From 53fca2a4e9e4af81649a96bcaccb27bed2a27264 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 22 Aug 2023 09:58:25 +1000 Subject: [PATCH 001/302] fix: text for note to self delete from all my devices --- _locales/en/messages.json | 1 + ts/components/conversation/ConversationHeader.tsx | 5 ++++- .../message/message-content/MessageContextMenu.tsx | 6 +++++- ts/interactions/conversations/unsendingInteractions.ts | 5 +++-- ts/types/LocalizerKeys.ts | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index d16a544ad4..5fcf483c9a 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -99,6 +99,7 @@ "delete": "Delete", "messageDeletionForbidden": "You don’t have permission to delete others’ messages", "deleteJustForMe": "Delete just for me", + "deleteFromAllMyDevices": "Delete from all my devices", "deleteForEveryone": "Delete for everyone", "deleteMessagesQuestion": "Delete $count$ messages?", "deleteMessageQuestion": "Delete this message?", diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 9bc56ce25d..79ab31144f 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -65,6 +65,7 @@ const SelectionOverlay = () => { const selectedConversationKey = useSelectedConversationKey(); const isPublic = useSelectedIsPublic(); const dispatch = useDispatch(); + const isMe = useSelectedisNoteToSelf(); const { i18n } = window; @@ -85,7 +86,9 @@ const SelectionOverlay = () => { const isOnlyServerDeletable = isPublic; const deleteMessageButtonText = i18n('delete'); - const deleteForEveryoneMessageButtonText = i18n('deleteForEveryone'); + const deleteForEveryoneMessageButtonText = isMe + ? i18n('deleteFromAllMyDevices') + : i18n('deleteForEveryone'); return (
diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx index 7591a9ac6f..fec11e0f34 100644 --- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx +++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx @@ -27,6 +27,7 @@ import { import { useSelectedConversationKey, useSelectedIsBlocked, + useSelectedisNoteToSelf, useSelectedIsPublic, useSelectedWeAreAdmin, useSelectedWeAreModerator, @@ -89,6 +90,7 @@ const StyledEmojiPanelContainer = styled.div<{ x: number; y: number }>` const DeleteForEveryone = ({ messageId }: { messageId: string }) => { const convoId = useSelectedConversationKey(); + const isMe = useSelectedisNoteToSelf(); const isDeletableForEveryone = useMessageIsDeletableForEveryone(messageId); if (!convoId || !isDeletableForEveryone) { return null; @@ -97,7 +99,9 @@ const DeleteForEveryone = ({ messageId }: { messageId: string }) => { void deleteMessagesByIdForEveryone([messageId], convoId); }; - const unsendMessageText = window.i18n('deleteForEveryone'); + const unsendMessageText = isMe + ? window.i18n('deleteFromAllMyDevices') + : window.i18n('deleteForEveryone'); return {unsendMessageText}; }; diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 85bdc930e6..819bbfe7ff 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -340,6 +340,7 @@ export async function deleteMessagesByIdForEveryone( conversationId: string ) { const conversation = getConversationController().getOrThrow(conversationId); + const isMe = conversation.isMe(); const selectedMessages = compact( await Promise.all(messageIds.map(m => Data.getMessageById(m, false))) ); @@ -349,11 +350,11 @@ export async function deleteMessagesByIdForEveryone( window.inboxStore?.dispatch( updateConfirmModal({ - title: window.i18n('deleteForEveryone'), + title: isMe ? window.i18n('deleteFromAllMyDevices') : window.i18n('deleteForEveryone'), message: moreThanOne ? window.i18n('deleteMessagesQuestion', [messageCount.toString()]) : window.i18n('deleteMessageQuestion'), - okText: window.i18n('deleteForEveryone'), + okText: isMe ? window.i18n('deleteFromAllMyDevices') : window.i18n('deleteForEveryone'), okTheme: SessionButtonColor.Danger, onClickOk: async () => { await doDeleteSelectedMessages({ selectedMessages, conversation, deleteForEveryone: true }); diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 592b1f5927..e710d08ba0 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -99,6 +99,7 @@ export type LocalizerKeys = | 'delete' | 'messageDeletionForbidden' | 'deleteJustForMe' + | 'deleteFromAllMyDevices' | 'deleteForEveryone' | 'deleteMessagesQuestion' | 'deleteMessageQuestion' From 5b2580c48dcb55ab09fd206a1d64716bc9b4af6f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 23 Aug 2023 11:49:32 +1000 Subject: [PATCH 002/302] feat: add poller changes and closed group keypair gen --- .../choose-action/OverlayChooseAction.tsx | 1 + .../conversations/unsendingInteractions.ts | 8 +- ts/models/conversation.ts | 60 ++-- ts/models/message.ts | 6 +- ts/receiver/closedGroups.ts | 2 +- .../apis/snode_api/SnodeRequestTypes.ts | 2 +- ts/session/apis/snode_api/namespaces.ts | 68 ++++- ts/session/apis/snode_api/retrieveRequest.ts | 4 +- ts/session/apis/snode_api/swarmPolling.ts | 267 +++++++++++------- .../conversations/ConversationController.ts | 11 +- ts/session/conversations/createClosedGroup.ts | 45 +-- ts/session/crypto/index.ts | 2 +- ts/session/group/closed-group.ts | 17 +- .../DataExtractionNotificationMessage.ts | 2 +- ts/session/sending/MessageSender.ts | 4 +- ts/session/utils/calling/CallManager.ts | 12 +- ts/session/utils/sync/syncUtils.ts | 4 +- .../session/unit/sending/MessageQueue_test.ts | 12 +- .../unit/sending/MessageSender_test.ts | 10 +- .../unit/sending/PendingMessageCache_test.ts | 56 ++-- ts/test/session/unit/utils/Messages_test.ts | 38 +-- 21 files changed, 366 insertions(+), 265 deletions(-) diff --git a/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx b/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx index 81a0ed6f94..d5cdf0e187 100644 --- a/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx +++ b/ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx @@ -103,6 +103,7 @@ export const OverlayChooseAction = () => { {window.i18n('createGroup')} + getMessageQueue() - .sendToPubKey(new PubKey(destinationId), unsendObject, SnodeNamespaces.UserMessages) + .sendToPubKey(new PubKey(destinationId), unsendObject, SnodeNamespaces.Default) .catch(window?.log?.error) ) ); await Promise.all( unsendMsgObjects.map(unsendObject => getMessageQueue() - .sendSyncMessage({ namespace: SnodeNamespaces.UserMessages, message: unsendObject }) + .sendSyncMessage({ namespace: SnodeNamespaces.Default, message: unsendObject }) .catch(window?.log?.error) ) ); @@ -57,7 +57,7 @@ async function unsendMessagesForEveryone( return getMessageQueue() .sendToGroup({ message: unsendObject, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, groupPubKey: new PubKey(destinationId), }) .catch(window?.log?.error); @@ -227,7 +227,7 @@ async function unsendMessageJustForThisUser( await Promise.all( unsendMsgObjects.map(unsendObject => getMessageQueue() - .sendSyncMessage({ namespace: SnodeNamespaces.UserMessages, message: unsendObject }) + .sendSyncMessage({ namespace: SnodeNamespaces.Default, message: unsendObject }) .catch(window?.log?.error) ) ); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 3d4eceaf34..86a73ba1b0 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -172,16 +172,23 @@ export class ConversationModel extends Backbone.Model { window.inboxStore?.dispatch(conversationsChanged([this.getConversationModelProps()])); } - public idForLogging() { - if (this.isPrivate()) { - return this.id; - } - - if (this.isPublic()) { - return this.id; + public idForLogging(): string { + const type = this.get('type'); + switch (type) { + case ConversationTypeEnum.PRIVATE: + return this.id; + case ConversationTypeEnum.GROUPV3: + return `group(${ed25519Str(this.id)})`; + case ConversationTypeEnum.GROUP: { + if (this.isPublic()) { + return this.id; + } + return `group(${ed25519Str(this.id)})`; + } + default: + assertUnreachable(type, `idForLogging case not handled for type:"${type}"`); } - - return `group(${ed25519Str(this.id)})`; + return this.id; } public isMe() { @@ -205,13 +212,18 @@ export class ConversationModel extends Backbone.Model { public isOpenGroupV2(): boolean { return OpenGroupUtils.isOpenGroupV2(this.id); } + public isClosedGroup(): boolean { return Boolean( (this.get('type') === ConversationTypeEnum.GROUP && this.id.startsWith('05')) || - (this.get('type') === ConversationTypeEnum.GROUPV3 && this.id.startsWith('03')) + this.isClosedGroupV3() ); } + public isClosedGroupV3(): boolean { + return Boolean(this.get('type') === ConversationTypeEnum.GROUPV3 && this.id.startsWith('03')); + } + public isPrivate() { return isDirectConversation(this.get('type')); } @@ -589,7 +601,7 @@ export class ConversationModel extends Backbone.Model { syncTarget: this.id, }); await getMessageQueue().sendSyncMessage({ - namespace: SnodeNamespaces.UserMessages, + namespace: SnodeNamespaces.Default, message: chatMessageMe, }); @@ -597,7 +609,7 @@ export class ConversationModel extends Backbone.Model { await getMessageQueue().sendToPubKey( destinationPubkey, chatMessagePrivate, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); await Reactions.handleMessageReaction({ reaction, @@ -616,7 +628,7 @@ export class ConversationModel extends Backbone.Model { // we need the return await so that errors are caught in the catch {} await getMessageQueue().sendToGroup({ message: closedGroupVisibleMessage, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, }); await Reactions.handleMessageReaction({ reaction, @@ -713,7 +725,7 @@ export class ConversationModel extends Backbone.Model { const messageRequestResponse = new MessageRequestResponse(messageRequestResponseParams); const pubkeyForSending = new PubKey(this.id); await getMessageQueue() - .sendToPubKey(pubkeyForSending, messageRequestResponse, SnodeNamespaces.UserMessages) + .sendToPubKey(pubkeyForSending, messageRequestResponse, SnodeNamespaces.Default) .catch(window?.log?.error); } @@ -870,11 +882,7 @@ export class ConversationModel extends Backbone.Model { if (this.isPrivate()) { const expirationTimerMessage = new ExpirationTimerUpdateMessage(expireUpdate); const pubkey = new PubKey(this.get('id')); - await getMessageQueue().sendToPubKey( - pubkey, - expirationTimerMessage, - SnodeNamespaces.UserMessages - ); + await getMessageQueue().sendToPubKey(pubkey, expirationTimerMessage, SnodeNamespaces.Default); } else { window?.log?.warn('TODO: Expiration update for closed groups are to be updated'); const expireUpdateForGroup = { @@ -886,7 +894,7 @@ export class ConversationModel extends Backbone.Model { await getMessageQueue().sendToGroup({ message: expirationTimerMessage, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, }); } } @@ -1032,7 +1040,7 @@ export class ConversationModel extends Backbone.Model { }); const device = new PubKey(this.id); - await getMessageQueue().sendToPubKey(device, receiptMessage, SnodeNamespaces.UserMessages); + await getMessageQueue().sendToPubKey(device, receiptMessage, SnodeNamespaces.Default); } } @@ -1757,7 +1765,7 @@ export class ConversationModel extends Backbone.Model { const chatMessageMe = new VisibleMessage(chatMessageParams); await getMessageQueue().sendSyncMessage({ - namespace: SnodeNamespaces.UserMessages, + namespace: SnodeNamespaces.Default, message: chatMessageMe, }); return; @@ -1776,7 +1784,7 @@ export class ConversationModel extends Backbone.Model { await getMessageQueue().sendToPubKey( destinationPubkey, groupInvitMessage, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); return; } @@ -1785,7 +1793,7 @@ export class ConversationModel extends Backbone.Model { await getMessageQueue().sendToPubKey( destinationPubkey, chatMessagePrivate, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); return; } @@ -1800,7 +1808,7 @@ export class ConversationModel extends Backbone.Model { // we need the return await so that errors are caught in the catch {} await getMessageQueue().sendToGroup({ message: closedGroupVisibleMessage, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, }); return; } @@ -2108,7 +2116,7 @@ export class ConversationModel extends Backbone.Model { const device = new PubKey(recipientId); void getMessageQueue() - .sendToPubKey(device, typingMessage, SnodeNamespaces.UserMessages) + .sendToPubKey(device, typingMessage, SnodeNamespaces.Default) .catch(window?.log?.error); } diff --git a/ts/models/message.ts b/ts/models/message.ts index 9ca93feb7d..a8da83b786 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -839,7 +839,7 @@ export class MessageModel extends Backbone.Model { return getMessageQueue().sendToPubKey( PubKey.cast(conversation.id), chatMessage, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); } @@ -860,7 +860,7 @@ export class MessageModel extends Backbone.Model { return getMessageQueue().sendToGroup({ message: closedGroupVisibleMessage, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, }); } catch (e) { await this.saveErrors(e); @@ -955,7 +955,7 @@ export class MessageModel extends Backbone.Model { } const syncMessage = buildSyncMessage(this.id, dataMessage, conversation.id, sentTimestamp); await getMessageQueue().sendSyncMessage({ - namespace: SnodeNamespaces.UserMessages, + namespace: SnodeNamespaces.Default, message: syncMessage, }); } diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index da4d8775ce..ccd5bdb015 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -923,7 +923,7 @@ async function sendLatestKeyPairToUsers( await getMessageQueue().sendToPubKey( PubKey.cast(member), keypairsMessage, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); }) ); diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 67025418e4..694afe5558 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -32,7 +32,7 @@ export type RetrievePubkeySubRequestType = { export type RetrieveLegacyClosedGroupSubRequestType = { method: 'retrieve'; params: { - namespace: SnodeNamespaces.ClosedGroupMessage; // legacy closed groups retrieve are not authenticated because the clients do not have a shared key + namespace: SnodeNamespaces.LegacyClosedGroup; // legacy closed groups retrieve are not authenticated because the clients do not have a shared key } & RetrieveAlwaysNeeded & RetrieveMaxCountSize; }; diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index e4345401b3..db099c1cdc 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -3,10 +3,15 @@ import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { PickEnum } from '../../../types/Enums'; export enum SnodeNamespaces { + /** + * The messages sent to a closed group are sent and polled from this namespace + */ + LegacyClosedGroup = -10, + /** * This is the namespace anyone can deposit a message for us */ - UserMessages = 0, + Default = 0, /** * This is the namespace used to sync our profile @@ -27,24 +32,33 @@ export enum SnodeNamespaces { UserGroups = 5, /** - * The messages sent to a closed group are sent and polled from this namespace + * This is the namespace used to sync the closed group details for each closed group + */ + ClosedGroupInfo = 11, + + /** + * This is the namespace used to sync the members for each closed group */ - ClosedGroupMessage = -10, + ClosedGroupMembers = 12, /** - * This is the namespace used to sync the closed group details for each of the closed groups we are polling + * This is the namespace used to sync the keys for each closed group */ - // ClosedGroupInfo = 1, + ClosedGroupKeys = 13, } export type SnodeNamespacesGroup = PickEnum< SnodeNamespaces, - SnodeNamespaces.ClosedGroupMessage // | SnodeNamespaces.ClosedGroupInfo + | SnodeNamespaces.LegacyClosedGroup + | SnodeNamespaces.ClosedGroupInfo + | SnodeNamespaces.ClosedGroupMembers + | SnodeNamespaces.ClosedGroupKeys + | SnodeNamespaces.Default >; export type SnodeNamespacesUser = PickEnum< SnodeNamespaces, - SnodeNamespaces.UserContacts | SnodeNamespaces.UserProfile | SnodeNamespaces.UserMessages + SnodeNamespaces.UserContacts | SnodeNamespaces.UserProfile | SnodeNamespaces.Default >; /** @@ -53,7 +67,7 @@ export type SnodeNamespacesUser = PickEnum< // eslint-disable-next-line consistent-return function isUserConfigNamespace(namespace: SnodeNamespaces) { switch (namespace) { - case SnodeNamespaces.UserMessages: + case SnodeNamespaces.Default: // user messages is not hosting config based messages return false; case SnodeNamespaces.UserContacts: @@ -61,8 +75,10 @@ function isUserConfigNamespace(namespace: SnodeNamespaces) { case SnodeNamespaces.UserGroups: case SnodeNamespaces.ConvoInfoVolatile: return true; - // case SnodeNamespaces.ClosedGroupInfo: - case SnodeNamespaces.ClosedGroupMessage: + case SnodeNamespaces.ClosedGroupInfo: + case SnodeNamespaces.ClosedGroupKeys: + case SnodeNamespaces.ClosedGroupMembers: + case SnodeNamespaces.LegacyClosedGroup: return false; default: @@ -75,10 +91,34 @@ function isUserConfigNamespace(namespace: SnodeNamespaces) { } } +function isGroupConfigNamespace(namespace: SnodeNamespaces) { + switch (namespace) { + case SnodeNamespaces.Default: + case SnodeNamespaces.UserContacts: + case SnodeNamespaces.UserProfile: + case SnodeNamespaces.UserGroups: + case SnodeNamespaces.ConvoInfoVolatile: + case SnodeNamespaces.LegacyClosedGroup: + return false; + case SnodeNamespaces.ClosedGroupInfo: + case SnodeNamespaces.ClosedGroupKeys: + case SnodeNamespaces.ClosedGroupMembers: + return true; + + default: + try { + assertUnreachable(namespace, `isGroupConfigNamespace case not handled: ${namespace}`); + } catch (e) { + window.log.warn(`isGroupConfigNamespace case not handled: ${namespace}: ${e.message}`); + return false; + } + } +} + // eslint-disable-next-line consistent-return function namespacePriority(namespace: SnodeNamespaces): number { switch (namespace) { - case SnodeNamespaces.UserMessages: + case SnodeNamespaces.Default: return 10; case SnodeNamespaces.UserContacts: return 1; @@ -88,7 +128,10 @@ function namespacePriority(namespace: SnodeNamespaces): number { return 1; case SnodeNamespaces.ConvoInfoVolatile: return 1; - case SnodeNamespaces.ClosedGroupMessage: + case SnodeNamespaces.LegacyClosedGroup: + case SnodeNamespaces.ClosedGroupInfo: + case SnodeNamespaces.ClosedGroupMembers: + case SnodeNamespaces.ClosedGroupKeys: return 10; default: @@ -127,5 +170,6 @@ function maxSizeMap(namespaces: Array) { export const SnodeNamespace = { isUserConfigNamespace, + isGroupConfigNamespace, maxSizeMap, }; diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 2502d1adda..04f3d31752 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -34,7 +34,7 @@ async function buildRetrieveRequest( max_size: foundMaxSize, }; - if (namespace === SnodeNamespaces.ClosedGroupMessage) { + if (namespace === SnodeNamespaces.LegacyClosedGroup) { if (pubkey === ourPubkey || !pubkey.startsWith('05')) { throw new Error( 'namespace -10 can only be used to retrieve messages from a legacy closed group (prefix 05)' @@ -56,7 +56,7 @@ async function buildRetrieveRequest( // if we get here, this can only be a retrieve for our own swarm, which must be authenticated if ( !SnodeNamespace.isUserConfigNamespace(namespace) && - namespace !== SnodeNamespaces.UserMessages + namespace !== SnodeNamespaces.Default ) { throw new Error(`not a legacy closed group. namespace can only be 0 and was ${namespace}`); } diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 2b7052d679..0a39d9d21d 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -10,11 +10,11 @@ import { ERROR_CODE_NO_CONNECT } from './SNodeAPI'; import * as snodePool from './snodePool'; import { ConversationModel } from '../../../models/conversation'; +import { ConversationTypeEnum } from '../../../models/conversationAttributes'; import { ConfigMessageHandler } from '../../../receiver/configMessage'; import { decryptEnvelopeWithOurKey } from '../../../receiver/contentMessage'; import { EnvelopePlus } from '../../../receiver/types'; import { updateIsOnline } from '../../../state/ducks/onion'; -import { ReleasedFeatures } from '../../../util/releaseFeature'; import { GenericWrapperActions, UserGroupsWrapperActions, @@ -167,28 +167,38 @@ export class SwarmPolling { return; } // we always poll as often as possible for our pubkey - const ourPubkey = UserUtils.getOurPubKeyFromCache(); + const ourPubkey = UserUtils.getOurPubKeyStrFromCache(); const userNamespaces = await this.getUserNamespacesPolled(); - const directPromise = Promise.all([this.pollOnceForKey(ourPubkey, false, userNamespaces)]).then( - () => undefined - ); + const directPromise = Promise.all([ + this.pollOnceForKey(ourPubkey, ConversationTypeEnum.PRIVATE, userNamespaces), + ]).then(() => undefined); const now = Date.now(); const groupPromises = this.groupPolling.map(async group => { const convoPollingTimeout = this.getPollingTimeout(group.pubkey); - const diff = now - group.lastPolledTimestamp; + const { key } = group.pubkey; + const isV3 = PubKey.isClosedGroupV3(key); const loggingId = getConversationController() - .get(group.pubkey.key) - ?.idForLogging() || group.pubkey.key; + .get(key) + ?.idForLogging() || key; if (diff >= convoPollingTimeout) { window?.log?.debug( `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} ` ); - - return this.pollOnceForKey(group.pubkey, true, [SnodeNamespaces.ClosedGroupMessage]); + if (isV3) { + return this.pollOnceForKey(key, ConversationTypeEnum.GROUPV3, [ + SnodeNamespaces.Default, + SnodeNamespaces.ClosedGroupKeys, + SnodeNamespaces.ClosedGroupInfo, + SnodeNamespaces.ClosedGroupMembers, + ]); + } + return this.pollOnceForKey(key, ConversationTypeEnum.GROUP, [ + SnodeNamespaces.LegacyClosedGroup, + ]); } window?.log?.debug( `Not polling for ${loggingId}; timeout: ${convoPollingTimeout} ; diff: ${diff}` @@ -196,6 +206,7 @@ export class SwarmPolling { return Promise.resolve(); }); + try { await Promise.all(concat([directPromise], groupPromises)); } catch (e) { @@ -210,13 +221,11 @@ export class SwarmPolling { * Only exposed as public for testing */ public async pollOnceForKey( - pubkey: PubKey, - isGroup: boolean, + pubkey: string, + type: ConversationTypeEnum, namespaces: Array ) { - const polledPubkey = pubkey.key; - - const swarmSnodes = await snodePool.getSwarmFor(polledPubkey); + const swarmSnodes = await snodePool.getSwarmFor(pubkey); // Select nodes for which we already have lastHashes const alreadyPolled = swarmSnodes.filter((n: Snode) => this.lastHashes[n.pubkey_ed25519]); @@ -230,12 +239,7 @@ export class SwarmPolling { let resultsFromAllNamespaces: RetrieveMessagesResultsBatched | null; try { - resultsFromAllNamespaces = await this.pollNodeForKey( - toPollFrom, - pubkey, - namespaces, - !isGroup - ); + resultsFromAllNamespaces = await this.pollNodeForKey(toPollFrom, pubkey, namespaces, type); } catch (e) { window.log.warn( `pollNodeForKey of ${pubkey} namespaces: ${namespaces} failed with: ${e.message}` @@ -243,58 +247,60 @@ export class SwarmPolling { resultsFromAllNamespaces = null; } - let allNamespacesWithoutUserConfigIfNeeded: Array = []; - const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); + if (!resultsFromAllNamespaces?.length) { + // not a single message from any of the polled namespace was retrieve. nothing else to do + return; + } + const { confMessages, otherMessages } = filterMessagesPerTypeOfConvo( + type, + resultsFromAllNamespaces + ); - // check if we just fetched the details from the config namespaces. - // If yes, merge them together and exclude them from the rest of the messages. - if (userConfigLibsession && resultsFromAllNamespaces) { - const userConfigMessages = resultsFromAllNamespaces - .filter(m => SnodeNamespace.isUserConfigNamespace(m.namespace)) - .map(r => r.messages.messages); + // first make sure to handle the shared user config message first - allNamespacesWithoutUserConfigIfNeeded = flatten( - compact( - resultsFromAllNamespaces - .filter(m => !SnodeNamespace.isUserConfigNamespace(m.namespace)) - .map(r => r.messages.messages) - ) - ); - const userConfigMessagesMerged = flatten(compact(userConfigMessages)); - - if (!isGroup && userConfigMessagesMerged.length) { + if (type === ConversationTypeEnum.PRIVATE) { + if (confMessages?.length) { window.log.info( - `received userConfigMessages count: ${userConfigMessagesMerged.length} for key ${pubkey.key}` + `received userConfigMessagesMerged count: ${confMessages.length} for key ${pubkey}` ); try { - await this.handleSharedConfigMessages(userConfigMessagesMerged); + await this.handleUserSharedConfigMessages(confMessages); } catch (e) { window.log.warn( - `handleSharedConfigMessages of ${userConfigMessagesMerged.length} failed with ${e.message}` + `handleSharedConfigMessages of ${confMessages.length} failed with ${e.message}` ); // not rethrowing } } - - // first make sure to handle the shared user config message first - } else { - allNamespacesWithoutUserConfigIfNeeded = flatten( - compact(resultsFromAllNamespaces?.map(m => m.messages.messages)) - ); + } else if (type === ConversationTypeEnum.GROUPV3) { + if (confMessages?.length) { + window.log.info( + `received GROUPV3MessagesMerged count: ${confMessages.length} for key ${pubkey}` + ); + throw new Error('received GROUPV3MessagesMerged TODO'); + + // try { + // await this.handleUserSharedConfigMessages(confMessages); + // } catch (e) { + // window.log.warn( + // `handleSharedConfigMessages of ${confMessages.length} failed with ${e.message}` + // ); + // // not rethrowing + // } + } } - if (allNamespacesWithoutUserConfigIfNeeded.length) { - window.log.debug( - `received allNamespacesWithoutUserConfigIfNeeded: ${allNamespacesWithoutUserConfigIfNeeded.length}` - ); + + if (otherMessages.length) { + window.log.debug(`received otherMessages: ${otherMessages.length} for type: ${type}`); } // Merge results into one list of unique messages - const messages = uniqBy(allNamespacesWithoutUserConfigIfNeeded, x => x.hash); + const messages = uniqBy(otherMessages, x => x.hash); // if all snodes returned an error (null), no need to update the lastPolledTimestamp - if (isGroup) { + if (type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV3) { window?.log?.debug( - `Polled for group(${ed25519Str(pubkey.key)}):, got ${messages.length} messages back.` + `Polled for group(${ed25519Str(pubkey)}):, got ${messages.length} messages back.` ); let lastPolledTimestamp = Date.now(); if (messages.length >= 95) { @@ -315,21 +321,19 @@ export class SwarmPolling { }); } - perfStart(`handleSeenMessages-${polledPubkey}`); + perfStart(`handleSeenMessages-${pubkey}`); const newMessages = await this.handleSeenMessages(messages); - perfEnd(`handleSeenMessages-${polledPubkey}`, 'handleSeenMessages'); + perfEnd(`handleSeenMessages-${pubkey}`, 'handleSeenMessages'); - // don't handle incoming messages from group swarms when using the userconfig and the group is not one of the tracked group - const isUserConfigReleaseLive = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); + // don't handle incoming messages from group swarms when the group is not one of the tracked group if ( - isUserConfigReleaseLive && - isGroup && - polledPubkey.startsWith('05') && - !(await UserGroupsWrapperActions.getLegacyGroup(polledPubkey)) // just check if a legacy group with that name exists + type === ConversationTypeEnum.GROUP && + pubkey.startsWith('05') && + !(await UserGroupsWrapperActions.getLegacyGroup(pubkey)) // just check if a legacy group with that name exists ) { // that pubkey is not tracked in the wrapper anymore. Just discard those messages and make sure we are not polling // TODOLATER we might need to do something like this for the new closed groups once released - getSwarmPollingInstance().removePubkey(polledPubkey); + getSwarmPollingInstance().removePubkey(pubkey); } else { // trigger the handling of all the other messages, not shared config related newMessages.forEach(m => { @@ -338,12 +342,20 @@ export class SwarmPolling { return; } - Receiver.handleRequest(content.body, isGroup ? polledPubkey : null, content.messageHash); + Receiver.handleRequest( + content.body, + type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV3 + ? pubkey + : null, + content.messageHash + ); }); } } - private async handleSharedConfigMessages(userConfigMessagesMerged: Array) { + private async handleUserSharedConfigMessages( + userConfigMessagesMerged: Array + ) { const extractedUserConfigMessage = compact( userConfigMessagesMerged.map((m: RetrieveMessageItem) => { return extractWebSocketContent(m.data, m.hash); @@ -403,46 +415,45 @@ export class SwarmPolling { // the lash hash record private async pollNodeForKey( node: Snode, - pubkey: PubKey, + pubkey: string, namespaces: Array, - isUs: boolean + type: ConversationTypeEnum ): Promise { const namespaceLength = namespaces.length; if (namespaceLength <= 0) { throw new Error(`invalid number of retrieve namespace provided: ${namespaceLength}`); } const snodeEdkey = node.pubkey_ed25519; - const pkStr = pubkey.key; try { const prevHashes = await Promise.all( - namespaces.map(namespace => this.getLastHash(snodeEdkey, pkStr, namespace)) + namespaces.map(namespace => this.getLastHash(snodeEdkey, pubkey, namespace)) ); const configHashesToBump: Array = []; - if (await ReleasedFeatures.checkIsUserConfigFeatureReleased()) { - // TODOLATER add the logic to take care of the closed groups too once we have a way to do it with the wrappers - if (isUs) { - for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) { - const variant = LibSessionUtil.requiredUserVariants[index]; - try { - const toBump = await GenericWrapperActions.currentHashes(variant); - - if (toBump?.length) { - configHashesToBump.push(...toBump); - } - } catch (e) { - window.log.warn(`failed to get currentHashes for user variant ${variant}`); + // TODOLATER add the logic to take care of the closed groups too once we have a way to do it with the wrappers + if (type === ConversationTypeEnum.PRIVATE) { + for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) { + const variant = LibSessionUtil.requiredUserVariants[index]; + try { + const toBump = await GenericWrapperActions.currentHashes(variant); + + if (toBump?.length) { + configHashesToBump.push(...toBump); } + } catch (e) { + window.log.warn(`failed to get currentHashes for user variant ${variant}`); } - window.log.debug(`configHashesToBump: ${configHashesToBump}`); } + window.log.debug(`configHashesToBump: ${configHashesToBump}`); + } else if (type === ConversationTypeEnum.GROUPV3) { + console.error('pollNodeForKey case bump of hashes closedgroup v3 to do '); } let results = await SnodeAPIRetrieve.retrieveNextMessages( node, prevHashes, - pkStr, + pubkey, namespaces, UserUtils.getOurPubKeyStrFromCache(), configHashesToBump @@ -538,16 +549,13 @@ export class SwarmPolling { } private async getUserNamespacesPolled() { - const isUserConfigRelease = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); - return isUserConfigRelease - ? [ - SnodeNamespaces.UserMessages, - SnodeNamespaces.UserProfile, - SnodeNamespaces.UserContacts, - SnodeNamespaces.UserGroups, - SnodeNamespaces.ConvoInfoVolatile, - ] - : [SnodeNamespaces.UserMessages]; + return [ + SnodeNamespaces.Default, + SnodeNamespaces.UserProfile, + SnodeNamespaces.UserContacts, + SnodeNamespaces.UserGroups, + SnodeNamespaces.ConvoInfoVolatile, + ]; } private async updateLastHash({ @@ -558,17 +566,16 @@ export class SwarmPolling { pubkey, }: { edkey: string; - pubkey: PubKey; + pubkey: string; namespace: number; hash: string; expiration: number; }): Promise { - const pkStr = pubkey.key; - const cached = await this.getLastHash(edkey, pubkey.key, namespace); + const cached = await this.getLastHash(edkey, pubkey, namespace); if (!cached || cached !== hash) { await Data.updateLastHash({ - convoId: pkStr, + convoId: pubkey, snode: edkey, hash, expiresAt: expiration, @@ -579,10 +586,10 @@ export class SwarmPolling { if (!this.lastHashes[edkey]) { this.lastHashes[edkey] = {}; } - if (!this.lastHashes[edkey][pkStr]) { - this.lastHashes[edkey][pkStr] = {}; + if (!this.lastHashes[edkey][pubkey]) { + this.lastHashes[edkey][pubkey] = {}; } - this.lastHashes[edkey][pkStr][namespace] = hash; + this.lastHashes[edkey][pubkey][namespace] = hash; } private async getLastHash(nodeEdKey: string, pubkey: string, namespace: number): Promise { @@ -603,3 +610,59 @@ export class SwarmPolling { return this.lastHashes[nodeEdKey][pubkey][namespace]; } } + +function filterMessagesPerTypeOfConvo( + type: T, + retrieveResults: RetrieveMessagesResultsBatched +): { confMessages: Array | null; otherMessages: Array } { + switch (type) { + case ConversationTypeEnum.PRIVATE: { + const confMessages = flatten( + compact( + retrieveResults + .filter(m => SnodeNamespace.isUserConfigNamespace(m.namespace)) + .map(r => r.messages.messages) + ) + ); + + const otherMessages = flatten( + compact( + retrieveResults + .filter(m => !SnodeNamespace.isUserConfigNamespace(m.namespace)) + .map(r => r.messages.messages) + ) + ); + + return { confMessages, otherMessages: uniqBy(otherMessages, x => x.hash) }; + } + + case ConversationTypeEnum.GROUP: + return { + confMessages: null, + otherMessages: flatten(compact(retrieveResults.map(m => m.messages.messages))), + }; + + case ConversationTypeEnum.GROUPV3: { + const confMessages = flatten( + compact( + retrieveResults + .filter(m => SnodeNamespace.isGroupConfigNamespace(m.namespace)) + .map(r => r.messages.messages) + ) + ); + + const otherMessages = flatten( + compact( + retrieveResults + .filter(m => !SnodeNamespace.isGroupConfigNamespace(m.namespace)) + .map(r => r.messages.messages) + ) + ); + + return { confMessages, otherMessages: uniqBy(otherMessages, x => x.hash) }; + } + + default: + return { confMessages: null, otherMessages: [] }; + } +} diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index a8995b071d..98719184e7 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -179,6 +179,15 @@ export class ConversationController { }); } + public async createGroupV3(id: string, privateIdentityKey: string): Promise { + if (!PubKey.isClosedGroupV3(id)) { + throw new Error('createGroupV3 invalid id given'); + } + // FIXME we should save the key to the wrapper right away? or even to the DB idk + + return getConversationController().getOrCreateAndWait(id, ConversationTypeEnum.GROUPV3); + } + /** * Usually, we want to mark private contact deleted as inactive (active_at = undefined). * That way we can still have the username and avatar for them, but they won't appear in search results etc. @@ -503,7 +512,7 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { // if we do not have a keypair for that group, we can't send our leave message, so just skip the message sending part const wasSent = await getMessageQueue().sendToPubKeyNonDurably({ message: ourLeavingMessage, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, pubkey: PubKey.cast(groupId), }); // TODO our leaving message might fail to be sent for some specific reason we want to still delete the group. diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index 0b7ebd0c69..8a67193535 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -7,7 +7,11 @@ import { openConversationWithMessages } from '../../state/ducks/conversations'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { getSwarmPollingInstance } from '../apis/snode_api'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; -import { generateClosedGroupPublicKey, generateCurve25519KeyPairWithoutPrefix } from '../crypto'; +import { + generateClosedGroupPublicKey, + generateCurve25519KeyPairWithoutPrefix, + generateGroupV3Keypair, +} from '../crypto'; import { ClosedGroupNewMessage, ClosedGroupNewMessageParams, @@ -17,23 +21,24 @@ import { UserUtils } from '../utils'; import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils'; import { getConversationController } from './ConversationController'; +/** + * Creates a brand new closed group from user supplied details. This function generates a new identityKeyPair so cannot be used to restore a closed group. + * @param groupName the name of this closed group + * @param members the initial members of this closed group + * @param isV3 if this closed group is a v3 closed group or not (has a 03 prefix in the identity keypair) + */ export async function createClosedGroup(groupName: string, members: Array, isV3: boolean) { const setOfMembers = new Set(members); - if (isV3) { - throw new Error('groupv3 is not supported yet'); - } - const us = UserUtils.getOurPubKeyStrFromCache(); - // const identityKeyPair = await generateGroupV3Keypair(); - // if (!identityKeyPair) { - // throw new Error('Could not create identity keypair for new closed group v3'); - // } + const identityKeyPair = await generateGroupV3Keypair(); + if (!identityKeyPair) { + throw new Error('Could not create identity keypair for new closed group v3'); + } // a v3 pubkey starts with 03 and an old one starts with 05 - const groupPublicKey = await generateClosedGroupPublicKey(); - // const groupPublicKey = isV3 ? identityKeyPair.pubkey : await generateClosedGroupPublicKey(); + const groupPublicKey = isV3 ? identityKeyPair.pubkey : await generateClosedGroupPublicKey(); // the first encryption keypair is generated the same for all versions of closed group const encryptionKeyPair = await generateCurve25519KeyPairWithoutPrefix(); @@ -42,12 +47,17 @@ export async function createClosedGroup(groupName: string, members: Array = { displayNameInProfile: details.name, members: details.members, - // Note: legacy group to not support change of admins. - type: ConversationTypeEnum.GROUP, + type: isV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP, active_at: details.activeAt ? details.activeAt : 0, left: !details.activeAt, }; @@ -262,7 +263,7 @@ async function sendNewName(convo: ConversationModel, name: string, messageId: st }); await getMessageQueue().sendToGroup({ message: nameChangeMessage, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, }); } @@ -297,7 +298,7 @@ async function sendAddedMembers( }); await getMessageQueue().sendToGroup({ message: closedGroupControlMessage, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, }); // Send closed group update messages to any new members individually @@ -318,7 +319,7 @@ async function sendAddedMembers( await getMessageQueue().sendToPubKey( memberPubKey, newClosedGroupUpdate, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); }); await Promise.all(promises); @@ -356,7 +357,7 @@ export async function sendRemovedMembers( // Send the group update, and only once sent, generate and distribute a new encryption key pair if needed await getMessageQueue().sendToGroup({ message: mainClosedGroupControlMessage, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, sentCb: async () => { if (isCurrentUserAdmin) { // we send the new encryption key only to members already here before the update @@ -430,7 +431,7 @@ async function generateAndSendNewEncryptionKeyPair( // this is to be sent to the group pubkey address await getMessageQueue().sendToGroup({ message: keypairsMessage, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, sentCb: messageSentCallback, }); } diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts index 50bf298bcb..2d7590f17c 100644 --- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts @@ -79,7 +79,7 @@ export const sendDataExtractionNotification = async ( await getMessageQueue().sendToPubKey( pubkey, dataExtractionNotificationMessage, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); } catch (e) { window.log.warn('failed to send data extraction notification', e); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index be9d1ed37a..6797526e0d 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -321,8 +321,8 @@ async function encryptMessageAndWrap( : getConversationController() .get(recipient.key) ?.isClosedGroup() - ? SnodeNamespaces.ClosedGroupMessage - : SnodeNamespaces.UserMessages; + ? SnodeNamespaces.LegacyClosedGroup + : SnodeNamespaces.Default; return { data64, diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 171661c859..840d88aa17 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -422,7 +422,7 @@ async function createOfferAndSendIt(recipient: string) { const negotiationOfferSendResult = await getMessageQueue().sendToPubKeyNonDurably({ pubkey: PubKey.cast(recipient), message: offerMessage, - namespace: SnodeNamespaces.UserMessages, + namespace: SnodeNamespaces.Default, }); if (typeof negotiationOfferSendResult === 'number') { // window.log?.warn('setting last sent timestamp'); @@ -524,7 +524,7 @@ export async function USER_callRecipient(recipient: string) { const rawMessage = await MessageUtils.toRawMessage( PubKey.cast(recipient), preOfferMsg, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); const { wrappedEnvelope } = await MessageSender.send(rawMessage); void PnServer.notifyPnServer(wrappedEnvelope, recipient); @@ -587,7 +587,7 @@ const iceSenderDebouncer = _.debounce(async (recipient: string) => { await getMessageQueue().sendToPubKeyNonDurably({ pubkey: PubKey.cast(recipient), message: callIceCandicates, - namespace: SnodeNamespaces.UserMessages, + namespace: SnodeNamespaces.Default, }); }, 2000); @@ -926,12 +926,12 @@ async function sendCallMessageAndSync(callmessage: CallMessage, user: string) { getMessageQueue().sendToPubKeyNonDurably({ pubkey: PubKey.cast(user), message: callmessage, - namespace: SnodeNamespaces.UserMessages, + namespace: SnodeNamespaces.Default, }), getMessageQueue().sendToPubKeyNonDurably({ pubkey: UserUtils.getOurPubKeyFromCache(), message: callmessage, - namespace: SnodeNamespaces.UserMessages, + namespace: SnodeNamespaces.Default, }), ]); } @@ -952,7 +952,7 @@ export async function USER_hangup(fromSender: string) { void getMessageQueue().sendToPubKeyNonDurably({ pubkey: PubKey.cast(fromSender), message: endCallMessage, - namespace: SnodeNamespaces.UserMessages, + namespace: SnodeNamespaces.Default, }); window.inboxStore?.dispatch(endCall()); diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts index 8baff4f1d9..fd596ad7fb 100644 --- a/ts/session/utils/sync/syncUtils.ts +++ b/ts/session/utils/sync/syncUtils.ts @@ -64,7 +64,7 @@ export const syncConfigurationIfNeeded = async () => { // window?.log?.info('syncConfigurationIfNeeded with', configMessage); await getMessageQueue().sendSyncMessage({ - namespace: SnodeNamespaces.UserMessages, + namespace: SnodeNamespaces.Default, message: configMessage, }); } catch (e) { @@ -116,7 +116,7 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal } : undefined; void getMessageQueue().sendSyncMessage({ - namespace: SnodeNamespaces.UserMessages, + namespace: SnodeNamespaces.Default, message: configMessage, sentCb: callback as any, }); diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index 63cb57cd37..5588e46f56 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -112,7 +112,7 @@ describe('MessageQueue', () => { await pendingMessageCache.add( device, TestUtils.generateVisibleMessage(), - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); const initialMessages = await pendingMessageCache.getForDevice(device); @@ -150,7 +150,7 @@ describe('MessageQueue', () => { }); void pendingMessageCache - .add(device, message, SnodeNamespaces.UserMessages, waitForMessageSentEvent) + .add(device, message, SnodeNamespaces.Default, waitForMessageSentEvent) .then(() => messageQueueStub.processPending(device)); }); @@ -160,7 +160,7 @@ describe('MessageQueue', () => { const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateVisibleMessage(); void pendingMessageCache - .add(device, message, SnodeNamespaces.UserMessages) + .add(device, message, SnodeNamespaces.Default) .then(() => messageQueueStub.processPending(device)); // The cb is only invoke is all reties fails. Here we poll until the messageSentHandlerFailed was invoked as this is what we want to do @@ -188,7 +188,7 @@ describe('MessageQueue', () => { const stub = Sinon.stub(messageQueueStub as any, 'process').resolves(); const message = TestUtils.generateVisibleMessage(); - await messageQueueStub.sendToPubKey(device, message, SnodeNamespaces.UserMessages); + await messageQueueStub.sendToPubKey(device, message, SnodeNamespaces.Default); const args = stub.lastCall.args as [Array, ContentMessage]; expect(args[0]).to.be.equal(device); @@ -202,7 +202,7 @@ describe('MessageQueue', () => { return expect( messageQueueStub.sendToGroup({ message: chatMessage as any, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, }) ).to.be.rejectedWith('Invalid group message passed in sendToGroup.'); }); @@ -217,7 +217,7 @@ describe('MessageQueue', () => { const message = TestUtils.generateClosedGroupMessage(); await messageQueueStub.sendToGroup({ message, - namespace: SnodeNamespaces.ClosedGroupMessage, + namespace: SnodeNamespaces.LegacyClosedGroup, }); expect(send.callCount).to.equal(1); diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index 3fb0fcf70f..b1dffe0de1 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -62,7 +62,7 @@ describe('MessageSender', () => { rawMessage = await MessageUtils.toRawMessage( TestUtils.generateFakePubKey(), TestUtils.generateVisibleMessage(), - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); }); @@ -111,7 +111,7 @@ describe('MessageSender', () => { const rawMessage = await MessageUtils.toRawMessage( device, visibleMessage, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); await MessageSender.send(rawMessage, 3, 10); @@ -123,7 +123,7 @@ describe('MessageSender', () => { // expect(args[3]).to.equal(visibleMessage.timestamp); the timestamp is overwritten on sending by the network clock offset expect(firstArg[0].ttl).to.equal(visibleMessage.ttl()); expect(firstArg[0].pubkey).to.equal(device.key); - expect(firstArg[0].namespace).to.equal(SnodeNamespaces.UserMessages); + expect(firstArg[0].namespace).to.equal(SnodeNamespaces.Default); }); it('should correctly build the envelope and override the timestamp', async () => { @@ -136,7 +136,7 @@ describe('MessageSender', () => { const rawMessage = await MessageUtils.toRawMessage( device, visibleMessage, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); const offset = 200000; Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(offset); @@ -192,7 +192,7 @@ describe('MessageSender', () => { const rawMessage = await MessageUtils.toRawMessage( device, visibleMessage, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); await MessageSender.send(rawMessage, 3, 10); diff --git a/ts/test/session/unit/sending/PendingMessageCache_test.ts b/ts/test/session/unit/sending/PendingMessageCache_test.ts index caa0310208..cacd65a3a0 100644 --- a/ts/test/session/unit/sending/PendingMessageCache_test.ts +++ b/ts/test/session/unit/sending/PendingMessageCache_test.ts @@ -58,13 +58,9 @@ describe('PendingMessageCache', () => { it('can add to cache', async () => { const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateVisibleMessage(); - const rawMessage = await MessageUtils.toRawMessage( - device, - message, - SnodeNamespaces.UserMessages - ); + const rawMessage = await MessageUtils.toRawMessage(device, message, SnodeNamespaces.Default); - await pendingMessageCacheStub.add(device, message, SnodeNamespaces.UserMessages); + await pendingMessageCacheStub.add(device, message, SnodeNamespaces.Default); // Verify that the message is in the cache const finalCache = await pendingMessageCacheStub.getAllPending(); @@ -81,20 +77,20 @@ describe('PendingMessageCache', () => { await pendingMessageCacheStub.add( device, TestUtils.generateVisibleMessage(), - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); // We have to timeout here otherwise it's processed too fast and messages start having the same timestamp await TestUtils.timeout(5); await pendingMessageCacheStub.add( device, TestUtils.generateVisibleMessage(), - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); await TestUtils.timeout(5); await pendingMessageCacheStub.add( device, TestUtils.generateVisibleMessage(), - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); // Verify that the message is in the cache @@ -106,13 +102,9 @@ describe('PendingMessageCache', () => { it('can remove from cache', async () => { const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateVisibleMessage(); - const rawMessage = await MessageUtils.toRawMessage( - device, - message, - SnodeNamespaces.UserMessages - ); + const rawMessage = await MessageUtils.toRawMessage(device, message, SnodeNamespaces.Default); - await pendingMessageCacheStub.add(device, message, SnodeNamespaces.UserMessages); + await pendingMessageCacheStub.add(device, message, SnodeNamespaces.Default); const initialCache = await pendingMessageCacheStub.getAllPending(); expect(initialCache).to.have.length(1); @@ -129,23 +121,19 @@ describe('PendingMessageCache', () => { it('should only remove messages with different identifier and device', async () => { const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateVisibleMessage(); - const rawMessage = await MessageUtils.toRawMessage( - device, - message, - SnodeNamespaces.UserMessages - ); + const rawMessage = await MessageUtils.toRawMessage(device, message, SnodeNamespaces.Default); - await pendingMessageCacheStub.add(device, message, SnodeNamespaces.UserMessages); + await pendingMessageCacheStub.add(device, message, SnodeNamespaces.Default); await TestUtils.timeout(5); const one = await pendingMessageCacheStub.add( device, TestUtils.generateVisibleMessage(), - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); const two = await pendingMessageCacheStub.add( TestUtils.generateFakePubKey(), message, - SnodeNamespaces.UserMessages + SnodeNamespaces.Default ); const initialCache = await pendingMessageCacheStub.getAllPending(); @@ -178,7 +166,7 @@ describe('PendingMessageCache', () => { ]; for (const item of cacheItems) { - await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.UserMessages); + await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.Default); } const cache = await pendingMessageCacheStub.getAllPending(); @@ -206,7 +194,7 @@ describe('PendingMessageCache', () => { ]; for (const item of cacheItems) { - await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.UserMessages); + await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.Default); } const initialCache = await pendingMessageCacheStub.getAllPending(); @@ -223,11 +211,7 @@ describe('PendingMessageCache', () => { it('can find nothing when empty', async () => { const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateVisibleMessage(); - const rawMessage = await MessageUtils.toRawMessage( - device, - message, - SnodeNamespaces.UserMessages - ); + const rawMessage = await MessageUtils.toRawMessage(device, message, SnodeNamespaces.Default); const foundMessage = pendingMessageCacheStub.find(rawMessage); expect(foundMessage, 'a message was found in empty cache').to.be.undefined; @@ -236,13 +220,9 @@ describe('PendingMessageCache', () => { it('can find message in cache', async () => { const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateVisibleMessage(); - const rawMessage = await MessageUtils.toRawMessage( - device, - message, - SnodeNamespaces.UserMessages - ); + const rawMessage = await MessageUtils.toRawMessage(device, message, SnodeNamespaces.Default); - await pendingMessageCacheStub.add(device, message, SnodeNamespaces.UserMessages); + await pendingMessageCacheStub.add(device, message, SnodeNamespaces.Default); const finalCache = await pendingMessageCacheStub.getAllPending(); expect(finalCache).to.have.length(1); @@ -269,7 +249,7 @@ describe('PendingMessageCache', () => { ]; for (const item of cacheItems) { - await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.UserMessages); + await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.Default); } const initialCache = await pendingMessageCacheStub.getAllPending(); @@ -299,7 +279,7 @@ describe('PendingMessageCache', () => { ]; for (const item of cacheItems) { - await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.UserMessages); + await pendingMessageCacheStub.add(item.device, item.message, SnodeNamespaces.Default); } const addedMessages = await pendingMessageCacheStub.getAllPending(); diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts index 7b9a6bd745..9622a34f56 100644 --- a/ts/test/session/unit/utils/Messages_test.ts +++ b/ts/test/session/unit/utils/Messages_test.ts @@ -65,11 +65,7 @@ describe('Message Utils', () => { const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateVisibleMessage(); - const rawMessage = await MessageUtils.toRawMessage( - device, - message, - SnodeNamespaces.UserMessages - ); + const rawMessage = await MessageUtils.toRawMessage(device, message, SnodeNamespaces.Default); const rawBuffer = rawMessage.plainTextBuffer; const rawBufferJSON = JSON.stringify(rawBuffer); @@ -89,11 +85,7 @@ describe('Message Utils', () => { const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateVisibleMessage(); - const rawMessage = await MessageUtils.toRawMessage( - device, - message, - SnodeNamespaces.UserMessages - ); + const rawMessage = await MessageUtils.toRawMessage(device, message, SnodeNamespaces.Default); const derivedPubKey = PubKey.from(rawMessage.device); expect(derivedPubKey).to.not.be.eq(undefined, 'should maintain pubkey'); @@ -109,22 +101,14 @@ describe('Message Utils', () => { const chatMessage = TestUtils.generateVisibleMessage(); const message = new ClosedGroupVisibleMessage({ chatMessage, groupId }); - const rawMessage = await MessageUtils.toRawMessage( - device, - message, - SnodeNamespaces.UserMessages - ); + const rawMessage = await MessageUtils.toRawMessage(device, message, SnodeNamespaces.Default); expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE); }); it('should set encryption to Fallback on other messages', async () => { const device = TestUtils.generateFakePubKey(); const message = TestUtils.generateVisibleMessage(); - const rawMessage = await MessageUtils.toRawMessage( - device, - message, - SnodeNamespaces.UserMessages - ); + const rawMessage = await MessageUtils.toRawMessage(device, message, SnodeNamespaces.Default); expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE); }); @@ -142,7 +126,7 @@ describe('Message Utils', () => { keypair: TestUtils.generateFakeECKeyPair(), expireTimer: 0, }); - const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages); + const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.Default); expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE); }); @@ -154,7 +138,7 @@ describe('Message Utils', () => { name: 'df', groupId: TestUtils.generateFakePubKey().key, }); - const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages); + const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.Default); expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE); }); @@ -166,7 +150,7 @@ describe('Message Utils', () => { addedMembers: [TestUtils.generateFakePubKey().key], groupId: TestUtils.generateFakePubKey().key, }); - const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages); + const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.Default); expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE); }); @@ -178,7 +162,7 @@ describe('Message Utils', () => { removedMembers: [TestUtils.generateFakePubKey().key], groupId: TestUtils.generateFakePubKey().key, }); - const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages); + const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.Default); expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE); }); @@ -199,7 +183,7 @@ describe('Message Utils', () => { groupId: TestUtils.generateFakePubKey().key, encryptedKeyPairs: fakeWrappers, }); - const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages); + const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.Default); expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE); }); @@ -220,7 +204,7 @@ describe('Message Utils', () => { groupId: TestUtils.generateFakePubKey().key, encryptedKeyPairs: fakeWrappers, }); - const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages); + const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.Default); expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE); }); @@ -234,7 +218,7 @@ describe('Message Utils', () => { displayName: 'displayName', contacts: [], }); - const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.UserMessages); + const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.Default); expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE); }); }); From db98cc28125d8d023a1461d94b56caeba31a7a1f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 7 Sep 2023 13:32:45 +1000 Subject: [PATCH 003/302] feat: able to create a broken closedgroup v3 --- .eslintrc.js | 5 + .gitignore | 2 +- libsession.worker.config.js | 5 +- preload.js | 2 +- ts/components/SessionInboxView.tsx | 2 + ts/node/hexStrings.ts | 37 +++ ts/receiver/configMessage.ts | 68 +++-- ts/session/apis/snode_api/swarmPolling.ts | 7 +- .../conversations/ConversationController.ts | 9 - ts/session/conversations/createClosedGroup.ts | 40 ++- ts/session/crypto/index.ts | 17 -- ts/session/group/closed-group.ts | 21 +- ts/session/types/PubKey.ts | 3 +- .../job_runners/jobs/ConfigurationSyncJob.ts | 5 + .../utils/libsession/libsession_utils.ts | 75 +++++- ts/state/actions.ts | 2 + ts/state/createStore.ts | 1 - ts/state/ducks/groupInfos.ts | 144 +++++++++++ ts/state/reducer.ts | 3 + ts/types/sqlSharedTypes.ts | 17 +- .../browser/libsession_worker_functions.d.ts | 38 --- .../browser/libsession_worker_functions.ts | 81 ++++++ .../browser/libsession_worker_interface.ts | 243 +++++++++++++++--- .../workers/browser/util_worker_interface.ts | 2 +- .../node/libsession/libsession.worker.ts | 168 +++++++++--- tsconfig.json | 7 +- utils.worker.config.js | 2 +- 27 files changed, 795 insertions(+), 211 deletions(-) create mode 100644 ts/node/hexStrings.ts create mode 100644 ts/state/ducks/groupInfos.ts delete mode 100644 ts/webworker/workers/browser/libsession_worker_functions.d.ts create mode 100644 ts/webworker/workers/browser/libsession_worker_functions.ts diff --git a/.eslintrc.js b/.eslintrc.js index 6b9ace6d52..9a11565694 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -5,6 +5,11 @@ module.exports = { react: { version: 'detect', }, + 'import/resolver': { + node: { + paths: [path.resolve(__dirname)], + }, + }, }, extends: [ diff --git a/.gitignore b/.gitignore index a57cb1a51b..29385777f0 100644 --- a/.gitignore +++ b/.gitignore @@ -50,5 +50,5 @@ test-results/ coverage/ stylesheets/dist/ -*.worker.js.LICENSE.txt +*.LICENSE.txt ts/webworker/workers/node/**/*.node diff --git a/libsession.worker.config.js b/libsession.worker.config.js index fe1741bea8..7d546c90ab 100644 --- a/libsession.worker.config.js +++ b/libsession.worker.config.js @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/no-var-requires */ const path = require('path'); +const isProd = process.env.NODE_ENV === 'production'; module.exports = { entry: './ts/webworker/workers/node/libsession/libsession.worker.ts', @@ -29,11 +30,11 @@ module.exports = { }, }, output: { - filename: 'libsession.worker.js', + filename: 'libsession.worker.compiled.js', path: path.resolve(__dirname, 'ts', 'webworker', 'workers', 'node', 'libsession'), }, target: 'node', optimization: { - minimize: true, + minimize: isProd, }, }; diff --git a/preload.js b/preload.js index 643e7938f0..f8339fd4b5 100644 --- a/preload.js +++ b/preload.js @@ -34,7 +34,7 @@ window.sessionFeatureFlags = { integrationTestEnv: Boolean( process.env.NODE_APP_INSTANCE && process.env.NODE_APP_INSTANCE.includes('test-integration') ), - useClosedGroupV3: false || process.env.USE_CLOSED_GROUP_V3, + useClosedGroupV3: true, debug: { debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), debugLibsessionDumps: !_.isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS), diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index fe3ced5502..26c59411c1 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -39,6 +39,7 @@ import { useHasDeviceOutdatedSyncing } from '../state/selectors/settings'; import { Storage } from '../util/storage'; import { NoticeBanner } from './NoticeBanner'; import { Flex } from './basic/Flex'; +import { initialGroupInfosState } from '../state/ducks/groupInfos'; function makeLookup(items: Array, key: string): { [key: string]: T } { // Yep, we can't index into item without knowing what it is. True. But we want to. @@ -88,6 +89,7 @@ function createSessionInboxStore() { call: initialCallState, sogsRoomInfo: initialSogsRoomInfoState, settings: getSettingsInitialState(), + groupInfos: initialGroupInfosState, }; return createStore(initialState); diff --git a/ts/node/hexStrings.ts b/ts/node/hexStrings.ts new file mode 100644 index 0000000000..574e191789 --- /dev/null +++ b/ts/node/hexStrings.ts @@ -0,0 +1,37 @@ +/** + * Checks if a string is hex string. A hex string is a string like "0512ab". + * @param maybeHex the string to test + * @returns true if this string is a hex string. + */ +const isHexString = (maybeHex: string) => + maybeHex.length !== 0 && maybeHex.length % 2 === 0 && !/[^a-fA-F0-9]/u.test(maybeHex); + +/** + * Returns the Uint8Array corresponding to the given string. + * Note: this is different than the libsodium.from_hex(). + * This takes a string like "0102" and converts it to an UIin8Array like [1, 2] whereare + * the libsodium one returns [0, 1, 0, 2] + * + * Throws an error if this string is not a hex string. + * @param hexString the string to convert from + * @returns the Uint8Arraty + */ +const fromHexString = (hexString: string): Uint8Array => { + if (!isHexString(hexString)) { + throw new Error('Not a hex string'); + } + const matches = hexString.match(/.{1,2}/g); + if (!matches) { + return new Uint8Array(); + } + return Uint8Array.from(matches.map(byte => parseInt(byte, 16))); +}; + +const toHexString = (bytes: Uint8Array) => + bytes.reduce((str, byte) => str + byte.toString(16).padStart(2, '0'), ''); + +export const HexString = { + toHexString, + fromHexString, + isHexString, +}; diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index de5ab601aa..5a20d93a77 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -41,11 +41,17 @@ import { } from '../util/storage'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../interactions/conversationInteractions'; // eslint-disable-next-line import/no-unresolved, import/extensions -import { ConfigWrapperObjectTypes } from '../../ts/webworker/workers/browser/libsession_worker_functions'; +import { + ConfigWrapperObjectTypes, + getGroupPubkeyFromWrapperType, + isMetaWrapperType, + isUserConfigWrapperType, +} from '../../ts/webworker/workers/browser/libsession_worker_functions'; import { ContactsWrapperActions, ConvoInfoVolatileWrapperActions, GenericWrapperActions, + MetaGroupWrapperActions, UserConfigWrapperActions, UserGroupsWrapperActions, } from '../webworker/workers/browser/libsession_worker_interface'; @@ -77,6 +83,29 @@ function groupByVariant( return groupedByVariant; } +async function printDumpForDebug(prefix: string, variant: ConfigWrapperObjectTypes) { + if (isUserConfigWrapperType(variant)) { + window.log.info(prefix, StringUtils.toHex(await GenericWrapperActions.dump(variant))); + return; + } + const metaGroupDumps = await MetaGroupWrapperActions.metaDump( + getGroupPubkeyFromWrapperType(variant) + ); + + window.log.info(prefix, StringUtils.toHex(metaGroupDumps)); +} + +async function variantNeedsDump(variant: ConfigWrapperObjectTypes) { + return isUserConfigWrapperType(variant) + ? await GenericWrapperActions.needsDump(variant) + : await MetaGroupWrapperActions.needsDump(getGroupPubkeyFromWrapperType(variant)); +} +async function variantNeedsPush(variant: ConfigWrapperObjectTypes) { + return isUserConfigWrapperType(variant) + ? await GenericWrapperActions.needsPush(variant) + : await MetaGroupWrapperActions.needsPush(getGroupPubkeyFromWrapperType(variant)); +} + async function mergeConfigsWithIncomingUpdates( incomingConfigs: Array> ): Promise> { @@ -100,25 +129,17 @@ async function mergeConfigsWithIncomingUpdates( hash: msg.messageHash, })); if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { - window.log.info( - `printDumpsForDebugging: before merge of ${variant}:`, - StringUtils.toHex(await GenericWrapperActions.dump(variant)) - ); - - for (let dumpIndex = 0; dumpIndex < toMerge.length; dumpIndex++) { - const element = toMerge[dumpIndex]; - window.log.info( - `printDumpsForDebugging: toMerge of ${dumpIndex}:${element.hash}: ${StringUtils.toHex( - element.data - )} `, - StringUtils.toHex(await GenericWrapperActions.dump(variant)) - ); - } + printDumpForDebug(`printDumpsForDebugging: before merge of ${variant}:`, variant); } + if (!isUserConfigWrapperType(variant)) { + window.log.info('// TODO Audric'); + continue; + } const mergedCount = await GenericWrapperActions.merge(variant, toMerge); - const needsPush = await GenericWrapperActions.needsPush(variant); - const needsDump = await GenericWrapperActions.needsDump(variant); + + const needsDump = await variantNeedsDump(variant); + const needsPush = await variantNeedsPush(variant); const latestEnvelopeTimestamp = Math.max(...sameVariant.map(m => m.envelopeTimestamp)); window.log.debug( @@ -126,10 +147,7 @@ async function mergeConfigsWithIncomingUpdates( ); if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { - window.log.info( - `printDumpsForDebugging: after merge of ${variant}:`, - StringUtils.toHex(await GenericWrapperActions.dump(variant)) - ); + printDumpForDebug(`printDumpsForDebugging: after merge of ${variant}:`, variant); } const incomingConfResult: IncomingConfResult = { needsDump, @@ -161,6 +179,10 @@ export function getSettingsKeyFromLibsessionWrapper( case 'ConvoInfoVolatileConfig': return null; // we don't really care about the convo info volatile one default: + if (isMetaWrapperType(wrapperType)) { + // we don't care about the group updates as we don't need to drop older one for now + return null; // TODO maybe we do? + } try { assertUnreachable( wrapperType, @@ -791,6 +813,10 @@ async function processMergingResults(results: Map { - if (!PubKey.isClosedGroupV3(id)) { - throw new Error('createGroupV3 invalid id given'); - } - // FIXME we should save the key to the wrapper right away? or even to the DB idk - - return getConversationController().getOrCreateAndWait(id, ConversationTypeEnum.GROUPV3); - } - /** * Usually, we want to mark private contact deleted as inactive (active_at = undefined). * That way we can still have the username and avatar for them, but they won't appear in search results etc. diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index 8a67193535..fa7f48782d 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -7,11 +7,7 @@ import { openConversationWithMessages } from '../../state/ducks/conversations'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { getSwarmPollingInstance } from '../apis/snode_api'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; -import { - generateClosedGroupPublicKey, - generateCurve25519KeyPairWithoutPrefix, - generateGroupV3Keypair, -} from '../crypto'; +import { generateClosedGroupPublicKey, generateCurve25519KeyPairWithoutPrefix } from '../crypto'; import { ClosedGroupNewMessage, ClosedGroupNewMessageParams, @@ -20,6 +16,7 @@ import { PubKey } from '../types'; import { UserUtils } from '../utils'; import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils'; import { getConversationController } from './ConversationController'; +import { groupInfoActions } from '../../state/ducks/groupInfos'; /** * Creates a brand new closed group from user supplied details. This function generates a new identityKeyPair so cannot be used to restore a closed group. @@ -28,17 +25,26 @@ import { getConversationController } from './ConversationController'; * @param isV3 if this closed group is a v3 closed group or not (has a 03 prefix in the identity keypair) */ export async function createClosedGroup(groupName: string, members: Array, isV3: boolean) { - const setOfMembers = new Set(members); + if (isV3) { + // we need to send a group info and encryption keys message to the batch endpoint with both seqno being 0 + console.error('isV3 send invite to group TODO'); // FIXME + // FIXME we should save the key to the wrapper right away? or even to the DB idk + window.inboxStore.dispatch(groupInfoActions.initNewGroupInfoInWrapper({ members, groupName })); + return; + } + // this is all legacy group logic. + // TODO: To be removed + + const setOfMembers = new Set(members); const us = UserUtils.getOurPubKeyStrFromCache(); - const identityKeyPair = await generateGroupV3Keypair(); + const identityKeyPair = await generateClosedGroupPublicKey(); if (!identityKeyPair) { throw new Error('Could not create identity keypair for new closed group v3'); } - // a v3 pubkey starts with 03 and an old one starts with 05 - const groupPublicKey = isV3 ? identityKeyPair.pubkey : await generateClosedGroupPublicKey(); + const groupPublicKey = await generateClosedGroupPublicKey(); // the first encryption keypair is generated the same for all versions of closed group const encryptionKeyPair = await generateCurve25519KeyPairWithoutPrefix(); @@ -47,12 +53,10 @@ export async function createClosedGroup(groupName: string, members: Array = [ +const requiredUserVariants: Array = [ 'UserConfig', 'ContactsConfig', 'UserGroupsConfig', @@ -51,27 +63,31 @@ async function initializeLibSessionUtilWrappers() { JSON.stringify(dumps.map(m => omit(m, 'data'))) ); - const userVariantsBuildWithoutErrors = new Set(); + const userVariantsBuildWithoutErrors = new Set(); // load the dumps retrieved from the database into their corresponding wrappers for (let index = 0; index < dumps.length; index++) { const dump = dumps[index]; - window.log.debug('initializeLibSessionUtilWrappers initing from dump', dump.variant); + const variant = dump.variant; + if (!isUserConfigWrapperType(variant)) { + continue; + } + window.log.debug('initializeLibSessionUtilWrappers initing from dump', variant); try { await GenericWrapperActions.init( - dump.variant, + variant, privateKeyEd25519, dump.data.length ? dump.data : null ); - userVariantsBuildWithoutErrors.add(dump.variant); + userVariantsBuildWithoutErrors.add(variant); } catch (e) { window.log.warn(`init of UserConfig failed with ${e.message} `); throw new Error(`initializeLibSessionUtilWrappers failed with ${e.message}`); } } - const missingRequiredVariants: Array = difference( + const missingRequiredVariants: Array = difference( LibSessionUtil.requiredUserVariants, [...userVariantsBuildWithoutErrors.values()] ); @@ -94,6 +110,39 @@ async function initializeLibSessionUtilWrappers() { `initializeLibSessionUtilWrappers: missingRequiredVariants "${missingVariant}" created` ); } + const ed25519KeyPairBytes = await getUserED25519KeyPairBytes(); + if (!ed25519KeyPairBytes?.privKeyBytes) { + throw new Error('user has no ed25519KeyPairBytes.'); + } + // TODO then load the Group wrappers (not handled yet) into memory + // load the dumps retrieved from the database into their corresponding wrappers + for (let index = 0; index < dumps.length; index++) { + const dump = dumps[index]; + const { variant } = dump; + if (!isMetaWrapperType(variant)) { + continue; + } + const groupPk = getGroupPubkeyFromWrapperType(variant); + const groupPkNoPrefix = groupPk.substring(2); + const groupEd25519Pubkey = HexString.fromHexString(groupPkNoPrefix); + + try { + const foundInUserGroups = await UserGroupsWrapperActions.getGroup(groupPk); + + window.log.debug('initializeLibSessionUtilWrappers initing from dump', variant); + // TODO we need to fetch the admin key here if we have it, maybe from the usergroup wrapper? + await MetaGroupWrapperActions.init(groupPk, { + groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd25519Pubkey, 32), + groupEd25519Secretkey: foundInUserGroups?.secretKey || null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(ed25519KeyPairBytes.privKeyBytes, 64), + metaDumped: dump.data, + }); + } catch (e) { + // TODO should not throw in this case? we should probably just try to load what we manage to load + window.log.warn(`initGroup of Group wrapper of variant ${variant} failed with ${e.message} `); + // throw new Error(`initializeLibSessionUtilWrappers failed with ${e.message}`); + } + } } async function pendingChangesForPubkey(pubkey: string): Promise> { @@ -119,6 +168,10 @@ async function pendingChangesForPubkey(pubkey: string): Promise; +}; + +export const initialGroupInfosState: GroupInfosState = { + infos: {}, +}; + +const updateGroupInfoInWrapper = createAsyncThunk( + 'groupInfos/updateGroupInfoInWrapper', + async ({ + id, + data, + }: { + id: GroupPubkeyType; + data: GroupInfoShared; + }): Promise => { + // TODO this will throw if the wrapper is not init yet... how to make sure it does exist? + const infos = await MetaGroupWrapperActions.infoSet(id, data); + return { id, ...infos }; + } +); + +const initNewGroupInfoInWrapper = createAsyncThunk( + 'groupInfos/initNewGroupInfoInWrapper', + async (groupDetails: { + groupName: string; + members: Array; + }): Promise => { + try { + const newGroup = await UserGroupsWrapperActions.createGroup(); + const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); + if (!ourEd25519KeypairBytes) { + throw new Error('Current user has no priv ed25519 key?'); + } + const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes; + const groupEd2519Pk = HexString.fromHexString(newGroup.pubkeyHex).slice(1); // remove the 03 prefix (single byte once in hex form) + + // dump is always empty when creating a new groupInfo + await MetaGroupWrapperActions.init(newGroup.pubkeyHex, { + metaDumped: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), + groupEd25519Secretkey: newGroup.secretKey, + groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), + }); + + const infos = await MetaGroupWrapperActions.infoGet(newGroup.pubkeyHex); + if (!infos) { + throw new Error( + `getInfos of ${newGroup.pubkeyHex} returned empty result even if it was just init.` + ); + } + + const convo = await getConversationController().getOrCreateAndWait( + newGroup.pubkeyHex, + ConversationTypeEnum.GROUPV3 + ); + + await convo.setIsApproved(true, false); + + console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?'); + + const us = UserUtils.getOurPubKeyStrFromCache(); + const setOfMembers = new Set(...groupDetails.members); + // Ensure the current user is a member + setOfMembers.add(us); + + const updateGroupDetails: ClosedGroup.GroupInfo = { + id: newGroup.pubkeyHex, + name: groupDetails.groupName, + members: [...setOfMembers], + admins: [us], + activeAt: Date.now(), + expireTimer: 0, + }; + + // we don't want the initial "AAA and You joined the group" + + // be sure to call this before sending the message. + // the sending pipeline needs to know from GroupUtils when a message is for a medium group + await ClosedGroup.updateOrCreateClosedGroup(updateGroupDetails); + await convo.commit(); + convo.updateLastMessage(); + + return { id: newGroup.pubkeyHex, ...infos }; + } catch (e) { + throw e; + } + } +); + +/** + * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. + */ +const groupInfosSlice = createSlice({ + name: 'groupInfos', + initialState: initialGroupInfosState, + reducers: { + updateGroupInfosFromMergeResults(state, action: PayloadAction>) { + // anything not in the results should not be in the state here + state.infos = {}; + action.payload.forEach(infos => { + state.infos[infos.id] = infos; + }); + return state; + }, + }, + extraReducers: builder => { + builder.addCase(updateGroupInfoInWrapper.fulfilled, (state, action) => { + state.infos[action.payload.id] = action.payload; + }); + builder.addCase(initNewGroupInfoInWrapper.fulfilled, (state, action) => { + state.infos[action.payload.id] = action.payload; + }); + builder.addCase(updateGroupInfoInWrapper.rejected, () => { + window.log.error('a updateGroupInfoInWrapper was rejected'); + }); + builder.addCase(initNewGroupInfoInWrapper.rejected, () => { + window.log.error('a initNewGroupInfoInWrapper was rejected'); + }); + }, +}); + +export const groupInfoActions = { + initNewGroupInfoInWrapper, + updateGroupInfoInWrapper, + ...groupInfosSlice.actions, +}; +export const groupInfosReducer = groupInfosSlice.reducer; diff --git a/ts/state/reducer.ts b/ts/state/reducer.ts index c6db627a70..0ddaf641a2 100644 --- a/ts/state/reducer.ts +++ b/ts/state/reducer.ts @@ -20,6 +20,7 @@ import { } from './ducks/stagedAttachments'; import { PrimaryColorStateType, ThemeStateType } from '../themes/constants/colors'; import { settingsReducer, SettingsState } from './ducks/settings'; +import { groupInfosReducer, GroupInfosState } from './ducks/groupInfos'; export type StateType = { search: SearchStateType; @@ -37,6 +38,7 @@ export type StateType = { call: CallStateType; sogsRoomInfo: SogsRoomInfoState; settings: SettingsState; + groupInfos: GroupInfosState; }; export const reducers = { @@ -55,6 +57,7 @@ export const reducers = { call, sogsRoomInfo: ReduxSogsRoomInfos.sogsRoomInfoReducer, settings: settingsReducer, + groupInfos: groupInfosReducer, }; // Making this work would require that our reducer signature supported AnyAction, not diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 35cd5c396e..39756b6a2c 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -1,7 +1,12 @@ /* eslint-disable import/extensions */ /* eslint-disable import/no-unresolved */ // eslint-disable-next-line camelcase -import { ContactInfoSet, LegacyGroupInfo, LegacyGroupMemberInfo } from 'libsession_util_nodejs'; +import { + ContactInfoSet, + FixedSizeUint8Array, + LegacyGroupInfo, + LegacyGroupMemberInfo, +} from 'libsession_util_nodejs'; import { from_hex } from 'libsodium-wrappers-sumo'; import { isArray, isEmpty, isEqual } from 'lodash'; import { OpenGroupV2Room } from '../data/opengroups'; @@ -265,3 +270,13 @@ export function capabilitiesListHasBlindEnabled(caps?: Array | null) { export function roomHasReactionsEnabled(openGroup?: OpenGroupV2Room) { return Boolean(openGroup?.capabilities?.includes('reactions')); } + +export function toFixedUint8ArrayOfLength( + data: Uint8Array, + length: T +): FixedSizeUint8Array { + if (data.length === length) return (data as any) as FixedSizeUint8Array; + throw new Error( + `toFixedUint8ArrayOfLength invalid. Expected length ${length} but got: ${data.length}` + ); +} diff --git a/ts/webworker/workers/browser/libsession_worker_functions.d.ts b/ts/webworker/workers/browser/libsession_worker_functions.d.ts deleted file mode 100644 index 4cb0048163..0000000000 --- a/ts/webworker/workers/browser/libsession_worker_functions.d.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { - BaseConfigActions, - ContactsConfigActionsType, - UserConfigActionsType, - UserGroupsConfigActionsType, - ConvoInfoVolatileConfigActionsType, -} from 'libsession_util_nodejs'; - -// we can only have one of those wrapper for our current user (but we can have a few configs for it to be merged into one) -type UserConfig = 'UserConfig'; -type ContactsConfig = 'ContactsConfig'; -type UserGroupsConfig = 'UserGroupsConfig'; -type ConvoInfoVolatileConfig = 'ConvoInfoVolatileConfig'; - -export type ConfigWrapperObjectTypes = - | UserConfig - | ContactsConfig - | UserGroupsConfig - | ConvoInfoVolatileConfig; - -type UserConfigFunctions = - | [UserConfig, ...BaseConfigActions] - | [UserConfig, ...UserConfigActionsType]; -type ContactsConfigFunctions = - | [ContactsConfig, ...BaseConfigActions] - | [ContactsConfig, ...ContactsConfigActionsType]; -type UserGroupsConfigFunctions = - | [UserGroupsConfig, ...BaseConfigActions] - | [UserGroupsConfig, ...UserGroupsConfigActionsType]; -type ConvoInfoVolatileConfigFunctions = - | [ConvoInfoVolatileConfig, ...BaseConfigActions] - | [ConvoInfoVolatileConfig, ...ConvoInfoVolatileConfigActionsType]; - -export type LibSessionWorkerFunctions = - | UserConfigFunctions - | ContactsConfigFunctions - | UserGroupsConfigFunctions - | ConvoInfoVolatileConfigFunctions; diff --git a/ts/webworker/workers/browser/libsession_worker_functions.ts b/ts/webworker/workers/browser/libsession_worker_functions.ts new file mode 100644 index 0000000000..d2301c631c --- /dev/null +++ b/ts/webworker/workers/browser/libsession_worker_functions.ts @@ -0,0 +1,81 @@ +import { + BaseConfigActions, + ContactsConfigActionsType, + ConvoInfoVolatileConfigActionsType, + GroupPubkeyType, + MetaGroupActionsType, + UserConfigActionsType, + UserGroupsConfigActionsType, +} from 'libsession_util_nodejs'; + +// we can only have one of those wrapper for our current user (but we can have a few configs for it to be merged into one) +export type UserConfig = 'UserConfig'; +export type ContactsConfig = 'ContactsConfig'; +export type UserGroupsConfig = 'UserGroupsConfig'; +export type ConvoInfoVolatileConfig = 'ConvoInfoVolatileConfig'; + +export const MetaGroupConfigValue = 'MetaGroupConfig-'; +type MetaGroupConfigType = typeof MetaGroupConfigValue; +export type MetaGroupConfig = `${MetaGroupConfigType}${GroupPubkeyType}`; + + +export type ConfigWrapperUser = + | UserConfig + | ContactsConfig + | UserGroupsConfig + | ConvoInfoVolatileConfig; + + +export type ConfigWrapperGroup = MetaGroupConfig; + +export type ConfigWrapperObjectTypes = + | ConfigWrapperUser + | ConfigWrapperGroup; + +type UserConfigFunctions = + | [UserConfig, ...BaseConfigActions] + | [UserConfig, ...UserConfigActionsType]; +type ContactsConfigFunctions = + | [ContactsConfig, ...BaseConfigActions] + | [ContactsConfig, ...ContactsConfigActionsType]; +type UserGroupsConfigFunctions = + | [UserGroupsConfig, ...BaseConfigActions] + | [UserGroupsConfig, ...UserGroupsConfigActionsType]; +type ConvoInfoVolatileConfigFunctions = + | [ConvoInfoVolatileConfig, ...BaseConfigActions] + | [ConvoInfoVolatileConfig, ...ConvoInfoVolatileConfigActionsType]; + +// Group-related calls +type MetaGroupFunctions = + | [MetaGroupConfig, ...MetaGroupActionsType] + + +export type LibSessionWorkerFunctions = + | UserConfigFunctions + | ContactsConfigFunctions + | UserGroupsConfigFunctions + | ConvoInfoVolatileConfigFunctions + | MetaGroupFunctions; + +export function isUserConfigWrapperType(config: ConfigWrapperObjectTypes): config is ConfigWrapperUser { + return ( + config === 'ContactsConfig' || + config === 'UserConfig' || + config === 'ConvoInfoVolatileConfig' || + config === 'UserGroupsConfig' + ); +} + +export function isMetaWrapperType(config: ConfigWrapperObjectTypes): config is MetaGroupConfig { + return config.startsWith(MetaGroupConfigValue); +} + + +export function getGroupPubkeyFromWrapperType(type: ConfigWrapperGroup): GroupPubkeyType { + if (!type.startsWith(MetaGroupConfigValue + '03')) { + throw new Error(`not a metagroup variant: ${type}`) + } + return type.substring(type.indexOf('-03') + 1) as GroupPubkeyType; // typescript is not yet smart enough +} + + diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 6ae6f734eb..b8e2454b33 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -1,19 +1,24 @@ /* eslint-disable import/extensions */ /* eslint-disable import/no-unresolved */ -import { join } from 'path'; import { - BaseWrapperActionsCalls, + GroupWrapperConstructor, ContactInfoSet, ContactsWrapperActionsCalls, ConvoInfoVolatileWrapperActionsCalls, + GenericWrapperActionsCall, + GroupInfoSet, + GroupPubkeyType, LegacyGroupInfo, + MetaGroupWrapperActionsCalls, + ProfilePicture, UserConfigWrapperActionsCalls, UserGroupsWrapperActionsCalls, } from 'libsession_util_nodejs'; +import { join } from 'path'; import { getAppRootPath } from '../../../node/getRootPath'; import { WorkerInterface } from '../../worker_interface'; -import { ConfigWrapperObjectTypes, LibSessionWorkerFunctions } from './libsession_worker_functions'; +import { ConfigWrapperUser, LibSessionWorkerFunctions } from './libsession_worker_functions'; let libsessionWorkerInterface: WorkerInterface | undefined; @@ -30,56 +35,68 @@ const internalCallLibSessionWorker = async ([ 'workers', 'node', 'libsession', - 'libsession.worker.js' + 'libsession.worker.compiled.js' ); libsessionWorkerInterface = new WorkerInterface(libsessionWorkerPath, 1 * 60 * 1000); } - return libsessionWorkerInterface?.callWorker(config, fnName, ...args); + const result = libsessionWorkerInterface?.callWorker(config, fnName, ...args); + + return result; }; -export const GenericWrapperActions = { - init: async ( - wrapperId: ConfigWrapperObjectTypes, +type GenericWrapperActionsCalls = { + init: ( + wrapperId: ConfigWrapperUser, ed25519Key: Uint8Array, dump: Uint8Array | null - ) => - /** base wrapper generic actions */ - callLibSessionWorker([wrapperId, 'init', ed25519Key, dump]) as Promise, - confirmPushed: async (wrapperId: ConfigWrapperObjectTypes, seqno: number, hash: string) => - callLibSessionWorker([wrapperId, 'confirmPushed', seqno, hash]) as ReturnType< - BaseWrapperActionsCalls['confirmPushed'] - >, - dump: async (wrapperId: ConfigWrapperObjectTypes) => - callLibSessionWorker([wrapperId, 'dump']) as Promise< - ReturnType + ) => Promise; + confirmPushed: GenericWrapperActionsCall; + dump: GenericWrapperActionsCall; + merge: GenericWrapperActionsCall; + needsDump: GenericWrapperActionsCall; + needsPush: GenericWrapperActionsCall; + push: GenericWrapperActionsCall; + storageNamespace: GenericWrapperActionsCall; + currentHashes: GenericWrapperActionsCall; +}; + +// TODO rename this to a UserWrapperActions or UserGenericWrapperActions as those actions are only used for User Wrappers now +export const GenericWrapperActions: GenericWrapperActionsCalls = { + /** base wrapper generic actions */ + + init: async (wrapperId: ConfigWrapperUser, ed25519Key: Uint8Array, dump: Uint8Array | null) => + callLibSessionWorker([wrapperId, 'init', ed25519Key, dump]) as ReturnType< + GenericWrapperActionsCalls['init'] >, - merge: async ( - wrapperId: ConfigWrapperObjectTypes, - toMerge: Array<{ hash: string; data: Uint8Array }> - ) => - callLibSessionWorker([wrapperId, 'merge', toMerge]) as Promise< - ReturnType + + confirmPushed: async (wrapperId: ConfigWrapperUser, seqno: number, hash: string) => + callLibSessionWorker([wrapperId, 'confirmPushed', seqno, hash]) as ReturnType< + GenericWrapperActionsCalls['confirmPushed'] >, - needsDump: async (wrapperId: ConfigWrapperObjectTypes) => - callLibSessionWorker([wrapperId, 'needsDump']) as Promise< - ReturnType + dump: async (wrapperId: ConfigWrapperUser) => + callLibSessionWorker([wrapperId, 'dump']) as ReturnType, + merge: async (wrapperId: ConfigWrapperUser, toMerge: Array<{ hash: string; data: Uint8Array }>) => + callLibSessionWorker([wrapperId, 'merge', toMerge]) as ReturnType< + GenericWrapperActionsCalls['merge'] >, - needsPush: async (wrapperId: ConfigWrapperObjectTypes) => - callLibSessionWorker([wrapperId, 'needsPush']) as Promise< - ReturnType + needsDump: async (wrapperId: ConfigWrapperUser) => + callLibSessionWorker([wrapperId, 'needsDump']) as ReturnType< + GenericWrapperActionsCalls['needsDump'] >, - push: async (wrapperId: ConfigWrapperObjectTypes) => - callLibSessionWorker([wrapperId, 'push']) as Promise< - ReturnType + needsPush: async (wrapperId: ConfigWrapperUser) => + callLibSessionWorker([wrapperId, 'needsPush']) as ReturnType< + GenericWrapperActionsCalls['needsPush'] >, - storageNamespace: async (wrapperId: ConfigWrapperObjectTypes) => - callLibSessionWorker([wrapperId, 'storageNamespace']) as Promise< - ReturnType + push: async (wrapperId: ConfigWrapperUser) => + callLibSessionWorker([wrapperId, 'push']) as ReturnType, + storageNamespace: async (wrapperId: ConfigWrapperUser) => + callLibSessionWorker([wrapperId, 'storageNamespace']) as ReturnType< + GenericWrapperActionsCalls['storageNamespace'] >, - currentHashes: async (wrapperId: ConfigWrapperObjectTypes) => - callLibSessionWorker([wrapperId, 'currentHashes']) as Promise< - ReturnType + currentHashes: async (wrapperId: ConfigWrapperUser) => + callLibSessionWorker([wrapperId, 'currentHashes']) as ReturnType< + GenericWrapperActionsCalls['currentHashes'] >, }; @@ -237,6 +254,16 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = { callLibSessionWorker(['UserGroupsConfig', 'eraseLegacyGroup', pubkeyHex]) as Promise< ReturnType >, + + createGroup: async () => + callLibSessionWorker(['UserGroupsConfig', 'createGroup']) as Promise< + ReturnType + >, + + getGroup: async (pubkeyHex: GroupPubkeyType) => + callLibSessionWorker(['UserGroupsConfig', 'getGroup', pubkeyHex]) as Promise< + ReturnType + >, }; export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCalls = { @@ -333,6 +360,144 @@ export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCal ]) as Promise>, }; +export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { + /** Shared actions */ + init: async (groupPk: GroupPubkeyType, options: GroupWrapperConstructor) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'init', options]) as Promise< + ReturnType + >, + needsPush: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'needsPush']) as Promise< + ReturnType + >, + push: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'push']) as Promise< + ReturnType + >, + needsDump: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'needsDump']) as Promise< + ReturnType + >, + metaDump: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'metaDump']) as Promise< + ReturnType + >, + + /** GroupInfo wrapper specific actions */ + infoGet: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'infoGet']) as Promise< + ReturnType + >, + infoSet: async (groupPk: GroupPubkeyType, infos: GroupInfoSet) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'infoSet', infos]) as Promise< + ReturnType + >, + infoDestroy: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'infoDestroy']) as Promise< + ReturnType + >, + + /** GroupMembers wrapper specific actions */ + memberGet: async (groupPk: GroupPubkeyType, pubkeyHex: string) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberGet', pubkeyHex]) as Promise< + ReturnType + >, + memberGetOrConstruct: async (groupPk: GroupPubkeyType, pubkeyHex: string) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberGetOrConstruct', + pubkeyHex, + ]) as Promise>, + memberGetAll: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberGetAll']) as Promise< + ReturnType + >, + memberErase: async (groupPk: GroupPubkeyType, pubkeyHex: string) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberErase', pubkeyHex]) as Promise< + ReturnType + >, + memberSetAccepted: async (groupPk: GroupPubkeyType, pubkeyHex: string) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberSetAccepted', pubkeyHex]) as Promise< + ReturnType + >, + memberSetPromoted: async (groupPk: GroupPubkeyType, pubkeyHex: string, failed: boolean) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberSetPromoted', + pubkeyHex, + failed, + ]) as Promise>, + memberSetInvited: async (groupPk: GroupPubkeyType, pubkeyHex: string, failed: boolean) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberSetInvited', + pubkeyHex, + failed, + ]) as Promise>, + memberSetName: async (groupPk: GroupPubkeyType, pubkeyHex: string, name: string) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberSetName', + pubkeyHex, + name, + ]) as Promise>, + memberSetProfilePicture: async ( + groupPk: GroupPubkeyType, + pubkeyHex: string, + profilePicture: ProfilePicture + ) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberSetProfilePicture', + pubkeyHex, + profilePicture, + ]) as Promise>, + + /** GroupKeys wrapper specific actions */ + + keyRekey: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'keyRekey']) as Promise< + ReturnType + >, + keysNeedsRekey: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'keysNeedsRekey']) as Promise< + ReturnType + >, + groupKeys: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'groupKeys']) as Promise< + ReturnType + >, + currentHashes: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'currentHashes']) as Promise< + ReturnType + >, + + loadKeyMessage: async ( + groupPk: GroupPubkeyType, + hash: string, + data: Uint8Array, + timestampMs: number + ) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'loadKeyMessage', + hash, + data, + timestampMs, + ]) as Promise>, + encryptMessage: async (groupPk: GroupPubkeyType, plaintext: Uint8Array, compress: boolean) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'encryptMessage', + plaintext, + compress, + ]) as Promise>, + decryptMessage: async (groupPk: GroupPubkeyType, ciphertext: Uint8Array) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'decryptMessage', ciphertext]) as Promise< + ReturnType + >, +}; + export const callLibSessionWorker = async ( callToMake: LibSessionWorkerFunctions ): Promise => { diff --git a/ts/webworker/workers/browser/util_worker_interface.ts b/ts/webworker/workers/browser/util_worker_interface.ts index cafef5cd94..f2fb842a38 100644 --- a/ts/webworker/workers/browser/util_worker_interface.ts +++ b/ts/webworker/workers/browser/util_worker_interface.ts @@ -25,7 +25,7 @@ const internalCallUtilsWorker = async ( 'workers', 'node', 'util', - 'util.worker.js' + 'util.worker.compiled.js' ); utilWorkerInterface = new WorkerInterface(utilWorkerPath, 3 * 60 * 1000); } diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index 75100a511a..1c0ad1f1b2 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -1,15 +1,25 @@ /* eslint-disable consistent-return */ /* eslint-disable no-case-declarations */ -import { isEmpty, isNull } from 'lodash'; import { BaseConfigWrapperNode, ContactsConfigWrapperNode, ConvoInfoVolatileWrapperNode, + GroupPubkeyType, + GroupWrapperConstructor, + MetaGroupWrapperNode, UserConfigWrapperNode, UserGroupsWrapperNode, } from 'libsession_util_nodejs'; -// eslint-disable-next-line import/no-unresolved, import/extensions -import { ConfigWrapperObjectTypes } from '../../browser/libsession_worker_functions'; +import { isEmpty, isNull } from 'lodash'; + +import { + ConfigWrapperGroup, + ConfigWrapperObjectTypes, + ConfigWrapperUser, + MetaGroupConfig, + isMetaWrapperType, + isUserConfigWrapperType, +} from '../../browser/libsession_worker_functions'; /* eslint-disable no-console */ /* eslint-disable strict */ @@ -29,7 +39,9 @@ let contactsConfigWrapper: ContactsConfigWrapperNode | undefined; let userGroupsConfigWrapper: UserGroupsWrapperNode | undefined; let convoInfoVolatileConfigWrapper: ConvoInfoVolatileWrapperNode | undefined; -function getUserWrapper(type: ConfigWrapperObjectTypes): BaseConfigWrapperNode | undefined { +const metaGroupWrappers: Map = new Map(); + +function getUserWrapper(type: ConfigWrapperUser): BaseConfigWrapperNode | undefined { switch (type) { case 'UserConfig': return userProfileWrapper; @@ -44,45 +56,84 @@ function getUserWrapper(type: ConfigWrapperObjectTypes): BaseConfigWrapperNode | } } -function getCorrespondingWrapper(wrapperType: ConfigWrapperObjectTypes): BaseConfigWrapperNode { - switch (wrapperType) { - case 'UserConfig': - case 'ContactsConfig': - case 'UserGroupsConfig': - case 'ConvoInfoVolatileConfig': - const wrapper = getUserWrapper(wrapperType); - if (!wrapper) { - throw new Error(`${wrapperType} is not init yet`); - } - return wrapper; - default: - assertUnreachable( - wrapperType, - `getCorrespondingWrapper: Missing case error "${wrapperType}"` - ); +function getGroupPubkeyFromWrapperType(type: ConfigWrapperGroup): GroupPubkeyType { + assertGroupWrapperType(type); + return type.substring(type.indexOf('-03') + 1) as GroupPubkeyType; // typescript is not yet smart enough +} + +function getGroupWrapper(type: ConfigWrapperGroup): MetaGroupWrapperNode | undefined { + assertGroupWrapperType(type); + + if (isMetaWrapperType(type)) { + const pk = getGroupPubkeyFromWrapperType(type); + return metaGroupWrappers.get(pk); } + + assertUnreachable(type, `getGroupWrapper: Missing case error "${type}"`); +} + +function getCorrespondingUserWrapper(wrapperType: ConfigWrapperUser): BaseConfigWrapperNode { + if (isUserConfigWrapperType(wrapperType)) { + switch (wrapperType) { + case 'UserConfig': + case 'ContactsConfig': + case 'UserGroupsConfig': + case 'ConvoInfoVolatileConfig': + const wrapper = getUserWrapper(wrapperType); + if (!wrapper) { + throw new Error(`UserWrapper: ${wrapperType} is not init yet`); + } + return wrapper; + default: + assertUnreachable( + wrapperType, + `getCorrespondingUserWrapper: Missing case error "${wrapperType}"` + ); + } + } + + assertUnreachable( + wrapperType, + `getCorrespondingUserWrapper missing global handling for "${wrapperType}"` + ); +} + +function getCorrespondingGroupWrapper(wrapperType: MetaGroupConfig): MetaGroupWrapperNode { + if (isMetaWrapperType(wrapperType)) { + const wrapper = getGroupWrapper(wrapperType); + if (!wrapper) { + throw new Error(`GroupWrapper: ${wrapperType} is not init yet`); + } + return wrapper; + } + assertUnreachable( + wrapperType, + `getCorrespondingGroupWrapper missing global handling for "${wrapperType}"` + ); } function isUInt8Array(value: any) { return value.constructor === Uint8Array; } -function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): ConfigWrapperObjectTypes { - if ( - wrapperType !== 'ContactsConfig' && - wrapperType !== 'UserConfig' && - wrapperType !== 'UserGroupsConfig' && - wrapperType !== 'ConvoInfoVolatileConfig' - ) { +function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): ConfigWrapperUser { + if (!isUserConfigWrapperType(wrapperType)) { throw new Error(`wrapperType "${wrapperType} is not of type User"`); } return wrapperType; } +function assertGroupWrapperType(wrapperType: ConfigWrapperObjectTypes): ConfigWrapperGroup { + if (!isMetaWrapperType(wrapperType)) { + throw new Error(`wrapperType "${wrapperType} is not of type Group"`); + } + return wrapperType; +} + /** * This function can be used to initialize a wrapper which takes the private ed25519 key of the user and a dump as argument. */ -function initUserWrapper(options: Array, wrapperType: ConfigWrapperObjectTypes) { +function initUserWrapper(options: Array, wrapperType: ConfigWrapperUser) { const userType = assertUserWrapperType(wrapperType); const wrapper = getUserWrapper(wrapperType); @@ -119,16 +170,69 @@ function initUserWrapper(options: Array, wrapperType: ConfigWrapperObjectTy } } +/** + * This function can be used to initialize a group wrapper + */ +function initGroupWrapper(options: Array, wrapperType: ConfigWrapperGroup) { + const groupType = assertGroupWrapperType(wrapperType); + + const wrapper = getGroupWrapper(wrapperType); + if (wrapper) { + throw new Error(`group: "${wrapperType}" already init`); + } + + if (options.length !== 1) { + throw new Error(`group: "${wrapperType}" init needs 1 arguments`); + } + // we need all the fields defined in GroupWrapperConstructor, but the function in the wrapper will throw if we don't forward what's needed + + const { + groupEd25519Pubkey, + groupEd25519Secretkey, + metaDumped, + userEd25519Secretkey, + }: GroupWrapperConstructor = options[0]; + + if (isMetaWrapperType(groupType)) { + const pk = getGroupPubkeyFromWrapperType(groupType); + const wrapper = new MetaGroupWrapperNode({ + groupEd25519Pubkey, + groupEd25519Secretkey, + metaDumped, + userEd25519Secretkey, + }); + + metaGroupWrappers.set(pk, wrapper); + return; + } + assertUnreachable(groupType, `initGroupWrapper: Missing case error "${groupType}"`); +} + onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any] }) => { const [jobId, config, action, ...args] = e.data; try { if (action === 'init') { - initUserWrapper(args, config); - postMessage([jobId, null, null]); - return; + if (isUserConfigWrapperType(config)) { + initUserWrapper(args, config); + postMessage([jobId, null, null]); + return; + } else if (isMetaWrapperType(config)) { + initGroupWrapper(args, config); + postMessage([jobId, null, null]); + return; + } + throw new Error('Unhandled init wrapper type:' + config); + } + + const wrapper = isUserConfigWrapperType(config) + ? getCorrespondingUserWrapper(config) + : isMetaWrapperType(config) + ? getCorrespondingGroupWrapper(config) + : undefined; + if (!wrapper) { + throw new Error(`did not find an already built wrapper for config: "${config}"`); } - const wrapper = getCorrespondingWrapper(config); const fn = (wrapper as any)[action]; if (!fn) { diff --git a/tsconfig.json b/tsconfig.json index a47a46a27f..c281241691 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,8 +26,11 @@ "moduleResolution": "node", // Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). "resolveJsonModule": true, // Module Resolution Options - // "baseUrl": "./", // Base directory to resolve non-absolute module names. - // "paths": {}, // A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. + // "baseUrl": "./", // Base directory to resolve non-absolute module names. + // "paths": { + // // A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. + // "@/ducks": ["ts/state/ducks/"] + // }, // "rootDirs": [], // List of root folders whose combined content represents the structure of the project at runtime. // "typeRoots": [], // List of folders to include type definitions from. // "types": [], // Type declaration files to be included in compilation. diff --git a/utils.worker.config.js b/utils.worker.config.js index 001dddb400..284dca0f56 100644 --- a/utils.worker.config.js +++ b/utils.worker.config.js @@ -22,7 +22,7 @@ module.exports = { }, }, output: { - filename: 'util.worker.js', + filename: 'util.worker.compiled.js', path: path.resolve(__dirname, 'ts', 'webworker', 'workers', 'node', 'util'), }, target: 'node', From f23c52557b6e7cef4119bbb19bf367e786ffcf71 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 7 Sep 2023 16:21:36 +1000 Subject: [PATCH 004/302] feat: add protobuf changes for new groups --- protos/SignalService.proto | 124 ++++++++++++------ .../browser/libsession_worker_interface.ts | 16 +++ 2 files changed, 102 insertions(+), 38 deletions(-) diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 4bbb80a835..cf1db982df 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -44,9 +44,9 @@ message SharedConfigMessage { CONTACTS = 2; CONVO_INFO_VOLATILE = 3; USER_GROUPS = 4; - // CLOSED_GROUP_INFO = 5; - // CLOSED_GROUP_MEMBERS = 6; - // ENCRYPTION_KEYS = 7; + GROUP_INFO = 5; + GROUP_MEMBERS = 6; + GROUP_KEYS = 7; } required Kind kind = 1; @@ -85,41 +85,90 @@ message DataExtractionNotification { optional uint64 timestamp = 2; } -// message GroupInviteMessage { -// required string name = 1; -// required bytes memberPrivateKey = 2; -// } - -// this will replace our closedGroupControlMessage but we will need to keep both for some time -// message GroupMessage { - // optional GroupAdminMessage adminMessage = 31; - // optional GroupMemberLeftMessage memberLeftMessage = 32; - // optional GroupInviteMessage inviteMessage = 33; - // optional GroupPromoteMessage promoteMessage = 34; -// } - -// message GroupPromoteMessage { - // required bytes privateKey = 1; // this is the group admins key -// } - -// message GroupAdminMessage { - // enum Type { - // DELETE_GROUP = 1; // members, groupSignature - // DELETE_GROUP_ALL_MEMBERS = 2; // groupSignature - // DELETE_MESSAGES_ALL_MEMBERS = 3; // groupSignature - // DELETE_ATTACHMENTS_ALL_MEMBERS = 4; // groupSignature - // } -// - // // @required - // required Type type = 1; - // repeated bytes members = 2; +message GroupUpdateInviteMessage { // @required - // required bytes groupSignature = 3; // used by every members to make sure incoming admin action can be trusted -// } + required bytes groupIdentityPublicKey = 1; + // @required + required string name = 2; + // @required + required bytes memberSubkey = 3; + // @required + required bytes memberTag = 4; + optional bytes profileKey = 5; + optional LokiProfile profile = 6; +} + +message GroupUpdateDeleteMessage { + // @required + required bytes groupIdentityPublicKey = 1; + // @required + required bytes encryptedMemberSubkey = 2; +} + +message GroupUpdateInfoChangeMessage { + enum Type { + NAME = 1; + AVATAR = 2; + DISAPPEARING_MESSAGES = 3; + } + + // @required + required Type type = 1; + optional string updatedName = 2; + optional uint32 updatedExpiration = 3; +} + +message GroupUpdateMemberChangeMessage { + enum Type { + ADDED = 1; + REMOVED = 2; + PROMOTED = 3; + } + + // @required + required Type type = 1; + repeated bytes memberPublicKeys = 2; +} + +message GroupUpdatePromoteMessage { + // @required + required bytes memberPublicKey = 1; + // @required + required bytes encryptedGroupIdentityPrivateKey = 2; +} + +message GroupUpdateMemberLeftMessage { + // the pubkey of the member left is included as part of the closed group encryption logic (senderIdentity on desktop) +} + +message GroupUpdateInviteResponseMessage { + // @required + required bool isApproved = 1; // Whether the request was approved + optional bytes profileKey = 2; + optional LokiProfile profile = 3; +} + +message GroupUpdatePromotionResponseMessage { + // @required + required bytes encryptedMemberPublicKey = 1; +} + +message GroupUpdateDeleteMemberContentMessage { + repeated bytes memberPublicKeys = 2; +} + +message GroupUpdateMessage { + optional GroupUpdateInviteMessage inviteMessage = 31; + optional GroupUpdateDeleteMessage deleteMessage = 32; + optional GroupUpdateInfoChangeMessage infoChangeMessage = 33; + optional GroupUpdateMemberChangeMessage memberChangeMessage = 34; + optional GroupUpdatePromoteMessage promoteMessage = 35; + optional GroupUpdateMemberLeftMessage memberLeftMessage = 36; + optional GroupUpdateInviteResponseMessage inviteResponse = 37; + optional GroupUpdatePromotionResponseMessage promotionResponse = 38; + optional GroupUpdateDeleteMemberContentMessage deleteMemberContent = 39; +} -// message GroupMemberLeftMessage { - // the pubkey of the member who left is already in the senderIdentity -// } message DataMessage { @@ -225,8 +274,7 @@ message DataMessage { optional ClosedGroupControlMessage closedGroupControlMessage = 104; optional string syncTarget = 105; optional bool blocksCommunityMessageRequests = 106; - // optional GroupMessage groupMessage = 120; -} + optional GroupUpdateMessage groupUpdateMessage = 120;} message CallMessage { diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index b8e2454b33..5d18b5fdb1 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -13,6 +13,7 @@ import { ProfilePicture, UserConfigWrapperActionsCalls, UserGroupsWrapperActionsCalls, + UserGroupsSet, } from 'libsession_util_nodejs'; import { join } from 'path'; @@ -264,6 +265,21 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = { callLibSessionWorker(['UserGroupsConfig', 'getGroup', pubkeyHex]) as Promise< ReturnType >, + + getAllGroups: async () => + callLibSessionWorker(['UserGroupsConfig', 'getAllGroups']) as Promise< + ReturnType + >, + + setGroup: async (info: UserGroupsSet) => + callLibSessionWorker(['UserGroupsConfig', 'setGroup', info]) as Promise< + ReturnType + >, + + eraseGroup: async (pubkeyHex: GroupPubkeyType) => + callLibSessionWorker(['UserGroupsConfig', 'eraseGroup', pubkeyHex]) as Promise< + ReturnType + >, }; export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCalls = { From a7acba82aef6edbd0ede8c3b6d85563dd849ab01 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 7 Sep 2023 16:22:58 +1000 Subject: [PATCH 005/302] chore: cleanup protobuf to spaces indent --- protos/SignalService.proto | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/protos/SignalService.proto b/protos/SignalService.proto index cf1db982df..adc5b7389b 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -94,7 +94,7 @@ message GroupUpdateInviteMessage { required bytes memberSubkey = 3; // @required required bytes memberTag = 4; - optional bytes profileKey = 5; + optional bytes profileKey = 5; optional LokiProfile profile = 6; } @@ -106,9 +106,9 @@ message GroupUpdateDeleteMessage { } message GroupUpdateInfoChangeMessage { - enum Type { + enum Type { NAME = 1; - AVATAR = 2; + AVATAR = 2; DISAPPEARING_MESSAGES = 3; } @@ -149,8 +149,8 @@ message GroupUpdateInviteResponseMessage { } message GroupUpdatePromotionResponseMessage { - // @required - required bytes encryptedMemberPublicKey = 1; + // @required + required bytes encryptedMemberPublicKey = 1; } message GroupUpdateDeleteMemberContentMessage { @@ -164,9 +164,9 @@ message GroupUpdateMessage { optional GroupUpdateMemberChangeMessage memberChangeMessage = 34; optional GroupUpdatePromoteMessage promoteMessage = 35; optional GroupUpdateMemberLeftMessage memberLeftMessage = 36; - optional GroupUpdateInviteResponseMessage inviteResponse = 37; - optional GroupUpdatePromotionResponseMessage promotionResponse = 38; - optional GroupUpdateDeleteMemberContentMessage deleteMemberContent = 39; + optional GroupUpdateInviteResponseMessage inviteResponse = 37; + optional GroupUpdatePromotionResponseMessage promotionResponse = 38; + optional GroupUpdateDeleteMemberContentMessage deleteMemberContent = 39; } From 8c3b6508adf9ba6714fee85dfdac89688fc858b5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 11 Sep 2023 13:50:33 +1000 Subject: [PATCH 006/302] fix: wip before removing info+members+keys from protobuf kinds --- ts/data/configDump/configDump.ts | 7 +- ts/node/sql_calls/config_dump.ts | 16 +- ts/receiver/closedGroups.ts | 4 +- ts/receiver/configMessage.ts | 396 +++--------------- ts/receiver/contentMessage.ts | 9 +- .../apis/snode_api/SnodeRequestTypes.ts | 7 +- ts/session/apis/snode_api/swarmPolling.ts | 128 +----- .../SwarmPollingConfigShared.ts | 63 +++ .../SwarmPollingGroupConfig.ts | 53 +++ .../SwarmPollingUserConfig.ts | 43 ++ .../controlMessage/SharedConfigMessage.ts | 38 +- ts/session/sending/MessageQueue.ts | 3 +- ts/session/utils/job_runners/JobRunner.ts | 3 + ts/session/utils/job_runners/PersistedJob.ts | 16 +- .../job_runners/jobs/ConfigurationSyncJob.ts | 26 +- .../utils/job_runners/jobs/GroupConfigJob.ts | 328 +++++++++++++++ .../utils/job_runners/jobs/JobRunnerType.ts | 1 + .../utils/libsession/libsession_utils.ts | 167 +++++--- ts/session/utils/sync/syncUtils.ts | 12 +- ts/state/ducks/groupInfos.ts | 10 +- .../receiving/ConfigurationMessage_test.ts | 97 ----- ts/types/ProtobufKind.ts | 32 ++ ts/types/sqlSharedTypes.ts | 7 +- ts/util/releaseFeature.ts | 6 + .../browser/libsession_worker_functions.ts | 13 +- .../browser/libsession_worker_interface.ts | 16 +- .../node/libsession/libsession.worker.ts | 8 +- 27 files changed, 853 insertions(+), 656 deletions(-) create mode 100644 ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts create mode 100644 ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts create mode 100644 ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts create mode 100644 ts/session/utils/job_runners/jobs/GroupConfigJob.ts delete mode 100644 ts/test/session/unit/receiving/ConfigurationMessage_test.ts create mode 100644 ts/types/ProtobufKind.ts diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts index 336cf401ab..7774373531 100644 --- a/ts/data/configDump/configDump.ts +++ b/ts/data/configDump/configDump.ts @@ -1,11 +1,11 @@ import { AsyncObjectWrapper, ConfigDumpDataNode, ConfigDumpRow } from '../../types/sqlSharedTypes'; // eslint-disable-next-line import/no-unresolved, import/extensions -import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions'; +import { ConfigWrapperObjectTypesMeta } from '../../webworker/workers/browser/libsession_worker_functions'; import { channels } from '../channels'; import { cleanData } from '../dataUtils'; export const ConfigDumpData: AsyncObjectWrapper = { - getByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, pubkey: string) => { + getByVariantAndPubkey: (variant: ConfigWrapperObjectTypesMeta, pubkey: string) => { return channels.getByVariantAndPubkey(variant, pubkey); }, saveConfigDump: (dump: ConfigDumpRow) => { @@ -17,4 +17,7 @@ export const ConfigDumpData: AsyncObjectWrapper = { getAllDumpsWithoutData: () => { return channels.getAllDumpsWithoutData(); }, + getAllDumpsWithoutDataFor: (pk: string) => { + return channels.getAllDumpsWithoutDataFor(pk); + }, }; diff --git a/ts/node/sql_calls/config_dump.ts b/ts/node/sql_calls/config_dump.ts index cfc9d97478..aa00f21e14 100644 --- a/ts/node/sql_calls/config_dump.ts +++ b/ts/node/sql_calls/config_dump.ts @@ -10,7 +10,7 @@ import { ConfigDumpRowWithoutData, } from '../../types/sqlSharedTypes'; // eslint-disable-next-line import/no-unresolved, import/extensions -import { ConfigWrapperObjectTypes } from '../../webworker/workers/browser/libsession_worker_functions'; +import { ConfigWrapperObjectTypesMeta } from '../../webworker/workers/browser/libsession_worker_functions'; import { assertGlobalInstance } from '../sqlInstance'; function parseRow( @@ -42,7 +42,7 @@ export function uniqCompacted(list: Array): Array { } export const configDumpData: ConfigDumpDataNode = { - getByVariantAndPubkey: (variant: ConfigWrapperObjectTypes, publicKey: string) => { + getByVariantAndPubkey: (variant: ConfigWrapperObjectTypesMeta, publicKey: string) => { const rows = assertGlobalInstance() .prepare( `SELECT publicKey, variant, data FROM ${CONFIG_DUMP_TABLE} WHERE variant = $variant AND publicKey = $publicKey;` @@ -83,6 +83,18 @@ export const configDumpData: ConfigDumpDataNode = { return compact(rows.map(parseRowNoData)); }, + getAllDumpsWithoutDataFor: (publicKey: string) => { + const rows = assertGlobalInstance() + .prepare(`SELECT variant, publicKey from ${CONFIG_DUMP_TABLE} WHERE publicKey=$publicKey;`) + .all({ publicKey }); + + if (!rows) { + return []; + } + + return compact(rows.map(parseRowNoData)); + }, + saveConfigDump: ({ data, publicKey, variant }: ConfigDumpRow) => { assertGlobalInstance() .prepare( diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index ccd5bdb015..8d5118d98b 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -22,10 +22,10 @@ import { perfEnd, perfStart } from '../session/utils/Performance'; import { ReleasedFeatures } from '../util/releaseFeature'; import { Storage } from '../util/storage'; // eslint-disable-next-line import/no-unresolved, import/extensions -import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions'; import { getSettingsKeyFromLibsessionWrapper } from './configMessage'; import { ECKeyPair, HexKeyPair } from './keypairs'; import { queueAllCachedFromSource } from './receiver'; +import { ConfigWrapperUser } from '../webworker/workers/browser/libsession_worker_functions'; export const distributingClosedGroupEncryptionKeyPairs = new Map(); @@ -216,7 +216,7 @@ function sanityCheckNewGroup( */ export async function sentAtMoreRecentThanWrapper( envelopeSentAtMs: number, - variant: ConfigWrapperObjectTypes + variant: ConfigWrapperUser ): Promise<'unknown' | 'wrapper_more_recent' | 'envelope_more_recent'> { const userConfigReleased = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); if (!userConfigReleased) { diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 5a20d93a77..f2d2091126 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -2,16 +2,11 @@ import { ContactInfo } from 'libsession_util_nodejs'; import { compact, difference, isEmpty, isNil, isNumber, toNumber } from 'lodash'; import { ConfigDumpData } from '../data/configDump/configDump'; -import { Data } from '../data/data'; import { SettingsKey } from '../data/settings-key'; -import { ConversationInteraction } from '../interactions'; +import { deleteAllMessagesByConvoIdNoConfirmation } from '../interactions/conversationInteractions'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../models/conversationAttributes'; import { SignalService } from '../protobuf'; import { ClosedGroup } from '../session'; -import { - joinOpenGroupV2WithUIEvents, - parseOpenGroupV2, -} from '../session/apis/open_group_api/opengroupV2/JoinOpenGroupV2'; import { getOpenGroupManager } from '../session/apis/open_group_api/opengroupV2/OpenGroupManagerV2'; import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; import { getOpenGroupV2ConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils'; @@ -23,7 +18,7 @@ import { PubKey } from '../session/types'; import { StringUtils, UserUtils } from '../session/utils'; import { toHex } from '../session/utils/String'; import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob'; -import { IncomingConfResult, LibSessionUtil } from '../session/utils/libsession/libsession_utils'; +import { LibSessionUtil } from '../session/utils/libsession/libsession_utils'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile'; import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups'; @@ -31,22 +26,15 @@ import { configurationMessageReceived, trigger } from '../shims/events'; import { getCurrentlySelectedConversationOutsideRedux } from '../state/selectors/conversations'; import { assertUnreachable } from '../types/sqlSharedTypes'; import { BlockedNumberController } from '../util'; -import { Registration } from '../util/registration'; -import { ReleasedFeatures } from '../util/releaseFeature'; -import { - Storage, - getLastProfileUpdateTimestamp, - isSignInByLinking, - setLastProfileUpdateTimestamp, -} from '../util/storage'; -import { deleteAllMessagesByConvoIdNoConfirmation } from '../interactions/conversationInteractions'; +import { Storage, setLastProfileUpdateTimestamp } from '../util/storage'; // eslint-disable-next-line import/no-unresolved, import/extensions import { - ConfigWrapperObjectTypes, + ConfigWrapperObjectTypesMeta, + ConfigWrapperUser, getGroupPubkeyFromWrapperType, - isMetaWrapperType, isUserConfigWrapperType, } from '../../ts/webworker/workers/browser/libsession_worker_functions'; +import { GroupConfigKind, UserConfigKind, isUserKind } from '../types/ProtobufKind'; import { ContactsWrapperActions, ConvoInfoVolatileWrapperActions, @@ -55,24 +43,36 @@ import { UserConfigWrapperActions, UserGroupsWrapperActions, } from '../webworker/workers/browser/libsession_worker_interface'; -import { removeFromCache } from './cache'; -import { addKeyPairToCacheAndDBIfNeeded, handleNewClosedGroup } from './closedGroups'; +import { addKeyPairToCacheAndDBIfNeeded } from './closedGroups'; import { HexKeyPair } from './keypairs'; import { queueAllCachedFromSource } from './receiver'; -import { EnvelopePlus } from './types'; -function groupByVariant( +type IncomingConfResult = { + needsPush: boolean; + needsDump: boolean; + kind: T; + publicKey: string; + latestEnvelopeTimestamp: number; +}; + +type IncomingUserResult = IncomingConfResult; +type IncomingGroupResult = IncomingConfResult; + +function byUserVariant( incomingConfigs: Array> ) { const groupedByVariant: Map< - ConfigWrapperObjectTypes, + ConfigWrapperUser, Array> > = new Map(); incomingConfigs.forEach(incomingConfig => { const { kind } = incomingConfig.message; + if (!isUserKind(kind)) { + throw new Error(`Invalid kind when handling userkinds: ${kind}`); + } - const wrapperId = LibSessionUtil.kindToVariant(kind); + const wrapperId = LibSessionUtil.userKindToVariant(kind); if (!groupedByVariant.has(wrapperId)) { groupedByVariant.set(wrapperId, []); @@ -83,7 +83,7 @@ function groupByVariant( return groupedByVariant; } -async function printDumpForDebug(prefix: string, variant: ConfigWrapperObjectTypes) { +async function printDumpForDebug(prefix: string, variant: ConfigWrapperObjectTypesMeta) { if (isUserConfigWrapperType(variant)) { window.log.info(prefix, StringUtils.toHex(await GenericWrapperActions.dump(variant))); return; @@ -95,26 +95,15 @@ async function printDumpForDebug(prefix: string, variant: ConfigWrapperObjectTyp window.log.info(prefix, StringUtils.toHex(metaGroupDumps)); } -async function variantNeedsDump(variant: ConfigWrapperObjectTypes) { - return isUserConfigWrapperType(variant) - ? await GenericWrapperActions.needsDump(variant) - : await MetaGroupWrapperActions.needsDump(getGroupPubkeyFromWrapperType(variant)); -} -async function variantNeedsPush(variant: ConfigWrapperObjectTypes) { - return isUserConfigWrapperType(variant) - ? await GenericWrapperActions.needsPush(variant) - : await MetaGroupWrapperActions.needsPush(getGroupPubkeyFromWrapperType(variant)); -} - -async function mergeConfigsWithIncomingUpdates( +async function mergeUserConfigsWithIncomingUpdates( incomingConfigs: Array> -): Promise> { +): Promise> { // first, group by variant so we do a single merge call - const groupedByVariant = groupByVariant(incomingConfigs); + // Note: this call throws if given a non user kind as this functio should only handle user variants/kinds + const groupedByVariant = byUserVariant(incomingConfigs); - const groupedResults: Map = new Map(); + const groupedResults: Map = new Map(); - // TODOLATER currently we only poll for user config messages, so this can be hardcoded const publicKey = UserUtils.getOurPubKeyStrFromCache(); try { @@ -132,14 +121,10 @@ async function mergeConfigsWithIncomingUpdates( printDumpForDebug(`printDumpsForDebugging: before merge of ${variant}:`, variant); } - if (!isUserConfigWrapperType(variant)) { - window.log.info('// TODO Audric'); - continue; - } const mergedCount = await GenericWrapperActions.merge(variant, toMerge); - const needsDump = await variantNeedsDump(variant); - const needsPush = await variantNeedsPush(variant); + const needsDump = await GenericWrapperActions.needsDump(variant); + const needsPush = await GenericWrapperActions.needsPush(variant); const latestEnvelopeTimestamp = Math.max(...sameVariant.map(m => m.envelopeTimestamp)); window.log.debug( @@ -149,10 +134,10 @@ async function mergeConfigsWithIncomingUpdates( if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { printDumpForDebug(`printDumpsForDebugging: after merge of ${variant}:`, variant); } - const incomingConfResult: IncomingConfResult = { + const incomingConfResult: IncomingUserResult = { needsDump, needsPush, - kind: LibSessionUtil.variantToKind(variant), + kind: LibSessionUtil.userVariantToUserKind(variant), publicKey, latestEnvelopeTimestamp: latestEnvelopeTimestamp || Date.now(), }; @@ -167,8 +152,13 @@ async function mergeConfigsWithIncomingUpdates( } export function getSettingsKeyFromLibsessionWrapper( - wrapperType: ConfigWrapperObjectTypes + wrapperType: ConfigWrapperObjectTypesMeta ): string | null { + if (!isUserConfigWrapperType(wrapperType)) { + throw new Error( + `getSettingsKeyFromLibsessionWrapper only cares about uservariants but got ${wrapperType}` + ); + } switch (wrapperType) { case 'UserConfig': return SettingsKey.latestUserProfileEnvelopeTimestamp; @@ -179,10 +169,6 @@ export function getSettingsKeyFromLibsessionWrapper( case 'ConvoInfoVolatileConfig': return null; // we don't really care about the convo info volatile one default: - if (isMetaWrapperType(wrapperType)) { - // we don't care about the group updates as we don't need to drop older one for now - return null; // TODO maybe we do? - } try { assertUnreachable( wrapperType, @@ -196,7 +182,7 @@ export function getSettingsKeyFromLibsessionWrapper( } async function updateLibsessionLatestProcessedUserTimestamp( - wrapperType: ConfigWrapperObjectTypes, + wrapperType: ConfigWrapperUser, latestEnvelopeTimestamp: number ) { const settingsKey = getSettingsKeyFromLibsessionWrapper(wrapperType); @@ -214,10 +200,10 @@ async function updateLibsessionLatestProcessedUserTimestamp( } } -async function handleUserProfileUpdate(result: IncomingConfResult): Promise { +async function handleUserProfileUpdate(result: IncomingUserResult) { const updateUserInfo = await UserConfigWrapperActions.getUserInfo(); if (!updateUserInfo) { - return result; + return; } const currentBlindedMsgRequest = Storage.get(SettingsKey.hasBlindedMsgRequestsEnabled); @@ -228,8 +214,8 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise) { @@ -311,7 +295,7 @@ async function deleteContactsFromDB(contactsToRemove: Array) { } } -async function handleContactsUpdate(result: IncomingConfResult): Promise { +async function handleContactsUpdate() { const us = UserUtils.getOurPubKeyStrFromCache(); const allContactsInWrapper = await ContactsWrapperActions.getAll(); @@ -389,7 +373,6 @@ async function handleContactsUpdate(result: IncomingConfResult): Promise { +async function handleUserGroupsUpdate(result: IncomingUserResult) { const toHandle = SessionUtilUserGroups.getUserGroupTypes(); for (let index = 0; index < toHandle.length; index++) { const typeToHandle = toHandle[index]; @@ -646,8 +629,6 @@ async function handleUserGroupsUpdate(result: IncomingConfResult): Promise { +async function handleConvoInfoVolatileUpdate() { const types = SessionUtilConvoInfoVolatile.getConvoInfoVolatileTypes(); for (let typeIndex = 0; typeIndex < types.length; typeIndex++) { const type = types[typeIndex]; @@ -759,11 +738,9 @@ async function handleConvoInfoVolatileUpdate( assertUnreachable(type, `handleConvoInfoVolatileUpdate: unhandeld switch case: ${type}`); } } - - return result; } -async function processMergingResults(results: Map) { +async function processUserMergingResults(results: Map) { if (!results || !results.size) { return; } @@ -784,23 +761,23 @@ async function processMergingResults(results: Map> ) { - const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); - - if (!userConfigLibsession) { - return; - } - if (isEmpty(configMessages)) { return; } @@ -856,18 +822,18 @@ async function handleConfigMessagesViaLibSession( window?.log?.debug( `Handling our sharedConfig message via libsession_util ${JSON.stringify( configMessages.map(m => ({ - variant: LibSessionUtil.kindToVariant(m.message.kind), + kind: m.message.kind, hash: m.messageHash, seqno: (m.message.seqno as Long).toNumber(), })) )}` ); - const incomingMergeResult = await mergeConfigsWithIncomingUpdates(configMessages); - await processMergingResults(incomingMergeResult); + const incomingMergeResult = await mergeUserConfigsWithIncomingUpdates(configMessages); + await processUserMergingResults(incomingMergeResult); } -async function updateOurProfileLegacyOrViaLibSession( +async function updateOurProfileViaLibSession( sentAt: number, displayName: string, profileUrl: string | null, @@ -885,250 +851,6 @@ async function updateOurProfileLegacyOrViaLibSession( } } -async function handleOurProfileUpdateLegacy( - sentAt: number | Long, - configMessage: SignalService.ConfigurationMessage -) { - const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); - // we want to allow if we are not registered, as we might need to fetch an old config message (can be removed once we released for a weeks the libsession util) - if (userConfigLibsession && !isSignInByLinking()) { - return; - } - const latestProfileUpdateTimestamp = getLastProfileUpdateTimestamp(); - if (!latestProfileUpdateTimestamp || sentAt > latestProfileUpdateTimestamp) { - window?.log?.info( - `Handling our profileUdpate ourLastUpdate:${latestProfileUpdateTimestamp}, envelope sent at: ${sentAt}` - ); - const { profileKey, profilePicture, displayName } = configMessage; - - await updateOurProfileLegacyOrViaLibSession( - toNumber(sentAt), - displayName, - profilePicture, - profileKey, - null // passing null to say do not the prioroti, as we do not get one from the legacy config message - ); - } -} - -async function handleGroupsAndContactsFromConfigMessageLegacy( - envelope: EnvelopePlus, - configMessage: SignalService.ConfigurationMessage -) { - const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); - - if (userConfigLibsession && Registration.isDone()) { - return; - } - const envelopeTimestamp = toNumber(envelope.timestamp); - - // at some point, we made the hasSyncedInitialConfigurationItem item to have a value=true and a timestamp set. - // we can actually just use the timestamp as a boolean, as if it is set, we know we have synced the initial config - // but we still need to handle the case where the timestamp was set when the value is true (for backwards compatiblity, until we get rid of the config message legacy) - const lastConfigUpdate = await Data.getItemById(SettingsKey.hasSyncedInitialConfigurationItem); - - let lastConfigTimestamp: number | undefined; - if (isNumber(lastConfigUpdate?.value)) { - lastConfigTimestamp = lastConfigUpdate?.value; - } else if (isNumber((lastConfigUpdate as any)?.timestamp)) { - lastConfigTimestamp = (lastConfigUpdate as any)?.timestamp; // ugly, but we can remove it once we dropped support for legacy config message, see comment above - } - - const isNewerConfig = - !lastConfigTimestamp || (lastConfigTimestamp && lastConfigTimestamp < envelopeTimestamp); - - if (!isNewerConfig) { - window?.log?.info('Received outdated configuration message... Dropping message.'); - return; - } - - await Storage.put(SettingsKey.hasSyncedInitialConfigurationItem, envelopeTimestamp); - - // we only want to apply changes to closed groups if we never got them - // new opengroups get added when we get a new closed group message from someone, or a sync'ed message from outself creating the group - if (!lastConfigTimestamp) { - await handleClosedGroupsFromConfigLegacy(configMessage.closedGroups, envelope); - } - - void handleOpenGroupsFromConfigLegacy(configMessage.openGroups); - - if (configMessage.contacts?.length) { - await Promise.all( - configMessage.contacts.map(async c => handleContactFromConfigLegacy(c, envelope)) - ); - } -} - -/** - * Trigger a join for all open groups we are not already in. - * @param openGroups string array of open group urls - */ -const handleOpenGroupsFromConfigLegacy = async (openGroups: Array) => { - const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); - - if (userConfigLibsession && Registration.isDone()) { - return; - } - const numberOpenGroup = openGroups?.length || 0; - for (let i = 0; i < numberOpenGroup; i++) { - const currentOpenGroupUrl = openGroups[i]; - const parsedRoom = parseOpenGroupV2(currentOpenGroupUrl); - if (!parsedRoom) { - continue; - } - const roomConvoId = getOpenGroupV2ConversationId(parsedRoom.serverUrl, parsedRoom.roomId); - if (!getConversationController().get(roomConvoId)) { - window?.log?.info( - `triggering join of public chat '${currentOpenGroupUrl}' from ConfigurationMessage` - ); - void joinOpenGroupV2WithUIEvents(currentOpenGroupUrl, false, true); - } - } -}; - -/** - * Trigger a join for all closed groups which doesn't exist yet - * @param openGroups string array of open group urls - */ -const handleClosedGroupsFromConfigLegacy = async ( - closedGroups: Array, - envelope: EnvelopePlus -) => { - const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); - - if (userConfigLibsession && Registration.isDone()) { - return; - } - const numberClosedGroup = closedGroups?.length || 0; - - window?.log?.info( - `Received ${numberClosedGroup} closed group on configuration. Creating them... ` - ); - await Promise.all( - closedGroups.map(async c => { - const groupUpdate = new SignalService.DataMessage.ClosedGroupControlMessage({ - type: SignalService.DataMessage.ClosedGroupControlMessage.Type.NEW, - encryptionKeyPair: c.encryptionKeyPair, - name: c.name, - admins: c.admins, - members: c.members, - publicKey: c.publicKey, - }); - try { - await handleNewClosedGroup(envelope, groupUpdate, true); - } catch (e) { - window?.log?.warn('failed to handle a new closed group from configuration message'); - } - }) - ); -}; - -/** - * Handles adding of a contact and setting approval/block status - * @param contactReceived Contact to sync - */ -const handleContactFromConfigLegacy = async ( - contactReceived: SignalService.ConfigurationMessage.IContact, - envelope: EnvelopePlus -) => { - const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); - - if (userConfigLibsession && Registration.isDone()) { - return; - } - try { - if (!contactReceived.publicKey?.length) { - return; - } - const contactConvo = await getConversationController().getOrCreateAndWait( - toHex(contactReceived.publicKey), - ConversationTypeEnum.PRIVATE - ); - const profileInDataMessage: SignalService.DataMessage.ILokiProfile = { - displayName: contactReceived.name, - profilePicture: contactReceived.profilePicture, - }; - - const existingActiveAt = contactConvo.get('active_at'); - if (!existingActiveAt || existingActiveAt === 0) { - contactConvo.set('active_at', toNumber(envelope.timestamp)); - } - - // checking for existence of field on protobuf - if (contactReceived.isApproved === true) { - if (!contactConvo.isApproved()) { - await contactConvo.setIsApproved(Boolean(contactReceived.isApproved)); - await contactConvo.addOutgoingApprovalMessage(toNumber(envelope.timestamp)); - } - - if (contactReceived.didApproveMe === true) { - // checking for existence of field on message - await contactConvo.setDidApproveMe(Boolean(contactReceived.didApproveMe)); - } - } - - // only set for explicit true/false values in case outdated sender doesn't have the fields - if (contactReceived.isBlocked === true) { - if (contactConvo.isIncomingRequest()) { - // handling case where restored device's declined message requests were getting restored - await ConversationInteraction.deleteAllMessagesByConvoIdNoConfirmation(contactConvo.id); - } - await BlockedNumberController.block(contactConvo.id); - } else if (contactReceived.isBlocked === false) { - await BlockedNumberController.unblockAll([contactConvo.id]); - } - - await ProfileManager.updateProfileOfContact( - contactConvo.id, - profileInDataMessage.displayName || undefined, - profileInDataMessage.profilePicture || null, - contactReceived.profileKey || null - ); - } catch (e) { - window?.log?.warn('failed to handle a new closed group from configuration message'); - } -}; - -/** - * This is the legacy way of handling incoming configuration message. - * Should not be used at all soon. - */ -async function handleConfigurationMessageLegacy( - envelope: EnvelopePlus, - configurationMessage: SignalService.ConfigurationMessage -): Promise { - // when the useSharedUtilForUserConfig flag is ON, we want only allow a legacy config message if we are registering a new user. - // this is to allow users linking a device to find their config message if they do not have a shared config message yet. - // the process of those messages is always done after the process of the shared config messages, so that's only a fallback. - const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); - - if (userConfigLibsession && !isSignInByLinking()) { - window?.log?.info( - 'useSharedUtilForUserConfig is set, not handling config messages with "handleConfigurationMessageLegacy()"' - ); - await window.setSettingValue(SettingsKey.someDeviceOutdatedSyncing, true); - await removeFromCache(envelope); - return; - } - - window?.log?.info('Handling legacy configuration message'); - const ourPubkey = UserUtils.getOurPubKeyStrFromCache(); - if (!ourPubkey) { - return; - } - - if (envelope.source !== ourPubkey) { - window?.log?.info('Dropping configuration change from someone else than us.'); - await removeFromCache(envelope); - return; - } - - await handleOurProfileUpdateLegacy(envelope.timestamp, configurationMessage); - await handleGroupsAndContactsFromConfigMessageLegacy(envelope, configurationMessage); - await removeFromCache(envelope); -} - export const ConfigMessageHandler = { - handleConfigurationMessageLegacy, - handleConfigMessagesViaLibSession, + handleUserConfigMessagesViaLibSession, }; diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 1a1ff95cd5..1057634e2d 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -32,7 +32,6 @@ import { ReadReceipts } from '../util/readReceipts'; import { Storage } from '../util/storage'; import { handleCallMessage } from './callMessage'; import { getAllCachedECKeyPair, sentAtMoreRecentThanWrapper } from './closedGroups'; -import { ConfigMessageHandler } from './configMessage'; import { ECKeyPair } from './keypairs'; import { ContactsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; @@ -468,12 +467,8 @@ export async function innerHandleSwarmContentMessage( return; } if (content.configurationMessage) { - // this one can be quite long (downloads profilePictures and everything), - // so do not await it - void ConfigMessageHandler.handleConfigurationMessageLegacy( - envelope, - content.configurationMessage as SignalService.ConfigurationMessage - ); + // we drop support for legacy configuration message + await removeFromCache(envelope); return; } if (content.sharedConfigMessage) { diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 694afe5558..39f571561b 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1,4 +1,7 @@ -import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; +import { + SharedGroupConfigMessage, + SharedUserConfigMessage, +} from '../../messages/outgoing/controlMessage/SharedConfigMessage'; import { SnodeNamespaces } from './namespaces'; export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } }; @@ -109,7 +112,7 @@ export type StoreOnNodeMessage = { pubkey: string; timestamp: number; namespace: number; - message: SharedConfigMessage; + message: SharedUserConfigMessage | SharedGroupConfigMessage; }; export type StoreOnNodeSubRequest = { method: 'store'; params: StoreOnNodeParams }; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 4c67e87a4b..16b1214a08 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -1,7 +1,7 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable more/no-then */ /* eslint-disable @typescript-eslint/no-misused-promises */ -import { compact, concat, difference, flatten, last, sample, toNumber, uniqBy } from 'lodash'; +import { compact, concat, difference, flatten, last, sample, uniqBy } from 'lodash'; import { Data, Snode } from '../../../data/data'; import { SignalService } from '../../../protobuf'; import * as Receiver from '../../../receiver/receiver'; @@ -11,9 +11,6 @@ import * as snodePool from './snodePool'; import { ConversationModel } from '../../../models/conversation'; import { ConversationTypeEnum } from '../../../models/conversationAttributes'; -import { ConfigMessageHandler } from '../../../receiver/configMessage'; -import { decryptEnvelopeWithOurKey } from '../../../receiver/contentMessage'; -import { EnvelopePlus } from '../../../receiver/types'; import { updateIsOnline } from '../../../state/ducks/onion'; import { GenericWrapperActions, @@ -21,13 +18,14 @@ import { } from '../../../webworker/workers/browser/libsession_worker_interface'; import { DURATION, SWARM_POLLING_TIMEOUT } from '../../constants'; import { getConversationController } from '../../conversations'; -import { IncomingMessage } from '../../messages/incoming/IncomingMessage'; import { ed25519Str } from '../../onions/onionPath'; import { StringUtils, UserUtils } from '../../utils'; import { perfEnd, perfStart } from '../../utils/Performance'; import { LibSessionUtil } from '../../utils/libsession/libsession_utils'; import { SnodeNamespace, SnodeNamespaces } from './namespaces'; import { SnodeAPIRetrieve } from './retrieveRequest'; +import { SwarmPollingGroupConfig } from './swarm_polling_config/SwarmPollingGroupConfig'; +import { SwarmPollingUserConfig } from './swarm_polling_config/SwarmPollingUserConfig'; import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types'; export function extractWebSocketContent( @@ -257,53 +255,34 @@ export class SwarmPolling { ); // first make sure to handle the shared user config message first - - if (type === ConversationTypeEnum.PRIVATE) { - if (confMessages?.length) { - window.log.info( - `received userConfigMessagesMerged count: ${confMessages.length} for key ${pubkey}` - ); - try { - await this.handleUserSharedConfigMessages(confMessages); - } catch (e) { - window.log.warn( - `handleSharedConfigMessages of ${confMessages.length} failed with ${e.message}` - ); - // not rethrowing - } - } - } else if (type === ConversationTypeEnum.GROUPV3) { - if (confMessages?.length) { - window.log.info( - `received GROUPV3MessagesMerged count: ${confMessages.length} for key ${pubkey}` - ); - throw new Error('received GROUPV3MessagesMerged TODO'); - - // try { - // await this.handleUserSharedConfigMessages(confMessages); - // } catch (e) { - // window.log.warn( - // `handleSharedConfigMessages of ${confMessages.length} failed with ${e.message}` - // ); - // // not rethrowing - // } - } + if ( + type === ConversationTypeEnum.PRIVATE && + confMessages?.length && + UserUtils.isUsFromCache(pubkey) + ) { + // this does not throw, no matter what happens + await SwarmPollingUserConfig.handleUserSharedConfigMessages(confMessages); + } else if ( + type === ConversationTypeEnum.GROUPV3 && + confMessages?.length && + PubKey.isClosedGroupV3(pubkey) + ) { + await SwarmPollingGroupConfig.handleGroupSharedConfigMessages(confMessages, pubkey); } - if (otherMessages.length) { + // Merge results into one list of unique messages + const uniqOtherMsgs = uniqBy(otherMessages, x => x.hash); + if (uniqOtherMsgs.length) { window.log.debug(`received otherMessages: ${otherMessages.length} for type: ${type}`); } - // Merge results into one list of unique messages - const messages = uniqBy(otherMessages, x => x.hash); - // if all snodes returned an error (null), no need to update the lastPolledTimestamp if (type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV3) { window?.log?.debug( - `Polled for group(${ed25519Str(pubkey)}):, got ${messages.length} messages back.` + `Polled for group(${ed25519Str(pubkey)}):, got ${uniqOtherMsgs.length} messages back.` ); let lastPolledTimestamp = Date.now(); - if (messages.length >= 95) { + if (uniqOtherMsgs.length >= 95) { // if we get 95 messages or more back, it means there are probably more than this // so make sure to retry the polling in the next 5sec by marking the last polled timestamp way before that it is really // this is a kind of hack @@ -322,7 +301,7 @@ export class SwarmPolling { } perfStart(`handleSeenMessages-${pubkey}`); - const newMessages = await this.handleSeenMessages(messages); + const newMessages = await this.handleSeenMessages(uniqOtherMsgs); perfEnd(`handleSeenMessages-${pubkey}`, 'handleSeenMessages'); // don't handle incoming messages from group swarms when the group is not one of the tracked group @@ -353,69 +332,6 @@ export class SwarmPolling { } } - private async handleUserSharedConfigMessages( - userConfigMessagesMerged: Array - ) { - const extractedUserConfigMessage = compact( - userConfigMessagesMerged.map((m: RetrieveMessageItem) => { - return extractWebSocketContent(m.data, m.hash); - }) - ); - - const allDecryptedConfigMessages: Array> = []; - - for (let index = 0; index < extractedUserConfigMessage.length; index++) { - const userConfigMessage = extractedUserConfigMessage[index]; - - try { - const envelope: EnvelopePlus = SignalService.Envelope.decode(userConfigMessage.body) as any; - const decryptedEnvelope = await decryptEnvelopeWithOurKey(envelope); - if (!decryptedEnvelope?.byteLength) { - continue; - } - const content = SignalService.Content.decode(new Uint8Array(decryptedEnvelope)); - if (content.sharedConfigMessage) { - const asIncomingMsg: IncomingMessage = { - envelopeTimestamp: toNumber(envelope.timestamp), - message: content.sharedConfigMessage, - messageHash: userConfigMessage.messageHash, - authorOrGroupPubkey: envelope.source, - authorInGroup: envelope.senderIdentity, - }; - allDecryptedConfigMessages.push(asIncomingMsg); - } else { - throw new Error( - 'received a message to a namespace reserved for user config but not containign a sharedConfigMessage' - ); - } - } catch (e) { - window.log.warn( - `failed to decrypt message with hash "${userConfigMessage.messageHash}": ${e.message}` - ); - } - } - - throw new Error( - "todo audric make sure we don't handle shared config messages through the old pipeline since I cleanedup this part" - ); - - if (allDecryptedConfigMessages.length) { - try { - window.log.info( - `handleConfigMessagesViaLibSession of "${allDecryptedConfigMessages.length}" messages with libsession` - ); - await ConfigMessageHandler.handleConfigMessagesViaLibSession(allDecryptedConfigMessages); - } catch (e) { - const allMessageHases = allDecryptedConfigMessages.map(m => m.messageHash).join(','); - window.log.warn( - `failed to handle messages hashes "${allMessageHases}" with libsession. Error: "${e.message}"` - ); - } - } - } - // Fetches messages for `pubkey` from `node` potentially updating // the lash hash record private async pollNodeForKey( diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts new file mode 100644 index 0000000000..15b2e27e7b --- /dev/null +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts @@ -0,0 +1,63 @@ +import { compact, toNumber } from 'lodash'; +import { RetrieveMessageItem } from '../types'; +import { extractWebSocketContent } from '../swarmPolling'; +import { SignalService } from '../../../../protobuf'; +import { IncomingMessage } from '../../../messages/incoming/IncomingMessage'; +import { EnvelopePlus } from '../../../../receiver/types'; + +function extractWebSocketContents(configMsgs: Array) { + try { + return compact( + configMsgs.map((m: RetrieveMessageItem) => { + return extractWebSocketContent(m.data, m.hash); + }) + ); + } catch (e) { + window.log.warn('extractWebSocketContents failed with ', e.message); + return []; + } +} + +async function decryptSharedConfigMessages( + extractedMsgs: ReturnType, + decryptEnvelope: (envelope: EnvelopePlus) => Promise +) { + const allDecryptedConfigMessages: Array> = []; + + for (let index = 0; index < extractedMsgs.length; index++) { + const groupConfigMessage = extractedMsgs[index]; + + try { + const envelope: EnvelopePlus = SignalService.Envelope.decode(groupConfigMessage.body) as any; + const decryptedEnvelope = await decryptEnvelope(envelope); + if (!decryptedEnvelope?.byteLength) { + continue; + } + const content = SignalService.Content.decode(new Uint8Array(decryptedEnvelope)); + if (content.sharedConfigMessage) { + const asIncomingMsg: IncomingMessage = { + envelopeTimestamp: toNumber(envelope.timestamp), + message: content.sharedConfigMessage, + messageHash: groupConfigMessage.messageHash, + authorOrGroupPubkey: envelope.source, + authorInGroup: envelope.senderIdentity, + }; + allDecryptedConfigMessages.push(asIncomingMsg); + } else { + throw new Error( + 'received a message to a namespace reserved for user config but not containign a sharedConfigMessage' + ); + } + } catch (e) { + window.log.warn( + `failed to decrypt message with hash "${groupConfigMessage.messageHash}": ${e.message}` + ); + } + } + return allDecryptedConfigMessages; +} + +export const SwarmPollingConfigShared = { + decryptSharedConfigMessages, + extractWebSocketContents, +}; diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts new file mode 100644 index 0000000000..66ff24b46c --- /dev/null +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -0,0 +1,53 @@ +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { EnvelopePlus } from '../../../../receiver/types'; +import { ed25519Str } from '../../../onions/onionPath'; +import { RetrieveMessageItem } from '../types'; +import { SwarmPollingConfigShared } from './SwarmPollingConfigShared'; + +async function handleGroupSharedConfigMessages( + groupConfigMessagesMerged: Array, + groupPk: GroupPubkeyType +) { + window.log.info( + `received groupConfigMessagesMerged count: ${ + groupConfigMessagesMerged.length + } for groupPk:${ed25519Str(groupPk)}` + ); + try { + const extractedConfigMessage = SwarmPollingConfigShared.extractWebSocketContents( + groupConfigMessagesMerged + ); + + const allDecryptedConfigMessages = await SwarmPollingConfigShared.decryptSharedConfigMessages( + extractedConfigMessage, + async (_envelope: EnvelopePlus) => { + console.warn('decrypt closed group incoming shared message to do'); + return null; + } + ); + + if (allDecryptedConfigMessages.length) { + try { + window.log.info( + `handleGroupSharedConfigMessages of "${allDecryptedConfigMessages.length}" messages with libsession` + ); + console.warn('HANDLING OF INCOMING GROUP TODO '); + // await ConfigMessageHandler.handleUserConfigMessagesViaLibSession( + // allDecryptedConfigMessages + // ); + } catch (e) { + const allMessageHases = allDecryptedConfigMessages.map(m => m.messageHash).join(','); + window.log.warn( + `failed to handle group messages hashes "${allMessageHases}" with libsession. Error: "${e.message}"` + ); + } + } + } catch (e) { + window.log.warn( + `handleGroupSharedConfigMessages of ${groupConfigMessagesMerged.length} failed with ${e.message}` + ); + // not rethrowing + } +} + +export const SwarmPollingGroupConfig = { handleGroupSharedConfigMessages }; diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts new file mode 100644 index 0000000000..c65c548d36 --- /dev/null +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts @@ -0,0 +1,43 @@ +import { ConfigMessageHandler } from '../../../../receiver/configMessage'; +import { decryptEnvelopeWithOurKey } from '../../../../receiver/contentMessage'; +import { RetrieveMessageItem } from '../types'; +import { SwarmPollingConfigShared } from './SwarmPollingConfigShared'; + +async function handleUserSharedConfigMessages( + userConfigMessagesMerged: Array +) { + window.log.info(`received userConfigMessagesMerged count: ${userConfigMessagesMerged.length}`); + try { + const extractedUserConfigMessage = SwarmPollingConfigShared.extractWebSocketContents( + userConfigMessagesMerged + ); + + const allDecryptedConfigMessages = await SwarmPollingConfigShared.decryptSharedConfigMessages( + extractedUserConfigMessage, + decryptEnvelopeWithOurKey + ); + + if (allDecryptedConfigMessages.length) { + try { + window.log.info( + `handleConfigMessagesViaLibSession of "${allDecryptedConfigMessages.length}" messages with libsession` + ); + await ConfigMessageHandler.handleUserConfigMessagesViaLibSession( + allDecryptedConfigMessages + ); + } catch (e) { + const allMessageHases = allDecryptedConfigMessages.map(m => m.messageHash).join(','); + window.log.warn( + `failed to handle messages hashes "${allMessageHases}" with libsession. Error: "${e.message}"` + ); + } + } + } catch (e) { + window.log.warn( + `handleSharedConfigMessages of ${userConfigMessagesMerged.length} failed with ${e.message}` + ); + // not rethrowing + } +} + +export const SwarmPollingUserConfig = { handleUserSharedConfigMessages }; diff --git a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts index 487a0b6ec4..cf60147e67 100644 --- a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts @@ -5,19 +5,23 @@ import { SignalService } from '../../../../protobuf'; import { MessageParams } from '../Message'; import { ContentMessage } from '..'; import { TTL_DEFAULT } from '../../../constants'; +import { GroupConfigKind, UserConfigKind } from '../../../../types/ProtobufKind'; -interface SharedConfigParams extends MessageParams { +interface SharedConfigParams + extends MessageParams { seqno: Long; - kind: SignalService.SharedConfigMessage.Kind; data: Uint8Array; + kind: KindsPicked; } -export class SharedConfigMessage extends ContentMessage { +export abstract class SharedConfigMessage< + KindsPicked extends UserConfigKind | GroupConfigKind +> extends ContentMessage { public readonly seqno: Long; - public readonly kind: SignalService.SharedConfigMessage.Kind; + public readonly kind: KindsPicked; public readonly data: Uint8Array; - constructor(params: SharedConfigParams) { + constructor(params: SharedConfigParams) { super({ timestamp: params.timestamp, identifier: params.identifier }); this.data = params.data; this.kind = params.kind; @@ -42,3 +46,27 @@ export class SharedConfigMessage extends ContentMessage { }); } } + +export class SharedUserConfigMessage extends SharedConfigMessage { + constructor(params: SharedConfigParams) { + super({ + timestamp: params.timestamp, + identifier: params.identifier, + data: params.data, + kind: params.kind, + seqno: params.seqno, + }); + } +} + +export class SharedGroupConfigMessage extends SharedConfigMessage { + constructor(params: SharedConfigParams) { + super({ + timestamp: params.timestamp, + identifier: params.identifier, + data: params.data, + kind: params.kind, + seqno: params.seqno, + }); + } +} diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 939bd5ea9e..d9d25a722a 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -236,7 +236,8 @@ export class MessageQueue { message: | ClosedGroupNewMessage | CallMessage - | SharedConfigMessage + // | SharedUserConfigMessage + // | SharedGroupConfigMessage | ClosedGroupMemberLeftMessage; namespace: SnodeNamespaces; }): Promise { diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts index abb1c71b3d..ef34ca34d7 100644 --- a/ts/session/utils/job_runners/JobRunner.ts +++ b/ts/session/utils/job_runners/JobRunner.ts @@ -6,6 +6,7 @@ import { JobRunnerType } from './jobs/JobRunnerType'; import { AvatarDownloadPersistedData, ConfigurationSyncPersistedData, + GroupSyncPersistedData, PersistedJob, RunJobResult, TypeOfPersistedData, @@ -351,6 +352,7 @@ const configurationSyncRunner = new PersistedJobRunner('GroupSyncJob', null); const avatarDownloadRunner = new PersistedJobRunner( 'AvatarDownloadJob', @@ -359,5 +361,6 @@ const avatarDownloadRunner = new PersistedJobRunner export const runners = { configurationSyncRunner, + groupSyncRunner, avatarDownloadRunner, }; diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts index 85e52b7a35..ffba8fd12c 100644 --- a/ts/session/utils/job_runners/PersistedJob.ts +++ b/ts/session/utils/job_runners/PersistedJob.ts @@ -2,6 +2,7 @@ import { cloneDeep, isEmpty } from 'lodash'; export type PersistedJobType = | 'ConfigurationSyncJobType' + | 'GroupSyncJobType' | 'AvatarDownloadJobType' | 'FakeSleepForJobType' | 'FakeSleepForJobMultiType'; @@ -34,12 +35,16 @@ export interface AvatarDownloadPersistedData extends PersistedJobData { export interface ConfigurationSyncPersistedData extends PersistedJobData { jobType: 'ConfigurationSyncJobType'; } +export interface GroupSyncPersistedData extends PersistedJobData { + jobType: 'GroupSyncJobType'; +} export type TypeOfPersistedData = | ConfigurationSyncPersistedData | AvatarDownloadPersistedData | FakeSleepJobData - | FakeSleepForMultiJobData; + | FakeSleepForMultiJobData + | GroupSyncPersistedData; export type AddJobCheckReturn = 'skipAddSameJobPresent' | 'sameJobDataAlreadyInQueue' | null; @@ -122,6 +127,15 @@ export abstract class PersistedJob { : null; } + public addJobCheckSameTypeAndIdentifierPresent(jobs: Array): 'skipAddSameJobPresent' | null { + return jobs.some( + j => + j.jobType === this.persistedData.jobType && j.identifier === this.persistedData.identifier + ) + ? 'skipAddSameJobPresent' + : null; + } + public abstract getJobTimeoutMs(): number; /** diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts index 6b28fc8ad0..4b17443374 100644 --- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts @@ -4,11 +4,14 @@ import { v4 } from 'uuid'; import { UserUtils } from '../..'; import { ConfigDumpData } from '../../../../data/configDump/configDump'; import { ConfigurationSyncJobDone } from '../../../../shims/events'; +import { ReleasedFeatures } from '../../../../util/releaseFeature'; +import { isSignInByLinking } from '../../../../util/storage'; import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { NotEmptyArrayOfBatchResults } from '../../../apis/snode_api/SnodeRequestTypes'; import { getConversationController } from '../../../conversations'; -import { SharedConfigMessage } from '../../../messages/outgoing/controlMessage/SharedConfigMessage'; +import { SharedUserConfigMessage } from '../../../messages/outgoing/controlMessage/SharedConfigMessage'; import { MessageSender } from '../../../sending/MessageSender'; +import { allowOnlyOneAtATime } from '../../Promise'; import { LibSessionUtil, OutgoingConfResult } from '../../libsession/libsession_utils'; import { runners } from '../JobRunner'; import { @@ -17,10 +20,7 @@ import { PersistedJob, RunJobResult, } from '../PersistedJob'; -import { ReleasedFeatures } from '../../../../util/releaseFeature'; -import { allowOnlyOneAtATime } from '../../Promise'; -import { isSignInByLinking } from '../../../../util/storage'; -import { isUserConfigWrapperType } from '../../../../webworker/workers/browser/libsession_worker_functions'; +import { UserConfigKind } from '../../../../types/ProtobufKind'; const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s) const defaultMaxAttempts = 2; @@ -32,12 +32,12 @@ const defaultMaxAttempts = 2; let lastRunConfigSyncJobTimestamp: number | null = null; export type SingleDestinationChanges = { - messages: Array; + messages: Array>; allOldHashes: Array; }; type SuccessfulChange = { - message: SharedConfigMessage; + message: SharedUserConfigMessage; updatedHash: string; }; @@ -48,7 +48,10 @@ type SuccessfulChange = { async function retrieveSingleDestinationChanges( destination: string ): Promise { - const outgoingConfResults = await LibSessionUtil.pendingChangesForPubkey(destination); + if (destination !== UserUtils.getOurPubKeyStrFromCache()) { + throw new Error('retrieveSingleDestinationChanges can only be us for ConfigurationSyncJob'); + } + const outgoingConfResults = await LibSessionUtil.pendingChangesForUs(); const compactedHashes = compact(outgoingConfResults.map(m => m.oldMessageHashes)).flat(); @@ -103,15 +106,10 @@ async function buildAndSaveDumpsToDB( ): Promise { for (let i = 0; i < changes.length; i++) { const change = changes[i]; - const variant = LibSessionUtil.kindToVariant(change.message.kind); + const variant = LibSessionUtil.userKindToVariant(change.message.kind); - if (!isUserConfigWrapperType(variant)) { - window.log.info('// TODO Audric'); - continue; - } const needsDump = await LibSessionUtil.markAsPushed( variant, - destination, change.message.seqno.toNumber(), change.updatedHash ); diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts new file mode 100644 index 0000000000..9e9db631af --- /dev/null +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -0,0 +1,328 @@ +/* eslint-disable no-await-in-loop */ +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { compact, isArray, isEmpty, isNumber, isString } from 'lodash'; +import { UserUtils } from '../..'; +import { ConfigDumpData } from '../../../../data/configDump/configDump'; +import { ReleasedFeatures } from '../../../../util/releaseFeature'; +import { isSignInByLinking } from '../../../../util/storage'; +import { isMetaWrapperType } from '../../../../webworker/workers/browser/libsession_worker_functions'; +import { NotEmptyArrayOfBatchResults } from '../../../apis/snode_api/SnodeRequestTypes'; +import { getConversationController } from '../../../conversations'; +import { SharedGroupConfigMessage } from '../../../messages/outgoing/controlMessage/SharedConfigMessage'; +import { MessageSender } from '../../../sending/MessageSender'; +import { PubKey } from '../../../types'; +import { allowOnlyOneAtATime } from '../../Promise'; +import { LibSessionUtil, OutgoingConfResult } from '../../libsession/libsession_utils'; +import { runners } from '../JobRunner'; +import { + AddJobCheckReturn, + GroupSyncPersistedData, + PersistedJob, + RunJobResult, +} from '../PersistedJob'; +import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { SignalService } from '../../../../protobuf'; +import { GroupConfigKind } from '../../../../types/ProtobufKind'; + +const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s) +const defaultMaxAttempts = 2; + +/** + * We want to run each of those jobs at least 3seconds apart. + * So every time one of that job finishes, update this timestamp, so we know when adding a new job, what is the next minimun date to run it. + */ +let lastRunConfigSyncJobTimestamp: number | null = null; + +export type SingleDestinationChanges = { + messages: Array>; + allOldHashes: Array; +}; + +type SuccessfulChange = { + message: SharedGroupConfigMessage; + updatedHash: string; +}; + +/** + * Later in the syncing logic, we want to batch-send all the updates for a pubkey in a single batch call. + * To make this easier, this function prebuilds and merges together all the changes for each pubkey. + */ +async function retrieveSingleDestinationChanges( + groupPk: GroupPubkeyType +): Promise { + const outgoingConfResults = await LibSessionUtil.pendingChangesForGroup(groupPk); + + const compactedHashes = compact(outgoingConfResults.map(m => m.oldMessageHashes)).flat(); + + return { messages: outgoingConfResults, allOldHashes: compactedHashes }; +} + +/** + * This function is run once we get the results from the multiple batch-send. + */ +function resultsToSuccessfulChange( + result: NotEmptyArrayOfBatchResults | null, + request: SingleDestinationChanges +): Array { + const successfulChanges: Array = []; + + /** + * For each batch request, we get as result + * - status code + hash of the new config message + * - status code of the delete of all messages as given by the request hashes. + * + * As it is a sequence, the delete might have failed but the new config message might still be posted. + * So we need to check which request failed, and if it is the delete by hashes, we need to add the hash of the posted message to the list of hashes + */ + + if (!result?.length) { + return successfulChanges; + } + + for (let j = 0; j < result.length; j++) { + const batchResult = result[j]; + const messagePostedHashes = batchResult?.body?.hash; + + if ( + batchResult.code === 200 && + isString(messagePostedHashes) && + request.messages?.[j].message + ) { + // the library keeps track of the hashes to push and pushed using the hashes now + successfulChanges.push({ + updatedHash: messagePostedHashes, + message: request.messages?.[j].message, + }); + } + } + + return successfulChanges; +} + +async function buildAndSaveDumpsToDB( + changes: Array, + groupPk: GroupPubkeyType +): Promise { + const toConfirm: Parameters = [ + groupPk, + { groupInfo: null, groupKeys: null, groupMember: null }, + ]; + + for (let i = 0; i < changes.length; i++) { + const change = changes[i]; + const variant = LibSessionUtil.groupKindToVariant(change.message.kind, groupPk); + + if (!isMetaWrapperType(variant)) { + throw new Error(`buildAndSaveDumpsToDB non metagroup variant: ${variant}`); + } + const Kind = SignalService.SharedConfigMessage.Kind; + switch (change.message.kind) { + case Kind.GROUP_INFO: { + toConfirm[1].groupInfo = [change.message.seqno.toNumber(), change.updatedHash]; + break; + } + case Kind.GROUP_MEMBERS: { + toConfirm[1].groupMember = [change.message.seqno.toNumber(), change.updatedHash]; + break; + } + case Kind.GROUP_KEYS: { + toConfirm[1].groupKeys = [change.message.seqno.toNumber(), change.updatedHash]; + break; + } + } + } + await MetaGroupWrapperActions.metaConfirmPushed(...toConfirm); + const metaNeedsDump = await MetaGroupWrapperActions.needsDump(groupPk); + // save the concatenated dumps as a single entry in the DB if any of the dumps had a need for dump + if (metaNeedsDump) { + const dump = await MetaGroupWrapperActions.metaDump(groupPk); + await ConfigDumpData.saveConfigDump({ + data: dump, + publicKey: groupPk, + variant: `MetaGroupConfig-${groupPk}`, + }); + } +} + +async function saveDumpsNeededToDB(groupPk: GroupPubkeyType) { + const needsDump = await MetaGroupWrapperActions.needsDump(groupPk); + + if (!needsDump) { + return; + } + const dump = await MetaGroupWrapperActions.metaDump(groupPk); + await ConfigDumpData.saveConfigDump({ + data: dump, + publicKey: groupPk, + variant: `MetaGroupConfig-${groupPk}`, + }); +} + +class GroupSyncJob extends PersistedJob { + constructor({ + identifier, // this has to be the pubkey to which we + nextAttemptTimestamp, + maxAttempts, + currentRetry, + }: Pick & + Partial< + Pick + >) { + super({ + jobType: 'GroupSyncJobType', + identifier, + delayBetweenRetries: defaultMsBetweenRetries, + maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts, + currentRetry: isNumber(currentRetry) ? currentRetry : 0, + nextAttemptTimestamp: nextAttemptTimestamp || Date.now(), + }); + } + + public async run(): Promise { + const start = Date.now(); + + try { + const thisJobDestination = this.persistedData.identifier; + + window.log.debug(`GroupSyncJob starting ${thisJobDestination}`); + + const us = UserUtils.getOurPubKeyStrFromCache(); + const ed25519Key = await UserUtils.getUserED25519KeyPairBytes(); + const conversation = getConversationController().get(us); + if (!us || !conversation || !ed25519Key) { + // we check for ed25519Key because it is needed for authenticated requests + window.log.warn('did not find our own conversation'); + return RunJobResult.PermanentFailure; + } + + if (!PubKey.isClosedGroupV3(thisJobDestination)) { + return RunJobResult.PermanentFailure; + } + + // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc + await saveDumpsNeededToDB(thisJobDestination); + const newGroupsReleased = await ReleasedFeatures.checkIsNewGroupsReleased(); + + // if the feature flag is not enabled, we want to keep updating the dumps, but just not sync them. + if (!newGroupsReleased) { + return RunJobResult.Success; + } + const singleDestChanges = await retrieveSingleDestinationChanges(thisJobDestination); + + // If there are no pending changes then the job can just complete (next time something + // is updated we want to try and run immediately so don't scuedule another run in this case) + if (isEmpty(singleDestChanges?.messages)) { + return RunJobResult.Success; + } + const oldHashesToDelete = new Set(singleDestChanges.allOldHashes); + const msgs = singleDestChanges.messages.map(item => { + return { + namespace: item.namespace, + pubkey: thisJobDestination, + timestamp: item.message.timestamp, + ttl: item.message.ttl(), + message: item.message, + }; + }); + + const result = await MessageSender.sendMessagesToSnode( + msgs, + thisJobDestination, + oldHashesToDelete + ); + + const expectedReplyLength = + singleDestChanges.messages.length + (oldHashesToDelete.size ? 1 : 0); + // we do a sequence call here. If we do not have the right expected number of results, consider it a failure + if (!isArray(result) || result.length !== expectedReplyLength) { + window.log.info( + `ConfigurationSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` + ); + // this might be a 421 error (already handled) so let's retry this request a little bit later + return RunJobResult.RetryJobIfPossible; + } + + const changes = resultsToSuccessfulChange(result, singleDestChanges); + if (isEmpty(changes)) { + return RunJobResult.RetryJobIfPossible; + } + // Now that we have the successful changes, we need to mark them as pushed and + // generate any config dumps which need to be stored + + await buildAndSaveDumpsToDB(changes, thisJobDestination); + return RunJobResult.Success; + // eslint-disable-next-line no-useless-catch + } catch (e) { + throw e; + } finally { + window.log.debug(`ConfigurationSyncJob run() took ${Date.now() - start}ms`); + + // this is a simple way to make sure whatever happens here, we update the lastest timestamp. + // (a finally statement is always executed (no matter if exception or returns in other try/catch block) + this.updateLastTickTimestamp(); + } + } + + public serializeJob(): GroupSyncPersistedData { + const fromParent = super.serializeBase(); + return fromParent; + } + + public addJobCheck(jobs: Array): AddJobCheckReturn { + return this.addJobCheckSameTypeAndIdentifierPresent(jobs); + } + + public nonRunningJobsToRemove(_jobs: Array) { + return []; + } + + public getJobTimeoutMs(): number { + return 20000; + } + + private updateLastTickTimestamp() { + lastRunConfigSyncJobTimestamp = Date.now(); + } +} + +/** + * Queue a new Sync Configuration if needed job. + * A GroupSyncJob can only be added if there is none of the same type queued already. + */ +async function queueNewJobIfNeeded(groupPk: GroupPubkeyType) { + if (isSignInByLinking()) { + window.log.info(`NOT Scheduling GroupSyncJob for ${groupPk} as we are linking a device`); + + return; + } + if ( + !lastRunConfigSyncJobTimestamp || + lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries + ) { + // window.log.debug('Scheduling GroupSyncJob: ASAP'); + // we postpone by 1000ms to make sure whoever is adding this job is done with what is needs to do first + // this call will make sure that there is only one configuration sync job at all times + await runners.groupSyncRunner.addJob( + new GroupSyncJob({ identifier: groupPk, nextAttemptTimestamp: Date.now() + 1000 }) + ); + } else { + // if we did run at t=100, and it is currently t=110, the difference is 10 + const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0); + // but we want to run every 30, so what we need is actually `30-10` from now = 20 + const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 1000); + // window.log.debug('Scheduling GroupSyncJob: LATER'); + + await runners.groupSyncRunner.addJob( + new GroupSyncJob({ + identifier: groupPk, + nextAttemptTimestamp: Date.now() + leftBeforeNextTick, + }) + ); + } +} + +export const GroupSync = { + GroupSyncJob, + queueNewJobIfNeeded: (groupPk: GroupPubkeyType) => + allowOnlyOneAtATime('GroupSyncJob-oneAtAtTime' + groupPk, () => queueNewJobIfNeeded(groupPk)), +}; diff --git a/ts/session/utils/job_runners/jobs/JobRunnerType.ts b/ts/session/utils/job_runners/jobs/JobRunnerType.ts index d24a2dc784..438d908327 100644 --- a/ts/session/utils/job_runners/jobs/JobRunnerType.ts +++ b/ts/session/utils/job_runners/jobs/JobRunnerType.ts @@ -1,5 +1,6 @@ export type JobRunnerType = | 'ConfigurationSyncJob' + | 'GroupSyncJob' | 'FakeSleepForJob' | 'FakeSleepForMultiJob' | 'AvatarDownloadJob'; diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 84972b5083..60c23b8b02 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -1,6 +1,7 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable import/extensions */ /* eslint-disable import/no-unresolved */ +import { GroupPubkeyType } from 'libsession_util_nodejs'; import { difference, omit } from 'lodash'; import Long from 'long'; import { UserUtils } from '..'; @@ -9,7 +10,8 @@ import { HexString } from '../../../node/hexStrings'; import { SignalService } from '../../../protobuf'; import { assertUnreachable, toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; import { - ConfigWrapperObjectTypes, + ConfigWrapperGroup, + ConfigWrapperGroupDetailed, ConfigWrapperUser, getGroupPubkeyFromWrapperType, isMetaWrapperType, @@ -22,9 +24,15 @@ import { } from '../../../webworker/workers/browser/libsession_worker_interface'; import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../apis/snode_api/namespaces'; -import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; +import { + SharedConfigMessage, + SharedGroupConfigMessage, + SharedUserConfigMessage, +} from '../../messages/outgoing/controlMessage/SharedConfigMessage'; +import { PubKey } from '../../types'; import { getUserED25519KeyPairBytes } from '../User'; import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob'; +import { GroupConfigKind, UserConfigKind } from '../../../types/ProtobufKind'; const requiredUserVariants: Array = [ 'UserConfig', @@ -33,16 +41,11 @@ const requiredUserVariants: Array = [ 'ConvoInfoVolatileConfig', ]; -export type IncomingConfResult = { - needsPush: boolean; - needsDump: boolean; - kind: SignalService.SharedConfigMessage.Kind; - publicKey: string; - latestEnvelopeTimestamp: number; -}; - -export type OutgoingConfResult = { - message: SharedConfigMessage; +export type OutgoingConfResult< + K extends UserConfigKind | GroupConfigKind, + T extends SharedConfigMessage +> = { + message: T; namespace: SnodeNamespaces; oldMessageHashes: Array; }; @@ -145,31 +148,32 @@ async function initializeLibSessionUtilWrappers() { } } -async function pendingChangesForPubkey(pubkey: string): Promise> { - const dumps = await ConfigDumpData.getAllDumpsWithoutData(); +async function pendingChangesForUs(): Promise< + Array> +> { const us = UserUtils.getOurPubKeyStrFromCache(); + const dumps = await ConfigDumpData.getAllDumpsWithoutDataFor(us); + // Ensure we always check the required user config types for changes even if there is no dump // data yet (to deal with first launch cases) - if (pubkey === us) { - LibSessionUtil.requiredUserVariants.forEach(requiredVariant => { - if (!dumps.find(m => m.publicKey === us && m.variant === requiredVariant)) { - dumps.push({ - publicKey: us, - variant: requiredVariant, - }); - } - }); - } + LibSessionUtil.requiredUserVariants.forEach(requiredVariant => { + if (!dumps.find(m => m.publicKey === us && m.variant === requiredVariant)) { + dumps.push({ + publicKey: us, + variant: requiredVariant, + }); + } + }); - const results: Array = []; - const variantsNeedingPush = new Set(); + const results: Array> = []; + const variantsNeedingPush = new Set(); for (let index = 0; index < dumps.length; index++) { const dump = dumps[index]; const variant = dump.variant; if (!isUserConfigWrapperType(variant)) { - window.log.info('// TODO Audric'); + // this shouldn't happen for our pubkey. continue; } const needsPush = await GenericWrapperActions.needsPush(variant); @@ -179,13 +183,12 @@ async function pendingChangesForPubkey(pubkey: string): Promise>> { + const dumps = await ConfigDumpData.getAllDumpsWithoutDataFor(groupPk); + + const results: Array> = []; + const variantsNeedingPush = new Set(); + + if (!PubKey.isClosedGroupV3(groupPk)) { + throw new Error(`pendingChangesForGroup only works for user or 03 group pubkeys`); + } + + for (let index = 0; index < dumps.length; index++) { + const dump = dumps[index]; + const variant = dump.variant; + if (!isMetaWrapperType(variant)) { + // shouldn't happen + continue; + } + + // one of the wrapper behind the metagroup needs a push + const needsPush = await MetaGroupWrapperActions.needsPush(groupPk); + + if (!needsPush) { + continue; + } + + const { groupInfo, groupMember } = await MetaGroupWrapperActions.push(groupPk); + if (groupInfo) { + variantsNeedingPush.add('GroupInfo'); + results.push({ + message: new SharedGroupConfigMessage({ + data: groupInfo.data, + kind: SignalService.SharedConfigMessage.Kind.GROUP_INFO, + seqno: Long.fromNumber(groupInfo.seqno), + timestamp: GetNetworkTime.getNowWithNetworkOffset(), + }), + oldMessageHashes: groupInfo.hashes, + namespace: groupInfo.namespace, + }); + } + if (groupMember) { + variantsNeedingPush.add('GroupMember'); + results.push({ + message: new SharedGroupConfigMessage({ + data: groupMember.data, + kind: SignalService.SharedConfigMessage.Kind.GROUP_MEMBERS, + seqno: Long.fromNumber(groupMember.seqno), + timestamp: GetNetworkTime.getNowWithNetworkOffset(), + }), + oldMessageHashes: groupMember.hashes, + namespace: groupMember.namespace, + }); + } + } + window.log.info(`those variants needs push: "${[...variantsNeedingPush]}"`); + + return results; +} + +function userKindToVariant(kind: UserConfigKind): ConfigWrapperUser { switch (kind) { case SignalService.SharedConfigMessage.Kind.USER_PROFILE: return 'UserConfig'; @@ -212,12 +274,11 @@ function kindToVariant(kind: SignalService.SharedConfigMessage.Kind): ConfigWrap case SignalService.SharedConfigMessage.Kind.CONVO_INFO_VOLATILE: return 'ConvoInfoVolatileConfig'; default: - assertUnreachable(kind, `kindToVariant: Unsupported variant: "${kind}"`); + assertUnreachable(kind, `userKindToVariant: Unsupported variant: "${kind}"`); } } -// eslint-disable-next-line consistent-return -function variantToKind(variant: ConfigWrapperObjectTypes): SignalService.SharedConfigMessage.Kind { +function userVariantToUserKind(variant: ConfigWrapperUser) { switch (variant) { case 'UserConfig': return SignalService.SharedConfigMessage.Kind.USER_PROFILE; @@ -228,31 +289,39 @@ function variantToKind(variant: ConfigWrapperObjectTypes): SignalService.SharedC case 'ConvoInfoVolatileConfig': return SignalService.SharedConfigMessage.Kind.CONVO_INFO_VOLATILE; default: - assertUnreachable(variant, `variantToKind: Unsupported kind: "${variant}"`); + assertUnreachable(variant, `userVariantToKind: Unsupported kind: "${variant}"`); + } +} + +function groupKindToVariant(kind: GroupConfigKind, groupPk: GroupPubkeyType): ConfigWrapperGroup { + if (!PubKey.isClosedGroupV3(groupPk)) { + throw new Error(`Not a groupPk starting with 03: ${groupPk}`); + } + switch (kind) { + case SignalService.SharedConfigMessage.Kind.GROUP_INFO: + case SignalService.SharedConfigMessage.Kind.GROUP_KEYS: + case SignalService.SharedConfigMessage.Kind.GROUP_MEMBERS: + return `MetaGroupConfig-${groupPk}`; + default: + assertUnreachable(kind, `userKindToVariant: Unsupported variant: "${kind}"`); } } /** * Returns true if the config needs to be dumped afterwards */ -async function markAsPushed( - variant: ConfigWrapperUser, - pubkey: string, - seqno: number, - hash: string -) { - if (pubkey !== UserUtils.getOurPubKeyStrFromCache()) { - throw new Error('FIXME, generic case is to be done'); // TODO Audric - } +async function markAsPushed(variant: ConfigWrapperUser, seqno: number, hash: string) { await GenericWrapperActions.confirmPushed(variant, seqno, hash); return GenericWrapperActions.needsDump(variant); } export const LibSessionUtil = { initializeLibSessionUtilWrappers, + userVariantToUserKind, requiredUserVariants, - pendingChangesForPubkey, - kindToVariant, - variantToKind, + pendingChangesForUs, + pendingChangesForGroup, + userKindToVariant, + groupKindToVariant, markAsPushed, }; diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts index fd596ad7fb..9790433a45 100644 --- a/ts/session/utils/sync/syncUtils.ts +++ b/ts/session/utils/sync/syncUtils.ts @@ -8,6 +8,9 @@ import { ConversationModel } from '../../../models/conversation'; import { SignalService } from '../../../protobuf'; import { ECKeyPair } from '../../../receiver/keypairs'; import { ConfigurationSyncJobDone } from '../../../shims/events'; +import { ReleasedFeatures } from '../../../util/releaseFeature'; +import { Storage } from '../../../util/storage'; +import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils'; import { SnodeNamespaces } from '../../apis/snode_api/namespaces'; import { DURATION } from '../../constants'; import { getConversationController } from '../../conversations'; @@ -18,7 +21,7 @@ import { } from '../../messages/outgoing/controlMessage/ConfigurationMessage'; import { ExpirationTimerUpdateMessage } from '../../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; import { MessageRequestResponse } from '../../messages/outgoing/controlMessage/MessageRequestResponse'; -import { SharedConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; +import { SharedUserConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; import { UnsendMessage } from '../../messages/outgoing/controlMessage/UnsendMessage'; import { AttachmentPointerWithUrl, @@ -27,11 +30,8 @@ import { VisibleMessage, } from '../../messages/outgoing/visibleMessage/VisibleMessage'; import { PubKey } from '../../types'; -import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob'; import { fromBase64ToArray, fromHexToArray } from '../String'; -import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils'; -import { Storage } from '../../../util/storage'; -import { ReleasedFeatures } from '../../../util/releaseFeature'; +import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob'; const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp'; @@ -354,7 +354,7 @@ export type SyncMessageType = | ConfigurationMessage | MessageRequestResponse | UnsendMessage - | SharedConfigMessage; + | SharedUserConfigMessage; export const buildSyncMessage = ( identifier: string, diff --git a/ts/state/ducks/groupInfos.ts b/ts/state/ducks/groupInfos.ts index 9e06da446e..422cec21b4 100644 --- a/ts/state/ducks/groupInfos.ts +++ b/ts/state/ducks/groupInfos.ts @@ -10,6 +10,7 @@ import { UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; +import { uniq } from 'lodash'; type GroupInfoGetWithId = GroupInfoGet & { id: GroupPubkeyType }; @@ -76,21 +77,18 @@ const initNewGroupInfoInWrapper = createAsyncThunk( console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?'); const us = UserUtils.getOurPubKeyStrFromCache(); - const setOfMembers = new Set(...groupDetails.members); - // Ensure the current user is a member - setOfMembers.add(us); + // Ensure the current user is a member and admin + const members = uniq([...groupDetails.members, us]); const updateGroupDetails: ClosedGroup.GroupInfo = { id: newGroup.pubkeyHex, name: groupDetails.groupName, - members: [...setOfMembers], + members, admins: [us], activeAt: Date.now(), expireTimer: 0, }; - // we don't want the initial "AAA and You joined the group" - // be sure to call this before sending the message. // the sending pipeline needs to know from GroupUtils when a message is for a medium group await ClosedGroup.updateOrCreateClosedGroup(updateGroupDetails); diff --git a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts b/ts/test/session/unit/receiving/ConfigurationMessage_test.ts deleted file mode 100644 index 9466c1d3b8..0000000000 --- a/ts/test/session/unit/receiving/ConfigurationMessage_test.ts +++ /dev/null @@ -1,97 +0,0 @@ -import chai from 'chai'; -import Sinon from 'sinon'; -import chaiAsPromised from 'chai-as-promised'; - -import { SignalService } from '../../../../protobuf'; - -import { ConfigurationMessage } from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage'; -import { UserUtils } from '../../../../session/utils'; -import { TestUtils } from '../../../test-utils'; - -import * as cache from '../../../../receiver/cache'; -import { EnvelopePlus } from '../../../../receiver/types'; - -import { ConfigMessageHandler } from '../../../../receiver/configMessage'; -import { ConfigurationSync } from '../../../../session/utils/job_runners/jobs/ConfigurationSyncJob'; -import { ReleasedFeatures } from '../../../../util/releaseFeature'; -import { stubData } from '../../../test-utils/utils'; - -chai.use(chaiAsPromised as any); -chai.should(); - -const { expect } = chai; - -describe('handleConfigurationMessageLegacy_receiving', () => { - let createOrUpdateStub: Sinon.SinonStub; - let getItemByIdStub: Sinon.SinonStub; - let sender: string; - - let envelope: EnvelopePlus; - let config: ConfigurationMessage; - - beforeEach(() => { - TestUtils.stubWindowFeatureFlags(); - Sinon.stub(cache, 'removeFromCache').resolves(); - sender = TestUtils.generateFakePubKey().key; - config = new ConfigurationMessage({ - activeOpenGroups: [], - activeClosedGroups: [], - timestamp: Date.now(), - identifier: 'identifier', - displayName: 'displayName', - contacts: [], - }); - Sinon.stub(ConfigurationSync, 'queueNewJobIfNeeded').resolves(); - TestUtils.stubWindow('setSettingValue', () => undefined); - }); - - afterEach(() => { - Sinon.restore(); - }); - - it('should not be processed if we do not have a pubkey', async () => { - TestUtils.stubWindowLog(); - Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').resolves(undefined); - - envelope = TestUtils.generateEnvelopePlus(sender); - - const proto = config.contentProto(); - createOrUpdateStub = stubData('createOrUpdateItem').resolves(); - getItemByIdStub = stubData('getItemById').resolves(); - const checkIsUserConfigFeatureReleasedStub = Sinon.stub( - ReleasedFeatures, - 'checkIsUserConfigFeatureReleased' - ).resolves(false); - await ConfigMessageHandler.handleConfigurationMessageLegacy( - envelope, - proto.configurationMessage as SignalService.ConfigurationMessage - ); - - expect(createOrUpdateStub.callCount).to.equal(0); - expect(getItemByIdStub.callCount).to.equal(0); - expect(checkIsUserConfigFeatureReleasedStub.callCount).to.be.eq(1); // should only have the one as part of the global legacy check, but none for the smaller handlers - }); - - describe('with ourNumber set', () => { - const ourNumber = TestUtils.generateFakePubKey().key; - - beforeEach(() => { - Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').resolves(ourNumber); - }); - - it('should not be processed if the message is not coming from our number', async () => { - const proto = config.contentProto(); - // sender !== ourNumber - envelope = TestUtils.generateEnvelopePlus(sender); - Sinon.stub(ReleasedFeatures, 'checkIsUserConfigFeatureReleased').resolves(false); - createOrUpdateStub = stubData('createOrUpdateItem').resolves(); - getItemByIdStub = stubData('getItemById').resolves(); - await ConfigMessageHandler.handleConfigurationMessageLegacy( - envelope, - proto.configurationMessage as SignalService.ConfigurationMessage - ); - expect(createOrUpdateStub.callCount).to.equal(0); - expect(getItemByIdStub.callCount).to.equal(0); - }); - }); -}); diff --git a/ts/types/ProtobufKind.ts b/ts/types/ProtobufKind.ts new file mode 100644 index 0000000000..567c327b2c --- /dev/null +++ b/ts/types/ProtobufKind.ts @@ -0,0 +1,32 @@ +import { SignalService } from '../protobuf'; +import { PickEnum } from './Enums'; + +export type UserConfigKind = PickEnum< + SignalService.SharedConfigMessage.Kind, + | SignalService.SharedConfigMessage.Kind.USER_PROFILE + | SignalService.SharedConfigMessage.Kind.CONTACTS + | SignalService.SharedConfigMessage.Kind.USER_GROUPS + | SignalService.SharedConfigMessage.Kind.CONVO_INFO_VOLATILE +>; + +export function isUserKind(kind: SignalService.SharedConfigMessage.Kind): kind is UserConfigKind { + const Kind = SignalService.SharedConfigMessage.Kind; + return ( + kind === Kind.USER_PROFILE || + kind === Kind.CONTACTS || + kind === Kind.USER_GROUPS || + kind === Kind.CONVO_INFO_VOLATILE + ); +} + +export type GroupConfigKind = PickEnum< + SignalService.SharedConfigMessage.Kind, + | SignalService.SharedConfigMessage.Kind.GROUP_INFO + | SignalService.SharedConfigMessage.Kind.GROUP_MEMBERS + | SignalService.SharedConfigMessage.Kind.GROUP_KEYS +>; + +export function isGroupKind(kind: SignalService.SharedConfigMessage.Kind): kind is GroupConfigKind { + const Kind = SignalService.SharedConfigMessage.Kind; + return kind === Kind.GROUP_INFO || kind === Kind.GROUP_MEMBERS || kind === Kind.GROUP_KEYS; +} diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 39756b6a2c..cc3a95fbd2 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -13,7 +13,7 @@ import { OpenGroupV2Room } from '../data/opengroups'; import { ConversationAttributes } from '../models/conversationAttributes'; import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil'; import { fromHexToArray } from '../session/utils/String'; -import { ConfigWrapperObjectTypes } from '../webworker/workers/browser/libsession_worker_functions'; +import { ConfigWrapperObjectTypesMeta } from '../webworker/workers/browser/libsession_worker_functions'; /** * This wrapper can be used to make a function type not async, asynced. @@ -45,7 +45,7 @@ export type UpdateLastHashType = { }; export type ConfigDumpRow = { - variant: ConfigWrapperObjectTypes; // the variant this entry is about. (user pr, contacts, ...) + variant: ConfigWrapperObjectTypesMeta; // the variant this entry is about. (user pr, contacts, ...) publicKey: string; // either our pubkey if a dump for our own swarm or the closed group pubkey data: Uint8Array; // the blob returned by libsession.dump() call }; @@ -58,13 +58,14 @@ export const CONFIG_DUMP_TABLE = 'configDump'; export type ConfigDumpDataNode = { getByVariantAndPubkey: ( - variant: ConfigWrapperObjectTypes, + variant: ConfigWrapperObjectTypesMeta, publicKey: string ) => Array; saveConfigDump: (dump: ConfigDumpRow) => void; getAllDumpsWithData: () => Array; getAllDumpsWithoutData: () => Array; + getAllDumpsWithoutDataFor: (pk: string) => Array; }; // ========== unprocessed diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts index 76f2e972d3..332866249f 100644 --- a/ts/util/releaseFeature.ts +++ b/ts/util/releaseFeature.ts @@ -101,11 +101,17 @@ async function checkIsUserConfigFeatureReleased() { return checkIsFeatureReleased('user_config_libsession'); } +// TODO AUDRIC maybe we want this, maybe we don't? +async function checkIsNewGroupsReleased() { + return true; +} + function isUserConfigFeatureReleasedCached(): boolean { return !!isUserConfigLibsessionFeatureReleased; } export const ReleasedFeatures = { checkIsUserConfigFeatureReleased, + checkIsNewGroupsReleased, isUserConfigFeatureReleasedCached, }; diff --git a/ts/webworker/workers/browser/libsession_worker_functions.ts b/ts/webworker/workers/browser/libsession_worker_functions.ts index d2301c631c..3fd1e8b41c 100644 --- a/ts/webworker/workers/browser/libsession_worker_functions.ts +++ b/ts/webworker/workers/browser/libsession_worker_functions.ts @@ -28,10 +28,17 @@ export type ConfigWrapperUser = export type ConfigWrapperGroup = MetaGroupConfig; -export type ConfigWrapperObjectTypes = +export type ConfigWrapperObjectTypesMeta = | ConfigWrapperUser | ConfigWrapperGroup; + + export type ConfigWrapperGroupDetailed = 'GroupInfo' | 'GroupMember'| 'GroupKeys'; + + export type ConfigWrapperObjectTypesDetailed = + | ConfigWrapperUser + | ConfigWrapperGroupDetailed; + type UserConfigFunctions = | [UserConfig, ...BaseConfigActions] | [UserConfig, ...UserConfigActionsType]; @@ -57,7 +64,7 @@ export type LibSessionWorkerFunctions = | ConvoInfoVolatileConfigFunctions | MetaGroupFunctions; -export function isUserConfigWrapperType(config: ConfigWrapperObjectTypes): config is ConfigWrapperUser { +export function isUserConfigWrapperType(config: ConfigWrapperObjectTypesMeta): config is ConfigWrapperUser { return ( config === 'ContactsConfig' || config === 'UserConfig' || @@ -66,7 +73,7 @@ export function isUserConfigWrapperType(config: ConfigWrapperObjectTypes): confi ); } -export function isMetaWrapperType(config: ConfigWrapperObjectTypes): config is MetaGroupConfig { +export function isMetaWrapperType(config: ConfigWrapperObjectTypesMeta): config is MetaGroupConfig { return config.startsWith(MetaGroupConfigValue); } diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 5d18b5fdb1..a4be752179 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -58,7 +58,6 @@ type GenericWrapperActionsCalls = { needsDump: GenericWrapperActionsCall; needsPush: GenericWrapperActionsCall; push: GenericWrapperActionsCall; - storageNamespace: GenericWrapperActionsCall; currentHashes: GenericWrapperActionsCall; }; @@ -91,10 +90,6 @@ export const GenericWrapperActions: GenericWrapperActionsCalls = { >, push: async (wrapperId: ConfigWrapperUser) => callLibSessionWorker([wrapperId, 'push']) as ReturnType, - storageNamespace: async (wrapperId: ConfigWrapperUser) => - callLibSessionWorker([wrapperId, 'storageNamespace']) as ReturnType< - GenericWrapperActionsCalls['storageNamespace'] - >, currentHashes: async (wrapperId: ConfigWrapperUser) => callLibSessionWorker([wrapperId, 'currentHashes']) as ReturnType< GenericWrapperActionsCalls['currentHashes'] @@ -113,7 +108,6 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = { needsDump: async () => GenericWrapperActions.needsDump('UserConfig'), needsPush: async () => GenericWrapperActions.needsPush('UserConfig'), push: async () => GenericWrapperActions.push('UserConfig'), - storageNamespace: async () => GenericWrapperActions.storageNamespace('UserConfig'), currentHashes: async () => GenericWrapperActions.currentHashes('UserConfig'), /** UserConfig wrapper specific actions */ @@ -160,7 +154,6 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = { needsDump: async () => GenericWrapperActions.needsDump('ContactsConfig'), needsPush: async () => GenericWrapperActions.needsPush('ContactsConfig'), push: async () => GenericWrapperActions.push('ContactsConfig'), - storageNamespace: async () => GenericWrapperActions.storageNamespace('ContactsConfig'), currentHashes: async () => GenericWrapperActions.currentHashes('ContactsConfig'), /** ContactsConfig wrapper specific actions */ @@ -196,7 +189,6 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = { needsDump: async () => GenericWrapperActions.needsDump('UserGroupsConfig'), needsPush: async () => GenericWrapperActions.needsPush('UserGroupsConfig'), push: async () => GenericWrapperActions.push('UserGroupsConfig'), - storageNamespace: async () => GenericWrapperActions.storageNamespace('UserGroupsConfig'), currentHashes: async () => GenericWrapperActions.currentHashes('UserGroupsConfig'), /** UserGroups wrapper specific actions */ @@ -294,7 +286,6 @@ export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCal needsDump: async () => GenericWrapperActions.needsDump('ConvoInfoVolatileConfig'), needsPush: async () => GenericWrapperActions.needsPush('ConvoInfoVolatileConfig'), push: async () => GenericWrapperActions.push('ConvoInfoVolatileConfig'), - storageNamespace: async () => GenericWrapperActions.storageNamespace('ConvoInfoVolatileConfig'), currentHashes: async () => GenericWrapperActions.currentHashes('ConvoInfoVolatileConfig'), /** ConvoInfoVolatile wrapper specific actions */ @@ -398,6 +389,13 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'metaDump']) as Promise< ReturnType >, + metaConfirmPushed: async ( + groupPk: GroupPubkeyType, + args: Parameters[1] + ) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'metaConfirmPushed', args]) as Promise< + ReturnType + >, /** GroupInfo wrapper specific actions */ infoGet: async (groupPk: GroupPubkeyType) => diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index 1c0ad1f1b2..6b2c2bf641 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -14,7 +14,7 @@ import { isEmpty, isNull } from 'lodash'; import { ConfigWrapperGroup, - ConfigWrapperObjectTypes, + ConfigWrapperObjectTypesMeta, ConfigWrapperUser, MetaGroupConfig, isMetaWrapperType, @@ -116,14 +116,14 @@ function isUInt8Array(value: any) { return value.constructor === Uint8Array; } -function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypes): ConfigWrapperUser { +function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypesMeta): ConfigWrapperUser { if (!isUserConfigWrapperType(wrapperType)) { throw new Error(`wrapperType "${wrapperType} is not of type User"`); } return wrapperType; } -function assertGroupWrapperType(wrapperType: ConfigWrapperObjectTypes): ConfigWrapperGroup { +function assertGroupWrapperType(wrapperType: ConfigWrapperObjectTypesMeta): ConfigWrapperGroup { if (!isMetaWrapperType(wrapperType)) { throw new Error(`wrapperType "${wrapperType} is not of type Group"`); } @@ -208,7 +208,7 @@ function initGroupWrapper(options: Array, wrapperType: ConfigWrapperGroup) assertUnreachable(groupType, `initGroupWrapper: Missing case error "${groupType}"`); } -onmessage = async (e: { data: [number, ConfigWrapperObjectTypes, string, ...any] }) => { +onmessage = async (e: { data: [number, ConfigWrapperObjectTypesMeta, string, ...any] }) => { const [jobId, config, action, ...args] = e.data; try { From 42913371df41f474392a8d88d045822821ad7277 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 11 Sep 2023 17:07:09 +1000 Subject: [PATCH 007/302] fix: remove groups from protobuf --- protos/SignalService.proto | 3 - ts/receiver/configMessage.ts | 9 +- .../apis/snode_api/SnodeRequestTypes.ts | 16 ++- .../controlMessage/SharedConfigMessage.ts | 19 +--- ts/session/sending/MessageQueue.ts | 7 +- ts/session/sending/MessageSender.ts | 51 +++++++++ .../job_runners/jobs/ConfigurationSyncJob.ts | 2 +- .../utils/job_runners/jobs/GroupConfigJob.ts | 90 ++++++++------- .../utils/libsession/libsession_utils.ts | 103 +++++++----------- ts/types/ProtobufKind.ts | 12 -- 10 files changed, 156 insertions(+), 156 deletions(-) diff --git a/protos/SignalService.proto b/protos/SignalService.proto index adc5b7389b..eb5359bcb8 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -44,9 +44,6 @@ message SharedConfigMessage { CONTACTS = 2; CONVO_INFO_VOLATILE = 3; USER_GROUPS = 4; - GROUP_INFO = 5; - GROUP_MEMBERS = 6; - GROUP_KEYS = 7; } required Kind kind = 1; diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index f2d2091126..150d6ea4d3 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -34,7 +34,7 @@ import { getGroupPubkeyFromWrapperType, isUserConfigWrapperType, } from '../../ts/webworker/workers/browser/libsession_worker_functions'; -import { GroupConfigKind, UserConfigKind, isUserKind } from '../types/ProtobufKind'; +import { UserConfigKind, isUserKind } from '../types/ProtobufKind'; import { ContactsWrapperActions, ConvoInfoVolatileWrapperActions, @@ -47,17 +47,14 @@ import { addKeyPairToCacheAndDBIfNeeded } from './closedGroups'; import { HexKeyPair } from './keypairs'; import { queueAllCachedFromSource } from './receiver'; -type IncomingConfResult = { +type IncomingUserResult = { needsPush: boolean; needsDump: boolean; - kind: T; + kind: UserConfigKind; publicKey: string; latestEnvelopeTimestamp: number; }; -type IncomingUserResult = IncomingConfResult; -type IncomingGroupResult = IncomingConfResult; - function byUserVariant( incomingConfigs: Array> ) { diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 39f571561b..e75eced7f6 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1,7 +1,5 @@ -import { - SharedGroupConfigMessage, - SharedUserConfigMessage, -} from '../../messages/outgoing/controlMessage/SharedConfigMessage'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { SharedUserConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; import { SnodeNamespaces } from './namespaces'; export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } }; @@ -112,7 +110,15 @@ export type StoreOnNodeMessage = { pubkey: string; timestamp: number; namespace: number; - message: SharedUserConfigMessage | SharedGroupConfigMessage; + message: SharedUserConfigMessage; +}; + +export type StoreOnNodeData = { + pubkey: GroupPubkeyType; + networkTimestamp: number; + namespace: number; + data: Uint8Array; + ttl: number; }; export type StoreOnNodeSubRequest = { method: 'store'; params: StoreOnNodeParams }; diff --git a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts index cf60147e67..7c3456a6c2 100644 --- a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts @@ -5,17 +5,16 @@ import { SignalService } from '../../../../protobuf'; import { MessageParams } from '../Message'; import { ContentMessage } from '..'; import { TTL_DEFAULT } from '../../../constants'; -import { GroupConfigKind, UserConfigKind } from '../../../../types/ProtobufKind'; +import { UserConfigKind } from '../../../../types/ProtobufKind'; -interface SharedConfigParams - extends MessageParams { +interface SharedConfigParams extends MessageParams { seqno: Long; data: Uint8Array; kind: KindsPicked; } export abstract class SharedConfigMessage< - KindsPicked extends UserConfigKind | GroupConfigKind + KindsPicked extends UserConfigKind > extends ContentMessage { public readonly seqno: Long; public readonly kind: KindsPicked; @@ -58,15 +57,3 @@ export class SharedUserConfigMessage extends SharedConfigMessage }); } } - -export class SharedGroupConfigMessage extends SharedConfigMessage { - constructor(params: SharedConfigParams) { - super({ - timestamp: params.timestamp, - identifier: params.identifier, - data: params.data, - kind: params.kind, - seqno: params.seqno, - }); - } -} diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index d9d25a722a..1ac531d71b 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -233,12 +233,7 @@ export class MessageQueue { pubkey, }: { pubkey: PubKey; - message: - | ClosedGroupNewMessage - | CallMessage - // | SharedUserConfigMessage - // | SharedGroupConfigMessage - | ClosedGroupMemberLeftMessage; + message: ClosedGroupNewMessage | CallMessage | ClosedGroupMemberLeftMessage; namespace: SnodeNamespaces; }): Promise { let rawMessage; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 6797526e0d..abeb5a4e84 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -17,6 +17,7 @@ import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; import { getSwarmFor } from '../apis/snode_api/snodePool'; import { NotEmptyArrayOfBatchResults, + StoreOnNodeData, StoreOnNodeMessage, StoreOnNodeParams, StoreOnNodeParamsNoSig, @@ -37,6 +38,8 @@ import { PubKey } from '../types'; import { RawMessage } from '../types/RawMessage'; import { EmptySwarmError } from '../utils/errors'; import { fromUInt8ArrayToBase64 } from '../utils/String'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { to_base64 } from 'libsodium-wrappers-sumo'; // ================ SNODE STORE ================ @@ -446,6 +449,53 @@ async function sendMessagesToSnode( } } +/** + * Send an array of preencrypted data to the corresponding swarm. + * Used currently only for sending libsession GroupInfo, GroupMembers and groupKeys config updates. + * + * @param params the data to deposit + * @param destination the pubkey we should deposit those message to + * @returns the hashes of successful deposit + */ +async function sendEncryptedDataToSnode( + encryptedData: Array, + destination: GroupPubkeyType, + messagesHashesToDelete: Set | null +): Promise { + try { + const batchResults = await pRetry( + async () => { + return MessageSender.sendMessagesDataToSnode( + encryptedData.map(content => ({ + pubkey: destination, + data64: to_base64(content.data), + ttl: content.ttl, + timestamp: content.networkTimestamp, + namespace: content.namespace, + })), + destination, + messagesHashesToDelete + ); + }, + { + retries: 2, + factor: 1, + minTimeout: MessageSender.getMinRetryTimeout(), + maxTimeout: 1000, + } + ); + + if (!batchResults || isEmpty(batchResults)) { + throw new Error('result is empty for sendEncryptedDataToSnode'); + } + + return batchResults; + } catch (e) { + window.log.warn(`sendEncryptedDataToSnode failed with ${e.message}`); + return null; + } +} + async function buildEnvelope( type: SignalService.Envelope.Type, sskSource: string | undefined, @@ -543,6 +593,7 @@ export const MessageSender = { sendToOpenGroupV2BlindedRequest, sendMessagesDataToSnode, sendMessagesToSnode, + sendEncryptedDataToSnode, getMinRetryTimeout, sendToOpenGroupV2, send, diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts index 4b17443374..b47edcc6bd 100644 --- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts @@ -31,7 +31,7 @@ const defaultMaxAttempts = 2; */ let lastRunConfigSyncJobTimestamp: number | null = null; -export type SingleDestinationChanges = { +type SingleDestinationChanges = { messages: Array>; allOldHashes: Array; }; diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index 9e9db631af..5959fa51e2 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -5,14 +5,19 @@ import { UserUtils } from '../..'; import { ConfigDumpData } from '../../../../data/configDump/configDump'; import { ReleasedFeatures } from '../../../../util/releaseFeature'; import { isSignInByLinking } from '../../../../util/storage'; -import { isMetaWrapperType } from '../../../../webworker/workers/browser/libsession_worker_functions'; -import { NotEmptyArrayOfBatchResults } from '../../../apis/snode_api/SnodeRequestTypes'; +import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { + NotEmptyArrayOfBatchResults, + StoreOnNodeData, +} from '../../../apis/snode_api/SnodeRequestTypes'; +import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; +import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; +import { TTL_DEFAULT } from '../../../constants'; import { getConversationController } from '../../../conversations'; -import { SharedGroupConfigMessage } from '../../../messages/outgoing/controlMessage/SharedConfigMessage'; import { MessageSender } from '../../../sending/MessageSender'; import { PubKey } from '../../../types'; import { allowOnlyOneAtATime } from '../../Promise'; -import { LibSessionUtil, OutgoingConfResult } from '../../libsession/libsession_utils'; +import { LibSessionUtil, PendingChangesForGroup } from '../../libsession/libsession_utils'; import { runners } from '../JobRunner'; import { AddJobCheckReturn, @@ -20,9 +25,6 @@ import { PersistedJob, RunJobResult, } from '../PersistedJob'; -import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { SignalService } from '../../../../protobuf'; -import { GroupConfigKind } from '../../../../types/ProtobufKind'; const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s) const defaultMaxAttempts = 2; @@ -33,13 +35,13 @@ const defaultMaxAttempts = 2; */ let lastRunConfigSyncJobTimestamp: number | null = null; -export type SingleDestinationChanges = { - messages: Array>; +type GroupSingleDestinationChanges = { + messages: Array; allOldHashes: Array; }; type SuccessfulChange = { - message: SharedGroupConfigMessage; + pushed: PendingChangesForGroup; updatedHash: string; }; @@ -47,14 +49,24 @@ type SuccessfulChange = { * Later in the syncing logic, we want to batch-send all the updates for a pubkey in a single batch call. * To make this easier, this function prebuilds and merges together all the changes for each pubkey. */ -async function retrieveSingleDestinationChanges( +async function retrieveGroupSingleDestinationChanges( groupPk: GroupPubkeyType -): Promise { +): Promise { const outgoingConfResults = await LibSessionUtil.pendingChangesForGroup(groupPk); - const compactedHashes = compact(outgoingConfResults.map(m => m.oldMessageHashes)).flat(); - - return { messages: outgoingConfResults, allOldHashes: compactedHashes }; + const compactedHashes = compact([...outgoingConfResults].map(m => m[1].oldMessageHashes)).flat(); + const sortedMessagesKeyFirst = compact( + [...outgoingConfResults.keys()] + .sort((a, b) => { + if (a === 'GroupKeys') return -1; + if (b === 'GroupKeys') return 1; + return 0; + }) + .map(key => { + return outgoingConfResults.get(key); + }) + ); + return { messages: sortedMessagesKeyFirst, allOldHashes: compactedHashes }; } /** @@ -62,7 +74,7 @@ async function retrieveSingleDestinationChanges( */ function resultsToSuccessfulChange( result: NotEmptyArrayOfBatchResults | null, - request: SingleDestinationChanges + request: GroupSingleDestinationChanges ): Array { const successfulChanges: Array = []; @@ -82,16 +94,13 @@ function resultsToSuccessfulChange( for (let j = 0; j < result.length; j++) { const batchResult = result[j]; const messagePostedHashes = batchResult?.body?.hash; + console.warn('messagePostedHashes', messagePostedHashes); - if ( - batchResult.code === 200 && - isString(messagePostedHashes) && - request.messages?.[j].message - ) { - // the library keeps track of the hashes to push and pushed using the hashes now + if (batchResult.code === 200 && isString(messagePostedHashes) && request.messages?.[j].data) { + // libsession keeps track of the hashes to push and pushed using the hashes now successfulChanges.push({ updatedHash: messagePostedHashes, - message: request.messages?.[j].message, + pushed: request.messages?.[j], }); } } @@ -110,27 +119,23 @@ async function buildAndSaveDumpsToDB( for (let i = 0; i < changes.length; i++) { const change = changes[i]; - const variant = LibSessionUtil.groupKindToVariant(change.message.kind, groupPk); - if (!isMetaWrapperType(variant)) { - throw new Error(`buildAndSaveDumpsToDB non metagroup variant: ${variant}`); - } - const Kind = SignalService.SharedConfigMessage.Kind; - switch (change.message.kind) { - case Kind.GROUP_INFO: { - toConfirm[1].groupInfo = [change.message.seqno.toNumber(), change.updatedHash]; + switch (change.pushed.namespace) { + case SnodeNamespaces.ClosedGroupInfo: { + toConfirm[1].groupInfo = [change.pushed.seqno.toNumber(), change.updatedHash]; break; } - case Kind.GROUP_MEMBERS: { - toConfirm[1].groupMember = [change.message.seqno.toNumber(), change.updatedHash]; + case SnodeNamespaces.ClosedGroupMembers: { + toConfirm[1].groupMember = [change.pushed.seqno.toNumber(), change.updatedHash]; break; } - case Kind.GROUP_KEYS: { - toConfirm[1].groupKeys = [change.message.seqno.toNumber(), change.updatedHash]; + case SnodeNamespaces.ClosedGroupKeys: { + toConfirm[1].groupKeys = [change.pushed.seqno.toNumber(), change.updatedHash]; break; } } } + await MetaGroupWrapperActions.metaConfirmPushed(...toConfirm); const metaNeedsDump = await MetaGroupWrapperActions.needsDump(groupPk); // save the concatenated dumps as a single entry in the DB if any of the dumps had a need for dump @@ -207,7 +212,7 @@ class GroupSyncJob extends PersistedJob { if (!newGroupsReleased) { return RunJobResult.Success; } - const singleDestChanges = await retrieveSingleDestinationChanges(thisJobDestination); + const singleDestChanges = await retrieveGroupSingleDestinationChanges(thisJobDestination); // If there are no pending changes then the job can just complete (next time something // is updated we want to try and run immediately so don't scuedule another run in this case) @@ -215,17 +220,18 @@ class GroupSyncJob extends PersistedJob { return RunJobResult.Success; } const oldHashesToDelete = new Set(singleDestChanges.allOldHashes); - const msgs = singleDestChanges.messages.map(item => { + + const msgs: Array = singleDestChanges.messages.map(item => { return { namespace: item.namespace, pubkey: thisJobDestination, - timestamp: item.message.timestamp, - ttl: item.message.ttl(), - message: item.message, + networkTimestamp: GetNetworkTime.getNowWithNetworkOffset(), + ttl: TTL_DEFAULT.TTL_CONFIG, + data: item.data, }; }); - const result = await MessageSender.sendMessagesToSnode( + const result = await MessageSender.sendEncryptedDataToSnode( msgs, thisJobDestination, oldHashesToDelete @@ -236,7 +242,7 @@ class GroupSyncJob extends PersistedJob { // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { window.log.info( - `ConfigurationSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` + `GroupSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` ); // this might be a 421 error (already handled) so let's retry this request a little bit later return RunJobResult.RetryJobIfPossible; diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 60c23b8b02..ded0705338 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -10,7 +10,6 @@ import { HexString } from '../../../node/hexStrings'; import { SignalService } from '../../../protobuf'; import { assertUnreachable, toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; import { - ConfigWrapperGroup, ConfigWrapperGroupDetailed, ConfigWrapperUser, getGroupPubkeyFromWrapperType, @@ -26,13 +25,12 @@ import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../apis/snode_api/namespaces'; import { SharedConfigMessage, - SharedGroupConfigMessage, SharedUserConfigMessage, } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; import { PubKey } from '../../types'; import { getUserED25519KeyPairBytes } from '../User'; import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob'; -import { GroupConfigKind, UserConfigKind } from '../../../types/ProtobufKind'; +import { UserConfigKind } from '../../../types/ProtobufKind'; const requiredUserVariants: Array = [ 'UserConfig', @@ -41,10 +39,7 @@ const requiredUserVariants: Array = [ 'ConvoInfoVolatileConfig', ]; -export type OutgoingConfResult< - K extends UserConfigKind | GroupConfigKind, - T extends SharedConfigMessage -> = { +export type OutgoingConfResult> = { message: T; namespace: SnodeNamespaces; oldMessageHashes: Array; @@ -203,60 +198,53 @@ async function pendingChangesForUs(): Promise< return results; } +export type PendingChangesForGroup = { + data: Uint8Array; + seqno: Long; + timestamp: number; + oldMessageHashes: Array; + namespace: SnodeNamespaces; +}; + async function pendingChangesForGroup( groupPk: GroupPubkeyType -): Promise>> { - const dumps = await ConfigDumpData.getAllDumpsWithoutDataFor(groupPk); - - const results: Array> = []; +): Promise> { + const results: Map = new Map(); const variantsNeedingPush = new Set(); if (!PubKey.isClosedGroupV3(groupPk)) { throw new Error(`pendingChangesForGroup only works for user or 03 group pubkeys`); } - for (let index = 0; index < dumps.length; index++) { - const dump = dumps[index]; - const variant = dump.variant; - if (!isMetaWrapperType(variant)) { - // shouldn't happen - continue; - } + // one of the wrapper behind the metagroup needs a push + const needsPush = await MetaGroupWrapperActions.needsPush(groupPk); - // one of the wrapper behind the metagroup needs a push - const needsPush = await MetaGroupWrapperActions.needsPush(groupPk); + // we probably need to add the GROUP_KEYS check here - if (!needsPush) { - continue; - } + if (!needsPush) { + return results; + } - const { groupInfo, groupMember } = await MetaGroupWrapperActions.push(groupPk); - if (groupInfo) { - variantsNeedingPush.add('GroupInfo'); - results.push({ - message: new SharedGroupConfigMessage({ - data: groupInfo.data, - kind: SignalService.SharedConfigMessage.Kind.GROUP_INFO, - seqno: Long.fromNumber(groupInfo.seqno), - timestamp: GetNetworkTime.getNowWithNetworkOffset(), - }), - oldMessageHashes: groupInfo.hashes, - namespace: groupInfo.namespace, - }); - } - if (groupMember) { - variantsNeedingPush.add('GroupMember'); - results.push({ - message: new SharedGroupConfigMessage({ - data: groupMember.data, - kind: SignalService.SharedConfigMessage.Kind.GROUP_MEMBERS, - seqno: Long.fromNumber(groupMember.seqno), - timestamp: GetNetworkTime.getNowWithNetworkOffset(), - }), - oldMessageHashes: groupMember.hashes, - namespace: groupMember.namespace, - }); - } + const { groupInfo, groupMember } = await MetaGroupWrapperActions.push(groupPk); + if (groupInfo) { + variantsNeedingPush.add('GroupInfo'); + results.set('GroupInfo', { + data: groupInfo.data, + seqno: Long.fromNumber(groupInfo.seqno), + timestamp: GetNetworkTime.getNowWithNetworkOffset(), + oldMessageHashes: groupInfo.hashes, + namespace: groupInfo.namespace, + }); + } + if (groupMember) { + variantsNeedingPush.add('GroupMember'); + results.set('GroupMember', { + data: groupMember.data, + seqno: Long.fromNumber(groupMember.seqno), + timestamp: GetNetworkTime.getNowWithNetworkOffset(), + oldMessageHashes: groupMember.hashes, + namespace: groupMember.namespace, + }); } window.log.info(`those variants needs push: "${[...variantsNeedingPush]}"`); @@ -293,20 +281,6 @@ function userVariantToUserKind(variant: ConfigWrapperUser) { } } -function groupKindToVariant(kind: GroupConfigKind, groupPk: GroupPubkeyType): ConfigWrapperGroup { - if (!PubKey.isClosedGroupV3(groupPk)) { - throw new Error(`Not a groupPk starting with 03: ${groupPk}`); - } - switch (kind) { - case SignalService.SharedConfigMessage.Kind.GROUP_INFO: - case SignalService.SharedConfigMessage.Kind.GROUP_KEYS: - case SignalService.SharedConfigMessage.Kind.GROUP_MEMBERS: - return `MetaGroupConfig-${groupPk}`; - default: - assertUnreachable(kind, `userKindToVariant: Unsupported variant: "${kind}"`); - } -} - /** * Returns true if the config needs to be dumped afterwards */ @@ -322,6 +296,5 @@ export const LibSessionUtil = { pendingChangesForUs, pendingChangesForGroup, userKindToVariant, - groupKindToVariant, markAsPushed, }; diff --git a/ts/types/ProtobufKind.ts b/ts/types/ProtobufKind.ts index 567c327b2c..8e5e564ad4 100644 --- a/ts/types/ProtobufKind.ts +++ b/ts/types/ProtobufKind.ts @@ -18,15 +18,3 @@ export function isUserKind(kind: SignalService.SharedConfigMessage.Kind): kind i kind === Kind.CONVO_INFO_VOLATILE ); } - -export type GroupConfigKind = PickEnum< - SignalService.SharedConfigMessage.Kind, - | SignalService.SharedConfigMessage.Kind.GROUP_INFO - | SignalService.SharedConfigMessage.Kind.GROUP_MEMBERS - | SignalService.SharedConfigMessage.Kind.GROUP_KEYS ->; - -export function isGroupKind(kind: SignalService.SharedConfigMessage.Kind): kind is GroupConfigKind { - const Kind = SignalService.SharedConfigMessage.Kind; - return kind === Kind.GROUP_INFO || kind === Kind.GROUP_MEMBERS || kind === Kind.GROUP_KEYS; -} From f86b3689ba8fd8ff1b6096dab8e93a95af184126 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 12 Sep 2023 15:13:05 +1000 Subject: [PATCH 008/302] fix: add GroupSyncJob to push changes for group --- ts/mains/main_renderer.tsx | 2 + ts/session/apis/snode_api/namespaces.ts | 23 +++--- ts/session/apis/snode_api/swarmPolling.ts | 2 +- ts/session/sending/MessageSender.ts | 15 ++-- .../utils/job_runners/jobs/GroupConfigJob.ts | 79 +++++++------------ .../utils/libsession/libsession_utils.ts | 68 +++++++++++----- ts/state/ducks/groupInfos.ts | 3 + 7 files changed, 106 insertions(+), 86 deletions(-) diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx index ba2a7b5164..03b15a90a6 100644 --- a/ts/mains/main_renderer.tsx +++ b/ts/mains/main_renderer.tsx @@ -116,6 +116,8 @@ async function startJobRunners() { runners.avatarDownloadRunner.startProcessing(); await runners.configurationSyncRunner.loadJobsFromDb(); runners.configurationSyncRunner.startProcessing(); + await runners.groupSyncRunner.loadJobsFromDb(); + runners.groupSyncRunner.startProcessing(); } // We need this 'first' check because we don't want to start the app up any other time diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index db099c1cdc..1c9ac770ef 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -34,17 +34,22 @@ export enum SnodeNamespaces { /** * This is the namespace used to sync the closed group details for each closed group */ - ClosedGroupInfo = 11, + ClosedGroupMessages = 11, + + /** + * This is the namespace used to sync the closed group details for each closed group + */ + ClosedGroupKeys = 12, /** * This is the namespace used to sync the members for each closed group */ - ClosedGroupMembers = 12, + ClosedGroupInfo = 13, /** * This is the namespace used to sync the keys for each closed group */ - ClosedGroupKeys = 13, + ClosedGroupMembers = 14, } export type SnodeNamespacesGroup = PickEnum< @@ -78,6 +83,7 @@ function isUserConfigNamespace(namespace: SnodeNamespaces) { case SnodeNamespaces.ClosedGroupInfo: case SnodeNamespaces.ClosedGroupKeys: case SnodeNamespaces.ClosedGroupMembers: + case SnodeNamespaces.ClosedGroupMessages: case SnodeNamespaces.LegacyClosedGroup: return false; @@ -99,6 +105,7 @@ function isGroupConfigNamespace(namespace: SnodeNamespaces) { case SnodeNamespaces.UserGroups: case SnodeNamespaces.ConvoInfoVolatile: case SnodeNamespaces.LegacyClosedGroup: + case SnodeNamespaces.ClosedGroupMessages: return false; case SnodeNamespaces.ClosedGroupInfo: case SnodeNamespaces.ClosedGroupKeys: @@ -119,20 +126,18 @@ function isGroupConfigNamespace(namespace: SnodeNamespaces) { function namespacePriority(namespace: SnodeNamespaces): number { switch (namespace) { case SnodeNamespaces.Default: + case SnodeNamespaces.ClosedGroupMessages: return 10; - case SnodeNamespaces.UserContacts: - return 1; - case SnodeNamespaces.UserProfile: - return 1; case SnodeNamespaces.UserGroups: - return 1; case SnodeNamespaces.ConvoInfoVolatile: + case SnodeNamespaces.UserProfile: + case SnodeNamespaces.UserContacts: return 1; case SnodeNamespaces.LegacyClosedGroup: case SnodeNamespaces.ClosedGroupInfo: case SnodeNamespaces.ClosedGroupMembers: case SnodeNamespaces.ClosedGroupKeys: - return 10; + return 1; default: try { diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 16b1214a08..8cb7b46e95 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -189,9 +189,9 @@ export class SwarmPolling { if (isV3) { return this.pollOnceForKey(key, ConversationTypeEnum.GROUPV3, [ SnodeNamespaces.Default, - SnodeNamespaces.ClosedGroupKeys, SnodeNamespaces.ClosedGroupInfo, SnodeNamespaces.ClosedGroupMembers, + SnodeNamespaces.ClosedGroupKeys, // keys are fetched last to avoid race conditions when someone deposits them ]); } return this.pollOnceForKey(key, ConversationTypeEnum.GROUP, [ diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index abeb5a4e84..1f4cbed11f 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -2,6 +2,7 @@ import { AbortController } from 'abort-controller'; import ByteBuffer from 'bytebuffer'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; import _, { isEmpty, isNil, isString, sample, toNumber } from 'lodash'; import pRetry from 'p-retry'; import { Data } from '../../data/data'; @@ -12,9 +13,6 @@ import { sendMessageOnionV4BlindedRequest, sendSogsMessageOnionV4, } from '../apis/open_group_api/sogsv3/sogsV3SendMessage'; -import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; -import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; -import { getSwarmFor } from '../apis/snode_api/snodePool'; import { NotEmptyArrayOfBatchResults, StoreOnNodeData, @@ -22,6 +20,9 @@ import { StoreOnNodeParams, StoreOnNodeParamsNoSig, } from '../apis/snode_api/SnodeRequestTypes'; +import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; +import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; +import { getSwarmFor } from '../apis/snode_api/snodePool'; import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/snodeSignatures'; import { SnodeAPIStore } from '../apis/snode_api/storeMessage'; import { getConversationController } from '../conversations'; @@ -29,17 +30,15 @@ import { MessageEncrypter } from '../crypto'; import { addMessagePadding } from '../crypto/BufferPadding'; import { ContentMessage } from '../messages/outgoing'; import { ConfigurationMessage } from '../messages/outgoing/controlMessage/ConfigurationMessage'; -import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; +import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; import { ed25519Str } from '../onions/onionPath'; import { PubKey } from '../types'; import { RawMessage } from '../types/RawMessage'; -import { EmptySwarmError } from '../utils/errors'; import { fromUInt8ArrayToBase64 } from '../utils/String'; -import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { to_base64 } from 'libsodium-wrappers-sumo'; +import { EmptySwarmError } from '../utils/errors'; // ================ SNODE STORE ================ @@ -468,7 +467,7 @@ async function sendEncryptedDataToSnode( return MessageSender.sendMessagesDataToSnode( encryptedData.map(content => ({ pubkey: destination, - data64: to_base64(content.data), + data64: ByteBuffer.wrap(content.data).toString('base64'), ttl: content.ttl, timestamp: content.networkTimestamp, namespace: content.namespace, diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index 5959fa51e2..3eab28c954 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -1,6 +1,6 @@ /* eslint-disable no-await-in-loop */ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { compact, isArray, isEmpty, isNumber, isString } from 'lodash'; +import { isArray, isEmpty, isNumber, isString } from 'lodash'; import { UserUtils } from '../..'; import { ConfigDumpData } from '../../../../data/configDump/configDump'; import { ReleasedFeatures } from '../../../../util/releaseFeature'; @@ -17,7 +17,11 @@ import { getConversationController } from '../../../conversations'; import { MessageSender } from '../../../sending/MessageSender'; import { PubKey } from '../../../types'; import { allowOnlyOneAtATime } from '../../Promise'; -import { LibSessionUtil, PendingChangesForGroup } from '../../libsession/libsession_utils'; +import { + GroupSingleDestinationChanges, + LibSessionUtil, + PendingChangesForGroup, +} from '../../libsession/libsession_utils'; import { runners } from '../JobRunner'; import { AddJobCheckReturn, @@ -33,42 +37,13 @@ const defaultMaxAttempts = 2; * We want to run each of those jobs at least 3seconds apart. * So every time one of that job finishes, update this timestamp, so we know when adding a new job, what is the next minimun date to run it. */ -let lastRunConfigSyncJobTimestamp: number | null = null; - -type GroupSingleDestinationChanges = { - messages: Array; - allOldHashes: Array; -}; +const lastRunConfigSyncJobTimestamps = new Map(); type SuccessfulChange = { pushed: PendingChangesForGroup; updatedHash: string; }; -/** - * Later in the syncing logic, we want to batch-send all the updates for a pubkey in a single batch call. - * To make this easier, this function prebuilds and merges together all the changes for each pubkey. - */ -async function retrieveGroupSingleDestinationChanges( - groupPk: GroupPubkeyType -): Promise { - const outgoingConfResults = await LibSessionUtil.pendingChangesForGroup(groupPk); - - const compactedHashes = compact([...outgoingConfResults].map(m => m[1].oldMessageHashes)).flat(); - const sortedMessagesKeyFirst = compact( - [...outgoingConfResults.keys()] - .sort((a, b) => { - if (a === 'GroupKeys') return -1; - if (b === 'GroupKeys') return 1; - return 0; - }) - .map(key => { - return outgoingConfResults.get(key); - }) - ); - return { messages: sortedMessagesKeyFirst, allOldHashes: compactedHashes }; -} - /** * This function is run once we get the results from the multiple batch-send. */ @@ -94,7 +69,10 @@ function resultsToSuccessfulChange( for (let j = 0; j < result.length; j++) { const batchResult = result[j]; const messagePostedHashes = batchResult?.body?.hash; - console.warn('messagePostedHashes', messagePostedHashes); + console.error( + 'this might be wrong as the key message is first now messagePostedHashes', + messagePostedHashes + ); if (batchResult.code === 200 && isString(messagePostedHashes) && request.messages?.[j].data) { // libsession keeps track of the hashes to push and pushed using the hashes now @@ -116,6 +94,7 @@ async function buildAndSaveDumpsToDB( groupPk, { groupInfo: null, groupKeys: null, groupMember: null }, ]; + debugger; for (let i = 0; i < changes.length; i++) { const change = changes[i]; @@ -212,7 +191,7 @@ class GroupSyncJob extends PersistedJob { if (!newGroupsReleased) { return RunJobResult.Success; } - const singleDestChanges = await retrieveGroupSingleDestinationChanges(thisJobDestination); + const singleDestChanges = await LibSessionUtil.pendingChangesForGroup(thisJobDestination); // If there are no pending changes then the job can just complete (next time something // is updated we want to try and run immediately so don't scuedule another run in this case) @@ -287,7 +266,7 @@ class GroupSyncJob extends PersistedJob { } private updateLastTickTimestamp() { - lastRunConfigSyncJobTimestamp = Date.now(); + lastRunConfigSyncJobTimestamps.set(this.persistedData.identifier, Date.now()); } } @@ -301,6 +280,7 @@ async function queueNewJobIfNeeded(groupPk: GroupPubkeyType) { return; } + const lastRunConfigSyncJobTimestamp = lastRunConfigSyncJobTimestamps.get(groupPk); if ( !lastRunConfigSyncJobTimestamp || lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries @@ -311,24 +291,25 @@ async function queueNewJobIfNeeded(groupPk: GroupPubkeyType) { await runners.groupSyncRunner.addJob( new GroupSyncJob({ identifier: groupPk, nextAttemptTimestamp: Date.now() + 1000 }) ); - } else { - // if we did run at t=100, and it is currently t=110, the difference is 10 - const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0); - // but we want to run every 30, so what we need is actually `30-10` from now = 20 - const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 1000); - // window.log.debug('Scheduling GroupSyncJob: LATER'); - - await runners.groupSyncRunner.addJob( - new GroupSyncJob({ - identifier: groupPk, - nextAttemptTimestamp: Date.now() + leftBeforeNextTick, - }) - ); + return; } + + // if we did run at t=100, and it is currently t=110, the difference is 10 + const diff = Math.max(Date.now() - lastRunConfigSyncJobTimestamp, 0); + // but we want to run every 30, so what we need is actually `30-10` from now = 20 + const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 1000); + // window.log.debug('Scheduling GroupSyncJob: LATER'); + + await runners.groupSyncRunner.addJob( + new GroupSyncJob({ + identifier: groupPk, + nextAttemptTimestamp: Date.now() + leftBeforeNextTick, + }) + ); } export const GroupSync = { GroupSyncJob, queueNewJobIfNeeded: (groupPk: GroupPubkeyType) => - allowOnlyOneAtATime('GroupSyncJob-oneAtAtTime' + groupPk, () => queueNewJobIfNeeded(groupPk)), + allowOnlyOneAtATime(`GroupSyncJob-oneAtAtTime-${groupPk}`, () => queueNewJobIfNeeded(groupPk)), }; diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index ded0705338..175781e807 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -2,12 +2,13 @@ /* eslint-disable import/extensions */ /* eslint-disable import/no-unresolved */ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { difference, omit } from 'lodash'; +import { compact, difference, omit } from 'lodash'; import Long from 'long'; import { UserUtils } from '..'; import { ConfigDumpData } from '../../../data/configDump/configDump'; import { HexString } from '../../../node/hexStrings'; import { SignalService } from '../../../protobuf'; +import { UserConfigKind } from '../../../types/ProtobufKind'; import { assertUnreachable, toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; import { ConfigWrapperGroupDetailed, @@ -27,10 +28,10 @@ import { SharedConfigMessage, SharedUserConfigMessage, } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; +import { ed25519Str } from '../../onions/onionPath'; import { PubKey } from '../../types'; import { getUserED25519KeyPairBytes } from '../User'; import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob'; -import { UserConfigKind } from '../../../types/ProtobufKind'; const requiredUserVariants: Array = [ 'UserConfig', @@ -198,57 +199,86 @@ async function pendingChangesForUs(): Promise< return results; } -export type PendingChangesForGroup = { +type PendingChangesForGroupShared = { data: Uint8Array; seqno: Long; timestamp: number; - oldMessageHashes: Array; namespace: SnodeNamespaces; }; +type PendingChangesForGroupNonKey = PendingChangesForGroupShared & { + type: Extract; +}; + +type PendingChangesForGroupKey = Pick< + PendingChangesForGroupShared, + 'data' | 'namespace' | 'timestamp' +> & { type: Extract }; + +export type PendingChangesForGroup = PendingChangesForGroupNonKey | PendingChangesForGroupKey; + +export type GroupSingleDestinationChanges = { + messages: Array; + allOldHashes: Set; +}; + async function pendingChangesForGroup( groupPk: GroupPubkeyType -): Promise> { - const results: Map = new Map(); - const variantsNeedingPush = new Set(); - +): Promise { + const results = new Array(); if (!PubKey.isClosedGroupV3(groupPk)) { throw new Error(`pendingChangesForGroup only works for user or 03 group pubkeys`); } - // one of the wrapper behind the metagroup needs a push const needsPush = await MetaGroupWrapperActions.needsPush(groupPk); // we probably need to add the GROUP_KEYS check here if (!needsPush) { - return results; + return { messages: results, allOldHashes: new Set() }; + } + + const { groupInfo, groupMember, groupKeys } = await MetaGroupWrapperActions.push(groupPk); + debugger; + + // Note: We need the keys to be pushed first to avoid a race condition + if (groupKeys) { + results.push({ + type: 'GroupKeys', + data: groupKeys.data, + namespace: groupKeys.namespace, + timestamp: GetNetworkTime.getNowWithNetworkOffset(), + }); } - const { groupInfo, groupMember } = await MetaGroupWrapperActions.push(groupPk); if (groupInfo) { - variantsNeedingPush.add('GroupInfo'); - results.set('GroupInfo', { + results.push({ + type: 'GroupInfo', data: groupInfo.data, seqno: Long.fromNumber(groupInfo.seqno), timestamp: GetNetworkTime.getNowWithNetworkOffset(), - oldMessageHashes: groupInfo.hashes, namespace: groupInfo.namespace, }); } if (groupMember) { - variantsNeedingPush.add('GroupMember'); - results.set('GroupMember', { + results.push({ + type: 'GroupMember', data: groupMember.data, seqno: Long.fromNumber(groupMember.seqno), timestamp: GetNetworkTime.getNowWithNetworkOffset(), - oldMessageHashes: groupMember.hashes, namespace: groupMember.namespace, }); } - window.log.info(`those variants needs push: "${[...variantsNeedingPush]}"`); + window.log.debug( + `${ed25519Str(groupPk)} those group variants needs push: "${results.map(m => m.type)}"` + ); - return results; + const memberHashes = compact(groupMember?.hashes) || []; + const infoHashes = compact(groupInfo?.hashes) || []; + const allOldHashes = new Set([...infoHashes, ...memberHashes]); + + console.error('compactedHashes', [...allOldHashes]); + return { messages: results, allOldHashes }; } function userKindToVariant(kind: UserConfigKind): ConfigWrapperUser { diff --git a/ts/state/ducks/groupInfos.ts b/ts/state/ducks/groupInfos.ts index 422cec21b4..31c2b83334 100644 --- a/ts/state/ducks/groupInfos.ts +++ b/ts/state/ducks/groupInfos.ts @@ -11,6 +11,7 @@ import { } from '../../webworker/workers/browser/libsession_worker_interface'; import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { uniq } from 'lodash'; +import { GroupSync } from '../../session/utils/job_runners/jobs/GroupConfigJob'; type GroupInfoGetWithId = GroupInfoGet & { id: GroupPubkeyType }; @@ -76,6 +77,8 @@ const initNewGroupInfoInWrapper = createAsyncThunk( console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?'); + await GroupSync.queueNewJobIfNeeded(newGroup.pubkeyHex); + const us = UserUtils.getOurPubKeyStrFromCache(); // Ensure the current user is a member and admin const members = uniq([...groupDetails.members, us]); From d89ff59560a5d1bd9d64410c7960818a1b1bc7df Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 13 Sep 2023 13:40:12 +1000 Subject: [PATCH 009/302] feat: store info+members+keys on right namespaces for groups make the signature work with the admin key, fetching it from the usergroups wrapper --- ts/session/apis/snode_api/SNodeAPI.ts | 17 +-- ts/session/apis/snode_api/batchRequest.ts | 10 +- ts/session/apis/snode_api/onions.ts | 1 - ts/session/apis/snode_api/retrieveRequest.ts | 2 +- ts/session/apis/snode_api/snodeSignatures.ts | 124 +++++++++++++----- ts/session/apis/snode_api/storeMessage.ts | 5 +- .../conversations/ConversationController.ts | 34 +++-- ts/session/sending/MessageSender.ts | 66 +++++++--- .../utils/job_runners/jobs/GroupConfigJob.ts | 7 +- .../utils/libsession/libsession_utils.ts | 20 +-- .../libsession_utils_convo_info_volatile.ts | 20 ++- .../libsession_utils_user_groups.ts | 16 --- ts/state/ducks/groupInfos.ts | 2 + 13 files changed, 216 insertions(+), 108 deletions(-) diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 2eeefde012..accd2faee6 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -16,11 +16,11 @@ export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.'; // TODOLATER we should merge those two functions together as they are almost exactly the same const forceNetworkDeletion = async (): Promise | null> => { const sodium = await getSodiumRenderer(); - const userX25519PublicKey = UserUtils.getOurPubKeyStrFromCache(); + const usPk = UserUtils.getOurPubKeyStrFromCache(); - const userED25519KeyPair = await UserUtils.getUserED25519KeyPair(); + const usED25519KeyPair = await UserUtils.getUserED25519KeyPairBytes(); - if (!userED25519KeyPair) { + if (!usED25519KeyPair) { window?.log?.warn('Cannot forceNetworkDeletion, did not find user ed25519 key.'); return null; } @@ -30,7 +30,7 @@ const forceNetworkDeletion = async (): Promise | null> => { try { const maliciousSnodes = await pRetry( async () => { - const userSwarm = await getSwarmFor(userX25519PublicKey); + const userSwarm = await getSwarmFor(usPk); const snodeToMakeRequestTo: Snode | undefined = sample(userSwarm); if (!snodeToMakeRequestTo) { @@ -40,17 +40,16 @@ const forceNetworkDeletion = async (): Promise | null> => { return pRetry( async () => { - const signOpts = await SnodeSignature.getSnodeSignatureParams({ + const signOpts = await SnodeSignature.getSnodeSignatureParamsUs({ method, namespace, - pubkey: userX25519PublicKey, }); const ret = await doSnodeBatchRequest( [{ method, params: { ...signOpts, namespace } }], snodeToMakeRequestTo, 10000, - userX25519PublicKey + usPk ); if (!ret || !ret?.[0].body || ret[0].code !== 200) { @@ -124,9 +123,7 @@ const forceNetworkDeletion = async (): Promise | null> => { const sortedHashes = hashes.sort(); const signatureSnode = snodeJson.signature as string; // The signature format is (with sortedHashes accross all namespaces) ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] ) - const dataToVerify = `${userX25519PublicKey}${ - signOpts.timestamp - }${sortedHashes.join('')}`; + const dataToVerify = `${usPk}${signOpts.timestamp}${sortedHashes.join('')}`; const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8'); const isValid = sodium.crypto_sign_verify_detached( diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 86f6b7695d..7e4b3198c7 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -21,11 +21,11 @@ export async function doSnodeBatchRequest( associatedWith: string | null, method: 'batch' | 'sequence' = 'batch' ): Promise { - // console.warn( - // `doSnodeBatchRequest "${method}":`, - // subRequests.map(m => m.method), - // subRequests - // ); + console.warn( + `doSnodeBatchRequest "${method}":`, + JSON.stringify(subRequests.map(m => m.method)), + subRequests + ); const result = await snodeRpc({ method, params: { requests: subRequests }, diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index 58e272c7aa..f7b1e58a51 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -1085,7 +1085,6 @@ async function sendOnionRequestSnodeDest( onionPath: Array, targetNode: Snode, headers: Record, - plaintext: string | null, associatedWith?: string ) { diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 04f3d31752..17ec44fd1c 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -64,7 +64,7 @@ async function buildRetrieveRequest( throw new Error('not a legacy closed group. pubkey can only be ours'); } const signatureArgs = { ...retrieveParam, method: 'retrieve' as const, ourPubkey }; - const signatureBuilt = await SnodeSignature.getSnodeSignatureParams(signatureArgs); + const signatureBuilt = await SnodeSignature.getSnodeSignatureParamsUs(signatureArgs); const retrieve: RetrieveSubRequestType = { method: 'retrieve', params: { ...retrieveParam, ...signatureBuilt }, diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts index 0789180d71..91c09a1689 100644 --- a/ts/session/apis/snode_api/snodeSignatures.ts +++ b/ts/session/apis/snode_api/snodeSignatures.ts @@ -1,16 +1,23 @@ +import { FixedSizeUint8Array, GroupPubkeyType } from 'libsession_util_nodejs'; import { getSodiumRenderer } from '../../crypto'; import { StringUtils, UserUtils } from '../../utils'; import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String'; import { GetNetworkTime } from './getNetworkTime'; +import { SnodeNamespaces } from './namespaces'; +import { PubKey } from '../../types'; +import { toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; export type SnodeSignatureResult = { timestamp: number; - // sig_timestamp: number; signature: string; pubkey_ed25519: string; pubkey: string; // this is the x25519 key of the pubkey we are doing the request to (ourself for our swarm usually) }; +export type SnodeGroupSignatureResult = Pick & { + pubkey: GroupPubkeyType; // this is the 03 pubkey of the corresponding group +}; + async function getSnodeSignatureByHashesParams({ messages, method, @@ -52,50 +59,106 @@ async function getSnodeSignatureByHashesParams({ } } -async function getSnodeSignatureParams(params: { - pubkey: string; +type SnodeSigParamsShared = { namespace: number | null | 'all'; // 'all' can be used to clear all namespaces (during account deletion) method: 'retrieve' | 'store' | 'delete_all'; -}): Promise { - const ourEd25519Key = await UserUtils.getUserED25519KeyPair(); - - if (!ourEd25519Key) { - const err = `getSnodeSignatureParams "${params.method}": User has no getUserED25519KeyPair()`; - window.log.warn(err); - throw new Error(err); - } - const namespace = params.namespace || 0; - const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey); - - const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset(); +}; - const withoutNamespace = `${params.method}${signatureTimestamp}`; - const withNamespace = `${params.method}${namespace}${signatureTimestamp}`; - const verificationData = - namespace === 0 - ? StringUtils.encode(withoutNamespace, 'utf8') - : StringUtils.encode(withNamespace, 'utf8'); +type SnodeSigParamsAdminGroup = SnodeSigParamsShared & { + groupPk: GroupPubkeyType; + privKey: Uint8Array; // our ed25519 key when we are signing with our pubkey +}; +type SnodeSigParamsUs = SnodeSigParamsShared & { + pubKey: string; + privKey: FixedSizeUint8Array<64>; +}; - const message = new Uint8Array(verificationData); +function isSigParamsForGroupAdmin( + sigParams: SnodeSigParamsAdminGroup | SnodeSigParamsUs +): sigParams is SnodeSigParamsAdminGroup { + const asGr = sigParams as SnodeSigParamsAdminGroup; + return PubKey.isClosedGroupV3(asGr.groupPk) && !!asGr.privKey; +} - const sodium = await getSodiumRenderer(); +async function getSnodeShared(params: SnodeSigParamsAdminGroup | SnodeSigParamsUs) { + const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset(); + const verificationData = StringUtils.encode( + `${params.method}${params.namespace === 0 ? '' : params.namespace}${signatureTimestamp}`, + 'utf8' + ); try { - const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes); + const message = new Uint8Array(verificationData); + const sodium = await getSodiumRenderer(); + const signature = sodium.crypto_sign_detached(message, params.privKey as Uint8Array); const signatureBase64 = fromUInt8ArrayToBase64(signature); - + if (isSigParamsForGroupAdmin(params)) { + return { + timestamp: signatureTimestamp, + signature: signatureBase64, + pubkey: params.groupPk, + }; + } return { - // sig_timestamp: signatureTimestamp, timestamp: signatureTimestamp, signature: signatureBase64, - pubkey_ed25519: ourEd25519Key.pubKey, - pubkey: params.pubkey, }; } catch (e) { - window.log.warn('getSnodeSignatureParams failed with: ', e.message); + window.log.warn('getSnodeShared failed with: ', e.message); throw e; } } +async function getSnodeSignatureParamsUs({ + method, + namespace = 0, +}: Pick): Promise { + const ourEd25519Key = await UserUtils.getUserED25519KeyPairBytes(); + const ourEd25519PubKey = await UserUtils.getUserED25519KeyPair(); + + if (!ourEd25519Key || !ourEd25519PubKey) { + const err = `getSnodeSignatureParams "${method}": User has no getUserED25519KeyPairBytes()`; + window.log.warn(err); + throw new Error(err); + } + + const edKeyPrivBytes = ourEd25519Key.privKeyBytes; + + const lengthCheckedPrivKey = toFixedUint8ArrayOfLength(edKeyPrivBytes, 64); + const sigData = await getSnodeShared({ + pubKey: UserUtils.getOurPubKeyStrFromCache(), + method, + namespace, + privKey: lengthCheckedPrivKey, + }); + + const us = UserUtils.getOurPubKeyStrFromCache(); + return { + ...sigData, + pubkey_ed25519: ourEd25519PubKey.pubKey, + pubkey: us, + }; +} + +async function getSnodeGroupSignatureParams({ + groupIdentityPrivKey, + groupPk, + method, + namespace = 0, +}: { + groupPk: GroupPubkeyType; + groupIdentityPrivKey: FixedSizeUint8Array<64>; + namespace: SnodeNamespaces; + method: 'retrieve' | 'store'; +}): Promise { + const sigData = await getSnodeShared({ + pubKey: groupPk, + method, + namespace, + privKey: groupIdentityPrivKey, + }); + return { ...sigData, pubkey: groupPk }; +} + async function generateUpdateExpirySignature({ shortenOrExtend, timestamp, @@ -136,7 +199,8 @@ async function generateUpdateExpirySignature({ } export const SnodeSignature = { - getSnodeSignatureParams, + getSnodeSignatureParamsUs, + getSnodeGroupSignatureParams, getSnodeSignatureByHashesParams, generateUpdateExpirySignature, }; diff --git a/ts/session/apis/snode_api/storeMessage.ts b/ts/session/apis/snode_api/storeMessage.ts index 7517335f97..f4f449b97a 100644 --- a/ts/session/apis/snode_api/storeMessage.ts +++ b/ts/session/apis/snode_api/storeMessage.ts @@ -47,7 +47,8 @@ function buildDeleteByHashesSubRequest( async function storeOnNode( targetNode: Snode, params: Array, - toDeleteOnSequence: DeleteByHashesFromNodeParams | null + toDeleteOnSequence: DeleteByHashesFromNodeParams | null, + method: 'batch' | 'sequence' ): Promise { try { const subRequests = buildStoreRequests(params, toDeleteOnSequence); @@ -56,7 +57,7 @@ async function storeOnNode( targetNode, 4000, params[0].pubkey, - toDeleteOnSequence ? 'sequence' : 'batch' + method ); if (!result || !result.length) { diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 46ff727564..fc889bb083 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -1,6 +1,6 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable more/no-then */ -import { ConvoVolatileType } from 'libsession_util_nodejs'; +import { ConvoVolatileType, GroupPubkeyType } from 'libsession_util_nodejs'; import { isEmpty, isNil } from 'lodash'; import { Data } from '../../data/data'; @@ -15,24 +15,24 @@ import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGrou import { getSwarmFor } from '../apis/snode_api/snodePool'; import { PubKey } from '../types'; +import { getMessageQueue } from '..'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/conversationAttributes'; +import { removeAllClosedGroupEncryptionKeyPairs } from '../../receiver/closedGroups'; +import { getCurrentlySelectedConversationOutsideRedux } from '../../state/selectors/conversations'; import { assertUnreachable } from '../../types/sqlSharedTypes'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; +import { OpenGroupUtils } from '../apis/open_group_api/utils'; +import { getSwarmPollingInstance } from '../apis/snode_api'; +import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; +import { SnodeNamespaces } from '../apis/snode_api/namespaces'; +import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage'; +import { UserUtils } from '../utils'; import { ConfigurationSync } from '../utils/job_runners/jobs/ConfigurationSyncJob'; import { LibSessionUtil } from '../utils/libsession/libsession_utils'; import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts'; import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile'; import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups'; -import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; -import { getMessageQueue } from '..'; -import { getSwarmPollingInstance } from '../apis/snode_api'; -import { SnodeNamespaces } from '../apis/snode_api/namespaces'; -import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage'; -import { UserUtils } from '../utils'; -import { getCurrentlySelectedConversationOutsideRedux } from '../../state/selectors/conversations'; -import { removeAllClosedGroupEncryptionKeyPairs } from '../../receiver/closedGroups'; -import { OpenGroupUtils } from '../apis/open_group_api/utils'; let instance: ConversationController | null; @@ -226,7 +226,11 @@ export class ConversationController { // if we were kicked or sent our left message, we have nothing to do more with that group. // Just delete everything related to it, not trying to add update message or send a left message. await this.removeGroupOrCommunityFromDBAndRedux(groupId); - await removeLegacyGroupFromWrappers(groupId); + if (PubKey.isClosedGroupV3(groupId)) { + await remove03GroupFromWrappers(groupId); + } else { + await removeLegacyGroupFromWrappers(groupId); + } if (!options.fromSyncMessage) { await ConfigurationSync.queueNewJobIfNeeded(); @@ -528,6 +532,14 @@ async function removeLegacyGroupFromWrappers(groupId: string) { await removeAllClosedGroupEncryptionKeyPairs(groupId); } +async function remove03GroupFromWrappers(groupId: GroupPubkeyType) { + getSwarmPollingInstance().removePubkey(groupId); + + await UserGroupsWrapperActions.eraseGroup(groupId); + await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupId); + window.log.warn('remove 03 from metagroup wrapper'); +} + async function removeCommunityFromWrappers(conversationId: string) { if (!conversationId || !OpenGroupUtils.isOpenGroupV2(conversationId)) { return; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 1f4cbed11f..2428efab4a 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -23,7 +23,7 @@ import { import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; import { getSwarmFor } from '../apis/snode_api/snodePool'; -import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/snodeSignatures'; +import { SnodeSignature } from '../apis/snode_api/snodeSignatures'; import { SnodeAPIStore } from '../apis/snode_api/storeMessage'; import { getConversationController } from '../conversations'; import { MessageEncrypter } from '../crypto'; @@ -37,8 +37,10 @@ import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/Ope import { ed25519Str } from '../onions/onionPath'; import { PubKey } from '../types'; import { RawMessage } from '../types/RawMessage'; +import { UserUtils } from '../utils'; import { fromUInt8ArrayToBase64 } from '../utils/String'; import { EmptySwarmError } from '../utils/errors'; +import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; // ================ SNODE STORE ================ @@ -140,7 +142,8 @@ async function send( }, ], recipient.key, - null + null, + 'batch' ); const isDestinationClosedGroup = getConversationController() @@ -181,33 +184,57 @@ async function send( ); } +async function getSignatureParamsFromNamespace(item: StoreOnNodeParamsNoSig, destination: string) { + if (SnodeNamespace.isUserConfigNamespace(item.namespace)) { + const ourPrivKey = (await UserUtils.getUserED25519KeyPairBytes())?.privKeyBytes; + if (!ourPrivKey) { + throw new Error('sendMessagesDataToSnode UserUtils.getUserED25519KeyPairBytes is empty'); + } + return SnodeSignature.getSnodeSignatureParamsUs({ + method: 'store' as const, + namespace: item.namespace, + }); + } + + if (SnodeNamespace.isGroupConfigNamespace(item.namespace)) { + if (!PubKey.isClosedGroupV3(destination)) { + throw new Error('sendMessagesDataToSnode: groupconfig namespace required a 03 pubkey'); + } + const group = await UserGroupsWrapperActions.getGroup(destination); + const groupSecretKey = group?.secretKey; + if (isNil(groupSecretKey) || isEmpty(groupSecretKey)) { + throw new Error(`sendMessagesDataToSnode: failed to find group admin secret key in wrapper`); + } + return SnodeSignature.getSnodeGroupSignatureParams({ + method: 'store' as const, + namespace: item.namespace, + groupPk: destination, + groupIdentityPrivKey: groupSecretKey, + }); + } + return {}; +} + async function sendMessagesDataToSnode( params: Array, destination: string, - messagesHashesToDelete: Set | null + messagesHashesToDelete: Set | null, + method: 'batch' | 'sequence' ): Promise { const rightDestination = params.filter(m => m.pubkey === destination); + const swarm = await getSwarmFor(destination); const withSigWhenRequired: Array = await Promise.all( rightDestination.map(async item => { // some namespaces require a signature to be added - let signOpts: SnodeSignatureResult | undefined; - if (SnodeNamespace.isUserConfigNamespace(item.namespace)) { - signOpts = await SnodeSignature.getSnodeSignatureParams({ - method: 'store' as const, - namespace: item.namespace, - pubkey: destination, - }); - } + const signOpts = await getSignatureParamsFromNamespace(item, destination); + const store: StoreOnNodeParams = { data: item.data64, namespace: item.namespace, pubkey: item.pubkey, - timestamp: item.timestamp, - // sig_timestamp: item.timestamp, - // sig_timestamp is currently not forwarded from the receiving snode to the other swarm members, and so their sig verify fail. - // This timestamp is not really needed so we just don't send it in the meantime (the timestamp value is used if the sig_timestamp is not present) + timestamp: item.timestamp, // sig_timestamp is unused and uneeded ttl: item.ttl, ...signOpts, }; @@ -234,7 +261,8 @@ async function sendMessagesDataToSnode( const storeResults = await SnodeAPIStore.storeOnNode( snode, withSigWhenRequired, - signedDeleteOldHashesRequest + signedDeleteOldHashesRequest, + method ); if (!isEmpty(storeResults)) { @@ -397,7 +425,8 @@ async function sendMessagesToSnode( namespace: wrapped.namespace, })), recipient.key, - messagesHashesToDelete + messagesHashesToDelete, + messagesHashesToDelete?.size ? 'sequence' : 'batch' ); }, { @@ -473,7 +502,8 @@ async function sendEncryptedDataToSnode( namespace: content.namespace, })), destination, - messagesHashesToDelete + messagesHashesToDelete, + 'sequence' ); }, { diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index 3eab28c954..6e45b9eb85 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -94,14 +94,15 @@ async function buildAndSaveDumpsToDB( groupPk, { groupInfo: null, groupKeys: null, groupMember: null }, ]; - debugger; for (let i = 0; i < changes.length; i++) { const change = changes[i]; switch (change.pushed.namespace) { case SnodeNamespaces.ClosedGroupInfo: { - toConfirm[1].groupInfo = [change.pushed.seqno.toNumber(), change.updatedHash]; + if ((change.pushed as any).seqno) { + toConfirm[1].groupInfo = [change.pushed.seqno.toNumber(), change.updatedHash]; + } break; } case SnodeNamespaces.ClosedGroupMembers: { @@ -109,7 +110,7 @@ async function buildAndSaveDumpsToDB( break; } case SnodeNamespaces.ClosedGroupKeys: { - toConfirm[1].groupKeys = [change.pushed.seqno.toNumber(), change.updatedHash]; + toConfirm[1].groupKeys = [change.pushed.data, change.updatedHash, change.pushed.timestamp]; break; } } diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 175781e807..21391a77fb 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -199,21 +199,22 @@ async function pendingChangesForUs(): Promise< return results; } -type PendingChangesForGroupShared = { +// we link the namespace to the type of what each wrapper needs + +type PendingChangesForGroupNonKey = { data: Uint8Array; seqno: Long; timestamp: number; - namespace: SnodeNamespaces; -}; - -type PendingChangesForGroupNonKey = PendingChangesForGroupShared & { + namespace: SnodeNamespaces.ClosedGroupInfo | SnodeNamespaces.ClosedGroupMembers; type: Extract; }; -type PendingChangesForGroupKey = Pick< - PendingChangesForGroupShared, - 'data' | 'namespace' | 'timestamp' -> & { type: Extract }; +type PendingChangesForGroupKey = { + data: Uint8Array; + timestamp: number; + namespace: SnodeNamespaces.ClosedGroupKeys; + type: Extract; +}; export type PendingChangesForGroup = PendingChangesForGroupNonKey | PendingChangesForGroupKey; @@ -239,7 +240,6 @@ async function pendingChangesForGroup( } const { groupInfo, groupMember, groupKeys } = await MetaGroupWrapperActions.push(groupPk); - debugger; // Note: We need the keys to be pushed first to avoid a race condition if (groupKeys) { diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts index dbde501507..a66ea24482 100644 --- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts +++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts @@ -1,5 +1,5 @@ /* eslint-disable no-case-declarations */ -import { BaseConvoInfoVolatile, ConvoVolatileType } from 'libsession_util_nodejs'; +import { BaseConvoInfoVolatile, ConvoVolatileType, GroupPubkeyType } from 'libsession_util_nodejs'; import { isEmpty, isFinite } from 'lodash'; import { Data } from '../../../data/data'; import { OpenGroupData } from '../../../data/opengroups'; @@ -25,6 +25,11 @@ const mapped1o1WrapperValues = new Map(); */ const mappedLegacyGroupWrapperValues = new Map(); +/** + * The key of this map is the convoId as stored in the database. So the group 03 pubkey + */ +const mappedGroupWrapperValues = new Map(); + /** * The key of this map is the convoId as stored in the database, so withoutpubkey */ @@ -243,6 +248,16 @@ async function removeLegacyGroupFromWrapper(convoId: string) { mappedLegacyGroupWrapperValues.delete(convoId); } +async function removeGroupFromWrapper(groupPk: GroupPubkeyType) { + // try { + // await ConvoInfoVolatileWrapperActions.eraseGroup(groupPk); + // } catch (e) { + // window.log.warn('removeGroupFromWrapper failed with ', e.message); + // } + window.log.warn('removeGroupFromWrapper TODO'); + mappedGroupWrapperValues.delete(groupPk); +} + /** * Removes the matching legacy group from the wrapper and from the cached list of legacy groups */ @@ -282,6 +297,9 @@ export const SessionUtilConvoInfoVolatile = { // legacy group removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODOLATER + // group + removeGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODOLATER + // communities removeCommunityFromWrapper, }; diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts index 0186f5568b..1de58fe5ef 100644 --- a/ts/session/utils/libsession/libsession_utils_user_groups.ts +++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts @@ -165,20 +165,6 @@ async function removeCommunityFromWrapper(_convoId: string, fullUrlWithOrWithout } } -/** - * Remove the matching legacy group from the wrapper and from the cached list of legacy groups - */ -async function removeLegacyGroupFromWrapper(groupPk: string) { - try { - await UserGroupsWrapperActions.eraseLegacyGroup(groupPk); - } catch (e) { - window.log.warn( - `UserGroupsWrapperActions.eraseLegacyGroup with = ${groupPk} failed with`, - e.message - ); - } -} - /** * This function can be used where there are things to do for all the types handled by this wrapper. * You can do a loop on all the types handled by this wrapper and have a switch using assertUnreachable to get errors when not every case is handled. @@ -207,6 +193,4 @@ export const SessionUtilUserGroups = { // legacy group isLegacyGroupToStoreInWrapper, isLegacyGroupToRemoveFromDBIfNotInWrapper, - - removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODOLATER }; diff --git a/ts/state/ducks/groupInfos.ts b/ts/state/ducks/groupInfos.ts index 31c2b83334..a4b28e6e3d 100644 --- a/ts/state/ducks/groupInfos.ts +++ b/ts/state/ducks/groupInfos.ts @@ -76,6 +76,8 @@ const initNewGroupInfoInWrapper = createAsyncThunk( await convo.setIsApproved(true, false); console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?'); + // the sync below will need the secretKey of the group to be saved in the wrapper. So save it! + await UserGroupsWrapperActions.setGroup(newGroup); await GroupSync.queueNewJobIfNeeded(newGroup.pubkeyHex); From be50aa7a2ec608cb4da5f4f08846d88589751c67 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 13 Sep 2023 16:59:17 +1000 Subject: [PATCH 010/302] feat: add support for retrieve signs with admin key of group --- ts/models/conversation.ts | 2 +- .../apis/snode_api/SnodeRequestTypes.ts | 24 +-- ts/session/apis/snode_api/namespaces.ts | 63 ++++++-- ts/session/apis/snode_api/retrieveRequest.ts | 152 ++++++++++++++---- ts/session/apis/snode_api/swarmPolling.ts | 51 +++--- .../ClosedGroupVisibleMessage.ts | 2 +- ts/session/onions/onionPath.ts | 3 +- ts/session/sending/MessageQueue.ts | 4 +- .../ClosedGroupChatMessage_test.ts | 6 +- ts/test/session/unit/utils/Messages_test.ts | 2 +- 10 files changed, 230 insertions(+), 79 deletions(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 86a73ba1b0..65abd867b3 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1691,7 +1691,7 @@ export class ConversationModel extends Backbone.Model { try { const { body, attachments, preview, quote, fileIdsToLink } = await message.uploadData(); const { id } = message; - const destination = this.id; + const destination = this.id as string; const sentAt = message.get('sent_at'); if (!sentAt) { diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index e75eced7f6..43a58e9783 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1,12 +1,14 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { SharedUserConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; -import { SnodeNamespaces } from './namespaces'; +import { SnodeNamespaces, SnodeNamespacesGroup } from './namespaces'; export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } }; -type RetrieveMaxCountSize = { max_count?: number; max_size?: number }; +type WithMaxCountSize = { max_count?: number; max_size?: number }; +type WithPubkeyAsString = { pubkey: string }; +type WithPubkeyAsGroupPubkey = { pubkey: GroupPubkeyType }; + type RetrieveAlwaysNeeded = { - pubkey: string; namespace: number; last_hash: string; timestamp?: number; @@ -19,7 +21,8 @@ export type RetrievePubkeySubRequestType = { pubkey_ed25519: string; namespace: number; } & RetrieveAlwaysNeeded & - RetrieveMaxCountSize; + WithMaxCountSize & + WithPubkeyAsString; }; /** Those namespaces do not require to be authenticated for storing messages. @@ -35,23 +38,24 @@ export type RetrieveLegacyClosedGroupSubRequestType = { params: { namespace: SnodeNamespaces.LegacyClosedGroup; // legacy closed groups retrieve are not authenticated because the clients do not have a shared key } & RetrieveAlwaysNeeded & - RetrieveMaxCountSize; + WithMaxCountSize & + WithPubkeyAsString; }; -export type RetrieveSubKeySubRequestType = { +export type RetrieveGroupAdminSubRequestType = { method: 'retrieve'; params: { - subkey: string; // 32-byte hex encoded string signature: string; - namespace: number; + namespace: SnodeNamespacesGroup; } & RetrieveAlwaysNeeded & - RetrieveMaxCountSize; + WithMaxCountSize & + WithPubkeyAsGroupPubkey; }; export type RetrieveSubRequestType = | RetrieveLegacyClosedGroupSubRequestType | RetrievePubkeySubRequestType - | RetrieveSubKeySubRequestType + | RetrieveGroupAdminSubRequestType | UpdateExpiryOnNodeSubRequest; /** diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index 1c9ac770ef..5bb74f3be6 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -52,15 +52,25 @@ export enum SnodeNamespaces { ClosedGroupMembers = 14, } -export type SnodeNamespacesGroup = PickEnum< +export type SnodeNamespacesLegacyGroup = PickEnum< + SnodeNamespaces, + SnodeNamespaces.LegacyClosedGroup +>; + +type SnodeNamespacesGroupConfig = PickEnum< SnodeNamespaces, - | SnodeNamespaces.LegacyClosedGroup | SnodeNamespaces.ClosedGroupInfo | SnodeNamespaces.ClosedGroupMembers | SnodeNamespaces.ClosedGroupKeys - | SnodeNamespaces.Default >; +/** + * the namespaces to which a 03-group can store/retrieve messages from/to + */ +export type SnodeNamespacesGroup = + | SnodeNamespacesGroupConfig + | PickEnum; + export type SnodeNamespacesUser = PickEnum< SnodeNamespaces, SnodeNamespaces.UserContacts | SnodeNamespaces.UserProfile | SnodeNamespaces.Default @@ -72,9 +82,6 @@ export type SnodeNamespacesUser = PickEnum< // eslint-disable-next-line consistent-return function isUserConfigNamespace(namespace: SnodeNamespaces) { switch (namespace) { - case SnodeNamespaces.Default: - // user messages is not hosting config based messages - return false; case SnodeNamespaces.UserContacts: case SnodeNamespaces.UserProfile: case SnodeNamespaces.UserGroups: @@ -85,6 +92,8 @@ function isUserConfigNamespace(namespace: SnodeNamespaces) { case SnodeNamespaces.ClosedGroupMembers: case SnodeNamespaces.ClosedGroupMessages: case SnodeNamespaces.LegacyClosedGroup: + case SnodeNamespaces.Default: + // user messages is not hosting config based messages return false; default: @@ -97,7 +106,12 @@ function isUserConfigNamespace(namespace: SnodeNamespaces) { } } -function isGroupConfigNamespace(namespace: SnodeNamespaces) { +/** + * Returns true if that namespace is one of the namespace used for the 03-group config messages + */ +function isGroupConfigNamespace( + namespace: SnodeNamespaces +): namespace is SnodeNamespacesGroupConfig { switch (namespace) { case SnodeNamespaces.Default: case SnodeNamespaces.UserContacts: @@ -122,8 +136,37 @@ function isGroupConfigNamespace(namespace: SnodeNamespaces) { } } -// eslint-disable-next-line consistent-return -function namespacePriority(namespace: SnodeNamespaces): number { +/** + * + * @param namespace the namespace to check + * @returns true if that namespace is a valid namespace for a 03 group (either a config namespace or a message namespace) + */ +function isGroupNamespace(namespace: SnodeNamespaces): namespace is SnodeNamespacesGroup { + if (isGroupConfigNamespace(namespace)) { + return true; + } + if (namespace === SnodeNamespaces.ClosedGroupMessages) { + return true; + } + switch (namespace) { + case SnodeNamespaces.Default: + case SnodeNamespaces.UserContacts: + case SnodeNamespaces.UserProfile: + case SnodeNamespaces.UserGroups: + case SnodeNamespaces.ConvoInfoVolatile: + case SnodeNamespaces.LegacyClosedGroup: + return false; + default: + try { + assertUnreachable(namespace, `isGroupNamespace case not handled: ${namespace}`); + } catch (e) { + window.log.warn(`isGroupNamespace case not handled: ${namespace}: ${e.message}`); + return false; + } + } +} + +function namespacePriority(namespace: SnodeNamespaces): 10 | 1 { switch (namespace) { case SnodeNamespaces.Default: case SnodeNamespaces.ClosedGroupMessages: @@ -132,7 +175,6 @@ function namespacePriority(namespace: SnodeNamespaces): number { case SnodeNamespaces.ConvoInfoVolatile: case SnodeNamespaces.UserProfile: case SnodeNamespaces.UserContacts: - return 1; case SnodeNamespaces.LegacyClosedGroup: case SnodeNamespaces.ClosedGroupInfo: case SnodeNamespaces.ClosedGroupMembers: @@ -176,5 +218,6 @@ function maxSizeMap(namespaces: Array) { export const SnodeNamespace = { isUserConfigNamespace, isGroupConfigNamespace, + isGroupNamespace, maxSizeMap, }; diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 17ec44fd1c..6a36d2852b 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -1,13 +1,17 @@ -import { omit } from 'lodash'; +import { isEmpty, isNil, omit } from 'lodash'; import { Snode } from '../../../data/data'; import { updateIsOnline } from '../../../state/ducks/onion'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { SnodeNamespace, SnodeNamespaces } from './namespaces'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { DURATION } from '../../constants'; +import { PubKey } from '../../types'; import { UserUtils } from '../../utils'; import { + RetrieveGroupAdminSubRequestType, RetrieveLegacyClosedGroupSubRequestType, RetrieveSubRequestType, UpdateExpiryOnNodeSubRequest, @@ -15,6 +19,112 @@ import { import { SnodeSignature } from './snodeSignatures'; import { RetrieveMessagesResultsBatched, RetrieveMessagesResultsContent } from './types'; +type RetrieveParams = { + pubkey: string; + last_hash: string; + timestamp: number; + max_size: number | undefined; +}; + +async function retrieveRequestForUs({ + namespace, + ourPubkey, + retrieveParam, +}: { + ourPubkey: string; + namespace: SnodeNamespaces; + retrieveParam: RetrieveParams; +}) { + if (!SnodeNamespace.isUserConfigNamespace(namespace) && namespace !== SnodeNamespaces.Default) { + throw new Error(`retrieveRequestForUs not a valid namespace to retrieve as us:${namespace}`); + } + const signatureArgs = { ...retrieveParam, namespace, method: 'retrieve' as const, ourPubkey }; + const signatureBuilt = await SnodeSignature.getSnodeSignatureParamsUs(signatureArgs); + const retrieveForUS: RetrieveSubRequestType = { + method: 'retrieve', + params: { ...retrieveParam, namespace, ...signatureBuilt }, + }; + return retrieveForUS; +} + +/** + * Retrieve for legacy groups are not authenticated so no need to sign the request + */ +function retrieveRequestForLegacyGroup({ + namespace, + ourPubkey, + pubkey, + retrieveParam, +}: { + pubkey: string; + namespace: SnodeNamespaces.LegacyClosedGroup; + ourPubkey: string; + retrieveParam: RetrieveParams; +}) { + if (pubkey === ourPubkey || !pubkey.startsWith('05')) { + throw new Error( + 'namespace -10 can only be used to retrieve messages from a legacy closed group (prefix 05)' + ); + } + if (namespace !== SnodeNamespaces.LegacyClosedGroup) { + throw new Error(`retrieveRequestForLegacyGroup namespace can only be -10`); + } + const retrieveLegacyClosedGroup = { + ...retrieveParam, + namespace, + }; + const retrieveParamsLegacy: RetrieveLegacyClosedGroupSubRequestType = { + method: 'retrieve', + params: omit(retrieveLegacyClosedGroup, 'timestamp'), // if we give a timestamp, a signature will be required by the service node, and we don't want to provide one as this is an unauthenticated namespace + }; + + return retrieveParamsLegacy; +} + +/** + * Retrieve for groups (03-prefixed) are authenticated with the admin key if we have it, or with our subkey auth + */ +async function retrieveRequestForGroup({ + namespace, + groupPk, + retrieveParam, +}: { + groupPk: GroupPubkeyType; + namespace: SnodeNamespaces; + retrieveParam: RetrieveParams; +}) { + if (!PubKey.isClosedGroupV3(groupPk)) { + throw new Error('retrieveRequestForGroup: not a 03 group'); + } + if (!SnodeNamespace.isGroupNamespace(namespace)) { + throw new Error(`retrieveRequestForGroup: not a groupNamespace: ${namespace}`); + } + const group = await UserGroupsWrapperActions.getGroup(groupPk); + const groupSecretKey = group?.secretKey; + if (isNil(groupSecretKey) || isEmpty(groupSecretKey)) { + throw new Error(`sendMessagesDataToSnode: failed to find group admin secret key in wrapper`); + } + const signatureBuilt = await SnodeSignature.getSnodeGroupSignatureParams({ + ...retrieveParam, + namespace, + method: 'retrieve' as const, + groupPk, + groupIdentityPrivKey: groupSecretKey, + }); + + const retrieveGroup = { + ...retrieveParam, + ...signatureBuilt, + namespace, + }; + const retrieveParamsGroup: RetrieveGroupAdminSubRequestType = { + method: 'retrieve', + params: retrieveGroup, + }; + + return retrieveParamsGroup; +} + async function buildRetrieveRequest( lastHashes: Array, pubkey: string, @@ -29,47 +139,25 @@ async function buildRetrieveRequest( const retrieveParam = { pubkey, last_hash: lastHashes.at(index) || '', - namespace, timestamp: GetNetworkTime.getNowWithNetworkOffset(), max_size: foundMaxSize, }; if (namespace === SnodeNamespaces.LegacyClosedGroup) { - if (pubkey === ourPubkey || !pubkey.startsWith('05')) { - throw new Error( - 'namespace -10 can only be used to retrieve messages from a legacy closed group (prefix 05)' - ); + return retrieveRequestForLegacyGroup({ namespace, ourPubkey, pubkey, retrieveParam }); + } + + if (PubKey.isClosedGroupV3(pubkey)) { + if (!SnodeNamespace.isGroupNamespace(namespace)) { + // either config or messages namespaces for 03 groups + throw new Error(`tried to poll from a non 03 group namespace ${namespace}`); } - const retrieveLegacyClosedGroup = { - ...retrieveParam, - namespace, - }; - const retrieveParamsLegacy: RetrieveLegacyClosedGroupSubRequestType = { - method: 'retrieve', - params: omit(retrieveLegacyClosedGroup, 'timestamp'), // if we give a timestamp, a signature will be required by the service node, and we don't want to provide one as this is an unauthenticated namespace - }; - - return retrieveParamsLegacy; + return retrieveRequestForGroup({ namespace, groupPk: pubkey, retrieveParam }); } // all legacy closed group retrieves are unauthenticated and run above. // if we get here, this can only be a retrieve for our own swarm, which must be authenticated - if ( - !SnodeNamespace.isUserConfigNamespace(namespace) && - namespace !== SnodeNamespaces.Default - ) { - throw new Error(`not a legacy closed group. namespace can only be 0 and was ${namespace}`); - } - if (pubkey !== ourPubkey) { - throw new Error('not a legacy closed group. pubkey can only be ours'); - } - const signatureArgs = { ...retrieveParam, method: 'retrieve' as const, ourPubkey }; - const signatureBuilt = await SnodeSignature.getSnodeSignatureParamsUs(signatureArgs); - const retrieve: RetrieveSubRequestType = { - method: 'retrieve', - params: { ...retrieveParam, ...signatureBuilt }, - }; - return retrieve; + return retrieveRequestForUs({ namespace, ourPubkey, retrieveParam }); }) ); diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 8cb7b46e95..b8b4605853 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -27,6 +27,8 @@ import { SnodeAPIRetrieve } from './retrieveRequest'; import { SwarmPollingGroupConfig } from './swarm_polling_config/SwarmPollingGroupConfig'; import { SwarmPollingUserConfig } from './swarm_polling_config/SwarmPollingUserConfig'; import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { assertUnreachable } from '../../../types/sqlSharedTypes'; export function extractWebSocketContent( message: string, @@ -62,6 +64,11 @@ export const getSwarmPollingInstance = () => { return instance; }; +type PollForUs = [pubkey: string, type: ConversationTypeEnum.PRIVATE]; +type PollForLegacy = [pubkey: string, type: ConversationTypeEnum.GROUP]; +type PollForGroup = [pubkey: GroupPubkeyType, type: ConversationTypeEnum.GROUPV3]; + + export class SwarmPolling { private groupPolling: Array<{ pubkey: PubKey; lastPolledTimestamp: number }>; private readonly lastHashes: Record>>; @@ -166,9 +173,8 @@ export class SwarmPolling { } // we always poll as often as possible for our pubkey const ourPubkey = UserUtils.getOurPubKeyStrFromCache(); - const userNamespaces = await this.getUserNamespacesPolled(); const directPromise = Promise.all([ - this.pollOnceForKey(ourPubkey, ConversationTypeEnum.PRIVATE, userNamespaces), + this.pollOnceForKey([ourPubkey, ConversationTypeEnum.PRIVATE]), ]).then(() => undefined); const now = Date.now(); @@ -176,7 +182,6 @@ export class SwarmPolling { const convoPollingTimeout = this.getPollingTimeout(group.pubkey); const diff = now - group.lastPolledTimestamp; const { key } = group.pubkey; - const isV3 = PubKey.isClosedGroupV3(key); const loggingId = getConversationController() @@ -186,17 +191,10 @@ export class SwarmPolling { window?.log?.debug( `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} ` ); - if (isV3) { - return this.pollOnceForKey(key, ConversationTypeEnum.GROUPV3, [ - SnodeNamespaces.Default, - SnodeNamespaces.ClosedGroupInfo, - SnodeNamespaces.ClosedGroupMembers, - SnodeNamespaces.ClosedGroupKeys, // keys are fetched last to avoid race conditions when someone deposits them - ]); + if (PubKey.isClosedGroupV3(key)) { + return this.pollOnceForKey([key, ConversationTypeEnum.GROUPV3]); } - return this.pollOnceForKey(key, ConversationTypeEnum.GROUP, [ - SnodeNamespaces.LegacyClosedGroup, - ]); + return this.pollOnceForKey([key, ConversationTypeEnum.GROUP]); } window?.log?.debug( `Not polling for ${loggingId}; timeout: ${convoPollingTimeout} ; diff: ${diff}` @@ -219,10 +217,10 @@ export class SwarmPolling { * Only exposed as public for testing */ public async pollOnceForKey( - pubkey: string, - type: ConversationTypeEnum, - namespaces: Array + [pubkey, type]:PollForUs | PollForLegacy | PollForGroup ) { + const namespaces = this.getNamespacesToPollFrom(type); + const swarmSnodes = await snodePool.getSwarmFor(pubkey); // Select nodes for which we already have lastHashes @@ -469,14 +467,31 @@ export class SwarmPolling { return newMessages; } - private async getUserNamespacesPolled() { + + private getNamespacesToPollFrom(type: ConversationTypeEnum): Array { + if(type === ConversationTypeEnum.PRIVATE) { return [ SnodeNamespaces.Default, SnodeNamespaces.UserProfile, SnodeNamespaces.UserContacts, SnodeNamespaces.UserGroups, SnodeNamespaces.ConvoInfoVolatile, - ]; + ] ; + } + if(type === ConversationTypeEnum.GROUP) { + return [ + SnodeNamespaces.LegacyClosedGroup + ] ; + } + if(type === ConversationTypeEnum.GROUPV3) { + return [ + SnodeNamespaces.ClosedGroupMessages, + SnodeNamespaces.ClosedGroupInfo, + SnodeNamespaces.ClosedGroupMembers, + SnodeNamespaces.ClosedGroupKeys, // keys are fetched last to avoid race conditions when someone deposits them + ] ; + } + assertUnreachable(type, `getNamespacesToPollFrom case should have been unreachable: type:${type}`) } private async updateLastHash({ diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index 11e248d765..203137ca4f 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -6,7 +6,7 @@ import { ClosedGroupMessage } from '../controlMessage/group/ClosedGroupMessage'; interface ClosedGroupVisibleMessageParams { identifier?: string; - groupId: string | PubKey; + groupId: string; chatMessage: VisibleMessage; } diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index d6df1e60b3..ae9984d04a 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -63,7 +63,8 @@ const pathFailureThreshold = 3; // some naming issue here it seems) export let guardNodes: Array = []; -export const ed25519Str = (ed25519Key: string) => `(...${ed25519Key.substr(58)})`; +export const ed25519Str = (ed25519Key: string) => + `(${ed25519Key.substr(0, 2)}...${ed25519Key.substr(60)})`; export async function buildNewOnionPathsOneAtATime() { // this function may be called concurrently make sure we only have one inflight diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 1ac531d71b..d59de9521d 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -27,7 +27,7 @@ import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroup import { sendSogsReactionOnionV4 } from '../apis/open_group_api/sogsv3/sogsV3SendReaction'; import { SnodeNamespaces, - SnodeNamespacesGroup, + SnodeNamespacesLegacyGroup, SnodeNamespacesUser, } from '../apis/snode_api/namespaces'; import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage'; @@ -179,7 +179,7 @@ export class MessageQueue { sentCb, }: { message: ClosedGroupMessageType; - namespace: SnodeNamespacesGroup; + namespace: SnodeNamespacesLegacyGroup; sentCb?: (message: RawMessage) => Promise; groupPubKey?: PubKey; }): Promise { diff --git a/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts index 98dac95053..53ec106202 100644 --- a/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts +++ b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts @@ -9,9 +9,9 @@ import { ClosedGroupVisibleMessage } from '../../../../../session/messages/outgo import { VisibleMessage } from '../../../../../session/messages/outgoing/visibleMessage/VisibleMessage'; describe('ClosedGroupVisibleMessage', () => { - let groupId: PubKey; + let groupId: string; beforeEach(() => { - groupId = TestUtils.generateFakePubKey(); + groupId = TestUtils.generateFakePubKeyStr(); }); it('can create empty message with timestamp, groupId and chatMessage', () => { const chatMessage = new VisibleMessage({ @@ -28,7 +28,7 @@ describe('ClosedGroupVisibleMessage', () => { .to.have.property('group') .to.have.deep.property( 'id', - new Uint8Array(StringUtils.encode(PubKey.PREFIX_GROUP_TEXTSECURE + groupId.key, 'utf8')) + new Uint8Array(StringUtils.encode(PubKey.PREFIX_GROUP_TEXTSECURE + groupId, 'utf8')) ); expect(decoded.dataMessage) .to.have.property('group') diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts index 9622a34f56..12c0853035 100644 --- a/ts/test/session/unit/utils/Messages_test.ts +++ b/ts/test/session/unit/utils/Messages_test.ts @@ -97,7 +97,7 @@ describe('Message Utils', () => { it('should set encryption to ClosedGroup if a ClosedGroupVisibleMessage is passed in', async () => { const device = TestUtils.generateFakePubKey(); - const groupId = TestUtils.generateFakePubKey(); + const groupId = TestUtils.generateFakePubKeyStr(); const chatMessage = TestUtils.generateVisibleMessage(); const message = new ClosedGroupVisibleMessage({ chatMessage, groupId }); From 90f4dd761c7607df6a3cf8817d48ec9e25473a79 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 14 Sep 2023 14:21:29 +1000 Subject: [PATCH 011/302] feat: add meta merge and update of name+members --- ts/receiver/configMessage.ts | 46 +++++++++- .../apis/snode_api/SnodeRequestTypes.ts | 10 +-- ts/session/apis/snode_api/batchRequest.ts | 4 +- ts/session/apis/snode_api/retrieveRequest.ts | 2 +- ts/session/apis/snode_api/swarmPolling.ts | 63 +++++++------- .../SwarmPollingGroupConfig.ts | 85 ++++++++++++------- ts/session/apis/snode_api/types.ts | 4 + .../utils/job_runners/jobs/GroupConfigJob.ts | 3 + .../libsession_utils_convo_info_volatile.ts | 3 + .../libsession_utils_user_groups.ts | 15 +++- ts/state/ducks/groupInfos.ts | 25 +++++- ts/types/sqlSharedTypes.ts | 8 +- .../browser/libsession_worker_interface.ts | 19 +++-- 13 files changed, 205 insertions(+), 82 deletions(-) diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 150d6ea4d3..99a95b8f51 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -24,7 +24,7 @@ import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libses import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups'; import { configurationMessageReceived, trigger } from '../shims/events'; import { getCurrentlySelectedConversationOutsideRedux } from '../state/selectors/conversations'; -import { assertUnreachable } from '../types/sqlSharedTypes'; +import { assertUnreachable, stringify, toFixedUint8ArrayOfLength } from '../types/sqlSharedTypes'; import { BlockedNumberController } from '../util'; import { Storage, setLastProfileUpdateTimestamp } from '../util/storage'; // eslint-disable-next-line import/no-unresolved, import/extensions @@ -46,6 +46,7 @@ import { import { addKeyPairToCacheAndDBIfNeeded } from './closedGroups'; import { HexKeyPair } from './keypairs'; import { queueAllCachedFromSource } from './receiver'; +import { HexString } from '../node/hexStrings'; type IncomingUserResult = { needsPush: boolean; @@ -609,6 +610,42 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { } } +async function handleGroupUpdate(latestEnvelopeTimestamp: number) { + // first let's check which groups needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB + const allGoupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); + + const allGoupsIdsInWrapper = allGoupsInWrapper.map(m => m.pubkeyHex); + console.warn('allGoupsIdsInWrapper', stringify(allGoupsIdsInWrapper)); + + const userEdKeypair = await UserUtils.getUserED25519KeyPairBytes(); + if (!userEdKeypair) { + throw new Error('userEdKeypair is not set'); + } + + for (let index = 0; index < allGoupsInWrapper.length; index++) { + const groupInWrapper = allGoupsInWrapper[index]; + if (!getConversationController().get(groupInWrapper.pubkeyHex)) { + // dump is always empty when creating a new groupInfo + await MetaGroupWrapperActions.init(groupInWrapper.pubkeyHex, { + metaDumped: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEdKeypair.privKeyBytes, 64), + groupEd25519Secretkey: groupInWrapper.secretKey, + groupEd25519Pubkey: toFixedUint8ArrayOfLength( + HexString.fromHexString(groupInWrapper.pubkeyHex.slice(2)), + 32 + ), + }); + const created = await getConversationController().getOrCreateAndWait( + groupInWrapper.pubkeyHex, + ConversationTypeEnum.GROUPV3 + ); + created.set({ active_at: latestEnvelopeTimestamp }); + await created.commit(); + getSwarmPollingInstance().addGroupId(PubKey.cast(groupInWrapper.pubkeyHex)); + } + } +} + async function handleUserGroupsUpdate(result: IncomingUserResult) { const toHandle = SessionUtilUserGroups.getUserGroupTypes(); for (let index = 0; index < toHandle.length; index++) { @@ -621,6 +658,9 @@ async function handleUserGroupsUpdate(result: IncomingUserResult) { case 'LegacyGroup': await handleLegacyGroupUpdate(result.latestEnvelopeTimestamp); break; + case 'Group': + await handleGroupUpdate(result.latestEnvelopeTimestamp); + break; default: assertUnreachable(typeToHandle, `handleUserGroupsUpdate unhandled type "${typeToHandle}"`); @@ -731,6 +771,10 @@ async function handleConvoInfoVolatileUpdate() { } break; + case 'Group': + // debugger; // we need to update the current read messages of that group 03 with what we have in the wrapper // debugger + break; + default: assertUnreachable(type, `handleConvoInfoVolatileUpdate: unhandeld switch case: ${type}`); } diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 43a58e9783..aa7be98de3 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -4,6 +4,7 @@ import { SnodeNamespaces, SnodeNamespacesGroup } from './namespaces'; export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } }; +type WithRetrieveMethod = { method: 'retrieve' }; type WithMaxCountSize = { max_count?: number; max_size?: number }; type WithPubkeyAsString = { pubkey: string }; type WithPubkeyAsGroupPubkey = { pubkey: GroupPubkeyType }; @@ -14,8 +15,7 @@ type RetrieveAlwaysNeeded = { timestamp?: number; }; -export type RetrievePubkeySubRequestType = { - method: 'retrieve'; +export type RetrievePubkeySubRequestType = WithRetrieveMethod & { params: { signature: string; pubkey_ed25519: string; @@ -33,8 +33,7 @@ export type RetrievePubkeySubRequestType = { */ // type UnauthenticatedStoreNamespaces = -30 | -20 | -10 | 0 | 10 | 20 | 30; -export type RetrieveLegacyClosedGroupSubRequestType = { - method: 'retrieve'; +export type RetrieveLegacyClosedGroupSubRequestType = WithRetrieveMethod & { params: { namespace: SnodeNamespaces.LegacyClosedGroup; // legacy closed groups retrieve are not authenticated because the clients do not have a shared key } & RetrieveAlwaysNeeded & @@ -42,8 +41,7 @@ export type RetrieveLegacyClosedGroupSubRequestType = { WithPubkeyAsString; }; -export type RetrieveGroupAdminSubRequestType = { - method: 'retrieve'; +export type RetrieveGroupAdminSubRequestType = WithRetrieveMethod & { params: { signature: string; namespace: SnodeNamespacesGroup; diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 7e4b3198c7..3e23b1ad65 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -23,8 +23,8 @@ export async function doSnodeBatchRequest( ): Promise { console.warn( `doSnodeBatchRequest "${method}":`, - JSON.stringify(subRequests.map(m => m.method)), - subRequests + JSON.stringify(subRequests.map(m => m.method)) + // subRequests ); const result = await snodeRpc({ method, diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 6a36d2852b..75833206fa 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -102,7 +102,7 @@ async function retrieveRequestForGroup({ const group = await UserGroupsWrapperActions.getGroup(groupPk); const groupSecretKey = group?.secretKey; if (isNil(groupSecretKey) || isEmpty(groupSecretKey)) { - throw new Error(`sendMessagesDataToSnode: failed to find group admin secret key in wrapper`); + throw new Error(`retrieveRequestForGroup: failed to find group admin secret key in wrapper`); } const signatureBuilt = await SnodeSignature.getSnodeGroupSignatureParams({ ...retrieveParam, diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index b8b4605853..8e93628882 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -26,7 +26,7 @@ import { SnodeNamespace, SnodeNamespaces } from './namespaces'; import { SnodeAPIRetrieve } from './retrieveRequest'; import { SwarmPollingGroupConfig } from './swarm_polling_config/SwarmPollingGroupConfig'; import { SwarmPollingUserConfig } from './swarm_polling_config/SwarmPollingUserConfig'; -import { RetrieveMessageItem, RetrieveMessagesResultsBatched } from './types'; +import { RetrieveMessageItem, RetrieveMessageItemWithNamespace, RetrieveMessagesResultsBatched, RetrieveRequestResult } from './types'; import { GroupPubkeyType } from 'libsession_util_nodejs'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; @@ -547,27 +547,28 @@ export class SwarmPolling { } } +function retrieveItemWithNamespace(results: RetrieveRequestResult[] ) { + return flatten( + compact(results.map(result => result.messages.messages?.map(r => ({ ...r, namespace: result.namespace }))))); +} + function filterMessagesPerTypeOfConvo( type: T, retrieveResults: RetrieveMessagesResultsBatched -): { confMessages: Array | null; otherMessages: Array } { +): { confMessages: Array | null; otherMessages: Array } { switch (type) { case ConversationTypeEnum.PRIVATE: { - const confMessages = flatten( - compact( - retrieveResults - .filter(m => SnodeNamespace.isUserConfigNamespace(m.namespace)) - .map(r => r.messages.messages) - ) - ); + const userConfs = retrieveResults + .filter(m => SnodeNamespace.isUserConfigNamespace(m.namespace)); + const userOthers = retrieveResults + .filter(m => !SnodeNamespace.isUserConfigNamespace(m.namespace)); + + const confMessages = + retrieveItemWithNamespace(userConfs) + + const otherMessages = + retrieveItemWithNamespace(userOthers) - const otherMessages = flatten( - compact( - retrieveResults - .filter(m => !SnodeNamespace.isUserConfigNamespace(m.namespace)) - .map(r => r.messages.messages) - ) - ); return { confMessages, otherMessages: uniqBy(otherMessages, x => x.hash) }; } @@ -575,27 +576,25 @@ function filterMessagesPerTypeOfConvo( case ConversationTypeEnum.GROUP: return { confMessages: null, - otherMessages: flatten(compact(retrieveResults.map(m => m.messages.messages))), + otherMessages: retrieveItemWithNamespace(retrieveResults), }; case ConversationTypeEnum.GROUPV3: { - const confMessages = flatten( - compact( - retrieveResults - .filter(m => SnodeNamespace.isGroupConfigNamespace(m.namespace)) - .map(r => r.messages.messages) - ) - ); - const otherMessages = flatten( - compact( - retrieveResults - .filter(m => !SnodeNamespace.isGroupConfigNamespace(m.namespace)) - .map(r => r.messages.messages) - ) - ); + const groupConfs = retrieveResults + .filter(m => SnodeNamespace.isGroupConfigNamespace(m.namespace)); + const groupOthers = retrieveResults + .filter(m => !SnodeNamespace.isGroupConfigNamespace(m.namespace)); + + const groupConfMessages = + retrieveItemWithNamespace(groupConfs) + + const groupOtherMessages = + retrieveItemWithNamespace(groupOthers) + + + return { confMessages: groupConfMessages, otherMessages: uniqBy(groupOtherMessages, x => x.hash) }; - return { confMessages, otherMessages: uniqBy(otherMessages, x => x.hash) }; } default: diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 66ff24b46c..b35f8b8900 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -1,11 +1,13 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { EnvelopePlus } from '../../../../receiver/types'; +import { stringify } from '../../../../types/sqlSharedTypes'; +import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { ed25519Str } from '../../../onions/onionPath'; -import { RetrieveMessageItem } from '../types'; -import { SwarmPollingConfigShared } from './SwarmPollingConfigShared'; +import { fromBase64ToArray } from '../../../utils/String'; +import { SnodeNamespaces } from '../namespaces'; +import { RetrieveMessageItemWithNamespace } from '../types'; async function handleGroupSharedConfigMessages( - groupConfigMessagesMerged: Array, + groupConfigMessagesMerged: Array, groupPk: GroupPubkeyType ) { window.log.info( @@ -14,34 +16,59 @@ async function handleGroupSharedConfigMessages( } for groupPk:${ed25519Str(groupPk)}` ); try { - const extractedConfigMessage = SwarmPollingConfigShared.extractWebSocketContents( - groupConfigMessagesMerged + const infos = groupConfigMessagesMerged + .filter(m => m.namespace === SnodeNamespaces.ClosedGroupInfo) + .map(info => { + return { data: fromBase64ToArray(info.data), hash: info.hash }; + }); + const members = groupConfigMessagesMerged + .filter(m => m.namespace === SnodeNamespaces.ClosedGroupMembers) + .map(info => { + return { data: fromBase64ToArray(info.data), hash: info.hash }; + }); + const keys = groupConfigMessagesMerged + .filter(m => m.namespace === SnodeNamespaces.ClosedGroupKeys) + .map(info => { + return { + data: fromBase64ToArray(info.data), + hash: info.hash, + timestampMs: info.timestamp, + }; + }); + const toMerge = { + groupInfo: infos, + groupKeys: keys, + groupMember: members, + }; + console.info(`About to merge ${stringify(toMerge)}`); + console.info(`dumps before ${stringify(await MetaGroupWrapperActions.metaDump(groupPk))}`); + console.info( + `groupInfo before merge: ${stringify(await MetaGroupWrapperActions.infoGet(groupPk))}` ); - - const allDecryptedConfigMessages = await SwarmPollingConfigShared.decryptSharedConfigMessages( - extractedConfigMessage, - async (_envelope: EnvelopePlus) => { - console.warn('decrypt closed group incoming shared message to do'); - return null; - } + const countMerged = await MetaGroupWrapperActions.metaMerge(groupPk, toMerge); + console.info( + `countMerged ${countMerged}, groupInfo after merge: ${stringify( + await MetaGroupWrapperActions.infoGet(groupPk) + )}` ); + console.info(`dumps after ${stringify(await MetaGroupWrapperActions.metaDump(groupPk))}`); - if (allDecryptedConfigMessages.length) { - try { - window.log.info( - `handleGroupSharedConfigMessages of "${allDecryptedConfigMessages.length}" messages with libsession` - ); - console.warn('HANDLING OF INCOMING GROUP TODO '); - // await ConfigMessageHandler.handleUserConfigMessagesViaLibSession( - // allDecryptedConfigMessages - // ); - } catch (e) { - const allMessageHases = allDecryptedConfigMessages.map(m => m.messageHash).join(','); - window.log.warn( - `failed to handle group messages hashes "${allMessageHases}" with libsession. Error: "${e.message}"` - ); - } - } + // if (allDecryptedConfigMessages.length) { + // try { + // window.log.info( + // `handleGroupSharedConfigMessages of "${allDecryptedConfigMessages.length}" messages with libsession` + // ); + // console.warn('HANDLING OF INCOMING GROUP TODO '); + // // await ConfigMessageHandler.handleUserConfigMessagesViaLibSession( + // // allDecryptedConfigMessages + // // ); + // } catch (e) { + // const allMessageHases = allDecryptedConfigMessages.map(m => m.messageHash).join(','); + // window.log.warn( + // `failed to handle group messages hashes "${allMessageHases}" with libsession. Error: "${e.message}"` + // ); + // } + // } } catch (e) { window.log.warn( `handleGroupSharedConfigMessages of ${groupConfigMessagesMerged.length} failed with ${e.message}` diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index 705c7b5fe3..9e267cb2a2 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -7,6 +7,10 @@ export type RetrieveMessageItem = { timestamp: number; }; +export type RetrieveMessageItemWithNamespace = RetrieveMessageItem & { + namespace: SnodeNamespaces; // the namespace from which this message was fetched +}; + export type RetrieveMessagesResultsContent = { hf?: Array; messages?: Array; diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index 6e45b9eb85..de92090371 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -29,6 +29,7 @@ import { PersistedJob, RunJobResult, } from '../PersistedJob'; +import { stringify } from '../../../../types/sqlSharedTypes'; const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s) const defaultMaxAttempts = 2; @@ -210,12 +211,14 @@ class GroupSyncJob extends PersistedJob { data: item.data, }; }); + console.warn(`msgs ${stringify(msgs)}`); const result = await MessageSender.sendEncryptedDataToSnode( msgs, thisJobDestination, oldHashesToDelete ); + console.warn(`result ${stringify(result)}`); const expectedReplyLength = singleDestChanges.messages.length + (oldHashesToDelete.size ? 1 : 0); diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts index a66ea24482..1cc1f1ae7d 100644 --- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts +++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts @@ -118,6 +118,9 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise< ); } break; + case 'Group': + // we need to keep track of the convo volatile info for the new group now. // TODO AUDRIC debugger + break; case 'Community': try { const asOpengroup = foundConvo.toOpenGroupV2(); diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts index 1de58fe5ef..a59dec94b3 100644 --- a/ts/session/utils/libsession/libsession_utils_user_groups.ts +++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts @@ -10,6 +10,7 @@ import { } from '../../../types/sqlSharedTypes'; import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { getConversationController } from '../../conversations'; +import { PubKey } from '../../types'; /** * Returns true if that conversation is an active group @@ -33,6 +34,10 @@ function isLegacyGroupToStoreInWrapper(convo: ConversationModel): boolean { ); } +function isGroupToStoreInWrapper(convo: ConversationModel): boolean { + return convo.isGroup() && PubKey.isClosedGroupV3(convo.id) && convo.isActive(); // TODO should we filter by left/kicked or they are on the wrapper itself? +} + /** * We do not want to include groups left in the wrapper, but when receiving a list * of wrappers from the network we need to check against the one present locally @@ -73,6 +78,8 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise const convoType: UserGroupsType = isCommunityToStoreInWrapper(foundConvo) ? 'Community' + : PubKey.isClosedGroupV3(convoId) + ? 'Group' : 'LegacyGroup'; switch (convoType) { @@ -135,6 +142,9 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise // we still let this go through } break; + case 'Group': + // debugger; + break; default: assertUnreachable( @@ -175,7 +185,7 @@ async function removeCommunityFromWrapper(_convoId: string, fullUrlWithOrWithout * whole other bunch of issues because it is a native node module. */ function getUserGroupTypes(): Array { - return ['Community', 'LegacyGroup']; + return ['Community', 'LegacyGroup', 'Group']; } export const SessionUtilUserGroups = { @@ -193,4 +203,7 @@ export const SessionUtilUserGroups = { // legacy group isLegacyGroupToStoreInWrapper, isLegacyGroupToRemoveFromDBIfNotInWrapper, + + // group 03 + isGroupToStoreInWrapper, }; diff --git a/ts/state/ducks/groupInfos.ts b/ts/state/ducks/groupInfos.ts index a4b28e6e3d..996edcb1e1 100644 --- a/ts/state/ducks/groupInfos.ts +++ b/ts/state/ducks/groupInfos.ts @@ -1,17 +1,17 @@ import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit'; import { GroupInfoGet, GroupInfoShared, GroupPubkeyType } from 'libsession_util_nodejs'; +import { uniq } from 'lodash'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { ClosedGroup } from '../../session'; import { getConversationController } from '../../session/conversations'; import { UserUtils } from '../../session/utils'; +import { GroupSync } from '../../session/utils/job_runners/jobs/GroupConfigJob'; +import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; -import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; -import { uniq } from 'lodash'; -import { GroupSync } from '../../session/utils/job_runners/jobs/GroupConfigJob'; type GroupInfoGetWithId = GroupInfoGet & { id: GroupPubkeyType }; @@ -46,6 +46,9 @@ const initNewGroupInfoInWrapper = createAsyncThunk( }): Promise => { try { const newGroup = await UserGroupsWrapperActions.createGroup(); + + await UserGroupsWrapperActions.setGroup(newGroup); + const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); if (!ourEd25519KeypairBytes) { throw new Error('Current user has no priv ed25519 key?'); @@ -61,12 +64,28 @@ const initNewGroupInfoInWrapper = createAsyncThunk( groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), }); + await Promise.all( + groupDetails.members.map(async member => { + const created = await MetaGroupWrapperActions.memberGetOrConstruct( + newGroup.pubkeyHex, + member + ); + await MetaGroupWrapperActions.memberSetInvited( + newGroup.pubkeyHex, + created.pubkeyHex, + false + ); + }) + ); const infos = await MetaGroupWrapperActions.infoGet(newGroup.pubkeyHex); + if (!infos) { throw new Error( `getInfos of ${newGroup.pubkeyHex} returned empty result even if it was just init.` ); } + infos.name = groupDetails.groupName; + await MetaGroupWrapperActions.infoSet(newGroup.pubkeyHex, infos); const convo = await getConversationController().getOrCreateAndWait( newGroup.pubkeyHex, diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index cc3a95fbd2..7a5d2d7abe 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -12,7 +12,7 @@ import { isArray, isEmpty, isEqual } from 'lodash'; import { OpenGroupV2Room } from '../data/opengroups'; import { ConversationAttributes } from '../models/conversationAttributes'; import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil'; -import { fromHexToArray } from '../session/utils/String'; +import { fromHexToArray, toHex } from '../session/utils/String'; import { ConfigWrapperObjectTypesMeta } from '../webworker/workers/browser/libsession_worker_functions'; /** @@ -281,3 +281,9 @@ export function toFixedUint8ArrayOfLength( `toFixedUint8ArrayOfLength invalid. Expected length ${length} but got: ${data.length}` ); } + +export function stringify(obj: unknown) { + return JSON.stringify(obj, (_key, value) => + value instanceof Uint8Array ? `Uint8Array(${value.length}): ${toHex(value)}` : value + ); +} diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index a4be752179..9733aaa8ba 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -14,6 +14,7 @@ import { UserConfigWrapperActionsCalls, UserGroupsWrapperActionsCalls, UserGroupsSet, + MergeSingle, } from 'libsession_util_nodejs'; import { join } from 'path'; @@ -76,7 +77,7 @@ export const GenericWrapperActions: GenericWrapperActionsCalls = { >, dump: async (wrapperId: ConfigWrapperUser) => callLibSessionWorker([wrapperId, 'dump']) as ReturnType, - merge: async (wrapperId: ConfigWrapperUser, toMerge: Array<{ hash: string; data: Uint8Array }>) => + merge: async (wrapperId: ConfigWrapperUser, toMerge: Array) => callLibSessionWorker([wrapperId, 'merge', toMerge]) as ReturnType< GenericWrapperActionsCalls['merge'] >, @@ -103,8 +104,7 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = { confirmPushed: async (seqno: number, hash: string) => GenericWrapperActions.confirmPushed('UserConfig', seqno, hash), dump: async () => GenericWrapperActions.dump('UserConfig'), - merge: async (toMerge: Array<{ hash: string; data: Uint8Array }>) => - GenericWrapperActions.merge('UserConfig', toMerge), + merge: async (toMerge: Array) => GenericWrapperActions.merge('UserConfig', toMerge), needsDump: async () => GenericWrapperActions.needsDump('UserConfig'), needsPush: async () => GenericWrapperActions.needsPush('UserConfig'), push: async () => GenericWrapperActions.push('UserConfig'), @@ -149,7 +149,7 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = { confirmPushed: async (seqno: number, hash: string) => GenericWrapperActions.confirmPushed('ContactsConfig', seqno, hash), dump: async () => GenericWrapperActions.dump('ContactsConfig'), - merge: async (toMerge: Array<{ hash: string; data: Uint8Array }>) => + merge: async (toMerge: Array) => GenericWrapperActions.merge('ContactsConfig', toMerge), needsDump: async () => GenericWrapperActions.needsDump('ContactsConfig'), needsPush: async () => GenericWrapperActions.needsPush('ContactsConfig'), @@ -184,7 +184,7 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = { confirmPushed: async (seqno: number, hash: string) => GenericWrapperActions.confirmPushed('UserGroupsConfig', seqno, hash), dump: async () => GenericWrapperActions.dump('UserGroupsConfig'), - merge: async (toMerge: Array<{ hash: string; data: Uint8Array }>) => + merge: async (toMerge: Array) => GenericWrapperActions.merge('UserGroupsConfig', toMerge), needsDump: async () => GenericWrapperActions.needsDump('UserGroupsConfig'), needsPush: async () => GenericWrapperActions.needsPush('UserGroupsConfig'), @@ -281,7 +281,7 @@ export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCal confirmPushed: async (seqno: number, hash: string) => GenericWrapperActions.confirmPushed('ConvoInfoVolatileConfig', seqno, hash), dump: async () => GenericWrapperActions.dump('ConvoInfoVolatileConfig'), - merge: async (toMerge: Array<{ hash: string; data: Uint8Array }>) => + merge: async (toMerge: Array) => GenericWrapperActions.merge('ConvoInfoVolatileConfig', toMerge), needsDump: async () => GenericWrapperActions.needsDump('ConvoInfoVolatileConfig'), needsPush: async () => GenericWrapperActions.needsPush('ConvoInfoVolatileConfig'), @@ -396,6 +396,13 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'metaConfirmPushed', args]) as Promise< ReturnType >, + metaMerge: async ( + groupPk: GroupPubkeyType, + args: Parameters[1] + ) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'metaMerge', args]) as Promise< + ReturnType + >, /** GroupInfo wrapper specific actions */ infoGet: async (groupPk: GroupPubkeyType) => From 08164f2fd00a319bbf75f7bafce33e676f0596e2 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 15 Sep 2023 16:34:05 +1000 Subject: [PATCH 012/302] feat: add sending and receiving of libsession encrypted msgs still a wip though --- ts/models/conversation.ts | 33 ++++- ts/receiver/closedGroups.ts | 6 +- ts/receiver/contentMessage.ts | 24 +++- ts/receiver/dataMessage.ts | 2 +- ts/session/apis/snode_api/batchRequest.ts | 8 +- ts/session/apis/snode_api/retrieveRequest.ts | 4 +- ts/session/apis/snode_api/snodeSignatures.ts | 2 +- ts/session/apis/snode_api/swarmPolling.ts | 4 +- .../conversations/ConversationController.ts | 4 +- ts/session/crypto/MessageEncrypter.ts | 133 ++++++++++++------ ts/session/group/closed-group.ts | 4 +- .../ClosedGroupVisibleMessage.ts | 38 ++++- ts/session/sending/MessageQueue.ts | 43 ++++-- ts/session/sending/MessageSender.ts | 27 ++-- ts/session/types/PubKey.ts | 75 +++++++--- ts/session/types/RawMessage.ts | 2 +- ts/session/utils/errors.ts | 14 ++ .../utils/job_runners/jobs/GroupConfigJob.ts | 32 +---- .../utils/libsession/libsession_utils.ts | 19 ++- .../libsession_utils_user_groups.ts | 4 +- 20 files changed, 337 insertions(+), 141 deletions(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 65abd867b3..43ffde283c 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -21,7 +21,10 @@ import { from_hex } from 'libsodium-wrappers-sumo'; import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; import { getConversationController } from '../session/conversations'; -import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; +import { + ClosedGroupV3VisibleMessage, + ClosedGroupVisibleMessage, +} from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { PubKey } from '../session/types'; import { ToastUtils, UserUtils } from '../session/utils'; import { BlockedNumberController } from '../util'; @@ -221,7 +224,9 @@ export class ConversationModel extends Backbone.Model { } public isClosedGroupV3(): boolean { - return Boolean(this.get('type') === ConversationTypeEnum.GROUPV3 && this.id.startsWith('03')); + return Boolean( + this.get('type') === ConversationTypeEnum.GROUPV3 && PubKey.isClosedGroupV2(this.id) + ); } public isPrivate() { @@ -1701,6 +1706,7 @@ export class ConversationModel extends Backbone.Model { // we are trying to send a message to someone. Make sure this convo is not hidden await this.unhideIfNeeded(true); + // TODO break down those functions (sendMessage and retrySend into smaller functions and narrow the VisibleMessageParams to preview, etc. with checks of types) // an OpenGroupV2 message is just a visible message const chatMessageParams: VisibleMessageParams = { body, @@ -1761,8 +1767,7 @@ export class ConversationModel extends Backbone.Model { if (this.isPrivate()) { if (this.isMe()) { - chatMessageParams.syncTarget = this.id; - const chatMessageMe = new VisibleMessage(chatMessageParams); + const chatMessageMe = new VisibleMessage({ ...chatMessageParams, syncTarget: this.id }); await getMessageQueue().sendSyncMessage({ namespace: SnodeNamespaces.Default, @@ -1798,6 +1803,12 @@ export class ConversationModel extends Backbone.Model { return; } + if (this.isClosedGroupV3()) { + // we need the return await so that errors are caught in the catch {} + await this.sendMessageToGroupV3(chatMessageParams); + return; + } + if (this.isClosedGroup()) { const chatMessageMediumGroup = new VisibleMessage(chatMessageParams); const closedGroupVisibleMessage = new ClosedGroupVisibleMessage({ @@ -1819,6 +1830,20 @@ export class ConversationModel extends Backbone.Model { } } + private async sendMessageToGroupV3(chatMessageParams: VisibleMessageParams) { + const visibleMessage = new VisibleMessage(chatMessageParams); + const groupVisibleMessage = new ClosedGroupV3VisibleMessage({ + chatMessage: visibleMessage, + destination: this.id, + namespace: SnodeNamespaces.ClosedGroupMessages, + }); + + // we need the return await so that errors are caught in the catch {} + await getMessageQueue().sendToGroupV3({ + message: groupVisibleMessage, + }); + } + private async sendBlindedMessageRequest(messageParams: VisibleMessageParams) { const ourSignKeyBytes = await UserUtils.getUserED25519KeyPairBytes(); const groupUrl = this.getSogsOriginMessage(); diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 8d5118d98b..c5ba8b879a 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -87,7 +87,7 @@ export async function handleClosedGroupControlMessage( }` ); - if (PubKey.isClosedGroupV3(envelope.source)) { + if (PubKey.isClosedGroupV2(envelope.source)) { window?.log?.warn( 'Message ignored; closed group v3 updates cannot come from SignalService.DataMessage.ClosedGroupControlMessage ' ); @@ -168,7 +168,7 @@ function sanityCheckNewGroup( return false; } - if (PubKey.isClosedGroupV3(hexGroupPublicKey)) { + if (PubKey.isClosedGroupV2(hexGroupPublicKey)) { window?.log?.warn('sanityCheckNewGroup: got a v3 new group as a ClosedGroupControlMessage. '); return false; } @@ -520,7 +520,7 @@ async function performIfValid( const groupPublicKey = envelope.source; const sender = envelope.senderIdentity; - if (PubKey.isClosedGroupV3(groupPublicKey)) { + if (PubKey.isClosedGroupV2(groupPublicKey)) { window?.log?.warn( 'Message ignored; closed group v3 updates cannot come from SignalService.DataMessage.ClosedGroupControlMessage ' ); diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 1057634e2d..df4a41e310 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -33,7 +33,11 @@ import { Storage } from '../util/storage'; import { handleCallMessage } from './callMessage'; import { getAllCachedECKeyPair, sentAtMoreRecentThanWrapper } from './closedGroups'; import { ECKeyPair } from './keypairs'; -import { ContactsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; +import { + ContactsWrapperActions, + MetaGroupWrapperActions, +} from '../webworker/workers/browser/libsession_worker_interface'; +import { PreConditionFailed } from '../session/utils/errors'; export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageHash: string) { try { @@ -54,6 +58,18 @@ export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageH } } +async function decryptForGroupV2(envelope: EnvelopePlus) { + window?.log?.info('received closed group message v2'); + // try { + const groupPk = envelope.source; + if (!PubKey.isClosedGroupV2(groupPk)) { + throw new PreConditionFailed('decryptForGroupV2: not a 03 prefixed group'); + } + + return await MetaGroupWrapperActions.decryptMessage(groupPk, envelope.content); + // } catch (e) {} +} + async function decryptForClosedGroup(envelope: EnvelopePlus) { // case .closedGroupCiphertext: for ios window?.log?.info('received closed group message'); @@ -266,7 +282,11 @@ async function decrypt(envelope: EnvelopePlus): Promise { plaintext = await decryptEnvelopeWithOurKey(envelope); break; case SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE: - plaintext = await decryptForClosedGroup(envelope); + if (PubKey.isClosedGroupV2(envelope.source)) { + plaintext = await decryptForGroupV2(envelope); + } else { + plaintext = await decryptForClosedGroup(envelope); + } break; default: assertUnreachable(envelope.type, `Unknown message type:${envelope.type}`); diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index edea30808a..ac32e58d06 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -195,7 +195,7 @@ export async function handleSwarmDataMessage( ); const isGroupMessage = !!envelope.senderIdentity; - const isGroupV3Message = isGroupMessage && PubKey.isClosedGroupV3(envelope.source); + const isGroupV3Message = isGroupMessage && PubKey.isClosedGroupV2(envelope.source); let typeOfConvo = ConversationTypeEnum.PRIVATE; if (isGroupV3Message) { typeOfConvo = ConversationTypeEnum.GROUPV3; diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 3e23b1ad65..a5212ecf1f 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -4,6 +4,12 @@ import { processOnionRequestErrorAtDestination, SnodeResponse } from './onions'; import { snodeRpc } from './sessionRpc'; import { NotEmptyArrayOfBatchResults, SnodeApiSubRequests } from './SnodeRequestTypes'; +function logSubRequests(requests: Array) { + return requests.map(m => + m.method === 'retrieve' || m.method === 'store' ? `${m.method}-${m.params.namespace}` : m.method + ); +} + /** * This is the equivalent to the batch send on sogs. The target node runs each sub request and returns a list of all the sub status and bodies. * If the global status code is not 200, an exception is thrown. @@ -23,7 +29,7 @@ export async function doSnodeBatchRequest( ): Promise { console.warn( `doSnodeBatchRequest "${method}":`, - JSON.stringify(subRequests.map(m => m.method)) + JSON.stringify(logSubRequests(subRequests)) // subRequests ); const result = await snodeRpc({ diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 75833206fa..2ac7290064 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -93,7 +93,7 @@ async function retrieveRequestForGroup({ namespace: SnodeNamespaces; retrieveParam: RetrieveParams; }) { - if (!PubKey.isClosedGroupV3(groupPk)) { + if (!PubKey.isClosedGroupV2(groupPk)) { throw new Error('retrieveRequestForGroup: not a 03 group'); } if (!SnodeNamespace.isGroupNamespace(namespace)) { @@ -147,7 +147,7 @@ async function buildRetrieveRequest( return retrieveRequestForLegacyGroup({ namespace, ourPubkey, pubkey, retrieveParam }); } - if (PubKey.isClosedGroupV3(pubkey)) { + if (PubKey.isClosedGroupV2(pubkey)) { if (!SnodeNamespace.isGroupNamespace(namespace)) { // either config or messages namespaces for 03 groups throw new Error(`tried to poll from a non 03 group namespace ${namespace}`); diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts index 91c09a1689..b2d46ecd75 100644 --- a/ts/session/apis/snode_api/snodeSignatures.ts +++ b/ts/session/apis/snode_api/snodeSignatures.ts @@ -77,7 +77,7 @@ function isSigParamsForGroupAdmin( sigParams: SnodeSigParamsAdminGroup | SnodeSigParamsUs ): sigParams is SnodeSigParamsAdminGroup { const asGr = sigParams as SnodeSigParamsAdminGroup; - return PubKey.isClosedGroupV3(asGr.groupPk) && !!asGr.privKey; + return PubKey.isClosedGroupV2(asGr.groupPk) && !!asGr.privKey; } async function getSnodeShared(params: SnodeSigParamsAdminGroup | SnodeSigParamsUs) { diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 8e93628882..d29c713c7c 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -191,7 +191,7 @@ export class SwarmPolling { window?.log?.debug( `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} ` ); - if (PubKey.isClosedGroupV3(key)) { + if (PubKey.isClosedGroupV2(key)) { return this.pollOnceForKey([key, ConversationTypeEnum.GROUPV3]); } return this.pollOnceForKey([key, ConversationTypeEnum.GROUP]); @@ -263,7 +263,7 @@ export class SwarmPolling { } else if ( type === ConversationTypeEnum.GROUPV3 && confMessages?.length && - PubKey.isClosedGroupV3(pubkey) + PubKey.isClosedGroupV2(pubkey) ) { await SwarmPollingGroupConfig.handleGroupSharedConfigMessages(confMessages, pubkey); } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index fc889bb083..38b7fec95a 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -96,7 +96,7 @@ export class ConversationController { throw new TypeError(`'type' must be 'private' or 'group' or 'groupv3' but got: '${type}'`); } - if (type === ConversationTypeEnum.GROUPV3 && !PubKey.isClosedGroupV3(id)) { + if (type === ConversationTypeEnum.GROUPV3 && !PubKey.isClosedGroupV2(id)) { throw new Error( 'required v3 closed group` ` but the pubkey does not match the 03 prefix for them' ); @@ -226,7 +226,7 @@ export class ConversationController { // if we were kicked or sent our left message, we have nothing to do more with that group. // Just delete everything related to it, not trying to add update message or send a left message. await this.removeGroupOrCommunityFromDBAndRedux(groupId); - if (PubKey.isClosedGroupV3(groupId)) { + if (PubKey.isClosedGroupV2(groupId)) { await remove03GroupFromWrappers(groupId); } else { await removeLegacyGroupFromWrappers(groupId); diff --git a/ts/session/crypto/MessageEncrypter.ts b/ts/session/crypto/MessageEncrypter.ts index 66eff65173..20334b24b3 100644 --- a/ts/session/crypto/MessageEncrypter.ts +++ b/ts/session/crypto/MessageEncrypter.ts @@ -1,9 +1,13 @@ +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { MessageEncrypter, concatUInt8Array, getSodiumRenderer } from '.'; +import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; +import { assertUnreachable } from '../../types/sqlSharedTypes'; +import { MetaGroupWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { PubKey } from '../types'; -import { concatUInt8Array, getSodiumRenderer, MessageEncrypter } from '.'; -import { fromHexToArray } from '../utils/String'; -import { Data } from '../../data/data'; import { UserUtils } from '../utils'; +import { fromHexToArray } from '../utils/String'; +import { SigningFailed } from '../utils/errors'; import { addMessagePadding } from './BufferPadding'; export { concatUInt8Array, getSodiumRenderer }; @@ -13,57 +17,106 @@ type EncryptResult = { cipherText: Uint8Array; }; +async function encryptWithLibSession(destination: GroupPubkeyType, plainText: Uint8Array) { + try { + return MetaGroupWrapperActions.encryptMessage(destination, plainText, true); + } catch (e) { + window.log.warn('encrypt message for group failed with', e.message); + throw new SigningFailed(e.message); + } +} + +async function encryptForLegacyGroup(destination: PubKey, plainText: Uint8Array) { + const hexEncryptionKeyPair = await Data.getLatestClosedGroupEncryptionKeyPair(destination.key); + if (!hexEncryptionKeyPair) { + window?.log?.warn("Couldn't get key pair for closed group during encryption"); + throw new Error("Couldn't get key pair for closed group"); + } + + const destinationX25519Pk = PubKey.cast(hexEncryptionKeyPair.publicHex); + + const cipherTextClosedGroup = await MessageEncrypter.encryptUsingSessionProtocol( + destinationX25519Pk, + plainText + ); + + return { + envelopeType: SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, + cipherText: cipherTextClosedGroup, + }; +} + /** - * Encrypt `plainTextBuffer` with given `encryptionType` for `device`. + * Encrypt `plainTextBuffer` with given `encryptionType` for `destination`. * - * @param device The device `PubKey` to encrypt for. + * @param destination The device `PubKey` to encrypt for. * @param plainTextBuffer The unpadded plaintext buffer. It will be padded * @param encryptionType The type of encryption. * @returns The envelope type and the base64 encoded cipher text */ export async function encrypt( - device: PubKey, + destination: PubKey, plainTextBuffer: Uint8Array, encryptionType: SignalService.Envelope.Type ): Promise { const { CLOSED_GROUP_MESSAGE, SESSION_MESSAGE } = SignalService.Envelope.Type; - - if (encryptionType !== CLOSED_GROUP_MESSAGE && encryptionType !== SESSION_MESSAGE) { - throw new Error(`Invalid encryption type:${encryptionType}`); - } - - const encryptForClosedGroup = encryptionType === CLOSED_GROUP_MESSAGE; - const plainText = addMessagePadding(plainTextBuffer); - - if (encryptForClosedGroup) { - // window?.log?.info( - // 'Encrypting message with SessionProtocol and envelope type is CLOSED_GROUP_MESSAGE' - // ); - const hexEncryptionKeyPair = await Data.getLatestClosedGroupEncryptionKeyPair(device.key); - if (!hexEncryptionKeyPair) { - window?.log?.warn("Couldn't get key pair for closed group during encryption"); - throw new Error("Couldn't get key pair for closed group"); + const plainTextPadded = addMessagePadding(plainTextBuffer); + + switch (encryptionType) { + case SESSION_MESSAGE: { + // if (destination.isPrivate || destination.isUS) { + const cipherText = await MessageEncrypter.encryptUsingSessionProtocol( + PubKey.cast(destination.key), + plainTextPadded + ); + return { envelopeType: SESSION_MESSAGE, cipherText }; + // } + + // if (destination.isGroupV2 || destination.isLegacyGroup) { + // throw new PreConditionFailed( + // 'Encryption with SESSION_MESSAGE only work with destination private or us' + // ); + // } + // assertUnreachable( + // destination, + // 'Encryption with SESSION_MESSAGE only work with destination private or us' + // ); } - const hexPubFromECKeyPair = PubKey.cast(hexEncryptionKeyPair.publicHex); - - const cipherTextClosedGroup = await MessageEncrypter.encryptUsingSessionProtocol( - hexPubFromECKeyPair, - plainText - ); - - return { - envelopeType: CLOSED_GROUP_MESSAGE, - cipherText: cipherTextClosedGroup, - }; + case CLOSED_GROUP_MESSAGE: { + const groupPk = destination.key; + if (PubKey.isClosedGroupV2(groupPk)) { + return { + envelopeType: CLOSED_GROUP_MESSAGE, + cipherText: await encryptWithLibSession(groupPk, plainTextBuffer), + }; + } + + // if (destination.isLegacyGroup) { + return encryptForLegacyGroup(destination, plainTextPadded); // not padding it again, it is already done by libsession + // } + // if ( + // destination.isBlinded || + // destination.isBlinded || + // destination.isPrivate || + // destination.isUS + // ) { + // throw new PreConditionFailed( + // 'Encryption with CLOSED_GROUP_MESSAGE only work with destination groupv2 or legacy group' + // ); + // } + // assertUnreachable( + // destination, + // 'Encryption with CLOSED_GROUP_MESSAGE only work with destination groupv2 or legacy group' + // ); + } + default: + assertUnreachable(encryptionType, ''); } - const cipherText = await MessageEncrypter.encryptUsingSessionProtocol(device, plainText); - - return { envelopeType: SESSION_MESSAGE, cipherText }; } export async function encryptUsingSessionProtocol( - recipientHexEncodedX25519PublicKey: PubKey, + destinationX25519Pk: PubKey, plaintext: Uint8Array ): Promise { const userED25519KeyPairHex = await UserUtils.getUserED25519KeyPair(); @@ -76,9 +129,9 @@ export async function encryptUsingSessionProtocol( } const sodium = await getSodiumRenderer(); - // window?.log?.info('encryptUsingSessionProtocol for ', recipientHexEncodedX25519PublicKey.key); - - const recipientX25519PublicKey = recipientHexEncodedX25519PublicKey.withoutPrefixToArray(); + const recipientX25519PublicKey = fromHexToArray( + PubKey.removePrefixIfNeeded(destinationX25519Pk.key) + ); const userED25519PubKeyBytes = fromHexToArray(userED25519KeyPairHex.pubKey); const userED25519SecretKeyBytes = fromHexToArray(userED25519KeyPairHex.privKey); diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index e1483e73f6..506461ff5f 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -60,7 +60,7 @@ export async function initiateClosedGroupUpdate( groupName: string, members: Array ) { - const isGroupV3 = PubKey.isClosedGroupV3(groupId); + const isGroupV3 = PubKey.isClosedGroupV2(groupId); const convo = await getConversationController().getOrCreateAndWait( groupId, isGroupV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP @@ -206,7 +206,7 @@ function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff export async function updateOrCreateClosedGroup(details: GroupInfo) { const { id, expireTimer } = details; - const isV3 = PubKey.isClosedGroupV3(id); + const isV3 = PubKey.isClosedGroupV2(id); const conversation = await getConversationController().getOrCreateAndWait( id, diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index 203137ca4f..7630323f87 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -3,6 +3,9 @@ import { PubKey } from '../../../types'; import { StringUtils } from '../../../utils'; import { VisibleMessage } from './VisibleMessage'; import { ClosedGroupMessage } from '../controlMessage/group/ClosedGroupMessage'; +import { DataMessage } from '../DataMessage'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; interface ClosedGroupVisibleMessageParams { identifier?: string; @@ -24,7 +27,7 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage { throw new Error('ClosedGroupVisibleMessage: groupId must be set'); } - if (PubKey.isClosedGroupV3(PubKey.cast(params.groupId).key)) { + if (PubKey.isClosedGroupV2(PubKey.cast(params.groupId).key)) { throw new Error('GroupContext should not be used anymore with closed group v3'); } } @@ -45,3 +48,36 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage { return dataProto; } } + +type WithDestinationGroupPk = { destination: GroupPubkeyType }; +type WithGroupMessageNamespace = { namespace: SnodeNamespaces.ClosedGroupMessages }; + +export class ClosedGroupV3VisibleMessage extends DataMessage { + private readonly chatMessage: VisibleMessage; + public readonly destination: GroupPubkeyType; + public readonly namespace: SnodeNamespaces.ClosedGroupMessages; + + constructor( + params: Pick & + WithDestinationGroupPk & + WithGroupMessageNamespace + ) { + super({ + timestamp: params.chatMessage.timestamp, + identifier: params.identifier ?? params.chatMessage.identifier, + }); + this.chatMessage = params.chatMessage; + + if (!PubKey.isClosedGroupV2(params.destination)) { + throw new Error('ClosedGroupV3VisibleMessage only work with 03-groups destination'); + } + this.destination = params.destination; + this.namespace = params.namespace; + } + + public dataProto(): SignalService.DataMessage { + // expireTimer is set in the dataProto in this call directly + const dataProto = this.chatMessage.dataProto(); + return dataProto; + } +} diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index d59de9521d..e20ad35340 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -1,28 +1,28 @@ import { AbortController } from 'abort-controller'; -import { PendingMessageCache } from './PendingMessageCache'; -import { JobQueue, MessageUtils, UserUtils } from '../utils'; -import { PubKey, RawMessage } from '../types'; import { MessageSender } from '.'; -import { ClosedGroupMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMessage'; import { ConfigurationMessage } from '../messages/outgoing/controlMessage/ConfigurationMessage'; +import { ClosedGroupMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMessage'; import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage'; +import { PubKey, RawMessage } from '../types'; +import { JobQueue, MessageUtils, UserUtils } from '../utils'; +import { PendingMessageCache } from './PendingMessageCache'; -import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage'; -import { MessageSentHandler } from './MessageSentHandler'; import { ContentMessage } from '../messages/outgoing'; import { ExpirationTimerUpdateMessage } from '../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; import { ClosedGroupAddedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage'; import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage'; +import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage'; import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage'; -import { ClosedGroupVisibleMessage } from '../messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; +import { + ClosedGroupV3VisibleMessage, + ClosedGroupVisibleMessage, +} from '../messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { SyncMessageType } from '../utils/sync/syncUtils'; +import { MessageSentHandler } from './MessageSentHandler'; import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil'; -import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; -import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; -import { CallMessage } from '../messages/outgoing/controlMessage/CallMessage'; import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2'; import { sendSogsReactionOnionV4 } from '../apis/open_group_api/sogsv3/sogsV3SendReaction'; import { @@ -30,7 +30,10 @@ import { SnodeNamespacesLegacyGroup, SnodeNamespacesUser, } from '../apis/snode_api/namespaces'; +import { CallMessage } from '../messages/outgoing/controlMessage/CallMessage'; import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage'; +import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; +import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; type ClosedGroupMessageType = | ClosedGroupVisibleMessage @@ -196,6 +199,26 @@ export class MessageQueue { return this.sendToPubKey(PubKey.cast(destinationPubKey), message, namespace, sentCb, true); } + public async sendToGroupV3({ + message, + sentCb, + }: { + message: ClosedGroupV3VisibleMessage; + sentCb?: (message: RawMessage) => Promise; + }): Promise { + if (!message.destination) { + throw new Error('Invalid group message passed in sendToGroupV3.'); + } + + return this.sendToPubKey( + PubKey.cast(message.destination), + message, + message.namespace, + sentCb, + true + ); + } + public async sendSyncMessage({ namespace, message, diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 2428efab4a..5a0644de7a 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -7,6 +7,7 @@ import _, { isEmpty, isNil, isString, sample, toNumber } from 'lodash'; import pRetry from 'p-retry'; import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; +import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil'; import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2'; import { @@ -40,7 +41,6 @@ import { RawMessage } from '../types/RawMessage'; import { UserUtils } from '../utils'; import { fromUInt8ArrayToBase64 } from '../utils/String'; import { EmptySwarmError } from '../utils/errors'; -import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; // ================ SNODE STORE ================ @@ -196,12 +196,15 @@ async function getSignatureParamsFromNamespace(item: StoreOnNodeParamsNoSig, des }); } - if (SnodeNamespace.isGroupConfigNamespace(item.namespace)) { - if (!PubKey.isClosedGroupV3(destination)) { + if ( + SnodeNamespace.isGroupConfigNamespace(item.namespace) || + item.namespace === SnodeNamespaces.ClosedGroupMessages + ) { + if (!PubKey.isClosedGroupV2(destination)) { throw new Error('sendMessagesDataToSnode: groupconfig namespace required a 03 pubkey'); } const group = await UserGroupsWrapperActions.getGroup(destination); - const groupSecretKey = group?.secretKey; + const groupSecretKey = group?.secretKey; // TODO we will need to the user auth at some point if (isNil(groupSecretKey) || isEmpty(groupSecretKey)) { throw new Error(`sendMessagesDataToSnode: failed to find group admin secret key in wrapper`); } @@ -303,7 +306,7 @@ type SharedEncryptAndWrap = { type EncryptAndWrapMessage = { plainTextBuffer: Uint8Array; destination: string; - namespace: number | null; + namespace: number; } & SharedEncryptAndWrap; type EncryptAndWrapMessageResults = { @@ -342,23 +345,11 @@ async function encryptMessageAndWrap( const data = wrapEnvelope(envelope); const data64 = ByteBuffer.wrap(data).toString('base64'); - // override the namespaces if those are unset in the incoming messages - // right when we upgrade from not having namespaces stored in the outgoing cached messages our messages won't have a namespace associated. - // So we need to keep doing the lookup of where they should go if the namespace is not set. - - const overridenNamespace = !isNil(namespace) - ? namespace - : getConversationController() - .get(recipient.key) - ?.isClosedGroup() - ? SnodeNamespaces.LegacyClosedGroup - : SnodeNamespaces.Default; - return { data64, networkTimestamp, data, - namespace: overridenNamespace, + namespace, ttl, identifier, isSyncMessage: syncMessage, diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index dd61aea1ef..2ad1912a95 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -26,6 +26,60 @@ export enum KeyPrefixType { groupV3 = '03', } +// export type GroupV2PubKey = { +// key: GroupPubkeyType; // 03 prefix for groups v2 +// isGroupV2: true; +// isLegacyGroup: false; +// isPrivate: false; +// isUS: false; +// isBlinded: false; +// }; + +// export type PrivatePubkey = { +// key: PubkeyType; // 05 prefix for private conversations +// isGroupV2: false; +// isLegacyGroup: false; +// isPrivate: true; +// isUS: false; +// isBlinded: false; +// }; + +// export type UsPubkey = { +// key: PubkeyType; // 05 prefix for note to self +// isGroupV2: false; +// isLegacyGroup: false; +// isPrivate: false; +// isUS: true; +// isBlinded: false; +// }; + +// export type PrivateBlindedPubkey = { +// key: BlindedPubkeyType; // 15 prefix for blinded pubkeys +// isGroupV2: false; +// isLegacyGroup: false; +// isPrivate: true; +// isUS: false; +// isBlinded: true; +// }; + +// export type LegacyGroupPubkey = { +// key: PubkeyType; // 05 prefix for legacy closed group +// isGroupV2: false; +// isLegacyGroup: true; +// isPrivate: false; +// isUS: false; +// isBlinded: false; +// }; + +// export type PubKeyRecord = +// | UsPubkey +// | PrivatePubkey +// | GroupV2PubKey +// | LegacyGroupPubkey +// | PrivateBlindedPubkey; + +// TODO make that Pubkey class more useful, add fields for what types of pubkey it is (group, legacy group, private) + export class PubKey { public static readonly PUBKEY_LEN = 66; public static readonly PUBKEY_LEN_NO_PREFIX = PubKey.PUBKEY_LEN - 2; @@ -233,31 +287,12 @@ export class PubKey { return fromHexToArray(this.key); } - public withoutPrefixToArray(): Uint8Array { - return fromHexToArray(PubKey.removePrefixIfNeeded(this.key)); - } - public static isBlinded(key: string) { return key.startsWith(KeyPrefixType.blinded15) || key.startsWith(KeyPrefixType.blinded25); } - public static isClosedGroupV3(key: string): key is GroupPubkeyType { + public static isClosedGroupV2(key: string): key is GroupPubkeyType { const regex = new RegExp(`^${KeyPrefixType.groupV3}${PubKey.HEX}{64}$`); return regex.test(key); } - - public static isHexOnly(str: string) { - return new RegExp(`^${PubKey.HEX}*$`).test(str); - } - - /** - * - * @returns true if that string is a valid group (as in closed group) pubkey. - * i.e. returns true if length is 66, prefix is 05 only, and it's hex characters only - */ - public static isValidGroupPubkey(pubkey: string): boolean { - return ( - pubkey.length === 66 && pubkey.startsWith(KeyPrefixType.standard) && this.isHexOnly(pubkey) - ); - } } diff --git a/ts/session/types/RawMessage.ts b/ts/session/types/RawMessage.ts index bebabc47c4..012dc65352 100644 --- a/ts/session/types/RawMessage.ts +++ b/ts/session/types/RawMessage.ts @@ -7,7 +7,7 @@ export type RawMessage = { device: string; ttl: number; encryption: SignalService.Envelope.Type; - namespace: SnodeNamespaces | null; // allowing null as when we upgrade, we might have messages awaiting sending which won't have a namespace + namespace: SnodeNamespaces; }; // For building RawMessages from JSON diff --git a/ts/session/utils/errors.ts b/ts/session/utils/errors.ts index 0807b10c0d..ec8eb5c5d2 100644 --- a/ts/session/utils/errors.ts +++ b/ts/session/utils/errors.ts @@ -66,3 +66,17 @@ export class HTTPError extends Error { } } } + +class BaseError extends Error { + public readonly context?: Object; + constructor(message: string, context?: Object) { + super(message); + this.name = this.constructor.name; + this.context = context; + } +} + +export class SigningFailed extends BaseError {} +export class InvalidSigningType extends BaseError {} +export class GroupV2SigningFailed extends SigningFailed {} +export class PreConditionFailed extends BaseError {} diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index de92090371..a76f13de0a 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -2,7 +2,7 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { isArray, isEmpty, isNumber, isString } from 'lodash'; import { UserUtils } from '../..'; -import { ConfigDumpData } from '../../../../data/configDump/configDump'; +import { stringify } from '../../../../types/sqlSharedTypes'; import { ReleasedFeatures } from '../../../../util/releaseFeature'; import { isSignInByLinking } from '../../../../util/storage'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; @@ -29,7 +29,6 @@ import { PersistedJob, RunJobResult, } from '../PersistedJob'; -import { stringify } from '../../../../types/sqlSharedTypes'; const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s) const defaultMaxAttempts = 2; @@ -118,30 +117,7 @@ async function buildAndSaveDumpsToDB( } await MetaGroupWrapperActions.metaConfirmPushed(...toConfirm); - const metaNeedsDump = await MetaGroupWrapperActions.needsDump(groupPk); - // save the concatenated dumps as a single entry in the DB if any of the dumps had a need for dump - if (metaNeedsDump) { - const dump = await MetaGroupWrapperActions.metaDump(groupPk); - await ConfigDumpData.saveConfigDump({ - data: dump, - publicKey: groupPk, - variant: `MetaGroupConfig-${groupPk}`, - }); - } -} - -async function saveDumpsNeededToDB(groupPk: GroupPubkeyType) { - const needsDump = await MetaGroupWrapperActions.needsDump(groupPk); - - if (!needsDump) { - return; - } - const dump = await MetaGroupWrapperActions.metaDump(groupPk); - await ConfigDumpData.saveConfigDump({ - data: dump, - publicKey: groupPk, - variant: `MetaGroupConfig-${groupPk}`, - }); + return LibSessionUtil.saveMetaGroupDumpToDb(groupPk); } class GroupSyncJob extends PersistedJob { @@ -181,12 +157,12 @@ class GroupSyncJob extends PersistedJob { return RunJobResult.PermanentFailure; } - if (!PubKey.isClosedGroupV3(thisJobDestination)) { + if (!PubKey.isClosedGroupV2(thisJobDestination)) { return RunJobResult.PermanentFailure; } // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc - await saveDumpsNeededToDB(thisJobDestination); + await LibSessionUtil.saveMetaGroupDumpToDb(thisJobDestination); const newGroupsReleased = await ReleasedFeatures.checkIsNewGroupsReleased(); // if the feature flag is not enabled, we want to keep updating the dumps, but just not sync them. diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 21391a77fb..205fac53dd 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -227,7 +227,7 @@ async function pendingChangesForGroup( groupPk: GroupPubkeyType ): Promise { const results = new Array(); - if (!PubKey.isClosedGroupV3(groupPk)) { + if (!PubKey.isClosedGroupV2(groupPk)) { throw new Error(`pendingChangesForGroup only works for user or 03 group pubkeys`); } // one of the wrapper behind the metagroup needs a push @@ -319,6 +319,22 @@ async function markAsPushed(variant: ConfigWrapperUser, seqno: number, hash: str return GenericWrapperActions.needsDump(variant); } +/** + * If a dump is needed for that metagroup wrapper, dump it to the Database + */ +async function saveMetaGroupDumpToDb(groupPk: GroupPubkeyType) { + const metaNeedsDump = await MetaGroupWrapperActions.needsDump(groupPk); + // save the concatenated dumps as a single entry in the DB if any of the dumps had a need for dump + if (metaNeedsDump) { + const dump = await MetaGroupWrapperActions.metaDump(groupPk); + await ConfigDumpData.saveConfigDump({ + data: dump, + publicKey: groupPk, + variant: `MetaGroupConfig-${groupPk}`, + }); + } +} + export const LibSessionUtil = { initializeLibSessionUtilWrappers, userVariantToUserKind, @@ -327,4 +343,5 @@ export const LibSessionUtil = { pendingChangesForGroup, userKindToVariant, markAsPushed, + saveMetaGroupDumpToDb, }; diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts index a59dec94b3..659b20fd15 100644 --- a/ts/session/utils/libsession/libsession_utils_user_groups.ts +++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts @@ -35,7 +35,7 @@ function isLegacyGroupToStoreInWrapper(convo: ConversationModel): boolean { } function isGroupToStoreInWrapper(convo: ConversationModel): boolean { - return convo.isGroup() && PubKey.isClosedGroupV3(convo.id) && convo.isActive(); // TODO should we filter by left/kicked or they are on the wrapper itself? + return convo.isGroup() && PubKey.isClosedGroupV2(convo.id) && convo.isActive(); // TODO should we filter by left/kicked or they are on the wrapper itself? } /** @@ -78,7 +78,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise const convoType: UserGroupsType = isCommunityToStoreInWrapper(foundConvo) ? 'Community' - : PubKey.isClosedGroupV3(convoId) + : PubKey.isClosedGroupV2(convoId) ? 'Group' : 'LegacyGroup'; From bbedfd943ca006b1f0b7d58c3a451babba41d3f4 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 18 Sep 2023 10:06:40 +1000 Subject: [PATCH 013/302] fix: do not confirm keys once pushed, wait for poll event --- ts/session/utils/job_runners/jobs/GroupConfigJob.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index a76f13de0a..974d69bea1 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -92,7 +92,7 @@ async function buildAndSaveDumpsToDB( ): Promise { const toConfirm: Parameters = [ groupPk, - { groupInfo: null, groupKeys: null, groupMember: null }, + { groupInfo: null, groupMember: null }, ]; for (let i = 0; i < changes.length; i++) { @@ -109,10 +109,6 @@ async function buildAndSaveDumpsToDB( toConfirm[1].groupMember = [change.pushed.seqno.toNumber(), change.updatedHash]; break; } - case SnodeNamespaces.ClosedGroupKeys: { - toConfirm[1].groupKeys = [change.pushed.data, change.updatedHash, change.pushed.timestamp]; - break; - } } } From 46e3675c450e3b435df6e71a1daa6170e8e72eec Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 19 Sep 2023 13:02:22 +1000 Subject: [PATCH 014/302] feat: add function to redux to grab group detail outside of store --- ts/components/SessionInboxView.tsx | 5 +- .../conversation/ConversationHeader.tsx | 13 +- .../conversation/StagedGenericAttachment.tsx | 48 ++-- .../conversation/SubtleNotification.tsx | 2 +- .../conversation/media-gallery/EmptyState.tsx | 10 +- .../dialog/AdminLeaveClosedGroupDialog.tsx | 5 +- ts/components/dialog/BanOrUnbanUserDialog.tsx | 15 +- ts/components/dialog/InviteContactsDialog.tsx | 30 ++- .../dialog/ModeratorsRemoveDialog.tsx | 25 +- .../dialog/UpdateGroupMembersDialog.tsx | 53 +++-- .../dialog/UpdateGroupNameDialog.tsx | 32 +-- .../conversation-list-item/HeaderItem.tsx | 4 +- .../conversation-list-item/MessageItem.tsx | 12 +- ts/data/configDump/configDump.ts | 4 + ts/hooks/useParamSelector.ts | 71 +++++- ts/interactions/conversationInteractions.ts | 4 +- .../conversations/unsendingInteractions.ts | 8 +- ts/models/conversation.ts | 34 ++- ts/node/sql_calls/config_dump.ts | 6 + ts/receiver/closedGroups.ts | 8 +- ts/receiver/configMessage.ts | 3 +- .../SwarmPollingGroupConfig.ts | 28 ++- .../conversations/ConversationController.ts | 4 +- ts/session/conversations/createClosedGroup.ts | 4 +- ts/session/group/closed-group.ts | 6 +- ts/session/utils/Groups.ts | 11 - .../utils/job_runners/jobs/GroupConfigJob.ts | 3 - .../utils/libsession/libsession_utils.ts | 36 ++- .../libsession/libsession_utils_contacts.ts | 10 +- .../libsession_utils_user_groups.ts | 2 +- ts/session/utils/sync/syncUtils.ts | 2 +- ts/state/actions.ts | 2 +- ts/state/ducks/groupInfos.ts | 166 -------------- ts/state/ducks/groups.ts | 217 ++++++++++++++++++ ts/state/ducks/modalDialog.tsx | 17 +- ts/state/reducer.ts | 6 +- ts/state/selectors/groups.ts | 83 +++++++ ts/state/selectors/selectedConversation.ts | 33 ++- .../session/unit/sending/MessageQueue_test.ts | 19 +- ts/types/sqlSharedTypes.ts | 2 + .../browser/libsession_worker_interface.ts | 4 + 41 files changed, 665 insertions(+), 382 deletions(-) delete mode 100644 ts/state/ducks/groupInfos.ts create mode 100644 ts/state/ducks/groups.ts create mode 100644 ts/state/selectors/groups.ts diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index 26c59411c1..bc44721ed4 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -39,7 +39,7 @@ import { useHasDeviceOutdatedSyncing } from '../state/selectors/settings'; import { Storage } from '../util/storage'; import { NoticeBanner } from './NoticeBanner'; import { Flex } from './basic/Flex'; -import { initialGroupInfosState } from '../state/ducks/groupInfos'; +import { groupInfoActions, initialGroupState } from '../state/ducks/groups'; function makeLookup(items: Array, key: string): { [key: string]: T } { // Yep, we can't index into item without knowing what it is. True. But we want to. @@ -89,7 +89,7 @@ function createSessionInboxStore() { call: initialCallState, sogsRoomInfo: initialSogsRoomInfoState, settings: getSettingsInitialState(), - groupInfos: initialGroupInfosState, + groups: initialGroupState, }; return createStore(initialState); @@ -99,6 +99,7 @@ function setupLeftPane(forceUpdateInboxComponent: () => void) { window.openConversationWithMessages = openConversationWithMessages; window.inboxStore = createSessionInboxStore(); window.inboxStore.dispatch(updateAllOnStorageReady()); + window.inboxStore.dispatch(groupInfoActions.loadDumpsFromDB()); forceUpdateInboxComponent(); } diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 79ab31144f..1d81aec0c8 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -39,7 +39,7 @@ import { useSelectedIsPrivate, useSelectedIsPrivateFriend, useSelectedIsPublic, - useSelectedMembers, + useSelectedMembersCount, useSelectedNotificationSetting, useSelectedSubscriberCount, useSelectedisNoteToSelf, @@ -297,7 +297,7 @@ const ConversationHeaderTitle = () => { const isKickedFromGroup = useSelectedIsKickedFromGroup(); const isMe = useSelectedisNoteToSelf(); const isGroup = useSelectedIsGroup(); - const members = useSelectedMembers(); + let memberCount = useSelectedMembersCount(); if (!selectedConvoKey) { return null; @@ -309,13 +309,8 @@ const ConversationHeaderTitle = () => { return
{i18n('noteToSelf')}
; } - let memberCount = 0; - if (isGroup) { - if (isPublic) { - memberCount = subscriberCount || 0; - } else { - memberCount = members.length; - } + if (isPublic) { + memberCount = subscriberCount || 0; } let memberCountText = ''; diff --git a/ts/components/conversation/StagedGenericAttachment.tsx b/ts/components/conversation/StagedGenericAttachment.tsx index 7ce239c491..564a70caed 100644 --- a/ts/components/conversation/StagedGenericAttachment.tsx +++ b/ts/components/conversation/StagedGenericAttachment.tsx @@ -7,30 +7,28 @@ interface Props { onClose: (attachment: AttachmentType) => void; } -export class StagedGenericAttachment extends React.Component { - public render() { - const { attachment, onClose } = this.props; - const { fileName, contentType } = attachment; - const extension = getExtensionForDisplay({ contentType, fileName }); +export const StagedGenericAttachment = (props: Props) => { + const { attachment, onClose } = props; + const { fileName, contentType } = attachment; + const extension = getExtensionForDisplay({ contentType, fileName }); - return ( -
-
{ - if (onClose) { - onClose(attachment); - } - }} - /> -
- {extension ? ( -
{extension}
- ) : null} -
-
{fileName}
+ return ( +
+
{ + if (onClose) { + onClose(attachment); + } + }} + /> +
+ {extension ? ( +
{extension}
+ ) : null}
- ); - } -} +
{fileName}
+
+ ); +}; diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index 0e3eb862dc..598deb7843 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -64,7 +64,7 @@ export const NoMessageInConversation = () => { const canWrite = useSelector(getSelectedCanWrite); const privateBlindedAndBlockingMsgReqs = useSelectedHasDisabledBlindedMsgRequests(); // TODOLATER use this selector accross the whole application (left pane excluded) - const nameToRender = useSelectedNicknameOrProfileNameOrShortenedPubkey(); + const nameToRender = useSelectedNicknameOrProfileNameOrShortenedPubkey() || ''; if (!selectedConversation || hasMessage) { return null; diff --git a/ts/components/conversation/media-gallery/EmptyState.tsx b/ts/components/conversation/media-gallery/EmptyState.tsx index 17b9a7afa5..550f4ebe02 100644 --- a/ts/components/conversation/media-gallery/EmptyState.tsx +++ b/ts/components/conversation/media-gallery/EmptyState.tsx @@ -7,10 +7,8 @@ interface Props { label: string; } -export class EmptyState extends React.Component { - public render() { - const { label } = this.props; +export const EmptyState = (props: Props) => { + const { label } = props; - return
{label}
; - } -} + return
{label}
; +}; diff --git a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx index d5e7a6f9bf..0e697dc1f8 100644 --- a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx +++ b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx @@ -7,6 +7,7 @@ import { SessionWrapperModal } from '../SessionWrapperModal'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; import { SpacerLG } from '../basic/Text'; import { SessionSpinner } from '../basic/SessionSpinner'; +import { useConversationUsername } from '../../hooks/useParamSelector'; const StyledWarning = styled.p` max-width: 500px; @@ -15,9 +16,9 @@ const StyledWarning = styled.p` export const AdminLeaveClosedGroupDialog = (props: { conversationId: string }) => { const dispatch = useDispatch(); - const convo = getConversationController().get(props.conversationId); + const displayName = useConversationUsername(props.conversationId); const [loading, setLoading] = useState(false); - const titleText = `${window.i18n('leaveGroup')} ${convo?.getRealSessionUsername() || ''}`; + const titleText = `${window.i18n('leaveGroup')} ${displayName || ''}`; const closeDialog = () => { dispatch(adminLeaveClosedGroup(null)); diff --git a/ts/components/dialog/BanOrUnbanUserDialog.tsx b/ts/components/dialog/BanOrUnbanUserDialog.tsx index 41348238cc..98409af92a 100644 --- a/ts/components/dialog/BanOrUnbanUserDialog.tsx +++ b/ts/components/dialog/BanOrUnbanUserDialog.tsx @@ -2,7 +2,7 @@ import React, { useRef, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { useFocusMount } from '../../hooks/useFocusMount'; -import { useConversationPropsById } from '../../hooks/useParamSelector'; +import { useConversationUsername } from '../../hooks/useParamSelector'; import { ConversationModel } from '../../models/conversation'; import { sogsV3BanUser, @@ -73,16 +73,13 @@ export const BanOrUnBanUserDialog = (props: { const inputRef = useRef(null); useFocusMount(inputRef, true); - const wasGivenAPubkey = Boolean(pubkey?.length); const [inputBoxValue, setInputBoxValue] = useState(''); const [inProgress, setInProgress] = useState(false); - const sourceConvoProps = useConversationPropsById(pubkey); + const displayName = useConversationUsername(pubkey); const inputTextToDisplay = - wasGivenAPubkey && sourceConvoProps - ? `${sourceConvoProps.displayNameInProfile} ${PubKey.shorten(sourceConvoProps.id)}` - : undefined; + !!pubkey && displayName ? `${displayName} ${PubKey.shorten(pubkey)}` : undefined; /** * Ban or Unban a user from an open group @@ -97,7 +94,7 @@ export const BanOrUnBanUserDialog = (props: { if (isBanned) { // clear input box setInputBoxValue(''); - if (wasGivenAPubkey) { + if (pubkey) { dispatch(updateBanOrUnbanUserModal(null)); } } @@ -137,8 +134,8 @@ export const BanOrUnBanUserDialog = (props: { placeholder={i18n('enterSessionID')} dir="auto" onChange={onPubkeyBoxChanges} - disabled={inProgress || wasGivenAPubkey} - value={wasGivenAPubkey ? inputTextToDisplay : inputBoxValue} + disabled={inProgress || !!pubkey} + value={pubkey ? inputTextToDisplay : inputBoxValue} /> { const privateContactPubkeys = useSelector(getPrivateContactsPubkeys); let validContactsForInvite = _.clone(privateContactPubkeys); - const convoProps = useConversationPropsById(conversationId); + const isPrivate = useIsPrivate(conversationId); + const isPublic = useIsPublic(conversationId); + const membersFromRedux = useSortedGroupMembers(conversationId); + const zombiesFromRedux = useZombies(conversationId); + const displayName = useConversationUsername(conversationId); const { uniqueValues: selectedContacts, addTo, removeFrom } = useSet(); - if (!convoProps) { - throw new Error('InviteContactsDialogInner not a valid convoId given'); - } - if (convoProps.isPrivate) { + if (isPrivate) { throw new Error('InviteContactsDialogInner must be a group'); } - if (!convoProps.isPublic) { + if (!isPublic) { // filter our zombies and current members from the list of contact we can add - const members = convoProps.members || []; - const zombies = convoProps.zombies || []; + const members = membersFromRedux || []; + const zombies = zombiesFromRedux || []; validContactsForInvite = validContactsForInvite.filter( d => !members.includes(d) && !zombies.includes(d) ); } - const chatName = convoProps.displayNameInProfile || window.i18n('unknown'); - const isPublicConvo = convoProps.isPublic; + const chatName = displayName || window.i18n('unknown'); const closeDialog = () => { dispatch(updateInviteContactModal(null)); @@ -132,7 +138,7 @@ const InviteContactsDialogInner = (props: Props) => { const onClickOK = () => { if (selectedContacts.length > 0) { - if (isPublicConvo) { + if (isPublic) { void submitForOpenGroup(conversationId, selectedContacts); } else { void submitForClosedGroup(conversationId, selectedContacts); diff --git a/ts/components/dialog/ModeratorsRemoveDialog.tsx b/ts/components/dialog/ModeratorsRemoveDialog.tsx index 7436b0edae..984705dcb9 100644 --- a/ts/components/dialog/ModeratorsRemoveDialog.tsx +++ b/ts/components/dialog/ModeratorsRemoveDialog.tsx @@ -1,5 +1,5 @@ -import React, { useState } from 'react'; import { compact } from 'lodash'; +import React, { useState } from 'react'; import { useDispatch } from 'react-redux'; import { getConversationController } from '../../session/conversations'; @@ -7,13 +7,18 @@ import { PubKey } from '../../session/types'; import { ToastUtils } from '../../session/utils'; import { Flex } from '../basic/Flex'; +import { + useConversationRealName, + useGroupAdmins, + useIsPublic, + useWeAreAdmin, +} from '../../hooks/useParamSelector'; +import { sogsV3RemoveAdmins } from '../../session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods'; import { updateRemoveModeratorsModal } from '../../state/ducks/modalDialog'; +import { MemberListItem } from '../MemberListItem'; import { SessionWrapperModal } from '../SessionWrapperModal'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; import { SessionSpinner } from '../basic/SessionSpinner'; -import { MemberListItem } from '../MemberListItem'; -import { useConversationPropsById } from '../../hooks/useParamSelector'; -import { sogsV3RemoveAdmins } from '../../session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods'; type Props = { conversationId: string; @@ -58,6 +63,11 @@ export const RemoveModeratorsDialog = (props: Props) => { dispatch(updateRemoveModeratorsModal(null)); }; + const weAreAdmin = useWeAreAdmin(conversationId); + const isPublic = useIsPublic(conversationId); + const displayName = useConversationRealName(conversationId); + const groupAdmins = useGroupAdmins(conversationId); + const removeModsCall = async () => { if (modsToRemove.length) { setRemovingInProgress(true); @@ -69,15 +79,14 @@ export const RemoveModeratorsDialog = (props: Props) => { } }; - const convoProps = useConversationPropsById(conversationId); - if (!convoProps || !convoProps.isPublic || !convoProps.weAreAdmin) { + if (!isPublic || !weAreAdmin) { throw new Error('RemoveModeratorsDialog: convoProps invalid'); } - const existingMods = convoProps.groupAdmins || []; + const existingMods = groupAdmins || []; const hasMods = existingMods.length !== 0; - const title = `${i18n('removeModerators')}: ${convoProps.displayNameInProfile}`; + const title = `${i18n('removeModerators')}: ${displayName}`; return ( diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 070a1c2b05..dfd58a7af8 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -1,18 +1,26 @@ -import React from 'react'; import _ from 'lodash'; +import React from 'react'; import { useDispatch } from 'react-redux'; import useKey from 'react-use/lib/useKey'; import styled from 'styled-components'; import { ToastUtils, UserUtils } from '../../session/utils'; -import { SpacerLG, Text } from '../basic/Text'; import { updateGroupMembersModal } from '../../state/ducks/modalDialog'; -import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; import { MemberListItem } from '../MemberListItem'; import { SessionWrapperModal } from '../SessionWrapperModal'; +import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; +import { SpacerLG, Text } from '../basic/Text'; -import { useConversationPropsById, useWeAreAdmin } from '../../hooks/useParamSelector'; +import { + useConversationUsername, + useGroupAdmins, + useIsPrivate, + useIsPublic, + useSortedGroupMembers, + useWeAreAdmin, + useZombies, +} from '../../hooks/useParamSelector'; import { useSet } from '../../hooks/useSet'; import { getConversationController } from '../../session/conversations'; @@ -38,12 +46,11 @@ const ClassicMemberList = (props: { }) => { const { onSelect, convoId, onUnselect, selectedMembers } = props; const weAreAdmin = useWeAreAdmin(convoId); - const convoProps = useConversationPropsById(convoId); - if (!convoProps) { - throw new Error('MemberList needs convoProps'); - } - let currentMembers = convoProps.members || []; - const { groupAdmins } = convoProps; + + const groupAdmins = useGroupAdmins(convoId); + const groupMembers = useSortedGroupMembers(convoId); + + let currentMembers = groupMembers || []; currentMembers = [...currentMembers].sort(m => (groupAdmins?.includes(m) ? -1 : 0)); return ( @@ -69,17 +76,17 @@ const ClassicMemberList = (props: { }; const ZombiesList = ({ convoId }: { convoId: string }) => { - const convoProps = useConversationPropsById(convoId); + const weAreAdmin = useWeAreAdmin(convoId); + const zombies = useZombies(convoId); function onZombieClicked() { - if (!convoProps?.weAreAdmin) { + if (!weAreAdmin) { ToastUtils.pushOnlyAdminCanRemove(); } } - if (!convoProps || !convoProps.zombies?.length) { + if (!zombies?.length) { return null; } - const { zombies, weAreAdmin } = convoProps; const zombieElements = zombies.map((zombie: string) => { const isSelected = weAreAdmin || false; // && !member.checkmarked; @@ -116,7 +123,7 @@ async function onSubmit(convoId: string, membersAfterUpdate: Array) { if (!convoFound || !convoFound.isGroup()) { throw new Error('Invalid convo for updateGroupMembersDialog'); } - if (!convoFound.isAdmin(UserUtils.getOurPubKeyStrFromCache())) { + if (!convoFound.weAreAdminUnblinded()) { window.log.warn('Skipping update of members, we are not the admin'); return; } @@ -168,8 +175,12 @@ async function onSubmit(convoId: string, membersAfterUpdate: Array) { export const UpdateGroupMembersDialog = (props: Props) => { const { conversationId } = props; - const convoProps = useConversationPropsById(conversationId); - const existingMembers = convoProps?.members || []; + const isPrivate = useIsPrivate(conversationId); + const isPublic = useIsPublic(conversationId); + const weAreAdmin = useWeAreAdmin(conversationId); + const existingMembers = useSortedGroupMembers(conversationId) || []; + const displayName = useConversationUsername(conversationId); + const groupAdmins = useGroupAdmins(conversationId); const { addTo, removeFrom, uniqueValues: membersToKeepWithUpdate } = useSet( existingMembers @@ -177,12 +188,10 @@ export const UpdateGroupMembersDialog = (props: Props) => { const dispatch = useDispatch(); - if (!convoProps || convoProps.isPrivate || convoProps.isPublic) { + if (isPrivate || isPublic) { throw new Error('UpdateGroupMembersDialog invalid convoProps'); } - const weAreAdmin = convoProps.weAreAdmin || false; - const closeDialog = () => { dispatch(updateGroupMembersModal(null)); }; @@ -214,7 +223,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { ToastUtils.pushOnlyAdminCanRemove(); return; } - if (convoProps.groupAdmins?.includes(member)) { + if (groupAdmins?.includes(member)) { ToastUtils.pushCannotRemoveCreatorFromGroup(); window?.log?.warn( `User ${member} cannot be removed as they are the creator of the closed group.` @@ -228,7 +237,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { const showNoMembersMessage = existingMembers.length === 0; const okText = window.i18n('ok'); const cancelText = window.i18n('cancel'); - const titleText = window.i18n('updateGroupDialogTitle', [convoProps.displayNameInProfile || '']); + const titleText = window.i18n('updateGroupDialogTitle', [displayName || '']); return ( diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx index 63b59276fc..3676c60a74 100644 --- a/ts/components/dialog/UpdateGroupNameDialog.tsx +++ b/ts/components/dialog/UpdateGroupNameDialog.tsx @@ -1,18 +1,20 @@ /* eslint-disable @typescript-eslint/no-misused-promises */ -import React from 'react'; -import classNames from 'classnames'; import autoBind from 'auto-bind'; +import classNames from 'classnames'; +import React from 'react'; -import { Avatar, AvatarSize } from '../avatar/Avatar'; -import { SpacerMD } from '../basic/Text'; -import { updateGroupNameModal } from '../../state/ducks/modalDialog'; +import { clone } from 'lodash'; import { ConversationModel } from '../../models/conversation'; import { getConversationController } from '../../session/conversations'; -import { SessionWrapperModal } from '../SessionWrapperModal'; -import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; -import { initiateOpenGroupUpdate } from '../../session/group/open-group'; import { initiateClosedGroupUpdate } from '../../session/group/closed-group'; +import { initiateOpenGroupUpdate } from '../../session/group/open-group'; +import { updateGroupNameModal } from '../../state/ducks/modalDialog'; +import { getLibGroupNameOutsideRedux } from '../../state/selectors/groups'; import { pickFileForAvatar } from '../../types/attachments/VisualAttachment'; +import { SessionWrapperModal } from '../SessionWrapperModal'; +import { Avatar, AvatarSize } from '../avatar/Avatar'; +import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; +import { SpacerMD } from '../basic/Text'; type Props = { conversationId: string; @@ -20,12 +22,14 @@ type Props = { interface State { groupName: string | undefined; + originalGroupName: string; errorDisplayed: boolean; errorMessage: string; oldAvatarPath: string | null; newAvatarObjecturl: string | null; } +// TODO break those last class bases components into functional ones (search for `extends React`) export class UpdateGroupNameDialog extends React.Component { private readonly convo: ConversationModel; @@ -35,8 +39,13 @@ export class UpdateGroupNameDialog extends React.Component { autoBind(this); this.convo = getConversationController().get(props.conversationId); + const libGroupName = getLibGroupNameOutsideRedux(props.conversationId); + const groupNameFromConvo = this.convo.getRealSessionUsername(); + const groupName = libGroupName || groupNameFromConvo; + this.state = { - groupName: this.convo.getRealSessionUsername(), + groupName: clone(groupName), + originalGroupName: clone(groupName) || '', errorDisplayed: false, errorMessage: 'placeholder', oldAvatarPath: this.convo.getAvatarPath(), @@ -61,10 +70,7 @@ export class UpdateGroupNameDialog extends React.Component { return; } - if ( - trimmedGroupName !== this.convo.getRealSessionUsername() || - newAvatarObjecturl !== oldAvatarPath - ) { + if (trimmedGroupName !== this.state.originalGroupName || newAvatarObjecturl !== oldAvatarPath) { if (this.convo.isPublic()) { void initiateOpenGroupUpdate(this.convo.id, trimmedGroupName, { objectUrl: newAvatarObjecturl, diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx index 1f435bfb1f..de338da5ca 100644 --- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx +++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx @@ -5,11 +5,11 @@ import styled from 'styled-components'; import { Data } from '../../../data/data'; import { useActiveAt, - useConversationPropsById, useHasUnread, useIsForcedUnreadWithoutUnreadMsg, useIsPinned, useMentionedUs, + useNotificationSetting, useUnreadCount, } from '../../../hooks/useParamSelector'; import { @@ -26,7 +26,7 @@ import { UserItem } from './UserItem'; const NotificationSettingIcon = () => { const isMessagesSection = useSelector(getIsMessageSection); const convoId = useConvoIdFromContext(); - const convoSetting = useConversationPropsById(convoId)?.currentNotificationSetting; + const convoSetting = useNotificationSetting(convoId); if (!isMessagesSection) { return null; diff --git a/ts/components/leftpane/conversation-list-item/MessageItem.tsx b/ts/components/leftpane/conversation-list-item/MessageItem.tsx index dbffb1b45c..db82ed9e8a 100644 --- a/ts/components/leftpane/conversation-list-item/MessageItem.tsx +++ b/ts/components/leftpane/conversation-list-item/MessageItem.tsx @@ -3,10 +3,10 @@ import { isEmpty } from 'lodash'; import React from 'react'; import { useSelector } from 'react-redux'; import { - useConversationPropsById, useHasUnread, useIsPrivate, useIsTyping, + useLastMessage, } from '../../../hooks/useParamSelector'; import { isSearching } from '../../../state/selectors/search'; import { getIsMessageRequestOverlayShown } from '../../../state/selectors/section'; @@ -15,17 +15,9 @@ import { MessageBody } from '../../conversation/message/message-content/MessageB import { OutgoingMessageStatus } from '../../conversation/message/message-content/OutgoingMessageStatus'; import { useConvoIdFromContext } from './ConvoIdContext'; -function useLastMessageFromConvo(convoId: string) { - const convoProps = useConversationPropsById(convoId); - if (!convoProps) { - return null; - } - return convoProps.lastMessage; -} - export const MessageItem = () => { const conversationId = useConvoIdFromContext(); - const lastMessage = useLastMessageFromConvo(conversationId); + const lastMessage = useLastMessage(conversationId); const isGroup = !useIsPrivate(conversationId); const hasUnread = useHasUnread(conversationId); diff --git a/ts/data/configDump/configDump.ts b/ts/data/configDump/configDump.ts index 7774373531..ae3f43b20f 100644 --- a/ts/data/configDump/configDump.ts +++ b/ts/data/configDump/configDump.ts @@ -1,3 +1,4 @@ +import { GroupPubkeyType } from 'libsession_util_nodejs'; import { AsyncObjectWrapper, ConfigDumpDataNode, ConfigDumpRow } from '../../types/sqlSharedTypes'; // eslint-disable-next-line import/no-unresolved, import/extensions import { ConfigWrapperObjectTypesMeta } from '../../webworker/workers/browser/libsession_worker_functions'; @@ -20,4 +21,7 @@ export const ConfigDumpData: AsyncObjectWrapper = { getAllDumpsWithoutDataFor: (pk: string) => { return channels.getAllDumpsWithoutDataFor(pk); }, + deleteDumpFor: (pk: GroupPubkeyType) => { + return channels.deleteDumpFor(pk); + }, }; diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index a04e8b04d5..dc34f71231 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -4,13 +4,14 @@ import { hasValidIncomingRequestValues, hasValidOutgoingRequestValues, } from '../models/conversation'; +import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; +import { CONVERSATION } from '../session/constants'; import { PubKey } from '../session/types'; import { UserUtils } from '../session/utils'; import { StateType } from '../state/reducer'; import { getMessageReactsProps } from '../state/selectors/conversations'; +import { useLibGroupAdmins, useLibGroupMembers, useLibGroupName } from '../state/selectors/groups'; import { isPrivateAndFriend } from '../state/selectors/selectedConversation'; -import { CONVERSATION } from '../session/constants'; -import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; export function useAvatarPath(convoId: string | undefined) { const convoProps = useConversationPropsById(convoId); @@ -27,7 +28,11 @@ export function useOurAvatarPath() { */ export function useConversationUsername(convoId?: string) { const convoProps = useConversationPropsById(convoId); + const groupName = useLibGroupName(convoId); + if (convoId && PubKey.isClosedGroupV2(convoId)) { + return groupName; + } return convoProps?.nickname || convoProps?.displayNameInProfile || convoId; } @@ -147,6 +152,18 @@ export function useWeAreAdmin(convoId?: string) { return Boolean(convoProps && convoProps.weAreAdmin); } +export function useGroupAdmins(convoId?: string) { + const convoProps = useConversationPropsById(convoId); + + const libMembers = useLibGroupAdmins(convoId); + + if (convoId && PubKey.isClosedGroupV2(convoId)) { + return compact(libMembers?.slice()?.sort()) || []; + } + + return convoProps?.groupAdmins || []; +} + export function useExpireTimer(convoId?: string) { const convoProps = useConversationPropsById(convoId); return convoProps && convoProps.expireTimer; @@ -203,7 +220,12 @@ export function useIsOutgoingRequest(convoId?: string) { ); } -export function useConversationPropsById(convoId?: string) { +/** + * Not to be exported: This selector is too generic and needs to be broken node in individual fields selectors. + * Make sure when writing a selector that you fetch the data from libsession if needed. + * (check useSortedGroupMembers() as an example) + */ +function useConversationPropsById(convoId?: string) { return useSelector((state: StateType) => { if (!convoId) { return null; @@ -216,6 +238,32 @@ export function useConversationPropsById(convoId?: string) { }); } +export function useZombies(convoId?: string) { + return useSelector((state: StateType) => { + if (!convoId) { + return null; + } + const convo = state.conversations.conversationLookup[convoId]; + if (!convo) { + return null; + } + return convo.zombies; + }); +} + +export function useLastMessage(convoId?: string) { + return useSelector((state: StateType) => { + if (!convoId) { + return null; + } + const convo = state.conversations.conversationLookup[convoId]; + if (!convo) { + return null; + } + return convo.lastMessage; + }); +} + export function useMessageReactsPropsById(messageId?: string) { return useSelector((state: StateType) => { if (!messageId) { @@ -279,15 +327,26 @@ export function useQuoteAuthorName( return { authorName, isMe }; } +function useMembers(convoId: string | undefined) { + const props = useConversationPropsById(convoId); + return props?.members || undefined; +} + /** * Get the list of members of a closed group or [] * @param convoId the closed group id to extract members from */ export function useSortedGroupMembers(convoId: string | undefined): Array { - const convoProps = useConversationPropsById(convoId); - if (!convoProps || convoProps.isPrivate || convoProps.isPublic) { + const members = useMembers(convoId); + const isPublic = useIsPublic(convoId); + const isPrivate = useIsPrivate(convoId); + const libMembers = useLibGroupMembers(convoId); + if (isPrivate || isPublic) { return []; } + if (convoId && PubKey.isClosedGroupV2(convoId)) { + return compact(libMembers?.slice()?.sort()) || []; + } // we need to clone the array before being able to call sort() it - return compact(convoProps.members?.slice()?.sort()) || []; + return compact(members?.slice()?.sort()) || []; } diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 8ded7592b1..fa143f70b0 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -234,9 +234,7 @@ export function showLeaveGroupByConvoId(conversationId: string) { const title = window.i18n('leaveGroup'); const message = window.i18n('leaveGroupConfirmation'); - const isAdmin = (conversation.get('groupAdmins') || []).includes( - UserUtils.getOurPubKeyStrFromCache() - ); + const isAdmin = conversation.getGroupAdmins().includes(UserUtils.getOurPubKeyStrFromCache()); const isClosedGroup = conversation.isClosedGroup() || false; const isPublic = conversation.isPublic() || false; diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 626dcfb507..577bbcb653 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -249,7 +249,7 @@ const doDeleteSelectedMessagesInSOGS = async ( } // #region open group v2 deletion // Get our Moderator status - const isAdmin = conversation.isAdmin(ourDevicePubkey); + const isAdmin = conversation.weAreAdminUnblinded(); const isModerator = conversation.isModerator(ourDevicePubkey); if (!isAllOurs && !(isAdmin || isModerator)) { @@ -302,16 +302,16 @@ const doDeleteSelectedMessages = async ({ return; } - const isAllOurs = selectedMessages.every(message => ourDevicePubkey === message.getSource()); + const areAllOurs = selectedMessages.every(message => ourDevicePubkey === message.getSource()); if (conversation.isPublic()) { - await doDeleteSelectedMessagesInSOGS(selectedMessages, conversation, isAllOurs); + await doDeleteSelectedMessagesInSOGS(selectedMessages, conversation, areAllOurs); return; } // #region deletion for 1-1 and closed groups if (deleteForEveryone) { - if (!isAllOurs) { + if (!areAllOurs) { ToastUtils.pushMessageDeleteForbidden(); window.inboxStore?.dispatch(resetSelectedMessageIds()); return; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 43ffde283c..1cac2c805e 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1,5 +1,6 @@ import autoBind from 'auto-bind'; import Backbone from 'backbone'; +import { from_hex } from 'libsodium-wrappers-sumo'; import { debounce, defaults, @@ -16,7 +17,6 @@ import { uniq, xor, } from 'lodash'; -import { from_hex } from 'libsodium-wrappers-sumo'; import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; @@ -115,12 +115,17 @@ import { import { LibSessionUtil } from '../session/utils/libsession/libsession_utils'; import { SessionUtilUserProfile } from '../session/utils/libsession/libsession_utils_user_profile'; import { ReduxSogsRoomInfos } from '../state/ducks/sogsRoomInfo'; +import { + getLibGroupAdminsOutsideRedux, + getLibGroupNameOutsideRedux, +} from '../state/selectors/groups'; import { getCanWriteOutsideRedux, getModeratorsOutsideRedux, getSubscriberCountOutsideRedux, } from '../state/selectors/sogsRoomInfo'; import { markAttributesAsReadIfNeeded } from './messageFactory'; +import { PreConditionFailed } from '../session/utils/errors'; type InMemoryConvoInfos = { mentionedUs: boolean; @@ -276,19 +281,12 @@ export class ConversationModel extends Backbone.Model { await deleteExternalFilesOfConversation(this.attributes); } - public getGroupAdmins(): Array { - const groupAdmins = this.get('groupAdmins'); - - return groupAdmins && groupAdmins.length > 0 ? groupAdmins : []; - } - public getConversationModelProps(): ReduxConversationType { const isPublic = this.isPublic(); - const ourNumber = UserUtils.getOurPubKeyStrFromCache(); const avatarPath = this.getAvatarPath(); const isPrivate = this.isPrivate(); - const weAreAdmin = this.isAdmin(ourNumber); + const weAreAdmin = this.weAreAdminUnblinded(); const currentNotificationSetting = this.get('triggerNotificationsFor'); const priorityFromDb = this.get('priority'); @@ -1120,7 +1118,7 @@ export class ConversationModel extends Backbone.Model { * @returns `displayNameInProfile` so the real username as defined by that user/group */ public getRealSessionUsername(): string | undefined { - return this.get('displayNameInProfile'); + return getLibGroupNameOutsideRedux(this.id) || this.get('displayNameInProfile'); } /** @@ -1161,10 +1159,18 @@ export class ConversationModel extends Backbone.Model { if (!pubKey) { throw new Error('isAdmin() pubKey is falsy'); } - const groupAdmins = this.getGroupAdmins(); + const groupAdmins = getLibGroupAdminsOutsideRedux(this.id) || this.getGroupAdmins(); return Array.isArray(groupAdmins) && groupAdmins.includes(pubKey); } + public weAreAdminUnblinded() { + const us = UserUtils.getOurPubKeyStrFromCache(); + if (!us) { + throw new PreConditionFailed('weAreAdminUnblinded: our pubkey is not set'); + } + return this.isAdmin(us); + } + /** * Check if the provided pubkey is a moderator. * Being a moderator only makes sense for a sogs as closed groups have their admin under the groupAdmins property @@ -1692,6 +1698,12 @@ export class ConversationModel extends Backbone.Model { return this.markConversationReadBouncy(newestUnreadDate); } + public getGroupAdmins(): Array { + const groupAdmins = this.get('groupAdmins'); + + return groupAdmins && groupAdmins.length > 0 ? groupAdmins : []; + } + private async sendMessageJob(message: MessageModel, expireTimer: number | undefined) { try { const { body, attachments, preview, quote, fileIdsToLink } = await message.uploadData(); diff --git a/ts/node/sql_calls/config_dump.ts b/ts/node/sql_calls/config_dump.ts index aa00f21e14..78fe4f3824 100644 --- a/ts/node/sql_calls/config_dump.ts +++ b/ts/node/sql_calls/config_dump.ts @@ -12,6 +12,7 @@ import { // eslint-disable-next-line import/no-unresolved, import/extensions import { ConfigWrapperObjectTypesMeta } from '../../webworker/workers/browser/libsession_worker_functions'; import { assertGlobalInstance } from '../sqlInstance'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; function parseRow( row: Pick @@ -114,4 +115,9 @@ export const configDumpData: ConfigDumpDataNode = { data, }); }, + deleteDumpFor: (publicKey: GroupPubkeyType) => { + assertGlobalInstance() + .prepare(`DELETE FROM ${CONFIG_DUMP_TABLE} WHERE publicKey=$publicKey;`) + .run({ publicKey }); + }, }; diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index c5ba8b879a..ea0be9c0fe 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -431,7 +431,7 @@ async function handleClosedGroupEncryptionKeyPair( await removeFromCache(envelope); return; } - if (!groupConvo.get('groupAdmins')?.includes(sender)) { + if (!groupConvo.getGroupAdmins().includes(sender)) { window?.log?.warn( `Ignoring closed group encryption key pair from non-admin. ${groupPublicKey}` ); @@ -684,7 +684,7 @@ async function areWeAdmin(groupConvo: ConversationModel) { throw new Error('areWeAdmin needs a convo'); } - const groupAdmins = groupConvo.get('groupAdmins'); + const groupAdmins = groupConvo.getGroupAdmins(); const ourNumber = UserUtils.getOurPubKeyStrFromCache(); return groupAdmins?.includes(ourNumber) || false; } @@ -706,7 +706,7 @@ async function handleClosedGroupMembersRemoved( window?.log?.info(`Got a group update for group ${envelope.source}, type: MEMBERS_REMOVED`); const membersAfterUpdate = _.difference(currentMembers, removedMembers); - const groupAdmins = convo.get('groupAdmins'); + const groupAdmins = convo.getGroupAdmins(); if (!groupAdmins?.length) { throw new Error('No admins found for closed group member removed update.'); } @@ -837,7 +837,7 @@ async function handleClosedGroupMemberLeft( ) { const sender = envelope.senderIdentity; const groupPublicKey = envelope.source; - const didAdminLeave = convo.get('groupAdmins')?.includes(sender) || false; + const didAdminLeave = convo.getGroupAdmins().includes(sender) || false; // If the admin leaves the group is disbanded // otherwise, we remove the sender from the list of current members in this group const oldMembers = convo.get('members') || []; diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 99a95b8f51..d705280e77 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -86,10 +86,9 @@ async function printDumpForDebug(prefix: string, variant: ConfigWrapperObjectTyp window.log.info(prefix, StringUtils.toHex(await GenericWrapperActions.dump(variant))); return; } - const metaGroupDumps = await MetaGroupWrapperActions.metaDump( + const metaGroupDumps = await MetaGroupWrapperActions.metaDebugDump( getGroupPubkeyFromWrapperType(variant) ); - window.log.info(prefix, StringUtils.toHex(metaGroupDumps)); } diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index b35f8b8900..9f0f20ef87 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -5,6 +5,8 @@ import { ed25519Str } from '../../../onions/onionPath'; import { fromBase64ToArray } from '../../../utils/String'; import { SnodeNamespaces } from '../namespaces'; import { RetrieveMessageItemWithNamespace } from '../types'; +import { groupInfoActions } from '../../../../state/ducks/groups'; +import { LibSessionUtil } from '../../../utils/libsession/libsession_utils'; async function handleGroupSharedConfigMessages( groupConfigMessagesMerged: Array, @@ -40,18 +42,28 @@ async function handleGroupSharedConfigMessages( groupKeys: keys, groupMember: members, }; - console.info(`About to merge ${stringify(toMerge)}`); - console.info(`dumps before ${stringify(await MetaGroupWrapperActions.metaDump(groupPk))}`); console.info( `groupInfo before merge: ${stringify(await MetaGroupWrapperActions.infoGet(groupPk))}` ); - const countMerged = await MetaGroupWrapperActions.metaMerge(groupPk, toMerge); - console.info( - `countMerged ${countMerged}, groupInfo after merge: ${stringify( - await MetaGroupWrapperActions.infoGet(groupPk) - )}` + + await MetaGroupWrapperActions.metaMerge(groupPk, toMerge); + await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); + + const updatedInfos = await MetaGroupWrapperActions.infoGet(groupPk); + const updatedMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); + console.info(`groupInfo after merge: ${stringify(updatedInfos)}`); + console.info(`groupMembers after merge: ${stringify(updatedMembers)}`); + if (!updatedInfos || !updatedMembers) { + throw new Error('updatedInfos or updatedMembers is null but we just created them'); + } + + window.inboxStore.dispatch( + groupInfoActions.updateGroupDetailsAfterMerge({ + groupPk, + infos: updatedInfos, + members: updatedMembers, + }) ); - console.info(`dumps after ${stringify(await MetaGroupWrapperActions.metaDump(groupPk))}`); // if (allDecryptedConfigMessages.length) { // try { diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 38b7fec95a..cca58fae73 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -459,7 +459,7 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { } const ourNumber = UserUtils.getOurPubKeyStrFromCache(); - const isCurrentUserAdmin = convo.get('groupAdmins')?.includes(ourNumber); + const isCurrentUserAdmin = convo.weAreAdminUnblinded(); let members: Array = []; let admins: Array = []; @@ -474,7 +474,7 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { // otherwise, just the exclude ourself from the members and trigger an update with this convo.set({ left: true }); members = (convo.get('members') || []).filter((m: string) => m !== ourNumber); - admins = convo.get('groupAdmins') || []; + admins = convo.getGroupAdmins(); } convo.set({ members }); await convo.updateGroupAdmins(admins, false); diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index fa7f48782d..85f568238c 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -16,7 +16,7 @@ import { PubKey } from '../types'; import { UserUtils } from '../utils'; import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils'; import { getConversationController } from './ConversationController'; -import { groupInfoActions } from '../../state/ducks/groupInfos'; +import { groupInfoActions } from '../../state/ducks/groups'; /** * Creates a brand new closed group from user supplied details. This function generates a new identityKeyPair so cannot be used to restore a closed group. @@ -29,7 +29,7 @@ export async function createClosedGroup(groupName: string, members: Array { - const groupConversation = getConversationController().get(groupId.key); - const groupMembers = groupConversation ? groupConversation.get('members') : undefined; - - if (!groupMembers) { - return []; - } - - return groupMembers.map(PubKey.cast); -} - export function isClosedGroup(groupId: PubKey): boolean { const conversation = getConversationController().get(groupId.key); diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index 974d69bea1..46b3edd256 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -2,7 +2,6 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { isArray, isEmpty, isNumber, isString } from 'lodash'; import { UserUtils } from '../..'; -import { stringify } from '../../../../types/sqlSharedTypes'; import { ReleasedFeatures } from '../../../../util/releaseFeature'; import { isSignInByLinking } from '../../../../util/storage'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; @@ -183,14 +182,12 @@ class GroupSyncJob extends PersistedJob { data: item.data, }; }); - console.warn(`msgs ${stringify(msgs)}`); const result = await MessageSender.sendEncryptedDataToSnode( msgs, thisJobDestination, oldHashesToDelete ); - console.warn(`result ${stringify(result)}`); const expectedReplyLength = singleDestChanges.messages.length + (oldHashesToDelete.size ? 1 : 0); diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 205fac53dd..7e70a07690 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -9,7 +9,11 @@ import { ConfigDumpData } from '../../../data/configDump/configDump'; import { HexString } from '../../../node/hexStrings'; import { SignalService } from '../../../protobuf'; import { UserConfigKind } from '../../../types/ProtobufKind'; -import { assertUnreachable, toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; +import { + ConfigDumpRow, + assertUnreachable, + toFixedUint8ArrayOfLength, +} from '../../../types/sqlSharedTypes'; import { ConfigWrapperGroupDetailed, ConfigWrapperUser, @@ -109,11 +113,15 @@ async function initializeLibSessionUtilWrappers() { `initializeLibSessionUtilWrappers: missingRequiredVariants "${missingVariant}" created` ); } + + await loadMetaGroupWrappers(dumps); +} + +async function loadMetaGroupWrappers(dumps: Array) { const ed25519KeyPairBytes = await getUserED25519KeyPairBytes(); if (!ed25519KeyPairBytes?.privKeyBytes) { throw new Error('user has no ed25519KeyPairBytes.'); } - // TODO then load the Group wrappers (not handled yet) into memory // load the dumps retrieved from the database into their corresponding wrappers for (let index = 0; index < dumps.length; index++) { const dump = dumps[index]; @@ -128,7 +136,23 @@ async function initializeLibSessionUtilWrappers() { try { const foundInUserGroups = await UserGroupsWrapperActions.getGroup(groupPk); - window.log.debug('initializeLibSessionUtilWrappers initing from dump', variant); + // remove it right away, and skip it entirely + if (!foundInUserGroups) { + try { + window.log.info( + 'metaGroup not found in userGroups. Deleting the corresponding dumps:', + groupPk + ); + + await ConfigDumpData.deleteDumpFor(groupPk); + } catch (e) { + window.log.warn('deleteDumpFor failed with ', e.message); + } + // await UserGroupsWrapperActions.eraseGroup(groupPk); + continue; + } + + window.log.debug('initializeLibSessionUtilWrappers initing from metagroup dump', variant); // TODO we need to fetch the admin key here if we have it, maybe from the usergroup wrapper? await MetaGroupWrapperActions.init(groupPk, { groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd25519Pubkey, 32), @@ -136,6 +160,9 @@ async function initializeLibSessionUtilWrappers() { userEd25519Secretkey: toFixedUint8ArrayOfLength(ed25519KeyPairBytes.privKeyBytes, 64), metaDumped: dump.data, }); + + // Annoyingly, the redux store is not initialized when this current funciton is called, + // so we need to init the group wrappers here, but load them in their redux slice later } catch (e) { // TODO should not throw in this case? we should probably just try to load what we manage to load window.log.warn(`initGroup of Group wrapper of variant ${variant} failed with ${e.message} `); @@ -332,6 +359,9 @@ async function saveMetaGroupDumpToDb(groupPk: GroupPubkeyType) { publicKey: groupPk, variant: `MetaGroupConfig-${groupPk}`, }); + window.log.debug(`Saved dumps for metagroup ${groupPk}`); + } else { + window.log.debug(`meta did not dumps saving for metagroup ${groupPk}`); } } diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts index 0db5442c35..db45b1bdb3 100644 --- a/ts/session/utils/libsession/libsession_utils_contacts.ts +++ b/ts/session/utils/libsession/libsession_utils_contacts.ts @@ -47,13 +47,13 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise) => { publicKey: groupPubKey, name: c.get('displayNameInProfile') || '', members: c.get('members') || [], - admins: c.get('groupAdmins') || [], + admins: c.getGroupAdmins(), encryptionKeyPair: ECKeyPair.fromHexKeyPair(fetchEncryptionKeyPair), }); }) diff --git a/ts/state/actions.ts b/ts/state/actions.ts index c017e50a97..921a3d7143 100644 --- a/ts/state/actions.ts +++ b/ts/state/actions.ts @@ -7,7 +7,7 @@ import { actions as sections } from './ducks/section'; import { actions as theme } from './ducks/theme'; import { actions as modalDialog } from './ducks/modalDialog'; import { actions as primaryColor } from './ducks/primaryColor'; -import { groupInfoActions } from './ducks/groupInfos'; +import { groupInfoActions } from './ducks/groups'; export function mapDispatchToProps(dispatch: Dispatch): object { return { diff --git a/ts/state/ducks/groupInfos.ts b/ts/state/ducks/groupInfos.ts deleted file mode 100644 index 996edcb1e1..0000000000 --- a/ts/state/ducks/groupInfos.ts +++ /dev/null @@ -1,166 +0,0 @@ -import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit'; -import { GroupInfoGet, GroupInfoShared, GroupPubkeyType } from 'libsession_util_nodejs'; -import { uniq } from 'lodash'; -import { ConversationTypeEnum } from '../../models/conversationAttributes'; -import { HexString } from '../../node/hexStrings'; -import { ClosedGroup } from '../../session'; -import { getConversationController } from '../../session/conversations'; -import { UserUtils } from '../../session/utils'; -import { GroupSync } from '../../session/utils/job_runners/jobs/GroupConfigJob'; -import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; -import { - MetaGroupWrapperActions, - UserGroupsWrapperActions, -} from '../../webworker/workers/browser/libsession_worker_interface'; - -type GroupInfoGetWithId = GroupInfoGet & { id: GroupPubkeyType }; - -export type GroupInfosState = { - infos: Record; -}; - -export const initialGroupInfosState: GroupInfosState = { - infos: {}, -}; - -const updateGroupInfoInWrapper = createAsyncThunk( - 'groupInfos/updateGroupInfoInWrapper', - async ({ - id, - data, - }: { - id: GroupPubkeyType; - data: GroupInfoShared; - }): Promise => { - // TODO this will throw if the wrapper is not init yet... how to make sure it does exist? - const infos = await MetaGroupWrapperActions.infoSet(id, data); - return { id, ...infos }; - } -); - -const initNewGroupInfoInWrapper = createAsyncThunk( - 'groupInfos/initNewGroupInfoInWrapper', - async (groupDetails: { - groupName: string; - members: Array; - }): Promise => { - try { - const newGroup = await UserGroupsWrapperActions.createGroup(); - - await UserGroupsWrapperActions.setGroup(newGroup); - - const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); - if (!ourEd25519KeypairBytes) { - throw new Error('Current user has no priv ed25519 key?'); - } - const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes; - const groupEd2519Pk = HexString.fromHexString(newGroup.pubkeyHex).slice(1); // remove the 03 prefix (single byte once in hex form) - - // dump is always empty when creating a new groupInfo - await MetaGroupWrapperActions.init(newGroup.pubkeyHex, { - metaDumped: null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), - groupEd25519Secretkey: newGroup.secretKey, - groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), - }); - - await Promise.all( - groupDetails.members.map(async member => { - const created = await MetaGroupWrapperActions.memberGetOrConstruct( - newGroup.pubkeyHex, - member - ); - await MetaGroupWrapperActions.memberSetInvited( - newGroup.pubkeyHex, - created.pubkeyHex, - false - ); - }) - ); - const infos = await MetaGroupWrapperActions.infoGet(newGroup.pubkeyHex); - - if (!infos) { - throw new Error( - `getInfos of ${newGroup.pubkeyHex} returned empty result even if it was just init.` - ); - } - infos.name = groupDetails.groupName; - await MetaGroupWrapperActions.infoSet(newGroup.pubkeyHex, infos); - - const convo = await getConversationController().getOrCreateAndWait( - newGroup.pubkeyHex, - ConversationTypeEnum.GROUPV3 - ); - - await convo.setIsApproved(true, false); - - console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?'); - // the sync below will need the secretKey of the group to be saved in the wrapper. So save it! - await UserGroupsWrapperActions.setGroup(newGroup); - - await GroupSync.queueNewJobIfNeeded(newGroup.pubkeyHex); - - const us = UserUtils.getOurPubKeyStrFromCache(); - // Ensure the current user is a member and admin - const members = uniq([...groupDetails.members, us]); - - const updateGroupDetails: ClosedGroup.GroupInfo = { - id: newGroup.pubkeyHex, - name: groupDetails.groupName, - members, - admins: [us], - activeAt: Date.now(), - expireTimer: 0, - }; - - // be sure to call this before sending the message. - // the sending pipeline needs to know from GroupUtils when a message is for a medium group - await ClosedGroup.updateOrCreateClosedGroup(updateGroupDetails); - await convo.commit(); - convo.updateLastMessage(); - - return { id: newGroup.pubkeyHex, ...infos }; - } catch (e) { - throw e; - } - } -); - -/** - * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. - */ -const groupInfosSlice = createSlice({ - name: 'groupInfos', - initialState: initialGroupInfosState, - reducers: { - updateGroupInfosFromMergeResults(state, action: PayloadAction>) { - // anything not in the results should not be in the state here - state.infos = {}; - action.payload.forEach(infos => { - state.infos[infos.id] = infos; - }); - return state; - }, - }, - extraReducers: builder => { - builder.addCase(updateGroupInfoInWrapper.fulfilled, (state, action) => { - state.infos[action.payload.id] = action.payload; - }); - builder.addCase(initNewGroupInfoInWrapper.fulfilled, (state, action) => { - state.infos[action.payload.id] = action.payload; - }); - builder.addCase(updateGroupInfoInWrapper.rejected, () => { - window.log.error('a updateGroupInfoInWrapper was rejected'); - }); - builder.addCase(initNewGroupInfoInWrapper.rejected, () => { - window.log.error('a initNewGroupInfoInWrapper was rejected'); - }); - }, -}); - -export const groupInfoActions = { - initNewGroupInfoInWrapper, - updateGroupInfoInWrapper, - ...groupInfosSlice.actions, -}; -export const groupInfosReducer = groupInfosSlice.reducer; diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts new file mode 100644 index 0000000000..1ea7919acb --- /dev/null +++ b/ts/state/ducks/groups.ts @@ -0,0 +1,217 @@ +import { PayloadAction, createAsyncThunk, createSlice } from '@reduxjs/toolkit'; +import { GroupInfoGet, GroupMemberGet, GroupPubkeyType } from 'libsession_util_nodejs'; +import { isEmpty } from 'lodash'; +import { ConfigDumpData } from '../../data/configDump/configDump'; +import { ConversationTypeEnum } from '../../models/conversationAttributes'; +import { HexString } from '../../node/hexStrings'; +import { getConversationController } from '../../session/conversations'; +import { UserUtils } from '../../session/utils'; +import { GroupSync } from '../../session/utils/job_runners/jobs/GroupConfigJob'; +import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; +import { + getGroupPubkeyFromWrapperType, + isMetaWrapperType, +} from '../../webworker/workers/browser/libsession_worker_functions'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../../webworker/workers/browser/libsession_worker_interface'; + +export type GroupState = { + infos: Record; + members: Record>; +}; + +export const initialGroupState: GroupState = { + infos: {}, + members: {}, +}; + +type GroupDetailsUpdate = { + groupPk: GroupPubkeyType; + infos: GroupInfoGet; + members: Array; +}; + +const initNewGroupInWrapper = createAsyncThunk( + 'group/initNewGroupInWrapper', + async (groupDetails: { + groupName: string; + members: Array; + }): Promise => { + try { + const newGroup = await UserGroupsWrapperActions.createGroup(); + + await UserGroupsWrapperActions.setGroup(newGroup); + + const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); + if (!ourEd25519KeypairBytes) { + throw new Error('Current user has no priv ed25519 key?'); + } + const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes; + const groupEd2519Pk = HexString.fromHexString(newGroup.pubkeyHex).slice(1); // remove the 03 prefix (single byte once in hex form) + + // dump is always empty when creating a new groupInfo + await MetaGroupWrapperActions.init(newGroup.pubkeyHex, { + metaDumped: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), + groupEd25519Secretkey: newGroup.secretKey, + groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), + }); + + await Promise.all( + groupDetails.members.map(async member => { + const created = await MetaGroupWrapperActions.memberGetOrConstruct( + newGroup.pubkeyHex, + member + ); + await MetaGroupWrapperActions.memberSetInvited( + newGroup.pubkeyHex, + created.pubkeyHex, + false + ); + }) + ); + const infos = await MetaGroupWrapperActions.infoGet(newGroup.pubkeyHex); + if (!infos) { + throw new Error( + `getInfos of ${newGroup.pubkeyHex} returned empty result even if it was just init.` + ); + } + infos.name = groupDetails.groupName; + await MetaGroupWrapperActions.infoSet(newGroup.pubkeyHex, infos); + + const members = await MetaGroupWrapperActions.memberGetAll(newGroup.pubkeyHex); + if (!members || isEmpty(members)) { + throw new Error( + `memberGetAll of ${newGroup.pubkeyHex} returned empty result even if it was just init.` + ); + } + + const convo = await getConversationController().getOrCreateAndWait( + newGroup.pubkeyHex, + ConversationTypeEnum.GROUPV3 + ); + + await convo.setIsApproved(true, false); + + // console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?'); + // // the sync below will need the secretKey of the group to be saved in the wrapper. So save it! + await UserGroupsWrapperActions.setGroup(newGroup); + + await GroupSync.queueNewJobIfNeeded(newGroup.pubkeyHex); + + // const us = UserUtils.getOurPubKeyStrFromCache(); + // // Ensure the current user is a member and admin + // const members = uniq([...groupDetails.members, us]); + + // const updateGroupDetails: ClosedGroup.GroupInfo = { + // id: newGroup.pubkeyHex, + // name: groupDetails.groupName, + // members, + // admins: [us], + // activeAt: Date.now(), + // expireTimer: 0, + // }; + + // // be sure to call this before sending the message. + // // the sending pipeline needs to know from GroupUtils when a message is for a medium group + // await ClosedGroup.updateOrCreateClosedGroup(updateGroupDetails); + await convo.unhideIfNeeded(); + convo.set({ active_at: Date.now() }); + await convo.commit(); + convo.updateLastMessage(); + + return { groupPk: newGroup.pubkeyHex, infos, members }; + } catch (e) { + throw e; + } + } +); + +const loadDumpsFromDB = createAsyncThunk( + 'group/loadDumpsFromDB', + async (): Promise> => { + const variantsWithoutData = await ConfigDumpData.getAllDumpsWithoutData(); + const allUserGroups = await UserGroupsWrapperActions.getAllGroups(); + const toReturn: Array = []; + for (let index = 0; index < variantsWithoutData.length; index++) { + const { variant } = variantsWithoutData[index]; + if (!isMetaWrapperType(variant)) { + continue; + } + const groupPk = getGroupPubkeyFromWrapperType(variant); + const foundInUserWrapper = allUserGroups.find(m => m.pubkeyHex === groupPk); + if (!foundInUserWrapper) { + continue; + } + + try { + window.log.debug( + 'loadDumpsFromDB loading from metagroup variant: ', + variant, + foundInUserWrapper.pubkeyHex + ); + + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + const members = await MetaGroupWrapperActions.memberGetAll(groupPk); + + toReturn.push({ groupPk, infos, members }); + + // Annoyingly, the redux store is not initialized when this current funciton is called, + // so we need to init the group wrappers here, but load them in their redux slice later + } catch (e) { + // TODO should not throw in this case? we should probably just try to load what we manage to load + window.log.warn( + `initGroup of Group wrapper of variant ${variant} failed with ${e.message} ` + ); + // throw new Error(`initializeLibSessionUtilWrappers failed with ${e.message}`); + } + } + + return toReturn; + } +); + +/** + * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. + */ +const groupSlice = createSlice({ + name: 'group', + initialState: initialGroupState, + reducers: { + updateGroupDetailsAfterMerge(state, action: PayloadAction) { + const { groupPk, infos, members } = action.payload; + state.infos[groupPk] = infos; + state.members[groupPk] = members; + }, + }, + extraReducers: builder => { + builder.addCase(initNewGroupInWrapper.fulfilled, (state, action) => { + const { groupPk, infos, members } = action.payload; + state.infos[groupPk] = infos; + state.members[groupPk] = members; + }); + builder.addCase(initNewGroupInWrapper.rejected, () => { + window.log.error('a initNewGroupInWrapper was rejected'); + // FIXME delete the wrapper completely & correspondign dumps, and usergroups entry? + }); + builder.addCase(loadDumpsFromDB.fulfilled, (state, action) => { + const loaded = action.payload; + loaded.forEach(element => { + state.infos[element.groupPk] = element.infos; + state.members[element.groupPk] = element.members; + }); + }); + builder.addCase(loadDumpsFromDB.rejected, () => { + window.log.error('a loadDumpsFromDB was rejected'); + }); + }, +}); + +export const groupInfoActions = { + initNewGroupInWrapper, + loadDumpsFromDB, + ...groupSlice.actions, +}; +export const groupReducer = groupSlice.reducer; diff --git a/ts/state/ducks/modalDialog.tsx b/ts/state/ducks/modalDialog.tsx index be1cb8b928..257cd9cfd2 100644 --- a/ts/state/ducks/modalDialog.tsx +++ b/ts/state/ducks/modalDialog.tsx @@ -6,16 +6,19 @@ import { Noop } from '../../types/Util'; export type BanType = 'ban' | 'unban'; export type ConfirmModalState = SessionConfirmDialogProps | null; -export type InviteContactModalState = { conversationId: string } | null; -export type BanOrUnbanUserModalState = { - conversationId: string; - banType: BanType; - pubkey?: string; -} | null; + +type WithConvoId = { conversationId: string }; +export type InviteContactModalState = WithConvoId | null; +export type BanOrUnbanUserModalState = + | (WithConvoId & { + banType: BanType; + pubkey?: string; + }) + | null; export type AddModeratorsModalState = InviteContactModalState; export type RemoveModeratorsModalState = InviteContactModalState; export type UpdateGroupMembersModalState = InviteContactModalState; -export type UpdateGroupNameModalState = InviteContactModalState; +export type UpdateGroupNameModalState = WithConvoId | null; export type ChangeNickNameModalState = InviteContactModalState; export type AdminLeaveClosedGroupModalState = InviteContactModalState; export type EditProfileModalState = object | null; diff --git a/ts/state/reducer.ts b/ts/state/reducer.ts index 0ddaf641a2..3ab29c0481 100644 --- a/ts/state/reducer.ts +++ b/ts/state/reducer.ts @@ -20,7 +20,7 @@ import { } from './ducks/stagedAttachments'; import { PrimaryColorStateType, ThemeStateType } from '../themes/constants/colors'; import { settingsReducer, SettingsState } from './ducks/settings'; -import { groupInfosReducer, GroupInfosState } from './ducks/groupInfos'; +import { groupReducer, GroupState } from './ducks/groups'; export type StateType = { search: SearchStateType; @@ -38,7 +38,7 @@ export type StateType = { call: CallStateType; sogsRoomInfo: SogsRoomInfoState; settings: SettingsState; - groupInfos: GroupInfosState; + groups: GroupState; }; export const reducers = { @@ -57,7 +57,7 @@ export const reducers = { call, sogsRoomInfo: ReduxSogsRoomInfos.sogsRoomInfoReducer, settings: settingsReducer, - groupInfos: groupInfosReducer, + groups: groupReducer, }; // Making this work would require that our reducer signature supported AnyAction, not diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts new file mode 100644 index 0000000000..f8dec3e659 --- /dev/null +++ b/ts/state/selectors/groups.ts @@ -0,0 +1,83 @@ +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { isEmpty } from 'lodash'; +import { PubKey } from '../../session/types'; +import { GroupState } from '../ducks/groups'; +import { StateType } from '../reducer'; +import { useSelector } from 'react-redux'; + +const getLibGroupsState = (state: StateType): GroupState => state.groups; + +export function getLibMembersPubkeys(state: StateType, convo?: string): Array { + if (!convo) { + return []; + } + if (!PubKey.isClosedGroupV2(convo)) { + return []; + } + + const members = getLibGroupsState(state).members[convo]; + if (isEmpty(members)) { + return []; + } + + return members.map(m => m.pubkeyHex); +} + +export function getLibAdminsPubkeys(state: StateType, convo?: string): Array { + if (!convo) { + return []; + } + if (!PubKey.isClosedGroupV2(convo)) { + return []; + } + + const members = getLibGroupsState(state).members[convo]; + if (isEmpty(members)) { + return []; + } + + return members.filter(m => m.promoted).map(m => m.pubkeyHex); +} + +export function getLibMembersCount(state: StateType, convo?: GroupPubkeyType): Array { + return getLibMembersPubkeys(state, convo); +} + +function getLibGroupName(state: StateType, convo?: string): string | undefined { + if (!convo) { + return undefined; + } + if (!PubKey.isClosedGroupV2(convo)) { + return undefined; + } + + const name = getLibGroupsState(state).infos[convo]?.name; + return name || undefined; +} + +export function useLibGroupName(convoId?: string): string | undefined { + return useSelector((state: StateType) => getLibGroupName(state, convoId)); +} + +export function useLibGroupMembers(convoId?: string): Array { + return useSelector((state: StateType) => getLibMembersPubkeys(state, convoId)); +} + +export function useLibGroupAdmins(convoId?: string): Array { + return useSelector((state: StateType) => getLibAdminsPubkeys(state, convoId)); +} + +export function getLibGroupNameOutsideRedux(convoId: string): string | undefined { + const state = window.inboxStore?.getState(); + return state ? getLibGroupName(state, convoId) : undefined; +} + +export function getLibGroupMembersOutsideRedux(convoId: string): Array { + const state = window.inboxStore?.getState(); + return state ? getLibMembersPubkeys(state, convoId) : []; +} + +export function getLibGroupAdminsOutsideRedux(convoId: string): Array { + const state = window.inboxStore?.getState(); + return state ? getLibAdminsPubkeys(state, convoId) : []; +} diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index 6c23c6bab7..09762da3fd 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -6,6 +6,7 @@ import { UserUtils } from '../../session/utils'; import { StateType } from '../reducer'; import { getCanWrite, getModerators, getSubscriberCount } from './sogsRoomInfo'; import { getIsMessageSelectionMode, getSelectedConversation } from './conversations'; +import { getLibMembersPubkeys, useLibGroupName } from './groups'; /** * Returns the formatted text for notification setting. @@ -138,12 +139,27 @@ export const isClosedGroupConversation = (state: StateType): boolean => { ); }; -const getSelectedGroupMembers = (state: StateType): Array => { +const getSelectedMembersCount = (state: StateType): number => { + const selected = getSelectedConversation(state); + if (!selected) { + return 0; + } + if (PubKey.isClosedGroupV2(selected.id)) { + return getLibMembersPubkeys(state, selected.id).length || 0; + } + if (selected.isPrivate || selected.isPublic) { + return 0; + } + return selected.members?.length || 0; +}; + +const getSelectedGroupAdmins = (state: StateType): Array => { const selected = getSelectedConversation(state); if (!selected) { return []; } - return selected.members || []; + + return selected.groupAdmins || []; }; const getSelectedSubscriberCount = (state: StateType): number | undefined => { @@ -221,8 +237,12 @@ export function useSelectedisNoteToSelf() { return useSelector(getIsSelectedNoteToSelf); } -export function useSelectedMembers() { - return useSelector(getSelectedGroupMembers); +export function useSelectedMembersCount() { + return useSelector(getSelectedMembersCount); +} + +export function useSelectedGroupAdmins() { + return useSelector(getSelectedGroupAdmins); } export function useSelectedSubscriberCount() { @@ -273,13 +293,18 @@ export function useSelectedShortenedPubkeyOrFallback() { * This also returns the localized "Note to Self" if the conversation is the note to self. */ export function useSelectedNicknameOrProfileNameOrShortenedPubkey() { + const selectedId = useSelectedConversationKey(); const nickname = useSelectedNickname(); const profileName = useSelectedDisplayNameInProfile(); const shortenedPubkey = useSelectedShortenedPubkeyOrFallback(); const isMe = useSelectedisNoteToSelf(); + const libGroupName = useLibGroupName(selectedId); if (isMe) { return window.i18n('noteToSelf'); } + if (selectedId && PubKey.isClosedGroupV2(selectedId)) { + return libGroupName; + } return nickname || profileName || shortenedPubkey; } diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index 5588e46f56..26e0eaf8d7 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -9,22 +9,22 @@ import { randomBytes } from 'crypto'; import chai from 'chai'; -import Sinon, * as sinon from 'sinon'; -import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; +import { describe } from 'mocha'; +import Sinon, * as sinon from 'sinon'; -import { GroupUtils, PromiseUtils, UserUtils } from '../../../../session/utils'; -import { TestUtils } from '../../../test-utils'; -import { MessageQueue } from '../../../../session/sending/MessageQueue'; import { ContentMessage } from '../../../../session/messages/outgoing'; -import { PubKey, RawMessage } from '../../../../session/types'; +import { ClosedGroupMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupMessage'; import { MessageSender } from '../../../../session/sending'; +import { MessageQueue } from '../../../../session/sending/MessageQueue'; +import { PubKey, RawMessage } from '../../../../session/types'; +import { PromiseUtils, UserUtils } from '../../../../session/utils'; +import { TestUtils } from '../../../test-utils'; import { PendingMessageCacheStub } from '../../../test-utils/stubs'; -import { ClosedGroupMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupMessage'; +import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { MessageSentHandler } from '../../../../session/sending/MessageSentHandler'; import { stubData } from '../../../test-utils/utils'; -import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; chai.use(chaiAsPromised as any); chai.should(); @@ -209,9 +209,6 @@ describe('MessageQueue', () => { describe('closed groups', () => { it('can send to closed group', async () => { - const members = TestUtils.generateFakePubKeys(4).map(p => new PubKey(p.key)); - Sinon.stub(GroupUtils, 'getGroupMembers').returns(members); - const send = Sinon.stub(messageQueueStub, 'sendToPubKey').resolves(); const message = TestUtils.generateClosedGroupMessage(); diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 7a5d2d7abe..05a31e154f 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -4,6 +4,7 @@ import { ContactInfoSet, FixedSizeUint8Array, + GroupPubkeyType, LegacyGroupInfo, LegacyGroupMemberInfo, } from 'libsession_util_nodejs'; @@ -66,6 +67,7 @@ export type ConfigDumpDataNode = { getAllDumpsWithData: () => Array; getAllDumpsWithoutData: () => Array; getAllDumpsWithoutDataFor: (pk: string) => Array; + deleteDumpFor: (pk: GroupPubkeyType) => void; }; // ========== unprocessed diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 9733aaa8ba..e92413ece7 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -389,6 +389,10 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'metaDump']) as Promise< ReturnType >, + metaDebugDump: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'metaDebugDump']) as Promise< + ReturnType + >, metaConfirmPushed: async ( groupPk: GroupPubkeyType, args: Parameters[1] From 197383a52f077cf6afd596171f58fd8736df42e1 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 19 Sep 2023 13:02:40 +1000 Subject: [PATCH 015/302] feat: move some the convomodel.get attributes to functions this is because we need to be able to override what is returned by what is in the redux lib slice if needed (libsession data overrides what is in the DB for groupv3) --- .../message/message-content/MessageAvatar.tsx | 2 +- ts/components/dialog/InviteContactsDialog.tsx | 4 +- .../dialog/UpdateGroupMembersDialog.tsx | 6 +- .../dialog/UpdateGroupNameDialog.tsx | 2 +- ts/interactions/conversationInteractions.ts | 14 +- ts/models/conversation.ts | 131 ++++++++++++++---- ts/models/message.ts | 2 +- ts/receiver/closedGroups.ts | 22 +-- ts/receiver/configMessage.ts | 14 +- ts/receiver/contentMessage.ts | 8 +- ts/receiver/queuedJob.ts | 4 +- .../open_group_api/sogsv3/sogsV3FetchFile.ts | 4 +- ts/session/apis/snode_api/swarmPolling.ts | 6 +- .../conversations/ConversationController.ts | 2 +- ts/session/group/closed-group.ts | 8 +- ts/session/group/open-group.ts | 2 +- ts/session/profile_manager/ProfileManager.ts | 8 +- ts/session/utils/User.ts | 4 +- ts/session/utils/calling/CallManager.ts | 2 +- .../job_runners/jobs/AvatarDownloadJob.ts | 8 +- .../libsession/libsession_utils_contacts.ts | 6 +- .../libsession_utils_user_groups.ts | 14 +- .../libsession_utils_user_profile.ts | 8 +- ts/session/utils/sync/syncUtils.ts | 26 ++-- 24 files changed, 191 insertions(+), 116 deletions(-) diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx index 375b3158ab..93cc83753c 100644 --- a/ts/components/conversation/message/message-content/MessageAvatar.tsx +++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx @@ -63,7 +63,7 @@ export const MessageAvatar = (props: Props) => { // public chat but session id not blinded. disable showing user details if we do not have an active convo with that user. // an unactive convo with that user means that we never chatted with that id directyly, but only through a sogs const convoWithSender = getConversationController().get(sender); - if (!convoWithSender || !convoWithSender.get('active_at')) { + if (!convoWithSender || !convoWithSender.getActiveAt()) { // for some time, we might still get some unblinded messages, as in message sent unblinded because // * older clients still send unblinded message and those are allowed by sogs if they doesn't enforce blinding // * new clients still send unblinded message and those are allowed by sogs if it doesn't enforce blinding diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index 2916f879c7..cfd3237a45 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -73,13 +73,13 @@ const submitForClosedGroup = async (convoId: string, pubkeys: Array) => // closed group chats const ourPK = UserUtils.getOurPubKeyStrFromCache(); // we only care about real members. If a member is currently a zombie we have to be able to add him back - let existingMembers = convo.get('members') || []; + let existingMembers = convo.getGroupMembers() || []; // at least make sure it's an array if (!Array.isArray(existingMembers)) { existingMembers = []; } existingMembers = _.compact(existingMembers); - const existingZombies = convo.get('zombies') || []; + const existingZombies = convo.getGroupZombies() || []; const newMembers = pubkeys.filter(d => !existingMembers.includes(d)); if (newMembers.length > 0) { diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index dfd58a7af8..6b99cba3cd 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -138,8 +138,8 @@ async function onSubmit(convoId: string, membersAfterUpdate: Array) { // We consider that the admin ALWAYS wants to remove zombies (actually they should be removed // automatically by him when the LEFT message is received) - const existingMembers = convoFound.get('members') || []; - const existingZombies = convoFound.get('zombies') || []; + const existingMembers = convoFound.getGroupMembers() || []; + const existingZombies = convoFound.getGroupZombies() || []; const allExistingMembersWithZombies = _.uniq(existingMembers.concat(existingZombies)); @@ -168,7 +168,7 @@ async function onSubmit(convoId: string, membersAfterUpdate: Array) { void initiateClosedGroupUpdate( convoId, - convoFound.get('displayNameInProfile') || 'Unknown', + convoFound.getRealSessionUsername() || 'Unknown', filteredMembers ); } diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx index 3676c60a74..cf8003be8f 100644 --- a/ts/components/dialog/UpdateGroupNameDialog.tsx +++ b/ts/components/dialog/UpdateGroupNameDialog.tsx @@ -76,7 +76,7 @@ export class UpdateGroupNameDialog extends React.Component { objectUrl: newAvatarObjecturl, }); } else { - const members = this.convo.get('members') || []; + const members = this.convo.getGroupMembers() || []; void initiateClosedGroupUpdate(this.convo.id, trimmedGroupName, members); } diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index fa143f70b0..3f28296b12 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -205,7 +205,7 @@ export async function showUpdateGroupNameByConvoId(conversationId: string) { // make sure all the members' convo exists so we can add or remove them await Promise.all( conversation - .get('members') + .getGroupMembers() .map(m => getConversationController().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE)) ); } @@ -218,7 +218,7 @@ export async function showUpdateGroupMembersByConvoId(conversationId: string) { // make sure all the members' convo exists so we can add or remove them await Promise.all( conversation - .get('members') + .getGroupMembers() .map(m => getConversationController().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE)) ); } @@ -310,7 +310,7 @@ export async function setNotificationForConvoId( ) { const conversation = getConversationController().get(conversationId); - const existingSettings = conversation.get('triggerNotificationsFor'); + const existingSettings = conversation.getNotificationsFor(); if (existingSettings !== selected) { conversation.set({ triggerNotificationsFor: selected }); await conversation.commit(); @@ -403,7 +403,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) { const ourConvoProfileKey = getConversationController() .get(UserUtils.getOurPubKeyStrFromCache()) - ?.get('profileKey') || null; + ?.getProfileKey() || null; profileKey = ourConvoProfileKey ? fromHexToArray(ourConvoProfileKey) : null; if (!profileKey) { @@ -452,7 +452,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) { }); // Replace our temporary image with the attachment pointer from the server: ourConvo.set('avatarInProfile', undefined); - const displayName = ourConvo.get('displayNameInProfile'); + const displayName = ourConvo.getRealSessionUsername(); // write the profileKey even if it did not change ourConvo.set({ profileKey: toHex(profileKey) }); @@ -480,8 +480,8 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) { ); } return { - avatarPointer: ourConvo.get('avatarPointer'), - profileKey: ourConvo.get('profileKey'), + avatarPointer: ourConvo.getAvatarPointer(), + profileKey: ourConvo.getProfileKey(), }; } diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 1cac2c805e..43e06366a4 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -117,6 +117,7 @@ import { SessionUtilUserProfile } from '../session/utils/libsession/libsession_u import { ReduxSogsRoomInfos } from '../state/ducks/sogsRoomInfo'; import { getLibGroupAdminsOutsideRedux, + getLibGroupMembersOutsideRedux, getLibGroupNameOutsideRedux, } from '../state/selectors/groups'; import { @@ -262,7 +263,7 @@ export class ConversationModel extends Backbone.Model { * For instance, all of the conversations created when receiving a community are not active, until we start directly talking with them (or they do). */ public isActive() { - return Boolean(this.get('active_at')); + return Boolean(this.getActiveAt()); } /** @@ -273,7 +274,7 @@ export class ConversationModel extends Backbone.Model { * - a legacy group is kept visible if we leave it, until we explicitely delete it. At that time, it is removed completely and not marked hidden */ public isHidden() { - const priority = this.get('priority') || CONVERSATION_PRIORITIES.default; + const priority = this.getPriority(); return this.isPrivate() && priority === CONVERSATION_PRIORITIES.hidden; } @@ -281,6 +282,14 @@ export class ConversationModel extends Backbone.Model { await deleteExternalFilesOfConversation(this.attributes); } + public getPriority() { + return this.get('priority') || CONVERSATION_PRIORITIES.default; + } + + public getNotificationsFor() { + return this.get('triggerNotificationsFor'); + } + public getConversationModelProps(): ReduxConversationType { const isPublic = this.isPublic(); @@ -288,14 +297,14 @@ export class ConversationModel extends Backbone.Model { const isPrivate = this.isPrivate(); const weAreAdmin = this.weAreAdminUnblinded(); - const currentNotificationSetting = this.get('triggerNotificationsFor'); - const priorityFromDb = this.get('priority'); + const currentNotificationSetting = this.getNotificationsFor(); + const priorityFromDb = this.getPriority(); // To reduce the redux store size, only set fields which cannot be undefined. // For instance, a boolean can usually be not set if false, etc const toRet: ReduxConversationType = { id: this.id as string, - activeAt: this.get('active_at'), + activeAt: this.getActiveAt(), type: this.get('type'), }; @@ -347,8 +356,8 @@ export class ConversationModel extends Backbone.Model { toRet.currentNotificationSetting = currentNotificationSetting; } - if (this.get('displayNameInProfile')) { - toRet.displayNameInProfile = this.get('displayNameInProfile'); + if (this.getRealSessionUsername()) { + toRet.displayNameInProfile = this.getRealSessionUsername(); } if (this.get('nickname')) { toRet.nickname = this.get('nickname'); @@ -367,7 +376,7 @@ export class ConversationModel extends Backbone.Model { } // those are values coming only from both the DB or the wrapper. Currently we display the data from the DB if (this.isClosedGroup()) { - toRet.members = this.get('members') || []; + toRet.members = this.getGroupMembers() || []; } // those are values coming only from both the DB or the wrapper. Currently we display the data from the DB @@ -378,14 +387,14 @@ export class ConversationModel extends Backbone.Model { // those are values coming only from the DB when this is a closed group if (this.isClosedGroup()) { - if (this.get('isKickedFromGroup')) { - toRet.isKickedFromGroup = this.get('isKickedFromGroup'); + if (this.isKickedFromGroup()) { + toRet.isKickedFromGroup = this.isKickedFromGroup(); } - if (this.get('left')) { - toRet.left = this.get('left'); + if (this.isLeft()) { + toRet.left = this.isLeft(); } // to be dropped once we get rid of the legacy closed groups - const zombies = this.get('zombies') || []; + const zombies = this.getGroupZombies() || []; if (zombies?.length) { toRet.zombies = uniq(zombies); } @@ -656,7 +665,7 @@ export class ConversationModel extends Backbone.Model { isApproved: this.isApproved(), isBlocked: this.isBlocked(), isPrivate: this.isPrivate(), - activeAt: this.get('active_at'), + activeAt: this.getActiveAt(), didApproveMe: this.didApproveMe(), }); } @@ -671,7 +680,7 @@ export class ConversationModel extends Backbone.Model { didApproveMe: this.didApproveMe() || false, isBlocked: this.isBlocked() || false, isPrivate: this.isPrivate() || false, - activeAt: this.get('active_at') || 0, + activeAt: this.getActiveAt() || 0, }); } @@ -1094,7 +1103,7 @@ export class ConversationModel extends Backbone.Model { this.set({ avatarInProfile: newProfile.avatarPath }); changes = true; } - const existingImageId = this.get('avatarImageId'); + const existingImageId = this.getAvatarImageId(); if (existingImageId !== newProfile.avatarImageId) { this.set({ avatarImageId: newProfile.avatarImageId }); @@ -1128,6 +1137,18 @@ export class ConversationModel extends Backbone.Model { return this.isPrivate() ? this.get('nickname') || undefined : undefined; } + public getAvatarImageId(): number | undefined { + return this.isPublic() ? this.get('avatarImageId') || undefined : undefined; + } + + public getProfileKey(): string | undefined { + return this.get('profileKey'); + } + + public getAvatarPointer(): string | undefined { + return this.get('avatarPointer'); + } + /** * @returns `getNickname` if a private convo and a nickname is set, or `getRealSessionUsername` */ @@ -1196,7 +1217,7 @@ export class ConversationModel extends Backbone.Model { priority: number, shouldCommit: boolean = true ): Promise { - if (priority !== this.get('priority')) { + if (priority !== this.getPriority()) { this.set({ priority, }); @@ -1229,7 +1250,7 @@ export class ConversationModel extends Backbone.Model { if (!this.isPrivate()) { return; } - const priority = this.get('priority'); + const priority = this.getPriority(); if (priority >= CONVERSATION_PRIORITIES.default) { this.set({ priority: CONVERSATION_PRIORITIES.hidden }); if (shouldCommit) { @@ -1244,7 +1265,7 @@ export class ConversationModel extends Backbone.Model { * A pinned cannot be hidden, as the it is all based on the same priority values. */ public async unhideIfNeeded(shouldCommit: boolean = true) { - const priority = this.get('priority'); + const priority = this.getPriority(); if (isFinite(priority) && priority < CONVERSATION_PRIORITIES.default) { this.set({ priority: CONVERSATION_PRIORITIES.default }); if (shouldCommit) { @@ -1445,7 +1466,7 @@ export class ConversationModel extends Backbone.Model { const profileKeyHex = toHex(profileKey); // profileKey is a string so we can compare it directly - if (this.get('profileKey') !== profileKeyHex) { + if (this.getProfileKey() !== profileKeyHex) { this.set({ profileKey: profileKeyHex, }); @@ -1457,7 +1478,7 @@ export class ConversationModel extends Backbone.Model { } public hasMember(pubkey: string) { - return includes(this.get('members'), pubkey); + return includes(this.getGroupMembers(), pubkey); } public hasReactions() { @@ -1488,7 +1509,7 @@ export class ConversationModel extends Backbone.Model { } public isPinned() { - const priority = this.get('priority'); + const priority = this.getPriority(); return isFinite(priority) && priority > CONVERSATION_PRIORITIES.default; } @@ -1519,7 +1540,7 @@ export class ConversationModel extends Backbone.Model { return window.i18n('you'); } - const profileName = this.get('displayNameInProfile'); + const profileName = this.getRealSessionUsername(); return profileName || PubKey.shorten(pubkey); } @@ -1587,7 +1608,7 @@ export class ConversationModel extends Backbone.Model { } // make sure the notifications are not muted for this convo (and not the source convo) - const convNotif = this.get('triggerNotificationsFor'); + const convNotif = this.getNotificationsFor(); if (convNotif === 'disabled') { window?.log?.info('notifications disabled for convo', this.idForLogging()); return; @@ -1644,7 +1665,7 @@ export class ConversationModel extends Backbone.Model { const conversationId = this.id; // make sure the notifications are not muted for this convo (and not the source convo) - const convNotif = this.get('triggerNotificationsFor'); + const convNotif = this.getNotificationsFor(); if (convNotif === 'disabled') { window?.log?.info( 'notifyIncomingCall: notifications disabled for convo', @@ -1704,6 +1725,60 @@ export class ConversationModel extends Backbone.Model { return groupAdmins && groupAdmins.length > 0 ? groupAdmins : []; } + public isKickedFromGroup(): boolean { + if (this.isClosedGroup()) { + if (this.isClosedGroupV3()) { + console.info('isKickedFromGroup using lib todo'); // debugger + } + return !!this.get('isKickedFromGroup'); + } + return false; + } + + public isLeft(): boolean { + if (this.isClosedGroup()) { + if (this.isClosedGroupV3()) { + console.info('isLeft using lib todo'); // debugger + } + return !!this.get('left'); + } + return false; + } + + public getActiveAt(): number | undefined { + return this.get('active_at'); + } + + public getLastJoinedTimestamp(): number { + if (this.isClosedGroup()) { + return this.get('lastJoinedTimestamp') || 0; + } + return 0; + } + + public getGroupMembers(): Array { + if (this.isClosedGroup()) { + if (this.isClosedGroupV3()) { + return getLibGroupMembersOutsideRedux(this.id); + } + const members = this.get('members'); + return members && members.length > 0 ? members : []; + } + return []; + } + + public getGroupZombies(): Array { + if (this.isClosedGroup()) { + // closed group with 03 prefix does not have the concepts of zombies + if (this.isClosedGroupV3()) { + return []; + } + const zombies = this.get('zombies'); + return zombies && zombies.length > 0 ? zombies : []; + } + return []; + } + private async sendMessageJob(message: MessageModel, expireTimer: number | undefined) { try { const { body, attachments, preview, quote, fileIdsToLink } = await message.uploadData(); @@ -1919,7 +1994,7 @@ export class ConversationModel extends Backbone.Model { } private async bouncyUpdateLastMessage() { - if (!this.id || !this.get('active_at') || this.isHidden()) { + if (!this.id || !this.getActiveAt() || this.isHidden()) { return; } const messages = await Data.getLastMessagesByConversation(this.id, 1, true); @@ -2336,7 +2411,7 @@ export class ConversationCollection extends Backbone.Collection) { super(models); this.comparator = (m: ConversationModel) => { - return -(m.get('active_at') || 0); + return -(m.getActiveAt() || 0); }; } } @@ -2379,7 +2454,7 @@ export function hasValidIncomingRequestValues({ isBlocked: boolean; isPrivate: boolean; didApproveMe: boolean; - activeAt: number; + activeAt: number | undefined; }): boolean { // if a convo is not active, it means we didn't get any messages nor sent any. const isActive = activeAt && isFinite(activeAt) && activeAt > 0; diff --git a/ts/models/message.ts b/ts/models/message.ts index a8da83b786..300495b43e 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -436,7 +436,7 @@ export class MessageModel extends Backbone.Model { return undefined; } - if (this.getConversation()?.get('left')) { + if (this.getConversation()?.isLeft()) { return 'sent'; } diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index ea0be9c0fe..eef48d6480 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -303,7 +303,7 @@ export async function handleNewClosedGroup( if (groupConvo) { // if we did not left this group, just add the keypair we got if not already there - if (!groupConvo.get('isKickedFromGroup') && !groupConvo.get('left')) { + if (!groupConvo.isKickedFromGroup() && !groupConvo.isLeft()) { const ecKeyPairAlreadyExistingConvo = new ECKeyPair( encryptionKeyPair!.publicKey, encryptionKeyPair!.privateKey @@ -542,7 +542,7 @@ async function performIfValid( } // Check that the message isn't from before the group was created - let lastJoinedTimestamp = convo.get('lastJoinedTimestamp'); + let lastJoinedTimestamp = convo.getLastJoinedTimestamp(); // might happen for existing groups if (!lastJoinedTimestamp) { const aYearAgo = Date.now() - 1000 * 60 * 24 * 365; @@ -562,7 +562,7 @@ async function performIfValid( } // Check that the sender is a member of the group (before the update) - const oldMembers = convo.get('members') || []; + const oldMembers = convo.getGroupMembers() || []; if (!oldMembers.includes(sender)) { window?.log?.error( `Error: closed group: ignoring closed group update message from non-member. ${sender} is not a current member.` @@ -600,7 +600,7 @@ async function handleClosedGroupNameChanged( const newName = groupUpdate.name; window?.log?.info(`Got a group update for group ${envelope.source}, type: NAME_CHANGED`); - if (newName !== convo.get('displayNameInProfile')) { + if (newName !== convo.getRealSessionUsername()) { const groupDiff: ClosedGroup.GroupDiff = { newName, }; @@ -628,7 +628,7 @@ async function handleClosedGroupMembersAdded( ) { const { members: addedMembersBinary } = groupUpdate; const addedMembers = (addedMembersBinary || []).map(toHex); - const oldMembers = convo.get('members') || []; + const oldMembers = convo.getGroupMembers() || []; const membersNotAlreadyPresent = addedMembers.filter(m => !oldMembers.includes(m)); window?.log?.info(`Got a group update for group ${envelope.source}, type: MEMBERS_ADDED`); @@ -696,7 +696,7 @@ async function handleClosedGroupMembersRemoved( shouldOnlyAddUpdateMessage: boolean // set this to true to not apply the change to the convo itself, just add the update in the conversation ) { // Check that the admin wasn't removed - const currentMembers = convo.get('members'); + const currentMembers = convo.getGroupMembers(); // removedMembers are all members in the diff const removedMembers = groupUpdate.members.map(toHex); // effectivelyRemovedMembers are the members which where effectively on this group before the update @@ -755,7 +755,7 @@ async function handleClosedGroupMembersRemoved( } // Update the group - const zombies = convo.get('zombies').filter(z => membersAfterUpdate.includes(z)); + const zombies = convo.getGroupZombies().filter(z => membersAfterUpdate.includes(z)); if (!shouldOnlyAddUpdateMessage) { convo.set({ members: membersAfterUpdate }); @@ -767,7 +767,7 @@ async function handleClosedGroupMembersRemoved( } function isUserAZombie(convo: ConversationModel, user: PubKey) { - return convo.get('zombies').includes(user.key); + return convo.getGroupZombies().includes(user.key); } /** @@ -779,7 +779,7 @@ function addMemberToZombies( userToAdd: PubKey, convo: ConversationModel ): boolean { - const zombies = convo.get('zombies'); + const zombies = convo.getGroupZombies(); const isAlreadyZombie = isUserAZombie(convo, userToAdd); if (isAlreadyZombie) { @@ -799,7 +799,7 @@ function removeMemberFromZombies( userToAdd: PubKey, convo: ConversationModel ): boolean { - const zombies = convo.get('zombies'); + const zombies = convo.getGroupZombies(); const isAlreadyAZombie = isUserAZombie(convo, userToAdd); if (!isAlreadyAZombie) { @@ -840,7 +840,7 @@ async function handleClosedGroupMemberLeft( const didAdminLeave = convo.getGroupAdmins().includes(sender) || false; // If the admin leaves the group is disbanded // otherwise, we remove the sender from the list of current members in this group - const oldMembers = convo.get('members') || []; + const oldMembers = convo.getGroupMembers() || []; const newMembers = oldMembers.filter(s => s !== sender); window?.log?.info(`Got a group update for group ${envelope.source}, type: MEMBER_LEFT`); diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index d705280e77..131d9c9d80 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -320,7 +320,7 @@ async function handleContactsUpdate() { changes = true; } - const currentPriority = contactConvo.get('priority'); + const currentPriority = contactConvo.getPriority(); if (wrapperConvo.priority !== currentPriority) { if (wrapperConvo.priority === CONVERSATION_PRIORITIES.hidden) { window.log.info( @@ -348,7 +348,7 @@ async function handleContactsUpdate() { // } // we want to set the active_at to the created_at timestamp if active_at is unset, so that it shows up in our list. - if (!contactConvo.get('active_at') && wrapperConvo.createdAtSeconds) { + if (!contactConvo.getActiveAt() && wrapperConvo.createdAtSeconds) { contactConvo.set({ active_at: wrapperConvo.createdAtSeconds * 1000 }); changes = true; } @@ -542,6 +542,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { const members = fromWrapper.members.map(m => m.pubkeyHex); const admins = fromWrapper.members.filter(m => m.isAdmin).map(m => m.pubkeyHex); + const activeAt = legacyGroupConvo.getActiveAt(); // then for all the existing legacy group in the wrapper, we need to override the field of what we have in the DB with what is in the wrapper // We only set group admins on group creation const groupDetails: ClosedGroup.GroupInfo = { @@ -550,9 +551,8 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { members, admins, activeAt: - !!legacyGroupConvo.get('active_at') && - legacyGroupConvo.get('active_at') < latestEnvelopeTimestamp - ? legacyGroupConvo.get('active_at') + !!activeAt && activeAt < latestEnvelopeTimestamp + ? legacyGroupConvo.getActiveAt() : latestEnvelopeTimestamp, }; @@ -560,7 +560,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { let changes = await legacyGroupConvo.setPriorityFromWrapper(fromWrapper.priority, false); - const existingTimestampMs = legacyGroupConvo.get('lastJoinedTimestamp'); + const existingTimestampMs = legacyGroupConvo.getLastJoinedTimestamp(); const existingJoinedAtSeconds = Math.floor(existingTimestampMs / 1000); if (existingJoinedAtSeconds !== fromWrapper.joinedAtSeconds) { legacyGroupConvo.set({ @@ -581,7 +581,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { // changes = true; // } // start polling for this group if we haven't left it yet. The wrapper does not store this info for legacy group so we check from the DB entry instead - if (!legacyGroupConvo.get('isKickedFromGroup') && !legacyGroupConvo.get('left')) { + if (!legacyGroupConvo.isKickedFromGroup() && !legacyGroupConvo.isLeft()) { getSwarmPollingInstance().addGroupId(PubKey.cast(fromWrapper.pubkeyHex)); // save the encryption keypair if needed diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index df4a41e310..21063d130b 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -695,7 +695,7 @@ async function handleMessageRequestResponse( unblindedConvoId, ConversationTypeEnum.PRIVATE ); - let mostRecentActiveAt = Math.max(...compact(convosToMerge.map(m => m.get('active_at')))); + let mostRecentActiveAt = Math.max(...compact(convosToMerge.map(m => m.getActiveAt()))); if (!isFinite(mostRecentActiveAt) || mostRecentActiveAt <= 0) { mostRecentActiveAt = toNumber(envelope.timestamp); } @@ -710,11 +710,11 @@ async function handleMessageRequestResponse( if (convosToMerge.length) { // merge fields we care by hand conversationToApprove.set({ - profileKey: convosToMerge[0].get('profileKey'), - displayNameInProfile: convosToMerge[0].get('displayNameInProfile'), + profileKey: convosToMerge[0].getProfileKey(), + displayNameInProfile: convosToMerge[0].getRealSessionUsername(), avatarInProfile: convosToMerge[0].get('avatarInProfile'), - avatarPointer: convosToMerge[0].get('avatarPointer'), // don't set the avatar pointer + avatarPointer: convosToMerge[0].getAvatarPointer(), // don't set the avatar pointer // nickname might be set already in conversationToApprove, so don't overwrite it }); diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index 0f9f62716b..8f92671548 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -312,7 +312,7 @@ async function handleRegularMessage( } } - const conversationActiveAt = conversation.get('active_at'); + const conversationActiveAt = conversation.getActiveAt(); if ( !conversationActiveAt || conversation.isHidden() || @@ -422,7 +422,7 @@ export async function handleMessageJob( // to their source message. conversation.set({ - active_at: Math.max(conversation.get('active_at'), messageModel.get('sent_at') || 0), + active_at: Math.max(conversation.getActiveAt() || 0, messageModel.get('sent_at') || 0), }); // this is a throttled call and will only run once every 1 sec at most conversation.updateLastMessage(); diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts index e52087a459..9bbec74ec7 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts @@ -92,7 +92,7 @@ export async function sogsV3FetchPreviewAndSaveIt(roomInfos: OpenGroupV2RoomWith if (!convo) { return; } - let existingImageId = convo.get('avatarImageId'); + let existingImageId = convo.getAvatarImageId(); if (existingImageId === imageIdNumber) { // return early as the imageID about to be downloaded the one already set as avatar is the same. return; @@ -117,7 +117,7 @@ export async function sogsV3FetchPreviewAndSaveIt(roomInfos: OpenGroupV2RoomWith if (!convo) { return; } - existingImageId = convo.get('avatarImageId'); + existingImageId = convo.getAvatarImageId(); if (existingImageId !== imageIdNumber && isFinite(imageIdNumber)) { // we have to trigger an update // write the file to the disk (automatically encrypted), diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index d29c713c7c..7d15ae720e 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -143,7 +143,7 @@ export class SwarmPolling { if (!convo) { return SWARM_POLLING_TIMEOUT.INACTIVE; } - const activeAt = convo.get('active_at'); + const activeAt = convo.getActiveAt(); if (!activeAt) { return SWARM_POLLING_TIMEOUT.INACTIVE; } @@ -437,10 +437,10 @@ export class SwarmPolling { const closedGroupsOnly = convos.filter( (c: ConversationModel) => - c.isClosedGroup() && !c.isBlocked() && !c.get('isKickedFromGroup') && !c.get('left') + c.isClosedGroup() && !c.isBlocked() && !c.isKickedFromGroup() && !c.isLeft() ); - closedGroupsOnly.forEach((c: any) => { + closedGroupsOnly.forEach((c) => { this.addGroupId(new PubKey(c.id)); }); } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index cca58fae73..617d9b67b6 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -473,7 +473,7 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { } else { // otherwise, just the exclude ourself from the members and trigger an update with this convo.set({ left: true }); - members = (convo.get('members') || []).filter((m: string) => m !== ourNumber); + members = (convo.getGroupMembers() || []).filter((m: string) => m !== ourNumber); admins = convo.getGroupAdmins(); } convo.set({ members }); diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 543209fb41..846b19ca15 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -73,7 +73,7 @@ export async function initiateClosedGroupUpdate( name: groupName, members, // remove from the zombies list the zombies not which are not in the group anymore - zombies: convo.get('zombies')?.filter(z => members.includes(z)), + zombies: convo.getGroupZombies()?.filter(z => members.includes(z)), activeAt: Date.now(), expireTimer: convo.get('expireTimer'), }; @@ -180,12 +180,12 @@ export async function addUpdateMessage( function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff { const groupDiff: GroupDiff = {}; - if (convo.get('displayNameInProfile') !== update.name) { + if (convo.getRealSessionUsername() !== update.name) { groupDiff.newName = update.name; } - const oldMembers = convo.get('members'); - const oldZombies = convo.get('zombies'); + const oldMembers = convo.getGroupMembers(); + const oldZombies = convo.getGroupZombies(); const oldMembersWithZombies = _.uniq(oldMembers.concat(oldZombies)); const newMembersWithZombiesLeft = _.uniq(update.members.concat(update.zombies || [])); diff --git a/ts/session/group/open-group.ts b/ts/session/group/open-group.ts index 57ac056100..7f08c4f01d 100644 --- a/ts/session/group/open-group.ts +++ b/ts/session/group/open-group.ts @@ -68,7 +68,7 @@ export async function initiateOpenGroupUpdate( contentType: MIME.IMAGE_UNKNOWN, // contentType is mostly used to generate previews and screenshot. We do not care for those in this case. }); await convo.setSessionProfile({ - displayName: groupName || convo.get('displayNameInProfile') || window.i18n('unknown'), + displayName: groupName || convo.getRealSessionUsername() || window.i18n('unknown'), avatarPath: upgraded.path, avatarImageId, }); diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts index c43fae9fc4..77bddc95d1 100644 --- a/ts/session/profile_manager/ProfileManager.ts +++ b/ts/session/profile_manager/ProfileManager.ts @@ -21,7 +21,7 @@ async function updateOurProfileSync( } await updateProfileOfContact(us, displayName, profileUrl, profileKey); - if (priority !== null && ourConvo.get('priority') !== priority) { + if (priority !== null && ourConvo.getPriority() !== priority) { ourConvo.set('priority', priority); await ourConvo.commit(); } @@ -43,7 +43,7 @@ async function updateProfileOfContact( return; } let changes = false; - const existingDisplayName = conversation.get('displayNameInProfile'); + const existingDisplayName = conversation.getRealSessionUsername(); // avoid setting the display name to an invalid value if (existingDisplayName !== displayName && !isEmpty(displayName)) { @@ -55,8 +55,8 @@ async function updateProfileOfContact( let avatarChanged = false; // trust whatever we get as an update. It either comes from a shared config wrapper or one of that user's message. But in any case we should trust it, even if it gets resetted. - const prevPointer = conversation.get('avatarPointer'); - const prevProfileKey = conversation.get('profileKey'); + const prevPointer = conversation.getAvatarPointer(); + const prevProfileKey = conversation.getProfileKey(); // we have to set it right away and not in the async download job, as the next .commit will save it to the // database and wrapper (and we do not want to override anything in the wrapper's content diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts index 0bcae2c785..51c5912917 100644 --- a/ts/session/utils/User.ts +++ b/ts/session/utils/User.ts @@ -103,10 +103,10 @@ export function getOurProfile(): LokiProfile | undefined { // in their primary device's conversation const ourNumber = Storage.get('primaryDevicePubKey') as string; const ourConversation = getConversationController().get(ourNumber); - const ourProfileKeyHex = ourConversation.get('profileKey'); + const ourProfileKeyHex = ourConversation.getProfileKey(); const profileKeyAsBytes = ourProfileKeyHex ? fromHexToArray(ourProfileKeyHex) : null; - const avatarPointer = ourConversation.get('avatarPointer'); + const avatarPointer = ourConversation.getAvatarPointer(); const displayName = ourConversation.getRealSessionUsername() || 'Anonymous'; return { displayName, diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 840d88aa17..d06ee5407b 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -1144,7 +1144,7 @@ export async function handleCallTypeOffer( // show a notification const callerConvo = getConversationController().get(sender); - const convNotif = callerConvo?.get('triggerNotificationsFor') || 'disabled'; + const convNotif = callerConvo?.getNotificationsFor() || 'disabled'; if (convNotif === 'disabled') { window?.log?.info('notifications disabled for convo', ed25519Str(sender)); } else if (callerConvo) { diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts index 273ab43462..5f81e28878 100644 --- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts +++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts @@ -35,8 +35,8 @@ export function shouldAddAvatarDownloadJob({ conversationId }: { conversationId: window.log.warn('shouldAddAvatarDownloadJob can only be used for private convos currently'); return false; } - const prevPointer = conversation.get('avatarPointer'); - const profileKey = conversation.get('profileKey'); + const prevPointer = conversation.getAvatarPointer(); + const profileKey = conversation.getProfileKey(); const hasNoAvatar = isEmpty(prevPointer) || isEmpty(profileKey); if (hasNoAvatar) { @@ -116,8 +116,8 @@ class AvatarDownloadJob extends PersistedJob { return RunJobResult.PermanentFailure; } let changes = false; - const toDownloadPointer = conversation.get('avatarPointer'); - const toDownloadProfileKey = conversation.get('profileKey'); + const toDownloadPointer = conversation.getAvatarPointer(); + const toDownloadProfileKey = conversation.getProfileKey(); // if there is an avatar and profileKey for that user ('', null and undefined excluded), download, decrypt and save the avatar locally. if (toDownloadPointer && toDownloadProfileKey) { diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts index db45b1bdb3..21788247d0 100644 --- a/ts/session/utils/libsession/libsession_utils_contacts.ts +++ b/ts/session/utils/libsession/libsession_utils_contacts.ts @@ -49,12 +49,12 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise> => { // Filter open groups v2 const openGroupsV2ConvoIds = convos - .filter(c => !!c.get('active_at') && c.isOpenGroupV2() && !c.get('left')) + .filter(c => !!c.getActiveAt() && c.isOpenGroupV2() && !c.isLeft()) .map(c => c.id) as Array; const urls = await Promise.all( @@ -161,13 +161,13 @@ const getValidClosedGroups = async (convos: Array) => { // Filter Closed/Medium groups const closedGroupModels = convos.filter( c => - !!c.get('active_at') && + !!c.getActiveAt() && c.isClosedGroup() && - c.get('members')?.includes(ourPubKey) && - !c.get('left') && - !c.get('isKickedFromGroup') && + c.getGroupMembers()?.includes(ourPubKey) && + !c.isLeft() && + !c.isKickedFromGroup() && !c.isBlocked() && - c.get('displayNameInProfile') + c.getRealSessionUsername() ); const closedGroups = await Promise.all( @@ -180,8 +180,8 @@ const getValidClosedGroups = async (convos: Array) => { return new ConfigurationMessageClosedGroup({ publicKey: groupPubKey, - name: c.get('displayNameInProfile') || '', - members: c.get('members') || [], + name: c.getRealSessionUsername() || '', + members: c.getGroupMembers() || [], admins: c.getGroupAdmins(), encryptionKeyPair: ECKeyPair.fromHexKeyPair(fetchEncryptionKeyPair), }); @@ -199,7 +199,7 @@ const getValidContacts = (convos: Array) => { // blindedId are synced with the outbox logic. const contactsModels = convos.filter( c => - !!c.get('active_at') && + !!c.getActiveAt() && c.getRealSessionUsername() && c.isPrivate() && c.isApproved() && @@ -208,7 +208,7 @@ const getValidContacts = (convos: Array) => { const contacts = contactsModels.map(c => { try { - const profileKey = c.get('profileKey'); + const profileKey = c.getProfileKey(); let profileKeyForContact = null; if (typeof profileKey === 'string') { // this will throw if the profileKey is not in hex. @@ -237,7 +237,7 @@ const getValidContacts = (convos: Array) => { return new ConfigurationMessageContact({ publicKey: c.id as string, displayName: c.getRealSessionUsername() || 'Anonymous', - profilePictureURL: c.get('avatarPointer'), + profilePictureURL: c.getAvatarPointer(), profileKey: !profileKeyForContact?.length ? undefined : profileKeyForContact, isApproved: c.isApproved(), isBlocked: c.isBlocked(), @@ -268,10 +268,10 @@ export const getCurrentConfigurationMessage = async ( const ourProfileKeyHex = getConversationController() .get(UserUtils.getOurPubKeyStrFromCache()) - ?.get('profileKey') || null; + ?.getProfileKey() || null; const profileKey = ourProfileKeyHex ? fromHexToArray(ourProfileKeyHex) : undefined; - const profilePicture = ourConvo?.get('avatarPointer') || undefined; + const profilePicture = ourConvo?.getAvatarPointer() || undefined; const displayName = ourConvo?.getRealSessionUsername() || 'Anonymous'; // this should never be undefined, but well... const activeOpenGroups = [...opengroupV2CompleteUrls]; From 9191c3476dd4a3e07e5389d70e8c34eb5224a1d6 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 19 Sep 2023 14:14:08 +1000 Subject: [PATCH 016/302] feat: mark us as admin and others as invite pending --- ts/hooks/useParamSelector.ts | 9 ++- .../SwarmPollingGroupConfig.ts | 3 - ts/session/conversations/createClosedGroup.ts | 8 ++- ts/state/ducks/groups.ts | 69 ++++++++++--------- ts/state/selectors/user.ts | 5 ++ 5 files changed, 53 insertions(+), 41 deletions(-) diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index dc34f71231..8f5f51b800 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -12,6 +12,7 @@ import { StateType } from '../state/reducer'; import { getMessageReactsProps } from '../state/selectors/conversations'; import { useLibGroupAdmins, useLibGroupMembers, useLibGroupName } from '../state/selectors/groups'; import { isPrivateAndFriend } from '../state/selectors/selectedConversation'; +import { useOurPkStr } from '../state/selectors/user'; export function useAvatarPath(convoId: string | undefined) { const convoProps = useConversationPropsById(convoId); @@ -148,8 +149,9 @@ export function useIsKickedFromGroup(convoId?: string) { } export function useWeAreAdmin(convoId?: string) { - const convoProps = useConversationPropsById(convoId); - return Boolean(convoProps && convoProps.weAreAdmin); + const groupAdmins = useGroupAdmins(convoId); + const us = useOurPkStr(); + return Boolean(groupAdmins.includes(us)); } export function useGroupAdmins(convoId?: string) { @@ -221,7 +223,8 @@ export function useIsOutgoingRequest(convoId?: string) { } /** - * Not to be exported: This selector is too generic and needs to be broken node in individual fields selectors. + * Note: NOT to be exported: + * This selector is too generic and needs to be broken node in individual fields selectors. * Make sure when writing a selector that you fetch the data from libsession if needed. * (check useSortedGroupMembers() as an example) */ diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 9f0f20ef87..2fd1cb3602 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -42,9 +42,6 @@ async function handleGroupSharedConfigMessages( groupKeys: keys, groupMember: members, }; - console.info( - `groupInfo before merge: ${stringify(await MetaGroupWrapperActions.infoGet(groupPk))}` - ); await MetaGroupWrapperActions.metaMerge(groupPk, toMerge); await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index 85f568238c..0a46c480f4 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -1,4 +1,4 @@ -import _ from 'lodash'; +import _, { concat } from 'lodash'; import { ClosedGroup, getMessageQueue } from '..'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { addKeyPairToCacheAndDBIfNeeded } from '../../receiver/closedGroups'; @@ -26,10 +26,14 @@ import { groupInfoActions } from '../../state/ducks/groups'; */ export async function createClosedGroup(groupName: string, members: Array, isV3: boolean) { if (isV3) { + const us = UserUtils.getOurPubKeyStrFromCache(); + // we need to send a group info and encryption keys message to the batch endpoint with both seqno being 0 console.error('isV3 send invite to group TODO'); // FIXME // FIXME we should save the key to the wrapper right away? or even to the DB idk - window.inboxStore.dispatch(groupInfoActions.initNewGroupInWrapper({ members, groupName })); + window.inboxStore.dispatch( + groupInfoActions.initNewGroupInWrapper({ members: concat(members, [us]), groupName, us }) + ); return; } diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index 1ea7919acb..73123d2bb5 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -1,6 +1,6 @@ import { PayloadAction, createAsyncThunk, createSlice } from '@reduxjs/toolkit'; import { GroupInfoGet, GroupMemberGet, GroupPubkeyType } from 'libsession_util_nodejs'; -import { isEmpty } from 'lodash'; +import { isEmpty, uniq } from 'lodash'; import { ConfigDumpData } from '../../data/configDump/configDump'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; @@ -16,6 +16,7 @@ import { MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; +import { PreConditionFailed } from '../../session/utils/errors'; export type GroupState = { infos: Record; @@ -35,12 +36,23 @@ type GroupDetailsUpdate = { const initNewGroupInWrapper = createAsyncThunk( 'group/initNewGroupInWrapper', - async (groupDetails: { + async ({ + groupName, + members, + us, + }: { groupName: string; members: Array; + us: string; }): Promise => { + if (!members.includes(us)) { + throw new PreConditionFailed('initNewGroupInWrapper needs us to be a member'); + } + const uniqMembers = uniq(members); try { const newGroup = await UserGroupsWrapperActions.createGroup(); + const groupPk = newGroup.pubkeyHex; + newGroup.name = groupName; // this will be used by the linked devices until they fetch the info from the groups swarm await UserGroupsWrapperActions.setGroup(newGroup); @@ -49,47 +61,42 @@ const initNewGroupInWrapper = createAsyncThunk( throw new Error('Current user has no priv ed25519 key?'); } const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes; - const groupEd2519Pk = HexString.fromHexString(newGroup.pubkeyHex).slice(1); // remove the 03 prefix (single byte once in hex form) + const groupEd2519Pk = HexString.fromHexString(groupPk).slice(1); // remove the 03 prefix (single byte once in hex form) // dump is always empty when creating a new groupInfo - await MetaGroupWrapperActions.init(newGroup.pubkeyHex, { + await MetaGroupWrapperActions.init(groupPk, { metaDumped: null, userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), groupEd25519Secretkey: newGroup.secretKey, groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), }); - await Promise.all( - groupDetails.members.map(async member => { - const created = await MetaGroupWrapperActions.memberGetOrConstruct( - newGroup.pubkeyHex, - member - ); - await MetaGroupWrapperActions.memberSetInvited( - newGroup.pubkeyHex, - created.pubkeyHex, - false - ); - }) - ); - const infos = await MetaGroupWrapperActions.infoGet(newGroup.pubkeyHex); + for (let index = 0; index < uniqMembers.length; index++) { + const member = uniqMembers[index]; + const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); + if (created.pubkeyHex === us) { + await MetaGroupWrapperActions.memberSetPromoted(groupPk, created.pubkeyHex, false); + } else { + await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); + } + } + + const infos = await MetaGroupWrapperActions.infoGet(groupPk); if (!infos) { - throw new Error( - `getInfos of ${newGroup.pubkeyHex} returned empty result even if it was just init.` - ); + throw new Error(`getInfos of ${groupPk} returned empty result even if it was just init.`); } - infos.name = groupDetails.groupName; - await MetaGroupWrapperActions.infoSet(newGroup.pubkeyHex, infos); + infos.name = groupName; + await MetaGroupWrapperActions.infoSet(groupPk, infos); - const members = await MetaGroupWrapperActions.memberGetAll(newGroup.pubkeyHex); - if (!members || isEmpty(members)) { + const membersFromWrapper = await MetaGroupWrapperActions.memberGetAll(groupPk); + if (!membersFromWrapper || isEmpty(membersFromWrapper)) { throw new Error( - `memberGetAll of ${newGroup.pubkeyHex} returned empty result even if it was just init.` + `memberGetAll of ${groupPk} returned empty result even if it was just init.` ); } const convo = await getConversationController().getOrCreateAndWait( - newGroup.pubkeyHex, + groupPk, ConversationTypeEnum.GROUPV3 ); @@ -99,11 +106,7 @@ const initNewGroupInWrapper = createAsyncThunk( // // the sync below will need the secretKey of the group to be saved in the wrapper. So save it! await UserGroupsWrapperActions.setGroup(newGroup); - await GroupSync.queueNewJobIfNeeded(newGroup.pubkeyHex); - - // const us = UserUtils.getOurPubKeyStrFromCache(); - // // Ensure the current user is a member and admin - // const members = uniq([...groupDetails.members, us]); + await GroupSync.queueNewJobIfNeeded(groupPk); // const updateGroupDetails: ClosedGroup.GroupInfo = { // id: newGroup.pubkeyHex, @@ -122,7 +125,7 @@ const initNewGroupInWrapper = createAsyncThunk( await convo.commit(); convo.updateLastMessage(); - return { groupPk: newGroup.pubkeyHex, infos, members }; + return { groupPk: newGroup.pubkeyHex, infos, members: membersFromWrapper }; } catch (e) { throw e; } diff --git a/ts/state/selectors/user.ts b/ts/state/selectors/user.ts index 69535cfda5..0f9a22360b 100644 --- a/ts/state/selectors/user.ts +++ b/ts/state/selectors/user.ts @@ -4,6 +4,7 @@ import { LocalizerType } from '../../types/Util'; import { StateType } from '../reducer'; import { UserStateType } from '../ducks/user'; +import { useSelector } from 'react-redux'; export const getUser = (state: StateType): UserStateType => state.user; @@ -13,3 +14,7 @@ export const getOurNumber = createSelector( ); export const getIntl = createSelector(getUser, (): LocalizerType => window.i18n); + +export function useOurPkStr() { + return useSelector((state: StateType) => getOurNumber(state)); +} From 1a18054faed2333899c92bd36669d8727e1e0e0f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 20 Sep 2023 11:47:35 +1000 Subject: [PATCH 017/302] feat: add bump of config hashes for groups when we have admin key --- .eslintrc.js | 2 + build/afterPackHook.js | 2 +- js/.eslintrc | 2 +- package.json | 2 +- ts/components/avatar/Avatar.tsx | 11 +- ts/components/basic/SessionButton.tsx | 12 +- ts/components/basic/SessionToggle.tsx | 4 +- ts/components/conversation/ContactName.tsx | 12 +- .../conversation/SessionConversation.tsx | 12 +- .../conversation/SessionRightPanel.tsx | 4 +- ts/components/conversation/Timestamp.tsx | 5 +- .../media-gallery/groupMediaItemsByDate.ts | 92 ++- .../message-content/MessageReactBar.tsx | 4 +- ts/components/dialog/ReactClearAllModal.tsx | 4 +- .../dialog/SessionPasswordDialog.tsx | 7 +- .../dialog/UpdateGroupMembersDialog.tsx | 8 +- ts/components/icon/Icons.tsx | 225 ++---- ts/components/leftpane/ActionsPanel.tsx | 14 +- ts/data/data.ts | 20 +- ts/hooks/useParamSelector.ts | 7 +- ts/hooks/useVideoEventListener.ts | 5 +- ts/interactions/conversationInteractions.ts | 5 +- ts/mains/main_node.ts | 11 +- ts/models/conversationAttributes.ts | 2 +- ts/models/message.ts | 10 +- ts/node/menu.ts | 10 +- ts/node/sql.ts | 69 +- ts/receiver/configMessage.ts | 32 +- ts/receiver/opengroup.ts | 6 +- ts/receiver/queuedJob.ts | 11 +- .../open_group_api/sogsv3/knownBlindedkeys.ts | 6 +- .../apis/open_group_api/sogsv3/sogsApiV3.ts | 9 +- .../apis/snode_api/SnodeRequestTypes.ts | 27 +- ts/session/apis/snode_api/expire.ts | 14 +- ts/session/apis/snode_api/onions.ts | 18 +- ts/session/apis/snode_api/pollingTypes.ts | 8 + ts/session/apis/snode_api/retrieveRequest.ts | 55 +- ts/session/apis/snode_api/sessionRpc.ts | 6 +- ts/session/apis/snode_api/snodeSignatures.ts | 91 ++- ts/session/apis/snode_api/swarmPolling.ts | 216 +++--- .../SwarmPollingUserConfig.ts | 5 +- .../conversations/ConversationController.ts | 8 +- ts/session/crypto/index.ts | 5 +- .../controlMessage/SharedConfigMessage.ts | 2 +- .../group/ClosedGroupEncryptionPairMessage.ts | 4 +- .../group/ClosedGroupMessage.ts | 3 +- .../group/ClosedGroupNewMessage.ts | 3 +- ts/session/onions/onionPath.ts | 6 +- ts/session/sending/MessageSender.ts | 12 +- ts/session/utils/AttachmentsDownload.ts | 7 +- ts/session/utils/calling/CallManager.ts | 9 +- .../utils/job_runners/JobDeserialization.ts | 8 +- ts/session/utils/job_runners/JobRunner.ts | 17 +- .../libsession/libsession_utils_contacts.ts | 8 +- .../libsession_utils_convo_info_volatile.ts | 9 +- ts/session/utils/sync/syncUtils.ts | 10 +- ts/state/ducks/conversations.ts | 24 +- ts/state/ducks/defaultRooms.tsx | 7 +- ts/state/ducks/section.tsx | 2 +- ts/state/ducks/settings.tsx | 11 +- ts/state/ducks/userConfig.tsx | 7 +- ts/state/selectors/conversations.ts | 166 ++--- ts/state/selectors/groups.ts | 2 +- ts/state/selectors/user.ts | 2 +- .../unit/crypto/MessageEncrypter_test.ts | 69 +- .../crypto/OpenGroupAuthentication_test.ts | 150 +--- .../session/unit/messages/ChatMessage_test.ts | 4 +- .../ClosedGroupChatMessage_test.ts | 4 +- ts/test/session/unit/padding/Padding_test.ts | 20 +- .../session/unit/sending/MessageQueue_test.ts | 9 +- ts/test/session/unit/utils/Messages_test.ts | 10 +- ts/test/session/unit/utils/Promise_test.ts | 2 +- ts/test/session/unit/utils/String_test.ts | 8 +- ts/test/test-utils/utils/stubbing.ts | 2 +- ts/types/attachments/migrations.ts | 36 +- .../message/initializeAttachmentMetadata.ts | 7 +- ts/types/sqlSharedTypes.ts | 2 +- ts/updater/updater.ts | 34 +- ts/util/expiringMessages.ts | 4 +- ts/util/linkPreviewFetch.ts | 5 +- ts/util/privacy.ts | 6 +- ts/util/readReceipts.ts | 4 +- .../browser/libsession_worker_functions.ts | 26 +- .../browser/libsession_worker_interface.ts | 2 +- .../node/libsession/libsession.worker.ts | 9 +- yarn.lock | 680 +----------------- 86 files changed, 808 insertions(+), 1682 deletions(-) create mode 100644 ts/session/apis/snode_api/pollingTypes.ts diff --git a/.eslintrc.js b/.eslintrc.js index 9a11565694..2365840887 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,3 +1,5 @@ +var path = require('path'); + module.exports = { root: true, settings: { diff --git a/build/afterPackHook.js b/build/afterPackHook.js index 49dfae9093..7cc030cb22 100644 --- a/build/afterPackHook.js +++ b/build/afterPackHook.js @@ -5,7 +5,7 @@ const util = require('util'); const renameAsync = util.promisify(fs.rename); const unlinkAsync = util.promisify(fs.unlink); -module.exports = async function(context) { +module.exports = async function (context) { // Replace the app launcher on linux only. if (process.platform !== 'linux') { return; diff --git a/js/.eslintrc b/js/.eslintrc index abe7cd23fc..86ee928d49 100644 --- a/js/.eslintrc +++ b/js/.eslintrc @@ -1,7 +1,7 @@ { "env": { "browser": true, - "node": false + "node": true }, "parserOptions": { "sourceType": "script" diff --git a/package.json b/package.json index 9ee4947b67..c54af41a19 100644 --- a/package.json +++ b/package.json @@ -189,7 +189,7 @@ "node-loader": "^2.0.0", "patch-package": "^6.4.7", "postinstall-prepare": "^1.0.1", - "prettier": "1.19.0", + "prettier": "^3.0.3", "protobufjs-cli": "^1.1.1", "run-script-os": "^1.1.6", "sass": "^1.60.0", diff --git a/ts/components/avatar/Avatar.tsx b/ts/components/avatar/Avatar.tsx index de2558b25a..60326f11bd 100644 --- a/ts/components/avatar/Avatar.tsx +++ b/ts/components/avatar/Avatar.tsx @@ -111,15 +111,8 @@ const AvatarImage = ( }; const AvatarInner = (props: Props) => { - const { - base64Data, - size, - pubkey, - forcedAvatarPath, - forcedName, - dataTestId, - onAvatarClick, - } = props; + const { base64Data, size, pubkey, forcedAvatarPath, forcedName, dataTestId, onAvatarClick } = + props; const [imageBroken, setImageBroken] = useState(false); const isSelectingMessages = useSelector(isMessageSelectionMode); diff --git a/ts/components/basic/SessionButton.tsx b/ts/components/basic/SessionButton.tsx index 84e96136d3..e30a75ecb3 100644 --- a/ts/components/basic/SessionButton.tsx +++ b/ts/components/basic/SessionButton.tsx @@ -116,16 +116,8 @@ type Props = { }; export const SessionButton = (props: Props) => { - const { - buttonType, - buttonShape, - dataTestId, - buttonColor, - text, - disabled, - onClick, - margin, - } = props; + const { buttonType, buttonShape, dataTestId, buttonColor, text, disabled, onClick, margin } = + props; const clickHandler = (e: any) => { if (onClick) { diff --git a/ts/components/basic/SessionToggle.tsx b/ts/components/basic/SessionToggle.tsx index bdbb9e8573..3f9ec0cb49 100644 --- a/ts/components/basic/SessionToggle.tsx +++ b/ts/components/basic/SessionToggle.tsx @@ -16,7 +16,9 @@ const StyledKnob = styled.div<{ active: boolean }>` ? '-2px 1px 3px var(--toggle-switch-ball-shadow-color);' : '2px 1px 3px var(--toggle-switch-ball-shadow-color);'}; - transition: transform var(--default-duration) ease, background-color var(--default-duration) ease; + transition: + transform var(--default-duration) ease, + background-color var(--default-duration) ease; transform: ${props => (props.active ? 'translateX(25px)' : '')}; `; diff --git a/ts/components/conversation/ContactName.tsx b/ts/components/conversation/ContactName.tsx index ecb53f86be..b22b819fc3 100644 --- a/ts/components/conversation/ContactName.tsx +++ b/ts/components/conversation/ContactName.tsx @@ -22,11 +22,13 @@ export const ContactName = (props: Props) => { const convoName = useConversationUsernameOrShorten(pubkey); const isPrivate = useIsPrivate(pubkey); const shouldShowProfile = Boolean(convoName || profileName || name); - const styles = (boldProfileName - ? { - fontWeight: 'bold', - } - : {}) as React.CSSProperties; + const styles = ( + boldProfileName + ? { + fontWeight: 'bold', + } + : {} + ) as React.CSSProperties; const textProfile = profileName || name || convoName || window.i18n('anonymous'); return ( diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index d90a97193d..fa29d12fb0 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -124,10 +124,8 @@ export class SessionConversation extends React.Component { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ public componentDidUpdate(prevProps: Props, _prevState: State) { - const { - selectedConversationKey: newConversationKey, - selectedConversation: newConversation, - } = this.props; + const { selectedConversationKey: newConversationKey, selectedConversation: newConversation } = + this.props; const { selectedConversationKey: oldConversationKey } = prevProps; // if the convo is valid, and it changed, register for drag events @@ -520,9 +518,9 @@ export class SessionConversation extends React.Component { ); window?.log?.debug( - `[perf] getPubkeysInPublicConversation returned '${ - allPubKeys?.length - }' members in ${Date.now() - start}ms` + `[perf] getPubkeysInPublicConversation returned '${allPubKeys?.length}' members in ${ + Date.now() - start + }ms` ); const allMembers = allPubKeys.map((pubKey: string) => { diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx index 8117d4e03f..95002c76f8 100644 --- a/ts/components/conversation/SessionRightPanel.tsx +++ b/ts/components/conversation/SessionRightPanel.tsx @@ -42,9 +42,7 @@ import { SpacerLG } from '../basic/Text'; import { MediaItemType } from '../lightbox/LightboxGallery'; import { MediaGallery } from './media-gallery/MediaGallery'; -async function getMediaGalleryProps( - conversationId: string -): Promise<{ +async function getMediaGalleryProps(conversationId: string): Promise<{ documents: Array; media: Array; }> { diff --git a/ts/components/conversation/Timestamp.tsx b/ts/components/conversation/Timestamp.tsx index 92c88f6063..de2ee1139e 100644 --- a/ts/components/conversation/Timestamp.tsx +++ b/ts/components/conversation/Timestamp.tsx @@ -44,10 +44,7 @@ export const Timestamp = (props: Props) => { // this is a hack to make the date string shorter, looks like moment does not have a localized way of doing this for now. const dateString = momentFromNow - ? momentValue - .fromNow() - .replace('minutes', 'mins') - .replace('minute', 'min') + ? momentValue.fromNow().replace('minutes', 'mins').replace('minute', 'min') : momentValue.format('lll'); const title = moment(timestamp).format('llll'); diff --git a/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts b/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts index b01ed751dd..5e82e9be29 100644 --- a/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts +++ b/ts/components/conversation/media-gallery/groupMediaItemsByDate.ts @@ -87,55 +87,53 @@ type MediaItemWithYearMonthSection = GenericMediaItemWithSection ( - mediaItem: MediaItemType -): MediaItemWithSection => { - const today = moment(referenceDateTime).startOf('day'); - const yesterday = moment(referenceDateTime) - .subtract(1, 'day') - .startOf('day'); - const thisWeek = moment(referenceDateTime).startOf('isoWeek'); - const thisMonth = moment(referenceDateTime).startOf('month'); +const withSection = + (referenceDateTime: moment.Moment) => + (mediaItem: MediaItemType): MediaItemWithSection => { + const today = moment(referenceDateTime).startOf('day'); + const yesterday = moment(referenceDateTime).subtract(1, 'day').startOf('day'); + const thisWeek = moment(referenceDateTime).startOf('isoWeek'); + const thisMonth = moment(referenceDateTime).startOf('month'); + + const { messageTimestamp } = mediaItem; + const mediaItemReceivedDate = moment.utc(messageTimestamp); + if (mediaItemReceivedDate.isAfter(today)) { + return { + order: 0, + type: 'today', + mediaItem, + }; + } + if (mediaItemReceivedDate.isAfter(yesterday)) { + return { + order: 1, + type: 'yesterday', + mediaItem, + }; + } + if (mediaItemReceivedDate.isAfter(thisWeek)) { + return { + order: 2, + type: 'thisWeek', + mediaItem, + }; + } + if (mediaItemReceivedDate.isAfter(thisMonth)) { + return { + order: 3, + type: 'thisMonth', + mediaItem, + }; + } + + const month: number = mediaItemReceivedDate.month(); + const year: number = mediaItemReceivedDate.year(); - const { messageTimestamp } = mediaItem; - const mediaItemReceivedDate = moment.utc(messageTimestamp); - if (mediaItemReceivedDate.isAfter(today)) { - return { - order: 0, - type: 'today', - mediaItem, - }; - } - if (mediaItemReceivedDate.isAfter(yesterday)) { - return { - order: 1, - type: 'yesterday', - mediaItem, - }; - } - if (mediaItemReceivedDate.isAfter(thisWeek)) { - return { - order: 2, - type: 'thisWeek', - mediaItem, - }; - } - if (mediaItemReceivedDate.isAfter(thisMonth)) { return { - order: 3, - type: 'thisMonth', + order: year * 100 + month, + type: 'yearMonth', + month, + year, mediaItem, }; - } - - const month: number = mediaItemReceivedDate.month(); - const year: number = mediaItemReceivedDate.year(); - - return { - order: year * 100 + month, - type: 'yearMonth', - month, - year, - mediaItem, }; -}; diff --git a/ts/components/conversation/message/message-content/MessageReactBar.tsx b/ts/components/conversation/message/message-content/MessageReactBar.tsx index 34068ef0ab..8a9f814a9a 100644 --- a/ts/components/conversation/message/message-content/MessageReactBar.tsx +++ b/ts/components/conversation/message/message-content/MessageReactBar.tsx @@ -16,7 +16,9 @@ type Props = { const StyledMessageReactBar = styled.div` background-color: var(--emoji-reaction-bar-background-color); border-radius: 25px; - box-shadow: 0 2px 16px 0 rgba(0, 0, 0, 0.2), 0 0px 20px 0 rgba(0, 0, 0, 0.19); + box-shadow: + 0 2px 16px 0 rgba(0, 0, 0, 0.2), + 0 0px 20px 0 rgba(0, 0, 0, 0.19); position: absolute; top: -56px; diff --git a/ts/components/dialog/ReactClearAllModal.tsx b/ts/components/dialog/ReactClearAllModal.tsx index fa3a07b6e5..7d7347bf4b 100644 --- a/ts/components/dialog/ReactClearAllModal.tsx +++ b/ts/components/dialog/ReactClearAllModal.tsx @@ -59,9 +59,7 @@ export const ReactClearAllModal = (props: Props): ReactElement => { } const { convoId, serverId } = msgProps; - const roomInfos = getConversationController() - .get(convoId) - .toOpenGroupV2(); + const roomInfos = getConversationController().get(convoId).toOpenGroupV2(); const handleClose = () => { dispatch(updateReactClearAllModal(null)); diff --git a/ts/components/dialog/SessionPasswordDialog.tsx b/ts/components/dialog/SessionPasswordDialog.tsx index 1eafcf5382..0d22fbe8a2 100644 --- a/ts/components/dialog/SessionPasswordDialog.tsx +++ b/ts/components/dialog/SessionPasswordDialog.tsx @@ -295,11 +295,8 @@ export class SessionPasswordDialog extends React.Component { private async setPassword() { const { passwordAction } = this.props; - const { - currentPasswordEntered, - currentPasswordConfirmEntered, - currentPasswordRetypeEntered, - } = this.state; + const { currentPasswordEntered, currentPasswordConfirmEntered, currentPasswordRetypeEntered } = + this.state; // Trim leading / trailing whitespace for UX const firstPasswordEntered = (currentPasswordEntered || '').trim(); diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 6b99cba3cd..e80e421c31 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -182,9 +182,11 @@ export const UpdateGroupMembersDialog = (props: Props) => { const displayName = useConversationUsername(conversationId); const groupAdmins = useGroupAdmins(conversationId); - const { addTo, removeFrom, uniqueValues: membersToKeepWithUpdate } = useSet( - existingMembers - ); + const { + addTo, + removeFrom, + uniqueValues: membersToKeepWithUpdate, + } = useSet(existingMembers); const dispatch = useDispatch(); diff --git a/ts/components/icon/Icons.tsx b/ts/components/icon/Icons.tsx index 9be3ed3bd0..e5f392dbbc 100644 --- a/ts/components/icon/Icons.tsx +++ b/ts/components/icon/Icons.tsx @@ -85,44 +85,37 @@ export type SessionIconSize = 'tiny' | 'small' | 'medium' | 'large' | 'huge' | ' export const icons = { addUser: { - path: - 'M8.85,2.17c-1.73,0-3.12,1.4-3.12,3.12s1.4,3.12,3.12,3.12c1.73,0,3.13-1.4,3.13-3.12S10.58,2.17,8.85,2.17z M8.85,0.08c2.88,0,5.21,2.33,5.21,5.21s-2.33,5.21-5.21,5.21s-5.2-2.33-5.2-5.21C3.65,2.42,5.98,0.08,8.85,0.08z M20.83,5.29 c0.54,0,0.98,0.41,1.04,0.93l0.01,0.11v2.08h2.08c0.54,0,0.98,0.41,1.04,0.93v0.12c0,0.54-0.41,0.98-0.93,1.04l-0.11,0.01h-2.08 v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08h-2.08c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11 c0-0.54,0.41-0.98,0.93-1.04l0.11-0.01h2.08V6.34C19.79,5.76,20.26,5.29,20.83,5.29z M12.5,12.58c2.8,0,5.09,2.21,5.2,4.99v0.22 v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08c0-1.67-1.3-3.03-2.95-3.12h-0.18H5.21 c-1.67,0-3.03,1.3-3.12,2.95v0.18v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93L0,19.88V17.8 c0-2.8,2.21-5.09,4.99-5.2h0.22h7.29V12.58z', + path: 'M8.85,2.17c-1.73,0-3.12,1.4-3.12,3.12s1.4,3.12,3.12,3.12c1.73,0,3.13-1.4,3.13-3.12S10.58,2.17,8.85,2.17z M8.85,0.08c2.88,0,5.21,2.33,5.21,5.21s-2.33,5.21-5.21,5.21s-5.2-2.33-5.2-5.21C3.65,2.42,5.98,0.08,8.85,0.08z M20.83,5.29 c0.54,0,0.98,0.41,1.04,0.93l0.01,0.11v2.08h2.08c0.54,0,0.98,0.41,1.04,0.93v0.12c0,0.54-0.41,0.98-0.93,1.04l-0.11,0.01h-2.08 v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08h-2.08c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11 c0-0.54,0.41-0.98,0.93-1.04l0.11-0.01h2.08V6.34C19.79,5.76,20.26,5.29,20.83,5.29z M12.5,12.58c2.8,0,5.09,2.21,5.2,4.99v0.22 v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08c0-1.67-1.3-3.03-2.95-3.12h-0.18H5.21 c-1.67,0-3.03,1.3-3.12,2.95v0.18v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93L0,19.88V17.8 c0-2.8,2.21-5.09,4.99-5.2h0.22h7.29V12.58z', viewBox: '0 0 25 21', ratio: 1, }, arrow: { - path: - 'M33.187,12.438 L6.097,12.438 L16.113,2.608 C16.704,2.027 16.713,1.078 16.133,0.486 C15.551,-0.105 14.602,-0.113 14.011,0.466 L1.407,12.836 C1.121,13.117 0.959,13.5 0.957981241,13.9 C0.956,14.3 1.114,14.685 1.397,14.968 L14.022,27.593 C14.315,27.886 14.699,28.032 15.083,28.032 C15.466,28.032 15.85,27.886 16.143,27.593 C16.729,27.007 16.729,26.057 16.143,25.472 L6.109,15.438 L33.187,15.438 C34.015,15.438 34.687,14.766 34.687,13.938 C34.687,13.109 34.015,12.438 33.187,12.438', + path: 'M33.187,12.438 L6.097,12.438 L16.113,2.608 C16.704,2.027 16.713,1.078 16.133,0.486 C15.551,-0.105 14.602,-0.113 14.011,0.466 L1.407,12.836 C1.121,13.117 0.959,13.5 0.957981241,13.9 C0.956,14.3 1.114,14.685 1.397,14.968 L14.022,27.593 C14.315,27.886 14.699,28.032 15.083,28.032 C15.466,28.032 15.85,27.886 16.143,27.593 C16.729,27.007 16.729,26.057 16.143,25.472 L6.109,15.438 L33.187,15.438 C34.015,15.438 34.687,14.766 34.687,13.938 C34.687,13.109 34.015,12.438 33.187,12.438', viewBox: '0 -4 37 37', ratio: 1, }, bell: { - path: - 'M2.117 0a.396.396 0 00-.397.397v.18C.963.757.53 1.434.53 2.25v1.323l-.53.53v.264h4.233V4.1l-.529-.53v-.223h-.29c-.066 0-.132-.006-.197-.015v.546l-2.159-.042V2.249c0-.656.4-1.19 1.059-1.19l.064.003c.119-.181.278-.334.463-.448a1.608 1.608 0 00-.13-.036v-.18A.396.396 0 002.117 0zm-.53 4.63a.53.53 0 001.058 0z M3.355.578a1.267 1.267 0 000 2.534h.634v-.254h-.634c-.55 0-1.013-.464-1.013-1.013 0-.55.463-1.014 1.013-1.014.55 0 1.014.464 1.014 1.014v.18c0 .1-.09.2-.19.2s-.19-.1-.19-.2v-.18a.634.634 0 10-.185.447.47.47 0 00.375.186c.25 0 .443-.203.443-.452v-.181c0-.7-.567-1.267-1.267-1.267zm0 1.647a.38.38 0 110-.76.38.38 0 010 .76z', + path: 'M2.117 0a.396.396 0 00-.397.397v.18C.963.757.53 1.434.53 2.25v1.323l-.53.53v.264h4.233V4.1l-.529-.53v-.223h-.29c-.066 0-.132-.006-.197-.015v.546l-2.159-.042V2.249c0-.656.4-1.19 1.059-1.19l.064.003c.119-.181.278-.334.463-.448a1.608 1.608 0 00-.13-.036v-.18A.396.396 0 002.117 0zm-.53 4.63a.53.53 0 001.058 0z M3.355.578a1.267 1.267 0 000 2.534h.634v-.254h-.634c-.55 0-1.013-.464-1.013-1.013 0-.55.463-1.014 1.013-1.014.55 0 1.014.464 1.014 1.014v.18c0 .1-.09.2-.19.2s-.19-.1-.19-.2v-.18a.634.634 0 10-.185.447.47.47 0 00.375.186c.25 0 .443-.203.443-.452v-.181c0-.7-.567-1.267-1.267-1.267zm0 1.647a.38.38 0 110-.76.38.38 0 010 .76z', viewBox: '0 0 4.622 5.159', ratio: 1, }, brand: { - path: - 'm 216.456,315.282 c 36.104,0 66.415,-29.551 65.565,-65.646 -0.59,-25.135 -14.478,-48.161 -36.54,-60.386 l -83.435,-46.234 v 69.229 c 0,5.18855 -4.20645,9.39455 -9.395,9.394 H 67.847 c -26.603,0 -48.093,22.297 -46.765,49.183 1.242,25.15 22.941,44.46 48.123,44.46 h 147.251 m -75.437,-121.993 0.016,-69.217 c 0.002,-5.186 4.19,-9.391 9.376,-9.392 l 84.808,-0.014 c 26.602,0 48.092,-22.297 46.764,-49.181 C 280.74,40.334 259.041,21.023 233.858,21.023 H 86.608 c -36.103,0 -66.415,29.551 -65.565,65.646 0.591,25.136 14.479,48.161 36.541,60.386 z m 114.65,-22.427 c 29.233,16.2 47.395,47.023 47.395,80.448 0,46.865 -38.129,84.995 -84.995,84.995 H 67.847 C 30.437,336.305 0,305.867 0,268.459 0,231.051 30.437,200.616 67.847,200.616 h 43.026 L 47.396,165.445 C 18.162,149.243 0,118.42 0,84.995 0,38.131 38.13,0 84.995,0 h 150.224 c 37.408,0 67.845,30.438 67.845,67.846 0,37.409 -30.437,67.843 -67.845,67.843 h -43.028 l 63.478,35.173', + path: 'm 216.456,315.282 c 36.104,0 66.415,-29.551 65.565,-65.646 -0.59,-25.135 -14.478,-48.161 -36.54,-60.386 l -83.435,-46.234 v 69.229 c 0,5.18855 -4.20645,9.39455 -9.395,9.394 H 67.847 c -26.603,0 -48.093,22.297 -46.765,49.183 1.242,25.15 22.941,44.46 48.123,44.46 h 147.251 m -75.437,-121.993 0.016,-69.217 c 0.002,-5.186 4.19,-9.391 9.376,-9.392 l 84.808,-0.014 c 26.602,0 48.092,-22.297 46.764,-49.181 C 280.74,40.334 259.041,21.023 233.858,21.023 H 86.608 c -36.103,0 -66.415,29.551 -65.565,65.646 0.591,25.136 14.479,48.161 36.541,60.386 z m 114.65,-22.427 c 29.233,16.2 47.395,47.023 47.395,80.448 0,46.865 -38.129,84.995 -84.995,84.995 H 67.847 C 30.437,336.305 0,305.867 0,268.459 0,231.051 30.437,200.616 67.847,200.616 h 43.026 L 47.396,165.445 C 18.162,149.243 0,118.42 0,84.995 0,38.131 38.13,0 84.995,0 h 150.224 c 37.408,0 67.845,30.438 67.845,67.846 0,37.409 -30.437,67.843 -67.845,67.843 h -43.028 l 63.478,35.173', viewBox: '0 0 404.085 448.407', ratio: 1, }, callIncoming: { - path: - 'M14.414 7l3.293-3.293a1 1 0 00-1.414-1.414L13 5.586V4a1 1 0 10-2 0v4.003a.996.996 0 00.617.921A.997.997 0 0012 9h4a1 1 0 100-2h-1.586zM2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3z', + path: 'M14.414 7l3.293-3.293a1 1 0 00-1.414-1.414L13 5.586V4a1 1 0 10-2 0v4.003a.996.996 0 00.617.921A.997.997 0 0012 9h4a1 1 0 100-2h-1.586zM2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3z', viewBox: '0 0 20 20', ratio: 1, }, callOutgoing: { - path: - 'M17.924 2.617a.997.997 0 00-.215-.322l-.004-.004A.997.997 0 0017 2h-4a1 1 0 100 2h1.586l-3.293 3.293a1 1 0 001.414 1.414L16 5.414V7a1 1 0 102 0V3a.997.997 0 00-.076-.383zM2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3z', + path: 'M17.924 2.617a.997.997 0 00-.215-.322l-.004-.004A.997.997 0 0017 2h-4a1 1 0 100 2h1.586l-3.293 3.293a1 1 0 001.414 1.414L16 5.414V7a1 1 0 102 0V3a.997.997 0 00-.076-.383zM2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3z', viewBox: '0 0 20 20', ratio: 1, }, callMissed: { - path: - 'M2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3zM16.707 3.293a1 1 0 010 1.414L15.414 6l1.293 1.293a1 1 0 01-1.414 1.414L14 7.414l-1.293 1.293a1 1 0 11-1.414-1.414L12.586 6l-1.293-1.293a1 1 0 011.414-1.414L14 4.586l1.293-1.293a1 1 0 011.414 0z', + path: 'M2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3zM16.707 3.293a1 1 0 010 1.414L15.414 6l1.293 1.293a1 1 0 01-1.414 1.414L14 7.414l-1.293 1.293a1 1 0 11-1.414-1.414L12.586 6l-1.293-1.293a1 1 0 011.414-1.414L14 4.586l1.293-1.293a1 1 0 011.414 0z', viewBox: '0 0 20 20', ratio: 1, }, @@ -132,20 +125,17 @@ export const icons = { ratio: 1, }, chatBubble: { - path: - 'M6.29289322,16.2928932 C6.4804296,16.1053568 6.73478351,16 7,16 L19,16 C19.5522847,16 20,15.5522847 20,15 L20,5 C20,4.44771525 19.5522847,4 19,4 L5,4 C4.44771525,4 4,4.44771525 4,5 L4,18.5857864 L6.29289322,16.2928932 Z M7.41421356,18 L3.70710678,21.7071068 C3.07714192,22.3370716 2,21.8909049 2,21 L2,5 C2,3.34314575 3.34314575,2 5,2 L19,2 C20.6568542,2 22,3.34314575 22,5 L22,15 C22,16.6568542 20.6568542,18 19,18 L7.41421356,18 Z', + path: 'M6.29289322,16.2928932 C6.4804296,16.1053568 6.73478351,16 7,16 L19,16 C19.5522847,16 20,15.5522847 20,15 L20,5 C20,4.44771525 19.5522847,4 19,4 L5,4 C4.44771525,4 4,4.44771525 4,5 L4,18.5857864 L6.29289322,16.2928932 Z M7.41421356,18 L3.70710678,21.7071068 C3.07714192,22.3370716 2,21.8909049 2,21 L2,5 C2,3.34314575 3.34314575,2 5,2 L19,2 C20.6568542,2 22,3.34314575 22,5 L22,15 C22,16.6568542 20.6568542,18 19,18 L7.41421356,18 Z', viewBox: '0.5 2 23 20', ratio: 1, }, check: { - path: - 'M0.77,2.61c-0.15-0.15-0.38-0.15-0.53,0c-0.15,0.15-0.15,0.38,0,0.53l1.87,1.87c0.15,0.15,0.38,0.15,0.53,0 l4.12-4.12c0.15-0.15,0.15-0.38,0-0.53c-0.15-0.15-0.38-0.15-0.53,0L2.38,4.22L0.77,2.61z', + path: 'M0.77,2.61c-0.15-0.15-0.38-0.15-0.53,0c-0.15,0.15-0.15,0.38,0,0.53l1.87,1.87c0.15,0.15,0.38,0.15,0.53,0 l4.12-4.12c0.15-0.15,0.15-0.38,0-0.53c-0.15-0.15-0.38-0.15-0.53,0L2.38,4.22L0.77,2.61z', viewBox: '0 0 7 6', ratio: 1, }, chevron: { - path: - 'M12,13.5857864 L6.70710678,8.29289322 C6.31658249,7.90236893 5.68341751,7.90236893 5.29289322,8.29289322 C4.90236893,8.68341751 4.90236893,9.31658249 5.29289322,9.70710678 L11.2928932,15.7071068 C11.6834175,16.0976311 12.3165825,16.0976311 12.7071068,15.7071068 L18.7071068,9.70710678 C19.0976311,9.31658249 19.0976311,8.68341751 18.7071068,8.29289322 C18.3165825,7.90236893 17.6834175,7.90236893 17.2928932,8.29289322 L12,13.5857864 Z', + path: 'M12,13.5857864 L6.70710678,8.29289322 C6.31658249,7.90236893 5.68341751,7.90236893 5.29289322,8.29289322 C4.90236893,8.68341751 4.90236893,9.31658249 5.29289322,9.70710678 L11.2928932,15.7071068 C11.6834175,16.0976311 12.3165825,16.0976311 12.7071068,15.7071068 L18.7071068,9.70710678 C19.0976311,9.31658249 19.0976311,8.68341751 18.7071068,8.29289322 C18.3165825,7.90236893 17.6834175,7.90236893 17.2928932,8.29289322 L12,13.5857864 Z', viewBox: '1.5 5.5 21 12', ratio: 1, }, @@ -159,224 +149,187 @@ export const icons = { ratio: 1, }, circleCheck: { - path: - 'M4.77,7.61c-0.15-0.15-0.38-0.15-0.53,0c-0.15,0.15-0.15,0.38,0,0.53l1.88,1.88c0.15,0.15,0.38,0.15,0.53,0 l4.13-4.12c0.15-0.15,0.15-0.38,0-0.53c-0.15-0.15-0.38-0.15-0.53,0L6.38,9.22L4.77,7.61z', + path: 'M4.77,7.61c-0.15-0.15-0.38-0.15-0.53,0c-0.15,0.15-0.15,0.38,0,0.53l1.88,1.88c0.15,0.15,0.38,0.15,0.53,0 l4.13-4.12c0.15-0.15,0.15-0.38,0-0.53c-0.15-0.15-0.38-0.15-0.53,0L6.38,9.22L4.77,7.61z', viewBox: '4 4 7 7', ratio: 1, }, delete: { - path: - 'M11.17 37.16h83.48a8.4 8.4 0 012 .16 5.93 5.93 0 012.88 1.56 5.43 5.43 0 011.64 3.34 7.65 7.65 0 01-.06 1.44L94 117.31V117.72a7.06 7.06 0 01-.2.9v.06a5.89 5.89 0 01-5.47 4.07H17.32a6.17 6.17 0 01-1.25-.19 6.17 6.17 0 01-1.16-.48 6.18 6.18 0 01-3.08-4.88l-7-73.49a7.69 7.69 0 01-.06-1.66 5.37 5.37 0 011.63-3.29 6 6 0 013-1.58 8.94 8.94 0 011.79-.13zM5.65 8.8h31.47V6a2.44 2.44 0 010-.27 6 6 0 011.76-4A6 6 0 0143.09 0h19.67a6 6 0 015.7 6v2.8h32.39a4.7 4.7 0 014.31 4.43v10.36a2.59 2.59 0 01-2.59 2.59H2.59A2.59 2.59 0 010 23.62V13.53a1.56 1.56 0 010-.31 4.72 4.72 0 013.88-4.34 10.4 10.4 0 011.77-.08zm42.1 52.7a4.77 4.77 0 019.49 0v37a4.77 4.77 0 01-9.49 0v-37zm23.73-.2a4.58 4.58 0 015-4.06 4.47 4.47 0 014.51 4.46l-2 37a4.57 4.57 0 01-5 4.06 4.47 4.47 0 01-4.51-4.46l2-37zM25 61.7a4.46 4.46 0 014.5-4.46 4.58 4.58 0 015 4.06l2 37a4.47 4.47 0 01-4.51 4.46 4.57 4.57 0 01-5-4.06l-2-37z', + path: 'M11.17 37.16h83.48a8.4 8.4 0 012 .16 5.93 5.93 0 012.88 1.56 5.43 5.43 0 011.64 3.34 7.65 7.65 0 01-.06 1.44L94 117.31V117.72a7.06 7.06 0 01-.2.9v.06a5.89 5.89 0 01-5.47 4.07H17.32a6.17 6.17 0 01-1.25-.19 6.17 6.17 0 01-1.16-.48 6.18 6.18 0 01-3.08-4.88l-7-73.49a7.69 7.69 0 01-.06-1.66 5.37 5.37 0 011.63-3.29 6 6 0 013-1.58 8.94 8.94 0 011.79-.13zM5.65 8.8h31.47V6a2.44 2.44 0 010-.27 6 6 0 011.76-4A6 6 0 0143.09 0h19.67a6 6 0 015.7 6v2.8h32.39a4.7 4.7 0 014.31 4.43v10.36a2.59 2.59 0 01-2.59 2.59H2.59A2.59 2.59 0 010 23.62V13.53a1.56 1.56 0 010-.31 4.72 4.72 0 013.88-4.34 10.4 10.4 0 011.77-.08zm42.1 52.7a4.77 4.77 0 019.49 0v37a4.77 4.77 0 01-9.49 0v-37zm23.73-.2a4.58 4.58 0 015-4.06 4.47 4.47 0 014.51 4.46l-2 37a4.57 4.57 0 01-5 4.06 4.47 4.47 0 01-4.51-4.46l2-37zM25 61.7a4.46 4.46 0 014.5-4.46 4.58 4.58 0 015 4.06l2 37a4.47 4.47 0 01-4.51 4.46 4.57 4.57 0 01-5-4.06l-2-37z', viewBox: '0 0 105.16 122.88', ratio: 1, }, doubleCheckCircleFilled: { - path: - 'M7.91731278,0.313257194 C6.15053376,1.58392424 5,3.65760134 5,6 C5,6.343797 5.0247846,6.68180525 5.07266453,7.01233547 L5,7.085 L3.205,5.295 L2.5,6 L5,8.5 L5.33970233,8.16029767 C5.80439817,9.59399486 6.71914823,10.8250231 7.91731278,11.6867428 C7.31518343,11.8898758 6.67037399,12 6,12 C2.688,12 0,9.312 0,6 C0,2.688 2.688,0 6,0 C6.67037399,0 7.31518343,0.110124239 7.91731278,0.313257194 Z M12,0 C15.312,0 18,2.688 18,6 C18,9.312 15.312,12 12,12 C8.688,12 6,9.312 6,6 C6,2.688 8.688,0 12,0 Z M11,8.5 L15.5,4 L14.795,3.29 L11,7.085 L9.205,5.295 L8.5,6 L11,8.5 Z', + path: 'M7.91731278,0.313257194 C6.15053376,1.58392424 5,3.65760134 5,6 C5,6.343797 5.0247846,6.68180525 5.07266453,7.01233547 L5,7.085 L3.205,5.295 L2.5,6 L5,8.5 L5.33970233,8.16029767 C5.80439817,9.59399486 6.71914823,10.8250231 7.91731278,11.6867428 C7.31518343,11.8898758 6.67037399,12 6,12 C2.688,12 0,9.312 0,6 C0,2.688 2.688,0 6,0 C6.67037399,0 7.31518343,0.110124239 7.91731278,0.313257194 Z M12,0 C15.312,0 18,2.688 18,6 C18,9.312 15.312,12 12,12 C8.688,12 6,9.312 6,6 C6,2.688 8.688,0 12,0 Z M11,8.5 L15.5,4 L14.795,3.29 L11,7.085 L9.205,5.295 L8.5,6 L11,8.5 Z', viewBox: '3 0 13 13', ratio: 1.6, }, circleElipses: { - path: - 'M4.76,7.47c0-0.32,0.26-0.57,0.57-0.57c0.32,0,0.57,0.25,0.57,0.57c0,0.31-0.25,0.57-0.57,0.57 C5.02,8.04,4.76,7.78,4.76,7.47z M7.04,7.47c0-0.32,0.26-0.57,0.57-0.57c0.32,0,0.57,0.25,0.57,0.57c0,0.31-0.25,0.57-0.57,0.57 C7.3,8.04,7.04,7.78,7.04,7.47z M9.32,7.47c0-0.32,0.26-0.57,0.57-0.57c0.32,0,0.57,0.25,0.57,0.57c0,0.31-0.25,0.57-0.57,0.57 C9.58,8.04,9.32,7.78,9.32,7.47z', + path: 'M4.76,7.47c0-0.32,0.26-0.57,0.57-0.57c0.32,0,0.57,0.25,0.57,0.57c0,0.31-0.25,0.57-0.57,0.57 C5.02,8.04,4.76,7.78,4.76,7.47z M7.04,7.47c0-0.32,0.26-0.57,0.57-0.57c0.32,0,0.57,0.25,0.57,0.57c0,0.31-0.25,0.57-0.57,0.57 C7.3,8.04,7.04,7.78,7.04,7.47z M9.32,7.47c0-0.32,0.26-0.57,0.57-0.57c0.32,0,0.57,0.25,0.57,0.57c0,0.31-0.25,0.57-0.57,0.57 C9.58,8.04,9.32,7.78,9.32,7.47z', viewBox: '0 0 15 15', ratio: 1, }, circlePlus: { - path: - 'M13.51,8.82c-0.35,0-0.63,0.28-0.62,0.62v3.43H9.46c-0.35,0-0.63,0.28-0.62,0.62 c0,0.35,0.28,0.63,0.62,0.62h3.43v3.43c-0.02,0.35,0.27,0.63,0.61,0.63c0.17,0,0.33-0.07,0.44-0.18 c0.11-0.11,0.18-0.27,0.18-0.44v-3.43h3.43c0.17,0,0.33-0.07,0.44-0.18c0.11-0.11,0.18-0.27,0.18-0.44 c0-0.35-0.28-0.63-0.62-0.62h-3.43V9.44C14.13,9.09,13.85,8.81,13.51,8.82z M21.46,5.54c4.39,4.39,4.39,11.53,0,15.92 c-4.39,4.39-11.53,4.39-15.92,0s-4.39-11.53,0-15.92C9.93,1.15,17.07,1.15,21.46,5.54z M22.34,22.34 c4.88-4.88,4.88-12.81,0-17.69s-12.81-4.88-17.69,0s-4.88,12.81,0,17.69S17.47,27.22,22.34,22.34z M13.51,8.82c-0.35,0-0.63,0.28-0.62,0.62v3.43H9.46c-0.35,0-0.63,0.28-0.62,0.62 c0,0.35,0.28,0.63,0.62,0.62h3.43v3.43c-0.02,0.35,0.27,0.63,0.61,0.63c0.17,0,0.33-0.07,0.44-0.18 c0.11-0.11,0.18-0.27,0.18-0.44v-3.43h3.43c0.17,0,0.33-0.07,0.44-0.18c0.11-0.11,0.18-0.27,0.18-0.44 c0-0.35-0.28-0.63-0.62-0.62h-3.43V9.44C14.13,9.09,13.85,8.81,13.51,8.82z M21.46,5.54c4.39,4.39,4.39,11.53,0,15.92 c-4.39,4.39-11.53,4.39-15.92,0c-4.39-4.39-4.39-11.53,0-15.92C9.93,1.15,17.07,1.15,21.46,5.54z M22.34,22.34 c4.88-4.88,4.88-12.81,0-17.69s-12.81-4.88-17.69,0s-4.88,12.81,0,17.69S17.47,27.22,22.34,22.34z', + path: 'M13.51,8.82c-0.35,0-0.63,0.28-0.62,0.62v3.43H9.46c-0.35,0-0.63,0.28-0.62,0.62 c0,0.35,0.28,0.63,0.62,0.62h3.43v3.43c-0.02,0.35,0.27,0.63,0.61,0.63c0.17,0,0.33-0.07,0.44-0.18 c0.11-0.11,0.18-0.27,0.18-0.44v-3.43h3.43c0.17,0,0.33-0.07,0.44-0.18c0.11-0.11,0.18-0.27,0.18-0.44 c0-0.35-0.28-0.63-0.62-0.62h-3.43V9.44C14.13,9.09,13.85,8.81,13.51,8.82z M21.46,5.54c4.39,4.39,4.39,11.53,0,15.92 c-4.39,4.39-11.53,4.39-15.92,0s-4.39-11.53,0-15.92C9.93,1.15,17.07,1.15,21.46,5.54z M22.34,22.34 c4.88-4.88,4.88-12.81,0-17.69s-12.81-4.88-17.69,0s-4.88,12.81,0,17.69S17.47,27.22,22.34,22.34z M13.51,8.82c-0.35,0-0.63,0.28-0.62,0.62v3.43H9.46c-0.35,0-0.63,0.28-0.62,0.62 c0,0.35,0.28,0.63,0.62,0.62h3.43v3.43c-0.02,0.35,0.27,0.63,0.61,0.63c0.17,0,0.33-0.07,0.44-0.18 c0.11-0.11,0.18-0.27,0.18-0.44v-3.43h3.43c0.17,0,0.33-0.07,0.44-0.18c0.11-0.11,0.18-0.27,0.18-0.44 c0-0.35-0.28-0.63-0.62-0.62h-3.43V9.44C14.13,9.09,13.85,8.81,13.51,8.82z M21.46,5.54c4.39,4.39,4.39,11.53,0,15.92 c-4.39,4.39-11.53,4.39-15.92,0c-4.39-4.39-4.39-11.53,0-15.92C9.93,1.15,17.07,1.15,21.46,5.54z M22.34,22.34 c4.88-4.88,4.88-12.81,0-17.69s-12.81-4.88-17.69,0s-4.88,12.81,0,17.69S17.47,27.22,22.34,22.34z', viewBox: '0 0 27 27', ratio: 1, }, contacts: { - path: - 'M13,14 C15.6887547,14 17.8818181,16.1223067 17.9953805,18.7831104 L18,19 L18,21 C18,21.5522847 17.5522847,22 17,22 C16.4871642,22 16.0644928,21.6139598 16.0067277,21.1166211 L16,21 L16,19 C16,17.4023191 14.75108,16.0963391 13.1762728,16.0050927 L13,16 L5,16 C3.40231912,16 2.09633912,17.24892 2.00509269,18.8237272 L2,19 L2,21 C2,21.5522847 1.55228475,22 1,22 C0.487164161,22 0.0644928393,21.6139598 0.00672773133,21.1166211 L0,21 L0,19 C0,16.3112453 2.12230671,14.1181819 4.78311038,14.0046195 L5,14 L13,14 Z M20.2499997,14.1617541 C22.3827066,14.712416 23.8947586,16.5896121 23.994728,18.773074 L24,19 L24,21 C24,21.5522847 23.5522847,22 23,22 C22.4871642,22 22.0644928,21.6139598 22.0067277,21.1166211 L22,21 L22.0000003,19.0007459 C21.9989805,17.6335842 21.0737494,16.440036 19.7500003,16.0982459 C19.2152528,15.9601749 18.8936831,15.4147477 19.0317541,14.8800003 C19.1698251,14.3452528 19.7152523,14.0236831 20.2499997,14.1617541 Z M9,2 C11.7614237,2 14,4.23857625 14,7 C14,9.76142375 11.7614237,12 9,12 C6.23857625,12 4,9.76142375 4,7 C4,4.23857625 6.23857625,2 9,2 Z M16.2480392,2.16125 C18.4604327,2.72771223 20.0078433,4.72123893 20.0078433,7.005 C20.0078433,9.28876107 18.4604327,11.2822878 16.2480392,11.84875 C15.7130133,11.9857383 15.1682383,11.663065 15.03125,11.1280392 C14.8942617,10.5930133 15.216935,10.0482383 15.7519608,9.91125 C17.0793969,9.57137266 18.0078433,8.37525664 18.0078433,7.005 C18.0078433,5.63474336 17.0793969,4.43862734 15.7519608,4.09875 C15.216935,3.96176174 14.8942617,3.41698667 15.03125,2.88196081 C15.1682383,2.34693496 15.7130133,2.02426174 16.2480392,2.16125 Z M9,4 C7.34314575,4 6,5.34314575 6,7 C6,8.65685425 7.34314575,10 9,10 C10.6568542,10 12,8.65685425 12,7 C12,5.34314575 10.6568542,4 9,4', + path: 'M13,14 C15.6887547,14 17.8818181,16.1223067 17.9953805,18.7831104 L18,19 L18,21 C18,21.5522847 17.5522847,22 17,22 C16.4871642,22 16.0644928,21.6139598 16.0067277,21.1166211 L16,21 L16,19 C16,17.4023191 14.75108,16.0963391 13.1762728,16.0050927 L13,16 L5,16 C3.40231912,16 2.09633912,17.24892 2.00509269,18.8237272 L2,19 L2,21 C2,21.5522847 1.55228475,22 1,22 C0.487164161,22 0.0644928393,21.6139598 0.00672773133,21.1166211 L0,21 L0,19 C0,16.3112453 2.12230671,14.1181819 4.78311038,14.0046195 L5,14 L13,14 Z M20.2499997,14.1617541 C22.3827066,14.712416 23.8947586,16.5896121 23.994728,18.773074 L24,19 L24,21 C24,21.5522847 23.5522847,22 23,22 C22.4871642,22 22.0644928,21.6139598 22.0067277,21.1166211 L22,21 L22.0000003,19.0007459 C21.9989805,17.6335842 21.0737494,16.440036 19.7500003,16.0982459 C19.2152528,15.9601749 18.8936831,15.4147477 19.0317541,14.8800003 C19.1698251,14.3452528 19.7152523,14.0236831 20.2499997,14.1617541 Z M9,2 C11.7614237,2 14,4.23857625 14,7 C14,9.76142375 11.7614237,12 9,12 C6.23857625,12 4,9.76142375 4,7 C4,4.23857625 6.23857625,2 9,2 Z M16.2480392,2.16125 C18.4604327,2.72771223 20.0078433,4.72123893 20.0078433,7.005 C20.0078433,9.28876107 18.4604327,11.2822878 16.2480392,11.84875 C15.7130133,11.9857383 15.1682383,11.663065 15.03125,11.1280392 C14.8942617,10.5930133 15.216935,10.0482383 15.7519608,9.91125 C17.0793969,9.57137266 18.0078433,8.37525664 18.0078433,7.005 C18.0078433,5.63474336 17.0793969,4.43862734 15.7519608,4.09875 C15.216935,3.96176174 14.8942617,3.41698667 15.03125,2.88196081 C15.1682383,2.34693496 15.7130133,2.02426174 16.2480392,2.16125 Z M9,4 C7.34314575,4 6,5.34314575 6,7 C6,8.65685425 7.34314575,10 9,10 C10.6568542,10 12,8.65685425 12,7 C12,5.34314575 10.6568542,4 9,4', viewBox: '0 2.5 24 20', ratio: 1, }, copy: { - path: - 'M14.2242 15.2325C14.3378 15.124 14.428 14.9946 14.4895 14.8519C14.551 14.7092 14.5826 14.5561 14.5823 14.4014V2.0795C14.5823 1.92477 14.5508 1.77155 14.4898 1.6286C14.4287 1.48565 14.3392 1.35575 14.2264 1.24634C14.1136 1.13693 13.9796 1.05014 13.8322 0.990929C13.6848 0.931716 13.5267 0.901238 13.3672 0.901238H5.27296C4.96712 0.900776 4.67219 1.01148 4.44638 1.2115H3.3418C3.51437 0.855597 3.78729 0.554341 4.12904 0.342562C4.47079 0.130783 4.86739 0.0171364 5.27296 0.0147705H13.3672C13.9319 0.0147705 14.4735 0.232303 14.8728 0.619516C15.2721 1.00673 15.4964 1.5319 15.4964 2.0795V14.4162C15.4954 14.8164 15.3747 15.2078 15.1488 15.5428C14.923 15.8778 14.6018 16.1421 14.2242 16.3037V15.2325ZM2.62547 18.9963C2.06142 18.9953 1.52081 18.7774 1.12232 18.3903C0.723828 18.0031 0.499999 17.4785 0.5 16.9316V4.59116C0.499999 4.0442 0.723828 3.51959 1.12232 3.13248C1.52081 2.74537 2.06142 2.52741 2.62547 2.52643H10.7235C11.2879 2.5274 11.8289 2.74525 12.228 3.13226C12.6271 3.51926 12.8517 4.04386 12.8527 4.59116V16.9316C12.8517 17.4789 12.6271 18.0035 12.228 18.3905C11.8289 18.7775 11.2879 18.9953 10.7235 18.9963H2.62547ZM2.62547 3.4129C2.30387 3.41387 1.99577 3.53845 1.76872 3.75931C1.54167 3.98017 1.41418 4.27931 1.41418 4.59116V16.9316C1.41418 17.2434 1.54167 17.5426 1.76872 17.7634C1.99577 17.9843 2.30387 18.1088 2.62547 18.1098H10.7235C11.0458 18.1098 11.3548 17.9857 11.5827 17.7647C11.8105 17.5438 11.9386 17.2441 11.9386 16.9316V4.59116C11.9386 4.27867 11.8105 3.97898 11.5827 3.75801C11.3548 3.53704 11.0458 3.4129 10.7235 3.4129H2.62547Z', + path: 'M14.2242 15.2325C14.3378 15.124 14.428 14.9946 14.4895 14.8519C14.551 14.7092 14.5826 14.5561 14.5823 14.4014V2.0795C14.5823 1.92477 14.5508 1.77155 14.4898 1.6286C14.4287 1.48565 14.3392 1.35575 14.2264 1.24634C14.1136 1.13693 13.9796 1.05014 13.8322 0.990929C13.6848 0.931716 13.5267 0.901238 13.3672 0.901238H5.27296C4.96712 0.900776 4.67219 1.01148 4.44638 1.2115H3.3418C3.51437 0.855597 3.78729 0.554341 4.12904 0.342562C4.47079 0.130783 4.86739 0.0171364 5.27296 0.0147705H13.3672C13.9319 0.0147705 14.4735 0.232303 14.8728 0.619516C15.2721 1.00673 15.4964 1.5319 15.4964 2.0795V14.4162C15.4954 14.8164 15.3747 15.2078 15.1488 15.5428C14.923 15.8778 14.6018 16.1421 14.2242 16.3037V15.2325ZM2.62547 18.9963C2.06142 18.9953 1.52081 18.7774 1.12232 18.3903C0.723828 18.0031 0.499999 17.4785 0.5 16.9316V4.59116C0.499999 4.0442 0.723828 3.51959 1.12232 3.13248C1.52081 2.74537 2.06142 2.52741 2.62547 2.52643H10.7235C11.2879 2.5274 11.8289 2.74525 12.228 3.13226C12.6271 3.51926 12.8517 4.04386 12.8527 4.59116V16.9316C12.8517 17.4789 12.6271 18.0035 12.228 18.3905C11.8289 18.7775 11.2879 18.9953 10.7235 18.9963H2.62547ZM2.62547 3.4129C2.30387 3.41387 1.99577 3.53845 1.76872 3.75931C1.54167 3.98017 1.41418 4.27931 1.41418 4.59116V16.9316C1.41418 17.2434 1.54167 17.5426 1.76872 17.7634C1.99577 17.9843 2.30387 18.1088 2.62547 18.1098H10.7235C11.0458 18.1098 11.3548 17.9857 11.5827 17.7647C11.8105 17.5438 11.9386 17.2441 11.9386 16.9316V4.59116C11.9386 4.27867 11.8105 3.97898 11.5827 3.75801C11.3548 3.53704 11.0458 3.4129 10.7235 3.4129H2.62547Z', viewBox: '0 0 16 19', ratio: 1.19, }, crown: { - path: - 'M462.3,130.5c-26.7,0-48.5,21.8-48.5,48.5c0,12.9,5,24.5,13.2,33.2c-14.6,16.3-35.7,26.6-59.3,26.6c-1.4,0-2.7,0-4.1-0.1c-36.3-1.8-66.2-28.1-73.7-62.7c8.9-8.8,14.5-21,14.5-34.5c0-0.8,0-1.7-0.1-2.5c-0.2-3.2-0.6-6.4-1.4-9.4 c0-0.1,0-0.2-0.1-0.2c-5.3-20.7-24-36-46.2-36.4c-0.3,0-0.5,0-0.8,0v0c0,0,0,0,0,0c-26.7,0-48.5,21.8-48.5,48.5c0,13.5,5.5,25.7,14.5,34.5c-7.7,35.8-39.6,62.8-77.7,62.8c-23.5,0-44.7-10.3-59.3-26.6c8.2-8.7,13.2-20.4,13.2-33.2c0-26.7-21.8-48.5-48.5-48.5S1.2,152.2,1.2,179c0,23.2,16.3,42.6,38.1,47.4c5.2,42.6,16.1,96.3,39.2,132.9h0V404c0,8.3,6.7,15,15,15H256h162.5c8.3,0,15-6.7,15-15v-44.8h0c5.6-8.8,10.5-18.7,14.7-29.1c13.3-32.8,20.6-71.5,24.5-103.7c21.8-4.8,38.1-24.2,38.1-47.4C510.8,152.2,489.1,130.5,462.3,130.5z', + path: 'M462.3,130.5c-26.7,0-48.5,21.8-48.5,48.5c0,12.9,5,24.5,13.2,33.2c-14.6,16.3-35.7,26.6-59.3,26.6c-1.4,0-2.7,0-4.1-0.1c-36.3-1.8-66.2-28.1-73.7-62.7c8.9-8.8,14.5-21,14.5-34.5c0-0.8,0-1.7-0.1-2.5c-0.2-3.2-0.6-6.4-1.4-9.4 c0-0.1,0-0.2-0.1-0.2c-5.3-20.7-24-36-46.2-36.4c-0.3,0-0.5,0-0.8,0v0c0,0,0,0,0,0c-26.7,0-48.5,21.8-48.5,48.5c0,13.5,5.5,25.7,14.5,34.5c-7.7,35.8-39.6,62.8-77.7,62.8c-23.5,0-44.7-10.3-59.3-26.6c8.2-8.7,13.2-20.4,13.2-33.2c0-26.7-21.8-48.5-48.5-48.5S1.2,152.2,1.2,179c0,23.2,16.3,42.6,38.1,47.4c5.2,42.6,16.1,96.3,39.2,132.9h0V404c0,8.3,6.7,15,15,15H256h162.5c8.3,0,15-6.7,15-15v-44.8h0c5.6-8.8,10.5-18.7,14.7-29.1c13.3-32.8,20.6-71.5,24.5-103.7c21.8-4.8,38.1-24.2,38.1-47.4C510.8,152.2,489.1,130.5,462.3,130.5z', viewBox: '0 0 512 512', ratio: 1, }, group: { - path: - 'M19.0674 11.1167C22.141 11.1167 24.647 8.6258 24.647 5.55835C24.647 2.4909 22.1466 0 19.0674 0C15.9882 0 13.4878 2.4909 13.4878 5.55835C13.4878 8.6258 15.9882 11.1167 19.0674 11.1167ZM19.0674 2.24461C20.9048 2.24461 22.3994 3.73355 22.3994 5.56395C22.3994 7.39434 20.9048 8.88329 19.0674 8.88329C17.23 8.88329 15.7354 7.39434 15.7354 5.56395C15.7354 3.73355 17.23 2.24461 19.0674 2.24461ZM19.0674 12.9415C14.7015 12.9415 11.0098 15.2757 9.82422 18.4719C9.5489 19.2108 10.0771 20 10.8693 20C11.3582 20 11.7684 19.681 11.9369 19.222C12.7966 16.8934 15.6623 15.1805 19.0674 15.1805C22.4724 15.1805 25.3381 16.899 26.1978 19.222C26.3664 19.6754 26.7766 20 27.2654 20C28.0577 20 28.5858 19.2108 28.3105 18.4719C27.1249 15.2757 23.4333 12.9415 19.0674 12.9415ZM30.5581 10.8928C33.0136 10.8928 35.0139 8.90009 35.0139 6.44836C35.0139 3.99664 33.0136 2.00952 30.5581 2.00952C28.1026 2.00952 26.1023 4.00224 26.1023 6.44836C26.1023 8.89449 28.1026 10.8928 30.5581 10.8928ZM30.5581 3.80073C32.0247 3.80073 33.2215 4.9874 33.2215 6.45396C33.2215 7.92051 32.0303 9.1072 30.5581 9.1072C29.086 9.1072 27.8947 7.91492 27.8947 6.45396C27.8947 4.993 29.086 3.80073 30.5581 3.80073ZM7.45314 10.8928C9.90861 10.8928 11.9089 8.90009 11.9089 6.44836C11.9089 3.99664 9.90861 2.00952 7.45314 2.00952C4.99766 2.00952 2.99731 4.00224 2.99731 6.44836C2.99731 8.89449 4.99766 10.8928 7.45314 10.8928ZM7.45314 3.80073C8.91968 3.80073 10.1165 4.9874 10.1165 6.45396C10.1165 7.92051 8.9253 9.1072 7.45314 9.1072C5.98097 9.1072 4.78976 7.91492 4.78976 6.45396C4.78976 4.993 5.98097 3.80073 7.45314 3.80073ZM37.9415 16.7702C36.9919 14.2177 34.042 12.3481 30.5526 12.3481C28.9681 12.3481 27.4959 12.7344 26.271 13.3949C26.8217 13.7699 27.333 14.1897 27.7881 14.6487C28.6141 14.3241 29.5525 14.1338 30.5526 14.1338C33.2722 14.1338 35.5647 15.5052 36.2502 17.3635C36.3851 17.7274 36.711 17.9849 37.1043 17.9849C37.7392 17.9849 38.1607 17.3523 37.9415 16.7646V16.7702ZM11.8021 13.4397C10.5604 12.7568 9.06572 12.3538 7.44747 12.3538C3.95811 12.3538 1.00817 14.2233 0.0585709 16.7758C-0.160568 17.3691 0.260847 17.9961 0.895787 17.9961C1.28349 17.9961 1.61501 17.7386 1.74987 17.3748C2.43538 15.5164 4.7279 14.145 7.44747 14.145C8.48697 14.145 9.45904 14.3465 10.3075 14.6935C10.757 14.2345 11.2571 13.8203 11.8021 13.4397Z', + path: 'M19.0674 11.1167C22.141 11.1167 24.647 8.6258 24.647 5.55835C24.647 2.4909 22.1466 0 19.0674 0C15.9882 0 13.4878 2.4909 13.4878 5.55835C13.4878 8.6258 15.9882 11.1167 19.0674 11.1167ZM19.0674 2.24461C20.9048 2.24461 22.3994 3.73355 22.3994 5.56395C22.3994 7.39434 20.9048 8.88329 19.0674 8.88329C17.23 8.88329 15.7354 7.39434 15.7354 5.56395C15.7354 3.73355 17.23 2.24461 19.0674 2.24461ZM19.0674 12.9415C14.7015 12.9415 11.0098 15.2757 9.82422 18.4719C9.5489 19.2108 10.0771 20 10.8693 20C11.3582 20 11.7684 19.681 11.9369 19.222C12.7966 16.8934 15.6623 15.1805 19.0674 15.1805C22.4724 15.1805 25.3381 16.899 26.1978 19.222C26.3664 19.6754 26.7766 20 27.2654 20C28.0577 20 28.5858 19.2108 28.3105 18.4719C27.1249 15.2757 23.4333 12.9415 19.0674 12.9415ZM30.5581 10.8928C33.0136 10.8928 35.0139 8.90009 35.0139 6.44836C35.0139 3.99664 33.0136 2.00952 30.5581 2.00952C28.1026 2.00952 26.1023 4.00224 26.1023 6.44836C26.1023 8.89449 28.1026 10.8928 30.5581 10.8928ZM30.5581 3.80073C32.0247 3.80073 33.2215 4.9874 33.2215 6.45396C33.2215 7.92051 32.0303 9.1072 30.5581 9.1072C29.086 9.1072 27.8947 7.91492 27.8947 6.45396C27.8947 4.993 29.086 3.80073 30.5581 3.80073ZM7.45314 10.8928C9.90861 10.8928 11.9089 8.90009 11.9089 6.44836C11.9089 3.99664 9.90861 2.00952 7.45314 2.00952C4.99766 2.00952 2.99731 4.00224 2.99731 6.44836C2.99731 8.89449 4.99766 10.8928 7.45314 10.8928ZM7.45314 3.80073C8.91968 3.80073 10.1165 4.9874 10.1165 6.45396C10.1165 7.92051 8.9253 9.1072 7.45314 9.1072C5.98097 9.1072 4.78976 7.91492 4.78976 6.45396C4.78976 4.993 5.98097 3.80073 7.45314 3.80073ZM37.9415 16.7702C36.9919 14.2177 34.042 12.3481 30.5526 12.3481C28.9681 12.3481 27.4959 12.7344 26.271 13.3949C26.8217 13.7699 27.333 14.1897 27.7881 14.6487C28.6141 14.3241 29.5525 14.1338 30.5526 14.1338C33.2722 14.1338 35.5647 15.5052 36.2502 17.3635C36.3851 17.7274 36.711 17.9849 37.1043 17.9849C37.7392 17.9849 38.1607 17.3523 37.9415 16.7646V16.7702ZM11.8021 13.4397C10.5604 12.7568 9.06572 12.3538 7.44747 12.3538C3.95811 12.3538 1.00817 14.2233 0.0585709 16.7758C-0.160568 17.3691 0.260847 17.9961 0.895787 17.9961C1.28349 17.9961 1.61501 17.7386 1.74987 17.3748C2.43538 15.5164 4.7279 14.145 7.44747 14.145C8.48697 14.145 9.45904 14.3465 10.3075 14.6935C10.757 14.2345 11.2571 13.8203 11.8021 13.4397Z', viewBox: '0 0 38 20', ratio: 1.5, }, ellipses: { - path: - 'M30,16c4.411,0,8-3.589,8-8s-3.589-8-8-8s-8,3.589-8,8S25.589,16,30,16z M30,22c-4.411,0-8,3.589-8,8s3.589,8,8,8s8-3.589,8-8S34.411,22,30,22z M30,44c-4.411,0-8,3.589-8,8s3.589,8,8,8s8-3.589,8-8S34.411,44,30,44z', + path: 'M30,16c4.411,0,8-3.589,8-8s-3.589-8-8-8s-8,3.589-8,8S25.589,16,30,16z M30,22c-4.411,0-8,3.589-8,8s3.589,8,8,8s8-3.589,8-8S34.411,22,30,22z M30,44c-4.411,0-8,3.589-8,8s3.589,8,8,8s8-3.589,8-8S34.411,44,30,44z', viewBox: '-5 -5 65 65', ratio: 1, }, emoji: { - path: - 'M658.5,23 L658.5,23 C664.29899,23 669,18.2989899 669,12.5 C669,6.70101013 664.29899,2 658.5,2 C652.70101,2 648,6.70101013 648,12.5 C648,18.2989899 652.70101,23 658.5,23 L658.5,23 Z M658.5,0 C665.403559,0 671,5.59644063 671,12.5 C671,19.3005212 665.569371,24.8326509 658.808227,24.9962742 L658.5,25 C651.596441,25 646,19.4035594 646,12.5 C646,5.59644063 651.596441,0 658.5,0 Z M660.798501,17.7873294 C660.742971,17.8419887 660.574401,17.9669753 660.297777,18.1043071 C659.802509,18.3501864 659.201612,18.5 658.48738,18.5 C657.77446,18.5 657.180037,18.3508621 656.694112,18.1065603 C656.532157,18.0251362 656.396978,17.9401014 656.288844,17.8583962 C656.235083,17.8177752 656.208774,17.7945605 656.210408,17.7962096 C655.821715,17.4038623 655.188557,17.4008996 654.79621,17.7895923 C654.403862,18.1782849 654.4009,18.811443 654.789592,19.2037904 C654.985716,19.4017586 655.319663,19.6540855 655.795746,19.8934397 C656.552967,20.2741379 657.453192,20.5 658.48738,20.5 C659.520256,20.5 660.423471,20.2748136 661.187124,19.8956929 C661.665852,19.6580247 662.003047,19.4080113 662.201499,19.2126706 C662.595096,18.8252434 662.600098,18.1920982 662.212671,17.7985011 C661.825243,17.404904 661.192098,17.3999023 660.798501,17.7873294 Z M653,12 C652.171573,12 651.5,12.6715729 651.5,13.5 C651.5,14.3284271 652.171573,15 653,15 C653.828427,15 654.5,14.3284271 654.5,13.5 C654.5,12.6715729 653.828427,12 653,12 Z M664,12 C663.171573,12 662.5,12.6715729 662.5,13.5 C662.5,14.3284271 663.171573,15 664,15 C664.828427,15 665.5,14.3284271 665.5,13.5 C665.5,12.6715729 664.828427,12 664,12', + path: 'M658.5,23 L658.5,23 C664.29899,23 669,18.2989899 669,12.5 C669,6.70101013 664.29899,2 658.5,2 C652.70101,2 648,6.70101013 648,12.5 C648,18.2989899 652.70101,23 658.5,23 L658.5,23 Z M658.5,0 C665.403559,0 671,5.59644063 671,12.5 C671,19.3005212 665.569371,24.8326509 658.808227,24.9962742 L658.5,25 C651.596441,25 646,19.4035594 646,12.5 C646,5.59644063 651.596441,0 658.5,0 Z M660.798501,17.7873294 C660.742971,17.8419887 660.574401,17.9669753 660.297777,18.1043071 C659.802509,18.3501864 659.201612,18.5 658.48738,18.5 C657.77446,18.5 657.180037,18.3508621 656.694112,18.1065603 C656.532157,18.0251362 656.396978,17.9401014 656.288844,17.8583962 C656.235083,17.8177752 656.208774,17.7945605 656.210408,17.7962096 C655.821715,17.4038623 655.188557,17.4008996 654.79621,17.7895923 C654.403862,18.1782849 654.4009,18.811443 654.789592,19.2037904 C654.985716,19.4017586 655.319663,19.6540855 655.795746,19.8934397 C656.552967,20.2741379 657.453192,20.5 658.48738,20.5 C659.520256,20.5 660.423471,20.2748136 661.187124,19.8956929 C661.665852,19.6580247 662.003047,19.4080113 662.201499,19.2126706 C662.595096,18.8252434 662.600098,18.1920982 662.212671,17.7985011 C661.825243,17.404904 661.192098,17.3999023 660.798501,17.7873294 Z M653,12 C652.171573,12 651.5,12.6715729 651.5,13.5 C651.5,14.3284271 652.171573,15 653,15 C653.828427,15 654.5,14.3284271 654.5,13.5 C654.5,12.6715729 653.828427,12 653,12 Z M664,12 C663.171573,12 662.5,12.6715729 662.5,13.5 C662.5,14.3284271 663.171573,15 664,15 C664.828427,15 665.5,14.3284271 665.5,13.5 C665.5,12.6715729 664.828427,12 664,12', viewBox: '645 0 26 26', ratio: 1, }, error: { - path: - 'M164.666,0C73.871,0,0.004,73.871,0.004,164.672c0.009,90.792,73.876,164.656,164.662,164.656 c90.793,0,164.658-73.865,164.658-164.658C329.324,73.871,255.459,0,164.666,0z M164.666,30c31.734,0,60.933,11.042,83.975,29.477 L59.478,248.638c-18.431-23.04-29.471-52.237-29.474-83.967C30.004,90.413,90.413,30,164.666,30z M164.666,299.328 c-31.733,0-60.934-11.042-83.977-29.477L269.854,80.691c18.431,23.043,29.471,52.244,29.471,83.979 C299.324,238.921,238.917,299.328,164.666,299.328z', + path: 'M164.666,0C73.871,0,0.004,73.871,0.004,164.672c0.009,90.792,73.876,164.656,164.662,164.656 c90.793,0,164.658-73.865,164.658-164.658C329.324,73.871,255.459,0,164.666,0z M164.666,30c31.734,0,60.933,11.042,83.975,29.477 L59.478,248.638c-18.431-23.04-29.471-52.237-29.474-83.967C30.004,90.413,90.413,30,164.666,30z M164.666,299.328 c-31.733,0-60.934-11.042-83.977-29.477L269.854,80.691c18.431,23.043,29.471,52.244,29.471,83.979 C299.324,238.921,238.917,299.328,164.666,299.328z', viewBox: '0 0 329.328 329.328', ratio: 1, }, eye: { - path: - 'M12,3 C15.3798024,3 18.3386923,4.63249094 20.8545372,7.31605887 C21.7188737,8.23801779 22.4694995,9.22244509 23.1056644,10.2074746 C23.4900327,10.8026256 23.7538591,11.2716502 23.8944272,11.5527864 C24.0351909,11.8343139 24.0351909,12.1656861 23.8944272,12.4472136 C23.7538591,12.7283498 23.4900327,13.1973744 23.1056644,13.7925254 C22.4694995,14.7775549 21.7188737,15.7619822 20.8545372,16.6839411 C18.3386923,19.3675091 15.3798024,21 12,21 C8.62019756,21 5.66130774,19.3675091 3.1454628,16.6839411 C2.28112631,15.7619822 1.5305005,14.7775549 0.894335622,13.7925254 C0.50996726,13.1973744 0.246140906,12.7283498 0.105572809,12.4472136 C-0.0351909363,12.1656861 -0.0351909363,11.8343139 0.105572809,11.5527864 C0.246140906,11.2716502 0.50996726,10.8026256 0.894335622,10.2074746 C1.5305005,9.22244509 2.28112631,8.23801779 3.1454628,7.31605887 C5.66130774,4.63249094 8.62019756,3 12,3 Z M12,5 C9.25480244,5 6.77619226,6.36750906 4.6045372,8.68394113 C3.82824869,9.51198221 3.149187,10.4025549 2.57441438,11.2925254 C2.41127724,11.5451249 2.26658862,11.7823697 2.14071218,12 C2.26658862,12.2176303 2.41127724,12.4548751 2.57441438,12.7074746 C3.149187,13.5974451 3.82824869,14.4880178 4.6045372,15.3160589 C6.77619226,17.6324909 9.25480244,19 12,19 C14.7451976,19 17.2238077,17.6324909 19.3954628,15.3160589 C20.1717513,14.4880178 20.850813,13.5974451 21.4255856,12.7074746 C21.5887228,12.4548751 21.7334114,12.2176303 21.8592878,12 C21.7334114,11.7823697 21.5887228,11.5451249 21.4255856,11.2925254 C20.850813,10.4025549 20.1717513,9.51198221 19.3954628,8.68394113 C17.2238077,6.36750906 14.7451976,5 12,5 Z M12,8 C14.209139,8 16,9.790861 16,12 C16,14.209139 14.209139,16 12,16 C9.790861,16 8,14.209139 8,12 C8,9.790861 9.790861,8 12,8 Z M12,10 C10.8954305,10 10,10.8954305 10,12 C10,13.1045695 10.8954305,14 12,14 C13.1045695,14 14,13.1045695 14,12 C14,10.8954305 13.1045695,10 12,10', + path: 'M12,3 C15.3798024,3 18.3386923,4.63249094 20.8545372,7.31605887 C21.7188737,8.23801779 22.4694995,9.22244509 23.1056644,10.2074746 C23.4900327,10.8026256 23.7538591,11.2716502 23.8944272,11.5527864 C24.0351909,11.8343139 24.0351909,12.1656861 23.8944272,12.4472136 C23.7538591,12.7283498 23.4900327,13.1973744 23.1056644,13.7925254 C22.4694995,14.7775549 21.7188737,15.7619822 20.8545372,16.6839411 C18.3386923,19.3675091 15.3798024,21 12,21 C8.62019756,21 5.66130774,19.3675091 3.1454628,16.6839411 C2.28112631,15.7619822 1.5305005,14.7775549 0.894335622,13.7925254 C0.50996726,13.1973744 0.246140906,12.7283498 0.105572809,12.4472136 C-0.0351909363,12.1656861 -0.0351909363,11.8343139 0.105572809,11.5527864 C0.246140906,11.2716502 0.50996726,10.8026256 0.894335622,10.2074746 C1.5305005,9.22244509 2.28112631,8.23801779 3.1454628,7.31605887 C5.66130774,4.63249094 8.62019756,3 12,3 Z M12,5 C9.25480244,5 6.77619226,6.36750906 4.6045372,8.68394113 C3.82824869,9.51198221 3.149187,10.4025549 2.57441438,11.2925254 C2.41127724,11.5451249 2.26658862,11.7823697 2.14071218,12 C2.26658862,12.2176303 2.41127724,12.4548751 2.57441438,12.7074746 C3.149187,13.5974451 3.82824869,14.4880178 4.6045372,15.3160589 C6.77619226,17.6324909 9.25480244,19 12,19 C14.7451976,19 17.2238077,17.6324909 19.3954628,15.3160589 C20.1717513,14.4880178 20.850813,13.5974451 21.4255856,12.7074746 C21.5887228,12.4548751 21.7334114,12.2176303 21.8592878,12 C21.7334114,11.7823697 21.5887228,11.5451249 21.4255856,11.2925254 C20.850813,10.4025549 20.1717513,9.51198221 19.3954628,8.68394113 C17.2238077,6.36750906 14.7451976,5 12,5 Z M12,8 C14.209139,8 16,9.790861 16,12 C16,14.209139 14.209139,16 12,16 C9.790861,16 8,14.209139 8,12 C8,9.790861 9.790861,8 12,8 Z M12,10 C10.8954305,10 10,10.8954305 10,12 C10,13.1045695 10.8954305,14 12,14 C13.1045695,14 14,13.1045695 14,12 C14,10.8954305 13.1045695,10 12,10', viewBox: '0 3 24 18', ratio: 1, }, exit: { - path: - 'M28.228,23.986L47.092,5.122c1.172-1.171,1.172-3.071,0-4.242c-1.172-1.172-3.07-1.172-4.242,0L23.986,19.744L5.121,0.88 c-1.172-1.172-3.07-1.172-4.242,0c-1.172,1.171-1.172,3.071,0,4.242l18.865,18.864L0.879,42.85c-1.172,1.171-1.172,3.071,0,4.242 C1.465,47.677,2.233,47.97,3,47.97s1.535-0.293,2.121-0.879l18.865-18.864L42.85,47.091c0.586,0.586,1.354,0.879,2.121,0.879 s1.535-0.293,2.121-0.879c1.172-1.171,1.172-3.071,0-4.242L28.228,23.986z', + path: 'M28.228,23.986L47.092,5.122c1.172-1.171,1.172-3.071,0-4.242c-1.172-1.172-3.07-1.172-4.242,0L23.986,19.744L5.121,0.88 c-1.172-1.172-3.07-1.172-4.242,0c-1.172,1.171-1.172,3.071,0,4.242l18.865,18.864L0.879,42.85c-1.172,1.171-1.172,3.071,0,4.242 C1.465,47.677,2.233,47.97,3,47.97s1.535-0.293,2.121-0.879l18.865-18.864L42.85,47.091c0.586,0.586,1.354,0.879,2.121,0.879 s1.535-0.293,2.121-0.879c1.172-1.171,1.172-3.071,0-4.242L28.228,23.986z', viewBox: '0 0 47.971 47.971', ratio: 1, }, file: { - path: - 'M13,1 C13.0425909,1 13.0845598,1.00266262 13.1257495,1.00783047 L13,1 C13.0528361,1 13.1052411,1.00418141 13.1567725,1.01236099 C13.1883933,1.0172036 13.2193064,1.02361582 13.249662,1.03141743 C13.2598053,1.0342797 13.2698902,1.03704988 13.2799252,1.0399762 C13.3109399,1.04873224 13.3413507,1.05922617 13.3710585,1.07110396 C13.3800191,1.07496957 13.3890567,1.0787342 13.3980377,1.08263089 C13.4262995,1.09463815 13.4536613,1.10806791 13.4802859,1.12267436 C13.4906553,1.12855823 13.5012587,1.13461331 13.5117542,1.14086468 C13.5399066,1.15749759 13.5670269,1.17554946 13.5931738,1.19484452 C13.5995817,1.19963491 13.6064603,1.20483437 13.6132762,1.21012666 C13.6177282,1.21353888 13.6216003,1.21659988 13.625449,1.21968877 L13.7071068,1.29289322 L13.7071068,1.29289322 L20.7071068,8.29289322 C20.7364445,8.32223095 20.7639678,8.3533831 20.7894939,8.38616693 L20.7071068,8.29289322 C20.7429509,8.32873733 20.7757929,8.36702236 20.8054709,8.40735764 C20.8244505,8.43297305 20.8425024,8.46009338 20.8592238,8.48809993 C20.8653867,8.49874131 20.8714418,8.50934473 20.8772982,8.52005033 C20.8919321,8.54633874 20.9053618,8.57370048 20.9175449,8.60172936 C20.9212658,8.61094326 20.9250304,8.61998091 20.9286618,8.62907226 C20.9407738,8.65864932 20.9512678,8.68906007 20.9602981,8.72009403 C20.9629501,8.73010978 20.9657203,8.7401947 20.9683328,8.75032594 C20.9763842,8.78069364 20.9827964,8.81160666 20.9877474,8.84300527 C20.9892866,8.85360724 20.990772,8.86402246 20.9920936,8.8744695 C20.9973374,8.91544017 21,8.95740914 21,9 L21,9 L21,20 C21,21.6568542 19.6568542,23 18,23 L6,23 C4.34314575,23 3,21.6568542 3,20 L3,4 C3,2.34314575 4.34314575,1 6,1 Z M12,3 L6,3 C5.44771525,3 5,3.44771525 5,4 L5,20 C5,20.5522847 5.44771525,21 6,21 L18,21 C18.5522847,21 19,20.5522847 19,20 L19,10 L13,10 C12.4871642,10 12.0644928,9.61395981 12.0067277,9.11662113 L12,9 L12,3 Z M17.586,8 L14,4.415 L14,8 L17.586,8', + path: 'M13,1 C13.0425909,1 13.0845598,1.00266262 13.1257495,1.00783047 L13,1 C13.0528361,1 13.1052411,1.00418141 13.1567725,1.01236099 C13.1883933,1.0172036 13.2193064,1.02361582 13.249662,1.03141743 C13.2598053,1.0342797 13.2698902,1.03704988 13.2799252,1.0399762 C13.3109399,1.04873224 13.3413507,1.05922617 13.3710585,1.07110396 C13.3800191,1.07496957 13.3890567,1.0787342 13.3980377,1.08263089 C13.4262995,1.09463815 13.4536613,1.10806791 13.4802859,1.12267436 C13.4906553,1.12855823 13.5012587,1.13461331 13.5117542,1.14086468 C13.5399066,1.15749759 13.5670269,1.17554946 13.5931738,1.19484452 C13.5995817,1.19963491 13.6064603,1.20483437 13.6132762,1.21012666 C13.6177282,1.21353888 13.6216003,1.21659988 13.625449,1.21968877 L13.7071068,1.29289322 L13.7071068,1.29289322 L20.7071068,8.29289322 C20.7364445,8.32223095 20.7639678,8.3533831 20.7894939,8.38616693 L20.7071068,8.29289322 C20.7429509,8.32873733 20.7757929,8.36702236 20.8054709,8.40735764 C20.8244505,8.43297305 20.8425024,8.46009338 20.8592238,8.48809993 C20.8653867,8.49874131 20.8714418,8.50934473 20.8772982,8.52005033 C20.8919321,8.54633874 20.9053618,8.57370048 20.9175449,8.60172936 C20.9212658,8.61094326 20.9250304,8.61998091 20.9286618,8.62907226 C20.9407738,8.65864932 20.9512678,8.68906007 20.9602981,8.72009403 C20.9629501,8.73010978 20.9657203,8.7401947 20.9683328,8.75032594 C20.9763842,8.78069364 20.9827964,8.81160666 20.9877474,8.84300527 C20.9892866,8.85360724 20.990772,8.86402246 20.9920936,8.8744695 C20.9973374,8.91544017 21,8.95740914 21,9 L21,9 L21,20 C21,21.6568542 19.6568542,23 18,23 L6,23 C4.34314575,23 3,21.6568542 3,20 L3,4 C3,2.34314575 4.34314575,1 6,1 Z M12,3 L6,3 C5.44771525,3 5,3.44771525 5,4 L5,20 C5,20.5522847 5.44771525,21 6,21 L18,21 C18.5522847,21 19,20.5522847 19,20 L19,10 L13,10 C12.4871642,10 12.0644928,9.61395981 12.0067277,9.11662113 L12,9 L12,3 Z M17.586,8 L14,4.415 L14,8 L17.586,8', viewBox: '0 0 24 24', ratio: 1, }, fullscreen: { - path: - 'M205.801,122.042c-22.778,0-45.56,0-68.334,0c-6.081,0-11.301,5-11.301,11.14 c0.004,22.774,0.007,45.552,0.007,68.326c0.004,14.487,22.445,14.614,22.445,0.161c-0.004-13.777-0.004-27.55-0.004-41.326 c16.136,16.136,32.277,32.276,48.413,48.409c10.224,10.224,26.035-5.703,15.785-15.953c-16.11-16.11-32.217-32.213-48.323-48.319 c13.717,0,27.437,0,41.154,0C220.128,144.487,220.255,122.042,205.801,122.042zM323.064,261.753c0.004,13.777,0.004,27.546,0.004,41.323 c-16.136-16.136-32.276-32.276-48.413-48.413c-10.224-10.224-26.035,5.699-15.785,15.953c16.11,16.11,32.213,32.213,48.323,48.323 c-13.721,0-27.437,0.004-41.154,0.004c-14.487,0.004-14.614,22.445-0.161,22.445c22.778-0.004,45.56-0.007,68.334-0.007 c6.081-0.004,11.301-5,11.301-11.14c-0.004-22.774-0.007-45.548-0.007-68.323C345.506,247.427,323.064,247.3,323.064,261.753zM265.882,144.494c13.777-0.004,27.546-0.004,41.323-0.004 c-16.136,16.133-32.276,32.273-48.413,48.405c-10.224,10.224,5.699,26.035,15.953,15.785c16.11-16.106,32.213-32.209,48.323-48.316 c0,13.713,0.004,27.43,0.004,41.147c0.004,14.487,22.445,14.614,22.445,0.161c-0.004-22.774-0.007-45.552-0.007-68.326 c0-6.081-5-11.301-11.14-11.301c-22.774,0.004-45.548,0.007-68.323,0.007C251.556,122.053,251.428,144.494,265.882,144.494zM205.801,318.932c-13.777,0.004-27.55,0.004-41.323,0.004 c16.133-16.133,32.273-32.273,48.405-48.405c10.224-10.224-5.699-26.035-15.953-15.785c-16.11,16.106-32.213,32.213-48.319,48.319 c0-13.717,0-27.434,0-41.151c0-14.487-22.445-14.614-22.445-0.161c0,22.774,0,45.552,0,68.326c0,6.081,5,11.301,11.14,11.301 c22.778-0.004,45.552-0.007,68.326-0.007C220.128,341.373,220.255,318.932,205.801,318.932z', + path: 'M205.801,122.042c-22.778,0-45.56,0-68.334,0c-6.081,0-11.301,5-11.301,11.14 c0.004,22.774,0.007,45.552,0.007,68.326c0.004,14.487,22.445,14.614,22.445,0.161c-0.004-13.777-0.004-27.55-0.004-41.326 c16.136,16.136,32.277,32.276,48.413,48.409c10.224,10.224,26.035-5.703,15.785-15.953c-16.11-16.11-32.217-32.213-48.323-48.319 c13.717,0,27.437,0,41.154,0C220.128,144.487,220.255,122.042,205.801,122.042zM323.064,261.753c0.004,13.777,0.004,27.546,0.004,41.323 c-16.136-16.136-32.276-32.276-48.413-48.413c-10.224-10.224-26.035,5.699-15.785,15.953c16.11,16.11,32.213,32.213,48.323,48.323 c-13.721,0-27.437,0.004-41.154,0.004c-14.487,0.004-14.614,22.445-0.161,22.445c22.778-0.004,45.56-0.007,68.334-0.007 c6.081-0.004,11.301-5,11.301-11.14c-0.004-22.774-0.007-45.548-0.007-68.323C345.506,247.427,323.064,247.3,323.064,261.753zM265.882,144.494c13.777-0.004,27.546-0.004,41.323-0.004 c-16.136,16.133-32.276,32.273-48.413,48.405c-10.224,10.224,5.699,26.035,15.953,15.785c16.11-16.106,32.213-32.209,48.323-48.316 c0,13.713,0.004,27.43,0.004,41.147c0.004,14.487,22.445,14.614,22.445,0.161c-0.004-22.774-0.007-45.552-0.007-68.326 c0-6.081-5-11.301-11.14-11.301c-22.774,0.004-45.548,0.007-68.323,0.007C251.556,122.053,251.428,144.494,265.882,144.494zM205.801,318.932c-13.777,0.004-27.55,0.004-41.323,0.004 c16.133-16.133,32.273-32.273,48.405-48.405c10.224-10.224-5.699-26.035-15.953-15.785c-16.11,16.106-32.213,32.213-48.319,48.319 c0-13.717,0-27.434,0-41.151c0-14.487-22.445-14.614-22.445-0.161c0,22.774,0,45.552,0,68.326c0,6.081,5,11.301,11.14,11.301 c22.778-0.004,45.552-0.007,68.326-0.007C220.128,341.373,220.255,318.932,205.801,318.932z', viewBox: '80 80 310 310', ratio: 1, }, gear: { - path: - 'M12,0 C13.6568542,0 15,1.34314575 15,3 L15,3.08601169 C15.0010253,3.34508314 15.1558067,3.57880297 15.4037653,3.68513742 C15.6468614,3.79242541 15.9307827,3.74094519 16.1128932,3.56289322 L16.1725,3.50328666 C16.7352048,2.93995553 17.4987723,2.62342669 18.295,2.62342669 C19.0912277,2.62342669 19.8547952,2.93995553 20.4167133,3.5025 C20.9800445,4.06520477 21.2965733,4.82877226 21.2965733,5.625 C21.2965733,6.42122774 20.9800445,7.18479523 20.4171068,7.74710678 L20.3648626,7.79926496 C20.1790548,7.98921731 20.1275746,8.27313857 20.2348626,8.51623466 C20.26314,8.58030647 20.2845309,8.64699387 20.2987985,8.71517468 C20.4176633,8.89040605 20.6163373,8.99914118 20.83,9 L21,9 C22.6568542,9 24,10.3431458 24,12 C24,13.6568542 22.6568542,15 21,15 L20.9139883,15 C20.6549169,15.0010253 20.421197,15.1558067 20.3191398,15.3939314 C20.2075746,15.6468614 20.2590548,15.9307827 20.4371068,16.1128932 L20.4967133,16.1725 C21.0600445,16.7352048 21.3765733,17.4987723 21.3765733,18.295 C21.3765733,19.0912277 21.0600445,19.8547952 20.4975,20.4167133 C19.9347952,20.9800445 19.1712277,21.2965733 18.375,21.2965733 C17.5787723,21.2965733 16.8152048,20.9800445 16.2528932,20.4171068 L16.200735,20.3648626 C16.0107827,20.1790548 15.7268614,20.1275746 15.4739314,20.2391398 C15.2358067,20.341197 15.0810253,20.5749169 15.08,20.83 L15.08,21 C15.08,22.6568542 13.7368542,24 12.08,24 C10.4231458,24 9.08,22.6568542 9.08,21 C9.07403212,20.6665579 8.90531385,20.4306648 8.59623466,20.3148626 C8.35313857,20.2075746 8.06921731,20.2590548 7.88710678,20.4371068 L7.8275,20.4967133 C7.26479523,21.0600445 6.50122774,21.3765733 5.705,21.3765733 C4.90877226,21.3765733 4.14520477,21.0600445 3.58328666,20.4975 C3.01995553,19.9347952 2.70342669,19.1712277 2.70342669,18.375 C2.70342669,17.5787723 3.01995553,16.8152048 3.58289322,16.2528932 L3.63513742,16.200735 C3.82094519,16.0107827 3.87242541,15.7268614 3.76086017,15.4739314 C3.65880297,15.2358067 3.42508314,15.0810253 3.17,15.08 L3,15.08 C1.34314575,15.08 0,13.7368542 0,12.08 C0,10.4231458 1.34314575,9.08 3,9.08 C3.33344206,9.07403212 3.56933519,8.90531385 3.68513742,8.59623466 C3.79242541,8.35313857 3.74094519,8.06921731 3.56289322,7.88710678 L3.50328666,7.8275 C2.93995553,7.26479523 2.62342669,6.50122774 2.62342669,5.705 C2.62342669,4.90877226 2.93995553,4.14520477 3.5025,3.58328666 C4.06520477,3.01995553 4.82877226,2.70342669 5.625,2.70342669 C6.42122774,2.70342669 7.18479523,3.01995553 7.74710678,3.58289322 L7.79926496,3.63513742 C7.98921731,3.82094519 8.27313857,3.87242541 8.51623466,3.76513742 C8.58030647,3.73685997 8.64699387,3.71546911 8.71517468,3.70120146 C8.89040605,3.58233675 8.99914118,3.3836627 9,3.17 L9,3 C9,1.34314575 10.3431458,0 12,0 Z M12,2 C11.4477153,2 11,2.44771525 11,3 L11,3.17398831 C10.9957795,4.2302027 10.3647479,5.18306046 9.39393144,5.59913983 C9.30943133,5.63535548 9.22053528,5.65966354 9.12978593,5.67154209 C8.1847178,6.00283804 7.12462982,5.77295717 6.39289322,5.05710678 L6.3325,4.99671334 C6.14493174,4.8089363 5.89040925,4.70342669 5.625,4.70342669 C5.35959075,4.70342669 5.10506826,4.8089363 4.91671334,4.9975 C4.7289363,5.18506826 4.62342669,5.43959075 4.62342669,5.705 C4.62342669,5.97040925 4.7289363,6.22493174 4.91710678,6.41289322 L4.98486258,6.48073504 C5.74238657,7.25515616 5.9522675,8.41268129 5.5385361,9.34518109 C5.16293446,10.3664297 4.2012163,11.0542811 3.09,11.08 L3,11.08 C2.44771525,11.08 2,11.5277153 2,12.08 C2,12.6322847 2.44771525,13.08 3,13.08 L3.17398831,13.080008 C4.2302027,13.0842205 5.18306046,13.7152521 5.59486258,14.6762347 C6.0322675,15.6673187 5.82238657,16.8248438 5.05710678,17.6071068 L4.99671334,17.6675 C4.8089363,17.8550683 4.70342669,18.1095908 4.70342669,18.375 C4.70342669,18.6404092 4.8089363,18.8949317 4.9975,19.0832867 C5.18506826,19.2710637 5.43959075,19.3765733 5.705,19.3765733 C5.97040925,19.3765733 6.22493174,19.2710637 6.41289322,19.0828932 L6.48073504,19.0151374 C7.25515616,18.2576134 8.41268129,18.0477325 9.34518109,18.4614639 C10.3664297,18.8370655 11.0542811,19.7987837 11.08,20.91 L11.08,21 C11.08,21.5522847 11.5277153,22 12.08,22 C12.6322847,22 13.08,21.5522847 13.08,21 L13.080008,20.8260117 C13.0842205,19.7697973 13.7152521,18.8169395 14.6762347,18.4051374 C15.6673187,17.9677325 16.8248438,18.1776134 17.6071068,18.9428932 L17.6675,19.0032867 C17.8550683,19.1910637 18.1095908,19.2965733 18.375,19.2965733 C18.6404092,19.2965733 18.8949317,19.1910637 19.0832867,19.0025 C19.2710637,18.8149317 19.3765733,18.5604092 19.3765733,18.295 C19.3765733,18.0295908 19.2710637,17.7750683 19.0828932,17.5871068 L19.0151374,17.519265 C18.2576134,16.7448438 18.0477325,15.5873187 18.4851374,14.5962347 C18.8969395,13.6352521 19.8497973,13.0042205 20.91,13 L21,13 C21.5522847,13 22,12.5522847 22,12 C22,11.4477153 21.5522847,11 21,11 L20.8260117,11 C19.7697973,10.9957795 18.8169395,10.3647479 18.4008602,9.39393144 C18.3646445,9.30943133 18.3403365,9.22053528 18.3284579,9.12978593 C17.997162,8.1847178 18.2270428,7.12462982 18.9428932,6.39289322 L19.0032867,6.3325 C19.1910637,6.14493174 19.2965733,5.89040925 19.2965733,5.625 C19.2965733,5.35959075 19.1910637,5.10506826 19.0025,4.91671334 C18.8149317,4.7289363 18.5604092,4.62342669 18.295,4.62342669 C18.0295908,4.62342669 17.7750683,4.7289363 17.5871068,4.91710678 L17.519265,4.98486258 C16.7448438,5.74238657 15.5873187,5.9522675 14.6060686,5.51913983 C13.6352521,5.10306046 13.0042205,4.1502027 13,3.09 L13,3 C13,2.44771525 12.5522847,2 12,2 Z M12,8 C14.209139,8 16,9.790861 16,12 C16,14.209139 14.209139,16 12,16 C9.790861,16 8,14.209139 8,12 C8,9.790861 9.790861,8 12,8 Z M12,14 C13.1045695,14 14,13.1045695 14,12 C14,10.8954305 13.1045695,10 12,10 C10.8954305,10 10,10.8954305 10,12 C10,13.1045695 10.8954305,14 12,14', + path: 'M12,0 C13.6568542,0 15,1.34314575 15,3 L15,3.08601169 C15.0010253,3.34508314 15.1558067,3.57880297 15.4037653,3.68513742 C15.6468614,3.79242541 15.9307827,3.74094519 16.1128932,3.56289322 L16.1725,3.50328666 C16.7352048,2.93995553 17.4987723,2.62342669 18.295,2.62342669 C19.0912277,2.62342669 19.8547952,2.93995553 20.4167133,3.5025 C20.9800445,4.06520477 21.2965733,4.82877226 21.2965733,5.625 C21.2965733,6.42122774 20.9800445,7.18479523 20.4171068,7.74710678 L20.3648626,7.79926496 C20.1790548,7.98921731 20.1275746,8.27313857 20.2348626,8.51623466 C20.26314,8.58030647 20.2845309,8.64699387 20.2987985,8.71517468 C20.4176633,8.89040605 20.6163373,8.99914118 20.83,9 L21,9 C22.6568542,9 24,10.3431458 24,12 C24,13.6568542 22.6568542,15 21,15 L20.9139883,15 C20.6549169,15.0010253 20.421197,15.1558067 20.3191398,15.3939314 C20.2075746,15.6468614 20.2590548,15.9307827 20.4371068,16.1128932 L20.4967133,16.1725 C21.0600445,16.7352048 21.3765733,17.4987723 21.3765733,18.295 C21.3765733,19.0912277 21.0600445,19.8547952 20.4975,20.4167133 C19.9347952,20.9800445 19.1712277,21.2965733 18.375,21.2965733 C17.5787723,21.2965733 16.8152048,20.9800445 16.2528932,20.4171068 L16.200735,20.3648626 C16.0107827,20.1790548 15.7268614,20.1275746 15.4739314,20.2391398 C15.2358067,20.341197 15.0810253,20.5749169 15.08,20.83 L15.08,21 C15.08,22.6568542 13.7368542,24 12.08,24 C10.4231458,24 9.08,22.6568542 9.08,21 C9.07403212,20.6665579 8.90531385,20.4306648 8.59623466,20.3148626 C8.35313857,20.2075746 8.06921731,20.2590548 7.88710678,20.4371068 L7.8275,20.4967133 C7.26479523,21.0600445 6.50122774,21.3765733 5.705,21.3765733 C4.90877226,21.3765733 4.14520477,21.0600445 3.58328666,20.4975 C3.01995553,19.9347952 2.70342669,19.1712277 2.70342669,18.375 C2.70342669,17.5787723 3.01995553,16.8152048 3.58289322,16.2528932 L3.63513742,16.200735 C3.82094519,16.0107827 3.87242541,15.7268614 3.76086017,15.4739314 C3.65880297,15.2358067 3.42508314,15.0810253 3.17,15.08 L3,15.08 C1.34314575,15.08 0,13.7368542 0,12.08 C0,10.4231458 1.34314575,9.08 3,9.08 C3.33344206,9.07403212 3.56933519,8.90531385 3.68513742,8.59623466 C3.79242541,8.35313857 3.74094519,8.06921731 3.56289322,7.88710678 L3.50328666,7.8275 C2.93995553,7.26479523 2.62342669,6.50122774 2.62342669,5.705 C2.62342669,4.90877226 2.93995553,4.14520477 3.5025,3.58328666 C4.06520477,3.01995553 4.82877226,2.70342669 5.625,2.70342669 C6.42122774,2.70342669 7.18479523,3.01995553 7.74710678,3.58289322 L7.79926496,3.63513742 C7.98921731,3.82094519 8.27313857,3.87242541 8.51623466,3.76513742 C8.58030647,3.73685997 8.64699387,3.71546911 8.71517468,3.70120146 C8.89040605,3.58233675 8.99914118,3.3836627 9,3.17 L9,3 C9,1.34314575 10.3431458,0 12,0 Z M12,2 C11.4477153,2 11,2.44771525 11,3 L11,3.17398831 C10.9957795,4.2302027 10.3647479,5.18306046 9.39393144,5.59913983 C9.30943133,5.63535548 9.22053528,5.65966354 9.12978593,5.67154209 C8.1847178,6.00283804 7.12462982,5.77295717 6.39289322,5.05710678 L6.3325,4.99671334 C6.14493174,4.8089363 5.89040925,4.70342669 5.625,4.70342669 C5.35959075,4.70342669 5.10506826,4.8089363 4.91671334,4.9975 C4.7289363,5.18506826 4.62342669,5.43959075 4.62342669,5.705 C4.62342669,5.97040925 4.7289363,6.22493174 4.91710678,6.41289322 L4.98486258,6.48073504 C5.74238657,7.25515616 5.9522675,8.41268129 5.5385361,9.34518109 C5.16293446,10.3664297 4.2012163,11.0542811 3.09,11.08 L3,11.08 C2.44771525,11.08 2,11.5277153 2,12.08 C2,12.6322847 2.44771525,13.08 3,13.08 L3.17398831,13.080008 C4.2302027,13.0842205 5.18306046,13.7152521 5.59486258,14.6762347 C6.0322675,15.6673187 5.82238657,16.8248438 5.05710678,17.6071068 L4.99671334,17.6675 C4.8089363,17.8550683 4.70342669,18.1095908 4.70342669,18.375 C4.70342669,18.6404092 4.8089363,18.8949317 4.9975,19.0832867 C5.18506826,19.2710637 5.43959075,19.3765733 5.705,19.3765733 C5.97040925,19.3765733 6.22493174,19.2710637 6.41289322,19.0828932 L6.48073504,19.0151374 C7.25515616,18.2576134 8.41268129,18.0477325 9.34518109,18.4614639 C10.3664297,18.8370655 11.0542811,19.7987837 11.08,20.91 L11.08,21 C11.08,21.5522847 11.5277153,22 12.08,22 C12.6322847,22 13.08,21.5522847 13.08,21 L13.080008,20.8260117 C13.0842205,19.7697973 13.7152521,18.8169395 14.6762347,18.4051374 C15.6673187,17.9677325 16.8248438,18.1776134 17.6071068,18.9428932 L17.6675,19.0032867 C17.8550683,19.1910637 18.1095908,19.2965733 18.375,19.2965733 C18.6404092,19.2965733 18.8949317,19.1910637 19.0832867,19.0025 C19.2710637,18.8149317 19.3765733,18.5604092 19.3765733,18.295 C19.3765733,18.0295908 19.2710637,17.7750683 19.0828932,17.5871068 L19.0151374,17.519265 C18.2576134,16.7448438 18.0477325,15.5873187 18.4851374,14.5962347 C18.8969395,13.6352521 19.8497973,13.0042205 20.91,13 L21,13 C21.5522847,13 22,12.5522847 22,12 C22,11.4477153 21.5522847,11 21,11 L20.8260117,11 C19.7697973,10.9957795 18.8169395,10.3647479 18.4008602,9.39393144 C18.3646445,9.30943133 18.3403365,9.22053528 18.3284579,9.12978593 C17.997162,8.1847178 18.2270428,7.12462982 18.9428932,6.39289322 L19.0032867,6.3325 C19.1910637,6.14493174 19.2965733,5.89040925 19.2965733,5.625 C19.2965733,5.35959075 19.1910637,5.10506826 19.0025,4.91671334 C18.8149317,4.7289363 18.5604092,4.62342669 18.295,4.62342669 C18.0295908,4.62342669 17.7750683,4.7289363 17.5871068,4.91710678 L17.519265,4.98486258 C16.7448438,5.74238657 15.5873187,5.9522675 14.6060686,5.51913983 C13.6352521,5.10306046 13.0042205,4.1502027 13,3.09 L13,3 C13,2.44771525 12.5522847,2 12,2 Z M12,8 C14.209139,8 16,9.790861 16,12 C16,14.209139 14.209139,16 12,16 C9.790861,16 8,14.209139 8,12 C8,9.790861 9.790861,8 12,8 Z M12,14 C13.1045695,14 14,13.1045695 14,12 C14,10.8954305 13.1045695,10 12,10 C10.8954305,10 10,10.8954305 10,12 C10,13.1045695 10.8954305,14 12,14', viewBox: '0 0 24 24', ratio: 1, }, communities: { - path: - 'M16,1.99999996 C8.26801348,1.99999996 1.99999996,8.26801348 1.99999996,16 C1.99999996,23.7319865 8.26801348,30 16,30 C23.7319865,30 30,23.7319865 30,16 C30,12.2869691 28.5250043,8.72601434 25.899495,6.10050503 C23.2739857,3.47499573 19.7130309,1.99999996 16,1.99999996 Z M24,15 C23.9541824,13.7847684 23.81713,12.5746962 23.59,11.38 C25.78,12.29 27.34,13.57 27.84,15 L24,15 Z M22,15 L17,15 L17,9.99999998 C18.4647569,10.0572205 19.9194297,10.2683827 21.34,10.63 C21.7186973,12.058241 21.9400138,13.5236242 22,15 Z M17,7.99999997 L17,4.18999996 C18.43,4.68999996 19.71,6.24999997 20.62,8.43999998 C19.426069,8.2027972 18.2159902,8.05571581 17,7.99999998 L17,7.99999997 Z M15,4.18999996 L15,7.99999997 C13.7847684,8.04581761 12.5746962,8.18286998 11.38,8.40999998 C12.29,6.24999997 13.57,4.68999996 15,4.18999996 Z M15,9.99999998 L15,15 L9.99999998,15 C10.0523471,13.5347995 10.2635844,12.0796099 10.63,10.66 C12.0592465,10.2861705 13.5241011,10.0649339 15,9.99999998 L15,9.99999998 Z M7.99999997,15 L4.18999996,15 C4.68999996,13.57 6.24999997,12.29 8.43999998,11.38 C8.2027972,12.573931 8.05571581,13.7840098 7.99999998,15 L7.99999997,15 Z M7.99999997,17 C8.04581761,18.2152316 8.18286998,19.4253038 8.40999998,20.62 C6.24999997,19.71 4.68999996,18.43 4.18999996,17 L7.99999997,17 Z M9.99999998,17 L15,17 L15,22 C13.5352431,21.9427795 12.0805703,21.7316173 10.66,21.37 C10.2813027,19.941759 10.0599862,18.4763758 9.99999998,17 L9.99999998,17 Z M15,24 L15,27.84 C13.57,27.34 12.29,25.78 11.38,23.59 C12.5746962,23.81713 13.7847684,23.9541824 15,24 Z M17,27.84 L17,24 C18.2152316,23.9541824 19.4253038,23.81713 20.62,23.59 C19.71,25.75 18.43,27.31 17,27.81 L17,27.84 Z M17,22 L17,17 L22,17 C21.9476529,18.4652005 21.7364156,19.9203901 21.37,21.34 C19.9407535,21.7138295 18.4758989,21.9350661 17,22 L17,22 Z M24,17 L27.84,17 C27.34,18.43 25.78,19.71 23.59,20.62 C23.81713,19.4253038 23.9541824,18.2152316 24,17 L24,17 Z M26.87,10.88 C25.6762805,10.0719416 24.3730724,9.43885859 23,8.99999998 C22.5705064,7.62858818 21.9475643,6.32546065 21.15,5.12999997 C23.6492047,6.33846833 25.6578129,8.36825686 26.84,10.88 L26.87,10.88 Z M10.87,5.15999997 C10.0679904,6.34500038 9.43836847,7.63791394 8.99999998,8.99999998 C7.62858818,9.42949358 6.32546065,10.0524357 5.12999997,10.85 C6.33846833,8.35079527 8.36825686,6.34218713 10.88,5.15999997 L10.87,5.15999997 Z M5.14999997,21.16 C6.33983272,21.9523657 7.63608858,22.571875 8.99999998,23 C9.42949358,24.3714118 10.0524357,25.6745393 10.85,26.87 C8.35079527,25.6615317 6.34218713,23.6317431 5.15999997,21.12 L5.14999997,21.16 Z M21.15,26.88 C21.9484187,25.681438 22.5713875,24.3748872 23,23 C24.3714118,22.5705064 25.6745393,21.9475643 26.87,21.15 C25.6615317,23.6492047 23.6317431,25.6578129 21.12,26.84 L21.15,26.88', + path: 'M16,1.99999996 C8.26801348,1.99999996 1.99999996,8.26801348 1.99999996,16 C1.99999996,23.7319865 8.26801348,30 16,30 C23.7319865,30 30,23.7319865 30,16 C30,12.2869691 28.5250043,8.72601434 25.899495,6.10050503 C23.2739857,3.47499573 19.7130309,1.99999996 16,1.99999996 Z M24,15 C23.9541824,13.7847684 23.81713,12.5746962 23.59,11.38 C25.78,12.29 27.34,13.57 27.84,15 L24,15 Z M22,15 L17,15 L17,9.99999998 C18.4647569,10.0572205 19.9194297,10.2683827 21.34,10.63 C21.7186973,12.058241 21.9400138,13.5236242 22,15 Z M17,7.99999997 L17,4.18999996 C18.43,4.68999996 19.71,6.24999997 20.62,8.43999998 C19.426069,8.2027972 18.2159902,8.05571581 17,7.99999998 L17,7.99999997 Z M15,4.18999996 L15,7.99999997 C13.7847684,8.04581761 12.5746962,8.18286998 11.38,8.40999998 C12.29,6.24999997 13.57,4.68999996 15,4.18999996 Z M15,9.99999998 L15,15 L9.99999998,15 C10.0523471,13.5347995 10.2635844,12.0796099 10.63,10.66 C12.0592465,10.2861705 13.5241011,10.0649339 15,9.99999998 L15,9.99999998 Z M7.99999997,15 L4.18999996,15 C4.68999996,13.57 6.24999997,12.29 8.43999998,11.38 C8.2027972,12.573931 8.05571581,13.7840098 7.99999998,15 L7.99999997,15 Z M7.99999997,17 C8.04581761,18.2152316 8.18286998,19.4253038 8.40999998,20.62 C6.24999997,19.71 4.68999996,18.43 4.18999996,17 L7.99999997,17 Z M9.99999998,17 L15,17 L15,22 C13.5352431,21.9427795 12.0805703,21.7316173 10.66,21.37 C10.2813027,19.941759 10.0599862,18.4763758 9.99999998,17 L9.99999998,17 Z M15,24 L15,27.84 C13.57,27.34 12.29,25.78 11.38,23.59 C12.5746962,23.81713 13.7847684,23.9541824 15,24 Z M17,27.84 L17,24 C18.2152316,23.9541824 19.4253038,23.81713 20.62,23.59 C19.71,25.75 18.43,27.31 17,27.81 L17,27.84 Z M17,22 L17,17 L22,17 C21.9476529,18.4652005 21.7364156,19.9203901 21.37,21.34 C19.9407535,21.7138295 18.4758989,21.9350661 17,22 L17,22 Z M24,17 L27.84,17 C27.34,18.43 25.78,19.71 23.59,20.62 C23.81713,19.4253038 23.9541824,18.2152316 24,17 L24,17 Z M26.87,10.88 C25.6762805,10.0719416 24.3730724,9.43885859 23,8.99999998 C22.5705064,7.62858818 21.9475643,6.32546065 21.15,5.12999997 C23.6492047,6.33846833 25.6578129,8.36825686 26.84,10.88 L26.87,10.88 Z M10.87,5.15999997 C10.0679904,6.34500038 9.43836847,7.63791394 8.99999998,8.99999998 C7.62858818,9.42949358 6.32546065,10.0524357 5.12999997,10.85 C6.33846833,8.35079527 8.36825686,6.34218713 10.88,5.15999997 L10.87,5.15999997 Z M5.14999997,21.16 C6.33983272,21.9523657 7.63608858,22.571875 8.99999998,23 C9.42949358,24.3714118 10.0524357,25.6745393 10.85,26.87 C8.35079527,25.6615317 6.34218713,23.6317431 5.15999997,21.12 L5.14999997,21.16 Z M21.15,26.88 C21.9484187,25.681438 22.5713875,24.3748872 23,23 C24.3714118,22.5705064 25.6745393,21.9475643 26.87,21.15 C25.6615317,23.6492047 23.6317431,25.6578129 21.12,26.84 L21.15,26.88', viewBox: '0.5 0 30 30', ratio: 1, }, hangup: { - path: - 'M983.7,530.6c7.7,53.1,12.6,125.7-11.1,153.6c-39.4,46-288.8,46-288.8-46c0-46.3,41-76.7,1.7-122.7c-38.7-45.2-108.2-46-185.4-46s-146.7,0.7-185.4,46c-39.4,46,1.7,76.3,1.7,122.7c0,92-249.4,92-288.8,46C3.7,656.4,8.7,583.7,16.3,530.6c5.9-35.5,20.8-73.7,68.5-122.5l0,0c71.5-66.8,179.8-121.3,411.4-122.5v0c1.3,0,2.5,0,3.8,0s2.5,0,3.8,0v0c231.6,1.2,339.8,55.7,411.4,122.5l0,0C962.9,456.9,977.8,495.2,983.7,530.6z', + path: 'M983.7,530.6c7.7,53.1,12.6,125.7-11.1,153.6c-39.4,46-288.8,46-288.8-46c0-46.3,41-76.7,1.7-122.7c-38.7-45.2-108.2-46-185.4-46s-146.7,0.7-185.4,46c-39.4,46,1.7,76.3,1.7,122.7c0,92-249.4,92-288.8,46C3.7,656.4,8.7,583.7,16.3,530.6c5.9-35.5,20.8-73.7,68.5-122.5l0,0c71.5-66.8,179.8-121.3,411.4-122.5v0c1.3,0,2.5,0,3.8,0s2.5,0,3.8,0v0c231.6,1.2,339.8,55.7,411.4,122.5l0,0C962.9,456.9,977.8,495.2,983.7,530.6z', viewBox: '0 0 1000 1000', ratio: 1, }, image: { - path: - 'M8.5,13.5L11,16.5L14.5,12L19,18H5M21,19V5C21,3.89 20.1,3 19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19Z', + path: 'M8.5,13.5L11,16.5L14.5,12L19,18H5M21,19V5C21,3.89 20.1,3 19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19Z', viewBox: '0 0 24 24', ratio: 1, }, info: { - path: - 'M17.5,2.4c-1.82-1.5-4.21-2.1-6.57-1.64c-3.09,0.6-5.57,3.09-6.15,6.19c-0.4,2.1,0.04,4.21,1.22,5.95 C7.23,14.7,8,16.41,8.36,18.12c0.17,0.81,0.89,1.41,1.72,1.41h4.85c0.83,0,1.55-0.59,1.72-1.42c0.37-1.82,1.13-3.55,2.19-4.99 c1-1.36,1.53-2.96,1.53-4.65C20.37,6.11,19.32,3.9,17.5,2.4z M17.47,12.11c-1.21,1.64-2.07,3.6-2.55,5.72l-4.91-0.05 c-0.4-1.93-1.25-3.84-2.62-5.84c-0.93-1.36-1.27-3.02-0.95-4.67c0.46-2.42,2.39-4.37,4.81-4.83c0.41-0.08,0.82-0.12,1.23-0.12 c1.44,0,2.82,0.49,3.94,1.4c1.43,1.18,2.25,2.91,2.25,4.76C18.67,9.79,18.25,11.04,17.47,12.11z M15.94,20.27H9.61c-0.47,0-0.85,0.38-0.85,0.85s0.38,0.85,0.85,0.85h6.33c0.47,0,0.85-0.38,0.85-0.85 S16.41,20.27,15.94,20.27z M15.94,22.7H9.61c-0.47,0-0.85,0.38-0.85,0.85s0.38,0.85,0.85,0.85h6.33c0.47,0,0.85-0.38,0.85-0.85 S16.41,22.7,15.94,22.7z M12.5,3.28c-2.89,0-5.23,2.35-5.23,5.23c0,0.47,0.38,0.85,0.85,0.85s0.85-0.38,0.85-0.85 c0-1.95,1.59-3.53,3.54-3.53c0.47,0,0.85-0.38,0.85-0.85S12.97,3.28,12.5,3.28z', + path: 'M17.5,2.4c-1.82-1.5-4.21-2.1-6.57-1.64c-3.09,0.6-5.57,3.09-6.15,6.19c-0.4,2.1,0.04,4.21,1.22,5.95 C7.23,14.7,8,16.41,8.36,18.12c0.17,0.81,0.89,1.41,1.72,1.41h4.85c0.83,0,1.55-0.59,1.72-1.42c0.37-1.82,1.13-3.55,2.19-4.99 c1-1.36,1.53-2.96,1.53-4.65C20.37,6.11,19.32,3.9,17.5,2.4z M17.47,12.11c-1.21,1.64-2.07,3.6-2.55,5.72l-4.91-0.05 c-0.4-1.93-1.25-3.84-2.62-5.84c-0.93-1.36-1.27-3.02-0.95-4.67c0.46-2.42,2.39-4.37,4.81-4.83c0.41-0.08,0.82-0.12,1.23-0.12 c1.44,0,2.82,0.49,3.94,1.4c1.43,1.18,2.25,2.91,2.25,4.76C18.67,9.79,18.25,11.04,17.47,12.11z M15.94,20.27H9.61c-0.47,0-0.85,0.38-0.85,0.85s0.38,0.85,0.85,0.85h6.33c0.47,0,0.85-0.38,0.85-0.85 S16.41,20.27,15.94,20.27z M15.94,22.7H9.61c-0.47,0-0.85,0.38-0.85,0.85s0.38,0.85,0.85,0.85h6.33c0.47,0,0.85-0.38,0.85-0.85 S16.41,22.7,15.94,22.7z M12.5,3.28c-2.89,0-5.23,2.35-5.23,5.23c0,0.47,0.38,0.85,0.85,0.85s0.85-0.38,0.85-0.85 c0-1.95,1.59-3.53,3.54-3.53c0.47,0,0.85-0.38,0.85-0.85S12.97,3.28,12.5,3.28z', viewBox: '0 0 25 25', ratio: 1, }, link: { - path: - 'M265.117,22.764l-9.877-8.737c-23.003-20.398-58.227-18.283-78.618,4.726l-28.267,31.89 c-6.38,7.199-5.717,18.251,1.479,24.637l2.653,2.354c7.221,6.402,18.239,5.741,24.646-1.481l28.265-31.889 c6.305-7.107,17.227-7.761,24.338-1.466l9.865,8.752c7.113,6.303,7.783,17.223,1.469,24.334l-61.808,69.726 c-5.231,5.911-13.791,7.505-20.816,3.875c-7.682-3.967-17.051-2.224-22.787,4.245l-0.482,0.544 c-3.881,4.377-5.499,10.188-4.439,15.943c1.061,5.752,4.642,10.604,9.825,13.313c8.197,4.284,17.049,6.358,25.814,6.358 c15.532,0,30.795-6.512,41.67-18.775l61.804-69.718C290.219,78.417,288.099,43.148,265.117,22.764zM133.998,208.581l-2.659-2.356c-7.204-6.383-18.259-5.712-24.64,1.489l-28.254,31.886 c-6.308,7.105-17.222,7.764-24.327,1.473l-9.879-8.764c-7.115-6.301-7.783-17.212-1.467-24.325l61.806-69.721 c5.124-5.787,13.555-7.442,20.504-4.028c7.986,3.924,17.683,2.016,23.595-4.656l0.222-0.25c3.798-4.288,5.396-9.979,4.386-15.614 c-1.01-5.636-4.484-10.417-9.533-13.119c-22.828-12.22-50.769-7.22-67.947,12.165l-61.81,69.707v0.001 c-20.371,22.978-18.252,58.246,4.726,78.622l9.877,8.749c10.583,9.383,23.77,13.992,36.913,13.992 c15.394,0,30.724-6.327,41.718-18.724l28.258-31.886C141.88,226.003,141.224,214.987,133.998,208.581z', + path: 'M265.117,22.764l-9.877-8.737c-23.003-20.398-58.227-18.283-78.618,4.726l-28.267,31.89 c-6.38,7.199-5.717,18.251,1.479,24.637l2.653,2.354c7.221,6.402,18.239,5.741,24.646-1.481l28.265-31.889 c6.305-7.107,17.227-7.761,24.338-1.466l9.865,8.752c7.113,6.303,7.783,17.223,1.469,24.334l-61.808,69.726 c-5.231,5.911-13.791,7.505-20.816,3.875c-7.682-3.967-17.051-2.224-22.787,4.245l-0.482,0.544 c-3.881,4.377-5.499,10.188-4.439,15.943c1.061,5.752,4.642,10.604,9.825,13.313c8.197,4.284,17.049,6.358,25.814,6.358 c15.532,0,30.795-6.512,41.67-18.775l61.804-69.718C290.219,78.417,288.099,43.148,265.117,22.764zM133.998,208.581l-2.659-2.356c-7.204-6.383-18.259-5.712-24.64,1.489l-28.254,31.886 c-6.308,7.105-17.222,7.764-24.327,1.473l-9.879-8.764c-7.115-6.301-7.783-17.212-1.467-24.325l61.806-69.721 c5.124-5.787,13.555-7.442,20.504-4.028c7.986,3.924,17.683,2.016,23.595-4.656l0.222-0.25c3.798-4.288,5.396-9.979,4.386-15.614 c-1.01-5.636-4.484-10.417-9.533-13.119c-22.828-12.22-50.769-7.22-67.947,12.165l-61.81,69.707v0.001 c-20.371,22.978-18.252,58.246,4.726,78.622l9.877,8.749c10.583,9.383,23.77,13.992,36.913,13.992 c15.394,0,30.724-6.327,41.718-18.724l28.258-31.886C141.88,226.003,141.224,214.987,133.998,208.581z', viewBox: '0 0 283.842 283.842', ratio: 1, }, messageRequest: { - path: - 'M68.987 7.718H27.143c-2.73 0-5.25.473-7.508 1.417-2.257.945-4.357 2.363-6.248 4.253-1.89 1.89-3.308 3.99-4.253 6.248-.945 2.257-1.417 4.778-1.417 7.508V67.99c0 2.73.472 5.25 1.417 7.508.945 2.258 2.363 4.357 4.253 6.248 1.942 1.891 4.043 3.359 6.3 4.252 2.258.945 4.726 1.418 7.456 1.418h17.956c2.101 0 3.833 1.732 3.833 3.832 0 .473-.105.893-.21 1.313-.683 2.521-1.418 5.041-2.258 7.455-.893 2.574-1.837 4.988-2.888 7.352-.525 1.207-1.155 2.361-1.837 3.57 3.675-1.629 7.14-3.518 10.343-5.619 3.36-2.205 6.51-4.672 9.397-7.35 2.94-2.73 5.565-5.723 7.98-8.926.735-.996 1.89-1.521 3.045-1.521H87.94c2.73 0 5.198-.473 7.455-1.418 2.258-.945 4.358-2.363 6.301-4.252 1.89-1.891 3.308-3.99 4.253-6.248.944-2.258 1.417-4.779 1.417-7.508V27.249c0-2.73-.473-5.25-1.417-7.508-.945-2.258-2.363-4.357-4.253-6.248s-3.99-3.308-6.248-4.252c-2.258-.945-4.777-1.418-7.508-1.418H68.987v-.105zm-7.282 47.97h-9.976V54.61c0-1.833.188-3.327.574-4.471.386-1.155.958-2.193 1.721-3.143.762-.951 2.474-2.619 5.136-5.005 1.416-1.251 2.124-2.396 2.124-3.435 0-1.047-.287-1.852-.851-2.434-.574-.573-1.435-.864-2.59-.864-1.247 0-2.269.446-3.083 1.338-.816.883-1.335 2.444-1.561 4.657l-10.191-1.368c.349-4.054 1.711-7.314 4.078-9.787 2.376-2.473 6.015-3.706 10.917-3.706 3.818 0 6.893.863 9.24 2.58 3.184 2.338 4.778 5.441 4.778 9.321 0 1.61-.412 3.172-1.237 4.666-.815 1.493-2.501 3.327-5.037 5.48-1.766 1.523-2.887 2.735-3.353 3.657-.456.914-.689 2.116-.689 3.592zm-10.325 2.87h10.693v8.532H51.38v-8.532zM46.097.053H87.94c3.675 0 7.141.683 10.396 1.995 3.202 1.312 6.143 3.308 8.768 5.933 2.626 2.625 4.621 5.565 5.934 8.768 1.312 3.203 1.994 6.667 1.994 10.396V67.99c0 3.729-.683 7.193-1.994 10.396-1.313 3.201-3.308 6.141-5.934 8.768-2.625 2.625-5.565 4.566-8.768 5.932-3.202 1.313-6.668 1.996-10.396 1.996H74.395c-2.362 2.992-4.935 5.826-7.665 8.4-3.255 3.045-6.72 5.773-10.448 8.189-3.728 2.467-7.718 4.621-11.971 6.457-4.2 1.838-8.715 3.361-13.44 4.621-1.365.367-2.835-.053-3.833-1.156-1.417-1.574-1.26-3.988.315-5.406 2.205-1.943 4.095-3.938 5.618-5.934 1.47-1.941 2.678-3.938 3.57-5.984v-.053c.998-2.205 1.89-4.463 2.678-6.721.263-.787.525-1.627.788-2.467H27.091c-3.675 0-7.14-.684-10.396-1.996-3.203-1.313-6.143-3.307-8.768-5.932-2.625-2.625-4.62-5.566-5.933-8.768C.682 75.078 0 71.613 0 67.938V27.091c0-3.676.682-7.141 1.995-10.396 1.313-3.203 3.308-6.143 5.933-8.768 2.625-2.625 5.565-4.62 8.768-5.933S23.363 0 27.091 0h18.953l.053.053z', + path: 'M68.987 7.718H27.143c-2.73 0-5.25.473-7.508 1.417-2.257.945-4.357 2.363-6.248 4.253-1.89 1.89-3.308 3.99-4.253 6.248-.945 2.257-1.417 4.778-1.417 7.508V67.99c0 2.73.472 5.25 1.417 7.508.945 2.258 2.363 4.357 4.253 6.248 1.942 1.891 4.043 3.359 6.3 4.252 2.258.945 4.726 1.418 7.456 1.418h17.956c2.101 0 3.833 1.732 3.833 3.832 0 .473-.105.893-.21 1.313-.683 2.521-1.418 5.041-2.258 7.455-.893 2.574-1.837 4.988-2.888 7.352-.525 1.207-1.155 2.361-1.837 3.57 3.675-1.629 7.14-3.518 10.343-5.619 3.36-2.205 6.51-4.672 9.397-7.35 2.94-2.73 5.565-5.723 7.98-8.926.735-.996 1.89-1.521 3.045-1.521H87.94c2.73 0 5.198-.473 7.455-1.418 2.258-.945 4.358-2.363 6.301-4.252 1.89-1.891 3.308-3.99 4.253-6.248.944-2.258 1.417-4.779 1.417-7.508V27.249c0-2.73-.473-5.25-1.417-7.508-.945-2.258-2.363-4.357-4.253-6.248s-3.99-3.308-6.248-4.252c-2.258-.945-4.777-1.418-7.508-1.418H68.987v-.105zm-7.282 47.97h-9.976V54.61c0-1.833.188-3.327.574-4.471.386-1.155.958-2.193 1.721-3.143.762-.951 2.474-2.619 5.136-5.005 1.416-1.251 2.124-2.396 2.124-3.435 0-1.047-.287-1.852-.851-2.434-.574-.573-1.435-.864-2.59-.864-1.247 0-2.269.446-3.083 1.338-.816.883-1.335 2.444-1.561 4.657l-10.191-1.368c.349-4.054 1.711-7.314 4.078-9.787 2.376-2.473 6.015-3.706 10.917-3.706 3.818 0 6.893.863 9.24 2.58 3.184 2.338 4.778 5.441 4.778 9.321 0 1.61-.412 3.172-1.237 4.666-.815 1.493-2.501 3.327-5.037 5.48-1.766 1.523-2.887 2.735-3.353 3.657-.456.914-.689 2.116-.689 3.592zm-10.325 2.87h10.693v8.532H51.38v-8.532zM46.097.053H87.94c3.675 0 7.141.683 10.396 1.995 3.202 1.312 6.143 3.308 8.768 5.933 2.626 2.625 4.621 5.565 5.934 8.768 1.312 3.203 1.994 6.667 1.994 10.396V67.99c0 3.729-.683 7.193-1.994 10.396-1.313 3.201-3.308 6.141-5.934 8.768-2.625 2.625-5.565 4.566-8.768 5.932-3.202 1.313-6.668 1.996-10.396 1.996H74.395c-2.362 2.992-4.935 5.826-7.665 8.4-3.255 3.045-6.72 5.773-10.448 8.189-3.728 2.467-7.718 4.621-11.971 6.457-4.2 1.838-8.715 3.361-13.44 4.621-1.365.367-2.835-.053-3.833-1.156-1.417-1.574-1.26-3.988.315-5.406 2.205-1.943 4.095-3.938 5.618-5.934 1.47-1.941 2.678-3.938 3.57-5.984v-.053c.998-2.205 1.89-4.463 2.678-6.721.263-.787.525-1.627.788-2.467H27.091c-3.675 0-7.14-.684-10.396-1.996-3.203-1.313-6.143-3.307-8.768-5.932-2.625-2.625-4.62-5.566-5.933-8.768C.682 75.078 0 71.613 0 67.938V27.091c0-3.676.682-7.141 1.995-10.396 1.313-3.203 3.308-6.143 5.933-8.768 2.625-2.625 5.565-4.62 8.768-5.933S23.363 0 27.091 0h18.953l.053.053z', viewBox: '0 0 115.031 122.88', ratio: 1, }, microphone: { - path: - 'M43.362728,18.444286 C46.0752408,18.444286 48.2861946,16.2442453 48.2861946,13.5451212 L48.2861946,6.8991648 C48.2861946,4.20004074 46.0752408,2 43.362728,2 C40.6502153,2 38.4392615,4.20004074 38.4392615,6.8991648 L38.4392615,13.5451212 C38.4392615,16.249338 40.6502153,18.444286 43.362728,18.444286 Z M51.0908304,12.9238134 C51.4388509,12.9238134 51.7203381,13.2039112 51.7203381,13.5502139 C51.7203381,17.9248319 48.3066664,21.5202689 43.9871178,21.8411082 L43.9871178,21.8411082 L43.9871178,25.747199 L47.2574869,25.747199 C47.6055074,25.747199 47.8869946,26.0272968 47.8869946,26.3735995 C47.8869946,26.7199022 47.6055074,27 47.2574869,27 L47.2574869,27 L39.4628512,27 C39.1148307,27 38.8333435,26.7199022 38.8333435,26.3735995 C38.8333435,26.0272968 39.1148307,25.747199 39.4628512,25.747199 L39.4628512,25.747199 L42.7332204,25.747199 L42.7332204,21.8411082 C38.4136717,21.5253616 35,17.9248319 35,13.5502139 C35,13.2039112 35.2814872,12.9238134 35.6295077,12.9238134 C35.9775282,12.9238134 36.2538974,13.2039112 36.2436615,13.5502139 C36.2436615,17.4512121 39.4321435,20.623956 43.3524921,20.623956 C47.2728408,20.623956 50.4613228,17.4512121 50.4613228,13.5502139 C50.4613228,13.2039112 50.7428099,12.9238134 51.0908304,12.9238134 Z M43.362728,3.24770829 C45.3843177,3.24770829 47.0322972,4.88755347 47.0322972,6.8991648 L47.0322972,13.5451212 C47.0322972,15.5567325 45.3843177,17.1965777 43.362728,17.1965777 C41.3411383,17.1965777 39.6931589,15.5567325 39.6931589,13.5451212 L39.6931589,6.8991648 C39.6931589,4.88755347 41.3411383,3.24770829 43.362728,3.24770829', + path: 'M43.362728,18.444286 C46.0752408,18.444286 48.2861946,16.2442453 48.2861946,13.5451212 L48.2861946,6.8991648 C48.2861946,4.20004074 46.0752408,2 43.362728,2 C40.6502153,2 38.4392615,4.20004074 38.4392615,6.8991648 L38.4392615,13.5451212 C38.4392615,16.249338 40.6502153,18.444286 43.362728,18.444286 Z M51.0908304,12.9238134 C51.4388509,12.9238134 51.7203381,13.2039112 51.7203381,13.5502139 C51.7203381,17.9248319 48.3066664,21.5202689 43.9871178,21.8411082 L43.9871178,21.8411082 L43.9871178,25.747199 L47.2574869,25.747199 C47.6055074,25.747199 47.8869946,26.0272968 47.8869946,26.3735995 C47.8869946,26.7199022 47.6055074,27 47.2574869,27 L47.2574869,27 L39.4628512,27 C39.1148307,27 38.8333435,26.7199022 38.8333435,26.3735995 C38.8333435,26.0272968 39.1148307,25.747199 39.4628512,25.747199 L39.4628512,25.747199 L42.7332204,25.747199 L42.7332204,21.8411082 C38.4136717,21.5253616 35,17.9248319 35,13.5502139 C35,13.2039112 35.2814872,12.9238134 35.6295077,12.9238134 C35.9775282,12.9238134 36.2538974,13.2039112 36.2436615,13.5502139 C36.2436615,17.4512121 39.4321435,20.623956 43.3524921,20.623956 C47.2728408,20.623956 50.4613228,17.4512121 50.4613228,13.5502139 C50.4613228,13.2039112 50.7428099,12.9238134 51.0908304,12.9238134 Z M43.362728,3.24770829 C45.3843177,3.24770829 47.0322972,4.88755347 47.0322972,6.8991648 L47.0322972,13.5451212 C47.0322972,15.5567325 45.3843177,17.1965777 43.362728,17.1965777 C41.3411383,17.1965777 39.6931589,15.5567325 39.6931589,13.5451212 L39.6931589,6.8991648 C39.6931589,4.88755347 41.3411383,3.24770829 43.362728,3.24770829', viewBox: '28 0 30 30', ratio: 1, }, microphoneFull: { - path: - 'M44,28c-0.552,0-1,0.447-1,1v6c0,7.72-6.28,14-14,14s-14-6.28-14-14v-6c0-0.553-0.448-1-1-1s-1,0.447-1,1v6c0,8.485,6.644,15.429,15,15.949V56h-5c-0.552,0-1,0.447-1,1s0.448,1,1,1h12c0.552,0,1-0.447,1-1s-0.448-1-1-1h-5v-5.051c8.356-0.52,15-7.465,15-15.949v-6C45,28.447,44.552,28,44,28zM29,46c6.065,0,11-4.935,11-11V11c0-6.065-4.935-11-11-11S18,4.935,18,11v24C18,41.065,22.935,46,29,46z', + path: 'M44,28c-0.552,0-1,0.447-1,1v6c0,7.72-6.28,14-14,14s-14-6.28-14-14v-6c0-0.553-0.448-1-1-1s-1,0.447-1,1v6c0,8.485,6.644,15.429,15,15.949V56h-5c-0.552,0-1,0.447-1,1s0.448,1,1,1h12c0.552,0,1-0.447,1-1s-0.448-1-1-1h-5v-5.051c8.356-0.52,15-7.465,15-15.949v-6C45,28.447,44.552,28,44,28zM29,46c6.065,0,11-4.935,11-11V11c0-6.065-4.935-11-11-11S18,4.935,18,11v24C18,41.065,22.935,46,29,46z', viewBox: '0 0 58 58', ratio: 1, }, moon: { - path: - 'M15.72 14.4723C13.3767 14.439 11.14 13.4593 9.49209 11.7444C7.84421 10.0296 6.91721 7.7169 6.91097 5.3051C6.92029 3.79321 7.29571 2.30757 8.00328 0.982563C8.06586 0.867604 8.09359 0.735993 8.08286 0.604685C8.07213 0.473378 8.02344 0.348388 7.94309 0.245798C7.86273 0.143207 7.75438 0.0677123 7.63197 0.0290483C7.50957 -0.00961566 7.37872 -0.00968327 7.25627 0.0288491C5.60062 0.574051 4.10352 1.53621 2.90088 2.82796C1.69824 4.11972 0.828148 5.70015 0.369624 7.42578C-0.088901 9.15141 -0.121348 10.9676 0.275232 12.7094C0.671811 14.4512 1.48485 16.0635 2.64054 17.3998C3.79623 18.7362 5.25797 19.7544 6.89303 20.3618C8.52809 20.9693 10.2847 21.1468 12.0033 20.8783C13.722 20.6099 15.3483 19.9039 16.7345 18.8244C18.1208 17.745 19.2231 16.3263 19.9413 14.6972C19.9949 14.5772 20.0124 14.4435 19.9913 14.3133C19.9703 14.183 19.9118 14.0623 19.8234 13.9666C19.735 13.8709 19.6207 13.8048 19.4954 13.7766C19.3701 13.7485 19.2394 13.7597 19.1203 13.8087C18.0407 14.2592 16.885 14.4847 15.72 14.4723Z', + path: 'M15.72 14.4723C13.3767 14.439 11.14 13.4593 9.49209 11.7444C7.84421 10.0296 6.91721 7.7169 6.91097 5.3051C6.92029 3.79321 7.29571 2.30757 8.00328 0.982563C8.06586 0.867604 8.09359 0.735993 8.08286 0.604685C8.07213 0.473378 8.02344 0.348388 7.94309 0.245798C7.86273 0.143207 7.75438 0.0677123 7.63197 0.0290483C7.50957 -0.00961566 7.37872 -0.00968327 7.25627 0.0288491C5.60062 0.574051 4.10352 1.53621 2.90088 2.82796C1.69824 4.11972 0.828148 5.70015 0.369624 7.42578C-0.088901 9.15141 -0.121348 10.9676 0.275232 12.7094C0.671811 14.4512 1.48485 16.0635 2.64054 17.3998C3.79623 18.7362 5.25797 19.7544 6.89303 20.3618C8.52809 20.9693 10.2847 21.1468 12.0033 20.8783C13.722 20.6099 15.3483 19.9039 16.7345 18.8244C18.1208 17.745 19.2231 16.3263 19.9413 14.6972C19.9949 14.5772 20.0124 14.4435 19.9913 14.3133C19.9703 14.183 19.9118 14.0623 19.8234 13.9666C19.735 13.8709 19.6207 13.8048 19.4954 13.7766C19.3701 13.7485 19.2394 13.7597 19.1203 13.8087C18.0407 14.2592 16.885 14.4847 15.72 14.4723Z', viewBox: '0 0 20 21', ratio: 1, }, movie: { - path: - 'M18,4L20,8H17L15,4H13L15,8H12L10,4H8L10,8H7L5,4H4A2,2 0 0,0 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V4H18Z', + path: 'M18,4L20,8H17L15,4H13L15,8H12L10,4H8L10,8H7L5,4H4A2,2 0 0,0 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V4H18Z', viewBox: '0 0 24 24', ratio: 1, }, mute: { - path: - 'M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM12,6.5c2.49,0 4,2.02 4,4.5v0.1l2,2L18,11c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.24,0.06 -0.47,0.15 -0.69,0.23l1.64,1.64c0.18,-0.02 0.36,-0.05 0.55,-0.05zM5.41,3.35L4,4.76l2.81,2.81C6.29,8.57 6,9.74 6,11v5l-2,2v1h14.24l1.74,1.74 1.41,-1.41L5.41,3.35zM16,17L8,17v-6c0,-0.68 0.12,-1.32 0.34,-1.9L16,16.76L16,17z', + path: 'M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM12,6.5c2.49,0 4,2.02 4,4.5v0.1l2,2L18,11c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.24,0.06 -0.47,0.15 -0.69,0.23l1.64,1.64c0.18,-0.02 0.36,-0.05 0.55,-0.05zM5.41,3.35L4,4.76l2.81,2.81C6.29,8.57 6,9.74 6,11v5l-2,2v1h14.24l1.74,1.74 1.41,-1.41L5.41,3.35zM16,17L8,17v-6c0,-0.68 0.12,-1.32 0.34,-1.9L16,16.76L16,17z', viewBox: '0 0 24 24', ratio: 1, }, oxen: { - path: - 'M1033.9 1319.4h1v122h-1c-1.7-1.9-1.6-4.3-1.6-6.6v-108.7c0-2.4-.2-4.8 1.6-6.7zM773.4 1441.4c-21 0-42-.1-63 .1-4.2 0-6.9-1.4-9.2-4.6-10.2-14.5-16.9-30.2-18.5-48.2-2.3-24.5 4.9-45.8 19-65.4 1.9-2.7 4.3-4.1 7.9-4.1 42.3.1 84.6.2 127 0 4.5 0 5.8 1.4 5.5 5.7-.4 5.1-.3 10.3 0 15.5.3 4-1.1 5.1-5.1 5-22.8-.2-45.7-.1-68.5-.1-15 0-30 .1-45-.1-3.1 0-4.8 1-6 3.9-1.7 4-2.9 8.1-4.1 12.3-1.1 3.8 0 5 4 5 23.3-.1 46.7-.1 70-.1 13.3 0 26.7.1 40-.1 3.8-.1 5 1.1 4.8 4.8-.3 5.5-.3 11 0 16.5.3 4.5-1 6-5.7 5.9-33.8-.2-67.6-.1-101.5-.1-2.8 0-5.7.3-8.5-.1-3.8-.4-4.1 1.4-3.4 4.3 0 .2 0 .3.1.5 3 16.2 4.4 17.3 20.6 17.3 34.3 0 68.6.1 103-.1 4 0 5.7.9 5.4 5.2-.4 5.5-.3 11 0 16.5.2 3.6-1.2 4.5-4.6 4.5-21.6-.1-42.9 0-64.2 0zM397.2 1319.3c20 0 40 .1 60-.1 3.6 0 5.8 1.3 7.8 4.1 13.9 19.4 20.7 40.9 18.8 64.7-1.5 18.8-8.7 35.7-19.9 50.8-1.4 1.9-3.2 2.6-5.6 2.6-40.8-.1-81.6-.1-122.4 0-2.2 0-3.7-.7-5-2.5-11.5-14.8-18.2-31.4-20-50.1-2.2-21.7 3.6-41.4 14.7-59.7.2-.3.3-.6.5-.9 3.6-6.3 8-9.6 16.2-9.2 18.2.9 36.6.3 54.9.3zM1033.9 1319.4v121.9c-5.7 0-11.4-.3-17 .2-6.6.6-12-1.9-17-5.8-32.5-25.1-64.9-50.2-97.4-75.2-1.6-1.2-3.2-2.3-5.6-4.1v5.8c0 24.5-.1 49 .1 73.5 0 4.7-1.4 6-5.9 5.7-6.3-.4-12.7-.2-19 0-2.8.1-4.2-.6-4.2-3.8.1-38.2.1-76.3 0-114.5 0-3.2 1.3-3.9 4.2-3.9 6 .2 12 .1 18 .1 7.3 0 12.1 5.2 17.3 9.1 21.4 16.3 42.7 32.7 64 49.2 11.3 8.7 22.5 17.4 33.9 26.2 1.3-1.8.7-3.5.7-5.1 0-24.8.1-49.7-.1-74.5 0-3.9 1-5.3 5-5.1 7.6.5 15.3.3 23 .3zM488.8 1319.4c14.1 0 27-.1 39.9.1 4.3.1 7.9 2.6 11 5.3 12.9 11.2 25.9 22.3 38.7 33.7 2.7 2.4 4.6 1.8 6.9-.2 10.5-9.1 21.1-18.3 31.6-27.5 2.9-2.5 5.7-5.1 8.7-7.5 2.8-2.2 6.1-3.8 9.6-3.9 12.6-.2 25.2-.1 37.9-.1.1 2.1-1.4 2.8-2.5 3.7-13.3 11.5-26.7 23-40 34.5-7.9 6.8-15.8 13.7-23.8 20.5-2.5 2.1-1.5 3.5.4 5.1 10.1 8.6 20.2 17.3 30.3 26 12.2 10.5 24.4 21 37.5 32.2-14.2 0-27.4.4-40.6-.2-7.3-.3-11.7-6.5-16.9-10.9-10.8-9.1-21.4-18.5-32-27.8-2.4-2.1-4.5-2.3-7-.2-12.5 10.9-25.2 21.7-37.6 32.7-4.8 4.3-10 6.7-16.7 6.5-11.3-.3-22.7-.1-34.6-.1 4.5-5.4 9.8-9.2 14.6-13.5 13.3-11.8 26.9-23.2 40.4-34.8 3.9-3.3 7.8-6.7 11.8-9.9 2.6-2.1 2.6-3.5-.1-5.8-14-11.8-27.7-23.8-41.6-35.7-8.3-7-16.7-14.3-25.9-22.2zM153.9 1273.4c5.4 1.3 10.9 2.3 16.3 3.9 41.5 12.6 67.5 40.1 76.6 82.4 6.7 31.3-.6 60.2-19.9 85.5-18.2 23.9-42.5 37.5-72.4 41.2-27.9 3.4-53.1-3.5-75.7-19.9-24.1-17.5-37.8-41.4-42.8-70.6-.2-1-.1-2-1.1-2.6v-26c1.6-19.6 9.1-36.9 20.8-52.5 15.4-20.4 35.8-33.4 60.5-39.7 4.2-1.1 8.5-.7 12.7-1.8 8.3.1 16.6.1 25 .1zM142.8 1379.4c2.3 6 8.1 8.5 12.4 12.5 10.7 9.7 21.8 18.9 32.8 28.3 4.8 4.1 9.4 8.3 14.8 12.9H80.9c6.2-5.5 12-10.5 17.8-15.6 13.2-11.4 26.4-22.7 39.6-34.1 1.2-1.1 2.7-2.1 2.6-4 .7-.5 1.3-.5 1.9 0zM142.8 1379.4h-1.9c-12.9-11-25.7-22-38.6-33-7-6-14-12.1-21.6-18.7h122.5c-20.6 17.6-40.5 34.6-60.4 51.7zM397.2 1415.4c-14.2 0-28.3-.2-42.5.1-5.1.1-8-1.1-10.1-6.3-7.9-20.1-7.8-39.8 1-59.5 1.4-3.1 3.1-4.4 6.8-4.4 30 .2 60 .1 90 0 3.6 0 5.2 1.3 6.6 4.5 4.1 9.3 6.4 19 6.7 28.9.3 11.9-2.5 23.4-7.6 34.2-1.2 2.6-3.2 2.4-5.4 2.4-15.2.1-30.4.1-45.5.1zM153.9 1273.4c292.2 0 584.3 0 876.5-.1 3.7 0 4.7.8 4.6 4.6-.3 13.8-.1 27.7-.1 41.5-.4.4-.9.7-1.4.9-6.8 1-13.6.3-20.4.5-5.2.2-5.7.5-5.7 5.8 0 23.3 0 46.6-.1 70 0 2.7 1.2 6.5-1.8 7.7-2.5 1.1-4.6-2-6.7-3.6-31.9-24.6-64-49-95.8-73.8-6.7-5.3-13.9-6.3-22-6.1-13.3.4-11.7-1.3-11.7 11.8-.1 33.5 0 67 0 100.4 0 6.8.1 7 7 7 4.5 0 9 .1 13.5 0 5.1-.1 5.7-.6 5.7-5.8 0-23 0-46 .1-69 0-2.9-1.2-6.9 1.6-8.4 2.9-1.5 5.3 2 7.6 3.7 31.8 24.5 63.7 48.8 95.4 73.5 5.2 4 10.7 6.4 17.4 6.1 5.3-.3 10.7-.6 15.9.4.5.3 1 .6 1.4.9 0 15-.1 30 .1 45 0 2.5-.6 3.5-3.1 3-.5-.1-1 0-1.5 0-330.3 0-660.7 0-991 .1-3.7 0-4.6-.8-4.6-4.6.2-30.5.1-61 .1-91.5 3.4 1 2.6 4.3 3.1 6.6 3.1 16 9.4 30.6 19.2 43.5 18.3 24.2 42.6 38.3 72.8 41.7 30.1 3.5 56.7-4.8 79.9-24.2 21.4-17.9 33.4-40.9 36.9-68.7 6.6-53-29.2-105-84.8-115.9-2.8-.4-6.5.7-8.1-3zM128.9 1273.4c-2.8 1.6-6 1.5-9 2.2-20.6 4.6-38.6 14.1-53.5 28.9-16.7 16.7-26.7 36.9-30.5 60.2-.2 1-.1 2-1 2.6 0-30.3 0-60.5-.1-90.8 0-2.8.6-3.3 3.3-3.3 30.3.2 60.5.2 90.8.2zM107.2 0C48 0 0 48 0 107.2s48 107.2 107.2 107.2 107.2-48 107.2-107.2S166.4 0 107.2 0zM45.3 160.3l61.7-53.4 61.7 53.4H45.3zm61.7-53.5L45.3 53.4h123.4L107 106.8zM426.9 46H297.7s-22.6 25.2-22.4 60.9c.2 35.7 22.4 60.9 22.4 60.9h129s21.7-25.8 22.4-60.4C449.7 73 426.9 46 426.9 46zm-6 61.4c-.4 19.9-9.1 34.9-9.1 34.9h-99.3s-8.8-14.6-8.9-35.2c-.1-20.6 8.9-35.2 8.9-35.2h99.4s9.3 15.5 9 35.5zM454.3 46l70.6 60.9-70.6 60.9h38.4s6.7-.1 12.8-5.6c6.1-5.5 41.5-35.9 41.5-35.9l45.5 39.1s3 2.3 9.8 2.5 37.7 0 37.7 0L569.4 107 640 46h-38.3s-5.2-.9-12.7 5.5c-7.5 6.4-41.8 36.3-41.8 36.3l-44.7-38s-2.7-3.8-12.2-3.8c-9.5-.1-36 0-36 0zM806.8 71.9V46h-137s-22.6 25.2-22.4 60.9 22.4 60.9 22.4 60.9h137v-25.6H684.6s-5.4-8.9-7.8-22.6h120V92.9H677c2.5-12.8 7.6-21.1 7.6-21.1h122.2zM833.1 167.9V46h20.4s5.9-.2 10.7 3.4c4.7 3.6 107.4 82.5 107.4 82.5V46h28.3v121.8h-21.6s-5.6.4-10.3-3.4c-4.7-3.7-106.5-82-106.5-82v85.4l-28.4.1z', + path: 'M1033.9 1319.4h1v122h-1c-1.7-1.9-1.6-4.3-1.6-6.6v-108.7c0-2.4-.2-4.8 1.6-6.7zM773.4 1441.4c-21 0-42-.1-63 .1-4.2 0-6.9-1.4-9.2-4.6-10.2-14.5-16.9-30.2-18.5-48.2-2.3-24.5 4.9-45.8 19-65.4 1.9-2.7 4.3-4.1 7.9-4.1 42.3.1 84.6.2 127 0 4.5 0 5.8 1.4 5.5 5.7-.4 5.1-.3 10.3 0 15.5.3 4-1.1 5.1-5.1 5-22.8-.2-45.7-.1-68.5-.1-15 0-30 .1-45-.1-3.1 0-4.8 1-6 3.9-1.7 4-2.9 8.1-4.1 12.3-1.1 3.8 0 5 4 5 23.3-.1 46.7-.1 70-.1 13.3 0 26.7.1 40-.1 3.8-.1 5 1.1 4.8 4.8-.3 5.5-.3 11 0 16.5.3 4.5-1 6-5.7 5.9-33.8-.2-67.6-.1-101.5-.1-2.8 0-5.7.3-8.5-.1-3.8-.4-4.1 1.4-3.4 4.3 0 .2 0 .3.1.5 3 16.2 4.4 17.3 20.6 17.3 34.3 0 68.6.1 103-.1 4 0 5.7.9 5.4 5.2-.4 5.5-.3 11 0 16.5.2 3.6-1.2 4.5-4.6 4.5-21.6-.1-42.9 0-64.2 0zM397.2 1319.3c20 0 40 .1 60-.1 3.6 0 5.8 1.3 7.8 4.1 13.9 19.4 20.7 40.9 18.8 64.7-1.5 18.8-8.7 35.7-19.9 50.8-1.4 1.9-3.2 2.6-5.6 2.6-40.8-.1-81.6-.1-122.4 0-2.2 0-3.7-.7-5-2.5-11.5-14.8-18.2-31.4-20-50.1-2.2-21.7 3.6-41.4 14.7-59.7.2-.3.3-.6.5-.9 3.6-6.3 8-9.6 16.2-9.2 18.2.9 36.6.3 54.9.3zM1033.9 1319.4v121.9c-5.7 0-11.4-.3-17 .2-6.6.6-12-1.9-17-5.8-32.5-25.1-64.9-50.2-97.4-75.2-1.6-1.2-3.2-2.3-5.6-4.1v5.8c0 24.5-.1 49 .1 73.5 0 4.7-1.4 6-5.9 5.7-6.3-.4-12.7-.2-19 0-2.8.1-4.2-.6-4.2-3.8.1-38.2.1-76.3 0-114.5 0-3.2 1.3-3.9 4.2-3.9 6 .2 12 .1 18 .1 7.3 0 12.1 5.2 17.3 9.1 21.4 16.3 42.7 32.7 64 49.2 11.3 8.7 22.5 17.4 33.9 26.2 1.3-1.8.7-3.5.7-5.1 0-24.8.1-49.7-.1-74.5 0-3.9 1-5.3 5-5.1 7.6.5 15.3.3 23 .3zM488.8 1319.4c14.1 0 27-.1 39.9.1 4.3.1 7.9 2.6 11 5.3 12.9 11.2 25.9 22.3 38.7 33.7 2.7 2.4 4.6 1.8 6.9-.2 10.5-9.1 21.1-18.3 31.6-27.5 2.9-2.5 5.7-5.1 8.7-7.5 2.8-2.2 6.1-3.8 9.6-3.9 12.6-.2 25.2-.1 37.9-.1.1 2.1-1.4 2.8-2.5 3.7-13.3 11.5-26.7 23-40 34.5-7.9 6.8-15.8 13.7-23.8 20.5-2.5 2.1-1.5 3.5.4 5.1 10.1 8.6 20.2 17.3 30.3 26 12.2 10.5 24.4 21 37.5 32.2-14.2 0-27.4.4-40.6-.2-7.3-.3-11.7-6.5-16.9-10.9-10.8-9.1-21.4-18.5-32-27.8-2.4-2.1-4.5-2.3-7-.2-12.5 10.9-25.2 21.7-37.6 32.7-4.8 4.3-10 6.7-16.7 6.5-11.3-.3-22.7-.1-34.6-.1 4.5-5.4 9.8-9.2 14.6-13.5 13.3-11.8 26.9-23.2 40.4-34.8 3.9-3.3 7.8-6.7 11.8-9.9 2.6-2.1 2.6-3.5-.1-5.8-14-11.8-27.7-23.8-41.6-35.7-8.3-7-16.7-14.3-25.9-22.2zM153.9 1273.4c5.4 1.3 10.9 2.3 16.3 3.9 41.5 12.6 67.5 40.1 76.6 82.4 6.7 31.3-.6 60.2-19.9 85.5-18.2 23.9-42.5 37.5-72.4 41.2-27.9 3.4-53.1-3.5-75.7-19.9-24.1-17.5-37.8-41.4-42.8-70.6-.2-1-.1-2-1.1-2.6v-26c1.6-19.6 9.1-36.9 20.8-52.5 15.4-20.4 35.8-33.4 60.5-39.7 4.2-1.1 8.5-.7 12.7-1.8 8.3.1 16.6.1 25 .1zM142.8 1379.4c2.3 6 8.1 8.5 12.4 12.5 10.7 9.7 21.8 18.9 32.8 28.3 4.8 4.1 9.4 8.3 14.8 12.9H80.9c6.2-5.5 12-10.5 17.8-15.6 13.2-11.4 26.4-22.7 39.6-34.1 1.2-1.1 2.7-2.1 2.6-4 .7-.5 1.3-.5 1.9 0zM142.8 1379.4h-1.9c-12.9-11-25.7-22-38.6-33-7-6-14-12.1-21.6-18.7h122.5c-20.6 17.6-40.5 34.6-60.4 51.7zM397.2 1415.4c-14.2 0-28.3-.2-42.5.1-5.1.1-8-1.1-10.1-6.3-7.9-20.1-7.8-39.8 1-59.5 1.4-3.1 3.1-4.4 6.8-4.4 30 .2 60 .1 90 0 3.6 0 5.2 1.3 6.6 4.5 4.1 9.3 6.4 19 6.7 28.9.3 11.9-2.5 23.4-7.6 34.2-1.2 2.6-3.2 2.4-5.4 2.4-15.2.1-30.4.1-45.5.1zM153.9 1273.4c292.2 0 584.3 0 876.5-.1 3.7 0 4.7.8 4.6 4.6-.3 13.8-.1 27.7-.1 41.5-.4.4-.9.7-1.4.9-6.8 1-13.6.3-20.4.5-5.2.2-5.7.5-5.7 5.8 0 23.3 0 46.6-.1 70 0 2.7 1.2 6.5-1.8 7.7-2.5 1.1-4.6-2-6.7-3.6-31.9-24.6-64-49-95.8-73.8-6.7-5.3-13.9-6.3-22-6.1-13.3.4-11.7-1.3-11.7 11.8-.1 33.5 0 67 0 100.4 0 6.8.1 7 7 7 4.5 0 9 .1 13.5 0 5.1-.1 5.7-.6 5.7-5.8 0-23 0-46 .1-69 0-2.9-1.2-6.9 1.6-8.4 2.9-1.5 5.3 2 7.6 3.7 31.8 24.5 63.7 48.8 95.4 73.5 5.2 4 10.7 6.4 17.4 6.1 5.3-.3 10.7-.6 15.9.4.5.3 1 .6 1.4.9 0 15-.1 30 .1 45 0 2.5-.6 3.5-3.1 3-.5-.1-1 0-1.5 0-330.3 0-660.7 0-991 .1-3.7 0-4.6-.8-4.6-4.6.2-30.5.1-61 .1-91.5 3.4 1 2.6 4.3 3.1 6.6 3.1 16 9.4 30.6 19.2 43.5 18.3 24.2 42.6 38.3 72.8 41.7 30.1 3.5 56.7-4.8 79.9-24.2 21.4-17.9 33.4-40.9 36.9-68.7 6.6-53-29.2-105-84.8-115.9-2.8-.4-6.5.7-8.1-3zM128.9 1273.4c-2.8 1.6-6 1.5-9 2.2-20.6 4.6-38.6 14.1-53.5 28.9-16.7 16.7-26.7 36.9-30.5 60.2-.2 1-.1 2-1 2.6 0-30.3 0-60.5-.1-90.8 0-2.8.6-3.3 3.3-3.3 30.3.2 60.5.2 90.8.2zM107.2 0C48 0 0 48 0 107.2s48 107.2 107.2 107.2 107.2-48 107.2-107.2S166.4 0 107.2 0zM45.3 160.3l61.7-53.4 61.7 53.4H45.3zm61.7-53.5L45.3 53.4h123.4L107 106.8zM426.9 46H297.7s-22.6 25.2-22.4 60.9c.2 35.7 22.4 60.9 22.4 60.9h129s21.7-25.8 22.4-60.4C449.7 73 426.9 46 426.9 46zm-6 61.4c-.4 19.9-9.1 34.9-9.1 34.9h-99.3s-8.8-14.6-8.9-35.2c-.1-20.6 8.9-35.2 8.9-35.2h99.4s9.3 15.5 9 35.5zM454.3 46l70.6 60.9-70.6 60.9h38.4s6.7-.1 12.8-5.6c6.1-5.5 41.5-35.9 41.5-35.9l45.5 39.1s3 2.3 9.8 2.5 37.7 0 37.7 0L569.4 107 640 46h-38.3s-5.2-.9-12.7 5.5c-7.5 6.4-41.8 36.3-41.8 36.3l-44.7-38s-2.7-3.8-12.2-3.8c-9.5-.1-36 0-36 0zM806.8 71.9V46h-137s-22.6 25.2-22.4 60.9 22.4 60.9 22.4 60.9h137v-25.6H684.6s-5.4-8.9-7.8-22.6h120V92.9H677c2.5-12.8 7.6-21.1 7.6-21.1h122.2zM833.1 167.9V46h20.4s5.9-.2 10.7 3.4c4.7 3.6 107.4 82.5 107.4 82.5V46h28.3v121.8h-21.6s-5.6.4-10.3-3.4c-4.7-3.7-106.5-82-106.5-82v85.4l-28.4.1z', viewBox: '0 0 1000 214.3', ratio: 4, }, externalLink: { - path: - 'M20.576 2.125C19.37.921 17.697.687 15.562.687H6.555c-2.104 0-3.779.234-4.985 1.438C.366 3.33.146 4.988.146 7.086v8.942c0 2.139.22 3.788 1.423 4.99 1.208 1.205 2.881 1.437 5.004 1.437h8.99c2.134 0 3.809-.232 5.013-1.438 1.203-1.203 1.424-2.85 1.424-4.99V7.116c0-2.137-.22-3.798-1.424-4.99Zm-.872 4.662v9.56c0 1.226-.155 2.338-.813 2.998-.648.646-1.783.814-2.998.814H6.254c-1.215 0-2.352-.168-3.01-.814-.646-.66-.803-1.772-.803-2.999v-9.53c0-1.237.157-2.368.803-3.016.658-.658 1.805-.817 3.04-.817h9.609c1.215 0 2.35.169 2.998.817.658.658.813 1.77.813 2.987ZM14.735 14.61c.584 0 .96-.442.96-1.061V8.094c0-.802-.45-1.162-1.176-1.162H9.033c-.635 0-1.04.376-1.04.959s.412.959 1.053.959h1.979l1.607-.188-1.741 1.592-4.106 4.115c-.198.198-.33.475-.33.75 0 .617.424 1.02 1.018 1.02.317 0 .578-.116.788-.324l4.095-4.093 1.582-1.723-.171 1.694v1.87c0 .634.376 1.048.968 1.048Z', + path: 'M20.576 2.125C19.37.921 17.697.687 15.562.687H6.555c-2.104 0-3.779.234-4.985 1.438C.366 3.33.146 4.988.146 7.086v8.942c0 2.139.22 3.788 1.423 4.99 1.208 1.205 2.881 1.437 5.004 1.437h8.99c2.134 0 3.809-.232 5.013-1.438 1.203-1.203 1.424-2.85 1.424-4.99V7.116c0-2.137-.22-3.798-1.424-4.99Zm-.872 4.662v9.56c0 1.226-.155 2.338-.813 2.998-.648.646-1.783.814-2.998.814H6.254c-1.215 0-2.352-.168-3.01-.814-.646-.66-.803-1.772-.803-2.999v-9.53c0-1.237.157-2.368.803-3.016.658-.658 1.805-.817 3.04-.817h9.609c1.215 0 2.35.169 2.998.817.658.658.813 1.77.813 2.987ZM14.735 14.61c.584 0 .96-.442.96-1.061V8.094c0-.802-.45-1.162-1.176-1.162H9.033c-.635 0-1.04.376-1.04.959s.412.959 1.053.959h1.979l1.607-.188-1.741 1.592-4.106 4.115c-.198.198-.33.475-.33.75 0 .617.424 1.02 1.018 1.02.317 0 .578-.116.788-.324l4.095-4.093 1.582-1.723-.171 1.694v1.87c0 .634.376 1.048.968 1.048Z', viewBox: '0 0 22 23', ratio: 1, }, pause: { - path: - 'M14.22,45.665v186.013c0,25.223,16.711,45.66,37.327,45.66c20.618,0,37.339-20.438,37.339-45.66V45.665c0-25.211-16.721-45.657-37.339-45.657C30.931,0,14.22,20.454,14.22,45.665zM225.78,0c-20.614,0-37.325,20.446-37.325,45.657V231.67c0,25.223,16.711,45.652,37.325,45.652s37.338-20.43,37.338-45.652V45.665C263.109,20.454,246.394,0,225.78,0z', + path: 'M14.22,45.665v186.013c0,25.223,16.711,45.66,37.327,45.66c20.618,0,37.339-20.438,37.339-45.66V45.665c0-25.211-16.721-45.657-37.339-45.657C30.931,0,14.22,20.454,14.22,45.665zM225.78,0c-20.614,0-37.325,20.446-37.325,45.657V231.67c0,25.223,16.711,45.652,37.325,45.652s37.338-20.43,37.338-45.652V45.665C263.109,20.454,246.394,0,225.78,0z', viewBox: '0 0 277.338 277.338', ratio: 1, }, pencil: { - path: - 'M4,16.4142136 L4,20 L7.58578644,20 L19.5857864,8 L16,4.41421356 L4,16.4142136 Z M16.7071068,2.29289322 L21.7071068,7.29289322 C22.0976311,7.68341751 22.0976311,8.31658249 21.7071068,8.70710678 L8.70710678,21.7071068 C8.5195704,21.8946432 8.26521649,22 8,22 L3,22 C2.44771525,22 2,21.5522847 2,21 L2,16 C2,15.7347835 2.10535684,15.4804296 2.29289322,15.2928932 L15.2928932,2.29289322 C15.6834175,1.90236893 16.3165825,1.90236893 16.7071068,2.29289322 Z', + path: 'M4,16.4142136 L4,20 L7.58578644,20 L19.5857864,8 L16,4.41421356 L4,16.4142136 Z M16.7071068,2.29289322 L21.7071068,7.29289322 C22.0976311,7.68341751 22.0976311,8.31658249 21.7071068,8.70710678 L8.70710678,21.7071068 C8.5195704,21.8946432 8.26521649,22 8,22 L3,22 C2.44771525,22 2,21.5522847 2,21 L2,16 C2,15.7347835 2.10535684,15.4804296 2.29289322,15.2928932 L15.2928932,2.29289322 C15.6834175,1.90236893 16.3165825,1.90236893 16.7071068,2.29289322 Z', viewBox: '1 1 21 21', ratio: 1, }, phone: { - path: - 'M2.8,180.875c46.6,134,144.7,286.2,282.9,424.399c138.2,138.2,290.4,236.301,424.4,282.9c18.2,6.3,38.3,1.8,52-11.8 l92.7-92.7l21.6-21.6c19.5-19.5,19.5-51.2,0-70.7l-143.5-143.4c-19.5-19.5-51.2-19.5-70.7,0l-38.899,38.9 c-20.2,20.2-52.4,22.2-75,4.6c-44.7-34.8-89-73.899-131.9-116.8c-42.9-42.9-82-87.2-116.8-131.9c-17.601-22.6-15.601-54.7,4.6-75 l38.9-38.9c19.5-19.5,19.5-51.2,0-70.7l-143.5-143.5c-19.5-19.5-51.2-19.5-70.7,0l-21.6,21.6l-92.7,92.7 C1,142.575-3.5,162.675,2.8,180.875z', + path: 'M2.8,180.875c46.6,134,144.7,286.2,282.9,424.399c138.2,138.2,290.4,236.301,424.4,282.9c18.2,6.3,38.3,1.8,52-11.8 l92.7-92.7l21.6-21.6c19.5-19.5,19.5-51.2,0-70.7l-143.5-143.4c-19.5-19.5-51.2-19.5-70.7,0l-38.899,38.9 c-20.2,20.2-52.4,22.2-75,4.6c-44.7-34.8-89-73.899-131.9-116.8c-42.9-42.9-82-87.2-116.8-131.9c-17.601-22.6-15.601-54.7,4.6-75 l38.9-38.9c19.5-19.5,19.5-51.2,0-70.7l-143.5-143.5c-19.5-19.5-51.2-19.5-70.7,0l-21.6,21.6l-92.7,92.7 C1,142.575-3.5,162.675,2.8,180.875z', viewBox: '0 0 891.024 891.024', ratio: 1, }, pin: { - path: - 'M83.88.451L122.427 39c.603.601.603 1.585 0 2.188l-13.128 13.125c-.602.604-1.586.604-2.187 0l-3.732-3.73-17.303 17.3c3.882 14.621.095 30.857-11.37 42.32-.266.268-.535.529-.808.787-1.004.955-.843.949-1.813-.021L47.597 86.48 0 122.867l36.399-47.584L11.874 50.76c-.978-.98-.896-.826.066-1.837.24-.251.485-.503.734-.753C24.137 36.707 40.376 32.917 54.996 36.8l17.301-17.3-3.733-3.732c-.601-.601-.601-1.585 0-2.188L81.691.451c.604-.601 1.588-.601 2.189 0z', + path: 'M83.88.451L122.427 39c.603.601.603 1.585 0 2.188l-13.128 13.125c-.602.604-1.586.604-2.187 0l-3.732-3.73-17.303 17.3c3.882 14.621.095 30.857-11.37 42.32-.266.268-.535.529-.808.787-1.004.955-.843.949-1.813-.021L47.597 86.48 0 122.867l36.399-47.584L11.874 50.76c-.978-.98-.896-.826.066-1.837.24-.251.485-.503.734-.753C24.137 36.707 40.376 32.917 54.996 36.8l17.301-17.3-3.733-3.732c-.601-.601-.601-1.585 0-2.188L81.691.451c.604-.601 1.588-.601 2.189 0z', viewBox: '0 0 122.879 122.867', ratio: 1, }, play: { - path: - 'M29.462,15.707c0,1.061-0.562,2.043-1.474,2.583L6.479,30.999c-0.47,0.275-0.998,0.417-1.526,0.417 c-0.513,0-1.026-0.131-1.487-0.396c-0.936-0.534-1.513-1.527-1.513-2.604V2.998c0-1.077,0.578-2.07,1.513-2.605 C4.402-0.139,5.553-0.13,6.479,0.415l21.509,12.709C28.903,13.664,29.462,14.646,29.462,15.707z', + path: 'M29.462,15.707c0,1.061-0.562,2.043-1.474,2.583L6.479,30.999c-0.47,0.275-0.998,0.417-1.526,0.417 c-0.513,0-1.026-0.131-1.487-0.396c-0.936-0.534-1.513-1.527-1.513-2.604V2.998c0-1.077,0.578-2.07,1.513-2.605 C4.402-0.139,5.553-0.13,6.479,0.415l21.509,12.709C28.903,13.664,29.462,14.646,29.462,15.707z', viewBox: '1 1 31.417 31.417', ratio: 1, }, plus: { - path: - 'm405.332031 192h-170.664062v-170.667969c0-11.773437-9.558594-21.332031-21.335938-21.332031-11.773437 0-21.332031 9.558594-21.332031 21.332031v170.667969h-170.667969c-11.773437 0-21.332031 9.558594-21.332031 21.332031 0 11.777344 9.558594 21.335938 21.332031 21.335938h170.667969v170.664062c0 11.777344 9.558594 21.335938 21.332031 21.335938 11.777344 0 21.335938-9.558594 21.335938-21.335938v-170.664062h170.664062c11.777344 0 21.335938-9.558594 21.335938-21.335938 0-11.773437-9.558594-21.332031-21.335938-21.332031zm0 0', + path: 'm405.332031 192h-170.664062v-170.667969c0-11.773437-9.558594-21.332031-21.335938-21.332031-11.773437 0-21.332031 9.558594-21.332031 21.332031v170.667969h-170.667969c-11.773437 0-21.332031 9.558594-21.332031 21.332031 0 11.777344 9.558594 21.335938 21.332031 21.335938h170.667969v170.664062c0 11.777344 9.558594 21.335938 21.332031 21.335938 11.777344 0 21.335938-9.558594 21.335938-21.335938v-170.664062h170.664062c11.777344 0 21.335938-9.558594 21.335938-21.335938 0-11.773437-9.558594-21.332031-21.335938-21.332031zm0 0', viewBox: '0 0 427 427', ratio: 1, }, plusThin: { - path: - 'M97.4,21.9H78.2V2.7c0-1.3-1.1-2.4-2.4-2.4c-1.3,0-2.4,1.1-2.4,2.4v19.2H54.2c-1.3,0-2.4,1.1-2.4,2.4c0,1.3,1.1,2.4,2.4,2.4h19.2v19.2c0,1.3,1.1,2.4,2.4,2.4c1.3,0,2.4-1.1,2.4-2.4V26.7h19.2c1.3,0,2.4-1.1,2.4-2.4C99.8,23,98.7,21.9,97.4,21.9zM46.3,22.5H25.5V1.7c0-0.8-0.7-1.5-1.5-1.5s-1.5,0.7-1.5,1.5v20.8H1.7c-0.8,0-1.5,0.7-1.5,1.5s0.7,1.5,1.5,1.5h20.8v20.8c0,0.8,0.7,1.5,1.5,1.5s1.5-0.7,1.5-1.5V25.5h20.8c0.8,0,1.5-0.7,1.5-1.5S47.1,22.5,46.3,22.5z', + path: 'M97.4,21.9H78.2V2.7c0-1.3-1.1-2.4-2.4-2.4c-1.3,0-2.4,1.1-2.4,2.4v19.2H54.2c-1.3,0-2.4,1.1-2.4,2.4c0,1.3,1.1,2.4,2.4,2.4h19.2v19.2c0,1.3,1.1,2.4,2.4,2.4c1.3,0,2.4-1.1,2.4-2.4V26.7h19.2c1.3,0,2.4-1.1,2.4-2.4C99.8,23,98.7,21.9,97.4,21.9zM46.3,22.5H25.5V1.7c0-0.8-0.7-1.5-1.5-1.5s-1.5,0.7-1.5,1.5v20.8H1.7c-0.8,0-1.5,0.7-1.5,1.5s0.7,1.5,1.5,1.5h20.8v20.8c0,0.8,0.7,1.5,1.5,1.5s1.5-0.7,1.5-1.5V25.5h20.8c0.8,0,1.5-0.7,1.5-1.5S47.1,22.5,46.3,22.5z', viewBox: '0 0 48 48', ratio: 1, }, @@ -386,152 +339,127 @@ export const icons = { ratio: 1, }, reply: { - path: - 'M4,3 C4.55228475,3 5,3.44771525 5,4 L5,4 L5,11 C5,12.6568542 6.34314575,14 8,14 L8,14 L17.585,14 L14.2928932,10.7071068 C13.9324093,10.3466228 13.9046797,9.77939176 14.2097046,9.38710056 L14.2928932,9.29289322 C14.6834175,8.90236893 15.3165825,8.90236893 15.7071068,9.29289322 L15.7071068,9.29289322 L20.7071068,14.2928932 C20.7355731,14.3213595 20.7623312,14.3515341 20.787214,14.3832499 C20.788658,14.3849951 20.7902348,14.3870172 20.7918027,14.389044 C20.8140715,14.4179625 20.8348358,14.4480862 20.8539326,14.4793398 C20.8613931,14.4913869 20.8685012,14.5036056 20.8753288,14.5159379 C20.8862061,14.5357061 20.8966234,14.5561086 20.9063462,14.5769009 C20.914321,14.5939015 20.9218036,14.6112044 20.9287745,14.628664 C20.9366843,14.6484208 20.9438775,14.6682023 20.9504533,14.6882636 C20.9552713,14.7031487 20.9599023,14.7185367 20.9641549,14.734007 C20.9701664,14.7555635 20.9753602,14.7772539 20.9798348,14.7992059 C20.9832978,14.8166247 20.9863719,14.834051 20.9889822,14.8515331 C20.9962388,14.8996379 21,14.9493797 21,15 L20.9962979,14.9137692 C20.9978436,14.9317345 20.9989053,14.9497336 20.9994829,14.9677454 L21,15 C21,15.0112225 20.9998151,15.0224019 20.9994483,15.0335352 C20.9988772,15.050591 20.997855,15.0679231 20.996384,15.0852242 C20.994564,15.1070574 20.9920941,15.1281144 20.9889807,15.1489612 C20.9863719,15.165949 20.9832978,15.1833753 20.9797599,15.2007258 C20.9753602,15.2227461 20.9701664,15.2444365 20.964279,15.2658396 C20.9599023,15.2814633 20.9552713,15.2968513 20.9502619,15.3121425 C20.9438775,15.3317977 20.9366843,15.3515792 20.928896,15.3710585 C20.9218036,15.3887956 20.914321,15.4060985 20.9063266,15.4232215 C20.8974314,15.4421635 20.8879327,15.4609002 20.8778732,15.4792864 C20.8703855,15.4931447 20.862375,15.5070057 20.8540045,15.5207088 C20.8382813,15.546275 20.8215099,15.5711307 20.8036865,15.5951593 C20.774687,15.6343256 20.7425008,15.6717127 20.7071068,15.7071068 L20.787214,15.6167501 C20.7849289,15.6196628 20.7826279,15.6225624 20.7803112,15.625449 L20.7071068,15.7071068 L15.7071068,20.7071068 C15.3165825,21.0976311 14.6834175,21.0976311 14.2928932,20.7071068 C13.9023689,20.3165825 13.9023689,19.6834175 14.2928932,19.2928932 L14.2928932,19.2928932 L17.585,16 L8,16 C5.3112453,16 3.11818189,13.8776933 3.00461951,11.2168896 L3,11 L3,4 C3,3.44771525 3.44771525,3 4,3', + path: 'M4,3 C4.55228475,3 5,3.44771525 5,4 L5,4 L5,11 C5,12.6568542 6.34314575,14 8,14 L8,14 L17.585,14 L14.2928932,10.7071068 C13.9324093,10.3466228 13.9046797,9.77939176 14.2097046,9.38710056 L14.2928932,9.29289322 C14.6834175,8.90236893 15.3165825,8.90236893 15.7071068,9.29289322 L15.7071068,9.29289322 L20.7071068,14.2928932 C20.7355731,14.3213595 20.7623312,14.3515341 20.787214,14.3832499 C20.788658,14.3849951 20.7902348,14.3870172 20.7918027,14.389044 C20.8140715,14.4179625 20.8348358,14.4480862 20.8539326,14.4793398 C20.8613931,14.4913869 20.8685012,14.5036056 20.8753288,14.5159379 C20.8862061,14.5357061 20.8966234,14.5561086 20.9063462,14.5769009 C20.914321,14.5939015 20.9218036,14.6112044 20.9287745,14.628664 C20.9366843,14.6484208 20.9438775,14.6682023 20.9504533,14.6882636 C20.9552713,14.7031487 20.9599023,14.7185367 20.9641549,14.734007 C20.9701664,14.7555635 20.9753602,14.7772539 20.9798348,14.7992059 C20.9832978,14.8166247 20.9863719,14.834051 20.9889822,14.8515331 C20.9962388,14.8996379 21,14.9493797 21,15 L20.9962979,14.9137692 C20.9978436,14.9317345 20.9989053,14.9497336 20.9994829,14.9677454 L21,15 C21,15.0112225 20.9998151,15.0224019 20.9994483,15.0335352 C20.9988772,15.050591 20.997855,15.0679231 20.996384,15.0852242 C20.994564,15.1070574 20.9920941,15.1281144 20.9889807,15.1489612 C20.9863719,15.165949 20.9832978,15.1833753 20.9797599,15.2007258 C20.9753602,15.2227461 20.9701664,15.2444365 20.964279,15.2658396 C20.9599023,15.2814633 20.9552713,15.2968513 20.9502619,15.3121425 C20.9438775,15.3317977 20.9366843,15.3515792 20.928896,15.3710585 C20.9218036,15.3887956 20.914321,15.4060985 20.9063266,15.4232215 C20.8974314,15.4421635 20.8879327,15.4609002 20.8778732,15.4792864 C20.8703855,15.4931447 20.862375,15.5070057 20.8540045,15.5207088 C20.8382813,15.546275 20.8215099,15.5711307 20.8036865,15.5951593 C20.774687,15.6343256 20.7425008,15.6717127 20.7071068,15.7071068 L20.787214,15.6167501 C20.7849289,15.6196628 20.7826279,15.6225624 20.7803112,15.625449 L20.7071068,15.7071068 L15.7071068,20.7071068 C15.3165825,21.0976311 14.6834175,21.0976311 14.2928932,20.7071068 C13.9023689,20.3165825 13.9023689,19.6834175 14.2928932,19.2928932 L14.2928932,19.2928932 L17.585,16 L8,16 C5.3112453,16 3.11818189,13.8776933 3.00461951,11.2168896 L3,11 L3,4 C3,3.44771525 3.44771525,3 4,3', viewBox: '-0.5 0.3 23 22', ratio: 1, }, search: { - path: - 'M16.5260392,16.2168725 L13.3593725,12.879521 C13.2567964,12.7688667 13.1425871,12.670895 13.0189558,12.5875028 L12.2272892,12.0118096 L12.2272892,12.0118096 C13.8556873,9.88830358 13.8708099,6.85915463 12.2637039,4.71770761 C10.6565979,2.57626059 7.85617522,1.8940349 5.52036814,3.07492811 C3.18456106,4.25582133 1.93676065,6.98467116 2.51570128,9.64591861 C3.09464191,12.3071661 5.34581319,14.190565 7.93645584,14.1810881 C9.19365936,14.1814736 10.4136244,13.7313239 11.3960392,12.9045511 L11.3960392,12.9045511 L11.9897892,13.738889 C12.0602158,13.8463397 12.1397052,13.9468684 12.2272892,14.0392507 L15.3939558,17.3766021 C15.4682801,17.4555775 15.5694535,17.5 15.6749975,17.5 C15.7805415,17.5 15.8817149,17.4555775 15.9560392,17.3766021 L16.5102058,16.7925656 C16.6604889,16.6359051 16.6674599,16.3824439 16.5260392,16.2168725 Z M7.93645584,12.5124123 C5.7503287,12.5124123 3.9781225,10.6446834 3.9781225,8.340723 C3.9781225,6.03676259 5.7503287,4.16903366 7.93645584,4.16903366 C10.122583,4.16903366 11.8947892,6.03676259 11.8947892,8.340723 C11.8947892,9.44712381 11.4777517,10.5082093 10.7354202,11.2905528 C9.99308868,12.0728963 8.98627111,12.5124123 7.93645584,12.5124123', + path: 'M16.5260392,16.2168725 L13.3593725,12.879521 C13.2567964,12.7688667 13.1425871,12.670895 13.0189558,12.5875028 L12.2272892,12.0118096 L12.2272892,12.0118096 C13.8556873,9.88830358 13.8708099,6.85915463 12.2637039,4.71770761 C10.6565979,2.57626059 7.85617522,1.8940349 5.52036814,3.07492811 C3.18456106,4.25582133 1.93676065,6.98467116 2.51570128,9.64591861 C3.09464191,12.3071661 5.34581319,14.190565 7.93645584,14.1810881 C9.19365936,14.1814736 10.4136244,13.7313239 11.3960392,12.9045511 L11.3960392,12.9045511 L11.9897892,13.738889 C12.0602158,13.8463397 12.1397052,13.9468684 12.2272892,14.0392507 L15.3939558,17.3766021 C15.4682801,17.4555775 15.5694535,17.5 15.6749975,17.5 C15.7805415,17.5 15.8817149,17.4555775 15.9560392,17.3766021 L16.5102058,16.7925656 C16.6604889,16.6359051 16.6674599,16.3824439 16.5260392,16.2168725 Z M7.93645584,12.5124123 C5.7503287,12.5124123 3.9781225,10.6446834 3.9781225,8.340723 C3.9781225,6.03676259 5.7503287,4.16903366 7.93645584,4.16903366 C10.122583,4.16903366 11.8947892,6.03676259 11.8947892,8.340723 C11.8947892,9.44712381 11.4777517,10.5082093 10.7354202,11.2905528 C9.99308868,12.0728963 8.98627111,12.5124123 7.93645584,12.5124123', viewBox: '2.3 1.8 15 16', ratio: 1, }, send: { - path: - 'M12.3266,4.71786207 L2.2646,4.71786207 L5.98482857,0.989241379 C6.20434286,0.768862069 6.20768571,0.408896552 5.99225714,0.184344828 C5.77608571,-0.0398275862 5.4236,-0.042862069 5.20408571,0.176758621 L0.5226,4.86882759 C0.416371429,4.97541379 0.3562,5.12068966 0.355821604,5.27241379 C0.355085714,5.42413793 0.413771429,5.57017241 0.518885714,5.67751724 L5.20817143,10.4663103 C5.317,10.5774483 5.45962857,10.6328276 5.60225714,10.6328276 C5.74451429,10.6328276 5.88714286,10.5774483 5.99597143,10.4663103 C6.21362857,10.2440345 6.21362857,9.88368966 5.99597143,9.6617931 L2.26905714,5.8557931 L12.3266,5.8557931 C12.6341429,5.8557931 12.8837429,5.60089655 12.8837429,5.28682759 C12.8837429,4.97237931 12.6341429,4.71786207 12.3266,4.71786207', + path: 'M12.3266,4.71786207 L2.2646,4.71786207 L5.98482857,0.989241379 C6.20434286,0.768862069 6.20768571,0.408896552 5.99225714,0.184344828 C5.77608571,-0.0398275862 5.4236,-0.042862069 5.20408571,0.176758621 L0.5226,4.86882759 C0.416371429,4.97541379 0.3562,5.12068966 0.355821604,5.27241379 C0.355085714,5.42413793 0.413771429,5.57017241 0.518885714,5.67751724 L5.20817143,10.4663103 C5.317,10.5774483 5.45962857,10.6328276 5.60225714,10.6328276 C5.74451429,10.6328276 5.88714286,10.5774483 5.99597143,10.4663103 C6.21362857,10.2440345 6.21362857,9.88368966 5.99597143,9.6617931 L2.26905714,5.8557931 L12.3266,5.8557931 C12.6341429,5.8557931 12.8837429,5.60089655 12.8837429,5.28682759 C12.8837429,4.97237931 12.6341429,4.71786207 12.3266,4.71786207', viewBox: '-1 -2 15 15', ratio: 1, }, star: { - path: - 'M9.80779568,8.70262392 C9.66225594,8.99747141 9.38107073,9.20193068 9.05571654,9.24948607 L4.1495,9.9666031 L7.69882113,13.4236419 C7.93469487,13.6533829 8.0423575,13.9845141 7.98669695,14.3090433 L7.14926913,19.1916734 L11.5356371,16.8849265 C11.8270199,16.7316912 12.1751567,16.7316912 12.4665396,16.8849265 L16.8529075,19.1916734 L16.0154797,14.3090433 C15.9598192,13.9845141 16.0674818,13.6533829 16.3033555,13.4236419 L19.8526767,9.9666031 L14.9464601,9.24948607 C14.6211059,9.20193068 14.3399207,8.99747141 14.194381,8.70262392 L12.0010883,4.25925434 L9.80779568,8.70262392 Z M8.24682697,7.3464661 L11.104381,1.55737608 C11.4712164,0.814207972 12.5309603,0.814207972 12.8977957,1.55737608 L15.7553497,7.3464661 L22.1457165,8.28051393 C22.9656312,8.40035674 23.2924147,9.40819801 22.6988211,9.98635811 L18.0756101,14.4893656 L19.166697,20.8509567 C19.3068155,21.6679189 18.4492666,22.2908819 17.7156371,21.9050735 L12.0010883,18.8998497 L6.28653961,21.9050735 C5.55291004,22.2908819 4.69536119,21.6679189 4.83547972,20.8509567 L5.92656655,14.4893656 L1.30335554,9.98635811 C0.709762006,9.40819801 1.03654545,8.40035674 1.85646012,8.28051393 L8.24682697,7.3464661', + path: 'M9.80779568,8.70262392 C9.66225594,8.99747141 9.38107073,9.20193068 9.05571654,9.24948607 L4.1495,9.9666031 L7.69882113,13.4236419 C7.93469487,13.6533829 8.0423575,13.9845141 7.98669695,14.3090433 L7.14926913,19.1916734 L11.5356371,16.8849265 C11.8270199,16.7316912 12.1751567,16.7316912 12.4665396,16.8849265 L16.8529075,19.1916734 L16.0154797,14.3090433 C15.9598192,13.9845141 16.0674818,13.6533829 16.3033555,13.4236419 L19.8526767,9.9666031 L14.9464601,9.24948607 C14.6211059,9.20193068 14.3399207,8.99747141 14.194381,8.70262392 L12.0010883,4.25925434 L9.80779568,8.70262392 Z M8.24682697,7.3464661 L11.104381,1.55737608 C11.4712164,0.814207972 12.5309603,0.814207972 12.8977957,1.55737608 L15.7553497,7.3464661 L22.1457165,8.28051393 C22.9656312,8.40035674 23.2924147,9.40819801 22.6988211,9.98635811 L18.0756101,14.4893656 L19.166697,20.8509567 C19.3068155,21.6679189 18.4492666,22.2908819 17.7156371,21.9050735 L12.0010883,18.8998497 L6.28653961,21.9050735 C5.55291004,22.2908819 4.69536119,21.6679189 4.83547972,20.8509567 L5.92656655,14.4893656 L1.30335554,9.98635811 C0.709762006,9.40819801 1.03654545,8.40035674 1.85646012,8.28051393 L8.24682697,7.3464661', viewBox: '0 0 22 21', ratio: 1, }, shield: { - path: - 'M 349.875 62.773438 L 205.875 2.773438 C 197.015625 -0.898438 187.058594 -0.898438 178.199219 2.773438 L 34.199219 62.773438 C 20.773438 68.324219 12 81.449219 12 96 C 12 244.875 97.875 347.773438 178.125 381.226563 C 186.976563 384.898438 196.949219 384.898438 205.800781 381.226563 C 270.074219 354.449219 372 261.976563 372 96 C 372 81.449219 363.226563 68.324219 349.875 62.773438 Z M 192.074219 334.726563 L 192 48.976563 L 323.925781 103.949219 C 321.449219 217.5 262.351563 299.773438 192.074219 334.726563 Z M 192.074219 334.726563', + path: 'M 349.875 62.773438 L 205.875 2.773438 C 197.015625 -0.898438 187.058594 -0.898438 178.199219 2.773438 L 34.199219 62.773438 C 20.773438 68.324219 12 81.449219 12 96 C 12 244.875 97.875 347.773438 178.125 381.226563 C 186.976563 384.898438 196.949219 384.898438 205.800781 381.226563 C 270.074219 354.449219 372 261.976563 372 96 C 372 81.449219 363.226563 68.324219 349.875 62.773438 Z M 192.074219 334.726563 L 192 48.976563 L 323.925781 103.949219 C 321.449219 217.5 262.351563 299.773438 192.074219 334.726563 Z M 192.074219 334.726563', viewBox: '0 0 384 384', ratio: 1, }, stopwatch: { - path: - 'm282.523438 1.34375c-8.800782-.886719-17.640626-1.328125-26.484376-1.3242188h-.265624c-14.636719.2421878-26.339844 12.2421878-26.214844 26.8828128v105.53125c-.035156 3.554687.6875 7.074218 2.117187 10.328125 4.582031 10.90625 15.863281 17.429687 27.597657 15.964843 13.554687-2.03125 23.5-13.792968 23.25-27.492187v-76.484375c98.890624 12.980469 173.726562 95.839844 176.59375 195.539062 2.867187 99.699219-67.078126 186.726563-165.058594 205.367188-97.980469 18.644531-195-36.613281-228.945313-130.398438-33.945312-93.785156 5.226563-198.339843 92.441407-246.730468 11.59375-6.566406 16.445312-20.769532 11.289062-33.054688l-.03125-.074218c-2.890625-6.988282-8.625-12.40625-15.765625-14.902344-7.136719-2.492188-15-1.820313-21.613281 1.84375-110.347656 61.484375-159.351563 194.269531-115.402344 312.695312 43.945312 118.429688 167.710938 187.097656 291.453125 161.710938 123.742187-25.386719 210.472656-137.238282 204.238281-263.40625-6.230468-126.164063-103.558594-228.925782-229.199218-241.996094zm0 0 M159.300781 170.949219c10.652344 28.050781 45.503907 94.28125 71.574219 122.480469 16.027344 18.09375 43.394531 20.515624 62.351562 5.523437 9.484376-7.957031 15.191407-19.527344 15.738282-31.894531.542968-12.363282-4.132813-24.390625-12.878906-33.148438-27.265626-27.261718-96.464844-63.382812-125.480469-74.398437-3.25-1.222657-6.917969-.417969-9.363281 2.050781-2.441407 2.472656-3.203126 6.148438-1.941407 9.386719zm0 0', + path: 'm282.523438 1.34375c-8.800782-.886719-17.640626-1.328125-26.484376-1.3242188h-.265624c-14.636719.2421878-26.339844 12.2421878-26.214844 26.8828128v105.53125c-.035156 3.554687.6875 7.074218 2.117187 10.328125 4.582031 10.90625 15.863281 17.429687 27.597657 15.964843 13.554687-2.03125 23.5-13.792968 23.25-27.492187v-76.484375c98.890624 12.980469 173.726562 95.839844 176.59375 195.539062 2.867187 99.699219-67.078126 186.726563-165.058594 205.367188-97.980469 18.644531-195-36.613281-228.945313-130.398438-33.945312-93.785156 5.226563-198.339843 92.441407-246.730468 11.59375-6.566406 16.445312-20.769532 11.289062-33.054688l-.03125-.074218c-2.890625-6.988282-8.625-12.40625-15.765625-14.902344-7.136719-2.492188-15-1.820313-21.613281 1.84375-110.347656 61.484375-159.351563 194.269531-115.402344 312.695312 43.945312 118.429688 167.710938 187.097656 291.453125 161.710938 123.742187-25.386719 210.472656-137.238282 204.238281-263.40625-6.230468-126.164063-103.558594-228.925782-229.199218-241.996094zm0 0 M159.300781 170.949219c10.652344 28.050781 45.503907 94.28125 71.574219 122.480469 16.027344 18.09375 43.394531 20.515624 62.351562 5.523437 9.484376-7.957031 15.191407-19.527344 15.738282-31.894531.542968-12.363282-4.132813-24.390625-12.878906-33.148438-27.265626-27.261718-96.464844-63.382812-125.480469-74.398437-3.25-1.222657-6.917969-.417969-9.363281 2.050781-2.441407 2.472656-3.203126 6.148438-1.941407 9.386719zm0 0', viewBox: '0 0 512 512', ratio: 1, }, sun: { - path: - 'M16.6209 7.62069C11.8081 7.62069 7.89156 11.5372 7.89156 16.35C7.89156 21.1628 11.8081 25.0793 16.6209 25.0793C21.4337 25.0793 25.3502 21.1628 25.3502 16.35C25.3502 11.5372 21.4337 7.62069 16.6209 7.62069ZM16.6209 22.5852C13.1768 22.5852 10.3856 19.794 10.3856 16.35C10.3856 12.906 13.1768 10.1148 16.6209 10.1148C20.0649 10.1148 22.8561 12.906 22.8561 16.35C22.8561 19.794 20.0649 22.5852 16.6209 22.5852ZM16.6209 5.1266C17.3093 5.1266 17.8679 4.568 17.8679 3.87956V1.38547C17.8679 0.697025 17.3093 0.138428 16.6209 0.138428C15.9324 0.138428 15.3738 0.697025 15.3738 1.38547V3.87956C15.3738 4.568 15.9324 5.1266 16.6209 5.1266ZM16.6209 27.5734C15.9324 27.5734 15.3738 28.132 15.3738 28.8204V31.3145C15.3738 32.0029 15.9324 32.5615 16.6209 32.5615C17.3093 32.5615 17.8679 32.0029 17.8679 31.3145V28.8204C17.8679 28.132 17.3093 27.5734 16.6209 27.5734ZM26.3196 8.4131L28.083 6.64971C28.5701 6.16258 28.5701 5.37344 28.083 4.88631C27.5959 4.39918 26.8067 4.39918 26.3196 4.88631L24.5562 6.64971C24.0691 7.13683 24.0691 7.92598 24.5562 8.4131C25.0433 8.90023 25.8325 8.90023 26.3196 8.4131ZM6.92214 24.2869L5.15874 26.0503C4.67162 26.5374 4.67162 27.3265 5.15874 27.8137C5.64587 28.3008 6.43501 28.3008 6.92214 27.8137L8.68554 26.0503C9.17266 25.5616 9.17266 24.774 8.68554 24.2869C8.19849 23.7997 7.40927 23.7981 6.92214 24.2869ZM5.39747 16.35C5.39747 15.6615 4.83888 15.1029 4.15043 15.1029H1.65634C0.967899 15.1029 0.409302 15.6615 0.409302 16.35C0.409302 17.0384 0.967899 17.597 1.65634 17.597H4.15043C4.83888 17.597 5.39747 17.0384 5.39747 16.35ZM31.5854 15.1029H29.0913C28.4028 15.1029 27.8442 15.6615 27.8442 16.35C27.8442 17.0384 28.4028 17.597 29.0913 17.597H31.5854C32.2738 17.597 32.8324 17.0384 32.8324 16.35C32.8324 15.6615 32.2738 15.1029 31.5854 15.1029ZM6.9205 8.4131C7.40771 8.90023 8.19685 8.90023 8.6839 8.4131C9.1711 7.92598 9.1711 7.13683 8.6839 6.64971L6.9205 4.88631C6.43338 4.39918 5.64431 4.39918 5.15711 4.88631C4.66998 5.37344 4.66998 6.16258 5.15711 6.64971L6.9205 8.4131ZM26.3212 24.2852C25.8325 23.7981 25.0449 23.7981 24.5578 24.2852C24.0706 24.7724 24.0691 25.5615 24.5578 26.0486L26.3212 27.812C26.8083 28.2992 27.5974 28.2992 28.0845 27.812C28.5717 27.3249 28.5717 26.5358 28.0845 26.0486L26.3212 24.2852Z', + path: 'M16.6209 7.62069C11.8081 7.62069 7.89156 11.5372 7.89156 16.35C7.89156 21.1628 11.8081 25.0793 16.6209 25.0793C21.4337 25.0793 25.3502 21.1628 25.3502 16.35C25.3502 11.5372 21.4337 7.62069 16.6209 7.62069ZM16.6209 22.5852C13.1768 22.5852 10.3856 19.794 10.3856 16.35C10.3856 12.906 13.1768 10.1148 16.6209 10.1148C20.0649 10.1148 22.8561 12.906 22.8561 16.35C22.8561 19.794 20.0649 22.5852 16.6209 22.5852ZM16.6209 5.1266C17.3093 5.1266 17.8679 4.568 17.8679 3.87956V1.38547C17.8679 0.697025 17.3093 0.138428 16.6209 0.138428C15.9324 0.138428 15.3738 0.697025 15.3738 1.38547V3.87956C15.3738 4.568 15.9324 5.1266 16.6209 5.1266ZM16.6209 27.5734C15.9324 27.5734 15.3738 28.132 15.3738 28.8204V31.3145C15.3738 32.0029 15.9324 32.5615 16.6209 32.5615C17.3093 32.5615 17.8679 32.0029 17.8679 31.3145V28.8204C17.8679 28.132 17.3093 27.5734 16.6209 27.5734ZM26.3196 8.4131L28.083 6.64971C28.5701 6.16258 28.5701 5.37344 28.083 4.88631C27.5959 4.39918 26.8067 4.39918 26.3196 4.88631L24.5562 6.64971C24.0691 7.13683 24.0691 7.92598 24.5562 8.4131C25.0433 8.90023 25.8325 8.90023 26.3196 8.4131ZM6.92214 24.2869L5.15874 26.0503C4.67162 26.5374 4.67162 27.3265 5.15874 27.8137C5.64587 28.3008 6.43501 28.3008 6.92214 27.8137L8.68554 26.0503C9.17266 25.5616 9.17266 24.774 8.68554 24.2869C8.19849 23.7997 7.40927 23.7981 6.92214 24.2869ZM5.39747 16.35C5.39747 15.6615 4.83888 15.1029 4.15043 15.1029H1.65634C0.967899 15.1029 0.409302 15.6615 0.409302 16.35C0.409302 17.0384 0.967899 17.597 1.65634 17.597H4.15043C4.83888 17.597 5.39747 17.0384 5.39747 16.35ZM31.5854 15.1029H29.0913C28.4028 15.1029 27.8442 15.6615 27.8442 16.35C27.8442 17.0384 28.4028 17.597 29.0913 17.597H31.5854C32.2738 17.597 32.8324 17.0384 32.8324 16.35C32.8324 15.6615 32.2738 15.1029 31.5854 15.1029ZM6.9205 8.4131C7.40771 8.90023 8.19685 8.90023 8.6839 8.4131C9.1711 7.92598 9.1711 7.13683 8.6839 6.64971L6.9205 4.88631C6.43338 4.39918 5.64431 4.39918 5.15711 4.88631C4.66998 5.37344 4.66998 6.16258 5.15711 6.64971L6.9205 8.4131ZM26.3212 24.2852C25.8325 23.7981 25.0449 23.7981 24.5578 24.2852C24.0706 24.7724 24.0691 25.5615 24.5578 26.0486L26.3212 27.812C26.8083 28.2992 27.5974 28.2992 28.0845 27.812C28.5717 27.3249 28.5717 26.5358 28.0845 26.0486L26.3212 24.2852Z', viewBox: '0 0 33 34', ratio: 1, }, qr: { - path: - 'M0 0v170h170V0H0zm130 130H40V40h90v90z M65 65h40v40H65zM342 0v170h170V0H342zm130 130h-90V40h90v90z M407 65h40v40h-40zM0 342v170h170V342H0zm130 130H40v-90h90v90z M65 407h40v40H65zM40 197h40v40H40zM120 277v-40H80v40h39v40h40v-40zM280 77h40v40h-40zM200 40h40v77h-40zM240 0h40v40h-40zM240 117v40h-40v40h80v-80zM280 355v-39h-40v-79h-40v80h40v39h40v39h80v-40z M280 197h40v80h-40zM472 236v-39h-73v40h-39v40h40v39h112v-80h-40zm0 40h-72v-39h72v39zM472 355h40v80h-40zM320 277h40v40h-40zM360 395h40v40h-40zM400 355h40v40h-40zM400 435v77h40v-37h32v-40zM200 356h40v76h-40zM320 472v-40h-80v80h40v-40h39v40h40v-40zM120 197h80v40h-80zM0 237h40v80H0z', + path: 'M0 0v170h170V0H0zm130 130H40V40h90v90z M65 65h40v40H65zM342 0v170h170V0H342zm130 130h-90V40h90v90z M407 65h40v40h-40zM0 342v170h170V342H0zm130 130H40v-90h90v90z M65 407h40v40H65zM40 197h40v40H40zM120 277v-40H80v40h39v40h40v-40zM280 77h40v40h-40zM200 40h40v77h-40zM240 0h40v40h-40zM240 117v40h-40v40h80v-80zM280 355v-39h-40v-79h-40v80h40v39h40v39h80v-40z M280 197h40v80h-40zM472 236v-39h-73v40h-39v40h40v39h112v-80h-40zm0 40h-72v-39h72v39zM472 355h40v80h-40zM320 277h40v40h-40zM360 395h40v40h-40zM400 355h40v40h-40zM400 435v77h40v-37h32v-40zM200 356h40v76h-40zM320 472v-40h-80v80h40v-40h39v40h40v-40zM120 197h80v40h-80zM0 237h40v80H0z', viewBox: '0 0 512 512', ratio: 1, }, users: { - path: - 'M9.38,2.17c-1.73,0-3.12,1.4-3.12,3.12s1.4,3.12,3.12,3.12s3.12-1.4,3.12-3.12S11.1,2.17,9.38,2.17z M16.93,0.25c2.3,0.59,3.92,2.67,3.92,5.05s-1.61,4.46-3.92,5.05c-0.56,0.14-1.12-0.19-1.27-0.75c-0.14-0.56,0.19-1.12,0.75-1.27 c1.38-0.35,2.35-1.6,2.35-3.03s-0.97-2.67-2.35-3.03c-0.56-0.14-0.9-0.71-0.75-1.27C15.8,0.44,16.37,0.11,16.93,0.25z M9.38,0.08 c2.88,0,5.21,2.33,5.21,5.21s-2.33,5.21-5.21,5.21S4.17,8.17,4.17,5.29C4.17,2.42,6.5,0.08,9.38,0.08z M21.09,12.75 c2.22,0.57,3.8,2.53,3.9,4.81L25,17.79v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08 c0-1.42-0.96-2.67-2.34-3.02c-0.56-0.14-0.89-0.71-0.75-1.27C19.97,12.94,20.54,12.61,21.09,12.75z M13.54,12.58 c2.8,0,5.09,2.21,5.2,4.99v0.22v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08 c0-1.67-1.3-3.03-2.95-3.12h-0.18H5.21c-1.67,0-3.03,1.3-3.12,2.95v0.18v2.08c0,0.58-0.47,1.04-1.04,1.04 c-0.54,0-0.98-0.41-1.04-0.93L0,19.88V17.8c0-2.8,2.21-5.09,4.99-5.2h0.22h8.33V12.58z', + path: 'M9.38,2.17c-1.73,0-3.12,1.4-3.12,3.12s1.4,3.12,3.12,3.12s3.12-1.4,3.12-3.12S11.1,2.17,9.38,2.17z M16.93,0.25c2.3,0.59,3.92,2.67,3.92,5.05s-1.61,4.46-3.92,5.05c-0.56,0.14-1.12-0.19-1.27-0.75c-0.14-0.56,0.19-1.12,0.75-1.27 c1.38-0.35,2.35-1.6,2.35-3.03s-0.97-2.67-2.35-3.03c-0.56-0.14-0.9-0.71-0.75-1.27C15.8,0.44,16.37,0.11,16.93,0.25z M9.38,0.08 c2.88,0,5.21,2.33,5.21,5.21s-2.33,5.21-5.21,5.21S4.17,8.17,4.17,5.29C4.17,2.42,6.5,0.08,9.38,0.08z M21.09,12.75 c2.22,0.57,3.8,2.53,3.9,4.81L25,17.79v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08 c0-1.42-0.96-2.67-2.34-3.02c-0.56-0.14-0.89-0.71-0.75-1.27C19.97,12.94,20.54,12.61,21.09,12.75z M13.54,12.58 c2.8,0,5.09,2.21,5.2,4.99v0.22v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08 c0-1.67-1.3-3.03-2.95-3.12h-0.18H5.21c-1.67,0-3.03,1.3-3.12,2.95v0.18v2.08c0,0.58-0.47,1.04-1.04,1.04 c-0.54,0-0.98-0.41-1.04-0.93L0,19.88V17.8c0-2.8,2.21-5.09,4.99-5.2h0.22h8.33V12.58z', viewBox: '0 0 25 21', ratio: 1, }, upload: { - path: - 'M380.032,133.472l-112-128C264.992,2.016,260.608,0,256,0c-4.608,0-8.992,2.016-12.032,5.472l-112,128 c-4.128,4.736-5.152,11.424-2.528,17.152C132.032,156.32,137.728,160,144,160h64v208c0,8.832,7.168,16,16,16h64 c8.832,0,16-7.168,16-16V160h64c6.272,0,11.968-3.648,14.56-9.376C385.152,144.896,384.192,138.176,380.032,133.472z M432,352v96H80v-96H16v128c0,17.696,14.336,32,32,32h416c17.696,0,32-14.304,32-32V352H432z', + path: 'M380.032,133.472l-112-128C264.992,2.016,260.608,0,256,0c-4.608,0-8.992,2.016-12.032,5.472l-112,128 c-4.128,4.736-5.152,11.424-2.528,17.152C132.032,156.32,137.728,160,144,160h64v208c0,8.832,7.168,16,16,16h64 c8.832,0,16-7.168,16-16V160h64c6.272,0,11.968-3.648,14.56-9.376C385.152,144.896,384.192,138.176,380.032,133.472z M432,352v96H80v-96H16v128c0,17.696,14.336,32,32,32h416c17.696,0,32-14.304,32-32V352H432z', viewBox: '0 0 512 512', ratio: 1, }, warning: { - path: - 'M243.225,333.382c-13.6,0-25,11.4-25,25s11.4,25,25,25c13.1,0,25-11.4,24.4-24.4 C268.225,344.682,256.925,333.382,243.225,333.382z M474.625,421.982c15.7-27.1,15.8-59.4,0.2-86.4l-156.6-271.2c-15.5-27.3-43.5-43.5-74.9-43.5s-59.4,16.3-74.9,43.4 l-156.8,271.5c-15.6,27.3-15.5,59.8,0.3,86.9c15.6,26.8,43.5,42.9,74.7,42.9h312.8 C430.725,465.582,458.825,449.282,474.625,421.982z M440.625,402.382c-8.7,15-24.1,23.9-41.3,23.9h-312.8 c-17,0-32.3-8.7-40.8-23.4c-8.6-14.9-8.7-32.7-0.1-47.7l156.8-271.4c8.5-14.9,23.7-23.7,40.9-23.7c17.1,0,32.4,8.9,40.9,23.8 l156.7,271.4C449.325,369.882,449.225,387.482,440.625,402.382z M237.025,157.882c-11.9,3.4-19.3,14.2-19.3,27.3c0.6,7.9,1.1,15.9,1.7,23.8c1.7,30.1,3.4,59.6,5.1,89.7 c0.6,10.2,8.5,17.6,18.7,17.6c10.2,0,18.2-7.9,18.7-18.2c0-6.2,0-11.9,0.6-18.2c1.1-19.3,2.3-38.6,3.4-57.9 c0.6-12.5,1.7-25,2.3-37.5c0-4.5-0.6-8.5-2.3-12.5C260.825,160.782,248.925,155.082,237.025,157.882z', + path: 'M243.225,333.382c-13.6,0-25,11.4-25,25s11.4,25,25,25c13.1,0,25-11.4,24.4-24.4 C268.225,344.682,256.925,333.382,243.225,333.382z M474.625,421.982c15.7-27.1,15.8-59.4,0.2-86.4l-156.6-271.2c-15.5-27.3-43.5-43.5-74.9-43.5s-59.4,16.3-74.9,43.4 l-156.8,271.5c-15.6,27.3-15.5,59.8,0.3,86.9c15.6,26.8,43.5,42.9,74.7,42.9h312.8 C430.725,465.582,458.825,449.282,474.625,421.982z M440.625,402.382c-8.7,15-24.1,23.9-41.3,23.9h-312.8 c-17,0-32.3-8.7-40.8-23.4c-8.6-14.9-8.7-32.7-0.1-47.7l156.8-271.4c8.5-14.9,23.7-23.7,40.9-23.7c17.1,0,32.4,8.9,40.9,23.8 l156.7,271.4C449.325,369.882,449.225,387.482,440.625,402.382z M237.025,157.882c-11.9,3.4-19.3,14.2-19.3,27.3c0.6,7.9,1.1,15.9,1.7,23.8c1.7,30.1,3.4,59.6,5.1,89.7 c0.6,10.2,8.5,17.6,18.7,17.6c10.2,0,18.2-7.9,18.7-18.2c0-6.2,0-11.9,0.6-18.2c1.1-19.3,2.3-38.6,3.4-57.9 c0.6-12.5,1.7-25,2.3-37.5c0-4.5-0.6-8.5-2.3-12.5C260.825,160.782,248.925,155.082,237.025,157.882z', viewBox: '0 0 486.463 486.463', ratio: 1, }, sending: { - path: - 'M11.5,0 L12.5,0 L12.5,1 L11.5,1 L11.5,0 Z M11.5,11 L12.5,11 L12.5,12 L11.5,12 L11.5,11 Z M6,5.5 L7,5.5 L7,6.5 L6,6.5 L6,5.5 Z M17,5.5 L18,5.5 L18,6.5 L17,6.5 L17,5.5 Z M16.9461524,2.5669873 L17.4461524,3.4330127 L16.580127,3.9330127 L16.080127,3.0669873 L16.9461524,2.5669873 Z M7.41987298,8.0669873 L7.91987298,8.9330127 L7.05384758,9.4330127 L6.55384758,8.5669873 L7.41987298,8.0669873 Z M9.4330127,0.553847577 L9.9330127,1.41987298 L9.0669873,1.91987298 L8.5669873,1.05384758 L9.4330127,0.553847577 Z M14.9330127,10.080127 L15.4330127,10.9461524 L14.5669873,11.4461524 L14.0669873,10.580127 L14.9330127,10.080127 Z M14.5669873,0.553847577 L15.4330127,1.05384758 L14.9330127,1.91987298 L14.0669873,1.41987298 L14.5669873,0.553847577 Z M9.0669873,10.080127 L9.9330127,10.580127 L9.4330127,11.4461524 L8.5669873,10.9461524 L9.0669873,10.080127 Z M7.05384758,2.5669873 L7.91987298,3.0669873 L7.41987298,3.9330127 L6.55384758,3.4330127 L7.05384758,2.5669873 Z M16.580127,8.0669873 L17.4461524,8.5669873 L16.9461524,9.4330127 L16.080127,8.9330127 L16.580127,8.0669873 Z', + path: 'M11.5,0 L12.5,0 L12.5,1 L11.5,1 L11.5,0 Z M11.5,11 L12.5,11 L12.5,12 L11.5,12 L11.5,11 Z M6,5.5 L7,5.5 L7,6.5 L6,6.5 L6,5.5 Z M17,5.5 L18,5.5 L18,6.5 L17,6.5 L17,5.5 Z M16.9461524,2.5669873 L17.4461524,3.4330127 L16.580127,3.9330127 L16.080127,3.0669873 L16.9461524,2.5669873 Z M7.41987298,8.0669873 L7.91987298,8.9330127 L7.05384758,9.4330127 L6.55384758,8.5669873 L7.41987298,8.0669873 Z M9.4330127,0.553847577 L9.9330127,1.41987298 L9.0669873,1.91987298 L8.5669873,1.05384758 L9.4330127,0.553847577 Z M14.9330127,10.080127 L15.4330127,10.9461524 L14.5669873,11.4461524 L14.0669873,10.580127 L14.9330127,10.080127 Z M14.5669873,0.553847577 L15.4330127,1.05384758 L14.9330127,1.91987298 L14.0669873,1.41987298 L14.5669873,0.553847577 Z M9.0669873,10.080127 L9.9330127,10.580127 L9.4330127,11.4461524 L8.5669873,10.9461524 L9.0669873,10.080127 Z M7.05384758,2.5669873 L7.91987298,3.0669873 L7.41987298,3.9330127 L6.55384758,3.4330127 L7.05384758,2.5669873 Z M16.580127,8.0669873 L17.4461524,8.5669873 L16.9461524,9.4330127 L16.080127,8.9330127 L16.580127,8.0669873 Z', viewBox: '6 0 12 12', ratio: 1, }, doubleCheckCircle: { - path: - 'M7.91731278,0.313257194 C7.58941091,0.549084144 7.28273546,0.812570593 7.00070199,1.10030099 C6.67734551,1.03453102 6.34268082,1 6,1 C3.24,1 1,3.24 1,6 C1,8.76 3.24,11 6,11 C6.34268082,11 6.67734551,10.965469 7.00070199,10.899699 C7.28273546,11.1874294 7.58941091,11.4509159 7.91731278,11.6867428 C7.31518343,11.8898758 6.67037399,12 6,12 C2.688,12 0,9.312 0,6 C0,2.688 2.688,0 6,0 C6.67037399,0 7.31518343,0.110124239 7.91731278,0.313257194 Z M5.07266453,7.01233547 C5.12977459,7.4065842 5.21974274,7.79019382 5.33970233,8.16029767 L5,8.5 L2.5,6 L3.205,5.295 L5,7.085 L5.07266453,7.01233547 Z M12,0 C15.312,0 18,2.688 18,6 C18,9.312 15.312,12 12,12 C8.688,12 6,9.312 6,6 C6,2.688 8.688,0 12,0 Z M12,1 C9.24,1 7,3.24 7,6 C7,8.76 9.24,11 12,11 C14.76,11 17,8.76 17,6 C17,3.24 14.76,1 12,1 Z M11,8.5 L8.5,6 L9.205,5.295 L11,7.085 L14.795,3.29 L15.5,4 L11,8.5 Z', + path: 'M7.91731278,0.313257194 C7.58941091,0.549084144 7.28273546,0.812570593 7.00070199,1.10030099 C6.67734551,1.03453102 6.34268082,1 6,1 C3.24,1 1,3.24 1,6 C1,8.76 3.24,11 6,11 C6.34268082,11 6.67734551,10.965469 7.00070199,10.899699 C7.28273546,11.1874294 7.58941091,11.4509159 7.91731278,11.6867428 C7.31518343,11.8898758 6.67037399,12 6,12 C2.688,12 0,9.312 0,6 C0,2.688 2.688,0 6,0 C6.67037399,0 7.31518343,0.110124239 7.91731278,0.313257194 Z M5.07266453,7.01233547 C5.12977459,7.4065842 5.21974274,7.79019382 5.33970233,8.16029767 L5,8.5 L2.5,6 L3.205,5.295 L5,7.085 L5.07266453,7.01233547 Z M12,0 C15.312,0 18,2.688 18,6 C18,9.312 15.312,12 12,12 C8.688,12 6,9.312 6,6 C6,2.688 8.688,0 12,0 Z M12,1 C9.24,1 7,3.24 7,6 C7,8.76 9.24,11 12,11 C14.76,11 17,8.76 17,6 C17,3.24 14.76,1 12,1 Z M11,8.5 L8.5,6 L9.205,5.295 L11,7.085 L14.795,3.29 L15.5,4 L11,8.5 Z', viewBox: '3 0 12 12', ratio: 1.6, }, gallery: { - path: - 'M218.8,52.1H110.2v-0.9c0.1-0.5,0.1-1.1,0.1-1.6V38.2c0-7.8-6.4-14.2-14.2-14.2H85.9H33.4H23.3c-7.8,0-14.2,6.4-14.2,14.2v10.1v1.2V75v130.7c0,15.5,12.6,28,28.1,28.1h181.6c15.5,0,28.1-12.6,28.1-28.1V80.2C246.9,64.7,234.3,52.1,218.8,52.1zM218.8,215.1H37.2c-5.2-0.1-9.3-4.2-9.4-9.4V80.3c0.1-5.2,4.2-9.3,9.4-9.4h181.6c5.2,0.1,9.3,4.2,9.4,9.4v125.4h0C228.1,210.9,224,215,218.8,215.1z M170.2,108.3c0-11.2,9.1-20.4,20.4-20.4s20.4,9.1,20.4,20.4c0,11.2-9.1,20.4-20.4,20.4h-0.1c0,0,0,0,0,0C179.2,128.7,170.2,119.5,170.2,108.3z M158.8,149.9l54.7,52.5h-173l51-103.7l33.8,75.3L158.8,149.9z', + path: 'M218.8,52.1H110.2v-0.9c0.1-0.5,0.1-1.1,0.1-1.6V38.2c0-7.8-6.4-14.2-14.2-14.2H85.9H33.4H23.3c-7.8,0-14.2,6.4-14.2,14.2v10.1v1.2V75v130.7c0,15.5,12.6,28,28.1,28.1h181.6c15.5,0,28.1-12.6,28.1-28.1V80.2C246.9,64.7,234.3,52.1,218.8,52.1zM218.8,215.1H37.2c-5.2-0.1-9.3-4.2-9.4-9.4V80.3c0.1-5.2,4.2-9.3,9.4-9.4h181.6c5.2,0.1,9.3,4.2,9.4,9.4v125.4h0C228.1,210.9,224,215,218.8,215.1z M170.2,108.3c0-11.2,9.1-20.4,20.4-20.4s20.4,9.1,20.4,20.4c0,11.2-9.1,20.4-20.4,20.4h-0.1c0,0,0,0,0,0C179.2,128.7,170.2,119.5,170.2,108.3z M158.8,149.9l54.7,52.5h-173l51-103.7l33.8,75.3L158.8,149.9z', viewBox: '0 0 256 256', ratio: 1, }, stop: { - path: - 'M33,4.5v24c0,2.484-2.016,4.5-4.5,4.5h-24C2.016,33,0,30.984,0,28.5v-24C0,2.016,2.016,0,4.5,0h24 C30.984,0,33,2.016,33,4.5z', + path: 'M33,4.5v24c0,2.484-2.016,4.5-4.5,4.5h-24C2.016,33,0,30.984,0,28.5v-24C0,2.016,2.016,0,4.5,0h24 C30.984,0,33,2.016,33,4.5z', viewBox: '-1 -1 35 35', ratio: 1, }, timer00: { - path: - 'M11.428367,3.44328115 L10.5587469,3.94535651 C10.4906607,3.79477198 10.4145019,3.64614153 10.330127,3.5 C10.2457522,3.35385847 10.1551138,3.21358774 10.0587469,3.07933111 L10.928367,2.57725574 C11.0225793,2.71323387 11.1119641,2.85418158 11.1961524,3 C11.2803407,3.14581842 11.3577126,3.2937018 11.428367,3.44328115 Z M9.42274426,1.07163304 L8.92066889,1.94125309 C8.78641226,1.84488615 8.64614153,1.75424783 8.5,1.66987298 C8.35385847,1.58549813 8.20522802,1.50933927 8.05464349,1.44125309 L8.55671885,0.571633044 C8.7062982,0.642287382 8.85418158,0.719659271 9,0.803847577 C9.14581842,0.888035884 9.28676613,0.977420696 9.42274426,1.07163304 Z M11.9794631,6.5 L10.9753124,6.5 C10.9916403,6.33554688 11,6.1687497 11,6 C11,5.8312503 10.9916403,5.66445312 10.9753124,5.5 L11.9794631,5.5 C11.9930643,5.66486669 12,5.83162339 12,6 C12,6.16837661 11.9930643,6.33513331 11.9794631,6.5 Z M10.928367,9.42274426 L10.0587469,8.92066889 C10.1551138,8.78641226 10.2457522,8.64614153 10.330127,8.5 C10.4145019,8.35385847 10.4906607,8.20522802 10.5587469,8.05464349 L11.428367,8.55671885 C11.3577126,8.7062982 11.2803407,8.85418158 11.1961524,9 C11.1119641,9.14581842 11.0225793,9.28676613 10.928367,9.42274426 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z M6.5,0.0205368885 L6.5,7 L5.5,7 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,5.01e-14 6,5.01e-14 C6.16837661,5.01e-14 6.33513331,0.00693566443 6.5,0.0205368885 Z', + path: 'M11.428367,3.44328115 L10.5587469,3.94535651 C10.4906607,3.79477198 10.4145019,3.64614153 10.330127,3.5 C10.2457522,3.35385847 10.1551138,3.21358774 10.0587469,3.07933111 L10.928367,2.57725574 C11.0225793,2.71323387 11.1119641,2.85418158 11.1961524,3 C11.2803407,3.14581842 11.3577126,3.2937018 11.428367,3.44328115 Z M9.42274426,1.07163304 L8.92066889,1.94125309 C8.78641226,1.84488615 8.64614153,1.75424783 8.5,1.66987298 C8.35385847,1.58549813 8.20522802,1.50933927 8.05464349,1.44125309 L8.55671885,0.571633044 C8.7062982,0.642287382 8.85418158,0.719659271 9,0.803847577 C9.14581842,0.888035884 9.28676613,0.977420696 9.42274426,1.07163304 Z M11.9794631,6.5 L10.9753124,6.5 C10.9916403,6.33554688 11,6.1687497 11,6 C11,5.8312503 10.9916403,5.66445312 10.9753124,5.5 L11.9794631,5.5 C11.9930643,5.66486669 12,5.83162339 12,6 C12,6.16837661 11.9930643,6.33513331 11.9794631,6.5 Z M10.928367,9.42274426 L10.0587469,8.92066889 C10.1551138,8.78641226 10.2457522,8.64614153 10.330127,8.5 C10.4145019,8.35385847 10.4906607,8.20522802 10.5587469,8.05464349 L11.428367,8.55671885 C11.3577126,8.7062982 11.2803407,8.85418158 11.1961524,9 C11.1119641,9.14581842 11.0225793,9.28676613 10.928367,9.42274426 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z M6.5,0.0205368885 L6.5,7 L5.5,7 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,5.01e-14 6,5.01e-14 C6.16837661,5.01e-14 6.33513331,0.00693566443 6.5,0.0205368885 Z', viewBox: '0 0 12 12', ratio: 1, }, timer05: { - path: - 'M6.5,1.02370353 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,4.42354486e-17 6,4.42354486e-17 L5.87059234,-7.37983893e-14 C7.16354589,-0.0289161279 8.40910326,0.364429763 9.43644004,1.08141215 L8.9316493,1.94944159 L8.92055711,1.94144648 L6.43301236,6.25000036 L5.56698696,5.75000036 L8.0545317,1.44144648 C7.56661533,1.2212014 7.04204534,1.07826289 6.5,1.02370353 Z M11.428367,3.44328115 L10.5587469,3.94535651 C10.4906607,3.79477198 10.4145019,3.64614153 10.330127,3.5 C10.2457522,3.35385847 10.1551138,3.21358774 10.0587469,3.07933111 L10.928367,2.57725574 C11.0225793,2.71323387 11.1119641,2.85418158 11.1961524,3 C11.2803407,3.14581842 11.3577126,3.2937018 11.428367,3.44328115 Z M11.9794631,6.5 L10.9753124,6.5 C10.9916403,6.33554688 11,6.1687497 11,6 C11,5.8312503 10.9916403,5.66445312 10.9753124,5.5 L11.9794631,5.5 C11.9930643,5.66486669 12,5.83162339 12,6 C12,6.16837661 11.9930643,6.33513331 11.9794631,6.5 Z M10.928367,9.42274426 L10.0587469,8.92066889 C10.1551138,8.78641226 10.2457522,8.64614153 10.330127,8.5 C10.4145019,8.35385847 10.4906607,8.20522802 10.5587469,8.05464349 L11.428367,8.55671885 C11.3577126,8.7062982 11.2803407,8.85418158 11.1961524,9 C11.1119641,9.14581842 11.0225793,9.28676613 10.928367,9.42274426 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', + path: 'M6.5,1.02370353 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,4.42354486e-17 6,4.42354486e-17 L5.87059234,-7.37983893e-14 C7.16354589,-0.0289161279 8.40910326,0.364429763 9.43644004,1.08141215 L8.9316493,1.94944159 L8.92055711,1.94144648 L6.43301236,6.25000036 L5.56698696,5.75000036 L8.0545317,1.44144648 C7.56661533,1.2212014 7.04204534,1.07826289 6.5,1.02370353 Z M11.428367,3.44328115 L10.5587469,3.94535651 C10.4906607,3.79477198 10.4145019,3.64614153 10.330127,3.5 C10.2457522,3.35385847 10.1551138,3.21358774 10.0587469,3.07933111 L10.928367,2.57725574 C11.0225793,2.71323387 11.1119641,2.85418158 11.1961524,3 C11.2803407,3.14581842 11.3577126,3.2937018 11.428367,3.44328115 Z M11.9794631,6.5 L10.9753124,6.5 C10.9916403,6.33554688 11,6.1687497 11,6 C11,5.8312503 10.9916403,5.66445312 10.9753124,5.5 L11.9794631,5.5 C11.9930643,5.66486669 12,5.83162339 12,6 C12,6.16837661 11.9930643,6.33513331 11.9794631,6.5 Z M10.928367,9.42274426 L10.0587469,8.92066889 C10.1551138,8.78641226 10.2457522,8.64614153 10.330127,8.5 C10.4145019,8.35385847 10.4906607,8.20522802 10.5587469,8.05464349 L11.428367,8.55671885 C11.3577126,8.7062982 11.2803407,8.85418158 11.1961524,9 C11.1119641,9.14581842 11.0225793,9.28676613 10.928367,9.42274426 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', viewBox: '0 0 12 12', ratio: 1, }, timer10: { - path: - 'M6.5,1.02430376 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,1.62630326e-17 6,1.62630326e-17 L5.86308464,3.75931924e-14 C6.41989049,-0.0124561971 6.98779297,0.0530213558 7.5529141,0.204445108 C9.33301785,0.681422471 10.710634,1.91072271 11.4353383,3.45859809 L10.564162,3.95793826 L10.5585534,3.9454682 L6.24999954,6.43301294 L5.74999954,5.56698753 L10.0585534,3.07944279 C9.4085445,2.17504687 8.45381951,1.48111816 7.29409506,1.17037093 C7.02944452,1.09945804 6.764062,1.05116398 6.5,1.02430376 Z M11.9794631,6.5 L10.9753124,6.5 C10.9916403,6.33554688 11,6.1687497 11,6 C11,5.8312503 10.9916403,5.66445312 10.9753124,5.5 L11.9794631,5.5 C11.9930643,5.66486669 12,5.83162339 12,6 C12,6.16837661 11.9930643,6.33513331 11.9794631,6.5 Z M10.928367,9.42274426 L10.0587469,8.92066889 C10.1551138,8.78641226 10.2457522,8.64614153 10.330127,8.5 C10.4145019,8.35385847 10.4906607,8.20522802 10.5587469,8.05464349 L11.428367,8.55671885 C11.3577126,8.7062982 11.2803407,8.85418158 11.1961524,9 C11.1119641,9.14581842 11.0225793,9.28676613 10.928367,9.42274426 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', + path: 'M6.5,1.02430376 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,1.62630326e-17 6,1.62630326e-17 L5.86308464,3.75931924e-14 C6.41989049,-0.0124561971 6.98779297,0.0530213558 7.5529141,0.204445108 C9.33301785,0.681422471 10.710634,1.91072271 11.4353383,3.45859809 L10.564162,3.95793826 L10.5585534,3.9454682 L6.24999954,6.43301294 L5.74999954,5.56698753 L10.0585534,3.07944279 C9.4085445,2.17504687 8.45381951,1.48111816 7.29409506,1.17037093 C7.02944452,1.09945804 6.764062,1.05116398 6.5,1.02430376 Z M11.9794631,6.5 L10.9753124,6.5 C10.9916403,6.33554688 11,6.1687497 11,6 C11,5.8312503 10.9916403,5.66445312 10.9753124,5.5 L11.9794631,5.5 C11.9930643,5.66486669 12,5.83162339 12,6 C12,6.16837661 11.9930643,6.33513331 11.9794631,6.5 Z M10.928367,9.42274426 L10.0587469,8.92066889 C10.1551138,8.78641226 10.2457522,8.64614153 10.330127,8.5 C10.4145019,8.35385847 10.4906607,8.20522802 10.5587469,8.05464349 L11.428367,8.55671885 C11.3577126,8.7062982 11.2803407,8.85418158 11.1961524,9 C11.1119641,9.14581842 11.0225793,9.28676613 10.928367,9.42274426 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', viewBox: '0 0 12 12', ratio: 1, }, timer15: { - path: - 'M6.5,0.0207420606 C7.86488275,0.134195272 9.19834885,0.713067711 10.2426405,1.75735938 C11.5457669,3.06048577 12.1241674,4.8138991 11.977842,6.51675063 L10.9737111,6.51360374 L10.975089,6.50000007 L5.9999995,6.50000007 L5.9999995,5.50000007 L10.975089,5.50000007 C10.8643627,4.39176576 10.384511,3.31344338 9.53553374,2.46446616 C8.55922305,1.48815547 7.27961153,1.00000011 6,1.00000007 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,0 6,0 C6.16837661,0 6.33513331,0.00693566443 6.5,0.0205368885 L6.5,0.0207420606 Z M10.928367,9.42274426 L10.0587469,8.92066889 C10.1551138,8.78641226 10.2457522,8.64614153 10.330127,8.5 C10.4145019,8.35385847 10.4906607,8.20522802 10.5587469,8.05464349 L11.428367,8.55671885 C11.3577126,8.7062982 11.2803407,8.85418158 11.1961524,9 C11.1119641,9.14581842 11.0225793,9.28676613 10.928367,9.42274426 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -1.13006288e-12,6.16837661 -1.13009381e-12,6 C-1.13012474e-12,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', + path: 'M6.5,0.0207420606 C7.86488275,0.134195272 9.19834885,0.713067711 10.2426405,1.75735938 C11.5457669,3.06048577 12.1241674,4.8138991 11.977842,6.51675063 L10.9737111,6.51360374 L10.975089,6.50000007 L5.9999995,6.50000007 L5.9999995,5.50000007 L10.975089,5.50000007 C10.8643627,4.39176576 10.384511,3.31344338 9.53553374,2.46446616 C8.55922305,1.48815547 7.27961153,1.00000011 6,1.00000007 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,0 6,0 C6.16837661,0 6.33513331,0.00693566443 6.5,0.0205368885 L6.5,0.0207420606 Z M10.928367,9.42274426 L10.0587469,8.92066889 C10.1551138,8.78641226 10.2457522,8.64614153 10.330127,8.5 C10.4145019,8.35385847 10.4906607,8.20522802 10.5587469,8.05464349 L11.428367,8.55671885 C11.3577126,8.7062982 11.2803407,8.85418158 11.1961524,9 C11.1119641,9.14581842 11.0225793,9.28676613 10.928367,9.42274426 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -1.13006288e-12,6.16837661 -1.13009381e-12,6 C-1.13012474e-12,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', viewBox: '0 0 12 12', ratio: 1, }, timer20: { - path: - 'M6.5,1.02370353 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,-1.1492543e-17 6,-1.1492543e-17 L5.87059232,4.19252306e-14 C8.57132191,-0.0604002043 11.0652567,1.72157607 11.7955548,4.4470858 C12.2725322,6.22718955 11.896735,8.03489028 10.9185877,9.43644027 L10.0505583,8.93164953 L10.0585534,8.92055734 L5.74999954,6.4330126 L6.24999954,5.5669872 L10.5585534,8.05453194 C11.0167788,7.03940974 11.1403762,5.86562929 10.829629,4.70590484 C10.2763071,2.64087962 8.50807111,1.22582513 6.5,1.02370353 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', + path: 'M6.5,1.02370353 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,-1.1492543e-17 6,-1.1492543e-17 L5.87059232,4.19252306e-14 C8.57132191,-0.0604002043 11.0652567,1.72157607 11.7955548,4.4470858 C12.2725322,6.22718955 11.896735,8.03489028 10.9185877,9.43644027 L10.0505583,8.93164953 L10.0585534,8.92055734 L5.74999954,6.4330126 L6.24999954,5.5669872 L10.5585534,8.05453194 C11.0167788,7.03940974 11.1403762,5.86562929 10.829629,4.70590484 C10.2763071,2.64087962 8.50807111,1.22582513 6.5,1.02370353 Z M8.55671885,11.428367 L8.05464349,10.5587469 C8.20522802,10.4906607 8.35385847,10.4145019 8.5,10.330127 C8.64614153,10.2457522 8.78641226,10.1551138 8.92066889,10.0587469 L9.42274426,10.928367 C9.28676613,11.0225793 9.14581842,11.1119641 9,11.1961524 C8.85418158,11.2803407 8.7062982,11.3577126 8.55671885,11.428367 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', viewBox: '0 0 12 12', ratio: 1, }, timer25: { - path: - 'M6.5,1.02430376 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,4.81385765e-17 6,4.81385765e-17 L5.86308468,4.16843209e-14 C6.41989052,-0.012456193 6.98779298,0.0530213603 7.5529141,0.204445109 C10.7537107,1.06209598 12.6532057,4.35211772 11.7955548,7.55291434 C11.3185774,9.33301809 10.0892772,10.7106343 8.54140181,11.4353385 L8.04206164,10.5641622 L8.0545317,10.5585537 L5.56698696,6.24999978 L6.43301237,5.74999978 L8.92055711,10.0585537 C9.82495303,9.40854474 10.5188817,8.45381974 10.829629,7.29409529 C11.544338,4.62676478 9.96142558,1.88507999 7.29409506,1.17037094 C7.02944452,1.09945804 6.764062,1.05116398 6.5,1.02430376 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', + path: 'M6.5,1.02430376 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,4.81385765e-17 6,4.81385765e-17 L5.86308468,4.16843209e-14 C6.41989052,-0.012456193 6.98779298,0.0530213603 7.5529141,0.204445109 C10.7537107,1.06209598 12.6532057,4.35211772 11.7955548,7.55291434 C11.3185774,9.33301809 10.0892772,10.7106343 8.54140181,11.4353385 L8.04206164,10.5641622 L8.0545317,10.5585537 L5.56698696,6.24999978 L6.43301237,5.74999978 L8.92055711,10.0585537 C9.82495303,9.40854474 10.5188817,8.45381974 10.829629,7.29409529 C11.544338,4.62676478 9.96142558,1.88507999 7.29409506,1.17037094 C7.02944452,1.09945804 6.764062,1.05116398 6.5,1.02430376 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M5.5,11.9794631 L5.5,10.9753124 C5.66445312,10.9916403 5.8312503,11 6,11 C6.1687497,11 6.33554688,10.9916403 6.5,10.9753124 L6.5,11.9794631 C6.33513331,11.9930643 6.16837661,12 6,12 C5.83162339,12 5.66486669,11.9930643 5.5,11.9794631 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', viewBox: '0 0 12 12', ratio: 1, }, timer30: { - path: - 'M6.5,0.0207420321 C7.86488252,0.134195172 9.19834876,0.713067621 10.2426405,1.75735938 C12.5857863,4.10050513 12.5857863,7.899495 10.2426405,10.2426408 C8.93951413,11.5457671 7.1861008,12.1241676 5.48324927,11.9778423 L5.48639616,10.9737113 L5.49999983,10.9750892 L5.49999983,5.99999973 L6.49999983,5.99999973 L6.49999983,10.9750892 C7.60823414,10.8643629 8.68655652,10.3845112 9.53553374,9.53553397 C11.4881552,7.58291251 11.4881552,4.41708762 9.53553374,2.46446616 C8.60186739,1.53079981 7.39081733,1.04357578 6.16765141,1.00279407 C6.11199785,1.00092414 6.05610685,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,0 6,0 C6.16837661,0 6.33513331,0.00693566443 6.5,0.0205368885 L6.5,0.0207420321 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', + path: 'M6.5,0.0207420321 C7.86488252,0.134195172 9.19834876,0.713067621 10.2426405,1.75735938 C12.5857863,4.10050513 12.5857863,7.899495 10.2426405,10.2426408 C8.93951413,11.5457671 7.1861008,12.1241676 5.48324927,11.9778423 L5.48639616,10.9737113 L5.49999983,10.9750892 L5.49999983,5.99999973 L6.49999983,5.99999973 L6.49999983,10.9750892 C7.60823414,10.8643629 8.68655652,10.3845112 9.53553374,9.53553397 C11.4881552,7.58291251 11.4881552,4.41708762 9.53553374,2.46446616 C8.60186739,1.53079981 7.39081733,1.04357578 6.16765141,1.00279407 C6.11199785,1.00092414 6.05610685,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,0 6,0 C6.16837661,0 6.33513331,0.00693566443 6.5,0.0205368885 L6.5,0.0207420321 Z M2.57725574,10.928367 L3.07933111,10.0587469 C3.21358774,10.1551138 3.35385847,10.2457522 3.5,10.330127 C3.64614153,10.4145019 3.79477198,10.4906607 3.94535651,10.5587469 L3.44328115,11.428367 C3.2937018,11.3577126 3.14581842,11.2803407 3,11.1961524 C2.85418158,11.1119641 2.71323387,11.0225793 2.57725574,10.928367 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', viewBox: '0 0 12 12', ratio: 1, }, timer35: { - path: - 'M6.5,1.02370354 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,4.09828421e-17 6,4.09828421e-17 L5.87059244,4.2745538e-14 C8.57132199,-0.0604001451 11.0652567,1.72157611 11.7955548,4.4470858 C12.6532057,7.64788242 10.7537107,10.9379042 7.5529141,11.795555 C5.77281035,12.2725324 3.96510962,11.8967353 2.56355963,10.918588 L3.06835037,10.0505585 L3.07944256,10.0585537 L5.5669873,5.74999978 L6.4330127,6.24999978 L3.94546796,10.5585537 C4.96059016,11.016779 6.13437061,11.1403764 7.29409506,10.8296292 C9.96142558,10.1149201 11.544338,7.37323536 10.829629,4.70590484 C10.2763071,2.64087963 8.50807111,1.22582514 6.5,1.02370354 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', + path: 'M6.5,1.02370354 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,4.09828421e-17 6,4.09828421e-17 L5.87059244,4.2745538e-14 C8.57132199,-0.0604001451 11.0652567,1.72157611 11.7955548,4.4470858 C12.6532057,7.64788242 10.7537107,10.9379042 7.5529141,11.795555 C5.77281035,12.2725324 3.96510962,11.8967353 2.56355963,10.918588 L3.06835037,10.0505585 L3.07944256,10.0585537 L5.5669873,5.74999978 L6.4330127,6.24999978 L3.94546796,10.5585537 C4.96059016,11.016779 6.13437061,11.1403764 7.29409506,10.8296292 C9.96142558,10.1149201 11.544338,7.37323536 10.829629,4.70590484 C10.2763071,2.64087963 8.50807111,1.22582514 6.5,1.02370354 Z M0.571633044,8.55671885 L1.44125309,8.05464349 C1.50933927,8.20522802 1.58549813,8.35385847 1.66987298,8.5 C1.75424783,8.64614153 1.84488615,8.78641226 1.94125309,8.92066889 L1.07163304,9.42274426 C0.977420696,9.28676613 0.888035884,9.14581842 0.803847577,9 C0.719659271,8.85418158 0.642287382,8.7062982 0.571633044,8.55671885 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', viewBox: '0 0 12 12', ratio: 1, }, timer40: { - path: - 'M6.5,1.02430376 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,-9.97465999e-18 6,-9.97465999e-18 L5.86308481,-6.71970472e-11 C6.4198906,-0.0124561805 6.98779302,0.0530213744 7.5529141,0.204445112 C10.7537107,1.06209598 12.6532057,4.35211772 11.7955548,7.55291434 C10.9379039,10.753711 7.64788218,12.6532059 4.44708556,11.795555 C2.66698181,11.3185777 1.28936562,10.0892774 0.564661357,8.54140205 L1.43583768,8.04206188 L1.44144625,8.05453194 L5.75000012,5.5669872 L6.25000012,6.4330126 L1.94144625,8.92055734 C2.59145516,9.82495327 3.54618016,10.518882 4.70590461,10.8296292 C7.37323512,11.5443383 10.1149199,9.96142581 10.829629,7.29409529 C11.544338,4.62676478 9.96142558,1.88508 7.29409506,1.17037094 C7.02944452,1.09945804 6.764062,1.05116398 6.5,1.02430376 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', + path: 'M6.5,1.02430376 L6.5,1.02468762 C6.33554688,1.00835972 6.1687497,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,-9.97465999e-18 6,-9.97465999e-18 L5.86308481,-6.71970472e-11 C6.4198906,-0.0124561805 6.98779302,0.0530213744 7.5529141,0.204445112 C10.7537107,1.06209598 12.6532057,4.35211772 11.7955548,7.55291434 C10.9379039,10.753711 7.64788218,12.6532059 4.44708556,11.795555 C2.66698181,11.3185777 1.28936562,10.0892774 0.564661357,8.54140205 L1.43583768,8.04206188 L1.44144625,8.05453194 L5.75000012,5.5669872 L6.25000012,6.4330126 L1.94144625,8.92055734 C2.59145516,9.82495327 3.54618016,10.518882 4.70590461,10.8296292 C7.37323512,11.5443383 10.1149199,9.96142581 10.829629,7.29409529 C11.544338,4.62676478 9.96142558,1.88508 7.29409506,1.17037094 C7.02944452,1.09945804 6.764062,1.05116398 6.5,1.02430376 Z M0.0205368885,5.5 L1.02468762,5.5 C1.00835972,5.66445312 1,5.8312503 1,6 C1,6.1687497 1.00835972,6.33554688 1.02468762,6.5 L0.0205368885,6.5 C0.00693566443,6.33513331 -9.95062878e-13,6.16837661 -9.95093808e-13,6 C-9.95124738e-13,5.83162339 0.00693566443,5.66486669 0.0205368885,5.5 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', viewBox: '0 0 12 12', ratio: 1, }, timer45: { - path: - 'M6.5,0.0207420343 C7.86488252,0.134195174 9.19834876,0.713067624 10.2426405,1.75735938 C12.5857863,4.10050513 12.5857863,7.89949501 10.2426405,10.2426408 C7.89949477,12.5857865 4.1005049,12.5857865 1.75735914,10.2426408 C0.454232755,8.93951437 -0.124167745,7.18610104 0.0221576434,5.48324951 L1.02628856,5.4863964 L1.02491069,5.50000007 L6.00000017,5.50000007 L6.00000017,6.50000007 L1.02491069,6.50000007 C1.13563696,7.60823437 1.61548871,8.68655676 2.46446593,9.53553398 C4.41708738,11.4881554 7.58291228,11.4881554 9.53553374,9.53553398 C11.4881552,7.58291252 11.4881552,4.41708762 9.53553374,2.46446616 C8.60186704,1.53079946 7.39081643,1.04357542 6.16765005,1.00279403 C6.11199694,1.00092412 6.05610639,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,0 6,0 C6.16837661,0 6.33513331,0.00693566443 6.5,0.0205368885 L6.5,0.0207420343 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', + path: 'M6.5,0.0207420343 C7.86488252,0.134195174 9.19834876,0.713067624 10.2426405,1.75735938 C12.5857863,4.10050513 12.5857863,7.89949501 10.2426405,10.2426408 C7.89949477,12.5857865 4.1005049,12.5857865 1.75735914,10.2426408 C0.454232755,8.93951437 -0.124167745,7.18610104 0.0221576434,5.48324951 L1.02628856,5.4863964 L1.02491069,5.50000007 L6.00000017,5.50000007 L6.00000017,6.50000007 L1.02491069,6.50000007 C1.13563696,7.60823437 1.61548871,8.68655676 2.46446593,9.53553398 C4.41708738,11.4881554 7.58291228,11.4881554 9.53553374,9.53553398 C11.4881552,7.58291252 11.4881552,4.41708762 9.53553374,2.46446616 C8.60186704,1.53079946 7.39081643,1.04357542 6.16765005,1.00279403 C6.11199694,1.00092412 6.05610639,1 6,1 C5.8312503,1 5.66445312,1.00835972 5.5,1.02468762 L5.5,0.0205368885 C5.66486669,0.00693566443 5.83162339,0 6,0 C6.16837661,0 6.33513331,0.00693566443 6.5,0.0205368885 L6.5,0.0207420343 Z M1.07163304,2.57725574 L1.94125309,3.07933111 C1.84488615,3.21358774 1.75424783,3.35385847 1.66987298,3.5 C1.58549813,3.64614153 1.50933927,3.79477198 1.44125309,3.94535651 L0.571633044,3.44328115 C0.642287382,3.2937018 0.719659271,3.14581842 0.803847577,3 C0.888035884,2.85418158 0.977420696,2.71323387 1.07163304,2.57725574 Z M3.44328115,0.571633044 L3.94535651,1.44125309 C3.79477198,1.50933927 3.64614153,1.58549813 3.5,1.66987298 C3.35385847,1.75424783 3.21358774,1.84488615 3.07933111,1.94125309 L2.57725574,1.07163304 C2.71323387,0.977420696 2.85418158,0.888035884 3,0.803847577 C3.14581842,0.719659271 3.2937018,0.642287382 3.44328115,0.571633044 Z', viewBox: '0 0 12 12', ratio: 1, }, @@ -544,20 +472,17 @@ export const icons = { ratio: 1, }, timer55: { - path: - 'M10.8871515,4.93877116 C10.7764707,4.43108229 10.5875051,3.94579225 10.3301269,3.50000021 L10.3308482,3.49958378 C9.46665561,2.00598422 7.8519922,1.00090744 6.00250515,1.00000061 L6.00250515,4.75001343e-07 C8.87812128,0.0011754551 11.2807698,2.02530154 11.8645776,4.72650571 C12.0619293,5.63173625 12.0518761,6.59631008 11.7955548,7.55291434 C10.9379039,10.753711 7.64788218,12.6532059 4.44708556,11.795555 C1.24628894,10.9379042 -0.653205997,7.64788242 0.204444873,4.4470858 C0.681422235,2.66698205 1.91072247,1.28936585 3.45859785,0.564661592 L3.95793802,1.43583792 L3.94546796,1.44144648 L6.4330127,5.75000036 L5.5669873,6.25000036 L3.07944256,1.94144648 C2.17504663,2.5914554 1.48111793,3.54618039 1.1703707,4.70590484 C0.455661641,7.37323536 2.03857409,10.1149201 4.7059046,10.8296292 C7.37323512,11.5443383 10.1149199,9.96142581 10.829629,7.29409529 C10.9454889,6.86170024 11.0009697,6.42735124 11.0012398,6 L11,6 C11,5.63585356 10.9610724,5.28079915 10.8871515,4.93877116 Z', + path: 'M10.8871515,4.93877116 C10.7764707,4.43108229 10.5875051,3.94579225 10.3301269,3.50000021 L10.3308482,3.49958378 C9.46665561,2.00598422 7.8519922,1.00090744 6.00250515,1.00000061 L6.00250515,4.75001343e-07 C8.87812128,0.0011754551 11.2807698,2.02530154 11.8645776,4.72650571 C12.0619293,5.63173625 12.0518761,6.59631008 11.7955548,7.55291434 C10.9379039,10.753711 7.64788218,12.6532059 4.44708556,11.795555 C1.24628894,10.9379042 -0.653205997,7.64788242 0.204444873,4.4470858 C0.681422235,2.66698205 1.91072247,1.28936585 3.45859785,0.564661592 L3.95793802,1.43583792 L3.94546796,1.44144648 L6.4330127,5.75000036 L5.5669873,6.25000036 L3.07944256,1.94144648 C2.17504663,2.5914554 1.48111793,3.54618039 1.1703707,4.70590484 C0.455661641,7.37323536 2.03857409,10.1149201 4.7059046,10.8296292 C7.37323512,11.5443383 10.1149199,9.96142581 10.829629,7.29409529 C10.9454889,6.86170024 11.0009697,6.42735124 11.0012398,6 L11,6 C11,5.63585356 10.9610724,5.28079915 10.8871515,4.93877116 Z', viewBox: '0 0 12 12', ratio: 1, }, timer60: { - path: - 'M6.51360423,1.02605705 L6.5136035,1.02628879 L6.49999983,1.02491092 L6.49999983,6.0000004 L5.49999983,6.0000004 L5.49999983,1.02491092 C4.39176553,1.1356372 3.31344314,1.61548894 2.46446592,2.46446616 C0.511844466,4.41708762 0.511844466,7.58291251 2.46446592,9.53553397 C4.41708738,11.4881554 7.58291228,11.4881554 9.53553374,9.53553397 C10.5118444,8.55922329 10.9999998,7.27961177 10.9999998,6.00000024 L11.9999998,6.00000024 C11.9999998,7.53553409 11.4142133,9.07106792 10.2426405,10.2426408 C7.89949477,12.5857865 4.10050489,12.5857865 1.75735914,10.2426408 C-0.585786607,7.899495 -0.585786607,4.10050513 1.75735914,1.75735938 C3.01051112,0.504207398 4.68007561,-0.0787387759 6.32064441,0.00852085708 C9.4853004,0.175084568 12,2.7938725 12,6 L11,6 C11,3.411981 9.0337411,1.28320638 6.51360423,1.02605705 Z', + path: 'M6.51360423,1.02605705 L6.5136035,1.02628879 L6.49999983,1.02491092 L6.49999983,6.0000004 L5.49999983,6.0000004 L5.49999983,1.02491092 C4.39176553,1.1356372 3.31344314,1.61548894 2.46446592,2.46446616 C0.511844466,4.41708762 0.511844466,7.58291251 2.46446592,9.53553397 C4.41708738,11.4881554 7.58291228,11.4881554 9.53553374,9.53553397 C10.5118444,8.55922329 10.9999998,7.27961177 10.9999998,6.00000024 L11.9999998,6.00000024 C11.9999998,7.53553409 11.4142133,9.07106792 10.2426405,10.2426408 C7.89949477,12.5857865 4.10050489,12.5857865 1.75735914,10.2426408 C-0.585786607,7.899495 -0.585786607,4.10050513 1.75735914,1.75735938 C3.01051112,0.504207398 4.68007561,-0.0787387759 6.32064441,0.00852085708 C9.4853004,0.175084568 12,2.7938725 12,6 L11,6 C11,3.411981 9.0337411,1.28320638 6.51360423,1.02605705 Z', viewBox: '0 0 12 12', ratio: 1, }, videoCamera: { - path: - 'M488.3,142.5v203.1c0,15.7-17,25.5-30.6,17.7l-84.6-48.8v13.9c0,41.8-33.9,75.7-75.7,75.7H75.7C33.9,404.1,0,370.2,0,328.4 V159.9c0-41.8,33.9-75.7,75.7-75.7h221.8c41.8,0,75.7,33.9,75.7,75.7v13.9l84.6-48.8C471.3,117,488.3,126.9,488.3,142.5z', + path: 'M488.3,142.5v203.1c0,15.7-17,25.5-30.6,17.7l-84.6-48.8v13.9c0,41.8-33.9,75.7-75.7,75.7H75.7C33.9,404.1,0,370.2,0,328.4 V159.9c0-41.8,33.9-75.7,75.7-75.7h221.8c41.8,0,75.7,33.9,75.7,75.7v13.9l84.6-48.8C471.3,117,488.3,126.9,488.3,142.5z', viewBox: '0 0 488.3 488.3', ratio: 1, }, diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index f94fc50f1f..437efffe5a 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -62,9 +62,9 @@ const Section = (props: { type: SectionType }) => { dispatch(editProfileModal({})); } else if (type === SectionType.ColorMode) { const currentTheme = String(window.Events.getThemeSetting()); - const newTheme = (isDarkMode - ? currentTheme.replace('dark', 'light') - : currentTheme.replace('light', 'dark')) as ThemeStateType; + const newTheme = ( + isDarkMode ? currentTheme.replace('dark', 'light') : currentTheme.replace('light', 'dark') + ) as ThemeStateType; // We want to persist the primary color when using the color mode button void switchThemeTo({ @@ -162,12 +162,8 @@ const setupTheme = async () => { // Do this only if we created a new Session ID, or if we already received the initial configuration message const triggerSyncIfNeeded = async () => { const us = UserUtils.getOurPubKeyStrFromCache(); - await getConversationController() - .get(us) - .setDidApproveMe(true, true); - await getConversationController() - .get(us) - .setIsApproved(true, true); + await getConversationController().get(us).setDidApproveMe(true, true); + await getConversationController().get(us).setIsApproved(true, true); const didWeHandleAConfigurationMessageAlready = (await Data.getItemById(SettingsKey.hasSyncedInitialConfigurationItem))?.value || false; if (didWeHandleAConfigurationMessageAlready) { diff --git a/ts/data/data.ts b/ts/data/data.ts index df4c54d4f1..143d052f7b 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -176,9 +176,8 @@ async function removeConversation(id: string): Promise { } async function getAllConversations(): Promise> { - const conversationsAttrs = (await channels.getAllConversations()) as Array< - ConversationAttributes - >; + const conversationsAttrs = + (await channels.getAllConversations()) as Array; return conversationsAttrs.map(attr => new ConversationModel(attr)); } @@ -515,23 +514,26 @@ async function removeAllMessagesInConversation(conversationId: string): Promise< await message.cleanup(); } window.log.info( - `removeAllMessagesInConversation messages.cleanup() ${conversationId} took ${Date.now() - - start}ms` + `removeAllMessagesInConversation messages.cleanup() ${conversationId} took ${ + Date.now() - start + }ms` ); start = Date.now(); // eslint-disable-next-line no-await-in-loop await channels.removeMessagesByIds(ids); window.log.info( - `removeAllMessagesInConversation: removeMessagesByIds ${conversationId} took ${Date.now() - - start}ms` + `removeAllMessagesInConversation: removeMessagesByIds ${conversationId} took ${ + Date.now() - start + }ms` ); } while (messages.length); await channels.removeAllMessagesInConversation(conversationId); window.log.info( - `removeAllMessagesInConversation: complete time ${conversationId} took ${Date.now() - - startFunction}ms` + `removeAllMessagesInConversation: complete time ${conversationId} took ${ + Date.now() - startFunction + }ms` ); } diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 8f5f51b800..f73c28e8fc 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -315,9 +315,10 @@ export function useIsTyping(conversationId?: string): boolean { return useConversationPropsById(conversationId)?.isTyping || false; } -export function useQuoteAuthorName( - authorId?: string -): { authorName: string | undefined; isMe: boolean } { +export function useQuoteAuthorName(authorId?: string): { + authorName: string | undefined; + isMe: boolean; +} { const convoProps = useConversationPropsById(authorId); const isMe = Boolean(authorId && isUsAnySogsFromCache(authorId)); diff --git a/ts/hooks/useVideoEventListener.ts b/ts/hooks/useVideoEventListener.ts index 06c984aa30..1fe3880cb4 100644 --- a/ts/hooks/useVideoEventListener.ts +++ b/ts/hooks/useVideoEventListener.ts @@ -21,9 +21,8 @@ export function useVideoCallEventsListener(uniqueId: string, onSame: boolean) { const [remoteStream, setRemoteStream] = useState(null); const [localStreamVideoIsMuted, setLocalStreamVideoIsMuted] = useState(true); const [ourAudioIsMuted, setOurAudioIsMuted] = useState(false); - const [currentSelectedAudioOutput, setCurrentSelectedAudioOutput] = useState( - DEVICE_DISABLED_DEVICE_ID - ); + const [currentSelectedAudioOutput, setCurrentSelectedAudioOutput] = + useState(DEVICE_DISABLED_DEVICE_ID); const [remoteStreamVideoIsMuted, setRemoteStreamVideoIsMuted] = useState(true); const mountedStateFunc = useMountedState(); const mountedState = mountedStateFunc(); diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 3f28296b12..7a61e07af7 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -401,9 +401,8 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) { } else { // this is a reupload. no need to generate a new profileKey const ourConvoProfileKey = - getConversationController() - .get(UserUtils.getOurPubKeyStrFromCache()) - ?.getProfileKey() || null; + getConversationController().get(UserUtils.getOurPubKeyStrFromCache())?.getProfileKey() || + null; profileKey = ourConvoProfileKey ? fromHexToArray(ourConvoProfileKey) : null; if (!profileKey) { diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts index e8c5cc9666..d09b98aa8f 100644 --- a/ts/mains/main_node.ts +++ b/ts/mains/main_node.ts @@ -861,10 +861,13 @@ async function requestShutdown() { // exits the app before we've set everything up in preload() (so the browser isn't // yet listening for these events), or if there are a whole lot of stacked-up tasks. // Note: two minutes is also our timeout for SQL tasks in data.ts in the browser. - setTimeout(() => { - console.log('requestShutdown: Response never received; forcing shutdown.'); - resolve(undefined); - }, 2 * 60 * 1000); + setTimeout( + () => { + console.log('requestShutdown: Response never received; forcing shutdown.'); + resolve(undefined); + }, + 2 * 60 * 1000 + ); }); try { diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts index 9d54661d3f..bfb52e19b1 100644 --- a/ts/models/conversationAttributes.ts +++ b/ts/models/conversationAttributes.ts @@ -34,7 +34,7 @@ export function isDirectConversation(conversationType: ConversationTypeEnum) { * mentions_only: trigger a notification only on mentions of ourself */ export const ConversationNotificationSetting = ['all', 'disabled', 'mentions_only'] as const; -export type ConversationNotificationSettingType = typeof ConversationNotificationSetting[number]; +export type ConversationNotificationSettingType = (typeof ConversationNotificationSetting)[number]; /** * Some fields are retrieved from the database as a select, but should not be saved in a commit() diff --git a/ts/models/message.ts b/ts/models/message.ts index 300495b43e..bc3cfd3cf2 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -232,9 +232,8 @@ export class MessageModel extends Backbone.Model { (pubkeysInDesc || []).forEach((pubkeyWithAt: string) => { const pubkey = pubkeyWithAt.slice(1); const isUS = isUsAnySogsFromCache(pubkey); - const displayName = getConversationController().getContactProfileNameOrShortenedPubKey( - pubkey - ); + const displayName = + getConversationController().getContactProfileNameOrShortenedPubKey(pubkey); if (isUS) { description = description?.replace(pubkeyWithAt, `@${window.i18n('you')}`); } else if (displayName && displayName.length) { @@ -683,9 +682,8 @@ export class MessageModel extends Backbone.Model { const quoteWithData = await loadQuoteData(this.get('quote')); const previewWithData = await loadPreviewData(this.get('preview')); - const { hasAttachments, hasVisualMediaAttachments, hasFileAttachments } = getAttachmentMetadata( - this - ); + const { hasAttachments, hasVisualMediaAttachments, hasFileAttachments } = + getAttachmentMetadata(this); this.set({ hasAttachments, hasVisualMediaAttachments, hasFileAttachments }); await this.commit(); diff --git a/ts/node/menu.ts b/ts/node/menu.ts index fb2862e1ba..fb45418505 100644 --- a/ts/node/menu.ts +++ b/ts/node/menu.ts @@ -17,14 +17,8 @@ export const createTemplate = ( throw new TypeError('`options.platform` must be a string'); } - const { - openReleaseNotes, - openSupportPage, - platform, - showAbout, - showDebugLog, - showWindow, - } = options; + const { openReleaseNotes, openSupportPage, platform, showAbout, showDebugLog, showWindow } = + options; const template = [ { diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 2964865b87..5cd2719af5 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -346,9 +346,7 @@ function getById(table: string, id: string, instance?: BetterSqlite3.Database) { function removeById(table: string, id: string) { if (!Array.isArray(id)) { - assertGlobalInstance() - .prepare(`DELETE FROM ${table} WHERE id = $id;`) - .run({ id }); + assertGlobalInstance().prepare(`DELETE FROM ${table} WHERE id = $id;`).run({ id }); return; } @@ -396,9 +394,7 @@ function updateSwarmNodesForPubkey(pubkey: string, snodeEdKeys: Array) { } function getConversationCount() { - const row = assertGlobalInstance() - .prepare(`SELECT count(*) from ${CONVERSATIONS_TABLE};`) - .get(); + const row = assertGlobalInstance().prepare(`SELECT count(*) from ${CONVERSATIONS_TABLE};`).get(); if (!row) { throw new Error(`getConversationCount: Unable to get count of ${CONVERSATIONS_TABLE}`); } @@ -517,11 +513,9 @@ function fetchConvoMemoryDetails(convoId: string): SaveConversationReturn { function removeConversation(id: string | Array) { if (!Array.isArray(id)) { - assertGlobalInstance() - .prepare(`DELETE FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`) - .run({ - id, - }); + assertGlobalInstance().prepare(`DELETE FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`).run({ + id, + }); return; } @@ -748,9 +742,7 @@ function searchMessagesInConversation(query: string, conversationId: string, lim } function getMessageCount() { - const row = assertGlobalInstance() - .prepare(`SELECT count(*) from ${MESSAGES_TABLE};`) - .get(); + const row = assertGlobalInstance().prepare(`SELECT count(*) from ${MESSAGES_TABLE};`).get(); if (!row) { throw new Error(`getMessageCount: Unable to get count of ${MESSAGES_TABLE}`); @@ -918,19 +910,15 @@ function saveSeenMessageHash(data: any) { } function cleanLastHashes() { - assertGlobalInstance() - .prepare(`DELETE FROM ${LAST_HASHES_TABLE} WHERE expiresAt <= $now;`) - .run({ - now: Date.now(), - }); + assertGlobalInstance().prepare(`DELETE FROM ${LAST_HASHES_TABLE} WHERE expiresAt <= $now;`).run({ + now: Date.now(), + }); } function cleanSeenMessages() { - assertGlobalInstance() - .prepare('DELETE FROM seenMessages WHERE expiresAt <= $now;') - .run({ - now: Date.now(), - }); + assertGlobalInstance().prepare('DELETE FROM seenMessages WHERE expiresAt <= $now;').run({ + now: Date.now(), + }); } function saveMessages(arrayOfMessages: Array) { @@ -1611,19 +1599,15 @@ const unprocessed: UnprocessedDataNode = { }, getUnprocessedById: (id: string) => { - const row = assertGlobalInstance() - .prepare('SELECT * FROM unprocessed WHERE id = $id;') - .get({ - id, - }); + const row = assertGlobalInstance().prepare('SELECT * FROM unprocessed WHERE id = $id;').get({ + id, + }); return row; }, getUnprocessedCount: () => { - const row = assertGlobalInstance() - .prepare('SELECT count(*) from unprocessed;') - .get(); + const row = assertGlobalInstance().prepare('SELECT count(*) from unprocessed;').get(); if (!row) { throw new Error('getMessageCount: Unable to get count of unprocessed'); @@ -1645,15 +1629,11 @@ const unprocessed: UnprocessedDataNode = { console.error('removeUnprocessed only supports single ids at a time'); throw new Error('removeUnprocessed only supports single ids at a time'); } - assertGlobalInstance() - .prepare('DELETE FROM unprocessed WHERE id = $id;') - .run({ id }); + assertGlobalInstance().prepare('DELETE FROM unprocessed WHERE id = $id;').run({ id }); }, removeAllUnprocessed: () => { - assertGlobalInstance() - .prepare('DELETE FROM unprocessed;') - .run(); + assertGlobalInstance().prepare('DELETE FROM unprocessed;').run(); }, }; @@ -1743,9 +1723,7 @@ function removeAll() { } function removeAllConversations() { - assertGlobalInstance() - .prepare(`DELETE FROM ${CONVERSATIONS_TABLE};`) - .run(); + assertGlobalInstance().prepare(`DELETE FROM ${CONVERSATIONS_TABLE};`).run(); } function getMessagesWithVisualMediaAttachments(conversationId: string, limit?: number) { @@ -2093,9 +2071,7 @@ function removeV2OpenGroupRoom(conversationId: string) { function getEntriesCountInTable(tbl: string) { try { - const row = assertGlobalInstance() - .prepare(`SELECT count(*) from ${tbl};`) - .get(); + const row = assertGlobalInstance().prepare(`SELECT count(*) from ${tbl};`).get(); return row['count(*)']; } catch (e) { console.error(e); @@ -2260,8 +2236,9 @@ function cleanUpOldOpengroupsOnStart() { const messagesInConvoAfter = getMessagesCountByConversation(convoId); console.info( - `Cleaning ${countToRemove} messages older than 6 months in public convo: ${convoId} took ${Date.now() - - start}ms. Old message count: ${messagesInConvoBefore}, new message count: ${messagesInConvoAfter}` + `Cleaning ${countToRemove} messages older than 6 months in public convo: ${convoId} took ${ + Date.now() - start + }ms. Old message count: ${messagesInConvoBefore}, new message count: ${messagesInConvoAfter}` ); // no need to update the `unreadCount` during the migration anymore. diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 131d9c9d80..037b0defc1 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -623,24 +623,29 @@ async function handleGroupUpdate(latestEnvelopeTimestamp: number) { for (let index = 0; index < allGoupsInWrapper.length; index++) { const groupInWrapper = allGoupsInWrapper[index]; - if (!getConversationController().get(groupInWrapper.pubkeyHex)) { - // dump is always empty when creating a new groupInfo - await MetaGroupWrapperActions.init(groupInWrapper.pubkeyHex, { - metaDumped: null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(userEdKeypair.privKeyBytes, 64), - groupEd25519Secretkey: groupInWrapper.secretKey, - groupEd25519Pubkey: toFixedUint8ArrayOfLength( - HexString.fromHexString(groupInWrapper.pubkeyHex.slice(2)), - 32 - ), - }); + const groupPk = groupInWrapper.pubkeyHex; + if (!getConversationController().get(groupPk)) { + try { + // dump is always empty when creating a new groupInfo + await MetaGroupWrapperActions.init(groupPk, { + metaDumped: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEdKeypair.privKeyBytes, 64), + groupEd25519Secretkey: groupInWrapper.secretKey, + groupEd25519Pubkey: toFixedUint8ArrayOfLength( + HexString.fromHexString(groupPk.slice(2)), + 32 + ), + }); + } catch (e) { + window.log.warn(`MetaGroupWrapperActions.init of "${groupPk}" failed with`, e.message); + } const created = await getConversationController().getOrCreateAndWait( - groupInWrapper.pubkeyHex, + groupPk, ConversationTypeEnum.GROUPV3 ); created.set({ active_at: latestEnvelopeTimestamp }); await created.commit(); - getSwarmPollingInstance().addGroupId(PubKey.cast(groupInWrapper.pubkeyHex)); + getSwarmPollingInstance().addGroupId(PubKey.cast(groupPk)); } } } @@ -653,7 +658,6 @@ async function handleUserGroupsUpdate(result: IncomingUserResult) { case 'Community': await handleCommunitiesUpdate(); break; - case 'LegacyGroup': await handleLegacyGroupUpdate(result.latestEnvelopeTimestamp); break; diff --git a/ts/receiver/opengroup.ts b/ts/receiver/opengroup.ts index fe412d2b7d..790fa49162 100644 --- a/ts/receiver/opengroup.ts +++ b/ts/receiver/opengroup.ts @@ -68,11 +68,7 @@ const handleOpenGroupMessage = async ( return; } - if ( - !getConversationController() - .get(conversationId) - ?.isOpenGroupV2() - ) { + if (!getConversationController().get(conversationId)?.isOpenGroupV2()) { window?.log?.error('Received a message for an unknown convo or not an v2. Skipping'); return; } diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index 8f92671548..61e40f4f62 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -153,8 +153,9 @@ function handleLinkPreviews(messageBody: string, messagePreview: any, message: M ); if (preview.length < incomingPreview.length) { window?.log?.info( - `${message.idForLogging()}: Eliminated ${preview.length - - incomingPreview.length} previews with invalid urls'` + `${message.idForLogging()}: Eliminated ${ + preview.length - incomingPreview.length + } previews with invalid urls'` ); } @@ -379,9 +380,9 @@ export async function handleMessageJob( messageHash: string ) { window?.log?.info( - `Starting handleMessageJob for message ${messageModel.idForLogging()}, ${messageModel.get( - 'serverTimestamp' - ) || messageModel.get('timestamp')} in conversation ${conversation.idForLogging()}` + `Starting handleMessageJob for message ${messageModel.idForLogging()}, ${ + messageModel.get('serverTimestamp') || messageModel.get('timestamp') + } in conversation ${conversation.idForLogging()}` ); const sendingDeviceConversation = await getConversationController().getOrCreateAndWait( diff --git a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts index fd4e760438..e569eb40b5 100644 --- a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts +++ b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts @@ -238,11 +238,7 @@ export function getUsBlindedInThatServer(convo: ConversationModel | string): str } const convoId = isString(convo) ? convo : convo.id; - if ( - !getConversationController() - .get(convoId) - ?.isOpenGroupV2() - ) { + if (!getConversationController().get(convoId)?.isOpenGroupV2()) { return undefined; } const room = OpenGroupData.getV2OpenGroupRoom(isString(convo) ? convo : convo.id); diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts index 6a110d873a..f234259830 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts @@ -259,9 +259,8 @@ const handleMessagesResponseV4 = async ( subrequestOption.messages.roomId ); - const messagesWithValidSignature = await filterOutMessagesInvalidSignature( - messagesWithoutDeleted - ); + const messagesWithValidSignature = + await filterOutMessagesInvalidSignature(messagesWithoutDeleted); // we do a first check with blinded ids. Looking to filter out messages we already received from that blinded id. const messagesFilteredBlindedIds = await filterDuplicatesFromDbAndIncomingV4( messagesWithValidSignature @@ -427,8 +426,8 @@ async function handleInboxOutboxMessages( unblindedIDOrBlinded, ConversationTypeEnum.PRIVATE ); - const serverConversationId = OpenGroupData.getV2OpenGroupRoomsByServerUrl(serverUrl)?.[0] - .conversationId; + const serverConversationId = + OpenGroupData.getV2OpenGroupRoomsByServerUrl(serverUrl)?.[0].conversationId; if (!serverConversationId) { throw new Error('serverConversationId needs to exist'); } diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index aa7be98de3..7c0fa38721 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -54,7 +54,8 @@ export type RetrieveSubRequestType = | RetrieveLegacyClosedGroupSubRequestType | RetrievePubkeySubRequestType | RetrieveGroupAdminSubRequestType - | UpdateExpiryOnNodeSubRequest; + | UpdateExpiryOnNodeUserSubRequest + | UpdateExpiryOnNodeGroupSubRequest; /** * OXEND_REQUESTS @@ -142,9 +143,7 @@ export type DeleteFromNodeSubRequest = { params: DeleteByHashesFromNodeParams; }; -export type UpdateExpireNodeParams = { - pubkey: string; - pubkey_ed25519: string; +type UpdateExpireAlwaysNeeded = { messages: Array; expiry: number; signature: string; @@ -152,9 +151,25 @@ export type UpdateExpireNodeParams = { shorten?: boolean; }; -export type UpdateExpiryOnNodeSubRequest = { +export type UpdateExpireNodeUserParams = WithPubkeyAsString & + UpdateExpireAlwaysNeeded & { + pubkey_ed25519: string; + }; + +export type UpdateExpireNodeGroupParams = WithPubkeyAsGroupPubkey & UpdateExpireAlwaysNeeded; + +type UpdateExpiryOnNodeSubRequest = + | UpdateExpiryOnNodeUserSubRequest + | UpdateExpiryOnNodeGroupSubRequest; + +export type UpdateExpiryOnNodeUserSubRequest = { + method: 'expire'; + params: UpdateExpireNodeUserParams; +}; + +export type UpdateExpiryOnNodeGroupSubRequest = { method: 'expire'; - params: UpdateExpireNodeParams; + params: UpdateExpireNodeGroupParams; }; export type OxendSubRequest = OnsResolveSubRequest | GetServiceNodesSubRequest; diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts index c47a67682d..842375eafb 100644 --- a/ts/session/apis/snode_api/expire.ts +++ b/ts/session/apis/snode_api/expire.ts @@ -5,7 +5,7 @@ import { getSodiumRenderer } from '../../crypto'; import { StringUtils, UserUtils } from '../../utils'; import { fromBase64ToArray, fromHexToArray } from '../../utils/String'; import { EmptySwarmError } from '../../utils/errors'; -import { UpdateExpireNodeParams } from './SnodeRequestTypes'; +import { UpdateExpireNodeUserParams } from './SnodeRequestTypes'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { getSwarmFor } from './snodePool'; @@ -89,9 +89,9 @@ async function processExpirationResults( const reason = 'Unknown'; const statusCode = '404'; window?.log?.warn( - `loki_message:::expireMessage - Couldn't delete data from: ${ - targetNode.pubkey_ed25519 - }${reason && statusCode && ` due to an error ${reason} (${statusCode})`}` + `loki_message:::expireMessage - Couldn't delete data from: ${targetNode.pubkey_ed25519}${ + reason && statusCode && ` due to an error ${reason} (${statusCode})` + }` ); // TODO This might be a redundant step results[nodeKey] = { hashes: [], expiry: 0 }; @@ -125,7 +125,7 @@ async function processExpirationResults( return results; } -async function expireOnNodes(targetNode: Snode, params: UpdateExpireNodeParams) { +async function expireOnNodes(targetNode: Snode, params: UpdateExpireNodeUserParams) { try { const result = await doSnodeBatchRequest( [ @@ -197,7 +197,7 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) { const swarm = await getSwarmFor(ourPubKey); const expiry = GetNetworkTime.getNowWithNetworkOffset() + expireTimer; - const signResult = await SnodeSignature.generateUpdateExpirySignature({ + const signResult = await SnodeSignature.generateUpdateExpiryOurSignature({ shortenOrExtend, timestamp: expiry, messageHashes: [messageHash], @@ -208,7 +208,7 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) { return; } - const params: UpdateExpireNodeParams = { + const params: UpdateExpireNodeUserParams = { pubkey: ourPubKey, pubkey_ed25519: signResult.pubkey_ed25519.toUpperCase(), // TODO better testing for failed case diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index f7b1e58a51..fea14ed290 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -86,9 +86,11 @@ async function encryptOnionV4RequestForPubkey( ) { const plaintext = encodeV4Request(requestInfo); - return callUtilsWorker('encryptForPubkey', pubKeyX25519hex, plaintext) as Promise< - DestinationContext - >; + return callUtilsWorker( + 'encryptForPubkey', + pubKeyX25519hex, + plaintext + ) as Promise; } // Returns the actual ciphertext, symmetric key that will be used // for decryption, and an ephemeral_key to send to the next hop @@ -98,9 +100,11 @@ async function encryptForPubKey( ): Promise { const plaintext = new TextEncoder().encode(JSON.stringify(requestInfo)); - return callUtilsWorker('encryptForPubkey', pubKeyX25519hex, plaintext) as Promise< - DestinationContext - >; + return callUtilsWorker( + 'encryptForPubkey', + pubKeyX25519hex, + plaintext + ) as Promise; } export type DestinationRelayV2 = { @@ -303,7 +307,7 @@ export async function processOnionRequestErrorAtDestination({ return; } window?.log?.info( - `processOnionRequestErrorAtDestination. statusCode nok: ${statusCode}: "${body}"` + `processOnionRequestErrorAtDestination. statusCode nok: ${statusCode}: associatedWith:${associatedWith} destinationSnodeEd25519:${destinationSnodeEd25519}` ); process406Or425Error(statusCode); processOxenServerError(statusCode, body); diff --git a/ts/session/apis/snode_api/pollingTypes.ts b/ts/session/apis/snode_api/pollingTypes.ts new file mode 100644 index 0000000000..3fd142a0f5 --- /dev/null +++ b/ts/session/apis/snode_api/pollingTypes.ts @@ -0,0 +1,8 @@ +// That named-tuple syntax breaks prettier linting and formatting on the whole file it is used currently, so we keep it separately. + +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { ConversationTypeEnum } from '../../../models/conversationAttributes'; + +export type PollForUs = [pubkey: string, type: ConversationTypeEnum.PRIVATE]; +export type PollForLegacy = [pubkey: string, type: ConversationTypeEnum.GROUP]; +export type PollForGroup = [pubkey: GroupPubkeyType, type: ConversationTypeEnum.GROUPV3]; diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 2ac7290064..2a6da4c3f3 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -14,10 +14,12 @@ import { RetrieveGroupAdminSubRequestType, RetrieveLegacyClosedGroupSubRequestType, RetrieveSubRequestType, - UpdateExpiryOnNodeSubRequest, + UpdateExpiryOnNodeGroupSubRequest, + UpdateExpiryOnNodeUserSubRequest, } from './SnodeRequestTypes'; import { SnodeSignature } from './snodeSignatures'; import { RetrieveMessagesResultsBatched, RetrieveMessagesResultsContent } from './types'; +import { PreConditionFailed } from '../../utils/errors'; type RetrieveParams = { pubkey: string; @@ -102,7 +104,9 @@ async function retrieveRequestForGroup({ const group = await UserGroupsWrapperActions.getGroup(groupPk); const groupSecretKey = group?.secretKey; if (isNil(groupSecretKey) || isEmpty(groupSecretKey)) { - throw new Error(`retrieveRequestForGroup: failed to find group admin secret key in wrapper`); + throw new PreConditionFailed( + `retrieveRequestForGroup: failed to find group admin secret key in wrapper` + ); } const signatureBuilt = await SnodeSignature.getSnodeGroupSignatureParams({ ...retrieveParam, @@ -118,7 +122,7 @@ async function retrieveRequestForGroup({ namespace, }; const retrieveParamsGroup: RetrieveGroupAdminSubRequestType = { - method: 'retrieve', + method: 'retrieve' as const, params: retrieveGroup, }; @@ -132,6 +136,7 @@ async function buildRetrieveRequest( ourPubkey: string, configHashesToBump: Array | null ): Promise> { + const isUs = pubkey === ourPubkey; const maxSizeMap = SnodeNamespace.maxSizeMap(namespaces); const retrieveRequestsParams: Array = await Promise.all( namespaces.map(async (namespace, index) => { @@ -163,17 +168,14 @@ async function buildRetrieveRequest( if (configHashesToBump?.length) { const expiry = GetNetworkTime.getNowWithNetworkOffset() + DURATION.DAYS * 30; - const signResult = await SnodeSignature.generateUpdateExpirySignature({ - shortenOrExtend: '', - timestamp: expiry, - messageHashes: configHashesToBump, - }); - if (!signResult) { - window.log.warn( - `SnodeSignature.generateUpdateExpirySignature returned result empty for hashes ${configHashesToBump}` - ); - } else { - const expireParams: UpdateExpiryOnNodeSubRequest = { + if (isUs) { + const signResult = await SnodeSignature.generateUpdateExpiryOurSignature({ + shortenOrExtend: '', + timestamp: expiry, + messageHashes: configHashesToBump, + }); + + const expireParams: UpdateExpiryOnNodeUserSubRequest = { method: 'expire', params: { messages: configHashesToBump, @@ -183,6 +185,31 @@ async function buildRetrieveRequest( pubkey_ed25519: signResult.pubkey_ed25519, }, }; + retrieveRequestsParams.push(expireParams); + } else if (PubKey.isClosedGroupV2(pubkey)) { + const group = await UserGroupsWrapperActions.getGroup(pubkey); + if (!group || !group.secretKey || isEmpty(group.secretKey)) { + throw new PreConditionFailed( + 'generateUpdateExpiryGroupSignature only handles when the group is in the userwrapper currently and we have the adminkey' + ); + } + const signResult = await SnodeSignature.generateUpdateExpiryGroupSignature({ + shortenOrExtend: '', + timestamp: expiry, + messageHashes: configHashesToBump, + groupPk: pubkey, + groupPrivKey: group.secretKey, + }); + + const expireParams: UpdateExpiryOnNodeGroupSubRequest = { + method: 'expire', + params: { + messages: configHashesToBump, + expiry, + signature: signResult.signature, + pubkey, + }, + }; retrieveRequestsParams.push(expireParams); } diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index d4e9863942..b2f2a51125 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -1,14 +1,14 @@ import https from 'https'; // eslint-disable-next-line import/no-named-default -import { default as insecureNodeFetch } from 'node-fetch'; import { clone } from 'lodash'; +import { default as insecureNodeFetch } from 'node-fetch'; import pRetry from 'p-retry'; -import { HTTPError, NotFoundError } from '../../utils/errors'; import { Snode } from '../../../data/data'; +import { HTTPError, NotFoundError } from '../../utils/errors'; -import { ERROR_421_HANDLED_RETRY_REQUEST, Onions, snodeHttpsAgent, SnodeResponse } from './onions'; import { APPLICATION_JSON } from '../../../types/MIME'; +import { ERROR_421_HANDLED_RETRY_REQUEST, Onions, snodeHttpsAgent, SnodeResponse } from './onions'; export interface LokiFetchOptions { method: 'GET' | 'POST'; diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts index b2d46ecd75..89a6c89247 100644 --- a/ts/session/apis/snode_api/snodeSignatures.ts +++ b/ts/session/apis/snode_api/snodeSignatures.ts @@ -6,6 +6,8 @@ import { GetNetworkTime } from './getNetworkTime'; import { SnodeNamespaces } from './namespaces'; import { PubKey } from '../../types'; import { toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; +import { PreConditionFailed } from '../../utils/errors'; +import { isEmpty } from 'lodash'; export type SnodeSignatureResult = { timestamp: number; @@ -163,44 +165,95 @@ async function generateUpdateExpirySignature({ shortenOrExtend, timestamp, messageHashes, + ed25519Privkey, + ed25519Pubkey, }: { shortenOrExtend: 'extend' | 'shorten' | ''; timestamp: number; messageHashes: Array; -}): Promise<{ signature: string; pubkey_ed25519: string } | null> { + ed25519Privkey: Uint8Array | FixedSizeUint8Array<64>; + ed25519Pubkey: string; +}): Promise<{ signature: string; pubkey_ed25519: string }> { + // "expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N] + const verificationString = `expire${shortenOrExtend}${timestamp}${messageHashes.join('')}`; + const verificationData = StringUtils.encode(verificationString, 'utf8'); + const message = new Uint8Array(verificationData); + + const sodium = await getSodiumRenderer(); + + const signature = sodium.crypto_sign_detached(message, ed25519Privkey as Uint8Array); + const signatureBase64 = fromUInt8ArrayToBase64(signature); + + if (!isEmpty(signatureBase64) || isEmpty(ed25519Pubkey)) { + throw new Error('generateUpdateExpirySignature: failed to build signature'); + } + + return { + signature: signatureBase64, + pubkey_ed25519: ed25519Pubkey, + }; +} + +async function generateUpdateExpiryOurSignature({ + shortenOrExtend, + timestamp, + messageHashes, +}: { + shortenOrExtend: 'extend' | 'shorten' | ''; + timestamp: number; + messageHashes: Array; +}) { const ourEd25519Key = await UserUtils.getUserED25519KeyPair(); if (!ourEd25519Key) { const err = 'getSnodeSignatureParams "expiry": User has no getUserED25519KeyPair()'; window.log.warn(err); - throw new Error(err); + throw new PreConditionFailed(err); } const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey); - // "expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N] - const verificationString = `expire${shortenOrExtend}${timestamp}${messageHashes.join('')}`; - const verificationData = StringUtils.encode(verificationString, 'utf8'); - const message = new Uint8Array(verificationData); - - const sodium = await getSodiumRenderer(); - try { - const signature = sodium.crypto_sign_detached(message, edKeyPrivBytes); - const signatureBase64 = fromUInt8ArrayToBase64(signature); + return generateUpdateExpirySignature({ + messageHashes, + shortenOrExtend, + timestamp, + ed25519Privkey: edKeyPrivBytes, + ed25519Pubkey: ourEd25519Key.pubKey, + }); +} - return { - signature: signatureBase64, - pubkey_ed25519: ourEd25519Key.pubKey, - }; - } catch (e) { - window.log.warn('generateSignature failed with: ', e.message); - return null; +async function generateUpdateExpiryGroupSignature({ + shortenOrExtend, + timestamp, + messageHashes, + groupPrivKey, + groupPk, +}: { + shortenOrExtend: 'extend' | 'shorten' | ''; + timestamp: number; + messageHashes: Array; + groupPk: GroupPubkeyType; + groupPrivKey: FixedSizeUint8Array<64>; +}) { + if (isEmpty(groupPrivKey) || isEmpty(groupPk)) { + throw new PreConditionFailed( + 'generateUpdateExpiryGroupSignature groupPrivKey or groupPks is empty' + ); } + + return generateUpdateExpirySignature({ + messageHashes, + shortenOrExtend, + timestamp, + ed25519Privkey: groupPrivKey, + ed25519Pubkey: groupPk, + }); } export const SnodeSignature = { getSnodeSignatureParamsUs, getSnodeGroupSignatureParams, getSnodeSignatureByHashesParams, - generateUpdateExpirySignature, + generateUpdateExpiryOurSignature, + generateUpdateExpiryGroupSignature, }; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 7d15ae720e..a0df1e0ba1 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -12,8 +12,10 @@ import * as snodePool from './snodePool'; import { ConversationModel } from '../../../models/conversation'; import { ConversationTypeEnum } from '../../../models/conversationAttributes'; import { updateIsOnline } from '../../../state/ducks/onion'; +import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { GenericWrapperActions, + MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../../../webworker/workers/browser/libsession_worker_interface'; import { DURATION, SWARM_POLLING_TIMEOUT } from '../../constants'; @@ -23,12 +25,16 @@ import { StringUtils, UserUtils } from '../../utils'; import { perfEnd, perfStart } from '../../utils/Performance'; import { LibSessionUtil } from '../../utils/libsession/libsession_utils'; import { SnodeNamespace, SnodeNamespaces } from './namespaces'; +import { PollForGroup, PollForLegacy, PollForUs } from './pollingTypes'; import { SnodeAPIRetrieve } from './retrieveRequest'; import { SwarmPollingGroupConfig } from './swarm_polling_config/SwarmPollingGroupConfig'; import { SwarmPollingUserConfig } from './swarm_polling_config/SwarmPollingUserConfig'; -import { RetrieveMessageItem, RetrieveMessageItemWithNamespace, RetrieveMessagesResultsBatched, RetrieveRequestResult } from './types'; -import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { assertUnreachable } from '../../../types/sqlSharedTypes'; +import { + RetrieveMessageItem, + RetrieveMessageItemWithNamespace, + RetrieveMessagesResultsBatched, + RetrieveRequestResult, +} from './types'; export function extractWebSocketContent( message: string, @@ -64,11 +70,6 @@ export const getSwarmPollingInstance = () => { return instance; }; -type PollForUs = [pubkey: string, type: ConversationTypeEnum.PRIVATE]; -type PollForLegacy = [pubkey: string, type: ConversationTypeEnum.GROUP]; -type PollForGroup = [pubkey: GroupPubkeyType, type: ConversationTypeEnum.GROUPV3]; - - export class SwarmPolling { private groupPolling: Array<{ pubkey: PubKey; lastPolledTimestamp: number }>; private readonly lastHashes: Record>>; @@ -122,10 +123,10 @@ export class SwarmPolling { } } - public removePubkey(pk: PubKey | string) { + public removePubkey(pk: PubKey | string, reason: string) { const pubkey = PubKey.cast(pk); if (this.groupPolling.some(group => pubkey.key === group.pubkey.key)) { - window?.log?.info('Swarm removePubkey: removing pubkey from polling', pubkey.key); + window?.log?.info(`SwarmPolling: removing ${ed25519Str(pubkey.key)} for reason: "${reason}"`); this.groupPolling = this.groupPolling.filter(group => !pubkey.isEqual(group.pubkey)); } } @@ -171,30 +172,35 @@ export class SwarmPolling { setTimeout(this.pollForAllKeys.bind(this), SWARM_POLLING_TIMEOUT.ACTIVE); return; } + window.log.warn('############################ pollForAllKeys ############################'); // we always poll as often as possible for our pubkey const ourPubkey = UserUtils.getOurPubKeyStrFromCache(); - const directPromise = Promise.all([ - this.pollOnceForKey([ourPubkey, ConversationTypeEnum.PRIVATE]), - ]).then(() => undefined); + const directPromise = this.pollOnceForKey([ourPubkey, ConversationTypeEnum.PRIVATE]); const now = Date.now(); + const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); + const allGroupsLegacyInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups(); const groupPromises = this.groupPolling.map(async group => { const convoPollingTimeout = this.getPollingTimeout(group.pubkey); const diff = now - group.lastPolledTimestamp; const { key } = group.pubkey; - const loggingId = - getConversationController() - .get(key) - ?.idForLogging() || key; + const loggingId = ed25519Str(key); if (diff >= convoPollingTimeout) { window?.log?.debug( `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} ` ); if (PubKey.isClosedGroupV2(key)) { - return this.pollOnceForKey([key, ConversationTypeEnum.GROUPV3]); + const isInWrapper = allGroupsInWrapper.some(m => m.pubkeyHex === key); + + return isInWrapper + ? this.pollOnceForKey([key, ConversationTypeEnum.GROUPV3]) + : this.notPollingForGroupAsNotInWrapper(key, 'not in wrapper before poll'); } - return this.pollOnceForKey([key, ConversationTypeEnum.GROUP]); + const isLegacyInWrapper = allGroupsLegacyInWrapper.some(m => m.pubkeyHex === key); + return isLegacyInWrapper + ? this.pollOnceForKey([key, ConversationTypeEnum.GROUP]) + : this.notPollingForGroupAsNotInWrapper(key, 'not in wrapper before poll'); } window?.log?.debug( `Not polling for ${loggingId}; timeout: ${convoPollingTimeout} ; diff: ${diff}` @@ -216,9 +222,7 @@ export class SwarmPolling { /** * Only exposed as public for testing */ - public async pollOnceForKey( - [pubkey, type]:PollForUs | PollForLegacy | PollForGroup - ) { + public async pollOnceForKey([pubkey, type]: PollForUs | PollForLegacy | PollForGroup) { const namespaces = this.getNamespacesToPollFrom(type); const swarmSnodes = await snodePool.getSwarmFor(pubkey); @@ -302,16 +306,28 @@ export class SwarmPolling { const newMessages = await this.handleSeenMessages(uniqOtherMsgs); perfEnd(`handleSeenMessages-${pubkey}`, 'handleSeenMessages'); - // don't handle incoming messages from group swarms when the group is not one of the tracked group + const allLegacyGroupsInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups(); + const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); + + // don't handle incoming messages from group when the group is not tracked. + // this can happen when a group is removed from the wrapper while we were polling + if ( type === ConversationTypeEnum.GROUP && pubkey.startsWith('05') && - !(await UserGroupsWrapperActions.getLegacyGroup(pubkey)) // just check if a legacy group with that name exists + !allLegacyGroupsInWrapper.some(m => m.pubkeyHex === pubkey) // just check if a legacy group with that pubkey exists ) { - // that pubkey is not tracked in the wrapper anymore. Just discard those messages and make sure we are not polling - // TODOLATER we might need to do something like this for the new closed groups once released - getSwarmPollingInstance().removePubkey(pubkey); - } else { + // not tracked anymore in the wrapper. Discard messages and stop polling + this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); + return; + } + if (PubKey.isClosedGroupV2(pubkey) && allGroupsInWrapper.some(m => m.pubkeyHex === pubkey)) { + // not tracked anymore in the wrapper. Discard messages and stop polling + this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); + return; + } + + { // trigger the handling of all the other messages, not shared config related newMessages.forEach(m => { const content = extractWebSocketContent(m.data, m.hash); @@ -330,6 +346,35 @@ export class SwarmPolling { } } + private async getHashesToBump( + type: ConversationTypeEnum, + pubkey: string + ): Promise> { + if (type === ConversationTypeEnum.PRIVATE) { + const configHashesToBump: Array = []; + for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) { + const variant = LibSessionUtil.requiredUserVariants[index]; + try { + const toBump = await GenericWrapperActions.currentHashes(variant); + + if (toBump?.length) { + configHashesToBump.push(...toBump); + } + } catch (e) { + window.log.warn(`failed to get currentHashes for user variant ${variant}`); + } + } + window.log.debug(`configHashesToBump: ${configHashesToBump}`); + return configHashesToBump; + } + if (type === ConversationTypeEnum.GROUPV3 && PubKey.isClosedGroupV2(pubkey)) { + const toBump = await MetaGroupWrapperActions.currentHashes(pubkey); + window.log.debug(`configHashesToBump: ${toBump}`); + return toBump; + } + return []; + } + // Fetches messages for `pubkey` from `node` potentially updating // the lash hash record private async pollNodeForKey( @@ -348,26 +393,7 @@ export class SwarmPolling { const prevHashes = await Promise.all( namespaces.map(namespace => this.getLastHash(snodeEdkey, pubkey, namespace)) ); - const configHashesToBump: Array = []; - - // TODOLATER add the logic to take care of the closed groups too once we have a way to do it with the wrappers - if (type === ConversationTypeEnum.PRIVATE) { - for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) { - const variant = LibSessionUtil.requiredUserVariants[index]; - try { - const toBump = await GenericWrapperActions.currentHashes(variant); - - if (toBump?.length) { - configHashesToBump.push(...toBump); - } - } catch (e) { - window.log.warn(`failed to get currentHashes for user variant ${variant}`); - } - } - window.log.debug(`configHashesToBump: ${configHashesToBump}`); - } else if (type === ConversationTypeEnum.GROUPV3) { - console.info('pollNodeForKey case bump of hashes closedgroup v3 to do '); - } + const configHashesToBump = await this.getHashesToBump(type, pubkey); let results = await SnodeAPIRetrieve.retrieveNextMessages( node, @@ -432,6 +458,11 @@ export class SwarmPolling { } } + private async notPollingForGroupAsNotInWrapper(pubkey: string, reason: string) { + this.removePubkey(pubkey, reason); + return Promise.resolve(); + } + private loadGroupIds() { const convos = getConversationController().getConversations(); @@ -440,7 +471,7 @@ export class SwarmPolling { c.isClosedGroup() && !c.isBlocked() && !c.isKickedFromGroup() && !c.isLeft() ); - closedGroupsOnly.forEach((c) => { + closedGroupsOnly.forEach(c => { this.addGroupId(new PubKey(c.id)); }); } @@ -467,31 +498,31 @@ export class SwarmPolling { return newMessages; } - private getNamespacesToPollFrom(type: ConversationTypeEnum): Array { - if(type === ConversationTypeEnum.PRIVATE) { - return [ - SnodeNamespaces.Default, - SnodeNamespaces.UserProfile, - SnodeNamespaces.UserContacts, - SnodeNamespaces.UserGroups, - SnodeNamespaces.ConvoInfoVolatile, - ] ; - } - if(type === ConversationTypeEnum.GROUP) { + if (type === ConversationTypeEnum.PRIVATE) { return [ - SnodeNamespaces.LegacyClosedGroup - ] ; + SnodeNamespaces.Default, + SnodeNamespaces.UserProfile, + SnodeNamespaces.UserContacts, + SnodeNamespaces.UserGroups, + SnodeNamespaces.ConvoInfoVolatile, + ]; } - if(type === ConversationTypeEnum.GROUPV3) { + if (type === ConversationTypeEnum.GROUP) { + return [SnodeNamespaces.LegacyClosedGroup]; + } + if (type === ConversationTypeEnum.GROUPV3) { return [ SnodeNamespaces.ClosedGroupMessages, SnodeNamespaces.ClosedGroupInfo, SnodeNamespaces.ClosedGroupMembers, SnodeNamespaces.ClosedGroupKeys, // keys are fetched last to avoid race conditions when someone deposits them - ] ; + ]; } - assertUnreachable(type, `getNamespacesToPollFrom case should have been unreachable: type:${type}`) + assertUnreachable( + type, + `getNamespacesToPollFrom case should have been unreachable: type:${type}` + ); } private async updateLastHash({ @@ -547,28 +578,35 @@ export class SwarmPolling { } } -function retrieveItemWithNamespace(results: RetrieveRequestResult[] ) { +function retrieveItemWithNamespace(results: RetrieveRequestResult[]) { return flatten( - compact(results.map(result => result.messages.messages?.map(r => ({ ...r, namespace: result.namespace }))))); + compact( + results.map( + result => result.messages.messages?.map(r => ({ ...r, namespace: result.namespace })) + ) + ) + ); } function filterMessagesPerTypeOfConvo( type: T, retrieveResults: RetrieveMessagesResultsBatched -): { confMessages: Array | null; otherMessages: Array } { +): { + confMessages: Array | null; + otherMessages: Array; +} { switch (type) { case ConversationTypeEnum.PRIVATE: { - const userConfs = retrieveResults - .filter(m => SnodeNamespace.isUserConfigNamespace(m.namespace)); - const userOthers = retrieveResults - .filter(m => !SnodeNamespace.isUserConfigNamespace(m.namespace)); - - const confMessages = - retrieveItemWithNamespace(userConfs) + const userConfs = retrieveResults.filter(m => + SnodeNamespace.isUserConfigNamespace(m.namespace) + ); + const userOthers = retrieveResults.filter( + m => !SnodeNamespace.isUserConfigNamespace(m.namespace) + ); - const otherMessages = - retrieveItemWithNamespace(userOthers) + const confMessages = retrieveItemWithNamespace(userConfs); + const otherMessages = retrieveItemWithNamespace(userOthers); return { confMessages, otherMessages: uniqBy(otherMessages, x => x.hash) }; } @@ -580,21 +618,21 @@ function filterMessagesPerTypeOfConvo( }; case ConversationTypeEnum.GROUPV3: { + const groupConfs = retrieveResults.filter(m => + SnodeNamespace.isGroupConfigNamespace(m.namespace) + ); + const groupOthers = retrieveResults.filter( + m => !SnodeNamespace.isGroupConfigNamespace(m.namespace) + ); - const groupConfs = retrieveResults - .filter(m => SnodeNamespace.isGroupConfigNamespace(m.namespace)); - const groupOthers = retrieveResults - .filter(m => !SnodeNamespace.isGroupConfigNamespace(m.namespace)); - - const groupConfMessages = - retrieveItemWithNamespace(groupConfs) - - const groupOtherMessages = - retrieveItemWithNamespace(groupOthers) - + const groupConfMessages = retrieveItemWithNamespace(groupConfs); - return { confMessages: groupConfMessages, otherMessages: uniqBy(groupOtherMessages, x => x.hash) }; + const groupOtherMessages = retrieveItemWithNamespace(groupOthers); + return { + confMessages: groupConfMessages, + otherMessages: uniqBy(groupOtherMessages, x => x.hash), + }; } default: diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts index c65c548d36..cc3e8bc78e 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts @@ -8,9 +8,8 @@ async function handleUserSharedConfigMessages( ) { window.log.info(`received userConfigMessagesMerged count: ${userConfigMessagesMerged.length}`); try { - const extractedUserConfigMessage = SwarmPollingConfigShared.extractWebSocketContents( - userConfigMessagesMerged - ); + const extractedUserConfigMessage = + SwarmPollingConfigShared.extractWebSocketContents(userConfigMessagesMerged); const allDecryptedConfigMessages = await SwarmPollingConfigShared.decryptSharedConfigMessages( extractedUserConfigMessage, diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 617d9b67b6..4e4b1bdfdc 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -217,7 +217,7 @@ export class ConversationController { return; } window.log.info(`deleteClosedGroup: ${groupId}, sendLeaveMessage?:${options.sendLeaveMessage}`); - getSwarmPollingInstance().removePubkey(groupId); // we don't need to keep polling anymore. + getSwarmPollingInstance().removePubkey(groupId, 'deleteClosedGroup'); // we don't need to keep polling anymore. if (options.sendLeaveMessage) { await leaveClosedGroup(groupId, options.fromSyncMessage); @@ -482,7 +482,7 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset(); - getSwarmPollingInstance().removePubkey(groupId); + getSwarmPollingInstance().removePubkey(groupId, 'leaveClosedGroup'); if (fromSyncMessage) { // no need to send our leave message as our other device should already have sent it. @@ -525,7 +525,7 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { } async function removeLegacyGroupFromWrappers(groupId: string) { - getSwarmPollingInstance().removePubkey(groupId); + getSwarmPollingInstance().removePubkey(groupId, 'removeLegacyGroupFromWrappers'); await UserGroupsWrapperActions.eraseLegacyGroup(groupId); await SessionUtilConvoInfoVolatile.removeLegacyGroupFromWrapper(groupId); @@ -533,7 +533,7 @@ async function removeLegacyGroupFromWrappers(groupId: string) { } async function remove03GroupFromWrappers(groupId: GroupPubkeyType) { - getSwarmPollingInstance().removePubkey(groupId); + getSwarmPollingInstance().removePubkey(groupId, 'remove03GroupFromWrappers'); await UserGroupsWrapperActions.eraseGroup(groupId); await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupId); diff --git a/ts/session/crypto/index.ts b/ts/session/crypto/index.ts index 97e551672a..e72e26b1f1 100644 --- a/ts/session/crypto/index.ts +++ b/ts/session/crypto/index.ts @@ -17,10 +17,7 @@ export async function getSodiumRenderer(): Promise { } export const sha256 = (s: string) => { - return crypto - .createHash('sha256') - .update(s) - .digest('base64'); + return crypto.createHash('sha256').update(s).digest('base64'); }; export const concatUInt8Array = (...args: Array): Uint8Array => { diff --git a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts index 7c3456a6c2..4c1ba71e26 100644 --- a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts @@ -14,7 +14,7 @@ interface SharedConfigParams extends Message } export abstract class SharedConfigMessage< - KindsPicked extends UserConfigKind + KindsPicked extends UserConfigKind, > extends ContentMessage { public readonly seqno: Long; public readonly kind: KindsPicked; diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts index 9976015d58..e1252396fa 100644 --- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts @@ -6,9 +6,7 @@ export interface ClosedGroupEncryptionPairMessageParams extends ClosedGroupMessa } export class ClosedGroupEncryptionPairMessage extends ClosedGroupMessage { - private readonly encryptedKeyPairs: Array< - SignalService.DataMessage.ClosedGroupControlMessage.KeyPairWrapper - >; + private readonly encryptedKeyPairs: Array; constructor(params: ClosedGroupEncryptionPairMessageParams) { super({ diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts index 4edbdbe8d8..c7a5465105 100644 --- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts @@ -29,7 +29,8 @@ export abstract class ClosedGroupMessage extends DataMessage { public dataProto(): SignalService.DataMessage { const dataMessage = new SignalService.DataMessage(); - dataMessage.closedGroupControlMessage = new SignalService.DataMessage.ClosedGroupControlMessage(); + dataMessage.closedGroupControlMessage = + new SignalService.DataMessage.ClosedGroupControlMessage(); return dataMessage; } diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage.ts index 9c73ba0869..559ed7a5ac 100644 --- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage.ts @@ -54,7 +54,8 @@ export class ClosedGroupNewMessage extends ClosedGroupMessage { public dataProto(): SignalService.DataMessage { const dataMessage = new SignalService.DataMessage(); - dataMessage.closedGroupControlMessage = new SignalService.DataMessage.ClosedGroupControlMessage(); + dataMessage.closedGroupControlMessage = + new SignalService.DataMessage.ClosedGroupControlMessage(); dataMessage.closedGroupControlMessage.type = SignalService.DataMessage.ClosedGroupControlMessage.Type.NEW; diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index ae9984d04a..47f5e55c17 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -376,9 +376,9 @@ export async function selectGuardNodes(): Promise> { // Test all three nodes at once, wait for all to resolve or reject // eslint-disable-next-line no-await-in-loop - const idxOk = ( - await Promise.allSettled(candidateNodes.map(OnionPaths.testGuardNode)) - ).flatMap(p => (p.status === 'fulfilled' ? p.value : null)); + const idxOk = (await Promise.allSettled(candidateNodes.map(OnionPaths.testGuardNode))).flatMap( + p => (p.status === 'fulfilled' ? p.value : null) + ); const goodNodes = _.zip(idxOk, candidateNodes) .filter(x => x[0]) diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 5a0644de7a..e3ecee6b19 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -287,11 +287,7 @@ async function sendMessagesDataToSnode( } function encryptionBasedOnConversation(destination: PubKey) { - if ( - getConversationController() - .get(destination.key) - ?.isClosedGroup() - ) { + if (getConversationController().get(destination.key)?.isClosedGroup()) { return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE; } return SignalService.Envelope.Type.SESSION_MESSAGE; @@ -328,10 +324,8 @@ async function encryptMessageAndWrap( ttl, } = params; - const { - overRiddenTimestampBuffer, - networkTimestamp, - } = overwriteOutgoingTimestampWithNetworkTimestamp({ plainTextBuffer }); + const { overRiddenTimestampBuffer, networkTimestamp } = + overwriteOutgoingTimestampWithNetworkTimestamp({ plainTextBuffer }); const recipient = PubKey.cast(destination); const { envelopeType, cipherText } = await MessageEncrypter.encrypt( diff --git a/ts/session/utils/AttachmentsDownload.ts b/ts/session/utils/AttachmentsDownload.ts index 8bc14d72d8..d9d54a2acd 100644 --- a/ts/session/utils/AttachmentsDownload.ts +++ b/ts/session/utils/AttachmentsDownload.ts @@ -216,11 +216,8 @@ async function _runJob(job: any) { // and tries to update the same message. found = await Data.getMessageById(messageId); if (found) { - const { - hasAttachments, - hasVisualMediaAttachments, - hasFileAttachments, - } = getAttachmentMetadata(found); + const { hasAttachments, hasVisualMediaAttachments, hasFileAttachments } = + getAttachmentMetadata(found); found.set({ hasAttachments, hasVisualMediaAttachments, hasFileAttachments }); } diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index d06ee5407b..069be22cc0 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -1050,9 +1050,7 @@ function getCachedMessageFromCallMessage( } async function isUserApprovedOrWeSentAMessage(user: string) { - const isApproved = getConversationController() - .get(user) - ?.isApproved(); + const isApproved = getConversationController().get(user)?.isApproved(); if (isApproved) { return true; @@ -1381,10 +1379,7 @@ function pushCallMessageToCallCache( callMessage: CachedCallMessageType ) { createCallCacheForPubkeyAndUUID(sender, uuid); - callCache - .get(sender) - ?.get(uuid) - ?.push(callMessage); + callCache.get(sender)?.get(uuid)?.push(callMessage); } /** diff --git a/ts/session/utils/job_runners/JobDeserialization.ts b/ts/session/utils/job_runners/JobDeserialization.ts index 363761da01..0957a6aa45 100644 --- a/ts/session/utils/job_runners/JobDeserialization.ts +++ b/ts/session/utils/job_runners/JobDeserialization.ts @@ -16,13 +16,13 @@ export function persistedJobFromData( switch (data.jobType) { case 'ConfigurationSyncJobType': - return (new ConfigurationSync.ConfigurationSyncJob(data) as unknown) as PersistedJob; + return new ConfigurationSync.ConfigurationSyncJob(data) as unknown as PersistedJob; case 'AvatarDownloadJobType': - return (new AvatarDownload.AvatarDownloadJob(data) as unknown) as PersistedJob; + return new AvatarDownload.AvatarDownloadJob(data) as unknown as PersistedJob; case 'FakeSleepForJobType': - return (new FakeSleepForJob(data) as unknown) as PersistedJob; + return new FakeSleepForJob(data) as unknown as PersistedJob; case 'FakeSleepForJobMultiType': - return (new FakeSleepForMultiJob(data) as unknown) as PersistedJob; + return new FakeSleepForMultiJob(data) as unknown as PersistedJob; default: window?.log?.error('unknown persisted job type:', (data as any).jobType); return null; diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts index ef34ca34d7..cc6b2a812d 100644 --- a/ts/session/utils/job_runners/JobRunner.ts +++ b/ts/session/utils/job_runners/JobRunner.ts @@ -234,13 +234,16 @@ export class PersistedJobRunner { global.clearTimeout(this.nextJobStartTimer); } // plan a timer to wakeup when that timer is reached. - this.nextJobStartTimer = global.setTimeout(() => { - if (this.nextJobStartTimer) { - global.clearTimeout(this.nextJobStartTimer); - this.nextJobStartTimer = null; - } - void this.runNextJob(); - }, Math.max(nextJob.persistedData.nextAttemptTimestamp - Date.now(), 1)); + this.nextJobStartTimer = global.setTimeout( + () => { + if (this.nextJobStartTimer) { + global.clearTimeout(this.nextJobStartTimer); + this.nextJobStartTimer = null; + } + void this.runNextJob(); + }, + Math.max(nextJob.persistedData.nextAttemptTimestamp - Date.now(), 1) + ); return 'job_deferred'; } diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts index 21788247d0..90031f18ef 100644 --- a/ts/session/utils/libsession/libsession_utils_contacts.ts +++ b/ts/session/utils/libsession/libsession_utils_contacts.ts @@ -91,15 +91,11 @@ async function refreshMappedValue(id: string, duringAppStart = false) { if (fromWrapper) { setMappedValue(fromWrapper); if (!duringAppStart) { - getConversationController() - .get(id) - ?.triggerUIRefresh(); + getConversationController().get(id)?.triggerUIRefresh(); } } else if (mappedContactWrapperValues.delete(id)) { if (!duringAppStart) { - getConversationController() - .get(id) - ?.triggerUIRefresh(); + getConversationController().get(id)?.triggerUIRefresh(); } } } diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts index 1cc1f1ae7d..9a053607a4 100644 --- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts +++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts @@ -188,9 +188,8 @@ async function refreshConvoVolatileCached( refreshed = true; break; case 'LegacyGroup': - const fromWrapperLegacyGroup = await ConvoInfoVolatileWrapperActions.getLegacyGroup( - convoId - ); + const fromWrapperLegacyGroup = + await ConvoInfoVolatileWrapperActions.getLegacyGroup(convoId); if (fromWrapperLegacyGroup) { mappedLegacyGroupWrapperValues.set(convoId, fromWrapperLegacyGroup); } @@ -209,9 +208,7 @@ async function refreshConvoVolatileCached( } if (refreshed && !duringAppStart) { - getConversationController() - .get(convoId) - ?.triggerUIRefresh(); + getConversationController().get(convoId)?.triggerUIRefresh(); } } catch (e) { window.log.info(`refreshMappedValue for volatile convoID: ${convoId}`, e.message); diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts index 02091d3c6f..cec343a945 100644 --- a/ts/session/utils/sync/syncUtils.ts +++ b/ts/session/utils/sync/syncUtils.ts @@ -188,9 +188,9 @@ const getValidClosedGroups = async (convos: Array) => { }) ); - const onlyValidClosedGroup = closedGroups.filter(m => m !== null) as Array< - ConfigurationMessageClosedGroup - >; + const onlyValidClosedGroup = closedGroups.filter( + m => m !== null + ) as Array; return onlyValidClosedGroup; }; @@ -266,9 +266,7 @@ export const getCurrentConfigurationMessage = async ( } const ourProfileKeyHex = - getConversationController() - .get(UserUtils.getOurPubKeyStrFromCache()) - ?.getProfileKey() || null; + getConversationController().get(UserUtils.getOurPubKeyStrFromCache())?.getProfileKey() || null; const profileKey = ourProfileKeyHex ? fromHexToArray(ourProfileKeyHex) : undefined; const profilePicture = ourConvo?.getAvatarPointer() || undefined; diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 94ea320511..e4c4284cf7 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -353,13 +353,11 @@ async function getMessages({ return { messagesProps: [], quotesProps: {} }; } - const { - messages: messagesCollection, - quotes: quotesCollection, - } = await Data.getMessagesByConversation(conversationKey, { - messageId, - returnQuotes: true, - }); + const { messages: messagesCollection, quotes: quotesCollection } = + await Data.getMessagesByConversation(conversationKey, { + messageId, + returnQuotes: true, + }); const messagesProps: Array = messagesCollection.models.map( m => m.getMessageModelProps() @@ -1137,13 +1135,11 @@ export async function openConversationToSpecificMessage(args: { const { conversationKey, messageIdToNavigateTo, shouldHighlightMessage } = args; await unmarkAsForcedUnread(conversationKey); - const { - messagesProps: messagesAroundThisMessage, - quotesProps: quotesAroundThisMessage, - } = await getMessages({ - conversationKey, - messageId: messageIdToNavigateTo, - }); + const { messagesProps: messagesAroundThisMessage, quotesProps: quotesAroundThisMessage } = + await getMessages({ + conversationKey, + messageId: messageIdToNavigateTo, + }); const mostRecentMessageIdOnOpen = await Data.getLastMessageIdInConversation(conversationKey); diff --git a/ts/state/ducks/defaultRooms.tsx b/ts/state/ducks/defaultRooms.tsx index ffca2b1d9b..59ebaec725 100644 --- a/ts/state/ducks/defaultRooms.tsx +++ b/ts/state/ducks/defaultRooms.tsx @@ -52,9 +52,6 @@ const defaultRoomsSlice = createSlice({ }); const { actions, reducer } = defaultRoomsSlice; -export const { - updateDefaultRooms, - updateDefaultBase64RoomData, - updateDefaultRoomsInProgress, -} = actions; +export const { updateDefaultRooms, updateDefaultBase64RoomData, updateDefaultRoomsInProgress } = + actions; export const defaultRoomReducer = reducer; diff --git a/ts/state/ducks/section.tsx b/ts/state/ducks/section.tsx index 17fe873ff9..771adc4753 100644 --- a/ts/state/ducks/section.tsx +++ b/ts/state/ducks/section.tsx @@ -118,7 +118,7 @@ export const reducer = ( case FOCUS_SECTION: // if we change to something else than settings, reset the focused settings section // eslint-disable-next-line no-case-declarations - const castedPayload = (payload as unknown) as SectionType; + const castedPayload = payload as unknown as SectionType; if (castedPayload !== SectionType.Settings) { return { diff --git a/ts/state/ducks/settings.tsx b/ts/state/ducks/settings.tsx index 43868f4c14..e8de3e436e 100644 --- a/ts/state/ducks/settings.tsx +++ b/ts/state/ducks/settings.tsx @@ -11,7 +11,7 @@ const SettingsBoolsKeyTrackedInRedux = [ ] as const; export type SettingsState = { - settingsBools: Record; + settingsBools: Record<(typeof SettingsBoolsKeyTrackedInRedux)[number], boolean>; }; export function getSettingsInitialState() { @@ -24,7 +24,7 @@ export function getSettingsInitialState() { }; } -function isTrackedBoolean(key: string): key is typeof SettingsBoolsKeyTrackedInRedux[number] { +function isTrackedBoolean(key: string): key is (typeof SettingsBoolsKeyTrackedInRedux)[number] { return SettingsBoolsKeyTrackedInRedux.indexOf(key as any) !== -1; } @@ -79,9 +79,6 @@ const settingsSlice = createSlice({ }); const { actions, reducer } = settingsSlice; -export const { - updateSettingsBoolValue, - deleteSettingsBoolValue, - updateAllOnStorageReady, -} = actions; +export const { updateSettingsBoolValue, deleteSettingsBoolValue, updateAllOnStorageReady } = + actions; export const settingsReducer = reducer; diff --git a/ts/state/ducks/userConfig.tsx b/ts/state/ducks/userConfig.tsx index 502367b879..e181717470 100644 --- a/ts/state/ducks/userConfig.tsx +++ b/ts/state/ducks/userConfig.tsx @@ -36,11 +36,8 @@ const userConfigSlice = createSlice({ }); const { actions, reducer } = userConfigSlice; -export const { - toggleAudioAutoplay, - disableRecoveryPhrasePrompt, - hideMessageRequestBanner, -} = actions; +export const { toggleAudioAutoplay, disableRecoveryPhrasePrompt, hideMessageRequestBanner } = + actions; export const userConfigReducer = reducer; export function showMessageRequestBannerOutsideRedux() { diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 21b03d926b..4e310d1903 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -715,39 +715,40 @@ export const getMessagePropsByMessageId = createSelector( } ); -export const getMessageReactsProps = createSelector(getMessagePropsByMessageId, (props): - | MessageReactsSelectorProps - | undefined => { - if (!props || isEmpty(props)) { - return undefined; - } +export const getMessageReactsProps = createSelector( + getMessagePropsByMessageId, + (props): MessageReactsSelectorProps | undefined => { + if (!props || isEmpty(props)) { + return undefined; + } - const msgProps: MessageReactsSelectorProps = pick(props.propsForMessage, [ - 'convoId', - 'conversationType', - 'reacts', - 'serverId', - ]); - - if (msgProps.reacts) { - // NOTE we don't want to render reactions that have 'senders' as an object this is a deprecated type used during development 25/08/2022 - const oldReactions = Object.values(msgProps.reacts).filter( - reaction => !Array.isArray(reaction.senders) - ); + const msgProps: MessageReactsSelectorProps = pick(props.propsForMessage, [ + 'convoId', + 'conversationType', + 'reacts', + 'serverId', + ]); + + if (msgProps.reacts) { + // NOTE we don't want to render reactions that have 'senders' as an object this is a deprecated type used during development 25/08/2022 + const oldReactions = Object.values(msgProps.reacts).filter( + reaction => !Array.isArray(reaction.senders) + ); + + if (oldReactions.length > 0) { + msgProps.reacts = undefined; + return msgProps; + } - if (oldReactions.length > 0) { - msgProps.reacts = undefined; - return msgProps; + const sortedReacts = Object.entries(msgProps.reacts).sort((a, b) => { + return a[1].index < b[1].index ? -1 : a[1].index > b[1].index ? 1 : 0; + }); + msgProps.sortedReacts = sortedReacts; } - const sortedReacts = Object.entries(msgProps.reacts).sort((a, b) => { - return a[1].index < b[1].index ? -1 : a[1].index > b[1].index ? 1 : 0; - }); - msgProps.sortedReacts = sortedReacts; + return msgProps; } - - return msgProps; -}); +); export const getMessageQuoteProps = createSelector( getConversationLookup, @@ -831,45 +832,47 @@ export const getMessageQuoteProps = createSelector( } ); -export const getMessageTextProps = createSelector(getMessagePropsByMessageId, (props): - | MessageTextSelectorProps - | undefined => { - if (!props || isEmpty(props)) { - return undefined; - } - - const msgProps: MessageTextSelectorProps = pick(props.propsForMessage, [ - 'direction', - 'status', - 'text', - 'isDeleted', - 'conversationType', - ]); +export const getMessageTextProps = createSelector( + getMessagePropsByMessageId, + (props): MessageTextSelectorProps | undefined => { + if (!props || isEmpty(props)) { + return undefined; + } - return msgProps; -}); + const msgProps: MessageTextSelectorProps = pick(props.propsForMessage, [ + 'direction', + 'status', + 'text', + 'isDeleted', + 'conversationType', + ]); -export const getMessageAttachmentProps = createSelector(getMessagePropsByMessageId, (props): - | MessageAttachmentSelectorProps - | undefined => { - if (!props || isEmpty(props)) { - return undefined; + return msgProps; } +); - const msgProps: MessageAttachmentSelectorProps = { - attachments: props.propsForMessage.attachments || [], - ...pick(props.propsForMessage, [ - 'direction', - 'isTrustedForAttachmentDownload', - 'timestamp', - 'serverTimestamp', - 'sender', - 'convoId', - ]), - }; +export const getMessageAttachmentProps = createSelector( + getMessagePropsByMessageId, + (props): MessageAttachmentSelectorProps | undefined => { + if (!props || isEmpty(props)) { + return undefined; + } - return msgProps; -}); + const msgProps: MessageAttachmentSelectorProps = { + attachments: props.propsForMessage.attachments || [], + ...pick(props.propsForMessage, [ + 'direction', + 'isTrustedForAttachmentDownload', + 'timestamp', + 'serverTimestamp', + 'sender', + 'convoId', + ]), + }; + + return msgProps; + } +); export const getIsMessageSelected = createSelector( getMessagePropsByMessageId, @@ -885,27 +888,28 @@ export const getIsMessageSelected = createSelector( } ); -export const getMessageContentSelectorProps = createSelector(getMessagePropsByMessageId, (props): - | MessageContentSelectorProps - | undefined => { - if (!props || isEmpty(props)) { - return undefined; - } +export const getMessageContentSelectorProps = createSelector( + getMessagePropsByMessageId, + (props): MessageContentSelectorProps | undefined => { + if (!props || isEmpty(props)) { + return undefined; + } - const msgProps: MessageContentSelectorProps = { - ...pick(props.propsForMessage, [ - 'direction', - 'serverTimestamp', - 'text', - 'timestamp', - 'previews', - 'quote', - 'attachments', - ]), - }; + const msgProps: MessageContentSelectorProps = { + ...pick(props.propsForMessage, [ + 'direction', + 'serverTimestamp', + 'text', + 'timestamp', + 'previews', + 'quote', + 'attachments', + ]), + }; - return msgProps; -}); + return msgProps; + } +); export const getMessageContentWithStatusesSelectorProps = createSelector( getMessagePropsByMessageId, diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index f8dec3e659..154f2b008b 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -1,9 +1,9 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; +import { useSelector } from 'react-redux'; import { PubKey } from '../../session/types'; import { GroupState } from '../ducks/groups'; import { StateType } from '../reducer'; -import { useSelector } from 'react-redux'; const getLibGroupsState = (state: StateType): GroupState => state.groups; diff --git a/ts/state/selectors/user.ts b/ts/state/selectors/user.ts index 0f9a22360b..774f3fddae 100644 --- a/ts/state/selectors/user.ts +++ b/ts/state/selectors/user.ts @@ -1,10 +1,10 @@ import { createSelector } from '@reduxjs/toolkit'; +import { useSelector } from 'react-redux'; import { LocalizerType } from '../../types/Util'; import { StateType } from '../reducer'; import { UserStateType } from '../ducks/user'; -import { useSelector } from 'react-redux'; export const getUser = (state: StateType): UserStateType => state.user; diff --git a/ts/test/session/unit/crypto/MessageEncrypter_test.ts b/ts/test/session/unit/crypto/MessageEncrypter_test.ts index 27bc167c6e..d7658024d5 100644 --- a/ts/test/session/unit/crypto/MessageEncrypter_test.ts +++ b/ts/test/session/unit/crypto/MessageEncrypter_test.ts @@ -16,73 +16,12 @@ import { SessionKeyPair } from '../../../../receiver/keypairs'; export const TEST_identityKeyPair: SessionKeyPair = { pubKey: new Uint8Array([ - 5, - 44, - 2, - 168, - 162, - 203, - 50, - 66, - 136, - 81, - 30, - 221, - 57, - 245, - 1, - 148, - 162, - 194, - 255, - 47, - 134, - 104, - 180, - 207, - 188, - 18, - 71, - 62, - 58, - 107, - 23, - 92, - 97, + 5, 44, 2, 168, 162, 203, 50, 66, 136, 81, 30, 221, 57, 245, 1, 148, 162, 194, 255, 47, 134, 104, + 180, 207, 188, 18, 71, 62, 58, 107, 23, 92, 97, ]), privKey: new Uint8Array([ - 200, - 45, - 226, - 75, - 253, - 235, - 213, - 108, - 187, - 188, - 217, - 9, - 51, - 105, - 65, - 15, - 97, - 36, - 233, - 33, - 21, - 31, - 7, - 90, - 145, - 30, - 52, - 254, - 47, - 162, - 192, - 105, + 200, 45, 226, 75, 253, 235, 213, 108, 187, 188, 217, 9, 51, 105, 65, 15, 97, 36, 233, 33, 21, + 31, 7, 90, 145, 30, 52, 254, 47, 162, 192, 105, ]), ed25519KeyPair: { privateKey: new Uint8Array(), diff --git a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts index f925d4c453..c5af953d9e 100644 --- a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts +++ b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts @@ -13,38 +13,8 @@ chai.use(chaiBytes); describe('OpenGroupAuthentication', () => { const secondPartPrivKey = new Uint8Array([ - 186, - 198, - 231, - 30, - 253, - 125, - 250, - 74, - 131, - 201, - 142, - 210, - 79, - 37, - 74, - 178, - 194, - 103, - 249, - 204, - 219, - 23, - 42, - 82, - 128, - 160, - 68, - 74, - 210, - 78, - 137, - 204, + 186, 198, 231, 30, 253, 125, 250, 74, 131, 201, 142, 210, 79, 37, 74, 178, 194, 103, 249, 204, + 219, 23, 42, 82, 128, 160, 68, 74, 210, 78, 137, 204, ]); const signingKeysA: ByteKeyPair = { // 881132ee03dbd2da065aa4c94f96081f62142dc8011d1b7a00de83e4aab38ce4 @@ -89,104 +59,14 @@ describe('OpenGroupAuthentication', () => { const signingKeysB: ByteKeyPair = { privKeyBytes: new Uint8Array([ - 130, - 56, - 83, - 227, - 58, - 149, - 251, - 148, - 119, - 85, - 180, - 81, - 17, - 190, - 245, - 33, - 219, - 6, - 246, - 238, - 110, - 61, - 191, - 133, - 244, - 223, - 32, - 32, - 121, - 172, - 138, - 198, - 215, - 25, - 249, - 139, - 235, - 31, - 251, - 12, - 100, - 87, - 84, - 131, - 231, - 45, - 87, - 251, - 204, - 133, - 20, - 3, - 118, - 71, - 29, - 47, - 245, - 62, - 216, - 163, - 254, - 248, - 195, - 109, + 130, 56, 83, 227, 58, 149, 251, 148, 119, 85, 180, 81, 17, 190, 245, 33, 219, 6, 246, 238, + 110, 61, 191, 133, 244, 223, 32, 32, 121, 172, 138, 198, 215, 25, 249, 139, 235, 31, 251, 12, + 100, 87, 84, 131, 231, 45, 87, 251, 204, 133, 20, 3, 118, 71, 29, 47, 245, 62, 216, 163, 254, + 248, 195, 109, ]), pubKeyBytes: new Uint8Array([ - 215, - 25, - 249, - 139, - 235, - 31, - 251, - 12, - 100, - 87, - 84, - 131, - 231, - 45, - 87, - 251, - 204, - 133, - 20, - 3, - 118, - 71, - 29, - 47, - 245, - 62, - 216, - 163, - 254, - 248, - 195, - 109, + 215, 25, 249, 139, 235, 31, 251, 12, 100, 87, 84, 131, 231, 45, 87, 251, 204, 133, 20, 3, 118, + 71, 29, 47, 245, 62, 216, 163, 254, 248, 195, 109, ]), }; const serverPubKey = new Uint8Array( @@ -395,12 +275,14 @@ const decryptBlindedMessage = async ( aSignKeyBytes: ByteKeyPair, bSignKeyBytes: ByteKeyPair, serverPubKey: Uint8Array -): Promise<| { - messageText: string; - senderED25519PubKey: string; - senderSessionId: string; - } -| undefined> => { +): Promise< + | { + messageText: string; + senderED25519PubKey: string; + senderSessionId: string; + } + | undefined +> => { const sodium = await getSodiumRenderer(); const aBlindingValues = SogsBlinding.getBlindingValues(serverPubKey, aSignKeyBytes, sodium); diff --git a/ts/test/session/unit/messages/ChatMessage_test.ts b/ts/test/session/unit/messages/ChatMessage_test.ts index 5bb8d32edd..72a39452dd 100644 --- a/ts/test/session/unit/messages/ChatMessage_test.ts +++ b/ts/test/session/unit/messages/ChatMessage_test.ts @@ -93,9 +93,7 @@ describe('VisibleMessage', () => { const plainText = message.plainTextBuffer(); const decoded = SignalService.Content.decode(plainText); expect(decoded.dataMessage?.preview).to.have.lengthOf(1); - expect(decoded.dataMessage) - .to.have.nested.property('preview[0].url') - .to.be.deep.equal('url'); + expect(decoded.dataMessage).to.have.nested.property('preview[0].url').to.be.deep.equal('url'); expect(decoded.dataMessage) .to.have.nested.property('preview[0].title') .to.be.deep.equal('title'); diff --git a/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts index 53ec106202..e32bb28a6b 100644 --- a/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts +++ b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts @@ -37,9 +37,7 @@ describe('ClosedGroupVisibleMessage', () => { expect(decoded.dataMessage).to.have.deep.property('body', 'body'); // we use the timestamp of the chatMessage as parent timestamp - expect(message) - .to.have.property('timestamp') - .to.be.equal(chatMessage.timestamp); + expect(message).to.have.property('timestamp').to.be.equal(chatMessage.timestamp); }); it('correct ttl', () => { diff --git a/ts/test/session/unit/padding/Padding_test.ts b/ts/test/session/unit/padding/Padding_test.ts index 1577c364d0..376bf5b652 100644 --- a/ts/test/session/unit/padding/Padding_test.ts +++ b/ts/test/session/unit/padding/Padding_test.ts @@ -94,25 +94,7 @@ describe('Padding', () => { it('remove padding', () => { const expectedSize = 10; const paddedBuffer = new Uint8Array([ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 128, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 128, 0, 0, 0, 0, 0, 0, 0, 0, ]); const unpaddedMessage = removeMessagePadding(paddedBuffer); diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index 26e0eaf8d7..c41671766a 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -44,12 +44,9 @@ describe('MessageQueue', () => { let messageQueueStub: MessageQueue; // Message Sender Stubs - let sendStub: sinon.SinonStub<[ - RawMessage, - (number | undefined)?, - (number | undefined)?, - (boolean | undefined)? - ]>; + let sendStub: sinon.SinonStub< + [RawMessage, (number | undefined)?, (number | undefined)?, (boolean | undefined)?] + >; beforeEach(() => { // Utils Stubs diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts index 12c0853035..50997c5381 100644 --- a/ts/test/session/unit/utils/Messages_test.ts +++ b/ts/test/session/unit/utils/Messages_test.ts @@ -169,9 +169,8 @@ describe('Message Utils', () => { it('passing ClosedGroupEncryptionPairMessage returns ClosedGroup', async () => { const device = TestUtils.generateFakePubKey(); - const fakeWrappers = new Array< - SignalService.DataMessage.ClosedGroupControlMessage.KeyPairWrapper - >(); + const fakeWrappers = + new Array(); fakeWrappers.push( new SignalService.DataMessage.ClosedGroupControlMessage.KeyPairWrapper({ publicKey: new Uint8Array(8), @@ -190,9 +189,8 @@ describe('Message Utils', () => { it('passing ClosedGroupEncryptionKeyPairReply returns Fallback', async () => { const device = TestUtils.generateFakePubKey(); - const fakeWrappers = new Array< - SignalService.DataMessage.ClosedGroupControlMessage.KeyPairWrapper - >(); + const fakeWrappers = + new Array(); fakeWrappers.push( new SignalService.DataMessage.ClosedGroupControlMessage.KeyPairWrapper({ publicKey: new Uint8Array(8), diff --git a/ts/test/session/unit/utils/Promise_test.ts b/ts/test/session/unit/utils/Promise_test.ts index 075ebc260f..80f0c5ae01 100644 --- a/ts/test/session/unit/utils/Promise_test.ts +++ b/ts/test/session/unit/utils/Promise_test.ts @@ -21,7 +21,7 @@ describe('Promise Utils', () => { let pollSpy: sinon.SinonSpy< [ (done: (arg: any) => void) => Promise | void, - (Partial | undefined)? + (Partial | undefined)?, ], Promise >; diff --git a/ts/test/session/unit/utils/String_test.ts b/ts/test/session/unit/utils/String_test.ts index 4813618fb8..3f8bcf9c90 100644 --- a/ts/test/session/unit/utils/String_test.ts +++ b/ts/test/session/unit/utils/String_test.ts @@ -83,9 +83,7 @@ describe('String Utils', () => { it('can encode huge string', () => { const stringSize = 2 ** 16; - const testString = Array(stringSize) - .fill('0') - .join(''); + const testString = Array(stringSize).fill('0').join(''); const allEncodedings = (['base64', 'hex', 'binary', 'utf8'] as Array).map(e => StringUtils.encode(testString, e) @@ -145,9 +143,7 @@ describe('String Utils', () => { it('can decode huge buffer', () => { const bytes = 2 ** 16; - const bufferString = Array(bytes) - .fill('A') - .join(''); + const bufferString = Array(bytes).fill('A').join(''); const buffer = ByteBuffer.fromUTF8(bufferString); const encodings = ['base64', 'hex', 'binary', 'utf8'] as Array; diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts index 20eb343a7a..27aa2d279a 100644 --- a/ts/test/test-utils/utils/stubbing.ts +++ b/ts/test/test-utils/utils/stubbing.ts @@ -46,7 +46,7 @@ export function stubLibSessionWorker(value: any) { } export function stubCreateObjectUrl() { - (global as any).URL = function() {}; + (global as any).URL = function () {}; (global as any).URL.createObjectURL = () => { return `${Date.now()}:${Math.floor(Math.random() * 1000)}`; }; diff --git a/ts/types/attachments/migrations.ts b/ts/types/attachments/migrations.ts index 63f6efff31..350ed1aea3 100644 --- a/ts/types/attachments/migrations.ts +++ b/ts/types/attachments/migrations.ts @@ -170,23 +170,25 @@ type CaptureDimensionType = { contentType: string; path: string }; export const captureDimensionsAndScreenshot = async ( attachment: CaptureDimensionType -): Promise => { +): Promise< + CaptureDimensionType & { + width?: number; + height?: number; + + thumbnail: { + path: string; + contentType: string; + width: number; + height: number; + } | null; + screenshot: { + path: string; + contentType: string; + width: number; + height: number; + } | null; + } +> => { const { contentType } = attachment; if ( diff --git a/ts/types/message/initializeAttachmentMetadata.ts b/ts/types/message/initializeAttachmentMetadata.ts index 7f41c70036..6e06045b3a 100644 --- a/ts/types/message/initializeAttachmentMetadata.ts +++ b/ts/types/message/initializeAttachmentMetadata.ts @@ -1,9 +1,10 @@ import { MessageModel } from '../../models/message'; import * as Attachment from '../Attachment'; -const hasAttachmentInMessage = (predicate: (value: Attachment.Attachment) => boolean) => ( - message: MessageModel -): boolean => Boolean((message.get('attachments') || []).some(predicate)); +const hasAttachmentInMessage = + (predicate: (value: Attachment.Attachment) => boolean) => + (message: MessageModel): boolean => + Boolean((message.get('attachments') || []).some(predicate)); export const hasFileAttachmentInMessage = hasAttachmentInMessage(Attachment.isFile); export const hasVisualMediaAttachmentInMessage = hasAttachmentInMessage(Attachment.isVisualMedia); diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 05a31e154f..25139c11c6 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -278,7 +278,7 @@ export function toFixedUint8ArrayOfLength( data: Uint8Array, length: T ): FixedSizeUint8Array { - if (data.length === length) return (data as any) as FixedSizeUint8Array; + if (data.length === length) return data as any as FixedSizeUint8Array; throw new Error( `toFixedUint8ArrayOfLength invalid. Expected length ${length} but got: ${data.length}` ); diff --git a/ts/updater/updater.ts b/ts/updater/updater.ts index 84f2c8cdf2..4abe992871 100644 --- a/ts/updater/updater.ts +++ b/ts/updater/updater.ts @@ -40,22 +40,28 @@ export async function start( autoUpdater.logger = logger; autoUpdater.autoDownload = false; - interval = global.setInterval(async () => { - try { - await checkForUpdates(getMainWindow, messages, logger); - } catch (error) { - logger.error('auto-update: error:', getPrintableError(error)); - } - }, 1000 * 60 * 10); // trigger and try to update every 10 minutes to let the file gets downloaded if we are updating + interval = global.setInterval( + async () => { + try { + await checkForUpdates(getMainWindow, messages, logger); + } catch (error) { + logger.error('auto-update: error:', getPrintableError(error)); + } + }, + 1000 * 60 * 10 + ); // trigger and try to update every 10 minutes to let the file gets downloaded if we are updating stopped = false; - global.setTimeout(async () => { - try { - await checkForUpdates(getMainWindow, messages, logger); - } catch (error) { - logger.error('auto-update: error:', getPrintableError(error)); - } - }, 2 * 60 * 1000); // we do checks from the fileserver every 1 minute. + global.setTimeout( + async () => { + try { + await checkForUpdates(getMainWindow, messages, logger); + } catch (error) { + logger.error('auto-update: error:', getPrintableError(error)); + } + }, + 2 * 60 * 1000 + ); // we do checks from the fileserver every 1 minute. } export function stop() { diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts index 5d64e282dc..e2cd8a17df 100644 --- a/ts/util/expiringMessages.ts +++ b/ts/util/expiringMessages.ts @@ -30,9 +30,7 @@ export async function destroyMessagesAndUpdateRedux( // trigger a refresh the last message for all those uniq conversation conversationWithChanges.forEach(convoIdToUpdate => { - getConversationController() - .get(convoIdToUpdate) - ?.updateLastMessage(); + getConversationController().get(convoIdToUpdate)?.updateLastMessage(); }); } diff --git a/ts/util/linkPreviewFetch.ts b/ts/util/linkPreviewFetch.ts index 4c02b7241b..73729e606b 100644 --- a/ts/util/linkPreviewFetch.ts +++ b/ts/util/linkPreviewFetch.ts @@ -299,10 +299,7 @@ const getLinkHrefAttribute = ( ): string | null => { for (let i = 0; i < rels.length; i += 1) { const rel = rels[i]; - const href = document - .querySelector(`link[rel="${rel}"]`) - ?.getAttribute('href') - ?.trim(); + const href = document.querySelector(`link[rel="${rel}"]`)?.getAttribute('href')?.trim(); if (href) { return href; } diff --git a/ts/util/privacy.ts b/ts/util/privacy.ts index 387876f0b6..7e063f7fee 100644 --- a/ts/util/privacy.ts +++ b/ts/util/privacy.ts @@ -6,9 +6,11 @@ import { getAppRootPath } from '../node/getRootPath'; const APP_ROOT_PATH = getAppRootPath(); const SESSION_ID_PATTERN = /\b((05)?[0-9a-f]{64})\b/gi; -const SNODE_PATTERN = /(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/g; +const SNODE_PATTERN = + /(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/g; const GROUP_ID_PATTERN = /(group\()([^)]+)(\))/g; -const SERVER_URL_PATTERN = /https?:\/\/[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)/g; +const SERVER_URL_PATTERN = + /https?:\/\/[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)/g; const REDACTION_PLACEHOLDER = '[REDACTED]'; // redactPath :: Path -> String -> String diff --git a/ts/util/readReceipts.ts b/ts/util/readReceipts.ts index 624413ba2b..777d9b6115 100644 --- a/ts/util/readReceipts.ts +++ b/ts/util/readReceipts.ts @@ -30,9 +30,7 @@ async function onReadReceipt(receipt: { source: string; timestamp: number; readA if ( !convoId || !getConversationController().get(convoId) || - !getConversationController() - .get(convoId) - .isPrivate() + !getConversationController().get(convoId).isPrivate() ) { window.log.info( 'Convo is undefined or not a private chat for read receipt in convo', diff --git a/ts/webworker/workers/browser/libsession_worker_functions.ts b/ts/webworker/workers/browser/libsession_worker_functions.ts index 3fd1e8b41c..d2d8a21a23 100644 --- a/ts/webworker/workers/browser/libsession_worker_functions.ts +++ b/ts/webworker/workers/browser/libsession_worker_functions.ts @@ -18,26 +18,19 @@ export const MetaGroupConfigValue = 'MetaGroupConfig-'; type MetaGroupConfigType = typeof MetaGroupConfigValue; export type MetaGroupConfig = `${MetaGroupConfigType}${GroupPubkeyType}`; - export type ConfigWrapperUser = | UserConfig | ContactsConfig | UserGroupsConfig | ConvoInfoVolatileConfig; - export type ConfigWrapperGroup = MetaGroupConfig; -export type ConfigWrapperObjectTypesMeta = - | ConfigWrapperUser - | ConfigWrapperGroup; +export type ConfigWrapperObjectTypesMeta = ConfigWrapperUser | ConfigWrapperGroup; +export type ConfigWrapperGroupDetailed = 'GroupInfo' | 'GroupMember' | 'GroupKeys'; - export type ConfigWrapperGroupDetailed = 'GroupInfo' | 'GroupMember'| 'GroupKeys'; - - export type ConfigWrapperObjectTypesDetailed = - | ConfigWrapperUser - | ConfigWrapperGroupDetailed; +export type ConfigWrapperObjectTypesDetailed = ConfigWrapperUser | ConfigWrapperGroupDetailed; type UserConfigFunctions = | [UserConfig, ...BaseConfigActions] @@ -53,9 +46,7 @@ type ConvoInfoVolatileConfigFunctions = | [ConvoInfoVolatileConfig, ...ConvoInfoVolatileConfigActionsType]; // Group-related calls -type MetaGroupFunctions = - | [MetaGroupConfig, ...MetaGroupActionsType] - +type MetaGroupFunctions = [MetaGroupConfig, ...MetaGroupActionsType]; export type LibSessionWorkerFunctions = | UserConfigFunctions @@ -64,7 +55,9 @@ export type LibSessionWorkerFunctions = | ConvoInfoVolatileConfigFunctions | MetaGroupFunctions; -export function isUserConfigWrapperType(config: ConfigWrapperObjectTypesMeta): config is ConfigWrapperUser { +export function isUserConfigWrapperType( + config: ConfigWrapperObjectTypesMeta +): config is ConfigWrapperUser { return ( config === 'ContactsConfig' || config === 'UserConfig' || @@ -77,12 +70,9 @@ export function isMetaWrapperType(config: ConfigWrapperObjectTypesMeta): config return config.startsWith(MetaGroupConfigValue); } - export function getGroupPubkeyFromWrapperType(type: ConfigWrapperGroup): GroupPubkeyType { if (!type.startsWith(MetaGroupConfigValue + '03')) { - throw new Error(`not a metagroup variant: ${type}`) + throw new Error(`not a metagroup variant: ${type}`); } return type.substring(type.indexOf('-03') + 1) as GroupPubkeyType; // typescript is not yet smart enough } - - diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index e92413ece7..096eeb7d2d 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -1,5 +1,6 @@ /* eslint-disable import/extensions */ /* eslint-disable import/no-unresolved */ +import { join } from 'path'; import { GroupWrapperConstructor, ContactInfoSet, @@ -16,7 +17,6 @@ import { UserGroupsSet, MergeSingle, } from 'libsession_util_nodejs'; -import { join } from 'path'; import { getAppRootPath } from '../../../node/getRootPath'; import { WorkerInterface } from '../../worker_interface'; diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index 6b2c2bf641..206ea5c066 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -195,14 +195,14 @@ function initGroupWrapper(options: Array, wrapperType: ConfigWrapperGroup) if (isMetaWrapperType(groupType)) { const pk = getGroupPubkeyFromWrapperType(groupType); - const wrapper = new MetaGroupWrapperNode({ + const justCreated = new MetaGroupWrapperNode({ groupEd25519Pubkey, groupEd25519Secretkey, metaDumped, userEd25519Secretkey, }); - metaGroupWrappers.set(pk, wrapper); + metaGroupWrappers.set(pk, justCreated); return; } assertUnreachable(groupType, `initGroupWrapper: Missing case error "${groupType}"`); @@ -217,12 +217,13 @@ onmessage = async (e: { data: [number, ConfigWrapperObjectTypesMeta, string, ... initUserWrapper(args, config); postMessage([jobId, null, null]); return; - } else if (isMetaWrapperType(config)) { + } + if (isMetaWrapperType(config)) { initGroupWrapper(args, config); postMessage([jobId, null, null]); return; } - throw new Error('Unhandled init wrapper type:' + config); + throw new Error(`Unhandled init wrapper type: ${config}`); } const wrapper = isUserConfigWrapperType(config) diff --git a/yarn.lock b/yarn.lock index 94940ec047..f6f5270356 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,48 +12,14 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@ampproject/remapping@^2.2.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" - integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.22.5": +"@babel/code-frame@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== dependencies: "@babel/highlight" "^7.22.5" -"@babel/compat-data@^7.22.9": - version "7.22.9" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" - integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ== - -"@babel/core@^7.14.8": - version "7.22.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.9.tgz#bd96492c68822198f33e8a256061da3cf391f58f" - integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w== - dependencies: - "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.22.5" - "@babel/generator" "^7.22.9" - "@babel/helper-compilation-targets" "^7.22.9" - "@babel/helper-module-transforms" "^7.22.9" - "@babel/helpers" "^7.22.6" - "@babel/parser" "^7.22.7" - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.8" - "@babel/types" "^7.22.5" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.2" - semver "^6.3.1" - -"@babel/generator@^7.22.7", "@babel/generator@^7.22.9": +"@babel/generator@^7.22.7": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d" integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw== @@ -63,39 +29,13 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" -"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5": +"@babel/helper-annotate-as-pure@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== dependencies: "@babel/types" "^7.22.5" -"@babel/helper-compilation-targets@^7.22.9": - version "7.22.9" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz#f9d0a7aaaa7cd32a3f31c9316a69f5a9bcacb892" - integrity sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw== - dependencies: - "@babel/compat-data" "^7.22.9" - "@babel/helper-validator-option" "^7.22.5" - browserslist "^4.21.9" - lru-cache "^5.1.1" - semver "^6.3.1" - -"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.9": - version "7.22.9" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz#c36ea240bb3348f942f08b0fbe28d6d979fab236" - integrity sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" - "@babel/helper-member-expression-to-functions" "^7.22.5" - "@babel/helper-optimise-call-expression" "^7.22.5" - "@babel/helper-replace-supers" "^7.22.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - semver "^6.3.1" - "@babel/helper-environment-visitor@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" @@ -116,13 +56,6 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-member-expression-to-functions@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2" - integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ== - dependencies: - "@babel/types" "^7.22.5" - "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c" @@ -130,52 +63,11 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9": - version "7.22.9" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129" - integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ== - dependencies: - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-module-imports" "^7.22.5" - "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/helper-validator-identifier" "^7.22.5" - -"@babel/helper-optimise-call-expression@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e" - integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": +"@babel/helper-plugin-utils@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== -"@babel/helper-replace-supers@^7.22.9": - version "7.22.9" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779" - integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg== - dependencies: - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-member-expression-to-functions" "^7.22.5" - "@babel/helper-optimise-call-expression" "^7.22.5" - -"@babel/helper-simple-access@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" - integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847" - integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q== - dependencies: - "@babel/types" "^7.22.5" - "@babel/helper-split-export-declaration@^7.22.6": version "7.22.6" resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" @@ -193,20 +85,6 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== -"@babel/helper-validator-option@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac" - integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw== - -"@babel/helpers@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.6.tgz#8e61d3395a4f0c5a8060f309fb008200969b5ecd" - integrity sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA== - dependencies: - "@babel/template" "^7.22.5" - "@babel/traverse" "^7.22.6" - "@babel/types" "^7.22.5" - "@babel/highlight@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" @@ -221,109 +99,6 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae" integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q== -"@babel/plugin-proposal-class-properties@^7.14.5": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" - integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-proposal-dynamic-import@^7.14.5": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94" - integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - -"@babel/plugin-proposal-export-namespace-from@^7.14.5": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203" - integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - -"@babel/plugin-proposal-logical-assignment-operators@^7.14.5": - version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" - integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - -"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" - integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-proposal-numeric-separator@^7.14.5": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75" - integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-proposal-optional-chaining@^7.14.5": - version "7.21.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea" - integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA== - dependencies: - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-methods@^7.14.5": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" - integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-proposal-private-property-in-object@^7.14.5": - version "7.21.11" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c" - integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.21.0" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - "@babel/plugin-syntax-jsx@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918" @@ -331,92 +106,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" - integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-typescript@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272" - integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/plugin-transform-modules-commonjs@^7.14.5", "@babel/plugin-transform-modules-commonjs@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa" - integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA== - dependencies: - "@babel/helper-module-transforms" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-simple-access" "^7.22.5" - -"@babel/plugin-transform-typescript@^7.22.5": - version "7.22.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.9.tgz#91e08ad1eb1028ecc62662a842e93ecfbf3c7234" - integrity sha512-BnVR1CpKiuD0iobHPaM1iLvcwPYN2uVFAqoLVSpEDKWuOikoCv5HbKLxclhKYUXlWkX86DoZGtqI4XhbOsyrMg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-create-class-features-plugin" "^7.22.9" - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/plugin-syntax-typescript" "^7.22.5" - -"@babel/preset-typescript@^7.14.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.22.5.tgz#16367d8b01d640e9a507577ed4ee54e0101e51c8" - integrity sha512-YbPaal9LxztSGhmndR46FmAbkJ/1fAsw293tSU+I5E5h+cnJ3d4GTwyUgGYmOXJYdGA+uNePle4qbaRzj2NISQ== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.5" - "@babel/plugin-syntax-jsx" "^7.22.5" - "@babel/plugin-transform-modules-commonjs" "^7.22.5" - "@babel/plugin-transform-typescript" "^7.22.5" - "@babel/runtime@7.4.5": version "7.4.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12" @@ -440,7 +129,7 @@ "@babel/parser" "^7.22.5" "@babel/types" "^7.22.5" -"@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8", "@babel/traverse@^7.4.5": +"@babel/traverse@^7.4.5": version "7.22.8" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e" integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw== @@ -608,17 +297,6 @@ resolved "https://registry.yarnpkg.com/@iconify/react/-/react-3.2.2.tgz#ab5241dc01562076bae3b0c22238aff7e5f029cc" integrity sha512-z3+Jno3VcJzgNHsN5mEvYMsgCkOZkydqdIwOxjXh45+i2Vs9RGH68Y52vt39izwFSfuYUXhaW+1u7m7+IhCn/g== -"@jest/types@^27.2.5", "@jest/types@^27.5.1": - version "27.5.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80" - integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^16.0.0" - chalk "^4.0.0" - "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.3" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" @@ -709,45 +387,6 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@playwright/test@1.16.3": - version "1.16.3" - resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.16.3.tgz#99439d07af6a355586393b463fd88315f32d2a57" - integrity sha512-aJR6d6Fd/y6lq1RWWggcuiivM7offqddOW3te+NGGMxgF2P0xAxU0/xUurwIFnEp7iHwXILSZByzZ6W6fuKPIg== - dependencies: - "@babel/code-frame" "^7.14.5" - "@babel/core" "^7.14.8" - "@babel/plugin-proposal-class-properties" "^7.14.5" - "@babel/plugin-proposal-dynamic-import" "^7.14.5" - "@babel/plugin-proposal-export-namespace-from" "^7.14.5" - "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5" - "@babel/plugin-proposal-numeric-separator" "^7.14.5" - "@babel/plugin-proposal-optional-chaining" "^7.14.5" - "@babel/plugin-proposal-private-methods" "^7.14.5" - "@babel/plugin-proposal-private-property-in-object" "^7.14.5" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-transform-modules-commonjs" "^7.14.5" - "@babel/preset-typescript" "^7.14.5" - colors "^1.4.0" - commander "^8.2.0" - debug "^4.1.1" - expect "=27.2.5" - jest-matcher-utils "=27.2.5" - jpeg-js "^0.4.2" - minimatch "^3.0.3" - ms "^2.1.2" - open "^8.3.0" - pirates "^4.0.1" - pixelmatch "^5.2.1" - playwright-core "=1.16.3" - pngjs "^5.0.0" - rimraf "^3.0.2" - source-map-support "^0.4.18" - stack-utils "^2.0.3" - "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" @@ -1041,25 +680,6 @@ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" - integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== - -"@types/istanbul-lib-report@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" - integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" - integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== - dependencies: - "@types/istanbul-lib-report" "*" - "@types/jquery@*": version "3.5.16" resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.16.tgz#632131baf30951915b0317d48c98e9890bdf051d" @@ -1288,11 +908,6 @@ resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef" integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ== -"@types/stack-utils@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" - integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== - "@types/styled-components@^5.1.4": version "5.1.26" resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.26.tgz#5627e6812ee96d755028a98dae61d28e57c233af" @@ -1332,13 +947,6 @@ resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== -"@types/yargs@^16.0.0": - version "16.0.5" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.5.tgz#12cc86393985735a283e387936398c2f9e5f88e3" - integrity sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ== - dependencies: - "@types/yargs-parser" "*" - "@types/yargs@^17.0.1": version "17.0.24" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902" @@ -1632,7 +1240,7 @@ acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== -agent-base@6, agent-base@^6.0.2: +agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -1714,11 +1322,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -ansi-styles@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" - integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== - anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -2081,7 +1684,7 @@ browser-stdout@1.3.1: resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.14.5, browserslist@^4.21.9: +browserslist@^4.14.5: version "4.21.10" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0" integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ== @@ -2490,11 +2093,6 @@ colors@1.0.3: resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== -colors@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -2524,11 +2122,6 @@ commander@^5.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -commander@^8.2.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== - compare-version@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" @@ -2569,11 +2162,6 @@ console-control-strings@^1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -convert-source-map@^1.7.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" - integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== - copy-to-clipboard@^3.3.1: version "3.3.3" resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0" @@ -2703,7 +2291,7 @@ data-urls@^4.0.0: whatwg-mimetype "^3.0.0" whatwg-url "^12.0.0" -debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -2768,11 +2356,6 @@ defer-to-connect@^2.0.0: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" @@ -2796,11 +2379,6 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -diff-sequences@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327" - integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ== - diff@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" @@ -3467,18 +3045,6 @@ execa@^4.0.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -expect@=27.2.5: - version "27.2.5" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.2.5.tgz#16154aaa60b4d9a5b0adacfea3e4d6178f4b93fd" - integrity sha512-ZrO0w7bo8BgGoP/bLz+HDCI+0Hfei9jUSZs5yI/Wyn9VkG9w8oJ7rHRgYj+MA7yqqFa0IwHA3flJzZtYugShJA== - dependencies: - "@jest/types" "^27.2.5" - ansi-styles "^5.0.0" - jest-get-type "^27.0.6" - jest-matcher-utils "^27.2.5" - jest-message-util "^27.2.5" - jest-regex-util "^27.0.6" - extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -3764,11 +3330,6 @@ gauge@^4.0.3: strip-ansi "^6.0.1" wide-align "^1.1.5" -gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -4236,11 +3797,6 @@ ip2country@1.0.1: dependencies: asbycountry "^1.4.2" -ip@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" - integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== - is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" @@ -4305,7 +3861,7 @@ is-date-object@^1.0.1: dependencies: has-tostringtag "^1.0.0" -is-docker@^2.0.0, is-docker@^2.1.1: +is-docker@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== @@ -4442,7 +3998,7 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-wsl@^2.1.1, is-wsl@^2.2.0: +is-wsl@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== @@ -4496,61 +4052,6 @@ jake@^10.8.5: filelist "^1.0.4" minimatch "^3.1.2" -jest-diff@^27.2.5, jest-diff@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def" - integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw== - dependencies: - chalk "^4.0.0" - diff-sequences "^27.5.1" - jest-get-type "^27.5.1" - pretty-format "^27.5.1" - -jest-get-type@^27.0.6, jest-get-type@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1" - integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw== - -jest-matcher-utils@=27.2.5: - version "27.2.5" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.2.5.tgz#4684faaa8eb32bf15e6edaead6834031897e2980" - integrity sha512-qNR/kh6bz0Dyv3m68Ck2g1fLW5KlSOUNcFQh87VXHZwWc/gY6XwnKofx76Qytz3x5LDWT09/2+yXndTkaG4aWg== - dependencies: - chalk "^4.0.0" - jest-diff "^27.2.5" - jest-get-type "^27.0.6" - pretty-format "^27.2.5" - -jest-matcher-utils@^27.2.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab" - integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw== - dependencies: - chalk "^4.0.0" - jest-diff "^27.5.1" - jest-get-type "^27.5.1" - pretty-format "^27.5.1" - -jest-message-util@^27.2.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf" - integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g== - dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.5.1" - "@types/stack-utils" "^2.0.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - micromatch "^4.0.4" - pretty-format "^27.5.1" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-regex-util@^27.0.6: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95" - integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg== - jest-worker@^27.4.5: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" @@ -4560,7 +4061,7 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -jpeg-js@^0.4.2, jpeg-js@^0.4.4: +jpeg-js@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa" integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg== @@ -4931,13 +4432,6 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== -lru-cache@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== - dependencies: - yallist "^3.0.2" - lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -5050,7 +4544,7 @@ mime-types@^2.1.12, mime-types@^2.1.27: dependencies: mime-db "1.52.0" -mime@^2.4.6, mime@^2.5.2: +mime@^2.5.2: version "2.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== @@ -5077,7 +4571,7 @@ mini-css-extract-plugin@^2.7.5: dependencies: schema-utils "^4.0.0" -"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1: +"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -5164,7 +4658,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.1.1, ms@^2.1.2: +ms@2.1.3, ms@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -5401,15 +4895,6 @@ open@^7.4.2: is-docker "^2.0.0" is-wsl "^2.1.1" -open@^8.3.0: - version "8.4.2" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" - integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -5615,18 +5100,6 @@ pify@3.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== -pirates@^4.0.1: - version "4.0.6" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" - integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== - -pixelmatch@^5.2.1: - version "5.3.0" - resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-5.3.0.tgz#5e5321a7abedfb7962d60dbf345deda87cb9560a" - integrity sha512-o8mkY4E/+LNUf6LzX96ht6k6CEDi65k9G2rjMtBe9Oo+VPKSvl+0GKHuH/AlG+GA5LPG/i5hrekkxUc3s2HU+Q== - dependencies: - pngjs "^6.0.0" - pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -5634,35 +5107,6 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -playwright-core@=1.16.3: - version "1.16.3" - resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.16.3.tgz#f466be9acaffb698654adfb0a17a4906ba936895" - integrity sha512-16hF27IvQheJee+DbhC941AUZLjbJgfZFWi9YPS4LKEk/lKFhZI+9TiFD0sboYqb9eaEWvul47uR5xxTVbE4iw== - dependencies: - commander "^8.2.0" - debug "^4.1.1" - extract-zip "^2.0.1" - https-proxy-agent "^5.0.0" - jpeg-js "^0.4.2" - mime "^2.4.6" - pngjs "^5.0.0" - progress "^2.0.3" - proper-lockfile "^4.1.1" - proxy-from-env "^1.1.0" - rimraf "^3.0.2" - socks-proxy-agent "^6.1.0" - stack-utils "^2.0.3" - ws "^7.4.6" - yauzl "^2.10.0" - yazl "^2.5.1" - -playwright@1.16.3: - version "1.16.3" - resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.16.3.tgz#27a292d9fa54fbac923998d3af58cd2b691f5ebe" - integrity sha512-nfJx/OpIb/8OexL3rYGxNN687hGyaM3XNpfuMzoPlrekURItyuiHHsNhC9oQCx3JDmCn5O3EyyyFCnrZjH6MpA== - dependencies: - playwright-core "=1.16.3" - plist@^3.0.1, plist@^3.0.4: version "3.1.0" resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" @@ -5672,16 +5116,6 @@ plist@^3.0.1, plist@^3.0.4: base64-js "^1.5.1" xmlbuilder "^15.1.1" -pngjs@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb" - integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw== - -pngjs@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-6.0.0.tgz#ca9e5d2aa48db0228a52c419c3308e87720da821" - integrity sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg== - postcss-modules-extract-imports@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" @@ -5747,19 +5181,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prettier@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.0.tgz#3bec4489d5eebcd52b95ddd2c22467b5c852fde1" - integrity sha512-GlAIjk6DjkNT6u/Bw5QCWrbzh9YlLKwwmJT//1YiCR3WDpZDnyss64aXHQZgF8VKeGlWnX6+tGsKSVxsZT/gtA== - -pretty-format@^27.2.5, pretty-format@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" - integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== - dependencies: - ansi-regex "^5.0.1" - ansi-styles "^5.0.0" - react-is "^17.0.1" +prettier@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" + integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== progress@^2.0.3: version "2.0.3" @@ -5783,15 +5208,6 @@ prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: object-assign "^4.1.1" react-is "^16.13.1" -proper-lockfile@^4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f" - integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA== - dependencies: - graceful-fs "^4.2.4" - retry "^0.12.0" - signal-exit "^3.0.2" - protobufjs-cli@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz#f531201b1c8c7772066aa822bf9a08318b24a704" @@ -5958,11 +5374,6 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^17.0.1: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== - react-is@^18.0.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" @@ -6591,40 +6002,16 @@ slice-ansi@^3.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -smart-buffer@^4.0.2, smart-buffer@^4.2.0: +smart-buffer@^4.0.2: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -socks-proxy-agent@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce" - integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ== - dependencies: - agent-base "^6.0.2" - debug "^4.3.3" - socks "^2.6.2" - -socks@^2.6.2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" - integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== - dependencies: - ip "^2.0.0" - smart-buffer "^4.2.0" - "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-support@^0.4.18: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== - dependencies: - source-map "^0.5.6" - source-map-support@^0.5.19, source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -6638,11 +6025,6 @@ source-map@0.5.6: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA== -source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== - source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -6665,13 +6047,6 @@ stack-generator@^2.0.5: dependencies: stackframe "^1.3.4" -stack-utils@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" - integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== - dependencies: - escape-string-regexp "^2.0.0" - stackframe@^1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" @@ -7450,11 +6825,6 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -ws@^7.4.6: - version "7.5.9" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" - integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== - ws@^8.13.0: version "8.13.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" @@ -7490,11 +6860,6 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -yallist@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" @@ -7564,13 +6929,6 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -yazl@^2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35" - integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw== - dependencies: - buffer-crc32 "~0.2.3" - yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" From cd17a08c2e33f3cdb7eb5929df0c0d39b5e85436 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 20 Sep 2023 11:48:01 +1000 Subject: [PATCH 018/302] chore: lint --- libsession.worker.config.js | 1 + ts/node/sql_calls/config_dump.ts | 2 +- ts/receiver/configMessage.ts | 6 +- ts/receiver/contentMessage.ts | 4 +- ts/session/apis/snode_api/namespaces.ts | 4 +- ts/session/apis/snode_api/retrieveRequest.ts | 2 +- ts/session/apis/snode_api/sessionRpc.ts | 1 + ts/session/apis/snode_api/snodeSignatures.ts | 4 +- ts/session/apis/snode_api/swarmPolling.ts | 42 +++--- .../SwarmPollingConfigShared.ts | 1 + ts/session/crypto/MessageEncrypter.ts | 31 +--- ts/session/group/closed-group.ts | 2 +- .../ClosedGroupVisibleMessage.ts | 2 +- ts/session/utils/errors.ts | 4 +- .../utils/job_runners/jobs/GroupConfigJob.ts | 10 +- .../utils/libsession/libsession_utils.ts | 2 + ts/state/ducks/groups.ts | 141 +++++++++--------- ts/types/sqlSharedTypes.ts | 4 +- .../browser/libsession_worker_functions.ts | 2 +- 19 files changed, 121 insertions(+), 144 deletions(-) diff --git a/libsession.worker.config.js b/libsession.worker.config.js index 7d546c90ab..bb8a9df2aa 100644 --- a/libsession.worker.config.js +++ b/libsession.worker.config.js @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/no-var-requires */ const path = require('path'); + const isProd = process.env.NODE_ENV === 'production'; module.exports = { diff --git a/ts/node/sql_calls/config_dump.ts b/ts/node/sql_calls/config_dump.ts index 78fe4f3824..98f1690d53 100644 --- a/ts/node/sql_calls/config_dump.ts +++ b/ts/node/sql_calls/config_dump.ts @@ -3,6 +3,7 @@ */ import { compact, uniq } from 'lodash'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; import { CONFIG_DUMP_TABLE, ConfigDumpDataNode, @@ -12,7 +13,6 @@ import { // eslint-disable-next-line import/no-unresolved, import/extensions import { ConfigWrapperObjectTypesMeta } from '../../webworker/workers/browser/libsession_worker_functions'; import { assertGlobalInstance } from '../sqlInstance'; -import { GroupPubkeyType } from 'libsession_util_nodejs'; function parseRow( row: Pick diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 037b0defc1..321b3b83da 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -33,7 +33,7 @@ import { ConfigWrapperUser, getGroupPubkeyFromWrapperType, isUserConfigWrapperType, -} from '../../ts/webworker/workers/browser/libsession_worker_functions'; +} from '../webworker/workers/browser/libsession_worker_functions'; import { UserConfigKind, isUserKind } from '../types/ProtobufKind'; import { ContactsWrapperActions, @@ -115,7 +115,7 @@ async function mergeUserConfigsWithIncomingUpdates( hash: msg.messageHash, })); if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { - printDumpForDebug(`printDumpsForDebugging: before merge of ${variant}:`, variant); + await printDumpForDebug(`printDumpsForDebugging: before merge of ${variant}:`, variant); } const mergedCount = await GenericWrapperActions.merge(variant, toMerge); @@ -129,7 +129,7 @@ async function mergeUserConfigsWithIncomingUpdates( ); if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { - printDumpForDebug(`printDumpsForDebugging: after merge of ${variant}:`, variant); + await printDumpForDebug(`printDumpsForDebugging: after merge of ${variant}:`, variant); } const incomingConfResult: IncomingUserResult = { needsDump, diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 21063d130b..f25e3b1512 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -60,14 +60,12 @@ export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageH async function decryptForGroupV2(envelope: EnvelopePlus) { window?.log?.info('received closed group message v2'); - // try { const groupPk = envelope.source; if (!PubKey.isClosedGroupV2(groupPk)) { throw new PreConditionFailed('decryptForGroupV2: not a 03 prefixed group'); } - return await MetaGroupWrapperActions.decryptMessage(groupPk, envelope.content); - // } catch (e) {} + return MetaGroupWrapperActions.decryptMessage(groupPk, envelope.content); } async function decryptForClosedGroup(envelope: EnvelopePlus) { diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index 5bb74f3be6..71d925ec46 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -131,9 +131,9 @@ function isGroupConfigNamespace( assertUnreachable(namespace, `isGroupConfigNamespace case not handled: ${namespace}`); } catch (e) { window.log.warn(`isGroupConfigNamespace case not handled: ${namespace}: ${e.message}`); - return false; } } + return false; } /** @@ -164,6 +164,7 @@ function isGroupNamespace(namespace: SnodeNamespaces): namespace is SnodeNamespa return false; } } + return false; } function namespacePriority(namespace: SnodeNamespaces): 10 | 1 { @@ -189,6 +190,7 @@ function namespacePriority(namespace: SnodeNamespaces): 10 | 1 { return 1; } } + return 1; } function maxSizeMap(namespaces: Array) { diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 2a6da4c3f3..46e2e0f62b 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -1,11 +1,11 @@ import { isEmpty, isNil, omit } from 'lodash'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; import { Snode } from '../../../data/data'; import { updateIsOnline } from '../../../state/ducks/onion'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { SnodeNamespace, SnodeNamespaces } from './namespaces'; -import { GroupPubkeyType } from 'libsession_util_nodejs'; import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { DURATION } from '../../constants'; import { PubKey } from '../../types'; diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index b2f2a51125..b5e4d61f56 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -1,6 +1,7 @@ import https from 'https'; // eslint-disable-next-line import/no-named-default import { clone } from 'lodash'; +// eslint-disable-next-line import/no-named-default import { default as insecureNodeFetch } from 'node-fetch'; import pRetry from 'p-retry'; diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts index 89a6c89247..f962164eec 100644 --- a/ts/session/apis/snode_api/snodeSignatures.ts +++ b/ts/session/apis/snode_api/snodeSignatures.ts @@ -1,4 +1,5 @@ import { FixedSizeUint8Array, GroupPubkeyType } from 'libsession_util_nodejs'; +import { isEmpty } from 'lodash'; import { getSodiumRenderer } from '../../crypto'; import { StringUtils, UserUtils } from '../../utils'; import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String'; @@ -7,7 +8,6 @@ import { SnodeNamespaces } from './namespaces'; import { PubKey } from '../../types'; import { toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; import { PreConditionFailed } from '../../utils/errors'; -import { isEmpty } from 'lodash'; export type SnodeSignatureResult = { timestamp: number; @@ -184,7 +184,7 @@ async function generateUpdateExpirySignature({ const signature = sodium.crypto_sign_detached(message, ed25519Privkey as Uint8Array); const signatureBase64 = fromUInt8ArrayToBase64(signature); - if (!isEmpty(signatureBase64) || isEmpty(ed25519Pubkey)) { + if (isEmpty(signatureBase64) || isEmpty(ed25519Pubkey)) { throw new Error('generateUpdateExpirySignature: failed to build signature'); } diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index a0df1e0ba1..4e4b48e753 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -172,7 +172,6 @@ export class SwarmPolling { setTimeout(this.pollForAllKeys.bind(this), SWARM_POLLING_TIMEOUT.ACTIVE); return; } - window.log.warn('############################ pollForAllKeys ############################'); // we always poll as often as possible for our pubkey const ourPubkey = UserUtils.getOurPubKeyStrFromCache(); const directPromise = this.pollOnceForKey([ourPubkey, ConversationTypeEnum.PRIVATE]); @@ -318,32 +317,30 @@ export class SwarmPolling { !allLegacyGroupsInWrapper.some(m => m.pubkeyHex === pubkey) // just check if a legacy group with that pubkey exists ) { // not tracked anymore in the wrapper. Discard messages and stop polling - this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); + await this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); return; } if (PubKey.isClosedGroupV2(pubkey) && allGroupsInWrapper.some(m => m.pubkeyHex === pubkey)) { // not tracked anymore in the wrapper. Discard messages and stop polling - this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); + await this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); return; } - { - // trigger the handling of all the other messages, not shared config related - newMessages.forEach(m => { - const content = extractWebSocketContent(m.data, m.hash); - if (!content) { - return; - } + // trigger the handling of all the other messages, not shared config related + newMessages.forEach(m => { + const content = extractWebSocketContent(m.data, m.hash); + if (!content) { + return; + } - Receiver.handleRequest( - content.body, - type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV3 - ? pubkey - : null, - content.messageHash - ); - }); - } + Receiver.handleRequest( + content.body, + type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV3 + ? pubkey + : null, + content.messageHash + ); + }); } private async getHashesToBump( @@ -364,12 +361,12 @@ export class SwarmPolling { window.log.warn(`failed to get currentHashes for user variant ${variant}`); } } - window.log.debug(`configHashesToBump: ${configHashesToBump}`); + window.log.debug(`configHashesToBump private: ${configHashesToBump}`); return configHashesToBump; } if (type === ConversationTypeEnum.GROUPV3 && PubKey.isClosedGroupV2(pubkey)) { const toBump = await MetaGroupWrapperActions.currentHashes(pubkey); - window.log.debug(`configHashesToBump: ${toBump}`); + window.log.debug(`configHashesToBump group: ${toBump}`); return toBump; } return []; @@ -498,6 +495,7 @@ export class SwarmPolling { return newMessages; } + // eslint-disable-next-line consistent-return private getNamespacesToPollFrom(type: ConversationTypeEnum): Array { if (type === ConversationTypeEnum.PRIVATE) { return [ @@ -578,7 +576,7 @@ export class SwarmPolling { } } -function retrieveItemWithNamespace(results: RetrieveRequestResult[]) { +function retrieveItemWithNamespace(results: Array) { return flatten( compact( results.map( diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts index 15b2e27e7b..0a541b02bd 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts @@ -29,6 +29,7 @@ async function decryptSharedConfigMessages( try { const envelope: EnvelopePlus = SignalService.Envelope.decode(groupConfigMessage.body) as any; + // eslint-disable-next-line no-await-in-loop const decryptedEnvelope = await decryptEnvelope(envelope); if (!decryptedEnvelope?.byteLength) { continue; diff --git a/ts/session/crypto/MessageEncrypter.ts b/ts/session/crypto/MessageEncrypter.ts index 20334b24b3..29d09804e4 100644 --- a/ts/session/crypto/MessageEncrypter.ts +++ b/ts/session/crypto/MessageEncrypter.ts @@ -54,6 +54,7 @@ async function encryptForLegacyGroup(destination: PubKey, plainText: Uint8Array) * @param encryptionType The type of encryption. * @returns The envelope type and the base64 encoded cipher text */ +// eslint-disable-next-line consistent-return export async function encrypt( destination: PubKey, plainTextBuffer: Uint8Array, @@ -64,23 +65,11 @@ export async function encrypt( switch (encryptionType) { case SESSION_MESSAGE: { - // if (destination.isPrivate || destination.isUS) { const cipherText = await MessageEncrypter.encryptUsingSessionProtocol( PubKey.cast(destination.key), plainTextPadded ); return { envelopeType: SESSION_MESSAGE, cipherText }; - // } - - // if (destination.isGroupV2 || destination.isLegacyGroup) { - // throw new PreConditionFailed( - // 'Encryption with SESSION_MESSAGE only work with destination private or us' - // ); - // } - // assertUnreachable( - // destination, - // 'Encryption with SESSION_MESSAGE only work with destination private or us' - // ); } case CLOSED_GROUP_MESSAGE: { @@ -92,26 +81,10 @@ export async function encrypt( }; } - // if (destination.isLegacyGroup) { return encryptForLegacyGroup(destination, plainTextPadded); // not padding it again, it is already done by libsession - // } - // if ( - // destination.isBlinded || - // destination.isBlinded || - // destination.isPrivate || - // destination.isUS - // ) { - // throw new PreConditionFailed( - // 'Encryption with CLOSED_GROUP_MESSAGE only work with destination groupv2 or legacy group' - // ); - // } - // assertUnreachable( - // destination, - // 'Encryption with CLOSED_GROUP_MESSAGE only work with destination groupv2 or legacy group' - // ); } default: - assertUnreachable(encryptionType, ''); + assertUnreachable(encryptionType, 'MessageEncrypter encrypt unreachable case'); } } diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 846b19ca15..bce72be0d1 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -1,4 +1,4 @@ -import _, { isNumber } from 'lodash'; +import _, { isFinite, isNumber } from 'lodash'; import { v4 as uuidv4 } from 'uuid'; import { PubKey } from '../types'; diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index 7630323f87..41a8e3c39b 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -1,10 +1,10 @@ +import { GroupPubkeyType } from 'libsession_util_nodejs'; import { SignalService } from '../../../../protobuf'; import { PubKey } from '../../../types'; import { StringUtils } from '../../../utils'; import { VisibleMessage } from './VisibleMessage'; import { ClosedGroupMessage } from '../controlMessage/group/ClosedGroupMessage'; import { DataMessage } from '../DataMessage'; -import { GroupPubkeyType } from 'libsession_util_nodejs'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; interface ClosedGroupVisibleMessageParams { diff --git a/ts/session/utils/errors.ts b/ts/session/utils/errors.ts index ec8eb5c5d2..f2bb10fc2e 100644 --- a/ts/session/utils/errors.ts +++ b/ts/session/utils/errors.ts @@ -68,11 +68,9 @@ export class HTTPError extends Error { } class BaseError extends Error { - public readonly context?: Object; - constructor(message: string, context?: Object) { + constructor(message: string) { super(message); this.name = this.constructor.name; - this.context = context; } } diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index 46b3edd256..0fc6791cf6 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -28,6 +28,7 @@ import { PersistedJob, RunJobResult, } from '../PersistedJob'; +import { assertUnreachable } from '../../../../types/sqlSharedTypes'; const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s) const defaultMaxAttempts = 2; @@ -96,8 +97,8 @@ async function buildAndSaveDumpsToDB( for (let i = 0; i < changes.length; i++) { const change = changes[i]; - - switch (change.pushed.namespace) { + const namespace = change.pushed.namespace; + switch (namespace) { case SnodeNamespaces.ClosedGroupInfo: { if ((change.pushed as any).seqno) { toConfirm[1].groupInfo = [change.pushed.seqno.toNumber(), change.updatedHash]; @@ -108,6 +109,11 @@ async function buildAndSaveDumpsToDB( toConfirm[1].groupMember = [change.pushed.seqno.toNumber(), change.updatedHash]; break; } + case SnodeNamespaces.ClosedGroupKeys: { + break; + } + default: + assertUnreachable(namespace, 'buildAndSaveDumpsToDB assertUnreachable'); } } diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 7e70a07690..366ae2331c 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -308,6 +308,7 @@ async function pendingChangesForGroup( return { messages: results, allOldHashes }; } +// eslint-disable-next-line consistent-return function userKindToVariant(kind: UserConfigKind): ConfigWrapperUser { switch (kind) { case SignalService.SharedConfigMessage.Kind.USER_PROFILE: @@ -323,6 +324,7 @@ function userKindToVariant(kind: UserConfigKind): ConfigWrapperUser { } } +// eslint-disable-next-line consistent-return function userVariantToUserKind(variant: ConfigWrapperUser) { switch (variant) { case 'UserConfig': diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index 73123d2bb5..e80e110fb2 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -1,3 +1,4 @@ +/* eslint-disable no-await-in-loop */ import { PayloadAction, createAsyncThunk, createSlice } from '@reduxjs/toolkit'; import { GroupInfoGet, GroupMemberGet, GroupPubkeyType } from 'libsession_util_nodejs'; import { isEmpty, uniq } from 'lodash'; @@ -49,86 +50,80 @@ const initNewGroupInWrapper = createAsyncThunk( throw new PreConditionFailed('initNewGroupInWrapper needs us to be a member'); } const uniqMembers = uniq(members); - try { - const newGroup = await UserGroupsWrapperActions.createGroup(); - const groupPk = newGroup.pubkeyHex; - newGroup.name = groupName; // this will be used by the linked devices until they fetch the info from the groups swarm + const newGroup = await UserGroupsWrapperActions.createGroup(); + const groupPk = newGroup.pubkeyHex; + newGroup.name = groupName; // this will be used by the linked devices until they fetch the info from the groups swarm - await UserGroupsWrapperActions.setGroup(newGroup); + await UserGroupsWrapperActions.setGroup(newGroup); - const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); - if (!ourEd25519KeypairBytes) { - throw new Error('Current user has no priv ed25519 key?'); - } - const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes; - const groupEd2519Pk = HexString.fromHexString(groupPk).slice(1); // remove the 03 prefix (single byte once in hex form) - - // dump is always empty when creating a new groupInfo - await MetaGroupWrapperActions.init(groupPk, { - metaDumped: null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), - groupEd25519Secretkey: newGroup.secretKey, - groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), - }); - - for (let index = 0; index < uniqMembers.length; index++) { - const member = uniqMembers[index]; - const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); - if (created.pubkeyHex === us) { - await MetaGroupWrapperActions.memberSetPromoted(groupPk, created.pubkeyHex, false); - } else { - await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); - } - } + const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); + if (!ourEd25519KeypairBytes) { + throw new Error('Current user has no priv ed25519 key?'); + } + const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes; + const groupEd2519Pk = HexString.fromHexString(groupPk).slice(1); // remove the 03 prefix (single byte once in hex form) + + // dump is always empty when creating a new groupInfo + await MetaGroupWrapperActions.init(groupPk, { + metaDumped: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), + groupEd25519Secretkey: newGroup.secretKey, + groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), + }); - const infos = await MetaGroupWrapperActions.infoGet(groupPk); - if (!infos) { - throw new Error(`getInfos of ${groupPk} returned empty result even if it was just init.`); + for (let index = 0; index < uniqMembers.length; index++) { + const member = uniqMembers[index]; + const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); + if (created.pubkeyHex === us) { + await MetaGroupWrapperActions.memberSetPromoted(groupPk, created.pubkeyHex, false); + } else { + await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); } - infos.name = groupName; - await MetaGroupWrapperActions.infoSet(groupPk, infos); + } - const membersFromWrapper = await MetaGroupWrapperActions.memberGetAll(groupPk); - if (!membersFromWrapper || isEmpty(membersFromWrapper)) { - throw new Error( - `memberGetAll of ${groupPk} returned empty result even if it was just init.` - ); - } + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + if (!infos) { + throw new Error(`getInfos of ${groupPk} returned empty result even if it was just init.`); + } + infos.name = groupName; + await MetaGroupWrapperActions.infoSet(groupPk, infos); - const convo = await getConversationController().getOrCreateAndWait( - groupPk, - ConversationTypeEnum.GROUPV3 - ); - - await convo.setIsApproved(true, false); - - // console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?'); - // // the sync below will need the secretKey of the group to be saved in the wrapper. So save it! - await UserGroupsWrapperActions.setGroup(newGroup); - - await GroupSync.queueNewJobIfNeeded(groupPk); - - // const updateGroupDetails: ClosedGroup.GroupInfo = { - // id: newGroup.pubkeyHex, - // name: groupDetails.groupName, - // members, - // admins: [us], - // activeAt: Date.now(), - // expireTimer: 0, - // }; - - // // be sure to call this before sending the message. - // // the sending pipeline needs to know from GroupUtils when a message is for a medium group - // await ClosedGroup.updateOrCreateClosedGroup(updateGroupDetails); - await convo.unhideIfNeeded(); - convo.set({ active_at: Date.now() }); - await convo.commit(); - convo.updateLastMessage(); - - return { groupPk: newGroup.pubkeyHex, infos, members: membersFromWrapper }; - } catch (e) { - throw e; + const membersFromWrapper = await MetaGroupWrapperActions.memberGetAll(groupPk); + if (!membersFromWrapper || isEmpty(membersFromWrapper)) { + throw new Error(`memberGetAll of ${groupPk} returned empty result even if it was just init.`); } + + const convo = await getConversationController().getOrCreateAndWait( + groupPk, + ConversationTypeEnum.GROUPV3 + ); + + await convo.setIsApproved(true, false); + + // console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?'); + // // the sync below will need the secretKey of the group to be saved in the wrapper. So save it! + await UserGroupsWrapperActions.setGroup(newGroup); + + await GroupSync.queueNewJobIfNeeded(groupPk); + + // const updateGroupDetails: ClosedGroup.GroupInfo = { + // id: newGroup.pubkeyHex, + // name: groupDetails.groupName, + // members, + // admins: [us], + // activeAt: Date.now(), + // expireTimer: 0, + // }; + + // // be sure to call this before sending the message. + // // the sending pipeline needs to know from GroupUtils when a message is for a medium group + // await ClosedGroup.updateOrCreateClosedGroup(updateGroupDetails); + await convo.unhideIfNeeded(); + convo.set({ active_at: Date.now() }); + await convo.commit(); + convo.updateLastMessage(); + + return { groupPk: newGroup.pubkeyHex, infos, members: membersFromWrapper }; } ); diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 25139c11c6..1f4358328a 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -278,7 +278,9 @@ export function toFixedUint8ArrayOfLength( data: Uint8Array, length: T ): FixedSizeUint8Array { - if (data.length === length) return data as any as FixedSizeUint8Array; + if (data.length === length) { +return data as any as FixedSizeUint8Array; +} throw new Error( `toFixedUint8ArrayOfLength invalid. Expected length ${length} but got: ${data.length}` ); diff --git a/ts/webworker/workers/browser/libsession_worker_functions.ts b/ts/webworker/workers/browser/libsession_worker_functions.ts index d2d8a21a23..ab1346cc9f 100644 --- a/ts/webworker/workers/browser/libsession_worker_functions.ts +++ b/ts/webworker/workers/browser/libsession_worker_functions.ts @@ -71,7 +71,7 @@ export function isMetaWrapperType(config: ConfigWrapperObjectTypesMeta): config } export function getGroupPubkeyFromWrapperType(type: ConfigWrapperGroup): GroupPubkeyType { - if (!type.startsWith(MetaGroupConfigValue + '03')) { + if (!type.startsWith(`${MetaGroupConfigValue}03`)) { throw new Error(`not a metagroup variant: ${type}`); } return type.substring(type.indexOf('-03') + 1) as GroupPubkeyType; // typescript is not yet smart enough From b53264593b486f25c926dda8f4f9d4ed298b59d9 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 21 Sep 2023 13:30:33 +1000 Subject: [PATCH 019/302] feat: preload name of group from usergroup wrapper until we get the groupinfo name from polling --- preload.js | 2 +- ts/components/SessionInboxView.tsx | 2 +- .../leftpane/LeftPaneMessageSection.tsx | 8 +- .../conversation-list-item/UserItem.tsx | 5 +- .../leftpane/overlay/OverlayClosedGroup.tsx | 139 +++++++- ts/hooks/useParamSelector.ts | 5 +- ts/models/conversation.ts | 7 +- ts/receiver/configMessage.ts | 107 +++++-- ts/session/apis/snode_api/batchRequest.ts | 6 +- ts/session/apis/snode_api/swarmPolling.ts | 10 +- .../SwarmPollingGroupConfig.ts | 37 +-- .../conversations/ConversationController.ts | 13 +- ts/session/conversations/createClosedGroup.ts | 20 +- .../utils/job_runners/jobs/GroupConfigJob.ts | 105 +++--- .../utils/libsession/libsession_utils.ts | 72 +---- ts/state/ducks/groups.ts | 302 ++++++++++++++---- ts/state/selectors/groups.ts | 8 + ts/types/sqlSharedTypes.ts | 4 +- ts/util/releaseFeature.ts | 6 - .../node/libsession/libsession.worker.ts | 3 +- ts/window.d.ts | 2 +- 21 files changed, 560 insertions(+), 303 deletions(-) diff --git a/preload.js b/preload.js index f8339fd4b5..cb1acea9c4 100644 --- a/preload.js +++ b/preload.js @@ -34,7 +34,7 @@ window.sessionFeatureFlags = { integrationTestEnv: Boolean( process.env.NODE_APP_INSTANCE && process.env.NODE_APP_INSTANCE.includes('test-integration') ), - useClosedGroupV3: true, + useClosedGroupV2: true, debug: { debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), debugLibsessionDumps: !_.isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS), diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index bc44721ed4..2dad1c9936 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -99,7 +99,7 @@ function setupLeftPane(forceUpdateInboxComponent: () => void) { window.openConversationWithMessages = openConversationWithMessages; window.inboxStore = createSessionInboxStore(); window.inboxStore.dispatch(updateAllOnStorageReady()); - window.inboxStore.dispatch(groupInfoActions.loadDumpsFromDB()); + window.inboxStore.dispatch(groupInfoActions.loadMetaDumpsFromDB()); // this loads the dumps from DB and fills the 03-groups slice with the corresponding details forceUpdateInboxComponent(); } diff --git a/ts/components/leftpane/LeftPaneMessageSection.tsx b/ts/components/leftpane/LeftPaneMessageSection.tsx index 0e5075a2db..a065fbd94a 100644 --- a/ts/components/leftpane/LeftPaneMessageSection.tsx +++ b/ts/components/leftpane/LeftPaneMessageSection.tsx @@ -13,7 +13,7 @@ import { assertUnreachable } from '../../types/sqlSharedTypes'; import { SessionSearchInput } from '../SessionSearchInput'; import { StyledLeftPaneList } from './LeftPaneList'; import { ConversationListItem } from './conversation-list-item/ConversationListItem'; -import { OverlayClosedGroup } from './overlay/OverlayClosedGroup'; +import { OverlayLegacyClosedGroup, OverlayClosedGroupV2 } from './overlay/OverlayClosedGroup'; import { OverlayCommunity } from './overlay/OverlayCommunity'; import { OverlayMessage } from './overlay/OverlayMessage'; import { OverlayMessageRequest } from './overlay/OverlayMessageRequest'; @@ -50,7 +50,11 @@ const ClosableOverlay = () => { case 'open-group': return ; case 'closed-group': - return ; + return window.sessionFeatureFlags.useClosedGroupV2 ? ( + + ) : ( + + ); case 'message': return ; case 'message-requests': diff --git a/ts/components/leftpane/conversation-list-item/UserItem.tsx b/ts/components/leftpane/conversation-list-item/UserItem.tsx index 0526bcb2f7..9e6e6f8e59 100644 --- a/ts/components/leftpane/conversation-list-item/UserItem.tsx +++ b/ts/components/leftpane/conversation-list-item/UserItem.tsx @@ -1,5 +1,6 @@ import React from 'react'; import { useSelector } from 'react-redux'; +import { isEmpty } from 'lodash'; import { useConversationRealName, useConversationUsername, @@ -18,8 +19,8 @@ export const UserItem = () => { const isSearchResultsMode = useSelector(isSearching); const shortenedPubkey = PubKey.shorten(conversationId); - const isMe = useIsMe(conversationId); const username = useConversationUsername(conversationId); + const isMe = useIsMe(conversationId); const realName = useConversationRealName(conversationId); const hasNickname = useHasNickname(conversationId); @@ -31,7 +32,7 @@ export const UserItem = () => { : username; let shouldShowPubkey = false; - if ((!username || username.length === 0) && (!displayName || displayName.length === 0)) { + if (isEmpty(username) && isEmpty(displayName)) { shouldShowPubkey = true; } diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index 62c1f4bd60..35c5ae8e71 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -4,21 +4,25 @@ import { useDispatch, useSelector } from 'react-redux'; import useKey from 'react-use/lib/useKey'; import styled from 'styled-components'; +import { concat } from 'lodash'; +import { MemberListItem } from '../../MemberListItem'; import { SessionButton } from '../../basic/SessionButton'; import { SessionIdEditable } from '../../basic/SessionIdEditable'; import { SessionSpinner } from '../../basic/SessionSpinner'; -import { MemberListItem } from '../../MemberListItem'; import { OverlayHeader } from './OverlayHeader'; -import { resetOverlayMode } from '../../../state/ducks/section'; -import { getPrivateContactsPubkeys } from '../../../state/selectors/conversations'; -import { SpacerLG } from '../../basic/Text'; -import { SessionSearchInput } from '../../SessionSearchInput'; -import { getSearchResultsContactOnly, isSearching } from '../../../state/selectors/search'; import { useSet } from '../../../hooks/useSet'; import { VALIDATION } from '../../../session/constants'; -import { ToastUtils } from '../../../session/utils'; import { createClosedGroup } from '../../../session/conversations/createClosedGroup'; +import { ToastUtils } from '../../../session/utils'; +import { groupInfoActions } from '../../../state/ducks/groups'; +import { resetOverlayMode } from '../../../state/ducks/section'; +import { getPrivateContactsPubkeys } from '../../../state/selectors/conversations'; +import { useIsCreatingGroupFromUIPending } from '../../../state/selectors/groups'; +import { getSearchResultsContactOnly, isSearching } from '../../../state/selectors/search'; +import { useOurPkStr } from '../../../state/selectors/user'; +import { SessionSearchInput } from '../../SessionSearchInput'; +import { SpacerLG } from '../../basic/Text'; const StyledMemberListNoContacts = styled.div` font-family: var(--font-mono), var(--font-default); @@ -82,12 +86,128 @@ async function createClosedGroupWithToasts( return false; } - await createClosedGroup(groupName, groupMemberIds, window.sessionFeatureFlags.useClosedGroupV3); + await createClosedGroup(groupName, groupMemberIds); return true; } -export const OverlayClosedGroup = () => { +// duplicated form the legacy one below because this one is a lot more tightly linked with redux async thunks logic +export const OverlayClosedGroupV2 = () => { + const dispatch = useDispatch(); + const us = useOurPkStr(); + const privateContactsPubkeys = useSelector(getPrivateContactsPubkeys); + const isCreatingGroup = useIsCreatingGroupFromUIPending(); + const [groupName, setGroupName] = useState(''); + const { + uniqueValues: members, + addTo: addToSelected, + removeFrom: removeFromSelected, + } = useSet([]); + const isSearch = useSelector(isSearching); + const searchResultContactsOnly = useSelector(getSearchResultsContactOnly); + + function closeOverlay() { + dispatch(resetOverlayMode()); + } + + async function onEnterPressed() { + if (isCreatingGroup) { + window?.log?.warn('Closed group creation already in progress'); + return; + } + // Validate groupName and groupMembers length + if (groupName.length === 0) { + ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooShort')); + return; + } + if (groupName.length > VALIDATION.MAX_GROUP_NAME_LENGTH) { + ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooLong')); + return; + } + + // >= because we add ourself as a member AFTER this. so a 10 group is already invalid as it will be 11 with ourself + // the same is valid with groups count < 1 + + if (members.length < 1) { + ToastUtils.pushToastError('pickClosedGroupMember', window.i18n('pickClosedGroupMember')); + return; + } + if (members.length >= VALIDATION.CLOSED_GROUP_SIZE_LIMIT) { + ToastUtils.pushToastError('closedGroupMaxSize', window.i18n('closedGroupMaxSize')); + return; + } + // trigger the add through redux. + dispatch( + groupInfoActions.initNewGroupInWrapper({ + members: concat(members, [us]), + groupName, + us, + }) as any + ); + } + + useKey('Escape', closeOverlay); + + const title = window.i18n('createGroup'); + const buttonText = window.i18n('create'); + const subtitle = window.i18n('createClosedGroupNamePrompt'); + const placeholder = window.i18n('createClosedGroupPlaceholder'); + + const noContactsForClosedGroup = privateContactsPubkeys.length === 0; + + const contactsToRender = isSearch ? searchResultContactsOnly : privateContactsPubkeys; + + const disableCreateButton = !members.length && !groupName.length; + + return ( +
+ +
+ +
+ + + + + {noContactsForClosedGroup ? ( + + ) : ( + + {contactsToRender.map((memberPubkey: string) => ( + m === memberPubkey)} + key={memberPubkey} + onSelect={addToSelected} + onUnselect={removeFromSelected} + disableBg={true} + /> + ))} + + )} + + + +
+ ); +}; + +export const OverlayLegacyClosedGroup = () => { const dispatch = useDispatch(); const privateContactsPubkeys = useSelector(getPrivateContactsPubkeys); const [groupName, setGroupName] = useState(''); @@ -111,6 +231,7 @@ export const OverlayClosedGroup = () => { } setLoading(true); const groupCreated = await createClosedGroupWithToasts(groupName, selectedMemberIds); + if (groupCreated) { closeOverlay(); return; diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index f73c28e8fc..f40b5c7f2a 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -31,7 +31,10 @@ export function useConversationUsername(convoId?: string) { const convoProps = useConversationPropsById(convoId); const groupName = useLibGroupName(convoId); - if (convoId && PubKey.isClosedGroupV2(convoId)) { + if (convoId && PubKey.isClosedGroupV2(convoId) && groupName) { + // when getting a new 03 group from the usergroup wrapper, + // we set the displayNameInProfile with the name from the wrapper. + // So let's keep falling back to convoProps?.displayNameInProfile if groupName is not set yet (it comes later through the groupInfos namespace) return groupName; } return convoProps?.nickname || convoProps?.displayNameInProfile || convoId; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 43e06366a4..537c9af0ce 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1728,7 +1728,7 @@ export class ConversationModel extends Backbone.Model { public isKickedFromGroup(): boolean { if (this.isClosedGroup()) { if (this.isClosedGroupV3()) { - console.info('isKickedFromGroup using lib todo'); // debugger + // console.info('isKickedFromGroup using lib todo'); // debugger } return !!this.get('isKickedFromGroup'); } @@ -1738,7 +1738,7 @@ export class ConversationModel extends Backbone.Model { public isLeft(): boolean { if (this.isClosedGroup()) { if (this.isClosedGroupV3()) { - console.info('isLeft using lib todo'); // debugger + // console.info('isLeft using lib todo'); // debugger } return !!this.get('left'); } @@ -2340,9 +2340,6 @@ export async function commitConversationAndRefreshWrapper(id: string) { return; } - // TODOLATER remove duplicates between db and wrapper (and move search by name or nickname to wrapper) - // TODOLATER insertConvoFromDBIntoWrapperAndRefresh and insertContactFromDBIntoWrapperAndRefresh both fetches the same data from the DB. Might be worth fetching it and providing it to both? - // write to db const savedDetails = await Data.saveConversation(convo.attributes); await convo.refreshInMemoryDetails(savedDetails); diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 321b3b83da..a992c77e1f 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -1,5 +1,5 @@ /* eslint-disable no-await-in-loop */ -import { ContactInfo } from 'libsession_util_nodejs'; +import { ContactInfo, UserGroupsGet } from 'libsession_util_nodejs'; import { compact, difference, isEmpty, isNil, isNumber, toNumber } from 'lodash'; import { ConfigDumpData } from '../data/configDump/configDump'; import { SettingsKey } from '../data/settings-key'; @@ -47,6 +47,7 @@ import { addKeyPairToCacheAndDBIfNeeded } from './closedGroups'; import { HexKeyPair } from './keypairs'; import { queueAllCachedFromSource } from './receiver'; import { HexString } from '../node/hexStrings'; +import { groupInfoActions } from '../state/ducks/groups'; type IncomingUserResult = { needsPush: boolean; @@ -125,7 +126,7 @@ async function mergeUserConfigsWithIncomingUpdates( const latestEnvelopeTimestamp = Math.max(...sameVariant.map(m => m.envelopeTimestamp)); window.log.debug( - `${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump}; mergedCount:${mergedCount} ` + `${variant}: needsPush:${needsPush} needsDump:${needsDump}; mergedCount:${mergedCount} ` ); if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { @@ -609,12 +610,77 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { } } +async function handleSingleGroupUpdate({ + groupInWrapper, + userEdKeypair, +}: { + groupInWrapper: UserGroupsGet; + latestEnvelopeTimestamp: number; + userEdKeypair: UserUtils.ByteKeyPair; +}) { + const groupPk = groupInWrapper.pubkeyHex; + try { + // dump is always empty when creating a new groupInfo + await MetaGroupWrapperActions.init(groupPk, { + metaDumped: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEdKeypair.privKeyBytes, 64), + groupEd25519Secretkey: groupInWrapper.secretKey, + groupEd25519Pubkey: toFixedUint8ArrayOfLength(HexString.fromHexString(groupPk.slice(2)), 32), + }); + } catch (e) { + window.log.warn( + `handleSingleGroupUpdate metawrapper init of "${groupPk}" failed with`, + e.message + ); + } + + if (!getConversationController().get(groupPk)) { + const created = await getConversationController().getOrCreateAndWait( + groupPk, + ConversationTypeEnum.GROUPV3 + ); + const joinedAt = groupInWrapper.joinedAtSeconds * 1000 || Date.now(); + created.set({ + active_at: joinedAt, + displayNameInProfile: groupInWrapper.name || undefined, + priority: groupInWrapper.priority, + lastJoinedTimestamp: joinedAt, + }); + await created.commit(); + getSwarmPollingInstance().addGroupId(PubKey.cast(groupPk)); + } +} + +async function handleSingleGroupUpdateToLeave(toLeave: string) { + // that group is not in the wrapper but in our local DB. it must be removed and cleaned + try { + window.log.debug( + `About to deleteGroup ${toLeave} via handleSingleGroupUpdateToLeave as in DB but not in wrapper` + ); + + await getConversationController().deleteClosedGroup(toLeave, { + fromSyncMessage: true, + sendLeaveMessage: false, + }); + } catch (e) { + window.log.info('Failed to deleteClosedGroup with: ', e.message); + } +} + +/** + * Called when we just got a userGroups merge from the network. We need to apply the changes to our local state. (i.e. DB and redux slice of 03 groups) + */ async function handleGroupUpdate(latestEnvelopeTimestamp: number) { // first let's check which groups needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB const allGoupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); + const allGoupsInDb = getConversationController() + .getConversations() + .filter(m => PubKey.isClosedGroupV2(m.id)); const allGoupsIdsInWrapper = allGoupsInWrapper.map(m => m.pubkeyHex); + const allGoupsIdsInDb = allGoupsInDb.map(m => m.id as string); console.warn('allGoupsIdsInWrapper', stringify(allGoupsIdsInWrapper)); + console.warn('allGoupsIdsInDb', stringify(allGoupsIdsInDb)); const userEdKeypair = await UserUtils.getUserED25519KeyPairBytes(); if (!userEdKeypair) { @@ -623,30 +689,19 @@ async function handleGroupUpdate(latestEnvelopeTimestamp: number) { for (let index = 0; index < allGoupsInWrapper.length; index++) { const groupInWrapper = allGoupsInWrapper[index]; - const groupPk = groupInWrapper.pubkeyHex; - if (!getConversationController().get(groupPk)) { - try { - // dump is always empty when creating a new groupInfo - await MetaGroupWrapperActions.init(groupPk, { - metaDumped: null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(userEdKeypair.privKeyBytes, 64), - groupEd25519Secretkey: groupInWrapper.secretKey, - groupEd25519Pubkey: toFixedUint8ArrayOfLength( - HexString.fromHexString(groupPk.slice(2)), - 32 - ), - }); - } catch (e) { - window.log.warn(`MetaGroupWrapperActions.init of "${groupPk}" failed with`, e.message); - } - const created = await getConversationController().getOrCreateAndWait( - groupPk, - ConversationTypeEnum.GROUPV3 - ); - created.set({ active_at: latestEnvelopeTimestamp }); - await created.commit(); - getSwarmPollingInstance().addGroupId(PubKey.cast(groupPk)); - } + window.inboxStore.dispatch(groupInfoActions.handleUserGroupUpdate(groupInWrapper)); + + await handleSingleGroupUpdate({ groupInWrapper, latestEnvelopeTimestamp, userEdKeypair }); + } + + const groupsInDbButNotInWrapper = difference(allGoupsIdsInDb, allGoupsIdsInWrapper); + window.log.info( + `we have to leave ${groupsInDbButNotInWrapper.length} 03 groups in DB compared to what is in the wrapper` + ); + + for (let index = 0; index < groupsInDbButNotInWrapper.length; index++) { + const toRemove = groupsInDbButNotInWrapper[index]; + await handleSingleGroupUpdateToLeave(toRemove); } } diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index a5212ecf1f..7a493fe22f 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -27,11 +27,7 @@ export async function doSnodeBatchRequest( associatedWith: string | null, method: 'batch' | 'sequence' = 'batch' ): Promise { - console.warn( - `doSnodeBatchRequest "${method}":`, - JSON.stringify(logSubRequests(subRequests)) - // subRequests - ); + window.log.debug(`doSnodeBatchRequest "${method}":`, JSON.stringify(logSubRequests(subRequests))); const result = await snodeRpc({ method, params: { requests: subRequests }, diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 4e4b48e753..96a1be92d8 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -320,7 +320,7 @@ export class SwarmPolling { await this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); return; } - if (PubKey.isClosedGroupV2(pubkey) && allGroupsInWrapper.some(m => m.pubkeyHex === pubkey)) { + if (PubKey.isClosedGroupV2(pubkey) && !allGroupsInWrapper.some(m => m.pubkeyHex === pubkey)) { // not tracked anymore in the wrapper. Discard messages and stop polling await this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); return; @@ -456,7 +456,13 @@ export class SwarmPolling { } private async notPollingForGroupAsNotInWrapper(pubkey: string, reason: string) { - this.removePubkey(pubkey, reason); + window.log.debug( + `notPollingForGroupAsNotInWrapper ${ed25519Str(pubkey)} with reason:"${reason}"` + ); + await getConversationController().deleteClosedGroup(pubkey, { + fromSyncMessage: true, + sendLeaveMessage: false, + }); return Promise.resolve(); } diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 2fd1cb3602..790bd70021 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -1,12 +1,11 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { stringify } from '../../../../types/sqlSharedTypes'; +import { groupInfoActions } from '../../../../state/ducks/groups'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { ed25519Str } from '../../../onions/onionPath'; import { fromBase64ToArray } from '../../../utils/String'; +import { LibSessionUtil } from '../../../utils/libsession/libsession_utils'; import { SnodeNamespaces } from '../namespaces'; import { RetrieveMessageItemWithNamespace } from '../types'; -import { groupInfoActions } from '../../../../state/ducks/groups'; -import { LibSessionUtil } from '../../../utils/libsession/libsession_utils'; async function handleGroupSharedConfigMessages( groupConfigMessagesMerged: Array, @@ -43,41 +42,17 @@ async function handleGroupSharedConfigMessages( groupMember: members, }; + // do the merge with our current state await MetaGroupWrapperActions.metaMerge(groupPk, toMerge); + // save updated dumps to the DB right away await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); - const updatedInfos = await MetaGroupWrapperActions.infoGet(groupPk); - const updatedMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); - console.info(`groupInfo after merge: ${stringify(updatedInfos)}`); - console.info(`groupMembers after merge: ${stringify(updatedMembers)}`); - if (!updatedInfos || !updatedMembers) { - throw new Error('updatedInfos or updatedMembers is null but we just created them'); - } - + // refresh the redux slice with the merged result window.inboxStore.dispatch( - groupInfoActions.updateGroupDetailsAfterMerge({ + groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk, - infos: updatedInfos, - members: updatedMembers, }) ); - - // if (allDecryptedConfigMessages.length) { - // try { - // window.log.info( - // `handleGroupSharedConfigMessages of "${allDecryptedConfigMessages.length}" messages with libsession` - // ); - // console.warn('HANDLING OF INCOMING GROUP TODO '); - // // await ConfigMessageHandler.handleUserConfigMessagesViaLibSession( - // // allDecryptedConfigMessages - // // ); - // } catch (e) { - // const allMessageHases = allDecryptedConfigMessages.map(m => m.messageHash).join(','); - // window.log.warn( - // `failed to handle group messages hashes "${allMessageHases}" with libsession. Error: "${e.message}"` - // ); - // } - // } } catch (e) { window.log.warn( `handleGroupSharedConfigMessages of ${groupConfigMessagesMerged.length} failed with ${e.message}` diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 4e4b1bdfdc..1d91c56cb3 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -19,6 +19,7 @@ import { getMessageQueue } from '..'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/conversationAttributes'; import { removeAllClosedGroupEncryptionKeyPairs } from '../../receiver/closedGroups'; +import { groupInfoActions } from '../../state/ducks/groups'; import { getCurrentlySelectedConversationOutsideRedux } from '../../state/selectors/conversations'; import { assertUnreachable } from '../../types/sqlSharedTypes'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; @@ -27,6 +28,7 @@ import { getSwarmPollingInstance } from '../apis/snode_api'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage'; +import { ed25519Str } from '../onions/onionPath'; import { UserUtils } from '../utils'; import { ConfigurationSync } from '../utils/job_runners/jobs/ConfigurationSyncJob'; import { LibSessionUtil } from '../utils/libsession/libsession_utils'; @@ -532,12 +534,13 @@ async function removeLegacyGroupFromWrappers(groupId: string) { await removeAllClosedGroupEncryptionKeyPairs(groupId); } -async function remove03GroupFromWrappers(groupId: GroupPubkeyType) { - getSwarmPollingInstance().removePubkey(groupId, 'remove03GroupFromWrappers'); +async function remove03GroupFromWrappers(groupPk: GroupPubkeyType) { + getSwarmPollingInstance().removePubkey(groupPk, 'remove03GroupFromWrappers'); - await UserGroupsWrapperActions.eraseGroup(groupId); - await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupId); - window.log.warn('remove 03 from metagroup wrapper'); + await UserGroupsWrapperActions.eraseGroup(groupPk); + await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupPk); + window?.inboxStore?.dispatch(groupInfoActions.destroyGroupDetails({ groupPk })); + window.log.info(`removed 03 from metagroup wrapper ${ed25519Str(groupPk)}`); } async function removeCommunityFromWrappers(conversationId: string) { diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index 0a46c480f4..db2ee0165a 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -1,4 +1,4 @@ -import _, { concat } from 'lodash'; +import _ from 'lodash'; import { ClosedGroup, getMessageQueue } from '..'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { addKeyPairToCacheAndDBIfNeeded } from '../../receiver/closedGroups'; @@ -16,27 +16,13 @@ import { PubKey } from '../types'; import { UserUtils } from '../utils'; import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils'; import { getConversationController } from './ConversationController'; -import { groupInfoActions } from '../../state/ducks/groups'; /** * Creates a brand new closed group from user supplied details. This function generates a new identityKeyPair so cannot be used to restore a closed group. * @param groupName the name of this closed group * @param members the initial members of this closed group - * @param isV3 if this closed group is a v3 closed group or not (has a 03 prefix in the identity keypair) */ -export async function createClosedGroup(groupName: string, members: Array, isV3: boolean) { - if (isV3) { - const us = UserUtils.getOurPubKeyStrFromCache(); - - // we need to send a group info and encryption keys message to the batch endpoint with both seqno being 0 - console.error('isV3 send invite to group TODO'); // FIXME - // FIXME we should save the key to the wrapper right away? or even to the DB idk - window.inboxStore.dispatch( - groupInfoActions.initNewGroupInWrapper({ members: concat(members, [us]), groupName, us }) - ); - return; - } - +export async function createClosedGroup(groupName: string, members: Array) { // this is all legacy group logic. // TODO: To be removed @@ -64,8 +50,6 @@ export async function createClosedGroup(groupName: string, members: Array { + // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc + await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); + + const singleDestChanges = await LibSessionUtil.pendingChangesForGroup(groupPk); + + // If there are no pending changes then the job can just complete (next time something + // is updated we want to try and run immediately so don't scuedule another run in this case) + if (isEmpty(singleDestChanges?.messages)) { + return RunJobResult.Success; + } + const oldHashesToDelete = new Set(singleDestChanges.allOldHashes); + + const msgs: Array = singleDestChanges.messages.map(item => { + return { + namespace: item.namespace, + pubkey: groupPk, + networkTimestamp: GetNetworkTime.getNowWithNetworkOffset(), + ttl: TTL_DEFAULT.TTL_CONFIG, + data: item.data, + }; + }); + + const result = await MessageSender.sendEncryptedDataToSnode(msgs, groupPk, oldHashesToDelete); + + const expectedReplyLength = singleDestChanges.messages.length + (oldHashesToDelete.size ? 1 : 0); + // we do a sequence call here. If we do not have the right expected number of results, consider it a failure + if (!isArray(result) || result.length !== expectedReplyLength) { + window.log.info( + `GroupSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` + ); + // this might be a 421 error (already handled) so let's retry this request a little bit later + return RunJobResult.RetryJobIfPossible; + } + + const changes = resultsToSuccessfulChange(result, singleDestChanges); + if (isEmpty(changes)) { + return RunJobResult.RetryJobIfPossible; + } + // Now that we have the successful changes, we need to mark them as pushed and + // generate any config dumps which need to be stored + + await buildAndSaveDumpsToDB(changes, groupPk); + return RunJobResult.Success; +} + class GroupSyncJob extends PersistedJob { constructor({ identifier, // this has to be the pubkey to which we @@ -162,59 +203,8 @@ class GroupSyncJob extends PersistedJob { return RunJobResult.PermanentFailure; } - // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc - await LibSessionUtil.saveMetaGroupDumpToDb(thisJobDestination); - const newGroupsReleased = await ReleasedFeatures.checkIsNewGroupsReleased(); - - // if the feature flag is not enabled, we want to keep updating the dumps, but just not sync them. - if (!newGroupsReleased) { - return RunJobResult.Success; - } - const singleDestChanges = await LibSessionUtil.pendingChangesForGroup(thisJobDestination); - - // If there are no pending changes then the job can just complete (next time something - // is updated we want to try and run immediately so don't scuedule another run in this case) - if (isEmpty(singleDestChanges?.messages)) { - return RunJobResult.Success; - } - const oldHashesToDelete = new Set(singleDestChanges.allOldHashes); - - const msgs: Array = singleDestChanges.messages.map(item => { - return { - namespace: item.namespace, - pubkey: thisJobDestination, - networkTimestamp: GetNetworkTime.getNowWithNetworkOffset(), - ttl: TTL_DEFAULT.TTL_CONFIG, - data: item.data, - }; - }); - - const result = await MessageSender.sendEncryptedDataToSnode( - msgs, - thisJobDestination, - oldHashesToDelete - ); - - const expectedReplyLength = - singleDestChanges.messages.length + (oldHashesToDelete.size ? 1 : 0); - // we do a sequence call here. If we do not have the right expected number of results, consider it a failure - if (!isArray(result) || result.length !== expectedReplyLength) { - window.log.info( - `GroupSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` - ); - // this might be a 421 error (already handled) so let's retry this request a little bit later - return RunJobResult.RetryJobIfPossible; - } - - const changes = resultsToSuccessfulChange(result, singleDestChanges); - if (isEmpty(changes)) { - return RunJobResult.RetryJobIfPossible; - } - // Now that we have the successful changes, we need to mark them as pushed and - // generate any config dumps which need to be stored + return await pushChangesToGroupSwarmIfNeeded(thisJobDestination); - await buildAndSaveDumpsToDB(changes, thisJobDestination); - return RunJobResult.Success; // eslint-disable-next-line no-useless-catch } catch (e) { throw e; @@ -289,6 +279,7 @@ async function queueNewJobIfNeeded(groupPk: GroupPubkeyType) { export const GroupSync = { GroupSyncJob, + pushChangesToGroupSwarmIfNeeded, queueNewJobIfNeeded: (groupPk: GroupPubkeyType) => allowOnlyOneAtATime(`GroupSyncJob-oneAtAtTime-${groupPk}`, () => queueNewJobIfNeeded(groupPk)), }; diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 366ae2331c..9c4b7406fb 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -6,25 +6,17 @@ import { compact, difference, omit } from 'lodash'; import Long from 'long'; import { UserUtils } from '..'; import { ConfigDumpData } from '../../../data/configDump/configDump'; -import { HexString } from '../../../node/hexStrings'; import { SignalService } from '../../../protobuf'; import { UserConfigKind } from '../../../types/ProtobufKind'; -import { - ConfigDumpRow, - assertUnreachable, - toFixedUint8ArrayOfLength, -} from '../../../types/sqlSharedTypes'; +import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { ConfigWrapperGroupDetailed, ConfigWrapperUser, - getGroupPubkeyFromWrapperType, - isMetaWrapperType, isUserConfigWrapperType, } from '../../../webworker/workers/browser/libsession_worker_functions'; import { GenericWrapperActions, MetaGroupWrapperActions, - UserGroupsWrapperActions, } from '../../../webworker/workers/browser/libsession_worker_interface'; import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../apis/snode_api/namespaces'; @@ -34,7 +26,6 @@ import { } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; import { ed25519Str } from '../../onions/onionPath'; import { PubKey } from '../../types'; -import { getUserED25519KeyPairBytes } from '../User'; import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob'; const requiredUserVariants: Array = [ @@ -114,61 +105,7 @@ async function initializeLibSessionUtilWrappers() { ); } - await loadMetaGroupWrappers(dumps); -} - -async function loadMetaGroupWrappers(dumps: Array) { - const ed25519KeyPairBytes = await getUserED25519KeyPairBytes(); - if (!ed25519KeyPairBytes?.privKeyBytes) { - throw new Error('user has no ed25519KeyPairBytes.'); - } - // load the dumps retrieved from the database into their corresponding wrappers - for (let index = 0; index < dumps.length; index++) { - const dump = dumps[index]; - const { variant } = dump; - if (!isMetaWrapperType(variant)) { - continue; - } - const groupPk = getGroupPubkeyFromWrapperType(variant); - const groupPkNoPrefix = groupPk.substring(2); - const groupEd25519Pubkey = HexString.fromHexString(groupPkNoPrefix); - - try { - const foundInUserGroups = await UserGroupsWrapperActions.getGroup(groupPk); - - // remove it right away, and skip it entirely - if (!foundInUserGroups) { - try { - window.log.info( - 'metaGroup not found in userGroups. Deleting the corresponding dumps:', - groupPk - ); - - await ConfigDumpData.deleteDumpFor(groupPk); - } catch (e) { - window.log.warn('deleteDumpFor failed with ', e.message); - } - // await UserGroupsWrapperActions.eraseGroup(groupPk); - continue; - } - - window.log.debug('initializeLibSessionUtilWrappers initing from metagroup dump', variant); - // TODO we need to fetch the admin key here if we have it, maybe from the usergroup wrapper? - await MetaGroupWrapperActions.init(groupPk, { - groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd25519Pubkey, 32), - groupEd25519Secretkey: foundInUserGroups?.secretKey || null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(ed25519KeyPairBytes.privKeyBytes, 64), - metaDumped: dump.data, - }); - - // Annoyingly, the redux store is not initialized when this current funciton is called, - // so we need to init the group wrappers here, but load them in their redux slice later - } catch (e) { - // TODO should not throw in this case? we should probably just try to load what we manage to load - window.log.warn(`initGroup of Group wrapper of variant ${variant} failed with ${e.message} `); - // throw new Error(`initializeLibSessionUtilWrappers failed with ${e.message}`); - } - } + // No need to load the meta group wrapper here. We will load them once the SessionInbox is loaded with a redux action } async function pendingChangesForUs(): Promise< @@ -304,7 +241,6 @@ async function pendingChangesForGroup( const infoHashes = compact(groupInfo?.hashes) || []; const allOldHashes = new Set([...infoHashes, ...memberHashes]); - console.error('compactedHashes', [...allOldHashes]); return { messages: results, allOldHashes }; } @@ -361,9 +297,9 @@ async function saveMetaGroupDumpToDb(groupPk: GroupPubkeyType) { publicKey: groupPk, variant: `MetaGroupConfig-${groupPk}`, }); - window.log.debug(`Saved dumps for metagroup ${groupPk}`); + window.log.debug(`Saved dumps for metagroup ${ed25519Str(groupPk)}`); } else { - window.log.debug(`meta did not dumps saving for metagroup ${groupPk}`); + window.log.debug(`No need to update local dumps for metagroup ${ed25519Str(groupPk)}`); } } diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index e80e110fb2..0924ce6928 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -1,14 +1,21 @@ /* eslint-disable no-await-in-loop */ -import { PayloadAction, createAsyncThunk, createSlice } from '@reduxjs/toolkit'; -import { GroupInfoGet, GroupMemberGet, GroupPubkeyType } from 'libsession_util_nodejs'; +import { createAsyncThunk, createSlice } from '@reduxjs/toolkit'; +import { + GroupInfoGet, + GroupMemberGet, + GroupPubkeyType, + UserGroupsGet, +} from 'libsession_util_nodejs'; import { isEmpty, uniq } from 'lodash'; import { ConfigDumpData } from '../../data/configDump/configDump'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { getConversationController } from '../../session/conversations'; import { UserUtils } from '../../session/utils'; +import { getUserED25519KeyPairBytes } from '../../session/utils/User'; +import { PreConditionFailed } from '../../session/utils/errors'; import { GroupSync } from '../../session/utils/job_runners/jobs/GroupConfigJob'; -import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; +import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { getGroupPubkeyFromWrapperType, isMetaWrapperType, @@ -17,16 +24,22 @@ import { MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; -import { PreConditionFailed } from '../../session/utils/errors'; +import { getSwarmPollingInstance } from '../../session/apis/snode_api'; +import { StateType } from '../reducer'; +import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; +import { resetOverlayMode } from './section'; +import { openConversationWithMessages } from './conversations'; export type GroupState = { infos: Record; members: Record>; + creationFromUIPending: boolean; }; export const initialGroupState: GroupState = { infos: {}, members: {}, + creationFromUIPending: false, }; type GroupDetailsUpdate = { @@ -35,17 +48,25 @@ type GroupDetailsUpdate = { members: Array; }; +/** + * Create a brand new group with a 03 prefix. + * To be called only when our current logged in user, through the UI, creates a brand new closed group given a name and a list of members. + * + */ const initNewGroupInWrapper = createAsyncThunk( 'group/initNewGroupInWrapper', - async ({ - groupName, - members, - us, - }: { - groupName: string; - members: Array; - us: string; - }): Promise => { + async ( + { + groupName, + members, + us, + }: { + groupName: string; + members: Array; + us: string; + }, + { dispatch } + ): Promise => { if (!members.includes(us)) { throw new PreConditionFailed('initNewGroupInWrapper needs us to be a member'); } @@ -54,8 +75,8 @@ const initNewGroupInWrapper = createAsyncThunk( const groupPk = newGroup.pubkeyHex; newGroup.name = groupName; // this will be used by the linked devices until they fetch the info from the groups swarm + // the `GroupSync` below will need the secretKey of the group to be saved in the wrapper. So save it! await UserGroupsWrapperActions.setGroup(newGroup); - const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); if (!ourEd25519KeypairBytes) { throw new Error('Current user has no priv ed25519 key?'); @@ -100,70 +121,135 @@ const initNewGroupInWrapper = createAsyncThunk( await convo.setIsApproved(true, false); - // console.warn('store the v3 identityPrivatekeypair as part of the wrapper only?'); - // // the sync below will need the secretKey of the group to be saved in the wrapper. So save it! - await UserGroupsWrapperActions.setGroup(newGroup); - - await GroupSync.queueNewJobIfNeeded(groupPk); - - // const updateGroupDetails: ClosedGroup.GroupInfo = { - // id: newGroup.pubkeyHex, - // name: groupDetails.groupName, - // members, - // admins: [us], - // activeAt: Date.now(), - // expireTimer: 0, - // }; + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); + if (result !== RunJobResult.Success) { + window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); + } - // // be sure to call this before sending the message. - // // the sending pipeline needs to know from GroupUtils when a message is for a medium group - // await ClosedGroup.updateOrCreateClosedGroup(updateGroupDetails); await convo.unhideIfNeeded(); convo.set({ active_at: Date.now() }); await convo.commit(); convo.updateLastMessage(); + dispatch(resetOverlayMode()); + await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); return { groupPk: newGroup.pubkeyHex, infos, members: membersFromWrapper }; } ); -const loadDumpsFromDB = createAsyncThunk( - 'group/loadDumpsFromDB', +/** + * Create a brand new group with a 03 prefix. + * To be called only when our current logged in user, through the UI, creates a brand new closed group given a name and a list of members. + * + */ +const handleUserGroupUpdate = createAsyncThunk( + 'group/handleUserGroupUpdate', + async (userGroup: UserGroupsGet, payloadCreator): Promise => { + // if we already have a state for that group here, it means that group was already init, and the data should come from the groupInfos after. + const state = payloadCreator.getState() as StateType; + const groupPk = userGroup.pubkeyHex; + if (state.groups.infos[groupPk] && state.groups.members[groupPk]) { + throw new Error('handleUserGroupUpdate group already present in redux slice'); + } + + const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); + if (!ourEd25519KeypairBytes) { + throw new Error('Current user has no priv ed25519 key?'); + } + const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes; + const groupEd2519Pk = HexString.fromHexString(groupPk).slice(1); // remove the 03 prefix (single byte once in hex form) + + // dump is always empty when creating a new groupInfo + try { + await MetaGroupWrapperActions.init(groupPk, { + metaDumped: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), + groupEd25519Secretkey: userGroup.secretKey, + groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), + }); + } catch (e) { + window.log.warn(`failed to init metawrapper ${groupPk}`); + } + + const convo = await getConversationController().getOrCreateAndWait( + groupPk, + ConversationTypeEnum.GROUPV3 + ); + + await convo.setIsApproved(true, false); + + await convo.setPriorityFromWrapper(userGroup.priority, false); + convo.set({ + active_at: Date.now(), + displayNameInProfile: userGroup.name || undefined, + }); + await convo.commit(); + + return { + groupPk, + infos: await MetaGroupWrapperActions.infoGet(groupPk), + members: await MetaGroupWrapperActions.memberGetAll(groupPk), + }; + } +); + +/** + * Called only when the app just loaded the SessionInbox (i.e. user logged in and fully loaded). + * This function populates the slice with any meta-dumps we have in the DB, if they also are part of what is the usergroup wrapper tracking. + * + */ +const loadMetaDumpsFromDB = createAsyncThunk( + 'group/loadMetaDumpsFromDB', async (): Promise> => { - const variantsWithoutData = await ConfigDumpData.getAllDumpsWithoutData(); + const ed25519KeyPairBytes = await getUserED25519KeyPairBytes(); + if (!ed25519KeyPairBytes?.privKeyBytes) { + throw new Error('user has no ed25519KeyPairBytes.'); + } + + const variantsWithData = await ConfigDumpData.getAllDumpsWithData(); const allUserGroups = await UserGroupsWrapperActions.getAllGroups(); const toReturn: Array = []; - for (let index = 0; index < variantsWithoutData.length; index++) { - const { variant } = variantsWithoutData[index]; + for (let index = 0; index < variantsWithData.length; index++) { + const { variant, data } = variantsWithData[index]; if (!isMetaWrapperType(variant)) { continue; } const groupPk = getGroupPubkeyFromWrapperType(variant); + const groupEd25519Pubkey = HexString.fromHexString(groupPk.substring(2)); const foundInUserWrapper = allUserGroups.find(m => m.pubkeyHex === groupPk); if (!foundInUserWrapper) { + try { + window.log.info( + 'metaGroup not found in userGroups. Deleting the corresponding dumps:', + groupPk + ); + + await ConfigDumpData.deleteDumpFor(groupPk); + } catch (e) { + window.log.warn(`ConfigDumpData.deleteDumpFor for ${groupPk} failed with `, e.message); + } continue; } try { - window.log.debug( - 'loadDumpsFromDB loading from metagroup variant: ', - variant, - foundInUserWrapper.pubkeyHex - ); + window.log.debug('loadMetaDumpsFromDB initing from metagroup dump', variant); + + await MetaGroupWrapperActions.init(groupPk, { + groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd25519Pubkey, 32), + groupEd25519Secretkey: foundInUserWrapper?.secretKey || null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(ed25519KeyPairBytes.privKeyBytes, 64), + metaDumped: data, + }); const infos = await MetaGroupWrapperActions.infoGet(groupPk); const members = await MetaGroupWrapperActions.memberGetAll(groupPk); toReturn.push({ groupPk, infos, members }); - - // Annoyingly, the redux store is not initialized when this current funciton is called, - // so we need to init the group wrappers here, but load them in their redux slice later } catch (e) { - // TODO should not throw in this case? we should probably just try to load what we manage to load - window.log.warn( + // Note: Don't retrow here, we want to load everything we can + window.log.error( `initGroup of Group wrapper of variant ${variant} failed with ${e.message} ` ); - // throw new Error(`initializeLibSessionUtilWrappers failed with ${e.message}`); } } @@ -171,45 +257,141 @@ const loadDumpsFromDB = createAsyncThunk( } ); +/** + * This action is to be called when we get a merge event from the network. + * It refreshes the state of that particular group (info & members) with the state from the wrapper after the merge is done. + * + */ +const refreshGroupDetailsFromWrapper = createAsyncThunk( + 'group/refreshGroupDetailsFromWrapper', + async ({ + groupPk, + }: { + groupPk: GroupPubkeyType; + }): Promise< + GroupDetailsUpdate | ({ groupPk: GroupPubkeyType } & Partial) + > => { + try { + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + const members = await MetaGroupWrapperActions.memberGetAll(groupPk); + + return { groupPk, infos, members }; + } catch (e) { + window.log.warn('refreshGroupDetailsFromWrapper failed with ', e.message); + return { groupPk }; + } + } +); + +const destroyGroupDetails = createAsyncThunk( + 'group/destroyGroupDetails', + async ({ groupPk }: { groupPk: GroupPubkeyType }) => { + try { + await UserGroupsWrapperActions.eraseGroup(groupPk); + await ConfigDumpData.deleteDumpFor(groupPk); + await MetaGroupWrapperActions.infoDestroy(groupPk); + getSwarmPollingInstance().removePubkey(groupPk, 'destroyGroupDetails'); + } catch (e) { + window.log.warn(`destroyGroupDetails for ${groupPk} failed with ${e.message}`); + } + return { groupPk }; + } +); + /** * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. */ const groupSlice = createSlice({ name: 'group', initialState: initialGroupState, - reducers: { - updateGroupDetailsAfterMerge(state, action: PayloadAction) { - const { groupPk, infos, members } = action.payload; - state.infos[groupPk] = infos; - state.members[groupPk] = members; - }, - }, + reducers: {}, extraReducers: builder => { builder.addCase(initNewGroupInWrapper.fulfilled, (state, action) => { const { groupPk, infos, members } = action.payload; state.infos[groupPk] = infos; state.members[groupPk] = members; + state.creationFromUIPending = false; }); - builder.addCase(initNewGroupInWrapper.rejected, () => { + builder.addCase(initNewGroupInWrapper.rejected, state => { window.log.error('a initNewGroupInWrapper was rejected'); - // FIXME delete the wrapper completely & correspondign dumps, and usergroups entry? + state.creationFromUIPending = false; + throw new Error('initNewGroupInWrapper.rejected'); + + // FIXME delete the wrapper completely & corresponding dumps, and usergroups entry? + }); + builder.addCase(initNewGroupInWrapper.pending, (state, _action) => { + state.creationFromUIPending = true; + + window.log.error('a initNewGroupInWrapper is pending'); }); - builder.addCase(loadDumpsFromDB.fulfilled, (state, action) => { + builder.addCase(loadMetaDumpsFromDB.fulfilled, (state, action) => { const loaded = action.payload; loaded.forEach(element => { state.infos[element.groupPk] = element.infos; state.members[element.groupPk] = element.members; }); }); - builder.addCase(loadDumpsFromDB.rejected, () => { - window.log.error('a loadDumpsFromDB was rejected'); + builder.addCase(loadMetaDumpsFromDB.rejected, () => { + window.log.error('a loadMetaDumpsFromDB was rejected'); + }); + builder.addCase(refreshGroupDetailsFromWrapper.fulfilled, (state, action) => { + const { infos, members, groupPk } = action.payload; + if (infos && members) { + state.infos[groupPk] = infos; + state.members[groupPk] = members; + + window.log.debug(`groupInfo after merge: ${stringify(infos)}`); + window.log.debug(`groupMembers after merge: ${stringify(members)}`); + } else { + window.log.debug( + `refreshGroupDetailsFromWrapper no details found, removing from slice: ${groupPk}}` + ); + + delete state.infos[groupPk]; + delete state.members[groupPk]; + } + }); + builder.addCase(refreshGroupDetailsFromWrapper.rejected, () => { + window.log.error('a refreshGroupDetailsFromWrapper was rejected'); + }); + builder.addCase(destroyGroupDetails.fulfilled, (state, action) => { + const { groupPk } = action.payload; + // FIXME destroyGroupDetails marks the info as destroyed, but does not really remove the wrapper currently + delete state.infos[groupPk]; + delete state.members[groupPk]; + }); + builder.addCase(destroyGroupDetails.rejected, () => { + window.log.error('a destroyGroupDetails was rejected'); + }); + builder.addCase(handleUserGroupUpdate.fulfilled, (state, action) => { + const { infos, members, groupPk } = action.payload; + if (infos && members) { + state.infos[groupPk] = infos; + state.members[groupPk] = members; + + window.log.debug(`groupInfo after handleUserGroupUpdate: ${stringify(infos)}`); + window.log.debug(`groupMembers after handleUserGroupUpdate: ${stringify(members)}`); + } else { + window.log.debug( + `handleUserGroupUpdate no details found, removing from slice: ${groupPk}}` + ); + + delete state.infos[groupPk]; + delete state.members[groupPk]; + } + }); + builder.addCase(handleUserGroupUpdate.rejected, () => { + window.log.error('a handleUserGroupUpdate was rejected'); }); }, }); export const groupInfoActions = { initNewGroupInWrapper, - loadDumpsFromDB, + loadMetaDumpsFromDB, + destroyGroupDetails, + refreshGroupDetailsFromWrapper, + handleUserGroupUpdate, ...groupSlice.actions, }; export const groupReducer = groupSlice.reducer; diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index 154f2b008b..11e6d13f82 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -23,6 +23,10 @@ export function getLibMembersPubkeys(state: StateType, convo?: string): Array m.pubkeyHex); } +function getIsCreatingGroupFromUI(state: StateType): boolean { + return getLibGroupsState(state).creationFromUIPending; +} + export function getLibAdminsPubkeys(state: StateType, convo?: string): Array { if (!convo) { return []; @@ -81,3 +85,7 @@ export function getLibGroupAdminsOutsideRedux(convoId: string): Array { const state = window.inboxStore?.getState(); return state ? getLibAdminsPubkeys(state, convoId) : []; } + +export function useIsCreatingGroupFromUIPending() { + return useSelector(getIsCreatingGroupFromUI); +} diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 1f4358328a..3b87dfa355 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -279,8 +279,8 @@ export function toFixedUint8ArrayOfLength( length: T ): FixedSizeUint8Array { if (data.length === length) { -return data as any as FixedSizeUint8Array; -} + return data as any as FixedSizeUint8Array; + } throw new Error( `toFixedUint8ArrayOfLength invalid. Expected length ${length} but got: ${data.length}` ); diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts index 332866249f..76f2e972d3 100644 --- a/ts/util/releaseFeature.ts +++ b/ts/util/releaseFeature.ts @@ -101,17 +101,11 @@ async function checkIsUserConfigFeatureReleased() { return checkIsFeatureReleased('user_config_libsession'); } -// TODO AUDRIC maybe we want this, maybe we don't? -async function checkIsNewGroupsReleased() { - return true; -} - function isUserConfigFeatureReleasedCached(): boolean { return !!isUserConfigLibsessionFeatureReleased; } export const ReleasedFeatures = { checkIsUserConfigFeatureReleased, - checkIsNewGroupsReleased, isUserConfigFeatureReleasedCached, }; diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index 206ea5c066..59f2cdda97 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -178,7 +178,8 @@ function initGroupWrapper(options: Array, wrapperType: ConfigWrapperGroup) const wrapper = getGroupWrapper(wrapperType); if (wrapper) { - throw new Error(`group: "${wrapperType}" already init`); + // console.warn(`group: "${wrapperType}" already init`); + return; } if (options.length !== 1) { diff --git a/ts/window.d.ts b/ts/window.d.ts index 2e5da8494f..6ccc54c192 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -33,7 +33,7 @@ declare global { sessionFeatureFlags: { useOnionRequests: boolean; useTestNet: boolean; - useClosedGroupV3: boolean; + useClosedGroupV2: boolean; integrationTestEnv: boolean; debug: { debugLogging: boolean; From e220aeea91c7841f1a11b1dc40ac1ffd08fd3cd2 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 21 Sep 2023 15:39:00 +1000 Subject: [PATCH 020/302] feat: add working encrypt/decrypt for 03 group with libsession --- ts/receiver/configMessage.ts | 4 +- ts/receiver/contentMessage.ts | 22 +++++--- ts/session/crypto/MessageEncrypter.ts | 2 +- ts/session/types/PubKey.ts | 52 ------------------- ....ts => libsession_wrapper_user_profile.ts} | 0 .../browser/libsession_worker_interface.ts | 11 ++-- 6 files changed, 23 insertions(+), 68 deletions(-) rename ts/test/session/unit/libsession_wrapper/{libsession_wrapper_test.ts => libsession_wrapper_user_profile.ts} (100%) diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index a992c77e1f..709390bbca 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -679,8 +679,8 @@ async function handleGroupUpdate(latestEnvelopeTimestamp: number) { const allGoupsIdsInWrapper = allGoupsInWrapper.map(m => m.pubkeyHex); const allGoupsIdsInDb = allGoupsInDb.map(m => m.id as string); - console.warn('allGoupsIdsInWrapper', stringify(allGoupsIdsInWrapper)); - console.warn('allGoupsIdsInDb', stringify(allGoupsIdsInDb)); + window.log.debug('allGoupsIdsInWrapper', stringify(allGoupsIdsInWrapper)); + window.log.debug('allGoupsIdsInDb', stringify(allGoupsIdsInDb)); const userEdKeypair = await UserUtils.getUserED25519KeyPairBytes(); if (!userEdKeypair) { diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index f25e3b1512..a0daf1c071 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -60,16 +60,26 @@ export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageH async function decryptForGroupV2(envelope: EnvelopePlus) { window?.log?.info('received closed group message v2'); - const groupPk = envelope.source; - if (!PubKey.isClosedGroupV2(groupPk)) { - throw new PreConditionFailed('decryptForGroupV2: not a 03 prefixed group'); - } + try { + const groupPk = envelope.source; + if (!PubKey.isClosedGroupV2(groupPk)) { + throw new PreConditionFailed('decryptForGroupV2: not a 03 prefixed group'); + } - return MetaGroupWrapperActions.decryptMessage(groupPk, envelope.content); + const decrypted = await MetaGroupWrapperActions.decryptMessage(groupPk, envelope.content); + + // the receiving pipeline relies on the envelope.senderIdentity field to know who is the author of a message + // eslint-disable-next-line no-param-reassign + envelope.senderIdentity = decrypted.pubkeyHex; + + return decrypted.plaintext; + } catch (e) { + window.log.warn('failed to decrypt message with error: ', e.message); + return null; + } } async function decryptForClosedGroup(envelope: EnvelopePlus) { - // case .closedGroupCiphertext: for ios window?.log?.info('received closed group message'); try { const hexEncodedGroupPublicKey = envelope.source; diff --git a/ts/session/crypto/MessageEncrypter.ts b/ts/session/crypto/MessageEncrypter.ts index 29d09804e4..b491c31ea4 100644 --- a/ts/session/crypto/MessageEncrypter.ts +++ b/ts/session/crypto/MessageEncrypter.ts @@ -19,7 +19,7 @@ type EncryptResult = { async function encryptWithLibSession(destination: GroupPubkeyType, plainText: Uint8Array) { try { - return MetaGroupWrapperActions.encryptMessage(destination, plainText, true); + return MetaGroupWrapperActions.encryptMessage(destination, plainText); } catch (e) { window.log.warn('encrypt message for group failed with', e.message); throw new SigningFailed(e.message); diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index 2ad1912a95..f473fcadee 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -26,58 +26,6 @@ export enum KeyPrefixType { groupV3 = '03', } -// export type GroupV2PubKey = { -// key: GroupPubkeyType; // 03 prefix for groups v2 -// isGroupV2: true; -// isLegacyGroup: false; -// isPrivate: false; -// isUS: false; -// isBlinded: false; -// }; - -// export type PrivatePubkey = { -// key: PubkeyType; // 05 prefix for private conversations -// isGroupV2: false; -// isLegacyGroup: false; -// isPrivate: true; -// isUS: false; -// isBlinded: false; -// }; - -// export type UsPubkey = { -// key: PubkeyType; // 05 prefix for note to self -// isGroupV2: false; -// isLegacyGroup: false; -// isPrivate: false; -// isUS: true; -// isBlinded: false; -// }; - -// export type PrivateBlindedPubkey = { -// key: BlindedPubkeyType; // 15 prefix for blinded pubkeys -// isGroupV2: false; -// isLegacyGroup: false; -// isPrivate: true; -// isUS: false; -// isBlinded: true; -// }; - -// export type LegacyGroupPubkey = { -// key: PubkeyType; // 05 prefix for legacy closed group -// isGroupV2: false; -// isLegacyGroup: true; -// isPrivate: false; -// isUS: false; -// isBlinded: false; -// }; - -// export type PubKeyRecord = -// | UsPubkey -// | PrivatePubkey -// | GroupV2PubKey -// | LegacyGroupPubkey -// | PrivateBlindedPubkey; - // TODO make that Pubkey class more useful, add fields for what types of pubkey it is (group, legacy group, private) export class PubKey { diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile.ts similarity index 100% rename from ts/test/session/unit/libsession_wrapper/libsession_wrapper_test.ts rename to ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile.ts diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 096eeb7d2d..0215fe6e03 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -510,13 +510,10 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { data, timestampMs, ]) as Promise>, - encryptMessage: async (groupPk: GroupPubkeyType, plaintext: Uint8Array, compress: boolean) => - callLibSessionWorker([ - `MetaGroupConfig-${groupPk}`, - 'encryptMessage', - plaintext, - compress, - ]) as Promise>, + encryptMessage: async (groupPk: GroupPubkeyType, plaintext: Uint8Array) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'encryptMessage', plaintext]) as Promise< + ReturnType + >, decryptMessage: async (groupPk: GroupPubkeyType, ciphertext: Uint8Array) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'decryptMessage', ciphertext]) as Promise< ReturnType From 1dc5224c263c3c14ce76a8694fccf15d3f299033 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 21 Sep 2023 16:50:07 +1000 Subject: [PATCH 021/302] test: added unit tests for pubkeys constructor checks --- ts/session/types/PubKey.ts | 6 +- ts/test/session/unit/types/PubKey_test.ts | 73 +++++++++++++++++++++++ 2 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 ts/test/session/unit/types/PubKey_test.ts diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index f473fcadee..2e90121e29 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -46,14 +46,10 @@ export class PubKey { /** * If you want to update this regex. Be sure that those are matches ; * __textsecure_group__!05010203040506070809a0b0c0d0e0f0ff010203040506070809a0b0c0d0e0f0ff - * __textsecure_group__!010203040506070809a0b0c0d0e0f0ff010203040506070809a0b0c0d0e0f0ff * __textsecure_group__!05010203040506070809a0b0c0d0e0f0ff - * __textsecure_group__!010203040506070809a0b0c0d0e0f0ff * 05010203040506070809a0b0c0d0e0f0ff010203040506070809a0b0c0d0e0f0ff * 03010203040506070809a0b0c0d0e0f0ff010203040506070809a0b0c0d0e0f0ff - * 010203040506070809a0b0c0d0e0f0ff010203040506070809a0B0c0d0e0f0FF * 05010203040506070809a0b0c0d0e0f0ff - * 010203040506070809a0b0c0d0e0f0ff * 030203040506070809a0b0c0d0e0f0ff */ @@ -67,7 +63,7 @@ export class PubKey { */ constructor(pubkeyString: string) { if (!PubKey.validate(pubkeyString)) { - throw new Error(`Invalid pubkey string passed: ${pubkeyString}`); + throw new Error('Invalid pubkey string passed'); } this.key = pubkeyString.toLowerCase(); } diff --git a/ts/test/session/unit/types/PubKey_test.ts b/ts/test/session/unit/types/PubKey_test.ts new file mode 100644 index 0000000000..ead911b60c --- /dev/null +++ b/ts/test/session/unit/types/PubKey_test.ts @@ -0,0 +1,73 @@ +import { expect } from 'chai'; +import { PubKey } from '../../../../session/types'; + +const defaultErr = 'Invalid pubkey string passed'; + +describe('PubKey constructor', () => { + it('does not throw with 05 prefix, right length and only hex chars', () => { + expect(() => new PubKey(`05${'0'.repeat(64)}`)).to.not.throw(); + }); + + it('does not throw with 15 prefix, right length and only hex chars', () => { + expect(() => new PubKey(`15${'0'.repeat(64)}`)).to.not.throw(); + }); + it('does not throw with 03 prefix, right length and only hex chars', () => { + expect(() => new PubKey(`03${'0'.repeat(64)}`)).to.not.throw(); + }); + it('does not throw with 25 prefix, right length and only hex chars', () => { + expect(() => new PubKey(`25${'0'.repeat(64)}`)).to.not.throw(); + }); + it('does not throw with 05 and textsecure prefix, right length and only hex chars', () => { + expect(() => new PubKey(`__textsecure_group__!05${'0'.repeat(64)}`)).to.not.throw(); + }); + + it('throws with null', () => { + expect(() => new PubKey(null as any)).to.throw(defaultErr); + }); + + it('throws with undefined', () => { + expect(() => new PubKey(undefined as any)).to.throw(defaultErr); + }); + + it('throws with empty string', () => { + expect(() => new PubKey('')).to.throw(defaultErr); + }); + it('throws with incorrect prefix', () => { + expect(() => new PubKey(`95${'0'.repeat(64)}`)).to.throw(defaultErr); + }); + + describe('05 prefix', () => { + it('throws with non-hex chars', () => { + expect(() => new PubKey(`05${'0'.repeat(63)}(`)).to.throw(defaultErr); + }); + + it('throws with incorrect length', () => { + expect(() => new PubKey(`05${'0'.repeat(63)}`)).to.throw(defaultErr); + }); + + // Currently we allow pubkeys of length 52 if they have a length of + // it('throws with incorrect length -2', () => { + // expect(() => new PubKey(`05${'0'.repeat(62)}`)).to.throw(defaultErr); + // }); + }); + + describe('25 prefix', () => { + it('throws with non-hex chars', () => { + expect(() => new PubKey(`25${'0'.repeat(63)}(`)).to.throw(defaultErr); + }); + + it('throws with incorrect length -1', () => { + expect(() => new PubKey(`25${'0'.repeat(63)}`)).to.throw(defaultErr); + }); + }); + + describe('03 prefix', () => { + it('throws with non-hex chars', () => { + expect(() => new PubKey(`03${'0'.repeat(63)}(`)).to.throw(defaultErr); + }); + + it('throws with incorrect length -1', () => { + expect(() => new PubKey(`03${'0'.repeat(63)}`)).to.throw(defaultErr); + }); + }); +}); From 820103b340f8d1f835fcd120e635242506859d7a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 21 Sep 2023 16:57:21 +1000 Subject: [PATCH 022/302] chore: refactor snodesignature input args type before testing --- ts/session/apis/snode_api/SNodeAPI.ts | 2 +- ts/session/apis/snode_api/expire.ts | 2 +- ts/session/apis/snode_api/retrieveRequest.ts | 4 +- ts/session/apis/snode_api/snodeSignatures.ts | 62 ++++++++++---------- ts/session/sending/MessageSender.ts | 2 +- 5 files changed, 35 insertions(+), 37 deletions(-) diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index accd2faee6..e3628221a0 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -207,7 +207,7 @@ const networkDeleteMessages = async (hashes: Array): Promise { const signOpts = await SnodeSignature.getSnodeSignatureByHashesParams({ - messages: hashes, + messagesHashes: hashes, method, pubkey: userX25519PublicKey, }); diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts index 842375eafb..5e640625e6 100644 --- a/ts/session/apis/snode_api/expire.ts +++ b/ts/session/apis/snode_api/expire.ts @@ -200,7 +200,7 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) { const signResult = await SnodeSignature.generateUpdateExpiryOurSignature({ shortenOrExtend, timestamp: expiry, - messageHashes: [messageHash], + messagesHashes: [messageHash], }); if (!signResult) { diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 46e2e0f62b..85d2bd92c7 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -172,7 +172,7 @@ async function buildRetrieveRequest( const signResult = await SnodeSignature.generateUpdateExpiryOurSignature({ shortenOrExtend: '', timestamp: expiry, - messageHashes: configHashesToBump, + messagesHashes: configHashesToBump, }); const expireParams: UpdateExpiryOnNodeUserSubRequest = { @@ -196,7 +196,7 @@ async function buildRetrieveRequest( const signResult = await SnodeSignature.generateUpdateExpiryGroupSignature({ shortenOrExtend: '', timestamp: expiry, - messageHashes: configHashesToBump, + messagesHashes: configHashesToBump, groupPk: pubkey, groupPrivKey: group.secretKey, }); diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts index f962164eec..42ae34cd86 100644 --- a/ts/session/apis/snode_api/snodeSignatures.ts +++ b/ts/session/apis/snode_api/snodeSignatures.ts @@ -9,24 +9,28 @@ import { PubKey } from '../../types'; import { toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; import { PreConditionFailed } from '../../utils/errors'; -export type SnodeSignatureResult = { - timestamp: number; +type WithTimestamp = { timestamp: number }; + +export type SnodeSignatureResult = WithTimestamp & { signature: string; pubkey_ed25519: string; pubkey: string; // this is the x25519 key of the pubkey we are doing the request to (ourself for our swarm usually) }; +type ShortenOrExtend = 'extend' | 'shorten' | ''; +type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; +type WithMessagesHashes = { messagesHashes: Array }; + export type SnodeGroupSignatureResult = Pick & { pubkey: GroupPubkeyType; // this is the 03 pubkey of the corresponding group }; async function getSnodeSignatureByHashesParams({ - messages, + messagesHashes, method, pubkey, -}: { +}: WithMessagesHashes & { pubkey: string; - messages: Array; method: 'delete'; }): Promise< Pick & { @@ -41,7 +45,7 @@ async function getSnodeSignatureByHashesParams({ throw new Error(err); } const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey); - const verificationData = StringUtils.encode(`${method}${messages.join('')}`, 'utf8'); + const verificationData = StringUtils.encode(`${method}${messagesHashes.join('')}`, 'utf8'); const message = new Uint8Array(verificationData); const sodium = await getSodiumRenderer(); @@ -53,7 +57,7 @@ async function getSnodeSignatureByHashesParams({ signature: signatureBase64, pubkey_ed25519: ourEd25519Key.pubKey, pubkey, - messages, + messages: messagesHashes, }; } catch (e) { window.log.warn('getSnodeSignatureParams failed with: ', e.message); @@ -164,18 +168,17 @@ async function getSnodeGroupSignatureParams({ async function generateUpdateExpirySignature({ shortenOrExtend, timestamp, - messageHashes, + messagesHashes, ed25519Privkey, ed25519Pubkey, -}: { - shortenOrExtend: 'extend' | 'shorten' | ''; - timestamp: number; - messageHashes: Array; - ed25519Privkey: Uint8Array | FixedSizeUint8Array<64>; - ed25519Pubkey: string; -}): Promise<{ signature: string; pubkey_ed25519: string }> { +}: WithMessagesHashes & + WithShortenOrExtend & + WithTimestamp & { + ed25519Privkey: Uint8Array | FixedSizeUint8Array<64>; + ed25519Pubkey: string; + }): Promise<{ signature: string; pubkey_ed25519: string }> { // "expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N] - const verificationString = `expire${shortenOrExtend}${timestamp}${messageHashes.join('')}`; + const verificationString = `expire${shortenOrExtend}${timestamp}${messagesHashes.join('')}`; const verificationData = StringUtils.encode(verificationString, 'utf8'); const message = new Uint8Array(verificationData); @@ -197,12 +200,8 @@ async function generateUpdateExpirySignature({ async function generateUpdateExpiryOurSignature({ shortenOrExtend, timestamp, - messageHashes, -}: { - shortenOrExtend: 'extend' | 'shorten' | ''; - timestamp: number; - messageHashes: Array; -}) { + messagesHashes, +}: WithMessagesHashes & WithShortenOrExtend & WithTimestamp) { const ourEd25519Key = await UserUtils.getUserED25519KeyPair(); if (!ourEd25519Key) { @@ -214,7 +213,7 @@ async function generateUpdateExpiryOurSignature({ const edKeyPrivBytes = fromHexToArray(ourEd25519Key?.privKey); return generateUpdateExpirySignature({ - messageHashes, + messagesHashes, shortenOrExtend, timestamp, ed25519Privkey: edKeyPrivBytes, @@ -225,16 +224,15 @@ async function generateUpdateExpiryOurSignature({ async function generateUpdateExpiryGroupSignature({ shortenOrExtend, timestamp, - messageHashes, + messagesHashes, groupPrivKey, groupPk, -}: { - shortenOrExtend: 'extend' | 'shorten' | ''; - timestamp: number; - messageHashes: Array; - groupPk: GroupPubkeyType; - groupPrivKey: FixedSizeUint8Array<64>; -}) { +}: WithMessagesHashes & + WithShortenOrExtend & + WithTimestamp & { + groupPk: GroupPubkeyType; + groupPrivKey: FixedSizeUint8Array<64>; + }) { if (isEmpty(groupPrivKey) || isEmpty(groupPk)) { throw new PreConditionFailed( 'generateUpdateExpiryGroupSignature groupPrivKey or groupPks is empty' @@ -242,7 +240,7 @@ async function generateUpdateExpiryGroupSignature({ } return generateUpdateExpirySignature({ - messageHashes, + messagesHashes, shortenOrExtend, timestamp, ed25519Privkey: groupPrivKey, diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index e3ecee6b19..b1ce4af039 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -249,7 +249,7 @@ async function sendMessagesDataToSnode( messagesHashesToDelete && messagesHashesToDelete.size ? await SnodeSignature.getSnodeSignatureByHashesParams({ method: 'delete' as const, - messages: [...messagesHashesToDelete], + messagesHashes: [...messagesHashesToDelete], pubkey: destination, }) : null; From e8e0e19b403bc8523f86852c2ec12a31f83b8f7d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 22 Sep 2023 16:24:31 +1000 Subject: [PATCH 023/302] chore: added tests for SnodeSignatures calls --- ts/node/sodiumNode.ts | 3 +- ts/session/apis/snode_api/expire.ts | 2 +- ts/session/apis/snode_api/retrieveRequest.ts | 6 +- ts/session/apis/snode_api/snodeSignatures.ts | 24 +- .../unit/crypto/SnodeSignatures_test.ts | 333 ++++++++++++++++++ 5 files changed, 351 insertions(+), 17 deletions(-) create mode 100644 ts/test/session/unit/crypto/SnodeSignatures_test.ts diff --git a/ts/node/sodiumNode.ts b/ts/node/sodiumNode.ts index 6961154038..14b06a1441 100644 --- a/ts/node/sodiumNode.ts +++ b/ts/node/sodiumNode.ts @@ -1,8 +1,9 @@ import * as wrappers from 'libsodium-wrappers-sumo'; +type LibSodiumWrappers = typeof wrappers; export async function getSodiumNode() { // don't ask me why, but when called from node we have to do this as the types are incorrect?! const anyWrappers = wrappers as any; await anyWrappers.ready; - return anyWrappers.default; + return anyWrappers.default as LibSodiumWrappers; } diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts index 5e640625e6..ffdd062a26 100644 --- a/ts/session/apis/snode_api/expire.ts +++ b/ts/session/apis/snode_api/expire.ts @@ -210,7 +210,7 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) { const params: UpdateExpireNodeUserParams = { pubkey: ourPubKey, - pubkey_ed25519: signResult.pubkey_ed25519.toUpperCase(), + pubkey_ed25519: signResult.pubkey.toUpperCase(), // TODO better testing for failed case messages: [messageHash], expiry, diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 85d2bd92c7..832eecae89 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -4,7 +4,7 @@ import { Snode } from '../../../data/data'; import { updateIsOnline } from '../../../state/ducks/onion'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; -import { SnodeNamespace, SnodeNamespaces } from './namespaces'; +import { SnodeNamespace, SnodeNamespaces, SnodeNamespacesGroup } from './namespaces'; import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { DURATION } from '../../constants'; @@ -92,7 +92,7 @@ async function retrieveRequestForGroup({ retrieveParam, }: { groupPk: GroupPubkeyType; - namespace: SnodeNamespaces; + namespace: SnodeNamespacesGroup; retrieveParam: RetrieveParams; }) { if (!PubKey.isClosedGroupV2(groupPk)) { @@ -182,7 +182,7 @@ async function buildRetrieveRequest( pubkey: UserUtils.getOurPubKeyStrFromCache(), expiry, signature: signResult.signature, - pubkey_ed25519: signResult.pubkey_ed25519, + pubkey_ed25519: signResult.pubkey, }, }; retrieveRequestsParams.push(expireParams); diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts index 42ae34cd86..07bd9d3937 100644 --- a/ts/session/apis/snode_api/snodeSignatures.ts +++ b/ts/session/apis/snode_api/snodeSignatures.ts @@ -1,13 +1,13 @@ import { FixedSizeUint8Array, GroupPubkeyType } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; +import { toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; import { getSodiumRenderer } from '../../crypto'; +import { PubKey } from '../../types'; import { StringUtils, UserUtils } from '../../utils'; import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String'; -import { GetNetworkTime } from './getNetworkTime'; -import { SnodeNamespaces } from './namespaces'; -import { PubKey } from '../../types'; -import { toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; import { PreConditionFailed } from '../../utils/errors'; +import { GetNetworkTime } from './getNetworkTime'; +import { SnodeNamespacesGroup } from './namespaces'; type WithTimestamp = { timestamp: number }; @@ -86,7 +86,7 @@ function isSigParamsForGroupAdmin( return PubKey.isClosedGroupV2(asGr.groupPk) && !!asGr.privKey; } -async function getSnodeShared(params: SnodeSigParamsAdminGroup | SnodeSigParamsUs) { +async function getSnodeSignatureShared(params: SnodeSigParamsAdminGroup | SnodeSigParamsUs) { const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset(); const verificationData = StringUtils.encode( `${params.method}${params.namespace === 0 ? '' : params.namespace}${signatureTimestamp}`, @@ -130,7 +130,7 @@ async function getSnodeSignatureParamsUs({ const edKeyPrivBytes = ourEd25519Key.privKeyBytes; const lengthCheckedPrivKey = toFixedUint8ArrayOfLength(edKeyPrivBytes, 64); - const sigData = await getSnodeShared({ + const sigData = await getSnodeSignatureShared({ pubKey: UserUtils.getOurPubKeyStrFromCache(), method, namespace, @@ -149,14 +149,14 @@ async function getSnodeGroupSignatureParams({ groupIdentityPrivKey, groupPk, method, - namespace = 0, + namespace, }: { groupPk: GroupPubkeyType; groupIdentityPrivKey: FixedSizeUint8Array<64>; - namespace: SnodeNamespaces; + namespace: SnodeNamespacesGroup; method: 'retrieve' | 'store'; }): Promise { - const sigData = await getSnodeShared({ + const sigData = await getSnodeSignatureShared({ pubKey: groupPk, method, namespace, @@ -176,7 +176,7 @@ async function generateUpdateExpirySignature({ WithTimestamp & { ed25519Privkey: Uint8Array | FixedSizeUint8Array<64>; ed25519Pubkey: string; - }): Promise<{ signature: string; pubkey_ed25519: string }> { + }): Promise<{ signature: string; pubkey: string }> { // "expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N] const verificationString = `expire${shortenOrExtend}${timestamp}${messagesHashes.join('')}`; const verificationData = StringUtils.encode(verificationString, 'utf8'); @@ -193,7 +193,7 @@ async function generateUpdateExpirySignature({ return { signature: signatureBase64, - pubkey_ed25519: ed25519Pubkey, + pubkey: ed25519Pubkey, }; } @@ -235,7 +235,7 @@ async function generateUpdateExpiryGroupSignature({ }) { if (isEmpty(groupPrivKey) || isEmpty(groupPk)) { throw new PreConditionFailed( - 'generateUpdateExpiryGroupSignature groupPrivKey or groupPks is empty' + 'generateUpdateExpiryGroupSignature groupPrivKey or groupPk is empty' ); } diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts new file mode 100644 index 0000000000..ce8b51b86d --- /dev/null +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -0,0 +1,333 @@ +import { expect, use } from 'chai'; +import chaiAsPromised from 'chai-as-promised'; +import Sinon from 'sinon'; +import { HexString } from '../../../../node/hexStrings'; +import { getSodiumNode } from '../../../../node/sodiumNode'; +import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; +import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; +import { SnodeSignature } from '../../../../session/apis/snode_api/snodeSignatures'; +import { concatUInt8Array } from '../../../../session/crypto'; +import { UserUtils } from '../../../../session/utils'; +import { fromBase64ToArray, fromHexToArray } from '../../../../session/utils/String'; +import { toFixedUint8ArrayOfLength } from '../../../../types/sqlSharedTypes'; + +use(chaiAsPromised); + +const validGroupPk = '03eef710fcaaa73fd50c4311333f5c496e0fdbbe9e8a70fdfa95e7ec62d5032f5c'; +const privKeyUint = toFixedUint8ArrayOfLength( + concatUInt8Array( + fromHexToArray('cd8488c39bf9972739046d627e7796b2bc0e38e2fa99fc4edd59205c28f2cdb1'), + fromHexToArray(validGroupPk.slice(2)) + ), + 64 +); + +const userEd25519Keypair = { + pubKey: '37e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309', + privKey: + 'be1d11154ff9b6de77873f0b6b0bcc460000000000000000000000000000000037e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309', +}; + +const hardcodedTimestamp = 1234; + +async function verifySig(ret: { pubkey: string; signature: string }, verificationData: string) { + const without03 = ret.pubkey.startsWith('03') ? ret.pubkey.slice(2) : ret.pubkey; // + const pk = HexString.fromHexString(without03); + const sodium = await getSodiumNode(); + const verified = sodium.crypto_sign_verify_detached( + fromBase64ToArray(ret.signature), + verificationData, + pk + ); + + if (!verified) { + throw new Error('sig failed to be verified'); + } +} + +describe('SnodeSignature', () => { + afterEach(() => { + Sinon.restore(); + }); + + describe('getSnodeGroupSignatureParams', () => { + beforeEach(() => { + Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(hardcodedTimestamp); + }); + + describe('retrieve', () => { + it('retrieve namespace ClosedGroupInfo', async () => { + const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + method: 'retrieve', + namespace: SnodeNamespaces.ClosedGroupInfo, + groupIdentityPrivKey: privKeyUint, + groupPk: validGroupPk, + }); + expect(ret.pubkey).to.be.eq(validGroupPk); + + expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + const verificationData = `retrieve${SnodeNamespaces.ClosedGroupInfo}${hardcodedTimestamp}`; + await verifySig(ret, verificationData); + }); + + it('retrieve namespace ClosedGroupKeys', async () => { + const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + method: 'retrieve', + namespace: SnodeNamespaces.ClosedGroupKeys, + groupIdentityPrivKey: privKeyUint, + groupPk: validGroupPk, + }); + expect(ret.pubkey).to.be.eq(validGroupPk); + + expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + const verificationData = `retrieve${SnodeNamespaces.ClosedGroupKeys}${hardcodedTimestamp}`; + + await verifySig(ret, verificationData); + }); + + it('retrieve namespace ClosedGroupMessages', async () => { + const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + method: 'retrieve', + namespace: SnodeNamespaces.ClosedGroupMessages, + groupIdentityPrivKey: privKeyUint, + groupPk: validGroupPk, + }); + expect(ret.pubkey).to.be.eq(validGroupPk); + + expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + const verificationData = `retrieve${SnodeNamespaces.ClosedGroupMessages}${hardcodedTimestamp}`; + await verifySig(ret, verificationData); + }); + }); + + describe('store', () => { + it('store namespace ClosedGroupInfo', async () => { + const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + method: 'store', + namespace: SnodeNamespaces.ClosedGroupInfo, + groupIdentityPrivKey: privKeyUint, + groupPk: validGroupPk, + }); + expect(ret.pubkey).to.be.eq(validGroupPk); + expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + + const verificationData = `store${SnodeNamespaces.ClosedGroupInfo}${hardcodedTimestamp}`; + await verifySig(ret, verificationData); + }); + + it('store namespace ClosedGroupKeys', async () => { + const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + method: 'store', + namespace: SnodeNamespaces.ClosedGroupKeys, + groupIdentityPrivKey: privKeyUint, + groupPk: validGroupPk, + }); + expect(ret.pubkey).to.be.eq(validGroupPk); + + expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + const verificationData = `store${SnodeNamespaces.ClosedGroupKeys}${hardcodedTimestamp}`; + await verifySig(ret, verificationData); + }); + + it('store namespace ClosedGroupMessages', async () => { + const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + method: 'store', + namespace: SnodeNamespaces.ClosedGroupMessages, + groupIdentityPrivKey: privKeyUint, + groupPk: validGroupPk, + }); + expect(ret.pubkey).to.be.eq(validGroupPk); + expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + const verificationData = `store${SnodeNamespaces.ClosedGroupMessages}${hardcodedTimestamp}`; + await verifySig(ret, verificationData); + }); + }); + }); + + describe('generateUpdateExpiryGroupSignature', () => { + it('throws if groupPk not given', async () => { + const func = async () => { + return SnodeSignature.generateUpdateExpiryGroupSignature({ + groupPk: null as any, + groupPrivKey: privKeyUint, + messagesHashes: ['[;p['], + shortenOrExtend: '', + timestamp: hardcodedTimestamp, + }); + }; + await expect(func()).to.be.rejectedWith( + 'generateUpdateExpiryGroupSignature groupPrivKey or groupPk is empty' + ); + }); + + it('throws if groupPrivKey is empty', async () => { + const func = async () => { + return SnodeSignature.generateUpdateExpiryGroupSignature({ + groupPk: validGroupPk, + groupPrivKey: new Uint8Array() as any, + messagesHashes: ['[;p['], + shortenOrExtend: '', + timestamp: hardcodedTimestamp, + }); + }; + await expect(func()).to.be.rejectedWith( + 'generateUpdateExpiryGroupSignature groupPrivKey or groupPk is empty' + ); + }); + + it('works with valid pubkey and privkey', async () => { + const hashes = ['hash4321', 'hash4221']; + const timestamp = hardcodedTimestamp; + const shortenOrExtend = ''; + const ret = await SnodeSignature.generateUpdateExpiryGroupSignature({ + groupPk: validGroupPk, + groupPrivKey: privKeyUint, + messagesHashes: hashes, + shortenOrExtend: '', + timestamp, + }); + + expect(ret.pubkey).to.be.eq(validGroupPk); + + const verificationData = `expire${shortenOrExtend}${timestamp}${hashes.join('')}`; + await verifySig(ret, verificationData); + }); + + it('fails with invalid timestamp', async () => { + const hashes = ['hash4321', 'hash4221']; + const timestamp = hardcodedTimestamp; + const shortenOrExtend = ''; + const ret = await SnodeSignature.generateUpdateExpiryGroupSignature({ + groupPk: validGroupPk, + groupPrivKey: privKeyUint, + messagesHashes: hashes, + shortenOrExtend: '', + timestamp, + }); + + expect(ret.pubkey).to.be.eq(validGroupPk); + + const verificationData = `expire${shortenOrExtend}${timestamp}1${hashes.join('')}`; + const func = async () => verifySig(ret, verificationData); + await expect(func()).rejectedWith('sig failed to be verified'); + }); + + it('fails with invalid hashes', async () => { + const hashes = ['hash4321', 'hash4221']; + const timestamp = hardcodedTimestamp; + const shortenOrExtend = ''; + const ret = await SnodeSignature.generateUpdateExpiryGroupSignature({ + groupPk: validGroupPk, + groupPrivKey: privKeyUint, + messagesHashes: hashes, + shortenOrExtend: '', + timestamp, + }); + + expect(ret.pubkey).to.be.eq(validGroupPk); + + const overridenHash = hashes.slice(); + overridenHash[0] = '1111'; + const verificationData = `expire${shortenOrExtend}${timestamp}${overridenHash.join('')}`; + const func = async () => verifySig(ret, verificationData); + await expect(func()).rejectedWith('sig failed to be verified'); + }); + + it('fails with invalid number of hashes', async () => { + const hashes = ['hash4321', 'hash4221']; + const timestamp = hardcodedTimestamp; + const shortenOrExtend = ''; + const ret = await SnodeSignature.generateUpdateExpiryGroupSignature({ + groupPk: validGroupPk, + groupPrivKey: privKeyUint, + messagesHashes: hashes, + shortenOrExtend: '', + timestamp, + }); + + expect(ret.pubkey).to.be.eq(validGroupPk); + + const overridenHash = [hashes[0]]; + const verificationData = `expire${shortenOrExtend}${timestamp}${overridenHash.join('')}`; + const func = async () => verifySig(ret, verificationData); + await expect(func()).rejectedWith('sig failed to be verified'); + }); + }); + + describe('generateUpdateExpiryOurSignature', () => { + it('throws if our ed keypair is not set', async () => { + Sinon.stub(UserUtils, 'getUserED25519KeyPair').resolves(null as any); + + const func = async () => { + const hashes = ['hash4321', 'hash4221']; + const shortenOrExtend = ''; + return SnodeSignature.generateUpdateExpiryOurSignature({ + messagesHashes: hashes, + shortenOrExtend, + timestamp: hardcodedTimestamp, + }); + }; + + await expect(func()).to.be.rejectedWith( + 'getSnodeSignatureParams "expiry": User has no getUserED25519KeyPair()' + ); + }); + + it('throws if invalid hashes', async () => { + Sinon.stub(UserUtils, 'getUserED25519KeyPair').resolves(userEd25519Keypair); + + const hashes = ['hash4321', 'hash4221']; + const shortenOrExtend = ''; + const ret = await SnodeSignature.generateUpdateExpiryOurSignature({ + messagesHashes: hashes, + shortenOrExtend, + timestamp: hardcodedTimestamp, + }); + const overridenHash = [hashes[0]]; + const verificationData = `expire${shortenOrExtend}${hardcodedTimestamp}${overridenHash.join( + '' + )}`; + + const func = async () => { + return verifySig(ret, verificationData); + }; + await expect(func()).to.be.rejectedWith('sig failed to be verified'); + }); + + it('throws if invalid timestamp', async () => { + Sinon.stub(UserUtils, 'getUserED25519KeyPair').resolves(userEd25519Keypair); + + const hashes = ['hash4321', 'hash4221']; + const shortenOrExtend = ''; + const ret = await SnodeSignature.generateUpdateExpiryOurSignature({ + messagesHashes: hashes, + shortenOrExtend, + timestamp: hardcodedTimestamp, + }); + const verificationData = `expire${shortenOrExtend}${hardcodedTimestamp}123${hashes.join('')}`; + + const func = async () => { + return verifySig(ret, verificationData); + }; + await expect(func()).to.be.rejectedWith('sig failed to be verified'); + }); + + it('works with valid pubkey and privkey', async () => { + Sinon.stub(UserUtils, 'getUserED25519KeyPair').resolves(userEd25519Keypair); + + const hashes = ['hash4321', 'hash4221']; + const timestamp = hardcodedTimestamp; + const shortenOrExtend = ''; + const ret = await SnodeSignature.generateUpdateExpiryOurSignature({ + messagesHashes: hashes, + shortenOrExtend: '', + timestamp, + }); + + expect(ret.pubkey).to.be.eq(userEd25519Keypair.pubKey); + + const verificationData = `expire${shortenOrExtend}${timestamp}${hashes.join('')}`; + await verifySig(ret, verificationData); + }); + }); +}); From d12071f3c8cbd95aaf60029b1eecf2390a8c1ea1 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 26 Sep 2023 17:18:07 +1000 Subject: [PATCH 024/302] chore: big rename of convocontroller to convohub --- preload.js | 2 - ts/components/SessionInboxView.tsx | 4 +- ts/components/conversation/AddMentions.tsx | 4 +- .../conversation/MessageRequestButtons.tsx | 4 +- .../conversation/SessionConversation.tsx | 6 +- .../composition/CompositionBox.tsx | 6 +- .../message-content/ClickToTrustSender.tsx | 4 +- .../message/message-content/MessageAvatar.tsx | 10 +- .../message-item/GenericReadableMessage.tsx | 6 +- .../message/message-item/ReadableMessage.tsx | 6 +- .../dialog/AdminLeaveClosedGroupDialog.tsx | 4 +- ts/components/dialog/BanOrUnbanUserDialog.tsx | 4 +- ts/components/dialog/EditProfileDialog.tsx | 6 +- ts/components/dialog/InviteContactsDialog.tsx | 8 +- ts/components/dialog/ModeratorsAddDialog.tsx | 4 +- .../dialog/ModeratorsRemoveDialog.tsx | 4 +- ts/components/dialog/ReactClearAllModal.tsx | 4 +- .../dialog/SessionNicknameDialog.tsx | 4 +- .../dialog/UpdateGroupMembersDialog.tsx | 4 +- .../dialog/UpdateGroupNameDialog.tsx | 4 +- ts/components/dialog/UserDetailsDialog.tsx | 6 +- ts/components/leftpane/ActionsPanel.tsx | 6 +- .../leftpane/overlay/OverlayMessage.tsx | 4 +- .../menu/ConversationListItemContextMenu.tsx | 4 +- ts/components/menu/Menu.tsx | 14 +- .../registration/RegistrationStages.tsx | 6 +- ts/interactions/conversationInteractions.ts | 45 +- .../conversations/unsendingInteractions.ts | 6 +- ts/interactions/messageInteractions.ts | 6 +- ts/mains/main_renderer.tsx | 8 +- ts/models/conversation.ts | 10 +- ts/models/message.ts | 27 +- ts/receiver/closedGroups.ts | 27 +- ts/receiver/configMessage.ts | 42 +- ts/receiver/contentMessage.ts | 21 +- ts/receiver/dataMessage.ts | 4 +- ts/receiver/opengroup.ts | 6 +- ts/receiver/queuedJob.ts | 4 +- .../open_group_api/opengroupV2/ApiUtil.ts | 6 +- .../opengroupV2/JoinOpenGroupV2.ts | 10 +- .../opengroupV2/OpenGroupManagerV2.ts | 8 +- .../open_group_api/sogsv3/knownBlindedkeys.ts | 8 +- .../apis/open_group_api/sogsv3/sogsApiV3.ts | 10 +- .../open_group_api/sogsv3/sogsV3FetchFile.ts | 6 +- ts/session/apis/snode_api/swarmPolling.ts | 156 +++--- .../conversations/ConversationController.ts | 34 +- ts/session/conversations/createClosedGroup.ts | 7 +- ts/session/conversations/index.ts | 4 +- ts/session/group/closed-group.ts | 10 +- ts/session/group/open-group.ts | 4 +- .../DataExtractionNotificationMessage.ts | 4 +- ts/session/profile_manager/ProfileManager.ts | 6 +- ts/session/sending/MessageSender.ts | 12 +- ts/session/utils/Groups.ts | 4 +- ts/session/utils/User.ts | 4 +- ts/session/utils/calling/CallManager.ts | 14 +- .../job_runners/jobs/AvatarDownloadJob.ts | 10 +- .../job_runners/jobs/ConfigurationSyncJob.ts | 4 +- .../utils/job_runners/jobs/GroupConfigJob.ts | 4 +- .../libsession/libsession_utils_contacts.ts | 8 +- .../libsession_utils_convo_info_volatile.ts | 6 +- .../libsession_utils_user_groups.ts | 4 +- .../libsession_utils_user_profile.ts | 4 +- ts/session/utils/sync/syncUtils.ts | 8 +- ts/state/ducks/conversations.ts | 6 +- ts/state/ducks/groups.ts | 121 ++--- ts/state/selectors/conversations.ts | 4 +- .../unit/crypto/SnodeSignatures_test.ts | 3 +- .../unit/sending/MessageSender_test.ts | 12 +- ts/test/session/unit/sogsv3/ApiUtil_test.ts | 16 +- .../unit/sogsv3/knownBlindedKeys_test.ts | 24 +- ...armPolling_getNamespacesToPollFrom_test.ts | 51 ++ .../SwarmPolling_getPollingTimeout_test.ts | 139 ++++++ .../SwarmPolling_pollForAllKeys_test.ts | 337 +++++++++++++ .../SwarmPolling_pollingDetails_test.ts | 278 +++++++++++ .../unit/swarm_polling/SwarmPolling_test.ts | 451 ------------------ ts/test/session/unit/utils/Messages_test.ts | 38 +- ts/test/test-utils/utils/pubkey.ts | 5 +- ts/test/test-utils/utils/stubbing.ts | 22 +- ts/util/accountManager.ts | 4 +- ts/util/blockedNumberController.ts | 2 +- ts/util/expiringMessages.ts | 4 +- ts/util/readReceipts.ts | 10 +- yarn.lock | 18 +- 84 files changed, 1307 insertions(+), 937 deletions(-) create mode 100644 ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts create mode 100644 ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts create mode 100644 ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts create mode 100644 ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts delete mode 100644 ts/test/session/unit/swarm_polling/SwarmPolling_test.ts diff --git a/preload.js b/preload.js index cb1acea9c4..017b1c1230 100644 --- a/preload.js +++ b/preload.js @@ -239,8 +239,6 @@ const data = require('./ts/data/dataInit'); const { setupi18n } = require('./ts/util/i18n'); window.Signal = data.initData(); -const { getConversationController } = require('./ts/session/conversations/ConversationController'); -window.getConversationController = getConversationController; // Linux seems to periodically let the event loop stop, so this is a global workaround setInterval(() => { window.nodeSetImmediate(() => {}); diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index 2dad1c9936..8e5207e5ff 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -10,7 +10,7 @@ import useMount from 'react-use/lib/useMount'; import { LeftPane } from './leftpane/LeftPane'; // moment does not support es-419 correctly (and cause white screen on app start) -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { UserUtils } from '../session/utils'; import { createStore } from '../state/createStore'; import { initialCallState } from '../state/ducks/call'; @@ -61,7 +61,7 @@ const StyledGutter = styled.div` function createSessionInboxStore() { // Here we set up a full redux store with initial state for our LeftPane Root - const conversations = getConversationController() + const conversations = ConvoHub.use() .getConversations() .map(conversation => conversation.getConversationModelProps()); diff --git a/ts/components/conversation/AddMentions.tsx b/ts/components/conversation/AddMentions.tsx index 0246683267..d86c35baec 100644 --- a/ts/components/conversation/AddMentions.tsx +++ b/ts/components/conversation/AddMentions.tsx @@ -2,7 +2,7 @@ import React from 'react'; import styled from 'styled-components'; import { RenderTextCallbackType } from '../../types/Util'; import { PubKey } from '../../session/types'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { isUsAnySogsFromCache } from '../../session/apis/open_group_api/sogsv3/knownBlindedkeys'; interface MentionProps { @@ -26,7 +26,7 @@ const StyledMentionedUs = styled(StyledMentionAnother)` const Mention = (props: MentionProps) => { const blindedOrNotPubkey = props.text.slice(1); - const foundConvo = getConversationController().get(blindedOrNotPubkey); + const foundConvo = ConvoHub.use().get(blindedOrNotPubkey); // this call takes care of finding if we have a blindedId of ourself on any sogs we have joined. if (isUsAnySogsFromCache(blindedOrNotPubkey)) { diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index 4b874e30ea..59bdc0d137 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -6,7 +6,7 @@ import { approveConvoAndSendResponse, declineConversationWithConfirm, } from '../../interactions/conversationInteractions'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { hasSelectedConversationIncomingMessages } from '../../state/selectors/conversations'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { SessionButton, SessionButtonColor } from '../basic/SessionButton'; @@ -62,7 +62,7 @@ const handleDeclineAndBlockConversationRequest = ( }; const handleAcceptConversationRequest = async (convoId: string) => { - const convo = getConversationController().get(convoId); + const convo = ConvoHub.use().get(convoId); if (!convo) { return; } diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index fa29d12fb0..5efadffea5 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -21,7 +21,7 @@ import { SessionFileDropzone } from './SessionFileDropzone'; import { Data } from '../../data/data'; import { markAllReadByConvoId } from '../../interactions/conversationInteractions'; import { MAX_ATTACHMENT_FILESIZE_BYTES } from '../../session/constants'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { ToastUtils } from '../../session/utils'; import { ReduxConversationType, @@ -187,7 +187,7 @@ export class SessionConversation extends React.Component { public sendMessageFn(msg: SendMessageType) { const { selectedConversationKey } = this.props; - const conversationModel = getConversationController().get(selectedConversationKey); + const conversationModel = ConvoHub.use().get(selectedConversationKey); if (!conversationModel) { return; @@ -524,7 +524,7 @@ export class SessionConversation extends React.Component { ); const allMembers = allPubKeys.map((pubKey: string) => { - const conv = getConversationController().get(pubKey); + const conv = ConvoHub.use().get(pubKey); const profileName = conv?.getNicknameOrRealUsernameOrPlaceholder(); return { diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx index c3669e78a4..f63295727d 100644 --- a/ts/components/conversation/composition/CompositionBox.tsx +++ b/ts/components/conversation/composition/CompositionBox.tsx @@ -14,7 +14,7 @@ import { SessionRecording } from '../SessionRecording'; import { SettingsKey } from '../../../data/settings-key'; import { showLinkSharingConfirmationModalDialog } from '../../../interactions/conversationInteractions'; -import { getConversationController } from '../../../session/conversations'; +import { ConvoHub } from '../../../session/conversations'; import { ToastUtils } from '../../../session/utils'; import { ReduxConversationType } from '../../../state/ducks/conversations'; import { removeAllStagedAttachmentsInConversation } from '../../../state/ducks/stagedAttachments'; @@ -598,7 +598,7 @@ class CompositionBoxInner extends React.Component { } const allMembers = allPubKeys.map(pubKey => { - const conv = getConversationController().get(pubKey); + const conv = ConvoHub.use().get(pubKey); const profileName = conv?.getNicknameOrRealUsernameOrPlaceholder() || window.i18n('anonymous'); @@ -855,7 +855,7 @@ class CompositionBoxInner extends React.Component { // Also, check for a message length change before firing it up, to avoid // catching ESC, tab, or whatever which is not typing if (draft && draft.length && draft.length !== this.lastBumpTypingMessageLength) { - const conversationModel = getConversationController().get(this.props.selectedConversationKey); + const conversationModel = ConvoHub.use().get(this.props.selectedConversationKey); if (!conversationModel) { return; } diff --git a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx index 25afee8a7e..8872a4efc3 100644 --- a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx +++ b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx @@ -1,7 +1,7 @@ import React from 'react'; import styled from 'styled-components'; import { Data } from '../../../../data/data'; -import { getConversationController } from '../../../../session/conversations'; +import { ConvoHub } from '../../../../session/conversations'; import { AttachmentDownloads } from '../../../../session/utils'; import { updateConfirmModal } from '../../../../state/ducks/modalDialog'; import { SessionButtonColor } from '../../../basic/SessionButton'; @@ -35,7 +35,7 @@ export const ClickToTrustSender = (props: { messageId: string }) => { return; } const sender = found.getSource(); - const convo = getConversationController().get(sender); + const convo = ConvoHub.use().get(sender); window.inboxStore?.dispatch( updateConfirmModal({ title: window.i18n('trustThisContactDialogTitle', [ diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx index 93cc83753c..bec16a9cbd 100644 --- a/ts/components/conversation/message/message-content/MessageAvatar.tsx +++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx @@ -4,7 +4,7 @@ import styled from 'styled-components'; import { OpenGroupData } from '../../../../data/opengroups'; import { MessageRenderingProps } from '../../../../models/messageType'; import { findCachedBlindedMatchOrLookItUp } from '../../../../session/apis/open_group_api/sogsv3/knownBlindedkeys'; -import { getConversationController } from '../../../../session/conversations'; +import { ConvoHub } from '../../../../session/conversations'; import { getSodiumRenderer } from '../../../../session/crypto'; import { KeyPrefixType, PubKey } from '../../../../session/types'; import { openConversationWithMessages } from '../../../../state/ducks/conversations'; @@ -62,7 +62,7 @@ export const MessageAvatar = (props: Props) => { if (isPublic && !PubKey.isBlinded(sender)) { // public chat but session id not blinded. disable showing user details if we do not have an active convo with that user. // an unactive convo with that user means that we never chatted with that id directyly, but only through a sogs - const convoWithSender = getConversationController().get(sender); + const convoWithSender = ConvoHub.use().get(sender); if (!convoWithSender || !convoWithSender.getActiveAt()) { // for some time, we might still get some unblinded messages, as in message sent unblinded because // * older clients still send unblinded message and those are allowed by sogs if they doesn't enforce blinding @@ -87,7 +87,7 @@ export const MessageAvatar = (props: Props) => { return; } - const convoOpen = getConversationController().get(selectedConvoKey); + const convoOpen = ConvoHub.use().get(selectedConvoKey); const room = OpenGroupData.getV2OpenGroupRoom(convoOpen.id); let privateConvoToOpen = sender; if (room?.serverPublicKey) { @@ -100,9 +100,7 @@ export const MessageAvatar = (props: Props) => { privateConvoToOpen = foundRealSessionId || privateConvoToOpen; } - await getConversationController() - .get(privateConvoToOpen) - .setOriginConversationID(selectedConvoKey); + await ConvoHub.use().get(privateConvoToOpen).setOriginConversationID(selectedConvoKey); // public and blinded key for that message, we should open the convo as is and see if the user wants // to send a sogs blinded message request. diff --git a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx index 775dd84e7e..0a2cb9f337 100644 --- a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx +++ b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx @@ -9,7 +9,7 @@ import useMount from 'react-use/lib/useMount'; import { Data } from '../../../../data/data'; import { MessageRenderingProps } from '../../../../models/messageType'; -import { getConversationController } from '../../../../session/conversations'; +import { ConvoHub } from '../../../../session/conversations'; import { messagesExpired } from '../../../../state/ducks/conversations'; import { getGenericReadableMessageSelectorProps, @@ -78,7 +78,7 @@ function useIsExpired(props: ExpiringProps) { }, ]) ); - const convo = getConversationController().get(convoId); + const convo = ConvoHub.use().get(convoId); convo?.updateLastMessage(); } } @@ -195,7 +195,7 @@ export const GenericReadableMessage = (props: Props) => { useEffect(() => { if (msgProps?.convoId) { - const conversationModel = getConversationController().get(msgProps?.convoId); + const conversationModel = ConvoHub.use().get(msgProps?.convoId); if (conversationModel) { setEnableReactions(conversationModel.hasReactions()); } diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx index b3abc292d6..0ccf92d798 100644 --- a/ts/components/conversation/message/message-item/ReadableMessage.tsx +++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx @@ -4,7 +4,7 @@ import { InView } from 'react-intersection-observer'; import { useDispatch, useSelector } from 'react-redux'; import { Data } from '../../../../data/data'; import { useHasUnread } from '../../../../hooks/useParamSelector'; -import { getConversationController } from '../../../../session/conversations'; +import { ConvoHub } from '../../../../session/conversations'; import { fetchBottomMessagesForConversation, fetchTopMessagesForConversation, @@ -104,7 +104,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => { // make sure the app is focused, because we mark message as read here if (inView === true && isAppFocused) { dispatch(showScrollToBottomButton(false)); - getConversationController() + ConvoHub.use() .get(selectedConversationKey) ?.markConversationRead(receivedAt || 0); // TODOLATER this should be `sentAt || serverTimestamp` I think @@ -149,7 +149,7 @@ export const ReadableMessage = (props: ReadableMessageProps) => { // mark the whole conversation as read until this point. // this will trigger the expire timer. if (foundSentAt) { - getConversationController() + ConvoHub.use() .get(selectedConversationKey) ?.markConversationRead(foundSentAt, Date.now()); } diff --git a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx index 0e697dc1f8..3a9810c266 100644 --- a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx +++ b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { useDispatch } from 'react-redux'; import styled from 'styled-components'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { adminLeaveClosedGroup } from '../../state/ducks/modalDialog'; import { SessionWrapperModal } from '../SessionWrapperModal'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; @@ -30,7 +30,7 @@ export const AdminLeaveClosedGroupDialog = (props: { conversationId: string }) = } setLoading(true); // we know want to delete a closed group right after we've left it, so we can call the deleteContact which takes care of it all - await getConversationController().deleteClosedGroup(props.conversationId, { + await ConvoHub.use().deleteClosedGroup(props.conversationId, { fromSyncMessage: false, sendLeaveMessage: true, }); diff --git a/ts/components/dialog/BanOrUnbanUserDialog.tsx b/ts/components/dialog/BanOrUnbanUserDialog.tsx index 98409af92a..3d94f5941d 100644 --- a/ts/components/dialog/BanOrUnbanUserDialog.tsx +++ b/ts/components/dialog/BanOrUnbanUserDialog.tsx @@ -8,7 +8,7 @@ import { sogsV3BanUser, sogsV3UnbanUser, } from '../../session/apis/open_group_api/sogsv3/sogsV3BanUnban'; -import { getConversationController } from '../../session/conversations/ConversationController'; +import { ConvoHub } from '../../session/conversations/ConversationController'; import { PubKey } from '../../session/types'; import { ToastUtils } from '../../session/utils'; import { BanType, updateBanOrUnbanUserModal } from '../../state/ducks/modalDialog'; @@ -69,7 +69,7 @@ export const BanOrUnBanUserDialog = (props: { const isBan = banType === 'ban'; const dispatch = useDispatch(); const darkMode = useSelector(isDarkTheme); - const convo = getConversationController().get(conversationId); + const convo = ConvoHub.use().get(conversationId); const inputRef = useRef(null); useFocusMount(inputRef, true); diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx index a1d38b080a..07a7349636 100644 --- a/ts/components/dialog/EditProfileDialog.tsx +++ b/ts/components/dialog/EditProfileDialog.tsx @@ -12,7 +12,7 @@ import { ConversationModel } from '../../models/conversation'; import { uploadOurAvatar } from '../../interactions/conversationInteractions'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { MAX_USERNAME_BYTES } from '../../session/constants'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { sanitizeSessionUsername } from '../../session/utils/String'; import { editProfileModal } from '../../state/ducks/modalDialog'; import { pickFileForAvatar } from '../../types/attachments/VisualAttachment'; @@ -67,7 +67,7 @@ export class EditProfileDialog extends React.Component { autoBind(this); - this.convo = getConversationController().get(UserUtils.getOurPubKeyStrFromCache()); + this.convo = ConvoHub.use().get(UserUtils.getOurPubKeyStrFromCache()); this.state = { profileName: this.convo.getRealSessionUsername() || '', @@ -327,7 +327,7 @@ export class EditProfileDialog extends React.Component { async function commitProfileEdits(newName: string, scaledAvatarUrl: string | null) { const ourNumber = UserUtils.getOurPubKeyStrFromCache(); - const conversation = await getConversationController().getOrCreateAndWait( + const conversation = await ConvoHub.use().getOrCreateAndWait( ourNumber, ConversationTypeEnum.PRIVATE ); diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index cfd3237a45..cff3c08bd3 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -5,7 +5,7 @@ import _ from 'lodash'; import { useDispatch, useSelector } from 'react-redux'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { VALIDATION } from '../../session/constants'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { ToastUtils, UserUtils } from '../../session/utils'; import { updateInviteContactModal } from '../../state/ducks/modalDialog'; import { SpacerLG } from '../basic/Text'; @@ -30,7 +30,7 @@ type Props = { }; async function submitForOpenGroup(convoId: string, pubkeys: Array) { - const convo = getConversationController().get(convoId); + const convo = ConvoHub.use().get(convoId); if (!convo || !convo.isPublic()) { throw new Error('submitForOpenGroup group not found'); } @@ -45,7 +45,7 @@ async function submitForOpenGroup(convoId: string, pubkeys: Array) { }; // eslint-disable-next-line @typescript-eslint/no-misused-promises pubkeys.forEach(async pubkeyStr => { - const privateConvo = await getConversationController().getOrCreateAndWait( + const privateConvo = await ConvoHub.use().getOrCreateAndWait( pubkeyStr, ConversationTypeEnum.PRIVATE ); @@ -66,7 +66,7 @@ async function submitForOpenGroup(convoId: string, pubkeys: Array) { } const submitForClosedGroup = async (convoId: string, pubkeys: Array) => { - const convo = getConversationController().get(convoId); + const convo = ConvoHub.use().get(convoId); if (!convo || !convo.isGroup()) { throw new Error('submitForClosedGroup group not found'); } diff --git a/ts/components/dialog/ModeratorsAddDialog.tsx b/ts/components/dialog/ModeratorsAddDialog.tsx index b8b3b3b35d..4c7322cd30 100644 --- a/ts/components/dialog/ModeratorsAddDialog.tsx +++ b/ts/components/dialog/ModeratorsAddDialog.tsx @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { PubKey } from '../../session/types'; import { ToastUtils } from '../../session/utils'; import { Flex } from '../basic/Flex'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { updateAddModeratorsModal } from '../../state/ducks/modalDialog'; import { SessionButton, SessionButtonType } from '../basic/SessionButton'; import { SessionSpinner } from '../basic/SessionSpinner'; @@ -22,7 +22,7 @@ export const AddModeratorsDialog = (props: Props) => { const dispatch = useDispatch(); const darkMode = useSelector(isDarkTheme); - const convo = getConversationController().get(conversationId); + const convo = ConvoHub.use().get(conversationId); const [inputBoxValue, setInputBoxValue] = useState(''); const [addingInProgress, setAddingInProgress] = useState(false); diff --git a/ts/components/dialog/ModeratorsRemoveDialog.tsx b/ts/components/dialog/ModeratorsRemoveDialog.tsx index 984705dcb9..2e5240377c 100644 --- a/ts/components/dialog/ModeratorsRemoveDialog.tsx +++ b/ts/components/dialog/ModeratorsRemoveDialog.tsx @@ -2,7 +2,7 @@ import { compact } from 'lodash'; import React, { useState } from 'react'; import { useDispatch } from 'react-redux'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { PubKey } from '../../session/types'; import { ToastUtils } from '../../session/utils'; import { Flex } from '../basic/Flex'; @@ -32,7 +32,7 @@ async function removeMods(convoId: string, modsToRemove: Array) { window?.log?.info(`asked to remove moderators: ${modsToRemove}`); try { - const convo = getConversationController().get(convoId); + const convo = ConvoHub.use().get(convoId); const roomInfos = convo.toOpenGroupV2(); const modsToRemovePubkey = compact(modsToRemove.map(m => PubKey.from(m))); diff --git a/ts/components/dialog/ReactClearAllModal.tsx b/ts/components/dialog/ReactClearAllModal.tsx index 7d7347bf4b..ea1303a9b8 100644 --- a/ts/components/dialog/ReactClearAllModal.tsx +++ b/ts/components/dialog/ReactClearAllModal.tsx @@ -3,7 +3,7 @@ import { useDispatch } from 'react-redux'; import styled from 'styled-components'; import { useMessageReactsPropsById } from '../../hooks/useParamSelector'; import { clearSogsReactionByServerId } from '../../session/apis/open_group_api/sogsv3/sogsV3ClearReaction'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { updateReactClearAllModal } from '../../state/ducks/modalDialog'; import { Flex } from '../basic/Flex'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; @@ -59,7 +59,7 @@ export const ReactClearAllModal = (props: Props): ReactElement => { } const { convoId, serverId } = msgProps; - const roomInfos = getConversationController().get(convoId).toOpenGroupV2(); + const roomInfos = ConvoHub.use().get(convoId).toOpenGroupV2(); const handleClose = () => { dispatch(updateReactClearAllModal(null)); diff --git a/ts/components/dialog/SessionNicknameDialog.tsx b/ts/components/dialog/SessionNicknameDialog.tsx index 008d341854..fc83107c67 100644 --- a/ts/components/dialog/SessionNicknameDialog.tsx +++ b/ts/components/dialog/SessionNicknameDialog.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import _ from 'lodash'; import { useDispatch } from 'react-redux'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { SpacerLG } from '../basic/Text'; import { changeNickNameModal } from '../../state/ducks/modalDialog'; @@ -43,7 +43,7 @@ export const SessionNicknameDialog = (props: Props) => { if (!conversationId) { throw new Error('Cant save without conversation id'); } - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); await conversation.setNickname(nickname, true); onClickClose(); }; diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index e80e421c31..6547e8e114 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -23,7 +23,7 @@ import { } from '../../hooks/useParamSelector'; import { useSet } from '../../hooks/useSet'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { initiateClosedGroupUpdate } from '../../session/group/closed-group'; type Props = { @@ -119,7 +119,7 @@ const ZombiesList = ({ convoId }: { convoId: string }) => { }; async function onSubmit(convoId: string, membersAfterUpdate: Array) { - const convoFound = getConversationController().get(convoId); + const convoFound = ConvoHub.use().get(convoId); if (!convoFound || !convoFound.isGroup()) { throw new Error('Invalid convo for updateGroupMembersDialog'); } diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx index cf8003be8f..c546e32aa4 100644 --- a/ts/components/dialog/UpdateGroupNameDialog.tsx +++ b/ts/components/dialog/UpdateGroupNameDialog.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { clone } from 'lodash'; import { ConversationModel } from '../../models/conversation'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { initiateClosedGroupUpdate } from '../../session/group/closed-group'; import { initiateOpenGroupUpdate } from '../../session/group/open-group'; import { updateGroupNameModal } from '../../state/ducks/modalDialog'; @@ -37,7 +37,7 @@ export class UpdateGroupNameDialog extends React.Component { super(props); autoBind(this); - this.convo = getConversationController().get(props.conversationId); + this.convo = ConvoHub.use().get(props.conversationId); const libGroupName = getLibGroupNameOutsideRedux(props.conversationId); const groupNameFromConvo = this.convo.getRealSessionUsername(); diff --git a/ts/components/dialog/UserDetailsDialog.tsx b/ts/components/dialog/UserDetailsDialog.tsx index 87be42e49a..4b77bc2ca6 100644 --- a/ts/components/dialog/UserDetailsDialog.tsx +++ b/ts/components/dialog/UserDetailsDialog.tsx @@ -4,7 +4,7 @@ import useCopyToClipboard from 'react-use/lib/useCopyToClipboard'; import useKey from 'react-use/lib/useKey'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { ToastUtils } from '../../session/utils'; import { openConversationWithMessages } from '../../state/ducks/conversations'; import { updateUserDetailsModal, UserDetailsModalState } from '../../state/ducks/modalDialog'; @@ -30,9 +30,9 @@ export const UserDetailsDialog = (props: UserDetailsModalState) => { if (!props) { return; } - const convo = getConversationController().get(props.conversationId); + const convo = ConvoHub.use().get(props.conversationId); - const conversation = await getConversationController().getOrCreateAndWait( + const conversation = await ConvoHub.use().getOrCreateAndWait( convo.id, ConversationTypeEnum.PRIVATE ); diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 437efffe5a..5cf331ee21 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -7,7 +7,7 @@ import useInterval from 'react-use/lib/useInterval'; import useTimeoutFn from 'react-use/lib/useTimeoutFn'; import { Data } from '../../data/data'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { getMessageQueue } from '../../session/sending'; import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils'; @@ -162,8 +162,8 @@ const setupTheme = async () => { // Do this only if we created a new Session ID, or if we already received the initial configuration message const triggerSyncIfNeeded = async () => { const us = UserUtils.getOurPubKeyStrFromCache(); - await getConversationController().get(us).setDidApproveMe(true, true); - await getConversationController().get(us).setIsApproved(true, true); + await ConvoHub.use().get(us).setDidApproveMe(true, true); + await ConvoHub.use().get(us).setIsApproved(true, true); const didWeHandleAConfigurationMessageAlready = (await Data.getItemById(SettingsKey.hasSyncedInitialConfigurationItem))?.value || false; if (didWeHandleAConfigurationMessageAlready) { diff --git a/ts/components/leftpane/overlay/OverlayMessage.tsx b/ts/components/leftpane/overlay/OverlayMessage.tsx index 9140169688..383a0d762c 100644 --- a/ts/components/leftpane/overlay/OverlayMessage.tsx +++ b/ts/components/leftpane/overlay/OverlayMessage.tsx @@ -4,7 +4,7 @@ import styled from 'styled-components'; import { useDispatch } from 'react-redux'; import { ConversationTypeEnum } from '../../../models/conversationAttributes'; -import { getConversationController } from '../../../session/conversations'; +import { ConvoHub } from '../../../session/conversations'; import { PubKey } from '../../../session/types'; import { ToastUtils, UserUtils } from '../../../session/utils'; import { openConversationWithMessages } from '../../../state/ducks/conversations'; @@ -57,7 +57,7 @@ export const OverlayMessage = () => { const disableNextButton = !pubkeyOrOns || loading; async function openConvoOnceResolved(resolvedSessionID: string) { - const convo = await getConversationController().getOrCreateAndWait( + const convo = await ConvoHub.use().getOrCreateAndWait( resolvedSessionID, ConversationTypeEnum.PRIVATE ); diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx index 59f95b619b..ec291829c4 100644 --- a/ts/components/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/menu/ConversationListItemContextMenu.tsx @@ -3,7 +3,7 @@ import { animation, Item, Menu } from 'react-contexify'; import { useSelector } from 'react-redux'; import { useIsPinned, useIsPrivate, useIsPrivateAndFriend } from '../../hooks/useParamSelector'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { getIsMessageSection } from '../../state/selectors/section'; import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext'; import { SessionContextMenuContainer } from '../SessionContextMenuContainer'; @@ -86,7 +86,7 @@ export const PinConversationMenuItem = (): JSX.Element | null => { const isPinned = useIsPinned(conversationId); if (isMessagesSection && (!isPrivate || (isPrivate && isPrivateAndFriend))) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); const togglePinConversation = () => { void conversation?.togglePinned(); diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index a5f1a1c901..235f43251b 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -41,7 +41,7 @@ import { ConversationNotificationSetting, ConversationNotificationSettingType, } from '../../models/conversationAttributes'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { PubKey } from '../../session/types'; import { changeNickNameModal, @@ -81,7 +81,7 @@ export const MarkConversationUnreadMenuItem = (): JSX.Element | null => { const isPrivateAndFriend = useIsPrivateAndFriend(conversationId); if (isMessagesSection && (!isPrivate || (isPrivate && isPrivateAndFriend))) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); const markUnread = () => { void conversation?.markAsUnread(true); @@ -118,7 +118,7 @@ export const DeletePrivateContactMenuItem = () => { onClickClose, okTheme: SessionButtonColor.Danger, onClickOk: async () => { - await getConversationController().delete1o1(convoId, { + await ConvoHub.use().delete1o1(convoId, { fromSyncMessage: false, justHidePrivate: false, }); @@ -159,11 +159,11 @@ export const DeleteGroupOrCommunityMenuItem = () => { okTheme: SessionButtonColor.Danger, onClickOk: async () => { if (isPublic) { - await getConversationController().deleteCommunity(convoId, { + await ConvoHub.use().deleteCommunity(convoId, { fromSyncMessage: false, }); } else { - await getConversationController().deleteClosedGroup(convoId, { + await ConvoHub.use().deleteClosedGroup(convoId, { fromSyncMessage: false, sendLeaveMessage: true, }); @@ -463,7 +463,7 @@ export const DeletePrivateConversationMenuItem = () => { return ( { - void getConversationController().delete1o1(convoId, { + void ConvoHub.use().delete1o1(convoId, { fromSyncMessage: false, justHidePrivate: true, }); @@ -477,7 +477,7 @@ export const DeletePrivateConversationMenuItem = () => { export const AcceptMsgRequestMenuItem = () => { const convoId = useConvoIdFromContext(); const isRequest = useIsIncomingRequest(convoId); - const convo = getConversationController().get(convoId); + const convo = ConvoHub.use().get(convoId); const isPrivate = useIsPrivate(convoId); if (isRequest && isPrivate) { diff --git a/ts/components/registration/RegistrationStages.tsx b/ts/components/registration/RegistrationStages.tsx index fe3e196d62..db676adc06 100644 --- a/ts/components/registration/RegistrationStages.tsx +++ b/ts/components/registration/RegistrationStages.tsx @@ -3,7 +3,7 @@ import { SignUpMode, SignUpTab } from './SignUpTab'; import { SignInMode, SignInTab } from './SignInTab'; import { Data } from '../../data/data'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { mnDecode } from '../../session/crypto/mnemonic'; import { PromiseUtils, StringUtils, ToastUtils } from '../../session/utils'; import { TaskTimedOutError } from '../../session/utils/Promise'; @@ -22,8 +22,8 @@ export async function resetRegistration() { await Data.removeAll(); Storage.reset(); await Storage.fetch(); - getConversationController().reset(); - await getConversationController().load(); + ConvoHub.use().reset(); + await ConvoHub.use().load(); } /** diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 7a61e07af7..b6aa0c90da 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -10,7 +10,7 @@ import { Data } from '../data/data'; import { SettingsKey } from '../data/settings-key'; import { uploadFileToFsWithOnionV4 } from '../session/apis/file_server_api/FileServerApi'; import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { getSodiumRenderer } from '../session/crypto'; import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; import { perfEnd, perfStart } from '../session/utils/Performance'; @@ -63,7 +63,7 @@ export async function copyPublicKeyByConvoId(convoId: string) { } export async function blockConvoById(conversationId: string) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); if (!conversation.id || conversation.isPublic()) { return; @@ -80,7 +80,7 @@ export async function blockConvoById(conversationId: string) { } export async function unblockConvoById(conversationId: string) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); if (!conversation) { // we assume it's a block contact and not group. @@ -104,7 +104,7 @@ export const approveConvoAndSendResponse = async ( conversationId: string, syncToDevices: boolean = true ) => { - const convoToApprove = getConversationController().get(conversationId); + const convoToApprove = ConvoHub.use().get(conversationId); if (!convoToApprove) { window?.log?.info('Conversation is already approved.'); @@ -133,7 +133,7 @@ export async function declineConversationWithoutConfirm({ syncToDevices: boolean; blockContact: boolean; // if set to false, the contact will just be set to not approved }) { - const conversationToDecline = getConversationController().get(conversationId); + const conversationToDecline = ConvoHub.use().get(conversationId); if (!conversationToDecline || !conversationToDecline.isPrivate()) { window?.log?.info('No conversation to decline.'); @@ -200,33 +200,33 @@ export const declineConversationWithConfirm = ({ }; export async function showUpdateGroupNameByConvoId(conversationId: string) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); if (conversation.isClosedGroup()) { // make sure all the members' convo exists so we can add or remove them await Promise.all( conversation .getGroupMembers() - .map(m => getConversationController().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE)) + .map(m => ConvoHub.use().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE)) ); } window.inboxStore?.dispatch(updateGroupNameModal({ conversationId })); } export async function showUpdateGroupMembersByConvoId(conversationId: string) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); if (conversation.isClosedGroup()) { // make sure all the members' convo exists so we can add or remove them await Promise.all( conversation .getGroupMembers() - .map(m => getConversationController().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE)) + .map(m => ConvoHub.use().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE)) ); } window.inboxStore?.dispatch(updateGroupMembersModal({ conversationId })); } export function showLeaveGroupByConvoId(conversationId: string) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); if (!conversation.isGroup()) { throw new Error('showLeaveGroupDialog() called with a non group convo.'); @@ -249,11 +249,11 @@ export function showLeaveGroupByConvoId(conversationId: string) { message, onClickOk: async () => { if (isPublic) { - await getConversationController().deleteCommunity(conversation.id, { + await ConvoHub.use().deleteCommunity(conversation.id, { fromSyncMessage: false, }); } else { - await getConversationController().deleteClosedGroup(conversation.id, { + await ConvoHub.use().deleteClosedGroup(conversation.id, { fromSyncMessage: false, sendLeaveMessage: true, }); @@ -296,7 +296,7 @@ export function showUnbanUserByConvoId(conversationId: string, pubkey?: string) } export async function markAllReadByConvoId(conversationId: string) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); perfStart(`markAllReadByConvoId-${conversationId}`); await conversation?.markAllAsRead(); @@ -308,7 +308,7 @@ export async function setNotificationForConvoId( conversationId: string, selected: ConversationNotificationSettingType ) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); const existingSettings = conversation.getNotificationsFor(); if (existingSettings !== selected) { @@ -317,7 +317,7 @@ export async function setNotificationForConvoId( } } export async function clearNickNameByConvoId(conversationId: string) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); await conversation.setNickname(null, true); } @@ -326,7 +326,7 @@ export function showChangeNickNameByConvoId(conversationId: string) { } export async function deleteAllMessagesByConvoIdNoConfirmation(conversationId: string) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); await Data.removeAllMessagesInConversation(conversationId); // destroy message keeps the active timestamp set so the @@ -364,7 +364,7 @@ export async function setDisappearingMessagesByConvoId( conversationId: string, seconds: number | undefined ) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); const canSetDisappearing = !conversation.isOutgoingRequest() && !conversation.isIncomingRequest(); @@ -386,7 +386,7 @@ export async function setDisappearingMessagesByConvoId( * If this is a reupload, the old profileKey is used, otherwise a new one is generated */ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) { - const ourConvo = getConversationController().get(UserUtils.getOurPubKeyStrFromCache()); + const ourConvo = ConvoHub.use().get(UserUtils.getOurPubKeyStrFromCache()); if (!ourConvo) { window.log.warn('ourConvo not found... This is not a valid case'); return null; @@ -401,8 +401,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) { } else { // this is a reupload. no need to generate a new profileKey const ourConvoProfileKey = - getConversationController().get(UserUtils.getOurPubKeyStrFromCache())?.getProfileKey() || - null; + ConvoHub.use().get(UserUtils.getOurPubKeyStrFromCache())?.getProfileKey() || null; profileKey = ourConvoProfileKey ? fromHexToArray(ourConvoProfileKey) : null; if (!profileKey) { @@ -490,9 +489,7 @@ export async function replyToMessage(messageId: string) { window.log.warn('Failed to find message to reply to'); return; } - const conversationModel = getConversationController().getOrThrow( - quotedMessageModel.get('conversationId') - ); + const conversationModel = ConvoHub.use().getOrThrow(quotedMessageModel.get('conversationId')); const quotedMessageProps = await conversationModel.makeQuote(quotedMessageModel); @@ -545,7 +542,7 @@ function isURL(str: string) { } export async function callRecipient(pubkey: string, canCall: boolean) { - const convo = getConversationController().get(pubkey); + const convo = ConvoHub.use().get(pubkey); if (!canCall) { ToastUtils.pushUnableToCall(); diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 577bbcb653..62619599fc 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -3,7 +3,7 @@ import { Data } from '../../data/data'; import { ConversationModel } from '../../models/conversation'; import { MessageModel } from '../../models/message'; import { getMessageQueue } from '../../session'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { UnsendMessage } from '../../session/messages/outgoing/controlMessage/UnsendMessage'; import { ed25519Str } from '../../session/onions/onionPath'; import { SnodeAPI } from '../../session/apis/snode_api/SNodeAPI'; @@ -339,7 +339,7 @@ export async function deleteMessagesByIdForEveryone( messageIds: Array, conversationId: string ) { - const conversation = getConversationController().getOrThrow(conversationId); + const conversation = ConvoHub.use().getOrThrow(conversationId); const isMe = conversation.isMe(); const selectedMessages = compact( await Promise.all(messageIds.map(m => Data.getMessageById(m, false))) @@ -368,7 +368,7 @@ export async function deleteMessagesByIdForEveryone( } export async function deleteMessagesById(messageIds: Array, conversationId: string) { - const conversation = getConversationController().getOrThrow(conversationId); + const conversation = ConvoHub.use().getOrThrow(conversationId); const selectedMessages = compact( await Promise.all(messageIds.map(m => Data.getMessageById(m, false))) ); diff --git a/ts/interactions/messageInteractions.ts b/ts/interactions/messageInteractions.ts index 2e4d15eea5..22b4ae2418 100644 --- a/ts/interactions/messageInteractions.ts +++ b/ts/interactions/messageInteractions.ts @@ -7,7 +7,7 @@ import { isOpenGroupV2, openGroupV2CompleteURLRegex, } from '../session/apis/open_group_api/utils/OpenGroupUtils'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { PubKey } from '../session/types'; import { ToastUtils } from '../session/utils'; @@ -67,7 +67,7 @@ export function copyBodyToClipboard(body?: string | null) { export async function removeSenderFromModerator(sender: string, convoId: string) { try { const pubKeyToRemove = PubKey.cast(sender); - const convo = getConversationController().getOrThrow(convoId); + const convo = ConvoHub.use().getOrThrow(convoId); const roomInfo = convo.toOpenGroupV2(); const res = await sogsV3RemoveAdmins([pubKeyToRemove], roomInfo); @@ -87,7 +87,7 @@ export async function removeSenderFromModerator(sender: string, convoId: string) export async function addSenderAsModerator(sender: string, convoId: string) { try { const pubKeyToAdd = PubKey.cast(sender); - const convo = getConversationController().getOrThrow(convoId); + const convo = ConvoHub.use().getOrThrow(convoId); const roomInfo = convo.toOpenGroupV2(); const res = await sogsV3AddAdmin([pubKeyToAdd], roomInfo); diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx index 03b15a90a6..ca3ec64e0a 100644 --- a/ts/mains/main_renderer.tsx +++ b/ts/mains/main_renderer.tsx @@ -8,7 +8,7 @@ import nativeEmojiData from '@emoji-mart/data'; import { MessageModel } from '../models/message'; import { isMacOS } from '../OS'; import { queueAllCached } from '../receiver/receiver'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { AttachmentDownloads, ToastUtils } from '../session/utils'; import { getOurPubKeyStrFromCache } from '../session/utils/User'; import { BlockedNumberController } from '../util'; @@ -202,9 +202,9 @@ Storage.onready(async () => { await initialiseEmojiData(nativeEmojiData); await AttachmentDownloads.initAttachmentPaths(); + await BlockedNumberController.load(); await Promise.all([ - getConversationController().load(), - BlockedNumberController.load(), + ConvoHub.use().load(), OpenGroupData.opengroupRoomsLoad(), loadKnownBlindedKeys(), ]); @@ -284,7 +284,7 @@ async function start() { window.setAutoHideMenuBar(hideMenuBar); window.setMenuBarVisibility(!hideMenuBar); // eslint-disable-next-line more/no-then - void getConversationController() + void ConvoHub.use() .loadPromise() ?.then(() => { ReactDOM.render(, document.getElementById('root')); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 537c9af0ce..934ebae1d3 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -20,7 +20,7 @@ import { import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { ClosedGroupV3VisibleMessage, ClosedGroupVisibleMessage, @@ -155,7 +155,7 @@ export class ConversationModel extends Backbone.Model { constructor(attributes: ConversationAttributes) { super(fillConvoAttributesWithDefaults(attributes)); - // This may be overridden by getConversationController().getOrCreate, and signify + // This may be overridden by ConvoHub.use().getOrCreate, and signify // our first save to the database. Or first fetch from the database. this.initialPromise = Promise.resolve(); autoBind(this); @@ -1584,7 +1584,7 @@ export class ConversationModel extends Backbone.Model { if (!this.isApproved()) { window?.log?.info('notification cancelled for unapproved convo', this.idForLogging()); const hadNoRequestsPrior = - getConversationController() + ConvoHub.use() .getConversations() .filter(conversation => { return ( @@ -1634,7 +1634,7 @@ export class ConversationModel extends Backbone.Model { } } - const convo = await getConversationController().getOrCreateAndWait( + const convo = await ConvoHub.use().getOrCreateAndWait( message.get('source'), ConversationTypeEnum.PRIVATE ); @@ -2335,7 +2335,7 @@ export class ConversationModel extends Backbone.Model { } export async function commitConversationAndRefreshWrapper(id: string) { - const convo = getConversationController().get(id); + const convo = ConvoHub.use().get(id); if (!convo) { return; } diff --git a/ts/models/message.ts b/ts/models/message.ts index bc3cfd3cf2..cd99044848 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -17,7 +17,7 @@ import { import filesize from 'filesize'; import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { DataMessage } from '../session/messages/outgoing'; import { PubKey } from '../session/types'; import { @@ -232,8 +232,7 @@ export class MessageModel extends Backbone.Model { (pubkeysInDesc || []).forEach((pubkeyWithAt: string) => { const pubkey = pubkeyWithAt.slice(1); const isUS = isUsAnySogsFromCache(pubkey); - const displayName = - getConversationController().getContactProfileNameOrShortenedPubKey(pubkey); + const displayName = ConvoHub.use().getContactProfileNameOrShortenedPubKey(pubkey); if (isUS) { description = description?.replace(pubkeyWithAt, `@${window.i18n('you')}`); } else if (displayName && displayName.length) { @@ -879,7 +878,7 @@ export class MessageModel extends Backbone.Model { // This needs to be an unsafe call, because this method is called during // initial module setup. We may be in the middle of the initial fetch to // the database. - return getConversationController().getUnsafe(this.get('conversationId')); + return ConvoHub.use().getUnsafe(this.get('conversationId')); } public getQuoteContact() { @@ -892,7 +891,7 @@ export class MessageModel extends Backbone.Model { return null; } - return getConversationController().get(author); + return ConvoHub.use().get(author); } public getSource() { @@ -1096,7 +1095,7 @@ export class MessageModel extends Backbone.Model { } // check the convo from this user // we want the convo of the sender of this message - const senderConvo = getConversationController().get(senderConvoId); + const senderConvo = ConvoHub.use().get(senderConvoId); if (!senderConvo) { return false; } @@ -1166,7 +1165,7 @@ export class MessageModel extends Backbone.Model { if (groupUpdate.left && groupUpdate.left.length === 1) { return window.i18n('leftTheGroup', [ - getConversationController().getContactProfileNameOrShortenedPubKey(groupUpdate.left[0]), + ConvoHub.use().getContactProfileNameOrShortenedPubKey(groupUpdate.left[0]), ]); } @@ -1178,9 +1177,7 @@ export class MessageModel extends Backbone.Model { return window.i18n('titleIsNow', [groupUpdate.name]); } if (groupUpdate.joined && groupUpdate.joined.length) { - const names = groupUpdate.joined.map( - getConversationController().getContactProfileNameOrShortenedPubKey - ); + const names = groupUpdate.joined.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey); if (names.length > 1) { messages.push(window.i18n('multipleJoinedTheGroup', [names.join(', ')])); @@ -1193,7 +1190,7 @@ export class MessageModel extends Backbone.Model { if (groupUpdate.kicked && groupUpdate.kicked.length) { const names = map( groupUpdate.kicked, - getConversationController().getContactProfileNameOrShortenedPubKey + ConvoHub.use().getContactProfileNameOrShortenedPubKey ); if (names.length > 1) { @@ -1217,16 +1214,16 @@ export class MessageModel extends Backbone.Model { ) as DataExtractionNotificationMsg; if (dataExtraction.type === SignalService.DataExtractionNotification.Type.SCREENSHOT) { return window.i18n('tookAScreenshot', [ - getConversationController().getContactProfileNameOrShortenedPubKey(dataExtraction.source), + ConvoHub.use().getContactProfileNameOrShortenedPubKey(dataExtraction.source), ]); } return window.i18n('savedTheFile', [ - getConversationController().getContactProfileNameOrShortenedPubKey(dataExtraction.source), + ConvoHub.use().getContactProfileNameOrShortenedPubKey(dataExtraction.source), ]); } if (this.get('callNotificationType')) { - const displayName = getConversationController().getContactProfileNameOrShortenedPubKey( + const displayName = ConvoHub.use().getContactProfileNameOrShortenedPubKey( this.get('conversationId') ); const callNotificationType = this.get('callNotificationType'); @@ -1268,7 +1265,7 @@ export class MessageCollection extends Backbone.Collection {} MessageCollection.prototype.model = MessageModel; export function findAndFormatContact(pubkey: string): FindAndFormatContactType { - const contactModel = getConversationController().get(pubkey); + const contactModel = ConvoHub.use().get(pubkey); let profileName: string | null = null; let isMe = false; diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index eef48d6480..f13dd3cd5b 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -3,7 +3,7 @@ import _, { isNumber, toNumber } from 'lodash'; import { Data } from '../data/data'; import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import * as ClosedGroup from '../session/group/closed-group'; import { PubKey } from '../session/types'; import { toHex } from '../session/utils/String'; @@ -110,7 +110,7 @@ export async function handleClosedGroupControlMessage( } if (type === Type.NEW) { if ( - !getConversationController() + !ConvoHub.use() .get(envelope.senderIdentity || envelope.source) ?.isApproved() ) { @@ -298,7 +298,7 @@ export async function handleNewClosedGroup( await removeFromCache(envelope); return; } - const groupConvo = getConversationController().get(groupId); + const groupConvo = ConvoHub.use().get(groupId); const expireTimer = groupUpdate.expireTimer; if (groupConvo) { @@ -341,8 +341,7 @@ export async function handleNewClosedGroup( } const convo = - groupConvo || - (await getConversationController().getOrCreateAndWait(groupId, ConversationTypeEnum.GROUP)); + groupConvo || (await ConvoHub.use().getOrCreateAndWait(groupId, ConversationTypeEnum.GROUP)); // ***** Creating a new group ***** window?.log?.info('Received a new ClosedGroup of id:', groupId); @@ -416,7 +415,7 @@ async function handleClosedGroupEncryptionKeyPair( return; } - const groupConvo = getConversationController().get(groupPublicKey); + const groupConvo = ConvoHub.use().get(groupPublicKey); if (!groupConvo) { window?.log?.warn( `Ignoring closed group encryption key pair for nonexistent group. ${groupPublicKey}` @@ -528,7 +527,7 @@ async function performIfValid( return; } - const convo = getConversationController().get(groupPublicKey); + const convo = ConvoHub.use().get(groupPublicKey); if (!convo) { window?.log?.warn('dropping message for nonexistent group'); await removeFromCache(envelope); @@ -571,7 +570,7 @@ async function performIfValid( return; } // make sure the conversation with this user exist (even if it's just hidden) - await getConversationController().getOrCreateAndWait(sender, ConversationTypeEnum.PRIVATE); + await ConvoHub.use().getOrCreateAndWait(sender, ConversationTypeEnum.PRIVATE); const moreRecentOrNah = await sentAtMoreRecentThanWrapper(envelopeTimestamp, 'UserGroupsConfig'); const shouldNotApplyGroupChange = moreRecentOrNah === 'wrapper_more_recent'; @@ -655,9 +654,7 @@ async function handleClosedGroupMembersAdded( const members = [...oldMembers, ...membersNotAlreadyPresent]; // make sure the conversation with those members (even if it's just hidden) await Promise.all( - members.map(async m => - getConversationController().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE) - ) + members.map(async m => ConvoHub.use().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE)) ); const groupDiff: ClosedGroup.GroupDiff = { @@ -732,7 +729,7 @@ async function handleClosedGroupMembersRemoved( const wasCurrentUserKicked = !membersAfterUpdate.includes(ourPubKey.key); if (wasCurrentUserKicked) { // we now want to remove everything related to a group when we get kicked from it. - await getConversationController().deleteClosedGroup(groupPubKey, { + await ConvoHub.use().deleteClosedGroup(groupPubKey, { fromSyncMessage: false, sendLeaveMessage: false, }); @@ -814,7 +811,7 @@ function removeMemberFromZombies( async function handleClosedGroupAdminMemberLeft(groupPublicKey: string, envelope: EnvelopePlus) { // if the admin was remove and we are the admin, it can only be voluntary - await getConversationController().deleteClosedGroup(groupPublicKey, { + await ConvoHub.use().deleteClosedGroup(groupPublicKey, { fromSyncMessage: false, sendLeaveMessage: false, }); @@ -823,7 +820,7 @@ async function handleClosedGroupAdminMemberLeft(groupPublicKey: string, envelope async function handleClosedGroupLeftOurself(groupId: string, envelope: EnvelopePlus) { // if we ourself left. It can only mean that another of our device left the group and we just synced that message through the swarm - await getConversationController().deleteClosedGroup(groupId, { + await ConvoHub.use().deleteClosedGroup(groupId, { fromSyncMessage: false, sendLeaveMessage: false, }); @@ -909,7 +906,7 @@ async function sendLatestKeyPairToUsers( await Promise.all( targetUsers.map(async member => { window?.log?.info(`Sending latest closed group encryption key pair to: ${member}`); - await getConversationController().getOrCreateAndWait(member, ConversationTypeEnum.PRIVATE); + await ConvoHub.use().getOrCreateAndWait(member, ConversationTypeEnum.PRIVATE); const wrappers = await ClosedGroup.buildEncryptionKeyPairWrappers([member], keyPairToUse); diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 709390bbca..8f23301b4f 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -11,7 +11,7 @@ import { getOpenGroupManager } from '../session/apis/open_group_api/opengroupV2/ import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; import { getOpenGroupV2ConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils'; import { getSwarmPollingInstance } from '../session/apis/snode_api'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { IncomingMessage } from '../session/messages/incoming/IncomingMessage'; import { ProfileManager } from '../session/profile_manager/ProfileManager'; import { PubKey } from '../session/types'; @@ -234,14 +234,14 @@ async function handleUserProfileUpdate(result: IncomingUserResult) { } function getContactsToRemoveFromDB(contactsInWrapper: Array) { - const allContactsInDBWhichShouldBeInWrapperIds = getConversationController() + const allContactsInDBWhichShouldBeInWrapperIds = ConvoHub.use() .getConversations() .filter(SessionUtilContact.isContactToStoreInWrapper) .map(m => m.id as string); const currentlySelectedConversationId = getCurrentlySelectedConversationOutsideRedux(); const currentlySelectedConvo = currentlySelectedConversationId - ? getConversationController().get(currentlySelectedConversationId) + ? ConvoHub.use().get(currentlySelectedConversationId) : undefined; // we might have some contacts not in the wrapper anymore, so let's clean things up. @@ -280,7 +280,7 @@ async function deleteContactsFromDB(contactsToRemove: Array) { for (let index = 0; index < contactsToRemove.length; index++) { const contactToRemove = contactsToRemove[index]; try { - await getConversationController().delete1o1(contactToRemove, { + await ConvoHub.use().delete1o1(contactToRemove, { fromSyncMessage: true, justHidePrivate: false, }); @@ -308,7 +308,7 @@ async function handleContactsUpdate() { // our profile update comes from our userProfile, not from the contacts wrapper. continue; } - const contactConvo = await getConversationController().getOrCreateAndWait( + const contactConvo = await ConvoHub.use().getOrCreateAndWait( wrapperConvo.id, ConversationTypeEnum.PRIVATE ); @@ -381,7 +381,7 @@ async function handleCommunitiesUpdate() { 'allCommunitiesInWrapper', allCommunitiesInWrapper.map(m => m.fullUrlWithPubkey) ); - const allCommunitiesConversation = getConversationController() + const allCommunitiesConversation = ConvoHub.use() .getConversations() .filter(SessionUtilUserGroups.isCommunityToStoreInWrapper); @@ -425,7 +425,7 @@ async function handleCommunitiesUpdate() { for (let index = 0; index < communitiesToLeaveInDB.length; index++) { const toLeave = communitiesToLeaveInDB[index]; window.log.info('leaving community with convoId ', toLeave.id); - await getConversationController().deleteCommunity(toLeave.id, { + await ConvoHub.use().deleteCommunity(toLeave.id, { fromSyncMessage: true, }); } @@ -457,7 +457,7 @@ async function handleCommunitiesUpdate() { fromWrapper.roomCasePreserved ); - const communityConvo = getConversationController().get(convoId); + const communityConvo = ConvoHub.use().get(convoId); if (fromWrapper && communityConvo) { let changes = false; @@ -475,7 +475,7 @@ async function handleCommunitiesUpdate() { async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { // first let's check which closed groups needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB const allLegacyGroupsInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups(); - const allLegacyGroupsInDb = getConversationController() + const allLegacyGroupsInDb = ConvoHub.use() .getConversations() .filter(SessionUtilUserGroups.isLegacyGroupToRemoveFromDBIfNotInWrapper); @@ -506,9 +506,9 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { 'leaving legacy group from configuration sync message with convoId ', toLeave.id ); - const toLeaveFromDb = getConversationController().get(toLeave.id); + const toLeaveFromDb = ConvoHub.use().get(toLeave.id); // the wrapper told us that this group is not tracked, so even if we left/got kicked from it, remove it from the DB completely - await getConversationController().deleteClosedGroup(toLeaveFromDb.id, { + await ConvoHub.use().deleteClosedGroup(toLeaveFromDb.id, { fromSyncMessage: true, sendLeaveMessage: false, // this comes from the wrapper, so we must have left/got kicked from that group already and our device already handled it. }); @@ -522,16 +522,13 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { ); // let's just create the required convo here, as we update the fields right below - await getConversationController().getOrCreateAndWait( - toJoin.pubkeyHex, - ConversationTypeEnum.GROUP - ); + await ConvoHub.use().getOrCreateAndWait(toJoin.pubkeyHex, ConversationTypeEnum.GROUP); } for (let index = 0; index < allLegacyGroupsInWrapper.length; index++) { const fromWrapper = allLegacyGroupsInWrapper[index]; - const legacyGroupConvo = getConversationController().get(fromWrapper.pubkeyHex); + const legacyGroupConvo = ConvoHub.use().get(fromWrapper.pubkeyHex); if (!legacyGroupConvo) { // this should not happen as we made sure to create them before window.log.warn( @@ -634,11 +631,8 @@ async function handleSingleGroupUpdate({ ); } - if (!getConversationController().get(groupPk)) { - const created = await getConversationController().getOrCreateAndWait( - groupPk, - ConversationTypeEnum.GROUPV3 - ); + if (!ConvoHub.use().get(groupPk)) { + const created = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV3); const joinedAt = groupInWrapper.joinedAtSeconds * 1000 || Date.now(); created.set({ active_at: joinedAt, @@ -658,7 +652,7 @@ async function handleSingleGroupUpdateToLeave(toLeave: string) { `About to deleteGroup ${toLeave} via handleSingleGroupUpdateToLeave as in DB but not in wrapper` ); - await getConversationController().deleteClosedGroup(toLeave, { + await ConvoHub.use().deleteClosedGroup(toLeave, { fromSyncMessage: true, sendLeaveMessage: false, }); @@ -673,7 +667,7 @@ async function handleSingleGroupUpdateToLeave(toLeave: string) { async function handleGroupUpdate(latestEnvelopeTimestamp: number) { // first let's check which groups needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB const allGoupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); - const allGoupsInDb = getConversationController() + const allGoupsInDb = ConvoHub.use() .getConversations() .filter(m => PubKey.isClosedGroupV2(m.id)); @@ -731,7 +725,7 @@ async function applyConvoVolatileUpdateFromWrapper( forcedUnread: boolean, lastReadMessageTimestamp: number ) { - const foundConvo = getConversationController().get(convoId); + const foundConvo = ConvoHub.use().get(convoId); if (!foundConvo) { return; } diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index a0daf1c071..bdee814bad 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -19,7 +19,7 @@ import { READ_MESSAGE_STATE, } from '../models/conversationAttributes'; import { findCachedBlindedMatchOrLookupOnAllServers } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { concatUInt8Array, getSodiumRenderer } from '../session/crypto'; import { removeMessagePadding } from '../session/crypto/BufferPadding'; import { ProfileManager } from '../session/profile_manager/ProfileManager'; @@ -365,7 +365,7 @@ function shouldDropBlockedUserMessage( return true; } - const groupConvo = getConversationController().get(groupPubkey); + const groupConvo = ConvoHub.use().get(groupPubkey); if (!groupConvo || !groupConvo.isClosedGroup()) { return true; } @@ -446,7 +446,7 @@ export async function innerHandleSwarmContentMessage( * For a closed group message, this holds the conversation with that specific user outside of the closed group. * For a private conversation message, this is just the conversation with that user */ - const senderConversationModel = await getConversationController().getOrCreateAndWait( + const senderConversationModel = await ConvoHub.use().getOrCreateAndWait( isPrivateConversationMessage ? envelope.source : envelope.senderIdentity, ConversationTypeEnum.PRIVATE ); @@ -457,10 +457,7 @@ export async function innerHandleSwarmContentMessage( */ if (!isPrivateConversationMessage) { // this is a closed group message, we have a second conversation to make sure exists - await getConversationController().getOrCreateAndWait( - envelope.source, - ConversationTypeEnum.GROUP - ); + await ConvoHub.use().getOrCreateAndWait(envelope.source, ConversationTypeEnum.GROUP); } if (content.dataMessage) { @@ -598,7 +595,7 @@ async function handleTypingMessage( } // typing message are only working with direct chats/ not groups - const conversation = getConversationController().get(source); + const conversation = ConvoHub.use().get(source); const started = action === SignalService.TypingMessage.Action.STARTED; @@ -653,7 +650,7 @@ async function handleUnsendMessage(envelope: EnvelopePlus, unsendMessage: Signal // #region executing deletion if (messageHash && messageToDelete) { window.log.info('handleUnsendMessage: got a request to delete ', messageHash); - const conversation = getConversationController().get(messageToDelete.get('conversationId')); + const conversation = ConvoHub.use().get(messageToDelete.get('conversationId')); if (!conversation) { await removeFromCache(envelope); @@ -699,7 +696,7 @@ async function handleMessageRequestResponse( const convosToMerge = findCachedBlindedMatchOrLookupOnAllServers(envelope.source, sodium); const unblindedConvoId = envelope.source; - const conversationToApprove = await getConversationController().getOrCreateAndWait( + const conversationToApprove = await ConvoHub.use().getOrCreateAndWait( unblindedConvoId, ConversationTypeEnum.PRIVATE ); @@ -757,7 +754,7 @@ async function handleMessageRequestResponse( for (let index = 0; index < convosToMerge.length; index++) { const element = convosToMerge[index]; // eslint-disable-next-line no-await-in-loop - await getConversationController().deleteBlindedContact(element.id); + await ConvoHub.use().deleteBlindedContact(element.id); } } @@ -805,7 +802,7 @@ export async function handleDataExtractionNotification( const { source, timestamp } = envelope; await removeFromCache(envelope); - const convo = getConversationController().get(source); + const convo = ConvoHub.use().get(source); if (!convo || !convo.isPrivate() || !Storage.get(SettingsKey.settingsReadReceipt)) { window?.log?.info( 'Got DataNotification for unknown or non private convo or read receipt not enabled' diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index ac32e58d06..b89a2a5f2e 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -8,7 +8,7 @@ import { EnvelopePlus } from './types'; import { Data } from '../data/data'; import { ConversationModel } from '../models/conversation'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { PubKey } from '../session/types'; import { StringUtils, UserUtils } from '../session/utils'; import { handleClosedGroupControlMessage } from './closedGroups'; @@ -208,7 +208,7 @@ export async function handleSwarmDataMessage( ); // remove the prefix from the source object so this is correct for all other - const convoToAddMessageTo = await getConversationController().getOrCreateAndWait( + const convoToAddMessageTo = await ConvoHub.use().getOrCreateAndWait( convoIdToAddTheMessageTo, typeOfConvo ); diff --git a/ts/receiver/opengroup.ts b/ts/receiver/opengroup.ts index 790fa49162..db49c1510b 100644 --- a/ts/receiver/opengroup.ts +++ b/ts/receiver/opengroup.ts @@ -8,7 +8,7 @@ import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/openg import { OpenGroupMessageV4 } from '../session/apis/open_group_api/opengroupV2/OpenGroupServerPoller'; import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; import { getOpenGroupV2ConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { removeMessagePadding } from '../session/crypto/BufferPadding'; import { perfEnd, perfStart } from '../session/utils/Performance'; import { fromBase64ToArray } from '../session/utils/String'; @@ -68,12 +68,12 @@ const handleOpenGroupMessage = async ( return; } - if (!getConversationController().get(conversationId)?.isOpenGroupV2()) { + if (!ConvoHub.use().get(conversationId)?.isOpenGroupV2()) { window?.log?.error('Received a message for an unknown convo or not an v2. Skipping'); return; } - const groupConvo = getConversationController().get(conversationId); + const groupConvo = ConvoHub.use().get(conversationId); if (!groupConvo) { window?.log?.warn('Skipping handleJob for unknown convo: ', conversationId); diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index 61e40f4f62..956f9ddebe 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -5,7 +5,7 @@ import { queueAttachmentDownloads } from './attachments'; import { Data } from '../data/data'; import { ConversationModel } from '../models/conversation'; import { MessageModel } from '../models/message'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { Quote } from './types'; import { ConversationTypeEnum, READ_MESSAGE_STATE } from '../models/conversationAttributes'; @@ -385,7 +385,7 @@ export async function handleMessageJob( } in conversation ${conversation.idForLogging()}` ); - const sendingDeviceConversation = await getConversationController().getOrCreateAndWait( + const sendingDeviceConversation = await ConvoHub.use().getOrCreateAndWait( source, ConversationTypeEnum.PRIVATE ); diff --git a/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts b/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts index 4ba6fae61b..bb0602cafa 100644 --- a/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts +++ b/ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts @@ -5,7 +5,7 @@ import { updateDefaultRoomsInProgress, } from '../../../../state/ducks/defaultRooms'; import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { getConversationController } from '../../../conversations'; +import { ConvoHub } from '../../../conversations'; import { allowOnlyOneAtATime } from '../../../utils/Promise'; import { getAllRoomInfos } from '../sogsv3/sogsV3RoomInfos'; import { parseOpenGroupV2 } from './JoinOpenGroupV2'; @@ -130,9 +130,7 @@ export function hasExistingOpenGroup(server: string, roomId: string) { const matchingRoom = rooms.find(r => r.roomId === roomId); return Boolean( - matchingRoom && - matchingRoom.conversationId && - getConversationController().get(matchingRoom.conversationId) + matchingRoom && matchingRoom.conversationId && ConvoHub.use().get(matchingRoom.conversationId) ); } diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts index 02457ad4f0..780f973ba3 100644 --- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts +++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts @@ -1,6 +1,6 @@ import { OpenGroupV2Room } from '../../../../data/opengroups'; import { ConversationModel } from '../../../../models/conversation'; -import { getConversationController } from '../../../conversations'; +import { ConvoHub } from '../../../conversations'; import { PromiseUtils, ToastUtils } from '../../../utils'; import { forceSyncConfigurationNowIfNeeded } from '../../../utils/sync/syncUtils'; @@ -71,7 +71,7 @@ async function joinOpenGroupV2( const alreadyExist = hasExistingOpenGroup(serverUrl, roomId); const conversationId = getOpenGroupV2ConversationId(serverUrl, roomId); - const existingConvo = getConversationController().get(conversationId); + const existingConvo = ConvoHub.use().get(conversationId); if (alreadyExist) { window?.log?.warn('Skipping join opengroupv2: already exists'); @@ -81,7 +81,7 @@ async function joinOpenGroupV2( // we already have a convo associated with it. Remove everything related to it so we start fresh window?.log?.warn('leaving before rejoining open group v2 room', conversationId); - await getConversationController().deleteCommunity(conversationId, { + await ConvoHub.use().deleteCommunity(conversationId, { fromSyncMessage: true, }); } @@ -145,8 +145,8 @@ export async function joinOpenGroupV2WithUIEvents( } const alreadyExist = hasExistingOpenGroup(parsedRoom.serverUrl, parsedRoom.roomId); const conversationID = getOpenGroupV2ConversationId(parsedRoom.serverUrl, parsedRoom.roomId); - if (alreadyExist || getConversationController().get(conversationID)) { - const existingConvo = getConversationController().get(conversationID); + if (alreadyExist || ConvoHub.use().get(conversationID)) { + const existingConvo = ConvoHub.use().get(conversationID); await existingConvo.setDidApproveMe(true, false); await existingConvo.setIsApproved(true, false); await existingConvo.commit(); diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts index fde16bcc9d..a4b4cc6fc1 100644 --- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts +++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts @@ -6,7 +6,7 @@ import autoBind from 'auto-bind'; import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups'; import { ConversationModel } from '../../../../models/conversation'; -import { getConversationController } from '../../../conversations'; +import { ConvoHub } from '../../../conversations'; import { allowOnlyOneAtATime } from '../../../utils/Promise'; import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils'; import { @@ -156,7 +156,7 @@ export class OpenGroupManagerV2 { await OpenGroupData.removeV2OpenGroupRoom(roomConvoId); getOpenGroupManager().removeRoomFromPolledRooms(infos); - await getConversationController().deleteCommunity(roomConvoId, { + await ConvoHub.use().deleteCommunity(roomConvoId, { fromSyncMessage: false, }); } @@ -185,7 +185,7 @@ export class OpenGroupManagerV2 { ): Promise { let conversationId = getOpenGroupV2ConversationId(serverUrl, roomId); - if (getConversationController().get(conversationId)) { + if (ConvoHub.use().get(conversationId)) { // Url incorrect or server not compatible throw new Error(window.i18n('publicChatExists')); } @@ -233,7 +233,7 @@ export class OpenGroupManagerV2 { await OpenGroupData.saveV2OpenGroupRoom(updatedRoom); } - const conversation = await getConversationController().getOrCreateAndWait( + const conversation = await ConvoHub.use().getOrCreateAndWait( conversationId, ConversationTypeEnum.GROUP ); diff --git a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts index e569eb40b5..771d1594d0 100644 --- a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts +++ b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts @@ -2,7 +2,7 @@ import { from_hex, to_hex } from 'libsodium-wrappers-sumo'; import { crypto_sign_curve25519_pk_to_ed25519 } from 'curve25519-js'; import { cloneDeep, flatten, isEmpty, isEqual, isString, uniqBy } from 'lodash'; -import { getConversationController } from '../../../conversations'; +import { ConvoHub } from '../../../conversations'; import { LibSodiumWrappers } from '../../../crypto'; import { KeyPrefixType, PubKey } from '../../../types'; import { Data } from '../../../../data/data'; @@ -202,7 +202,7 @@ function findNotCachedBlindingMatch( } // we iterate only over the convos private, approved, and which have an unblinded id. - const foundConvoMatchingBlindedPubkey = getConversationController() + const foundConvoMatchingBlindedPubkey = ConvoHub.use() .getConversations() .filter(m => m.isPrivate() && m.isApproved() && !PubKey.isBlinded(m.id)) .find(m => { @@ -238,7 +238,7 @@ export function getUsBlindedInThatServer(convo: ConversationModel | string): str } const convoId = isString(convo) ? convo : convo.id; - if (!getConversationController().get(convoId)?.isOpenGroupV2()) { + if (!ConvoHub.use().get(convoId)?.isOpenGroupV2()) { return undefined; } const room = OpenGroupData.getV2OpenGroupRoom(isString(convo) ? convo : convo.id); @@ -273,7 +273,7 @@ function findNotCachedBlindedConvoFromUnblindedKey( // we iterate only over the convos private, with a blindedId, and active, // so the one to which we sent a message already or received one from outside sogs. const foundConvosForThisServerPk = - getConversationController() + ConvoHub.use() .getConversations() .filter(m => m.isPrivate() && PubKey.isBlinded(m.id) && m.isActive()) .filter(m => { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts index f234259830..e117b3d294 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts @@ -14,7 +14,7 @@ import { } from '../opengroupV2/OpenGroupServerPoller'; import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils'; import { handleCapabilities } from './sogsCapabilities'; -import { getConversationController } from '../../../conversations'; +import { ConvoHub } from '../../../conversations'; import { ConversationModel } from '../../../../models/conversation'; import { filterDuplicatesFromDbAndIncomingV4 } from '../opengroupV2/SogsFilterDuplicate'; import { callUtilsWorker } from '../../../../webworker/workers/browser/util_worker_interface'; @@ -54,7 +54,7 @@ function getSogsConvoOrReturnEarly(serverUrl: string, roomId: string): Conversat return null; } - const foundConvo = getConversationController().get(convoId); + const foundConvo = ConvoHub.use().get(convoId); if (!foundConvo) { window.log.info('getSogsConvoOrReturnEarly: convo not found: ', convoId); return null; @@ -174,7 +174,7 @@ const handleSogsV3DeletedMessages = async ( try { const convoId = getOpenGroupV2ConversationId(serverUrl, roomId); - const convo = getConversationController().get(convoId); + const convo = ConvoHub.use().get(convoId); const messageIds = await Data.getMessageIdsFromServerIds(allIdsRemoved, convo.id); allIdsRemoved.forEach(removedId => { @@ -319,7 +319,7 @@ const handleMessagesResponseV4 = async ( if (messagesWithReactions.length > 0) { const conversationId = getOpenGroupV2ConversationId(serverUrl, roomId); - const groupConvo = getConversationController().get(conversationId); + const groupConvo = ConvoHub.use().get(conversationId); if (groupConvo && groupConvo.isOpenGroupV2()) { for (const messageWithReaction of messagesWithReactions) { if (isEmpty(messageWithReaction.reactions)) { @@ -422,7 +422,7 @@ async function handleInboxOutboxMessages( (await findCachedBlindedMatchOrLookItUp(recipient, serverPubkey, sodium)) || recipient; if (contentDecoded.dataMessage) { - const outboxConversationModel = await getConversationController().getOrCreateAndWait( + const outboxConversationModel = await ConvoHub.use().getOrCreateAndWait( unblindedIDOrBlinded, ConversationTypeEnum.PRIVATE ); diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts index 9bbec74ec7..de45a9c0d3 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts @@ -9,7 +9,7 @@ import { MIME } from '../../../../types'; import { processNewAttachment } from '../../../../types/MessageAttachment'; import { roomHasBlindEnabled } from '../../../../types/sqlSharedTypes'; import { callUtilsWorker } from '../../../../webworker/workers/browser/util_worker_interface'; -import { getConversationController } from '../../../conversations'; +import { ConvoHub } from '../../../conversations'; import { OnionSending } from '../../../onions/onionSend'; import { allowOnlyOneAtATime } from '../../../utils/Promise'; import { OpenGroupPollingUtils } from '../opengroupV2/OpenGroupPollingUtils'; @@ -88,7 +88,7 @@ export async function sogsV3FetchPreviewAndSaveIt(roomInfos: OpenGroupV2RoomWith const imageIdNumber = toNumber(imageID); const convoId = getOpenGroupV2ConversationId(roomInfos.serverUrl, roomInfos.roomId); - let convo = getConversationController().get(convoId); + let convo = ConvoHub.use().get(convoId); if (!convo) { return; } @@ -113,7 +113,7 @@ export async function sogsV3FetchPreviewAndSaveIt(roomInfos: OpenGroupV2RoomWith return; } // refresh to make sure the convo was not deleted during the fetch above - convo = getConversationController().get(convoId); + convo = ConvoHub.use().get(convoId); if (!convo) { return; } diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 96a1be92d8..0d8167771a 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -1,7 +1,8 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable more/no-then */ /* eslint-disable @typescript-eslint/no-misused-promises */ -import { compact, concat, difference, flatten, last, sample, uniqBy } from 'lodash'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { compact, concat, difference, flatten, isArray, last, sample, uniqBy } from 'lodash'; import { Data, Snode } from '../../../data/data'; import { SignalService } from '../../../protobuf'; import * as Receiver from '../../../receiver/receiver'; @@ -19,7 +20,7 @@ import { UserGroupsWrapperActions, } from '../../../webworker/workers/browser/libsession_worker_interface'; import { DURATION, SWARM_POLLING_TIMEOUT } from '../../constants'; -import { getConversationController } from '../../conversations'; +import { ConvoHub } from '../../conversations'; import { ed25519Str } from '../../onions/onionPath'; import { StringUtils, UserUtils } from '../../utils'; import { perfEnd, perfStart } from '../../utils/Performance'; @@ -70,8 +71,18 @@ export const getSwarmPollingInstance = () => { return instance; }; +type GroupPollingEntry = { pubkey: PubKey; lastPolledTimestamp: number }; + +function entryToKey(entry: GroupPollingEntry) { + return entry.pubkey.key; +} + export class SwarmPolling { - private groupPolling: Array<{ pubkey: PubKey; lastPolledTimestamp: number }>; + private groupPolling: Array; + + /** + * lastHashes[snode_edkey][pubkey_polled][namespace_polled] = last_hash + */ private readonly lastHashes: Record>>; private hasStarted = false; @@ -104,22 +115,21 @@ export class SwarmPolling { this.hasStarted = false; } - public forcePolledTimestamp(pubkey: PubKey, lastPoll: number) { - this.groupPolling = this.groupPolling.map(group => { - if (PubKey.isEqual(pubkey, group.pubkey)) { - return { - ...group, - lastPolledTimestamp: lastPoll, - }; - } - return group; + public forcePolledTimestamp(pubkey: string, lastPoll: number) { + const foundAt = this.groupPolling.findIndex(group => { + return PubKey.isEqual(pubkey, group.pubkey); }); + + if (foundAt > -1) { + this.groupPolling[foundAt].lastPolledTimestamp = lastPoll; + } } - public addGroupId(pubkey: PubKey) { - if (this.groupPolling.findIndex(m => m.pubkey.key === pubkey.key) === -1) { - window?.log?.info('Swarm addGroupId: adding pubkey to polling', pubkey.key); - this.groupPolling.push({ pubkey, lastPolledTimestamp: 0 }); + public addGroupId(pubkey: PubKey | string) { + const pk = PubKey.cast(pubkey); + if (this.groupPolling.findIndex(m => m.pubkey.key === pk.key) === -1) { + window?.log?.info('Swarm addGroupId: adding pubkey to polling', pk.key); + this.groupPolling.push({ pubkey: pk, lastPolledTimestamp: 0 }); } } @@ -140,7 +150,7 @@ export class SwarmPolling { * -> an activeAt more than a week old is considered inactive, and not polled much (every 2 minutes) */ public getPollingTimeout(convoId: PubKey) { - const convo = getConversationController().get(convoId.key); + const convo = ConvoHub.use().get(convoId.key); if (!convo) { return SWARM_POLLING_TIMEOUT.INACTIVE; } @@ -150,18 +160,76 @@ export class SwarmPolling { } const currentTimestamp = Date.now(); + const diff = currentTimestamp - activeAt; // consider that this is an active group if activeAt is less than two days old - if (currentTimestamp - activeAt <= DURATION.DAYS * 2) { + if (diff <= DURATION.DAYS * 2) { return SWARM_POLLING_TIMEOUT.ACTIVE; } - if (currentTimestamp - activeAt <= DURATION.DAYS * 7) { + if (diff <= DURATION.DAYS * 7) { return SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE; } return SWARM_POLLING_TIMEOUT.INACTIVE; } + public shouldPollByTimeout(entry: GroupPollingEntry) { + const convoPollingTimeout = this.getPollingTimeout(entry.pubkey); + const diff = Date.now() - entry.lastPolledTimestamp; + return diff >= convoPollingTimeout; + } + + public async getPollingDetails(pollingEntries: Array) { + let toPollDetails: Array = []; + const ourPubkey = UserUtils.getOurPubKeyStrFromCache(); + + if (pollingEntries.some(m => m.pubkey.key === ourPubkey)) { + throw new Error( + 'pollingEntries should only contain group swarm (legacy or not), but not ourself' + ); + } + + // First, make sure we do poll for our own swarm. Note: we always poll as often as possible for our swarm + toPollDetails.push([ourPubkey, ConversationTypeEnum.PRIVATE]); + + const allGroupsLegacyInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups(); + const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); + if (!isArray(allGroupsLegacyInWrapper) || !isArray(allGroupsInWrapper)) { + throw new Error('getAllLegacyGroups or getAllGroups returned unknown result'); + } + + // only groups NOT starting with 03 + const legacyGroups = pollingEntries.filter(m => !PubKey.isClosedGroupV2(m.pubkey.key)); + + // only groups starting with 03 + const groups = pollingEntries.filter(m => PubKey.isClosedGroupV2(m.pubkey.key)); + + // let's grab the groups and legacy groups which should be left as they are not in their corresponding wrapper + const legacyGroupsToLeave = legacyGroups + .filter(m => !allGroupsLegacyInWrapper.some(w => w.pubkeyHex === m.pubkey.key)) + .map(entryToKey); + const groupsToLeave = groups + .filter(m => !allGroupsInWrapper.some(w => w.pubkeyHex === m.pubkey.key)) + .map(entryToKey); + + const allLegacyGroupsTracked = legacyGroups + .filter(m => this.shouldPollByTimeout(m)) // should we poll from it depending on this group activity? + .filter(m => allGroupsLegacyInWrapper.some(w => w.pubkeyHex === m.pubkey.key)) // we don't poll from legacygroups which are not in the usergroup wrapper + .map(m => m.pubkey.key) // extract the pubkey + .map(m => [m, ConversationTypeEnum.GROUP] as PollForLegacy); // + toPollDetails = concat(toPollDetails, allLegacyGroupsTracked); + + const allGroupsTracked = groups + .filter(m => this.shouldPollByTimeout(m)) // should we poll from it depending on this group activity? + .filter(m => allGroupsInWrapper.some(w => w.pubkeyHex === m.pubkey.key)) // we don't poll from groups which are not in the usergroup wrapper + .map(m => m.pubkey.key as GroupPubkeyType) // extract the pubkey + .map(m => [m, ConversationTypeEnum.GROUPV3] as PollForGroup); + + toPollDetails = concat(toPollDetails, allGroupsTracked); + + return { toPollDetails, legacyGroupsToLeave, groupsToLeave }; + } + /** * Only public for testing */ @@ -172,44 +240,20 @@ export class SwarmPolling { setTimeout(this.pollForAllKeys.bind(this), SWARM_POLLING_TIMEOUT.ACTIVE); return; } - // we always poll as often as possible for our pubkey - const ourPubkey = UserUtils.getOurPubKeyStrFromCache(); - const directPromise = this.pollOnceForKey([ourPubkey, ConversationTypeEnum.PRIVATE]); - const now = Date.now(); - const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); - const allGroupsLegacyInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups(); - const groupPromises = this.groupPolling.map(async group => { - const convoPollingTimeout = this.getPollingTimeout(group.pubkey); - const diff = now - group.lastPolledTimestamp; - const { key } = group.pubkey; - - const loggingId = ed25519Str(key); - if (diff >= convoPollingTimeout) { - window?.log?.debug( - `Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} ` - ); - if (PubKey.isClosedGroupV2(key)) { - const isInWrapper = allGroupsInWrapper.some(m => m.pubkeyHex === key); - - return isInWrapper - ? this.pollOnceForKey([key, ConversationTypeEnum.GROUPV3]) - : this.notPollingForGroupAsNotInWrapper(key, 'not in wrapper before poll'); - } - const isLegacyInWrapper = allGroupsLegacyInWrapper.some(m => m.pubkeyHex === key); - return isLegacyInWrapper - ? this.pollOnceForKey([key, ConversationTypeEnum.GROUP]) - : this.notPollingForGroupAsNotInWrapper(key, 'not in wrapper before poll'); - } - window?.log?.debug( - `Not polling for ${loggingId}; timeout: ${convoPollingTimeout} ; diff: ${diff}` - ); + const { toPollDetails, groupsToLeave, legacyGroupsToLeave } = await this.getPollingDetails( + this.groupPolling + ); - return Promise.resolve(); - }); + // first, leave anything which shouldn't be there anymore + await Promise.all( + concat(groupsToLeave, legacyGroupsToLeave).map(m => + this.notPollingForGroupAsNotInWrapper(m, 'not in wrapper before poll') + ) + ); try { - await Promise.all(concat([directPromise], groupPromises)); + await Promise.all(toPollDetails.map(toPoll => this.pollOnceForKey(toPoll))); } catch (e) { window?.log?.warn('pollForAllKeys exception: ', e); throw e; @@ -459,7 +503,7 @@ export class SwarmPolling { window.log.debug( `notPollingForGroupAsNotInWrapper ${ed25519Str(pubkey)} with reason:"${reason}"` ); - await getConversationController().deleteClosedGroup(pubkey, { + await ConvoHub.use().deleteClosedGroup(pubkey, { fromSyncMessage: true, sendLeaveMessage: false, }); @@ -467,7 +511,7 @@ export class SwarmPolling { } private loadGroupIds() { - const convos = getConversationController().getConversations(); + const convos = ConvoHub.use().getConversations(); const closedGroupsOnly = convos.filter( (c: ConversationModel) => @@ -502,7 +546,7 @@ export class SwarmPolling { } // eslint-disable-next-line consistent-return - private getNamespacesToPollFrom(type: ConversationTypeEnum): Array { + public getNamespacesToPollFrom(type: ConversationTypeEnum): Array { if (type === ConversationTypeEnum.PRIVATE) { return [ SnodeNamespaces.Default, diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 1d91c56cb3..eed07b1186 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -38,7 +38,7 @@ import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user let instance: ConversationController | null; -export const getConversationController = () => { +const getConversationController = () => { if (instance) { return instance; } @@ -47,13 +47,13 @@ export const getConversationController = () => { return instance; }; -export class ConversationController { +class ConversationController { private readonly conversations: ConversationCollection; private _initialFetchComplete: boolean = false; private _initialPromise?: Promise; /** - * Do not call this constructor. You get the ConversationController through getConversationController() only + * Do not call this constructor. You get the ConversationController through ConvoHub.use() only */ constructor() { this.conversations = new ConversationCollection(); @@ -62,7 +62,7 @@ export class ConversationController { // FIXME this could return | undefined public get(id: string): ConversationModel { if (!this._initialFetchComplete) { - throw new Error('getConversationController().get() needs complete initial fetch'); + throw new Error('ConvoHub.use().get() needs complete initial fetch'); } return this.conversations.get(id); @@ -70,7 +70,7 @@ export class ConversationController { public getOrThrow(id: string): ConversationModel { if (!this._initialFetchComplete) { - throw new Error('getConversationController().get() needs complete initial fetch'); + throw new Error('ConvoHub.use().get() needs complete initial fetch'); } const convo = this.conversations.get(id); @@ -78,7 +78,7 @@ export class ConversationController { if (convo) { return convo; } - throw new Error(`Conversation ${id} does not exist on getConversationController().get()`); + throw new Error(`Conversation ${id} does not exist on ConvoHub.use().get()`); } // Needed for some model setup which happens during the initial fetch() call below public getUnsafe(id: string): ConversationModel | undefined { @@ -100,12 +100,12 @@ export class ConversationController { if (type === ConversationTypeEnum.GROUPV3 && !PubKey.isClosedGroupV2(id)) { throw new Error( - 'required v3 closed group` ` but the pubkey does not match the 03 prefix for them' + 'required v3 closed group but the pubkey does not match the 03 prefix for them' ); } if (!this._initialFetchComplete) { - throw new Error('getConversationController().get() needs complete initial fetch'); + throw new Error('ConvoHub.use().get() needs complete initial fetch'); } if (this.conversations.get(id)) { @@ -153,7 +153,7 @@ export class ConversationController { } public getContactProfileNameOrShortenedPubKey(pubKey: string): string { - const conversation = getConversationController().get(pubKey); + const conversation = ConvoHub.use().get(pubKey); if (!conversation) { return pubKey; } @@ -188,9 +188,7 @@ export class ConversationController { */ public async deleteBlindedContact(blindedId: string) { if (!this._initialFetchComplete) { - throw new Error( - 'getConversationController().deleteBlindedContact() needs complete initial fetch' - ); + throw new Error('ConvoHub.use().deleteBlindedContact() needs complete initial fetch'); } if (!PubKey.isBlinded(blindedId)) { throw new Error('deleteBlindedContact allow accepts blinded id'); @@ -314,12 +312,17 @@ export class ConversationController { } public async load() { + window.log.warn(`plop1`); + if (this.conversations.length) { throw new Error('ConversationController: Already loaded!'); } + window.log.warn(`plop1`); const load = async () => { try { + window.log.warn(`plop2`); + const startLoad = Date.now(); const convoModels = await Data.getAllConversations(); @@ -375,7 +378,6 @@ export class ConversationController { throw error; } }; - await BlockedNumberController.load(); this._initialPromise = load(); @@ -397,7 +399,7 @@ export class ConversationController { private async deleteConvoInitialChecks(convoId: string, deleteType: ConvoVolatileType) { if (!this._initialFetchComplete) { - throw new Error(`getConversationController.${deleteType} needs complete initial fetch`); + throw new Error(`ConvoHub.${deleteType} needs complete initial fetch`); } window.log.info(`${deleteType} with ${convoId}`); @@ -453,7 +455,7 @@ export class ConversationController { * So if the user made the action on this device, fromSyncMessage should be false, but if it happened from a linked device polled update, set this to true. */ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { - const convo = getConversationController().get(groupId); + const convo = ConvoHub.use().get(groupId); if (!convo || !convo.isClosedGroup()) { window?.log?.error('Cannot leave non-existing group'); @@ -566,3 +568,5 @@ async function removeCommunityFromWrappers(conversationId: string) { window?.log?.info('SessionUtilUserGroups.removeCommunityFromWrapper failed:', e.message); } } + +export const ConvoHub = { use: getConversationController }; diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index db2ee0165a..e9b1793ef7 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -15,7 +15,7 @@ import { import { PubKey } from '../types'; import { UserUtils } from '../utils'; import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils'; -import { getConversationController } from './ConversationController'; +import { ConvoHub } from './ConversationController'; /** * Creates a brand new closed group from user supplied details. This function generates a new identityKeyPair so cannot be used to restore a closed group. @@ -43,10 +43,7 @@ export async function createClosedGroup(groupName: string, members: Array ) { const isGroupV3 = PubKey.isClosedGroupV2(groupId); - const convo = await getConversationController().getOrCreateAndWait( + const convo = await ConvoHub.use().getOrCreateAndWait( groupId, isGroupV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP ); @@ -208,7 +208,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) { const isV3 = PubKey.isClosedGroupV2(id); - const conversation = await getConversationController().getOrCreateAndWait( + const conversation = await ConvoHub.use().getOrCreateAndWait( id, isV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP ); @@ -313,7 +313,7 @@ async function sendAddedMembers( }); const promises = addedMembers.map(async m => { - await getConversationController().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE); + await ConvoHub.use().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE); const memberPubKey = PubKey.cast(m); await getMessageQueue().sendToPubKey( memberPubKey, @@ -374,7 +374,7 @@ async function generateAndSendNewEncryptionKeyPair( groupPublicKey: string, targetMembers: Array ) { - const groupConvo = getConversationController().get(groupPublicKey); + const groupConvo = ConvoHub.use().get(groupPublicKey); const groupId = fromHexToArray(groupPublicKey); if (!groupConvo) { diff --git a/ts/session/group/open-group.ts b/ts/session/group/open-group.ts index 7f08c4f01d..3026af5d53 100644 --- a/ts/session/group/open-group.ts +++ b/ts/session/group/open-group.ts @@ -4,7 +4,7 @@ import { MIME } from '../../types'; import { urlToBlob } from '../../types/attachments/VisualAttachment'; import { processNewAttachment } from '../../types/MessageAttachment'; import { uploadImageForRoomSogsV3 } from '../apis/open_group_api/sogsv3/sogsV3RoomImage'; -import { getConversationController } from '../conversations'; +import { ConvoHub } from '../conversations'; export type OpenGroupUpdateAvatar = { objectUrl: string | null }; @@ -19,7 +19,7 @@ export async function initiateOpenGroupUpdate( ) { // we actually do not change the groupName just yet here, serverSide. This is just done client side. Maybe something to allow in a later release. // For now, the UI is actually not allowing changing the room name so we do not care. - const convo = getConversationController().get(groupId); + const convo = ConvoHub.use().get(groupId); if (!convo?.isPublic()) { throw new Error('initiateOpenGroupUpdate can only be used for communities'); diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts index 2d7590f17c..d3962fdad3 100644 --- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts @@ -5,7 +5,7 @@ import { MessageParams } from '../Message'; import { ContentMessage } from '..'; import { PubKey } from '../../../types'; import { getMessageQueue } from '../../..'; -import { getConversationController } from '../../../conversations'; +import { ConvoHub } from '../../../conversations'; import { UserUtils } from '../../../utils'; import { SettingsKey } from '../../../../data/settings-key'; import { Storage } from '../../../../util/storage'; @@ -53,7 +53,7 @@ export const sendDataExtractionNotification = async ( attachmentSender: string, referencedAttachmentTimestamp: number ) => { - const convo = getConversationController().get(conversationId); + const convo = ConvoHub.use().get(conversationId); if ( !convo || !convo.isPrivate() || diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts index 77bddc95d1..fd29696216 100644 --- a/ts/session/profile_manager/ProfileManager.ts +++ b/ts/session/profile_manager/ProfileManager.ts @@ -1,5 +1,5 @@ import { isEmpty } from 'lodash'; -import { getConversationController } from '../conversations'; +import { ConvoHub } from '../conversations'; import { UserUtils } from '../utils'; import { toHex } from '../utils/String'; import { AvatarDownload } from '../utils/job_runners/jobs/AvatarDownloadJob'; @@ -14,7 +14,7 @@ async function updateOurProfileSync( priority: number | null ) { const us = UserUtils.getOurPubKeyStrFromCache(); - const ourConvo = getConversationController().get(us); + const ourConvo = ConvoHub.use().get(us); if (!ourConvo?.id) { window?.log?.warn('[profileupdate] Cannot update our profile without convo associated'); return; @@ -36,7 +36,7 @@ async function updateProfileOfContact( profileUrl: string | null | undefined, profileKey: Uint8Array | null | undefined ) { - const conversation = getConversationController().get(pubkey); + const conversation = ConvoHub.use().get(pubkey); if (!conversation || !conversation.isPrivate()) { window.log.warn('updateProfileOfContact can only be used for existing and private convos'); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index b1ce4af039..5d530b4bae 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -26,7 +26,7 @@ import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; import { getSwarmFor } from '../apis/snode_api/snodePool'; import { SnodeSignature } from '../apis/snode_api/snodeSignatures'; import { SnodeAPIStore } from '../apis/snode_api/storeMessage'; -import { getConversationController } from '../conversations'; +import { ConvoHub } from '../conversations'; import { MessageEncrypter } from '../crypto'; import { addMessagePadding } from '../crypto/BufferPadding'; import { ContentMessage } from '../messages/outgoing'; @@ -146,9 +146,7 @@ async function send( 'batch' ); - const isDestinationClosedGroup = getConversationController() - .get(recipient.key) - ?.isClosedGroup(); + const isDestinationClosedGroup = ConvoHub.use().get(recipient.key)?.isClosedGroup(); // If message also has a sync message, save that hash. Otherwise save the hash from the regular message send i.e. only closed groups in this case. if ( encryptedAndWrapped.identifier && @@ -287,7 +285,7 @@ async function sendMessagesDataToSnode( } function encryptionBasedOnConversation(destination: PubKey) { - if (getConversationController().get(destination.key)?.isClosedGroup()) { + if (ConvoHub.use().get(destination.key)?.isClosedGroup()) { return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE; } return SignalService.Envelope.Type.SESSION_MESSAGE; @@ -426,9 +424,7 @@ async function sendMessagesToSnode( throw new Error('result is empty for sendMessagesToSnode'); } - const isDestinationClosedGroup = getConversationController() - .get(recipient.key) - ?.isClosedGroup(); + const isDestinationClosedGroup = ConvoHub.use().get(recipient.key)?.isClosedGroup(); await Promise.all( encryptedAndWrapped.map(async (message, index) => { diff --git a/ts/session/utils/Groups.ts b/ts/session/utils/Groups.ts index ddfd51d764..06b749159e 100644 --- a/ts/session/utils/Groups.ts +++ b/ts/session/utils/Groups.ts @@ -1,9 +1,9 @@ import { PubKey } from '../types'; -import { getConversationController } from '../conversations'; +import { ConvoHub } from '../conversations'; import { fromHexToArray } from './String'; export function isClosedGroup(groupId: PubKey): boolean { - const conversation = getConversationController().get(groupId.key); + const conversation = ConvoHub.use().get(groupId.key); if (!conversation) { return false; diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts index 51c5912917..b69e476b33 100644 --- a/ts/session/utils/User.ts +++ b/ts/session/utils/User.ts @@ -3,7 +3,7 @@ import { UserUtils } from '.'; import { Data } from '../../data/data'; import { PubKey } from '../types'; import { fromHexToArray, toHex } from './String'; -import { getConversationController } from '../conversations'; +import { ConvoHub } from '../conversations'; import { LokiProfile } from '../../types/Message'; import { getOurPubKeyStrFromStorage, Storage } from '../../util/storage'; import { SessionKeyPair } from '../../receiver/keypairs'; @@ -102,7 +102,7 @@ export function getOurProfile(): LokiProfile | undefined { // Secondary devices have their profile stored // in their primary device's conversation const ourNumber = Storage.get('primaryDevicePubKey') as string; - const ourConversation = getConversationController().get(ourNumber); + const ourConversation = ConvoHub.use().get(ourNumber); const ourProfileKeyHex = ourConversation.getProfileKey(); const profileKeyAsBytes = ourProfileKeyHex ? fromHexToArray(ourProfileKeyHex) : null; diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 069be22cc0..0b39ec2df2 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -16,7 +16,7 @@ import { setFullScreenCall, startingCallWith, } from '../../../state/ducks/call'; -import { getConversationController } from '../../conversations'; +import { ConvoHub } from '../../conversations'; import { CallMessage } from '../../messages/outgoing/controlMessage/CallMessage'; import { ed25519Str } from '../../onions/onionPath'; import { PubKey } from '../../types'; @@ -505,7 +505,7 @@ export async function USER_callRecipient(recipient: string) { }); window.log.info('Sending preOffer message to ', ed25519Str(recipient)); - const calledConvo = getConversationController().get(recipient); + const calledConvo = ConvoHub.use().get(recipient); calledConvo.set('active_at', Date.now()); // addSingleOutgoingMessage does the commit for us on the convo await calledConvo.unhideIfNeeded(false); weAreCallerOnCurrentCall = true; @@ -857,7 +857,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) { } } const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset(); - const callerConvo = getConversationController().get(fromSender); + const callerConvo = ConvoHub.use().get(fromSender); callerConvo.set('active_at', networkTimestamp); await callerConvo.unhideIfNeeded(false); @@ -1050,7 +1050,7 @@ function getCachedMessageFromCallMessage( } async function isUserApprovedOrWeSentAMessage(user: string) { - const isApproved = getConversationController().get(user)?.isApproved(); + const isApproved = ConvoHub.use().get(user)?.isApproved(); if (isApproved) { return true; @@ -1141,7 +1141,7 @@ export async function handleCallTypeOffer( window.inboxStore?.dispatch(incomingCall({ pubkey: sender })); // show a notification - const callerConvo = getConversationController().get(sender); + const callerConvo = ConvoHub.use().get(sender); const convNotif = callerConvo?.getNotificationsFor() || 'disabled'; if (convNotif === 'disabled') { window?.log?.info('notifications disabled for convo', ed25519Str(sender)); @@ -1162,7 +1162,7 @@ export async function handleMissedCall( incomingOfferTimestamp: number, reason: 'not-approved' | 'permissions' | 'another-call-ongoing' | 'too-old-timestamp' ) { - const incomingCallConversation = getConversationController().get(sender); + const incomingCallConversation = ConvoHub.use().get(sender); const displayname = incomingCallConversation?.getNickname() || @@ -1189,7 +1189,7 @@ export async function handleMissedCall( } async function addMissedCallMessage(callerPubkey: string, sentAt: number) { - const incomingCallConversation = getConversationController().get(callerPubkey); + const incomingCallConversation = ConvoHub.use().get(callerPubkey); if (incomingCallConversation.isActive() || incomingCallConversation.isHidden()) { incomingCallConversation.set('active_at', GetNetworkTime.getNowWithNetworkOffset()); diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts index 5f81e28878..3a0fd7dc4d 100644 --- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts +++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts @@ -6,7 +6,7 @@ import { MIME } from '../../../../types'; import { processNewAttachment } from '../../../../types/MessageAttachment'; import { autoScaleForIncomingAvatar } from '../../../../util/attachmentsUtil'; import { decryptProfile } from '../../../../util/crypto/profileEncrypter'; -import { getConversationController } from '../../../conversations'; +import { ConvoHub } from '../../../conversations'; import { fromHexToArray } from '../../String'; import { runners } from '../JobRunner'; import { @@ -24,7 +24,7 @@ const defaultMaxAttemps = 3; * Before calling this function, you have to update the related conversation profileKey and avatarPointer fields with the urls which should be downloaded, or reset them if you wanted them reset. */ export function shouldAddAvatarDownloadJob({ conversationId }: { conversationId: string }) { - const conversation = getConversationController().get(conversationId); + const conversation = ConvoHub.use().get(conversationId); if (!conversation) { // return true so we do not retry this task. window.log.warn('shouldAddAvatarDownloadJob did not corresponding conversation'); @@ -104,7 +104,7 @@ class AvatarDownloadJob extends PersistedJob { return RunJobResult.PermanentFailure; } - let conversation = getConversationController().get(convoId); + let conversation = ConvoHub.use().get(convoId); if (!conversation) { // return true so we do not retry this task. window.log.warn('AvatarDownloadJob did not corresponding conversation'); @@ -127,7 +127,7 @@ class AvatarDownloadJob extends PersistedJob { url: toDownloadPointer, isRaw: true, }); - conversation = getConversationController().getOrThrow(convoId); + conversation = ConvoHub.use().getOrThrow(convoId); if (!downloaded.data.byteLength) { window.log.debug(`[profileupdate] downloaded data is empty for ${conversation.id}`); @@ -161,7 +161,7 @@ class AvatarDownloadJob extends PersistedJob { data: await scaledData.blob.arrayBuffer(), contentType: MIME.IMAGE_UNKNOWN, // contentType is mostly used to generate previews and screenshot. We do not care for those in this case. }); - conversation = getConversationController().getOrThrow(convoId); + conversation = ConvoHub.use().getOrThrow(convoId); ({ path } = upgraded); } catch (e) { window?.log?.error(`[profileupdate] Could not decrypt profile image: ${e}`); diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts index b47edcc6bd..3fdc88f024 100644 --- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts @@ -8,7 +8,7 @@ import { ReleasedFeatures } from '../../../../util/releaseFeature'; import { isSignInByLinking } from '../../../../util/storage'; import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { NotEmptyArrayOfBatchResults } from '../../../apis/snode_api/SnodeRequestTypes'; -import { getConversationController } from '../../../conversations'; +import { ConvoHub } from '../../../conversations'; import { SharedUserConfigMessage } from '../../../messages/outgoing/controlMessage/SharedConfigMessage'; import { MessageSender } from '../../../sending/MessageSender'; import { allowOnlyOneAtATime } from '../../Promise'; @@ -173,7 +173,7 @@ class ConfigurationSyncJob extends PersistedJob const us = UserUtils.getOurPubKeyStrFromCache(); const ed25519Key = await UserUtils.getUserED25519KeyPairBytes(); - const conversation = getConversationController().get(us); + const conversation = ConvoHub.use().get(us); if (!us || !conversation || !ed25519Key) { // we check for ed25519Key because it is needed for authenticated requests window.log.warn('did not find our own conversation'); diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index 19299bcadf..a518fabec8 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -11,7 +11,7 @@ import { import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; import { TTL_DEFAULT } from '../../../constants'; -import { getConversationController } from '../../../conversations'; +import { ConvoHub } from '../../../conversations'; import { MessageSender } from '../../../sending/MessageSender'; import { PubKey } from '../../../types'; import { allowOnlyOneAtATime } from '../../Promise'; @@ -192,7 +192,7 @@ class GroupSyncJob extends PersistedJob { const us = UserUtils.getOurPubKeyStrFromCache(); const ed25519Key = await UserUtils.getUserED25519KeyPairBytes(); - const conversation = getConversationController().get(us); + const conversation = ConvoHub.use().get(us); if (!us || !conversation || !ed25519Key) { // we check for ed25519Key because it is needed for authenticated requests window.log.warn('did not find our own conversation'); diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts index 90031f18ef..8364e62ceb 100644 --- a/ts/session/utils/libsession/libsession_utils_contacts.ts +++ b/ts/session/utils/libsession/libsession_utils_contacts.ts @@ -2,7 +2,7 @@ import { ContactInfo } from 'libsession_util_nodejs'; import { ConversationModel } from '../../../models/conversation'; import { getContactInfoFromDBValues } from '../../../types/sqlSharedTypes'; import { ContactsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; -import { getConversationController } from '../../conversations'; +import { ConvoHub } from '../../conversations'; import { PubKey } from '../../types'; /** @@ -38,7 +38,7 @@ function isContactToStoreInWrapper(convo: ConversationModel): boolean { */ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise { - const foundConvo = getConversationController().get(id); + const foundConvo = ConvoHub.use().get(id); if (!foundConvo) { return; } @@ -91,11 +91,11 @@ async function refreshMappedValue(id: string, duringAppStart = false) { if (fromWrapper) { setMappedValue(fromWrapper); if (!duringAppStart) { - getConversationController().get(id)?.triggerUIRefresh(); + ConvoHub.use().get(id)?.triggerUIRefresh(); } } else if (mappedContactWrapperValues.delete(id)) { if (!duringAppStart) { - getConversationController().get(id)?.triggerUIRefresh(); + ConvoHub.use().get(id)?.triggerUIRefresh(); } } } diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts index 9a053607a4..2ee2ecd4da 100644 --- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts +++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts @@ -10,7 +10,7 @@ import { UserGroupsWrapperActions, } from '../../../webworker/workers/browser/libsession_worker_interface'; import { OpenGroupUtils } from '../../apis/open_group_api/utils'; -import { getConversationController } from '../../conversations'; +import { ConvoHub } from '../../conversations'; import { SessionUtilContact } from './libsession_utils_contacts'; import { SessionUtilUserGroups } from './libsession_utils_user_groups'; import { SessionUtilUserProfile } from './libsession_utils_user_profile'; @@ -69,7 +69,7 @@ function getConvoType(convo: ConversationModel): ConvoVolatileType { */ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise { // this is too slow to fetch from the database the up to date data here. Let's hope that what we have in memory is up to date enough - const foundConvo = getConversationController().get(convoId); + const foundConvo = ConvoHub.use().get(convoId); if (!foundConvo || !isConvoToStoreInWrapper(foundConvo)) { return; } @@ -208,7 +208,7 @@ async function refreshConvoVolatileCached( } if (refreshed && !duringAppStart) { - getConversationController().get(convoId)?.triggerUIRefresh(); + ConvoHub.use().get(convoId)?.triggerUIRefresh(); } } catch (e) { window.log.info(`refreshMappedValue for volatile convoID: ${convoId}`, e.message); diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts index cfb67125ec..3a73d3bbfd 100644 --- a/ts/session/utils/libsession/libsession_utils_user_groups.ts +++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts @@ -9,7 +9,7 @@ import { getLegacyGroupInfoFromDBValues, } from '../../../types/sqlSharedTypes'; import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; -import { getConversationController } from '../../conversations'; +import { ConvoHub } from '../../conversations'; import { PubKey } from '../../types'; /** @@ -67,7 +67,7 @@ function isLegacyGroupToRemoveFromDBIfNotInWrapper(convo: ConversationModel): bo * Same applies for a legacy group. */ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise { - const foundConvo = getConversationController().get(convoId); + const foundConvo = ConvoHub.use().get(convoId); if (!foundConvo) { return; } diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts index a089e41411..3daec9db5b 100644 --- a/ts/session/utils/libsession/libsession_utils_user_profile.ts +++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts @@ -1,7 +1,7 @@ import { isEmpty } from 'lodash'; import { UserUtils } from '..'; import { UserConfigWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; -import { getConversationController } from '../../conversations'; +import { ConvoHub } from '../../conversations'; import { fromHexToArray } from '../String'; import { CONVERSATION_PRIORITIES } from '../../../models/conversationAttributes'; import { Storage } from '../../../util/storage'; @@ -12,7 +12,7 @@ async function insertUserProfileIntoWrapper(convoId: string) { return; } const us = UserUtils.getOurPubKeyStrFromCache(); - const ourConvo = getConversationController().get(us); + const ourConvo = ConvoHub.use().get(us); if (!ourConvo) { throw new Error('insertUserProfileIntoWrapper needs a ourConvo to exist'); diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts index cec343a945..38c80a062d 100644 --- a/ts/session/utils/sync/syncUtils.ts +++ b/ts/session/utils/sync/syncUtils.ts @@ -13,7 +13,7 @@ import { Storage } from '../../../util/storage'; import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils'; import { SnodeNamespaces } from '../../apis/snode_api/namespaces'; import { DURATION } from '../../constants'; -import { getConversationController } from '../../conversations'; +import { ConvoHub } from '../../conversations'; import { ConfigurationMessage, ConfigurationMessageClosedGroup, @@ -57,7 +57,7 @@ export const syncConfigurationIfNeeded = async () => { return; } - const allConvos = getConversationController().getConversations(); + const allConvos = ConvoHub.use().getConversations(); const configMessage = await getCurrentConfigurationMessage(allConvos); try { @@ -102,7 +102,7 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal resolve(true); return; } - const allConvos = getConversationController().getConversations(); + const allConvos = ConvoHub.use().getConversations(); // eslint-disable-next-line more/no-then void getCurrentConfigurationMessage(allConvos) @@ -266,7 +266,7 @@ export const getCurrentConfigurationMessage = async ( } const ourProfileKeyHex = - getConversationController().get(UserUtils.getOurPubKeyStrFromCache())?.getProfileKey() || null; + ConvoHub.use().get(UserUtils.getOurPubKeyStrFromCache())?.getProfileKey() || null; const profileKey = ourProfileKeyHex ? fromHexToArray(ourProfileKeyHex) : undefined; const profilePicture = ourConvo?.getAvatarPointer() || undefined; diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index e4c4284cf7..47f8a9e44c 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -15,7 +15,7 @@ import { PropsForDataExtractionNotification, PropsForMessageRequestResponse, } from '../../models/messageType'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { ReactionList } from '../../types/Reaction'; export type CallNotificationType = 'missed-call' | 'started-call' | 'answered-a-call'; @@ -346,7 +346,7 @@ async function getMessages({ }> { const beforeTimestamp = Date.now(); - const conversation = getConversationController().get(conversationKey); + const conversation = ConvoHub.use().get(conversationKey); if (!conversation) { // no valid conversation, early return window?.log?.error('Failed to get convo on reducer.'); @@ -1093,7 +1093,7 @@ export const { } = actions; async function unmarkAsForcedUnread(convoId: string) { - const convo = getConversationController().get(convoId); + const convo = ConvoHub.use().get(convoId); if (convo && convo.isMarkedUnread()) { // we just opened it and it was forced "Unread", so we reset the unread state here await convo.markAsUnread(false, true); diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index 0924ce6928..d53b866fb5 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -10,7 +10,7 @@ import { isEmpty, uniq } from 'lodash'; import { ConfigDumpData } from '../../data/configDump/configDump'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { UserUtils } from '../../session/utils'; import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { PreConditionFailed } from '../../session/utils/errors'; @@ -73,67 +73,81 @@ const initNewGroupInWrapper = createAsyncThunk( const uniqMembers = uniq(members); const newGroup = await UserGroupsWrapperActions.createGroup(); const groupPk = newGroup.pubkeyHex; - newGroup.name = groupName; // this will be used by the linked devices until they fetch the info from the groups swarm - // the `GroupSync` below will need the secretKey of the group to be saved in the wrapper. So save it! - await UserGroupsWrapperActions.setGroup(newGroup); - const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); - if (!ourEd25519KeypairBytes) { - throw new Error('Current user has no priv ed25519 key?'); - } - const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes; - const groupEd2519Pk = HexString.fromHexString(groupPk).slice(1); // remove the 03 prefix (single byte once in hex form) + try { + newGroup.name = groupName; // this will be used by the linked devices until they fetch the info from the groups swarm - // dump is always empty when creating a new groupInfo - await MetaGroupWrapperActions.init(groupPk, { - metaDumped: null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), - groupEd25519Secretkey: newGroup.secretKey, - groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), - }); + // the `GroupSync` below will need the secretKey of the group to be saved in the wrapper. So save it! + await UserGroupsWrapperActions.setGroup(newGroup); + const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); + if (!ourEd25519KeypairBytes) { + throw new Error('Current user has no priv ed25519 key?'); + } + const userEd25519Secretkey = ourEd25519KeypairBytes.privKeyBytes; + const groupEd2519Pk = HexString.fromHexString(groupPk).slice(1); // remove the 03 prefix (single byte once in hex form) - for (let index = 0; index < uniqMembers.length; index++) { - const member = uniqMembers[index]; - const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); - if (created.pubkeyHex === us) { - await MetaGroupWrapperActions.memberSetPromoted(groupPk, created.pubkeyHex, false); - } else { - await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); + // dump is always empty when creating a new groupInfo + await MetaGroupWrapperActions.init(groupPk, { + metaDumped: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), + groupEd25519Secretkey: newGroup.secretKey, + groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), + }); + + for (let index = 0; index < uniqMembers.length; index++) { + const member = uniqMembers[index]; + const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); + if (created.pubkeyHex === us) { + await MetaGroupWrapperActions.memberSetPromoted(groupPk, created.pubkeyHex, false); + } else { + await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); + } } - } - const infos = await MetaGroupWrapperActions.infoGet(groupPk); - if (!infos) { - throw new Error(`getInfos of ${groupPk} returned empty result even if it was just init.`); - } - infos.name = groupName; - await MetaGroupWrapperActions.infoSet(groupPk, infos); + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + if (!infos) { + throw new Error(`getInfos of ${groupPk} returned empty result even if it was just init.`); + } + infos.name = groupName; + await MetaGroupWrapperActions.infoSet(groupPk, infos); - const membersFromWrapper = await MetaGroupWrapperActions.memberGetAll(groupPk); - if (!membersFromWrapper || isEmpty(membersFromWrapper)) { - throw new Error(`memberGetAll of ${groupPk} returned empty result even if it was just init.`); - } + const membersFromWrapper = await MetaGroupWrapperActions.memberGetAll(groupPk); + if (!membersFromWrapper || isEmpty(membersFromWrapper)) { + throw new Error( + `memberGetAll of ${groupPk} returned empty result even if it was just init.` + ); + } - const convo = await getConversationController().getOrCreateAndWait( - groupPk, - ConversationTypeEnum.GROUPV3 - ); + const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV3); - await convo.setIsApproved(true, false); + await convo.setIsApproved(true, false); - const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); - if (result !== RunJobResult.Success) { - window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); - } + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); + if (result !== RunJobResult.Success) { + window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); + } - await convo.unhideIfNeeded(); - convo.set({ active_at: Date.now() }); - await convo.commit(); - convo.updateLastMessage(); - dispatch(resetOverlayMode()); - await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); + await convo.unhideIfNeeded(); + convo.set({ active_at: Date.now() }); + await convo.commit(); + convo.updateLastMessage(); + dispatch(resetOverlayMode()); + await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); - return { groupPk: newGroup.pubkeyHex, infos, members: membersFromWrapper }; + return { groupPk: newGroup.pubkeyHex, infos, members: membersFromWrapper }; + } catch (e) { + window.log.warn('group creation failed. Deleting already saved datas: ', e.message); + await UserGroupsWrapperActions.eraseGroup(groupPk); + await MetaGroupWrapperActions.infoDestroy(groupPk); + const foundConvo = ConvoHub.use().get(groupPk); + if (foundConvo) { + await ConvoHub.use().deleteClosedGroup(groupPk, { + fromSyncMessage: false, + sendLeaveMessage: false, + }); + } + throw e; + } } ); @@ -171,10 +185,7 @@ const handleUserGroupUpdate = createAsyncThunk( window.log.warn(`failed to init metawrapper ${groupPk}`); } - const convo = await getConversationController().getOrCreateAndWait( - groupPk, - ConversationTypeEnum.GROUPV3 - ); + const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV3); await convo.setIsApproved(true, false); diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 4e310d1903..0a4c55870f 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -26,7 +26,7 @@ import { GenericReadableMessageSelectorProps } from '../../components/conversati import { LightBoxOptions } from '../../components/conversation/SessionConversation'; import { hasValidIncomingRequestValues } from '../../models/conversation'; import { CONVERSATION_PRIORITIES, isOpenOrClosedGroup } from '../../models/conversationAttributes'; -import { getConversationController } from '../../session/conversations'; +import { ConvoHub } from '../../session/conversations'; import { UserUtils } from '../../session/utils'; import { LocalizerType } from '../../types/Util'; import { BlockedNumberController } from '../../util'; @@ -73,7 +73,7 @@ export const getSortedMessagesOfSelectedConversation = createSelector( } const convoId = messages[0].propsForMessage.convoId; - const convo = getConversationController().get(convoId); + const convo = ConvoHub.use().get(convoId); if (!convo) { return []; diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts index ce8b51b86d..8d9e19ead2 100644 --- a/ts/test/session/unit/crypto/SnodeSignatures_test.ts +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -31,7 +31,8 @@ const userEd25519Keypair = { const hardcodedTimestamp = 1234; async function verifySig(ret: { pubkey: string; signature: string }, verificationData: string) { - const without03 = ret.pubkey.startsWith('03') ? ret.pubkey.slice(2) : ret.pubkey; // + const without03 = + ret.pubkey.startsWith('03') || ret.pubkey.startsWith('05') ? ret.pubkey.slice(2) : ret.pubkey; // const pk = HexString.fromHexString(without03); const sodium = await getSodiumNode(); const verified = sodium.crypto_sign_verify_detached( diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index b1dffe0de1..586d73efcd 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -9,7 +9,7 @@ import { SogsBlinding } from '../../../../session/apis/open_group_api/sogsv3/sog import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { Onions } from '../../../../session/apis/snode_api/onions'; -import { getConversationController } from '../../../../session/conversations/ConversationController'; +import { ConvoHub } from '../../../../session/conversations/ConversationController'; import { MessageEncrypter } from '../../../../session/crypto'; import { OnionSending } from '../../../../session/onions/onionSend'; import { OnionV4 } from '../../../../session/onions/onionv4'; @@ -29,12 +29,12 @@ describe('MessageSender', () => { beforeEach(async () => { TestUtils.stubWindowLog(); TestUtils.stubWindowFeatureFlags(); - getConversationController().reset(); + ConvoHub.use().reset(); TestUtils.stubData('getItemById').resolves(); stubData('getAllConversations').resolves([]); stubData('saveConversation').resolves(); - await getConversationController().load(); + await ConvoHub.use().load(); }); describe('send', () => { @@ -106,7 +106,7 @@ describe('MessageSender', () => { it('should pass the correct values to lokiMessageAPI', async () => { const device = TestUtils.generateFakePubKey(); const visibleMessage = TestUtils.generateVisibleMessage(); - Sinon.stub(getConversationController(), 'get').returns(undefined as any); + Sinon.stub(ConvoHub.use(), 'get').returns(undefined as any); const rawMessage = await MessageUtils.toRawMessage( device, @@ -131,7 +131,7 @@ describe('MessageSender', () => { // This test assumes the encryption stub returns the plainText passed into it. const device = TestUtils.generateFakePubKey(); - Sinon.stub(getConversationController(), 'get').returns(undefined as any); + Sinon.stub(ConvoHub.use(), 'get').returns(undefined as any); const visibleMessage = TestUtils.generateVisibleMessage(); const rawMessage = await MessageUtils.toRawMessage( device, @@ -183,7 +183,7 @@ describe('MessageSender', () => { describe('SESSION_MESSAGE', () => { it('should set the envelope source to be empty', async () => { messageEncyrptReturnEnvelopeType = SignalService.Envelope.Type.SESSION_MESSAGE; - Sinon.stub(getConversationController(), 'get').returns(undefined as any); + Sinon.stub(ConvoHub.use(), 'get').returns(undefined as any); // This test assumes the encryption stub returns the plainText passed into it. const device = TestUtils.generateFakePubKey(); diff --git a/ts/test/session/unit/sogsv3/ApiUtil_test.ts b/ts/test/session/unit/sogsv3/ApiUtil_test.ts index d4e7c4cd2f..cffae3298b 100644 --- a/ts/test/session/unit/sogsv3/ApiUtil_test.ts +++ b/ts/test/session/unit/sogsv3/ApiUtil_test.ts @@ -8,7 +8,7 @@ import { isSessionRunOpenGroup, } from '../../../../session/apis/open_group_api/opengroupV2/ApiUtil'; import { getOpenGroupV2ConversationId } from '../../../../session/apis/open_group_api/utils/OpenGroupUtils'; -import { getConversationController } from '../../../../session/conversations'; +import { ConvoHub } from '../../../../session/conversations'; import { stubData, stubOpenGroupData, stubWindowLog } from '../../../test-utils/utils'; import { UserUtils } from '../../../../session/utils'; import { TestUtils } from '../../../test-utils'; @@ -86,9 +86,9 @@ describe('APIUtils', () => { stubData('saveConversation').resolves(); stubData('getItemById').resolves(); stubOpenGroupData('getAllV2OpenGroupRooms').resolves(); - getConversationController().reset(); + ConvoHub.use().reset(); - await getConversationController().load(); + await ConvoHub.use().load(); await OpenGroupData.opengroupRoomsLoad(); }); afterEach(() => { @@ -134,25 +134,25 @@ describe('APIUtils', () => { stubData('getItemById').resolves(); stubOpenGroupData('getAllV2OpenGroupRooms').resolves(); getV2OpenGroupRoomsByServerUrl = stubOpenGroupData('getV2OpenGroupRoomsByServerUrl'); - getConversationController().reset(); + ConvoHub.use().reset(); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns( TestUtils.generateFakePubKeyStr() ); - await getConversationController().load(); + await ConvoHub.use().load(); - const convoOurIp = await getConversationController().getOrCreateAndWait( + const convoOurIp = await ConvoHub.use().getOrCreateAndWait( convoIdOurIp, ConversationTypeEnum.GROUP ); convoOurIp.set({ active_at: Date.now() }); - const convoOurUrl = await getConversationController().getOrCreateAndWait( + const convoOurUrl = await ConvoHub.use().getOrCreateAndWait( convoIdOurUrl, ConversationTypeEnum.GROUP ); convoOurUrl.set({ active_at: Date.now() }); - const convoNotOur = await getConversationController().getOrCreateAndWait( + const convoNotOur = await ConvoHub.use().getOrCreateAndWait( convoIdNotOur, ConversationTypeEnum.GROUP ); diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts index 7beeed054e..526ea032bc 100644 --- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts +++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts @@ -19,7 +19,7 @@ import { tryMatchBlindWithStandardKey, writeKnownBlindedKeys, } from '../../../../session/apis/open_group_api/sogsv3/knownBlindedkeys'; -import { getConversationController } from '../../../../session/conversations'; +import { ConvoHub } from '../../../../session/conversations'; import { LibSodiumWrappers } from '../../../../session/crypto'; import { UserUtils } from '../../../../session/utils'; import { expectAsyncToThrow, stubData, stubWindowLog } from '../../../test-utils/utils'; @@ -479,7 +479,7 @@ describe('knownBlindedKeys', () => { describe('when not in cache', () => { beforeEach(async () => { - getConversationController().reset(); + ConvoHub.use().reset(); getItemById.resolves(); stubData('getAllConversations').resolves([]); @@ -487,7 +487,7 @@ describe('knownBlindedKeys', () => { Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns( TestUtils.generateFakePubKeyStr() ); - await getConversationController().load(); + await ConvoHub.use().load(); }); it('does iterate over all the conversations and find the first one matching (fails)', async () => { @@ -500,7 +500,7 @@ describe('knownBlindedKeys', () => { await addCachedBlindedKey(shouldBeWrittenToDb); - Sinon.stub(getConversationController(), 'getConversations').returns([]); + Sinon.stub(ConvoHub.use(), 'getConversations').returns([]); const real = await findCachedBlindedMatchOrLookItUp(realSessionId, serverPublicKey, sodium); // we should have 1 call here as the value was already added to the cache expect(createOrUpdateItem.callCount).to.eq(1); @@ -514,18 +514,12 @@ describe('knownBlindedKeys', () => { it('does iterate over all the conversations and find the first one matching (passes)', async () => { await loadKnownBlindedKeys(); // adding a private conversation with a known match of the blinded pubkey we have - await getConversationController().getOrCreateAndWait( - realSessionId, - ConversationTypeEnum.PRIVATE - ); - const convo = await getConversationController().getOrCreateAndWait( + await ConvoHub.use().getOrCreateAndWait(realSessionId, ConversationTypeEnum.PRIVATE); + const convo = await ConvoHub.use().getOrCreateAndWait( knownBlindingMatch.realSessionId, ConversationTypeEnum.PRIVATE ); - await getConversationController().getOrCreateAndWait( - realSessionId2, - ConversationTypeEnum.PRIVATE - ); + await ConvoHub.use().getOrCreateAndWait(realSessionId2, ConversationTypeEnum.PRIVATE); convo.set({ isApproved: true }); const real = await findCachedBlindedMatchOrLookItUp( knownBlindingMatch.blindedId, @@ -546,7 +540,7 @@ describe('knownBlindedKeys', () => { it('does iterate over all the conversations but is not approved so must fail', async () => { await loadKnownBlindedKeys(); // adding a private conversation with a known match of the blinded pubkey we have - const convo = await getConversationController().getOrCreateAndWait( + const convo = await ConvoHub.use().getOrCreateAndWait( knownBlindingMatch.realSessionId, ConversationTypeEnum.PRIVATE ); @@ -564,7 +558,7 @@ describe('knownBlindedKeys', () => { it('does iterate over all the conversations but is not private so must fail: group', async () => { await loadKnownBlindedKeys(); // adding a private conversation with a known match of the blinded pubkey we have - const convo = await getConversationController().getOrCreateAndWait( + const convo = await ConvoHub.use().getOrCreateAndWait( knownBlindingMatch.realSessionId, ConversationTypeEnum.GROUP ); diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts new file mode 100644 index 0000000000..593a4527a6 --- /dev/null +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts @@ -0,0 +1,51 @@ +import { expect } from 'chai'; +import Sinon from 'sinon'; +import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; +import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; +import { TestUtils } from '../../../test-utils'; +import { getSwarmPollingInstance } from '../../../../session/apis/snode_api'; +import { SwarmPolling } from '../../../../session/apis/snode_api/swarmPolling'; + +describe('SwarmPolling:getNamespacesToPollFrom', () => { + let swarmPolling: SwarmPolling; + + beforeEach(async () => { + TestUtils.stubLibSessionWorker(undefined); + TestUtils.stubWindowLog(); + swarmPolling = getSwarmPollingInstance(); + swarmPolling.resetSwarmPolling(); + }); + + afterEach(() => { + Sinon.restore(); + }); + + it('for us/private ', () => { + expect(swarmPolling.getNamespacesToPollFrom(ConversationTypeEnum.PRIVATE)).to.deep.equal([ + SnodeNamespaces.Default, + SnodeNamespaces.UserProfile, + SnodeNamespaces.UserContacts, + SnodeNamespaces.UserGroups, + SnodeNamespaces.ConvoInfoVolatile, + ]); + }); + + it('for group v2 (03 prefix) ', () => { + expect(swarmPolling.getNamespacesToPollFrom(ConversationTypeEnum.GROUPV3)).to.deep.equal([ + SnodeNamespaces.ClosedGroupMessages, + SnodeNamespaces.ClosedGroupInfo, + SnodeNamespaces.ClosedGroupMembers, + SnodeNamespaces.ClosedGroupKeys, + ]); + }); + + it('for legacy group ', () => { + expect(swarmPolling.getNamespacesToPollFrom(ConversationTypeEnum.GROUP)).to.deep.equal([ + SnodeNamespaces.LegacyClosedGroup, + ]); + }); + + it('for unknown type ', () => { + expect(() => swarmPolling.getNamespacesToPollFrom('invalidtype' as any)).to.throw(''); // empty string just means that we want it to throw anything + }); +}); diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts new file mode 100644 index 0000000000..06423df0cd --- /dev/null +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts @@ -0,0 +1,139 @@ +import { expect } from 'chai'; +import Sinon from 'sinon'; +import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; +import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants'; +import { PubKey } from '../../../../session/types'; +import { TestUtils } from '../../../test-utils'; +import { + SwarmPolling, + getSwarmPollingInstance, +} from '../../../../session/apis/snode_api/swarmPolling'; +import { ConvoHub } from '../../../../session/conversations/ConversationController'; +import { stubData } from '../../../test-utils/utils'; + +describe('SwarmPolling:getPollingTimeout', () => { + let swarmPolling: SwarmPolling; + + beforeEach(async () => { + TestUtils.stubLibSessionWorker(undefined); + TestUtils.stubWindowLog(); + swarmPolling = getSwarmPollingInstance(); + swarmPolling.resetSwarmPolling(); + ConvoHub.use().reset(); + stubData('getAllConversations').resolves([]); + await ConvoHub.use().load(); + }); + + afterEach(() => { + Sinon.restore(); + ConvoHub.use().reset(); + }); + + it('returns INACTIVE for non existing convo', () => { + const fakeConvo = TestUtils.generateFakePubKey(); + + expect(swarmPolling.getPollingTimeout(fakeConvo)).to.eq(SWARM_POLLING_TIMEOUT.INACTIVE); + }); + + describe('legacy groups', () => { + it('returns ACTIVE for convo with less than two days old activeAt', () => { + const convo = ConvoHub.use().getOrCreate( + TestUtils.generateFakePubKeyStr(), + ConversationTypeEnum.GROUP + ); + convo.set('active_at', Date.now() - 2 * 23 * 3600 * 1000); // 23 * 2 = 46 hours old + expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( + SWARM_POLLING_TIMEOUT.ACTIVE + ); + }); + + it('returns INACTIVE for convo with undefined activeAt', () => { + const convo = ConvoHub.use().getOrCreate( + TestUtils.generateFakePubKeyStr(), + ConversationTypeEnum.GROUP + ); + convo.set('active_at', undefined); + expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( + SWARM_POLLING_TIMEOUT.INACTIVE + ); + }); + + it('returns MEDIUM_ACTIVE for convo with activeAt of more than 2 days but less than a week old', () => { + const convo = ConvoHub.use().getOrCreate( + TestUtils.generateFakePubKeyStr(), + ConversationTypeEnum.GROUP + ); + convo.set('active_at', Date.now() - 1000 * 3600 * 25 * 2); // 25 hours x 2 = 50 hours old + expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( + SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE + ); + + convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 7 + 3600); // a week minus an hour old + expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( + SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE + ); + }); + + it('returns INACTIVE for convo with activeAt of more than a week', () => { + const convo = ConvoHub.use().getOrCreate( + TestUtils.generateFakePubKeyStr(), + ConversationTypeEnum.GROUP + ); + convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 8); // 8 days + expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( + SWARM_POLLING_TIMEOUT.INACTIVE + ); + }); + }); + + describe('groupv3', () => { + it('returns ACTIVE for convo with less than two days old activeAt', () => { + const convo = ConvoHub.use().getOrCreate( + TestUtils.generateFakeClosedGroupV3PkStr(), + ConversationTypeEnum.GROUPV3 + ); + convo.set('active_at', Date.now() - 2 * 23 * 3600 * 1000); // 23 * 2 = 46 hours old + expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( + SWARM_POLLING_TIMEOUT.ACTIVE + ); + }); + + it('returns INACTIVE for convo with undefined activeAt', () => { + const convo = ConvoHub.use().getOrCreate( + TestUtils.generateFakeClosedGroupV3PkStr(), + ConversationTypeEnum.GROUPV3 + ); + convo.set('active_at', undefined); + expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( + SWARM_POLLING_TIMEOUT.INACTIVE + ); + }); + + it('returns MEDIUM_ACTIVE for convo with activeAt of more than 2 days but less than a week old', () => { + const convo = ConvoHub.use().getOrCreate( + TestUtils.generateFakeClosedGroupV3PkStr(), + ConversationTypeEnum.GROUPV3 + ); + convo.set('active_at', Date.now() - 1000 * 3600 * 25 * 2); // 25 hours x 2 = 50 hours old + expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( + SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE + ); + + convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 7 + 3600); // a week minus an hour old + expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( + SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE + ); + }); + + it('returns INACTIVE for convo with activeAt of more than a week', () => { + const convo = ConvoHub.use().getOrCreate( + TestUtils.generateFakeClosedGroupV3PkStr(), + ConversationTypeEnum.GROUPV3 + ); + convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 8); // 8 days + expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( + SWARM_POLLING_TIMEOUT.INACTIVE + ); + }); + }); +}); diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts new file mode 100644 index 0000000000..9cf6283189 --- /dev/null +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts @@ -0,0 +1,337 @@ +import chai from 'chai'; +import { describe } from 'mocha'; +import Sinon, * as sinon from 'sinon'; + +import { UserGroupsGet } from 'libsession_util_nodejs'; +import { ConversationModel } from '../../../../models/conversation'; +import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; +import { SnodePool, getSwarmPollingInstance } from '../../../../session/apis/snode_api'; +import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling'; +import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest'; +import { SwarmPolling } from '../../../../session/apis/snode_api/swarmPolling'; +import { ConvoHub } from '../../../../session/conversations'; +import { PubKey } from '../../../../session/types'; +import { UserUtils } from '../../../../session/utils'; +import { sleepFor } from '../../../../session/utils/Promise'; +import { ConfigurationSync } from '../../../../session/utils/job_runners/jobs/ConfigurationSyncJob'; +import { TestUtils } from '../../../test-utils'; +import { generateFakeSnodes, stubData } from '../../../test-utils/utils'; + +const { expect } = chai; + +const pollOnceForUsArgs = (us: string) => [[us, ConversationTypeEnum.PRIVATE]]; +const pollOnceForGroupLegacyArgs = (groupLegacy: string) => [ + [groupLegacy, ConversationTypeEnum.GROUP], +]; + +describe('SwarmPolling:pollForAllKeys', () => { + const ourPubkey = TestUtils.generateFakePubKey(); + const ourNumber = ourPubkey.key; + + let pollOnceForKeySpy: Sinon.SinonSpy< + Parameters, + ReturnType + >; + let swarmPolling: SwarmPolling; + let getItemByIdStub: Sinon.SinonStub; + let clock: Sinon.SinonFakeTimers; + + beforeEach(async () => { + ConvoHub.use().reset(); + TestUtils.stubWindowFeatureFlags(); + Sinon.stub(ConfigurationSync, 'queueNewJobIfNeeded').resolves(); + + // Utils Stubs + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); + + stubData('getAllConversations').resolves([]); + getItemByIdStub = TestUtils.stubData('getItemById'); + stubData('saveConversation').resolves(); + stubData('getSwarmNodesForPubkey').resolves(); + stubData('getLastHashBySnode').resolves(); + + Sinon.stub(SnodePool, 'getSwarmFor').resolves(generateFakeSnodes(5)); + Sinon.stub(SnodeAPIRetrieve, 'retrieveNextMessages').resolves([]); + TestUtils.stubWindow('inboxStore', undefined); + TestUtils.stubWindow('getGlobalOnlineStatus', () => true); + TestUtils.stubWindowLog(); + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); + TestUtils.stubUserGroupWrapper('getAllGroups', []); + + const convoController = ConvoHub.use(); + await convoController.load(); + ConvoHub.use().getOrCreate(ourPubkey.key, ConversationTypeEnum.PRIVATE); + + swarmPolling = getSwarmPollingInstance(); + swarmPolling.resetSwarmPolling(); + pollOnceForKeySpy = Sinon.spy(swarmPolling, 'pollOnceForKey'); + + clock = sinon.useFakeTimers({ now: Date.now(), shouldAdvanceTime: true }); + stubData('createOrUpdateItem').resolves(); + }); + + afterEach(() => { + Sinon.restore(); + ConvoHub.use().reset(); + clock.restore(); + resetHardForkCachedValues(); + }); + + it('does run for our pubkey even if activeAt is really old ', async () => { + TestUtils.stubLibSessionWorker(undefined); + + const convo = ConvoHub.use().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE); + convo.set('active_at', Date.now() - 1000 * 3600 * 25); + await swarmPolling.start(true); + + expect(pollOnceForKeySpy.callCount).to.eq(1); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + }); + + it('does run for our pubkey even if activeAt is recent ', async () => { + TestUtils.stubLibSessionWorker(undefined); + + const convo = ConvoHub.use().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE); + convo.set('active_at', Date.now()); + await swarmPolling.start(true); + + expect(pollOnceForKeySpy.callCount).to.eq(1); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + }); + + describe('legacy group', () => { + it('does run for group pubkey on start no matter the recent timestamp', async () => { + const groupPk = TestUtils.generateFakePubKeyStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); + const group = { + pubkeyHex: groupPk, + } as UserGroupsGet; + TestUtils.stubLibSessionWorker([group]); + convo.set('active_at', Date.now()); + const groupConvoPubkey = PubKey.cast(groupPk); + swarmPolling.addGroupId(groupConvoPubkey); + await swarmPolling.start(true); + + // our pubkey will be polled for, hence the 2 + expect(pollOnceForKeySpy.callCount).to.eq(2); + + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupLegacyArgs(groupPk)); + }); + + it('does only poll from -10 for closed groups', async () => { + const groupPk = TestUtils.generateFakePubKeyStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); + const group = { + pubkeyHex: groupPk, + } as UserGroupsGet; + TestUtils.stubLibSessionWorker([group]); + + convo.set('active_at', 1); + swarmPolling.addGroupId(PubKey.cast(groupPk)); + + await swarmPolling.start(true); + + // our pubkey will be polled for, hence the 2 + expect(pollOnceForKeySpy.callCount).to.eq(2); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupLegacyArgs(groupPk)); + getItemByIdStub.restore(); + getItemByIdStub = TestUtils.stubData('getItemById'); + + getItemByIdStub.resolves(); + }); + + it('does run for group pubkey on start but not another time if activeAt is old ', async () => { + const groupPk = TestUtils.generateFakePubKeyStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); + + const group = { + pubkeyHex: groupPk, + } as UserGroupsGet; + TestUtils.stubLibSessionWorker([group]); + convo.set('active_at', 1); // really old, but active + swarmPolling.addGroupId(groupPk); + + // this calls the stub 2 times, one for our direct pubkey and one for the group + await swarmPolling.start(true); + + // this should only call the stub one more time: for our direct pubkey but not for the group pubkey + await swarmPolling.pollForAllKeys(); + + expect(pollOnceForKeySpy.callCount).to.eq(3); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupLegacyArgs(groupPk)); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + }); + + it('does run twice if activeAt less than one hour ', async () => { + const groupPk = TestUtils.generateFakePubKeyStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); + + // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event + const group = { + pubkeyHex: groupPk, + } as UserGroupsGet; + TestUtils.stubLibSessionWorker([group]); + + convo.set('active_at', Date.now()); + swarmPolling.addGroupId(groupPk); + await swarmPolling.start(true); + expect(pollOnceForKeySpy.callCount).to.eq(2); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupLegacyArgs(groupPk)); + pollOnceForKeySpy.resetHistory(); + clock.tick(9000); + + // no need to do that as the tick will trigger a call in all cases after 5 secs await swarmPolling.pollForAllKeys(); + /** this is not easy to explain, but + * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group id) + * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails. + * the only fix is to restore the clock and force the a small sleep to let the thing run in bg + */ + + await sleepFor(10); + + expect(pollOnceForKeySpy.callCount).to.eq(2); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupLegacyArgs(groupPk)); + }); + + it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => { + const groupPk = TestUtils.generateFakePubKeyStr(); + + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); + // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event + const group = { + pubkeyHex: groupPk, + } as UserGroupsGet; + TestUtils.stubLibSessionWorker([group]); + pollOnceForKeySpy.resetHistory(); + convo.set('active_at', Date.now()); + swarmPolling.addGroupId(groupPk); + // this call the stub two times already, one for our direct pubkey and one for the group + await swarmPolling.start(true); + const timeToTick = 3 * 60 * 1000; + swarmPolling.forcePolledTimestamp(groupPk, Date.now() - timeToTick); + // more than week old, so inactive group but we have to tick after more than 2 min + convo.set('active_at', Date.now() - 7 * 25 * 3600 * 1000); + clock.tick(timeToTick); + /** this is not easy to explain, but + * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od) + * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails. + * the only fix is to restore the clock and force the a small sleep to let the thing run in bg + */ + await sleepFor(10); + // we should have two more calls here, so 4 total. + expect(pollOnceForKeySpy.callCount).to.eq(4); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupLegacyArgs(groupPk)); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq(pollOnceForGroupLegacyArgs(groupPk)); + }); + + it('does run once only if group is inactive and we tick less than 2 minutes ', async () => { + const groupPk = TestUtils.generateFakePubKeyStr(); + + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); + pollOnceForKeySpy.resetHistory(); + const group = { + pubkeyHex: groupPk, + } as UserGroupsGet; + TestUtils.stubLibSessionWorker([group]); + convo.set('active_at', Date.now()); + swarmPolling.addGroupId(groupPk); + await swarmPolling.start(true); + + // more than a week old, we should not tick after just 5 seconds + convo.set('active_at', Date.now() - 7 * 24 * 3600 * 1000 - 3600 * 1000); + + clock.tick(1 * 60 * 1000); + await sleepFor(10); + + // we should have only one more call here, the one for our direct pubkey fetch + expect(pollOnceForKeySpy.callCount).to.eq(3); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupLegacyArgs(groupPk)); // this one comes from the swarmPolling.start + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + }); + + describe('multiple runs', () => { + let convo: ConversationModel; + let groupConvoPubkey: PubKey; + + beforeEach(async () => { + convo = ConvoHub.use().getOrCreate( + TestUtils.generateFakePubKeyStr(), + ConversationTypeEnum.GROUP + ); + TestUtils.stubLibSessionWorker({}); + + convo.set('active_at', Date.now()); + groupConvoPubkey = PubKey.cast(convo.id as string); + swarmPolling.addGroupId(groupConvoPubkey); + await swarmPolling.start(true); + }); + + afterEach(() => { + Sinon.restore(); + ConvoHub.use().reset(); + clock.restore(); + resetHardForkCachedValues(); + }); + + it('does run twice if activeAt is less than 2 days', async () => { + pollOnceForKeySpy.resetHistory(); + // less than 2 days old, this is an active group + convo.set('active_at', Date.now() - 2 * 24 * 3600 * 1000 - 3600 * 1000); + + const timeToTick = 6 * 1000; + + swarmPolling.forcePolledTimestamp(convo.id, timeToTick); + // we tick more than 5 sec + clock.tick(timeToTick); + + await swarmPolling.pollForAllKeys(); + // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too) + expect(pollOnceForKeySpy.callCount).to.eq(4); + // first two calls are our pubkey + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq( + pollOnceForGroupLegacyArgs(groupConvoPubkey.key) + ); + + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq( + pollOnceForGroupLegacyArgs(groupConvoPubkey.key) + ); + }); + + it('does run twice if activeAt is more than 2 days old and we tick more than one minute', async () => { + pollOnceForKeySpy.resetHistory(); + TestUtils.stubWindowLog(); + convo.set('active_at', Date.now() - 2 * 25 * 3600 * 1000); // medium active + // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event + + const timeToTick = 65 * 1000; // more than one minute + swarmPolling.forcePolledTimestamp(convo.id, timeToTick); + clock.tick(timeToTick); // should tick twice more (one more our direct pubkey and one for the group) + + // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event + + await swarmPolling.pollForAllKeys(); + + expect(pollOnceForKeySpy.callCount).to.eq(4); + + // first two calls are our pubkey + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq( + pollOnceForGroupLegacyArgs(groupConvoPubkey.key) + ); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq( + pollOnceForGroupLegacyArgs(groupConvoPubkey.key) + ); + }); + }); + }); +}); diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts new file mode 100644 index 0000000000..69bb3b9d35 --- /dev/null +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts @@ -0,0 +1,278 @@ +import { expect } from 'chai'; +import { LegacyGroupInfo, UserGroupsGet } from 'libsession_util_nodejs'; +import Sinon from 'sinon'; +import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; +import { getSwarmPollingInstance } from '../../../../session/apis/snode_api'; +import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling'; +import { SwarmPolling } from '../../../../session/apis/snode_api/swarmPolling'; +import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants'; +import { PubKey } from '../../../../session/types'; +import { UserUtils } from '../../../../session/utils'; +import { TestUtils } from '../../../test-utils'; +import { stubData } from '../../../test-utils/utils'; + +describe('getPollingDetails', () => { + // Initialize new stubbed cache + const ourPubkey = TestUtils.generateFakePubKey(); + const ourNumber = ourPubkey.key; + + let swarmPolling: SwarmPolling; + + let clock: Sinon.SinonFakeTimers; + beforeEach(async () => { + TestUtils.stubWindowFeatureFlags(); + TestUtils.stubWindowLog(); + stubData('createOrUpdateItem').resolves(); + + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); + + swarmPolling = getSwarmPollingInstance(); + TestUtils.stubLibSessionWorker(undefined); + + clock = Sinon.useFakeTimers({ now: Date.now(), shouldAdvanceTime: true }); + }); + + afterEach(() => { + Sinon.restore(); + clock.restore(); + resetHardForkCachedValues(); + }); + + it('without anything else, we should be part of it', async () => { + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); + TestUtils.stubUserGroupWrapper('getAllGroups', []); + swarmPolling.resetSwarmPolling(); + + const details = await swarmPolling.getPollingDetails([]); + expect(details.toPollDetails.length).to.be.eq(1); + expect(details.toPollDetails[0][0]).to.be.eq(ourNumber); + }); + + it('throws if polling entries include our pk', async () => { + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); + TestUtils.stubUserGroupWrapper('getAllGroups', []); + swarmPolling.resetSwarmPolling(); + + const fn = async () => + swarmPolling.getPollingDetails([{ pubkey: PubKey.cast(ourPubkey), lastPolledTimestamp: 0 }]); + await expect(fn()).to.be.rejectedWith(''); + }); + + describe("groups not in wrapper should be included in 'to leave' only", () => { + it('legacy group', async () => { + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); + TestUtils.stubUserGroupWrapper('getAllGroups', []); + const groupPk = TestUtils.generateFakePubKeyStr(); + + Sinon.stub(swarmPolling, 'getPollingTimeout').returns(SWARM_POLLING_TIMEOUT.ACTIVE); + + const { groupsToLeave, legacyGroupsToLeave, toPollDetails } = + await swarmPolling.getPollingDetails([ + { pubkey: PubKey.cast(groupPk), lastPolledTimestamp: 0 }, + ]); + expect(toPollDetails.length).to.be.eq(1); + expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); + + expect(legacyGroupsToLeave.length).to.be.eq(1); + expect(legacyGroupsToLeave[0]).to.be.eq(groupPk); + expect(groupsToLeave.length).to.be.eq(0); + }); + + it('new group NOT in wrapper should be requested for leaving', async () => { + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); + TestUtils.stubUserGroupWrapper('getAllGroups', []); + const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + + Sinon.stub(swarmPolling, 'getPollingTimeout').returns(SWARM_POLLING_TIMEOUT.ACTIVE); + + const { groupsToLeave, legacyGroupsToLeave, toPollDetails } = + await swarmPolling.getPollingDetails([ + { pubkey: PubKey.cast(groupPk), lastPolledTimestamp: 0 }, + ]); + expect(toPollDetails.length).to.be.eq(1); + expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); + + expect(groupsToLeave.length).to.be.eq(1); + expect(groupsToLeave[0]).to.be.eq(groupPk); + expect(legacyGroupsToLeave.length).to.be.eq(0); + }); + }); + + describe('groups in wrapper but polled recently should not be polled and not to leave neither', () => { + it('legacy group', async () => { + const groupPk = TestUtils.generateFakePubKeyStr(); + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', [ + { pubkeyHex: groupPk } as LegacyGroupInfo, + ]); + TestUtils.stubUserGroupWrapper('getAllGroups', []); + + Sinon.stub(swarmPolling, 'getPollingTimeout').returns(SWARM_POLLING_TIMEOUT.ACTIVE); + + const { groupsToLeave, legacyGroupsToLeave, toPollDetails } = + await swarmPolling.getPollingDetails([ + { pubkey: PubKey.cast(groupPk), lastPolledTimestamp: Date.now() }, + ]); + expect(toPollDetails.length).to.be.eq(1); + expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); + + expect(legacyGroupsToLeave.length).to.be.eq(0); + expect(groupsToLeave.length).to.be.eq(0); + }); + + it('new group', async () => { + const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); + TestUtils.stubUserGroupWrapper('getAllGroups', [{ pubkeyHex: groupPk } as UserGroupsGet]); + + Sinon.stub(swarmPolling, 'getPollingTimeout').returns(SWARM_POLLING_TIMEOUT.ACTIVE); + + const { groupsToLeave, legacyGroupsToLeave, toPollDetails } = + await swarmPolling.getPollingDetails([ + { pubkey: PubKey.cast(groupPk), lastPolledTimestamp: Date.now() }, + ]); + expect(toPollDetails.length).to.be.eq(1); + expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); + expect(groupsToLeave.length).to.be.eq(0); + expect(legacyGroupsToLeave.length).to.be.eq(0); + }); + }); + + describe("groups in wrapper should be included in 'to poll' only", () => { + it('legacy group in wrapper should be polled', async () => { + const groupPk = TestUtils.generateFakePubKeyStr(); + + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', [ + { pubkeyHex: groupPk } as LegacyGroupInfo, + ]); + TestUtils.stubUserGroupWrapper('getAllGroups', []); + swarmPolling.resetSwarmPolling(); + + Sinon.stub(swarmPolling, 'getPollingTimeout').returns(SWARM_POLLING_TIMEOUT.ACTIVE); + + const { groupsToLeave, legacyGroupsToLeave, toPollDetails } = + await swarmPolling.getPollingDetails([ + { pubkey: PubKey.cast(groupPk), lastPolledTimestamp: 0 }, + ]); + expect(toPollDetails.length).to.be.eq(2, 'both our and closed group should be polled'); + expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); + expect(toPollDetails[1]).to.be.deep.eq([groupPk, ConversationTypeEnum.GROUP]); + // no groups to leave nor legacy ones + expect(legacyGroupsToLeave.length).to.be.eq(0); + expect(groupsToLeave.length).to.be.eq(0); + }); + + it('new group in wrapper should be polled', async () => { + const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); + TestUtils.stubUserGroupWrapper('getAllGroups', [{ pubkeyHex: groupPk } as UserGroupsGet]); + + Sinon.stub(swarmPolling, 'getPollingTimeout').returns(SWARM_POLLING_TIMEOUT.ACTIVE); + + const { groupsToLeave, legacyGroupsToLeave, toPollDetails } = + await swarmPolling.getPollingDetails([ + { pubkey: PubKey.cast(groupPk), lastPolledTimestamp: 0 }, + ]); + + expect(toPollDetails.length).to.be.eq(2); + expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); + expect(toPollDetails[1]).to.be.deep.eq([groupPk, ConversationTypeEnum.GROUPV3]); + // no groups to leave nor legacy ones + expect(legacyGroupsToLeave.length).to.be.eq(0); + expect(groupsToLeave.length).to.be.eq(0); + }); + }); + + describe('multiple groups', () => { + it('one legacy group with a few v2 group not in wrapper', async () => { + const groupPk = TestUtils.generateFakePubKeyStr(); + const groupV2Pk = TestUtils.generateFakeClosedGroupV3PkStr(); + const groupV2Pk2 = TestUtils.generateFakeClosedGroupV3PkStr(); + + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', [ + { pubkeyHex: groupPk } as LegacyGroupInfo, + ]); + TestUtils.stubUserGroupWrapper('getAllGroups', []); + swarmPolling.resetSwarmPolling(); + + Sinon.stub(swarmPolling, 'getPollingTimeout').returns(SWARM_POLLING_TIMEOUT.ACTIVE); + + const { groupsToLeave, legacyGroupsToLeave, toPollDetails } = + await swarmPolling.getPollingDetails([ + { pubkey: PubKey.cast(groupPk), lastPolledTimestamp: 0 }, + { pubkey: PubKey.cast(groupV2Pk), lastPolledTimestamp: 0 }, + { pubkey: PubKey.cast(groupV2Pk2), lastPolledTimestamp: 0 }, + ]); + expect(toPollDetails.length).to.be.eq(2, 'both our and closed group should be polled'); + expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); + expect(toPollDetails[1]).to.be.deep.eq([groupPk, ConversationTypeEnum.GROUP]); + expect(legacyGroupsToLeave.length).to.be.eq(0); + expect(groupsToLeave.length).to.be.eq(2); + expect(groupsToLeave[0]).to.be.deep.eq(groupV2Pk); + expect(groupsToLeave[1]).to.be.deep.eq(groupV2Pk2); + }); + + it('new group in wrapper with a few legacy groups not in wrapper', async () => { + const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const groupPkLeg1 = TestUtils.generateFakePubKeyStr(); + const groupPkLeg2 = TestUtils.generateFakePubKeyStr(); + + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); + TestUtils.stubUserGroupWrapper('getAllGroups', [{ pubkeyHex: groupPk } as UserGroupsGet]); + + Sinon.stub(swarmPolling, 'getPollingTimeout').returns(SWARM_POLLING_TIMEOUT.ACTIVE); + + const { groupsToLeave, legacyGroupsToLeave, toPollDetails } = + await swarmPolling.getPollingDetails([ + { pubkey: PubKey.cast(groupPk), lastPolledTimestamp: 0 }, + { pubkey: PubKey.cast(groupPkLeg1), lastPolledTimestamp: 0 }, + { pubkey: PubKey.cast(groupPkLeg2), lastPolledTimestamp: 0 }, + ]); + + expect(toPollDetails.length).to.be.eq(2); + expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); + expect(toPollDetails[1]).to.be.deep.eq([groupPk, ConversationTypeEnum.GROUPV3]); + expect(legacyGroupsToLeave.length).to.be.eq(2); + expect(legacyGroupsToLeave[0]).to.be.eq(groupPkLeg1); + expect(legacyGroupsToLeave[1]).to.be.eq(groupPkLeg2); + expect(groupsToLeave.length).to.be.eq(0); + }); + + it('two of each, all should be polled', async () => { + const groupPk1 = TestUtils.generateFakeClosedGroupV3PkStr(); + const groupPk2 = TestUtils.generateFakeClosedGroupV3PkStr(); + const groupPkLeg1 = TestUtils.generateFakePubKeyStr(); + const groupPkLeg2 = TestUtils.generateFakePubKeyStr(); + + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', [ + { pubkeyHex: groupPkLeg1 } as LegacyGroupInfo, + { pubkeyHex: groupPkLeg2 } as LegacyGroupInfo, + ]); + TestUtils.stubUserGroupWrapper('getAllGroups', [ + { pubkeyHex: groupPk1 } as UserGroupsGet, + { pubkeyHex: groupPk2 } as UserGroupsGet, + ]); + + Sinon.stub(swarmPolling, 'getPollingTimeout').returns(SWARM_POLLING_TIMEOUT.ACTIVE); + + const { groupsToLeave, legacyGroupsToLeave, toPollDetails } = + await swarmPolling.getPollingDetails([ + { pubkey: PubKey.cast(groupPk1), lastPolledTimestamp: 0 }, + { pubkey: PubKey.cast(groupPk2), lastPolledTimestamp: 0 }, + { pubkey: PubKey.cast(groupPkLeg1), lastPolledTimestamp: 0 }, + { pubkey: PubKey.cast(groupPkLeg2), lastPolledTimestamp: 0 }, + ]); + + expect(toPollDetails.length).to.be.eq(5); + expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); + expect(toPollDetails[1]).to.be.deep.eq([groupPkLeg1, ConversationTypeEnum.GROUP]); + expect(toPollDetails[2]).to.be.deep.eq([groupPkLeg2, ConversationTypeEnum.GROUP]); + expect(toPollDetails[3]).to.be.deep.eq([groupPk1, ConversationTypeEnum.GROUPV3]); + expect(toPollDetails[4]).to.be.deep.eq([groupPk2, ConversationTypeEnum.GROUPV3]); + + // no groups to leave nor legacy ones + expect(legacyGroupsToLeave.length).to.be.eq(0); + expect(groupsToLeave.length).to.be.eq(0); + }); + }); +}); diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts deleted file mode 100644 index 5f904582b4..0000000000 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts +++ /dev/null @@ -1,451 +0,0 @@ -import chai from 'chai'; -import { describe } from 'mocha'; -import Sinon, * as sinon from 'sinon'; - -import chaiAsPromised from 'chai-as-promised'; -import { ConversationModel } from '../../../../models/conversation'; -import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; -import { getSwarmPollingInstance, SnodePool } from '../../../../session/apis/snode_api'; -import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling'; -import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest'; -import { SwarmPolling } from '../../../../session/apis/snode_api/swarmPolling'; -import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants'; -import { getConversationController } from '../../../../session/conversations'; -import { PubKey } from '../../../../session/types'; -import { UserUtils } from '../../../../session/utils'; -import { ConfigurationSync } from '../../../../session/utils/job_runners/jobs/ConfigurationSyncJob'; -import { sleepFor } from '../../../../session/utils/Promise'; -import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { TestUtils } from '../../../test-utils'; -import { generateFakeSnodes, stubData } from '../../../test-utils/utils'; - -chai.use(chaiAsPromised as any); -chai.should(); - -const { expect } = chai; - -describe('SwarmPolling', () => { - // Initialize new stubbed cache - const ourPubkey = TestUtils.generateFakePubKey(); - const ourNumber = ourPubkey.key; - - let pollOnceForKeySpy: Sinon.SinonSpy; - - let swarmPolling: SwarmPolling; - let getItemByIdStub: Sinon.SinonStub; - - let clock: Sinon.SinonFakeTimers; - beforeEach(async () => { - getConversationController().reset(); - TestUtils.stubWindowFeatureFlags(); - Sinon.stub(ConfigurationSync, 'queueNewJobIfNeeded').resolves(); - - // Utils Stubs - Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); - - stubData('getAllConversations').resolves([]); - getItemByIdStub = TestUtils.stubData('getItemById'); - stubData('saveConversation').resolves(); - stubData('getSwarmNodesForPubkey').resolves(); - stubData('getLastHashBySnode').resolves(); - - Sinon.stub(SnodePool, 'getSwarmFor').resolves(generateFakeSnodes(5)); - Sinon.stub(SnodeAPIRetrieve, 'retrieveNextMessages').resolves([]); - TestUtils.stubWindow('inboxStore', undefined); - TestUtils.stubWindow('getGlobalOnlineStatus', () => true); - TestUtils.stubWindowLog(); - - const convoController = getConversationController(); - await convoController.load(); - getConversationController().getOrCreate(ourPubkey.key, ConversationTypeEnum.PRIVATE); - - swarmPolling = getSwarmPollingInstance(); - swarmPolling.resetSwarmPolling(); - pollOnceForKeySpy = Sinon.spy(swarmPolling, 'pollOnceForKey'); - - clock = sinon.useFakeTimers({ now: Date.now(), shouldAdvanceTime: true }); - }); - - afterEach(() => { - Sinon.restore(); - getConversationController().reset(); - clock.restore(); - resetHardForkCachedValues(); - }); - - describe('getPollingTimeout', () => { - beforeEach(() => { - TestUtils.stubLibSessionWorker(undefined); - }); - it('returns INACTIVE for non existing convo', () => { - const fakeConvo = TestUtils.generateFakePubKey(); - - expect(swarmPolling.getPollingTimeout(fakeConvo)).to.eq(SWARM_POLLING_TIMEOUT.INACTIVE); - }); - - describe('legacy groups', () => { - it('returns ACTIVE for convo with less than two days old activeAt', () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - convo.set('active_at', Date.now() - 2 * 23 * 3600 * 1000); // 23 * 2 = 46 hours old - expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( - SWARM_POLLING_TIMEOUT.ACTIVE - ); - }); - - it('returns INACTIVE for convo with undefined activeAt', () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - convo.set('active_at', undefined); - expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( - SWARM_POLLING_TIMEOUT.INACTIVE - ); - }); - - it('returns MEDIUM_ACTIVE for convo with activeAt of more than 2 days but less than a week old', () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - convo.set('active_at', Date.now() - 1000 * 3600 * 25 * 2); // 25 hours x 2 = 50 hours old - expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( - SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE - ); - - convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 7 + 3600); // a week minus an hour old - expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( - SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE - ); - }); - - it('returns INACTIVE for convo with activeAt of more than a week', () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 8); // 8 days - expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( - SWARM_POLLING_TIMEOUT.INACTIVE - ); - }); - }); - - describe('groupv3', () => { - it('returns ACTIVE for convo with less than two days old activeAt', () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakeClosedGroupV3PkStr(), - ConversationTypeEnum.GROUPV3 - ); - convo.set('active_at', Date.now() - 2 * 23 * 3600 * 1000); // 23 * 2 = 46 hours old - expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( - SWARM_POLLING_TIMEOUT.ACTIVE - ); - }); - - it('returns INACTIVE for convo with undefined activeAt', () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakeClosedGroupV3PkStr(), - ConversationTypeEnum.GROUPV3 - ); - convo.set('active_at', undefined); - expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( - SWARM_POLLING_TIMEOUT.INACTIVE - ); - }); - - it('returns MEDIUM_ACTIVE for convo with activeAt of more than 2 days but less than a week old', () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakeClosedGroupV3PkStr(), - ConversationTypeEnum.GROUPV3 - ); - convo.set('active_at', Date.now() - 1000 * 3600 * 25 * 2); // 25 hours x 2 = 50 hours old - expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( - SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE - ); - - convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 7 + 3600); // a week minus an hour old - expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( - SWARM_POLLING_TIMEOUT.MEDIUM_ACTIVE - ); - }); - - it('returns INACTIVE for convo with activeAt of more than a week', () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakeClosedGroupV3PkStr(), - ConversationTypeEnum.GROUPV3 - ); - convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 8); // 8 days - expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( - SWARM_POLLING_TIMEOUT.INACTIVE - ); - }); - }); - }); - - describe('pollForAllKeys', () => { - beforeEach(() => { - stubData('createOrUpdateItem').resolves(); - }); - afterEach(() => { - Sinon.restore(); - }); - it('does run for our pubkey even if activeAt is really old ', async () => { - const convo = getConversationController().getOrCreate( - ourNumber, - ConversationTypeEnum.PRIVATE - ); - convo.set('active_at', Date.now() - 1000 * 3600 * 25); - await swarmPolling.start(true); - - expect(pollOnceForKeySpy.callCount).to.eq(1); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - }); - - it('does run for our pubkey even if activeAt is recent ', async () => { - const convo = getConversationController().getOrCreate( - ourNumber, - ConversationTypeEnum.PRIVATE - ); - convo.set('active_at', Date.now()); - await swarmPolling.start(true); - - expect(pollOnceForKeySpy.callCount).to.eq(1); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - }); - - describe('legacy group', () => { - it('does run for group pubkey on start no matter the recent timestamp', async () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - TestUtils.stubLibSessionWorker(undefined); - convo.set('active_at', Date.now()); - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - await swarmPolling.start(true); - - // our pubkey will be polled for, hence the 2 - expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - }); - - it('does only poll from -10 for closed groups if HF >= 19.1 ', async () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - TestUtils.stubLibSessionWorker(undefined); - getItemByIdStub.restore(); - getItemByIdStub = TestUtils.stubData('getItemById'); - getItemByIdStub - .withArgs('hasSeenHardfork190') - .resolves({ id: 'hasSeenHardfork190', value: true }) - .withArgs('hasSeenHardfork191') - .resolves({ id: 'hasSeenHardfork191', value: true }); - - convo.set('active_at', 1); - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - - await swarmPolling.start(true); - - // our pubkey will be polled for, hence the 2 - expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - getItemByIdStub.restore(); - getItemByIdStub = TestUtils.stubData('getItemById'); - - getItemByIdStub.resolves(); - }); - - it('does run for group pubkey on start but not another time if activeAt is old ', async () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - TestUtils.stubLibSessionWorker(undefined); - - convo.set('active_at', 1); // really old, but active - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - - // this calls the stub 2 times, one for our direct pubkey and one for the group - await swarmPolling.start(true); - - // this should only call the stub one more time: for our direct pubkey but not for the group pubkey - await swarmPolling.pollForAllKeys(); - - expect(pollOnceForKeySpy.callCount).to.eq(3); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - }); - - it('does run twice if activeAt less than one hour ', async () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - - // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event - Sinon.stub(UserGroupsWrapperActions, 'getLegacyGroup').resolves({} as any); - - convo.set('active_at', Date.now()); - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - await swarmPolling.start(true); - expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - pollOnceForKeySpy.resetHistory(); - clock.tick(9000); - - // no need to do that as the tick will trigger a call in all cases after 5 secs await swarmPolling.pollForAllKeys(); - /** this is not easy to explain, but - * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group id) - * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails. - * the only fix is to restore the clock and force the a small sleep to let the thing run in bg - */ - - await sleepFor(10); - - expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - }); - - it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event - Sinon.stub(UserGroupsWrapperActions, 'getLegacyGroup').resolves({} as any); - pollOnceForKeySpy.resetHistory(); - convo.set('active_at', Date.now()); - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - // this call the stub two times already, one for our direct pubkey and one for the group - await swarmPolling.start(true); - const timeToTick = 3 * 60 * 1000; - swarmPolling.forcePolledTimestamp(groupConvoPubkey, Date.now() - timeToTick); - // more than week old, so inactive group but we have to tick after more than 2 min - convo.set('active_at', Date.now() - 7 * 25 * 3600 * 1000); - clock.tick(timeToTick); - /** this is not easy to explain, but - * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od) - * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails. - * the only fix is to restore the clock and force the a small sleep to let the thing run in bg - */ - await sleepFor(10); - // we should have two more calls here, so 4 total. - expect(pollOnceForKeySpy.callCount).to.eq(4); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]); - }); - - it('does run once only if group is inactive and we tick less than 2 minutes ', async () => { - const convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - pollOnceForKeySpy.resetHistory(); - TestUtils.stubLibSessionWorker(undefined); - convo.set('active_at', Date.now()); - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - await swarmPolling.start(true); - - // more than a week old, we should not tick after just 5 seconds - convo.set('active_at', Date.now() - 7 * 24 * 3600 * 1000 - 3600 * 1000); - - clock.tick(1 * 60 * 1000); - await sleepFor(10); - - // we should have only one more call here, the one for our direct pubkey fetch - expect(pollOnceForKeySpy.callCount).to.eq(3); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - }); - - describe('multiple runs', () => { - let convo: ConversationModel; - let groupConvoPubkey: PubKey; - - beforeEach(async () => { - convo = getConversationController().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - TestUtils.stubLibSessionWorker({}); - - convo.set('active_at', Date.now()); - groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - await swarmPolling.start(true); - }); - - afterEach(() => { - Sinon.restore(); - getConversationController().reset(); - clock.restore(); - resetHardForkCachedValues(); - }); - - it('does run twice if activeAt is less than 2 days', async () => { - pollOnceForKeySpy.resetHistory(); - // less than 2 days old, this is an active group - convo.set('active_at', Date.now() - 2 * 24 * 3600 * 1000 - 3600 * 1000); - - const timeToTick = 6 * 1000; - - swarmPolling.forcePolledTimestamp(convo.id, timeToTick); - // we tick more than 5 sec - clock.tick(timeToTick); - - await swarmPolling.pollForAllKeys(); - // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too) - expect(pollOnceForKeySpy.callCount).to.eq(4); - // first two calls are our pubkey - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]); - }); - - it('does run twice if activeAt is more than 2 days old and we tick more than one minute', async () => { - pollOnceForKeySpy.resetHistory(); - TestUtils.stubWindowLog(); - convo.set('active_at', Date.now() - 2 * 25 * 3600 * 1000); // medium active - // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event - - const timeToTick = 65 * 1000; // more than one minute - swarmPolling.forcePolledTimestamp(convo.id, timeToTick); - clock.tick(timeToTick); // should tick twice more (one more our direct pubkey and one for the group) - - // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event - - await swarmPolling.pollForAllKeys(); - - expect(pollOnceForKeySpy.callCount).to.eq(4); - - // first two calls are our pubkey - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]); - }); - }); - }); - }); -}); diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts index 50997c5381..82feda2be9 100644 --- a/ts/test/session/unit/utils/Messages_test.ts +++ b/ts/test/session/unit/utils/Messages_test.ts @@ -15,7 +15,7 @@ import { ConversationTypeEnum } from '../../../../models/conversationAttributes' import { SignalService } from '../../../../protobuf'; import { getOpenGroupV2ConversationId } from '../../../../session/apis/open_group_api/utils/OpenGroupUtils'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; -import { getConversationController } from '../../../../session/conversations'; +import { ConvoHub } from '../../../../session/conversations'; import { ClosedGroupAddedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage'; import { ClosedGroupEncryptionPairMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage'; import { ClosedGroupEncryptionPairReplyMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage'; @@ -233,9 +233,9 @@ describe('Message Utils', () => { TestUtils.stubData('getItemById').callsFake(async () => { return { value: '[]' }; }); - getConversationController().reset(); + ConvoHub.use().reset(); - await getConversationController().load(); + await ConvoHub.use().load(); }); afterEach(() => { @@ -244,23 +244,14 @@ describe('Message Utils', () => { // open groups are actually removed when we leave them so this doesn't make much sense, but just in case we break something later it('filter out non active open groups', async () => { - await getConversationController().getOrCreateAndWait( - '05123456789', - ConversationTypeEnum.PRIVATE - ); - await getConversationController().getOrCreateAndWait( - '0512345678', - ConversationTypeEnum.PRIVATE - ); + await ConvoHub.use().getOrCreateAndWait('05123456789', ConversationTypeEnum.PRIVATE); + await ConvoHub.use().getOrCreateAndWait('0512345678', ConversationTypeEnum.PRIVATE); const convoId3 = getOpenGroupV2ConversationId('http://chat-dev2.lokinet.org', 'fish'); const convoId4 = getOpenGroupV2ConversationId('http://chat-dev3.lokinet.org', 'fish2'); const convoId5 = getOpenGroupV2ConversationId('http://chat-dev3.lokinet.org', 'fish3'); - const convo3 = await getConversationController().getOrCreateAndWait( - convoId3, - ConversationTypeEnum.GROUP - ); + const convo3 = await ConvoHub.use().getOrCreateAndWait(convoId3, ConversationTypeEnum.GROUP); convo3.set({ active_at: Date.now() }); stubOpenGroupData('getV2OpenGroupRoom') @@ -272,24 +263,15 @@ describe('Message Utils', () => { serverPublicKey: 'serverPublicKey', } as OpenGroupV2Room); - const convo4 = await getConversationController().getOrCreateAndWait( - convoId4, - ConversationTypeEnum.GROUP - ); + const convo4 = await ConvoHub.use().getOrCreateAndWait(convoId4, ConversationTypeEnum.GROUP); convo4.set({ active_at: undefined }); await OpenGroupData.opengroupRoomsLoad(); - const convo5 = await getConversationController().getOrCreateAndWait( - convoId5, - ConversationTypeEnum.GROUP - ); + const convo5 = await ConvoHub.use().getOrCreateAndWait(convoId5, ConversationTypeEnum.GROUP); convo5.set({ active_at: 0 }); - await getConversationController().getOrCreateAndWait( - '051234567', - ConversationTypeEnum.PRIVATE - ); - const convos = getConversationController().getConversations(); + await ConvoHub.use().getOrCreateAndWait('051234567', ConversationTypeEnum.PRIVATE); + const convos = ConvoHub.use().getConversations(); // convoID3 is active but 4 and 5 are not const configMessage = await getCurrentConfigurationMessage(convos); diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index 617473ce26..826012e514 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -3,6 +3,7 @@ import _ from 'lodash'; import { Snode } from '../../../data/data'; import { ECKeyPair } from '../../../receiver/keypairs'; import { PubKey } from '../../../session/types'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; export function generateFakePubKey(): PubKey { // Generates a mock pubkey for testing @@ -22,11 +23,11 @@ export function generateFakePubKeyStr(): string { return pubkeyString; } -export function generateFakeClosedGroupV3PkStr(): string { +export function generateFakeClosedGroupV3PkStr(): GroupPubkeyType { // Generates a mock pubkey for testing const numBytes = PubKey.PUBKEY_LEN / 2 - 1; const hexBuffer = crypto.randomBytes(numBytes).toString('hex'); - const pubkeyString = `03${hexBuffer}`; + const pubkeyString: GroupPubkeyType = `03${hexBuffer}`; return pubkeyString; } diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts index 27aa2d279a..7d18717954 100644 --- a/ts/test/test-utils/utils/stubbing.ts +++ b/ts/test/test-utils/utils/stubbing.ts @@ -1,12 +1,14 @@ /* eslint-disable func-names */ import { expect } from 'chai'; import Sinon from 'sinon'; +import { UserGroupsWrapperActionsCalls } from 'libsession_util_nodejs'; +import { ConfigDumpData } from '../../../data/configDump/configDump'; import { Data } from '../../../data/data'; import { OpenGroupData } from '../../../data/opengroups'; -import { ConfigDumpData } from '../../../data/configDump/configDump'; -import * as utilWorker from '../../../webworker/workers/browser/util_worker_interface'; +import { BlockedNumberController } from '../../../util'; import * as libsessionWorker from '../../../webworker/workers/browser/libsession_worker_interface'; +import * as utilWorker from '../../../webworker/workers/browser/util_worker_interface'; const globalAny: any = global; @@ -41,8 +43,20 @@ export function stubUtilWorker(fnName: string, returnedValue: any): sinon.SinonS .resolves(returnedValue); } -export function stubLibSessionWorker(value: any) { - Sinon.stub(libsessionWorker, 'callLibSessionWorker').resolves(value); +export function stubLibSessionWorker(resolveValue: any) { + Sinon.stub(libsessionWorker, 'callLibSessionWorker').resolves(resolveValue); +} + +export function stubBlockedNumberController() { + Sinon.stub(BlockedNumberController, 'getNumbersFromDB').resolves(); + Sinon.stub(BlockedNumberController, 'isBlocked').resolves(); +} + +export function stubUserGroupWrapper( + fn: T, + value: Awaited> +) { + Sinon.stub(libsessionWorker.UserGroupsWrapperActions, fn).resolves(value); } export function stubCreateObjectUrl() { diff --git a/ts/util/accountManager.ts b/ts/util/accountManager.ts index b95a6bb92f..0d7b29f591 100644 --- a/ts/util/accountManager.ts +++ b/ts/util/accountManager.ts @@ -1,4 +1,4 @@ -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; import { getSodiumRenderer } from '../session/crypto'; import { fromArrayBufferToBase64, fromHex, toHex } from '../session/utils/String'; import { getOurPubKeyStrFromCache } from '../session/utils/User'; @@ -194,7 +194,7 @@ async function registrationDone(ourPubkey: string, displayName: string) { window.log.warn('LibSessionUtil.initializeLibSessionUtilWrappers failed with', e.message); } // Ensure that we always have a conversation for ourself - const conversation = await getConversationController().getOrCreateAndWait( + const conversation = await ConvoHub.use().getOrCreateAndWait( ourPubkey, ConversationTypeEnum.PRIVATE ); diff --git a/ts/util/blockedNumberController.ts b/ts/util/blockedNumberController.ts index 76d5aa77c7..6ee17b1be2 100644 --- a/ts/util/blockedNumberController.ts +++ b/ts/util/blockedNumberController.ts @@ -103,7 +103,7 @@ export class BlockedNumberController { this.blockedNumbers = new Set(); } - private static async getNumbersFromDB(id: string): Promise> { + public static async getNumbersFromDB(id: string): Promise> { const data = await Data.getItemById(id); if (!data || !data.value) { return new Set(); diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts index e2cd8a17df..7e191252d2 100644 --- a/ts/util/expiringMessages.ts +++ b/ts/util/expiringMessages.ts @@ -6,7 +6,7 @@ import { LocalizerKeys } from '../types/LocalizerKeys'; import { initWallClockListener } from './wallClockListener'; import { Data } from '../data/data'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; export async function destroyMessagesAndUpdateRedux( messages: Array<{ @@ -30,7 +30,7 @@ export async function destroyMessagesAndUpdateRedux( // trigger a refresh the last message for all those uniq conversation conversationWithChanges.forEach(convoIdToUpdate => { - getConversationController().get(convoIdToUpdate)?.updateLastMessage(); + ConvoHub.use().get(convoIdToUpdate)?.updateLastMessage(); }); } diff --git a/ts/util/readReceipts.ts b/ts/util/readReceipts.ts index 777d9b6115..4ef399b8ca 100644 --- a/ts/util/readReceipts.ts +++ b/ts/util/readReceipts.ts @@ -1,7 +1,7 @@ import { MessageCollection } from '../models/message'; import { Data } from '../data/data'; -import { getConversationController } from '../session/conversations'; +import { ConvoHub } from '../session/conversations'; async function getTargetMessage(reader: string, messages: MessageCollection) { if (messages.length === 0) { @@ -27,11 +27,7 @@ async function onReadReceipt(receipt: { source: string; timestamp: number; readA return; } const convoId = message.get('conversationId'); // this might be a group and we don't want to handle them - if ( - !convoId || - !getConversationController().get(convoId) || - !getConversationController().get(convoId).isPrivate() - ) { + if (!convoId || !ConvoHub.use().get(convoId) || !ConvoHub.use().get(convoId).isPrivate()) { window.log.info( 'Convo is undefined or not a private chat for read receipt in convo', convoId @@ -64,7 +60,7 @@ async function onReadReceipt(receipt: { source: string; timestamp: number; readA } // notify frontend listeners - const conversation = getConversationController().get(message.get('conversationId')); + const conversation = ConvoHub.use().get(message.get('conversationId')); if (conversation) { conversation.updateLastMessage(); } diff --git a/yarn.lock b/yarn.lock index f6f5270356..d80a8ff3e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -832,21 +832,21 @@ "@types/prop-types" "*" "@types/react" "*" -"@types/react@*", "@types/react@^17", "@types/react@^17.0.2": - version "17.0.62" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.62.tgz#2efe8ddf8533500ec44b1334dd1a97caa2f860e3" - integrity sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw== +"@types/react@*", "@types/react@17.0.2", "@types/react@^17": + version "17.0.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" + integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== dependencies: "@types/prop-types" "*" - "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@17.0.2": - version "17.0.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" - integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== +"@types/react@^17.0.2": + version "17.0.62" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.62.tgz#2efe8ddf8533500ec44b1334dd1a97caa2f860e3" + integrity sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw== dependencies: "@types/prop-types" "*" + "@types/scheduler" "*" csstype "^3.0.2" "@types/redux-logger@3.0.7": From e69c5c4b35308a64eecbb20b7f204816120fd383 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 27 Sep 2023 11:50:47 +1000 Subject: [PATCH 025/302] chore: fixed unit tests --- ts/models/conversation.ts | 8 +- ts/session/apis/snode_api/swarmPolling.ts | 107 +++++++++++------- .../conversations/ConversationController.ts | 59 ++++------ .../unit/sogsv3/knownBlindedKeys_test.ts | 4 +- .../SwarmPolling_pollForAllKeys_test.ts | 90 ++++++++------- ts/test/session/unit/updater/updater_test.ts | 8 ++ ts/test/session/unit/utils/Promise_test.ts | 10 +- .../unit/utils/job_runner/JobRunner_test.ts | 18 +-- ts/util/blockedNumberController.ts | 6 +- 9 files changed, 161 insertions(+), 149 deletions(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 934ebae1d3..de11d99ed1 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -144,7 +144,7 @@ export class ConversationModel extends Backbone.Model { public throttledBumpTyping: () => void; public throttledNotify: (message: MessageModel) => void; public markConversationRead: (newestUnreadDate: number, readAt?: number) => void; - public initialPromise: any; + public initialPromise: Promise; private typingRefreshTimer?: NodeJS.Timeout | null; private typingPauseTimer?: NodeJS.Timeout | null; @@ -918,7 +918,7 @@ export class ConversationModel extends Backbone.Model { public async commit() { perfStart(`conversationCommit-${this.id}`); - await commitConversationAndRefreshWrapper(this.id); + await Convo.commitConversationAndRefreshWrapper(this.id); perfEnd(`conversationCommit-${this.id}`, 'conversationCommit'); } @@ -2334,7 +2334,9 @@ export class ConversationModel extends Backbone.Model { } } -export async function commitConversationAndRefreshWrapper(id: string) { +export const Convo = { commitConversationAndRefreshWrapper }; + +async function commitConversationAndRefreshWrapper(id: string) { const convo = ConvoHub.use().get(id); if (!convo) { return; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 0d8167771a..9e7292d08d 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -244,7 +244,6 @@ export class SwarmPolling { const { toPollDetails, groupsToLeave, legacyGroupsToLeave } = await this.getPollingDetails( this.groupPolling ); - // first, leave anything which shouldn't be there anymore await Promise.all( concat(groupsToLeave, legacyGroupsToLeave).map(m => @@ -262,12 +261,61 @@ export class SwarmPolling { } } + public async updateLastPollTimestampForPubkey({ + countMessages, + pubkey, + type, + }: { + type: ConversationTypeEnum; + countMessages: number; + pubkey: string; + }) { + // if all snodes returned an error (null), no need to update the lastPolledTimestamp + if (type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV3) { + window?.log?.debug( + `Polled for group(${ed25519Str(pubkey)}):, got ${countMessages} messages back.` + ); + let lastPolledTimestamp = Date.now(); + if (countMessages >= 95) { + // if we get 95 messages or more back, it means there are probably more than this + // so make sure to retry the polling in the next 5sec by marking the last polled timestamp way before that it is really + // this is a kind of hack + lastPolledTimestamp = Date.now() - SWARM_POLLING_TIMEOUT.INACTIVE - 5 * 1000; + } // update the last fetched timestamp + + this.forcePolledTimestamp(pubkey, lastPolledTimestamp); + } + } + + public async handleUserOrGroupConfMessages({ + confMessages, + pubkey, + type, + }: { + type: ConversationTypeEnum; + pubkey: string; + confMessages: Array | null; + }) { + if (!confMessages) { + return; + } + + // first make sure to handle the shared user config message first + if (type === ConversationTypeEnum.PRIVATE && UserUtils.isUsFromCache(pubkey)) { + // this does not throw, no matter what happens + await SwarmPollingUserConfig.handleUserSharedConfigMessages(confMessages); + return; + } + if (type === ConversationTypeEnum.GROUPV3 && PubKey.isClosedGroupV2(pubkey)) { + await SwarmPollingGroupConfig.handleGroupSharedConfigMessages(confMessages, pubkey); + } + } + /** * Only exposed as public for testing */ public async pollOnceForKey([pubkey, type]: PollForUs | PollForLegacy | PollForGroup) { const namespaces = this.getNamespacesToPollFrom(type); - const swarmSnodes = await snodePool.getSwarmFor(pubkey); // Select nodes for which we already have lastHashes @@ -291,59 +339,32 @@ export class SwarmPolling { } if (!resultsFromAllNamespaces?.length) { - // not a single message from any of the polled namespace was retrieve. nothing else to do + // Not a single message from any of the polled namespace was retrieve. + // We must still mark the current pubkey as "was just polled" + await this.updateLastPollTimestampForPubkey({ + countMessages: 0, + pubkey, + type, + }); return; } const { confMessages, otherMessages } = filterMessagesPerTypeOfConvo( type, resultsFromAllNamespaces ); - - // first make sure to handle the shared user config message first - if ( - type === ConversationTypeEnum.PRIVATE && - confMessages?.length && - UserUtils.isUsFromCache(pubkey) - ) { - // this does not throw, no matter what happens - await SwarmPollingUserConfig.handleUserSharedConfigMessages(confMessages); - } else if ( - type === ConversationTypeEnum.GROUPV3 && - confMessages?.length && - PubKey.isClosedGroupV2(pubkey) - ) { - await SwarmPollingGroupConfig.handleGroupSharedConfigMessages(confMessages, pubkey); - } + // We always handle the config messages first (for groups 03 or our own messages) + await this.handleUserOrGroupConfMessages({ confMessages, pubkey, type }); // Merge results into one list of unique messages const uniqOtherMsgs = uniqBy(otherMessages, x => x.hash); if (uniqOtherMsgs.length) { window.log.debug(`received otherMessages: ${otherMessages.length} for type: ${type}`); } - - // if all snodes returned an error (null), no need to update the lastPolledTimestamp - if (type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV3) { - window?.log?.debug( - `Polled for group(${ed25519Str(pubkey)}):, got ${uniqOtherMsgs.length} messages back.` - ); - let lastPolledTimestamp = Date.now(); - if (uniqOtherMsgs.length >= 95) { - // if we get 95 messages or more back, it means there are probably more than this - // so make sure to retry the polling in the next 5sec by marking the last polled timestamp way before that it is really - // this is a kind of hack - lastPolledTimestamp = Date.now() - SWARM_POLLING_TIMEOUT.INACTIVE - 5 * 1000; - } - // update the last fetched timestamp - this.groupPolling = this.groupPolling.map(group => { - if (PubKey.isEqual(pubkey, group.pubkey)) { - return { - ...group, - lastPolledTimestamp, - }; - } - return group; - }); - } + await this.updateLastPollTimestampForPubkey({ + countMessages: uniqOtherMsgs.length, + pubkey, + type, + }); perfStart(`handleSeenMessages-${pubkey}`); const newMessages = await this.handleSeenMessages(uniqOtherMsgs); diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index eed07b1186..ba226d122f 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -12,7 +12,6 @@ import { } from '../../state/ducks/conversations'; import { BlockedNumberController } from '../../util'; import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGroupManagerV2'; -import { getSwarmFor } from '../apis/snode_api/snodePool'; import { PubKey } from '../types'; import { getMessageQueue } from '..'; @@ -36,24 +35,24 @@ import { SessionUtilContact } from '../utils/libsession/libsession_utils_contact import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile'; import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups'; -let instance: ConversationController | null; +let instance: ConvoController | null; -const getConversationController = () => { +const getConvoHub = () => { if (instance) { return instance; } - instance = new ConversationController(); + instance = new ConvoController(); return instance; }; -class ConversationController { +class ConvoController { private readonly conversations: ConversationCollection; private _initialFetchComplete: boolean = false; - private _initialPromise?: Promise; + private _convoHubInitialPromise?: Promise; /** - * Do not call this constructor. You get the ConversationController through ConvoHub.use() only + * Do not call this constructor. You get the ConvoHub through ConvoHub.use() only */ constructor() { this.conversations = new ConversationCollection(); @@ -139,11 +138,6 @@ class ConversationController { }) ); - if (!conversation.isPublic() && conversation.isActive()) { - // NOTE: we request snodes updating the cache, but ignore the result - - void getSwarmFor(id); - } return conversation; }; @@ -164,21 +158,21 @@ class ConversationController { id: string | PubKey, type: ConversationTypeEnum ): Promise { - const initialPromise = - this._initialPromise !== undefined ? this._initialPromise : Promise.resolve(); - return initialPromise.then(() => { - if (!id) { - return Promise.reject(new Error('getOrCreateAndWait: invalid id passed.')); - } - const pubkey = id && (id as any).key ? (id as any).key : id; - const conversation = this.getOrCreate(pubkey, type); + const convoHubInitialPromise = + this._convoHubInitialPromise !== undefined ? this._convoHubInitialPromise : Promise.resolve(); + await convoHubInitialPromise; - if (conversation) { - return conversation.initialPromise.then(() => conversation); - } + if (!id) { + throw new Error('getOrCreateAndWait: invalid id passed.'); + } + const pubkey = id && (id as any).key ? (id as any).key : id; + const conversation = this.getOrCreate(pubkey, type); - return Promise.reject(new Error('getOrCreateAndWait: did not get conversation')); - }); + if (conversation) { + return conversation.initialPromise.then(() => conversation); + } + + return Promise.reject(new Error('getOrCreateAndWait: did not get conversation')); } /** @@ -312,17 +306,12 @@ class ConversationController { } public async load() { - window.log.warn(`plop1`); - if (this.conversations.length) { throw new Error('ConversationController: Already loaded!'); } - window.log.warn(`plop1`); const load = async () => { try { - window.log.warn(`plop2`); - const startLoad = Date.now(); const convoModels = await Data.getAllConversations(); @@ -379,17 +368,17 @@ class ConversationController { } }; - this._initialPromise = load(); + this._convoHubInitialPromise = load(); - return this._initialPromise; + return this._convoHubInitialPromise; } public loadPromise() { - return this._initialPromise; + return this._convoHubInitialPromise; } public reset() { - this._initialPromise = Promise.resolve(); + this._convoHubInitialPromise = Promise.resolve(); this._initialFetchComplete = false; if (window?.inboxStore) { window.inboxStore?.dispatch(conversationActions.removeAllConversations()); @@ -569,4 +558,4 @@ async function removeCommunityFromWrappers(conversationId: string) { } } -export const ConvoHub = { use: getConversationController }; +export const ConvoHub = { use: getConvoHub }; diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts index 526ea032bc..48284cb9c3 100644 --- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts +++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts @@ -514,12 +514,12 @@ describe('knownBlindedKeys', () => { it('does iterate over all the conversations and find the first one matching (passes)', async () => { await loadKnownBlindedKeys(); // adding a private conversation with a known match of the blinded pubkey we have - await ConvoHub.use().getOrCreateAndWait(realSessionId, ConversationTypeEnum.PRIVATE); + ConvoHub.use().getOrCreate(realSessionId, ConversationTypeEnum.PRIVATE); const convo = await ConvoHub.use().getOrCreateAndWait( knownBlindingMatch.realSessionId, ConversationTypeEnum.PRIVATE ); - await ConvoHub.use().getOrCreateAndWait(realSessionId2, ConversationTypeEnum.PRIVATE); + ConvoHub.use().getOrCreate(realSessionId2, ConversationTypeEnum.PRIVATE); convo.set({ isApproved: true }); const real = await findCachedBlindedMatchOrLookItUp( knownBlindingMatch.blindedId, diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts index 9cf6283189..41a7d42e9a 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts @@ -2,8 +2,8 @@ import chai from 'chai'; import { describe } from 'mocha'; import Sinon, * as sinon from 'sinon'; -import { UserGroupsGet } from 'libsession_util_nodejs'; -import { ConversationModel } from '../../../../models/conversation'; +import { GroupPubkeyType, LegacyGroupInfo, UserGroupsGet } from 'libsession_util_nodejs'; +import { ConversationModel, Convo } from '../../../../models/conversation'; import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; import { SnodePool, getSwarmPollingInstance } from '../../../../session/apis/snode_api'; import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling'; @@ -24,6 +24,16 @@ const pollOnceForGroupLegacyArgs = (groupLegacy: string) => [ [groupLegacy, ConversationTypeEnum.GROUP], ]; +function stubWithLegacyGroups(pubkeys: Array) { + const groups = pubkeys.map(m => ({ pubkeyHex: m }) as LegacyGroupInfo); + TestUtils.stubUserGroupWrapper('getAllLegacyGroups', groups); +} + +function stubWithGroups(pubkeys: Array) { + const groups = pubkeys.map(m => ({ pubkeyHex: m }) as UserGroupsGet); + TestUtils.stubUserGroupWrapper('getAllGroups', groups); +} + describe('SwarmPolling:pollForAllKeys', () => { const ourPubkey = TestUtils.generateFakePubKey(); const ourNumber = ourPubkey.key; @@ -39,6 +49,7 @@ describe('SwarmPolling:pollForAllKeys', () => { beforeEach(async () => { ConvoHub.use().reset(); TestUtils.stubWindowFeatureFlags(); + TestUtils.stubWindowLog(); Sinon.stub(ConfigurationSync, 'queueNewJobIfNeeded').resolves(); // Utils Stubs @@ -50,13 +61,16 @@ describe('SwarmPolling:pollForAllKeys', () => { stubData('getSwarmNodesForPubkey').resolves(); stubData('getLastHashBySnode').resolves(); + Sinon.stub(Convo, 'commitConversationAndRefreshWrapper').resolves(); + + TestUtils.stubLibSessionWorker(undefined); + Sinon.stub(SnodePool, 'getSwarmFor').resolves(generateFakeSnodes(5)); Sinon.stub(SnodeAPIRetrieve, 'retrieveNextMessages').resolves([]); + TestUtils.stubWindow('inboxStore', undefined); TestUtils.stubWindow('getGlobalOnlineStatus', () => true); TestUtils.stubWindowLog(); - TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); - TestUtils.stubUserGroupWrapper('getAllGroups', []); const convoController = ConvoHub.use(); await convoController.load(); @@ -78,8 +92,8 @@ describe('SwarmPolling:pollForAllKeys', () => { }); it('does run for our pubkey even if activeAt is really old ', async () => { - TestUtils.stubLibSessionWorker(undefined); - + stubWithGroups([]); + stubWithLegacyGroups([]); const convo = ConvoHub.use().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE); convo.set('active_at', Date.now() - 1000 * 3600 * 25); await swarmPolling.start(true); @@ -89,8 +103,8 @@ describe('SwarmPolling:pollForAllKeys', () => { }); it('does run for our pubkey even if activeAt is recent ', async () => { - TestUtils.stubLibSessionWorker(undefined); - + stubWithGroups([]); + stubWithLegacyGroups([]); const convo = ConvoHub.use().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE); convo.set('active_at', Date.now()); await swarmPolling.start(true); @@ -103,10 +117,8 @@ describe('SwarmPolling:pollForAllKeys', () => { it('does run for group pubkey on start no matter the recent timestamp', async () => { const groupPk = TestUtils.generateFakePubKeyStr(); const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); - const group = { - pubkeyHex: groupPk, - } as UserGroupsGet; - TestUtils.stubLibSessionWorker([group]); + stubWithLegacyGroups([groupPk]); + stubWithGroups([]); convo.set('active_at', Date.now()); const groupConvoPubkey = PubKey.cast(groupPk); swarmPolling.addGroupId(groupConvoPubkey); @@ -122,11 +134,9 @@ describe('SwarmPolling:pollForAllKeys', () => { it('does only poll from -10 for closed groups', async () => { const groupPk = TestUtils.generateFakePubKeyStr(); const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); - const group = { - pubkeyHex: groupPk, - } as UserGroupsGet; - TestUtils.stubLibSessionWorker([group]); + stubWithLegacyGroups([groupPk]); + stubWithGroups([]); convo.set('active_at', 1); swarmPolling.addGroupId(PubKey.cast(groupPk)); @@ -144,36 +154,31 @@ describe('SwarmPolling:pollForAllKeys', () => { it('does run for group pubkey on start but not another time if activeAt is old ', async () => { const groupPk = TestUtils.generateFakePubKeyStr(); - const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); + const groupConvo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); - const group = { - pubkeyHex: groupPk, - } as UserGroupsGet; - TestUtils.stubLibSessionWorker([group]); - convo.set('active_at', 1); // really old, but active - swarmPolling.addGroupId(groupPk); + stubWithLegacyGroups([groupPk]); + stubWithGroups([]); + groupConvo.set('active_at', 1); // really old, but active + swarmPolling.addGroupId(groupPk); // this calls the stub 2 times, one for our direct pubkey and one for the group await swarmPolling.start(true); - + expect(pollOnceForKeySpy.callCount).to.eq(2); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupLegacyArgs(groupPk)); // this should only call the stub one more time: for our direct pubkey but not for the group pubkey await swarmPolling.pollForAllKeys(); - expect(pollOnceForKeySpy.callCount).to.eq(3); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupLegacyArgs(groupPk)); expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); }); it('does run twice if activeAt less than one hour ', async () => { const groupPk = TestUtils.generateFakePubKeyStr(); - const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event - const group = { - pubkeyHex: groupPk, - } as UserGroupsGet; - TestUtils.stubLibSessionWorker([group]); + stubWithLegacyGroups([groupPk]); + stubWithGroups([]); convo.set('active_at', Date.now()); swarmPolling.addGroupId(groupPk); @@ -203,10 +208,9 @@ describe('SwarmPolling:pollForAllKeys', () => { const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event - const group = { - pubkeyHex: groupPk, - } as UserGroupsGet; - TestUtils.stubLibSessionWorker([group]); + + stubWithLegacyGroups([groupPk]); + stubWithGroups([]); pollOnceForKeySpy.resetHistory(); convo.set('active_at', Date.now()); swarmPolling.addGroupId(groupPk); @@ -236,10 +240,10 @@ describe('SwarmPolling:pollForAllKeys', () => { const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUP); pollOnceForKeySpy.resetHistory(); - const group = { - pubkeyHex: groupPk, - } as UserGroupsGet; - TestUtils.stubLibSessionWorker([group]); + + stubWithLegacyGroups([groupPk]); + stubWithGroups([]); + convo.set('active_at', Date.now()); swarmPolling.addGroupId(groupPk); await swarmPolling.start(true); @@ -265,7 +269,9 @@ describe('SwarmPolling:pollForAllKeys', () => { TestUtils.generateFakePubKeyStr(), ConversationTypeEnum.GROUP ); - TestUtils.stubLibSessionWorker({}); + + stubWithLegacyGroups([convo.id]); + stubWithGroups([]); convo.set('active_at', Date.now()); groupConvoPubkey = PubKey.cast(convo.id as string); @@ -334,4 +340,6 @@ describe('SwarmPolling:pollForAllKeys', () => { }); }); }); + + it.skip('do the same for neww groups'); }); diff --git a/ts/test/session/unit/updater/updater_test.ts b/ts/test/session/unit/updater/updater_test.ts index c3af600232..fc7f0062b3 100644 --- a/ts/test/session/unit/updater/updater_test.ts +++ b/ts/test/session/unit/updater/updater_test.ts @@ -1,6 +1,8 @@ import path from 'path'; import { readFileSync } from 'fs-extra'; import { isEmpty } from 'lodash'; +import { expect } from 'chai'; +import { enableLogRedirect } from '../../../test-utils/utils'; describe('Updater', () => { it.skip('isUpdateAvailable', () => {}); @@ -16,4 +18,10 @@ describe('Updater', () => { ); } }); + it('stubWindowLog is set to false before pushing', () => { + expect(enableLogRedirect).to.be.eq( + false, + 'If you see this message, just set `enableLogRedirect` to false in `ts/test/test-utils/utils/stubbing.ts' + ); + }); }); diff --git a/ts/test/session/unit/utils/Promise_test.ts b/ts/test/session/unit/utils/Promise_test.ts index 80f0c5ae01..43ec7e439b 100644 --- a/ts/test/session/unit/utils/Promise_test.ts +++ b/ts/test/session/unit/utils/Promise_test.ts @@ -1,6 +1,6 @@ import chai from 'chai'; -import Sinon, * as sinon from 'sinon'; import chaiAsPromised from 'chai-as-promised'; +import Sinon, * as sinon from 'sinon'; import { PromiseUtils } from '../../../../session/utils'; @@ -10,7 +10,6 @@ import { sleepFor, } from '../../../../session/utils/Promise'; import { TestUtils } from '../../../test-utils'; -import { enableLogRedirect } from '../../../test-utils/utils'; chai.use(chaiAsPromised as any); chai.should(); @@ -207,11 +206,4 @@ describe('Promise Utils', () => { expect(hasAlreadyOneAtaTimeMatching('testing2')).to.be.eq(false, 'should be false'); }); }); - - it('stubWindowLog is set to false before pushing', () => { - expect( - enableLogRedirect, - 'If you see this message, just set `enableLogRedirect` to false in `ts/test/test-utils/utils/stubbing.ts`' - ).to.be.eq(false); - }); }); diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts index 121358a0d5..6b6324d8ee 100644 --- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts +++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts @@ -199,12 +199,11 @@ describe('JobRunner', () => { expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]); expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier); - console.info( - 'runnerMulti.getJobList() initial', - runnerMulti.getJobList().map(m => m.identifier), - Date.now() - ); - console.info('=========== awaiting first job =========='); + // console.info( + // 'runnerMulti.getJobList() initial', + // runnerMulti.getJobList().map(m => m.identifier), + // Date.now() + // ); // each job takes 5s to finish, so let's tick once the first one should be done clock.tick(5000); @@ -212,20 +211,13 @@ describe('JobRunner', () => { let awaited = await runnerMulti.waitCurrentJob(); expect(awaited).to.eq('await'); await sleepFor(10); - - console.info('=========== awaited first job =========='); expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job2.persistedData.identifier); - - console.info('=========== awaiting second job =========='); - clock.tick(5000); awaited = await runnerMulti.waitCurrentJob(); expect(awaited).to.eq('await'); await sleepFor(10); // those sleep for is just to let the runner the time to finish writing the tests to the DB and exit the handling of the previous test - console.info('=========== awaited second job =========='); - expect(runnerMulti.getCurrentJobIdentifier()).to.eq(null); expect(runnerMulti.getJobList()).to.deep.eq([]); diff --git a/ts/util/blockedNumberController.ts b/ts/util/blockedNumberController.ts index 6ee17b1be2..851584b410 100644 --- a/ts/util/blockedNumberController.ts +++ b/ts/util/blockedNumberController.ts @@ -1,5 +1,5 @@ import { Data } from '../data/data'; -import { commitConversationAndRefreshWrapper } from '../models/conversation'; +import { Convo } from '../models/conversation'; import { PubKey } from '../session/types'; import { Storage } from './storage'; @@ -38,7 +38,7 @@ export class BlockedNumberController { if (!this.blockedNumbers.has(toBlock.key)) { this.blockedNumbers.add(toBlock.key); await this.saveToDB(BLOCKED_NUMBERS_ID, this.blockedNumbers); - await commitConversationAndRefreshWrapper(toBlock.key); + await Convo.commitConversationAndRefreshWrapper(toBlock.key); } } @@ -64,7 +64,7 @@ export class BlockedNumberController { const user = users[index]; try { // eslint-disable-next-line no-await-in-loop - await commitConversationAndRefreshWrapper(user); + await Convo.commitConversationAndRefreshWrapper(user); } catch (e) { window.log.warn( 'failed to SessionUtilContact.insertContactFromDBIntoWrapperAndRefresh with: ', From cc7e6f03db5d9a7ba09a738f05e59c74e9601df0 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 27 Sep 2023 13:21:08 +1000 Subject: [PATCH 026/302] test: add tests for swarmPolling of new groups 03 --- ts/session/apis/snode_api/swarmPolling.ts | 54 +++-- .../SwarmPolling_pollForAllKeys_test.ts | 221 +++++++++++++++++- 2 files changed, 253 insertions(+), 22 deletions(-) diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 9e7292d08d..7fc5f24c51 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -366,31 +366,15 @@ export class SwarmPolling { type, }); + const shouldDiscardMessages = await this.shouldLeaveNotPolledGroup({ type, pubkey }); + if (shouldDiscardMessages) { + return; + } + perfStart(`handleSeenMessages-${pubkey}`); const newMessages = await this.handleSeenMessages(uniqOtherMsgs); perfEnd(`handleSeenMessages-${pubkey}`, 'handleSeenMessages'); - const allLegacyGroupsInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups(); - const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); - - // don't handle incoming messages from group when the group is not tracked. - // this can happen when a group is removed from the wrapper while we were polling - - if ( - type === ConversationTypeEnum.GROUP && - pubkey.startsWith('05') && - !allLegacyGroupsInWrapper.some(m => m.pubkeyHex === pubkey) // just check if a legacy group with that pubkey exists - ) { - // not tracked anymore in the wrapper. Discard messages and stop polling - await this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); - return; - } - if (PubKey.isClosedGroupV2(pubkey) && !allGroupsInWrapper.some(m => m.pubkeyHex === pubkey)) { - // not tracked anymore in the wrapper. Discard messages and stop polling - await this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); - return; - } - // trigger the handling of all the other messages, not shared config related newMessages.forEach(m => { const content = extractWebSocketContent(m.data, m.hash); @@ -408,6 +392,34 @@ export class SwarmPolling { }); } + private async shouldLeaveNotPolledGroup({ + pubkey, + type, + }: { + type: ConversationTypeEnum; + pubkey: string; + }) { + const allLegacyGroupsInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups(); + const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); + + // don't handle incoming messages from group when the group is not tracked. + // this can happen when a group is removed from the wrapper while we were polling + + const newGroupButNotInWrapper = + PubKey.isClosedGroupV2(pubkey) && !allGroupsInWrapper.some(m => m.pubkeyHex === pubkey); + const legacyGroupButNoInWrapper = + type === ConversationTypeEnum.GROUP && + pubkey.startsWith('05') && + !allLegacyGroupsInWrapper.some(m => m.pubkeyHex === pubkey); + + if (newGroupButNotInWrapper || legacyGroupButNoInWrapper) { + // not tracked anymore in the wrapper. Discard messages and stop polling + await this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); + return true; + } + return false; + } + private async getHashesToBump( type: ConversationTypeEnum, pubkey: string diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts index 41a7d42e9a..e8ac3a5428 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts @@ -24,6 +24,8 @@ const pollOnceForGroupLegacyArgs = (groupLegacy: string) => [ [groupLegacy, ConversationTypeEnum.GROUP], ]; +const pollOnceForGroupArgs = (group: GroupPubkeyType) => [[group, ConversationTypeEnum.GROUPV3]]; + function stubWithLegacyGroups(pubkeys: Array) { const groups = pubkeys.map(m => ({ pubkeyHex: m }) as LegacyGroupInfo); TestUtils.stubUserGroupWrapper('getAllLegacyGroups', groups); @@ -341,5 +343,222 @@ describe('SwarmPolling:pollForAllKeys', () => { }); }); - it.skip('do the same for neww groups'); + describe('03 group', () => { + it('does run for group pubkey on start no matter the recent timestamp', async () => { + const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + stubWithLegacyGroups([]); + stubWithGroups([groupPk]); + convo.set('active_at', Date.now()); + const groupConvoPubkey = PubKey.cast(groupPk); + swarmPolling.addGroupId(groupConvoPubkey); + await swarmPolling.start(true); + + // our pubkey will be polled for, hence the 2 + expect(pollOnceForKeySpy.callCount).to.eq(2); + + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupArgs(groupPk)); + }); + + it('does only poll from -10 for closed groups', async () => { + const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + stubWithLegacyGroups([]); + stubWithGroups([groupPk]); + convo.set('active_at', 1); + swarmPolling.addGroupId(PubKey.cast(groupPk)); + + await swarmPolling.start(true); + + // our pubkey will be polled for, hence the 2 + expect(pollOnceForKeySpy.callCount).to.eq(2); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupArgs(groupPk)); + getItemByIdStub.restore(); + getItemByIdStub = TestUtils.stubData('getItemById'); + + getItemByIdStub.resolves(); + }); + + it('does run for group pubkey on start but not another time if activeAt is old ', async () => { + const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + stubWithLegacyGroups([]); + stubWithGroups([groupPk]); + + convo.set('active_at', 1); // really old, but active + swarmPolling.addGroupId(groupPk); + // this calls the stub 2 times, one for our direct pubkey and one for the group + await swarmPolling.start(true); + expect(pollOnceForKeySpy.callCount).to.eq(2); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupArgs(groupPk)); + // this should only call the stub one more time: for our direct pubkey but not for the group pubkey + await swarmPolling.pollForAllKeys(); + expect(pollOnceForKeySpy.callCount).to.eq(3); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + }); + + it('does run twice if activeAt less than one hour ', async () => { + const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + stubWithLegacyGroups([]); + stubWithGroups([groupPk]); + + convo.set('active_at', Date.now()); + swarmPolling.addGroupId(groupPk); + await swarmPolling.start(true); + expect(pollOnceForKeySpy.callCount).to.eq(2); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupArgs(groupPk)); + pollOnceForKeySpy.resetHistory(); + clock.tick(9000); + + // no need to do that as the tick will trigger a call in all cases after 5 secs await swarmPolling.pollForAllKeys(); + /** this is not easy to explain, but + * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group id) + * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails. + * the only fix is to restore the clock and force the a small sleep to let the thing run in bg + */ + + await sleepFor(10); + + expect(pollOnceForKeySpy.callCount).to.eq(2); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupArgs(groupPk)); + }); + + it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => { + const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + stubWithLegacyGroups([]); + stubWithGroups([groupPk]); + + pollOnceForKeySpy.resetHistory(); + convo.set('active_at', Date.now()); + swarmPolling.addGroupId(groupPk); + // this call the stub two times already, one for our direct pubkey and one for the group + await swarmPolling.start(true); + const timeToTick = 3 * 60 * 1000; + swarmPolling.forcePolledTimestamp(groupPk, Date.now() - timeToTick); + // more than week old, so inactive group but we have to tick after more than 2 min + convo.set('active_at', Date.now() - 7 * 25 * 3600 * 1000); + clock.tick(timeToTick); + /** this is not easy to explain, but + * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od) + * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails. + * the only fix is to restore the clock and force the a small sleep to let the thing run in bg + */ + await sleepFor(10); + // we should have two more calls here, so 4 total. + expect(pollOnceForKeySpy.callCount).to.eq(4); + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupArgs(groupPk)); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq(pollOnceForGroupArgs(groupPk)); + }); + + it('does run once only if group is inactive and we tick less than 2 minutes ', async () => { + const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + stubWithLegacyGroups([]); + stubWithGroups([groupPk]); + + convo.set('active_at', Date.now()); + swarmPolling.addGroupId(groupPk); + await swarmPolling.start(true); + + // more than a week old, we should not tick after just 5 seconds + convo.set('active_at', Date.now() - 7 * 24 * 3600 * 1000 - 3600 * 1000); + + clock.tick(1 * 60 * 1000); + await sleepFor(10); + + // we should have only one more call here, the one for our direct pubkey fetch + expect(pollOnceForKeySpy.callCount).to.eq(3); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq(pollOnceForGroupArgs(groupPk)); // this one comes from the swarmPolling.start + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + }); + + describe('multiple runs', () => { + let convo: ConversationModel; + let groupConvoPubkey: PubKey; + + beforeEach(async () => { + convo = ConvoHub.use().getOrCreate( + TestUtils.generateFakeClosedGroupV3PkStr(), + ConversationTypeEnum.GROUPV3 + ); + + stubWithLegacyGroups([]); + stubWithGroups([convo.id]); + + convo.set('active_at', Date.now()); + groupConvoPubkey = PubKey.cast(convo.id as string); + swarmPolling.addGroupId(groupConvoPubkey); + await swarmPolling.start(true); + }); + + afterEach(() => { + Sinon.restore(); + ConvoHub.use().reset(); + clock.restore(); + resetHardForkCachedValues(); + }); + + it('does run twice if activeAt is less than 2 days', async () => { + pollOnceForKeySpy.resetHistory(); + // less than 2 days old, this is an active group + convo.set('active_at', Date.now() - 2 * 24 * 3600 * 1000 - 3600 * 1000); + + const timeToTick = 6 * 1000; + + swarmPolling.forcePolledTimestamp(convo.id, timeToTick); + // we tick more than 5 sec + clock.tick(timeToTick); + + await swarmPolling.pollForAllKeys(); + // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too) + expect(pollOnceForKeySpy.callCount).to.eq(4); + // first two calls are our pubkey + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq( + pollOnceForGroupArgs(groupConvoPubkey.key as GroupPubkeyType) + ); + + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq( + pollOnceForGroupArgs(groupConvoPubkey.key as GroupPubkeyType) + ); + }); + + it('does run twice if activeAt is more than 2 days old and we tick more than one minute', async () => { + pollOnceForKeySpy.resetHistory(); + TestUtils.stubWindowLog(); + convo.set('active_at', Date.now() - 2 * 25 * 3600 * 1000); // medium active + // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event + + const timeToTick = 65 * 1000; // more than one minute + swarmPolling.forcePolledTimestamp(convo.id, timeToTick); + clock.tick(timeToTick); // should tick twice more (one more our direct pubkey and one for the group) + + // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event + + await swarmPolling.pollForAllKeys(); + + expect(pollOnceForKeySpy.callCount).to.eq(4); + + // first two calls are our pubkey + expect(pollOnceForKeySpy.firstCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.secondCall.args).to.deep.eq( + pollOnceForGroupArgs(groupConvoPubkey.key as GroupPubkeyType) + ); + expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq(pollOnceForUsArgs(ourPubkey.key)); + expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq( + pollOnceForGroupArgs(groupConvoPubkey.key as GroupPubkeyType) + ); + }); + }); + }); }); From 9cf5d4d7c542e7020b1816c1c1c61bfe44944ae9 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 2 Oct 2023 14:47:25 +1100 Subject: [PATCH 027/302] test: add unit tests for encrypting/decryption groups messages --- .../libsession_wrapper_metagroup_test.ts | 54 +++++++++++++++++++ ts/test/test-utils/utils/pubkey.ts | 44 ++++++++++++++- 2 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts new file mode 100644 index 0000000000..4acf9a286b --- /dev/null +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -0,0 +1,54 @@ +import { expect } from 'chai'; +import { MetaGroupWrapperNode, UserGroupsWrapperNode } from 'libsession_util_nodejs'; +import Sinon from 'sinon'; +import { HexString } from '../../../../node/hexStrings'; +import { toFixedUint8ArrayOfLength } from '../../../../types/sqlSharedTypes'; +import { TestUtils } from '../../../test-utils'; +import { TestUserKeyPairs } from '../../../test-utils/utils'; + +describe('libsession_metagroup', () => { + let us: TestUserKeyPairs; + let groupCreated: ReturnType; + let metaGroupWrapper: MetaGroupWrapperNode; + + beforeEach(async () => { + us = await TestUtils.generateUserKeyPairs(); + const groupWrapper = new UserGroupsWrapperNode(us.ed25519KeyPair.privateKey, null); + groupCreated = groupWrapper.createGroup(); + + metaGroupWrapper = new MetaGroupWrapperNode({ + groupEd25519Pubkey: toFixedUint8ArrayOfLength( + HexString.fromHexString(groupCreated.pubkeyHex.slice(2)), + 32 + ), + groupEd25519Secretkey: groupCreated.secretKey, + metaDumped: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(us.ed25519KeyPair.privateKey, 64), + }); + }); + afterEach(() => { + Sinon.restore(); + }); + + describe("encrypt/decrypt group's message", () => { + it('can encrypt/decrypt message for group with us as author', async () => { + const plaintext = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + const toEncrypt = new Uint8Array(plaintext); + const encrypted = metaGroupWrapper.encryptMessage(toEncrypt); + const decrypted = metaGroupWrapper.decryptMessage(encrypted); + + expect(decrypted.plaintext).to.be.deep.eq(toEncrypt); + expect(decrypted.pubkeyHex).to.be.deep.eq(us.x25519KeyPair.pubkeyHex); + }); + + it('throws when encrypt/decrypt message when content is messed up', async () => { + const plaintext = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + const toEncrypt = new Uint8Array(plaintext); + const encrypted = metaGroupWrapper.encryptMessage(toEncrypt); + + encrypted[1] = 67; + const func = () => metaGroupWrapper.decryptMessage(encrypted); + expect(func).to.throw('unable to decrypt ciphertext with any current group keys'); + }); + }); +}); diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index 826012e514..7247c7435b 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -1,9 +1,11 @@ import * as crypto from 'crypto'; +import { GroupPubkeyType, UserGroupsWrapperNode } from 'libsession_util_nodejs'; +import { KeyPair, to_hex } from 'libsodium-wrappers-sumo'; import _ from 'lodash'; import { Snode } from '../../../data/data'; +import { getSodiumNode } from '../../../node/sodiumNode'; import { ECKeyPair } from '../../../receiver/keypairs'; import { PubKey } from '../../../session/types'; -import { GroupPubkeyType } from 'libsession_util_nodejs'; export function generateFakePubKey(): PubKey { // Generates a mock pubkey for testing @@ -23,6 +25,46 @@ export function generateFakePubKeyStr(): string { return pubkeyString; } +export type TestUserKeyPairs = { + x25519KeyPair: { + pubkeyHex: string; + pubKey: Uint8Array; + privKey: Uint8Array; + }; + ed25519KeyPair: KeyPair; +}; + +export async function generateUserKeyPairs(): Promise { + const sodium = await getSodiumNode(); + const ed25519KeyPair = sodium.crypto_sign_seed_keypair( + sodium.randombytes_buf(sodium.crypto_sign_SEEDBYTES) + ); + const x25519PublicKey = sodium.crypto_sign_ed25519_pk_to_curve25519(ed25519KeyPair.publicKey); + // prepend version byte (coming from `processKeys(raw_keys)`) + const origPub = new Uint8Array(x25519PublicKey); + const prependedX25519PublicKey = new Uint8Array(33); + prependedX25519PublicKey.set(origPub, 1); + prependedX25519PublicKey[0] = 5; + const x25519SecretKey = sodium.crypto_sign_ed25519_sk_to_curve25519(ed25519KeyPair.privateKey); + + // prepend with 05 the public key + const userKeys = { + x25519KeyPair: { + pubkeyHex: to_hex(prependedX25519PublicKey), + pubKey: prependedX25519PublicKey, + privKey: x25519SecretKey, + }, + ed25519KeyPair, + }; + + return userKeys; +} + +export async function generateGroupV2(privateEd25519: Uint8Array) { + const groupWrapper = new UserGroupsWrapperNode(privateEd25519, null); + return groupWrapper.createGroup(); +} + export function generateFakeClosedGroupV3PkStr(): GroupPubkeyType { // Generates a mock pubkey for testing const numBytes = PubKey.PUBKEY_LEN / 2 - 1; From cf44ea1da10d42350027ccaf930d6da019e814fb Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 2 Oct 2023 16:25:01 +1100 Subject: [PATCH 028/302] test: added tests for group info get/set --- .../libsession_wrapper_metagroup_test.ts | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 4acf9a286b..a81fad43ef 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -1,6 +1,7 @@ import { expect } from 'chai'; import { MetaGroupWrapperNode, UserGroupsWrapperNode } from 'libsession_util_nodejs'; import Sinon from 'sinon'; +import { range } from 'lodash'; import { HexString } from '../../../../node/hexStrings'; import { toFixedUint8ArrayOfLength } from '../../../../types/sqlSharedTypes'; import { TestUtils } from '../../../test-utils'; @@ -51,4 +52,74 @@ describe('libsession_metagroup', () => { expect(func).to.throw('unable to decrypt ciphertext with any current group keys'); }); }); + + describe('info', () => { + it('all fields are accounted for', () => { + const info = metaGroupWrapper.infoGet(); + expect(Object.keys(info).length).to.be.eq( + 7, // if you change this value, also make sure you add a test, testing that field, below + 'this test is designed to fail if you need to add tests to test a new field of libsession' + ); + }); + + it('can set and recover group name', () => { + expect(metaGroupWrapper.infoGet().name).to.be.deep.eq(null); + const info = metaGroupWrapper.infoGet(); + info.name = 'fake name'; + metaGroupWrapper.infoSet(info); + expect(metaGroupWrapper.infoGet().name).to.be.deep.eq('fake name'); + }); + + it('can set and recover group createdAt', () => { + const expected = 1234; + expect(metaGroupWrapper.infoGet().createdAtSeconds).to.be.deep.eq(null); + const info = metaGroupWrapper.infoGet(); + info.createdAtSeconds = expected; + metaGroupWrapper.infoSet(info); + expect(metaGroupWrapper.infoGet().createdAtSeconds).to.be.deep.eq(expected); + }); + + it('can set and recover group deleteAttachBeforeSeconds', () => { + const expected = 1234; + expect(metaGroupWrapper.infoGet().deleteAttachBeforeSeconds).to.be.deep.eq(null); + const info = metaGroupWrapper.infoGet(); + info.deleteAttachBeforeSeconds = expected; + metaGroupWrapper.infoSet(info); + expect(metaGroupWrapper.infoGet().deleteAttachBeforeSeconds).to.be.deep.eq(expected); + }); + + it('can set and recover group deleteBeforeSeconds', () => { + const expected = 1234; + expect(metaGroupWrapper.infoGet().deleteBeforeSeconds).to.be.deep.eq(null); + const info = metaGroupWrapper.infoGet(); + info.deleteBeforeSeconds = expected; + metaGroupWrapper.infoSet(info); + expect(metaGroupWrapper.infoGet().deleteBeforeSeconds).to.be.deep.eq(expected); + }); + + it('can set and recover group expirySeconds', () => { + const expected = 1234; + expect(metaGroupWrapper.infoGet().expirySeconds).to.be.deep.eq(null); + const info = metaGroupWrapper.infoGet(); + info.expirySeconds = expected; + metaGroupWrapper.infoSet(info); + expect(metaGroupWrapper.infoGet().expirySeconds).to.be.deep.eq(expected); + }); + + it('can set and recover group isDestroyed', () => { + expect(metaGroupWrapper.infoGet().isDestroyed).to.be.deep.eq(false); + metaGroupWrapper.infoDestroy(); + expect(metaGroupWrapper.infoGet().isDestroyed).to.be.deep.eq(true); + }); + + it('can set and recover group profilePicture', () => { + const expected = { key: new Uint8Array(range(0, 32)), url: '1234' }; + expect(metaGroupWrapper.infoGet().profilePicture).to.be.deep.eq({ url: null, key: null }); + const info = metaGroupWrapper.infoGet(); + + info.profilePicture = expected; + metaGroupWrapper.infoSet(info); + expect(metaGroupWrapper.infoGet().profilePicture).to.be.deep.eq(expected); + }); + }); }); From e24ec9e1a8243a7e8c1fee394b6a5959e426c5f7 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 3 Oct 2023 11:53:10 +1100 Subject: [PATCH 029/302] test: added tests for metagroup members wrapper --- .../libsession_wrapper_metagroup_test.ts | 130 +++++++++++++++++- 1 file changed, 129 insertions(+), 1 deletion(-) diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index a81fad43ef..7f98ae7b90 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -1,5 +1,9 @@ import { expect } from 'chai'; -import { MetaGroupWrapperNode, UserGroupsWrapperNode } from 'libsession_util_nodejs'; +import { + GroupMemberGet, + MetaGroupWrapperNode, + UserGroupsWrapperNode, +} from 'libsession_util_nodejs'; import Sinon from 'sinon'; import { range } from 'lodash'; import { HexString } from '../../../../node/hexStrings'; @@ -7,10 +11,32 @@ import { toFixedUint8ArrayOfLength } from '../../../../types/sqlSharedTypes'; import { TestUtils } from '../../../test-utils'; import { TestUserKeyPairs } from '../../../test-utils/utils'; +function profilePicture() { + return { key: new Uint8Array(range(0, 32)), url: `${Math.random()}` }; +} + +function emptyMember(pubkeyHex: string): GroupMemberGet { + return { + inviteFailed: false, + invitePending: false, + name: '', + profilePicture: { + key: null, + url: null, + }, + promoted: false, + promotionFailed: false, + promotionPending: false, + pubkeyHex, + }; +} + describe('libsession_metagroup', () => { let us: TestUserKeyPairs; let groupCreated: ReturnType; let metaGroupWrapper: MetaGroupWrapperNode; + let member: string; + let member2: string; beforeEach(async () => { us = await TestUtils.generateUserKeyPairs(); @@ -26,6 +52,8 @@ describe('libsession_metagroup', () => { metaDumped: null, userEd25519Secretkey: toFixedUint8ArrayOfLength(us.ed25519KeyPair.privateKey, 64), }); + member = TestUtils.generateFakePubKeyStr(); + member2 = TestUtils.generateFakePubKeyStr(); }); afterEach(() => { Sinon.restore(); @@ -122,4 +150,104 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.infoGet().profilePicture).to.be.deep.eq(expected); }); }); + + describe('members', () => { + it('all fields are accounted for', () => { + const memberCreated = metaGroupWrapper.memberGetOrConstruct(member); + expect(Object.keys(memberCreated).length).to.be.eq( + 8, // if you change this value, also make sure you add a test, testing that new field, below + 'this test is designed to fail if you need to add tests to test a new field of libsession' + ); + }); + + it('can add member by setting its promoted state', () => { + metaGroupWrapper.memberSetPromoted(member, false); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ + ...emptyMember(member), + promoted: true, + promotionPending: true, + }); + + metaGroupWrapper.memberSetPromoted(member2, true); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); + // the list is sorted by member pk, which means that index based test do not work + expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ + ...emptyMember(member2), + promoted: true, + promotionFailed: true, + promotionPending: true, + }); + }); + + it('can add member by setting its invited state', () => { + metaGroupWrapper.memberSetInvited(member, false); // with invite success + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ + ...emptyMember(member), + invitePending: true, + }); + + metaGroupWrapper.memberSetInvited(member2, true); // with invite failed + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); + expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ + ...emptyMember(member2), + invitePending: true, + inviteFailed: true, + }); + }); + + it('can add member by setting its accepted state', () => { + metaGroupWrapper.memberSetAccepted(member); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ + ...emptyMember(member), + }); + + metaGroupWrapper.memberSetAccepted(member2); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); + expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ + ...emptyMember(member2), + }); + }); + + it('can erase member', () => { + metaGroupWrapper.memberSetAccepted(member); + metaGroupWrapper.memberSetPromoted(member2, false); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); + + expect(metaGroupWrapper.memberGet(member)).to.be.deep.eq({ + ...emptyMember(member), + }); + expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ + ...emptyMember(member2), + promoted: true, + promotionPending: true, + }); + + metaGroupWrapper.memberErase(member2); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ + ...emptyMember(member), + }); + }); + + it('can add via name set', () => { + metaGroupWrapper.memberSetName(member, 'member name'); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ + ...emptyMember(member), + name: 'member name', + }); + }); + + it('can add via profile picture set', () => { + const pic = profilePicture(); + metaGroupWrapper.memberSetProfilePicture(member, pic); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + const expected = { ...emptyMember(member), profilePicture: pic }; + + expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); + }); + }); }); From 6b3adff9724f992d76c4cebadb0ac8026bd09484 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 3 Oct 2023 15:56:13 +1100 Subject: [PATCH 030/302] test: added a (still broken) test for key conflicts --- .../utils/job_runners/jobs/GroupConfigJob.ts | 2 - .../utils/libsession/libsession_utils.ts | 1 - .../libsession_wrapper_metagroup_test.ts | 41 ++++++++++++++++++- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index a518fabec8..3302cb77ee 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -119,9 +119,7 @@ async function buildAndSaveDumpsToDB( async function pushChangesToGroupSwarmIfNeeded(groupPk: GroupPubkeyType): Promise { // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); - const singleDestChanges = await LibSessionUtil.pendingChangesForGroup(groupPk); - // If there are no pending changes then the job can just complete (next time something // is updated we want to try and run immediately so don't scuedule another run in this case) if (isEmpty(singleDestChanges?.messages)) { diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 9c4b7406fb..69a79a5d4f 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -202,7 +202,6 @@ async function pendingChangesForGroup( if (!needsPush) { return { messages: results, allOldHashes: new Set() }; } - const { groupInfo, groupMember, groupKeys } = await MetaGroupWrapperActions.push(groupPk); // Note: We need the keys to be pushed first to avoid a race condition diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 7f98ae7b90..4785bfeb4a 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -75,7 +75,7 @@ describe('libsession_metagroup', () => { const toEncrypt = new Uint8Array(plaintext); const encrypted = metaGroupWrapper.encryptMessage(toEncrypt); - encrypted[1] = 67; + encrypted[1] -= 1; const func = () => metaGroupWrapper.decryptMessage(encrypted); expect(func).to.throw('unable to decrypt ciphertext with any current group keys'); }); @@ -250,4 +250,43 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); }); }); + + describe('keys', () => { + it('fresh group does not need rekey', () => { + expect(metaGroupWrapper.keysNeedsRekey()).to.be.eq( + false, + 'rekey should be false on fresh group' + ); + }); + + it('merging a key conflict marks needsRekey to true', () => { + const metaGroupWrapper2 = new MetaGroupWrapperNode({ + groupEd25519Pubkey: toFixedUint8ArrayOfLength( + HexString.fromHexString(groupCreated.pubkeyHex.slice(2)), + 32 + ), + groupEd25519Secretkey: groupCreated.secretKey, + metaDumped: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(us.ed25519KeyPair.privateKey, 64), + }); + metaGroupWrapper.memberSetPromoted(TestUtils.generateFakePubKeyStr(), false); + metaGroupWrapper2.memberSetPromoted(TestUtils.generateFakePubKeyStr(), false); + expect(metaGroupWrapper.keysNeedsRekey()).to.be.eq( + false, + 'rekey should be false on fresh group' + ); + expect(metaGroupWrapper2.keysNeedsRekey()).to.be.eq( + false, + 'rekey should be false on fresh group2' + ); + const wrapper2Rekeyed = metaGroupWrapper2.keyRekey(); + + const loadedKey = metaGroupWrapper.loadKeyMessage('fakehash1', wrapper2Rekeyed, Date.now()); + expect(loadedKey).to.be.eq(true, 'key should have been loaded'); + expect(metaGroupWrapper.keysNeedsRekey()).to.be.eq( + true, + 'rekey should be true for after add' + ); + }); + }); }); From 51205424d6f0476e1ac20978c65965147e6b43f8 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 9 Oct 2023 15:45:57 +1100 Subject: [PATCH 031/302] test: add tests for GroupSyncJob --- .../utils/job_runners/jobs/GroupConfigJob.ts | 26 +- .../utils/libsession/libsession_utils.ts | 4 +- .../group_sync_job/GroupSyncJob_test.ts | 492 ++++++++++++++++++ ts/test/test-utils/utils/pubkey.ts | 9 +- ts/test/test-utils/utils/stubbing.ts | 6 + 5 files changed, 521 insertions(+), 16 deletions(-) create mode 100644 ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index 3302cb77ee..d1af3428a6 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -38,7 +38,7 @@ const defaultMaxAttempts = 2; */ const lastRunConfigSyncJobTimestamps = new Map(); -type SuccessfulChange = { +export type GroupSuccessfulChange = { pushed: PendingChangesForGroup; updatedHash: string; }; @@ -49,8 +49,8 @@ type SuccessfulChange = { function resultsToSuccessfulChange( result: NotEmptyArrayOfBatchResults | null, request: GroupSingleDestinationChanges -): Array { - const successfulChanges: Array = []; +): Array { + const successfulChanges: Array = []; /** * For each batch request, we get as result @@ -82,20 +82,19 @@ function resultsToSuccessfulChange( } async function buildAndSaveDumpsToDB( - changes: Array, + changes: Array, groupPk: GroupPubkeyType ): Promise { const toConfirm: Parameters = [ groupPk, { groupInfo: null, groupMember: null }, ]; - for (let i = 0; i < changes.length; i++) { const change = changes[i]; const namespace = change.pushed.namespace; switch (namespace) { case SnodeNamespaces.ClosedGroupInfo: { - if ((change.pushed as any).seqno) { + if (change.pushed.seqno) { toConfirm[1].groupInfo = [change.pushed.seqno.toNumber(), change.updatedHash]; } break; @@ -140,16 +139,18 @@ async function pushChangesToGroupSwarmIfNeeded(groupPk: GroupPubkeyType): Promis const result = await MessageSender.sendEncryptedDataToSnode(msgs, groupPk, oldHashesToDelete); const expectedReplyLength = singleDestChanges.messages.length + (oldHashesToDelete.size ? 1 : 0); + // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { window.log.info( `GroupSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` ); + // this might be a 421 error (already handled) so let's retry this request a little bit later return RunJobResult.RetryJobIfPossible; } - const changes = resultsToSuccessfulChange(result, singleDestChanges); + const changes = GroupSync.resultsToSuccessfulChange(result, singleDestChanges); if (isEmpty(changes)) { return RunJobResult.RetryJobIfPossible; } @@ -185,6 +186,9 @@ class GroupSyncJob extends PersistedJob { try { const thisJobDestination = this.persistedData.identifier; + if (!PubKey.isClosedGroupV2(thisJobDestination)) { + return RunJobResult.PermanentFailure; + } window.log.debug(`GroupSyncJob starting ${thisJobDestination}`); @@ -197,11 +201,8 @@ class GroupSyncJob extends PersistedJob { return RunJobResult.PermanentFailure; } - if (!PubKey.isClosedGroupV2(thisJobDestination)) { - return RunJobResult.PermanentFailure; - } - - return await pushChangesToGroupSwarmIfNeeded(thisJobDestination); + // return await so we catch exceptions in here + return await GroupSync.pushChangesToGroupSwarmIfNeeded(thisJobDestination); // eslint-disable-next-line no-useless-catch } catch (e) { @@ -278,6 +279,7 @@ async function queueNewJobIfNeeded(groupPk: GroupPubkeyType) { export const GroupSync = { GroupSyncJob, pushChangesToGroupSwarmIfNeeded, + resultsToSuccessfulChange, queueNewJobIfNeeded: (groupPk: GroupPubkeyType) => allowOnlyOneAtATime(`GroupSyncJob-oneAtAtTime-${groupPk}`, () => queueNewJobIfNeeded(groupPk)), }; diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 69a79a5d4f..10efca0cf9 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -190,7 +190,6 @@ export type GroupSingleDestinationChanges = { async function pendingChangesForGroup( groupPk: GroupPubkeyType ): Promise { - const results = new Array(); if (!PubKey.isClosedGroupV2(groupPk)) { throw new Error(`pendingChangesForGroup only works for user or 03 group pubkeys`); } @@ -200,9 +199,10 @@ async function pendingChangesForGroup( // we probably need to add the GROUP_KEYS check here if (!needsPush) { - return { messages: results, allOldHashes: new Set() }; + return { messages: [], allOldHashes: new Set() }; } const { groupInfo, groupMember, groupKeys } = await MetaGroupWrapperActions.push(groupPk); + const results = new Array(); // Note: We need the keys to be pushed first to avoid a race condition if (groupKeys) { diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts new file mode 100644 index 0000000000..a2ad4d71cb --- /dev/null +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -0,0 +1,492 @@ +import { expect } from 'chai'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { omit, pick } from 'lodash'; +import Long from 'long'; +import Sinon from 'sinon'; +import { ConfigDumpData } from '../../../../../../data/configDump/configDump'; +import { getSodiumNode } from '../../../../../../node/sodiumNode'; +import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/SnodeRequestTypes'; +import { GetNetworkTime } from '../../../../../../session/apis/snode_api/getNetworkTime'; +import { SnodeNamespaces } from '../../../../../../session/apis/snode_api/namespaces'; +import { ConvoHub } from '../../../../../../session/conversations'; +import { LibSodiumWrappers } from '../../../../../../session/crypto'; +import { UserUtils } from '../../../../../../session/utils'; +import { RunJobResult } from '../../../../../../session/utils/job_runners/PersistedJob'; +import { + GroupSuccessfulChange, + GroupSync, +} from '../../../../../../session/utils/job_runners/jobs/GroupConfigJob'; +import { + GroupSingleDestinationChanges, + LibSessionUtil, + PendingChangesForGroup, +} from '../../../../../../session/utils/libsession/libsession_utils'; +import { MetaGroupWrapperActions } from '../../../../../../webworker/workers/browser/libsession_worker_interface'; +import { TestUtils } from '../../../../../test-utils'; +import { MessageSender } from '../../../../../../session/sending'; +import { TypedStub } from '../../../../../test-utils/utils'; +import { TTL_DEFAULT } from '../../../../../../session/constants'; + +function validInfo(sodium: LibSodiumWrappers) { + return { + type: 'GroupInfo', + data: sodium.randombytes_buf(12), + seqno: Long.fromNumber(123), + namespace: SnodeNamespaces.ClosedGroupInfo, + timestamp: 1234, + } as const; +} +function validMembers(sodium: LibSodiumWrappers) { + return { + type: 'GroupMember', + data: sodium.randombytes_buf(12), + seqno: Long.fromNumber(321), + namespace: SnodeNamespaces.ClosedGroupMembers, + timestamp: 4321, + } as const; +} + +function validKeys(sodium: LibSodiumWrappers) { + return { + type: 'GroupKeys', + data: sodium.randombytes_buf(12), + namespace: SnodeNamespaces.ClosedGroupKeys, + timestamp: 3333, + } as const; +} + +describe('GroupSyncJob saveMetaGroupDumpToDb', () => { + let groupPk: GroupPubkeyType; + + beforeEach(async () => {}); + beforeEach(() => { + groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + }); + + afterEach(() => { + Sinon.restore(); + }); + + it('does not save to DB if needsDump reports false', async () => { + Sinon.stub(MetaGroupWrapperActions, 'needsDump').resolves(false); + const metaDump = Sinon.stub(MetaGroupWrapperActions, 'metaDump').resolves(new Uint8Array()); + const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); + await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); + expect(saveConfigDump.callCount).to.be.equal(0); + expect(metaDump.callCount).to.be.equal(0); + }); + + it('does save to DB if needsDump reports true', async () => { + Sinon.stub(MetaGroupWrapperActions, 'needsDump').resolves(true); + const dump = [1, 2, 3, 4, 5]; + const metaDump = Sinon.stub(MetaGroupWrapperActions, 'metaDump').resolves(new Uint8Array(dump)); + const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); + await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); + expect(saveConfigDump.callCount).to.be.equal(1); + expect(metaDump.callCount).to.be.equal(1); + expect(metaDump.firstCall.args).to.be.deep.eq([groupPk]); + expect(saveConfigDump.firstCall.args).to.be.deep.eq([ + { + publicKey: groupPk, + variant: `MetaGroupConfig-${groupPk}`, + data: new Uint8Array(dump), + }, + ]); + }); +}); + +describe('GroupSyncJob pendingChangesForGroup', () => { + let groupPk: GroupPubkeyType; + beforeEach(() => { + groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + }); + + afterEach(() => { + Sinon.restore(); + }); + + it('empty results if needsPush is false', async () => { + Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(false); + const result = await LibSessionUtil.pendingChangesForGroup(groupPk); + expect(result.allOldHashes.size).to.be.equal(0); + expect(result.messages.length).to.be.equal(0); + }); + + it('valid results if needsPush is true', async () => { + const pushResults = { + groupKeys: { data: new Uint8Array([3, 2, 1]), namespace: 13 }, + groupInfo: { + seqno: 1, + data: new Uint8Array([1, 2, 3]), + hashes: ['123', '333'], + namespace: 12, + }, + groupMember: { + seqno: 2, + data: new Uint8Array([1, 2]), + hashes: ['321', '111'], + namespace: 14, + }, + }; + Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(true); + Sinon.stub(MetaGroupWrapperActions, 'push').resolves(pushResults); + Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(1234); + const result = await LibSessionUtil.pendingChangesForGroup(groupPk); + expect(result.allOldHashes.size).to.be.equal(4); + // check that all of the hashes are there + expect([...result.allOldHashes]).to.have.members([ + ...pushResults.groupInfo.hashes, + ...pushResults.groupMember.hashes, + ]); + + expect(result.messages.length).to.be.equal(3); + // check for the keys push content + expect(result.messages[0]).to.be.deep.eq({ + type: 'GroupKeys', + data: new Uint8Array([3, 2, 1]), + namespace: 13, + timestamp: 1234, + }); + // check for the info push content + expect(result.messages[1]).to.be.deep.eq({ + type: 'GroupInfo', + data: new Uint8Array([1, 2, 3]), + namespace: 12, + seqno: Long.fromInt(pushResults.groupInfo.seqno), + timestamp: 1234, + }); + // check for the members pusu content + expect(result.messages[2]).to.be.deep.eq({ + type: 'GroupMember', + data: new Uint8Array([1, 2]), + namespace: 14, + seqno: Long.fromInt(pushResults.groupMember.seqno), + timestamp: 1234, + }); + }); + + it('skips entry results if needsPush one of the wrapper has no changes', async () => { + const pushResults = { + groupInfo: { + seqno: 1, + data: new Uint8Array([1, 2, 3]), + hashes: ['123', '333'], + namespace: 12, + }, + groupMember: null, + groupKeys: { data: new Uint8Array([3, 2, 1]), namespace: 13 }, + }; + Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(true); + Sinon.stub(MetaGroupWrapperActions, 'push').resolves(pushResults); + const result = await LibSessionUtil.pendingChangesForGroup(groupPk); + expect(result.allOldHashes.size).to.be.equal(2); + expect(result.messages.length).to.be.equal(2); + }); +}); + +describe('GroupSyncJob run()', () => { + afterEach(() => { + Sinon.restore(); + }); + it('throws if no user keys', async () => { + const job = new GroupSync.GroupSyncJob({ + identifier: TestUtils.generateFakeClosedGroupV3PkStr(), + }); + + const func = async () => job.run(); + await expect(func()).to.be.eventually.rejected; + }); + + it('permanent failure if group is not a 03 one', async () => { + const job = new GroupSync.GroupSyncJob({ + identifier: TestUtils.generateFakeClosedGroupV3PkStr().slice(2), + }); + const result = await job.run(); + expect(result).to.be.eq(RunJobResult.PermanentFailure); + }); + + it('permanent failure if user has no ed keypair', async () => { + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(TestUtils.generateFakePubKeyStr()); + Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves(undefined); + Sinon.stub(ConvoHub.use(), 'get').resolves({}); // anything not falsy + const job = new GroupSync.GroupSyncJob({ + identifier: TestUtils.generateFakeClosedGroupV3PkStr(), + }); + const result = await job.run(); + expect(result).to.be.eq(RunJobResult.PermanentFailure); + }); + + it('permanent failure if user has no own conversation', async () => { + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(TestUtils.generateFakePubKeyStr()); + Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves({} as any); // anything not falsy + Sinon.stub(ConvoHub.use(), 'get').returns(undefined as any); + const job = new GroupSync.GroupSyncJob({ + identifier: TestUtils.generateFakeClosedGroupV3PkStr(), + }); + const result = await job.run(); + expect(result).to.be.eq(RunJobResult.PermanentFailure); + }); + + it('calls pushChangesToGroupSwarmIfNeeded if preconditions are fine', async () => { + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(TestUtils.generateFakePubKeyStr()); + Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves({} as any); // anything not falsy + const taskedRun = Sinon.stub(GroupSync, 'pushChangesToGroupSwarmIfNeeded').resolves( + RunJobResult.Success + ); + Sinon.stub(ConvoHub.use(), 'get').returns({} as any); // anything not falsy + const job = new GroupSync.GroupSyncJob({ + identifier: TestUtils.generateFakeClosedGroupV3PkStr(), + }); + const result = await job.run(); + expect(result).to.be.eq(RunJobResult.Success); + expect(taskedRun.callCount).to.be.eq(1); + }); +}); + +describe('GroupSyncJob resultsToSuccessfulChange', () => { + let sodium: LibSodiumWrappers; + beforeEach(async () => { + sodium = await getSodiumNode(); + }); + it('no or empty results return empty array', () => { + expect( + GroupSync.resultsToSuccessfulChange(null, { allOldHashes: new Set(), messages: [] }) + ).to.be.deep.eq([]); + + expect( + GroupSync.resultsToSuccessfulChange([] as any as NotEmptyArrayOfBatchResults, { + allOldHashes: new Set(), + messages: [], + }) + ).to.be.deep.eq([]); + }); + + it('extract one result with 200 and messagehash', () => { + const member = validMembers(sodium); + const info = validInfo(sodium); + const batchResults: NotEmptyArrayOfBatchResults = [{ code: 200, body: { hash: 'hash1' } }]; + const request: GroupSingleDestinationChanges = { + allOldHashes: new Set(), + messages: [info, member], + }; + const results = GroupSync.resultsToSuccessfulChange(batchResults, request); + expect(results).to.be.deep.eq([ + { + updatedHash: 'hash1', + pushed: info, + }, + ]); + }); + + it('extract two results with 200 and messagehash', () => { + const member = validMembers(sodium); + const info = validInfo(sodium); + const batchResults: NotEmptyArrayOfBatchResults = [ + { code: 200, body: { hash: 'hash1' } }, + { code: 200, body: { hash: 'hash2' } }, + ]; + const request: GroupSingleDestinationChanges = { + allOldHashes: new Set(), + messages: [info, member], + }; + const results = GroupSync.resultsToSuccessfulChange(batchResults, request); + expect(results).to.be.deep.eq([ + { + updatedHash: 'hash1', + pushed: info, + }, + { + updatedHash: 'hash2', + pushed: member, + }, + ]); + }); + + it('skip message hashes not a string', () => { + const member = validMembers(sodium); + const info = validInfo(sodium); + const batchResults: NotEmptyArrayOfBatchResults = [ + { code: 200, body: { hash: 123 as any as string } }, + { code: 200, body: { hash: 'hash2' } }, + ]; + const request: GroupSingleDestinationChanges = { + allOldHashes: new Set(), + messages: [info, member], + }; + const results = GroupSync.resultsToSuccessfulChange(batchResults, request); + expect(results).to.be.deep.eq([ + { + updatedHash: 'hash2', + pushed: member, + }, + ]); + }); + + it('skip request item without data', () => { + const member = validMembers(sodium); + const info = validInfo(sodium); + const infoNoData = omit(info, 'data'); + const batchResults: NotEmptyArrayOfBatchResults = [ + { code: 200, body: { hash: 'hash1' } }, + { code: 200, body: { hash: 'hash2' } }, + ]; + const request: GroupSingleDestinationChanges = { + allOldHashes: new Set(), + messages: [infoNoData as PendingChangesForGroup, member], + }; + const results = GroupSync.resultsToSuccessfulChange(batchResults, request); + expect(results).to.be.deep.eq([ + { + updatedHash: 'hash2', + pushed: member, + }, + ]); + }); + + it('skip request item without 200 code', () => { + const member = validMembers(sodium); + const info = validInfo(sodium); + const batchResults: NotEmptyArrayOfBatchResults = [ + { code: 200, body: { hash: 'hash1' } }, + { code: 401, body: { hash: 'hash2' } }, + ]; + const request: GroupSingleDestinationChanges = { + allOldHashes: new Set(), + messages: [info, member], + }; + const results = GroupSync.resultsToSuccessfulChange(batchResults, request); + expect(results).to.be.deep.eq([ + { + updatedHash: 'hash1', + pushed: info, + }, + ]); + + // another test swapping the results + batchResults[0].code = 401; + batchResults[1].code = 200; + const results2 = GroupSync.resultsToSuccessfulChange(batchResults, request); + expect(results2).to.be.deep.eq([ + { + updatedHash: 'hash2', + pushed: member, + }, + ]); + }); +}); + +describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { + let groupPk: GroupPubkeyType; + let userkeys: TestUtils.TestUserKeyPairs; + let sodium: LibSodiumWrappers; + + let sendStub: TypedStub; + let pendingChangesForGroupStub: TypedStub; + let saveMetaGroupDumpToDbStub: TypedStub; + + beforeEach(async () => { + sodium = await getSodiumNode(); + groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + userkeys = await TestUtils.generateUserKeyPairs(); + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(userkeys.x25519KeyPair.pubkeyHex); + Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves(userkeys.ed25519KeyPair); + + pendingChangesForGroupStub = Sinon.stub(LibSessionUtil, 'pendingChangesForGroup'); + saveMetaGroupDumpToDbStub = Sinon.stub(LibSessionUtil, 'saveMetaGroupDumpToDb'); + sendStub = Sinon.stub(MessageSender, 'sendEncryptedDataToSnode'); + }); + afterEach(() => { + Sinon.restore(); + }); + + it('call savesDumpToDb even if no changes are required on the serverside', async () => { + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); + pendingChangesForGroupStub.resolves(undefined); + expect(result).to.be.eq(RunJobResult.Success); + expect(sendStub.callCount).to.be.eq(0); + expect(pendingChangesForGroupStub.callCount).to.be.eq(1); + expect(saveMetaGroupDumpToDbStub.callCount).to.be.eq(1); + expect(saveMetaGroupDumpToDbStub.firstCall.args).to.be.deep.eq([groupPk]); + }); + + it('calls sendEncryptedDataToSnode with the right data and retry if network returned nothing', async () => { + const info = validInfo(sodium); + const member = validMembers(sodium); + const networkTimestamp = 4444; + const ttl = TTL_DEFAULT.TTL_CONFIG; + Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(networkTimestamp); + pendingChangesForGroupStub.resolves({ + messages: [info, member], + allOldHashes: new Set('123'), + }); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); + + sendStub.resolves(undefined); + expect(result).to.be.eq(RunJobResult.RetryJobIfPossible); // not returning anything in the sendstub so network issue happened + expect(sendStub.callCount).to.be.eq(1); + expect(pendingChangesForGroupStub.callCount).to.be.eq(1); + expect(saveMetaGroupDumpToDbStub.callCount).to.be.eq(1); + expect(saveMetaGroupDumpToDbStub.firstCall.args).to.be.deep.eq([groupPk]); + + function expected(details: any) { + return { ...pick(details, 'data', 'namespace'), ttl, networkTimestamp, pubkey: groupPk }; + } + + const expectedInfo = expected(info); + const expectedMember = expected(member); + expect(sendStub.firstCall.args).to.be.deep.eq([ + [expectedInfo, expectedMember], + groupPk, + new Set('123'), + ]); + }); + + it('calls sendEncryptedDataToSnode with the right data and retry if network returned nothing', async () => { + const info = validInfo(sodium); + const member = validMembers(sodium); + const keys = validKeys(sodium); + pendingChangesForGroupStub.resolves({ + messages: [keys, info, member], + allOldHashes: new Set('123'), + }); + const changes: Array = [ + { + pushed: keys, + updatedHash: 'hashkeys', + }, + { + pushed: info, + updatedHash: 'hash1', + }, + { + pushed: member, + updatedHash: 'hash2', + }, + ]; + Sinon.stub(GroupSync, 'resultsToSuccessfulChange').returns(changes); + const metaConfirmPushed = Sinon.stub(MetaGroupWrapperActions, 'metaConfirmPushed').resolves(); + + sendStub.resolves([ + { code: 200, body: { hash: 'hashkeys' } }, + { code: 200, body: { hash: 'hash1' } }, + { code: 200, body: { hash: 'hash2' } }, + { code: 200, body: {} }, // because we are giving a set of allOldHashes + ]); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); + + expect(sendStub.callCount).to.be.eq(1); + expect(pendingChangesForGroupStub.callCount).to.be.eq(1); + expect(saveMetaGroupDumpToDbStub.callCount).to.be.eq(2); + expect(saveMetaGroupDumpToDbStub.firstCall.args).to.be.deep.eq([groupPk]); + expect(saveMetaGroupDumpToDbStub.secondCall.args).to.be.deep.eq([groupPk]); + expect(metaConfirmPushed.callCount).to.be.eq(1); + expect(metaConfirmPushed.firstCall.args).to.be.deep.eq([ + groupPk, + { + groupInfo: [123, 'hash1'], + groupMember: [321, 'hash2'], + }, + ]); + expect(result).to.be.eq(RunJobResult.Success); + }); +}); diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index 7247c7435b..aa178a9629 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -6,6 +6,7 @@ import { Snode } from '../../../data/data'; import { getSodiumNode } from '../../../node/sodiumNode'; import { ECKeyPair } from '../../../receiver/keypairs'; import { PubKey } from '../../../session/types'; +import { ByteKeyPair } from '../../../session/utils/User'; export function generateFakePubKey(): PubKey { // Generates a mock pubkey for testing @@ -31,7 +32,7 @@ export type TestUserKeyPairs = { pubKey: Uint8Array; privKey: Uint8Array; }; - ed25519KeyPair: KeyPair; + ed25519KeyPair: KeyPair & ByteKeyPair; }; export async function generateUserKeyPairs(): Promise { @@ -54,7 +55,11 @@ export async function generateUserKeyPairs(): Promise { pubKey: prependedX25519PublicKey, privKey: x25519SecretKey, }, - ed25519KeyPair, + ed25519KeyPair: { + ...ed25519KeyPair, + pubKeyBytes: ed25519KeyPair.publicKey, + privKeyBytes: ed25519KeyPair.privateKey, + }, }; return userKeys; diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts index 7d18717954..34d4958385 100644 --- a/ts/test/test-utils/utils/stubbing.ts +++ b/ts/test/test-utils/utils/stubbing.ts @@ -116,3 +116,9 @@ export async function expectAsyncToThrow(toAwait: () => Promise, errorMessa expect(e.message).to.be.eq(errorMessageToCatch); } } + +export type TypedStub, K extends keyof T> = T[K] extends ( + ...args: any +) => any + ? Sinon.SinonStub, ReturnType> + : never; From 0ef2df801e58c3bcb69b24dbbf9790cbf6e95e08 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 9 Oct 2023 17:09:07 +1100 Subject: [PATCH 032/302] test: speedup onion tests by stubbing retries timeout --- ts/session/onions/onionSend.ts | 7 +++- .../decryptedAttachmentsManager_test.ts | 3 -- .../libsession_wrapper_metagroup_test.ts | 42 ++++++++++++------- .../unit/sending/MessageSender_test.ts | 4 ++ ts/test/session/unit/updater/updater_test.ts | 1 + .../browser/libsession_worker_interface.ts | 4 -- 6 files changed, 39 insertions(+), 22 deletions(-) diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts index 48146a5bba..be98ab0585 100644 --- a/ts/session/onions/onionSend.ts +++ b/ts/session/onions/onionSend.ts @@ -236,7 +236,7 @@ const sendViaOnionV4ToNonSnodeWithRetries = async ( }, { retries: 2, // retry 3 (2+1) times at most - minTimeout: 100, + minTimeout: OnionSending.getMinTimeoutForSogs(), onFailedAttempt: e => { window?.log?.warn( `sendViaOnionV4ToNonSnodeRetryable attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...: ${e.message}` @@ -525,6 +525,10 @@ async function sendJsonViaOnionV4ToFileServer(sendOptions: { return res as OnionV4JSONSnodeResponse; } +function getMinTimeoutForSogs() { + return 100; +} + // we export these methods for stubbing during testing export const OnionSending = { endpointRequiresDecoding, @@ -536,4 +540,5 @@ export const OnionSending = { sendBinaryViaOnionV4ToSogs, getBinaryViaOnionV4FromFileServer, sendJsonViaOnionV4ToFileServer, + getMinTimeoutForSogs, }; diff --git a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts index 983da4ca60..9c6a3af170 100644 --- a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts +++ b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts @@ -134,7 +134,4 @@ describe('DecryptedAttachmentsManager', () => { }); }); }); - - it.skip('cleanUpOldDecryptedMedias', () => {}); - it.skip('getDecryptedBlob', () => {}); }); diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 4785bfeb4a..3d1bc8377a 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -259,7 +259,7 @@ describe('libsession_metagroup', () => { ); }); - it('merging a key conflict marks needsRekey to true', () => { + it.skip('merging a key conflict marks needsRekey to true', () => { const metaGroupWrapper2 = new MetaGroupWrapperNode({ groupEd25519Pubkey: toFixedUint8ArrayOfLength( HexString.fromHexString(groupCreated.pubkeyHex.slice(2)), @@ -269,20 +269,34 @@ describe('libsession_metagroup', () => { metaDumped: null, userEd25519Secretkey: toFixedUint8ArrayOfLength(us.ed25519KeyPair.privateKey, 64), }); - metaGroupWrapper.memberSetPromoted(TestUtils.generateFakePubKeyStr(), false); - metaGroupWrapper2.memberSetPromoted(TestUtils.generateFakePubKeyStr(), false); - expect(metaGroupWrapper.keysNeedsRekey()).to.be.eq( - false, - 'rekey should be false on fresh group' - ); - expect(metaGroupWrapper2.keysNeedsRekey()).to.be.eq( - false, - 'rekey should be false on fresh group2' - ); - const wrapper2Rekeyed = metaGroupWrapper2.keyRekey(); - const loadedKey = metaGroupWrapper.loadKeyMessage('fakehash1', wrapper2Rekeyed, Date.now()); - expect(loadedKey).to.be.eq(true, 'key should have been loaded'); + // mark current user as admin + metaGroupWrapper.memberSetPromoted(us.x25519KeyPair.pubkeyHex, false); + metaGroupWrapper2.memberSetPromoted(us.x25519KeyPair.pubkeyHex, false); + + // add 2 normal members to each of those wrappers + const m1 = TestUtils.generateFakePubKeyStr(); + const m2 = TestUtils.generateFakePubKeyStr(); + metaGroupWrapper.memberSetAccepted(m1); + metaGroupWrapper.memberSetAccepted(m2); + metaGroupWrapper2.memberSetAccepted(m1); + metaGroupWrapper2.memberSetAccepted(m2); + + expect(metaGroupWrapper.keysNeedsRekey()).to.be.eq(false); + expect(metaGroupWrapper2.keysNeedsRekey()).to.be.eq(false); + + // remove m2 from wrapper2, and m1 from wrapper1 + metaGroupWrapper2.memberErase(m2); + metaGroupWrapper.memberErase(m1); + + // const push1 = metaGroupWrapper.push(); + // metaGroupWrapper2.metaMerge([push1]); + + // const wrapper2Rekeyed = metaGroupWrapper2.keyRekey(); + // metaGroupWrapper.keyRekey(); + + // const loadedKey = metaGroupWrapper.loadKeyMessage('fakehash1', wrapper2Rekeyed, Date.now()); + // expect(loadedKey).to.be.eq(true, 'key should have been loaded'); expect(metaGroupWrapper.keysNeedsRekey()).to.be.eq( true, 'rekey should be true for after add' diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index 586d73efcd..2f39cf1f1a 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -267,6 +267,7 @@ describe('MessageSender', () => { bodyBinary: new Uint8Array(), bodyContentType: 'a', }); + Sinon.stub(OnionSending, 'getMinTimeoutForSogs').returns(5); const message = TestUtils.generateOpenGroupVisibleMessage(); const roomInfos = TestUtils.generateOpenGroupV2RoomInfos(); @@ -279,6 +280,8 @@ describe('MessageSender', () => { const roomInfos = TestUtils.generateOpenGroupV2RoomInfos(); Sinon.stub(Onions, 'sendOnionRequestHandlingSnodeEject').resolves({} as any); + Sinon.stub(OnionSending, 'getMinTimeoutForSogs').returns(5); + const decodev4responseStub = Sinon.stub(OnionV4, 'decodeV4Response'); decodev4responseStub.throws('whate'); @@ -296,6 +299,7 @@ describe('MessageSender', () => { const message = TestUtils.generateOpenGroupVisibleMessage(); const roomInfos = TestUtils.generateOpenGroupV2RoomInfos(); Sinon.stub(Onions, 'sendOnionRequestHandlingSnodeEject').resolves({} as any); + Sinon.stub(OnionSending, 'getMinTimeoutForSogs').returns(5); const decodev4responseStub = Sinon.stub(OnionV4, 'decodeV4Response'); decodev4responseStub.throws('whate'); diff --git a/ts/test/session/unit/updater/updater_test.ts b/ts/test/session/unit/updater/updater_test.ts index fc7f0062b3..ff20afc14b 100644 --- a/ts/test/session/unit/updater/updater_test.ts +++ b/ts/test/session/unit/updater/updater_test.ts @@ -18,6 +18,7 @@ describe('Updater', () => { ); } }); + it('stubWindowLog is set to false before pushing', () => { expect(enableLogRedirect).to.be.eq( false, diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 0215fe6e03..d681056a80 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -488,10 +488,6 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'keysNeedsRekey']) as Promise< ReturnType >, - groupKeys: async (groupPk: GroupPubkeyType) => - callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'groupKeys']) as Promise< - ReturnType - >, currentHashes: async (groupPk: GroupPubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'currentHashes']) as Promise< ReturnType From d9300e67a084d85d737e271e71253bcd8692937b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 10 Oct 2023 14:53:43 +1100 Subject: [PATCH 033/302] fix: remove the whole kind logic and use namespace instead this is because session doesn't care about the config it receives anymore and just forwards them to libsession --- ts/node/sodiumNode.ts | 1 + ts/receiver/configMessage.ts | 104 ++++----- .../apis/snode_api/SnodeRequestTypes.ts | 12 +- ts/session/apis/snode_api/namespaces.ts | 12 +- ts/session/apis/snode_api/swarmPolling.ts | 7 +- .../SwarmPollingConfigShared.ts | 64 ------ .../SwarmPollingUserConfig.ts | 24 +-- .../controlMessage/SharedConfigMessage.ts | 59 ------ ts/session/sending/MessageQueue.ts | 2 - ts/session/sending/MessageSender.ts | 118 +---------- ts/session/utils/User.ts | 1 + .../job_runners/jobs/ConfigurationSyncJob.ts | 199 ++++++++---------- .../utils/job_runners/jobs/GroupConfigJob.ts | 10 +- .../utils/libsession/libsession_utils.ts | 131 +++++------- ts/session/utils/sync/syncUtils.ts | 4 +- .../group_sync_job/GroupSyncJob_test.ts | 5 +- ts/types/ProtobufKind.ts | 20 -- .../browser/libsession_worker_interface.ts | 79 +++---- 18 files changed, 265 insertions(+), 587 deletions(-) delete mode 100644 ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts delete mode 100644 ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts delete mode 100644 ts/types/ProtobufKind.ts diff --git a/ts/node/sodiumNode.ts b/ts/node/sodiumNode.ts index 14b06a1441..3657f92ce4 100644 --- a/ts/node/sodiumNode.ts +++ b/ts/node/sodiumNode.ts @@ -1,4 +1,5 @@ import * as wrappers from 'libsodium-wrappers-sumo'; + type LibSodiumWrappers = typeof wrappers; export async function getSodiumNode() { diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 8f23301b4f..920ccd9885 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -1,18 +1,17 @@ /* eslint-disable no-await-in-loop */ import { ContactInfo, UserGroupsGet } from 'libsession_util_nodejs'; +import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo'; import { compact, difference, isEmpty, isNil, isNumber, toNumber } from 'lodash'; import { ConfigDumpData } from '../data/configDump/configDump'; import { SettingsKey } from '../data/settings-key'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../interactions/conversationInteractions'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../models/conversationAttributes'; -import { SignalService } from '../protobuf'; import { ClosedGroup } from '../session'; import { getOpenGroupManager } from '../session/apis/open_group_api/opengroupV2/OpenGroupManagerV2'; import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; import { getOpenGroupV2ConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils'; import { getSwarmPollingInstance } from '../session/apis/snode_api'; import { ConvoHub } from '../session/conversations'; -import { IncomingMessage } from '../session/messages/incoming/IncomingMessage'; import { ProfileManager } from '../session/profile_manager/ProfileManager'; import { PubKey } from '../session/types'; import { StringUtils, UserUtils } from '../session/utils'; @@ -28,13 +27,20 @@ import { assertUnreachable, stringify, toFixedUint8ArrayOfLength } from '../type import { BlockedNumberController } from '../util'; import { Storage, setLastProfileUpdateTimestamp } from '../util/storage'; // eslint-disable-next-line import/no-unresolved, import/extensions +import { HexString } from '../node/hexStrings'; +import { + SnodeNamespace, + SnodeNamespaces, + UserConfigNamespaces, +} from '../session/apis/snode_api/namespaces'; +import { RetrieveMessageItemWithNamespace } from '../session/apis/snode_api/types'; +import { groupInfoActions } from '../state/ducks/groups'; import { ConfigWrapperObjectTypesMeta, ConfigWrapperUser, getGroupPubkeyFromWrapperType, isUserConfigWrapperType, } from '../webworker/workers/browser/libsession_worker_functions'; -import { UserConfigKind, isUserKind } from '../types/ProtobufKind'; import { ContactsWrapperActions, ConvoInfoVolatileWrapperActions, @@ -46,87 +52,87 @@ import { import { addKeyPairToCacheAndDBIfNeeded } from './closedGroups'; import { HexKeyPair } from './keypairs'; import { queueAllCachedFromSource } from './receiver'; -import { HexString } from '../node/hexStrings'; -import { groupInfoActions } from '../state/ducks/groups'; type IncomingUserResult = { needsPush: boolean; needsDump: boolean; - kind: UserConfigKind; publicKey: string; latestEnvelopeTimestamp: number; + namespace: UserConfigNamespaces; }; -function byUserVariant( - incomingConfigs: Array> -) { +function byUserNamespace(incomingConfigs: Array) { const groupedByVariant: Map< - ConfigWrapperUser, - Array> + UserConfigNamespaces, + Array > = new Map(); incomingConfigs.forEach(incomingConfig => { - const { kind } = incomingConfig.message; - if (!isUserKind(kind)) { - throw new Error(`Invalid kind when handling userkinds: ${kind}`); + const { namespace } = incomingConfig; + if (!SnodeNamespace.isUserConfigNamespace(namespace)) { + throw new Error(`Invalid namespace on byUserNamespace: ${namespace}`); } - const wrapperId = LibSessionUtil.userKindToVariant(kind); - - if (!groupedByVariant.has(wrapperId)) { - groupedByVariant.set(wrapperId, []); + if (!groupedByVariant.has(namespace)) { + groupedByVariant.set(namespace, []); } - groupedByVariant.get(wrapperId)?.push(incomingConfig); + groupedByVariant.get(namespace)?.push(incomingConfig); }); return groupedByVariant; } async function printDumpForDebug(prefix: string, variant: ConfigWrapperObjectTypesMeta) { if (isUserConfigWrapperType(variant)) { - window.log.info(prefix, StringUtils.toHex(await GenericWrapperActions.dump(variant))); + window.log.info(prefix, StringUtils.toHex(await GenericWrapperActions.makeDump(variant))); return; } - const metaGroupDumps = await MetaGroupWrapperActions.metaDebugDump( + const metaGroupDumps = await MetaGroupWrapperActions.metaMakeDump( getGroupPubkeyFromWrapperType(variant) ); window.log.info(prefix, StringUtils.toHex(metaGroupDumps)); } async function mergeUserConfigsWithIncomingUpdates( - incomingConfigs: Array> + incomingConfigs: Array ): Promise> { - // first, group by variant so we do a single merge call - // Note: this call throws if given a non user kind as this functio should only handle user variants/kinds - const groupedByVariant = byUserVariant(incomingConfigs); + // first, group by namesapces so we do a single merge call + // Note: this call throws if given a non user kind as this function should only handle user variants/kinds + const groupedByNamespaces = byUserNamespace(incomingConfigs); const groupedResults: Map = new Map(); - const publicKey = UserUtils.getOurPubKeyStrFromCache(); + const us = UserUtils.getOurPubKeyStrFromCache(); try { - for (let index = 0; index < groupedByVariant.size; index++) { - const variant = [...groupedByVariant.keys()][index]; - const sameVariant = groupedByVariant.get(variant); + for (let index = 0; index < groupedByNamespaces.size; index++) { + const namespace = [...groupedByNamespaces.keys()][index]; + const sameVariant = groupedByNamespaces.get(namespace); if (!sameVariant?.length) { continue; } const toMerge = sameVariant.map(msg => ({ - data: msg.message.data, - hash: msg.messageHash, + data: from_base64(msg.data, base64_variants.ORIGINAL), + hash: msg.hash, })); + + const variant = LibSessionUtil.userNamespaceToVariant(namespace); + if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { await printDumpForDebug(`printDumpsForDebugging: before merge of ${variant}:`, variant); } - const mergedCount = await GenericWrapperActions.merge(variant, toMerge); + const hashesMerged = await GenericWrapperActions.merge(variant, toMerge); const needsDump = await GenericWrapperActions.needsDump(variant); const needsPush = await GenericWrapperActions.needsPush(variant); - const latestEnvelopeTimestamp = Math.max(...sameVariant.map(m => m.envelopeTimestamp)); + const mergedTimestamps = sameVariant + .filter(m => hashesMerged.includes(m.hash)) + .map(m => m.timestamp); + const latestEnvelopeTimestamp = Math.max(...mergedTimestamps); window.log.debug( - `${variant}: needsPush:${needsPush} needsDump:${needsDump}; mergedCount:${mergedCount} ` + `${variant}: needsPush:${needsPush} needsDump:${needsDump}; mergedCount:${hashesMerged.length} ` ); if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { @@ -135,8 +141,8 @@ async function mergeUserConfigsWithIncomingUpdates( const incomingConfResult: IncomingUserResult = { needsDump, needsPush, - kind: LibSessionUtil.userVariantToUserKind(variant), - publicKey, + publicKey: us, + namespace, latestEnvelopeTimestamp: latestEnvelopeTimestamp || Date.now(), }; groupedResults.set(variant, incomingConfResult); @@ -848,29 +854,32 @@ async function processUserMergingResults(results: Map> + configMessages: Array ) { if (isEmpty(configMessages)) { return; @@ -915,9 +924,8 @@ async function handleUserConfigMessagesViaLibSession( window?.log?.debug( `Handling our sharedConfig message via libsession_util ${JSON.stringify( configMessages.map(m => ({ - kind: m.message.kind, - hash: m.messageHash, - seqno: (m.message.seqno as Long).toNumber(), + hash: m.hash, + namespace: m.namespace, })) )}` ); diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 7c0fa38721..628a0c9061 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1,5 +1,4 @@ -import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { SharedUserConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { SnodeNamespaces, SnodeNamespacesGroup } from './namespaces'; export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } }; @@ -109,15 +108,8 @@ export type DeleteFromNodeWithTimestampParams = { } & DeleteSigParameters; export type DeleteByHashesFromNodeParams = { messages: Array } & DeleteSigParameters; -export type StoreOnNodeMessage = { - pubkey: string; - timestamp: number; - namespace: number; - message: SharedUserConfigMessage; -}; - export type StoreOnNodeData = { - pubkey: GroupPubkeyType; + pubkey: GroupPubkeyType | PubkeyType; networkTimestamp: number; namespace: number; data: Uint8Array; diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index 71d925ec46..693848f9e3 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -76,14 +76,22 @@ export type SnodeNamespacesUser = PickEnum< SnodeNamespaces.UserContacts | SnodeNamespaces.UserProfile | SnodeNamespaces.Default >; +export type UserConfigNamespaces = PickEnum< + SnodeNamespaces, + | SnodeNamespaces.UserProfile + | SnodeNamespaces.UserContacts + | SnodeNamespaces.UserGroups + | SnodeNamespaces.ConvoInfoVolatile +>; + /** * Returns true if that namespace is associated with the config of a user (not his messages, only configs) */ // eslint-disable-next-line consistent-return -function isUserConfigNamespace(namespace: SnodeNamespaces) { +function isUserConfigNamespace(namespace: SnodeNamespaces): namespace is UserConfigNamespaces { switch (namespace) { - case SnodeNamespaces.UserContacts: case SnodeNamespaces.UserProfile: + case SnodeNamespaces.UserContacts: case SnodeNamespaces.UserGroups: case SnodeNamespaces.ConvoInfoVolatile: return true; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 7fc5f24c51..45d09d0fcf 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -25,7 +25,7 @@ import { ed25519Str } from '../../onions/onionPath'; import { StringUtils, UserUtils } from '../../utils'; import { perfEnd, perfStart } from '../../utils/Performance'; import { LibSessionUtil } from '../../utils/libsession/libsession_utils'; -import { SnodeNamespace, SnodeNamespaces } from './namespaces'; +import { SnodeNamespace, SnodeNamespaces, UserConfigNamespaces } from './namespaces'; import { PollForGroup, PollForLegacy, PollForUs } from './pollingTypes'; import { SnodeAPIRetrieve } from './retrieveRequest'; import { SwarmPollingGroupConfig } from './swarm_polling_config/SwarmPollingGroupConfig'; @@ -579,15 +579,16 @@ export class SwarmPolling { } // eslint-disable-next-line consistent-return - public getNamespacesToPollFrom(type: ConversationTypeEnum): Array { + public getNamespacesToPollFrom(type: ConversationTypeEnum) { if (type === ConversationTypeEnum.PRIVATE) { - return [ + const toRet: Array = [ SnodeNamespaces.Default, SnodeNamespaces.UserProfile, SnodeNamespaces.UserContacts, SnodeNamespaces.UserGroups, SnodeNamespaces.ConvoInfoVolatile, ]; + return toRet; } if (type === ConversationTypeEnum.GROUP) { return [SnodeNamespaces.LegacyClosedGroup]; diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts deleted file mode 100644 index 0a541b02bd..0000000000 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingConfigShared.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { compact, toNumber } from 'lodash'; -import { RetrieveMessageItem } from '../types'; -import { extractWebSocketContent } from '../swarmPolling'; -import { SignalService } from '../../../../protobuf'; -import { IncomingMessage } from '../../../messages/incoming/IncomingMessage'; -import { EnvelopePlus } from '../../../../receiver/types'; - -function extractWebSocketContents(configMsgs: Array) { - try { - return compact( - configMsgs.map((m: RetrieveMessageItem) => { - return extractWebSocketContent(m.data, m.hash); - }) - ); - } catch (e) { - window.log.warn('extractWebSocketContents failed with ', e.message); - return []; - } -} - -async function decryptSharedConfigMessages( - extractedMsgs: ReturnType, - decryptEnvelope: (envelope: EnvelopePlus) => Promise -) { - const allDecryptedConfigMessages: Array> = []; - - for (let index = 0; index < extractedMsgs.length; index++) { - const groupConfigMessage = extractedMsgs[index]; - - try { - const envelope: EnvelopePlus = SignalService.Envelope.decode(groupConfigMessage.body) as any; - // eslint-disable-next-line no-await-in-loop - const decryptedEnvelope = await decryptEnvelope(envelope); - if (!decryptedEnvelope?.byteLength) { - continue; - } - const content = SignalService.Content.decode(new Uint8Array(decryptedEnvelope)); - if (content.sharedConfigMessage) { - const asIncomingMsg: IncomingMessage = { - envelopeTimestamp: toNumber(envelope.timestamp), - message: content.sharedConfigMessage, - messageHash: groupConfigMessage.messageHash, - authorOrGroupPubkey: envelope.source, - authorInGroup: envelope.senderIdentity, - }; - allDecryptedConfigMessages.push(asIncomingMsg); - } else { - throw new Error( - 'received a message to a namespace reserved for user config but not containign a sharedConfigMessage' - ); - } - } catch (e) { - window.log.warn( - `failed to decrypt message with hash "${groupConfigMessage.messageHash}": ${e.message}` - ); - } - } - return allDecryptedConfigMessages; -} - -export const SwarmPollingConfigShared = { - decryptSharedConfigMessages, - extractWebSocketContents, -}; diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts index cc3e8bc78e..8d9ac1ea4a 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts @@ -1,31 +1,19 @@ import { ConfigMessageHandler } from '../../../../receiver/configMessage'; -import { decryptEnvelopeWithOurKey } from '../../../../receiver/contentMessage'; -import { RetrieveMessageItem } from '../types'; -import { SwarmPollingConfigShared } from './SwarmPollingConfigShared'; +import { RetrieveMessageItemWithNamespace } from '../types'; async function handleUserSharedConfigMessages( - userConfigMessagesMerged: Array + userConfigMessagesMerged: Array ) { window.log.info(`received userConfigMessagesMerged count: ${userConfigMessagesMerged.length}`); try { - const extractedUserConfigMessage = - SwarmPollingConfigShared.extractWebSocketContents(userConfigMessagesMerged); - - const allDecryptedConfigMessages = await SwarmPollingConfigShared.decryptSharedConfigMessages( - extractedUserConfigMessage, - decryptEnvelopeWithOurKey - ); - - if (allDecryptedConfigMessages.length) { + if (userConfigMessagesMerged.length) { try { window.log.info( - `handleConfigMessagesViaLibSession of "${allDecryptedConfigMessages.length}" messages with libsession` - ); - await ConfigMessageHandler.handleUserConfigMessagesViaLibSession( - allDecryptedConfigMessages + `handleConfigMessagesViaLibSession of "${userConfigMessagesMerged.length}" messages with libsession` ); + await ConfigMessageHandler.handleUserConfigMessagesViaLibSession(userConfigMessagesMerged); } catch (e) { - const allMessageHases = allDecryptedConfigMessages.map(m => m.messageHash).join(','); + const allMessageHases = userConfigMessagesMerged.map(m => m.hash).join(','); window.log.warn( `failed to handle messages hashes "${allMessageHases}" with libsession. Error: "${e.message}"` ); diff --git a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts b/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts deleted file mode 100644 index 4c1ba71e26..0000000000 --- a/ts/session/messages/outgoing/controlMessage/SharedConfigMessage.ts +++ /dev/null @@ -1,59 +0,0 @@ -// this is not a very good name, but a configuration message is a message sent to our other devices so sync our current public and closed groups -import Long from 'long'; - -import { SignalService } from '../../../../protobuf'; -import { MessageParams } from '../Message'; -import { ContentMessage } from '..'; -import { TTL_DEFAULT } from '../../../constants'; -import { UserConfigKind } from '../../../../types/ProtobufKind'; - -interface SharedConfigParams extends MessageParams { - seqno: Long; - data: Uint8Array; - kind: KindsPicked; -} - -export abstract class SharedConfigMessage< - KindsPicked extends UserConfigKind, -> extends ContentMessage { - public readonly seqno: Long; - public readonly kind: KindsPicked; - public readonly data: Uint8Array; - - constructor(params: SharedConfigParams) { - super({ timestamp: params.timestamp, identifier: params.identifier }); - this.data = params.data; - this.kind = params.kind; - this.seqno = params.seqno; - } - - public contentProto(): SignalService.Content { - return new SignalService.Content({ - sharedConfigMessage: this.sharedConfigProto(), - }); - } - - public ttl(): number { - return TTL_DEFAULT.TTL_CONFIG; - } - - protected sharedConfigProto(): SignalService.SharedConfigMessage { - return new SignalService.SharedConfigMessage({ - data: this.data, - kind: this.kind, - seqno: this.seqno, - }); - } -} - -export class SharedUserConfigMessage extends SharedConfigMessage { - constructor(params: SharedConfigParams) { - super({ - timestamp: params.timestamp, - identifier: params.identifier, - data: params.data, - kind: params.kind, - seqno: params.seqno, - }); - } -} diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index e20ad35340..e8b350405b 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -31,7 +31,6 @@ import { SnodeNamespacesUser, } from '../apis/snode_api/namespaces'; import { CallMessage } from '../messages/outgoing/controlMessage/CallMessage'; -import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; @@ -234,7 +233,6 @@ export class MessageQueue { if ( !(message instanceof ConfigurationMessage) && !(message instanceof UnsendMessage) && - !(message instanceof SharedConfigMessage) && !(message as any)?.syncTarget ) { throw new Error('Invalid message given to sendSyncMessage'); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 5d530b4bae..d85f1d8b2d 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -2,8 +2,8 @@ import { AbortController } from 'abort-controller'; import ByteBuffer from 'bytebuffer'; -import { GroupPubkeyType } from 'libsession_util_nodejs'; -import _, { isEmpty, isNil, isString, sample, toNumber } from 'lodash'; +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import _, { isEmpty, isNil, sample, toNumber } from 'lodash'; import pRetry from 'p-retry'; import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; @@ -17,7 +17,6 @@ import { import { NotEmptyArrayOfBatchResults, StoreOnNodeData, - StoreOnNodeMessage, StoreOnNodeParams, StoreOnNodeParamsNoSig, } from '../apis/snode_api/SnodeRequestTypes'; @@ -31,7 +30,6 @@ import { MessageEncrypter } from '../crypto'; import { addMessagePadding } from '../crypto/BufferPadding'; import { ContentMessage } from '../messages/outgoing'; import { ConfigurationMessage } from '../messages/outgoing/controlMessage/ConfigurationMessage'; -import { SharedConfigMessage } from '../messages/outgoing/controlMessage/SharedConfigMessage'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; @@ -84,7 +82,6 @@ function isSyncMessage(message: ContentMessage) { message instanceof ConfigurationMessage || message instanceof ClosedGroupNewMessage || message instanceof UnsendMessage || - message instanceof SharedConfigMessage || (message as any).syncTarget?.length > 0 ) { return true; @@ -268,7 +265,7 @@ async function sendMessagesDataToSnode( if (!isEmpty(storeResults)) { window?.log?.info( - `sendMessagesToSnode - Successfully stored messages to ${ed25519Str(destination)} via ${ + `sendMessagesDataToSnode - Successfully stored messages to ${ed25519Str(destination)} via ${ snode.ip }:${snode.port} on namespaces: ${rightDestination.map(m => m.namespace).join(',')}` ); @@ -278,7 +275,7 @@ async function sendMessagesDataToSnode( } catch (e) { const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null'; window?.log?.warn( - `sendMessagesToSnode - "${e.code}:${e.message}" to ${destination} via snode:${snodeStr}` + `sendMessagesDataToSnode - "${e.code}:${e.message}" to ${destination} via snode:${snodeStr}` ); throw e; } @@ -354,110 +351,6 @@ async function encryptMessagesAndWrap( return Promise.all(messages.map(encryptMessageAndWrap)); } -/** - * Send a list of messages to a single service node. - * Used currently only for sending SharedConfigMessage to multiple messages at a time. - * - * @param params the messages to deposit - * @param destination the pubkey we should deposit those message for - * @returns the hashes of successful deposit - */ -async function sendMessagesToSnode( - params: Array, - destination: string, - messagesHashesToDelete: Set | null -): Promise { - try { - const recipient = PubKey.cast(destination); - - const encryptedAndWrapped = await encryptMessagesAndWrap( - params.map(m => ({ - destination: m.pubkey, - plainTextBuffer: m.message.plainTextBuffer(), - namespace: m.namespace, - ttl: m.message.ttl(), - identifier: m.message.identifier, - isSyncMessage: MessageSender.isSyncMessage(m.message), - })) - ); - - // first update all the associated timestamps of our messages in DB, if the outgoing messages are associated with one. - await Promise.all( - encryptedAndWrapped.map(async (m, index) => { - // make sure to update the local sent_at timestamp, because sometimes, we will get the just pushed message in the receiver side - // before we return from the await below. - // and the isDuplicate messages relies on sent_at timestamp to be valid. - const found = await Data.getMessageById(m.identifier); - - // make sure to not update the sent timestamp if this a currently syncing message - if (found && !found.get('sentSync')) { - found.set({ sent_at: encryptedAndWrapped[index].networkTimestamp }); - await found.commit(); - } - }) - ); - - const batchResults = await pRetry( - async () => { - return MessageSender.sendMessagesDataToSnode( - encryptedAndWrapped.map(wrapped => ({ - pubkey: recipient.key, - data64: wrapped.data64, - ttl: wrapped.ttl, - timestamp: wrapped.networkTimestamp, - namespace: wrapped.namespace, - })), - recipient.key, - messagesHashesToDelete, - messagesHashesToDelete?.size ? 'sequence' : 'batch' - ); - }, - { - retries: 2, - factor: 1, - minTimeout: MessageSender.getMinRetryTimeout(), - maxTimeout: 1000, - } - ); - - if (!batchResults || isEmpty(batchResults)) { - throw new Error('result is empty for sendMessagesToSnode'); - } - - const isDestinationClosedGroup = ConvoHub.use().get(recipient.key)?.isClosedGroup(); - - await Promise.all( - encryptedAndWrapped.map(async (message, index) => { - // If message also has a sync message, save that hash. Otherwise save the hash from the regular message send i.e. only closed groups in this case. - if ( - message.identifier && - (message.isSyncMessage || isDestinationClosedGroup) && - batchResults[index] && - !isEmpty(batchResults[index]) && - isString(batchResults[index].body.hash) - ) { - const hashFoundInResponse = batchResults[index].body.hash; - const foundMessage = await Data.getMessageById(message.identifier); - if (foundMessage) { - await foundMessage.updateMessageHash(hashFoundInResponse); - await foundMessage.commit(); - window?.log?.info( - `updated message ${foundMessage.get('id')} with hash: ${foundMessage.get( - 'messageHash' - )}` - ); - } - } - }) - ); - - return batchResults; - } catch (e) { - window.log.warn(`sendMessagesToSnode failed with ${e.message}`); - return null; - } -} - /** * Send an array of preencrypted data to the corresponding swarm. * Used currently only for sending libsession GroupInfo, GroupMembers and groupKeys config updates. @@ -468,7 +361,7 @@ async function sendMessagesToSnode( */ async function sendEncryptedDataToSnode( encryptedData: Array, - destination: GroupPubkeyType, + destination: GroupPubkeyType | PubkeyType, messagesHashesToDelete: Set | null ): Promise { try { @@ -602,7 +495,6 @@ async function sendToOpenGroupV2BlindedRequest( export const MessageSender = { sendToOpenGroupV2BlindedRequest, sendMessagesDataToSnode, - sendMessagesToSnode, sendEncryptedDataToSnode, getMinRetryTimeout, sendToOpenGroupV2, diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts index b69e476b33..df0d3239d3 100644 --- a/ts/session/utils/User.ts +++ b/ts/session/utils/User.ts @@ -40,6 +40,7 @@ export function getOurPubKeyStrFromCache(): string { if (!ourNumber) { throw new Error('ourNumber is not set'); } + return ourNumber; } diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts index 3fdc88f024..be817063ef 100644 --- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts @@ -1,18 +1,26 @@ /* eslint-disable no-await-in-loop */ -import { compact, isArray, isEmpty, isNumber, isString } from 'lodash'; +import { PubkeyType } from 'libsession_util_nodejs'; +import { isArray, isEmpty, isNumber, isString } from 'lodash'; import { v4 } from 'uuid'; import { UserUtils } from '../..'; import { ConfigDumpData } from '../../../../data/configDump/configDump'; import { ConfigurationSyncJobDone } from '../../../../shims/events'; -import { ReleasedFeatures } from '../../../../util/releaseFeature'; import { isSignInByLinking } from '../../../../util/storage'; import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { NotEmptyArrayOfBatchResults } from '../../../apis/snode_api/SnodeRequestTypes'; +import { + NotEmptyArrayOfBatchResults, + StoreOnNodeData, +} from '../../../apis/snode_api/SnodeRequestTypes'; +import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; +import { TTL_DEFAULT } from '../../../constants'; import { ConvoHub } from '../../../conversations'; -import { SharedUserConfigMessage } from '../../../messages/outgoing/controlMessage/SharedConfigMessage'; import { MessageSender } from '../../../sending/MessageSender'; import { allowOnlyOneAtATime } from '../../Promise'; -import { LibSessionUtil, OutgoingConfResult } from '../../libsession/libsession_utils'; +import { + LibSessionUtil, + PendingChangesForUs, + UserSingleDestinationChanges, +} from '../../libsession/libsession_utils'; import { runners } from '../JobRunner'; import { AddJobCheckReturn, @@ -20,7 +28,6 @@ import { PersistedJob, RunJobResult, } from '../PersistedJob'; -import { UserConfigKind } from '../../../../types/ProtobufKind'; const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s) const defaultMaxAttempts = 2; @@ -31,41 +38,19 @@ const defaultMaxAttempts = 2; */ let lastRunConfigSyncJobTimestamp: number | null = null; -type SingleDestinationChanges = { - messages: Array>; - allOldHashes: Array; -}; - -type SuccessfulChange = { - message: SharedUserConfigMessage; +type UserSuccessfulChange = { + pushed: PendingChangesForUs; updatedHash: string; }; -/** - * Later in the syncing logic, we want to batch-send all the updates for a pubkey in a single batch call. - * To make this easier, this function prebuilds and merges together all the changes for each pubkey. - */ -async function retrieveSingleDestinationChanges( - destination: string -): Promise { - if (destination !== UserUtils.getOurPubKeyStrFromCache()) { - throw new Error('retrieveSingleDestinationChanges can only be us for ConfigurationSyncJob'); - } - const outgoingConfResults = await LibSessionUtil.pendingChangesForUs(); - - const compactedHashes = compact(outgoingConfResults.map(m => m.oldMessageHashes)).flat(); - - return { messages: outgoingConfResults, allOldHashes: compactedHashes }; -} - /** * This function is run once we get the results from the multiple batch-send. */ function resultsToSuccessfulChange( result: NotEmptyArrayOfBatchResults | null, - request: SingleDestinationChanges -): Array { - const successfulChanges: Array = []; + request: UserSingleDestinationChanges +): Array { + const successfulChanges: Array = []; /** * For each batch request, we get as result @@ -84,15 +69,11 @@ function resultsToSuccessfulChange( const batchResult = result[j]; const messagePostedHashes = batchResult?.body?.hash; - if ( - batchResult.code === 200 && - isString(messagePostedHashes) && - request.messages?.[j].message - ) { + if (batchResult.code === 200 && isString(messagePostedHashes) && request.messages?.[j]) { // the library keeps track of the hashes to push and pushed using the hashes now successfulChanges.push({ updatedHash: messagePostedHashes, - message: request.messages?.[j].message, + pushed: request.messages?.[j], }); } } @@ -101,16 +82,16 @@ function resultsToSuccessfulChange( } async function buildAndSaveDumpsToDB( - changes: Array, - destination: string + changes: Array, + us: string ): Promise { for (let i = 0; i < changes.length; i++) { const change = changes[i]; - const variant = LibSessionUtil.userKindToVariant(change.message.kind); + const variant = LibSessionUtil.userNamespaceToVariant(change.pushed.namespace); const needsDump = await LibSessionUtil.markAsPushed( variant, - change.message.seqno.toNumber(), + change.pushed.seqno.toNumber(), change.updatedHash ); @@ -120,13 +101,13 @@ async function buildAndSaveDumpsToDB( const dump = await GenericWrapperActions.dump(variant); await ConfigDumpData.saveConfigDump({ data: dump, - publicKey: destination, + publicKey: us, variant, }); } } -async function saveDumpsNeededToDB(destination: string) { +async function saveDumpsNeededToDB(us: string) { for (let i = 0; i < LibSessionUtil.requiredUserVariants.length; i++) { const variant = LibSessionUtil.requiredUserVariants[i]; const needsDump = await GenericWrapperActions.needsDump(variant); @@ -137,12 +118,75 @@ async function saveDumpsNeededToDB(destination: string) { const dump = await GenericWrapperActions.dump(variant); await ConfigDumpData.saveConfigDump({ data: dump, - publicKey: destination, + publicKey: us, variant, }); } } +function triggerConfSyncJobDone() { + window.Whisper.events.trigger(ConfigurationSyncJobDone); +} + +function isPubkey(us: string): us is PubkeyType { + return us.startsWith('05'); +} + +async function pushChangesToUserSwarmIfNeeded() { + const us = UserUtils.getOurPubKeyStrFromCache(); + if (!isPubkey(us)) { + throw new Error('invalid user pubkey, not right prefix'); + } + + // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc + await saveDumpsNeededToDB(us); + const singleDestChanges = await LibSessionUtil.pendingChangesForUs(); + + // If there are no pending changes then the job can just complete (next time something + // is updated we want to try and run immediately so don't scuedule another run in this case) + if (isEmpty(singleDestChanges?.messages)) { + triggerConfSyncJobDone(); + return RunJobResult.Success; + } + const msgs: Array = singleDestChanges.messages.map(item => { + return { + namespace: item.namespace, + pubkey: us, + networkTimestamp: GetNetworkTime.getNowWithNetworkOffset(), + ttl: TTL_DEFAULT.TTL_CONFIG, + data: item.ciphertext, + }; + }); + + const result = await MessageSender.sendEncryptedDataToSnode( + msgs, + us, + singleDestChanges.allOldHashes + ); + + const expectedReplyLength = + singleDestChanges.messages.length + (singleDestChanges.allOldHashes.size ? 1 : 0); + // we do a sequence call here. If we do not have the right expected number of results, consider it a failure + if (!isArray(result) || result.length !== expectedReplyLength) { + window.log.info( + `ConfigurationSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` + ); + // this might be a 421 error (already handled) so let's retry this request a little bit later + return RunJobResult.RetryJobIfPossible; + } + + const changes = resultsToSuccessfulChange(result, singleDestChanges); + if (isEmpty(changes)) { + return RunJobResult.RetryJobIfPossible; + } + // Now that we have the successful changes, we need to mark them as pushed and + // generate any config dumps which need to be stored + + await buildAndSaveDumpsToDB(changes, us); + triggerConfSyncJobDone(); + return RunJobResult.Success; +} + class ConfigurationSyncJob extends PersistedJob { constructor({ identifier, @@ -180,64 +224,7 @@ class ConfigurationSyncJob extends PersistedJob return RunJobResult.PermanentFailure; } - // TODOLATER add a way to have a few configuration sync jobs running at the same time, but only a single one per pubkey - const thisJobDestination = us; - - // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc - await saveDumpsNeededToDB(thisJobDestination); - const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); - - // if the feature flag is not enabled, we want to keep updating the dumps, but just not sync them. - if (!userConfigLibsession) { - this.triggerConfSyncJobDone(); - return RunJobResult.Success; - } - const singleDestChanges = await retrieveSingleDestinationChanges(thisJobDestination); - - // If there are no pending changes then the job can just complete (next time something - // is updated we want to try and run immediately so don't scuedule another run in this case) - if (isEmpty(singleDestChanges?.messages)) { - this.triggerConfSyncJobDone(); - return RunJobResult.Success; - } - const oldHashesToDelete = new Set(singleDestChanges.allOldHashes); - const msgs = singleDestChanges.messages.map(item => { - return { - namespace: item.namespace, - pubkey: thisJobDestination, - timestamp: item.message.timestamp, - ttl: item.message.ttl(), - message: item.message, - }; - }); - - const result = await MessageSender.sendMessagesToSnode( - msgs, - thisJobDestination, - oldHashesToDelete - ); - - const expectedReplyLength = - singleDestChanges.messages.length + (oldHashesToDelete.size ? 1 : 0); - // we do a sequence call here. If we do not have the right expected number of results, consider it a failure - if (!isArray(result) || result.length !== expectedReplyLength) { - window.log.info( - `ConfigurationSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` - ); - // this might be a 421 error (already handled) so let's retry this request a little bit later - return RunJobResult.RetryJobIfPossible; - } - - const changes = resultsToSuccessfulChange(result, singleDestChanges); - if (isEmpty(changes)) { - return RunJobResult.RetryJobIfPossible; - } - // Now that we have the successful changes, we need to mark them as pushed and - // generate any config dumps which need to be stored - - await buildAndSaveDumpsToDB(changes, thisJobDestination); - this.triggerConfSyncJobDone(); - return RunJobResult.Success; + return await pushChangesToUserSwarmIfNeeded(); // eslint-disable-next-line no-useless-catch } catch (e) { throw e; @@ -275,10 +262,6 @@ class ConfigurationSyncJob extends PersistedJob private updateLastTickTimestamp() { lastRunConfigSyncJobTimestamp = Date.now(); } - - private triggerConfSyncJobDone() { - window.Whisper.events.trigger(ConfigurationSyncJobDone); - } } /** diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index d1af3428a6..12d9b02ba2 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -124,7 +124,6 @@ async function pushChangesToGroupSwarmIfNeeded(groupPk: GroupPubkeyType): Promis if (isEmpty(singleDestChanges?.messages)) { return RunJobResult.Success; } - const oldHashesToDelete = new Set(singleDestChanges.allOldHashes); const msgs: Array = singleDestChanges.messages.map(item => { return { @@ -136,9 +135,14 @@ async function pushChangesToGroupSwarmIfNeeded(groupPk: GroupPubkeyType): Promis }; }); - const result = await MessageSender.sendEncryptedDataToSnode(msgs, groupPk, oldHashesToDelete); + const result = await MessageSender.sendEncryptedDataToSnode( + msgs, + groupPk, + singleDestChanges.allOldHashes + ); - const expectedReplyLength = singleDestChanges.messages.length + (oldHashesToDelete.size ? 1 : 0); + const expectedReplyLength = + singleDestChanges.messages.length + (singleDestChanges.allOldHashes.size ? 1 : 0); // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 10efca0cf9..fac857777c 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -6,8 +6,6 @@ import { compact, difference, omit } from 'lodash'; import Long from 'long'; import { UserUtils } from '..'; import { ConfigDumpData } from '../../../data/configDump/configDump'; -import { SignalService } from '../../../protobuf'; -import { UserConfigKind } from '../../../types/ProtobufKind'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { ConfigWrapperGroupDetailed, @@ -18,12 +16,7 @@ import { GenericWrapperActions, MetaGroupWrapperActions, } from '../../../webworker/workers/browser/libsession_worker_interface'; -import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime'; -import { SnodeNamespaces } from '../../apis/snode_api/namespaces'; -import { - SharedConfigMessage, - SharedUserConfigMessage, -} from '../../messages/outgoing/controlMessage/SharedConfigMessage'; +import { SnodeNamespaces, UserConfigNamespaces } from '../../apis/snode_api/namespaces'; import { ed25519Str } from '../../onions/onionPath'; import { PubKey } from '../../types'; import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob'; @@ -35,12 +28,6 @@ const requiredUserVariants: Array = [ 'ConvoInfoVolatileConfig', ]; -export type OutgoingConfResult> = { - message: T; - namespace: SnodeNamespaces; - oldMessageHashes: Array; -}; - async function initializeLibSessionUtilWrappers() { const keypair = await UserUtils.getUserED25519KeyPairBytes(); if (!keypair || !keypair.privKeyBytes) { @@ -108,17 +95,43 @@ async function initializeLibSessionUtilWrappers() { // No need to load the meta group wrapper here. We will load them once the SessionInbox is loaded with a redux action } -async function pendingChangesForUs(): Promise< - Array> -> { - const us = UserUtils.getOurPubKeyStrFromCache(); +export type PendingChangesForUs = { + ciphertext: Uint8Array; + seqno: Long; + namespace: UserConfigNamespaces; +}; + +type PendingChangesForGroupNonKey = { + data: Uint8Array; + seqno: Long; + namespace: SnodeNamespaces.ClosedGroupInfo | SnodeNamespaces.ClosedGroupMembers; + type: Extract; +}; +type PendingChangesForGroupKey = { + data: Uint8Array; + namespace: SnodeNamespaces.ClosedGroupKeys; + type: Extract; +}; + +export type PendingChangesForGroup = PendingChangesForGroupNonKey | PendingChangesForGroupKey; + +type SingleDestinationChanges = { + messages: Array; + allOldHashes: Set; +}; + +export type UserSingleDestinationChanges = SingleDestinationChanges; +export type GroupSingleDestinationChanges = SingleDestinationChanges; + +async function pendingChangesForUs(): Promise { + const us = UserUtils.getOurPubKeyStrFromCache(); const dumps = await ConfigDumpData.getAllDumpsWithoutDataFor(us); // Ensure we always check the required user config types for changes even if there is no dump // data yet (to deal with first launch cases) LibSessionUtil.requiredUserVariants.forEach(requiredVariant => { - if (!dumps.find(m => m.publicKey === us && m.variant === requiredVariant)) { + if (!dumps.some(m => m.publicKey === us && m.variant === requiredVariant)) { dumps.push({ publicKey: us, variant: requiredVariant, @@ -126,7 +139,7 @@ async function pendingChangesForUs(): Promise< } }); - const results: Array> = []; + const results: UserSingleDestinationChanges = { messages: [], allOldHashes: new Set() }; const variantsNeedingPush = new Set(); for (let index = 0; index < dumps.length; index++) { @@ -137,7 +150,6 @@ async function pendingChangesForUs(): Promise< continue; } const needsPush = await GenericWrapperActions.needsPush(variant); - if (!needsPush) { continue; } @@ -145,18 +157,15 @@ async function pendingChangesForUs(): Promise< variantsNeedingPush.add(variant); const { data, seqno, hashes, namespace } = await GenericWrapperActions.push(variant); - const kind = userVariantToUserKind(variant); - - results.push({ - message: new SharedUserConfigMessage({ - data, - kind, - seqno: Long.fromNumber(seqno), - timestamp: GetNetworkTime.getNowWithNetworkOffset(), - }), - oldMessageHashes: hashes, + results.messages.push({ + ciphertext: data, + seqno: Long.fromNumber(seqno), namespace, }); + + hashes.forEach(hash => { + results.allOldHashes.add(hash); + }); } window.log.info(`those variants needs push: "${[...variantsNeedingPush]}"`); @@ -165,28 +174,6 @@ async function pendingChangesForUs(): Promise< // we link the namespace to the type of what each wrapper needs -type PendingChangesForGroupNonKey = { - data: Uint8Array; - seqno: Long; - timestamp: number; - namespace: SnodeNamespaces.ClosedGroupInfo | SnodeNamespaces.ClosedGroupMembers; - type: Extract; -}; - -type PendingChangesForGroupKey = { - data: Uint8Array; - timestamp: number; - namespace: SnodeNamespaces.ClosedGroupKeys; - type: Extract; -}; - -export type PendingChangesForGroup = PendingChangesForGroupNonKey | PendingChangesForGroupKey; - -export type GroupSingleDestinationChanges = { - messages: Array; - allOldHashes: Set; -}; - async function pendingChangesForGroup( groupPk: GroupPubkeyType ): Promise { @@ -210,7 +197,6 @@ async function pendingChangesForGroup( type: 'GroupKeys', data: groupKeys.data, namespace: groupKeys.namespace, - timestamp: GetNetworkTime.getNowWithNetworkOffset(), }); } @@ -219,7 +205,6 @@ async function pendingChangesForGroup( type: 'GroupInfo', data: groupInfo.data, seqno: Long.fromNumber(groupInfo.seqno), - timestamp: GetNetworkTime.getNowWithNetworkOffset(), namespace: groupInfo.namespace, }); } @@ -228,7 +213,6 @@ async function pendingChangesForGroup( type: 'GroupMember', data: groupMember.data, seqno: Long.fromNumber(groupMember.seqno), - timestamp: GetNetworkTime.getNowWithNetworkOffset(), namespace: groupMember.namespace, }); } @@ -243,35 +227,19 @@ async function pendingChangesForGroup( return { messages: results, allOldHashes }; } -// eslint-disable-next-line consistent-return -function userKindToVariant(kind: UserConfigKind): ConfigWrapperUser { - switch (kind) { - case SignalService.SharedConfigMessage.Kind.USER_PROFILE: +function userNamespaceToVariant(namespace: UserConfigNamespaces) { + switch (namespace) { + case SnodeNamespaces.UserProfile: return 'UserConfig'; - case SignalService.SharedConfigMessage.Kind.CONTACTS: + case SnodeNamespaces.UserContacts: return 'ContactsConfig'; - case SignalService.SharedConfigMessage.Kind.USER_GROUPS: + case SnodeNamespaces.UserGroups: return 'UserGroupsConfig'; - case SignalService.SharedConfigMessage.Kind.CONVO_INFO_VOLATILE: + case SnodeNamespaces.ConvoInfoVolatile: return 'ConvoInfoVolatileConfig'; default: - assertUnreachable(kind, `userKindToVariant: Unsupported variant: "${kind}"`); - } -} - -// eslint-disable-next-line consistent-return -function userVariantToUserKind(variant: ConfigWrapperUser) { - switch (variant) { - case 'UserConfig': - return SignalService.SharedConfigMessage.Kind.USER_PROFILE; - case 'ContactsConfig': - return SignalService.SharedConfigMessage.Kind.CONTACTS; - case 'UserGroupsConfig': - return SignalService.SharedConfigMessage.Kind.USER_GROUPS; - case 'ConvoInfoVolatileConfig': - return SignalService.SharedConfigMessage.Kind.CONVO_INFO_VOLATILE; - default: - assertUnreachable(variant, `userVariantToKind: Unsupported kind: "${variant}"`); + assertUnreachable(namespace, `userNamespaceToVariant: Unsupported namespace: "${namespace}"`); + throw new Error('userNamespaceToVariant: Unsupported namespace:'); } } @@ -304,11 +272,10 @@ async function saveMetaGroupDumpToDb(groupPk: GroupPubkeyType) { export const LibSessionUtil = { initializeLibSessionUtilWrappers, - userVariantToUserKind, + userNamespaceToVariant, requiredUserVariants, pendingChangesForUs, pendingChangesForGroup, - userKindToVariant, markAsPushed, saveMetaGroupDumpToDb, }; diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts index 38c80a062d..b7ddaf2156 100644 --- a/ts/session/utils/sync/syncUtils.ts +++ b/ts/session/utils/sync/syncUtils.ts @@ -21,7 +21,6 @@ import { } from '../../messages/outgoing/controlMessage/ConfigurationMessage'; import { ExpirationTimerUpdateMessage } from '../../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; import { MessageRequestResponse } from '../../messages/outgoing/controlMessage/MessageRequestResponse'; -import { SharedUserConfigMessage } from '../../messages/outgoing/controlMessage/SharedConfigMessage'; import { UnsendMessage } from '../../messages/outgoing/controlMessage/UnsendMessage'; import { AttachmentPointerWithUrl, @@ -351,8 +350,7 @@ export type SyncMessageType = | ExpirationTimerUpdateMessage | ConfigurationMessage | MessageRequestResponse - | UnsendMessage - | SharedUserConfigMessage; + | UnsendMessage; export const buildSyncMessage = ( identifier: string, diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index a2ad4d71cb..39a22bfcbc 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -145,7 +145,6 @@ describe('GroupSyncJob pendingChangesForGroup', () => { type: 'GroupKeys', data: new Uint8Array([3, 2, 1]), namespace: 13, - timestamp: 1234, }); // check for the info push content expect(result.messages[1]).to.be.deep.eq({ @@ -153,7 +152,6 @@ describe('GroupSyncJob pendingChangesForGroup', () => { data: new Uint8Array([1, 2, 3]), namespace: 12, seqno: Long.fromInt(pushResults.groupInfo.seqno), - timestamp: 1234, }); // check for the members pusu content expect(result.messages[2]).to.be.deep.eq({ @@ -161,7 +159,6 @@ describe('GroupSyncJob pendingChangesForGroup', () => { data: new Uint8Array([1, 2]), namespace: 14, seqno: Long.fromInt(pushResults.groupMember.seqno), - timestamp: 1234, }); }); @@ -332,7 +329,7 @@ describe('GroupSyncJob resultsToSuccessfulChange', () => { ]; const request: GroupSingleDestinationChanges = { allOldHashes: new Set(), - messages: [infoNoData as PendingChangesForGroup, member], + messages: [infoNoData as any as PendingChangesForGroup, member], }; const results = GroupSync.resultsToSuccessfulChange(batchResults, request); expect(results).to.be.deep.eq([ diff --git a/ts/types/ProtobufKind.ts b/ts/types/ProtobufKind.ts deleted file mode 100644 index 8e5e564ad4..0000000000 --- a/ts/types/ProtobufKind.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { SignalService } from '../protobuf'; -import { PickEnum } from './Enums'; - -export type UserConfigKind = PickEnum< - SignalService.SharedConfigMessage.Kind, - | SignalService.SharedConfigMessage.Kind.USER_PROFILE - | SignalService.SharedConfigMessage.Kind.CONTACTS - | SignalService.SharedConfigMessage.Kind.USER_GROUPS - | SignalService.SharedConfigMessage.Kind.CONVO_INFO_VOLATILE ->; - -export function isUserKind(kind: SignalService.SharedConfigMessage.Kind): kind is UserConfigKind { - const Kind = SignalService.SharedConfigMessage.Kind; - return ( - kind === Kind.USER_PROFILE || - kind === Kind.CONTACTS || - kind === Kind.USER_GROUPS || - kind === Kind.CONVO_INFO_VOLATILE - ); -} diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index d681056a80..12660f0b37 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -55,6 +55,7 @@ type GenericWrapperActionsCalls = { ) => Promise; confirmPushed: GenericWrapperActionsCall; dump: GenericWrapperActionsCall; + makeDump: GenericWrapperActionsCall; merge: GenericWrapperActionsCall; needsDump: GenericWrapperActionsCall; needsPush: GenericWrapperActionsCall; @@ -77,6 +78,10 @@ export const GenericWrapperActions: GenericWrapperActionsCalls = { >, dump: async (wrapperId: ConfigWrapperUser) => callLibSessionWorker([wrapperId, 'dump']) as ReturnType, + makeDump: async (wrapperId: ConfigWrapperUser) => + callLibSessionWorker([wrapperId, 'makeDump']) as ReturnType< + GenericWrapperActionsCalls['makeDump'] + >, merge: async (wrapperId: ConfigWrapperUser, toMerge: Array) => callLibSessionWorker([wrapperId, 'merge', toMerge]) as ReturnType< GenericWrapperActionsCalls['merge'] @@ -97,18 +102,26 @@ export const GenericWrapperActions: GenericWrapperActionsCalls = { >, }; +function createBaseActionsFor(wrapperType: ConfigWrapperUser) { + return { + /* Reuse the GenericWrapperActions with the UserConfig argument */ + init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) => + GenericWrapperActions.init(wrapperType, ed25519Key, dump), + confirmPushed: async (seqno: number, hash: string) => + GenericWrapperActions.confirmPushed(wrapperType, seqno, hash), + dump: async () => GenericWrapperActions.dump(wrapperType), + makeDump: async () => GenericWrapperActions.makeDump(wrapperType), + merge: async (toMerge: Array) => GenericWrapperActions.merge(wrapperType, toMerge), + needsDump: async () => GenericWrapperActions.needsDump(wrapperType), + needsPush: async () => GenericWrapperActions.needsPush(wrapperType), + push: async () => GenericWrapperActions.push(wrapperType), + currentHashes: async () => GenericWrapperActions.currentHashes(wrapperType), + }; +} + export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = { /* Reuse the GenericWrapperActions with the UserConfig argument */ - init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) => - GenericWrapperActions.init('UserConfig', ed25519Key, dump), - confirmPushed: async (seqno: number, hash: string) => - GenericWrapperActions.confirmPushed('UserConfig', seqno, hash), - dump: async () => GenericWrapperActions.dump('UserConfig'), - merge: async (toMerge: Array) => GenericWrapperActions.merge('UserConfig', toMerge), - needsDump: async () => GenericWrapperActions.needsDump('UserConfig'), - needsPush: async () => GenericWrapperActions.needsPush('UserConfig'), - push: async () => GenericWrapperActions.push('UserConfig'), - currentHashes: async () => GenericWrapperActions.currentHashes('UserConfig'), + ...createBaseActionsFor('UserConfig'), /** UserConfig wrapper specific actions */ getUserInfo: async () => @@ -144,17 +157,7 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = { export const ContactsWrapperActions: ContactsWrapperActionsCalls = { /* Reuse the GenericWrapperActions with the ContactConfig argument */ - init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) => - GenericWrapperActions.init('ContactsConfig', ed25519Key, dump), - confirmPushed: async (seqno: number, hash: string) => - GenericWrapperActions.confirmPushed('ContactsConfig', seqno, hash), - dump: async () => GenericWrapperActions.dump('ContactsConfig'), - merge: async (toMerge: Array) => - GenericWrapperActions.merge('ContactsConfig', toMerge), - needsDump: async () => GenericWrapperActions.needsDump('ContactsConfig'), - needsPush: async () => GenericWrapperActions.needsPush('ContactsConfig'), - push: async () => GenericWrapperActions.push('ContactsConfig'), - currentHashes: async () => GenericWrapperActions.currentHashes('ContactsConfig'), + ...createBaseActionsFor('ContactsConfig'), /** ContactsConfig wrapper specific actions */ get: async (pubkeyHex: string) => @@ -178,18 +181,8 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = { }; export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = { - /* Reuse the GenericWrapperActions with the ContactConfig argument */ - init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) => - GenericWrapperActions.init('UserGroupsConfig', ed25519Key, dump), - confirmPushed: async (seqno: number, hash: string) => - GenericWrapperActions.confirmPushed('UserGroupsConfig', seqno, hash), - dump: async () => GenericWrapperActions.dump('UserGroupsConfig'), - merge: async (toMerge: Array) => - GenericWrapperActions.merge('UserGroupsConfig', toMerge), - needsDump: async () => GenericWrapperActions.needsDump('UserGroupsConfig'), - needsPush: async () => GenericWrapperActions.needsPush('UserGroupsConfig'), - push: async () => GenericWrapperActions.push('UserGroupsConfig'), - currentHashes: async () => GenericWrapperActions.currentHashes('UserGroupsConfig'), + /* Reuse the GenericWrapperActions with the UserGroupsConfig argument */ + ...createBaseActionsFor('UserGroupsConfig'), /** UserGroups wrapper specific actions */ @@ -275,18 +268,8 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = { }; export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCalls = { - /* Reuse the GenericWrapperActions with the ContactConfig argument */ - init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) => - GenericWrapperActions.init('ConvoInfoVolatileConfig', ed25519Key, dump), - confirmPushed: async (seqno: number, hash: string) => - GenericWrapperActions.confirmPushed('ConvoInfoVolatileConfig', seqno, hash), - dump: async () => GenericWrapperActions.dump('ConvoInfoVolatileConfig'), - merge: async (toMerge: Array) => - GenericWrapperActions.merge('ConvoInfoVolatileConfig', toMerge), - needsDump: async () => GenericWrapperActions.needsDump('ConvoInfoVolatileConfig'), - needsPush: async () => GenericWrapperActions.needsPush('ConvoInfoVolatileConfig'), - push: async () => GenericWrapperActions.push('ConvoInfoVolatileConfig'), - currentHashes: async () => GenericWrapperActions.currentHashes('ConvoInfoVolatileConfig'), + /* Reuse the GenericWrapperActions with the ConvoInfoVolatileConfig argument */ + ...createBaseActionsFor('ConvoInfoVolatileConfig'), /** ConvoInfoVolatile wrapper specific actions */ // 1o1 @@ -389,9 +372,9 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'metaDump']) as Promise< ReturnType >, - metaDebugDump: async (groupPk: GroupPubkeyType) => - callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'metaDebugDump']) as Promise< - ReturnType + metaMakeDump: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'metaMakeDump']) as Promise< + ReturnType >, metaConfirmPushed: async ( groupPk: GroupPubkeyType, From c14276200e4e369ddbd20a4d20553fd20bd4a046 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 10 Oct 2023 17:22:10 +1100 Subject: [PATCH 034/302] chore: merged what can be between user and group sync job --- .../apis/snode_api/SnodeRequestTypes.ts | 28 ++- ts/session/apis/snode_api/namespaces.ts | 7 +- .../SwarmPollingGroupConfig.ts | 2 +- .../job_runners/jobs/ConfigurationSyncJob.ts | 97 +------ .../utils/job_runners/jobs/GroupConfigJob.ts | 81 ++---- .../utils/libsession/libsession_utils.ts | 238 +++++++++++++----- .../unit/utils/job_runner/JobRunner_test.ts | 5 - .../group_sync_job/GroupSyncJob_test.ts | 92 +++---- 8 files changed, 279 insertions(+), 271 deletions(-) diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 628a0c9061..df1aba59a0 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1,5 +1,10 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import { SnodeNamespaces, SnodeNamespacesGroup } from './namespaces'; +import { + SnodeNamespaces, + SnodeNamespacesGroup, + SnodeNamespacesGroupConfig, + UserConfigNamespaces, +} from './namespaces'; export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } }; @@ -108,14 +113,24 @@ export type DeleteFromNodeWithTimestampParams = { } & DeleteSigParameters; export type DeleteByHashesFromNodeParams = { messages: Array } & DeleteSigParameters; -export type StoreOnNodeData = { - pubkey: GroupPubkeyType | PubkeyType; +type StoreOnNodeShared = { networkTimestamp: number; - namespace: number; data: Uint8Array; ttl: number; }; +type StoreOnNodeGroupConfig = StoreOnNodeShared & { + pubkey: GroupPubkeyType; + namespace: SnodeNamespacesGroupConfig; +}; + +type StoreOnNodeUserConfig = StoreOnNodeShared & { + pubkey: PubkeyType; + namespace: UserConfigNamespaces; +}; + +export type StoreOnNodeData = StoreOnNodeGroupConfig | StoreOnNodeUserConfig; + export type StoreOnNodeSubRequest = { method: 'store'; params: StoreOnNodeParams }; export type NetworkTimeSubRequest = { method: 'info'; params: object }; @@ -179,7 +194,8 @@ export type SnodeApiSubRequests = // eslint-disable-next-line @typescript-eslint/array-type export type NonEmptyArray = [T, ...T[]]; -export type NotEmptyArrayOfBatchResults = NonEmptyArray<{ +export type BatchResultEntry = { code: number; body: Record; -}>; +}; +export type NotEmptyArrayOfBatchResults = NonEmptyArray; diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index 693848f9e3..40f6ccb67f 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -57,7 +57,7 @@ export type SnodeNamespacesLegacyGroup = PickEnum< SnodeNamespaces.LegacyClosedGroup >; -type SnodeNamespacesGroupConfig = PickEnum< +export type SnodeNamespacesGroupConfig = PickEnum< SnodeNamespaces, | SnodeNamespaces.ClosedGroupInfo | SnodeNamespaces.ClosedGroupMembers @@ -71,10 +71,7 @@ export type SnodeNamespacesGroup = | SnodeNamespacesGroupConfig | PickEnum; -export type SnodeNamespacesUser = PickEnum< - SnodeNamespaces, - SnodeNamespaces.UserContacts | SnodeNamespaces.UserProfile | SnodeNamespaces.Default ->; +export type SnodeNamespacesUser = PickEnum; export type UserConfigNamespaces = PickEnum< SnodeNamespaces, diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 790bd70021..398543f2db 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -45,7 +45,7 @@ async function handleGroupSharedConfigMessages( // do the merge with our current state await MetaGroupWrapperActions.metaMerge(groupPk, toMerge); // save updated dumps to the DB right away - await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); + await LibSessionUtil.saveDumpsToDb(groupPk); // refresh the redux slice with the merged result window.inboxStore.dispatch( diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts index be817063ef..78da695fba 100644 --- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts @@ -1,26 +1,19 @@ /* eslint-disable no-await-in-loop */ import { PubkeyType } from 'libsession_util_nodejs'; -import { isArray, isEmpty, isNumber, isString } from 'lodash'; +import { isArray, isEmpty, isNumber } from 'lodash'; import { v4 } from 'uuid'; import { UserUtils } from '../..'; import { ConfigDumpData } from '../../../../data/configDump/configDump'; import { ConfigurationSyncJobDone } from '../../../../shims/events'; import { isSignInByLinking } from '../../../../util/storage'; import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { - NotEmptyArrayOfBatchResults, - StoreOnNodeData, -} from '../../../apis/snode_api/SnodeRequestTypes'; +import { StoreOnNodeData } from '../../../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { TTL_DEFAULT } from '../../../constants'; import { ConvoHub } from '../../../conversations'; import { MessageSender } from '../../../sending/MessageSender'; import { allowOnlyOneAtATime } from '../../Promise'; -import { - LibSessionUtil, - PendingChangesForUs, - UserSingleDestinationChanges, -} from '../../libsession/libsession_utils'; +import { LibSessionUtil, UserSuccessfulChange } from '../../libsession/libsession_utils'; import { runners } from '../JobRunner'; import { AddJobCheckReturn, @@ -38,78 +31,18 @@ const defaultMaxAttempts = 2; */ let lastRunConfigSyncJobTimestamp: number | null = null; -type UserSuccessfulChange = { - pushed: PendingChangesForUs; - updatedHash: string; -}; - -/** - * This function is run once we get the results from the multiple batch-send. - */ -function resultsToSuccessfulChange( - result: NotEmptyArrayOfBatchResults | null, - request: UserSingleDestinationChanges -): Array { - const successfulChanges: Array = []; - - /** - * For each batch request, we get as result - * - status code + hash of the new config message - * - status code of the delete of all messages as given by the request hashes. - * - * As it is a sequence, the delete might have failed but the new config message might still be posted. - * So we need to check which request failed, and if it is the delete by hashes, we need to add the hash of the posted message to the list of hashes - */ - - if (!result?.length) { - return successfulChanges; - } - - for (let j = 0; j < result.length; j++) { - const batchResult = result[j]; - const messagePostedHashes = batchResult?.body?.hash; - - if (batchResult.code === 200 && isString(messagePostedHashes) && request.messages?.[j]) { - // the library keeps track of the hashes to push and pushed using the hashes now - successfulChanges.push({ - updatedHash: messagePostedHashes, - pushed: request.messages?.[j], - }); - } - } - - return successfulChanges; -} - -async function buildAndSaveDumpsToDB( +async function confirmPushedAndDump( changes: Array, us: string ): Promise { for (let i = 0; i < changes.length; i++) { const change = changes[i]; const variant = LibSessionUtil.userNamespaceToVariant(change.pushed.namespace); - - const needsDump = await LibSessionUtil.markAsPushed( + await GenericWrapperActions.confirmPushed( variant, change.pushed.seqno.toNumber(), change.updatedHash ); - - if (!needsDump) { - continue; - } - const dump = await GenericWrapperActions.dump(variant); - await ConfigDumpData.saveConfigDump({ - data: dump, - publicKey: us, - variant, - }); - } -} - -async function saveDumpsNeededToDB(us: string) { - for (let i = 0; i < LibSessionUtil.requiredUserVariants.length; i++) { - const variant = LibSessionUtil.requiredUserVariants[i]; const needsDump = await GenericWrapperActions.needsDump(variant); if (!needsDump) { @@ -139,16 +72,16 @@ async function pushChangesToUserSwarmIfNeeded() { } // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc - await saveDumpsNeededToDB(us); - const singleDestChanges = await LibSessionUtil.pendingChangesForUs(); + await LibSessionUtil.saveDumpsToDb(us); + const changesToPush = await LibSessionUtil.pendingChangesForUs(); // If there are no pending changes then the job can just complete (next time something // is updated we want to try and run immediately so don't scuedule another run in this case) - if (isEmpty(singleDestChanges?.messages)) { + if (isEmpty(changesToPush?.messages)) { triggerConfSyncJobDone(); return RunJobResult.Success; } - const msgs: Array = singleDestChanges.messages.map(item => { + const msgs: Array = changesToPush.messages.map(item => { return { namespace: item.namespace, pubkey: us, @@ -158,14 +91,10 @@ async function pushChangesToUserSwarmIfNeeded() { }; }); - const result = await MessageSender.sendEncryptedDataToSnode( - msgs, - us, - singleDestChanges.allOldHashes - ); + const result = await MessageSender.sendEncryptedDataToSnode(msgs, us, changesToPush.allOldHashes); const expectedReplyLength = - singleDestChanges.messages.length + (singleDestChanges.allOldHashes.size ? 1 : 0); + changesToPush.messages.length + (changesToPush.allOldHashes.size ? 1 : 0); // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { window.log.info( @@ -175,14 +104,14 @@ async function pushChangesToUserSwarmIfNeeded() { return RunJobResult.RetryJobIfPossible; } - const changes = resultsToSuccessfulChange(result, singleDestChanges); + const changes = LibSessionUtil.batchResultsToUserSuccessfulChange(result, changesToPush); if (isEmpty(changes)) { return RunJobResult.RetryJobIfPossible; } // Now that we have the successful changes, we need to mark them as pushed and // generate any config dumps which need to be stored - await buildAndSaveDumpsToDB(changes, us); + await confirmPushedAndDump(changes, us); triggerConfSyncJobDone(); return RunJobResult.Success; } diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts index 12d9b02ba2..fcd2cdc6db 100644 --- a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupConfigJob.ts @@ -1,13 +1,11 @@ /* eslint-disable no-await-in-loop */ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { isArray, isEmpty, isNumber, isString } from 'lodash'; +import { isArray, isEmpty, isNumber } from 'lodash'; import { UserUtils } from '../..'; +import { assertUnreachable } from '../../../../types/sqlSharedTypes'; import { isSignInByLinking } from '../../../../util/storage'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { - NotEmptyArrayOfBatchResults, - StoreOnNodeData, -} from '../../../apis/snode_api/SnodeRequestTypes'; +import { StoreOnNodeData } from '../../../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; import { TTL_DEFAULT } from '../../../constants'; @@ -15,11 +13,7 @@ import { ConvoHub } from '../../../conversations'; import { MessageSender } from '../../../sending/MessageSender'; import { PubKey } from '../../../types'; import { allowOnlyOneAtATime } from '../../Promise'; -import { - GroupSingleDestinationChanges, - LibSessionUtil, - PendingChangesForGroup, -} from '../../libsession/libsession_utils'; +import { GroupSuccessfulChange, LibSessionUtil } from '../../libsession/libsession_utils'; import { runners } from '../JobRunner'; import { AddJobCheckReturn, @@ -27,7 +21,6 @@ import { PersistedJob, RunJobResult, } from '../PersistedJob'; -import { assertUnreachable } from '../../../../types/sqlSharedTypes'; const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s) const defaultMaxAttempts = 2; @@ -38,50 +31,7 @@ const defaultMaxAttempts = 2; */ const lastRunConfigSyncJobTimestamps = new Map(); -export type GroupSuccessfulChange = { - pushed: PendingChangesForGroup; - updatedHash: string; -}; - -/** - * This function is run once we get the results from the multiple batch-send. - */ -function resultsToSuccessfulChange( - result: NotEmptyArrayOfBatchResults | null, - request: GroupSingleDestinationChanges -): Array { - const successfulChanges: Array = []; - - /** - * For each batch request, we get as result - * - status code + hash of the new config message - * - status code of the delete of all messages as given by the request hashes. - * - * As it is a sequence, the delete might have failed but the new config message might still be posted. - * So we need to check which request failed, and if it is the delete by hashes, we need to add the hash of the posted message to the list of hashes - */ - - if (!result?.length) { - return successfulChanges; - } - - for (let j = 0; j < result.length; j++) { - const batchResult = result[j]; - const messagePostedHashes = batchResult?.body?.hash; - - if (batchResult.code === 200 && isString(messagePostedHashes) && request.messages?.[j].data) { - // libsession keeps track of the hashes to push and pushed using the hashes now - successfulChanges.push({ - updatedHash: messagePostedHashes, - pushed: request.messages?.[j], - }); - } - } - - return successfulChanges; -} - -async function buildAndSaveDumpsToDB( +async function confirmPushedAndDump( changes: Array, groupPk: GroupPubkeyType ): Promise { @@ -112,37 +62,37 @@ async function buildAndSaveDumpsToDB( } await MetaGroupWrapperActions.metaConfirmPushed(...toConfirm); - return LibSessionUtil.saveMetaGroupDumpToDb(groupPk); + return LibSessionUtil.saveDumpsToDb(groupPk); } async function pushChangesToGroupSwarmIfNeeded(groupPk: GroupPubkeyType): Promise { // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc - await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); - const singleDestChanges = await LibSessionUtil.pendingChangesForGroup(groupPk); + await LibSessionUtil.saveDumpsToDb(groupPk); + const changesToPush = await LibSessionUtil.pendingChangesForGroup(groupPk); // If there are no pending changes then the job can just complete (next time something // is updated we want to try and run immediately so don't scuedule another run in this case) - if (isEmpty(singleDestChanges?.messages)) { + if (isEmpty(changesToPush?.messages)) { return RunJobResult.Success; } - const msgs: Array = singleDestChanges.messages.map(item => { + const msgs: Array = changesToPush.messages.map(item => { return { namespace: item.namespace, pubkey: groupPk, networkTimestamp: GetNetworkTime.getNowWithNetworkOffset(), ttl: TTL_DEFAULT.TTL_CONFIG, - data: item.data, + data: item.ciphertext, }; }); const result = await MessageSender.sendEncryptedDataToSnode( msgs, groupPk, - singleDestChanges.allOldHashes + changesToPush.allOldHashes ); const expectedReplyLength = - singleDestChanges.messages.length + (singleDestChanges.allOldHashes.size ? 1 : 0); + changesToPush.messages.length + (changesToPush.allOldHashes.size ? 1 : 0); // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { @@ -154,14 +104,14 @@ async function pushChangesToGroupSwarmIfNeeded(groupPk: GroupPubkeyType): Promis return RunJobResult.RetryJobIfPossible; } - const changes = GroupSync.resultsToSuccessfulChange(result, singleDestChanges); + const changes = LibSessionUtil.batchResultsToGroupSuccessfulChange(result, changesToPush); if (isEmpty(changes)) { return RunJobResult.RetryJobIfPossible; } // Now that we have the successful changes, we need to mark them as pushed and // generate any config dumps which need to be stored - await buildAndSaveDumpsToDB(changes, groupPk); + await confirmPushedAndDump(changes, groupPk); return RunJobResult.Success; } @@ -283,7 +233,6 @@ async function queueNewJobIfNeeded(groupPk: GroupPubkeyType) { export const GroupSync = { GroupSyncJob, pushChangesToGroupSwarmIfNeeded, - resultsToSuccessfulChange, queueNewJobIfNeeded: (groupPk: GroupPubkeyType) => allowOnlyOneAtATime(`GroupSyncJob-oneAtAtTime-${groupPk}`, () => queueNewJobIfNeeded(groupPk)), }; diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index fac857777c..bd59fadd76 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -1,8 +1,8 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable import/extensions */ /* eslint-disable import/no-unresolved */ -import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { compact, difference, omit } from 'lodash'; +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { compact, difference, isString, omit } from 'lodash'; import Long from 'long'; import { UserUtils } from '..'; import { ConfigDumpData } from '../../../data/configDump/configDump'; @@ -20,6 +20,10 @@ import { SnodeNamespaces, UserConfigNamespaces } from '../../apis/snode_api/name import { ed25519Str } from '../../onions/onionPath'; import { PubKey } from '../../types'; import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob'; +import { + BatchResultEntry, + NotEmptyArrayOfBatchResults, +} from '../../apis/snode_api/SnodeRequestTypes'; const requiredUserVariants: Array = [ 'UserConfig', @@ -95,88 +99,85 @@ async function initializeLibSessionUtilWrappers() { // No need to load the meta group wrapper here. We will load them once the SessionInbox is loaded with a redux action } -export type PendingChangesForUs = { +type PendingChangesShared = { ciphertext: Uint8Array; +}; + +export type PendingChangesForUs = PendingChangesShared & { seqno: Long; namespace: UserConfigNamespaces; }; -type PendingChangesForGroupNonKey = { - data: Uint8Array; +type PendingChangesForGroupNonKey = PendingChangesShared & { seqno: Long; namespace: SnodeNamespaces.ClosedGroupInfo | SnodeNamespaces.ClosedGroupMembers; type: Extract; }; type PendingChangesForGroupKey = { - data: Uint8Array; + ciphertext: Uint8Array; namespace: SnodeNamespaces.ClosedGroupKeys; type: Extract; }; export type PendingChangesForGroup = PendingChangesForGroupNonKey | PendingChangesForGroupKey; -type SingleDestinationChanges = { +type DestinationChanges = { messages: Array; allOldHashes: Set; }; -export type UserSingleDestinationChanges = SingleDestinationChanges; -export type GroupSingleDestinationChanges = SingleDestinationChanges; +export type UserDestinationChanges = DestinationChanges; +export type GroupDestinationChanges = DestinationChanges; -async function pendingChangesForUs(): Promise { - const us = UserUtils.getOurPubKeyStrFromCache(); - const dumps = await ConfigDumpData.getAllDumpsWithoutDataFor(us); +export type UserSuccessfulChange = { + pushed: PendingChangesForUs; + updatedHash: string; +}; - // Ensure we always check the required user config types for changes even if there is no dump - // data yet (to deal with first launch cases) - LibSessionUtil.requiredUserVariants.forEach(requiredVariant => { - if (!dumps.some(m => m.publicKey === us && m.variant === requiredVariant)) { - dumps.push({ - publicKey: us, - variant: requiredVariant, - }); - } - }); +export type GroupSuccessfulChange = { + pushed: PendingChangesForGroup; + updatedHash: string; +}; - const results: UserSingleDestinationChanges = { messages: [], allOldHashes: new Set() }; +/** + * Fetch what needs to be pushed for all of the current user's wrappers. + */ +async function pendingChangesForUs(): Promise { + const results: UserDestinationChanges = { messages: [], allOldHashes: new Set() }; const variantsNeedingPush = new Set(); + const userVariants = LibSessionUtil.requiredUserVariants; + + for (let index = 0; index < userVariants.length; index++) { + const variant = userVariants[index]; - for (let index = 0; index < dumps.length; index++) { - const dump = dumps[index]; - const variant = dump.variant; - if (!isUserConfigWrapperType(variant)) { - // this shouldn't happen for our pubkey. - continue; - } const needsPush = await GenericWrapperActions.needsPush(variant); if (!needsPush) { continue; } - variantsNeedingPush.add(variant); const { data, seqno, hashes, namespace } = await GenericWrapperActions.push(variant); + variantsNeedingPush.add(variant); results.messages.push({ ciphertext: data, seqno: Long.fromNumber(seqno), - namespace, + namespace, // we only use the namespace to know to wha }); - hashes.forEach(hash => { - results.allOldHashes.add(hash); - }); + hashes.forEach(results.allOldHashes.add); // add all the hashes to the set } - window.log.info(`those variants needs push: "${[...variantsNeedingPush]}"`); + window.log.info(`those user variants needs push: "${[...variantsNeedingPush]}"`); return results; } -// we link the namespace to the type of what each wrapper needs - -async function pendingChangesForGroup( - groupPk: GroupPubkeyType -): Promise { +/** + * Fetch what needs to be pushed for the specified group public key. + * @param groupPk the public key of the group to fetch the details off + * @returns an object with a list of messages to be pushed and the list of hashes to bump expiry, server side + */ +async function pendingChangesForGroup(groupPk: GroupPubkeyType): Promise { if (!PubKey.isClosedGroupV2(groupPk)) { throw new Error(`pendingChangesForGroup only works for user or 03 group pubkeys`); } @@ -195,7 +196,7 @@ async function pendingChangesForGroup( if (groupKeys) { results.push({ type: 'GroupKeys', - data: groupKeys.data, + ciphertext: groupKeys.data, namespace: groupKeys.namespace, }); } @@ -203,7 +204,7 @@ async function pendingChangesForGroup( if (groupInfo) { results.push({ type: 'GroupInfo', - data: groupInfo.data, + ciphertext: groupInfo.data, seqno: Long.fromNumber(groupInfo.seqno), namespace: groupInfo.namespace, }); @@ -211,7 +212,7 @@ async function pendingChangesForGroup( if (groupMember) { results.push({ type: 'GroupMember', - data: groupMember.data, + ciphertext: groupMember.data, seqno: Long.fromNumber(groupMember.seqno), namespace: groupMember.namespace, }); @@ -227,7 +228,12 @@ async function pendingChangesForGroup( return { messages: results, allOldHashes }; } +/** + * Return the wrapperId associated with a specific namespace. + * WrapperIds are what we use in the database and with the libsession workers calls, and namespace is what we push to. + */ function userNamespaceToVariant(namespace: UserConfigNamespaces) { + // TODO Might be worth migrating them to use directly the namespaces? switch (namespace) { case SnodeNamespaces.UserProfile: return 'UserConfig'; @@ -239,34 +245,141 @@ function userNamespaceToVariant(namespace: UserConfigNamespaces) { return 'ConvoInfoVolatileConfig'; default: assertUnreachable(namespace, `userNamespaceToVariant: Unsupported namespace: "${namespace}"`); - throw new Error('userNamespaceToVariant: Unsupported namespace:'); + throw new Error('userNamespaceToVariant: Unsupported namespace:'); // ts is not happy without this + } +} + +function resultShouldBeIncluded( + msgPushed: T, + batchResult: BatchResultEntry +) { + const hash = batchResult.body?.hash; + if (batchResult.code === 200 && isString(hash) && msgPushed.ciphertext) { + return { + hash, + pushed: msgPushed, + }; } + return null; } /** - * Returns true if the config needs to be dumped afterwards + * This function is run once we get the results from the multiple batch-send for the group push. + * Note: the logic is the same as `batchResultsToUserSuccessfulChange` but I couldn't make typescript happy. */ -async function markAsPushed(variant: ConfigWrapperUser, seqno: number, hash: string) { - await GenericWrapperActions.confirmPushed(variant, seqno, hash); - return GenericWrapperActions.needsDump(variant); +function batchResultsToGroupSuccessfulChange( + result: NotEmptyArrayOfBatchResults | null, + request: GroupDestinationChanges +): Array { + const successfulChanges: Array = []; + + /** + * For each batch request, we get as result + * - status code + hash of the new config message + * - status code of the delete of all messages as given by the request hashes. + * + * As it is a sequence, the delete might have failed but the new config message might still be posted. + * So we need to check which request failed, and if it is the delete by hashes, we need to add the hash of the posted message to the list of hashes + */ + + if (!result?.length) { + return successfulChanges; + } + + for (let j = 0; j < result.length; j++) { + const msgPushed = request.messages?.[j]; + const shouldBe = resultShouldBeIncluded(msgPushed, result[j]); + + if (shouldBe) { + // libsession keeps track of the hashes to push and the one pushed + successfulChanges.push({ + updatedHash: shouldBe.hash, + pushed: shouldBe.pushed, + }); + } + } + + return successfulChanges; } /** - * If a dump is needed for that metagroup wrapper, dump it to the Database + * This function is run once we get the results from the multiple batch-send for the user push. + * Note: the logic is the same as `batchResultsToGroupSuccessfulChange` but I couldn't make typescript happy. */ -async function saveMetaGroupDumpToDb(groupPk: GroupPubkeyType) { - const metaNeedsDump = await MetaGroupWrapperActions.needsDump(groupPk); - // save the concatenated dumps as a single entry in the DB if any of the dumps had a need for dump - if (metaNeedsDump) { - const dump = await MetaGroupWrapperActions.metaDump(groupPk); +function batchResultsToUserSuccessfulChange( + result: NotEmptyArrayOfBatchResults | null, + request: UserDestinationChanges +): Array { + const successfulChanges: Array = []; + + /** + * For each batch request, we get as result + * - status code + hash of the new config message + * - status code of the delete of all messages as given by the request hashes. + * + * As it is a sequence, the delete might have failed but the new config message might still be posted. + * So we need to check which request failed, and if it is the delete by hashes, we need to add the hash of the posted message to the list of hashes + */ + + if (!result?.length) { + return successfulChanges; + } + + for (let j = 0; j < result.length; j++) { + const msgPushed = request.messages?.[j]; + const shouldBe = resultShouldBeIncluded(msgPushed, result[j]); + + if (shouldBe) { + // libsession keeps track of the hashes to push and the one pushed + successfulChanges.push({ + updatedHash: shouldBe.hash, + pushed: shouldBe.pushed, + }); + } + } + + return successfulChanges; +} + +/** + * Check if the wrappers related to that pubkeys need to be dumped to the DB, and if yes, do it. + */ +async function saveDumpsToDb(pubkey: PubkeyType | GroupPubkeyType) { + // first check if this is relating a group + if (PubKey.isClosedGroupV2(pubkey)) { + const metaNeedsDump = await MetaGroupWrapperActions.needsDump(pubkey); + // save the concatenated dumps as a single entry in the DB if any of the dumps had a need for dump + if (metaNeedsDump) { + const dump = await MetaGroupWrapperActions.metaDump(pubkey); + await ConfigDumpData.saveConfigDump({ + data: dump, + publicKey: pubkey, + variant: `MetaGroupConfig-${pubkey}`, + }); + window.log.debug(`Saved dumps for metagroup ${ed25519Str(pubkey)}`); + } else { + window.log.debug(`No need to update local dumps for metagroup ${ed25519Str(pubkey)}`); + } + return; + } + // here, we can only be called with our current user pubkey + if (pubkey !== UserUtils.getOurPubKeyStrFromCache()) { + throw new Error('saveDumpsToDb only supports groupv2 and us pubkeys'); + } + + for (let i = 0; i < LibSessionUtil.requiredUserVariants.length; i++) { + const variant = LibSessionUtil.requiredUserVariants[i]; + const needsDump = await GenericWrapperActions.needsDump(variant); + + if (!needsDump) { + continue; + } + const dump = await GenericWrapperActions.dump(variant); await ConfigDumpData.saveConfigDump({ data: dump, - publicKey: groupPk, - variant: `MetaGroupConfig-${groupPk}`, + publicKey: pubkey, + variant, }); - window.log.debug(`Saved dumps for metagroup ${ed25519Str(groupPk)}`); - } else { - window.log.debug(`No need to update local dumps for metagroup ${ed25519Str(groupPk)}`); } } @@ -276,6 +389,7 @@ export const LibSessionUtil = { requiredUserVariants, pendingChangesForUs, pendingChangesForGroup, - markAsPushed, - saveMetaGroupDumpToDb, + saveDumpsToDb, + batchResultsToGroupSuccessfulChange, + batchResultsToUserSuccessfulChange, }; diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts index 6b6324d8ee..d9fa0ce6d8 100644 --- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts +++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts @@ -236,27 +236,22 @@ describe('JobRunner', () => { expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier); clock.tick(5000); - console.info('=========== awaiting first job =========='); await runnerMulti.waitCurrentJob(); // just give some time for the runnerMulti to pick up a new job await sleepFor(10); expect(runnerMulti.getJobList()).to.deep.eq([]); expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(null); - console.info('=========== awaited first job =========='); // the first job should already be finished now result = await runnerMulti.addJob(job2); expect(result).to.eq('job_started'); expect(runnerMulti.getJobList()).to.deep.eq([job2.serializeJob()]); - console.info('=========== awaiting second job =========='); - // each job takes 5s to finish, so let's tick once the first one should be done clock.tick(5010); await runnerMulti.waitCurrentJob(); await sleepFor(10); - console.info('=========== awaited second job =========='); expect(runnerMulti.getJobList()).to.deep.eq([]); }); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 39a22bfcbc..9ffa9bd5e8 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { omit, pick } from 'lodash'; +import { omit } from 'lodash'; import Long from 'long'; import Sinon from 'sinon'; import { ConfigDumpData } from '../../../../../../data/configDump/configDump'; @@ -8,29 +8,27 @@ import { getSodiumNode } from '../../../../../../node/sodiumNode'; import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../../../../../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../../../../session/apis/snode_api/namespaces'; +import { TTL_DEFAULT } from '../../../../../../session/constants'; import { ConvoHub } from '../../../../../../session/conversations'; import { LibSodiumWrappers } from '../../../../../../session/crypto'; +import { MessageSender } from '../../../../../../session/sending'; import { UserUtils } from '../../../../../../session/utils'; import { RunJobResult } from '../../../../../../session/utils/job_runners/PersistedJob'; +import { GroupSync } from '../../../../../../session/utils/job_runners/jobs/GroupConfigJob'; import { + GroupDestinationChanges, GroupSuccessfulChange, - GroupSync, -} from '../../../../../../session/utils/job_runners/jobs/GroupConfigJob'; -import { - GroupSingleDestinationChanges, LibSessionUtil, PendingChangesForGroup, } from '../../../../../../session/utils/libsession/libsession_utils'; import { MetaGroupWrapperActions } from '../../../../../../webworker/workers/browser/libsession_worker_interface'; import { TestUtils } from '../../../../../test-utils'; -import { MessageSender } from '../../../../../../session/sending'; import { TypedStub } from '../../../../../test-utils/utils'; -import { TTL_DEFAULT } from '../../../../../../session/constants'; function validInfo(sodium: LibSodiumWrappers) { return { type: 'GroupInfo', - data: sodium.randombytes_buf(12), + ciphertext: sodium.randombytes_buf(12), seqno: Long.fromNumber(123), namespace: SnodeNamespaces.ClosedGroupInfo, timestamp: 1234, @@ -39,7 +37,7 @@ function validInfo(sodium: LibSodiumWrappers) { function validMembers(sodium: LibSodiumWrappers) { return { type: 'GroupMember', - data: sodium.randombytes_buf(12), + ciphertext: sodium.randombytes_buf(12), seqno: Long.fromNumber(321), namespace: SnodeNamespaces.ClosedGroupMembers, timestamp: 4321, @@ -49,13 +47,13 @@ function validMembers(sodium: LibSodiumWrappers) { function validKeys(sodium: LibSodiumWrappers) { return { type: 'GroupKeys', - data: sodium.randombytes_buf(12), + ciphertext: sodium.randombytes_buf(12), namespace: SnodeNamespaces.ClosedGroupKeys, timestamp: 3333, } as const; } -describe('GroupSyncJob saveMetaGroupDumpToDb', () => { +describe('GroupSyncJob saveDumpsToDb', () => { let groupPk: GroupPubkeyType; beforeEach(async () => {}); @@ -71,7 +69,7 @@ describe('GroupSyncJob saveMetaGroupDumpToDb', () => { Sinon.stub(MetaGroupWrapperActions, 'needsDump').resolves(false); const metaDump = Sinon.stub(MetaGroupWrapperActions, 'metaDump').resolves(new Uint8Array()); const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); - await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); + await LibSessionUtil.saveDumpsToDb(groupPk); expect(saveConfigDump.callCount).to.be.equal(0); expect(metaDump.callCount).to.be.equal(0); }); @@ -81,7 +79,7 @@ describe('GroupSyncJob saveMetaGroupDumpToDb', () => { const dump = [1, 2, 3, 4, 5]; const metaDump = Sinon.stub(MetaGroupWrapperActions, 'metaDump').resolves(new Uint8Array(dump)); const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); - await LibSessionUtil.saveMetaGroupDumpToDb(groupPk); + await LibSessionUtil.saveDumpsToDb(groupPk); expect(saveConfigDump.callCount).to.be.equal(1); expect(metaDump.callCount).to.be.equal(1); expect(metaDump.firstCall.args).to.be.deep.eq([groupPk]); @@ -143,20 +141,20 @@ describe('GroupSyncJob pendingChangesForGroup', () => { // check for the keys push content expect(result.messages[0]).to.be.deep.eq({ type: 'GroupKeys', - data: new Uint8Array([3, 2, 1]), + ciphertext: new Uint8Array([3, 2, 1]), namespace: 13, }); // check for the info push content expect(result.messages[1]).to.be.deep.eq({ type: 'GroupInfo', - data: new Uint8Array([1, 2, 3]), + ciphertext: new Uint8Array([1, 2, 3]), namespace: 12, seqno: Long.fromInt(pushResults.groupInfo.seqno), }); // check for the members pusu content expect(result.messages[2]).to.be.deep.eq({ type: 'GroupMember', - data: new Uint8Array([1, 2]), + ciphertext: new Uint8Array([1, 2]), namespace: 14, seqno: Long.fromInt(pushResults.groupMember.seqno), }); @@ -247,11 +245,14 @@ describe('GroupSyncJob resultsToSuccessfulChange', () => { }); it('no or empty results return empty array', () => { expect( - GroupSync.resultsToSuccessfulChange(null, { allOldHashes: new Set(), messages: [] }) + LibSessionUtil.batchResultsToGroupSuccessfulChange(null, { + allOldHashes: new Set(), + messages: [], + }) ).to.be.deep.eq([]); expect( - GroupSync.resultsToSuccessfulChange([] as any as NotEmptyArrayOfBatchResults, { + LibSessionUtil.batchResultsToGroupSuccessfulChange([] as any as NotEmptyArrayOfBatchResults, { allOldHashes: new Set(), messages: [], }) @@ -262,11 +263,11 @@ describe('GroupSyncJob resultsToSuccessfulChange', () => { const member = validMembers(sodium); const info = validInfo(sodium); const batchResults: NotEmptyArrayOfBatchResults = [{ code: 200, body: { hash: 'hash1' } }]; - const request: GroupSingleDestinationChanges = { + const request: GroupDestinationChanges = { allOldHashes: new Set(), messages: [info, member], }; - const results = GroupSync.resultsToSuccessfulChange(batchResults, request); + const results = LibSessionUtil.batchResultsToGroupSuccessfulChange(batchResults, request); expect(results).to.be.deep.eq([ { updatedHash: 'hash1', @@ -282,11 +283,11 @@ describe('GroupSyncJob resultsToSuccessfulChange', () => { { code: 200, body: { hash: 'hash1' } }, { code: 200, body: { hash: 'hash2' } }, ]; - const request: GroupSingleDestinationChanges = { + const request: GroupDestinationChanges = { allOldHashes: new Set(), messages: [info, member], }; - const results = GroupSync.resultsToSuccessfulChange(batchResults, request); + const results = LibSessionUtil.batchResultsToGroupSuccessfulChange(batchResults, request); expect(results).to.be.deep.eq([ { updatedHash: 'hash1', @@ -306,11 +307,11 @@ describe('GroupSyncJob resultsToSuccessfulChange', () => { { code: 200, body: { hash: 123 as any as string } }, { code: 200, body: { hash: 'hash2' } }, ]; - const request: GroupSingleDestinationChanges = { + const request: GroupDestinationChanges = { allOldHashes: new Set(), messages: [info, member], }; - const results = GroupSync.resultsToSuccessfulChange(batchResults, request); + const results = LibSessionUtil.batchResultsToGroupSuccessfulChange(batchResults, request); expect(results).to.be.deep.eq([ { updatedHash: 'hash2', @@ -322,16 +323,16 @@ describe('GroupSyncJob resultsToSuccessfulChange', () => { it('skip request item without data', () => { const member = validMembers(sodium); const info = validInfo(sodium); - const infoNoData = omit(info, 'data'); + const infoNoData = omit(info, 'ciphertext'); const batchResults: NotEmptyArrayOfBatchResults = [ { code: 200, body: { hash: 'hash1' } }, { code: 200, body: { hash: 'hash2' } }, ]; - const request: GroupSingleDestinationChanges = { + const request: GroupDestinationChanges = { allOldHashes: new Set(), messages: [infoNoData as any as PendingChangesForGroup, member], }; - const results = GroupSync.resultsToSuccessfulChange(batchResults, request); + const results = LibSessionUtil.batchResultsToGroupSuccessfulChange(batchResults, request); expect(results).to.be.deep.eq([ { updatedHash: 'hash2', @@ -347,11 +348,11 @@ describe('GroupSyncJob resultsToSuccessfulChange', () => { { code: 200, body: { hash: 'hash1' } }, { code: 401, body: { hash: 'hash2' } }, ]; - const request: GroupSingleDestinationChanges = { + const request: GroupDestinationChanges = { allOldHashes: new Set(), messages: [info, member], }; - const results = GroupSync.resultsToSuccessfulChange(batchResults, request); + const results = LibSessionUtil.batchResultsToGroupSuccessfulChange(batchResults, request); expect(results).to.be.deep.eq([ { updatedHash: 'hash1', @@ -362,7 +363,7 @@ describe('GroupSyncJob resultsToSuccessfulChange', () => { // another test swapping the results batchResults[0].code = 401; batchResults[1].code = 200; - const results2 = GroupSync.resultsToSuccessfulChange(batchResults, request); + const results2 = LibSessionUtil.batchResultsToGroupSuccessfulChange(batchResults, request); expect(results2).to.be.deep.eq([ { updatedHash: 'hash2', @@ -379,7 +380,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { let sendStub: TypedStub; let pendingChangesForGroupStub: TypedStub; - let saveMetaGroupDumpToDbStub: TypedStub; + let saveDumpsToDbStub: TypedStub; beforeEach(async () => { sodium = await getSodiumNode(); @@ -389,7 +390,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves(userkeys.ed25519KeyPair); pendingChangesForGroupStub = Sinon.stub(LibSessionUtil, 'pendingChangesForGroup'); - saveMetaGroupDumpToDbStub = Sinon.stub(LibSessionUtil, 'saveMetaGroupDumpToDb'); + saveDumpsToDbStub = Sinon.stub(LibSessionUtil, 'saveDumpsToDb'); sendStub = Sinon.stub(MessageSender, 'sendEncryptedDataToSnode'); }); afterEach(() => { @@ -402,8 +403,8 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { expect(result).to.be.eq(RunJobResult.Success); expect(sendStub.callCount).to.be.eq(0); expect(pendingChangesForGroupStub.callCount).to.be.eq(1); - expect(saveMetaGroupDumpToDbStub.callCount).to.be.eq(1); - expect(saveMetaGroupDumpToDbStub.firstCall.args).to.be.deep.eq([groupPk]); + expect(saveDumpsToDbStub.callCount).to.be.eq(1); + expect(saveDumpsToDbStub.firstCall.args).to.be.deep.eq([groupPk]); }); it('calls sendEncryptedDataToSnode with the right data and retry if network returned nothing', async () => { @@ -422,11 +423,18 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { expect(result).to.be.eq(RunJobResult.RetryJobIfPossible); // not returning anything in the sendstub so network issue happened expect(sendStub.callCount).to.be.eq(1); expect(pendingChangesForGroupStub.callCount).to.be.eq(1); - expect(saveMetaGroupDumpToDbStub.callCount).to.be.eq(1); - expect(saveMetaGroupDumpToDbStub.firstCall.args).to.be.deep.eq([groupPk]); + expect(saveDumpsToDbStub.callCount).to.be.eq(1); + expect(saveDumpsToDbStub.firstCall.args).to.be.deep.eq([groupPk]); function expected(details: any) { - return { ...pick(details, 'data', 'namespace'), ttl, networkTimestamp, pubkey: groupPk }; + console.warn('details', details); + return { + namespace: details.namespace, + data: details.ciphertext, + ttl, + networkTimestamp, + pubkey: groupPk, + }; } const expectedInfo = expected(info); @@ -438,7 +446,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { ]); }); - it('calls sendEncryptedDataToSnode with the right data and retry if network returned nothing', async () => { + it('calls sendEncryptedDataToSnode with the right data (and keys) and retry if network returned nothing', async () => { const info = validInfo(sodium); const member = validMembers(sodium); const keys = validKeys(sodium); @@ -460,7 +468,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { updatedHash: 'hash2', }, ]; - Sinon.stub(GroupSync, 'resultsToSuccessfulChange').returns(changes); + Sinon.stub(LibSessionUtil, 'batchResultsToGroupSuccessfulChange').returns(changes); const metaConfirmPushed = Sinon.stub(MetaGroupWrapperActions, 'metaConfirmPushed').resolves(); sendStub.resolves([ @@ -473,9 +481,9 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { expect(sendStub.callCount).to.be.eq(1); expect(pendingChangesForGroupStub.callCount).to.be.eq(1); - expect(saveMetaGroupDumpToDbStub.callCount).to.be.eq(2); - expect(saveMetaGroupDumpToDbStub.firstCall.args).to.be.deep.eq([groupPk]); - expect(saveMetaGroupDumpToDbStub.secondCall.args).to.be.deep.eq([groupPk]); + expect(saveDumpsToDbStub.callCount).to.be.eq(2); + expect(saveDumpsToDbStub.firstCall.args).to.be.deep.eq([groupPk]); + expect(saveDumpsToDbStub.secondCall.args).to.be.deep.eq([groupPk]); expect(metaConfirmPushed.callCount).to.be.eq(1); expect(metaConfirmPushed.firstCall.args).to.be.deep.eq([ groupPk, From eb77c50fa9a44c4890be55df686d330d9b2966cb Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 11 Oct 2023 13:18:15 +1100 Subject: [PATCH 035/302] chore: renamed GroupConfigurationJob to GroupSyncJob --- .../job_runners/jobs/{GroupConfigJob.ts => GroupSyncJob.ts} | 0 ts/state/ducks/groups.ts | 2 +- .../unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename ts/session/utils/job_runners/jobs/{GroupConfigJob.ts => GroupSyncJob.ts} (100%) diff --git a/ts/session/utils/job_runners/jobs/GroupConfigJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts similarity index 100% rename from ts/session/utils/job_runners/jobs/GroupConfigJob.ts rename to ts/session/utils/job_runners/jobs/GroupSyncJob.ts diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index d53b866fb5..2249099417 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -14,7 +14,7 @@ import { ConvoHub } from '../../session/conversations'; import { UserUtils } from '../../session/utils'; import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { PreConditionFailed } from '../../session/utils/errors'; -import { GroupSync } from '../../session/utils/job_runners/jobs/GroupConfigJob'; +import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { getGroupPubkeyFromWrapperType, diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 9ffa9bd5e8..6c96d228c3 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -14,7 +14,7 @@ import { LibSodiumWrappers } from '../../../../../../session/crypto'; import { MessageSender } from '../../../../../../session/sending'; import { UserUtils } from '../../../../../../session/utils'; import { RunJobResult } from '../../../../../../session/utils/job_runners/PersistedJob'; -import { GroupSync } from '../../../../../../session/utils/job_runners/jobs/GroupConfigJob'; +import { GroupSync } from '../../../../../../session/utils/job_runners/jobs/GroupSyncJob'; import { GroupDestinationChanges, GroupSuccessfulChange, From d134da3421b2e6a05119d0a7607eed87851dda5f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 11 Oct 2023 13:23:43 +1100 Subject: [PATCH 036/302] chore: renamed ConfigurationSyncJob to UserSyncJob --- ts/components/leftpane/ActionsPanel.tsx | 4 +- .../settings/section/CategoryPrivacy.tsx | 4 +- ts/interactions/conversationInteractions.ts | 4 +- ts/mains/main_renderer.tsx | 4 +- ts/models/conversation.ts | 4 +- ts/receiver/configMessage.ts | 4 +- .../conversations/ConversationController.ts | 8 ++-- .../utils/job_runners/JobDeserialization.ts | 6 +-- ts/session/utils/job_runners/JobRunner.ts | 13 +++--- ts/session/utils/job_runners/PersistedJob.ts | 8 ++-- .../utils/job_runners/jobs/GroupSyncJob.ts | 2 +- .../utils/job_runners/jobs/JobRunnerType.ts | 2 +- ...ConfigurationSyncJob.ts => UserSyncJob.ts} | 41 +++++++++---------- .../utils/libsession/libsession_utils.ts | 4 +- .../libsession/libsession_utils_contacts.ts | 2 +- ts/session/utils/sync/syncUtils.ts | 14 +++---- ts/shims/events.ts | 2 +- .../SwarmPolling_pollForAllKeys_test.ts | 4 +- ts/util/releaseFeature.ts | 4 +- 19 files changed, 65 insertions(+), 69 deletions(-) rename ts/session/utils/job_runners/jobs/{ConfigurationSyncJob.ts => UserSyncJob.ts} (84%) diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 5cf331ee21..ad015a663e 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -45,7 +45,7 @@ import { import { isDarkTheme } from '../../state/selectors/theme'; import { ThemeStateType } from '../../themes/constants/colors'; import { switchThemeTo } from '../../themes/switchTheme'; -import { ConfigurationSync } from '../../session/utils/job_runners/jobs/ConfigurationSyncJob'; +import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; const Section = (props: { type: SectionType }) => { const ourNumber = useSelector(getOurNumber); @@ -212,7 +212,7 @@ const doAppStartUp = async () => { global.setTimeout(() => { // Schedule a confSyncJob in some time to let anything incoming from the network be applied and see if there is a push needed - void ConfigurationSync.queueNewJobIfNeeded(); + void UserSync.queueNewJobIfNeeded(); }, 20000); }; diff --git a/ts/components/settings/section/CategoryPrivacy.tsx b/ts/components/settings/section/CategoryPrivacy.tsx index 4e0f5be3b9..9ad89969cd 100644 --- a/ts/components/settings/section/CategoryPrivacy.tsx +++ b/ts/components/settings/section/CategoryPrivacy.tsx @@ -10,7 +10,7 @@ import { SpacerLG } from '../../basic/Text'; import { TypingBubble } from '../../conversation/TypingBubble'; import { UserUtils } from '../../../session/utils'; -import { ConfigurationSync } from '../../../session/utils/job_runners/jobs/ConfigurationSyncJob'; +import { UserSync } from '../../../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilUserProfile } from '../../../session/utils/libsession/libsession_utils_user_profile'; import { useHasBlindedMsgRequestsEnabled, @@ -98,7 +98,7 @@ export const SettingsCategoryPrivacy = (props: { await SessionUtilUserProfile.insertUserProfileIntoWrapper( UserUtils.getOurPubKeyStrFromCache() ); - await ConfigurationSync.queueNewJobIfNeeded(); + await UserSync.queueNewJobIfNeeded(); forceUpdate(); }} title={window.i18n('blindedMsgReqsSettingTitle')} diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index b6aa0c90da..7210a35132 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -15,7 +15,7 @@ import { getSodiumRenderer } from '../session/crypto'; import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; import { perfEnd, perfStart } from '../session/utils/Performance'; import { fromHexToArray, toHex } from '../session/utils/String'; -import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob'; +import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils'; import { @@ -466,7 +466,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) { if (newAvatarDecrypted) { await setLastProfileUpdateTimestamp(Date.now()); - await ConfigurationSync.queueNewJobIfNeeded(); + await UserSync.queueNewJobIfNeeded(); const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); if (!userConfigLibsession) { diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx index ca3ec64e0a..52af0ea8fb 100644 --- a/ts/mains/main_renderer.tsx +++ b/ts/mains/main_renderer.tsx @@ -114,8 +114,8 @@ async function startJobRunners() { // start the job runners await runners.avatarDownloadRunner.loadJobsFromDb(); runners.avatarDownloadRunner.startProcessing(); - await runners.configurationSyncRunner.loadJobsFromDb(); - runners.configurationSyncRunner.startProcessing(); + await runners.userSyncRunner.loadJobsFromDb(); + runners.userSyncRunner.startProcessing(); await runners.groupSyncRunner.loadJobsFromDb(); runners.groupSyncRunner.startProcessing(); } diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index de11d99ed1..0d72b4768e 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -78,7 +78,7 @@ import { MessageRequestResponseParams, } from '../session/messages/outgoing/controlMessage/MessageRequestResponse'; import { ed25519Str } from '../session/onions/onionPath'; -import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob'; +import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile'; import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups'; @@ -2386,7 +2386,7 @@ async function commitConversationAndRefreshWrapper(id: string) { if (Registration.isDone()) { // save the new dump if needed to the DB asap // this call throttled so we do not run this too often (and not for every .commit()) - await ConfigurationSync.queueNewJobIfNeeded(); + await UserSync.queueNewJobIfNeeded(); } convo.triggerUIRefresh(); } diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 920ccd9885..dd39970801 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -16,7 +16,7 @@ import { ProfileManager } from '../session/profile_manager/ProfileManager'; import { PubKey } from '../session/types'; import { StringUtils, UserUtils } from '../session/utils'; import { toHex } from '../session/utils/String'; -import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob'; +import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { LibSessionUtil } from '../session/utils/libsession/libsession_utils'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile'; @@ -910,7 +910,7 @@ async function processUserMergingResults(results: Map( @@ -15,8 +15,8 @@ export function persistedJobFromData( } switch (data.jobType) { - case 'ConfigurationSyncJobType': - return new ConfigurationSync.ConfigurationSyncJob(data) as unknown as PersistedJob; + case 'UserSyncJobType': + return new UserSync.UserSyncJob(data) as unknown as PersistedJob; case 'AvatarDownloadJobType': return new AvatarDownload.AvatarDownloadJob(data) as unknown as PersistedJob; case 'FakeSleepForJobType': diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts index cc6b2a812d..9f470d864f 100644 --- a/ts/session/utils/job_runners/JobRunner.ts +++ b/ts/session/utils/job_runners/JobRunner.ts @@ -1,17 +1,17 @@ import { cloneDeep, compact, isArray, isString } from 'lodash'; import { Data } from '../../../data/data'; +import { Storage } from '../../../util/storage'; import { timeout } from '../Promise'; import { persistedJobFromData } from './JobDeserialization'; -import { JobRunnerType } from './jobs/JobRunnerType'; import { AvatarDownloadPersistedData, - ConfigurationSyncPersistedData, GroupSyncPersistedData, PersistedJob, RunJobResult, TypeOfPersistedData, + UserSyncPersistedData, } from './PersistedJob'; -import { Storage } from '../../../util/storage'; +import { JobRunnerType } from './jobs/JobRunnerType'; /** * 'job_in_progress' if there is already a job in progress @@ -351,10 +351,7 @@ export class PersistedJobRunner { } } -const configurationSyncRunner = new PersistedJobRunner( - 'ConfigurationSyncJob', - null -); +const userSyncRunner = new PersistedJobRunner('UserSyncJob', null); const groupSyncRunner = new PersistedJobRunner('GroupSyncJob', null); const avatarDownloadRunner = new PersistedJobRunner( @@ -363,7 +360,7 @@ const avatarDownloadRunner = new PersistedJobRunner ); export const runners = { - configurationSyncRunner, + userSyncRunner, groupSyncRunner, avatarDownloadRunner, }; diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts index ffba8fd12c..4bc3513d1d 100644 --- a/ts/session/utils/job_runners/PersistedJob.ts +++ b/ts/session/utils/job_runners/PersistedJob.ts @@ -1,7 +1,7 @@ import { cloneDeep, isEmpty } from 'lodash'; export type PersistedJobType = - | 'ConfigurationSyncJobType' + | 'UserSyncJobType' | 'GroupSyncJobType' | 'AvatarDownloadJobType' | 'FakeSleepForJobType' @@ -32,15 +32,15 @@ export interface AvatarDownloadPersistedData extends PersistedJobData { conversationId: string; } -export interface ConfigurationSyncPersistedData extends PersistedJobData { - jobType: 'ConfigurationSyncJobType'; +export interface UserSyncPersistedData extends PersistedJobData { + jobType: 'UserSyncJobType'; } export interface GroupSyncPersistedData extends PersistedJobData { jobType: 'GroupSyncJobType'; } export type TypeOfPersistedData = - | ConfigurationSyncPersistedData + | UserSyncPersistedData | AvatarDownloadPersistedData | FakeSleepJobData | FakeSleepForMultiJobData diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index fcd2cdc6db..f00b565647 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -162,7 +162,7 @@ class GroupSyncJob extends PersistedJob { } catch (e) { throw e; } finally { - window.log.debug(`ConfigurationSyncJob run() took ${Date.now() - start}ms`); + window.log.debug(`UserSyncJob run() took ${Date.now() - start}ms`); // this is a simple way to make sure whatever happens here, we update the lastest timestamp. // (a finally statement is always executed (no matter if exception or returns in other try/catch block) diff --git a/ts/session/utils/job_runners/jobs/JobRunnerType.ts b/ts/session/utils/job_runners/jobs/JobRunnerType.ts index 438d908327..56b3b27560 100644 --- a/ts/session/utils/job_runners/jobs/JobRunnerType.ts +++ b/ts/session/utils/job_runners/jobs/JobRunnerType.ts @@ -1,5 +1,5 @@ export type JobRunnerType = - | 'ConfigurationSyncJob' + | 'UserSyncJob' | 'GroupSyncJob' | 'FakeSleepForJob' | 'FakeSleepForMultiJob' diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts similarity index 84% rename from ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts rename to ts/session/utils/job_runners/jobs/UserSyncJob.ts index 78da695fba..bbb5ff64f5 100644 --- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -4,7 +4,7 @@ import { isArray, isEmpty, isNumber } from 'lodash'; import { v4 } from 'uuid'; import { UserUtils } from '../..'; import { ConfigDumpData } from '../../../../data/configDump/configDump'; -import { ConfigurationSyncJobDone } from '../../../../shims/events'; +import { UserSyncJobDone } from '../../../../shims/events'; import { isSignInByLinking } from '../../../../util/storage'; import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { StoreOnNodeData } from '../../../apis/snode_api/SnodeRequestTypes'; @@ -17,7 +17,7 @@ import { LibSessionUtil, UserSuccessfulChange } from '../../libsession/libsessio import { runners } from '../JobRunner'; import { AddJobCheckReturn, - ConfigurationSyncPersistedData, + UserSyncPersistedData, PersistedJob, RunJobResult, } from '../PersistedJob'; @@ -58,7 +58,7 @@ async function confirmPushedAndDump( } function triggerConfSyncJobDone() { - window.Whisper.events.trigger(ConfigurationSyncJobDone); + window.Whisper.events.trigger(UserSyncJobDone); } function isPubkey(us: string): us is PubkeyType { @@ -98,7 +98,7 @@ async function pushChangesToUserSwarmIfNeeded() { // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { window.log.info( - `ConfigurationSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` + `UserSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` ); // this might be a 421 error (already handled) so let's retry this request a little bit later return RunJobResult.RetryJobIfPossible; @@ -116,7 +116,7 @@ async function pushChangesToUserSwarmIfNeeded() { return RunJobResult.Success; } -class ConfigurationSyncJob extends PersistedJob { +class UserSyncJob extends PersistedJob { constructor({ identifier, nextAttemptTimestamp, @@ -124,12 +124,12 @@ class ConfigurationSyncJob extends PersistedJob currentRetry, }: Partial< Pick< - ConfigurationSyncPersistedData, + UserSyncPersistedData, 'identifier' | 'nextAttemptTimestamp' | 'currentRetry' | 'maxAttempts' > >) { super({ - jobType: 'ConfigurationSyncJobType', + jobType: 'UserSyncJobType', identifier: identifier || v4(), delayBetweenRetries: defaultMsBetweenRetries, maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts, @@ -142,7 +142,7 @@ class ConfigurationSyncJob extends PersistedJob const start = Date.now(); try { - window.log.debug(`ConfigurationSyncJob starting ${this.persistedData.identifier}`); + window.log.debug(`UserSyncJob starting ${this.persistedData.identifier}`); const us = UserUtils.getOurPubKeyStrFromCache(); const ed25519Key = await UserUtils.getUserED25519KeyPairBytes(); @@ -158,7 +158,7 @@ class ConfigurationSyncJob extends PersistedJob } catch (e) { throw e; } finally { - window.log.debug(`ConfigurationSyncJob run() took ${Date.now() - start}ms`); + window.log.debug(`UserSyncJob run() took ${Date.now() - start}ms`); // this is a simple way to make sure whatever happens here, we update the lastest timestamp. // (a finally statement is always executed (no matter if exception or returns in other try/catch block) @@ -166,12 +166,12 @@ class ConfigurationSyncJob extends PersistedJob } } - public serializeJob(): ConfigurationSyncPersistedData { + public serializeJob(): UserSyncPersistedData { const fromParent = super.serializeBase(); return fromParent; } - public addJobCheck(jobs: Array): AddJobCheckReturn { + public addJobCheck(jobs: Array): AddJobCheckReturn { return this.addJobCheckSameTypePresent(jobs); } @@ -180,7 +180,7 @@ class ConfigurationSyncJob extends PersistedJob * We never want to add a new sync configuration job if there is already one in the queue. * This is done by the `addJobCheck` method above */ - public nonRunningJobsToRemove(_jobs: Array) { + public nonRunningJobsToRemove(_jobs: Array) { return []; } @@ -195,7 +195,7 @@ class ConfigurationSyncJob extends PersistedJob /** * Queue a new Sync Configuration if needed job. - * A ConfigurationSyncJob can only be added if there is none of the same type queued already. + * A UserSyncJob can only be added if there is none of the same type queued already. */ async function queueNewJobIfNeeded() { if (isSignInByLinking()) { @@ -210,8 +210,8 @@ async function queueNewJobIfNeeded() { // window.log.debug('Scheduling ConfSyncJob: ASAP'); // we postpone by 1000ms to make sure whoever is adding this job is done with what is needs to do first // this call will make sure that there is only one configuration sync job at all times - await runners.configurationSyncRunner.addJob( - new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() + 1000 }) + await runners.userSyncRunner.addJob( + new UserSyncJob({ nextAttemptTimestamp: Date.now() + 1000 }) ); } else { // if we did run at t=100, and it is currently t=110, the difference is 10 @@ -220,14 +220,13 @@ async function queueNewJobIfNeeded() { const leftBeforeNextTick = Math.max(defaultMsBetweenRetries - diff, 1000); // window.log.debug('Scheduling ConfSyncJob: LATER'); - await runners.configurationSyncRunner.addJob( - new ConfigurationSyncJob({ nextAttemptTimestamp: Date.now() + leftBeforeNextTick }) + await runners.userSyncRunner.addJob( + new UserSyncJob({ nextAttemptTimestamp: Date.now() + leftBeforeNextTick }) ); } } -export const ConfigurationSync = { - ConfigurationSyncJob, - queueNewJobIfNeeded: () => - allowOnlyOneAtATime('ConfigurationSyncJob-oneAtAtTime', queueNewJobIfNeeded), +export const UserSync = { + UserSyncJob, + queueNewJobIfNeeded: () => allowOnlyOneAtATime('UserSyncJob-oneAtAtTime', queueNewJobIfNeeded), }; diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index bd59fadd76..5c3b014bfd 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -19,7 +19,7 @@ import { import { SnodeNamespaces, UserConfigNamespaces } from '../../apis/snode_api/namespaces'; import { ed25519Str } from '../../onions/onionPath'; import { PubKey } from '../../types'; -import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob'; +import { UserSync } from '../job_runners/jobs/UserSyncJob'; import { BatchResultEntry, NotEmptyArrayOfBatchResults, @@ -39,7 +39,7 @@ async function initializeLibSessionUtilWrappers() { } const privateKeyEd25519 = keypair.privKeyBytes; // let's plan a sync on start with some room for the app to be ready - setTimeout(() => ConfigurationSync.queueNewJobIfNeeded, 20000); + setTimeout(() => UserSync.queueNewJobIfNeeded, 20000); // fetch the dumps we already have from the database const dumps = await ConfigDumpData.getAllDumpsWithData(); diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts index 8364e62ceb..a360a7523f 100644 --- a/ts/session/utils/libsession/libsession_utils_contacts.ts +++ b/ts/session/utils/libsession/libsession_utils_contacts.ts @@ -18,7 +18,7 @@ import { PubKey } from '../../types'; * * Also, to make sure that our wrapper is up to date, we schedule jobs to be run and fetch all contacts and update all the wrappers entries. * This is done in the - * - `ConfigurationSyncJob` (sending data to the network) and the + * - `UserSyncJob` (sending data to the network) and the * */ const mappedContactWrapperValues = new Map(); diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts index b7ddaf2156..eb06837de0 100644 --- a/ts/session/utils/sync/syncUtils.ts +++ b/ts/session/utils/sync/syncUtils.ts @@ -7,7 +7,7 @@ import { OpenGroupData } from '../../../data/opengroups'; import { ConversationModel } from '../../../models/conversation'; import { SignalService } from '../../../protobuf'; import { ECKeyPair } from '../../../receiver/keypairs'; -import { ConfigurationSyncJobDone } from '../../../shims/events'; +import { UserSyncJobDone } from '../../../shims/events'; import { ReleasedFeatures } from '../../../util/releaseFeature'; import { Storage } from '../../../util/storage'; import { getCompleteUrlFromRoom } from '../../apis/open_group_api/utils/OpenGroupUtils'; @@ -30,7 +30,7 @@ import { } from '../../messages/outgoing/visibleMessage/VisibleMessage'; import { PubKey } from '../../types'; import { fromBase64ToArray, fromHexToArray } from '../String'; -import { ConfigurationSync } from '../job_runners/jobs/ConfigurationSyncJob'; +import { UserSync } from '../job_runners/jobs/UserSyncJob'; const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp'; @@ -44,7 +44,7 @@ const writeLastSyncTimestampToDb = async (timestamp: number) => * Conditionally Syncs user configuration with other devices linked. */ export const syncConfigurationIfNeeded = async () => { - await ConfigurationSync.queueNewJobIfNeeded(); + await UserSync.queueNewJobIfNeeded(); const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); if (!userConfigLibsession) { @@ -84,16 +84,16 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal resolve(false); }, 20000); - // the ConfigurationSync also handles dumping in to the DB if we do not need to push the data, but the dumping needs to be done even before the feature flag is true. - void ConfigurationSync.queueNewJobIfNeeded().catch(e => { + // the UserSync also handles dumping in to the DB if we do not need to push the data, but the dumping needs to be done even before the feature flag is true. + void UserSync.queueNewJobIfNeeded().catch(e => { window.log.warn( - 'forceSyncConfigurationNowIfNeeded scheduling of jobs ConfigurationSync.queueNewJobIfNeeded failed with: ', + 'forceSyncConfigurationNowIfNeeded scheduling of jobs UserSync.queueNewJobIfNeeded failed with: ', e.message ); }); if (ReleasedFeatures.isUserConfigFeatureReleasedCached()) { if (waitForMessageSent) { - window.Whisper.events.once(ConfigurationSyncJobDone, () => { + window.Whisper.events.once(UserSyncJobDone, () => { resolve(true); }); return; diff --git a/ts/shims/events.ts b/ts/shims/events.ts index 2ab75b3c85..45cdf4cd78 100644 --- a/ts/shims/events.ts +++ b/ts/shims/events.ts @@ -3,4 +3,4 @@ export function trigger(name: string, param1?: any, param2?: any) { } export const configurationMessageReceived = 'configurationMessageReceived'; -export const ConfigurationSyncJobDone = 'ConfigurationSyncJobDone'; +export const UserSyncJobDone = 'UserSyncJobDone'; diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts index e8ac3a5428..675ca91cc8 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts @@ -13,7 +13,7 @@ import { ConvoHub } from '../../../../session/conversations'; import { PubKey } from '../../../../session/types'; import { UserUtils } from '../../../../session/utils'; import { sleepFor } from '../../../../session/utils/Promise'; -import { ConfigurationSync } from '../../../../session/utils/job_runners/jobs/ConfigurationSyncJob'; +import { UserSync } from '../../../../session/utils/job_runners/jobs/UserSyncJob'; import { TestUtils } from '../../../test-utils'; import { generateFakeSnodes, stubData } from '../../../test-utils/utils'; @@ -52,7 +52,7 @@ describe('SwarmPolling:pollForAllKeys', () => { ConvoHub.use().reset(); TestUtils.stubWindowFeatureFlags(); TestUtils.stubWindowLog(); - Sinon.stub(ConfigurationSync, 'queueNewJobIfNeeded').resolves(); + Sinon.stub(UserSync, 'queueNewJobIfNeeded').resolves(); // Utils Stubs Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts index 76f2e972d3..6f3c4b762b 100644 --- a/ts/util/releaseFeature.ts +++ b/ts/util/releaseFeature.ts @@ -1,5 +1,5 @@ import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; -import { ConfigurationSync } from '../session/utils/job_runners/jobs/ConfigurationSyncJob'; +import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { assertUnreachable } from '../types/sqlSharedTypes'; import { Storage } from './storage'; @@ -87,7 +87,7 @@ async function checkIsFeatureReleased(featureName: FeatureNameTracked): Promise< await Storage.put(featureStorageItemId(featureName), true); setIsFeatureReleasedCached(featureName, true); // trigger a sync right away so our user data is online - await ConfigurationSync.queueNewJobIfNeeded(); + await UserSync.queueNewJobIfNeeded(); } const isReleased = Boolean(getIsFeatureReleasedCached(featureName)); From ceffa1e13bb692d31bbb9c614bfaf704f2e9ee9f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 11 Oct 2023 16:04:10 +1100 Subject: [PATCH 037/302] test: add tests for pendingchangesforus --- .../utils/libsession/libsession_utils.ts | 10 +- .../crypto/OpenGroupAuthentication_test.ts | 6 +- .../libsession_util/libsession_utils_test.ts | 352 ++++++++++++++++++ .../group_sync_job/GroupSyncJob_test.ts | 127 ------- ts/test/test-utils/utils/pubkey.ts | 6 +- 5 files changed, 362 insertions(+), 139 deletions(-) create mode 100644 ts/test/session/unit/libsession_util/libsession_utils_test.ts diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 5c3b014bfd..c2424508fb 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -16,14 +16,14 @@ import { GenericWrapperActions, MetaGroupWrapperActions, } from '../../../webworker/workers/browser/libsession_worker_interface'; -import { SnodeNamespaces, UserConfigNamespaces } from '../../apis/snode_api/namespaces'; -import { ed25519Str } from '../../onions/onionPath'; -import { PubKey } from '../../types'; -import { UserSync } from '../job_runners/jobs/UserSyncJob'; import { BatchResultEntry, NotEmptyArrayOfBatchResults, } from '../../apis/snode_api/SnodeRequestTypes'; +import { SnodeNamespaces, UserConfigNamespaces } from '../../apis/snode_api/namespaces'; +import { ed25519Str } from '../../onions/onionPath'; +import { PubKey } from '../../types'; +import { UserSync } from '../job_runners/jobs/UserSyncJob'; const requiredUserVariants: Array = [ 'UserConfig', @@ -165,7 +165,7 @@ async function pendingChangesForUs(): Promise { namespace, // we only use the namespace to know to wha }); - hashes.forEach(results.allOldHashes.add); // add all the hashes to the set + hashes.forEach(h => results.allOldHashes.add(h)); // add all the hashes to the set } window.log.info(`those user variants needs push: "${[...variantsNeedingPush]}"`); diff --git a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts index c5af953d9e..b48f628e10 100644 --- a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts +++ b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts @@ -299,9 +299,7 @@ const decryptBlindedMessage = async ( const version = data[0]; if (version !== 0) { - window?.log?.error( - 'decryptBlindedMessage - Dropping message due to unsupported encryption version' - ); + console.warn('decryptBlindedMessage - Dropping message due to unsupported encryption version'); return undefined; } @@ -319,7 +317,7 @@ const decryptBlindedMessage = async ( if (plaintextIncoming.length <= 32) { // throw Error; - window?.log?.error('decryptBlindedMessage: plaintext insufficient length'); + console.error('decryptBlindedMessage: plaintext insufficient length'); return undefined; } diff --git a/ts/test/session/unit/libsession_util/libsession_utils_test.ts b/ts/test/session/unit/libsession_util/libsession_utils_test.ts new file mode 100644 index 0000000000..8879d1ceab --- /dev/null +++ b/ts/test/session/unit/libsession_util/libsession_utils_test.ts @@ -0,0 +1,352 @@ +import { expect } from 'chai'; +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { randombytes_buf } from 'libsodium-wrappers-sumo'; +import Long from 'long'; +import Sinon from 'sinon'; +import { ConfigDumpData } from '../../../../data/configDump/configDump'; +import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; +import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; +import { UserUtils } from '../../../../session/utils'; +import { LibSessionUtil } from '../../../../session/utils/libsession/libsession_utils'; +import { + GenericWrapperActions, + MetaGroupWrapperActions, +} from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { TestUtils } from '../../../test-utils'; + +describe('LibSessionUtil saveDumpsToDb', () => { + describe('for group', () => { + let groupPk: GroupPubkeyType; + + beforeEach(() => { + groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + }); + + afterEach(() => { + Sinon.restore(); + }); + + it('does not save to DB if needsDump reports false', async () => { + Sinon.stub(MetaGroupWrapperActions, 'needsDump').resolves(false); + const metaDump = Sinon.stub(MetaGroupWrapperActions, 'metaDump').resolves(new Uint8Array()); + const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); + await LibSessionUtil.saveDumpsToDb(groupPk); + expect(saveConfigDump.callCount).to.be.equal(0); + expect(metaDump.callCount).to.be.equal(0); + }); + + it('does save to DB if needsDump reports true', async () => { + Sinon.stub(MetaGroupWrapperActions, 'needsDump').resolves(true); + const dump = [1, 2, 3, 4, 5]; + const metaDump = Sinon.stub(MetaGroupWrapperActions, 'metaDump').resolves( + new Uint8Array(dump) + ); + const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); + await LibSessionUtil.saveDumpsToDb(groupPk); + expect(saveConfigDump.callCount).to.be.equal(1); + expect(metaDump.callCount).to.be.equal(1); + expect(metaDump.firstCall.args).to.be.deep.eq([groupPk]); + expect(saveConfigDump.firstCall.args).to.be.deep.eq([ + { + publicKey: groupPk, + variant: `MetaGroupConfig-${groupPk}`, + data: new Uint8Array(dump), + }, + ]); + }); + }); + + describe('for user', () => { + let userDetails: TestUtils.TestUserKeyPairs; + let sessionId: PubkeyType; + + beforeEach(async () => { + userDetails = await TestUtils.generateUserKeyPairs(); + sessionId = userDetails.x25519KeyPair.pubkeyHex; + }); + + afterEach(() => { + Sinon.restore(); + }); + + it('does not save to DB if all needsDump reports false', async () => { + Sinon.stub(GenericWrapperActions, 'needsDump').resolves(false); + const dump = Sinon.stub(GenericWrapperActions, 'dump').resolves(new Uint8Array()); + const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(sessionId); + + await LibSessionUtil.saveDumpsToDb(sessionId); + expect(saveConfigDump.callCount).to.be.equal(0); + expect(dump.callCount).to.be.equal(0); + }); + + it('does save to DB if any needsDump reports true', async () => { + Sinon.stub(GenericWrapperActions, 'needsDump') + .resolves(false) + .withArgs('ConvoInfoVolatileConfig') + .resolves(true); + const dump = Sinon.stub(GenericWrapperActions, 'dump').resolves(new Uint8Array()); + const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(sessionId); + + await LibSessionUtil.saveDumpsToDb(sessionId); + expect(saveConfigDump.callCount).to.be.equal(1); + expect(dump.callCount).to.be.equal(1); + }); + + it('does save to DB if all needsDump reports true', async () => { + const needsDump = Sinon.stub(GenericWrapperActions, 'needsDump').resolves(true); + const dumped = new Uint8Array([1, 2, 3]); + const dump = Sinon.stub(GenericWrapperActions, 'dump').resolves(dumped); + const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(sessionId); + + await LibSessionUtil.saveDumpsToDb(userDetails.x25519KeyPair.pubkeyHex); + expect(needsDump.callCount).to.be.equal(4); + expect(dump.callCount).to.be.equal(4); + expect(needsDump.getCalls().map(call => call.args)).to.be.deep.eq([ + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ]); + expect(saveConfigDump.callCount).to.be.equal(4); + + expect(saveConfigDump.getCalls().map(call => call.args)).to.be.deep.eq([ + [{ variant: 'UserConfig', publicKey: sessionId, data: dumped }], + [{ variant: 'ContactsConfig', publicKey: sessionId, data: dumped }], + [{ variant: 'UserGroupsConfig', publicKey: sessionId, data: dumped }], + [{ variant: 'ConvoInfoVolatileConfig', publicKey: sessionId, data: dumped }], + ]); + + expect(dump.getCalls().map(call => call.args)).to.be.deep.eq([ + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ]); + }); + }); +}); + +describe('LibSessionUtil pendingChangesForGroup', () => { + let groupPk: GroupPubkeyType; + beforeEach(() => { + groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + }); + + afterEach(() => { + Sinon.restore(); + }); + + it('empty results if needsPush is false', async () => { + Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(false); + const result = await LibSessionUtil.pendingChangesForGroup(groupPk); + expect(result.allOldHashes.size).to.be.equal(0); + expect(result.messages.length).to.be.equal(0); + }); + + it('valid results if needsPush is true', async () => { + const pushResults = { + groupKeys: { data: new Uint8Array([3, 2, 1]), namespace: 13 }, + groupInfo: { + seqno: 1, + data: new Uint8Array([1, 2, 3]), + hashes: ['123', '333'], + namespace: 12, + }, + groupMember: { + seqno: 2, + data: new Uint8Array([1, 2]), + hashes: ['321', '111'], + namespace: 14, + }, + }; + Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(true); + Sinon.stub(MetaGroupWrapperActions, 'push').resolves(pushResults); + Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(1234); + const result = await LibSessionUtil.pendingChangesForGroup(groupPk); + expect(result.allOldHashes.size).to.be.equal(4); + // check that all of the hashes are there + expect([...result.allOldHashes]).to.have.members([ + ...pushResults.groupInfo.hashes, + ...pushResults.groupMember.hashes, + ]); + + expect(result.messages.length).to.be.equal(3); + // check for the keys push content + expect(result.messages[0]).to.be.deep.eq({ + type: 'GroupKeys', + ciphertext: new Uint8Array([3, 2, 1]), + namespace: 13, + }); + // check for the info push content + expect(result.messages[1]).to.be.deep.eq({ + type: 'GroupInfo', + ciphertext: new Uint8Array([1, 2, 3]), + namespace: 12, + seqno: Long.fromInt(pushResults.groupInfo.seqno), + }); + // check for the members pusu content + expect(result.messages[2]).to.be.deep.eq({ + type: 'GroupMember', + ciphertext: new Uint8Array([1, 2]), + namespace: 14, + seqno: Long.fromInt(pushResults.groupMember.seqno), + }); + }); + + it('skips entry results if needsPush one of the wrapper has no changes', async () => { + const pushResults = { + groupInfo: { + seqno: 1, + data: new Uint8Array([1, 2, 3]), + hashes: ['123', '333'], + namespace: 12, + }, + groupMember: null, + groupKeys: { data: new Uint8Array([3, 2, 1]), namespace: 13 }, + }; + Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(true); + Sinon.stub(MetaGroupWrapperActions, 'push').resolves(pushResults); + const result = await LibSessionUtil.pendingChangesForGroup(groupPk); + expect(result.allOldHashes.size).to.be.equal(2); + expect(result.messages.length).to.be.equal(2); + }); +}); + +describe('LibSessionUtil pendingChangesForUser', () => { + beforeEach(async () => {}); + + afterEach(() => { + Sinon.restore(); + }); + + it('empty results if all needsPush is false', async () => { + Sinon.stub(GenericWrapperActions, 'needsPush').resolves(false); + const result = await LibSessionUtil.pendingChangesForUs(); + expect(result.allOldHashes.size).to.be.equal(0); + expect(result.messages.length).to.be.equal(0); + }); + + it('valid results if ConvoVolatile needsPush only is true', async () => { + // this is what would be supposedly returned by libsession + const pushResultsConvo = { + data: randombytes_buf(300), + seqno: 123, + hashes: ['123'], + namespace: SnodeNamespaces.ConvoInfoVolatile, + }; + const needsPush = Sinon.stub(GenericWrapperActions, 'needsPush'); + needsPush.resolves(false).withArgs('ConvoInfoVolatileConfig').resolves(true); + + const push = Sinon.stub(GenericWrapperActions, 'push') + .throws() + .withArgs('ConvoInfoVolatileConfig') + .resolves(pushResultsConvo); + + Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(1234); + const result = await LibSessionUtil.pendingChangesForUs(); + expect(needsPush.callCount).to.be.eq(4); + expect(needsPush.getCalls().map(m => m.args)).to.be.deep.eq([ + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ]); + + expect(push.callCount).to.be.eq(1); + expect(push.getCalls().map(m => m.args)).to.be.deep.eq([['ConvoInfoVolatileConfig']]); + + // check that all of the hashes are there + expect(result.allOldHashes.size).to.be.equal(1); + expect([...result.allOldHashes]).to.have.members([...pushResultsConvo.hashes]); + + // check for the messages to push are what we expect + expect(result.messages).to.be.deep.eq([ + { + ciphertext: pushResultsConvo.data, + namespace: pushResultsConvo.namespace, + seqno: Long.fromNumber(pushResultsConvo.seqno), + }, + ]); + }); + + it('valid results if all wrappers needsPush only are true', async () => { + // this is what would be supposedly returned by libsession + const pushConvo = { + data: randombytes_buf(300), + seqno: 123, + hashes: ['123'], + namespace: SnodeNamespaces.ConvoInfoVolatile, + }; + const pushContacts = { + data: randombytes_buf(300), + seqno: 321, + hashes: ['321', '4444'], + namespace: SnodeNamespaces.UserContacts, + }; + const pushGroups = { + data: randombytes_buf(300), + seqno: 222, + hashes: ['222', '5555'], + namespace: SnodeNamespaces.UserGroups, + }; + const pushUser = { + data: randombytes_buf(300), + seqno: 111, + hashes: ['111'], + namespace: SnodeNamespaces.UserProfile, + }; + const needsPush = Sinon.stub(GenericWrapperActions, 'needsPush'); + needsPush.resolves(true); + + const push = Sinon.stub(GenericWrapperActions, 'push'); + push + .throws() + .withArgs('ContactsConfig') + .resolves(pushContacts) + .withArgs('UserConfig') + .resolves(pushUser) + .withArgs('UserGroupsConfig') + .resolves(pushGroups) + .withArgs('ConvoInfoVolatileConfig') + .resolves(pushConvo); + + Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(1234); + const result = await LibSessionUtil.pendingChangesForUs(); + expect(needsPush.callCount).to.be.eq(4); + expect(needsPush.getCalls().map(m => m.args)).to.be.deep.eq([ + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ]); + + expect(push.callCount).to.be.eq(4); + expect(push.getCalls().map(m => m.args)).to.be.deep.eq([ + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ]); + + // check that all of the hashes are there + expect(result.allOldHashes.size).to.be.equal(6); + expect([...result.allOldHashes]).to.have.members([ + ...pushContacts.hashes, + ...pushConvo.hashes, + ...pushGroups.hashes, + ...pushUser.hashes, + ]); + + // check for the messages to push are what we expect + expect(result.messages).to.be.deep.eq( + [pushUser, pushContacts, pushGroups, pushConvo].map(m => ({ + ciphertext: m.data, + namespace: m.namespace, + seqno: Long.fromNumber(m.seqno), + })) + ); + }); +}); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 6c96d228c3..950cf63e17 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -3,7 +3,6 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { omit } from 'lodash'; import Long from 'long'; import Sinon from 'sinon'; -import { ConfigDumpData } from '../../../../../../data/configDump/configDump'; import { getSodiumNode } from '../../../../../../node/sodiumNode'; import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../../../../../../session/apis/snode_api/getNetworkTime'; @@ -53,132 +52,6 @@ function validKeys(sodium: LibSodiumWrappers) { } as const; } -describe('GroupSyncJob saveDumpsToDb', () => { - let groupPk: GroupPubkeyType; - - beforeEach(async () => {}); - beforeEach(() => { - groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); - }); - - afterEach(() => { - Sinon.restore(); - }); - - it('does not save to DB if needsDump reports false', async () => { - Sinon.stub(MetaGroupWrapperActions, 'needsDump').resolves(false); - const metaDump = Sinon.stub(MetaGroupWrapperActions, 'metaDump').resolves(new Uint8Array()); - const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); - await LibSessionUtil.saveDumpsToDb(groupPk); - expect(saveConfigDump.callCount).to.be.equal(0); - expect(metaDump.callCount).to.be.equal(0); - }); - - it('does save to DB if needsDump reports true', async () => { - Sinon.stub(MetaGroupWrapperActions, 'needsDump').resolves(true); - const dump = [1, 2, 3, 4, 5]; - const metaDump = Sinon.stub(MetaGroupWrapperActions, 'metaDump').resolves(new Uint8Array(dump)); - const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); - await LibSessionUtil.saveDumpsToDb(groupPk); - expect(saveConfigDump.callCount).to.be.equal(1); - expect(metaDump.callCount).to.be.equal(1); - expect(metaDump.firstCall.args).to.be.deep.eq([groupPk]); - expect(saveConfigDump.firstCall.args).to.be.deep.eq([ - { - publicKey: groupPk, - variant: `MetaGroupConfig-${groupPk}`, - data: new Uint8Array(dump), - }, - ]); - }); -}); - -describe('GroupSyncJob pendingChangesForGroup', () => { - let groupPk: GroupPubkeyType; - beforeEach(() => { - groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); - }); - - afterEach(() => { - Sinon.restore(); - }); - - it('empty results if needsPush is false', async () => { - Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(false); - const result = await LibSessionUtil.pendingChangesForGroup(groupPk); - expect(result.allOldHashes.size).to.be.equal(0); - expect(result.messages.length).to.be.equal(0); - }); - - it('valid results if needsPush is true', async () => { - const pushResults = { - groupKeys: { data: new Uint8Array([3, 2, 1]), namespace: 13 }, - groupInfo: { - seqno: 1, - data: new Uint8Array([1, 2, 3]), - hashes: ['123', '333'], - namespace: 12, - }, - groupMember: { - seqno: 2, - data: new Uint8Array([1, 2]), - hashes: ['321', '111'], - namespace: 14, - }, - }; - Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(true); - Sinon.stub(MetaGroupWrapperActions, 'push').resolves(pushResults); - Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(1234); - const result = await LibSessionUtil.pendingChangesForGroup(groupPk); - expect(result.allOldHashes.size).to.be.equal(4); - // check that all of the hashes are there - expect([...result.allOldHashes]).to.have.members([ - ...pushResults.groupInfo.hashes, - ...pushResults.groupMember.hashes, - ]); - - expect(result.messages.length).to.be.equal(3); - // check for the keys push content - expect(result.messages[0]).to.be.deep.eq({ - type: 'GroupKeys', - ciphertext: new Uint8Array([3, 2, 1]), - namespace: 13, - }); - // check for the info push content - expect(result.messages[1]).to.be.deep.eq({ - type: 'GroupInfo', - ciphertext: new Uint8Array([1, 2, 3]), - namespace: 12, - seqno: Long.fromInt(pushResults.groupInfo.seqno), - }); - // check for the members pusu content - expect(result.messages[2]).to.be.deep.eq({ - type: 'GroupMember', - ciphertext: new Uint8Array([1, 2]), - namespace: 14, - seqno: Long.fromInt(pushResults.groupMember.seqno), - }); - }); - - it('skips entry results if needsPush one of the wrapper has no changes', async () => { - const pushResults = { - groupInfo: { - seqno: 1, - data: new Uint8Array([1, 2, 3]), - hashes: ['123', '333'], - namespace: 12, - }, - groupMember: null, - groupKeys: { data: new Uint8Array([3, 2, 1]), namespace: 13 }, - }; - Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(true); - Sinon.stub(MetaGroupWrapperActions, 'push').resolves(pushResults); - const result = await LibSessionUtil.pendingChangesForGroup(groupPk); - expect(result.allOldHashes.size).to.be.equal(2); - expect(result.messages.length).to.be.equal(2); - }); -}); - describe('GroupSyncJob run()', () => { afterEach(() => { Sinon.restore(); diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index aa178a9629..5870a124c9 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -1,5 +1,5 @@ import * as crypto from 'crypto'; -import { GroupPubkeyType, UserGroupsWrapperNode } from 'libsession_util_nodejs'; +import { GroupPubkeyType, PubkeyType, UserGroupsWrapperNode } from 'libsession_util_nodejs'; import { KeyPair, to_hex } from 'libsodium-wrappers-sumo'; import _ from 'lodash'; import { Snode } from '../../../data/data'; @@ -28,7 +28,7 @@ export function generateFakePubKeyStr(): string { export type TestUserKeyPairs = { x25519KeyPair: { - pubkeyHex: string; + pubkeyHex: PubkeyType; pubKey: Uint8Array; privKey: Uint8Array; }; @@ -51,7 +51,7 @@ export async function generateUserKeyPairs(): Promise { // prepend with 05 the public key const userKeys = { x25519KeyPair: { - pubkeyHex: to_hex(prependedX25519PublicKey), + pubkeyHex: to_hex(prependedX25519PublicKey) as PubkeyType, pubKey: prependedX25519PublicKey, privKey: x25519SecretKey, }, From 9492fdc51e1e62b1f6fb13f64e685904e125da90 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 12 Oct 2023 13:10:17 +1100 Subject: [PATCH 038/302] fix: first working test ios to desktop still have some tests to fix --- ts/receiver/contentMessage.ts | 34 +- ts/receiver/receiver.ts | 18 +- ts/session/apis/snode_api/swarmPolling.ts | 82 +++- ts/session/sending/MessageSender.ts | 53 ++- .../utils/job_runners/jobs/UserSyncJob.ts | 11 +- .../libsession_util/libsession_utils_test.ts | 2 +- .../group_sync_job/GroupSyncJob_test.ts | 3 +- .../user_sync_job/UserSyncJob_test.ts | 367 ++++++++++++++++++ 8 files changed, 505 insertions(+), 65 deletions(-) create mode 100644 ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index bdee814bad..1642e17ece 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -30,14 +30,10 @@ import { assertUnreachable } from '../types/sqlSharedTypes'; import { BlockedNumberController } from '../util'; import { ReadReceipts } from '../util/readReceipts'; import { Storage } from '../util/storage'; +import { ContactsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; import { handleCallMessage } from './callMessage'; import { getAllCachedECKeyPair, sentAtMoreRecentThanWrapper } from './closedGroups'; import { ECKeyPair } from './keypairs'; -import { - ContactsWrapperActions, - MetaGroupWrapperActions, -} from '../webworker/workers/browser/libsession_worker_interface'; -import { PreConditionFailed } from '../session/utils/errors'; export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageHash: string) { try { @@ -58,27 +54,6 @@ export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageH } } -async function decryptForGroupV2(envelope: EnvelopePlus) { - window?.log?.info('received closed group message v2'); - try { - const groupPk = envelope.source; - if (!PubKey.isClosedGroupV2(groupPk)) { - throw new PreConditionFailed('decryptForGroupV2: not a 03 prefixed group'); - } - - const decrypted = await MetaGroupWrapperActions.decryptMessage(groupPk, envelope.content); - - // the receiving pipeline relies on the envelope.senderIdentity field to know who is the author of a message - // eslint-disable-next-line no-param-reassign - envelope.senderIdentity = decrypted.pubkeyHex; - - return decrypted.plaintext; - } catch (e) { - window.log.warn('failed to decrypt message with error: ', e.message); - return null; - } -} - async function decryptForClosedGroup(envelope: EnvelopePlus) { window?.log?.info('received closed group message'); try { @@ -291,10 +266,11 @@ async function decrypt(envelope: EnvelopePlus): Promise { break; case SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE: if (PubKey.isClosedGroupV2(envelope.source)) { - plaintext = await decryptForGroupV2(envelope); - } else { - plaintext = await decryptForClosedGroup(envelope); + // groupv2 messages are decrypted way earlier than this via libsession, and what we get here is already decrypted + return envelope.content; } + plaintext = await decryptForClosedGroup(envelope); + break; default: assertUnreachable(envelope.type, `Unknown message type:${envelope.type}`); diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts index 15938d25e7..48f10bedd3 100644 --- a/ts/receiver/receiver.ts +++ b/ts/receiver/receiver.ts @@ -1,6 +1,6 @@ /* eslint-disable more/no-then */ +import _, { isEmpty, last } from 'lodash'; import { v4 as uuidv4 } from 'uuid'; -import _ from 'lodash'; import { EnvelopePlus } from './types'; @@ -70,18 +70,22 @@ function queueSwarmEnvelope(envelope: EnvelopePlus, messageHash: string) { } } +function contentIsEnvelope(content: Uint8Array | EnvelopePlus): content is EnvelopePlus { + return !isEmpty((content as EnvelopePlus).content); +} + async function handleRequestDetail( - plaintext: Uint8Array, + data: Uint8Array | EnvelopePlus, inConversation: string | null, lastPromise: Promise, messageHash: string ): Promise { - const envelope: any = SignalService.Envelope.decode(plaintext); + const envelope: any = contentIsEnvelope(data) ? data : SignalService.Envelope.decode(data); // After this point, decoding errors are not the server's // fault, and we should handle them gracefully and tell the // user they received an invalid message - // The message is for a medium size group + // The message is for a group if (inConversation) { const ourNumber = UserUtils.getOurPubKeyStrFromCache(); const senderIdentity = envelope.source; @@ -95,7 +99,7 @@ async function handleRequestDetail( envelope.source = inConversation; // eslint-disable-next-line no-param-reassign - plaintext = SignalService.Envelope.encode(envelope).finish(); + data = SignalService.Envelope.encode(envelope).finish(); envelope.senderIdentity = senderIdentity; } @@ -109,7 +113,7 @@ async function handleRequestDetail( // need to handle senderIdentity separately)... perfStart(`addToCache-${envelope.id}`); - await addToCache(envelope, plaintext, messageHash); + await addToCache(envelope, contentIsEnvelope(data) ? data.content : data, messageHash); perfEnd(`addToCache-${envelope.id}`, 'addToCache'); // To ensure that we queue in the same order we receive messages @@ -133,7 +137,7 @@ export function handleRequest( inConversation: string | null, messageHash: string ): void { - const lastPromise = _.last(incomingMessagePromises) || Promise.resolve(); + const lastPromise = last(incomingMessagePromises) || Promise.resolve(); const promise = handleRequestDetail(plaintext, inConversation, lastPromise, messageHash).catch( e => { diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 45d09d0fcf..a96347d4b2 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -3,6 +3,7 @@ /* eslint-disable @typescript-eslint/no-misused-promises */ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { compact, concat, difference, flatten, isArray, last, sample, uniqBy } from 'lodash'; +import { v4 } from 'uuid'; import { Data, Snode } from '../../../data/data'; import { SignalService } from '../../../protobuf'; import * as Receiver from '../../../receiver/receiver'; @@ -12,6 +13,8 @@ import * as snodePool from './snodePool'; import { ConversationModel } from '../../../models/conversation'; import { ConversationTypeEnum } from '../../../models/conversationAttributes'; +import { signalservice } from '../../../protobuf/compiled'; +import { EnvelopePlus } from '../../../receiver/types'; import { updateIsOnline } from '../../../state/ducks/onion'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { @@ -24,6 +27,7 @@ import { ConvoHub } from '../../conversations'; import { ed25519Str } from '../../onions/onionPath'; import { StringUtils, UserUtils } from '../../utils'; import { perfEnd, perfStart } from '../../utils/Performance'; +import { PreConditionFailed } from '../../utils/errors'; import { LibSessionUtil } from '../../utils/libsession/libsession_utils'; import { SnodeNamespace, SnodeNamespaces, UserConfigNamespaces } from './namespaces'; import { PollForGroup, PollForLegacy, PollForUs } from './pollingTypes'; @@ -37,13 +41,7 @@ import { RetrieveRequestResult, } from './types'; -export function extractWebSocketContent( - message: string, - messageHash: string -): null | { - body: Uint8Array; - messageHash: string; -} { +export function extractWebSocketContent(message: string): null | Uint8Array { try { const dataPlaintext = new Uint8Array(StringUtils.encode(message, 'base64')); const messageBuf = SignalService.WebSocketMessage.decode(dataPlaintext); @@ -51,11 +49,9 @@ export function extractWebSocketContent( messageBuf.type === SignalService.WebSocketMessage.Type.REQUEST && messageBuf.request?.body?.length ) { - return { - body: messageBuf.request.body, - messageHash, - }; + return messageBuf.request.body; } + return null; } catch (error) { window?.log?.warn('extractWebSocketContent from message failed with:', error.message); @@ -374,21 +370,38 @@ export class SwarmPolling { perfStart(`handleSeenMessages-${pubkey}`); const newMessages = await this.handleSeenMessages(uniqOtherMsgs); perfEnd(`handleSeenMessages-${pubkey}`, 'handleSeenMessages'); + if (type === ConversationTypeEnum.GROUPV3) { + for (let index = 0; index < newMessages.length; index++) { + const msg = newMessages[index]; + const retrieveResult = new Uint8Array(StringUtils.encode(msg.data, 'base64')); + try { + const envelopePlus = await decryptForGroupV2({ + content: retrieveResult, + groupPk: pubkey, + sentTimestamp: msg.timestamp, + }); + if (!envelopePlus) { + throw new Error('decryptForGroupV2 returned empty envelope'); + } + + // this is the processing of the message itself, which can be long. + Receiver.handleRequest(envelopePlus.content, envelopePlus.source, msg.hash); + } catch (e) { + window.log.warn('failed to handle groupv2 otherMessage because of: ', e.message); + } + } + return; + } // trigger the handling of all the other messages, not shared config related newMessages.forEach(m => { - const content = extractWebSocketContent(m.data, m.hash); + const content = extractWebSocketContent(m.data); + if (!content) { return; } - Receiver.handleRequest( - content.body, - type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV3 - ? pubkey - : null, - content.messageHash - ); + Receiver.handleRequest(content, type === ConversationTypeEnum.GROUP ? pubkey : null, m.hash); }); } @@ -721,3 +734,34 @@ function filterMessagesPerTypeOfConvo( return { confMessages: null, otherMessages: [] }; } } + +async function decryptForGroupV2(retrieveResult: { + groupPk: string; + content: Uint8Array; + sentTimestamp: number; +}): Promise { + window?.log?.info('received closed group message v2'); + try { + const groupPk = retrieveResult.groupPk; + if (!PubKey.isClosedGroupV2(groupPk)) { + throw new PreConditionFailed('decryptForGroupV2: not a 03 prefixed group'); + } + + const decrypted = await MetaGroupWrapperActions.decryptMessage(groupPk, retrieveResult.content); + const envelopePlus: EnvelopePlus = { + id: v4(), + senderIdentity: decrypted.pubkeyHex, + receivedAt: Date.now(), + content: decrypted.plaintext, + source: groupPk, + type: signalservice.Envelope.Type.CLOSED_GROUP_MESSAGE, + timestamp: retrieveResult.sentTimestamp, + }; + // the receiving pipeline relies on the envelope.senderIdentity field to know who is the author of a message + + return envelopePlus; + } catch (e) { + window.log.warn('failed to decrypt message with error: ', e.message); + return null; + } +} diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index d85f1d8b2d..c6dc63e840 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -307,6 +307,50 @@ type EncryptAndWrapMessageResults = { namespace: number; } & SharedEncryptAndWrap; +async function encryptForGroupV2( + params: EncryptAndWrapMessage +): Promise { + // Group v2 encryption works a bit differently: we encrypt the envelope itself through libsession. + // We essentially need to do the opposite of the usual encryption which is send envelope unencrypted with content encrypted. + const { + destination, + identifier, + isSyncMessage: syncMessage, + namespace, + plainTextBuffer, + ttl, + } = params; + + const { overRiddenTimestampBuffer, networkTimestamp } = + overwriteOutgoingTimestampWithNetworkTimestamp({ plainTextBuffer }); + const envelope = await buildEnvelope( + SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, + destination, + networkTimestamp, + overRiddenTimestampBuffer + ); + + const recipient = PubKey.cast(destination); + + const { cipherText } = await MessageEncrypter.encrypt( + recipient, + SignalService.Envelope.encode(envelope).finish(), + encryptionBasedOnConversation(recipient) + ); + + const data64 = ByteBuffer.wrap(cipherText).toString('base64'); + + return { + data64, + networkTimestamp, + data: cipherText, + namespace, + ttl, + identifier, + isSyncMessage: syncMessage, + }; +} + async function encryptMessageAndWrap( params: EncryptAndWrapMessage ): Promise { @@ -319,6 +363,10 @@ async function encryptMessageAndWrap( ttl, } = params; + if (PubKey.isClosedGroupV2(destination)) { + return encryptForGroupV2(params); + } + const { overRiddenTimestampBuffer, networkTimestamp } = overwriteOutgoingTimestampWithNetworkTimestamp({ plainTextBuffer }); const recipient = PubKey.cast(destination); @@ -330,8 +378,7 @@ async function encryptMessageAndWrap( ); const envelope = await buildEnvelope(envelopeType, recipient.key, networkTimestamp, cipherText); - - const data = wrapEnvelope(envelope); + const data = wrapEnvelopeInWebSocketMessage(envelope); const data64 = ByteBuffer.wrap(data).toString('base64'); return { @@ -423,7 +470,7 @@ async function buildEnvelope( * This is an outdated practice and we should probably just send the envelope data directly. * Something to think about in the future. */ -function wrapEnvelope(envelope: SignalService.Envelope): Uint8Array { +function wrapEnvelopeInWebSocketMessage(envelope: SignalService.Envelope): Uint8Array { const request = SignalService.WebSocketRequestMessage.create({ id: 0, body: SignalService.Envelope.encode(envelope).finish(), diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index bbb5ff64f5..3c04d93a10 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -1,6 +1,6 @@ /* eslint-disable no-await-in-loop */ import { PubkeyType } from 'libsession_util_nodejs'; -import { isArray, isEmpty, isNumber } from 'lodash'; +import { isArray, isEmpty, isNumber, isString } from 'lodash'; import { v4 } from 'uuid'; import { UserUtils } from '../..'; import { ConfigDumpData } from '../../../../data/configDump/configDump'; @@ -17,9 +17,9 @@ import { LibSessionUtil, UserSuccessfulChange } from '../../libsession/libsessio import { runners } from '../JobRunner'; import { AddJobCheckReturn, - UserSyncPersistedData, PersistedJob, RunJobResult, + UserSyncPersistedData, } from '../PersistedJob'; const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s) @@ -61,8 +61,8 @@ function triggerConfSyncJobDone() { window.Whisper.events.trigger(UserSyncJobDone); } -function isPubkey(us: string): us is PubkeyType { - return us.startsWith('05'); +function isPubkey(us: unknown): us is PubkeyType { + return isString(us) && us.startsWith('05'); } async function pushChangesToUserSwarmIfNeeded() { @@ -153,7 +153,7 @@ class UserSyncJob extends PersistedJob { return RunJobResult.PermanentFailure; } - return await pushChangesToUserSwarmIfNeeded(); + return await UserSync.pushChangesToUserSwarmIfNeeded(); // eslint-disable-next-line no-useless-catch } catch (e) { throw e; @@ -228,5 +228,6 @@ async function queueNewJobIfNeeded() { export const UserSync = { UserSyncJob, + pushChangesToUserSwarmIfNeeded, queueNewJobIfNeeded: () => allowOnlyOneAtATime('UserSyncJob-oneAtAtTime', queueNewJobIfNeeded), }; diff --git a/ts/test/session/unit/libsession_util/libsession_utils_test.ts b/ts/test/session/unit/libsession_util/libsession_utils_test.ts index 8879d1ceab..cfa5254dba 100644 --- a/ts/test/session/unit/libsession_util/libsession_utils_test.ts +++ b/ts/test/session/unit/libsession_util/libsession_utils_test.ts @@ -215,7 +215,7 @@ describe('LibSessionUtil pendingChangesForGroup', () => { }); }); -describe('LibSessionUtil pendingChangesForUser', () => { +describe('LibSessionUtil pendingChangesForUs', () => { beforeEach(async () => {}); afterEach(() => { diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 950cf63e17..686368cde2 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -281,6 +281,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); it('calls sendEncryptedDataToSnode with the right data and retry if network returned nothing', async () => { + throw null; // this test might not be right const info = validInfo(sodium); const member = validMembers(sodium); const networkTimestamp = 4444; @@ -300,7 +301,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { expect(saveDumpsToDbStub.firstCall.args).to.be.deep.eq([groupPk]); function expected(details: any) { - console.warn('details', details); return { namespace: details.namespace, data: details.ciphertext, @@ -320,6 +320,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); it('calls sendEncryptedDataToSnode with the right data (and keys) and retry if network returned nothing', async () => { + throw null; // this test might not be right const info = validInfo(sodium); const member = validMembers(sodium); const keys = validKeys(sodium); diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts new file mode 100644 index 0000000000..bac7105d5e --- /dev/null +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -0,0 +1,367 @@ +import { expect } from 'chai'; +import { PubkeyType } from 'libsession_util_nodejs'; +import { omit } from 'lodash'; +import Long from 'long'; +import Sinon from 'sinon'; +import { getSodiumNode } from '../../../../../../node/sodiumNode'; +import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/SnodeRequestTypes'; +import { GetNetworkTime } from '../../../../../../session/apis/snode_api/getNetworkTime'; +import { + SnodeNamespaces, + UserConfigNamespaces, +} from '../../../../../../session/apis/snode_api/namespaces'; +import { TTL_DEFAULT } from '../../../../../../session/constants'; +import { ConvoHub } from '../../../../../../session/conversations'; +import { LibSodiumWrappers } from '../../../../../../session/crypto'; +import { MessageSender } from '../../../../../../session/sending'; +import { UserUtils } from '../../../../../../session/utils'; +import { RunJobResult } from '../../../../../../session/utils/job_runners/PersistedJob'; +import { UserSync } from '../../../../../../session/utils/job_runners/jobs/UserSyncJob'; +import { + LibSessionUtil, + PendingChangesForUs, + UserDestinationChanges, + UserSuccessfulChange, +} from '../../../../../../session/utils/libsession/libsession_utils'; +import { GenericWrapperActions } from '../../../../../../webworker/workers/browser/libsession_worker_interface'; +import { TestUtils } from '../../../../../test-utils'; +import { TypedStub, stubConfigDumpData } from '../../../../../test-utils/utils'; + +function userChange( + sodium: LibSodiumWrappers, + namespace: UserConfigNamespaces, + seqno: number +): PendingChangesForUs { + return { + ciphertext: sodium.randombytes_buf(120), + namespace, + seqno: Long.fromNumber(seqno), + }; +} + +describe('UserSyncJob run()', () => { + afterEach(() => { + Sinon.restore(); + }); + it('throws if no user keys', async () => { + const job = new UserSync.UserSyncJob({}); + + const func = async () => job.run(); + await expect(func()).to.be.eventually.rejected; + }); + + it('throws if our pubkey is set but not valid', async () => { + const job = new UserSync.UserSyncJob({}); + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns({ something: false } as any); + Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves({ something: true } as any); + Sinon.stub(ConvoHub.use(), 'get').resolves({}); // anything not falsy + + const func = async () => job.run(); + await expect(func()).to.be.eventually.rejected; + }); + + it('permanent failure if user has no ed keypair', async () => { + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(TestUtils.generateFakePubKeyStr()); + Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves(undefined); + Sinon.stub(ConvoHub.use(), 'get').resolves({}); // anything not falsy + const job = new UserSync.UserSyncJob({}); + const result = await job.run(); + expect(result).to.be.eq(RunJobResult.PermanentFailure); + }); + + it('permanent failure if user has no own conversation', async () => { + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(TestUtils.generateFakePubKeyStr()); + Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves({} as any); // anything not falsy + Sinon.stub(ConvoHub.use(), 'get').returns(undefined as any); + const job = new UserSync.UserSyncJob({}); + const result = await job.run(); + expect(result).to.be.eq(RunJobResult.PermanentFailure); + }); + + it('calls pushChangesToUserSwarmIfNeeded if preconditions are fine', async () => { + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(TestUtils.generateFakePubKeyStr()); + Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves({} as any); // anything not falsy + const taskedRun = Sinon.stub(UserSync, 'pushChangesToUserSwarmIfNeeded').resolves( + RunJobResult.Success + ); + Sinon.stub(ConvoHub.use(), 'get').returns({} as any); // anything not falsy + const job = new UserSync.UserSyncJob({}); + const result = await job.run(); + expect(result).to.be.eq(RunJobResult.Success); + expect(taskedRun.callCount).to.be.eq(1); + }); +}); + +describe('UserSyncJob resultsToSuccessfulChange', () => { + let sodium: LibSodiumWrappers; + beforeEach(async () => { + sodium = await getSodiumNode(); + }); + it('no or empty results return empty array', () => { + expect( + LibSessionUtil.batchResultsToUserSuccessfulChange(null, { + allOldHashes: new Set(), + messages: [], + }) + ).to.be.deep.eq([]); + + expect( + LibSessionUtil.batchResultsToUserSuccessfulChange([] as any as NotEmptyArrayOfBatchResults, { + allOldHashes: new Set(), + messages: [], + }) + ).to.be.deep.eq([]); + }); + + it('extract one result with 200 and messagehash', () => { + const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); + const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); + const batchResults: NotEmptyArrayOfBatchResults = [{ code: 200, body: { hash: 'hash1' } }]; + const request: UserDestinationChanges = { + allOldHashes: new Set(), + messages: [profile, contact], + }; + const results = LibSessionUtil.batchResultsToUserSuccessfulChange(batchResults, request); + expect(results).to.be.deep.eq([ + { + updatedHash: 'hash1', + pushed: profile, + }, + ]); + }); + + it('extract two results with 200 and messagehash', () => { + const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); + const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); + const batchResults: NotEmptyArrayOfBatchResults = [ + { code: 200, body: { hash: 'hash1' } }, + { code: 200, body: { hash: 'hash2' } }, + ]; + const request: UserDestinationChanges = { + allOldHashes: new Set(), + messages: [contact, profile], + }; + const results = LibSessionUtil.batchResultsToUserSuccessfulChange(batchResults, request); + expect(results).to.be.deep.eq([ + { + updatedHash: 'hash1', + pushed: contact, + }, + { + updatedHash: 'hash2', + pushed: profile, + }, + ]); + }); + + it('skip message hashes not a string', () => { + const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); + const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); + const batchResults: NotEmptyArrayOfBatchResults = [ + { code: 200, body: { hash: 123 as any as string } }, + { code: 200, body: { hash: 'hash2' } }, + ]; + const request: UserDestinationChanges = { + allOldHashes: new Set(), + messages: [profile, contact], + }; + const results = LibSessionUtil.batchResultsToUserSuccessfulChange(batchResults, request); + expect(results).to.be.deep.eq([ + { + updatedHash: 'hash2', + pushed: contact, + }, + ]); + }); + + it('skip request item without data', () => { + const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); + const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); + const profileNoData = omit(profile, 'ciphertext'); + const batchResults: NotEmptyArrayOfBatchResults = [ + { code: 200, body: { hash: 'hash1' } }, + { code: 200, body: { hash: 'hash2' } }, + ]; + const request: UserDestinationChanges = { + allOldHashes: new Set(), + messages: [profileNoData as any as PendingChangesForUs, contact], + }; + const results = LibSessionUtil.batchResultsToUserSuccessfulChange(batchResults, request); + expect(results).to.be.deep.eq([ + { + updatedHash: 'hash2', + pushed: contact, + }, + ]); + }); + + it('skip request item without 200 code', () => { + const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); + const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); + const batchResults: NotEmptyArrayOfBatchResults = [ + { code: 200, body: { hash: 'hash1' } }, + { code: 401, body: { hash: 'hash2' } }, + ]; + const request: UserDestinationChanges = { + allOldHashes: new Set(), + messages: [profile, contact], + }; + const results = LibSessionUtil.batchResultsToUserSuccessfulChange(batchResults, request); + expect(results).to.be.deep.eq([ + { + updatedHash: 'hash1', + pushed: profile, + }, + ]); + + // another test swapping the results + batchResults[0].code = 401; + batchResults[1].code = 200; + const results2 = LibSessionUtil.batchResultsToUserSuccessfulChange(batchResults, request); + expect(results2).to.be.deep.eq([ + { + updatedHash: 'hash2', + pushed: contact, + }, + ]); + }); +}); + +describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { + let sessionId: PubkeyType; + let userkeys: TestUtils.TestUserKeyPairs; + let sodium: LibSodiumWrappers; + + let sendStub: TypedStub; + let pendingChangesForUsStub: TypedStub; + let dump: TypedStub; + + beforeEach(async () => { + sodium = await getSodiumNode(); + userkeys = await TestUtils.generateUserKeyPairs(); + sessionId = userkeys.x25519KeyPair.pubkeyHex; + + Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(userkeys.x25519KeyPair.pubkeyHex); + Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves(userkeys.ed25519KeyPair); + + window.Whisper = {}; + window.Whisper.events = {}; + window.Whisper.events.trigger = Sinon.mock(); + stubConfigDumpData('saveConfigDump').resolves(); + + pendingChangesForUsStub = Sinon.stub(LibSessionUtil, 'pendingChangesForUs'); + dump = Sinon.stub(GenericWrapperActions, 'dump').resolves(new Uint8Array()); + sendStub = Sinon.stub(MessageSender, 'sendEncryptedDataToSnode'); + }); + afterEach(() => { + Sinon.restore(); + }); + + it('call savesDumpToDb even if no changes are required on the serverside', async () => { + Sinon.stub(GenericWrapperActions, 'needsDump').resolves(true); + const result = await UserSync.pushChangesToUserSwarmIfNeeded(); + + pendingChangesForUsStub.resolves(undefined); + expect(result).to.be.eq(RunJobResult.Success); + expect(sendStub.callCount).to.be.eq(0); + expect(pendingChangesForUsStub.callCount).to.be.eq(1); + expect(dump.callCount).to.be.eq(4); + expect(dump.getCalls().map(m => m.args)).to.be.deep.eq([ + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ]); + }); + + it('calls sendEncryptedDataToSnode with the right data x2 and retry if network returned nothing', async () => { + Sinon.stub(GenericWrapperActions, 'needsDump').resolves(false); + + const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); + const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); + const networkTimestamp = 4444; + const ttl = TTL_DEFAULT.TTL_CONFIG; + Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(networkTimestamp); + pendingChangesForUsStub.resolves({ + messages: [profile, contact], + allOldHashes: new Set('123'), + }); + const result = await UserSync.pushChangesToUserSwarmIfNeeded(); + + sendStub.resolves(undefined); + expect(result).to.be.eq(RunJobResult.RetryJobIfPossible); // not returning anything in the sendstub so network issue happened + expect(sendStub.callCount).to.be.eq(1); + expect(pendingChangesForUsStub.callCount).to.be.eq(1); + expect(dump.callCount).to.be.eq(0); + + function expected(details: any) { + return { + namespace: details.namespace, + data: details.ciphertext, + ttl, + networkTimestamp, + pubkey: sessionId, + }; + } + throw null; // + // this test is not right. check for dump logic and make sure this matches + + const expectedProfile = expected(profile); + const expectedContact = expected(contact); + expect(sendStub.firstCall.args).to.be.deep.eq([ + [expectedProfile, expectedContact], + sessionId, + new Set('123'), + ]); + }); + + it('calls sendEncryptedDataToSnode with the right data x3 and retry if network returned nothing then success', async () => { + const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); + const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); + const groups = userChange(sodium, SnodeNamespaces.UserGroups, 111); + + throw null; // + // this test is not right. check for dump logic and make sure this matches + pendingChangesForUsStub.resolves({ + messages: [profile, contact, groups], + allOldHashes: new Set('123'), + }); + const changes: Array = [ + { + pushed: profile, + updatedHash: 'hashprofile', + }, + { + pushed: contact, + updatedHash: 'hashcontact', + }, + { + pushed: groups, + updatedHash: 'hashgroup', + }, + ]; + Sinon.stub(LibSessionUtil, 'batchResultsToUserSuccessfulChange').returns(changes); + const confirmPushed = Sinon.stub(GenericWrapperActions, 'confirmPushed').resolves(); + + const needsDump = Sinon.stub(GenericWrapperActions, 'needsDump').resolves(); + + sendStub.resolves([ + { code: 200, body: { hash: 'hashprofile' } }, + { code: 200, body: { hash: 'hashcontact' } }, + { code: 200, body: { hash: 'hashgroup' } }, + { code: 200, body: {} }, // because we are giving a set of allOldHashes + ]); + const result = await UserSync.pushChangesToUserSwarmIfNeeded(); + + expect(sendStub.callCount).to.be.eq(1); + expect(pendingChangesForUsStub.callCount).to.be.eq(1); + expect(dump.callCount).to.be.eq(2); + expect(dump.firstCall.args).to.be.deep.eq([sessionId]); + expect(needsDump.callCount).to.be.eq(4); + expect(needsDump.getCalls().map(m => m.args)).to.be.deep.eq([[sessionId, []]]); + + expect(confirmPushed.callCount).to.be.eq(4); + expect(confirmPushed.getCalls().map(m => m.args)).to.be.deep.eq([[sessionId, [123, 'hash1']]]); + expect(result).to.be.eq(RunJobResult.Success); + }); +}); From ae67215a7e011a7acd4ea5e97e2d43e4b73f4601 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 12 Oct 2023 17:15:52 +1100 Subject: [PATCH 039/302] test: finished tests for userSyncJob --- ts/session/apis/snode_api/namespaces.ts | 4 +- .../utils/job_runners/jobs/UserSyncJob.ts | 5 ++ ts/state/ducks/groups.ts | 6 +- .../session/unit/onion/SnodeNamespace_test.ts | 38 ++++---- .../group_sync_job/GroupSyncJob_test.ts | 21 ++--- .../user_sync_job/UserSyncJob_test.ts | 89 ++++++++++++++++--- 6 files changed, 114 insertions(+), 49 deletions(-) diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index 40f6ccb67f..274ffd46ca 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -1,6 +1,6 @@ import { last, orderBy } from 'lodash'; -import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { PickEnum } from '../../../types/Enums'; +import { assertUnreachable } from '../../../types/sqlSharedTypes'; export enum SnodeNamespaces { /** @@ -32,7 +32,7 @@ export enum SnodeNamespaces { UserGroups = 5, /** - * This is the namespace used to sync the closed group details for each closed group + * This is the namespace used to sync the closed group messages for each closed group */ ClosedGroupMessages = 11, diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index 3c04d93a10..db2df4819e 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -43,6 +43,11 @@ async function confirmPushedAndDump( change.pushed.seqno.toNumber(), change.updatedHash ); + } + + const { requiredUserVariants } = LibSessionUtil; + for (let index = 0; index < requiredUserVariants.length; index++) { + const variant = requiredUserVariants[index]; const needsDump = await GenericWrapperActions.needsDump(variant); if (!needsDump) { diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index 2249099417..3f6369a2d6 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -10,10 +10,12 @@ import { isEmpty, uniq } from 'lodash'; import { ConfigDumpData } from '../../data/configDump/configDump'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; +import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { ConvoHub } from '../../session/conversations'; import { UserUtils } from '../../session/utils'; import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { PreConditionFailed } from '../../session/utils/errors'; +import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { @@ -24,11 +26,9 @@ import { MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; -import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { StateType } from '../reducer'; -import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; -import { resetOverlayMode } from './section'; import { openConversationWithMessages } from './conversations'; +import { resetOverlayMode } from './section'; export type GroupState = { infos: Record; diff --git a/ts/test/session/unit/onion/SnodeNamespace_test.ts b/ts/test/session/unit/onion/SnodeNamespace_test.ts index 11fd317801..8e6a8cc822 100644 --- a/ts/test/session/unit/onion/SnodeNamespace_test.ts +++ b/ts/test/session/unit/onion/SnodeNamespace_test.ts @@ -2,28 +2,26 @@ import { expect } from 'chai'; import Sinon from 'sinon'; import { SnodeNamespace } from '../../../../session/apis/snode_api/namespaces'; -describe('Snode namespaces', () => { - describe('maxSizeMap', () => { - afterEach(() => { - Sinon.restore(); - }); +describe('maxSizeMap', () => { + afterEach(() => { + Sinon.restore(); + }); - it('single namespace 0 returns -1', () => { - expect(SnodeNamespace.maxSizeMap([0])).to.be.deep.eq([{ namespace: 0, maxSize: -1 }]); - }); + it('single namespace 0 returns -1', () => { + expect(SnodeNamespace.maxSizeMap([0])).to.be.deep.eq([{ namespace: 0, maxSize: -1 }]); + }); - it('single namespace config 5 returns -1', () => { - expect(SnodeNamespace.maxSizeMap([5])).to.be.deep.eq([{ namespace: 5, maxSize: -1 }]); - }); + it('single namespace config 5 returns -1', () => { + expect(SnodeNamespace.maxSizeMap([5])).to.be.deep.eq([{ namespace: 5, maxSize: -1 }]); + }); - it('multiple namespaces config 0,2,3,4,5 returns [-2,-8,-8,-8,-8]', () => { - expect(SnodeNamespace.maxSizeMap([0, 2, 3, 4, 5])).to.be.deep.eq([ - { namespace: 0, maxSize: -2 }, // 0 has a priority of 10 so takes its own bucket - { namespace: 2, maxSize: -8 }, // the 4 other ones are sharing the next bucket - { namespace: 3, maxSize: -8 }, - { namespace: 4, maxSize: -8 }, - { namespace: 5, maxSize: -8 }, - ]); - }); + it('multiple namespaces config 0,2,3,4,5 returns [-2,-8,-8,-8,-8]', () => { + expect(SnodeNamespace.maxSizeMap([0, 2, 3, 4, 5])).to.be.deep.eq([ + { namespace: 0, maxSize: -2 }, // 0 has a priority of 10 so takes its own bucket + { namespace: 2, maxSize: -8 }, // the 4 other ones are sharing the next bucket + { namespace: 3, maxSize: -8 }, + { namespace: 4, maxSize: -8 }, + { namespace: 5, maxSize: -8 }, + ]); }); }); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 686368cde2..b29b093257 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -281,7 +281,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); it('calls sendEncryptedDataToSnode with the right data and retry if network returned nothing', async () => { - throw null; // this test might not be right const info = validInfo(sodium); const member = validMembers(sodium); const networkTimestamp = 4444; @@ -320,7 +319,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); it('calls sendEncryptedDataToSnode with the right data (and keys) and retry if network returned nothing', async () => { - throw null; // this test might not be right const info = validInfo(sodium); const member = validMembers(sodium); const keys = validKeys(sodium); @@ -335,11 +333,11 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }, { pushed: info, - updatedHash: 'hash1', + updatedHash: 'hashinfo', }, { pushed: member, - updatedHash: 'hash2', + updatedHash: 'hashmember', }, ]; Sinon.stub(LibSessionUtil, 'batchResultsToGroupSuccessfulChange').returns(changes); @@ -347,25 +345,28 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { sendStub.resolves([ { code: 200, body: { hash: 'hashkeys' } }, - { code: 200, body: { hash: 'hash1' } }, - { code: 200, body: { hash: 'hash2' } }, + { code: 200, body: { hash: 'hashinfo' } }, + { code: 200, body: { hash: 'hashmember' } }, { code: 200, body: {} }, // because we are giving a set of allOldHashes ]); const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); expect(sendStub.callCount).to.be.eq(1); expect(pendingChangesForGroupStub.callCount).to.be.eq(1); - expect(saveDumpsToDbStub.callCount).to.be.eq(2); + expect(saveDumpsToDbStub.firstCall.args).to.be.deep.eq([groupPk]); expect(saveDumpsToDbStub.secondCall.args).to.be.deep.eq([groupPk]); - expect(metaConfirmPushed.callCount).to.be.eq(1); + expect(saveDumpsToDbStub.callCount).to.be.eq(2); + expect(metaConfirmPushed.firstCall.args).to.be.deep.eq([ groupPk, { - groupInfo: [123, 'hash1'], - groupMember: [321, 'hash2'], + groupInfo: [123, 'hashinfo'], + groupMember: [321, 'hashmember'], }, ]); + expect(metaConfirmPushed.callCount).to.be.eq(1); + expect(result).to.be.eq(RunJobResult.Success); }); }); diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index bac7105d5e..f24b1ab563 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -275,13 +275,14 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { }); it('calls sendEncryptedDataToSnode with the right data x2 and retry if network returned nothing', async () => { - Sinon.stub(GenericWrapperActions, 'needsDump').resolves(false); + Sinon.stub(GenericWrapperActions, 'needsDump').resolves(false).onSecondCall().resolves(true); const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); const networkTimestamp = 4444; const ttl = TTL_DEFAULT.TTL_CONFIG; Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(networkTimestamp); + pendingChangesForUsStub.resolves({ messages: [profile, contact], allOldHashes: new Set('123'), @@ -292,7 +293,8 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { expect(result).to.be.eq(RunJobResult.RetryJobIfPossible); // not returning anything in the sendstub so network issue happened expect(sendStub.callCount).to.be.eq(1); expect(pendingChangesForUsStub.callCount).to.be.eq(1); - expect(dump.callCount).to.be.eq(0); + expect(dump.callCount).to.be.eq(1); + expect(dump.firstCall.args).to.be.deep.eq(['ContactsConfig']); function expected(details: any) { return { @@ -303,8 +305,6 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { pubkey: sessionId, }; } - throw null; // - // this test is not right. check for dump logic and make sure this matches const expectedProfile = expected(profile); const expectedContact = expected(contact); @@ -320,8 +320,6 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); const groups = userChange(sodium, SnodeNamespaces.UserGroups, 111); - throw null; // - // this test is not right. check for dump logic and make sure this matches pendingChangesForUsStub.resolves({ messages: [profile, contact, groups], allOldHashes: new Set('123'), @@ -343,25 +341,88 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { Sinon.stub(LibSessionUtil, 'batchResultsToUserSuccessfulChange').returns(changes); const confirmPushed = Sinon.stub(GenericWrapperActions, 'confirmPushed').resolves(); - const needsDump = Sinon.stub(GenericWrapperActions, 'needsDump').resolves(); + // all 4 need to be dumped + const needsDump = Sinon.stub(GenericWrapperActions, 'needsDump').resolves(true); + // ============ 1st try, let's say we didn't get as much entries in the result as expected. This should be a fail sendStub.resolves([ { code: 200, body: { hash: 'hashprofile' } }, { code: 200, body: { hash: 'hashcontact' } }, { code: 200, body: { hash: 'hashgroup' } }, - { code: 200, body: {} }, // because we are giving a set of allOldHashes ]); - const result = await UserSync.pushChangesToUserSwarmIfNeeded(); + let result = await UserSync.pushChangesToUserSwarmIfNeeded(); expect(sendStub.callCount).to.be.eq(1); expect(pendingChangesForUsStub.callCount).to.be.eq(1); - expect(dump.callCount).to.be.eq(2); - expect(dump.firstCall.args).to.be.deep.eq([sessionId]); + expect(dump.getCalls().map(m => m.args)).to.be.deep.eq([ + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ]); + expect(dump.callCount).to.be.eq(4); + + expect(needsDump.getCalls().map(m => m.args)).to.be.deep.eq([ + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ]); expect(needsDump.callCount).to.be.eq(4); - expect(needsDump.getCalls().map(m => m.args)).to.be.deep.eq([[sessionId, []]]); - expect(confirmPushed.callCount).to.be.eq(4); - expect(confirmPushed.getCalls().map(m => m.args)).to.be.deep.eq([[sessionId, [123, 'hash1']]]); + expect(confirmPushed.callCount).to.be.eq(0); // first send failed, shouldn't confirm pushed + expect(result).to.be.eq(RunJobResult.RetryJobIfPossible); + + // ============= second try: we now should get a success + sendStub.resetHistory(); + sendStub.resolves([ + { code: 200, body: { hash: 'hashprofile2' } }, + { code: 200, body: { hash: 'hashcontact2' } }, + { code: 200, body: { hash: 'hashgroup2' } }, + { code: 200, body: {} }, // because we are giving a set of allOldHashes + ]); + changes.forEach(change => { + // eslint-disable-next-line no-param-reassign + change.updatedHash += '2'; + }); + + pendingChangesForUsStub.resetHistory(); + dump.resetHistory(); + needsDump.resetHistory(); + confirmPushed.resetHistory(); + result = await UserSync.pushChangesToUserSwarmIfNeeded(); + + expect(sendStub.callCount).to.be.eq(1); + expect(pendingChangesForUsStub.callCount).to.be.eq(1); + expect(dump.getCalls().map(m => m.args)).to.be.deep.eq([ + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ]); + + expect(needsDump.getCalls().map(m => m.args)).to.be.deep.eq([ + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ['UserConfig'], + ['ContactsConfig'], + ['UserGroupsConfig'], + ['ConvoInfoVolatileConfig'], + ]); + + expect(confirmPushed.getCalls().map(m => m.args)).to.be.deep.eq([ + ['UserConfig', 321, 'hashprofile2'], + ['ContactsConfig', 123, 'hashcontact2'], + ['UserGroupsConfig', 111, 'hashgroup2'], + ]); + expect(confirmPushed.callCount).to.be.eq(3); // second send success, we should confirm the pushes of the 3 pushed messages + expect(result).to.be.eq(RunJobResult.Success); }); }); From 2ee4cad33ee20e428f440a68dc9ef51fdd9e08f7 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 13 Oct 2023 11:23:04 +1100 Subject: [PATCH 040/302] chore: move mocha config to .mocharc.yml to package.json is cleaner --- .mocharc.yml | 11 +++++++++++ package.json | 2 +- .../job_runner/user_sync_job/UserSyncJob_test.ts | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .mocharc.yml diff --git a/.mocharc.yml b/.mocharc.yml new file mode 100644 index 0000000000..92a0030eab --- /dev/null +++ b/.mocharc.yml @@ -0,0 +1,11 @@ +jobs: 1 +package: './package.json' +parallel: false +exit: true +recursive: true +require: 'jsdom-global/register' +sort: false +spec: + - './ts/test/**/*_test.js' # the positional arguments! +timeout: 1000 +watch: false diff --git a/package.json b/package.json index c54af41a19..3fe211f677 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "lint-full": "yarn format-full && eslint .", "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"", "start-prod-test": "cross-env NODE_ENV=production NODE_APP_INSTANCE=$MULTI electron .", - "test": "mocha -r jsdom-global/register --recursive --exit --timeout 10000 \"./ts/test/**/*_test.js\"", + "test": "mocha", "build-release": "run-script-os", "build-release-non-linux": "yarn build-everything && cross-env SIGNAL_ENV=production electron-builder --config.extraMetadata.environment=production --publish=never --config.directories.output=release", "build-release:win32": "yarn build-release-non-linux", diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index f24b1ab563..6a91e0b472 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -92,7 +92,7 @@ describe('UserSyncJob run()', () => { }); }); -describe('UserSyncJob resultsToSuccessfulChange', () => { +describe('UserSyncJob batchResultsToUserSuccessfulChange', () => { let sodium: LibSodiumWrappers; beforeEach(async () => { sodium = await getSodiumNode(); From b0e38670ab2a6daa1a8fea1338490bef5c45ef1f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 16 Oct 2023 10:14:24 +1100 Subject: [PATCH 041/302] chore: rename all groupv3 to groupv2 --- ts/models/conversation.ts | 30 +++++++++---------- ts/models/conversationAttributes.ts | 6 ++-- ts/receiver/configMessage.ts | 2 +- ts/receiver/dataMessage.ts | 6 ++-- .../open_group_api/sogsv3/sogsV3SendFile.ts | 2 +- ts/session/apis/snode_api/pollingTypes.ts | 2 +- ts/session/apis/snode_api/swarmPolling.ts | 14 ++++----- .../conversations/ConversationController.ts | 6 ++-- ts/session/conversations/createClosedGroup.ts | 2 +- ts/session/group/closed-group.ts | 10 +++---- .../ClosedGroupVisibleMessage.ts | 10 +++---- ts/session/sending/MessageQueue.ts | 11 +++---- ts/session/types/PubKey.ts | 6 ++-- ts/session/utils/AttachmentsV2.ts | 2 +- ts/state/ducks/groups.ts | 4 +-- ts/state/selectors/selectedConversation.ts | 4 +-- .../libsession_util/libsession_utils_test.ts | 4 +-- .../libsession_wrapper_usergroups_test.ts | 2 +- .../models/formatRowOfConversation_test.ts | 2 +- .../unit/sogsv3/knownBlindedKeys_test.ts | 6 ++-- ...armPolling_getNamespacesToPollFrom_test.ts | 6 ++-- .../SwarmPolling_getPollingTimeout_test.ts | 24 +++++++-------- .../SwarmPolling_pollForAllKeys_test.ts | 30 +++++++++---------- .../SwarmPolling_pollingDetails_test.ts | 24 +++++++-------- .../group_sync_job/GroupSyncJob_test.ts | 12 ++++---- ts/test/test-utils/utils/pubkey.ts | 2 +- 26 files changed, 113 insertions(+), 116 deletions(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 8074fbc240..9e710d0ae8 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -22,7 +22,7 @@ import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; import { ConvoHub } from '../session/conversations'; import { - ClosedGroupV3VisibleMessage, + ClosedGroupV2VisibleMessage, ClosedGroupVisibleMessage, } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { PubKey } from '../session/types'; @@ -112,6 +112,7 @@ import { READ_MESSAGE_STATE, } from './conversationAttributes'; +import { PreConditionFailed } from '../session/utils/errors'; import { LibSessionUtil } from '../session/utils/libsession/libsession_utils'; import { SessionUtilUserProfile } from '../session/utils/libsession/libsession_utils_user_profile'; import { ReduxSogsRoomInfos } from '../state/ducks/sogsRoomInfo'; @@ -126,7 +127,6 @@ import { getSubscriberCountOutsideRedux, } from '../state/selectors/sogsRoomInfo'; import { markAttributesAsReadIfNeeded } from './messageFactory'; -import { PreConditionFailed } from '../session/utils/errors'; type InMemoryConvoInfos = { mentionedUs: boolean; @@ -186,7 +186,7 @@ export class ConversationModel extends Backbone.Model { switch (type) { case ConversationTypeEnum.PRIVATE: return this.id; - case ConversationTypeEnum.GROUPV3: + case ConversationTypeEnum.GROUPV2: return `group(${ed25519Str(this.id)})`; case ConversationTypeEnum.GROUP: { if (this.isPublic()) { @@ -225,13 +225,13 @@ export class ConversationModel extends Backbone.Model { public isClosedGroup(): boolean { return Boolean( (this.get('type') === ConversationTypeEnum.GROUP && this.id.startsWith('05')) || - this.isClosedGroupV3() + this.isClosedGroupV2() ); } - public isClosedGroupV3(): boolean { + public isClosedGroupV2(): boolean { return Boolean( - this.get('type') === ConversationTypeEnum.GROUPV3 && PubKey.isClosedGroupV2(this.id) + this.get('type') === ConversationTypeEnum.GROUPV2 && PubKey.isClosedGroupV2(this.id) ); } @@ -1728,7 +1728,7 @@ export class ConversationModel extends Backbone.Model { public isKickedFromGroup(): boolean { if (this.isClosedGroup()) { - if (this.isClosedGroupV3()) { + if (this.isClosedGroupV2()) { // console.info('isKickedFromGroup using lib todo'); // debugger } return !!this.get('isKickedFromGroup'); @@ -1738,7 +1738,7 @@ export class ConversationModel extends Backbone.Model { public isLeft(): boolean { if (this.isClosedGroup()) { - if (this.isClosedGroupV3()) { + if (this.isClosedGroupV2()) { // console.info('isLeft using lib todo'); // debugger } return !!this.get('left'); @@ -1759,7 +1759,7 @@ export class ConversationModel extends Backbone.Model { public getGroupMembers(): Array { if (this.isClosedGroup()) { - if (this.isClosedGroupV3()) { + if (this.isClosedGroupV2()) { return getLibGroupMembersOutsideRedux(this.id); } const members = this.get('members'); @@ -1771,7 +1771,7 @@ export class ConversationModel extends Backbone.Model { public getGroupZombies(): Array { if (this.isClosedGroup()) { // closed group with 03 prefix does not have the concepts of zombies - if (this.isClosedGroupV3()) { + if (this.isClosedGroupV2()) { return []; } const zombies = this.get('zombies'); @@ -1891,9 +1891,9 @@ export class ConversationModel extends Backbone.Model { return; } - if (this.isClosedGroupV3()) { + if (this.isClosedGroupV2()) { // we need the return await so that errors are caught in the catch {} - await this.sendMessageToGroupV3(chatMessageParams); + await this.sendMessageToGroupV2(chatMessageParams); return; } @@ -1918,16 +1918,16 @@ export class ConversationModel extends Backbone.Model { } } - private async sendMessageToGroupV3(chatMessageParams: VisibleMessageParams) { + private async sendMessageToGroupV2(chatMessageParams: VisibleMessageParams) { const visibleMessage = new VisibleMessage(chatMessageParams); - const groupVisibleMessage = new ClosedGroupV3VisibleMessage({ + const groupVisibleMessage = new ClosedGroupV2VisibleMessage({ chatMessage: visibleMessage, destination: this.id, namespace: SnodeNamespaces.ClosedGroupMessages, }); // we need the return await so that errors are caught in the catch {} - await getMessageQueue().sendToGroupV3({ + await getMessageQueue().sendToGroupV2({ message: groupVisibleMessage, }); } diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts index bfb52e19b1..80f0cd4e71 100644 --- a/ts/models/conversationAttributes.ts +++ b/ts/models/conversationAttributes.ts @@ -13,14 +13,14 @@ import { LastMessageStatusType } from '../state/ducks/conversations'; */ export enum ConversationTypeEnum { GROUP = 'group', - GROUPV3 = 'groupv3', + GROUPV2 = 'groupv2', PRIVATE = 'private', } export function isOpenOrClosedGroup(conversationType: ConversationTypeEnum) { return ( conversationType === ConversationTypeEnum.GROUP || - conversationType === ConversationTypeEnum.GROUPV3 + conversationType === ConversationTypeEnum.GROUPV2 ); } @@ -50,7 +50,7 @@ export type ConversationAttributesWithNotSavedOnes = ConversationAttributes & export interface ConversationAttributes { id: string; - type: ConversationTypeEnum.PRIVATE | ConversationTypeEnum.GROUPV3 | ConversationTypeEnum.GROUP; + type: ConversationTypeEnum.PRIVATE | ConversationTypeEnum.GROUPV2 | ConversationTypeEnum.GROUP; // 0 means inactive (undefined and null too but we try to get rid of them and only have 0 = inactive) active_at: number; // this field is the one used to sort conversations in the left pane from most recent diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index dd39970801..7e4025e876 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -638,7 +638,7 @@ async function handleSingleGroupUpdate({ } if (!ConvoHub.use().get(groupPk)) { - const created = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV3); + const created = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); const joinedAt = groupInWrapper.joinedAtSeconds * 1000 || Date.now(); created.set({ active_at: joinedAt, diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index b89a2a5f2e..835494636c 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -195,10 +195,10 @@ export async function handleSwarmDataMessage( ); const isGroupMessage = !!envelope.senderIdentity; - const isGroupV3Message = isGroupMessage && PubKey.isClosedGroupV2(envelope.source); + const isGroupV2Message = isGroupMessage && PubKey.isClosedGroupV2(envelope.source); let typeOfConvo = ConversationTypeEnum.PRIVATE; - if (isGroupV3Message) { - typeOfConvo = ConversationTypeEnum.GROUPV3; + if (isGroupV2Message) { + typeOfConvo = ConversationTypeEnum.GROUPV2; } else if (isGroupMessage) { typeOfConvo = ConversationTypeEnum.GROUP; } diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts index 8c1f9c7d19..c49a41171d 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts @@ -18,7 +18,7 @@ export const uploadFileToRoomSogs3 = async ( const roomDetails = OpenGroupData.getV2OpenGroupRoomByRoomId(roomInfos); if (!roomDetails || !roomDetails.serverPublicKey) { - window.log.warn('uploadFileOpenGroupV3: roomDetails is invalid'); + window.log.warn('uploadFileOpenGroup: roomDetails is invalid'); return null; } diff --git a/ts/session/apis/snode_api/pollingTypes.ts b/ts/session/apis/snode_api/pollingTypes.ts index 3fd142a0f5..44374f2627 100644 --- a/ts/session/apis/snode_api/pollingTypes.ts +++ b/ts/session/apis/snode_api/pollingTypes.ts @@ -5,4 +5,4 @@ import { ConversationTypeEnum } from '../../../models/conversationAttributes'; export type PollForUs = [pubkey: string, type: ConversationTypeEnum.PRIVATE]; export type PollForLegacy = [pubkey: string, type: ConversationTypeEnum.GROUP]; -export type PollForGroup = [pubkey: GroupPubkeyType, type: ConversationTypeEnum.GROUPV3]; +export type PollForGroup = [pubkey: GroupPubkeyType, type: ConversationTypeEnum.GROUPV2]; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index a96347d4b2..469d26810f 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -219,7 +219,7 @@ export class SwarmPolling { .filter(m => this.shouldPollByTimeout(m)) // should we poll from it depending on this group activity? .filter(m => allGroupsInWrapper.some(w => w.pubkeyHex === m.pubkey.key)) // we don't poll from groups which are not in the usergroup wrapper .map(m => m.pubkey.key as GroupPubkeyType) // extract the pubkey - .map(m => [m, ConversationTypeEnum.GROUPV3] as PollForGroup); + .map(m => [m, ConversationTypeEnum.GROUPV2] as PollForGroup); toPollDetails = concat(toPollDetails, allGroupsTracked); @@ -267,7 +267,7 @@ export class SwarmPolling { pubkey: string; }) { // if all snodes returned an error (null), no need to update the lastPolledTimestamp - if (type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV3) { + if (type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV2) { window?.log?.debug( `Polled for group(${ed25519Str(pubkey)}):, got ${countMessages} messages back.` ); @@ -302,7 +302,7 @@ export class SwarmPolling { await SwarmPollingUserConfig.handleUserSharedConfigMessages(confMessages); return; } - if (type === ConversationTypeEnum.GROUPV3 && PubKey.isClosedGroupV2(pubkey)) { + if (type === ConversationTypeEnum.GROUPV2 && PubKey.isClosedGroupV2(pubkey)) { await SwarmPollingGroupConfig.handleGroupSharedConfigMessages(confMessages, pubkey); } } @@ -370,7 +370,7 @@ export class SwarmPolling { perfStart(`handleSeenMessages-${pubkey}`); const newMessages = await this.handleSeenMessages(uniqOtherMsgs); perfEnd(`handleSeenMessages-${pubkey}`, 'handleSeenMessages'); - if (type === ConversationTypeEnum.GROUPV3) { + if (type === ConversationTypeEnum.GROUPV2) { for (let index = 0; index < newMessages.length; index++) { const msg = newMessages[index]; const retrieveResult = new Uint8Array(StringUtils.encode(msg.data, 'base64')); @@ -454,7 +454,7 @@ export class SwarmPolling { window.log.debug(`configHashesToBump private: ${configHashesToBump}`); return configHashesToBump; } - if (type === ConversationTypeEnum.GROUPV3 && PubKey.isClosedGroupV2(pubkey)) { + if (type === ConversationTypeEnum.GROUPV2 && PubKey.isClosedGroupV2(pubkey)) { const toBump = await MetaGroupWrapperActions.currentHashes(pubkey); window.log.debug(`configHashesToBump group: ${toBump}`); return toBump; @@ -606,7 +606,7 @@ export class SwarmPolling { if (type === ConversationTypeEnum.GROUP) { return [SnodeNamespaces.LegacyClosedGroup]; } - if (type === ConversationTypeEnum.GROUPV3) { + if (type === ConversationTypeEnum.GROUPV2) { return [ SnodeNamespaces.ClosedGroupMessages, SnodeNamespaces.ClosedGroupInfo, @@ -712,7 +712,7 @@ function filterMessagesPerTypeOfConvo( otherMessages: retrieveItemWithNamespace(retrieveResults), }; - case ConversationTypeEnum.GROUPV3: { + case ConversationTypeEnum.GROUPV2: { const groupConfs = retrieveResults.filter(m => SnodeNamespace.isGroupConfigNamespace(m.namespace) ); diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 877c14ebd8..078c43b798 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -92,12 +92,12 @@ class ConvoController { if ( type !== ConversationTypeEnum.PRIVATE && type !== ConversationTypeEnum.GROUP && - type !== ConversationTypeEnum.GROUPV3 + type !== ConversationTypeEnum.GROUPV2 ) { - throw new TypeError(`'type' must be 'private' or 'group' or 'groupv3' but got: '${type}'`); + throw new TypeError(`'type' must be 'private' or 'group' or 'groupv2' but got: '${type}'`); } - if (type === ConversationTypeEnum.GROUPV3 && !PubKey.isClosedGroupV2(id)) { + if (type === ConversationTypeEnum.GROUPV2 && !PubKey.isClosedGroupV2(id)) { throw new Error( 'required v3 closed group but the pubkey does not match the 03 prefix for them' ); diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index e9b1793ef7..b7a523be43 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -97,7 +97,7 @@ export async function createClosedGroup(groupName: string, members: Array, diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index b2c67f7029..10a3b2fe31 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -1,7 +1,6 @@ import _, { isFinite, isNumber } from 'lodash'; import { v4 as uuidv4 } from 'uuid'; -import { PubKey } from '../types'; import { getMessageQueue } from '..'; import { Data } from '../../data/data'; import { ConversationModel } from '../../models/conversation'; @@ -23,6 +22,7 @@ import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMe import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage'; import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage'; +import { PubKey } from '../types'; import { UserUtils } from '../utils'; import { fromHexToArray, toHex } from '../utils/String'; @@ -60,10 +60,10 @@ export async function initiateClosedGroupUpdate( groupName: string, members: Array ) { - const isGroupV3 = PubKey.isClosedGroupV2(groupId); + const isGroupV2 = PubKey.isClosedGroupV2(groupId); const convo = await ConvoHub.use().getOrCreateAndWait( groupId, - isGroupV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP + isGroupV2 ? ConversationTypeEnum.GROUPV2 : ConversationTypeEnum.GROUP ); // do not give an admins field here. We don't want to be able to update admins and @@ -210,7 +210,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) { const conversation = await ConvoHub.use().getOrCreateAndWait( id, - isV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP + isV3 ? ConversationTypeEnum.GROUPV2 : ConversationTypeEnum.GROUP ); const updates: Pick< @@ -219,7 +219,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) { > = { displayNameInProfile: details.name, members: details.members, - type: isV3 ? ConversationTypeEnum.GROUPV3 : ConversationTypeEnum.GROUP, + type: isV3 ? ConversationTypeEnum.GROUPV2 : ConversationTypeEnum.GROUP, active_at: details.activeAt ? details.activeAt : 0, left: !details.activeAt, }; diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index 41a8e3c39b..3059b07da4 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -1,11 +1,11 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { SignalService } from '../../../../protobuf'; +import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; import { PubKey } from '../../../types'; import { StringUtils } from '../../../utils'; -import { VisibleMessage } from './VisibleMessage'; -import { ClosedGroupMessage } from '../controlMessage/group/ClosedGroupMessage'; import { DataMessage } from '../DataMessage'; -import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; +import { ClosedGroupMessage } from '../controlMessage/group/ClosedGroupMessage'; +import { VisibleMessage } from './VisibleMessage'; interface ClosedGroupVisibleMessageParams { identifier?: string; @@ -52,7 +52,7 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage { type WithDestinationGroupPk = { destination: GroupPubkeyType }; type WithGroupMessageNamespace = { namespace: SnodeNamespaces.ClosedGroupMessages }; -export class ClosedGroupV3VisibleMessage extends DataMessage { +export class ClosedGroupV2VisibleMessage extends DataMessage { private readonly chatMessage: VisibleMessage; public readonly destination: GroupPubkeyType; public readonly namespace: SnodeNamespaces.ClosedGroupMessages; @@ -69,7 +69,7 @@ export class ClosedGroupV3VisibleMessage extends DataMessage { this.chatMessage = params.chatMessage; if (!PubKey.isClosedGroupV2(params.destination)) { - throw new Error('ClosedGroupV3VisibleMessage only work with 03-groups destination'); + throw new Error('ClosedGroupV2VisibleMessage only work with 03-groups destination'); } this.destination = params.destination; this.namespace = params.namespace; diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index e8b350405b..ce8b32abf8 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -15,10 +15,7 @@ import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMe import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage'; import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage'; -import { - ClosedGroupV3VisibleMessage, - ClosedGroupVisibleMessage, -} from '../messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; +import { ClosedGroupVisibleMessage } from '../messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { SyncMessageType } from '../utils/sync/syncUtils'; import { MessageSentHandler } from './MessageSentHandler'; @@ -198,15 +195,15 @@ export class MessageQueue { return this.sendToPubKey(PubKey.cast(destinationPubKey), message, namespace, sentCb, true); } - public async sendToGroupV3({ + public async sendToGroupV2({ message, sentCb, }: { - message: ClosedGroupV3VisibleMessage; + message: ClosedGroupV2VisibleMessage; sentCb?: (message: RawMessage) => Promise; }): Promise { if (!message.destination) { - throw new Error('Invalid group message passed in sendToGroupV3.'); + throw new Error('Invalid group message passed in sendToGroupV2.'); } return this.sendToPubKey( diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index 2e90121e29..ad2c2bb55e 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -23,7 +23,7 @@ export enum KeyPrefixType { /** * used for participants in open groups */ - groupV3 = '03', + groupV2 = '03', } // TODO make that Pubkey class more useful, add fields for what types of pubkey it is (group, legacy group, private) @@ -41,7 +41,7 @@ export class PubKey { public static readonly PREFIX_GROUP_TEXTSECURE = '__textsecure_group__!'; // prettier-ignore private static readonly regex: RegExp = new RegExp( - `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(${KeyPrefixType.standard}|${KeyPrefixType.blinded15}|${KeyPrefixType.blinded25}|${KeyPrefixType.unblinded}|${KeyPrefixType.groupV3})?(${PubKey.HEX}{64}|${PubKey.HEX}{32})$` + `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(${KeyPrefixType.standard}|${KeyPrefixType.blinded15}|${KeyPrefixType.blinded25}|${KeyPrefixType.unblinded}|${KeyPrefixType.groupV2})?(${PubKey.HEX}{64}|${PubKey.HEX}{32})$` ); /** * If you want to update this regex. Be sure that those are matches ; @@ -236,7 +236,7 @@ export class PubKey { } public static isClosedGroupV2(key: string): key is GroupPubkeyType { - const regex = new RegExp(`^${KeyPrefixType.groupV3}${PubKey.HEX}{64}$`); + const regex = new RegExp(`^${KeyPrefixType.groupV2}${PubKey.HEX}{64}$`); return regex.test(key); } } diff --git a/ts/session/utils/AttachmentsV2.ts b/ts/session/utils/AttachmentsV2.ts index f8d53fb882..9d81543c12 100644 --- a/ts/session/utils/AttachmentsV2.ts +++ b/ts/session/utils/AttachmentsV2.ts @@ -47,7 +47,7 @@ async function uploadV3(params: UploadParamsV2): Promise { } return ( (selected.type === ConversationTypeEnum.GROUP && !selected.isPublic) || - selected.type === ConversationTypeEnum.GROUPV3 || + selected.type === ConversationTypeEnum.GROUPV2 || false ); }; diff --git a/ts/test/session/unit/libsession_util/libsession_utils_test.ts b/ts/test/session/unit/libsession_util/libsession_utils_test.ts index cfa5254dba..f68731b2f5 100644 --- a/ts/test/session/unit/libsession_util/libsession_utils_test.ts +++ b/ts/test/session/unit/libsession_util/libsession_utils_test.ts @@ -19,7 +19,7 @@ describe('LibSessionUtil saveDumpsToDb', () => { let groupPk: GroupPubkeyType; beforeEach(() => { - groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); }); afterEach(() => { @@ -132,7 +132,7 @@ describe('LibSessionUtil saveDumpsToDb', () => { describe('LibSessionUtil pendingChangesForGroup', () => { let groupPk: GroupPubkeyType; beforeEach(() => { - groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); }); afterEach(() => { diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts index 9eb29164a6..e36d19610d 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts @@ -108,7 +108,7 @@ describe('libsession_groups', () => { SessionUtilUserGroups.isUserGroupToStoreInWrapper( new ConversationModel({ ...validArgs, - type: ConversationTypeEnum.GROUPV3, + type: ConversationTypeEnum.GROUPV2, id: '03123456564', } as any) ) diff --git a/ts/test/session/unit/models/formatRowOfConversation_test.ts b/ts/test/session/unit/models/formatRowOfConversation_test.ts index 636c85a4ba..6964e2d3bf 100644 --- a/ts/test/session/unit/models/formatRowOfConversation_test.ts +++ b/ts/test/session/unit/models/formatRowOfConversation_test.ts @@ -272,7 +272,7 @@ describe('formatRowOfConversation', () => { formatRowOfConversation( fillConvoAttributesWithDefaults({ id: '1234565', - type: ConversationTypeEnum.GROUPV3, + type: ConversationTypeEnum.GROUPV2, nickname: 'nickname', displayNameInProfile: 'displayNameInProfile', profileKey: '', diff --git a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts index 48284cb9c3..27b6b6daa7 100644 --- a/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts +++ b/ts/test/session/unit/sogsv3/knownBlindedKeys_test.ts @@ -22,8 +22,8 @@ import { import { ConvoHub } from '../../../../session/conversations'; import { LibSodiumWrappers } from '../../../../session/crypto'; import { UserUtils } from '../../../../session/utils'; -import { expectAsyncToThrow, stubData, stubWindowLog } from '../../../test-utils/utils'; import { TestUtils } from '../../../test-utils'; +import { expectAsyncToThrow, stubData, stubWindowLog } from '../../../test-utils/utils'; const serverPublicKey = 'serverPublicKey'; const blindedId = '151111'; @@ -572,8 +572,8 @@ describe('knownBlindedKeys', () => { expect(real).to.eq(undefined); }); - it('does iterate over all the conversations but is not private so must fail: groupv3', () => { - // we actually cannot test this one as we would need to create a conversation with groupv3 as type but 05 as prefix, and the conversation controller denies it, as expected + it('does iterate over all the conversations but is not private so must fail: groupv2', () => { + // we actually cannot test this one as we would need to create a conversation with groupv2 as type but 05 as prefix, and the conversation controller denies it, as expected }); }); }); diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts index 593a4527a6..5c3b37507b 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts @@ -1,10 +1,10 @@ import { expect } from 'chai'; import Sinon from 'sinon'; import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; -import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; -import { TestUtils } from '../../../test-utils'; import { getSwarmPollingInstance } from '../../../../session/apis/snode_api'; +import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { SwarmPolling } from '../../../../session/apis/snode_api/swarmPolling'; +import { TestUtils } from '../../../test-utils'; describe('SwarmPolling:getNamespacesToPollFrom', () => { let swarmPolling: SwarmPolling; @@ -31,7 +31,7 @@ describe('SwarmPolling:getNamespacesToPollFrom', () => { }); it('for group v2 (03 prefix) ', () => { - expect(swarmPolling.getNamespacesToPollFrom(ConversationTypeEnum.GROUPV3)).to.deep.equal([ + expect(swarmPolling.getNamespacesToPollFrom(ConversationTypeEnum.GROUPV2)).to.deep.equal([ SnodeNamespaces.ClosedGroupMessages, SnodeNamespaces.ClosedGroupInfo, SnodeNamespaces.ClosedGroupMembers, diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts index 06423df0cd..d23dc079f1 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts @@ -1,14 +1,14 @@ import { expect } from 'chai'; import Sinon from 'sinon'; import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; -import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants'; -import { PubKey } from '../../../../session/types'; -import { TestUtils } from '../../../test-utils'; import { SwarmPolling, getSwarmPollingInstance, } from '../../../../session/apis/snode_api/swarmPolling'; +import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants'; import { ConvoHub } from '../../../../session/conversations/ConversationController'; +import { PubKey } from '../../../../session/types'; +import { TestUtils } from '../../../test-utils'; import { stubData } from '../../../test-utils/utils'; describe('SwarmPolling:getPollingTimeout', () => { @@ -86,11 +86,11 @@ describe('SwarmPolling:getPollingTimeout', () => { }); }); - describe('groupv3', () => { + describe('groupv2', () => { it('returns ACTIVE for convo with less than two days old activeAt', () => { const convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakeClosedGroupV3PkStr(), - ConversationTypeEnum.GROUPV3 + TestUtils.generateFakeClosedGroupV2PkStr(), + ConversationTypeEnum.GROUPV2 ); convo.set('active_at', Date.now() - 2 * 23 * 3600 * 1000); // 23 * 2 = 46 hours old expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( @@ -100,8 +100,8 @@ describe('SwarmPolling:getPollingTimeout', () => { it('returns INACTIVE for convo with undefined activeAt', () => { const convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakeClosedGroupV3PkStr(), - ConversationTypeEnum.GROUPV3 + TestUtils.generateFakeClosedGroupV2PkStr(), + ConversationTypeEnum.GROUPV2 ); convo.set('active_at', undefined); expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( @@ -111,8 +111,8 @@ describe('SwarmPolling:getPollingTimeout', () => { it('returns MEDIUM_ACTIVE for convo with activeAt of more than 2 days but less than a week old', () => { const convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakeClosedGroupV3PkStr(), - ConversationTypeEnum.GROUPV3 + TestUtils.generateFakeClosedGroupV2PkStr(), + ConversationTypeEnum.GROUPV2 ); convo.set('active_at', Date.now() - 1000 * 3600 * 25 * 2); // 25 hours x 2 = 50 hours old expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( @@ -127,8 +127,8 @@ describe('SwarmPolling:getPollingTimeout', () => { it('returns INACTIVE for convo with activeAt of more than a week', () => { const convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakeClosedGroupV3PkStr(), - ConversationTypeEnum.GROUPV3 + TestUtils.generateFakeClosedGroupV2PkStr(), + ConversationTypeEnum.GROUPV2 ); convo.set('active_at', Date.now() - 1000 * 3600 * 24 * 8); // 8 days expect(swarmPolling.getPollingTimeout(PubKey.cast(convo.id as string))).to.eq( diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts index 675ca91cc8..b5f418decb 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts @@ -24,7 +24,7 @@ const pollOnceForGroupLegacyArgs = (groupLegacy: string) => [ [groupLegacy, ConversationTypeEnum.GROUP], ]; -const pollOnceForGroupArgs = (group: GroupPubkeyType) => [[group, ConversationTypeEnum.GROUPV3]]; +const pollOnceForGroupArgs = (group: GroupPubkeyType) => [[group, ConversationTypeEnum.GROUPV2]]; function stubWithLegacyGroups(pubkeys: Array) { const groups = pubkeys.map(m => ({ pubkeyHex: m }) as LegacyGroupInfo); @@ -345,8 +345,8 @@ describe('SwarmPolling:pollForAllKeys', () => { describe('03 group', () => { it('does run for group pubkey on start no matter the recent timestamp', async () => { - const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); - const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + const groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV2); stubWithLegacyGroups([]); stubWithGroups([groupPk]); convo.set('active_at', Date.now()); @@ -362,8 +362,8 @@ describe('SwarmPolling:pollForAllKeys', () => { }); it('does only poll from -10 for closed groups', async () => { - const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); - const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + const groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV2); stubWithLegacyGroups([]); stubWithGroups([groupPk]); convo.set('active_at', 1); @@ -382,8 +382,8 @@ describe('SwarmPolling:pollForAllKeys', () => { }); it('does run for group pubkey on start but not another time if activeAt is old ', async () => { - const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); - const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + const groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV2); stubWithLegacyGroups([]); stubWithGroups([groupPk]); @@ -401,8 +401,8 @@ describe('SwarmPolling:pollForAllKeys', () => { }); it('does run twice if activeAt less than one hour ', async () => { - const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); - const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + const groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV2); stubWithLegacyGroups([]); stubWithGroups([groupPk]); @@ -430,8 +430,8 @@ describe('SwarmPolling:pollForAllKeys', () => { }); it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => { - const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); - const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + const groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV2); stubWithLegacyGroups([]); stubWithGroups([groupPk]); @@ -460,8 +460,8 @@ describe('SwarmPolling:pollForAllKeys', () => { }); it('does run once only if group is inactive and we tick less than 2 minutes ', async () => { - const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); - const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV3); + const groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); + const convo = ConvoHub.use().getOrCreate(groupPk, ConversationTypeEnum.GROUPV2); stubWithLegacyGroups([]); stubWithGroups([groupPk]); @@ -487,8 +487,8 @@ describe('SwarmPolling:pollForAllKeys', () => { beforeEach(async () => { convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakeClosedGroupV3PkStr(), - ConversationTypeEnum.GROUPV3 + TestUtils.generateFakeClosedGroupV2PkStr(), + ConversationTypeEnum.GROUPV2 ); stubWithLegacyGroups([]); diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts index 69bb3b9d35..e62705a07b 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts @@ -81,7 +81,7 @@ describe('getPollingDetails', () => { it('new group NOT in wrapper should be requested for leaving', async () => { TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); TestUtils.stubUserGroupWrapper('getAllGroups', []); - const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); Sinon.stub(swarmPolling, 'getPollingTimeout').returns(SWARM_POLLING_TIMEOUT.ACTIVE); @@ -120,7 +120,7 @@ describe('getPollingDetails', () => { }); it('new group', async () => { - const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); TestUtils.stubUserGroupWrapper('getAllGroups', [{ pubkeyHex: groupPk } as UserGroupsGet]); @@ -163,7 +163,7 @@ describe('getPollingDetails', () => { }); it('new group in wrapper should be polled', async () => { - const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); TestUtils.stubUserGroupWrapper('getAllLegacyGroups', []); TestUtils.stubUserGroupWrapper('getAllGroups', [{ pubkeyHex: groupPk } as UserGroupsGet]); @@ -176,7 +176,7 @@ describe('getPollingDetails', () => { expect(toPollDetails.length).to.be.eq(2); expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); - expect(toPollDetails[1]).to.be.deep.eq([groupPk, ConversationTypeEnum.GROUPV3]); + expect(toPollDetails[1]).to.be.deep.eq([groupPk, ConversationTypeEnum.GROUPV2]); // no groups to leave nor legacy ones expect(legacyGroupsToLeave.length).to.be.eq(0); expect(groupsToLeave.length).to.be.eq(0); @@ -186,8 +186,8 @@ describe('getPollingDetails', () => { describe('multiple groups', () => { it('one legacy group with a few v2 group not in wrapper', async () => { const groupPk = TestUtils.generateFakePubKeyStr(); - const groupV2Pk = TestUtils.generateFakeClosedGroupV3PkStr(); - const groupV2Pk2 = TestUtils.generateFakeClosedGroupV3PkStr(); + const groupV2Pk = TestUtils.generateFakeClosedGroupV2PkStr(); + const groupV2Pk2 = TestUtils.generateFakeClosedGroupV2PkStr(); TestUtils.stubUserGroupWrapper('getAllLegacyGroups', [ { pubkeyHex: groupPk } as LegacyGroupInfo, @@ -213,7 +213,7 @@ describe('getPollingDetails', () => { }); it('new group in wrapper with a few legacy groups not in wrapper', async () => { - const groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + const groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); const groupPkLeg1 = TestUtils.generateFakePubKeyStr(); const groupPkLeg2 = TestUtils.generateFakePubKeyStr(); @@ -231,7 +231,7 @@ describe('getPollingDetails', () => { expect(toPollDetails.length).to.be.eq(2); expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); - expect(toPollDetails[1]).to.be.deep.eq([groupPk, ConversationTypeEnum.GROUPV3]); + expect(toPollDetails[1]).to.be.deep.eq([groupPk, ConversationTypeEnum.GROUPV2]); expect(legacyGroupsToLeave.length).to.be.eq(2); expect(legacyGroupsToLeave[0]).to.be.eq(groupPkLeg1); expect(legacyGroupsToLeave[1]).to.be.eq(groupPkLeg2); @@ -239,8 +239,8 @@ describe('getPollingDetails', () => { }); it('two of each, all should be polled', async () => { - const groupPk1 = TestUtils.generateFakeClosedGroupV3PkStr(); - const groupPk2 = TestUtils.generateFakeClosedGroupV3PkStr(); + const groupPk1 = TestUtils.generateFakeClosedGroupV2PkStr(); + const groupPk2 = TestUtils.generateFakeClosedGroupV2PkStr(); const groupPkLeg1 = TestUtils.generateFakePubKeyStr(); const groupPkLeg2 = TestUtils.generateFakePubKeyStr(); @@ -267,8 +267,8 @@ describe('getPollingDetails', () => { expect(toPollDetails[0]).to.be.deep.eq([ourNumber, ConversationTypeEnum.PRIVATE]); expect(toPollDetails[1]).to.be.deep.eq([groupPkLeg1, ConversationTypeEnum.GROUP]); expect(toPollDetails[2]).to.be.deep.eq([groupPkLeg2, ConversationTypeEnum.GROUP]); - expect(toPollDetails[3]).to.be.deep.eq([groupPk1, ConversationTypeEnum.GROUPV3]); - expect(toPollDetails[4]).to.be.deep.eq([groupPk2, ConversationTypeEnum.GROUPV3]); + expect(toPollDetails[3]).to.be.deep.eq([groupPk1, ConversationTypeEnum.GROUPV2]); + expect(toPollDetails[4]).to.be.deep.eq([groupPk2, ConversationTypeEnum.GROUPV2]); // no groups to leave nor legacy ones expect(legacyGroupsToLeave.length).to.be.eq(0); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index b29b093257..fb4b28fa27 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -58,7 +58,7 @@ describe('GroupSyncJob run()', () => { }); it('throws if no user keys', async () => { const job = new GroupSync.GroupSyncJob({ - identifier: TestUtils.generateFakeClosedGroupV3PkStr(), + identifier: TestUtils.generateFakeClosedGroupV2PkStr(), }); const func = async () => job.run(); @@ -67,7 +67,7 @@ describe('GroupSyncJob run()', () => { it('permanent failure if group is not a 03 one', async () => { const job = new GroupSync.GroupSyncJob({ - identifier: TestUtils.generateFakeClosedGroupV3PkStr().slice(2), + identifier: TestUtils.generateFakeClosedGroupV2PkStr().slice(2), }); const result = await job.run(); expect(result).to.be.eq(RunJobResult.PermanentFailure); @@ -78,7 +78,7 @@ describe('GroupSyncJob run()', () => { Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves(undefined); Sinon.stub(ConvoHub.use(), 'get').resolves({}); // anything not falsy const job = new GroupSync.GroupSyncJob({ - identifier: TestUtils.generateFakeClosedGroupV3PkStr(), + identifier: TestUtils.generateFakeClosedGroupV2PkStr(), }); const result = await job.run(); expect(result).to.be.eq(RunJobResult.PermanentFailure); @@ -89,7 +89,7 @@ describe('GroupSyncJob run()', () => { Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves({} as any); // anything not falsy Sinon.stub(ConvoHub.use(), 'get').returns(undefined as any); const job = new GroupSync.GroupSyncJob({ - identifier: TestUtils.generateFakeClosedGroupV3PkStr(), + identifier: TestUtils.generateFakeClosedGroupV2PkStr(), }); const result = await job.run(); expect(result).to.be.eq(RunJobResult.PermanentFailure); @@ -103,7 +103,7 @@ describe('GroupSyncJob run()', () => { ); Sinon.stub(ConvoHub.use(), 'get').returns({} as any); // anything not falsy const job = new GroupSync.GroupSyncJob({ - identifier: TestUtils.generateFakeClosedGroupV3PkStr(), + identifier: TestUtils.generateFakeClosedGroupV2PkStr(), }); const result = await job.run(); expect(result).to.be.eq(RunJobResult.Success); @@ -257,7 +257,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { beforeEach(async () => { sodium = await getSodiumNode(); - groupPk = TestUtils.generateFakeClosedGroupV3PkStr(); + groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); userkeys = await TestUtils.generateUserKeyPairs(); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(userkeys.x25519KeyPair.pubkeyHex); Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves(userkeys.ed25519KeyPair); diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index 5870a124c9..3a6923dd98 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -70,7 +70,7 @@ export async function generateGroupV2(privateEd25519: Uint8Array) { return groupWrapper.createGroup(); } -export function generateFakeClosedGroupV3PkStr(): GroupPubkeyType { +export function generateFakeClosedGroupV2PkStr(): GroupPubkeyType { // Generates a mock pubkey for testing const numBytes = PubKey.PUBKEY_LEN / 2 - 1; const hexBuffer = crypto.randomBytes(numBytes).toString('hex'); From 0b4f9b2c978bcbc8fbcc8585f9c1786a4089c39f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 16 Oct 2023 10:19:23 +1100 Subject: [PATCH 042/302] chore: rename useSelectedisNoteToSelf to useSelectedIsNoteToSelf --- ts/components/conversation/ConversationHeader.tsx | 8 ++++---- ts/components/conversation/SubtleNotification.tsx | 6 +++--- .../message/message-content/MessageContextMenu.tsx | 4 ++-- ts/state/selectors/selectedConversation.ts | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 1d81aec0c8..b81aef4256 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -36,13 +36,13 @@ import { useSelectedIsBlocked, useSelectedIsGroup, useSelectedIsKickedFromGroup, + useSelectedIsNoteToSelf, useSelectedIsPrivate, useSelectedIsPrivateFriend, useSelectedIsPublic, useSelectedMembersCount, useSelectedNotificationSetting, useSelectedSubscriberCount, - useSelectedisNoteToSelf, } from '../../state/selectors/selectedConversation'; import { ExpirationTimerOptions } from '../../util/expiringMessages'; import { Flex } from '../basic/Flex'; @@ -65,7 +65,7 @@ const SelectionOverlay = () => { const selectedConversationKey = useSelectedConversationKey(); const isPublic = useSelectedIsPublic(); const dispatch = useDispatch(); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const { i18n } = window; @@ -216,7 +216,7 @@ const CallButton = () => { const isPrivate = useSelectedIsPrivate(); const isBlocked = useSelectedIsBlocked(); const isActive = useSelectedIsActive(); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const selectedConvoKey = useSelectedConversationKey(); const hasIncomingCall = useSelector(getHasIncomingCall); @@ -295,7 +295,7 @@ const ConversationHeaderTitle = () => { const isPublic = useSelectedIsPublic(); const isKickedFromGroup = useSelectedIsKickedFromGroup(); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const isGroup = useSelectedIsGroup(); let memberCount = useSelectedMembersCount(); diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index 598deb7843..efce31456b 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { useSelector } from 'react-redux'; import styled from 'styled-components'; +import { useIsIncomingRequest } from '../../hooks/useParamSelector'; import { getSelectedHasMessages, hasSelectedConversationIncomingMessages, @@ -9,12 +10,11 @@ import { getSelectedCanWrite, useSelectedConversationKey, useSelectedHasDisabledBlindedMsgRequests, + useSelectedIsNoteToSelf, useSelectedNicknameOrProfileNameOrShortenedPubkey, - useSelectedisNoteToSelf, } from '../../state/selectors/selectedConversation'; import { LocalizerKeys } from '../../types/LocalizerKeys'; import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; -import { useIsIncomingRequest } from '../../hooks/useParamSelector'; const Container = styled.div` display: flex; @@ -60,7 +60,7 @@ export const NoMessageInConversation = () => { const hasMessage = useSelector(getSelectedHasMessages); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const canWrite = useSelector(getSelectedCanWrite); const privateBlindedAndBlockingMsgReqs = useSelectedHasDisabledBlindedMsgRequests(); // TODOLATER use this selector accross the whole application (left pane excluded) diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx index a8235576f9..150dd5891d 100644 --- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx +++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx @@ -39,10 +39,10 @@ import { import { useSelectedConversationKey, useSelectedIsBlocked, + useSelectedIsNoteToSelf, useSelectedIsPublic, useSelectedWeAreAdmin, useSelectedWeAreModerator, - useSelectedisNoteToSelf, } from '../../../../state/selectors/selectedConversation'; import { saveAttachmentToDisk } from '../../../../util/attachmentsUtil'; import { Reactions } from '../../../../util/reactions'; @@ -89,7 +89,7 @@ const StyledEmojiPanelContainer = styled.div<{ x: number; y: number }>` const DeleteForEveryone = ({ messageId }: { messageId: string }) => { const convoId = useSelectedConversationKey(); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const isDeletableForEveryone = useMessageIsDeletableForEveryone(messageId); if (!convoId || !isDeletableForEveryone) { return null; diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index f7cf07e004..10d9dc8983 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -233,7 +233,7 @@ export function useSelectedIsActive() { return useSelector(getIsSelectedActive); } -export function useSelectedisNoteToSelf() { +export function useSelectedIsNoteToSelf() { return useSelector(getIsSelectedNoteToSelf); } @@ -297,7 +297,7 @@ export function useSelectedNicknameOrProfileNameOrShortenedPubkey() { const nickname = useSelectedNickname(); const profileName = useSelectedDisplayNameInProfile(); const shortenedPubkey = useSelectedShortenedPubkeyOrFallback(); - const isMe = useSelectedisNoteToSelf(); + const isMe = useSelectedIsNoteToSelf(); const libGroupName = useLibGroupName(selectedId); if (isMe) { return window.i18n('noteToSelf'); From 28d99a0f520e74cbb3833b6f67fbf12f010f7826 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 17 Oct 2023 10:32:54 +1100 Subject: [PATCH 043/302] chore: lint --- ts/components/icon/Icons.tsx | 6 +- ts/session/sending/MessageQueue.ts | 5 +- yarn.lock | 143 ----------------------------- 3 files changed, 6 insertions(+), 148 deletions(-) diff --git a/ts/components/icon/Icons.tsx b/ts/components/icon/Icons.tsx index 2d2d354626..d7b12a5708 100644 --- a/ts/components/icon/Icons.tsx +++ b/ts/components/icon/Icons.tsx @@ -415,8 +415,7 @@ export const icons: Record>>>>>> upstream/unstable dependencies: "@babel/highlight" "^7.22.10" chalk "^2.4.2" -<<<<<<< HEAD "@babel/generator@^7.22.7": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d" integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw== dependencies: "@babel/types" "^7.22.5" -======= -"@babel/generator@^7.22.10": - version "7.22.10" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.10.tgz#c92254361f398e160645ac58831069707382b722" - integrity sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A== - dependencies: - "@babel/types" "^7.22.10" ->>>>>>> upstream/unstable "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -110,42 +86,19 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== -<<<<<<< HEAD "@babel/highlight@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== -======= -"@babel/highlight@^7.22.10": - version "7.22.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.10.tgz#02a3f6d8c1cb4521b2fd0ab0da8f4739936137d7" - integrity sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ== ->>>>>>> upstream/unstable dependencies: "@babel/helper-validator-identifier" "^7.22.5" chalk "^2.4.2" js-tokens "^4.0.0" -<<<<<<< HEAD "@babel/parser@^7.20.15", "@babel/parser@^7.22.5", "@babel/parser@^7.22.7": version "7.22.7" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae" integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q== -======= -"@babel/highlight@^7.22.13": - version "7.22.13" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16" - integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ== - dependencies: - "@babel/helper-validator-identifier" "^7.22.5" - chalk "^2.4.2" - js-tokens "^4.0.0" - -"@babel/parser@^7.20.15", "@babel/parser@^7.22.10", "@babel/parser@^7.22.5": - version "7.22.10" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.10.tgz#e37634f9a12a1716136c44624ef54283cabd3f55" - integrity sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ== ->>>>>>> upstream/unstable "@babel/plugin-syntax-jsx@^7.22.5": version "7.22.5" @@ -178,15 +131,9 @@ "@babel/types" "^7.22.5" "@babel/traverse@^7.4.5": -<<<<<<< HEAD version "7.22.8" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e" integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw== -======= - version "7.22.10" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.10.tgz#20252acb240e746d27c2e82b4484f199cf8141aa" - integrity sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig== ->>>>>>> upstream/unstable dependencies: "@babel/code-frame" "^7.22.10" "@babel/generator" "^7.22.10" @@ -1602,14 +1549,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -<<<<<<< HEAD -======= -ansi-styles@^6.0.0, ansi-styles@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" - integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== - ->>>>>>> upstream/unstable anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -2464,17 +2403,6 @@ commander@^5.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -<<<<<<< HEAD -======= -compare-func@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3" - integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA== - dependencies: - array-ify "^1.0.0" - dot-prop "^5.1.0" - ->>>>>>> upstream/unstable compare-version@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" @@ -2515,33 +2443,6 @@ console-control-strings@^1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== -<<<<<<< HEAD -======= -conventional-changelog-angular@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-6.0.0.tgz#a9a9494c28b7165889144fd5b91573c4aa9ca541" - integrity sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg== - dependencies: - compare-func "^2.0.0" - -conventional-changelog-conventionalcommits@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-6.1.0.tgz#3bad05f4eea64e423d3d90fc50c17d2c8cf17652" - integrity sha512-3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw== - dependencies: - compare-func "^2.0.0" - -conventional-commits-parser@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz#02ae1178a381304839bce7cea9da5f1b549ae505" - integrity sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg== - dependencies: - JSONStream "^1.3.5" - is-text-path "^1.0.1" - meow "^8.1.2" - split2 "^3.2.2" - ->>>>>>> upstream/unstable copy-to-clipboard@^3.3.1: version "3.3.3" resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0" @@ -3500,24 +3401,6 @@ execa@^4.0.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -<<<<<<< HEAD -======= -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - ->>>>>>> upstream/unstable extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -5942,17 +5825,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -<<<<<<< HEAD prettier@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== -======= -prettier@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.0.tgz#3bec4489d5eebcd52b95ddd2c22467b5c852fde1" - integrity sha512-GlAIjk6DjkNT6u/Bw5QCWrbzh9YlLKwwmJT//1YiCR3WDpZDnyss64aXHQZgF8VKeGlWnX6+tGsKSVxsZT/gtA== ->>>>>>> upstream/unstable progress@^2.0.3: version "2.0.3" @@ -6827,17 +6703,6 @@ slice-ansi@^3.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -<<<<<<< HEAD -======= -slice-ansi@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" - integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== - dependencies: - ansi-styles "^6.0.0" - is-fullwidth-code-point "^4.0.0" - ->>>>>>> upstream/unstable smart-buffer@^4.0.2: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" @@ -7924,14 +7789,6 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -<<<<<<< HEAD -======= -yn@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== - ->>>>>>> upstream/unstable yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" From df3a1880748618b614053278111a065bae333de7 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 18 Oct 2023 10:47:21 +1100 Subject: [PATCH 044/302] fix: address PR reviews --- preload.js | 2 +- protos/SignalService.proto | 85 +------------------ ts/receiver/configMessage.ts | 17 ++-- ts/receiver/receiver.ts | 3 - ts/session/apis/snode_api/swarmPolling.ts | 8 +- ts/session/constants.ts | 2 + .../ClosedGroupVisibleMessage.ts | 1 + ts/session/onions/onionSend.ts | 23 ++--- .../utils/job_runners/jobs/GroupSyncJob.ts | 5 +- .../utils/job_runners/jobs/UserSyncJob.ts | 4 +- .../unit/utils/job_runner/JobRunner_test.ts | 12 +-- ts/updater/updater.ts | 21 +++-- tsconfig.json | 4 - 13 files changed, 51 insertions(+), 136 deletions(-) diff --git a/preload.js b/preload.js index 312bbd3913..c0fc59dea9 100644 --- a/preload.js +++ b/preload.js @@ -34,7 +34,7 @@ window.sessionFeatureFlags = { integrationTestEnv: Boolean( process.env.NODE_APP_INSTANCE && process.env.NODE_APP_INSTANCE.includes('test-integration') ), - useClosedGroupV2: true, + useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA debug: { debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), debugLibsessionDumps: !_.isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS), diff --git a/protos/SignalService.proto b/protos/SignalService.proto index eb5359bcb8..db1ef1fe7f 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -82,89 +82,6 @@ message DataExtractionNotification { optional uint64 timestamp = 2; } -message GroupUpdateInviteMessage { - // @required - required bytes groupIdentityPublicKey = 1; - // @required - required string name = 2; - // @required - required bytes memberSubkey = 3; - // @required - required bytes memberTag = 4; - optional bytes profileKey = 5; - optional LokiProfile profile = 6; -} - -message GroupUpdateDeleteMessage { - // @required - required bytes groupIdentityPublicKey = 1; - // @required - required bytes encryptedMemberSubkey = 2; -} - -message GroupUpdateInfoChangeMessage { - enum Type { - NAME = 1; - AVATAR = 2; - DISAPPEARING_MESSAGES = 3; - } - - // @required - required Type type = 1; - optional string updatedName = 2; - optional uint32 updatedExpiration = 3; -} - -message GroupUpdateMemberChangeMessage { - enum Type { - ADDED = 1; - REMOVED = 2; - PROMOTED = 3; - } - - // @required - required Type type = 1; - repeated bytes memberPublicKeys = 2; -} - -message GroupUpdatePromoteMessage { - // @required - required bytes memberPublicKey = 1; - // @required - required bytes encryptedGroupIdentityPrivateKey = 2; -} - -message GroupUpdateMemberLeftMessage { - // the pubkey of the member left is included as part of the closed group encryption logic (senderIdentity on desktop) -} - -message GroupUpdateInviteResponseMessage { - // @required - required bool isApproved = 1; // Whether the request was approved - optional bytes profileKey = 2; - optional LokiProfile profile = 3; -} - -message GroupUpdatePromotionResponseMessage { - // @required - required bytes encryptedMemberPublicKey = 1; -} - -message GroupUpdateDeleteMemberContentMessage { - repeated bytes memberPublicKeys = 2; -} - -message GroupUpdateMessage { - optional GroupUpdateInviteMessage inviteMessage = 31; - optional GroupUpdateDeleteMessage deleteMessage = 32; - optional GroupUpdateInfoChangeMessage infoChangeMessage = 33; - optional GroupUpdateMemberChangeMessage memberChangeMessage = 34; - optional GroupUpdatePromoteMessage promoteMessage = 35; - optional GroupUpdateMemberLeftMessage memberLeftMessage = 36; - optional GroupUpdateInviteResponseMessage inviteResponse = 37; - optional GroupUpdatePromotionResponseMessage promotionResponse = 38; - optional GroupUpdateDeleteMemberContentMessage deleteMemberContent = 39; -} @@ -271,7 +188,7 @@ message DataMessage { optional ClosedGroupControlMessage closedGroupControlMessage = 104; optional string syncTarget = 105; optional bool blocksCommunityMessageRequests = 106; - optional GroupUpdateMessage groupUpdateMessage = 120;} +} message CallMessage { diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 7e4025e876..a1d2008d35 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -119,7 +119,10 @@ async function mergeUserConfigsWithIncomingUpdates( const variant = LibSessionUtil.userNamespaceToVariant(namespace); if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { - await printDumpForDebug(`printDumpsForDebugging: before merge of ${variant}:`, variant); + await printDumpForDebug( + `printDumpsForDebugging: before merge of ${toMerge.length}, ${variant}:`, + variant + ); } const hashesMerged = await GenericWrapperActions.merge(variant, toMerge); @@ -672,13 +675,13 @@ async function handleSingleGroupUpdateToLeave(toLeave: string) { */ async function handleGroupUpdate(latestEnvelopeTimestamp: number) { // first let's check which groups needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB - const allGoupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); - const allGoupsInDb = ConvoHub.use() + const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); + const allGroupsInDb = ConvoHub.use() .getConversations() .filter(m => PubKey.isClosedGroupV2(m.id)); - const allGoupsIdsInWrapper = allGoupsInWrapper.map(m => m.pubkeyHex); - const allGoupsIdsInDb = allGoupsInDb.map(m => m.id as string); + const allGoupsIdsInWrapper = allGroupsInWrapper.map(m => m.pubkeyHex); + const allGoupsIdsInDb = allGroupsInDb.map(m => m.id as string); window.log.debug('allGoupsIdsInWrapper', stringify(allGoupsIdsInWrapper)); window.log.debug('allGoupsIdsInDb', stringify(allGoupsIdsInDb)); @@ -687,8 +690,8 @@ async function handleGroupUpdate(latestEnvelopeTimestamp: number) { throw new Error('userEdKeypair is not set'); } - for (let index = 0; index < allGoupsInWrapper.length; index++) { - const groupInWrapper = allGoupsInWrapper[index]; + for (let index = 0; index < allGroupsInWrapper.length; index++) { + const groupInWrapper = allGroupsInWrapper[index]; window.inboxStore.dispatch(groupInfoActions.handleUserGroupUpdate(groupInWrapper)); await handleSingleGroupUpdate({ groupInWrapper, latestEnvelopeTimestamp, userEdKeypair }); diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts index 48f10bedd3..4a6040de8e 100644 --- a/ts/receiver/receiver.ts +++ b/ts/receiver/receiver.ts @@ -82,9 +82,6 @@ async function handleRequestDetail( ): Promise { const envelope: any = contentIsEnvelope(data) ? data : SignalService.Envelope.decode(data); - // After this point, decoding errors are not the server's - // fault, and we should handle them gracefully and tell the - // user they received an invalid message // The message is for a group if (inConversation) { const ourNumber = UserUtils.getOurPubKeyStrFromCache(); diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 469d26810f..82d5b0f81a 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -41,6 +41,8 @@ import { RetrieveRequestResult, } from './types'; +const minMsgCountShouldRetry = 95; + export function extractWebSocketContent(message: string): null | Uint8Array { try { const dataPlaintext = new Uint8Array(StringUtils.encode(message, 'base64')); @@ -272,8 +274,8 @@ export class SwarmPolling { `Polled for group(${ed25519Str(pubkey)}):, got ${countMessages} messages back.` ); let lastPolledTimestamp = Date.now(); - if (countMessages >= 95) { - // if we get 95 messages or more back, it means there are probably more than this + if (countMessages >= minMsgCountShouldRetry) { + // if we get `minMsgCountShouldRetry` messages or more back, it means there are probably more than this // so make sure to retry the polling in the next 5sec by marking the last polled timestamp way before that it is really // this is a kind of hack lastPolledTimestamp = Date.now() - SWARM_POLLING_TIMEOUT.INACTIVE - 5 * 1000; @@ -335,7 +337,7 @@ export class SwarmPolling { } if (!resultsFromAllNamespaces?.length) { - // Not a single message from any of the polled namespace was retrieve. + // Not a single message from any of the polled namespace was retrieved. // We must still mark the current pubkey as "was just polled" await this.updateLastPollTimestampForPubkey({ countMessages: 0, diff --git a/ts/session/constants.ts b/ts/session/constants.ts index dac444ea18..616fe8d846 100644 --- a/ts/session/constants.ts +++ b/ts/session/constants.ts @@ -61,3 +61,5 @@ export const UI = { export const DEFAULT_RECENT_REACTS = ['😂', '🥰', '😢', '😡', '😮', '😈']; export const MAX_USERNAME_BYTES = 64; + +export const UPDATER_INTERVAL_MS = 10 * DURATION.MINUTES; diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index 3059b07da4..1513257384 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -52,6 +52,7 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage { type WithDestinationGroupPk = { destination: GroupPubkeyType }; type WithGroupMessageNamespace = { namespace: SnodeNamespaces.ClosedGroupMessages }; +// TODO audric This will need to extend ExpirableMessage after Disappearing Messages V2 is merged export class ClosedGroupV2VisibleMessage extends DataMessage { private readonly chatMessage: VisibleMessage; public readonly destination: GroupPubkeyType; diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts index be98ab0585..c040cb3133 100644 --- a/ts/session/onions/onionSend.ts +++ b/ts/session/onions/onionSend.ts @@ -1,8 +1,17 @@ +import { AbortSignal } from 'abort-controller'; import { toNumber } from 'lodash'; import pRetry from 'p-retry'; -import { AbortSignal } from 'abort-controller'; import { OnionPaths } from '.'; +import { Snode } from '../../data/data'; +import { fileServerPubKey, fileServerURL } from '../apis/file_server_api/FileServerApi'; +import { OpenGroupPollingUtils } from '../apis/open_group_api/opengroupV2/OpenGroupPollingUtils'; +import { invalidAuthRequiresBlinding } from '../apis/open_group_api/opengroupV2/OpenGroupServerPoller'; +import { + addBinaryContentTypeToHeaders, + addJsonContentTypeToHeaders, +} from '../apis/open_group_api/sogsv3/sogsV3SendMessage'; +import { pnServerPubkeyHex, pnServerUrl } from '../apis/push_notification_api/PnServer'; import { buildErrorMessageWithFailedCode, FinalDestNonSnodeOptions, @@ -12,16 +21,7 @@ import { STATUS_NO_STATUS, } from '../apis/snode_api/onions'; import { PROTOCOLS } from '../constants'; -import { Snode } from '../../data/data'; import { OnionV4 } from './onionv4'; -import { OpenGroupPollingUtils } from '../apis/open_group_api/opengroupV2/OpenGroupPollingUtils'; -import { - addBinaryContentTypeToHeaders, - addJsonContentTypeToHeaders, -} from '../apis/open_group_api/sogsv3/sogsV3SendMessage'; -import { pnServerPubkeyHex, pnServerUrl } from '../apis/push_notification_api/PnServer'; -import { fileServerPubKey, fileServerURL } from '../apis/file_server_api/FileServerApi'; -import { invalidAuthRequiresBlinding } from '../apis/open_group_api/opengroupV2/OpenGroupServerPoller'; export type OnionFetchOptions = { method: string; @@ -525,6 +525,9 @@ async function sendJsonViaOnionV4ToFileServer(sendOptions: { return res as OnionV4JSONSnodeResponse; } +/** + * This is used during stubbing so we can override the time between retries (so the unit tests are faster) + */ function getMinTimeoutForSogs() { return 100; } diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index f00b565647..ad83f39f3b 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -26,7 +26,7 @@ const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid const defaultMaxAttempts = 2; /** - * We want to run each of those jobs at least 3seconds apart. + * We want to run each of those jobs at least 3 seconds apart. * So every time one of that job finishes, update this timestamp, so we know when adding a new job, what is the next minimun date to run it. */ const lastRunConfigSyncJobTimestamps = new Map(); @@ -54,6 +54,7 @@ async function confirmPushedAndDump( break; } case SnodeNamespaces.ClosedGroupKeys: { + // TODO chunk 2 closed group break; } default: @@ -70,7 +71,7 @@ async function pushChangesToGroupSwarmIfNeeded(groupPk: GroupPubkeyType): Promis await LibSessionUtil.saveDumpsToDb(groupPk); const changesToPush = await LibSessionUtil.pendingChangesForGroup(groupPk); // If there are no pending changes then the job can just complete (next time something - // is updated we want to try and run immediately so don't scuedule another run in this case) + // is updated we want to try and run immediately so don't schedule another run in this case) if (isEmpty(changesToPush?.messages)) { return RunJobResult.Success; } diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index db2df4819e..afc3cf2035 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -26,7 +26,7 @@ const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid const defaultMaxAttempts = 2; /** - * We want to run each of those jobs at least 3seconds apart. + * We want to run each of those jobs at least 3 seconds apart. * So every time one of that job finishes, update this timestamp, so we know when adding a new job, what is the next minimun date to run it. */ let lastRunConfigSyncJobTimestamp: number | null = null; @@ -81,7 +81,7 @@ async function pushChangesToUserSwarmIfNeeded() { const changesToPush = await LibSessionUtil.pendingChangesForUs(); // If there are no pending changes then the job can just complete (next time something - // is updated we want to try and run immediately so don't scuedule another run in this case) + // is updated we want to try and run immediately so don't schedule another run in this case) if (isEmpty(changesToPush?.messages)) { triggerConfSyncJobDone(); return RunJobResult.Success; diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts index d9fa0ce6d8..aa581810b4 100644 --- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts +++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts @@ -2,15 +2,15 @@ import { expect } from 'chai'; import { isUndefined } from 'lodash'; import Sinon from 'sinon'; import { v4 } from 'uuid'; +import { sleepFor } from '../../../../../session/utils/Promise'; import { PersistedJobRunner } from '../../../../../session/utils/job_runners/JobRunner'; -import { FakeSleepForJob, FakeSleepForMultiJob } from './FakeSleepForJob'; import { FakeSleepForMultiJobData, FakeSleepJobData, } from '../../../../../session/utils/job_runners/PersistedJob'; -import { sleepFor } from '../../../../../session/utils/Promise'; -import { stubData } from '../../../../test-utils/utils'; import { TestUtils } from '../../../../test-utils'; +import { stubData } from '../../../../test-utils/utils'; +import { FakeSleepForJob, FakeSleepForMultiJob } from './FakeSleepForJob'; function getFakeSleepForJob(timestamp: number): FakeSleepForJob { const job = new FakeSleepForJob({ @@ -199,12 +199,6 @@ describe('JobRunner', () => { expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]); expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier); - // console.info( - // 'runnerMulti.getJobList() initial', - // runnerMulti.getJobList().map(m => m.identifier), - // Date.now() - // ); - // each job takes 5s to finish, so let's tick once the first one should be done clock.tick(5000); expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier); diff --git a/ts/updater/updater.ts b/ts/updater/updater.ts index 4abe992871..2a85b039d9 100644 --- a/ts/updater/updater.ts +++ b/ts/updater/updater.ts @@ -1,14 +1,16 @@ /* eslint-disable @typescript-eslint/no-misused-promises */ /* eslint-disable no-console */ -import * as path from 'path'; import { app, BrowserWindow } from 'electron'; import { autoUpdater, UpdateInfo } from 'electron-updater'; import * as fs from 'fs-extra'; +// eslint-disable-next-line import/order +import * as path from 'path'; import { gt as isVersionGreaterThan, parse as parseVersion } from 'semver'; import { windowMarkShouldQuit } from '../node/window_state'; import { getLastestRelease } from '../node/latest_desktop_release'; +import { UPDATER_INTERVAL_MS } from '../session/constants'; import { getPrintableError, LoggerType, @@ -40,16 +42,13 @@ export async function start( autoUpdater.logger = logger; autoUpdater.autoDownload = false; - interval = global.setInterval( - async () => { - try { - await checkForUpdates(getMainWindow, messages, logger); - } catch (error) { - logger.error('auto-update: error:', getPrintableError(error)); - } - }, - 1000 * 60 * 10 - ); // trigger and try to update every 10 minutes to let the file gets downloaded if we are updating + interval = global.setInterval(async () => { + try { + await checkForUpdates(getMainWindow, messages, logger); + } catch (error) { + logger.error('auto-update: error:', getPrintableError(error)); + } + }, UPDATER_INTERVAL_MS); // trigger and try to update every 10 minutes to let the file gets downloaded if we are updating stopped = false; global.setTimeout( diff --git a/tsconfig.json b/tsconfig.json index c281241691..5455bafe39 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,10 +27,6 @@ "resolveJsonModule": true, // Module Resolution Options // "baseUrl": "./", // Base directory to resolve non-absolute module names. - // "paths": { - // // A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. - // "@/ducks": ["ts/state/ducks/"] - // }, // "rootDirs": [], // List of root folders whose combined content represents the structure of the project at runtime. // "typeRoots": [], // List of folders to include type definitions from. // "types": [], // Type declaration files to be included in compilation. From 0fbb0cc85209269ed5cedb7f3ac38aa7eb160708 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 18 Oct 2023 13:58:35 +1100 Subject: [PATCH 045/302] chore: merge ReceiptMessage and readReceiptMessage into one --- ts/models/conversation.ts | 2 +- .../receipt/ReadReceiptMessage.ts | 28 ++++++++++++++--- .../controlMessage/receipt/ReceiptMessage.ts | 30 ------------------- 3 files changed, 25 insertions(+), 35 deletions(-) delete mode 100644 ts/session/messages/outgoing/controlMessage/receipt/ReceiptMessage.ts diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 9e710d0ae8..abda7cbe7e 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -36,7 +36,6 @@ import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/openg import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; import { getOpenGroupV2FromConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils'; import { ExpirationTimerUpdateMessage } from '../session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; -import { ReadReceiptMessage } from '../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage'; import { TypingMessage } from '../session/messages/outgoing/controlMessage/TypingMessage'; import { GroupInvitationMessage } from '../session/messages/outgoing/visibleMessage/GroupInvitationMessage'; import { OpenGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; @@ -112,6 +111,7 @@ import { READ_MESSAGE_STATE, } from './conversationAttributes'; +import { ReadReceiptMessage } from '../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage'; import { PreConditionFailed } from '../session/utils/errors'; import { LibSessionUtil } from '../session/utils/libsession/libsession_utils'; import { SessionUtilUserProfile } from '../session/utils/libsession/libsession_utils_user_profile'; diff --git a/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts b/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts index 511a66117b..3ca1c848c0 100644 --- a/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts @@ -1,8 +1,28 @@ +import { ContentMessage } from '../..'; import { SignalService } from '../../../../../protobuf'; -import { ReceiptMessage } from './ReceiptMessage'; +import { MessageParams } from '../../Message'; -export class ReadReceiptMessage extends ReceiptMessage { - public getReceiptType(): SignalService.ReceiptMessage.Type { - return SignalService.ReceiptMessage.Type.READ; +interface ReadReceiptMessageParams extends MessageParams { + timestamps: Array; +} +export class ReadReceiptMessage extends ContentMessage { + public readonly timestamps: Array; + + constructor({ timestamp, identifier, timestamps }: ReadReceiptMessageParams) { + super({ timestamp, identifier }); + this.timestamps = timestamps; + } + + public contentProto(): SignalService.Content { + return new SignalService.Content({ + receiptMessage: this.receiptProto(), + }); + } + + protected receiptProto(): SignalService.ReceiptMessage { + return new SignalService.ReceiptMessage({ + type: SignalService.ReceiptMessage.Type.READ, + timestamp: this.timestamps, + }); } } diff --git a/ts/session/messages/outgoing/controlMessage/receipt/ReceiptMessage.ts b/ts/session/messages/outgoing/controlMessage/receipt/ReceiptMessage.ts deleted file mode 100644 index 5beebca220..0000000000 --- a/ts/session/messages/outgoing/controlMessage/receipt/ReceiptMessage.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { SignalService } from '../../../../../protobuf'; -import { MessageParams } from '../../Message'; -import { ContentMessage } from '../..'; - -interface ReceiptMessageParams extends MessageParams { - timestamps: Array; -} -export abstract class ReceiptMessage extends ContentMessage { - public readonly timestamps: Array; - - constructor({ timestamp, identifier, timestamps }: ReceiptMessageParams) { - super({ timestamp, identifier }); - this.timestamps = timestamps; - } - - public abstract getReceiptType(): SignalService.ReceiptMessage.Type; - - public contentProto(): SignalService.Content { - return new SignalService.Content({ - receiptMessage: this.receiptProto(), - }); - } - - protected receiptProto(): SignalService.ReceiptMessage { - return new SignalService.ReceiptMessage({ - type: this.getReceiptType(), - timestamp: this.timestamps, - }); - } -} From c9b2d69a730f77f54a65eae179d92a2ac10b54a0 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 19 Oct 2023 13:14:20 +1100 Subject: [PATCH 046/302] fix: remove all of the ConfiguratioMessage (legacy) logic --- protos/SignalService.proto | 33 +-- ts/components/leftpane/ActionsPanel.tsx | 8 +- .../registration/RegistrationStages.tsx | 15 +- ts/receiver/closedGroups.ts | 4 +- ts/receiver/contentMessage.ts | 13 +- ts/receiver/queuedJob.ts | 6 +- .../messages/incoming/IncomingMessage.ts | 1 - .../controlMessage/ConfigurationMessage.ts | 217 --------------- ts/session/sending/MessageQueue.ts | 11 +- ts/session/sending/MessageSender.ts | 2 - ts/session/utils/User.ts | 12 +- ts/session/utils/sync/syncUtils.ts | 260 +----------------- .../messages/ConfigurationMessage_test.ts | 251 ----------------- ts/test/session/unit/utils/Messages_test.ts | 85 +----- ts/util/missingCaseError.ts | 17 +- 15 files changed, 43 insertions(+), 892 deletions(-) delete mode 100644 ts/session/messages/outgoing/controlMessage/ConfigurationMessage.ts delete mode 100644 ts/test/session/unit/messages/ConfigurationMessage_test.ts diff --git a/protos/SignalService.proto b/protos/SignalService.proto index db1ef1fe7f..5dd6dfdedf 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -52,11 +52,12 @@ message SharedConfigMessage { } message Content { + reserved 7; + reserved "configurationMessage"; optional DataMessage dataMessage = 1; optional CallMessage callMessage = 3; optional ReceiptMessage receiptMessage = 5; optional TypingMessage typingMessage = 6; - optional ConfigurationMessage configurationMessage = 7; optional DataExtractionNotification dataExtractionNotification = 8; optional Unsend unsendMessage = 9; optional MessageRequestResponse messageRequestResponse = 10; @@ -212,36 +213,6 @@ message CallMessage { } -message ConfigurationMessage { - - message ClosedGroup { - optional bytes publicKey = 1; - optional string name = 2; - optional KeyPair encryptionKeyPair = 3; - repeated bytes members = 4; - repeated bytes admins = 5; - } - - message Contact { - // @required - required bytes publicKey = 1; - // @required - required string name = 2; - optional string profilePicture = 3; - optional bytes profileKey = 4; - optional bool isApproved = 5; - optional bool isBlocked = 6; - optional bool didApproveMe = 7; - } - - repeated ClosedGroup closedGroups = 1; - repeated string openGroups = 2; - optional string displayName = 3; - optional string profilePicture = 4; - optional bytes profileKey = 5; - repeated Contact contacts = 6; -} - message ReceiptMessage { enum Type { diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index ad015a663e..5e8263ccc0 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -9,7 +9,6 @@ import useTimeoutFn from 'react-use/lib/useTimeoutFn'; import { Data } from '../../data/data'; import { ConvoHub } from '../../session/conversations'; import { getMessageQueue } from '../../session/sending'; -import { syncConfigurationIfNeeded } from '../../session/utils/sync/syncUtils'; import { clearSearch } from '../../state/ducks/search'; import { resetOverlayMode, SectionType, showLeftPaneSection } from '../../state/ducks/section'; @@ -42,10 +41,11 @@ import { forceRefreshRandomSnodePool, getFreshSwarmFor, } from '../../session/apis/snode_api/snodePool'; +import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; +import { forceSyncConfigurationNowIfNeeded } from '../../session/utils/sync/syncUtils'; import { isDarkTheme } from '../../state/selectors/theme'; import { ThemeStateType } from '../../themes/constants/colors'; import { switchThemeTo } from '../../themes/switchTheme'; -import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; const Section = (props: { type: SectionType }) => { const ourNumber = useSelector(getOurNumber); @@ -167,7 +167,7 @@ const triggerSyncIfNeeded = async () => { const didWeHandleAConfigurationMessageAlready = (await Data.getItemById(SettingsKey.hasSyncedInitialConfigurationItem))?.value || false; if (didWeHandleAConfigurationMessageAlready) { - await syncConfigurationIfNeeded(); + await forceSyncConfigurationNowIfNeeded(); } }; @@ -267,7 +267,7 @@ export const ActionsPanel = () => { if (!ourPrimaryConversation) { return; } - void syncConfigurationIfNeeded(); + void forceSyncConfigurationNowIfNeeded(); }, DURATION.DAYS * 2); useInterval(() => { diff --git a/ts/components/registration/RegistrationStages.tsx b/ts/components/registration/RegistrationStages.tsx index db676adc06..7a63b26f84 100644 --- a/ts/components/registration/RegistrationStages.tsx +++ b/ts/components/registration/RegistrationStages.tsx @@ -1,12 +1,12 @@ import React, { createContext, useEffect, useState } from 'react'; -import { SignUpMode, SignUpTab } from './SignUpTab'; -import { SignInMode, SignInTab } from './SignInTab'; import { Data } from '../../data/data'; +import { SettingsKey } from '../../data/settings-key'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { ConvoHub } from '../../session/conversations'; import { mnDecode } from '../../session/crypto/mnemonic'; import { PromiseUtils, StringUtils, ToastUtils } from '../../session/utils'; import { TaskTimedOutError } from '../../session/utils/Promise'; +import { fromHex } from '../../session/utils/String'; import { trigger } from '../../shims/events'; import { generateMnemonic, @@ -14,9 +14,9 @@ import { sessionGenerateKeyPair, signInByLinkingDevice, } from '../../util/accountManager'; -import { fromHex } from '../../session/utils/String'; -import { setSignInByLinking, setSignWithRecoveryPhrase, Storage } from '../../util/storage'; -import { SettingsKey } from '../../data/settings-key'; +import { Storage, setSignInByLinking, setSignWithRecoveryPhrase } from '../../util/storage'; +import { SignInMode, SignInTab } from './SignInTab'; +import { SignUpMode, SignUpTab } from './SignUpTab'; export async function resetRegistration() { await Data.removeAll(); @@ -71,8 +71,7 @@ export async function signUp(signUpDetails: { /** * Sign in/restore from seed. - * Ask for a display name, as we will drop incoming ConfigurationMessages if any are saved on the swarm. - * We will handle a ConfigurationMessage + * Ask for a display name, as we will drop incoming libsession updates if any are saved on the swarm. */ export async function signInWithRecovery(signInDetails: { displayName: string; @@ -102,7 +101,7 @@ export async function signInWithRecovery(signInDetails: { /** * This is will try to sign in with the user recovery phrase. - * If no ConfigurationMessage is received in 60seconds, the loading will be canceled. + * If no libsession updates is received in 60seconds, the loading will be canceled. */ export async function signInWithLinking(signInDetails: { userRecoveryPhrase: string }) { const { userRecoveryPhrase } = signInDetails; diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index f13dd3cd5b..2ec248783b 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -22,10 +22,10 @@ import { perfEnd, perfStart } from '../session/utils/Performance'; import { ReleasedFeatures } from '../util/releaseFeature'; import { Storage } from '../util/storage'; // eslint-disable-next-line import/no-unresolved, import/extensions +import { ConfigWrapperUser } from '../webworker/workers/browser/libsession_worker_functions'; import { getSettingsKeyFromLibsessionWrapper } from './configMessage'; import { ECKeyPair, HexKeyPair } from './keypairs'; import { queueAllCachedFromSource } from './receiver'; -import { ConfigWrapperUser } from '../webworker/workers/browser/libsession_worker_functions'; export const distributingClosedGroupEncryptionKeyPairs = new Map(); @@ -101,7 +101,7 @@ export async function handleClosedGroupControlMessage( return; } - // We drop New closed group message from our other devices, as they will come as ConfigurationMessage instead + // We drop New closed group message from our other devices, as they will come through libsession instead if (type === Type.ENCRYPTION_KEY_PAIR) { const isComingFromGroupPubkey = envelope.type === SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE; diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 39b2239bb4..1cfa8b27ac 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -483,11 +483,7 @@ export async function innerHandleSwarmContentMessage( perfEnd(`handleTypingMessage-${envelope.id}`, 'handleTypingMessage'); return; } - if (content.configurationMessage) { - // we drop support for legacy configuration message - await removeFromCache(envelope); - return; - } + if (content.sharedConfigMessage) { window.log.warn('content.sharedConfigMessage are handled outside of the receiving pipeline'); // this should never happen, but remove it from cache just in case something is messed up @@ -509,16 +505,23 @@ export async function innerHandleSwarmContentMessage( } if (content.unsendMessage) { await handleUnsendMessage(envelope, content.unsendMessage as SignalService.Unsend); + return; } if (content.callMessage) { await handleCallMessage(envelope, content.callMessage as SignalService.CallMessage); + return; } if (content.messageRequestResponse) { await handleMessageRequestResponse( envelope, content.messageRequestResponse as SignalService.MessageRequestResponse ); + return; } + + // If we get here, we don't know how to handle that envelope. probably a very old type of message, or something we don't support. + // There is not much we can do expect drop it + await removeFromCache(envelope); } catch (e) { window?.log?.warn(e.message); } diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index 956f9ddebe..789d8de8b7 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -12,13 +12,13 @@ import { ConversationTypeEnum, READ_MESSAGE_STATE } from '../models/conversation import { MessageDirection } from '../models/messageType'; import { SignalService } from '../protobuf'; import { ProfileManager } from '../session/profile_manager/ProfileManager'; +import { PubKey } from '../session/types'; +import { PropsForMessageWithoutConvoProps, lookupQuote } from '../state/ducks/conversations'; import { showMessageRequestBannerOutsideRedux } from '../state/ducks/userConfig'; import { getHideMessageRequestBannerOutsideRedux } from '../state/selectors/userConfig'; import { GoogleChrome } from '../util'; import { LinkPreviews } from '../util/linkPreviews'; import { ReleasedFeatures } from '../util/releaseFeature'; -import { PropsForMessageWithoutConvoProps, lookupQuote } from '../state/ducks/conversations'; -import { PubKey } from '../session/types'; function contentTypeSupported(type: string): boolean { const Chrome = GoogleChrome; @@ -436,7 +436,7 @@ export async function handleMessageJob( void queueAttachmentDownloads(messageModel, conversation); // Check if we need to update any profile names // the only profile we don't update with what is coming here is ours, - // as our profile is shared across our devices with a ConfigurationMessage + // as our profile is shared across our devices with libsession if (messageModel.isIncoming() && regularDataMessage.profile) { await ProfileManager.updateProfileOfContact( sendingDeviceConversation.id, diff --git a/ts/session/messages/incoming/IncomingMessage.ts b/ts/session/messages/incoming/IncomingMessage.ts index 4e08f1d55b..995e2b27bd 100644 --- a/ts/session/messages/incoming/IncomingMessage.ts +++ b/ts/session/messages/incoming/IncomingMessage.ts @@ -6,7 +6,6 @@ type IncomingMessageAvailableTypes = | SignalService.CallMessage | SignalService.ReceiptMessage | SignalService.TypingMessage - | SignalService.ConfigurationMessage | SignalService.DataExtractionNotification | SignalService.Unsend | SignalService.MessageRequestResponse diff --git a/ts/session/messages/outgoing/controlMessage/ConfigurationMessage.ts b/ts/session/messages/outgoing/controlMessage/ConfigurationMessage.ts deleted file mode 100644 index 00ec330c3f..0000000000 --- a/ts/session/messages/outgoing/controlMessage/ConfigurationMessage.ts +++ /dev/null @@ -1,217 +0,0 @@ -// this is not a very good name, but a configuration message is a message sent to our other devices so sync our current public and closed groups - -import { SignalService } from '../../../../protobuf'; -import { MessageParams } from '../Message'; -import { ECKeyPair } from '../../../../receiver/keypairs'; -import { fromHexToArray } from '../../../utils/String'; -import { PubKey } from '../../../types'; -import { ContentMessage } from '..'; - -interface ConfigurationMessageParams extends MessageParams { - activeClosedGroups: Array; - activeOpenGroups: Array; - displayName: string; - profilePicture?: string; - profileKey?: Uint8Array; - contacts: Array; -} - -export class ConfigurationMessage extends ContentMessage { - public readonly activeClosedGroups: Array; - public readonly activeOpenGroups: Array; - public readonly displayName: string; - public readonly profilePicture?: string; - public readonly profileKey?: Uint8Array; - public readonly contacts: Array; - - constructor(params: ConfigurationMessageParams) { - super({ timestamp: params.timestamp, identifier: params.identifier }); - this.activeClosedGroups = params.activeClosedGroups; - this.activeOpenGroups = params.activeOpenGroups; - this.displayName = params.displayName; - this.profilePicture = params.profilePicture; - this.profileKey = params.profileKey; - this.contacts = params.contacts; - - if (!this.activeClosedGroups) { - throw new Error('closed group must be set'); - } - - if (!this.activeOpenGroups) { - throw new Error('open group must be set'); - } - - if (!this.displayName || !this.displayName?.length) { - throw new Error('displayName must be set'); - } - - if (this.profilePicture && typeof this.profilePicture !== 'string') { - throw new Error('profilePicture set but not an Uin8Array'); - } - - if (this.profileKey && !(this.profileKey instanceof Uint8Array)) { - throw new Error('profileKey set but not an Uin8Array'); - } - - if (!this.contacts) { - throw new Error('contacts must be set'); - } - } - - public contentProto(): SignalService.Content { - return new SignalService.Content({ - configurationMessage: this.configurationProto(), - }); - } - - protected configurationProto(): SignalService.ConfigurationMessage { - return new SignalService.ConfigurationMessage({ - closedGroups: this.mapClosedGroupsObjectToProto(this.activeClosedGroups), - openGroups: this.activeOpenGroups, - displayName: this.displayName, - profilePicture: this.profilePicture, - profileKey: this.profileKey, - contacts: this.mapContactsObjectToProto(this.contacts), - }); - } - - private mapClosedGroupsObjectToProto( - closedGroups: Array - ): Array { - return (closedGroups || []).map(m => m.toProto()); - } - - private mapContactsObjectToProto( - contacts: Array - ): Array { - return (contacts || []).map(m => m.toProto()); - } -} - -export class ConfigurationMessageContact { - public publicKey: string; - public displayName: string; - public profilePictureURL?: string; - public profileKey?: Uint8Array; - public isApproved?: boolean; - public isBlocked?: boolean; - public didApproveMe?: boolean; - - public constructor({ - publicKey, - displayName, - profilePictureURL, - profileKey, - isApproved, - isBlocked, - didApproveMe, - }: { - publicKey: string; - displayName: string; - profilePictureURL?: string; - profileKey?: Uint8Array; - isApproved?: boolean; - isBlocked?: boolean; - didApproveMe?: boolean; - }) { - this.publicKey = publicKey; - this.displayName = displayName; - this.profilePictureURL = profilePictureURL; - this.profileKey = profileKey; - this.isApproved = isApproved; - this.isBlocked = isBlocked; - this.didApproveMe = didApproveMe; - - // will throw if public key is invalid - PubKey.cast(publicKey); - - if (this.displayName?.length === 0) { - throw new Error('displayName must be set or undefined'); - } - - if (this.profilePictureURL !== undefined && this.profilePictureURL?.length === 0) { - throw new Error('profilePictureURL must either undefined or not empty'); - } - if (this.profileKey !== undefined && this.profileKey?.length === 0) { - throw new Error('profileKey must either undefined or not empty'); - } - } - - public toProto(): SignalService.ConfigurationMessage.Contact { - return new SignalService.ConfigurationMessage.Contact({ - publicKey: fromHexToArray(this.publicKey), - name: this.displayName, - profilePicture: this.profilePictureURL, - profileKey: this.profileKey, - isApproved: this.isApproved, - isBlocked: this.isBlocked, - didApproveMe: this.didApproveMe, - }); - } -} - -export class ConfigurationMessageClosedGroup { - public publicKey: string; - public name: string; - public encryptionKeyPair: ECKeyPair; - public members: Array; - public admins: Array; - - public constructor({ - publicKey, - name, - encryptionKeyPair, - members, - admins, - }: { - publicKey: string; - name: string; - encryptionKeyPair: ECKeyPair; - members: Array; - admins: Array; - }) { - this.publicKey = publicKey; - this.name = name; - this.encryptionKeyPair = encryptionKeyPair; - this.members = members; - this.admins = admins; - - // will throw if publik key is invalid - PubKey.cast(publicKey); - - if ( - !encryptionKeyPair?.privateKeyData?.byteLength || - !encryptionKeyPair?.publicKeyData?.byteLength - ) { - throw new Error('Encryption key pair looks invalid'); - } - - if (!this.name?.length) { - throw new Error('name must be set'); - } - - if (!this.members?.length) { - throw new Error('members must be set'); - } - if (!this.admins?.length) { - throw new Error('admins must be set'); - } - - if (this.admins.some(a => !this.members.includes(a))) { - throw new Error('some admins are not members'); - } - } - - public toProto(): SignalService.ConfigurationMessage.ClosedGroup { - return new SignalService.ConfigurationMessage.ClosedGroup({ - publicKey: fromHexToArray(this.publicKey), - name: this.name, - encryptionKeyPair: { - publicKey: this.encryptionKeyPair.publicKeyData, - privateKey: this.encryptionKeyPair.privateKeyData, - }, - members: this.members.map(fromHexToArray), - admins: this.admins.map(fromHexToArray), - }); - } -} diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index cce7659259..78452b6a96 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -1,7 +1,6 @@ import { AbortController } from 'abort-controller'; import { MessageSender } from '.'; -import { ConfigurationMessage } from '../messages/outgoing/controlMessage/ConfigurationMessage'; import { ClosedGroupMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMessage'; import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage'; import { PubKey, RawMessage } from '../types'; @@ -62,7 +61,7 @@ export class MessageQueue { sentCb?: (message: RawMessage) => Promise, isGroup = false ): Promise { - if (message instanceof ConfigurationMessage || !!(message as any).syncTarget) { + if ((message as any).syncTarget) { throw new Error('SyncMessage needs to be sent with sendSyncMessage'); } await this.process(destinationPubKey, message, namespace, sentCb, isGroup); @@ -230,11 +229,7 @@ export class MessageQueue { if (!message) { return; } - if ( - !(message instanceof ConfigurationMessage) && - !(message instanceof UnsendMessage) && - !(message as any)?.syncTarget - ) { + if (!(message instanceof UnsendMessage) && !(message as any)?.syncTarget) { throw new Error('Invalid message given to sendSyncMessage'); } @@ -347,7 +342,7 @@ export class MessageQueue { const us = UserUtils.getOurPubKeyFromCache(); let isSyncMessage = false; if (us && destinationPk.isEqual(us)) { - // We allow a message for ourselves only if it's a ConfigurationMessage, a ClosedGroupNewMessage, + // We allow a message for ourselves only if it's a ClosedGroupNewMessage, // or a message with a syncTarget set. if (MessageSender.isSyncMessage(message)) { diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index c6dc63e840..28e02eba9d 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -29,7 +29,6 @@ import { ConvoHub } from '../conversations'; import { MessageEncrypter } from '../crypto'; import { addMessagePadding } from '../crypto/BufferPadding'; import { ContentMessage } from '../messages/outgoing'; -import { ConfigurationMessage } from '../messages/outgoing/controlMessage/ConfigurationMessage'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; @@ -79,7 +78,6 @@ function getMinRetryTimeout() { function isSyncMessage(message: ContentMessage) { if ( - message instanceof ConfigurationMessage || message instanceof ClosedGroupNewMessage || message instanceof UnsendMessage || (message as any).syncTarget?.length > 0 diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts index df0d3239d3..4a2def2dde 100644 --- a/ts/session/utils/User.ts +++ b/ts/session/utils/User.ts @@ -1,12 +1,12 @@ import _ from 'lodash'; import { UserUtils } from '.'; import { Data } from '../../data/data'; +import { SessionKeyPair } from '../../receiver/keypairs'; +import { LokiProfile } from '../../types/Message'; +import { getOurPubKeyStrFromStorage } from '../../util/storage'; +import { ConvoHub } from '../conversations'; import { PubKey } from '../types'; import { fromHexToArray, toHex } from './String'; -import { ConvoHub } from '../conversations'; -import { LokiProfile } from '../../types/Message'; -import { getOurPubKeyStrFromStorage, Storage } from '../../util/storage'; -import { SessionKeyPair } from '../../receiver/keypairs'; export type HexKeyPair = { pubKey: string; @@ -100,9 +100,7 @@ export const getUserED25519KeyPairBytes = async (): Promise => - (await Data.getItemById(ITEM_ID_LAST_SYNC_TIMESTAMP))?.value; - -const writeLastSyncTimestampToDb = async (timestamp: number) => - Storage.put(ITEM_ID_LAST_SYNC_TIMESTAMP, timestamp); - -/** - * Conditionally Syncs user configuration with other devices linked. - */ -export const syncConfigurationIfNeeded = async () => { - await UserSync.queueNewJobIfNeeded(); - - const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); - if (!userConfigLibsession) { - const lastSyncedTimestamp = (await getLastSyncTimestampFromDb()) || 0; - const now = Date.now(); - - // if the last sync was less than 2 days before, return early. - if (Math.abs(now - lastSyncedTimestamp) < DURATION.DAYS * 2) { - return; - } - - const allConvos = ConvoHub.use().getConversations(); - - const configMessage = await getCurrentConfigurationMessage(allConvos); - try { - // window?.log?.info('syncConfigurationIfNeeded with', configMessage); - - await getMessageQueue().sendSyncMessage({ - namespace: SnodeNamespaces.Default, - message: configMessage, - }); - } catch (e) { - window?.log?.warn('Caught an error while sending our ConfigurationMessage:', e); - // we do return early so that next time we use the old timestamp again - // and so try again to trigger a sync - return; - } - await writeLastSyncTimestampToDb(now); - } -}; - export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = false) => { await ReleasedFeatures.checkIsUserConfigFeatureReleased(); return new Promise(resolve => { @@ -91,197 +29,14 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal e.message ); }); - if (ReleasedFeatures.isUserConfigFeatureReleasedCached()) { - if (waitForMessageSent) { - window.Whisper.events.once(UserSyncJobDone, () => { - resolve(true); - }); - return; - } - resolve(true); - return; - } - const allConvos = ConvoHub.use().getConversations(); - // eslint-disable-next-line more/no-then - void getCurrentConfigurationMessage(allConvos) - .then(configMessage => { - // this just adds the message to the sending queue. - // if waitForMessageSent is set, we need to effectively wait until then - - const callback = waitForMessageSent - ? () => { - resolve(true); - } - : undefined; - void getMessageQueue().sendSyncMessage({ - namespace: SnodeNamespaces.Default, - message: configMessage, - sentCb: callback as any, - }); - // either we resolve from the callback if we need to wait for it, - // or we don't want to wait, we resolve it here. - if (!waitForMessageSent) { - resolve(true); - } - }) - .catch(e => { - window?.log?.warn('Caught an error while building our ConfigurationMessage:', e); - resolve(false); + if (waitForMessageSent) { + window.Whisper.events.once(UserSyncJobDone, () => { + resolve(true); }); - }); -}; - -const getActiveOpenGroupV2CompleteUrls = async ( - convos: Array -): Promise> => { - // Filter open groups v2 - const openGroupsV2ConvoIds = convos - .filter(c => !!c.getActiveAt() && c.isOpenGroupV2() && !c.isLeft()) - .map(c => c.id) as Array; - - const urls = await Promise.all( - openGroupsV2ConvoIds.map(async opengroupConvoId => { - const roomInfos = OpenGroupData.getV2OpenGroupRoom(opengroupConvoId); - - if (roomInfos) { - return getCompleteUrlFromRoom(roomInfos); - } - return null; - }) - ); - - return _.compact(urls) || []; -}; - -const getValidClosedGroups = async (convos: Array) => { - const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); - - // Filter Closed/Medium groups - const closedGroupModels = convos.filter( - c => - !!c.getActiveAt() && - c.isClosedGroup() && - c.getGroupMembers()?.includes(ourPubKey) && - !c.isLeft() && - !c.isKickedFromGroup() && - !c.isBlocked() && - c.getRealSessionUsername() - ); - - const closedGroups = await Promise.all( - closedGroupModels.map(async c => { - const groupPubKey = c.get('id'); - const fetchEncryptionKeyPair = await Data.getLatestClosedGroupEncryptionKeyPair(groupPubKey); - if (!fetchEncryptionKeyPair) { - return null; - } - - return new ConfigurationMessageClosedGroup({ - publicKey: groupPubKey, - name: c.getRealSessionUsername() || '', - members: c.getGroupMembers() || [], - admins: c.getGroupAdmins(), - encryptionKeyPair: ECKeyPair.fromHexKeyPair(fetchEncryptionKeyPair), - }); - }) - ); - - const onlyValidClosedGroup = closedGroups.filter( - m => m !== null - ) as Array; - return onlyValidClosedGroup; -}; - -const getValidContacts = (convos: Array) => { - // Filter contacts - // blindedId are synced with the outbox logic. - const contactsModels = convos.filter( - c => - !!c.getActiveAt() && - c.getRealSessionUsername() && - c.isPrivate() && - c.isApproved() && - !PubKey.isBlinded(c.get('id')) - ); - - const contacts = contactsModels.map(c => { - try { - const profileKey = c.getProfileKey(); - let profileKeyForContact = null; - if (typeof profileKey === 'string') { - // this will throw if the profileKey is not in hex. - try { - // for some reason, at some point, the saved profileKey is a string in base64 format - // this hack is here to update existing conversations with a non-hex profileKey to a hex format and save them - - if (!/^[0-9a-fA-F]+$/.test(profileKey)) { - throw new Error('Not Hex'); - } - profileKeyForContact = fromHexToArray(profileKey); - } catch (e) { - // if not hex, try to decode it as base64 - profileKeyForContact = fromBase64ToArray(profileKey); - // if the line above does not fail, update the stored profileKey for this convo - void c.setProfileKey(profileKeyForContact); - } - } else if (profileKey) { - window.log.warn( - 'Got a profileKey for a contact in another format than string. Contact: ', - c.id - ); - return null; - } - - return new ConfigurationMessageContact({ - publicKey: c.id as string, - displayName: c.getRealSessionUsername() || 'Anonymous', - profilePictureURL: c.getAvatarPointer(), - profileKey: !profileKeyForContact?.length ? undefined : profileKeyForContact, - isApproved: c.isApproved(), - isBlocked: c.isBlocked(), - didApproveMe: c.didApproveMe(), - }); - } catch (e) { - window?.log.warn('getValidContacts', e); - return null; + return; } - }); - return _.compact(contacts); -}; - -export const getCurrentConfigurationMessage = async ( - convos: Array -): Promise => { - const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); - const ourConvo = convos.find(convo => convo.id === ourPubKey); - - const opengroupV2CompleteUrls = await getActiveOpenGroupV2CompleteUrls(convos); - const onlyValidClosedGroup = await getValidClosedGroups(convos); - const validContacts = getValidContacts(convos); - - if (!ourConvo) { - window?.log?.error('Could not find our convo while building a configuration message.'); - } - - const ourProfileKeyHex = - ConvoHub.use().get(UserUtils.getOurPubKeyStrFromCache())?.getProfileKey() || null; - const profileKey = ourProfileKeyHex ? fromHexToArray(ourProfileKeyHex) : undefined; - - const profilePicture = ourConvo?.getAvatarPointer() || undefined; - const displayName = ourConvo?.getRealSessionUsername() || 'Anonymous'; // this should never be undefined, but well... - - const activeOpenGroups = [...opengroupV2CompleteUrls]; - - return new ConfigurationMessage({ - identifier: uuidv4(), - timestamp: Date.now(), - activeOpenGroups, - activeClosedGroups: onlyValidClosedGroup, - displayName, - profilePicture, - profileKey, - contacts: validContacts, + resolve(true); }); }; @@ -348,7 +103,6 @@ const buildSyncExpireTimerMessage = ( export type SyncMessageType = | VisibleMessage | ExpirationTimerUpdateMessage - | ConfigurationMessage | MessageRequestResponse | UnsendMessage; @@ -368,7 +122,7 @@ export const buildSyncMessage = ( if (!sentTimestamp || !_.isNumber(sentTimestamp)) { throw new Error('Tried to build a sync message without a sentTimestamp'); } - // don't include our profileKey on syncing message. This is to be done by a ConfigurationMessage now + // don't include our profileKey on syncing message. This is to be done through libsession now const timestamp = _.toNumber(sentTimestamp); if (dataMessage.flags === SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE) { return buildSyncExpireTimerMessage(identifier, dataMessage, timestamp, syncTarget); diff --git a/ts/test/session/unit/messages/ConfigurationMessage_test.ts b/ts/test/session/unit/messages/ConfigurationMessage_test.ts deleted file mode 100644 index ca541a7769..0000000000 --- a/ts/test/session/unit/messages/ConfigurationMessage_test.ts +++ /dev/null @@ -1,251 +0,0 @@ -import { expect } from 'chai'; -import { ECKeyPair } from '../../../../receiver/keypairs'; -import { TTL_DEFAULT } from '../../../../session/constants'; - -import { - ConfigurationMessage, - ConfigurationMessageClosedGroup, - ConfigurationMessageContact, -} from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage'; -import { TestUtils } from '../../../test-utils'; - -describe('ConfigurationMessage', () => { - it('throw if closed group is not set', () => { - const activeClosedGroups = null as any; - const params = { - activeClosedGroups, - activeOpenGroups: [], - timestamp: Date.now(), - displayName: 'displayName', - contacts: [], - }; - expect(() => new ConfigurationMessage(params)).to.throw('closed group must be set'); - }); - - it('throw if open group is not set', () => { - const activeOpenGroups = null as any; - const params = { - activeClosedGroups: [], - activeOpenGroups, - timestamp: Date.now(), - displayName: 'displayName', - contacts: [], - }; - expect(() => new ConfigurationMessage(params)).to.throw('open group must be set'); - }); - - it('throw if display name is not set', () => { - const params = { - activeClosedGroups: [], - activeOpenGroups: [], - timestamp: Date.now(), - displayName: undefined as any, - contacts: [], - }; - expect(() => new ConfigurationMessage(params)).to.throw('displayName must be set'); - }); - - it('throw if display name is set but empty', () => { - const params = { - activeClosedGroups: [], - activeOpenGroups: [], - timestamp: Date.now(), - displayName: undefined as any, - contacts: [], - }; - expect(() => new ConfigurationMessage(params)).to.throw('displayName must be set'); - }); - - it('ttl is 4 days', () => { - const params = { - activeClosedGroups: [], - activeOpenGroups: [], - timestamp: Date.now(), - displayName: 'displayName', - contacts: [], - }; - const configMessage = new ConfigurationMessage(params); - expect(configMessage.ttl()).to.be.equal(TTL_DEFAULT.TTL_MAX); - }); - - describe('ConfigurationMessageClosedGroup', () => { - it('throw if closed group has no encryptionkeypair', () => { - const member = TestUtils.generateFakePubKey().key; - const params = { - publicKey: TestUtils.generateFakePubKey().key, - name: 'groupname', - members: [member], - admins: [member], - encryptionKeyPair: undefined as any, - }; - - expect(() => new ConfigurationMessageClosedGroup(params)).to.throw( - 'Encryption key pair looks invalid' - ); - }); - - it('throw if closed group has invalid encryptionkeypair', () => { - const member = TestUtils.generateFakePubKey().key; - const params = { - publicKey: TestUtils.generateFakePubKey().key, - name: 'groupname', - members: [member], - admins: [member], - encryptionKeyPair: new ECKeyPair(new Uint8Array(), new Uint8Array()), - }; - - expect(() => new ConfigurationMessageClosedGroup(params)).to.throw( - 'Encryption key pair looks invalid' - ); - }); - - it('throw if closed group has invalid pubkey', () => { - const member = TestUtils.generateFakePubKey().key; - const params = { - publicKey: 'invalidpubkey', - name: 'groupname', - members: [member], - admins: [member], - encryptionKeyPair: TestUtils.generateFakeECKeyPair(), - }; - - expect(() => new ConfigurationMessageClosedGroup(params)).to.throw(); - }); - - it('throw if closed group has invalid name', () => { - const member = TestUtils.generateFakePubKey().key; - const params = { - publicKey: TestUtils.generateFakePubKey().key, - name: '', - members: [member], - admins: [member], - encryptionKeyPair: TestUtils.generateFakeECKeyPair(), - }; - - expect(() => new ConfigurationMessageClosedGroup(params)).to.throw('name must be set'); - }); - - it('throw if members is empty', () => { - const member = TestUtils.generateFakePubKey().key; - const params = { - publicKey: TestUtils.generateFakePubKey().key, - name: 'groupname', - members: [], - admins: [member], - encryptionKeyPair: TestUtils.generateFakeECKeyPair(), - }; - - expect(() => new ConfigurationMessageClosedGroup(params)).to.throw('members must be set'); - }); - - it('throw if admins is empty', () => { - const member = TestUtils.generateFakePubKey().key; - const params = { - publicKey: TestUtils.generateFakePubKey().key, - name: 'groupname', - members: [member], - admins: [], - encryptionKeyPair: TestUtils.generateFakeECKeyPair(), - }; - - expect(() => new ConfigurationMessageClosedGroup(params)).to.throw('admins must be set'); - }); - - it('throw if some admins are not members', () => { - const member = TestUtils.generateFakePubKey().key; - const admin = TestUtils.generateFakePubKey().key; - const params = { - publicKey: TestUtils.generateFakePubKey().key, - name: 'groupname', - members: [member], - admins: [admin], - encryptionKeyPair: TestUtils.generateFakeECKeyPair(), - }; - - expect(() => new ConfigurationMessageClosedGroup(params)).to.throw( - 'some admins are not members' - ); - }); - }); - - describe('ConfigurationMessageContact', () => { - it('throws if contacts is not set', () => { - const params = { - activeClosedGroups: [], - activeOpenGroups: [], - timestamp: Date.now(), - displayName: 'displayName', - contacts: undefined as any, - }; - expect(() => new ConfigurationMessage(params)).to.throw('contacts must be set'); - }); - it('throw if some admins are not members', () => { - const member = TestUtils.generateFakePubKey().key; - const admin = TestUtils.generateFakePubKey().key; - const params = { - publicKey: TestUtils.generateFakePubKey().key, - name: 'groupname', - members: [member], - admins: [admin], - encryptionKeyPair: TestUtils.generateFakeECKeyPair(), - }; - - expect(() => new ConfigurationMessageClosedGroup(params)).to.throw( - 'some admins are not members' - ); - }); - - it('throw if the contact has not a valid pubkey', () => { - const params = { - publicKey: '05', - displayName: 'contactDisplayName', - }; - - expect(() => new ConfigurationMessageContact(params)).to.throw(); - - const params2 = { - publicKey: undefined as any, - displayName: 'contactDisplayName', - }; - - expect(() => new ConfigurationMessageContact(params2)).to.throw(); - }); - - it('throw if the contact has an empty display name', () => { - // a display name cannot be empty nor undefined - - expect(() => new ConfigurationMessageContact(params2)).to.throw(); - - const params2 = { - publicKey: TestUtils.generateFakePubKey().key, - displayName: '', - }; - - expect(() => new ConfigurationMessageContact(params2)).to.throw(); - }); - - it('throw if the contact has a profilePictureURL set but empty', () => { - const params = { - publicKey: TestUtils.generateFakePubKey().key, - displayName: 'contactDisplayName', - profilePictureURL: '', - }; - - expect(() => new ConfigurationMessageContact(params)).to.throw( - 'profilePictureURL must either undefined or not empty' - ); - }); - - it('throw if the contact has a profileKey set but empty', () => { - const params = { - publicKey: TestUtils.generateFakePubKey().key, - displayName: 'contactDisplayName', - profileKey: new Uint8Array(), - }; - - expect(() => new ConfigurationMessageContact(params)).to.throw( - 'profileKey must either undefined or not empty' - ); - }); - }); -}); diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts index 82feda2be9..babd9e70cf 100644 --- a/ts/test/session/unit/utils/Messages_test.ts +++ b/ts/test/session/unit/utils/Messages_test.ts @@ -1,29 +1,21 @@ /* eslint-disable no-unused-expressions */ import chai from 'chai'; import chaiAsPromised from 'chai-as-promised'; -import { beforeEach } from 'mocha'; import Sinon from 'sinon'; -import { ConfigurationMessage } from '../../../../session/messages/outgoing/controlMessage/ConfigurationMessage'; import { ClosedGroupVisibleMessage } from '../../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { PubKey } from '../../../../session/types'; -import { MessageUtils, UserUtils } from '../../../../session/utils'; +import { MessageUtils } from '../../../../session/utils'; import { TestUtils } from '../../../test-utils'; -import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups'; -import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; import { SignalService } from '../../../../protobuf'; -import { getOpenGroupV2ConversationId } from '../../../../session/apis/open_group_api/utils/OpenGroupUtils'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; -import { ConvoHub } from '../../../../session/conversations'; import { ClosedGroupAddedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage'; import { ClosedGroupEncryptionPairMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage'; import { ClosedGroupEncryptionPairReplyMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage'; import { ClosedGroupNameChangeMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage'; import { ClosedGroupNewMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { ClosedGroupRemovedMembersMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage'; -import { getCurrentConfigurationMessage } from '../../../../session/utils/sync/syncUtils'; -import { stubData, stubOpenGroupData } from '../../../test-utils/utils'; chai.use(chaiAsPromised as any); @@ -205,80 +197,5 @@ describe('Message Utils', () => { const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.Default); expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE); }); - - it('passing a ConfigurationMessage returns Fallback', async () => { - const device = TestUtils.generateFakePubKey(); - - const msg = new ConfigurationMessage({ - timestamp: Date.now(), - activeOpenGroups: [], - activeClosedGroups: [], - displayName: 'displayName', - contacts: [], - }); - const rawMessage = await MessageUtils.toRawMessage(device, msg, SnodeNamespaces.Default); - expect(rawMessage.encryption).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE); - }); - }); - - describe('getCurrentConfigurationMessage', () => { - const ourNumber = TestUtils.generateFakePubKey().key; - - beforeEach(async () => { - Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').resolves(ourNumber); - Sinon.stub(UserUtils, 'getOurPubKeyFromCache').resolves(PubKey.cast(ourNumber)); - stubData('getAllConversations').resolves([]); - stubData('saveConversation').resolves(); - stubOpenGroupData('getAllV2OpenGroupRooms').resolves(); - TestUtils.stubData('getItemById').callsFake(async () => { - return { value: '[]' }; - }); - ConvoHub.use().reset(); - - await ConvoHub.use().load(); - }); - - afterEach(() => { - Sinon.restore(); - }); - - // open groups are actually removed when we leave them so this doesn't make much sense, but just in case we break something later - it('filter out non active open groups', async () => { - await ConvoHub.use().getOrCreateAndWait('05123456789', ConversationTypeEnum.PRIVATE); - await ConvoHub.use().getOrCreateAndWait('0512345678', ConversationTypeEnum.PRIVATE); - - const convoId3 = getOpenGroupV2ConversationId('http://chat-dev2.lokinet.org', 'fish'); - const convoId4 = getOpenGroupV2ConversationId('http://chat-dev3.lokinet.org', 'fish2'); - const convoId5 = getOpenGroupV2ConversationId('http://chat-dev3.lokinet.org', 'fish3'); - - const convo3 = await ConvoHub.use().getOrCreateAndWait(convoId3, ConversationTypeEnum.GROUP); - convo3.set({ active_at: Date.now() }); - - stubOpenGroupData('getV2OpenGroupRoom') - .returns(null) - .withArgs(convoId3) - .returns({ - serverUrl: 'http://chat-dev2.lokinet.org', - roomId: 'fish', - serverPublicKey: 'serverPublicKey', - } as OpenGroupV2Room); - - const convo4 = await ConvoHub.use().getOrCreateAndWait(convoId4, ConversationTypeEnum.GROUP); - convo4.set({ active_at: undefined }); - - await OpenGroupData.opengroupRoomsLoad(); - const convo5 = await ConvoHub.use().getOrCreateAndWait(convoId5, ConversationTypeEnum.GROUP); - convo5.set({ active_at: 0 }); - - await ConvoHub.use().getOrCreateAndWait('051234567', ConversationTypeEnum.PRIVATE); - const convos = ConvoHub.use().getConversations(); - - // convoID3 is active but 4 and 5 are not - const configMessage = await getCurrentConfigurationMessage(convos); - expect(configMessage.activeOpenGroups.length).to.equal(1); - expect(configMessage.activeOpenGroups[0]).to.equal( - 'http://chat-dev2.lokinet.org/fish?public_key=serverPublicKey' - ); - }); }); }); diff --git a/ts/util/missingCaseError.ts b/ts/util/missingCaseError.ts index 4673f5c5f9..8f5ff77d4b 100644 --- a/ts/util/missingCaseError.ts +++ b/ts/util/missingCaseError.ts @@ -1,20 +1,5 @@ // `missingCaseError` is useful for compile-time checking that all `case`s in // a `switch` statement have been handled, e.g. // -// type AttachmentType = 'media' | 'documents'; -// -// const type: AttachmentType = selectedTab; -// switch (type) { -// case 'media': -// return ; -// case 'documents': -// return ; -// default: -// return missingCaseError(type); -// } -// -// If we extended `AttachmentType` to `'media' | 'documents' | 'links'` the code -// above would trigger a compiler error stating that `'links'` has not been -// handled by our `switch` / `case` statement which is useful for code -// maintenance and system evolution. + export const missingCaseError = (x: never): TypeError => new TypeError(`Unhandled case: ${x}`); From dbe94f2293310166b4f14005a3d460883efd5a4e Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 20 Oct 2023 15:23:58 +1100 Subject: [PATCH 047/302] feat: added strings for groupv2 control message and components for them --- _locales/en/messages.json | 24 ++- protos/SignalService.proto | 108 +++++++++++-- .../message-item/GroupUpdateMessage.tsx | 151 ++++++++++++++++-- .../NotificationBubble.tsx | 7 +- ts/models/conversation.ts | 2 +- ts/models/message.ts | 51 +++--- ts/models/messageType.ts | 3 +- ts/node/migration/sessionMigrations.ts | 26 +-- ts/receiver/configMessage.ts | 12 +- ts/session/apis/snode_api/snodeSignatures.ts | 20 +-- .../group_v2/GroupUpdateMessage.ts | 31 ++++ .../GroupUpdateDeleteMemberContentMessage.ts | 45 ++++++ .../to_group/GroupUpdateInfoChangeMessage.ts | 81 ++++++++++ .../GroupUpdateInviteResponseMessage.ts | 46 ++++++ .../GroupUpdateMemberChangeMessage.ts | 82 ++++++++++ .../to_group/GroupUpdateMemberLeftMessage.ts | 24 +++ .../to_user/GroupUpdateDeleteMessage.ts | 34 ++++ .../to_user/GroupUpdateInviteMessage.ts | 53 ++++++ .../to_user/GroupUpdatePromoteMessage.ts | 39 +++++ ts/session/utils/User.ts | 5 +- .../libsession_utils_user_profile.ts | 28 ++-- ts/state/ducks/conversations.ts | 18 ++- ts/state/ducks/groups.ts | 13 +- ts/state/selectors/selectedConversation.ts | 17 ++ ts/state/selectors/user.ts | 5 +- .../unit/crypto/MessageEncrypter_test.ts | 13 +- .../unit/crypto/SnodeSignatures_test.ts | 12 +- .../libsession_wrapper_metagroup_test.ts | 10 +- .../unit/reactions/ReactionMessage_test.ts | 15 +- .../session/unit/sending/MessageQueue_test.ts | 3 +- .../unit/sending/MessageSender_test.ts | 7 +- .../SwarmPolling_pollForAllKeys_test.ts | 9 +- .../SwarmPolling_pollingDetails_test.ts | 5 +- ts/test/test-utils/utils/pubkey.ts | 4 +- ts/test/util/blockedNumberController_test.ts | 3 + ts/types/LocalizerKeys.ts | 18 ++- ts/types/sqlSharedTypes.ts | 9 +- ts/util/reactions.ts | 2 +- .../browser/libsession_worker_interface.ts | 9 +- 39 files changed, 881 insertions(+), 163 deletions(-) create mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts create mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts create mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts create mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts create mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts create mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts create mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts create mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts create mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 8c82b96e63..0f7c305e6c 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -238,12 +238,34 @@ "autoUpdateDownloadInstructions": "Would you like to download the update?", "leftTheGroup": "$name$ has left the group.", "multipleLeftTheGroup": "$name$ left the group", - "updatedTheGroup": "Group updated", "titleIsNow": "Group name is now '$name$'.", + "groupNameChange": "Group name is now $name$.", + "groupNameChangeFallback": "Group name updated.", + "groupAvatarChange": "Group display picture updated.", + + "groupOneJoined": "name joined the group.", + "groupYouJoined": "You joined the group.", + "groupTwoJoined": "$first$ and $second$ joined the group.", + "groupOthersJoined": "$name$ and $count$ others joined the group.", + + "groupOneRemoved": "name was removed from the group.", + "groupYouRemoved": "You were removed from the group.", + "groupTwoRemoved": "$first$ and $second$ were removed from the group.", + "groupOthersRemoved": "$name$ and $count$ others were removed from the group.", + + "groupOnePromoted": "name was promoted to Admin.", + "groupYouPromoted": "You were promoted to Admin.", + "groupTwoPromoted": "$first$ and $second$ were promoted to Admin.", + "groupOthersPromoted": "$name$ and $count$ others were promoted to Admin.", + + "groupOneLeft": "$name$ left the group.", + "groupYouLeft": "You left the group.", + "joinedTheGroup": "$name$ joined the group.", "multipleJoinedTheGroup": "$name$ joined the group.", "kickedFromTheGroup": "$name$ was removed from the group.", "multipleKickedFromTheGroup": "$name$ were removed from the group.", + "block": "Block", "unblock": "Unblock", "unblocked": "Unblocked", diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 5dd6dfdedf..f91beb3670 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -83,8 +83,85 @@ message DataExtractionNotification { optional uint64 timestamp = 2; } +message GroupUpdateInviteMessage { + // @required + required string groupSessionId = 1; // The `groupIdentityPublicKey` with a `03` prefix + // @required + required string name = 2; + required bytes memberAuthData = 3; + optional bytes profileKey = 4; + optional LokiProfile profile = 5; + // @required + required bytes adminSignature = 6; +} + +message GroupUpdateDeleteMessage { + // @required + required string groupSessionId = 1; // The `groupIdentityPublicKey` with a `03` prefix + // @required + required bytes adminSignature = 2; +} + +message GroupUpdateInfoChangeMessage { + enum Type { + NAME = 1; + AVATAR = 2; + DISAPPEARING_MESSAGES = 3; + } + + // @required + required Type type = 1; + optional string updatedName = 2; + optional uint32 updatedExpiration = 3; +} + +message GroupUpdateMemberChangeMessage { + enum Type { + ADDED = 1; + REMOVED = 2; + PROMOTED = 3; + } + + // @required + required Type type = 1; + repeated string memberSessionIds = 2; +} + + +message GroupUpdatePromoteMessage { + // @required + required bytes groupIdentitySeed = 1; +} + +message GroupUpdateMemberLeftMessage { + // the pubkey of the member left is included as part of the closed group encryption logic (senderIdentity on desktop) +} + +message GroupUpdateInviteResponseMessage { + // @required + required bool isApproved = 1; // Whether the request was approved + optional bytes profileKey = 2; + optional LokiProfile profile = 3; +} +message GroupUpdateDeleteMemberContentMessage { + repeated string memberSessionIds = 1; + // @required + required bytes adminSignature = 2; +} + +message GroupUpdateMessage { + optional GroupUpdateInviteMessage inviteMessage = 1; + optional GroupUpdateDeleteMessage deleteMessage = 2; + optional GroupUpdateInfoChangeMessage infoChangeMessage = 3; + optional GroupUpdateMemberChangeMessage memberChangeMessage = 4; + optional GroupUpdatePromoteMessage promoteMessage = 5; + optional GroupUpdateMemberLeftMessage memberLeftMessage = 6; + optional GroupUpdateInviteResponseMessage inviteResponse = 7; + optional GroupUpdateDeleteMemberContentMessage deleteMemberContent = 8; +} + message DataMessage { @@ -173,23 +250,22 @@ message DataMessage { } - - optional string body = 1; - repeated AttachmentPointer attachments = 2; - optional GroupContext group = 3; - optional uint32 flags = 4; - optional uint32 expireTimer = 5; - optional bytes profileKey = 6; - optional uint64 timestamp = 7; - optional Quote quote = 8; - repeated Preview preview = 10; - optional Reaction reaction = 11; - optional LokiProfile profile = 101; - optional OpenGroupInvitation openGroupInvitation = 102; - optional ClosedGroupControlMessage closedGroupControlMessage = 104; - optional string syncTarget = 105; + optional string body = 1; + repeated AttachmentPointer attachments = 2; + optional GroupContext group = 3; + optional uint32 flags = 4; + optional uint32 expireTimer = 5; + optional bytes profileKey = 6; + optional uint64 timestamp = 7; + optional Quote quote = 8; + repeated Preview preview = 10; + optional Reaction reaction = 11; + optional LokiProfile profile = 101; + optional OpenGroupInvitation openGroupInvitation = 102; + optional ClosedGroupControlMessage closedGroupControlMessage = 104; + optional string syncTarget = 105; optional bool blocksCommunityMessageRequests = 106; -} + optional GroupUpdateMessage groupUpdateMessage = 120;} message CallMessage { diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx index 26761cbfe0..5cfc34cc77 100644 --- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx +++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx @@ -1,41 +1,149 @@ import React from 'react'; +import { PubkeyType } from 'libsession_util_nodejs'; +import { useConversationsUsernameWithQuoteOrFullPubkey } from '../../../../hooks/useParamSelector'; +import { arrayContainsUsOnly } from '../../../../models/message'; +import { PreConditionFailed } from '../../../../session/utils/errors'; import { PropsForGroupUpdate, PropsForGroupUpdateType, } from '../../../../state/ducks/conversations'; -import { NotificationBubble } from './notification-bubble/NotificationBubble'; -import { ReadableMessage } from './ReadableMessage'; -import { arrayContainsUsOnly } from '../../../../models/message'; -import { useConversationsUsernameWithQuoteOrFullPubkey } from '../../../../hooks/useParamSelector'; +import { useSelectedIsGroupV2 } from '../../../../state/selectors/selectedConversation'; +import { useOurPkStr } from '../../../../state/selectors/user'; import { assertUnreachable } from '../../../../types/sqlSharedTypes'; +import { ReadableMessage } from './ReadableMessage'; +import { NotificationBubble } from './notification-bubble/NotificationBubble'; -// This component is used to display group updates in the conversation view. +type IdWithName = { sessionId: PubkeyType; name: string }; -const ChangeItemJoined = (added: Array): string => { +function mapIdsWithNames(changed: Array, names: Array): Array { + if (!changed.length || !names.length) { + throw new PreConditionFailed('mapIdsWithNames needs a change'); + } + if (changed.length !== names.length) { + throw new PreConditionFailed('mapIdsWithNames needs a the same length to map them together'); + } + return changed.map((sessionId, index) => { + return { sessionId, name: names[index] }; + }); +} + +/** + * When we are part of a change, we display the You first, and then others. + * This function is used to check if we are part of the list. + * - if yes: returns {weArePart: true, others: changedWithoutUs} + * - if yes: returns {weArePart: false, others: changed} + */ +function moveUsToStart( + changed: Array, + us: PubkeyType +): { + sortedWithUsFirst: Array; +} { + const usAt = changed.findIndex(m => m.sessionId === us); + if (usAt <= -1) { + // we are not in it + return { sortedWithUsFirst: changed }; + } + const usItem = changed.at(usAt); + if (!usItem) { + throw new PreConditionFailed('"we" should have been there'); + } + return { sortedWithUsFirst: [usItem, ...changed.slice(usAt, 1)] }; +} + +function changeOfMembersV2({ + changedWithNames, + type, + us, +}: { + type: 'added' | 'promoted' | 'removed'; + changedWithNames: Array; + us: PubkeyType; +}): string { + const { sortedWithUsFirst } = moveUsToStart(changedWithNames, us); + if (changedWithNames.length === 0) { + throw new PreConditionFailed('change must always have an associated change'); + } + const subject = + sortedWithUsFirst.length === 1 && sortedWithUsFirst[0].sessionId === us + ? 'You' + : sortedWithUsFirst.length === 1 + ? 'One' + : sortedWithUsFirst.length === 2 + ? 'Two' + : 'Others'; + + const action = + type === 'added' ? 'Joined' : type === 'promoted' ? 'Promoted' : ('Removed' as const); + const key = `group${subject}${action}` as const; + + return window.i18n( + key, + sortedWithUsFirst.map(m => m.name) + ); +} + +// TODO those lookups might need to be memoized +const ChangeItemJoined = (added: Array): string => { if (!added.length) { throw new Error('Group update add is missing contacts'); } const names = useConversationsUsernameWithQuoteOrFullPubkey(added); + const isGroupV2 = useSelectedIsGroupV2(); + const us = useOurPkStr(); + if (isGroupV2) { + return changeOfMembersV2({ + changedWithNames: mapIdsWithNames(added, names), + type: 'added', + us, + }); + } const joinKey = added.length > 1 ? 'multipleJoinedTheGroup' : 'joinedTheGroup'; return window.i18n(joinKey, [names.join(', ')]); }; -const ChangeItemKicked = (kicked: Array): string => { - if (!kicked.length) { - throw new Error('Group update kicked is missing contacts'); +const ChangeItemKicked = (removed: Array): string => { + if (!removed.length) { + throw new Error('Group update removed is missing contacts'); + } + const names = useConversationsUsernameWithQuoteOrFullPubkey(removed); + const isGroupV2 = useSelectedIsGroupV2(); + const us = useOurPkStr(); + if (isGroupV2) { + return changeOfMembersV2({ + changedWithNames: mapIdsWithNames(removed, names), + type: 'removed', + us, + }); } - const names = useConversationsUsernameWithQuoteOrFullPubkey(kicked); - if (arrayContainsUsOnly(kicked)) { + if (arrayContainsUsOnly(removed)) { return window.i18n('youGotKickedFromGroup'); } - const kickedKey = kicked.length > 1 ? 'multipleKickedFromTheGroup' : 'kickedFromTheGroup'; + const kickedKey = removed.length > 1 ? 'multipleKickedFromTheGroup' : 'kickedFromTheGroup'; return window.i18n(kickedKey, [names.join(', ')]); }; -const ChangeItemLeft = (left: Array): string => { +const ChangeItemPromoted = (promoted: Array): string => { + if (!promoted.length) { + throw new Error('Group update promoted is missing contacts'); + } + const names = useConversationsUsernameWithQuoteOrFullPubkey(promoted); + const isGroupV2 = useSelectedIsGroupV2(); + const us = useOurPkStr(); + if (isGroupV2) { + return changeOfMembersV2({ + changedWithNames: mapIdsWithNames(promoted, names), + type: 'promoted', + us, + }); + } + throw new PreConditionFailed('ChangeItemPromoted only applies to groupv2'); +}; + +const ChangeItemLeft = (left: Array): string => { if (!left.length) { throw new Error('Group update remove is missing contacts'); } @@ -50,11 +158,21 @@ const ChangeItemLeft = (left: Array): string => { return window.i18n(leftKey, [names.join(', ')]); }; +const ChangeItemName = (newName: string) => { + const isGroupV2 = useSelectedIsGroupV2(); + if (isGroupV2) { + return newName + ? window.i18n('groupNameChange', [newName]) + : window.i18n('groupNameChangeFallback'); + } + return window.i18n('titleIsNow', [newName || '']); +}; + const ChangeItem = (change: PropsForGroupUpdateType): string => { const { type } = change; switch (type) { case 'name': - return window.i18n('titleIsNow', [change.newName || '']); + return ChangeItemName(change.newName); case 'add': return ChangeItemJoined(change.added); @@ -63,9 +181,8 @@ const ChangeItem = (change: PropsForGroupUpdateType): string => { case 'kicked': return ChangeItemKicked(change.kicked); - - case 'general': - return window.i18n('updatedTheGroup'); + case 'promoted': + return ChangeItemPromoted(change.promoted); default: assertUnreachable(type, `ChangeItem: Missing case error "${type}"`); return ''; diff --git a/ts/components/conversation/message/message-item/notification-bubble/NotificationBubble.tsx b/ts/components/conversation/message/message-item/notification-bubble/NotificationBubble.tsx index df6ed5ff23..56caf8d3d5 100644 --- a/ts/components/conversation/message/message-item/notification-bubble/NotificationBubble.tsx +++ b/ts/components/conversation/message/message-item/notification-bubble/NotificationBubble.tsx @@ -1,5 +1,6 @@ import React from 'react'; import styled from 'styled-components'; +import { SessionHtmlRenderer } from '../../../../basic/SessionHTMLRenderer'; import { SessionIcon, SessionIconType } from '../../../../icon'; const NotificationBubbleFlex = styled.div` @@ -44,8 +45,10 @@ export const NotificationBubble = (props: { iconPadding="auto 10px" /> - )} - {notificationText} + )}{' '} + + + {iconType && } ); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index abda7cbe7e..0c589546ad 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -929,7 +929,7 @@ export class ConversationModel extends Backbone.Model { 'conversationId' | 'source' | 'type' | 'direction' | 'received_at' | 'unread' > ) { - let sender = UserUtils.getOurPubKeyStrFromCache(); + let sender: string = UserUtils.getOurPubKeyStrFromCache(); if (this.isPublic()) { const openGroup = OpenGroupData.getV2OpenGroupRoom(this.id); if (openGroup && openGroup.serverPublicKey && roomHasBlindEnabled(openGroup)) { diff --git a/ts/models/message.ts b/ts/models/message.ts index cd99044848..2b6ab91851 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -1,6 +1,8 @@ import Backbone from 'backbone'; import autoBind from 'auto-bind'; +import filesize from 'filesize'; +import { PubkeyType } from 'libsession_util_nodejs'; import { cloneDeep, debounce, @@ -14,28 +16,27 @@ import { sortBy, uniq, } from 'lodash'; -import filesize from 'filesize'; import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; import { ConvoHub } from '../session/conversations'; import { DataMessage } from '../session/messages/outgoing'; +import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { PubKey } from '../session/types'; import { + UserUtils, uploadAttachmentsToFileServer, uploadLinkPreviewToFileServer, uploadQuoteThumbnailsToFileServer, - UserUtils, } from '../session/utils'; -import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { DataExtractionNotificationMsg, - fillMessageAttributesWithDefaults, MessageAttributes, MessageAttributesOptionals, MessageGroupUpdate, MessageModelType, PropsForDataExtractionNotification, PropsForMessageRequestResponse, + fillMessageAttributesWithDefaults, } from './messageType'; import { Data } from '../data/data'; @@ -55,28 +56,27 @@ import { uploadQuoteThumbnailsV3, } from '../session/utils/AttachmentsV2'; import { perfEnd, perfStart } from '../session/utils/Performance'; -import { buildSyncMessage } from '../session/utils/sync/syncUtils'; import { isUsFromCache } from '../session/utils/User'; +import { buildSyncMessage } from '../session/utils/sync/syncUtils'; import { FindAndFormatContactType, LastMessageStatusType, MessageModelPropsWithoutConvoProps, MessagePropsDetails, - messagesChanged, PropsForAttachment, PropsForExpirationTimer, PropsForGroupInvitation, PropsForGroupUpdate, PropsForGroupUpdateAdd, - PropsForGroupUpdateGeneral, PropsForGroupUpdateKicked, PropsForGroupUpdateLeft, PropsForGroupUpdateName, + PropsForGroupUpdatePromoted, PropsForMessageWithoutConvoProps, PropsForQuote, + messagesChanged, } from '../state/ducks/conversations'; import { AttachmentTypeWithPath, isVoiceMessage } from '../types/Attachment'; -import { getAttachmentMetadata } from '../types/message/initializeAttachmentMetadata'; import { deleteExternalMessageFiles, getAbsoluteAttachmentPath, @@ -85,6 +85,7 @@ import { loadQuoteData, } from '../types/MessageAttachment'; import { ReactionList } from '../types/Reaction'; +import { getAttachmentMetadata } from '../types/message/initializeAttachmentMetadata'; import { roomHasBlindEnabled } from '../types/sqlSharedTypes'; import { ExpirationTimerOptions } from '../util/expiringMessages'; import { LinkPreviews } from '../util/linkPreviews'; @@ -384,7 +385,7 @@ export class MessageModel extends Backbone.Model { if (groupUpdate.joined?.length) { const change: PropsForGroupUpdateAdd = { type: 'add', - added: groupUpdate.joined, + added: groupUpdate.joined as Array, }; return { change, ...sharedProps }; } @@ -392,7 +393,7 @@ export class MessageModel extends Backbone.Model { if (groupUpdate.kicked?.length) { const change: PropsForGroupUpdateKicked = { type: 'kicked', - kicked: groupUpdate.kicked, + kicked: groupUpdate.kicked as Array, }; return { change, ...sharedProps }; } @@ -400,11 +401,18 @@ export class MessageModel extends Backbone.Model { if (groupUpdate.left?.length) { const change: PropsForGroupUpdateLeft = { type: 'left', - left: groupUpdate.left, + left: groupUpdate.left as Array, }; return { change, ...sharedProps }; } + if (groupUpdate.promoted?.length) { + const change: PropsForGroupUpdatePromoted = { + type: 'promoted', + promoted: groupUpdate.promoted as Array, + }; + return { change, ...sharedProps }; + } if (groupUpdate.name) { const change: PropsForGroupUpdateName = { type: 'name', @@ -413,11 +421,7 @@ export class MessageModel extends Backbone.Model { return { change, ...sharedProps }; } - // Just show a "Group Updated" message, not sure what was changed - const changeGeneral: PropsForGroupUpdateGeneral = { - type: 'general', - }; - return { change: changeGeneral, ...sharedProps }; + return null; } public getMessagePropStatus(): LastMessageStatusType { @@ -1162,6 +1166,9 @@ export class MessageModel extends Backbone.Model { if (arrayContainsUsOnly(groupUpdate.left)) { return window.i18n('youLeftTheGroup'); } + if (groupUpdate.name) { + return window.i18n('titleIsNow', [groupUpdate.name]); + } if (groupUpdate.left && groupUpdate.left.length === 1) { return window.i18n('leftTheGroup', [ @@ -1169,15 +1176,9 @@ export class MessageModel extends Backbone.Model { ]); } - const messages = []; - if (!groupUpdate.name && !groupUpdate.joined && !groupUpdate.kicked && !groupUpdate.kicked) { - return window.i18n('updatedTheGroup'); // Group Updated - } - if (groupUpdate.name) { - return window.i18n('titleIsNow', [groupUpdate.name]); - } if (groupUpdate.joined && groupUpdate.joined.length) { const names = groupUpdate.joined.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey); + const messages = []; if (names.length > 1) { messages.push(window.i18n('multipleJoinedTheGroup', [names.join(', ')])); @@ -1192,14 +1193,16 @@ export class MessageModel extends Backbone.Model { groupUpdate.kicked, ConvoHub.use().getContactProfileNameOrShortenedPubKey ); + const messages = []; if (names.length > 1) { messages.push(window.i18n('multipleKickedFromTheGroup', [names.join(', ')])); } else { messages.push(window.i18n('kickedFromTheGroup', names)); } + return messages.join(' '); } - return messages.join(' '); + return null; } if (this.isIncoming() && this.hasErrors()) { return window.i18n('incomingError'); diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts index eebcb0596f..f29272d22f 100644 --- a/ts/models/messageType.ts +++ b/ts/models/messageType.ts @@ -1,3 +1,4 @@ +import { PubkeyType } from 'libsession_util_nodejs'; import { defaultsDeep } from 'lodash'; import { v4 as uuidv4 } from 'uuid'; import { @@ -155,6 +156,7 @@ export type MessageGroupUpdate = { left?: Array; joined?: Array; kicked?: Array; + promoted?: Array; name?: string; }; @@ -177,7 +179,6 @@ export interface MessageAttributesOptionals { group_update?: MessageGroupUpdate; groupInvitation?: any; attachments?: any; - contact?: any; conversationId: string; errors?: any; flags?: number; diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts index 2135f04405..1616415174 100644 --- a/ts/node/migration/sessionMigrations.ts +++ b/ts/node/migration/sessionMigrations.ts @@ -19,6 +19,7 @@ import { getCommunityInfoFromDBValues, getContactInfoFromDBValues, getLegacyGroupInfoFromDBValues, + toFixedUint8ArrayOfLength, } from '../../types/sqlSharedTypes'; import { CLOSED_GROUP_V2_KEY_PAIRS_TABLE, @@ -34,9 +35,9 @@ import { toSqliteBoolean, } from '../database_utility'; -import { getIdentityKeys, sqlNode } from '../sql'; -import { sleepFor } from '../../session/utils/Promise'; import { SettingsKey } from '../../data/settings-key'; +import { sleepFor } from '../../session/utils/Promise'; +import { getIdentityKeys, sqlNode } from '../sql'; const hasDebugEnvVariable = Boolean(process.env.SESSION_DEBUG); @@ -1643,15 +1644,18 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite const ourConvoPriority = ourConversation.priority; // const ourConvoExpire = ourConversation.expireTimer || 0; if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) { - userProfileWrapper.setUserInfo( - ourDbName, - ourConvoPriority, - { - url: ourDbProfileUrl, - key: ourDbProfileKey, - } - // ourConvoExpire, - ); + if (ourDbProfileKey.length === 32) { + const ourKeyFixedLen = toFixedUint8ArrayOfLength(ourDbProfileKey, 32); + userProfileWrapper.setUserInfo( + ourDbName, + ourConvoPriority, + { + url: ourDbProfileUrl, + key: ourKeyFixedLen.buffer, // TODO make this use the fixed length array + } + // ourConvoExpire, + ); + } } insertContactIntoContactWrapper( diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index a1d2008d35..9495dcaf61 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -219,14 +219,17 @@ async function handleUserProfileUpdate(result: IncomingUserResult) { await window.setSettingValue(SettingsKey.hasBlindedMsgRequestsEnabled, newBlindedMsgRequest); // this does the dispatch to redux } - const picUpdate = !isEmpty(updateUserInfo.key) && !isEmpty(updateUserInfo.url); + const picUpdate = + !isEmpty(updateUserInfo.key) && + !isEmpty(updateUserInfo.url) && + updateUserInfo.key.length === 32; // NOTE: if you do any changes to the settings of a user which are synced, it should be done above the `updateOurProfileViaLibSession` call await updateOurProfileViaLibSession( result.latestEnvelopeTimestamp, updateUserInfo.name, picUpdate ? updateUserInfo.url : null, - picUpdate ? updateUserInfo.key : null, + picUpdate ? updateUserInfo.key : null, // TODO make the whole logic of handling profileKeys used the UInt8ArrayFixedLength updateUserInfo.priority ); @@ -629,9 +632,10 @@ async function handleSingleGroupUpdate({ // dump is always empty when creating a new groupInfo await MetaGroupWrapperActions.init(groupPk, { metaDumped: null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(userEdKeypair.privKeyBytes, 64), + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEdKeypair.privKeyBytes, 64).buffer, groupEd25519Secretkey: groupInWrapper.secretKey, - groupEd25519Pubkey: toFixedUint8ArrayOfLength(HexString.fromHexString(groupPk.slice(2)), 32), + groupEd25519Pubkey: toFixedUint8ArrayOfLength(HexString.fromHexString(groupPk.slice(2)), 32) + .buffer, }); } catch (e) { window.log.warn( diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/snodeSignatures.ts index 07bd9d3937..64ae7028fd 100644 --- a/ts/session/apis/snode_api/snodeSignatures.ts +++ b/ts/session/apis/snode_api/snodeSignatures.ts @@ -1,4 +1,4 @@ -import { FixedSizeUint8Array, GroupPubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; import { toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; import { getSodiumRenderer } from '../../crypto'; @@ -72,11 +72,11 @@ type SnodeSigParamsShared = { type SnodeSigParamsAdminGroup = SnodeSigParamsShared & { groupPk: GroupPubkeyType; - privKey: Uint8Array; // our ed25519 key when we are signing with our pubkey + privKey: Uint8Array; // len 64 }; type SnodeSigParamsUs = SnodeSigParamsShared & { pubKey: string; - privKey: FixedSizeUint8Array<64>; + privKey: Uint8Array; // len 64 }; function isSigParamsForGroupAdmin( @@ -95,7 +95,7 @@ async function getSnodeSignatureShared(params: SnodeSigParamsAdminGroup | SnodeS try { const message = new Uint8Array(verificationData); const sodium = await getSodiumRenderer(); - const signature = sodium.crypto_sign_detached(message, params.privKey as Uint8Array); + const signature = sodium.crypto_sign_detached(message, params.privKey); const signatureBase64 = fromUInt8ArrayToBase64(signature); if (isSigParamsForGroupAdmin(params)) { return { @@ -134,7 +134,7 @@ async function getSnodeSignatureParamsUs({ pubKey: UserUtils.getOurPubKeyStrFromCache(), method, namespace, - privKey: lengthCheckedPrivKey, + privKey: lengthCheckedPrivKey.buffer, }); const us = UserUtils.getOurPubKeyStrFromCache(); @@ -152,7 +152,7 @@ async function getSnodeGroupSignatureParams({ namespace, }: { groupPk: GroupPubkeyType; - groupIdentityPrivKey: FixedSizeUint8Array<64>; + groupIdentityPrivKey: Uint8Array; // len 64 namespace: SnodeNamespacesGroup; method: 'retrieve' | 'store'; }): Promise { @@ -174,7 +174,7 @@ async function generateUpdateExpirySignature({ }: WithMessagesHashes & WithShortenOrExtend & WithTimestamp & { - ed25519Privkey: Uint8Array | FixedSizeUint8Array<64>; + ed25519Privkey: Uint8Array; // len 64 ed25519Pubkey: string; }): Promise<{ signature: string; pubkey: string }> { // "expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N] @@ -184,7 +184,7 @@ async function generateUpdateExpirySignature({ const sodium = await getSodiumRenderer(); - const signature = sodium.crypto_sign_detached(message, ed25519Privkey as Uint8Array); + const signature = sodium.crypto_sign_detached(message, ed25519Privkey); const signatureBase64 = fromUInt8ArrayToBase64(signature); if (isEmpty(signatureBase64) || isEmpty(ed25519Pubkey)) { @@ -216,7 +216,7 @@ async function generateUpdateExpiryOurSignature({ messagesHashes, shortenOrExtend, timestamp, - ed25519Privkey: edKeyPrivBytes, + ed25519Privkey: toFixedUint8ArrayOfLength(edKeyPrivBytes, 64).buffer, ed25519Pubkey: ourEd25519Key.pubKey, }); } @@ -231,7 +231,7 @@ async function generateUpdateExpiryGroupSignature({ WithShortenOrExtend & WithTimestamp & { groupPk: GroupPubkeyType; - groupPrivKey: FixedSizeUint8Array<64>; + groupPrivKey: Uint8Array; // len 64 }) { if (isEmpty(groupPrivKey) || isEmpty(groupPk)) { throw new PreConditionFailed( diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts new file mode 100644 index 0000000000..012e61daac --- /dev/null +++ b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts @@ -0,0 +1,31 @@ +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { SignalService } from '../../../../../protobuf'; +import { DataMessage } from '../../DataMessage'; +import { MessageParams } from '../../Message'; + +export interface GroupUpdateMessageParams extends MessageParams { + groupPk: GroupPubkeyType; +} + +export abstract class GroupUpdateMessage extends DataMessage { + public readonly groupPk: GroupUpdateMessageParams['groupPk']; + + constructor(params: GroupUpdateMessageParams) { + super(params); + + this.groupPk = params.groupPk; + if (!this.groupPk || this.groupPk.length === 0) { + throw new Error('groupPk must be set'); + } + } + + protected abstract updateProto(): SignalService.GroupUpdateMessage; + + public dataProto(): SignalService.DataMessage { + const groupUpdateMessage = this.updateProto(); + return new SignalService.DataMessage({ groupUpdateMessage }); + } + + public abstract isFor1o1Swarm(): boolean; + public abstract isForGroupSwarm(): boolean; +} diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts new file mode 100644 index 0000000000..d8e2d7559f --- /dev/null +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts @@ -0,0 +1,45 @@ +import { PubkeyType } from 'libsession_util_nodejs'; +import { isEmpty } from 'lodash'; +import { SignalService } from '../../../../../../protobuf'; +import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; + +type Params = GroupUpdateMessageParams & { + memberSessionIds: Array; + adminSignature: Uint8Array; // this is a signature of `"DELETE_CONTENT" || timestamp || sessionId[0] || ... || sessionId[N]` +}; + +/** + * GroupUpdateDeleteMemberContentMessage is sent as a message to group's swarm. + */ +export class GroupUpdateDeleteMemberContentMessage extends GroupUpdateMessage { + public readonly memberSessionIds: Params['memberSessionIds']; + public readonly adminSignature: Params['adminSignature']; + + constructor(params: Params) { + super(params); + + this.adminSignature = params.adminSignature; + this.memberSessionIds = params.memberSessionIds; + if (isEmpty(this.memberSessionIds)) { + throw new Error('GroupUpdateDeleteMemberContentMessage needs members in list'); + } + } + + protected updateProto(): SignalService.GroupUpdateMessage { + const deleteMemberContent = new SignalService.GroupUpdateDeleteMemberContentMessage({ + adminSignature: this.adminSignature, + memberSessionIds: this.memberSessionIds, + }); + + return new SignalService.GroupUpdateMessage({ + deleteMemberContent, + }); + } + + public isForGroupSwarm(): boolean { + return true; + } + public isFor1o1Swarm(): boolean { + return false; + } +} diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts new file mode 100644 index 0000000000..fbfd413257 --- /dev/null +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts @@ -0,0 +1,81 @@ +import { isEmpty, isFinite } from 'lodash'; +import { SignalService } from '../../../../../../protobuf'; +import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; + +type NameChangeParams = GroupUpdateMessageParams & { + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.NAME; + updatedName: string; +}; + +type AvatarChangeParams = GroupUpdateMessageParams & { + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR; +}; + +type DisappearingMessageChangeParams = GroupUpdateMessageParams & { + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES; + updatedExpirationSeconds: number; +}; + +/** + * GroupUpdateInfoChangeMessage is sent as a message to group's swarm. + */ +export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { + public readonly typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type; + public readonly updatedName: string = ''; + public readonly updatedExpirationSeconds: number = 0; + + constructor(params: NameChangeParams | AvatarChangeParams | DisappearingMessageChangeParams) { + super(params); + const types = SignalService.GroupUpdateInfoChangeMessage.Type; + + this.typeOfChange = params.typeOfChange; + + switch (params.typeOfChange) { + case types.NAME: { + if (isEmpty(params.updatedName)) { + throw new Error('A group needs a name'); + } + this.updatedName = params.updatedName; + break; + } + case types.AVATAR: + // nothing to do for avatar + break; + case types.DISAPPEARING_MESSAGES: { + if (!isFinite(params.updatedExpirationSeconds) || params.updatedExpirationSeconds < 0) { + throw new Error('Invalid disappearing message timer. Must be finite and >=0'); + } + this.updatedExpirationSeconds = params.updatedExpirationSeconds; + break; + } + default: + break; + } + } + + protected updateProto(): SignalService.GroupUpdateMessage { + const infoChangeMessage = new SignalService.GroupUpdateInfoChangeMessage({ + type: this.typeOfChange, + }); + + if (this.typeOfChange === SignalService.GroupUpdateInfoChangeMessage.Type.NAME) { + infoChangeMessage.updatedName = this.updatedName; + } + if ( + this.typeOfChange === SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES + ) { + infoChangeMessage.updatedExpiration = this.updatedExpirationSeconds; + } + + return new SignalService.GroupUpdateMessage({ + infoChangeMessage, + }); + } + + public isForGroupSwarm(): boolean { + return true; + } + public isFor1o1Swarm(): boolean { + return false; + } +} diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts new file mode 100644 index 0000000000..3722047a0a --- /dev/null +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts @@ -0,0 +1,46 @@ +import { SignalService } from '../../../../../../protobuf'; +import { getOurProfile } from '../../../../../utils/User'; +import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; + +type Params = GroupUpdateMessageParams & { + isApproved: boolean; +}; + +/** + * GroupUpdateInviteResponseMessage is sent to the group's swarm. + * Our pubkey, as the leaving member is part of the encryption of libsession for the new groups + * + */ +export class GroupUpdateInviteResponseMessage extends GroupUpdateMessage { + public readonly isApproved: Params['isApproved']; + constructor(params: Params) { + super(params); + this.isApproved = params.isApproved; + } + + protected updateProto(): SignalService.GroupUpdateMessage { + const ourProfile = getOurProfile(); + + const inviteResponse = new SignalService.GroupUpdateInviteResponseMessage({ + isApproved: true, + profileKey: ourProfile?.profileKey, + profile: ourProfile + ? { + displayName: ourProfile.displayName, + profilePicture: ourProfile.avatarPointer, + } + : undefined, + }); + + return new SignalService.GroupUpdateMessage({ + inviteResponse, + }); + } + + public isForGroupSwarm(): boolean { + return true; + } + public isFor1o1Swarm(): boolean { + return false; + } +} diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts new file mode 100644 index 0000000000..734097d8f9 --- /dev/null +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts @@ -0,0 +1,82 @@ +import { PubkeyType } from 'libsession_util_nodejs'; +import { isEmpty } from 'lodash'; +import { SignalService } from '../../../../../../protobuf'; +import { assertUnreachable } from '../../../../../../types/sqlSharedTypes'; +import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; + +type MembersAddedMessageParams = GroupUpdateMessageParams & { + typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.ADDED; + added: Array; +}; + +type MembersRemovedMessageParams = GroupUpdateMessageParams & { + typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED; + removed: Array; +}; + +type MembersPromotedMessageParams = GroupUpdateMessageParams & { + typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.PROMOTED; + promoted: Array; +}; + +/** + * GroupUpdateInfoChangeMessage is sent to the group's swarm. + */ +export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { + public readonly typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type; + public readonly memberSessionIds: Array = []; // added, removed, promoted based on the type. + + constructor( + params: MembersAddedMessageParams | MembersRemovedMessageParams | MembersPromotedMessageParams + ) { + super(params); + const { Type } = SignalService.GroupUpdateMemberChangeMessage; + const { typeOfChange } = params; + + this.typeOfChange = typeOfChange; + + switch (typeOfChange) { + case Type.ADDED: { + if (isEmpty(params.added)) { + throw new Error('added members list cannot be empty'); + } + this.memberSessionIds = params.added; + break; + } + case Type.REMOVED: { + if (isEmpty(params.removed)) { + throw new Error('removed members list cannot be empty'); + } + this.memberSessionIds = params.removed; + break; + } + case Type.PROMOTED: { + if (isEmpty(params.promoted)) { + throw new Error('promoted members list cannot be empty'); + } + this.memberSessionIds = params.promoted; + break; + } + default: + assertUnreachable(typeOfChange, 'unhandled switch case'); + } + } + + protected updateProto(): SignalService.GroupUpdateMessage { + const memberChangeMessage = new SignalService.GroupUpdateMemberChangeMessage({ + type: this.typeOfChange, + memberSessionIds: this.memberSessionIds, + }); + + return new SignalService.GroupUpdateMessage({ + memberChangeMessage, + }); + } + + public isForGroupSwarm(): boolean { + return true; + } + public isFor1o1Swarm(): boolean { + return false; + } +} diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts new file mode 100644 index 0000000000..4266dd3fa8 --- /dev/null +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts @@ -0,0 +1,24 @@ +import { SignalService } from '../../../../../../protobuf'; +import { GroupUpdateMessage } from '../GroupUpdateMessage'; + +/** + * GroupUpdateMemberLeftMessage is sent to the group's swarm. + * Our pubkey, as the leaving member is part of the encryption of libsession for the new groups + * + */ +export class GroupUpdateMemberLeftMessage extends GroupUpdateMessage { + protected updateProto(): SignalService.GroupUpdateMessage { + const memberLeftMessage = new SignalService.GroupUpdateMemberLeftMessage({}); + + return new SignalService.GroupUpdateMessage({ + memberLeftMessage, + }); + } + + public isForGroupSwarm(): boolean { + return true; + } + public isFor1o1Swarm(): boolean { + return false; + } +} diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts new file mode 100644 index 0000000000..70ccaf0fe5 --- /dev/null +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts @@ -0,0 +1,34 @@ +import { SignalService } from '../../../../../../protobuf'; +import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; + +interface Params extends GroupUpdateMessageParams { + adminSignature: Uint8Array; // this is a signature of `"DELETE" || sessionId || timestamp ` +} + +/** + * GroupUpdateDeleteMessage is sent as a 1o1 message to the recipient, not through the group's swarm. + */ +export class GroupUpdateDeleteMessage extends GroupUpdateMessage { + public readonly adminSignature: Params['adminSignature']; + + constructor(params: Params) { + super(params); + + this.adminSignature = params.adminSignature; + } + + protected updateProto(): SignalService.GroupUpdateMessage { + const deleteMessage = new SignalService.GroupUpdateDeleteMessage({ + groupSessionId: this.groupPk, + adminSignature: this.adminSignature, + }); + return new SignalService.GroupUpdateMessage({ deleteMessage }); + } + + public isForGroupSwarm(): boolean { + return false; + } + public isFor1o1Swarm(): boolean { + return true; + } +} diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts new file mode 100644 index 0000000000..4394aacd9a --- /dev/null +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts @@ -0,0 +1,53 @@ +import { SignalService } from '../../../../../../protobuf'; +import { UserUtils } from '../../../../../utils'; +import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; + +interface Params extends GroupUpdateMessageParams { + groupName: string; + adminSignature: Uint8Array; // this is a signature of `"INVITE" || inviteeSessionId || timestamp` + memberAuthData: Uint8Array; +} + +/** + * GroupUpdateInviteMessage is sent as a 1o1 message to the recipient, not through the group's swarm. + */ +export class GroupUpdateInviteMessage extends GroupUpdateMessage { + public readonly groupName: Params['groupName']; + public readonly adminSignature: Params['adminSignature']; + public readonly memberAuthData: Params['memberAuthData']; + + constructor(params: Params) { + super({ + timestamp: params.timestamp, + identifier: params.identifier, + groupPk: params.groupPk, + }); + + this.groupName = params.groupName; + this.adminSignature = params.adminSignature; + this.memberAuthData = params.memberAuthData; + } + + protected updateProto(): SignalService.GroupUpdateMessage { + const ourProfile = UserUtils.getOurProfile(); + const inviteMessage = new SignalService.GroupUpdateInviteMessage({ + groupSessionId: this.groupPk, + name: this.groupName, + adminSignature: this.adminSignature, + memberAuthData: this.memberAuthData, + profile: ourProfile + ? { displayName: ourProfile.displayName, profilePicture: ourProfile.avatarPointer } + : undefined, + profileKey: ourProfile?.profileKey, + }); + return new SignalService.GroupUpdateMessage({ inviteMessage }); + } + + public isForGroupSwarm(): boolean { + return false; + } + + public isFor1o1Swarm(): boolean { + return true; + } +} diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts new file mode 100644 index 0000000000..1cc3252257 --- /dev/null +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts @@ -0,0 +1,39 @@ +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { SignalService } from '../../../../../../protobuf'; +import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; + +interface Params extends GroupUpdateMessageParams { + groupPk: GroupPubkeyType; + groupIdentitySeed: Uint8Array; +} + +/** + * GroupUpdateDeleteMessage is sent as a 1o1 message to the recipient, not through the group's swarm. + */ +export class GroupUpdatePromoteMessage extends GroupUpdateMessage { + public readonly groupIdentitySeed: Params['groupIdentitySeed']; + + constructor(params: Params) { + super(params); + + this.groupIdentitySeed = params.groupIdentitySeed; + if (!this.groupIdentitySeed || this.groupIdentitySeed.length !== 32) { + throw new Error('groupIdentitySeed must be set'); + } + } + + protected updateProto(): SignalService.GroupUpdateMessage { + const promoteMessage = new SignalService.GroupUpdatePromoteMessage({ + groupIdentitySeed: this.groupIdentitySeed, + }); + + return new SignalService.GroupUpdateMessage({ promoteMessage }); + } + + public isForGroupSwarm(): boolean { + return false; + } + public isFor1o1Swarm(): boolean { + return true; + } +} diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts index 4a2def2dde..b4479c3214 100644 --- a/ts/session/utils/User.ts +++ b/ts/session/utils/User.ts @@ -1,3 +1,4 @@ +import { PubkeyType } from 'libsession_util_nodejs'; import _ from 'lodash'; import { UserUtils } from '.'; import { Data } from '../../data/data'; @@ -35,13 +36,13 @@ export function isUsFromCache(pubKey: string | PubKey | undefined): boolean { /** * Returns the public key of this current device as a STRING, or throws an error */ -export function getOurPubKeyStrFromCache(): string { +export function getOurPubKeyStrFromCache(): PubkeyType { const ourNumber = getOurPubKeyStrFromStorage(); if (!ourNumber) { throw new Error('ourNumber is not set'); } - return ourNumber; + return ourNumber as PubkeyType; } /** diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts index 3daec9db5b..a63c2dd46c 100644 --- a/ts/session/utils/libsession/libsession_utils_user_profile.ts +++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts @@ -1,11 +1,12 @@ import { isEmpty } from 'lodash'; import { UserUtils } from '..'; +import { SettingsKey } from '../../../data/settings-key'; +import { CONVERSATION_PRIORITIES } from '../../../models/conversationAttributes'; +import { toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; +import { Storage } from '../../../util/storage'; import { UserConfigWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { ConvoHub } from '../../conversations'; import { fromHexToArray } from '../String'; -import { CONVERSATION_PRIORITIES } from '../../../models/conversationAttributes'; -import { Storage } from '../../../util/storage'; -import { SettingsKey } from '../../../data/settings-key'; async function insertUserProfileIntoWrapper(convoId: string) { if (!isUserProfileToStoreInWrapper(convoId)) { @@ -32,15 +33,18 @@ async function insertUserProfileIntoWrapper(convoId: string) { ); // const expirySeconds = ourConvo.get('expireTimer') || 0; if (dbProfileUrl && !isEmpty(dbProfileKey)) { - await UserConfigWrapperActions.setUserInfo( - dbName, - priority, - { - url: dbProfileUrl, - key: dbProfileKey, - } - // expirySeconds - ); + if (dbProfileKey.length === 32) { + const fixedLen = toFixedUint8ArrayOfLength(dbProfileKey, 32); + await UserConfigWrapperActions.setUserInfo( + dbName, + priority, + { + url: dbProfileUrl, + key: fixedLen.buffer, // TODO make this use the fixed length array + } + // expirySeconds + ); + } } else { await UserConfigWrapperActions.setUserInfo(dbName, priority, null); // expirySeconds } diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 47f8a9e44c..93ce75ae20 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -1,5 +1,6 @@ /* eslint-disable no-restricted-syntax */ import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit'; +import { PubkeyType } from 'libsession_util_nodejs'; import { omit, toNumber } from 'lodash'; import { ReplyingToMessageProps } from '../../components/conversation/composition/CompositionBox'; import { QuotedAttachmentType } from '../../components/conversation/message/message-content/quote/Quote'; @@ -83,23 +84,24 @@ export type PropsForExpirationTimer = { receivedAt: number | undefined; }; -export type PropsForGroupUpdateGeneral = { - type: 'general'; -}; - export type PropsForGroupUpdateAdd = { type: 'add'; - added: Array; + added: Array; }; export type PropsForGroupUpdateKicked = { type: 'kicked'; - kicked: Array; + kicked: Array; +}; + +export type PropsForGroupUpdatePromoted = { + type: 'promoted'; + promoted: Array; }; export type PropsForGroupUpdateLeft = { type: 'left'; - left: Array; + left: Array; }; export type PropsForGroupUpdateName = { @@ -108,9 +110,9 @@ export type PropsForGroupUpdateName = { }; export type PropsForGroupUpdateType = - | PropsForGroupUpdateGeneral | PropsForGroupUpdateAdd | PropsForGroupUpdateKicked + | PropsForGroupUpdatePromoted | PropsForGroupUpdateName | PropsForGroupUpdateLeft; diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index 027c2fff22..5ab0cbb4ab 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -89,9 +89,9 @@ const initNewGroupInWrapper = createAsyncThunk( // dump is always empty when creating a new groupInfo await MetaGroupWrapperActions.init(groupPk, { metaDumped: null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64).buffer, groupEd25519Secretkey: newGroup.secretKey, - groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), + groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32).buffer, }); for (let index = 0; index < uniqMembers.length; index++) { @@ -177,9 +177,9 @@ const handleUserGroupUpdate = createAsyncThunk( try { await MetaGroupWrapperActions.init(groupPk, { metaDumped: null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64), + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64).buffer, groupEd25519Secretkey: userGroup.secretKey, - groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32), + groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32).buffer, }); } catch (e) { window.log.warn(`failed to init metawrapper ${groupPk}`); @@ -246,9 +246,10 @@ const loadMetaDumpsFromDB = createAsyncThunk( window.log.debug('loadMetaDumpsFromDB initing from metagroup dump', variant); await MetaGroupWrapperActions.init(groupPk, { - groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd25519Pubkey, 32), + groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd25519Pubkey, 32).buffer, groupEd25519Secretkey: foundInUserWrapper?.secretKey || null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(ed25519KeyPairBytes.privKeyBytes, 64), + userEd25519Secretkey: toFixedUint8ArrayOfLength(ed25519KeyPairBytes.privKeyBytes, 64) + .buffer, metaDumped: data, }); diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index 10d9dc8983..810eef4d2a 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -124,6 +124,20 @@ const getSelectedConversationIsGroup = (state: StateType): boolean => { return selected.type ? isOpenOrClosedGroup(selected.type) : false; }; +/** + * Returns true if the current conversation selected is a group conversation. + * Returns false if the current conversation selected is not a group conversation, or none are selected + */ +const getSelectedConversationIsGroupV2 = (state: StateType): boolean => { + const selected = getSelectedConversation(state); + if (!selected || !selected.type) { + return false; + } + return selected.type + ? selected.type === ConversationTypeEnum.GROUPV2 && PubKey.isClosedGroupV2(selected.id) + : false; +}; + /** * Returns true if the current conversation selected is a closed group and false otherwise. */ @@ -179,6 +193,9 @@ export function useSelectedConversationKey() { export function useSelectedIsGroup() { return useSelector(getSelectedConversationIsGroup); } +export function useSelectedIsGroupV2() { + return useSelector(getSelectedConversationIsGroupV2); +} export function useSelectedIsPublic() { return useSelector(getSelectedConversationIsPublic); diff --git a/ts/state/selectors/user.ts b/ts/state/selectors/user.ts index 774f3fddae..d3a357bbdd 100644 --- a/ts/state/selectors/user.ts +++ b/ts/state/selectors/user.ts @@ -1,16 +1,17 @@ import { createSelector } from '@reduxjs/toolkit'; +import { PubkeyType } from 'libsession_util_nodejs'; import { useSelector } from 'react-redux'; import { LocalizerType } from '../../types/Util'; -import { StateType } from '../reducer'; import { UserStateType } from '../ducks/user'; +import { StateType } from '../reducer'; export const getUser = (state: StateType): UserStateType => state.user; export const getOurNumber = createSelector( getUser, - (state: UserStateType): string => state.ourNumber + (state: UserStateType): PubkeyType => state.ourNumber as PubkeyType ); export const getIntl = createSelector(getUser, (): LocalizerType => window.i18n); diff --git a/ts/test/session/unit/crypto/MessageEncrypter_test.ts b/ts/test/session/unit/crypto/MessageEncrypter_test.ts index d7658024d5..272fa5881e 100644 --- a/ts/test/session/unit/crypto/MessageEncrypter_test.ts +++ b/ts/test/session/unit/crypto/MessageEncrypter_test.ts @@ -1,18 +1,19 @@ -import * as crypto from 'crypto'; +/* eslint-disable import/order */ import chai, { expect } from 'chai'; -import Sinon, * as sinon from 'sinon'; import chaiBytes from 'chai-bytes'; +import * as crypto from 'crypto'; +import Sinon, * as sinon from 'sinon'; +import { SignalService } from '../../../../protobuf'; import { concatUInt8Array, getSodiumRenderer, MessageEncrypter } from '../../../../session/crypto'; import { TestUtils } from '../../../test-utils'; -import { SignalService } from '../../../../protobuf'; import { StringUtils, UserUtils } from '../../../../session/utils'; +import { SessionKeyPair } from '../../../../receiver/keypairs'; +import { addMessagePadding } from '../../../../session/crypto/BufferPadding'; import { PubKey } from '../../../../session/types'; import { fromHex, toHex } from '../../../../session/utils/String'; -import { addMessagePadding } from '../../../../session/crypto/BufferPadding'; -import { SessionKeyPair } from '../../../../receiver/keypairs'; export const TEST_identityKeyPair: SessionKeyPair = { pubKey: new Uint8Array([ @@ -32,7 +33,7 @@ export const TEST_identityKeyPair: SessionKeyPair = { chai.use(chaiBytes); describe('MessageEncrypter', () => { - const ourNumber = '0123456789abcdef'; + const ourNumber = TestUtils.generateFakePubKeyStr(); const ourUserEd25516Keypair = { pubKey: '37e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309', privKey: diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts index 8d9e19ead2..a2b932f846 100644 --- a/ts/test/session/unit/crypto/SnodeSignatures_test.ts +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -9,18 +9,14 @@ import { SnodeSignature } from '../../../../session/apis/snode_api/snodeSignatur import { concatUInt8Array } from '../../../../session/crypto'; import { UserUtils } from '../../../../session/utils'; import { fromBase64ToArray, fromHexToArray } from '../../../../session/utils/String'; -import { toFixedUint8ArrayOfLength } from '../../../../types/sqlSharedTypes'; use(chaiAsPromised); const validGroupPk = '03eef710fcaaa73fd50c4311333f5c496e0fdbbe9e8a70fdfa95e7ec62d5032f5c'; -const privKeyUint = toFixedUint8ArrayOfLength( - concatUInt8Array( - fromHexToArray('cd8488c39bf9972739046d627e7796b2bc0e38e2fa99fc4edd59205c28f2cdb1'), - fromHexToArray(validGroupPk.slice(2)) - ), - 64 -); +const privKeyUint = concatUInt8Array( + fromHexToArray('cd8488c39bf9972739046d627e7796b2bc0e38e2fa99fc4edd59205c28f2cdb1'), + fromHexToArray(validGroupPk.slice(2)) +); // len 64 const userEd25519Keypair = { pubKey: '37e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309', diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 3d1bc8377a..003b12572c 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -4,8 +4,8 @@ import { MetaGroupWrapperNode, UserGroupsWrapperNode, } from 'libsession_util_nodejs'; -import Sinon from 'sinon'; import { range } from 'lodash'; +import Sinon from 'sinon'; import { HexString } from '../../../../node/hexStrings'; import { toFixedUint8ArrayOfLength } from '../../../../types/sqlSharedTypes'; import { TestUtils } from '../../../test-utils'; @@ -47,10 +47,10 @@ describe('libsession_metagroup', () => { groupEd25519Pubkey: toFixedUint8ArrayOfLength( HexString.fromHexString(groupCreated.pubkeyHex.slice(2)), 32 - ), + ).buffer, groupEd25519Secretkey: groupCreated.secretKey, metaDumped: null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(us.ed25519KeyPair.privateKey, 64), + userEd25519Secretkey: toFixedUint8ArrayOfLength(us.ed25519KeyPair.privateKey, 64).buffer, }); member = TestUtils.generateFakePubKeyStr(); member2 = TestUtils.generateFakePubKeyStr(); @@ -264,10 +264,10 @@ describe('libsession_metagroup', () => { groupEd25519Pubkey: toFixedUint8ArrayOfLength( HexString.fromHexString(groupCreated.pubkeyHex.slice(2)), 32 - ), + ).buffer, groupEd25519Secretkey: groupCreated.secretKey, metaDumped: null, - userEd25519Secretkey: toFixedUint8ArrayOfLength(us.ed25519KeyPair.privateKey, 64), + userEd25519Secretkey: toFixedUint8ArrayOfLength(us.ed25519KeyPair.privateKey, 64).buffer, }); // mark current user as admin diff --git a/ts/test/session/unit/reactions/ReactionMessage_test.ts b/ts/test/session/unit/reactions/ReactionMessage_test.ts index 256a736586..01be5a7f36 100644 --- a/ts/test/session/unit/reactions/ReactionMessage_test.ts +++ b/ts/test/session/unit/reactions/ReactionMessage_test.ts @@ -1,19 +1,20 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable no-unused-expressions */ import chai, { expect } from 'chai'; -import Sinon, { useFakeTimers } from 'sinon'; -import { noop } from 'lodash'; import chaiAsPromised from 'chai-as-promised'; +import { noop } from 'lodash'; +import Sinon, { useFakeTimers } from 'sinon'; -import { Reactions } from '../../../../util/reactions'; import { Data } from '../../../../data/data'; +import { DEFAULT_RECENT_REACTS } from '../../../../session/constants'; +import { Reactions } from '../../../../util/reactions'; import * as Storage from '../../../../util/storage'; import { generateFakeIncomingPrivateMessage, stubWindowLog } from '../../../test-utils/utils'; -import { DEFAULT_RECENT_REACTS } from '../../../../session/constants'; -import { UserUtils } from '../../../../session/utils'; -import { SignalService } from '../../../../protobuf'; import { MessageCollection } from '../../../../models/message'; +import { SignalService } from '../../../../protobuf'; +import { UserUtils } from '../../../../session/utils'; +import { TestUtils } from '../../../test-utils'; chai.use(chaiAsPromised as any); @@ -21,7 +22,7 @@ describe('ReactionMessage', () => { stubWindowLog(); let clock: Sinon.SinonFakeTimers; - const ourNumber = '0123456789abcdef'; + const ourNumber = TestUtils.generateFakePubKeyStr(); const originalMessage = generateFakeIncomingPrivateMessage(); originalMessage.set('sent_at', Date.now()); diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index c41671766a..2baf03ee24 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -13,6 +13,7 @@ import chaiAsPromised from 'chai-as-promised'; import { describe } from 'mocha'; import Sinon, * as sinon from 'sinon'; +import { PubkeyType } from 'libsession_util_nodejs'; import { ContentMessage } from '../../../../session/messages/outgoing'; import { ClosedGroupMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupMessage'; import { MessageSender } from '../../../../session/sending'; @@ -34,7 +35,7 @@ const { expect } = chai; describe('MessageQueue', () => { // Initialize new stubbed cache const ourDevice = TestUtils.generateFakePubKey(); - const ourNumber = ourDevice.key; + const ourNumber = ourDevice.key as PubkeyType; // Initialize new stubbed queue let pendingMessageCache: PendingMessageCacheStub; diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index 2f39cf1f1a..afc7e6b03c 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -1,5 +1,6 @@ -import * as crypto from 'crypto'; import { expect } from 'chai'; +// eslint-disable-next-line import/order +import * as crypto from 'crypto'; import _ from 'lodash'; import Sinon, * as sinon from 'sinon'; import { SignalService } from '../../../../protobuf'; @@ -16,10 +17,10 @@ import { OnionV4 } from '../../../../session/onions/onionv4'; import { MessageSender } from '../../../../session/sending'; import { PubKey, RawMessage } from '../../../../session/types'; import { MessageUtils, UserUtils } from '../../../../session/utils'; +import { fromBase64ToArrayBuffer } from '../../../../session/utils/String'; import { TestUtils } from '../../../test-utils'; import { stubCreateObjectUrl, stubData, stubUtilWorker } from '../../../test-utils/utils'; import { TEST_identityKeyPair } from '../crypto/MessageEncrypter_test'; -import { fromBase64ToArrayBuffer } from '../../../../session/utils/String'; describe('MessageSender', () => { afterEach(() => { @@ -38,7 +39,7 @@ describe('MessageSender', () => { }); describe('send', () => { - const ourNumber = '0123456789abcdef'; + const ourNumber = TestUtils.generateFakePubKeyStr(); let sessionMessageAPISendStub: sinon.SinonStub; let encryptStub: sinon.SinonStub<[PubKey, Uint8Array, SignalService.Envelope.Type]>; diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts index b5f418decb..6582b49fac 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts @@ -2,7 +2,12 @@ import chai from 'chai'; import { describe } from 'mocha'; import Sinon, * as sinon from 'sinon'; -import { GroupPubkeyType, LegacyGroupInfo, UserGroupsGet } from 'libsession_util_nodejs'; +import { + GroupPubkeyType, + LegacyGroupInfo, + PubkeyType, + UserGroupsGet, +} from 'libsession_util_nodejs'; import { ConversationModel, Convo } from '../../../../models/conversation'; import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; import { SnodePool, getSwarmPollingInstance } from '../../../../session/apis/snode_api'; @@ -38,7 +43,7 @@ function stubWithGroups(pubkeys: Array) { describe('SwarmPolling:pollForAllKeys', () => { const ourPubkey = TestUtils.generateFakePubKey(); - const ourNumber = ourPubkey.key; + const ourNumber = ourPubkey.key as PubkeyType; let pollOnceForKeySpy: Sinon.SinonSpy< Parameters, diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts index e62705a07b..d8d488d1f1 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts @@ -13,8 +13,7 @@ import { stubData } from '../../../test-utils/utils'; describe('getPollingDetails', () => { // Initialize new stubbed cache - const ourPubkey = TestUtils.generateFakePubKey(); - const ourNumber = ourPubkey.key; + const ourNumber = TestUtils.generateFakePubKeyStr(); let swarmPolling: SwarmPolling; @@ -54,7 +53,7 @@ describe('getPollingDetails', () => { swarmPolling.resetSwarmPolling(); const fn = async () => - swarmPolling.getPollingDetails([{ pubkey: PubKey.cast(ourPubkey), lastPolledTimestamp: 0 }]); + swarmPolling.getPollingDetails([{ pubkey: PubKey.cast(ourNumber), lastPolledTimestamp: 0 }]); await expect(fn()).to.be.rejectedWith(''); }); diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index 3a6923dd98..46c500fb42 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -17,11 +17,11 @@ export function generateFakePubKey(): PubKey { return new PubKey(pubkeyString); } -export function generateFakePubKeyStr(): string { +export function generateFakePubKeyStr(): PubkeyType { // Generates a mock pubkey for testing const numBytes = PubKey.PUBKEY_LEN / 2 - 1; const hexBuffer = crypto.randomBytes(numBytes).toString('hex'); - const pubkeyString = `05${hexBuffer}`; + const pubkeyString: PubkeyType = `05${hexBuffer}`; return pubkeyString; } diff --git a/ts/test/util/blockedNumberController_test.ts b/ts/test/util/blockedNumberController_test.ts index 904a3d3a95..115edb35ac 100644 --- a/ts/test/util/blockedNumberController_test.ts +++ b/ts/test/util/blockedNumberController_test.ts @@ -1,5 +1,6 @@ import { expect } from 'chai'; import Sinon from 'sinon'; +import { Convo } from '../../models/conversation'; import { BlockedNumberController } from '../../util/blockedNumberController'; import { TestUtils } from '../test-utils'; @@ -51,6 +52,8 @@ describe('BlockedNumberController', () => { describe('block', () => { it('should block the user', async () => { + Sinon.stub(Convo, 'commitConversationAndRefreshWrapper').resolves(); + const other = TestUtils.generateFakePubKey(); await BlockedNumberController.block(other); diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 94c89999fe..1c71658d2c 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -189,8 +189,25 @@ export type LocalizerKeys = | 'getStarted' | 'goToReleaseNotes' | 'goToSupportPage' + | 'groupAvatarChange' | 'groupMembers' + | 'groupNameChange' + | 'groupNameChangeFallback' | 'groupNamePlaceholder' + | 'groupOneJoined' + | 'groupOneLeft' + | 'groupOnePromoted' + | 'groupOneRemoved' + | 'groupOthersJoined' + | 'groupOthersPromoted' + | 'groupOthersRemoved' + | 'groupTwoJoined' + | 'groupTwoPromoted' + | 'groupTwoRemoved' + | 'groupYouJoined' + | 'groupYouLeft' + | 'groupYouPromoted' + | 'groupYouRemoved' | 'helpSettingsTitle' | 'helpUsTranslateSession' | 'hideBanner' @@ -483,7 +500,6 @@ export type LocalizerKeys = | 'unpinConversation' | 'unreadMessages' | 'updateGroupDialogTitle' - | 'updatedTheGroup' | 'userAddedToModerators' | 'userBanFailed' | 'userBanned' diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 3b87dfa355..8dc30380a7 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -3,10 +3,10 @@ // eslint-disable-next-line camelcase import { ContactInfoSet, - FixedSizeUint8Array, GroupPubkeyType, LegacyGroupInfo, LegacyGroupMemberInfo, + Uint8ArrayFixedLength, } from 'libsession_util_nodejs'; import { from_hex } from 'libsodium-wrappers-sumo'; import { isArray, isEmpty, isEqual } from 'lodash'; @@ -277,9 +277,12 @@ export function roomHasReactionsEnabled(openGroup?: OpenGroupV2Room) { export function toFixedUint8ArrayOfLength( data: Uint8Array, length: T -): FixedSizeUint8Array { +): Uint8ArrayFixedLength { if (data.length === length) { - return data as any as FixedSizeUint8Array; + return { + buffer: data, + length, + }; } throw new Error( `toFixedUint8ArrayOfLength invalid. Expected length ${length} but got: ${data.length}` diff --git a/ts/util/reactions.ts b/ts/util/reactions.ts index cb1cad416b..c816bc7148 100644 --- a/ts/util/reactions.ts +++ b/ts/util/reactions.ts @@ -86,7 +86,7 @@ const sendMessageReaction = async (messageId: string, emoji: string) => { return undefined; } - let me = UserUtils.getOurPubKeyStrFromCache(); + let me: string = UserUtils.getOurPubKeyStrFromCache(); let id = Number(found.get('sent_at')); if (found.get('isPublic')) { diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 12660f0b37..357a10b810 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -1,22 +1,23 @@ /* eslint-disable import/extensions */ /* eslint-disable import/no-unresolved */ -import { join } from 'path'; import { - GroupWrapperConstructor, ContactInfoSet, ContactsWrapperActionsCalls, ConvoInfoVolatileWrapperActionsCalls, GenericWrapperActionsCall, GroupInfoSet, GroupPubkeyType, + GroupWrapperConstructor, LegacyGroupInfo, + MergeSingle, MetaGroupWrapperActionsCalls, ProfilePicture, UserConfigWrapperActionsCalls, - UserGroupsWrapperActionsCalls, UserGroupsSet, - MergeSingle, + UserGroupsWrapperActionsCalls, } from 'libsession_util_nodejs'; +// eslint-disable-next-line import/order +import { join } from 'path'; import { getAppRootPath } from '../../../node/getRootPath'; import { WorkerInterface } from '../../worker_interface'; From e2801915efa9ce906ed56835ae1f85dbadc52349 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 23 Oct 2023 10:55:38 +1100 Subject: [PATCH 048/302] chore: cleaned up window.d.ts --- about_preload.js | 8 -------- preload.js | 2 +- ts/window.d.ts | 17 +++-------------- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/about_preload.js b/about_preload.js index 27f48d231e..17f1210210 100644 --- a/about_preload.js +++ b/about_preload.js @@ -20,14 +20,6 @@ window.getVersion = () => config.version; window.getCommitHash = () => config.commitHash; window.getAppInstance = () => config.appInstance; -const { AboutView } = require('./ts/components/AboutView'); - -window.Signal = { - Components: { - AboutView, - }, -}; - window.closeAbout = () => ipcRenderer.send('close-about'); require('./ts/util/logging'); diff --git a/preload.js b/preload.js index c0fc59dea9..bb904551fa 100644 --- a/preload.js +++ b/preload.js @@ -237,7 +237,7 @@ window.nodeSetImmediate = setImmediate; const data = require('./ts/data/dataInit'); const { setupi18n } = require('./ts/util/i18n'); -window.Signal = data.initData(); +data.initData(); const { ConvoHub } = require('./ts/session/conversations/ConversationController'); window.getConversationController = ConvoHub.use; diff --git a/ts/window.d.ts b/ts/window.d.ts index 6ccc54c192..9283b59256 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -3,7 +3,6 @@ import {} from 'styled-components/cssprop'; import { LocalizerType } from './types/Util'; -import { ConversationCollection } from './models/conversation'; import { PrimaryColorStateType, ThemeStateType } from './themes/constants/colors'; export interface LibTextsecure { @@ -17,14 +16,11 @@ If you import anything in global.d.ts, the type system won't work correctly. declare global { interface Window { - CONSTANTS: any; Events: any; - Lodash: any; Session: any; Whisper: any; clearLocalData: any; clipboard: any; - dcodeIO: any; getSettingValue: (id: string, comparisonValue?: any) => any; setSettingValue: (id: string, value: any) => Promise; @@ -43,28 +39,25 @@ declare global { debugOnionRequests: boolean; }; }; - SessionSnodeAPI: SessionSnodeAPI; onLogin: (pw: string) => Promise; persistStore?: Persistor; - restart: any; + restart: () => void; getSeedNodeList: () => Array | undefined; - setPassword: any; + setPassword: (passPhrase: string | null, oldPhrase: string | null) => Promise; isOnline: boolean; toggleMediaPermissions: () => Promise; toggleCallMediaPermissionsTo: (enabled: boolean) => Promise; getCallMediaPermissions: () => boolean; toggleMenuBar: () => void; - toggleSpellCheck: any; + toggleSpellCheck: () => void; primaryColor: PrimaryColorStateType; theme: ThemeStateType; setTheme: (newTheme: string) => Promise; isDev?: () => boolean; userConfig: any; versionInfo: any; - getConversations: () => ConversationCollection; readyForUpdates: () => void; drawAttention: () => void; - MediaRecorder: any; platform: string; openFromNotification: (convoId: string) => void; @@ -91,9 +84,7 @@ declare global { conversationKey: string; messageId: string | null; }) => Promise; - LokiPushNotificationServer: any; getGlobalOnlineStatus: () => boolean; - confirmationDialog: any; setStartInTray: (val: boolean) => Promise; getStartInTray: () => Promise; getOpengroupPruning: () => Promise; @@ -104,7 +95,5 @@ declare global { setAutoUpdateEnabled: (enabled: boolean) => void; setZoomFactor: (newZoom: number) => void; updateZoomFactor: () => void; - - Signal: any; } } From 6ed74c9807873c5f0d75396abbd9e622ebba8371 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 24 Oct 2023 11:00:18 +1100 Subject: [PATCH 049/302] feat: move profile details of group invite to use the one in dataMsg --- protos/SignalService.proto | 4 --- .../group_v2/GroupUpdateMessage.ts | 7 +--- .../GroupUpdateDeleteMemberContentMessage.ts | 6 ++-- .../to_group/GroupUpdateInfoChangeMessage.ts | 7 ++-- .../GroupUpdateInviteResponseMessage.ts | 10 +++--- .../GroupUpdateMemberChangeMessage.ts | 6 ++-- .../to_group/GroupUpdateMemberLeftMessage.ts | 6 ++-- .../to_user/GroupUpdateDeleteMessage.ts | 5 +-- .../to_user/GroupUpdateInviteMessage.ts | 32 +++++++++++++------ .../to_user/GroupUpdatePromoteMessage.ts | 6 ++-- ts/session/sending/MessageQueue.ts | 7 +++- ts/session/sending/MessageSender.ts | 11 +++++-- ts/session/types/PubKey.ts | 8 ++++- ts/state/ducks/groups.ts | 5 +++ 14 files changed, 71 insertions(+), 49 deletions(-) diff --git a/protos/SignalService.proto b/protos/SignalService.proto index f91beb3670..d71ab754cb 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -89,8 +89,6 @@ message GroupUpdateInviteMessage { // @required required string name = 2; required bytes memberAuthData = 3; - optional bytes profileKey = 4; - optional LokiProfile profile = 5; // @required required bytes adminSignature = 6; } @@ -140,8 +138,6 @@ message GroupUpdateMemberLeftMessage { message GroupUpdateInviteResponseMessage { // @required required bool isApproved = 1; // Whether the request was approved - optional bytes profileKey = 2; - optional LokiProfile profile = 3; } diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts index 012e61daac..c5af608f48 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts @@ -19,12 +19,7 @@ export abstract class GroupUpdateMessage extends DataMessage { } } - protected abstract updateProto(): SignalService.GroupUpdateMessage; - - public dataProto(): SignalService.DataMessage { - const groupUpdateMessage = this.updateProto(); - return new SignalService.DataMessage({ groupUpdateMessage }); - } + public abstract dataProto(): SignalService.DataMessage; public abstract isFor1o1Swarm(): boolean; public abstract isForGroupSwarm(): boolean; diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts index d8e2d7559f..33a5e5a557 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts @@ -25,15 +25,13 @@ export class GroupUpdateDeleteMemberContentMessage extends GroupUpdateMessage { } } - protected updateProto(): SignalService.GroupUpdateMessage { + public dataProto(): SignalService.DataMessage { const deleteMemberContent = new SignalService.GroupUpdateDeleteMemberContentMessage({ adminSignature: this.adminSignature, memberSessionIds: this.memberSessionIds, }); - return new SignalService.GroupUpdateMessage({ - deleteMemberContent, - }); + return new SignalService.DataMessage({ groupUpdateMessage: { deleteMemberContent } }); } public isForGroupSwarm(): boolean { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts index fbfd413257..c8ded96230 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts @@ -53,7 +53,7 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { } } - protected updateProto(): SignalService.GroupUpdateMessage { + public dataProto(): SignalService.DataMessage { const infoChangeMessage = new SignalService.GroupUpdateInfoChangeMessage({ type: this.typeOfChange, }); @@ -66,10 +66,7 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { ) { infoChangeMessage.updatedExpiration = this.updatedExpirationSeconds; } - - return new SignalService.GroupUpdateMessage({ - infoChangeMessage, - }); + return new SignalService.DataMessage({ groupUpdateMessage: { infoChangeMessage } }); } public isForGroupSwarm(): boolean { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts index 3722047a0a..428e84bf53 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts @@ -18,11 +18,14 @@ export class GroupUpdateInviteResponseMessage extends GroupUpdateMessage { this.isApproved = params.isApproved; } - protected updateProto(): SignalService.GroupUpdateMessage { + public dataProto(): SignalService.DataMessage { const ourProfile = getOurProfile(); const inviteResponse = new SignalService.GroupUpdateInviteResponseMessage({ isApproved: true, + }); + + return new SignalService.DataMessage({ profileKey: ourProfile?.profileKey, profile: ourProfile ? { @@ -30,10 +33,7 @@ export class GroupUpdateInviteResponseMessage extends GroupUpdateMessage { profilePicture: ourProfile.avatarPointer, } : undefined, - }); - - return new SignalService.GroupUpdateMessage({ - inviteResponse, + groupUpdateMessage: { inviteResponse }, }); } diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts index 734097d8f9..9783f82229 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts @@ -62,15 +62,13 @@ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { } } - protected updateProto(): SignalService.GroupUpdateMessage { + public dataProto(): SignalService.DataMessage { const memberChangeMessage = new SignalService.GroupUpdateMemberChangeMessage({ type: this.typeOfChange, memberSessionIds: this.memberSessionIds, }); - return new SignalService.GroupUpdateMessage({ - memberChangeMessage, - }); + return new SignalService.DataMessage({ groupUpdateMessage: { memberChangeMessage } }); } public isForGroupSwarm(): boolean { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts index 4266dd3fa8..de46bdedd1 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts @@ -7,12 +7,10 @@ import { GroupUpdateMessage } from '../GroupUpdateMessage'; * */ export class GroupUpdateMemberLeftMessage extends GroupUpdateMessage { - protected updateProto(): SignalService.GroupUpdateMessage { + public dataProto(): SignalService.DataMessage { const memberLeftMessage = new SignalService.GroupUpdateMemberLeftMessage({}); - return new SignalService.GroupUpdateMessage({ - memberLeftMessage, - }); + return new SignalService.DataMessage({ groupUpdateMessage: { memberLeftMessage } }); } public isForGroupSwarm(): boolean { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts index 70ccaf0fe5..328b414127 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts @@ -17,12 +17,13 @@ export class GroupUpdateDeleteMessage extends GroupUpdateMessage { this.adminSignature = params.adminSignature; } - protected updateProto(): SignalService.GroupUpdateMessage { + public dataProto(): SignalService.DataMessage { const deleteMessage = new SignalService.GroupUpdateDeleteMessage({ groupSessionId: this.groupPk, adminSignature: this.adminSignature, }); - return new SignalService.GroupUpdateMessage({ deleteMessage }); + + return new SignalService.DataMessage({ groupUpdateMessage: { deleteMessage } }); } public isForGroupSwarm(): boolean { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts index 4394aacd9a..3802037593 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts @@ -1,5 +1,6 @@ import { SignalService } from '../../../../../../protobuf'; import { UserUtils } from '../../../../../utils'; +import { Preconditions } from '../../../preconditions'; import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; interface Params extends GroupUpdateMessageParams { @@ -16,31 +17,44 @@ export class GroupUpdateInviteMessage extends GroupUpdateMessage { public readonly adminSignature: Params['adminSignature']; public readonly memberAuthData: Params['memberAuthData']; - constructor(params: Params) { + constructor({ adminSignature, groupName, memberAuthData, ...others }: Params) { super({ - timestamp: params.timestamp, - identifier: params.identifier, - groupPk: params.groupPk, + ...others, }); - this.groupName = params.groupName; - this.adminSignature = params.adminSignature; - this.memberAuthData = params.memberAuthData; + this.groupName = groupName; // not sure if getting an invite with an empty group name should make us drop an incoming group invite (and the keys associated to it too) + this.adminSignature = adminSignature; + this.memberAuthData = memberAuthData; + Preconditions.checkUin8tArrayOrThrow( + memberAuthData, + 100, + 'memberAuthData', + 'GroupUpdateInviteMessage' + ); + Preconditions.checkUin8tArrayOrThrow( + adminSignature, + 32, + 'adminSignature', + 'GroupUpdateInviteMessage' + ); } - protected updateProto(): SignalService.GroupUpdateMessage { + public dataProto(): SignalService.DataMessage { const ourProfile = UserUtils.getOurProfile(); const inviteMessage = new SignalService.GroupUpdateInviteMessage({ groupSessionId: this.groupPk, name: this.groupName, adminSignature: this.adminSignature, memberAuthData: this.memberAuthData, + }); + + return new SignalService.DataMessage({ profile: ourProfile ? { displayName: ourProfile.displayName, profilePicture: ourProfile.avatarPointer } : undefined, profileKey: ourProfile?.profileKey, + groupUpdateMessage: { inviteMessage }, }); - return new SignalService.GroupUpdateMessage({ inviteMessage }); } public isForGroupSwarm(): boolean { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts index 1cc3252257..b41fec3638 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts @@ -22,12 +22,14 @@ export class GroupUpdatePromoteMessage extends GroupUpdateMessage { } } - protected updateProto(): SignalService.GroupUpdateMessage { + public dataProto(): SignalService.DataMessage { const promoteMessage = new SignalService.GroupUpdatePromoteMessage({ groupIdentitySeed: this.groupIdentitySeed, }); - return new SignalService.GroupUpdateMessage({ promoteMessage }); + return new SignalService.DataMessage({ + groupUpdateMessage: { promoteMessage }, + }); } public isForGroupSwarm(): boolean { diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 78452b6a96..7a607132c7 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -31,6 +31,7 @@ import { } from '../apis/snode_api/namespaces'; import { CallMessage } from '../messages/outgoing/controlMessage/CallMessage'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; +import { GroupUpdateInviteMessage } from '../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; type ClosedGroupMessageType = @@ -249,7 +250,11 @@ export class MessageQueue { pubkey, }: { pubkey: PubKey; - message: ClosedGroupNewMessage | CallMessage | ClosedGroupMemberLeftMessage; + message: + | ClosedGroupNewMessage + | CallMessage + | ClosedGroupMemberLeftMessage + | GroupUpdateInviteMessage; namespace: SnodeNamespaces; }): Promise { let rawMessage; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 28e02eba9d..8942fe7cdf 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -49,8 +49,15 @@ function overwriteOutgoingTimestampWithNetworkTimestamp(message: { plainTextBuff const { dataMessage, dataExtractionNotification, typingMessage } = contentDecoded; if (dataMessage && dataMessage.timestamp && toNumber(dataMessage.timestamp) > 0) { - // this is a sync message, do not overwrite the message timestamp - if (dataMessage.syncTarget) { + // for a few message types, we cannot override the timestamp when sending it. + // - for a sync message + // - groupv2InviteMessage, groupUpdateDeleteMemberContentMessage, groupUpdateDeleteMessage as the embedded signature depends on the timestamp inside + if ( + dataMessage.syncTarget || + dataMessage.groupUpdateMessage?.inviteMessage || + dataMessage.groupUpdateMessage?.deleteMemberContent || + dataMessage.groupUpdateMessage?.deleteMessage + ) { return { overRiddenTimestampBuffer: plainTextBuffer, networkTimestamp: _.toNumber(dataMessage.timestamp), diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index ad2c2bb55e..4f7dc8554f 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -1,4 +1,4 @@ -import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { fromHexToArray } from '../utils/String'; export enum KeyPrefixType { @@ -235,8 +235,14 @@ export class PubKey { return key.startsWith(KeyPrefixType.blinded15) || key.startsWith(KeyPrefixType.blinded25); } + // TODO we should probably move those to a libsession exported ts file public static isClosedGroupV2(key: string): key is GroupPubkeyType { const regex = new RegExp(`^${KeyPrefixType.groupV2}${PubKey.HEX}{64}$`); return regex.test(key); } + + public static is05Pubkey(key: string): key is PubkeyType { + const regex = new RegExp(`^${KeyPrefixType.standard}${PubKey.HEX}{64}$`); + return regex.test(key); + } } diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index 5ab0cbb4ab..df7a213a53 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -4,6 +4,7 @@ import { GroupInfoGet, GroupMemberGet, GroupPubkeyType, + PubkeyType, UserGroupsGet, } from 'libsession_util_nodejs'; import { isEmpty, uniq } from 'lodash'; @@ -11,7 +12,11 @@ import { ConfigDumpData } from '../../data/configDump/configDump'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; +import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces'; import { ConvoHub } from '../../session/conversations'; +import { getGroupInvitesMessages } from '../../session/crypto/group/groupSignature'; +import { getMessageQueue } from '../../session/sending'; +import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { PreConditionFailed } from '../../session/utils/errors'; From d7608c42b67f4f2315364f2bc89cc34e7a014b54 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 24 Oct 2023 13:53:28 +1100 Subject: [PATCH 050/302] feat: add building and sending of invite messages --- ts/session/crypto/group/groupSignature.ts | 51 +++++++++++++++++++ .../GroupUpdateDeleteMemberContentMessage.ts | 13 +++++ .../to_user/GroupUpdateDeleteMessage.ts | 8 +++ .../to_user/GroupUpdateInviteMessage.ts | 25 ++++----- ts/session/messages/outgoing/preconditions.ts | 37 ++++++++++++++ ts/state/ducks/groups.ts | 37 ++++++++++++-- .../libsession_wrapper_metagroup_test.ts | 7 +-- .../browser/libsession_worker_interface.ts | 23 ++++++--- 8 files changed, 174 insertions(+), 27 deletions(-) create mode 100644 ts/session/crypto/group/groupSignature.ts create mode 100644 ts/session/messages/outgoing/preconditions.ts diff --git a/ts/session/crypto/group/groupSignature.ts b/ts/session/crypto/group/groupSignature.ts new file mode 100644 index 0000000000..76c0d35029 --- /dev/null +++ b/ts/session/crypto/group/groupSignature.ts @@ -0,0 +1,51 @@ +import { GroupMemberGet, GroupPubkeyType, Uint8ArrayLen64 } from 'libsession_util_nodejs'; +import { compact } from 'lodash'; +import { MetaGroupWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; +import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime'; +import { GroupUpdateInviteMessage } from '../../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; +import { UserUtils } from '../../utils'; +import { getSodiumRenderer } from '../MessageEncrypter'; + +export async function getGroupInvitesMessages({ + groupName, + membersFromWrapper, + secretKey, + groupPk, +}: { + membersFromWrapper: Array; + groupName: string; + secretKey: Uint8ArrayLen64; // len 64 + groupPk: GroupPubkeyType; +}) { + const sodium = await getSodiumRenderer(); + const timestamp = GetNetworkTime.getNowWithNetworkOffset(); + + const inviteDetails = compact( + await Promise.all( + membersFromWrapper.map(async ({ pubkeyHex: member }) => { + if (UserUtils.isUsFromCache(member)) { + return null; + } + const tosign = `INVITE${member}${timestamp}`; + + // Note: as the signature is built with the timestamp here, we cannot override the timestamp later on the sending pipeline + const adminSignature = sodium.crypto_sign_detached(tosign, secretKey); + console.info(`before makeSwarmSubAccount ${groupPk}:${member}`); + const memberAuthData = await MetaGroupWrapperActions.makeSwarmSubAccount(groupPk, member); + debugger; + console.info(`after makeSwarmSubAccount ${groupPk}:${member}`); + + const invite = new GroupUpdateInviteMessage({ + groupName, + groupPk, + timestamp, + adminSignature, + memberAuthData, + }); + + return { member, invite }; + }) + ) + ); + return inviteDetails; +} diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts index 33a5e5a557..84012654ca 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts @@ -1,6 +1,7 @@ import { PubkeyType } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; import { SignalService } from '../../../../../../protobuf'; +import { Preconditions } from '../../../preconditions'; import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; type Params = GroupUpdateMessageParams & { @@ -23,6 +24,18 @@ export class GroupUpdateDeleteMemberContentMessage extends GroupUpdateMessage { if (isEmpty(this.memberSessionIds)) { throw new Error('GroupUpdateDeleteMemberContentMessage needs members in list'); } + Preconditions.checkUin8tArrayOrThrow({ + data: this.adminSignature, + expectedLength: 64, + varName: 'adminSignature', + context: this.constructor.toString(), + }); + + Preconditions.checkArrayHaveOnly05Pubkeys({ + arr: this.memberSessionIds, + context: this.constructor.toString(), + varName: 'memberSessionIds', + }); } public dataProto(): SignalService.DataMessage { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts index 328b414127..6362292636 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts @@ -1,4 +1,5 @@ import { SignalService } from '../../../../../../protobuf'; +import { Preconditions } from '../../../preconditions'; import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; interface Params extends GroupUpdateMessageParams { @@ -15,6 +16,13 @@ export class GroupUpdateDeleteMessage extends GroupUpdateMessage { super(params); this.adminSignature = params.adminSignature; + + Preconditions.checkUin8tArrayOrThrow({ + data: this.adminSignature, + expectedLength: 64, + varName: 'adminSignature', + context: this.constructor.toString(), + }); } public dataProto(): SignalService.DataMessage { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts index 3802037593..93c253d041 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts @@ -25,18 +25,19 @@ export class GroupUpdateInviteMessage extends GroupUpdateMessage { this.groupName = groupName; // not sure if getting an invite with an empty group name should make us drop an incoming group invite (and the keys associated to it too) this.adminSignature = adminSignature; this.memberAuthData = memberAuthData; - Preconditions.checkUin8tArrayOrThrow( - memberAuthData, - 100, - 'memberAuthData', - 'GroupUpdateInviteMessage' - ); - Preconditions.checkUin8tArrayOrThrow( - adminSignature, - 32, - 'adminSignature', - 'GroupUpdateInviteMessage' - ); + + Preconditions.checkUin8tArrayOrThrow({ + data: adminSignature, + expectedLength: 64, + varName: 'adminSignature', + context: this.constructor.toString(), + }); + Preconditions.checkUin8tArrayOrThrow({ + data: memberAuthData, + expectedLength: 100, + varName: 'memberAuthData', + context: this.constructor.toString(), + }); } public dataProto(): SignalService.DataMessage { diff --git a/ts/session/messages/outgoing/preconditions.ts b/ts/session/messages/outgoing/preconditions.ts new file mode 100644 index 0000000000..8a29e421ff --- /dev/null +++ b/ts/session/messages/outgoing/preconditions.ts @@ -0,0 +1,37 @@ +import { isEmpty } from 'lodash'; +import { PubKey } from '../../types'; +import { PreConditionFailed } from '../../utils/errors'; + +function checkUin8tArrayOrThrow({ + context, + data, + expectedLength, + varName, +}: { + data: Uint8Array; + expectedLength: number; + varName: string; + context: string; +}) { + if (isEmpty(data) || data.length !== expectedLength) { + throw new PreConditionFailed( + `${varName} length should be ${expectedLength} for ctx:"${context}"` + ); + } +} + +function checkArrayHaveOnly05Pubkeys({ + context, + arr, + varName, +}: { + arr: Array; + varName: string; + context: string; +}) { + if (arr.some(v => !PubKey.is05Pubkey(v))) { + throw new PreConditionFailed(`${varName} did not contain only 05 pubkeys for ctx:"${context}"`); + } +} + +export const Preconditions = { checkUin8tArrayOrThrow, checkArrayHaveOnly05Pubkeys }; diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index df7a213a53..dccaae9b8b 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -75,11 +75,18 @@ const initNewGroupInWrapper = createAsyncThunk( if (!members.includes(us)) { throw new PreConditionFailed('initNewGroupInWrapper needs us to be a member'); } - const uniqMembers = uniq(members); + if (members.some(k => !PubKey.is05Pubkey(k))) { + throw new PreConditionFailed('initNewGroupInWrapper only works with members being pubkeys'); + } + const uniqMembers = uniq(members) as Array; // the if just above ensures that this is fine const newGroup = await UserGroupsWrapperActions.createGroup(); const groupPk = newGroup.pubkeyHex; try { + const groupSecretKey = newGroup.secretKey; + if (!groupSecretKey) { + throw new Error('groupSecretKey was empty just after creation.'); + } newGroup.name = groupName; // this will be used by the linked devices until they fetch the info from the groups swarm // the `GroupSync` below will need the secretKey of the group to be saved in the wrapper. So save it! @@ -130,6 +137,7 @@ const initNewGroupInWrapper = createAsyncThunk( const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); if (result !== RunJobResult.Success) { window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); + throw new Error('failed to pushChangesToGroupSwarmIfNeeded'); } await convo.unhideIfNeeded(); @@ -138,6 +146,23 @@ const initNewGroupInWrapper = createAsyncThunk( convo.updateLastMessage(); dispatch(resetOverlayMode()); await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); + // everything is setup for this group, we now need to send the invites to every members, privately and asynchronously, and gracefully handle errors with toasts. + + const inviteDetails = await getGroupInvitesMessages({ + groupName, + membersFromWrapper, + secretKey: groupSecretKey, + groupPk, + }); + + void inviteDetails.map(async detail => { + await getMessageQueue().sendToPubKeyNonDurably({ + message: detail.invite, + namespace: SnodeNamespaces.Default, + pubkey: PubKey.cast(detail.member), + }); + console.log(`sending invite message to ${detail.member}`); + }); return { groupPk: newGroup.pubkeyHex, infos, members: membersFromWrapper }; } catch (e) { @@ -328,18 +353,19 @@ const groupSlice = createSlice({ state.infos[groupPk] = infos; state.members[groupPk] = members; state.creationFromUIPending = false; + return state; }); builder.addCase(initNewGroupInWrapper.rejected, state => { window.log.error('a initNewGroupInWrapper was rejected'); state.creationFromUIPending = false; - throw new Error('initNewGroupInWrapper.rejected'); - + return state; // FIXME delete the wrapper completely & corresponding dumps, and usergroups entry? }); builder.addCase(initNewGroupInWrapper.pending, (state, _action) => { state.creationFromUIPending = true; window.log.error('a initNewGroupInWrapper is pending'); + return state; }); builder.addCase(loadMetaDumpsFromDB.fulfilled, (state, action) => { const loaded = action.payload; @@ -347,9 +373,11 @@ const groupSlice = createSlice({ state.infos[element.groupPk] = element.infos; state.members[element.groupPk] = element.members; }); + return state; }); - builder.addCase(loadMetaDumpsFromDB.rejected, () => { + builder.addCase(loadMetaDumpsFromDB.rejected, state => { window.log.error('a loadMetaDumpsFromDB was rejected'); + return state; }); builder.addCase(refreshGroupDetailsFromWrapper.fulfilled, (state, action) => { const { infos, members, groupPk } = action.payload; @@ -367,6 +395,7 @@ const groupSlice = createSlice({ delete state.infos[groupPk]; delete state.members[groupPk]; } + return state; }); builder.addCase(refreshGroupDetailsFromWrapper.rejected, () => { window.log.error('a refreshGroupDetailsFromWrapper was rejected'); diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 003b12572c..ea73fc35fe 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -2,6 +2,7 @@ import { expect } from 'chai'; import { GroupMemberGet, MetaGroupWrapperNode, + PubkeyType, UserGroupsWrapperNode, } from 'libsession_util_nodejs'; import { range } from 'lodash'; @@ -15,7 +16,7 @@ function profilePicture() { return { key: new Uint8Array(range(0, 32)), url: `${Math.random()}` }; } -function emptyMember(pubkeyHex: string): GroupMemberGet { +function emptyMember(pubkeyHex: PubkeyType): GroupMemberGet { return { inviteFailed: false, invitePending: false, @@ -35,8 +36,8 @@ describe('libsession_metagroup', () => { let us: TestUserKeyPairs; let groupCreated: ReturnType; let metaGroupWrapper: MetaGroupWrapperNode; - let member: string; - let member2: string; + let member: PubkeyType; + let member2: PubkeyType; beforeEach(async () => { us = await TestUtils.generateUserKeyPairs(); diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 357a10b810..1ca5fb7f74 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -12,6 +12,7 @@ import { MergeSingle, MetaGroupWrapperActionsCalls, ProfilePicture, + PubkeyType, UserConfigWrapperActionsCalls, UserGroupsSet, UserGroupsWrapperActionsCalls, @@ -407,11 +408,11 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { >, /** GroupMembers wrapper specific actions */ - memberGet: async (groupPk: GroupPubkeyType, pubkeyHex: string) => + memberGet: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberGet', pubkeyHex]) as Promise< ReturnType >, - memberGetOrConstruct: async (groupPk: GroupPubkeyType, pubkeyHex: string) => + memberGetOrConstruct: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, 'memberGetOrConstruct', @@ -421,29 +422,29 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberGetAll']) as Promise< ReturnType >, - memberErase: async (groupPk: GroupPubkeyType, pubkeyHex: string) => + memberErase: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberErase', pubkeyHex]) as Promise< ReturnType >, - memberSetAccepted: async (groupPk: GroupPubkeyType, pubkeyHex: string) => + memberSetAccepted: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberSetAccepted', pubkeyHex]) as Promise< ReturnType >, - memberSetPromoted: async (groupPk: GroupPubkeyType, pubkeyHex: string, failed: boolean) => + memberSetPromoted: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, failed: boolean) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, 'memberSetPromoted', pubkeyHex, failed, ]) as Promise>, - memberSetInvited: async (groupPk: GroupPubkeyType, pubkeyHex: string, failed: boolean) => + memberSetInvited: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, failed: boolean) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, 'memberSetInvited', pubkeyHex, failed, ]) as Promise>, - memberSetName: async (groupPk: GroupPubkeyType, pubkeyHex: string, name: string) => + memberSetName: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, name: string) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, 'memberSetName', @@ -452,7 +453,7 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { ]) as Promise>, memberSetProfilePicture: async ( groupPk: GroupPubkeyType, - pubkeyHex: string, + pubkeyHex: PubkeyType, profilePicture: ProfilePicture ) => callLibSessionWorker([ @@ -498,6 +499,12 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'decryptMessage', ciphertext]) as Promise< ReturnType >, + makeSwarmSubAccount: async (groupPk: GroupPubkeyType, memberPubkeyHex: PubkeyType) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'makeSwarmSubAccount', + memberPubkeyHex, + ]) as Promise>, }; export const callLibSessionWorker = async ( From b8876ebbfe669b73f64b754c16cfab9e40bf3d23 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 26 Oct 2023 14:29:38 +1100 Subject: [PATCH 051/302] feat: add subaccount auth --- .eslintrc.js | 3 + .../message-content/MessageContent.tsx | 1 - .../leftpane/overlay/OverlayClosedGroup.tsx | 1 + ts/receiver/closedGroups.ts | 2 +- ts/receiver/dataMessage.ts | 21 +- ts/receiver/groupv2/handleGroupV2Message.ts | 90 +++++++ ts/session/apis/snode_api/SNodeAPI.ts | 2 +- .../apis/snode_api/SnodeRequestTypes.ts | 33 ++- ts/session/apis/snode_api/expire.ts | 2 +- ts/session/apis/snode_api/retrieveRequest.ts | 53 ++--- .../snode_api/signature/groupSignature.ts | 225 ++++++++++++++++++ .../snode_api/signature/signatureShared.ts | 75 ++++++ .../{ => signature}/snodeSignatures.ts | 106 +++------ ts/session/apis/snode_api/types.ts | 5 + ts/session/crypto/group/groupSignature.ts | 51 ---- ts/session/sending/MessageSender.ts | 39 +-- ts/session/utils/TaskWithTimeout.ts | 1 - ts/session/utils/User.ts | 4 +- ts/state/ducks/groups.ts | 8 +- .../unit/crypto/SnodeSignatures_test.ts | 187 ++++++++++++--- .../browser/libsession_worker_interface.ts | 12 + 21 files changed, 692 insertions(+), 229 deletions(-) create mode 100644 ts/receiver/groupv2/handleGroupV2Message.ts create mode 100644 ts/session/apis/snode_api/signature/groupSignature.ts create mode 100644 ts/session/apis/snode_api/signature/signatureShared.ts rename ts/session/apis/snode_api/{ => signature}/snodeSignatures.ts (70%) delete mode 100644 ts/session/crypto/group/groupSignature.ts diff --git a/.eslintrc.js b/.eslintrc.js index ff58cdd079..84ad7ccef2 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -56,6 +56,9 @@ module.exports = { // it helps readability to put public API at top, 'no-use-before-define': 'off', + // we need them with code in WIP sometimes, and it doesn't do any harm + 'no-useless-return': 'off', + // useful for unused or internal fields 'no-underscore-dangle': 'off', diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx index 61724294b5..c89495bc4b 100644 --- a/ts/components/conversation/message/message-content/MessageContent.tsx +++ b/ts/components/conversation/message/message-content/MessageContent.tsx @@ -40,7 +40,6 @@ function onClickOnMessageInnerContainer(event: React.MouseEvent) // User clicked on message body const target = event.target as HTMLDivElement; if (target.className === 'text-selectable' || window.contextMenuShown) { - // eslint-disable-next-line no-useless-return return; } } diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index 35c5ae8e71..f9c54fdbdc 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -34,6 +34,7 @@ const StyledMemberListNoContacts = styled.div` const StyledGroupMemberListContainer = styled.div` padding: 2px 0px; width: 100%; + min-height: 40px; max-height: 400px; overflow-y: auto; border-top: 1px solid var(--border-color); diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 2ec248783b..d94ca77994 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -75,7 +75,7 @@ export async function removeAllClosedGroupEncryptionKeyPairs(groupPubKey: string await Data.removeAllClosedGroupEncryptionKeyPairs(groupPubKey); } -export async function handleClosedGroupControlMessage( +export async function handleLegacyClosedGroupControlMessage( envelope: EnvelopePlus, groupUpdate: SignalService.DataMessage.ClosedGroupControlMessage ) { diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index 835494636c..a64291a674 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -11,7 +11,7 @@ import { ConversationModel } from '../models/conversation'; import { ConvoHub } from '../session/conversations'; import { PubKey } from '../session/types'; import { StringUtils, UserUtils } from '../session/utils'; -import { handleClosedGroupControlMessage } from './closedGroups'; +import { handleLegacyClosedGroupControlMessage } from './closedGroups'; import { handleMessageJob, toRegularMessage } from './queuedJob'; import { ConversationTypeEnum } from '../models/conversationAttributes'; @@ -25,6 +25,7 @@ import { isUsFromCache } from '../session/utils/User'; import { Action, Reaction } from '../types/Reaction'; import { toLogFormat } from '../types/attachments/Errors'; import { Reactions } from '../util/reactions'; +import { GroupV2Receiver } from './groupv2/handleGroupV2Message'; function cleanAttachment(attachment: any) { return { @@ -43,7 +44,7 @@ function cleanAttachments(decrypted: SignalService.DataMessage) { // Here we go from binary to string/base64 in all AttachmentPointer digest/key fields - // we do not care about group on Session + // we do not care about group on Session Desktop decrypted.group = null; @@ -150,7 +151,6 @@ export function cleanIncomingDataMessage( * * envelope.source is our pubkey (our other device has the same pubkey as us) * * dataMessage.syncTarget is either the group public key OR the private conversation this message is about. */ - export async function handleSwarmDataMessage( envelope: EnvelopePlus, sentAtTimestamp: number, @@ -161,9 +161,20 @@ export async function handleSwarmDataMessage( window.log.info('handleSwarmDataMessage'); const cleanDataMessage = cleanIncomingDataMessage(rawDataMessage, envelope); - // we handle group updates from our other devices in handleClosedGroupControlMessage() + + if (cleanDataMessage.groupUpdateMessage) { + await GroupV2Receiver.handleGroupUpdateMessage({ + envelopeTimestamp: sentAtTimestamp, + updateMessage: rawDataMessage.groupUpdateMessage as SignalService.GroupUpdateMessage, + }); + // Groups update should always be able to be decrypted as we get the keys before trying to decrypt them. + // If decryption failed once, it will keep failing, so no need to keep it in the cache. + await removeFromCache({ id: envelope.id }); + return; + } + // we handle legacy group updates from our other devices in handleLegacyClosedGroupControlMessage() if (cleanDataMessage.closedGroupControlMessage) { - await handleClosedGroupControlMessage( + await handleLegacyClosedGroupControlMessage( envelope, cleanDataMessage.closedGroupControlMessage as SignalService.DataMessage.ClosedGroupControlMessage ); diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts new file mode 100644 index 0000000000..20c4fb03fd --- /dev/null +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -0,0 +1,90 @@ +import { isEmpty } from 'lodash'; +import { ConversationTypeEnum } from '../../models/conversationAttributes'; +import { HexString } from '../../node/hexStrings'; +import { SignalService } from '../../protobuf'; +import { getSwarmPollingInstance } from '../../session/apis/snode_api'; +import { ConvoHub } from '../../session/conversations'; +import { PubKey } from '../../session/types'; +import { UserUtils } from '../../session/utils'; +import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; +import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../../webworker/workers/browser/libsession_worker_interface'; + +type WithEnvelopeTimestamp = { envelopeTimestamp: number }; + +type GroupInviteDetails = { + inviteMessage: SignalService.GroupUpdateInviteMessage; +} & WithEnvelopeTimestamp; + +type GroupUpdateDetails = { + updateMessage: SignalService.GroupUpdateMessage; +} & WithEnvelopeTimestamp; + +async function handleGroupInviteMessage({ inviteMessage, envelopeTimestamp }: GroupInviteDetails) { + if (!PubKey.isClosedGroupV2(inviteMessage.groupSessionId)) { + // invite to a group which has not a 03 prefix, we can just drop it. + return; + } + // TODO verify sig invite adminSignature + const convo = await ConvoHub.use().getOrCreateAndWait( + inviteMessage.groupSessionId, + ConversationTypeEnum.GROUPV2 + ); + convo.set({ + active_at: envelopeTimestamp, + didApproveMe: true, + }); + + if (inviteMessage.name && isEmpty(convo.getRealSessionUsername())) { + convo.set({ + displayNameInProfile: inviteMessage.name, + }); + } + await convo.commit(); + + let found = await UserGroupsWrapperActions.getGroup(inviteMessage.groupSessionId); + if (!found) { + found = { + authData: null, + joinedAtSeconds: Date.now(), + name: inviteMessage.name, + priority: 0, + pubkeyHex: inviteMessage.groupSessionId, + secretKey: null, + }; + } + // not sure if we should drop it, or set it again? They should be the same anyway + found.authData = inviteMessage.memberAuthData; + + const userEd25519Secretkey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes; + await UserGroupsWrapperActions.setGroup(found); + await MetaGroupWrapperActions.init(inviteMessage.groupSessionId, { + metaDumped: null, + groupEd25519Secretkey: null, + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64).buffer, + groupEd25519Pubkey: toFixedUint8ArrayOfLength( + HexString.fromHexString(inviteMessage.groupSessionId.slice(2)), + 32 + ).buffer, + }); + await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); + + // TODO use the pending so we actually don't start polling here unless it is not in the pending state. + // once everything is ready, start polling using that authData to get the keys, members, details of that group, and its messages. + getSwarmPollingInstance().addGroupId(inviteMessage.groupSessionId); +} + +async function handleGroupUpdateMessage(args: GroupUpdateDetails) { + if (args.updateMessage.inviteMessage) { + await handleGroupInviteMessage({ + inviteMessage: args.updateMessage.inviteMessage as SignalService.GroupUpdateInviteMessage, + ...args, + }); + return; + } +} + +export const GroupV2Receiver = { handleGroupUpdateMessage }; diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index e3628221a0..6d54ca08ec 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -8,8 +8,8 @@ import { ed25519Str } from '../../onions/onionPath'; import { StringUtils, UserUtils } from '../../utils'; import { fromBase64ToArray, fromHexToArray } from '../../utils/String'; import { doSnodeBatchRequest } from './batchRequest'; +import { SnodeSignature } from './signature/snodeSignatures'; import { getSwarmFor } from './snodePool'; -import { SnodeSignature } from './snodeSignatures'; export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.'; diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index df1aba59a0..5d51352fdc 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -49,6 +49,16 @@ export type RetrieveGroupAdminSubRequestType = WithRetrieveMethod & { params: { signature: string; namespace: SnodeNamespacesGroup; + } & RetrieveAlwaysNeeded & + WithMaxCountSize; +}; + +export type RetrieveGroupSubAccountSubRequestType = WithRetrieveMethod & { + params: { + namespace: SnodeNamespacesGroup; + signature: string; + subaccount: string; + subaccount_sig: string; } & RetrieveAlwaysNeeded & WithMaxCountSize & WithPubkeyAsGroupPubkey; @@ -59,7 +69,8 @@ export type RetrieveSubRequestType = | RetrievePubkeySubRequestType | RetrieveGroupAdminSubRequestType | UpdateExpiryOnNodeUserSubRequest - | UpdateExpiryOnNodeGroupSubRequest; + | UpdateExpiryOnNodeGroupSubRequest + | RetrieveGroupSubAccountSubRequestType; /** * OXEND_REQUESTS @@ -91,7 +102,7 @@ export type GetServiceNodesSubRequest = { }; }; -export type StoreOnNodeParams = { +type StoreOnNodeNormalParams = { pubkey: string; ttl: number; timestamp: number; @@ -102,6 +113,19 @@ export type StoreOnNodeParams = { pubkey_ed25519?: string; }; +type StoreOnNodeSubAccountParams = Pick< + StoreOnNodeNormalParams, + 'data' | 'namespace' | 'ttl' | 'timestamp' +> & { + pubkey: GroupPubkeyType; + subaccount: string; + subaccount_sig: string; + namespace: SnodeNamespaces.ClosedGroupMessages; // this can only be this one, subaccounts holder can not post to something else atm + signature: string; // signature is mandatory for subaccount +}; + +export type StoreOnNodeParams = StoreOnNodeNormalParams | StoreOnNodeSubAccountParams; + export type StoreOnNodeParamsNoSig = Pick< StoreOnNodeParams, 'pubkey' | 'ttl' | 'timestamp' | 'ttl' | 'namespace' @@ -131,7 +155,10 @@ type StoreOnNodeUserConfig = StoreOnNodeShared & { export type StoreOnNodeData = StoreOnNodeGroupConfig | StoreOnNodeUserConfig; -export type StoreOnNodeSubRequest = { method: 'store'; params: StoreOnNodeParams }; +export type StoreOnNodeSubRequest = { + method: 'store'; + params: StoreOnNodeParams | StoreOnNodeSubAccountParams; +}; export type NetworkTimeSubRequest = { method: 'info'; params: object }; type DeleteSigParameters = { diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts index ffdd062a26..7d1a8e8bed 100644 --- a/ts/session/apis/snode_api/expire.ts +++ b/ts/session/apis/snode_api/expire.ts @@ -8,8 +8,8 @@ import { EmptySwarmError } from '../../utils/errors'; import { UpdateExpireNodeUserParams } from './SnodeRequestTypes'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; +import { SnodeSignature } from './signature/snodeSignatures'; import { getSwarmFor } from './snodePool'; -import { SnodeSignature } from './snodeSignatures'; async function verifySignature({ pubkey, diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 832eecae89..5d3f61f4a9 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -1,5 +1,5 @@ -import { isEmpty, isNil, omit } from 'lodash'; import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { omit } from 'lodash'; import { Snode } from '../../../data/data'; import { updateIsOnline } from '../../../state/ducks/onion'; import { doSnodeBatchRequest } from './batchRequest'; @@ -12,14 +12,15 @@ import { PubKey } from '../../types'; import { UserUtils } from '../../utils'; import { RetrieveGroupAdminSubRequestType, + RetrieveGroupSubAccountSubRequestType, RetrieveLegacyClosedGroupSubRequestType, RetrieveSubRequestType, UpdateExpiryOnNodeGroupSubRequest, UpdateExpiryOnNodeUserSubRequest, } from './SnodeRequestTypes'; -import { SnodeSignature } from './snodeSignatures'; +import { SnodeGroupSignature } from './signature/groupSignature'; +import { SnodeSignature } from './signature/snodeSignatures'; import { RetrieveMessagesResultsBatched, RetrieveMessagesResultsContent } from './types'; -import { PreConditionFailed } from '../../utils/errors'; type RetrieveParams = { pubkey: string; @@ -102,28 +103,23 @@ async function retrieveRequestForGroup({ throw new Error(`retrieveRequestForGroup: not a groupNamespace: ${namespace}`); } const group = await UserGroupsWrapperActions.getGroup(groupPk); - const groupSecretKey = group?.secretKey; - if (isNil(groupSecretKey) || isEmpty(groupSecretKey)) { - throw new PreConditionFailed( - `retrieveRequestForGroup: failed to find group admin secret key in wrapper` - ); - } - const signatureBuilt = await SnodeSignature.getSnodeGroupSignatureParams({ - ...retrieveParam, + + const sigResult = await SnodeGroupSignature.getSnodeGroupSignature({ + method: 'retrieve', namespace, - method: 'retrieve' as const, - groupPk, - groupIdentityPrivKey: groupSecretKey, + group, }); - const retrieveGroup = { - ...retrieveParam, - ...signatureBuilt, - namespace, - }; - const retrieveParamsGroup: RetrieveGroupAdminSubRequestType = { - method: 'retrieve' as const, - params: retrieveGroup, + const retrieveParamsGroup: + | RetrieveGroupSubAccountSubRequestType + | RetrieveGroupAdminSubRequestType = { + method: 'retrieve', + params: { + ...retrieveParam, + ...sigResult, + + namespace, + }, }; return retrieveParamsGroup; @@ -188,17 +184,12 @@ async function buildRetrieveRequest( retrieveRequestsParams.push(expireParams); } else if (PubKey.isClosedGroupV2(pubkey)) { const group = await UserGroupsWrapperActions.getGroup(pubkey); - if (!group || !group.secretKey || isEmpty(group.secretKey)) { - throw new PreConditionFailed( - 'generateUpdateExpiryGroupSignature only handles when the group is in the userwrapper currently and we have the adminkey' - ); - } - const signResult = await SnodeSignature.generateUpdateExpiryGroupSignature({ + + const signResult = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ shortenOrExtend: '', timestamp: expiry, messagesHashes: configHashesToBump, - groupPk: pubkey, - groupPrivKey: group.secretKey, + group, }); const expireParams: UpdateExpiryOnNodeGroupSubRequest = { @@ -206,7 +197,7 @@ async function buildRetrieveRequest( params: { messages: configHashesToBump, expiry, - signature: signResult.signature, + ...signResult, pubkey, }, }; diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts new file mode 100644 index 0000000000..933e8b082e --- /dev/null +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -0,0 +1,225 @@ +import { + GroupMemberGet, + GroupPubkeyType, + Uint8ArrayLen100, + Uint8ArrayLen64, + UserGroupsGet, +} from 'libsession_util_nodejs'; +import { compact, isEmpty } from 'lodash'; +import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { getSodiumRenderer } from '../../../crypto/MessageEncrypter'; +import { GroupUpdateInviteMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; +import { StringUtils, UserUtils } from '../../../utils'; +import { fromUInt8ArrayToBase64 } from '../../../utils/String'; +import { PreConditionFailed } from '../../../utils/errors'; +import { GetNetworkTime } from '../getNetworkTime'; +import { SnodeNamespacesGroup } from '../namespaces'; +import { WithMessagesHashes, WithShortenOrExtend, WithTimestamp } from '../types'; +import { SignatureShared } from './signatureShared'; +import { SnodeSignatureResult } from './snodeSignatures'; + +async function getGroupInvitesMessages({ + groupName, + membersFromWrapper, + secretKey, + groupPk, +}: { + membersFromWrapper: Array; + groupName: string; + secretKey: Uint8ArrayLen64; // len 64 + groupPk: GroupPubkeyType; +}) { + const sodium = await getSodiumRenderer(); + const timestamp = GetNetworkTime.getNowWithNetworkOffset(); + + const inviteDetails = compact( + await Promise.all( + membersFromWrapper.map(async ({ pubkeyHex: member }) => { + if (UserUtils.isUsFromCache(member)) { + return null; + } + const tosign = `INVITE${member}${timestamp}`; + + // Note: as the signature is built with the timestamp here, we cannot override the timestamp later on the sending pipeline + const adminSignature = sodium.crypto_sign_detached(tosign, secretKey); + const memberAuthData = await MetaGroupWrapperActions.makeSwarmSubAccount(groupPk, member); + + const invite = new GroupUpdateInviteMessage({ + groupName, + groupPk, + timestamp, + adminSignature, + memberAuthData, + }); + + return { member, invite }; + }) + ) + ); + return inviteDetails; +} + +type ParamsShared = { + groupPk: GroupPubkeyType; + namespace: SnodeNamespacesGroup; + method: 'retrieve' | 'store'; +}; + +type SigParamsAdmin = ParamsShared & { + groupIdentityPrivKey: Uint8ArrayLen64; +}; + +type SigParamsSubaccount = ParamsShared & { + authData: Uint8ArrayLen100; +}; + +export type SigResultAdmin = Pick & { + pubkey: GroupPubkeyType; // this is the 03 pubkey of the corresponding group +}; + +export type SigResultSubAccount = SigResultAdmin & { + subaccount: string; + subaccount_sig: string; +}; + +async function getSnodeGroupSignatureParams(params: SigParamsAdmin): Promise; +async function getSnodeGroupSignatureParams( + params: SigParamsSubaccount +): Promise; + +async function getSnodeGroupSignatureParams( + params: SigParamsAdmin | SigParamsSubaccount +): Promise { + if ('groupIdentityPrivKey' in params) { + return getSnodeGroupAdminSignatureParams(params); + } + return getSnodeGroupSubAccountSignatureParams(params); +} + +async function getSnodeGroupSubAccountSignatureParams( + params: SigParamsSubaccount +): Promise { + const { signatureTimestamp, toSign } = + SignatureShared.getVerificationDataForStoreRetrieve(params); + const sigResult = await MetaGroupWrapperActions.swarmSubaccountSign( + params.groupPk, + toSign, + params.authData + ); + return { + ...sigResult, + timestamp: signatureTimestamp, + pubkey: params.groupPk, + }; +} + +async function getSnodeGroupAdminSignatureParams(params: SigParamsAdmin): Promise { + const sigData = await SignatureShared.getSnodeSignatureShared({ + pubKey: params.groupPk, + method: params.method, + namespace: params.namespace, + privKey: params.groupIdentityPrivKey, + }); + return { ...sigData, pubkey: params.groupPk }; +} + +type GroupDetailsNeededForSignature = Pick; + +async function getSnodeGroupSignature({ + group, + method, + namespace, +}: { + group: GroupDetailsNeededForSignature | null; + method: 'store' | 'retrieve'; + namespace: SnodeNamespacesGroup; +}) { + if (!group) { + throw new Error(`getSnodeGroupSignature: did not find group in wrapper`); + } + const { pubkeyHex: groupPk, secretKey, authData } = group; + + const groupSecretKey = secretKey && !isEmpty(secretKey) ? secretKey : null; + const groupAuthData = authData && !isEmpty(authData) ? authData : null; + + if (groupSecretKey) { + return getSnodeGroupSignatureParams({ + method, + namespace, + groupPk, + groupIdentityPrivKey: groupSecretKey, + }); + } + if (groupAuthData) { + const subAccountSign = await getSnodeGroupSignatureParams({ + groupPk, + method, + namespace, + authData: groupAuthData, + }); + return subAccountSign; + } + throw new Error(`getSnodeGroupSignature: needs either groupSecretKey or authData`); +} + +// this is kind of duplicated with `generateUpdateExpirySignature`, but needs to use the authData when secretKey is not available +async function generateUpdateExpiryGroupSignature({ + shortenOrExtend, + timestamp, + messagesHashes, + group, +}: WithMessagesHashes & + WithShortenOrExtend & + WithTimestamp & { + group: GroupDetailsNeededForSignature | null; + }) { + if (!group || isEmpty(group.pubkeyHex)) { + throw new PreConditionFailed('generateUpdateExpiryGroupSignature groupPk is empty'); + } + + // "expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N] + const verificationString = `expire${shortenOrExtend}${timestamp}${messagesHashes.join('')}`; + const verificationData = StringUtils.encode(verificationString, 'utf8'); + const message = new Uint8Array(verificationData); + + if (!group) { + throw new Error('generateUpdateExpiryGroupSignature group was not found'); + } + const { pubkeyHex: groupPk, secretKey, authData } = group; + + const groupSecretKey = secretKey && !isEmpty(secretKey) ? secretKey : null; + const groupAuthData = authData && !isEmpty(authData) ? authData : null; + if (!groupSecretKey && !groupAuthData) { + throw new Error(`retrieveRequestForGroup: needs either groupSecretKey or authData`); + } + + const sodium = await getSodiumRenderer(); + const shared = { timestamp, pubkey: groupPk }; + + if (groupSecretKey) { + return { + signature: fromUInt8ArrayToBase64(sodium.crypto_sign_detached(message, groupSecretKey)), + ...shared, + }; + } + + if (groupAuthData) { + const subaccountSign = await MetaGroupWrapperActions.swarmSubaccountSign( + groupPk, + message, + groupAuthData + ); + return { + ...subaccountSign, + ...shared, + }; + } + + throw new Error(`generateUpdateExpiryGroupSignature: needs either groupSecretKey or authData`); +} + +export const SnodeGroupSignature = { + generateUpdateExpiryGroupSignature, + getGroupInvitesMessages, + getSnodeGroupSignature, +}; diff --git a/ts/session/apis/snode_api/signature/signatureShared.ts b/ts/session/apis/snode_api/signature/signatureShared.ts new file mode 100644 index 0000000000..51ae73a505 --- /dev/null +++ b/ts/session/apis/snode_api/signature/signatureShared.ts @@ -0,0 +1,75 @@ +import { GroupPubkeyType, Uint8ArrayLen100, Uint8ArrayLen64 } from 'libsession_util_nodejs'; +import { isEmpty } from 'lodash'; +import { getSodiumRenderer } from '../../../crypto'; +import { PubKey } from '../../../types'; +import { StringUtils } from '../../../utils'; +import { fromUInt8ArrayToBase64 } from '../../../utils/String'; +import { GetNetworkTime } from '../getNetworkTime'; + +export type SnodeSigParamsShared = { + namespace: number | null | 'all'; // 'all' can be used to clear all namespaces (during account deletion) + method: 'retrieve' | 'store' | 'delete_all'; +}; + +export type SnodeSigParamsAdminGroup = SnodeSigParamsShared & { + groupPk: GroupPubkeyType; + privKey: Uint8ArrayLen64; // len 64 +}; + +export type SnodeSigParamsSubAccount = SnodeSigParamsShared & { + groupPk: GroupPubkeyType; + authData: Uint8ArrayLen100; // len 100 +}; + +export type SnodeSigParamsUs = SnodeSigParamsShared & { + pubKey: string; + privKey: Uint8ArrayLen64; // len 64 +}; + +function getVerificationDataForStoreRetrieve(params: SnodeSigParamsShared) { + const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset(); + const verificationData = StringUtils.encode( + `${params.method}${params.namespace === 0 ? '' : params.namespace}${signatureTimestamp}`, + 'utf8' + ); + return { + toSign: new Uint8Array(verificationData), + signatureTimestamp, + }; +} + +function isSigParamsForGroupAdmin( + sigParams: SnodeSigParamsAdminGroup | SnodeSigParamsUs | SnodeSigParamsSubAccount +): sigParams is SnodeSigParamsAdminGroup { + const asGr = sigParams as SnodeSigParamsAdminGroup; + return PubKey.isClosedGroupV2(asGr.groupPk) && !isEmpty(asGr.privKey); +} + +async function getSnodeSignatureShared(params: SnodeSigParamsAdminGroup | SnodeSigParamsUs) { + const { signatureTimestamp, toSign } = getVerificationDataForStoreRetrieve(params); + + try { + const sodium = await getSodiumRenderer(); + const signature = sodium.crypto_sign_detached(toSign, params.privKey); + const signatureBase64 = fromUInt8ArrayToBase64(signature); + if (isSigParamsForGroupAdmin(params)) { + return { + timestamp: signatureTimestamp, + signature: signatureBase64, + pubkey: params.groupPk, + }; + } + return { + timestamp: signatureTimestamp, + signature: signatureBase64, + }; + } catch (e) { + window.log.warn('getSnodeShared failed with: ', e.message); + throw e; + } +} + +export const SignatureShared = { + getSnodeSignatureShared, + getVerificationDataForStoreRetrieve, +}; diff --git a/ts/session/apis/snode_api/snodeSignatures.ts b/ts/session/apis/snode_api/signature/snodeSignatures.ts similarity index 70% rename from ts/session/apis/snode_api/snodeSignatures.ts rename to ts/session/apis/snode_api/signature/snodeSignatures.ts index 64ae7028fd..5c139d8f18 100644 --- a/ts/session/apis/snode_api/snodeSignatures.ts +++ b/ts/session/apis/snode_api/signature/snodeSignatures.ts @@ -1,15 +1,13 @@ -import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType, Uint8ArrayLen100, Uint8ArrayLen64 } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; -import { toFixedUint8ArrayOfLength } from '../../../types/sqlSharedTypes'; -import { getSodiumRenderer } from '../../crypto'; -import { PubKey } from '../../types'; -import { StringUtils, UserUtils } from '../../utils'; -import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../utils/String'; -import { PreConditionFailed } from '../../utils/errors'; -import { GetNetworkTime } from './getNetworkTime'; -import { SnodeNamespacesGroup } from './namespaces'; - -type WithTimestamp = { timestamp: number }; +import { toFixedUint8ArrayOfLength } from '../../../../types/sqlSharedTypes'; +import { getSodiumRenderer } from '../../../crypto'; +import { PubKey } from '../../../types'; +import { StringUtils, UserUtils } from '../../../utils'; +import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../../utils/String'; +import { PreConditionFailed } from '../../../utils/errors'; +import { GetNetworkTime } from '../getNetworkTime'; +import { WithMessagesHashes, WithShortenOrExtend, WithTimestamp } from '../types'; export type SnodeSignatureResult = WithTimestamp & { signature: string; @@ -17,14 +15,6 @@ export type SnodeSignatureResult = WithTimestamp & { pubkey: string; // this is the x25519 key of the pubkey we are doing the request to (ourself for our swarm usually) }; -type ShortenOrExtend = 'extend' | 'shorten' | ''; -type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; -type WithMessagesHashes = { messagesHashes: Array }; - -export type SnodeGroupSignatureResult = Pick & { - pubkey: GroupPubkeyType; // this is the 03 pubkey of the corresponding group -}; - async function getSnodeSignatureByHashesParams({ messagesHashes, method, @@ -72,30 +62,44 @@ type SnodeSigParamsShared = { type SnodeSigParamsAdminGroup = SnodeSigParamsShared & { groupPk: GroupPubkeyType; - privKey: Uint8Array; // len 64 + privKey: Uint8ArrayLen64; // len 64 +}; + +type SnodeSigParamsSubAccount = SnodeSigParamsShared & { + groupPk: GroupPubkeyType; + authData: Uint8ArrayLen100; // len 100 }; + type SnodeSigParamsUs = SnodeSigParamsShared & { pubKey: string; - privKey: Uint8Array; // len 64 + privKey: Uint8ArrayLen64; // len 64 }; function isSigParamsForGroupAdmin( - sigParams: SnodeSigParamsAdminGroup | SnodeSigParamsUs + sigParams: SnodeSigParamsAdminGroup | SnodeSigParamsUs | SnodeSigParamsSubAccount ): sigParams is SnodeSigParamsAdminGroup { const asGr = sigParams as SnodeSigParamsAdminGroup; - return PubKey.isClosedGroupV2(asGr.groupPk) && !!asGr.privKey; + return PubKey.isClosedGroupV2(asGr.groupPk) && !isEmpty(asGr.privKey); } -async function getSnodeSignatureShared(params: SnodeSigParamsAdminGroup | SnodeSigParamsUs) { +function getVerificationData(params: SnodeSigParamsShared) { const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset(); const verificationData = StringUtils.encode( `${params.method}${params.namespace === 0 ? '' : params.namespace}${signatureTimestamp}`, 'utf8' ); + return { + toSign: new Uint8Array(verificationData), + signatureTimestamp, + }; +} + +async function getSnodeSignatureShared(params: SnodeSigParamsAdminGroup | SnodeSigParamsUs) { + const { signatureTimestamp, toSign } = getVerificationData(params); + try { - const message = new Uint8Array(verificationData); const sodium = await getSodiumRenderer(); - const signature = sodium.crypto_sign_detached(message, params.privKey); + const signature = sodium.crypto_sign_detached(toSign, params.privKey); const signatureBase64 = fromUInt8ArrayToBase64(signature); if (isSigParamsForGroupAdmin(params)) { return { @@ -145,26 +149,6 @@ async function getSnodeSignatureParamsUs({ }; } -async function getSnodeGroupSignatureParams({ - groupIdentityPrivKey, - groupPk, - method, - namespace, -}: { - groupPk: GroupPubkeyType; - groupIdentityPrivKey: Uint8Array; // len 64 - namespace: SnodeNamespacesGroup; - method: 'retrieve' | 'store'; -}): Promise { - const sigData = await getSnodeSignatureShared({ - pubKey: groupPk, - method, - namespace, - privKey: groupIdentityPrivKey, - }); - return { ...sigData, pubkey: groupPk }; -} - async function generateUpdateExpirySignature({ shortenOrExtend, timestamp, @@ -220,38 +204,8 @@ async function generateUpdateExpiryOurSignature({ ed25519Pubkey: ourEd25519Key.pubKey, }); } - -async function generateUpdateExpiryGroupSignature({ - shortenOrExtend, - timestamp, - messagesHashes, - groupPrivKey, - groupPk, -}: WithMessagesHashes & - WithShortenOrExtend & - WithTimestamp & { - groupPk: GroupPubkeyType; - groupPrivKey: Uint8Array; // len 64 - }) { - if (isEmpty(groupPrivKey) || isEmpty(groupPk)) { - throw new PreConditionFailed( - 'generateUpdateExpiryGroupSignature groupPrivKey or groupPk is empty' - ); - } - - return generateUpdateExpirySignature({ - messagesHashes, - shortenOrExtend, - timestamp, - ed25519Privkey: groupPrivKey, - ed25519Pubkey: groupPk, - }); -} - export const SnodeSignature = { getSnodeSignatureParamsUs, - getSnodeGroupSignatureParams, getSnodeSignatureByHashesParams, generateUpdateExpiryOurSignature, - generateUpdateExpiryGroupSignature, }; diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index 9e267cb2a2..d7fd39145a 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -25,3 +25,8 @@ export type RetrieveRequestResult = { }; export type RetrieveMessagesResultsBatched = Array; + +export type WithTimestamp = { timestamp: number }; +export type ShortenOrExtend = 'extend' | 'shorten' | ''; +export type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; +export type WithMessagesHashes = { messagesHashes: Array }; diff --git a/ts/session/crypto/group/groupSignature.ts b/ts/session/crypto/group/groupSignature.ts deleted file mode 100644 index 76c0d35029..0000000000 --- a/ts/session/crypto/group/groupSignature.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { GroupMemberGet, GroupPubkeyType, Uint8ArrayLen64 } from 'libsession_util_nodejs'; -import { compact } from 'lodash'; -import { MetaGroupWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; -import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime'; -import { GroupUpdateInviteMessage } from '../../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; -import { UserUtils } from '../../utils'; -import { getSodiumRenderer } from '../MessageEncrypter'; - -export async function getGroupInvitesMessages({ - groupName, - membersFromWrapper, - secretKey, - groupPk, -}: { - membersFromWrapper: Array; - groupName: string; - secretKey: Uint8ArrayLen64; // len 64 - groupPk: GroupPubkeyType; -}) { - const sodium = await getSodiumRenderer(); - const timestamp = GetNetworkTime.getNowWithNetworkOffset(); - - const inviteDetails = compact( - await Promise.all( - membersFromWrapper.map(async ({ pubkeyHex: member }) => { - if (UserUtils.isUsFromCache(member)) { - return null; - } - const tosign = `INVITE${member}${timestamp}`; - - // Note: as the signature is built with the timestamp here, we cannot override the timestamp later on the sending pipeline - const adminSignature = sodium.crypto_sign_detached(tosign, secretKey); - console.info(`before makeSwarmSubAccount ${groupPk}:${member}`); - const memberAuthData = await MetaGroupWrapperActions.makeSwarmSubAccount(groupPk, member); - debugger; - console.info(`after makeSwarmSubAccount ${groupPk}:${member}`); - - const invite = new GroupUpdateInviteMessage({ - groupName, - groupPk, - timestamp, - adminSignature, - memberAuthData, - }); - - return { member, invite }; - }) - ) - ); - return inviteDetails; -} diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 8942fe7cdf..189700447e 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -3,7 +3,7 @@ import { AbortController } from 'abort-controller'; import ByteBuffer from 'bytebuffer'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import _, { isEmpty, isNil, sample, toNumber } from 'lodash'; +import _, { isEmpty, sample, toNumber } from 'lodash'; import pRetry from 'p-retry'; import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; @@ -22,8 +22,13 @@ import { } from '../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; +import { + SigResultAdmin, + SigResultSubAccount, + SnodeGroupSignature, +} from '../apis/snode_api/signature/groupSignature'; +import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/signature/snodeSignatures'; import { getSwarmFor } from '../apis/snode_api/snodePool'; -import { SnodeSignature } from '../apis/snode_api/snodeSignatures'; import { SnodeAPIStore } from '../apis/snode_api/storeMessage'; import { ConvoHub } from '../conversations'; import { MessageEncrypter } from '../crypto'; @@ -184,14 +189,20 @@ async function send( ); } -async function getSignatureParamsFromNamespace(item: StoreOnNodeParamsNoSig, destination: string) { +async function getSignatureParamsFromNamespace( + item: StoreOnNodeParamsNoSig, + destination: string +): Promise { + const store = 'store' as const; if (SnodeNamespace.isUserConfigNamespace(item.namespace)) { const ourPrivKey = (await UserUtils.getUserED25519KeyPairBytes())?.privKeyBytes; if (!ourPrivKey) { - throw new Error('sendMessagesDataToSnode UserUtils.getUserED25519KeyPairBytes is empty'); + throw new Error( + 'getSignatureParamsFromNamespace UserUtils.getUserED25519KeyPairBytes is empty' + ); } return SnodeSignature.getSnodeSignatureParamsUs({ - method: 'store' as const, + method: store, namespace: item.namespace, }); } @@ -201,20 +212,18 @@ async function getSignatureParamsFromNamespace(item: StoreOnNodeParamsNoSig, des item.namespace === SnodeNamespaces.ClosedGroupMessages ) { if (!PubKey.isClosedGroupV2(destination)) { - throw new Error('sendMessagesDataToSnode: groupconfig namespace required a 03 pubkey'); - } - const group = await UserGroupsWrapperActions.getGroup(destination); - const groupSecretKey = group?.secretKey; // TODO we will need to the user auth at some point - if (isNil(groupSecretKey) || isEmpty(groupSecretKey)) { - throw new Error(`sendMessagesDataToSnode: failed to find group admin secret key in wrapper`); + throw new Error( + 'getSignatureParamsFromNamespace: groupconfig namespace required a 03 pubkey' + ); } - return SnodeSignature.getSnodeGroupSignatureParams({ - method: 'store' as const, + const found = await UserGroupsWrapperActions.getGroup(destination); + return SnodeGroupSignature.getSnodeGroupSignature({ + method: store, namespace: item.namespace, - groupPk: destination, - groupIdentityPrivKey: groupSecretKey, + group: found, }); } + // no signature required for this namespace/pubkey combo return {}; } diff --git a/ts/session/utils/TaskWithTimeout.ts b/ts/session/utils/TaskWithTimeout.ts index c9f0ef5917..1e77199e31 100644 --- a/ts/session/utils/TaskWithTimeout.ts +++ b/ts/session/utils/TaskWithTimeout.ts @@ -1,4 +1,3 @@ -/* eslint-disable no-useless-return */ /* eslint-disable consistent-return */ /* eslint-disable no-promise-executor-return */ diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts index b4479c3214..208316c22c 100644 --- a/ts/session/utils/User.ts +++ b/ts/session/utils/User.ts @@ -83,7 +83,7 @@ export async function getUserED25519KeyPair(): Promise { return undefined; } -export const getUserED25519KeyPairBytes = async (): Promise => { +export const getUserED25519KeyPairBytes = async (): Promise => { // 'identityKey' keeps the ed25519KeyPair under a ed25519KeyPair field. // it is only set if the user migrated to the ed25519 way of generating a key const item = await UserUtils.getIdentityKeyPair(); @@ -96,7 +96,7 @@ export const getUserED25519KeyPairBytes = async (): Promise { Sinon.restore(); }); - describe('getSnodeGroupSignatureParams', () => { + describe('getSnodeGroupAdminSignatureParams', () => { beforeEach(() => { Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(hardcodedTimestamp); }); describe('retrieve', () => { it('retrieve namespace ClosedGroupInfo', async () => { - const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + const ret = await SnodeGroupSignature.getSnodeGroupSignature({ method: 'retrieve', namespace: SnodeNamespaces.ClosedGroupInfo, - groupIdentityPrivKey: privKeyUint, - groupPk: validGroupPk, + group: { + authData: null, + pubkeyHex: validGroupPk, + secretKey: privKeyUint, + }, }); expect(ret.pubkey).to.be.eq(validGroupPk); @@ -68,11 +72,14 @@ describe('SnodeSignature', () => { }); it('retrieve namespace ClosedGroupKeys', async () => { - const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + const ret = await SnodeGroupSignature.getSnodeGroupSignature({ method: 'retrieve', namespace: SnodeNamespaces.ClosedGroupKeys, - groupIdentityPrivKey: privKeyUint, - groupPk: validGroupPk, + group: { + authData: null, + pubkeyHex: validGroupPk, + secretKey: privKeyUint, + }, }); expect(ret.pubkey).to.be.eq(validGroupPk); @@ -83,11 +90,14 @@ describe('SnodeSignature', () => { }); it('retrieve namespace ClosedGroupMessages', async () => { - const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + const ret = await SnodeGroupSignature.getSnodeGroupSignature({ method: 'retrieve', namespace: SnodeNamespaces.ClosedGroupMessages, - groupIdentityPrivKey: privKeyUint, - groupPk: validGroupPk, + group: { + authData: null, + pubkeyHex: validGroupPk, + secretKey: privKeyUint, + }, }); expect(ret.pubkey).to.be.eq(validGroupPk); @@ -99,11 +109,14 @@ describe('SnodeSignature', () => { describe('store', () => { it('store namespace ClosedGroupInfo', async () => { - const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + const ret = await SnodeGroupSignature.getSnodeGroupSignature({ method: 'store', namespace: SnodeNamespaces.ClosedGroupInfo, - groupIdentityPrivKey: privKeyUint, - groupPk: validGroupPk, + group: { + authData: null, + pubkeyHex: validGroupPk, + secretKey: privKeyUint, + }, }); expect(ret.pubkey).to.be.eq(validGroupPk); expect(ret.timestamp).to.be.eq(hardcodedTimestamp); @@ -113,11 +126,14 @@ describe('SnodeSignature', () => { }); it('store namespace ClosedGroupKeys', async () => { - const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + const ret = await SnodeGroupSignature.getSnodeGroupSignature({ method: 'store', namespace: SnodeNamespaces.ClosedGroupKeys, - groupIdentityPrivKey: privKeyUint, - groupPk: validGroupPk, + group: { + authData: null, + pubkeyHex: validGroupPk, + secretKey: privKeyUint, + }, }); expect(ret.pubkey).to.be.eq(validGroupPk); @@ -127,11 +143,14 @@ describe('SnodeSignature', () => { }); it('store namespace ClosedGroupMessages', async () => { - const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + const ret = await SnodeGroupSignature.getSnodeGroupSignature({ method: 'store', namespace: SnodeNamespaces.ClosedGroupMessages, - groupIdentityPrivKey: privKeyUint, - groupPk: validGroupPk, + group: { + authData: null, + pubkeyHex: validGroupPk, + secretKey: privKeyUint, + }, }); expect(ret.pubkey).to.be.eq(validGroupPk); expect(ret.timestamp).to.be.eq(hardcodedTimestamp); @@ -141,12 +160,104 @@ describe('SnodeSignature', () => { }); }); + // describe('getSnodeGroupSubAccountSignatureParams', () => { + // beforeEach(() => { + // Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(hardcodedTimestamp); + // }); + + // describe('retrieve', () => { + // it('retrieve namespace ClosedGroupInfo', async () => { + // const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + // method: 'retrieve', + // namespace: SnodeNamespaces.ClosedGroupInfo, + // groupPk: validGroupPk, + // groupIdentityPrivKey: privKeyUint, + // }); + // expect(ret.pubkey).to.be.eq(validGroupPk); + + // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + // const verificationData = `retrieve${SnodeNamespaces.ClosedGroupInfo}${hardcodedTimestamp}`; + // await verifySig(ret, verificationData); + // }); + + // it('retrieve namespace ClosedGroupKeys', async () => { + // const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + // method: 'retrieve', + // namespace: SnodeNamespaces.ClosedGroupKeys, + // groupIdentityPrivKey: privKeyUint, + // groupPk: validGroupPk, + // }); + // expect(ret.pubkey).to.be.eq(validGroupPk); + + // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + // const verificationData = `retrieve${SnodeNamespaces.ClosedGroupKeys}${hardcodedTimestamp}`; + + // await verifySig(ret, verificationData); + // }); + + // it('retrieve namespace ClosedGroupMessages', async () => { + // const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + // method: 'retrieve', + // namespace: SnodeNamespaces.ClosedGroupMessages, + // groupIdentityPrivKey: privKeyUint, + // groupPk: validGroupPk, + // }); + // expect(ret.pubkey).to.be.eq(validGroupPk); + + // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + // const verificationData = `retrieve${SnodeNamespaces.ClosedGroupMessages}${hardcodedTimestamp}`; + // await verifySig(ret, verificationData); + // }); + // }); + + // describe('store', () => { + // it('store namespace ClosedGroupInfo', async () => { + // const ret = await SnodeSignature.getSnodeGroupSignatureParams({ + // method: 'store', + // namespace: SnodeNamespaces.ClosedGroupInfo, + // groupIdentityPrivKey: privKeyUint, + // groupPk: validGroupPk, + // }); + // expect(ret.pubkey).to.be.eq(validGroupPk); + // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + + // const verificationData = `store${SnodeNamespaces.ClosedGroupInfo}${hardcodedTimestamp}`; + // await verifySig(ret, verificationData); + // }); + + // it('store namespace ClosedGroupKeys', async () => { + // const ret = await SnodeSignature.getSnodeGroupSubAccountSignatureParams({ + // method: 'store', + // namespace: SnodeNamespaces.ClosedGroupKeys, + // groupIdentityPrivKey: privKeyUint, + // groupPk: validGroupPk, + // }); + // expect(ret.pubkey).to.be.eq(validGroupPk); + + // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + // const verificationData = `store${SnodeNamespaces.ClosedGroupKeys}${hardcodedTimestamp}`; + // await verifySig(ret, verificationData); + // }); + + // it('store namespace ClosedGroupMessages', async () => { + // const ret = await SnodeSignature.getSnodeGroupSubAccountSignatureParams({ + // method: 'store', + // namespace: SnodeNamespaces.ClosedGroupMessages, + // groupPk: validGroupPk, + // }); + // expect(ret.groupPk).to.be.eq(validGroupPk); + // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); + // const verificationData = `store${SnodeNamespaces.ClosedGroupMessages}${hardcodedTimestamp}`; + // await verifySig(ret, verificationData); + // }); + // }); + // }); + describe('generateUpdateExpiryGroupSignature', () => { it('throws if groupPk not given', async () => { const func = async () => { - return SnodeSignature.generateUpdateExpiryGroupSignature({ - groupPk: null as any, - groupPrivKey: privKeyUint, + return SnodeGroupSignature.generateUpdateExpiryGroupSignature({ + group: { pubkeyHex: null as any, secretKey: privKeyUint, authData: null }, messagesHashes: ['[;p['], shortenOrExtend: '', timestamp: hardcodedTimestamp, @@ -159,9 +270,13 @@ describe('SnodeSignature', () => { it('throws if groupPrivKey is empty', async () => { const func = async () => { - return SnodeSignature.generateUpdateExpiryGroupSignature({ - groupPk: validGroupPk, - groupPrivKey: new Uint8Array() as any, + return SnodeGroupSignature.generateUpdateExpiryGroupSignature({ + group: { + pubkeyHex: validGroupPk as any, + secretKey: new Uint8Array() as any, + authData: null, + }, + messagesHashes: ['[;p['], shortenOrExtend: '', timestamp: hardcodedTimestamp, @@ -176,9 +291,8 @@ describe('SnodeSignature', () => { const hashes = ['hash4321', 'hash4221']; const timestamp = hardcodedTimestamp; const shortenOrExtend = ''; - const ret = await SnodeSignature.generateUpdateExpiryGroupSignature({ - groupPk: validGroupPk, - groupPrivKey: privKeyUint, + const ret = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ + group: { pubkeyHex: validGroupPk, secretKey: privKeyUint, authData: null }, messagesHashes: hashes, shortenOrExtend: '', timestamp, @@ -194,9 +308,8 @@ describe('SnodeSignature', () => { const hashes = ['hash4321', 'hash4221']; const timestamp = hardcodedTimestamp; const shortenOrExtend = ''; - const ret = await SnodeSignature.generateUpdateExpiryGroupSignature({ - groupPk: validGroupPk, - groupPrivKey: privKeyUint, + const ret = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ + group: { pubkeyHex: validGroupPk, secretKey: privKeyUint, authData: null }, messagesHashes: hashes, shortenOrExtend: '', timestamp, @@ -213,9 +326,8 @@ describe('SnodeSignature', () => { const hashes = ['hash4321', 'hash4221']; const timestamp = hardcodedTimestamp; const shortenOrExtend = ''; - const ret = await SnodeSignature.generateUpdateExpiryGroupSignature({ - groupPk: validGroupPk, - groupPrivKey: privKeyUint, + const ret = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ + group: { pubkeyHex: validGroupPk, secretKey: privKeyUint, authData: null }, messagesHashes: hashes, shortenOrExtend: '', timestamp, @@ -234,9 +346,8 @@ describe('SnodeSignature', () => { const hashes = ['hash4321', 'hash4221']; const timestamp = hardcodedTimestamp; const shortenOrExtend = ''; - const ret = await SnodeSignature.generateUpdateExpiryGroupSignature({ - groupPk: validGroupPk, - groupPrivKey: privKeyUint, + const ret = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ + group: { pubkeyHex: validGroupPk, secretKey: privKeyUint, authData: null }, messagesHashes: hashes, shortenOrExtend: '', timestamp, diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 1ca5fb7f74..70afb91a25 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -13,6 +13,7 @@ import { MetaGroupWrapperActionsCalls, ProfilePicture, PubkeyType, + Uint8ArrayLen100, UserConfigWrapperActionsCalls, UserGroupsSet, UserGroupsWrapperActionsCalls, @@ -505,6 +506,17 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { 'makeSwarmSubAccount', memberPubkeyHex, ]) as Promise>, + swarmSubaccountSign: async ( + groupPk: GroupPubkeyType, + message: Uint8Array, + authData: Uint8ArrayLen100 + ) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'swarmSubaccountSign', + message, + authData, + ]) as Promise>, }; export const callLibSessionWorker = async ( From f17beaf85267d917739020f317b0eb76b09eb0ea Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 26 Oct 2023 16:16:52 +1100 Subject: [PATCH 052/302] feat: add GroupInviteJob --- ts/mains/main_renderer.tsx | 45 +++--- .../snode_api/signature/groupSignature.ts | 54 +++---- ts/session/utils/job_runners/JobRunner.ts | 6 + ts/session/utils/job_runners/PersistedJob.ts | 11 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 144 ++++++++++++++++++ .../utils/job_runners/jobs/JobRunnerType.ts | 3 +- ts/state/ducks/groups.ts | 29 ++-- 7 files changed, 218 insertions(+), 74 deletions(-) create mode 100644 ts/session/utils/job_runners/jobs/GroupInviteJob.ts diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx index 52af0ea8fb..290734dced 100644 --- a/ts/mains/main_renderer.tsx +++ b/ts/mains/main_renderer.tsx @@ -1,32 +1,32 @@ -import _ from 'lodash'; -import ReactDOM from 'react-dom'; import Backbone from 'backbone'; +import _, { toPairs } from 'lodash'; +import ReactDOM from 'react-dom'; -import React from 'react'; import nativeEmojiData from '@emoji-mart/data'; +import React from 'react'; -import { MessageModel } from '../models/message'; import { isMacOS } from '../OS'; +import { SessionInboxView } from '../components/SessionInboxView'; +import { SessionRegistrationView } from '../components/registration/SessionRegistrationView'; +import { Data } from '../data/data'; +import { OpenGroupData } from '../data/opengroups'; +import { SettingsKey } from '../data/settings-key'; +import { MessageModel } from '../models/message'; +import { deleteAllLogs } from '../node/logs'; import { queueAllCached } from '../receiver/receiver'; +import { loadKnownBlindedKeys } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; import { ConvoHub } from '../session/conversations'; import { AttachmentDownloads, ToastUtils } from '../session/utils'; import { getOurPubKeyStrFromCache } from '../session/utils/User'; +import { runners } from '../session/utils/job_runners/JobRunner'; +import { LibSessionUtil } from '../session/utils/libsession/libsession_utils'; +import { switchPrimaryColorTo } from '../themes/switchPrimaryColor'; import { BlockedNumberController } from '../util'; +import { initialiseEmojiData } from '../util/emoji'; import { ExpirationTimerOptions } from '../util/expiringMessages'; import { Notifications } from '../util/notifications'; import { Registration } from '../util/registration'; -import { isSignInByLinking, Storage } from '../util/storage'; -import { Data } from '../data/data'; -import { SessionRegistrationView } from '../components/registration/SessionRegistrationView'; -import { SessionInboxView } from '../components/SessionInboxView'; -import { deleteAllLogs } from '../node/logs'; -import { OpenGroupData } from '../data/opengroups'; -import { loadKnownBlindedKeys } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; -import { initialiseEmojiData } from '../util/emoji'; -import { switchPrimaryColorTo } from '../themes/switchPrimaryColor'; -import { LibSessionUtil } from '../session/utils/libsession/libsession_utils'; -import { runners } from '../session/utils/job_runners/JobRunner'; -import { SettingsKey } from '../data/settings-key'; +import { Storage, isSignInByLinking } from '../util/storage'; // Globally disable drag and drop document.body.addEventListener( @@ -112,12 +112,13 @@ function mapOldThemeToNew(theme: string) { async function startJobRunners() { // start the job runners - await runners.avatarDownloadRunner.loadJobsFromDb(); - runners.avatarDownloadRunner.startProcessing(); - await runners.userSyncRunner.loadJobsFromDb(); - runners.userSyncRunner.startProcessing(); - await runners.groupSyncRunner.loadJobsFromDb(); - runners.groupSyncRunner.startProcessing(); + const pairs = toPairs(runners); + for (let index = 0; index < pairs.length; index++) { + const runner = pairs[index][1]; + // eslint-disable-next-line no-await-in-loop + await runner.loadJobsFromDb(); + runner.startProcessing(); + } } // We need this 'first' check because we don't want to start the app up any other time diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 933e8b082e..568bf6e394 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -1,11 +1,11 @@ import { - GroupMemberGet, GroupPubkeyType, + PubkeyType, Uint8ArrayLen100, Uint8ArrayLen64, UserGroupsGet, } from 'libsession_util_nodejs'; -import { compact, isEmpty } from 'lodash'; +import { isEmpty } from 'lodash'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { getSodiumRenderer } from '../../../crypto/MessageEncrypter'; import { GroupUpdateInviteMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; @@ -18,13 +18,13 @@ import { WithMessagesHashes, WithShortenOrExtend, WithTimestamp } from '../types import { SignatureShared } from './signatureShared'; import { SnodeSignatureResult } from './snodeSignatures'; -async function getGroupInvitesMessages({ +async function getGroupInviteMessage({ groupName, - membersFromWrapper, + member, secretKey, groupPk, }: { - membersFromWrapper: Array; + member: PubkeyType; groupName: string; secretKey: Uint8ArrayLen64; // len 64 groupPk: GroupPubkeyType; @@ -32,31 +32,23 @@ async function getGroupInvitesMessages({ const sodium = await getSodiumRenderer(); const timestamp = GetNetworkTime.getNowWithNetworkOffset(); - const inviteDetails = compact( - await Promise.all( - membersFromWrapper.map(async ({ pubkeyHex: member }) => { - if (UserUtils.isUsFromCache(member)) { - return null; - } - const tosign = `INVITE${member}${timestamp}`; - - // Note: as the signature is built with the timestamp here, we cannot override the timestamp later on the sending pipeline - const adminSignature = sodium.crypto_sign_detached(tosign, secretKey); - const memberAuthData = await MetaGroupWrapperActions.makeSwarmSubAccount(groupPk, member); - - const invite = new GroupUpdateInviteMessage({ - groupName, - groupPk, - timestamp, - adminSignature, - memberAuthData, - }); - - return { member, invite }; - }) - ) - ); - return inviteDetails; + if (UserUtils.isUsFromCache(member)) { + throw new Error('getGroupInviteMessage: we cannot invite ourselves'); + } + const tosign = `INVITE${member}${timestamp}`; + + // Note: as the signature is built with the timestamp here, we cannot override the timestamp later on the sending pipeline + const adminSignature = sodium.crypto_sign_detached(tosign, secretKey); + const memberAuthData = await MetaGroupWrapperActions.makeSwarmSubAccount(groupPk, member); + + const invite = new GroupUpdateInviteMessage({ + groupName, + groupPk, + timestamp, + adminSignature, + memberAuthData, + }); + return invite; } type ParamsShared = { @@ -220,6 +212,6 @@ async function generateUpdateExpiryGroupSignature({ export const SnodeGroupSignature = { generateUpdateExpiryGroupSignature, - getGroupInvitesMessages, + getGroupInviteMessage, getSnodeGroupSignature, }; diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts index 9f470d864f..f5c3b5ae1a 100644 --- a/ts/session/utils/job_runners/JobRunner.ts +++ b/ts/session/utils/job_runners/JobRunner.ts @@ -5,6 +5,7 @@ import { timeout } from '../Promise'; import { persistedJobFromData } from './JobDeserialization'; import { AvatarDownloadPersistedData, + GroupInvitePersistedData, GroupSyncPersistedData, PersistedJob, RunJobResult, @@ -358,9 +359,14 @@ const avatarDownloadRunner = new PersistedJobRunner 'AvatarDownloadJob', null ); +const groupInviteJobRunner = new PersistedJobRunner( + 'GroupInviteJob', + null +); export const runners = { userSyncRunner, groupSyncRunner, avatarDownloadRunner, + groupInviteJobRunner, }; diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts index 4bc3513d1d..c496d71848 100644 --- a/ts/session/utils/job_runners/PersistedJob.ts +++ b/ts/session/utils/job_runners/PersistedJob.ts @@ -1,9 +1,11 @@ +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { cloneDeep, isEmpty } from 'lodash'; export type PersistedJobType = | 'UserSyncJobType' | 'GroupSyncJobType' | 'AvatarDownloadJobType' + | 'GroupInviteJobType' | 'FakeSleepForJobType' | 'FakeSleepForJobMultiType'; @@ -32,6 +34,12 @@ export interface AvatarDownloadPersistedData extends PersistedJobData { conversationId: string; } +export interface GroupInvitePersistedData extends PersistedJobData { + jobType: 'GroupInviteJobType'; + groupPk: GroupPubkeyType; + member: PubkeyType; +} + export interface UserSyncPersistedData extends PersistedJobData { jobType: 'UserSyncJobType'; } @@ -44,7 +52,8 @@ export type TypeOfPersistedData = | AvatarDownloadPersistedData | FakeSleepJobData | FakeSleepForMultiJobData - | GroupSyncPersistedData; + | GroupSyncPersistedData + | GroupInvitePersistedData; export type AddJobCheckReturn = 'skipAddSameJobPresent' | 'sameJobDataAlreadyInQueue' | null; diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts new file mode 100644 index 0000000000..5d2e315a0d --- /dev/null +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -0,0 +1,144 @@ +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { isNumber } from 'lodash'; +import { v4 } from 'uuid'; +import { UserUtils } from '../..'; +import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; +import { SnodeGroupSignature } from '../../../apis/snode_api/signature/groupSignature'; +import { getMessageQueue } from '../../../sending'; +import { PubKey } from '../../../types'; +import { runners } from '../JobRunner'; +import { + AddJobCheckReturn, + GroupInvitePersistedData, + PersistedJob, + RunJobResult, +} from '../PersistedJob'; + +const defaultMsBetweenRetries = 10000; +const defaultMaxAttemps = 1; + +type JobExtraArgs = { + groupPk: GroupPubkeyType; + member: PubkeyType; +}; + +export function shouldAddGroupInviteJob(args: JobExtraArgs) { + if (UserUtils.isUsFromCache(args.member)) { + return false; + } + + return true; +} + +async function addGroupInviteJob({ groupPk, member }: JobExtraArgs) { + if (shouldAddGroupInviteJob({ groupPk, member })) { + const groupInviteJob = new GroupInviteJob({ + groupPk, + member, + nextAttemptTimestamp: Date.now(), + }); + window.log.debug(`addGroupInviteJob: adding group invite for ${groupPk}:${member} `); + await runners.groupInviteJobRunner.addJob(groupInviteJob); + } +} + +class GroupInviteJob extends PersistedJob { + constructor({ + groupPk, + member, + nextAttemptTimestamp, + maxAttempts, + currentRetry, + identifier, + }: Pick & + Partial< + Pick< + GroupInvitePersistedData, + | 'nextAttemptTimestamp' + | 'identifier' + | 'maxAttempts' + | 'delayBetweenRetries' + | 'currentRetry' + > + >) { + super({ + jobType: 'GroupInviteJobType', + identifier: identifier || v4(), + member, + groupPk, + delayBetweenRetries: defaultMsBetweenRetries, + maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttemps, + nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries, + currentRetry: isNumber(currentRetry) ? currentRetry : 0, + }); + } + + public async run(): Promise { + const { groupPk, member } = this.persistedData; + + window.log.info( + `running job ${this.persistedData.jobType} with groupPk:"${groupPk}" member: ${member} id:"${this.persistedData.identifier}" ` + ); + const group = await UserGroupsWrapperActions.getGroup(this.persistedData.groupPk); + if (!group || !group.secretKey || !group.name) { + window.log.warn(`GroupInviteJob: Did not find group in wrapper or no valid info in wrapper`); + return RunJobResult.PermanentFailure; + } + + if (UserUtils.isUsFromCache(member)) { + return RunJobResult.Success; // nothing to do for us, we get the update from our user's libsession wrappers + } + + const inviteDetails = await SnodeGroupSignature.getGroupInviteMessage({ + groupName: group.name, + member, + secretKey: group.secretKey, + groupPk, + }); + if (!inviteDetails) { + window.log.warn(`GroupInviteJob: Did not find group in wrapper or no valid info in wrapper`); + + return RunJobResult.PermanentFailure; + } + + await getMessageQueue().sendToPubKeyNonDurably({ + message: inviteDetails, + namespace: SnodeNamespaces.Default, + pubkey: PubKey.cast(member), + }); + + // return true so this job is marked as a success and we don't need to retry it + return RunJobResult.Success; + } + + public serializeJob(): GroupInvitePersistedData { + return super.serializeBase(); + } + + public nonRunningJobsToRemove(_jobs: Array) { + return []; + } + + public addJobCheck(jobs: Array): AddJobCheckReturn { + // avoid adding the same job if the exact same one is already planned + const hasSameJob = jobs.some(j => { + return j.groupPk === this.persistedData.groupPk && j.member === this.persistedData.member; + }); + + if (hasSameJob) { + return 'skipAddSameJobPresent'; + } + + return null; + } + + public getJobTimeoutMs(): number { + return 15000; + } +} + +export const GroupInvite = { + GroupInviteJob, + addGroupInviteJob, +}; diff --git a/ts/session/utils/job_runners/jobs/JobRunnerType.ts b/ts/session/utils/job_runners/jobs/JobRunnerType.ts index 56b3b27560..a9ac9aba7f 100644 --- a/ts/session/utils/job_runners/jobs/JobRunnerType.ts +++ b/ts/session/utils/job_runners/jobs/JobRunnerType.ts @@ -3,4 +3,5 @@ export type JobRunnerType = | 'GroupSyncJob' | 'FakeSleepForJob' | 'FakeSleepForMultiJob' - | 'AvatarDownloadJob'; + | 'AvatarDownloadJob' + | 'GroupInviteJob'; diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index 63d1bbec3a..b6b46b9dd3 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -12,15 +12,13 @@ import { ConfigDumpData } from '../../data/configDump/configDump'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; -import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces'; -import { SnodeGroupSignature } from '../../session/apis/snode_api/signature/groupSignature'; import { ConvoHub } from '../../session/conversations'; -import { getMessageQueue } from '../../session/sending'; import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { PreConditionFailed } from '../../session/utils/errors'; import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; +import { GroupInvite } from '../../session/utils/job_runners/jobs/GroupInviteJob'; import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { @@ -134,7 +132,6 @@ const initNewGroupInWrapper = createAsyncThunk( // to include them and marks the corresponding wrappers as dirty await MetaGroupWrapperActions.keyRekey(groupPk); const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); - await convo.setIsApproved(true, false); const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); @@ -148,23 +145,17 @@ const initNewGroupInWrapper = createAsyncThunk( await convo.commit(); convo.updateLastMessage(); dispatch(resetOverlayMode()); - await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); - // everything is setup for this group, we now need to send the invites to every members, privately and asynchronously, and gracefully handle errors with toasts. - const inviteDetails = await SnodeGroupSignature.getGroupInvitesMessages({ - groupName, - membersFromWrapper, - secretKey: groupSecretKey, - groupPk, - }); + // Everything is setup for this group, we now need to send the invites to each members, + // privately and asynchronously, and gracefully handle errors with toasts. + // Let's do all of this part of a job to handle app crashes and make sure we + // can update the groupwrapper with a failed state if a message fails to be sent. + for (let index = 0; index < membersFromWrapper.length; index++) { + const member = membersFromWrapper[index]; + await GroupInvite.addGroupInviteJob({ member: member.pubkeyHex, groupPk }); + } - void inviteDetails.map(async detail => { - await getMessageQueue().sendToPubKeyNonDurably({ - message: detail.invite, - namespace: SnodeNamespaces.Default, - pubkey: PubKey.cast(detail.member), - }); - }); + await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); return { groupPk: newGroup.pubkeyHex, infos, members: membersFromWrapper }; } catch (e) { From 1dbcd157a0495c6a16fb9e6425adb33292de98fa Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 27 Oct 2023 13:12:36 +1100 Subject: [PATCH 053/302] feat: add invite failed toast debounced also make the toast replace pubkeys with nicknames/names or shortened pks --- _locales/en/messages.json | 5 + ts/components/basic/SessionToast.tsx | 29 +++- ts/hooks/useParamSelector.ts | 38 +++++- ts/session/conversations/createClosedGroup.ts | 8 +- ts/session/sending/MessageQueue.ts | 4 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 127 ++++++++++++++---- ts/types/LocalizerKeys.ts | 4 + 7 files changed, 178 insertions(+), 37 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 0f7c305e6c..64e7dd22b3 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -258,6 +258,11 @@ "groupTwoPromoted": "$first$ and $second$ were promoted to Admin.", "groupOthersPromoted": "$name$ and $count$ others were promoted to Admin.", + "inviteFailed": "Invite Failed", + "groupInviteFailedOne": "Failed to invite $name$ to $groupname$", + "groupInviteFailedTwo": "Failed to invite $first$ and $second$ to $groupname$", + "groupInviteFailedOthers": "Failed to invite $first$ and $count$ others to $groupname$", + "groupOneLeft": "$name$ left the group.", "groupYouLeft": "You left the group.", diff --git a/ts/components/basic/SessionToast.tsx b/ts/components/basic/SessionToast.tsx index d1ae112591..9cbbe82376 100644 --- a/ts/components/basic/SessionToast.tsx +++ b/ts/components/basic/SessionToast.tsx @@ -1,10 +1,12 @@ -import { noop } from 'lodash'; +import { clone, noop } from 'lodash'; import React from 'react'; import styled from 'styled-components'; import { Flex } from './Flex'; +import { useConversationsUsernameWithQuoteOrShortPk } from '../../hooks/useParamSelector'; import { SessionIcon, SessionIconType } from '../icon'; +import { SessionHtmlRenderer } from './SessionHTMLRenderer'; // NOTE We don't change the color strip on the left based on the type. 16/09/2022 export enum SessionToastType { @@ -46,6 +48,29 @@ const IconDiv = styled.div` margin: 0 var(--margins-xs); `; +function useReplacePkInTextWithNames(description: string) { + const pubkeysToLookup = [...description.matchAll(/0[3,5][0-9a-fA-F]{64}/g)] || []; + const memberNames = useConversationsUsernameWithQuoteOrShortPk(pubkeysToLookup.map(m => m[0])); + + let replacedWithNames = clone(description); + for (let index = 0; index < memberNames.length; index++) { + const name = memberNames[index]; + const pk = pubkeysToLookup[index][0]; + replacedWithNames = replacedWithNames.replace(pk, name); + } + + return replacedWithNames; +} + +function DescriptionPubkeysReplaced({ description }: { description: string }) { + const replacedWithNames = useReplacePkInTextWithNames(description); + return ( + + + + ); +} + export const SessionToast = (props: Props) => { const { title, description, type, icon } = props; @@ -93,7 +118,7 @@ export const SessionToast = (props: Props) => { className="session-toast" > {title} - {toastDesc && {toastDesc}} + {toastDesc && } ); diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index f40b5c7f2a..1a2a569a27 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -60,18 +60,44 @@ export function useConversationRealName(convoId?: string) { return convoProps?.isPrivate ? convoProps?.displayNameInProfile : undefined; } +function usernameForQuoteOrFullPk(pubkey: string, state: StateType) { + if (pubkey === UserUtils.getOurPubKeyStrFromCache() || pubkey.toLowerCase() === 'you') { + return window.i18n('you'); + } + // use the name from the cached libsession wrappers if available + if (PubKey.isClosedGroupV2(pubkey)) { + const info = state.groups.infos[pubkey]; + if (info && info.name) { + return info.name; + } + } + const convo = state.conversations.conversationLookup[pubkey]; + + const nameGot = convo?.nickname || convo?.displayNameInProfile; + return nameGot?.length ? nameGot : null; +} + /** * Returns either the nickname, the profileName, in '"' or the full pubkeys given */ export function useConversationsUsernameWithQuoteOrFullPubkey(pubkeys: Array) { return useSelector((state: StateType) => { return pubkeys.map(pubkey => { - if (pubkey === UserUtils.getOurPubKeyStrFromCache() || pubkey.toLowerCase() === 'you') { - return window.i18n('you'); - } - const convo = state.conversations.conversationLookup[pubkey]; - const nameGot = convo?.displayNameInProfile; - return nameGot?.length ? `"${nameGot}"` : pubkey; + const nameGot = usernameForQuoteOrFullPk(pubkey, state); + return nameGot?.length ? nameGot : pubkey; + }); + }); +} + +/** + * Returns either the nickname, the profileName, a shortened pubkey, or "you" for our own pubkey + */ +export function useConversationsUsernameWithQuoteOrShortPk(pubkeys: Array) { + return useSelector((state: StateType) => { + return pubkeys.map(pubkey => { + const nameGot = usernameForQuoteOrFullPk(pubkey, state); + + return nameGot?.length ? nameGot : PubKey.shorten(pubkey); }); }); } diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index b7a523be43..0668ac2856 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -1,4 +1,4 @@ -import _ from 'lodash'; +import _, { isFinite, isNumber } from 'lodash'; import { ClosedGroup, getMessageQueue } from '..'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { addKeyPairToCacheAndDBIfNeeded } from '../../receiver/closedGroups'; @@ -119,7 +119,9 @@ async function sendToGroupMembers( window?.log?.info(`Sending invites for group ${groupPublicKey} to ${listOfMembers}`); // evaluating if all invites sent, if failed give the option to retry failed invites via modal dialog const inviteResults = await Promise.all(promises); - const allInvitesSent = _.every(inviteResults, inviteResult => inviteResult !== false); + const allInvitesSent = _.every(inviteResults, inviteResult => { + return isNumber(inviteResult) && isFinite(inviteResult); + }); if (allInvitesSent) { // if (true) { @@ -157,7 +159,7 @@ async function sendToGroupMembers( inviteResults.forEach((result, index) => { const member = listOfMembers[index]; // group invite must always contain the admin member. - if (result !== true || admins.includes(member)) { + if (result === null || admins.includes(member)) { membersToResend.push(member); } }); diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 7a607132c7..a1e795d913 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -256,7 +256,7 @@ export class MessageQueue { | ClosedGroupMemberLeftMessage | GroupUpdateInviteMessage; namespace: SnodeNamespaces; - }): Promise { + }): Promise { let rawMessage; try { rawMessage = await MessageUtils.toRawMessage(pubkey, message, namespace); @@ -271,7 +271,7 @@ export class MessageQueue { if (rawMessage) { await MessageSentHandler.handleMessageSentFailure(rawMessage, error); } - return false; + return null; } } diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 5d2e315a0d..e0a892a573 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -1,8 +1,11 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import { isNumber } from 'lodash'; +import { debounce, difference, isNumber } from 'lodash'; import { v4 } from 'uuid'; -import { UserUtils } from '../..'; -import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { ToastUtils, UserUtils } from '../..'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../../../../webworker/workers/browser/libsession_worker_interface'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; import { SnodeGroupSignature } from '../../../apis/snode_api/signature/groupSignature'; import { getMessageQueue } from '../../../sending'; @@ -31,6 +34,14 @@ export function shouldAddGroupInviteJob(args: JobExtraArgs) { return true; } +const invitesFailed = new Map< + GroupPubkeyType, + { + debouncedCall: (groupPk: GroupPubkeyType) => void; + failedMembers: Array; + } +>(); + async function addGroupInviteJob({ groupPk, member }: JobExtraArgs) { if (shouldAddGroupInviteJob({ groupPk, member })) { const groupInviteJob = new GroupInviteJob({ @@ -43,6 +54,42 @@ async function addGroupInviteJob({ groupPk, member }: JobExtraArgs) { } } +function displayFailedInvitesForGroup(groupPk: GroupPubkeyType) { + const thisGroupFailures = invitesFailed.get(groupPk); + if (!thisGroupFailures || thisGroupFailures.failedMembers.length === 0) { + return; + } + const count = thisGroupFailures.failedMembers.length; + switch (count) { + case 1: + ToastUtils.pushToastWarning( + `invite-failed${groupPk}`, + window.i18n('inviteFailed'), + window.i18n('groupInviteFailedOne', [...thisGroupFailures.failedMembers, groupPk]) + ); + break; + case 2: + ToastUtils.pushToastWarning( + `invite-failed${groupPk}`, + window.i18n('inviteFailed'), + window.i18n('groupInviteFailedTwo', [...thisGroupFailures.failedMembers, groupPk]) + ); + break; + default: + ToastUtils.pushToastWarning( + `invite-failed${groupPk}`, + window.i18n('inviteFailed'), + window.i18n('groupInviteFailedOthers', [ + thisGroupFailures.failedMembers[0], + `${thisGroupFailures.failedMembers.length - 1}`, + groupPk, + ]) + ); + } + // toast was displayed empty the list + thisGroupFailures.failedMembers = []; +} + class GroupInviteJob extends PersistedJob { constructor({ groupPk, @@ -75,12 +122,12 @@ class GroupInviteJob extends PersistedJob { } public async run(): Promise { - const { groupPk, member } = this.persistedData; + const { groupPk, member, jobType, identifier } = this.persistedData; window.log.info( - `running job ${this.persistedData.jobType} with groupPk:"${groupPk}" member: ${member} id:"${this.persistedData.identifier}" ` + `running job ${jobType} with groupPk:"${groupPk}" member: ${member} id:"${identifier}" ` ); - const group = await UserGroupsWrapperActions.getGroup(this.persistedData.groupPk); + const group = await UserGroupsWrapperActions.getGroup(groupPk); if (!group || !group.secretKey || !group.name) { window.log.warn(`GroupInviteJob: Did not find group in wrapper or no valid info in wrapper`); return RunJobResult.PermanentFailure; @@ -89,25 +136,31 @@ class GroupInviteJob extends PersistedJob { if (UserUtils.isUsFromCache(member)) { return RunJobResult.Success; // nothing to do for us, we get the update from our user's libsession wrappers } - - const inviteDetails = await SnodeGroupSignature.getGroupInviteMessage({ - groupName: group.name, - member, - secretKey: group.secretKey, - groupPk, - }); - if (!inviteDetails) { - window.log.warn(`GroupInviteJob: Did not find group in wrapper or no valid info in wrapper`); - - return RunJobResult.PermanentFailure; + let failed = true; + try { + const inviteDetails = await SnodeGroupSignature.getGroupInviteMessage({ + groupName: group.name, + member, + secretKey: group.secretKey, + groupPk, + }); + + const storedAt = await getMessageQueue().sendToPubKeyNonDurably({ + message: inviteDetails, + namespace: SnodeNamespaces.Default, + pubkey: PubKey.cast(member), + }); + if (storedAt !== null) { + failed = false; + } + } finally { + updateFailedStateForMember(groupPk, member, failed); + try { + await MetaGroupWrapperActions.memberSetInvited(groupPk, member, failed); + } catch (e) { + window.log.warn('GroupInviteJob memberSetInvited failed with', e.message); + } } - - await getMessageQueue().sendToPubKeyNonDurably({ - message: inviteDetails, - namespace: SnodeNamespaces.Default, - pubkey: PubKey.cast(member), - }); - // return true so this job is marked as a success and we don't need to retry it return RunJobResult.Success; } @@ -142,3 +195,29 @@ export const GroupInvite = { GroupInviteJob, addGroupInviteJob, }; +function updateFailedStateForMember(groupPk: GroupPubkeyType, member: PubkeyType, failed: boolean) { + let thisGroupFailure = invitesFailed.get(groupPk); + + if (!failed) { + // invite sent success, remove a pending failure state from the list of toasts to display + if (thisGroupFailure) { + thisGroupFailure.failedMembers = difference(thisGroupFailure.failedMembers, [member]); + } + + return; + } + // invite sent failed, append the member to that groupFailure member list, and trigger the debounce call + if (!thisGroupFailure) { + thisGroupFailure = { + failedMembers: [], + debouncedCall: debounce(displayFailedInvitesForGroup, 1000), // TODO change to 5000 + }; + } + + if (!thisGroupFailure.failedMembers.includes(member)) { + thisGroupFailure.failedMembers.push(member); + } + + invitesFailed.set(groupPk, thisGroupFailure); + thisGroupFailure.debouncedCall(groupPk); +} diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 1c71658d2c..17c81014f8 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -190,6 +190,9 @@ export type LocalizerKeys = | 'goToReleaseNotes' | 'goToSupportPage' | 'groupAvatarChange' + | 'groupInviteFailedOne' + | 'groupInviteFailedOthers' + | 'groupInviteFailedTwo' | 'groupMembers' | 'groupNameChange' | 'groupNameChangeFallback' @@ -230,6 +233,7 @@ export type LocalizerKeys = | 'invalidPubkeyFormat' | 'invalidSessionId' | 'inviteContacts' + | 'inviteFailed' | 'join' | 'joinACommunity' | 'joinOpenGroup' From 82747125282af7b303ebec3dba92a89c04914c13 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 1 Nov 2023 11:26:09 +1100 Subject: [PATCH 054/302] feat: add member status from wrapper when we are an admin --- _locales/en/messages.json | 3 + ts/components/MemberListItem.tsx | 155 ++++++++++++++++-- .../dialog/UpdateGroupMembersDialog.tsx | 14 +- ts/node/logging.ts | 7 +- ts/state/selectors/groups.ts | 72 ++++++-- ts/types/LocalizerKeys.ts | 3 + yarn.lock | 143 +++++++++++++--- 7 files changed, 331 insertions(+), 66 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 64e7dd22b3..f424e20b6c 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -259,6 +259,9 @@ "groupOthersPromoted": "$name$ and $count$ others were promoted to Admin.", "inviteFailed": "Invite Failed", + "invitePending": "Invite Pending", + "promotionFailed": "Promotion Failed", + "promotionPending": "Promotion Pending", "groupInviteFailedOne": "Failed to invite $name$ to $groupname$", "groupInviteFailedTwo": "Failed to invite $first$ and $second$ to $groupname$", "groupInviteFailedOthers": "Failed to invite $first$ and $count$ others to $groupname$", diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index cda20a20bb..5a133da475 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -1,8 +1,20 @@ import React from 'react'; import styled from 'styled-components'; -import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar'; +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { useConversationUsernameOrShorten } from '../hooks/useParamSelector'; +import { PubKey } from '../session/types'; +import { UserUtils } from '../session/utils'; +import { GroupInvite } from '../session/utils/job_runners/jobs/GroupInviteJob'; +import { + useMemberInviteFailed, + useMemberInvitePending, + useMemberPromotionFailed, + useMemberPromotionPending, +} from '../state/selectors/groups'; +import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar'; +import { Flex } from './basic/Flex'; +import { SessionButton, SessionButtonShape, SessionButtonType } from './basic/SessionButton'; import { SessionRadio } from './basic/SessionRadio'; const AvatarContainer = styled.div` @@ -55,8 +67,6 @@ const StyledInfo = styled.div` const StyledName = styled.span` font-weight: bold; - margin-inline-start: var(--margins-md); - margin-inline-end: var(--margins-md); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -67,7 +77,7 @@ const StyledCheckContainer = styled.div` align-items: center; `; -export const MemberListItem = (props: { +type MemberListItemProps = { pubkey: string; isSelected: boolean; // this bool is used to make a zombie appear with less opacity than a normal member @@ -78,19 +88,114 @@ export const MemberListItem = (props: { onSelect?: (pubkey: string) => void; onUnselect?: (pubkey: string) => void; dataTestId?: string; + displayGroupStatus?: boolean; + groupPk?: string; +}; + +const ResendInviteContainer = ({ + displayGroupStatus, + groupPk, + pubkey, +}: Pick) => { + if ( + displayGroupStatus && + groupPk && + PubKey.isClosedGroupV2(groupPk) && + PubKey.is05Pubkey(pubkey) && + !UserUtils.isUsFromCache(pubkey) + ) { + return ( + + + + ); + } + return null; +}; + +const StyledGroupStatusText = styled.span<{ isFailure: boolean }>` + color: var(--danger-color); + font-size: var(--font-size-xs); + margin-top: var(--margins-xs); +`; + +const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupPubkeyType }) => { + const groupInviteFailed = useMemberInviteFailed(pubkey, groupPk); + const groupPromotionFailed = useMemberPromotionFailed(pubkey, groupPk); + + const groupInvitePending = useMemberInvitePending(pubkey, groupPk); + const groupPromotionPending = useMemberPromotionPending(pubkey, groupPk); + + const statusText = groupPromotionFailed + ? window.i18n('promotionFailed') + : groupInviteFailed + ? window.i18n('inviteFailed') + : groupInvitePending + ? window.i18n('invitePending') + : groupPromotionPending + ? window.i18n('promotionPending') + : null; + + if (!statusText) { + return null; + } + return ( + + {statusText} + + ); +}; + +const GroupStatusContainer = ({ + displayGroupStatus, + groupPk, + pubkey, +}: Pick) => { + if ( + displayGroupStatus && + groupPk && + PubKey.isClosedGroupV2(groupPk) && + PubKey.is05Pubkey(pubkey) && + !UserUtils.isUsFromCache(pubkey) + ) { + return ; + } + return null; +}; + +const ResendInviteButton = ({ + groupPk, + pubkey, +}: { + pubkey: PubkeyType; + groupPk: GroupPubkeyType; }) => { - const { - isSelected, - pubkey, - isZombie, - isAdmin, - onSelect, - onUnselect, - inMentions, - disableBg, - dataTestId, - } = props; + return ( + { + void GroupInvite.addGroupInviteJob({ groupPk, member: pubkey }); + }} + /> + ); +}; +export const MemberListItem = ({ + isSelected, + pubkey, + dataTestId, + disableBg, + displayGroupStatus, + inMentions, + isAdmin, + isZombie, + onSelect, + onUnselect, + groupPk, +}: MemberListItemProps) => { const memberName = useConversationUsernameOrShorten(pubkey); return ( @@ -114,9 +219,27 @@ export const MemberListItem = (props: { > - {memberName} + + {memberName} + + + + {!inMentions && ( diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 6547e8e114..48a91549fc 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -1,5 +1,5 @@ import _ from 'lodash'; -import React from 'react'; +import React, { useMemo } from 'react'; import { useDispatch } from 'react-redux'; import useKey from 'react-use/lib/useKey'; import styled from 'styled-components'; @@ -25,6 +25,7 @@ import { import { useSet } from '../../hooks/useSet'; import { ConvoHub } from '../../session/conversations'; import { initiateClosedGroupUpdate } from '../../session/group/closed-group'; +import { useSelectedIsGroupV2 } from '../../state/selectors/selectedConversation'; type Props = { conversationId: string; @@ -46,16 +47,19 @@ const ClassicMemberList = (props: { }) => { const { onSelect, convoId, onUnselect, selectedMembers } = props; const weAreAdmin = useWeAreAdmin(convoId); + const isV2Group = useSelectedIsGroupV2(); const groupAdmins = useGroupAdmins(convoId); const groupMembers = useSortedGroupMembers(convoId); - let currentMembers = groupMembers || []; - currentMembers = [...currentMembers].sort(m => (groupAdmins?.includes(m) ? -1 : 0)); + const sortedMembers = useMemo( + () => [...groupMembers].sort(m => (groupAdmins?.includes(m) ? -1 : 0)), + [groupMembers, groupAdmins] + ); return ( <> - {currentMembers.map(member => { + {sortedMembers.map(member => { const isSelected = (weAreAdmin && selectedMembers.includes(member)) || false; const isAdmin = groupAdmins?.includes(member); @@ -68,6 +72,8 @@ const ClassicMemberList = (props: { key={member} isAdmin={isAdmin} disableBg={true} + displayGroupStatus={isV2Group && weAreAdmin} + groupPk={convoId} /> ); })} diff --git a/ts/node/logging.ts b/ts/node/logging.ts index f256d4f82d..dcfc3ab211 100644 --- a/ts/node/logging.ts +++ b/ts/node/logging.ts @@ -1,13 +1,14 @@ // NOTE: Temporarily allow `then` until we convert the entire file to `async` / `await`: /* eslint-disable more/no-then */ -import path from 'path'; import fs from 'fs'; +import path from 'path'; -import { app, ipcMain as ipc } from 'electron'; import Logger from 'bunyan'; -import _ from 'lodash'; +// eslint-disable-next-line import/order +import { app, ipcMain as ipc } from 'electron'; import firstline from 'firstline'; +import _ from 'lodash'; import { readLastLinesEnc } from 'read-last-lines-ts'; import rimraf from 'rimraf'; diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index 11e6d13f82..fb9e88e8d1 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -1,5 +1,4 @@ -import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { isEmpty } from 'lodash'; +import { GroupMemberGet, GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { useSelector } from 'react-redux'; import { PubKey } from '../../session/types'; import { GroupState } from '../ducks/groups'; @@ -7,7 +6,7 @@ import { StateType } from '../reducer'; const getLibGroupsState = (state: StateType): GroupState => state.groups; -export function getLibMembersPubkeys(state: StateType, convo?: string): Array { +function getMembersOfGroup(state: StateType, convo?: string): Array { if (!convo) { return []; } @@ -16,9 +15,15 @@ export function getLibMembersPubkeys(state: StateType, convo?: string): Array, memberPk: string) { + return members.find(m => m.pubkeyHex === memberPk); +} + +export function getLibMembersPubkeys(state: StateType, convo?: string): Array { + const members = getMembersOfGroup(state, convo); return members.map(m => m.pubkeyHex); } @@ -28,21 +33,36 @@ function getIsCreatingGroupFromUI(state: StateType): boolean { } export function getLibAdminsPubkeys(state: StateType, convo?: string): Array { - if (!convo) { - return []; - } - if (!PubKey.isClosedGroupV2(convo)) { - return []; - } - - const members = getLibGroupsState(state).members[convo]; - if (isEmpty(members)) { - return []; - } + const members = getMembersOfGroup(state, convo); return members.filter(m => m.promoted).map(m => m.pubkeyHex); } +function getMemberInviteFailed(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.inviteFailed || false; +} + +function getMemberInvitePending(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.invitePending || false; +} + +function getMemberIsPromoted(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.promoted || false; +} + +function getMemberPromotionFailed(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.promotionFailed || false; +} + +function getMemberPromotionPending(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.promotionPending || false; +} + export function getLibMembersCount(state: StateType, convo?: GroupPubkeyType): Array { return getLibMembersPubkeys(state, convo); } @@ -89,3 +109,21 @@ export function getLibGroupAdminsOutsideRedux(convoId: string): Array { export function useIsCreatingGroupFromUIPending() { return useSelector(getIsCreatingGroupFromUI); } + +export function useMemberInviteFailed(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberInviteFailed(state, member, groupPk)); +} + +export function useMemberInvitePending(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberInvitePending(state, member, groupPk)); +} +export function useMemberIsPromoted(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberIsPromoted(state, member, groupPk)); +} + +export function useMemberPromotionFailed(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberPromotionFailed(state, member, groupPk)); +} +export function useMemberPromotionPending(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberPromotionPending(state, member, groupPk)); +} diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 17c81014f8..14fa5beba1 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -234,6 +234,7 @@ export type LocalizerKeys = | 'invalidSessionId' | 'inviteContacts' | 'inviteFailed' + | 'invitePending' | 'join' | 'joinACommunity' | 'joinOpenGroup' @@ -363,6 +364,8 @@ export type LocalizerKeys = | 'primaryColorRed' | 'primaryColorYellow' | 'privacySettingsTitle' + | 'promotionFailed' + | 'promotionPending' | 'pruneSettingDescription' | 'pruneSettingTitle' | 'publicChatExists' diff --git a/yarn.lock b/yarn.lock index ae1a8c628f..f9c7f8bea4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,20 +12,27 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== +"@babel/code-frame@^7.0.0": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== + dependencies: + "@babel/highlight" "^7.22.13" + chalk "^2.4.2" + "@babel/code-frame@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658" integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ== dependencies: - "@babel/highlight" "^7.22.10" - chalk "^2.4.2" + "@babel/highlight" "^7.22.5" "@babel/generator@^7.22.7": - version "7.22.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d" - integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw== + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" + integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g== dependencies: - "@babel/types" "^7.22.5" + "@babel/types" "^7.23.0" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -81,25 +88,35 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== +"@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== + "@babel/helper-validator-identifier@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193" integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ== -"@babel/highlight@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031" - integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw== +"@babel/highlight@^7.22.13", "@babel/highlight@^7.22.5": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" + integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg== dependencies: - "@babel/helper-validator-identifier" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.20" chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/parser@^7.20.15", "@babel/parser@^7.22.5", "@babel/parser@^7.22.7": +"@babel/parser@^7.20.15", "@babel/parser@^7.22.5": version "7.22.7" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae" integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q== +"@babel/parser@^7.22.7": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719" + integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw== + "@babel/plugin-syntax-jsx@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918" @@ -135,18 +152,18 @@ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e" integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw== dependencies: - "@babel/code-frame" "^7.22.10" - "@babel/generator" "^7.22.10" + "@babel/code-frame" "^7.22.5" + "@babel/generator" "^7.22.7" "@babel/helper-environment-visitor" "^7.22.5" "@babel/helper-function-name" "^7.22.5" "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.22.10" - "@babel/types" "^7.22.10" + "@babel/parser" "^7.22.7" + "@babel/types" "^7.22.5" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.22.10", "@babel/types@^7.22.5": +"@babel/types@^7.22.5": version "7.22.10" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.10.tgz#4a9e76446048f2c66982d1a989dd12b8a2d2dc03" integrity sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg== @@ -155,6 +172,15 @@ "@babel/helper-validator-identifier" "^7.22.5" to-fast-properties "^2.0.0" +"@babel/types@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb" + integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + "@commitlint/cli@^17.7.1": version "17.7.1" resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.7.1.tgz#f3ab35bd38d82fcd4ab03ec5a1e9db26d57fe1b0" @@ -1039,21 +1065,21 @@ "@types/prop-types" "*" "@types/react" "*" -"@types/react@*", "@types/react@^17", "@types/react@^17.0.2": - version "17.0.62" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.62.tgz#2efe8ddf8533500ec44b1334dd1a97caa2f860e3" - integrity sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw== +"@types/react@*", "@types/react@17.0.2", "@types/react@^17": + version "17.0.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" + integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== dependencies: "@types/prop-types" "*" - "@types/scheduler" "*" csstype "^3.0.2" -"@types/react@17.0.2": - version "17.0.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" - integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== +"@types/react@^17.0.2": + version "17.0.62" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.62.tgz#2efe8ddf8533500ec44b1334dd1a97caa2f860e3" + integrity sha512-eANCyz9DG8p/Vdhr0ZKST8JV12PhH2ACCDYlFw6DIO+D+ca+uP4jtEDEpVqXZrh/uZdXQGwk7whJa3ah5DtyLw== dependencies: "@types/prop-types" "*" + "@types/scheduler" "*" csstype "^3.0.2" "@types/redux-logger@3.0.7": @@ -1549,6 +1575,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" +ansi-styles@^6.0.0, ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -2403,6 +2434,14 @@ commander@^5.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== +compare-func@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3" + integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA== + dependencies: + array-ify "^1.0.0" + dot-prop "^5.1.0" + compare-version@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" @@ -2443,6 +2482,30 @@ console-control-strings@^1.1.0: resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== +conventional-changelog-angular@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-6.0.0.tgz#a9a9494c28b7165889144fd5b91573c4aa9ca541" + integrity sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg== + dependencies: + compare-func "^2.0.0" + +conventional-changelog-conventionalcommits@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-6.1.0.tgz#3bad05f4eea64e423d3d90fc50c17d2c8cf17652" + integrity sha512-3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw== + dependencies: + compare-func "^2.0.0" + +conventional-commits-parser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz#02ae1178a381304839bce7cea9da5f1b549ae505" + integrity sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg== + dependencies: + JSONStream "^1.3.5" + is-text-path "^1.0.1" + meow "^8.1.2" + split2 "^3.2.2" + copy-to-clipboard@^3.3.1: version "3.3.3" resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0" @@ -3392,6 +3455,21 @@ execa@^4.0.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -6694,6 +6772,14 @@ slice-ansi@^3.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +slice-ansi@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" + integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== + dependencies: + ansi-styles "^6.0.0" + is-fullwidth-code-point "^4.0.0" + smart-buffer@^4.0.2: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" @@ -7775,6 +7861,11 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" From f9502b4bbe7f69e60f6ad1a83cdfff1cf7d4ed2c Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 1 Nov 2023 11:35:40 +1100 Subject: [PATCH 055/302] fix: remove titles from toasts as they have been removed from the guideline --- _locales/en/messages.json | 8 -- ts/components/basic/SessionToast.tsx | 17 +--- .../dialog/SessionPasswordDialog.tsx | 15 ++-- ts/session/utils/Toast.tsx | 78 +++++-------------- .../utils/job_runners/jobs/GroupInviteJob.ts | 3 - ts/types/attachments/VisualAttachment.ts | 3 +- 6 files changed, 32 insertions(+), 92 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index f424e20b6c..7e1b7999f4 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -83,7 +83,6 @@ "replyingToMessage": "Replying to:", "originalMessageNotFound": "Original message not found", "you": "You", - "audioPermissionNeededTitle": "Microphone Access Required", "audioPermissionNeeded": "You can enable microphone access under: Settings (Gear icon) => Privacy", "image": "Image", "audio": "Audio", @@ -332,9 +331,6 @@ "setPasswordInvalid": "Passwords do not match", "changePasswordInvalid": "The old password you entered is incorrect", "removePasswordInvalid": "Incorrect password", - "setPasswordTitle": "Password Set", - "changePasswordTitle": "Password Changed", - "removePasswordTitle": "Password Removed", "setPasswordToastDescription": "Your password has been set. Please keep it safe.", "changePasswordToastDescription": "Your password has been changed. Please keep it safe.", "removePasswordToastDescription": "Your password has been removed.", @@ -362,7 +358,6 @@ "noContactsToAdd": "No contacts to add", "noMembersInThisGroup": "No other members in this group", "noModeratorsToRemove": "no admins to remove", - "onlyAdminCanRemoveMembers": "You are not the creator", "onlyAdminCanRemoveMembersDesc": "Only the creator of the group can remove users", "createAccount": "Create account", "startInTrayTitle": "Keep in System Tray", @@ -486,12 +481,9 @@ "endCall": "End call", "permissionsSettingsTitle": "Permissions", "helpSettingsTitle": "Help", - "cameraPermissionNeededTitle": "Voice/Video Call permissions required", "cameraPermissionNeeded": "You can enable the 'Voice and video calls' permission in the Privacy Settings.", "unableToCall": "Cancel your ongoing call first", - "unableToCallTitle": "Cannot start new call", "callMissed": "Missed call from $name$", - "callMissedTitle": "Call missed", "noCameraFound": "No camera found", "noAudioInputFound": "No audio input found", "noAudioOutputFound": "No audio output found", diff --git a/ts/components/basic/SessionToast.tsx b/ts/components/basic/SessionToast.tsx index 9cbbe82376..4705287445 100644 --- a/ts/components/basic/SessionToast.tsx +++ b/ts/components/basic/SessionToast.tsx @@ -17,23 +17,15 @@ export enum SessionToastType { } type Props = { - title: string; + description: string; + id?: string; type?: SessionToastType; icon?: SessionIconType; - description?: string; closeToast?: any; onToastClick?: () => void; }; -const TitleDiv = styled.div` - font-size: var(--font-size-md); - line-height: var(--font-size-md); - font-family: var(--font-default); - color: var(--text-primary-color); - text-overflow: ellipsis; -`; - const DescriptionDiv = styled.div` font-size: var(--font-size-sm); color: var(--text-secondary-color); @@ -72,7 +64,7 @@ function DescriptionPubkeysReplaced({ description }: { description: string }) { } export const SessionToast = (props: Props) => { - const { title, description, type, icon } = props; + const { description, type, icon } = props; const toastDesc = description || ''; const toastIconSize = toastDesc ? 'huge' : 'medium'; @@ -117,8 +109,7 @@ export const SessionToast = (props: Props) => { flexDirection="column" className="session-toast" > - {title} - {toastDesc && } + ); diff --git a/ts/components/dialog/SessionPasswordDialog.tsx b/ts/components/dialog/SessionPasswordDialog.tsx index 0d22fbe8a2..b358f40e3d 100644 --- a/ts/components/dialog/SessionPasswordDialog.tsx +++ b/ts/components/dialog/SessionPasswordDialog.tsx @@ -1,16 +1,16 @@ /* eslint-disable @typescript-eslint/no-misused-promises */ -import React from 'react'; import autoBind from 'auto-bind'; +import React from 'react'; -import { ToastUtils } from '../../session/utils'; import { Data } from '../../data/data'; -import { SpacerSM } from '../basic/Text'; +import { ToastUtils } from '../../session/utils'; import { sessionPassword } from '../../state/ducks/modalDialog'; import { LocalizerKeys } from '../../types/LocalizerKeys'; -import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; -import { SessionWrapperModal } from '../SessionWrapperModal'; -import { matchesHash, validatePassword } from '../../util/passwordUtils'; import { assertUnreachable } from '../../types/sqlSharedTypes'; +import { matchesHash, validatePassword } from '../../util/passwordUtils'; +import { SessionWrapperModal } from '../SessionWrapperModal'; +import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; +import { SpacerSM } from '../basic/Text'; export type PasswordAction = 'set' | 'change' | 'remove' | 'enter'; @@ -197,7 +197,6 @@ export class SessionPasswordDialog extends React.Component { await window.setPassword(enteredPassword, null); ToastUtils.pushToastSuccess( 'setPasswordSuccessToast', - window.i18n('setPasswordTitle'), window.i18n('setPasswordToastDescription') ); @@ -237,7 +236,6 @@ export class SessionPasswordDialog extends React.Component { ToastUtils.pushToastSuccess( 'setPasswordSuccessToast', - window.i18n('changePasswordTitle'), window.i18n('changePasswordToastDescription') ); @@ -259,7 +257,6 @@ export class SessionPasswordDialog extends React.Component { ToastUtils.pushToastWarning( 'setPasswordSuccessToast', - window.i18n('removePasswordTitle'), window.i18n('removePasswordToastDescription') ); diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx index 1087345edd..fbaef40564 100644 --- a/ts/session/utils/Toast.tsx +++ b/ts/session/utils/Toast.tsx @@ -6,30 +6,28 @@ import { SessionSettingCategory } from '../../components/settings/SessionSetting import { SectionType, showLeftPaneSection, showSettingsSection } from '../../state/ducks/section'; // if you push a toast manually with toast...() be sure to set the type attribute of the SessionToast component -export function pushToastError(id: string, title: string, description?: string) { - toast.error( - , - { toastId: id, updateId: id } - ); +export function pushToastError(id: string, description: string) { + toast.error(, { + toastId: id, + updateId: id, + }); } -export function pushToastWarning(id: string, title: string, description?: string) { - toast.warning( - , - { toastId: id, updateId: id } - ); +export function pushToastWarning(id: string, description: string) { + toast.warning(, { + toastId: id, + updateId: id, + }); } export function pushToastInfo( id: string, - title: string, - description?: string, + description: string, onToastClick?: () => void, delay?: number ) { toast.info( , + , { toastId: id, updateId: id } ); } @@ -64,7 +52,7 @@ export function pushLoadAttachmentFailure(message?: string) { } export function pushFileSizeError(limit: number, units: string) { - pushToastError('fileSizeWarning', window.i18n('fileSizeWarning'), `Max size: ${limit} ${units}`); + pushToastError('fileSizeWarning', `${window.i18n('fileSizeWarning')}: ${limit} ${units}`); } export function pushFileSizeErrorAsByte(bytesCount: number) { @@ -130,15 +118,11 @@ export function pushMessageDeleteForbidden() { } export function pushUnableToCall() { - pushToastError('unableToCall', window.i18n('unableToCallTitle'), window.i18n('unableToCall')); + pushToastError('unableToCall', window.i18n('unableToCall')); } export function pushedMissedCall(conversationName: string) { - pushToastInfo( - 'missedCall', - window.i18n('callMissedTitle'), - window.i18n('callMissed', [conversationName]) - ); + pushToastInfo('missedCall', window.i18n('callMissed', [conversationName])); } const openPermissionsSettings = () => { @@ -150,7 +134,6 @@ export function pushedMissedCallCauseOfPermission(conversationName: string) { const id = 'missedCallPermission'; toast.info( Date: Wed, 1 Nov 2023 14:33:33 +1100 Subject: [PATCH 056/302] feat: add revoke/unrevoke subrequests unused currently --- .../apis/snode_api/SnodeRequestTypes.ts | 21 +++-- ts/session/apis/snode_api/revokeSubaccount.ts | 84 +++++++++++++++++++ .../snode_api/signature/groupSignature.ts | 24 ++++++ 3 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 ts/session/apis/snode_api/revokeSubaccount.ts diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 5d51352fdc..8f67cfdeac 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -192,10 +192,6 @@ export type UpdateExpireNodeUserParams = WithPubkeyAsString & export type UpdateExpireNodeGroupParams = WithPubkeyAsGroupPubkey & UpdateExpireAlwaysNeeded; -type UpdateExpiryOnNodeSubRequest = - | UpdateExpiryOnNodeUserSubRequest - | UpdateExpiryOnNodeGroupSubRequest; - export type UpdateExpiryOnNodeUserSubRequest = { method: 'expire'; params: UpdateExpireNodeUserParams; @@ -206,6 +202,20 @@ export type UpdateExpiryOnNodeGroupSubRequest = { params: UpdateExpireNodeGroupParams; }; +type UpdateExpiryOnNodeSubRequest = + | UpdateExpiryOnNodeUserSubRequest + | UpdateExpiryOnNodeGroupSubRequest; + +export type RevokeSubaccountParams = { + pubkey: GroupPubkeyType; + revoke: string; // the subaccount token to revoke in hex + signature: string; +}; +export type RevokeSubaccountSubRequest = { + method: 'revoke_subaccount' | 'unrevoke_subaccount'; + params: RevokeSubaccountParams; +}; + export type OxendSubRequest = OnsResolveSubRequest | GetServiceNodesSubRequest; export type SnodeApiSubRequests = @@ -216,7 +226,8 @@ export type SnodeApiSubRequests = | NetworkTimeSubRequest | DeleteFromNodeSubRequest | DeleteAllFromNodeSubRequest - | UpdateExpiryOnNodeSubRequest; + | UpdateExpiryOnNodeSubRequest + | RevokeSubaccountSubRequest; // eslint-disable-next-line @typescript-eslint/array-type export type NonEmptyArray = [T, ...T[]]; diff --git a/ts/session/apis/snode_api/revokeSubaccount.ts b/ts/session/apis/snode_api/revokeSubaccount.ts new file mode 100644 index 0000000000..8cd77cef4a --- /dev/null +++ b/ts/session/apis/snode_api/revokeSubaccount.ts @@ -0,0 +1,84 @@ +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import _, { isEmpty } from 'lodash'; +import { doSnodeBatchRequest } from './batchRequest'; + +import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; +import { PubKey } from '../../types'; +import { stringToUint8Array } from '../../utils/String'; +import { RevokeSubaccountSubRequest } from './SnodeRequestTypes'; +import { SnodeGroupSignature } from './signature/groupSignature'; +import { getSwarmFor } from './snodePool'; + +type Change = { + action: 'revoke_subaccount' | 'unrevoke_subaccount'; + tokenToRevoke: string; +}; + +type ArrayOfChange = Array; +async function getRevokeSubaccountRequest({ + groupPk, + actions, +}: { + groupPk: GroupPubkeyType; + actions: ArrayOfChange; +}): Promise> { + if (!PubKey.isClosedGroupV2(groupPk)) { + throw new Error('revokeSubaccountForGroup: not a 03 group'); + } + + const group = await UserGroupsWrapperActions.getGroup(groupPk); + + if (!group || isEmpty(group?.secretKey)) { + throw new Error(`revokeSubaccountForGroup ${groupPk} needs admin secretkey`); + } + + const revokeParams: Array = await Promise.all( + actions.map(async action => { + const verificationString = `${action}${stringToUint8Array(action.tokenToRevoke)}`; + const sigResult = await SnodeGroupSignature.signDataWithAdminSecret( + verificationString, + group + ); + + return { + method: action.action, + params: { + revoke: action.tokenToRevoke, + ...sigResult, + pubkey: groupPk, + }, + }; + }) + ); + + return revokeParams; +} + +async function revokeSubAccounts( + groupPk: GroupPubkeyType, + actions: ArrayOfChange +): Promise { + try { + const swarm = await getSwarmFor(groupPk); + const snode = _.sample(swarm); + if (!snode) { + throw new Error('revoke subaccounts empty swarm'); + } + const revokeParams = await getRevokeSubaccountRequest({ + groupPk, + actions, + }); + + const results = await doSnodeBatchRequest(revokeParams, snode, 4000, null); + + if (!results || !results.length) { + throw new Error(`_revokeSubAccounts could not talk to ${snode.ip}:${snode.port}`); + } + return true; + } catch (e) { + window?.log?.warn(`_revokeSubAccounts failed with ${e.message}`); + return false; + } +} + +export const SnodeAPIRetrieve = { revokeSubAccounts }; diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 568bf6e394..1b1b872104 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -154,6 +154,29 @@ async function getSnodeGroupSignature({ throw new Error(`getSnodeGroupSignature: needs either groupSecretKey or authData`); } +async function signDataWithAdminSecret( + verificationString: string, + group: Pick +) { + const verificationData = StringUtils.encode(verificationString, 'utf8'); + const message = new Uint8Array(verificationData); + + if (!group) { + throw new Error('signDataWithAdminSecret group was not found'); + } + const { secretKey } = group; + + const groupSecretKey = secretKey && !isEmpty(secretKey) ? secretKey : null; + if (!groupSecretKey) { + throw new Error('groupSecretKey is empty'); + } + const sodium = await getSodiumRenderer(); + + return { + signature: fromUInt8ArrayToBase64(sodium.crypto_sign_detached(message, groupSecretKey)), + }; +} + // this is kind of duplicated with `generateUpdateExpirySignature`, but needs to use the authData when secretKey is not available async function generateUpdateExpiryGroupSignature({ shortenOrExtend, @@ -214,4 +237,5 @@ export const SnodeGroupSignature = { generateUpdateExpiryGroupSignature, getGroupInviteMessage, getSnodeGroupSignature, + signDataWithAdminSecret, }; From 16e7ee1cd6eb43581deb3033cfe25902e9dbb4dc Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 8 Nov 2023 15:55:04 +1100 Subject: [PATCH 057/302] feat: make groupv2 messages skip cache also add group members change --- _locales/en/messages.json | 6 +- preload.js | 3 + protos/SignalService.proto | 2 +- ts/components/MemberListItem.tsx | 8 +- ts/components/dialog/InviteContactsDialog.tsx | 28 +- .../dialog/UpdateGroupMembersDialog.tsx | 37 +- .../dialog/UpdateGroupNameDialog.tsx | 20 +- ts/hooks/useParamSelector.ts | 20 +- ts/models/conversation.ts | 4 +- ts/node/database_utility.ts | 4 +- ts/node/sql.ts | 5 +- ts/receiver/cache.ts | 61 ++- ts/receiver/callMessage.ts | 22 +- ts/receiver/closedGroups.ts | 105 ++-- ts/receiver/configMessage.ts | 6 +- ts/receiver/contentMessage.ts | 133 ++--- ts/receiver/dataMessage.ts | 28 +- ts/receiver/groupv2/handleGroupV2Message.ts | 118 ++++- ts/receiver/receiver.ts | 120 ++++- .../apis/open_group_api/sogsv3/sogsApiV3.ts | 56 +-- ts/session/apis/snode_api/SNodeAPI.ts | 2 +- .../apis/snode_api/SnodeRequestTypes.ts | 40 +- ts/session/apis/snode_api/batchRequest.ts | 5 +- ts/session/apis/snode_api/namespaces.ts | 38 +- ts/session/apis/snode_api/onions.ts | 27 +- ts/session/apis/snode_api/retrieveRequest.ts | 6 +- ts/session/apis/snode_api/revokeSubaccount.ts | 92 ++-- .../snode_api/signature/groupSignature.ts | 45 +- .../snode_api/signature/signatureShared.ts | 2 +- .../snode_api/signature/snodeSignatures.ts | 17 +- ts/session/apis/snode_api/swarmPolling.ts | 130 +++-- .../SwarmPollingGroupConfig.ts | 10 +- .../SwarmPollingUserConfig.ts | 5 +- .../conversations/ConversationController.ts | 4 +- ts/session/conversations/createClosedGroup.ts | 5 +- ts/session/crypto/MessageEncrypter.ts | 2 +- ts/session/group/closed-group.ts | 37 +- .../group_v2/GroupUpdateMessage.ts | 8 +- .../GroupUpdateDeleteMemberContentMessage.ts | 2 + .../to_group/GroupUpdateInfoChangeMessage.ts | 2 + .../GroupUpdateInviteResponseMessage.ts | 3 + .../GroupUpdateMemberChangeMessage.ts | 2 + .../to_group/GroupUpdateMemberLeftMessage.ts | 3 + .../to_user/GroupUpdateDeleteMessage.ts | 2 +- .../to_user/GroupUpdateInviteMessage.ts | 2 +- .../ClosedGroupVisibleMessage.ts | 4 +- ts/session/sending/MessageQueue.ts | 15 +- ts/session/sending/MessageSender.ts | 50 +- ts/session/types/PubKey.ts | 2 +- .../utils/job_runners/jobs/GroupSyncJob.ts | 26 +- .../utils/libsession/libsession_utils.ts | 8 +- .../libsession_utils_user_groups.ts | 4 +- ts/state/createStore.ts | 2 +- ts/state/ducks/groups.ts | 475 +++++++++++++++++- ts/state/selectors/groups.ts | 17 +- ts/state/selectors/selectedConversation.ts | 6 +- .../libsession_wrapper_metagroup_test.ts | 9 +- .../group_sync_job/GroupSyncJob_test.ts | 6 +- .../browser/libsession_worker_interface.ts | 25 +- 59 files changed, 1471 insertions(+), 455 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 7e1b7999f4..8856d9063e 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -242,17 +242,17 @@ "groupNameChangeFallback": "Group name updated.", "groupAvatarChange": "Group display picture updated.", - "groupOneJoined": "name joined the group.", + "groupOneJoined": "$name$ joined the group.", "groupYouJoined": "You joined the group.", "groupTwoJoined": "$first$ and $second$ joined the group.", "groupOthersJoined": "$name$ and $count$ others joined the group.", - "groupOneRemoved": "name was removed from the group.", + "groupOneRemoved": "$name$ was removed from the group.", "groupYouRemoved": "You were removed from the group.", "groupTwoRemoved": "$first$ and $second$ were removed from the group.", "groupOthersRemoved": "$name$ and $count$ others were removed from the group.", - "groupOnePromoted": "name was promoted to Admin.", + "groupOnePromoted": "$name$ was promoted to Admin.", "groupYouPromoted": "You were promoted to Admin.", "groupTwoPromoted": "$first$ and $second$ were promoted to Admin.", "groupOthersPromoted": "$name$ and $count$ others were promoted to Admin.", diff --git a/preload.js b/preload.js index bb904551fa..6b152e77d3 100644 --- a/preload.js +++ b/preload.js @@ -242,6 +242,9 @@ data.initData(); const { ConvoHub } = require('./ts/session/conversations/ConversationController'); window.getConversationController = ConvoHub.use; +const { IncomingMessageCache } = require('./ts/receiver/cache'); +window.IncomingMessageCache = IncomingMessageCache; + // Linux seems to periodically let the event loop stop, so this is a global workaround setInterval(() => { window.nodeSetImmediate(() => {}); diff --git a/protos/SignalService.proto b/protos/SignalService.proto index d71ab754cb..30e7e65ddb 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -92,7 +92,6 @@ message GroupUpdateInviteMessage { // @required required bytes adminSignature = 6; } - message GroupUpdateDeleteMessage { // @required required string groupSessionId = 1; // The `groupIdentityPublicKey` with a `03` prefix @@ -100,6 +99,7 @@ message GroupUpdateDeleteMessage { required bytes adminSignature = 2; } + message GroupUpdateInfoChangeMessage { enum Type { NAME = 1; diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 5a133da475..f785430af3 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -100,12 +100,12 @@ const ResendInviteContainer = ({ if ( displayGroupStatus && groupPk && - PubKey.isClosedGroupV2(groupPk) && + PubKey.is03Pubkey(groupPk) && PubKey.is05Pubkey(pubkey) && !UserUtils.isUsFromCache(pubkey) ) { return ( - + ); @@ -114,7 +114,7 @@ const ResendInviteContainer = ({ }; const StyledGroupStatusText = styled.span<{ isFailure: boolean }>` - color: var(--danger-color); + color: ${props => (props.isFailure ? 'var(--danger-color)' : 'var(--text-secondary-color)')}; font-size: var(--font-size-xs); margin-top: var(--margins-xs); `; @@ -154,7 +154,7 @@ const GroupStatusContainer = ({ if ( displayGroupStatus && groupPk && - PubKey.isClosedGroupV2(groupPk) && + PubKey.is03Pubkey(groupPk) && PubKey.is05Pubkey(pubkey) && !UserUtils.isUsFromCache(pubkey) ) { diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index cff3c08bd3..f90e1bb573 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -1,6 +1,7 @@ import React from 'react'; import useKey from 'react-use/lib/useKey'; +import { PubkeyType } from 'libsession_util_nodejs'; import _ from 'lodash'; import { useDispatch, useSelector } from 'react-redux'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; @@ -18,12 +19,16 @@ import { useZombies, } from '../../hooks/useParamSelector'; import { useSet } from '../../hooks/useSet'; -import { initiateClosedGroupUpdate } from '../../session/group/closed-group'; +import { ClosedGroup } from '../../session/group/closed-group'; +import { PubKey } from '../../session/types'; import { SessionUtilUserGroups } from '../../session/utils/libsession/libsession_utils_user_groups'; +import { groupInfoActions } from '../../state/ducks/groups'; import { getPrivateContactsPubkeys } from '../../state/selectors/conversations'; +import { useMemberGroupChangePending } from '../../state/selectors/groups'; import { MemberListItem } from '../MemberListItem'; import { SessionWrapperModal } from '../SessionWrapperModal'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; +import { SessionSpinner } from '../basic/SessionSpinner'; type Props = { conversationId: string; @@ -99,7 +104,7 @@ const submitForClosedGroup = async (convoId: string, pubkeys: Array) => const groupId = convo.get('id'); const groupName = convo.getNicknameOrRealUsernameOrPlaceholder(); - await initiateClosedGroupUpdate(groupId, groupName, uniqMembers); + await ClosedGroup.initiateClosedGroupUpdate(groupId, groupName, uniqMembers); } }; @@ -108,7 +113,9 @@ const InviteContactsDialogInner = (props: Props) => { const dispatch = useDispatch(); const privateContactPubkeys = useSelector(getPrivateContactsPubkeys); - let validContactsForInvite = _.clone(privateContactPubkeys); + let validContactsForInvite = _.clone(privateContactPubkeys) as Array; + + const isProcessingUIChange = useMemberGroupChangePending(); const isPrivate = useIsPrivate(conversationId); const isPublic = useIsPublic(conversationId); @@ -141,6 +148,16 @@ const InviteContactsDialogInner = (props: Props) => { if (isPublic) { void submitForOpenGroup(conversationId, selectedContacts); } else { + if (PubKey.is03Pubkey(conversationId)) { + const action = groupInfoActions.currentDeviceGroupMembersChange({ + addMembersWithoutHistory: selectedContacts as Array, + addMembersWithHistory: [], + removeMembers: [], + groupPk: conversationId, + }); + dispatch(action as any); + return; + } void submitForClosedGroup(conversationId, selectedContacts); } } @@ -189,12 +206,14 @@ const InviteContactsDialogInner = (props: Props) => { )}
+ +
{ buttonColor={SessionButtonColor.Danger} buttonType={SessionButtonType.Simple} onClick={closeDialog} + disabled={isProcessingUIChange} />
diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 48a91549fc..d8d9997d8a 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -1,9 +1,10 @@ -import _ from 'lodash'; +import _, { difference } from 'lodash'; import React, { useMemo } from 'react'; import { useDispatch } from 'react-redux'; import useKey from 'react-use/lib/useKey'; import styled from 'styled-components'; +import { PubkeyType } from 'libsession_util_nodejs'; import { ToastUtils, UserUtils } from '../../session/utils'; import { updateGroupMembersModal } from '../../state/ducks/modalDialog'; @@ -24,8 +25,12 @@ import { import { useSet } from '../../hooks/useSet'; import { ConvoHub } from '../../session/conversations'; -import { initiateClosedGroupUpdate } from '../../session/group/closed-group'; +import { ClosedGroup } from '../../session/group/closed-group'; +import { PubKey } from '../../session/types'; +import { groupInfoActions } from '../../state/ducks/groups'; +import { useMemberGroupChangePending } from '../../state/selectors/groups'; import { useSelectedIsGroupV2 } from '../../state/selectors/selectedConversation'; +import { SessionSpinner } from '../basic/SessionSpinner'; type Props = { conversationId: string; @@ -172,7 +177,7 @@ async function onSubmit(convoId: string, membersAfterUpdate: Array) { memberAfterUpdate => !_.includes(membersToRemove, memberAfterUpdate) ); - void initiateClosedGroupUpdate( + void ClosedGroup.initiateClosedGroupUpdate( convoId, convoFound.getRealSessionUsername() || 'Unknown', filteredMembers @@ -187,6 +192,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { const existingMembers = useSortedGroupMembers(conversationId) || []; const displayName = useConversationUsername(conversationId); const groupAdmins = useGroupAdmins(conversationId); + const isProcessingUIChange = useMemberGroupChangePending(); const { addTo, @@ -205,9 +211,20 @@ export const UpdateGroupMembersDialog = (props: Props) => { }; const onClickOK = async () => { - // const members = getWouldBeMembers(this.state.contactList).map(d => d.id); - // do not include zombies here, they are removed by force + if (PubKey.is03Pubkey(conversationId)) { + const groupv2Action = groupInfoActions.currentDeviceGroupMembersChange({ + groupPk: conversationId, + addMembersWithHistory: [], + addMembersWithoutHistory: [], + removeMembers: difference(existingMembers, membersToKeepWithUpdate) as Array, + }); + dispatch(groupv2Action as any); + + return; // keeping the dialog open until the async thunk is done + } + await onSubmit(conversationId, membersToKeepWithUpdate); + closeDialog(); }; @@ -260,17 +277,25 @@ export const UpdateGroupMembersDialog = (props: Props) => { {showNoMembersMessage &&

{window.i18n('noMembersInThisGroup')}

} + +
{weAreAdmin && ( - + )}
diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx index c546e32aa4..59c18883f8 100644 --- a/ts/components/dialog/UpdateGroupNameDialog.tsx +++ b/ts/components/dialog/UpdateGroupNameDialog.tsx @@ -6,8 +6,10 @@ import React from 'react'; import { clone } from 'lodash'; import { ConversationModel } from '../../models/conversation'; import { ConvoHub } from '../../session/conversations'; -import { initiateClosedGroupUpdate } from '../../session/group/closed-group'; +import { ClosedGroup } from '../../session/group/closed-group'; import { initiateOpenGroupUpdate } from '../../session/group/open-group'; +import { PubKey } from '../../session/types'; +import { groupInfoActions } from '../../state/ducks/groups'; import { updateGroupNameModal } from '../../state/ducks/modalDialog'; import { getLibGroupNameOutsideRedux } from '../../state/selectors/groups'; import { pickFileForAvatar } from '../../types/attachments/VisualAttachment'; @@ -75,14 +77,24 @@ export class UpdateGroupNameDialog extends React.Component { void initiateOpenGroupUpdate(this.convo.id, trimmedGroupName, { objectUrl: newAvatarObjecturl, }); + this.closeDialog(); } else { + const groupPk = this.convo.id; + if (PubKey.is03Pubkey(groupPk)) { + const groupv2Action = groupInfoActions.currentDeviceGroupNameChange({ + groupPk, + newName: trimmedGroupName, + }); + window.inboxStore.dispatch(groupv2Action as any); + + return; // keeping the dialog open until the async thunk is done + } const members = this.convo.getGroupMembers() || []; - void initiateClosedGroupUpdate(this.convo.id, trimmedGroupName, members); + void ClosedGroup.initiateClosedGroupUpdate(this.convo.id, trimmedGroupName, members); + this.closeDialog(); } } - - this.closeDialog(); } public render() { diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 1a2a569a27..c68358eec3 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -1,9 +1,11 @@ +import { PubkeyType } from 'libsession_util_nodejs'; import { compact, isEmpty, isFinite, isNumber } from 'lodash'; import { useSelector } from 'react-redux'; import { hasValidIncomingRequestValues, hasValidOutgoingRequestValues, } from '../models/conversation'; +import { ConversationTypeEnum } from '../models/conversationAttributes'; import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; import { CONVERSATION } from '../session/constants'; import { PubKey } from '../session/types'; @@ -31,7 +33,7 @@ export function useConversationUsername(convoId?: string) { const convoProps = useConversationPropsById(convoId); const groupName = useLibGroupName(convoId); - if (convoId && PubKey.isClosedGroupV2(convoId) && groupName) { + if (convoId && PubKey.is03Pubkey(convoId) && groupName) { // when getting a new 03 group from the usergroup wrapper, // we set the displayNameInProfile with the name from the wrapper. // So let's keep falling back to convoProps?.displayNameInProfile if groupName is not set yet (it comes later through the groupInfos namespace) @@ -65,7 +67,7 @@ function usernameForQuoteOrFullPk(pubkey: string, state: StateType) { return window.i18n('you'); } // use the name from the cached libsession wrappers if available - if (PubKey.isClosedGroupV2(pubkey)) { + if (PubKey.is03Pubkey(pubkey)) { const info = state.groups.infos[pubkey]; if (info && info.name) { return info.name; @@ -148,6 +150,12 @@ export function useNotificationSetting(convoId?: string) { const convoProps = useConversationPropsById(convoId); return convoProps?.currentNotificationSetting || 'all'; } + +export function useIsGroupV2(convoId?: string) { + const convoProps = useConversationPropsById(convoId); + return convoId && convoProps?.type === ConversationTypeEnum.GROUPV2 && PubKey.is03Pubkey(convoId); +} + export function useIsPublic(convoId?: string) { const convoProps = useConversationPropsById(convoId); return Boolean(convoProps && convoProps.isPublic); @@ -188,7 +196,7 @@ export function useGroupAdmins(convoId?: string) { const libMembers = useLibGroupAdmins(convoId); - if (convoId && PubKey.isClosedGroupV2(convoId)) { + if (convoId && PubKey.is03Pubkey(convoId)) { return compact(libMembers?.slice()?.sort()) || []; } @@ -369,7 +377,7 @@ function useMembers(convoId: string | undefined) { * Get the list of members of a closed group or [] * @param convoId the closed group id to extract members from */ -export function useSortedGroupMembers(convoId: string | undefined): Array { +export function useSortedGroupMembers(convoId: string | undefined): Array { const members = useMembers(convoId); const isPublic = useIsPublic(convoId); const isPrivate = useIsPrivate(convoId); @@ -377,9 +385,9 @@ export function useSortedGroupMembers(convoId: string | undefined): Array; } diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 0c589546ad..ea64998e1d 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -230,9 +230,7 @@ export class ConversationModel extends Backbone.Model { } public isClosedGroupV2(): boolean { - return Boolean( - this.get('type') === ConversationTypeEnum.GROUPV2 && PubKey.isClosedGroupV2(this.id) - ); + return Boolean(this.get('type') === ConversationTypeEnum.GROUPV2 && PubKey.is03Pubkey(this.id)); } public isPrivate() { diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts index e78a4e53d4..db6a6baf3e 100644 --- a/ts/node/database_utility.ts +++ b/ts/node/database_utility.ts @@ -1,9 +1,9 @@ -import { difference, isNumber, omit, pick } from 'lodash'; import * as BetterSqlite3 from '@signalapp/better-sqlite3'; +import { difference, isNumber, omit, pick } from 'lodash'; import { + CONVERSATION_PRIORITIES, ConversationAttributes, ConversationAttributesWithNotSavedOnes, - CONVERSATION_PRIORITIES, } from '../models/conversationAttributes'; export const CONVERSATIONS_TABLE = 'conversations'; diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 3d14fef43e..72a6af1540 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1,7 +1,8 @@ +// eslint-disable-next-line import/order +import * as BetterSqlite3 from '@signalapp/better-sqlite3'; import { app, clipboard, dialog, Notification } from 'electron'; import fs from 'fs'; import path from 'path'; -import * as BetterSqlite3 from '@signalapp/better-sqlite3'; import rimraf from 'rimraf'; import { base64_variants, from_base64, to_hex } from 'libsodium-wrappers-sumo'; @@ -910,7 +911,7 @@ function saveSeenMessageHash(data: any) { try { assertGlobalInstance() .prepare( - `INSERT INTO seenMessages ( + `INSERT OR REPLACE INTO seenMessages ( expiresAt, hash ) values ( diff --git a/ts/receiver/cache.ts b/ts/receiver/cache.ts index b8a060ac54..91050d2078 100644 --- a/ts/receiver/cache.ts +++ b/ts/receiver/cache.ts @@ -1,20 +1,28 @@ import { map, toNumber } from 'lodash'; -import { EnvelopePlus } from './types'; -import { StringUtils } from '../session/utils'; import { Data } from '../data/data'; +import { PubKey } from '../session/types'; +import { StringUtils } from '../session/utils'; import { UnprocessedParameter } from '../types/sqlSharedTypes'; +import { EnvelopePlus } from './types'; -export async function removeFromCache(envelope: Pick) { +async function removeFromCache(envelope: Pick) { return Data.removeUnprocessed(envelope.id); } -export async function addToCache( - envelope: EnvelopePlus, - plaintext: ArrayBuffer, - messageHash: string -) { +function assertNon03Group(envelope: Pick) { + if (PubKey.is03Pubkey(envelope.source)) { + window.log.warn('tried to addtocache message with source:', envelope.source); + // 03 group message keys are handled first. We also block the polling until the current messages are processed (so not updating the corresponding last hash) + // This means that we cannot miss a message from a 03 swarm, and if a message fails to be decrypted/handled, it will keep failing. + // So, there is no need for cache at all for those messages, which is great news as we consider the caching to be legacy code, to be removed asap. + throw new Error('addToCache we do not rely on the caching for 03 group messages'); + } +} + +async function addToCache(envelope: EnvelopePlus, plaintext: ArrayBuffer, messageHash: string) { const { id } = envelope; + assertNon03Group(envelope); const encodedEnvelope = StringUtils.decode(plaintext, 'base64'); const data: UnprocessedParameter = { @@ -70,15 +78,16 @@ async function increaseAttemptsOrRemove( ); } -export async function getAllFromCache() { - window?.log?.info('getAllFromCache'); +async function getAllFromCache() { const items = await fetchAllFromCache(); - window?.log?.info('getAllFromCache loaded', items.length, 'saved envelopes'); + if (items.length) { + window?.log?.info('getAllFromCache loaded', items.length, 'saved envelopes'); + } return increaseAttemptsOrRemove(items); } -export async function getAllFromCacheForSource(source: string) { +async function getAllFromCacheForSource(source: string) { const items = await fetchAllFromCache(); // keep items without source too (for old message already added to the cache) @@ -91,10 +100,15 @@ export async function getAllFromCacheForSource(source: string) { return increaseAttemptsOrRemove(itemsFromSource); } -export async function updateCacheWithDecryptedContent( - envelope: Pick, - plaintext: ArrayBuffer -): Promise { +async function updateCacheWithDecryptedContent({ + envelope, + decryptedContent, +}: { + envelope: Pick; + decryptedContent: ArrayBuffer; +}): Promise { + assertNon03Group(envelope); + const { id, senderIdentity, source } = envelope; const item = await Data.getUnprocessedById(id); if (!item) { @@ -111,7 +125,20 @@ export async function updateCacheWithDecryptedContent( item.senderIdentity = senderIdentity; } - item.decrypted = StringUtils.decode(plaintext, 'base64'); + item.decrypted = StringUtils.decode(decryptedContent, 'base64'); await Data.updateUnprocessedWithData(item.id, item); } + +async function forceEmptyCache() { + await Data.removeAllUnprocessed(); +} + +export const IncomingMessageCache = { + removeFromCache, + addToCache, + updateCacheWithDecryptedContent, + getAllFromCacheForSource, + getAllFromCache, + forceEmptyCache, +}; diff --git a/ts/receiver/callMessage.ts b/ts/receiver/callMessage.ts index a2bf6e2938..2378bdf1ef 100644 --- a/ts/receiver/callMessage.ts +++ b/ts/receiver/callMessage.ts @@ -3,7 +3,7 @@ import { SignalService } from '../protobuf'; import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { TTL_DEFAULT } from '../session/constants'; import { CallManager, UserUtils } from '../session/utils'; -import { removeFromCache } from './cache'; +import { IncomingMessageCache } from './cache'; import { EnvelopePlus } from './types'; export async function handleCallMessage( @@ -23,26 +23,26 @@ export async function handleCallMessage( callMessage.type !== SignalService.CallMessage.Type.END_CALL ) { window.log.info('Dropping incoming call from ourself'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } if (CallManager.isCallRejected(callMessage.uuid)) { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); window.log.info(`Dropping already rejected call from this device ${callMessage.uuid}`); return; } if (type === SignalService.CallMessage.Type.PROVISIONAL_ANSWER) { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); window.log.info('Skipping callMessage PROVISIONAL_ANSWER'); return; } if (type === SignalService.CallMessage.Type.PRE_OFFER) { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); window.log.info('Skipping callMessage PRE_OFFER'); return; @@ -53,11 +53,11 @@ export async function handleCallMessage( Math.max(sentTimestamp - GetNetworkTime.getNowWithNetworkOffset()) > TTL_DEFAULT.CALL_MESSAGE ) { window?.log?.info('Dropping incoming OFFER callMessage sent a while ago: ', sentTimestamp); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); await CallManager.handleCallTypeOffer(sender, callMessage, sentTimestamp); @@ -65,7 +65,7 @@ export async function handleCallMessage( } if (type === SignalService.CallMessage.Type.END_CALL) { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); await CallManager.handleCallTypeEndCall(sender, callMessage.uuid); @@ -73,20 +73,20 @@ export async function handleCallMessage( } if (type === SignalService.CallMessage.Type.ANSWER) { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); await CallManager.handleCallTypeAnswer(sender, callMessage, sentTimestamp); return; } if (type === SignalService.CallMessage.Type.ICE_CANDIDATES) { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); await CallManager.handleCallTypeIceCandidates(sender, callMessage, sentTimestamp); return; } - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); // if this another type of call message, just add it to the manager await CallManager.handleOtherCallTypes(sender, callMessage, sentTimestamp); diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index d94ca77994..c09ccd08b1 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -1,14 +1,12 @@ -import _, { isNumber, toNumber } from 'lodash'; +import _, { isEmpty, isNumber, toNumber } from 'lodash'; import { Data } from '../data/data'; import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; import { ConvoHub } from '../session/conversations'; -import * as ClosedGroup from '../session/group/closed-group'; import { PubKey } from '../session/types'; import { toHex } from '../session/utils/String'; import { BlockedNumberController } from '../util'; -import { removeFromCache } from './cache'; import { decryptWithSessionProtocol } from './contentMessage'; import { EnvelopePlus } from './types'; @@ -22,7 +20,9 @@ import { perfEnd, perfStart } from '../session/utils/Performance'; import { ReleasedFeatures } from '../util/releaseFeature'; import { Storage } from '../util/storage'; // eslint-disable-next-line import/no-unresolved, import/extensions +import { ClosedGroup, GroupDiff, GroupInfo } from '../session/group/closed-group'; import { ConfigWrapperUser } from '../webworker/workers/browser/libsession_worker_functions'; +import { IncomingMessageCache } from './cache'; import { getSettingsKeyFromLibsessionWrapper } from './configMessage'; import { ECKeyPair, HexKeyPair } from './keypairs'; import { queueAllCachedFromSource } from './receiver'; @@ -87,17 +87,17 @@ export async function handleLegacyClosedGroupControlMessage( }` ); - if (PubKey.isClosedGroupV2(envelope.source)) { + if (PubKey.is03Pubkey(envelope.source)) { window?.log?.warn( 'Message ignored; closed group v3 updates cannot come from SignalService.DataMessage.ClosedGroupControlMessage ' ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } if (BlockedNumberController.isBlocked(PubKey.cast(envelope.source))) { window?.log?.warn('Message ignored; destined for blocked group'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -135,7 +135,7 @@ export async function handleLegacyClosedGroupControlMessage( } window?.log?.error('Unknown group update type: ', type); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } function sanityCheckNewGroup( @@ -168,7 +168,7 @@ function sanityCheckNewGroup( return false; } - if (PubKey.isClosedGroupV2(hexGroupPublicKey)) { + if (PubKey.is03Pubkey(hexGroupPublicKey)) { window?.log?.warn('sanityCheckNewGroup: got a v3 new group as a ClosedGroupControlMessage. '); return false; } @@ -244,7 +244,7 @@ export async function sentAtMoreRecentThanWrapper( } export async function handleNewClosedGroup( - envelope: EnvelopePlus, + envelope: Omit, groupUpdate: SignalService.DataMessage.ClosedGroupControlMessage, fromLegacyConfig: boolean ) { @@ -253,14 +253,14 @@ export async function handleNewClosedGroup( } if (!sanityCheckNewGroup(groupUpdate)) { window?.log?.warn('Sanity check for newGroup failed, dropping the message...'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } const ourNumber = UserUtils.getOurPubKeyFromCache(); if (envelope.senderIdentity === ourNumber.key) { window?.log?.warn('Dropping new closed group updatemessage from our other device.'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -287,7 +287,7 @@ export async function handleNewClosedGroup( // not from legacy config, so this is a new closed group deposited on our swarm by a user. // we do not want to process it if our wrapper is more recent that that invite to group envelope. window.log.info('dropping invite to legacy group because our wrapper is more recent'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -295,7 +295,7 @@ export async function handleNewClosedGroup( window?.log?.info( 'Got a new group message but apparently we are not a member of it. Dropping it.' ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } const groupConvo = ConvoHub.use().get(groupId); @@ -317,12 +317,12 @@ export async function handleNewClosedGroup( if (isKeyPairAlreadyHere) { window.log.info('Dropping already saved keypair for group', groupId); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } window.log.info(`Received the encryptionKeyPair for new group ${groupId}`); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); window.log.warn( 'Closed group message of type NEW: the conversation already exists, but we saved the new encryption keypair' ); @@ -348,7 +348,7 @@ export async function handleNewClosedGroup( // we don't want the initial "AAA,BBB and You joined the group" // We only set group admins on group creation - const groupDetails: ClosedGroup.GroupInfo = { + const groupDetails: GroupInfo = { id: groupId, name, members, @@ -378,7 +378,7 @@ export async function handleNewClosedGroup( // start polling for this new group getSwarmPollingInstance().addGroupId(PubKey.cast(groupId)); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); // trigger decrypting of all this group messages we did not decrypt successfully yet. await queueAllCachedFromSource(groupId); } @@ -411,7 +411,7 @@ async function handleClosedGroupEncryptionKeyPair( if (!ourKeyPair) { window?.log?.warn("Couldn't find user X25519 key pair."); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -420,21 +420,21 @@ async function handleClosedGroupEncryptionKeyPair( window?.log?.warn( `Ignoring closed group encryption key pair for nonexistent group. ${groupPublicKey}` ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } if (!groupConvo.isClosedGroup()) { window?.log?.warn( `Ignoring closed group encryption key pair for nonexistent medium group. ${groupPublicKey}` ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } if (!groupConvo.getGroupAdmins().includes(sender)) { window?.log?.warn( `Ignoring closed group encryption key pair from non-admin. ${groupPublicKey}` ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -444,27 +444,27 @@ async function handleClosedGroupEncryptionKeyPair( window?.log?.warn( `Couldn't find our wrapper in the encryption keypairs wrappers for group ${groupPublicKey}` ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } let plaintext: Uint8Array; try { perfStart(`encryptionKeyPair-${envelope.id}`); - const buffer = await decryptWithSessionProtocol( + const decryptedSessionProtocol = await decryptWithSessionProtocol( envelope, ourWrapper.encryptedKeyPair, ECKeyPair.fromKeyPair(ourKeyPair) ); perfEnd(`encryptionKeyPair-${envelope.id}`, 'encryptionKeyPair'); - if (!buffer || buffer.byteLength === 0) { - throw new Error(); + if (!decryptedSessionProtocol || isEmpty(decryptedSessionProtocol.decryptedContent)) { + throw new Error('decryptedSessionProtocol.decryptedContent is empty'); } - plaintext = new Uint8Array(buffer); + plaintext = new Uint8Array(decryptedSessionProtocol.decryptedContent); } catch (e) { window?.log?.warn("Couldn't decrypt closed group encryption key pair.", e); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -477,7 +477,7 @@ async function handleClosedGroupEncryptionKeyPair( } } catch (e) { window?.log?.warn("Couldn't parse closed group encryption key pair."); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -486,7 +486,7 @@ async function handleClosedGroupEncryptionKeyPair( keyPair = new ECKeyPair(proto.publicKey, proto.privateKey); } catch (e) { window?.log?.warn("Couldn't parse closed group encryption key pair."); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } window?.log?.info(`Received a new encryptionKeyPair for group ${groupPublicKey}`); @@ -501,11 +501,11 @@ async function handleClosedGroupEncryptionKeyPair( if (isKeyPairAlreadyHere) { window?.log?.info('Dropping already saved keypair for group', groupPublicKey); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } window?.log?.info('Got a new encryption keypair for group', groupPublicKey); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); // trigger decrypting of all this group messages we did not decrypt successfully yet. await queueAllCachedFromSource(groupPublicKey); } @@ -519,24 +519,24 @@ async function performIfValid( const groupPublicKey = envelope.source; const sender = envelope.senderIdentity; - if (PubKey.isClosedGroupV2(groupPublicKey)) { + if (PubKey.is03Pubkey(groupPublicKey)) { window?.log?.warn( 'Message ignored; closed group v3 updates cannot come from SignalService.DataMessage.ClosedGroupControlMessage ' ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } const convo = ConvoHub.use().get(groupPublicKey); if (!convo) { window?.log?.warn('dropping message for nonexistent group'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } if (!convo) { window?.log?.warn('Ignoring a closed group update message (INFO) for a non-existing group'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -556,7 +556,7 @@ async function performIfValid( window?.log?.warn( 'Got a group update with an older timestamp than when we joined this group last time. Dropping it.' ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -566,7 +566,7 @@ async function performIfValid( window?.log?.error( `Error: closed group: ignoring closed group update message from non-member. ${sender} is not a current member.` ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } // make sure the conversation with this user exist (even if it's just hidden) @@ -584,7 +584,7 @@ async function performIfValid( } else if (groupUpdate.type === Type.MEMBER_LEFT) { await handleClosedGroupMemberLeft(envelope, convo, shouldNotApplyGroupChange); } else if (groupUpdate.type === Type.ENCRYPTION_KEY_PAIR_REQUEST) { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } // if you add a case here, remember to add it where performIfValid is called too. } @@ -600,7 +600,7 @@ async function handleClosedGroupNameChanged( window?.log?.info(`Got a group update for group ${envelope.source}, type: NAME_CHANGED`); if (newName !== convo.getRealSessionUsername()) { - const groupDiff: ClosedGroup.GroupDiff = { + const groupDiff: GroupDiff = { newName, }; await ClosedGroup.addUpdateMessage( @@ -616,7 +616,7 @@ async function handleClosedGroupNameChanged( await convo.commit(); } - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } async function handleClosedGroupMembersAdded( @@ -641,7 +641,7 @@ async function handleClosedGroupMembersAdded( // this is just to make sure that the zombie list got written to the db. // if a member adds a member we have as a zombie, we consider that this member is not a zombie anymore await convo.commit(); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -657,7 +657,7 @@ async function handleClosedGroupMembersAdded( members.map(async m => ConvoHub.use().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE)) ); - const groupDiff: ClosedGroup.GroupDiff = { + const groupDiff: GroupDiff = { joiningMembers: membersNotAlreadyPresent, }; await ClosedGroup.addUpdateMessage( @@ -673,7 +673,7 @@ async function handleClosedGroupMembersAdded( convo.updateLastMessage(); await convo.commit(); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } async function areWeAdmin(groupConvo: ConversationModel) { @@ -692,6 +692,9 @@ async function handleClosedGroupMembersRemoved( convo: ConversationModel, shouldOnlyAddUpdateMessage: boolean // set this to true to not apply the change to the convo itself, just add the update in the conversation ) { + if (convo.isClosedGroupV2()) { + throw new Error('legacy group method called with 03 group'); + } // Check that the admin wasn't removed const currentMembers = convo.getGroupMembers(); // removedMembers are all members in the diff @@ -711,14 +714,14 @@ async function handleClosedGroupMembersRemoved( if (removedMembers.includes(firstAdmin)) { window?.log?.warn('Ignoring invalid closed group update: trying to remove the admin.'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); throw new Error('Admins cannot be removed. They can only leave'); } // The MEMBERS_REMOVED message type can only come from an admin. if (!groupAdmins.includes(envelope.senderIdentity)) { window?.log?.warn('Ignoring invalid closed group update. Only admins can remove members.'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); throw new Error('Only admins can remove members.'); } @@ -739,7 +742,7 @@ async function handleClosedGroupMembersRemoved( // Only add update message if we have something to show if (membersAfterUpdate.length !== currentMembers.length) { - const groupDiff: ClosedGroup.GroupDiff = { + const groupDiff: GroupDiff = { kickedMembers: effectivelyRemovedMembers, }; await ClosedGroup.addUpdateMessage( @@ -760,7 +763,7 @@ async function handleClosedGroupMembersRemoved( } await convo.commit(); } - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } function isUserAZombie(convo: ConversationModel, user: PubKey) { @@ -815,7 +818,7 @@ async function handleClosedGroupAdminMemberLeft(groupPublicKey: string, envelope fromSyncMessage: false, sendLeaveMessage: false, }); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } async function handleClosedGroupLeftOurself(groupId: string, envelope: EnvelopePlus) { @@ -824,7 +827,7 @@ async function handleClosedGroupLeftOurself(groupId: string, envelope: EnvelopeP fromSyncMessage: false, sendLeaveMessage: false, }); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } async function handleClosedGroupMemberLeft( @@ -862,7 +865,7 @@ async function handleClosedGroupMemberLeft( // Another member left, not us, not the admin, just another member. // But this member was in the list of members (as performIfValid checks for that) - const groupDiff: ClosedGroup.GroupDiff = { + const groupDiff: GroupDiff = { leavingMembers: [sender], }; @@ -883,7 +886,7 @@ async function handleClosedGroupMemberLeft( await convo.commit(); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } async function sendLatestKeyPairToUsers( diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 9495dcaf61..58a83d25bf 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -6,7 +6,6 @@ import { ConfigDumpData } from '../data/configDump/configDump'; import { SettingsKey } from '../data/settings-key'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../interactions/conversationInteractions'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../models/conversationAttributes'; -import { ClosedGroup } from '../session'; import { getOpenGroupManager } from '../session/apis/open_group_api/opengroupV2/OpenGroupManagerV2'; import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; import { getOpenGroupV2ConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils'; @@ -34,6 +33,7 @@ import { UserConfigNamespaces, } from '../session/apis/snode_api/namespaces'; import { RetrieveMessageItemWithNamespace } from '../session/apis/snode_api/types'; +import { ClosedGroup, GroupInfo } from '../session/group/closed-group'; import { groupInfoActions } from '../state/ducks/groups'; import { ConfigWrapperObjectTypesMeta, @@ -555,7 +555,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { const activeAt = legacyGroupConvo.getActiveAt(); // then for all the existing legacy group in the wrapper, we need to override the field of what we have in the DB with what is in the wrapper // We only set group admins on group creation - const groupDetails: ClosedGroup.GroupInfo = { + const groupDetails: GroupInfo = { id: fromWrapper.pubkeyHex, name: fromWrapper.name, members, @@ -682,7 +682,7 @@ async function handleGroupUpdate(latestEnvelopeTimestamp: number) { const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); const allGroupsInDb = ConvoHub.use() .getConversations() - .filter(m => PubKey.isClosedGroupV2(m.id)); + .filter(m => PubKey.is03Pubkey(m.id)); const allGoupsIdsInWrapper = allGroupsInWrapper.map(m => m.pubkeyHex); const allGoupsIdsInDb = allGroupsInDb.map(m => m.id as string); diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 1cfa8b27ac..be56c56afe 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -5,7 +5,7 @@ import { EnvelopePlus } from './types'; import { SignalService } from '../protobuf'; import { KeyPrefixType, PubKey } from '../session/types'; -import { removeFromCache, updateCacheWithDecryptedContent } from './cache'; +import { IncomingMessageCache } from './cache'; import { Data } from '../data/data'; import { SettingsKey } from '../data/settings-key'; @@ -38,24 +38,31 @@ import { ECKeyPair } from './keypairs'; export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageHash: string) { try { - const plaintext = await decrypt(envelope); + console.warn('444 envelope.source', envelope.source); + console.warn('444 envelope.senderIdentity', envelope.senderIdentity); + const decryptedForAll = await decrypt(envelope); - if (!plaintext) { - return; - } - if (plaintext instanceof ArrayBuffer && plaintext.byteLength === 0) { + if (!decryptedForAll || !decryptedForAll.decryptedContent || isEmpty(decryptedForAll)) { return; } + const sentAtTimestamp = toNumber(envelope.timestamp); // swarm messages already comes with a timestamp in milliseconds, so this sentAtTimestamp is correct. // the sogs messages do not come as milliseconds but just seconds, so we override it - await innerHandleSwarmContentMessage(envelope, sentAtTimestamp, plaintext, messageHash); + await innerHandleSwarmContentMessage({ + envelope, + sentAtTimestamp, + contentDecrypted: decryptedForAll.decryptedContent, + messageHash, + }); } catch (e) { window?.log?.warn(e.message); } } -async function decryptForClosedGroup(envelope: EnvelopePlus) { +async function decryptForClosedGroup( + envelope: EnvelopePlus +): Promise<{ decryptedContent: ArrayBuffer }> { window?.log?.info('received closed group message'); try { const hexEncodedGroupPublicKey = envelope.source; @@ -87,15 +94,17 @@ async function decryptForClosedGroup(envelope: EnvelopePlus) { const encryptionKeyPair = ECKeyPair.fromHexKeyPair(hexEncryptionKeyPair); // eslint-disable-next-line no-await-in-loop - decryptedContent = await decryptWithSessionProtocol( + const res = await decryptWithSessionProtocol( envelope, envelope.content, encryptionKeyPair, true ); - if (decryptedContent?.byteLength) { + if (res?.decryptedContent.byteLength) { break; } + decryptedContent = res.decryptedContent; + keyIndex++; } catch (e) { window?.log?.info( @@ -116,7 +125,8 @@ async function decryptForClosedGroup(envelope: EnvelopePlus) { } window?.log?.info('ClosedGroup Message decrypted successfully with keyIndex:', keyIndex); - return removeMessagePadding(decryptedContent); + const withoutPadding = removeMessagePadding(decryptedContent); + return { decryptedContent: withoutPadding }; } catch (e) { /** * If an error happened during the decoding, @@ -149,7 +159,7 @@ export async function decryptWithSessionProtocol( ciphertextObj: ArrayBuffer, x25519KeyPair: ECKeyPair, isClosedGroup?: boolean -): Promise { +): Promise<{ decryptedContent: ArrayBuffer }> { perfStart(`decryptWithSessionProtocol-${envelope.id}`); const recipientX25519PrivateKey = x25519KeyPair.privateKeyData; const hex = toHex(new Uint8Array(x25519KeyPair.publicKeyData)); @@ -211,7 +221,7 @@ export async function decryptWithSessionProtocol( } perfEnd(`decryptWithSessionProtocol-${envelope.id}`, 'decryptWithSessionProtocol'); - return plaintext; + return { decryptedContent: plaintext }; } /** @@ -235,17 +245,13 @@ export async function decryptEnvelopeWithOurKey( userX25519KeyPair.privKey ); - // keep the await so the try catch works as expected - perfStart(`decryptUnidentifiedSender-${envelope.id}`); - - const retSessionProtocol = await decryptWithSessionProtocol( + const { decryptedContent } = await decryptWithSessionProtocol( envelope, envelope.content, ecKeyPair ); - const ret = removeMessagePadding(retSessionProtocol); - perfEnd(`decryptUnidentifiedSender-${envelope.id}`, 'decryptUnidentifiedSender'); + const ret = removeMessagePadding(decryptedContent); return ret; } catch (e) { @@ -254,46 +260,50 @@ export async function decryptEnvelopeWithOurKey( } } -async function decrypt(envelope: EnvelopePlus): Promise { +async function decrypt(envelope: EnvelopePlus): Promise<{ decryptedContent: ArrayBuffer } | null> { if (envelope.content.byteLength === 0) { throw new Error('Received an empty envelope.'); } - let plaintext: ArrayBuffer | null = null; + let decryptedContent: ArrayBuffer | null = null; switch (envelope.type) { // Only SESSION_MESSAGE and CLOSED_GROUP_MESSAGE are supported case SignalService.Envelope.Type.SESSION_MESSAGE: - plaintext = await decryptEnvelopeWithOurKey(envelope); + decryptedContent = await decryptEnvelopeWithOurKey(envelope); break; case SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE: - if (PubKey.isClosedGroupV2(envelope.source)) { + if (PubKey.is03Pubkey(envelope.source)) { // groupv2 messages are decrypted way earlier than this via libsession, and what we get here is already decrypted - return envelope.content; + return { decryptedContent: envelope.content }; } - plaintext = await decryptForClosedGroup(envelope); + // eslint-disable-next-line no-case-declarations + const res = await decryptForClosedGroup(envelope); + decryptedContent = res.decryptedContent; break; default: assertUnreachable(envelope.type, `Unknown message type:${envelope.type}`); } - if (!plaintext) { + if (!decryptedContent) { // content could not be decrypted. - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return null; } perfStart(`updateCacheWithDecryptedContent-${envelope.id}`); - await updateCacheWithDecryptedContent(envelope, plaintext).catch((error: any) => { - window?.log?.error( - 'decrypt failed to save decrypted message contents to cache:', - error && error.stack ? error.stack : error - ); - }); + await IncomingMessageCache.updateCacheWithDecryptedContent({ envelope, decryptedContent }).catch( + error => { + window?.log?.error( + 'decrypt failed to save decrypted message contents to cache:', + error && error.stack ? error.stack : error + ); + } + ); perfEnd(`updateCacheWithDecryptedContent-${envelope.id}`, 'updateCacheWithDecryptedContent'); - return plaintext; + return { decryptedContent }; } async function shouldDropIncomingPrivateMessage( @@ -388,19 +398,21 @@ function shouldDropBlockedUserMessage( return !isControlDataMessageOnly; } -export async function innerHandleSwarmContentMessage( - envelope: EnvelopePlus, - sentAtTimestamp: number, - plaintext: ArrayBuffer, - messageHash: string -): Promise { +export async function innerHandleSwarmContentMessage({ + contentDecrypted, + envelope, + messageHash, + sentAtTimestamp, +}: { + envelope: EnvelopePlus; + sentAtTimestamp: number; + contentDecrypted: ArrayBuffer; + messageHash: string; +}): Promise { try { - perfStart(`SignalService.Content.decode-${envelope.id}`); window.log.info('innerHandleSwarmContentMessage'); - perfStart(`isBlocked-${envelope.id}`); - const content = SignalService.Content.decode(new Uint8Array(plaintext)); - perfEnd(`SignalService.Content.decode-${envelope.id}`, 'SignalService.Content.decode'); + const content = SignalService.Content.decode(new Uint8Array(contentDecrypted)); /** * senderIdentity is set ONLY if that message is a closed group message. @@ -412,7 +424,6 @@ export async function innerHandleSwarmContentMessage( */ const blocked = BlockedNumberController.isBlocked(envelope.senderIdentity || envelope.source); - perfEnd(`isBlocked-${envelope.id}`, 'isBlocked'); if (blocked) { const envelopeSource = envelope.source; // We want to allow a blocked user message if that's a control message for a known group and the group is not blocked @@ -429,7 +440,7 @@ export async function innerHandleSwarmContentMessage( if (isPrivateConversationMessage) { if (await shouldDropIncomingPrivateMessage(sentAtTimestamp, envelope, content)) { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } } @@ -457,7 +468,6 @@ export async function innerHandleSwarmContentMessage( if (isEmpty(content.dataMessage.profileKey)) { content.dataMessage.profileKey = null; } - perfStart(`handleSwarmDataMessage-${envelope.id}`); await handleSwarmDataMessage( envelope, sentAtTimestamp, @@ -465,7 +475,6 @@ export async function innerHandleSwarmContentMessage( messageHash, senderConversationModel ); - perfEnd(`handleSwarmDataMessage-${envelope.id}`, 'handleSwarmDataMessage'); return; } @@ -487,7 +496,7 @@ export async function innerHandleSwarmContentMessage( if (content.sharedConfigMessage) { window.log.warn('content.sharedConfigMessage are handled outside of the receiving pipeline'); // this should never happen, but remove it from cache just in case something is messed up - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } if (content.dataExtractionNotification) { @@ -521,7 +530,7 @@ export async function innerHandleSwarmContentMessage( // If we get here, we don't know how to handle that envelope. probably a very old type of message, or something we don't support. // There is not much we can do expect drop it - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } catch (e) { window?.log?.warn(e.message); } @@ -560,7 +569,7 @@ async function handleReceiptMessage( } await Promise.all(results); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } async function handleTypingMessage( @@ -570,7 +579,7 @@ async function handleTypingMessage( const { timestamp, action } = typingMessage; const { source } = envelope; - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); // We don't do anything with incoming typing messages if the setting is disabled if (!Storage.get(SettingsKey.settingsTypingIndicator)) { @@ -615,19 +624,19 @@ async function handleUnsendMessage(envelope: EnvelopePlus, unsendMessage: Signal window?.log?.error( 'handleUnsendMessage: Dropping request as the author and the sender differs.' ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } if (!unsendMessage) { window?.log?.error('handleUnsendMessage: Invalid parameters -- dropping message.'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } if (!timestamp) { window?.log?.error('handleUnsendMessage: Invalid timestamp -- dropping message'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -647,7 +656,7 @@ async function handleUnsendMessage(envelope: EnvelopePlus, unsendMessage: Signal window.log.info('handleUnsendMessage: got a request to delete ', messageHash); const conversation = ConvoHub.use().get(messageToDelete.get('conversationId')); if (!conversation) { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -665,7 +674,7 @@ async function handleUnsendMessage(envelope: EnvelopePlus, unsendMessage: Signal messageToDelete?.id ); } - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } /** @@ -677,12 +686,12 @@ async function handleMessageRequestResponse( ) { const { isApproved } = messageRequestResponse; if (!isApproved) { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } if (!messageRequestResponse) { window?.log?.error('handleMessageRequestResponse: Invalid parameters -- dropping message.'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -767,7 +776,7 @@ async function handleMessageRequestResponse( window?.log?.info( 'Conversation already contains the correct value for the didApproveMe field.' ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -779,7 +788,7 @@ async function handleMessageRequestResponse( unblindedConvoId ); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } /** @@ -795,7 +804,7 @@ export async function handleDataExtractionNotification( const { type, timestamp: referencedAttachment } = dataNotificationMessage; const { source, timestamp } = envelope; - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); const convo = ConvoHub.use().get(source); if (!convo || !convo.isPrivate() || !Storage.get(SettingsKey.settingsReadReceipt)) { diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index a64291a674..f80a691680 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -2,7 +2,7 @@ import { isEmpty, isFinite, noop, omit, toNumber } from 'lodash'; import { SignalService } from '../protobuf'; -import { removeFromCache } from './cache'; +import { IncomingMessageCache } from './cache'; import { getEnvelopeId } from './common'; import { EnvelopePlus } from './types'; @@ -39,19 +39,21 @@ function cleanAttachment(attachment: any) { }; } -function cleanAttachments(decrypted: SignalService.DataMessage) { - const { quote } = decrypted; +function cleanAttachments(decryptedDataMessage: SignalService.DataMessage) { + const { quote } = decryptedDataMessage; // Here we go from binary to string/base64 in all AttachmentPointer digest/key fields // we do not care about group on Session Desktop - decrypted.group = null; + decryptedDataMessage.group = null; // when receiving a message we get keys of attachment as buffer, but we override the data with the decrypted string instead. // TODO it would be nice to get rid of that as any here, but not in this PR - decrypted.attachments = (decrypted.attachments || []).map(cleanAttachment) as any; - decrypted.preview = (decrypted.preview || []).map((item: any) => { + decryptedDataMessage.attachments = (decryptedDataMessage.attachments || []).map( + cleanAttachment + ) as any; + decryptedDataMessage.preview = (decryptedDataMessage.preview || []).map((item: any) => { const { image } = item; if (!image) { @@ -166,10 +168,12 @@ export async function handleSwarmDataMessage( await GroupV2Receiver.handleGroupUpdateMessage({ envelopeTimestamp: sentAtTimestamp, updateMessage: rawDataMessage.groupUpdateMessage as SignalService.GroupUpdateMessage, + source: envelope.source, + senderIdentity: envelope.senderIdentity, }); // Groups update should always be able to be decrypted as we get the keys before trying to decrypt them. // If decryption failed once, it will keep failing, so no need to keep it in the cache. - await removeFromCache({ id: envelope.id }); + await IncomingMessageCache.removeFromCache({ id: envelope.id }); return; } // we handle legacy group updates from our other devices in handleLegacyClosedGroupControlMessage() @@ -198,7 +202,7 @@ export async function handleSwarmDataMessage( if (isSyncedMessage && !isMe) { window?.log?.warn('Got a sync message from someone else than me. Dropping it.'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } const convoIdToAddTheMessageTo = PubKey.removeTextSecurePrefixIfNeeded( @@ -206,7 +210,7 @@ export async function handleSwarmDataMessage( ); const isGroupMessage = !!envelope.senderIdentity; - const isGroupV2Message = isGroupMessage && PubKey.isClosedGroupV2(envelope.source); + const isGroupV2Message = isGroupMessage && PubKey.is03Pubkey(envelope.source); let typeOfConvo = ConversationTypeEnum.PRIVATE; if (isGroupV2Message) { typeOfConvo = ConversationTypeEnum.GROUPV2; @@ -241,13 +245,13 @@ export async function handleSwarmDataMessage( if (!messageHasVisibleContent(cleanDataMessage)) { window?.log?.warn(`Message ${getEnvelopeId(envelope)} ignored; it was empty`); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } if (!convoIdToAddTheMessageTo) { window?.log?.error('We cannot handle a message without a conversationId'); - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); return; } @@ -272,7 +276,7 @@ export async function handleSwarmDataMessage( cleanDataMessage, convoToAddMessageTo, // eslint-disable-next-line @typescript-eslint/no-misused-promises - () => removeFromCache(envelope) + () => IncomingMessageCache.removeFromCache(envelope) ); } diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 20c4fb03fd..e857cc3c00 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -1,9 +1,12 @@ +import { PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { ConvoHub } from '../../session/conversations'; +import { ClosedGroup } from '../../session/group/closed-group'; +import { ed25519Str } from '../../session/onions/onionPath'; import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; @@ -14,20 +17,40 @@ import { } from '../../webworker/workers/browser/libsession_worker_interface'; type WithEnvelopeTimestamp = { envelopeTimestamp: number }; +type WithAuthor = { author: PubkeyType }; + +type WithUncheckedSource = { source: string }; +type WithUncheckedSenderIdentity = { senderIdentity: string }; type GroupInviteDetails = { inviteMessage: SignalService.GroupUpdateInviteMessage; -} & WithEnvelopeTimestamp; +} & WithEnvelopeTimestamp & + WithAuthor; + +type GroupMemberChangeDetails = { + memberChangeDetails: SignalService.GroupUpdateMemberChangeMessage; +} & WithEnvelopeTimestamp & + WithGroupPubkey & + WithAuthor; type GroupUpdateDetails = { updateMessage: SignalService.GroupUpdateMessage; } & WithEnvelopeTimestamp; -async function handleGroupInviteMessage({ inviteMessage, envelopeTimestamp }: GroupInviteDetails) { - if (!PubKey.isClosedGroupV2(inviteMessage.groupSessionId)) { +async function handleGroupInviteMessage({ + inviteMessage, + author, + envelopeTimestamp, +}: GroupInviteDetails) { + if (!PubKey.is03Pubkey(inviteMessage.groupSessionId)) { // invite to a group which has not a 03 prefix, we can just drop it. return; } + window.log.debug( + `received invite to group ${ed25519Str(inviteMessage.groupSessionId)} by user:${ed25519Str( + author + )}` + ); // TODO verify sig invite adminSignature const convo = await ConvoHub.use().getOrCreateAndWait( inviteMessage.groupSessionId, @@ -77,11 +100,92 @@ async function handleGroupInviteMessage({ inviteMessage, envelopeTimestamp }: Gr getSwarmPollingInstance().addGroupId(inviteMessage.groupSessionId); } -async function handleGroupUpdateMessage(args: GroupUpdateDetails) { - if (args.updateMessage.inviteMessage) { +async function handleGroupMemberChangeMessage({ + memberChangeDetails, + groupPk, + envelopeTimestamp, + author, +}: GroupMemberChangeDetails) { + if (!PubKey.is03Pubkey(groupPk)) { + // invite to a group which has not a 03 prefix, we can just drop it. + return; + } + // TODO verify sig invite adminSignature + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + return; + } + + switch (memberChangeDetails.type) { + case SignalService.GroupUpdateMemberChangeMessage.Type.ADDED: { + await ClosedGroup.addUpdateMessage( + convo, + { joiningMembers: memberChangeDetails.memberSessionIds }, + author, + envelopeTimestamp + ); + + break; + } + case SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED: { + await ClosedGroup.addUpdateMessage( + convo, + { kickedMembers: memberChangeDetails.memberSessionIds }, + author, + envelopeTimestamp + ); + break; + } + case SignalService.GroupUpdateMemberChangeMessage.Type.PROMOTED: { + await ClosedGroup.addUpdateMessage( + convo, + { promotedMembers: memberChangeDetails.memberSessionIds }, + author, + envelopeTimestamp + ); + break; + } + default: + return; + } + + convo.set({ + active_at: envelopeTimestamp, + didApproveMe: true, + }); +} + +async function handleGroupUpdateMessage( + details: GroupUpdateDetails & WithUncheckedSource & WithUncheckedSenderIdentity +) { + if (details.updateMessage.inviteMessage) { + // the invite message is received from our own swarm, so source is the sender, and senderIdentity is empty + const author = details.source; + if (!PubKey.is05Pubkey(author)) { + window.log.warn('received group inviteMessage with invalid author'); + return; + } await handleGroupInviteMessage({ - inviteMessage: args.updateMessage.inviteMessage as SignalService.GroupUpdateInviteMessage, - ...args, + inviteMessage: details.updateMessage.inviteMessage as SignalService.GroupUpdateInviteMessage, + ...details, + author, + }); + return; + } + // other messages are received from the groups swarm, so source is the groupPk, and senderIdentity is the author + const author = details.senderIdentity; + const groupPk = details.source; + if (!PubKey.is05Pubkey(author) || !PubKey.is03Pubkey(groupPk)) { + window.log.warn('received group update message with invalid author or groupPk'); + return; + } + if (details.updateMessage.memberChangeMessage) { + await handleGroupMemberChangeMessage({ + memberChangeDetails: details.updateMessage + .memberChangeMessage as SignalService.GroupUpdateMemberChangeMessage, + ...details, + author, + groupPk, }); return; } diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts index 4a6040de8e..8040dd9ad2 100644 --- a/ts/receiver/receiver.ts +++ b/ts/receiver/receiver.ts @@ -4,15 +4,18 @@ import { v4 as uuidv4 } from 'uuid'; import { EnvelopePlus } from './types'; -import { addToCache, getAllFromCache, getAllFromCacheForSource, removeFromCache } from './cache'; +import { IncomingMessageCache } from './cache'; // innerHandleSwarmContentMessage is only needed because of code duplication in handleDecryptedEnvelope... import { handleSwarmContentMessage, innerHandleSwarmContentMessage } from './contentMessage'; import { Data } from '../data/data'; import { SignalService } from '../protobuf'; +import { DURATION } from '../session/constants'; +import { PubKey } from '../session/types'; import { StringUtils, UserUtils } from '../session/utils'; import { perfEnd, perfStart } from '../session/utils/Performance'; +import { sleepFor } from '../session/utils/Promise'; import { createTaskWithTimeout } from '../session/utils/TaskWithTimeout'; import { UnprocessedParameter } from '../types/sqlSharedTypes'; import { getEnvelopeId } from './common'; @@ -21,13 +24,58 @@ export { downloadAttachment } from './attachments'; const incomingMessagePromises: Array> = []; +export async function handleSwarmContentDecryptedWithTimeout({ + envelope, + messageHash, + sentAtTimestamp, + contentDecrypted, +}: { + envelope: EnvelopePlus; + messageHash: string; + sentAtTimestamp: number; + contentDecrypted: ArrayBuffer; +}) { + let taskDone = false; + return Promise.race([ + (async () => { + await sleepFor(1 * DURATION.MINUTES); // 1 minute expiry per message seems more than enough + if (taskDone) { + return; + } + window.log.error( + 'handleSwarmContentDecryptedWithTimeout timer expired for envelope ', + envelope.id + ); + await IncomingMessageCache.removeFromCache(envelope); + })(), + (async () => { + try { + await innerHandleSwarmContentMessage({ + envelope, + messageHash, + contentDecrypted, + sentAtTimestamp, + }); + await IncomingMessageCache.removeFromCache(envelope); + } catch (e) { + window.log.error( + 'handleSwarmContentDecryptedWithTimeout task failed with ', + e.message, + envelope.id + ); + } finally { + taskDone = true; + } + })(), + ]); +} + async function handleSwarmEnvelope(envelope: EnvelopePlus, messageHash: string) { - if (envelope.content && envelope.content.length > 0) { - return handleSwarmContentMessage(envelope, messageHash); + if (isEmpty(envelope.content)) { + await IncomingMessageCache.removeFromCache(envelope); + throw new Error('Received message with no content'); } - - await removeFromCache(envelope); - throw new Error('Received message with no content'); + return handleSwarmContentMessage(envelope, messageHash); } class EnvelopeQueue { @@ -97,7 +145,9 @@ async function handleRequestDetail( // eslint-disable-next-line no-param-reassign data = SignalService.Envelope.encode(envelope).finish(); - envelope.senderIdentity = senderIdentity; + if (!PubKey.is03Pubkey(senderIdentity)) { + envelope.senderIdentity = senderIdentity; + } } envelope.id = uuidv4(); @@ -110,7 +160,11 @@ async function handleRequestDetail( // need to handle senderIdentity separately)... perfStart(`addToCache-${envelope.id}`); - await addToCache(envelope, contentIsEnvelope(data) ? data.content : data, messageHash); + await IncomingMessageCache.addToCache( + envelope, + contentIsEnvelope(data) ? data.content : data, + messageHash + ); perfEnd(`addToCache-${envelope.id}`, 'addToCache'); // To ensure that we queue in the same order we receive messages @@ -130,7 +184,7 @@ async function handleRequestDetail( * @param inConversation if the request is related to a group, this will be set to the group pubkey. Otherwise, it is set to null */ export function handleRequest( - plaintext: Uint8Array, + plaintext: EnvelopePlus | Uint8Array, inConversation: string | null, messageHash: string ): void { @@ -149,7 +203,7 @@ export function handleRequest( * Used in main_renderer.js */ export async function queueAllCached() { - const items = await getAllFromCache(); + const items = await IncomingMessageCache.getAllFromCache(); await items.reduce(async (promise, item) => { await promise; @@ -158,7 +212,7 @@ export async function queueAllCached() { } export async function queueAllCachedFromSource(source: string) { - const items = await getAllFromCacheForSource(source); + const items = await IncomingMessageCache.getAllFromCacheForSource(source); // queue all cached for this source, but keep the order await items.reduce(async (promise, item) => { @@ -179,12 +233,13 @@ async function queueCached(item: UnprocessedParameter) { // Why do we need to do this??? envelope.senderIdentity = envelope.senderIdentity || item.senderIdentity; - const { decrypted } = item; + // decrypted must be a decryptedContent here (SignalService.Content.parse will be called with it in the pipeline) + const { decrypted: decryptedContentB64 } = item; - if (decrypted) { - const payloadPlaintext = StringUtils.encode(decrypted, 'base64'); + if (decryptedContentB64) { + const contentDecrypted = StringUtils.encode(decryptedContentB64, 'base64'); - queueDecryptedEnvelope(envelope, payloadPlaintext, envelope.messageHash); + queueDecryptedEnvelope({ envelope, contentDecrypted, messageHash: envelope.messageHash }); } else { queueSwarmEnvelope(envelope, envelope.messageHash); } @@ -209,11 +264,19 @@ async function queueCached(item: UnprocessedParameter) { } } -function queueDecryptedEnvelope(envelope: any, plaintext: ArrayBuffer, messageHash: string) { +function queueDecryptedEnvelope({ + contentDecrypted, + envelope, + messageHash, +}: { + envelope: any; + contentDecrypted: ArrayBuffer; + messageHash: string; +}) { const id = getEnvelopeId(envelope); window?.log?.info('queueing decrypted envelope', id); - const task = handleDecryptedEnvelope.bind(null, envelope, plaintext, messageHash); + const task = handleDecryptedEnvelope.bind(null, { envelope, contentDecrypted, messageHash }); const taskWithTimeout = createTaskWithTimeout(task, `queueEncryptedEnvelope ${id}`); try { envelopeQueue.add(taskWithTimeout); @@ -225,16 +288,25 @@ function queueDecryptedEnvelope(envelope: any, plaintext: ArrayBuffer, messageHa } } -async function handleDecryptedEnvelope( - envelope: EnvelopePlus, - plaintext: ArrayBuffer, - messageHash: string -) { +async function handleDecryptedEnvelope({ + envelope, + messageHash, + contentDecrypted, +}: { + envelope: EnvelopePlus; + contentDecrypted: ArrayBuffer; + messageHash: string; +}) { if (envelope.content) { const sentAtTimestamp = _.toNumber(envelope.timestamp); - await innerHandleSwarmContentMessage(envelope, sentAtTimestamp, plaintext, messageHash); + await innerHandleSwarmContentMessage({ + envelope, + sentAtTimestamp, + contentDecrypted, + messageHash, + }); } else { - await removeFromCache(envelope); + await IncomingMessageCache.removeFromCache(envelope); } } diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts index e117b3d294..7f412259f0 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts @@ -1,24 +1,22 @@ /* eslint-disable no-restricted-syntax */ /* eslint-disable no-await-in-loop */ -import { compact, isArray, isEmpty, isFinite, isNumber, isObject, pick } from 'lodash'; import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo'; +import { compact, isArray, isEmpty, isFinite, isNumber, isObject, pick } from 'lodash'; import { v4 } from 'uuid'; import { OpenGroupData } from '../../../../data/opengroups'; +import { ConversationModel } from '../../../../models/conversation'; import { handleOpenGroupV4Message } from '../../../../receiver/opengroup'; +import { callUtilsWorker } from '../../../../webworker/workers/browser/util_worker_interface'; +import { ConvoHub } from '../../../conversations'; +import { PubKey } from '../../../types'; import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil'; -import { BatchSogsReponse, OpenGroupBatchRow, SubRequestMessagesType } from './sogsV3BatchPoll'; import { - getRoomAndUpdateLastFetchTimestamp, OpenGroupMessageV4, + getRoomAndUpdateLastFetchTimestamp, } from '../opengroupV2/OpenGroupServerPoller'; -import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils'; -import { handleCapabilities } from './sogsCapabilities'; -import { ConvoHub } from '../../../conversations'; -import { ConversationModel } from '../../../../models/conversation'; import { filterDuplicatesFromDbAndIncomingV4 } from '../opengroupV2/SogsFilterDuplicate'; -import { callUtilsWorker } from '../../../../webworker/workers/browser/util_worker_interface'; -import { PubKey } from '../../../types'; +import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils'; import { addCachedBlindedKey, findCachedBlindedMatchOrLookItUp, @@ -27,21 +25,23 @@ import { tryMatchBlindWithStandardKey, } from './knownBlindedkeys'; import { SogsBlinding } from './sogsBlinding'; +import { handleCapabilities } from './sogsCapabilities'; +import { BatchSogsReponse, OpenGroupBatchRow, SubRequestMessagesType } from './sogsV3BatchPoll'; -import { UserUtils } from '../../../utils'; -import { innerHandleSwarmContentMessage } from '../../../../receiver/contentMessage'; -import { EnvelopePlus } from '../../../../receiver/types'; -import { SignalService } from '../../../../protobuf'; -import { removeMessagePadding } from '../../../crypto/BufferPadding'; -import { getSodiumRenderer } from '../../../crypto'; -import { handleOutboxMessageModel } from '../../../../receiver/dataMessage'; +import { Data } from '../../../../data/data'; import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; import { createSwarmMessageSentFromUs } from '../../../../models/messageFactory'; -import { Data } from '../../../../data/data'; -import { processMessagesUsingCache } from './sogsV3MutationCache'; +import { SignalService } from '../../../../protobuf'; +import { innerHandleSwarmContentMessage } from '../../../../receiver/contentMessage'; +import { handleOutboxMessageModel } from '../../../../receiver/dataMessage'; +import { EnvelopePlus } from '../../../../receiver/types'; +import { assertUnreachable } from '../../../../types/sqlSharedTypes'; import { destroyMessagesAndUpdateRedux } from '../../../../util/expiringMessages'; +import { getSodiumRenderer } from '../../../crypto'; +import { removeMessagePadding } from '../../../crypto/BufferPadding'; +import { UserUtils } from '../../../utils'; import { sogsRollingDeletions } from './sogsRollingDeletions'; -import { assertUnreachable } from '../../../../types/sqlSharedTypes'; +import { processMessagesUsingCache } from './sogsV3MutationCache'; /** * Get the convo matching those criteria and make sure it is an opengroup convo, or return null. @@ -414,14 +414,14 @@ async function handleInboxOutboxMessages( * We will need this to send new message to that user from our second device. */ const recipient = inboxOutboxItem.recipient; - const contentDecoded = SignalService.Content.decode(content); + const contentDecrypted = SignalService.Content.decode(content); // if we already know this user's unblinded pubkey, store the blinded message we sent to that blinded recipient under // the unblinded conversation instead (as we would have merge the blinded one with the other ) const unblindedIDOrBlinded = (await findCachedBlindedMatchOrLookItUp(recipient, serverPubkey, sodium)) || recipient; - if (contentDecoded.dataMessage) { + if (contentDecrypted.dataMessage) { const outboxConversationModel = await ConvoHub.use().getOrCreateAndWait( unblindedIDOrBlinded, ConversationTypeEnum.PRIVATE @@ -442,7 +442,7 @@ async function handleInboxOutboxMessages( msgModel, '', postedAtInMs, - contentDecoded.dataMessage as SignalService.DataMessage, + contentDecrypted.dataMessage as SignalService.DataMessage, outboxConversationModel ); } @@ -473,12 +473,12 @@ async function handleInboxOutboxMessages( window.log.warn('tryMatchBlindWithStandardKey could not veriyfy'); } - await innerHandleSwarmContentMessage( - builtEnvelope, - postedAtInMs, - builtEnvelope.content, - '' - ); + await innerHandleSwarmContentMessage({ + envelope: builtEnvelope, + sentAtTimestamp: postedAtInMs, + contentDecrypted: builtEnvelope.content, + messageHash: '', + }); } } catch (e) { window.log.warn('handleOutboxMessages failed with:', e.message); diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 6d54ca08ec..4f1acd3938 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -46,7 +46,7 @@ const forceNetworkDeletion = async (): Promise | null> => { }); const ret = await doSnodeBatchRequest( - [{ method, params: { ...signOpts, namespace } }], + [{ method, params: { ...signOpts, namespace, pubkey: usPk } }], snodeToMakeRequestTo, 10000, usPk diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 8f67cfdeac..3e0150d703 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -134,8 +134,12 @@ export type StoreOnNodeParamsNoSig = Pick< export type DeleteFromNodeWithTimestampParams = { timestamp: string | number; namespace: number | null | 'all'; -} & DeleteSigParameters; -export type DeleteByHashesFromNodeParams = { messages: Array } & DeleteSigParameters; +} & (DeleteSigUserParameters | DeleteSigGroupParameters); + +export type DeleteByHashesFromNodeParams = { messages: Array } & ( + | DeleteSigUserParameters + | DeleteSigGroupParameters +); type StoreOnNodeShared = { networkTimestamp: number; @@ -161,12 +165,17 @@ export type StoreOnNodeSubRequest = { }; export type NetworkTimeSubRequest = { method: 'info'; params: object }; -type DeleteSigParameters = { - pubkey: string; +type DeleteSigUserParameters = { + pubkey: PubkeyType; pubkey_ed25519: string; signature: string; }; +type DeleteSigGroupParameters = { + pubkey: GroupPubkeyType; + signature: string; +}; + export type DeleteAllFromNodeSubRequest = { method: 'delete_all'; params: DeleteFromNodeWithTimestampParams; @@ -206,16 +215,30 @@ type UpdateExpiryOnNodeSubRequest = | UpdateExpiryOnNodeUserSubRequest | UpdateExpiryOnNodeGroupSubRequest; -export type RevokeSubaccountParams = { +type RevokeSubaccountShared = { pubkey: GroupPubkeyType; - revoke: string; // the subaccount token to revoke in hex signature: string; + timestamp: number; }; + +export type RevokeSubaccountParams = RevokeSubaccountShared & { + revoke: string; // the subaccount token to revoke in hex +}; + +export type UnrevokeSubaccountParams = RevokeSubaccountShared & { + unrevoke: string; // the subaccount token to revoke in hex +}; + export type RevokeSubaccountSubRequest = { - method: 'revoke_subaccount' | 'unrevoke_subaccount'; + method: 'revoke_subaccount'; params: RevokeSubaccountParams; }; +export type UnrevokeSubaccountSubRequest = { + method: 'unrevoke_subaccount'; + params: UnrevokeSubaccountParams; +}; + export type OxendSubRequest = OnsResolveSubRequest | GetServiceNodesSubRequest; export type SnodeApiSubRequests = @@ -227,7 +250,8 @@ export type SnodeApiSubRequests = | DeleteFromNodeSubRequest | DeleteAllFromNodeSubRequest | UpdateExpiryOnNodeSubRequest - | RevokeSubaccountSubRequest; + | RevokeSubaccountSubRequest + | UnrevokeSubaccountSubRequest; // eslint-disable-next-line @typescript-eslint/array-type export type NonEmptyArray = [T, ...T[]]; diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 7a493fe22f..5bb1027c6f 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -1,12 +1,15 @@ import { isArray } from 'lodash'; import { Snode } from '../../../data/data'; +import { SnodeNamespace } from './namespaces'; import { processOnionRequestErrorAtDestination, SnodeResponse } from './onions'; import { snodeRpc } from './sessionRpc'; import { NotEmptyArrayOfBatchResults, SnodeApiSubRequests } from './SnodeRequestTypes'; function logSubRequests(requests: Array) { return requests.map(m => - m.method === 'retrieve' || m.method === 'store' ? `${m.method}-${m.params.namespace}` : m.method + m.method === 'retrieve' || m.method === 'store' + ? `${m.method}-${SnodeNamespace.toRoles(m.params.namespace)}` + : m.method ); } diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index 274ffd46ca..d3402103ed 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -1,4 +1,4 @@ -import { last, orderBy } from 'lodash'; +import { isNumber, last, orderBy } from 'lodash'; import { PickEnum } from '../../../types/Enums'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; @@ -222,9 +222,45 @@ function maxSizeMap(namespaces: Array) { return sizeMap; } +function toRole(namespace: number) { + const asKnownNamespace: SnodeNamespaces = namespace; + switch (asKnownNamespace) { + case SnodeNamespaces.LegacyClosedGroup: + return 'legacyGroup'; + case SnodeNamespaces.Default: + return 'default'; + case SnodeNamespaces.UserProfile: + return 'userProfile'; + case SnodeNamespaces.UserContacts: + return 'userContacts'; + case SnodeNamespaces.ConvoInfoVolatile: + return 'convoVolatile'; + case SnodeNamespaces.UserGroups: + return 'userGroups'; + case SnodeNamespaces.ClosedGroupMessages: + return 'groupMsg'; + case SnodeNamespaces.ClosedGroupKeys: + return 'groupKeys'; + case SnodeNamespaces.ClosedGroupInfo: + return 'groupInfo'; + case SnodeNamespaces.ClosedGroupMembers: + return 'groupMembers'; + default: + return `${namespace}`; + } +} + +function toRoles(namespace: number | Array) { + if (isNumber(namespace)) { + return [namespace].map(toRole); + } + return namespace.map(toRole); +} + export const SnodeNamespace = { isUserConfigNamespace, isGroupConfigNamespace, isGroupNamespace, maxSizeMap, + toRoles, }; diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index fea14ed290..95cc0e476e 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -1,25 +1,26 @@ import https from 'https'; -// eslint-disable-next-line import/no-named-default -import { default as insecureNodeFetch, RequestInit, Response } from 'node-fetch'; -import ByteBuffer from 'bytebuffer'; -import pRetry from 'p-retry'; -import { cloneDeep, isEmpty, isString, omit } from 'lodash'; +// eslint-disable import/no-named-default import { AbortSignal } from 'abort-controller'; +import ByteBuffer from 'bytebuffer'; import { to_string } from 'libsodium-wrappers-sumo'; +import { cloneDeep, isEmpty, isString, omit } from 'lodash'; +// eslint-disable-next-line import/no-named-default +import { RequestInit, Response, default as insecureNodeFetch } from 'node-fetch'; +import pRetry from 'p-retry'; // eslint-disable-next-line import/no-unresolved import { AbortSignal as AbortSignalNode } from 'node-fetch/externals'; import { dropSnodeFromSnodePool, dropSnodeFromSwarmIfNeeded, updateSwarmFor } from './snodePool'; import { OnionPaths } from '../../onions'; -import { toHex } from '../../utils/String'; import { ed25519Str, incrementBadPathCountOrDrop } from '../../onions/onionPath'; +import { toHex } from '../../utils/String'; import { Snode } from '../../../data/data'; -import { ERROR_CODE_NO_CONNECT } from './SNodeAPI'; -import { hrefPnServerProd } from '../push_notification_api/PnServer'; import { callUtilsWorker } from '../../../webworker/workers/browser/util_worker_interface'; import { encodeV4Request } from '../../onions/onionv4'; +import { hrefPnServerProd } from '../push_notification_api/PnServer'; +import { ERROR_CODE_NO_CONNECT } from './SNodeAPI'; // hold the ed25519 key of a snode against the time it fails. Used to remove a snode only after a few failures (snodeFailureThreshold failures) let snodeFailureCount: Record = {}; @@ -261,6 +262,14 @@ function process406Or425Error(statusCode: number) { } } +function process401Error(statusCode: number) { + if (statusCode === 401) { + throw new pRetry.AbortError( + `Got 401 status code. Most likely a client bug. Retries would not help. ` + ); + } +} + function processOxenServerError(_statusCode: number, body?: string) { if (body === OXEN_SERVER_ERROR) { window?.log?.warn('[path] Got Oxen server Error. Not much to do if the server has troubles.'); @@ -310,6 +319,7 @@ export async function processOnionRequestErrorAtDestination({ `processOnionRequestErrorAtDestination. statusCode nok: ${statusCode}: associatedWith:${associatedWith} destinationSnodeEd25519:${destinationSnodeEd25519}` ); process406Or425Error(statusCode); + process401Error(statusCode); processOxenServerError(statusCode, body); await process421Error(statusCode, body, associatedWith, destinationSnodeEd25519); if (destinationSnodeEd25519) { @@ -387,6 +397,7 @@ async function processAnyOtherErrorAtDestination( // this test checks for error at the destination. if ( status !== 400 && + status !== 401 && // handled in process401Error status !== 406 && // handled in process406Error status !== 421 // handled in process421Error ) { diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 5d3f61f4a9..18ad5325e8 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -96,7 +96,7 @@ async function retrieveRequestForGroup({ namespace: SnodeNamespacesGroup; retrieveParam: RetrieveParams; }) { - if (!PubKey.isClosedGroupV2(groupPk)) { + if (!PubKey.is03Pubkey(groupPk)) { throw new Error('retrieveRequestForGroup: not a 03 group'); } if (!SnodeNamespace.isGroupNamespace(namespace)) { @@ -148,7 +148,7 @@ async function buildRetrieveRequest( return retrieveRequestForLegacyGroup({ namespace, ourPubkey, pubkey, retrieveParam }); } - if (PubKey.isClosedGroupV2(pubkey)) { + if (PubKey.is03Pubkey(pubkey)) { if (!SnodeNamespace.isGroupNamespace(namespace)) { // either config or messages namespaces for 03 groups throw new Error(`tried to poll from a non 03 group namespace ${namespace}`); @@ -182,7 +182,7 @@ async function buildRetrieveRequest( }, }; retrieveRequestsParams.push(expireParams); - } else if (PubKey.isClosedGroupV2(pubkey)) { + } else if (PubKey.is03Pubkey(pubkey)) { const group = await UserGroupsWrapperActions.getGroup(pubkey); const signResult = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ diff --git a/ts/session/apis/snode_api/revokeSubaccount.ts b/ts/session/apis/snode_api/revokeSubaccount.ts index 8cd77cef4a..2062178b2e 100644 --- a/ts/session/apis/snode_api/revokeSubaccount.ts +++ b/ts/session/apis/snode_api/revokeSubaccount.ts @@ -1,62 +1,79 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import _, { isEmpty } from 'lodash'; +import { from_hex } from 'libsodium-wrappers-sumo'; +import _ from 'lodash'; import { doSnodeBatchRequest } from './batchRequest'; -import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; +import { concatUInt8Array } from '../../crypto'; import { PubKey } from '../../types'; -import { stringToUint8Array } from '../../utils/String'; -import { RevokeSubaccountSubRequest } from './SnodeRequestTypes'; +import { StringUtils } from '../../utils'; +import { RevokeSubaccountSubRequest, UnrevokeSubaccountSubRequest } from './SnodeRequestTypes'; +import { GetNetworkTime } from './getNetworkTime'; import { SnodeGroupSignature } from './signature/groupSignature'; import { getSwarmFor } from './snodePool'; -type Change = { +export type RevokeChanges = Array<{ action: 'revoke_subaccount' | 'unrevoke_subaccount'; - tokenToRevoke: string; -}; + tokenToRevokeHex: string; +}>; -type ArrayOfChange = Array; async function getRevokeSubaccountRequest({ groupPk, - actions, + revokeChanges, + groupSecretKey, }: { groupPk: GroupPubkeyType; - actions: ArrayOfChange; -}): Promise> { - if (!PubKey.isClosedGroupV2(groupPk)) { + groupSecretKey: Uint8Array; + revokeChanges: RevokeChanges; +}): Promise> { + if (!PubKey.is03Pubkey(groupPk)) { throw new Error('revokeSubaccountForGroup: not a 03 group'); } - const group = await UserGroupsWrapperActions.getGroup(groupPk); + const timestamp = GetNetworkTime.getNowWithNetworkOffset(); - if (!group || isEmpty(group?.secretKey)) { - throw new Error(`revokeSubaccountForGroup ${groupPk} needs admin secretkey`); - } + const revokeParams: Array = + await Promise.all( + revokeChanges.map(async change => { + const tokenBytes = from_hex(change.tokenToRevokeHex); + + const prefix = new Uint8Array(StringUtils.encode(`${change.action}${timestamp}`, 'utf8')); + const sigResult = await SnodeGroupSignature.signDataWithAdminSecret( + concatUInt8Array(prefix, tokenBytes), + { secretKey: groupSecretKey } + ); - const revokeParams: Array = await Promise.all( - actions.map(async action => { - const verificationString = `${action}${stringToUint8Array(action.tokenToRevoke)}`; - const sigResult = await SnodeGroupSignature.signDataWithAdminSecret( - verificationString, - group - ); + const args = + change.action === 'revoke_subaccount' + ? { + method: change.action, + params: { + revoke: change.tokenToRevokeHex, + ...sigResult, + pubkey: groupPk, + timestamp, + }, + } + : { + method: change.action, + params: { + unrevoke: change.tokenToRevokeHex, + ...sigResult, + pubkey: groupPk, + timestamp, + }, + }; - return { - method: action.action, - params: { - revoke: action.tokenToRevoke, - ...sigResult, - pubkey: groupPk, - }, - }; - }) - ); + return args; + }) + ); return revokeParams; } async function revokeSubAccounts( groupPk: GroupPubkeyType, - actions: ArrayOfChange + revokeChanges: RevokeChanges, + groupSecretKey: Uint8Array ): Promise { try { const swarm = await getSwarmFor(groupPk); @@ -66,10 +83,11 @@ async function revokeSubAccounts( } const revokeParams = await getRevokeSubaccountRequest({ groupPk, - actions, + revokeChanges, + groupSecretKey, }); - const results = await doSnodeBatchRequest(revokeParams, snode, 4000, null); + const results = await doSnodeBatchRequest(revokeParams, snode, 7000, null); if (!results || !results.length) { throw new Error(`_revokeSubAccounts could not talk to ${snode.ip}:${snode.port}`); @@ -81,4 +99,4 @@ async function revokeSubAccounts( } } -export const SnodeAPIRetrieve = { revokeSubAccounts }; +export const SnodeAPIRevoke = { revokeSubAccounts }; diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 1b1b872104..a74431f9bb 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -5,8 +5,11 @@ import { Uint8ArrayLen64, UserGroupsGet, } from 'libsession_util_nodejs'; -import { isEmpty } from 'lodash'; -import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { isEmpty, isString } from 'lodash'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../../../../webworker/workers/browser/libsession_worker_interface'; import { getSodiumRenderer } from '../../../crypto/MessageEncrypter'; import { GroupUpdateInviteMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; import { StringUtils, UserUtils } from '../../../utils'; @@ -155,10 +158,12 @@ async function getSnodeGroupSignature({ } async function signDataWithAdminSecret( - verificationString: string, + verificationString: string | Uint8Array, group: Pick ) { - const verificationData = StringUtils.encode(verificationString, 'utf8'); + const verificationData = isString(verificationString) + ? StringUtils.encode(verificationString, 'utf8') + : verificationString; const message = new Uint8Array(verificationData); if (!group) { @@ -233,9 +238,41 @@ async function generateUpdateExpiryGroupSignature({ throw new Error(`generateUpdateExpiryGroupSignature: needs either groupSecretKey or authData`); } +async function getGroupSignatureByHashesParams({ + messagesHashes, + method, + pubkey, +}: WithMessagesHashes & { + pubkey: GroupPubkeyType; + method: 'delete'; +}) { + const verificationData = StringUtils.encode(`${method}${messagesHashes.join('')}`, 'utf8'); + const message = new Uint8Array(verificationData); + + const sodium = await getSodiumRenderer(); + try { + const group = await UserGroupsWrapperActions.getGroup(pubkey); + if (!group || !group.secretKey || isEmpty(group.secretKey)) { + throw new Error('getSnodeGroupSignatureByHashesParams needs admin secretKey'); + } + const signature = sodium.crypto_sign_detached(message, group.secretKey); + const signatureBase64 = fromUInt8ArrayToBase64(signature); + + return { + signature: signatureBase64, + pubkey, + messages: messagesHashes, + }; + } catch (e) { + window.log.warn('getSnodeGroupSignatureByHashesParams failed with: ', e.message); + throw e; + } +} + export const SnodeGroupSignature = { generateUpdateExpiryGroupSignature, getGroupInviteMessage, getSnodeGroupSignature, + getGroupSignatureByHashesParams, signDataWithAdminSecret, }; diff --git a/ts/session/apis/snode_api/signature/signatureShared.ts b/ts/session/apis/snode_api/signature/signatureShared.ts index 51ae73a505..7444616563 100644 --- a/ts/session/apis/snode_api/signature/signatureShared.ts +++ b/ts/session/apis/snode_api/signature/signatureShared.ts @@ -42,7 +42,7 @@ function isSigParamsForGroupAdmin( sigParams: SnodeSigParamsAdminGroup | SnodeSigParamsUs | SnodeSigParamsSubAccount ): sigParams is SnodeSigParamsAdminGroup { const asGr = sigParams as SnodeSigParamsAdminGroup; - return PubKey.isClosedGroupV2(asGr.groupPk) && !isEmpty(asGr.privKey); + return PubKey.is03Pubkey(asGr.groupPk) && !isEmpty(asGr.privKey); } async function getSnodeSignatureShared(params: SnodeSigParamsAdminGroup | SnodeSigParamsUs) { diff --git a/ts/session/apis/snode_api/signature/snodeSignatures.ts b/ts/session/apis/snode_api/signature/snodeSignatures.ts index 5c139d8f18..0341b9b808 100644 --- a/ts/session/apis/snode_api/signature/snodeSignatures.ts +++ b/ts/session/apis/snode_api/signature/snodeSignatures.ts @@ -1,4 +1,9 @@ -import { GroupPubkeyType, Uint8ArrayLen100, Uint8ArrayLen64 } from 'libsession_util_nodejs'; +import { + GroupPubkeyType, + PubkeyType, + Uint8ArrayLen100, + Uint8ArrayLen64, +} from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; import { toFixedUint8ArrayOfLength } from '../../../../types/sqlSharedTypes'; import { getSodiumRenderer } from '../../../crypto'; @@ -20,13 +25,9 @@ async function getSnodeSignatureByHashesParams({ method, pubkey, }: WithMessagesHashes & { - pubkey: string; + pubkey: PubkeyType; method: 'delete'; -}): Promise< - Pick & { - messages: Array; - } -> { +}) { const ourEd25519Key = await UserUtils.getUserED25519KeyPair(); if (!ourEd25519Key) { @@ -79,7 +80,7 @@ function isSigParamsForGroupAdmin( sigParams: SnodeSigParamsAdminGroup | SnodeSigParamsUs | SnodeSigParamsSubAccount ): sigParams is SnodeSigParamsAdminGroup { const asGr = sigParams as SnodeSigParamsAdminGroup; - return PubKey.isClosedGroupV2(asGr.groupPk) && !isEmpty(asGr.privKey); + return PubKey.is03Pubkey(asGr.groupPk) && !isEmpty(asGr.privKey); } function getVerificationData(params: SnodeSigParamsShared) { diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 82d5b0f81a..90a3f7c215 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -2,7 +2,17 @@ /* eslint-disable more/no-then */ /* eslint-disable @typescript-eslint/no-misused-promises */ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { compact, concat, difference, flatten, isArray, last, sample, uniqBy } from 'lodash'; +import { + compact, + concat, + difference, + flatten, + isArray, + last, + sample, + toNumber, + uniqBy, +} from 'lodash'; import { v4 } from 'uuid'; import { Data, Snode } from '../../../data/data'; import { SignalService } from '../../../protobuf'; @@ -13,7 +23,6 @@ import * as snodePool from './snodePool'; import { ConversationModel } from '../../../models/conversation'; import { ConversationTypeEnum } from '../../../models/conversationAttributes'; -import { signalservice } from '../../../protobuf/compiled'; import { EnvelopePlus } from '../../../receiver/types'; import { updateIsOnline } from '../../../state/ducks/onion'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; @@ -26,7 +35,6 @@ import { DURATION, SWARM_POLLING_TIMEOUT } from '../../constants'; import { ConvoHub } from '../../conversations'; import { ed25519Str } from '../../onions/onionPath'; import { StringUtils, UserUtils } from '../../utils'; -import { perfEnd, perfStart } from '../../utils/Performance'; import { PreConditionFailed } from '../../utils/errors'; import { LibSessionUtil } from '../../utils/libsession/libsession_utils'; import { SnodeNamespace, SnodeNamespaces, UserConfigNamespaces } from './namespaces'; @@ -197,10 +205,10 @@ export class SwarmPolling { } // only groups NOT starting with 03 - const legacyGroups = pollingEntries.filter(m => !PubKey.isClosedGroupV2(m.pubkey.key)); + const legacyGroups = pollingEntries.filter(m => !PubKey.is03Pubkey(m.pubkey.key)); // only groups starting with 03 - const groups = pollingEntries.filter(m => PubKey.isClosedGroupV2(m.pubkey.key)); + const groups = pollingEntries.filter(m => PubKey.is03Pubkey(m.pubkey.key)); // let's grab the groups and legacy groups which should be left as they are not in their corresponding wrapper const legacyGroupsToLeave = legacyGroups @@ -271,7 +279,7 @@ export class SwarmPolling { // if all snodes returned an error (null), no need to update the lastPolledTimestamp if (type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV2) { window?.log?.debug( - `Polled for group(${ed25519Str(pubkey)}):, got ${countMessages} messages back.` + `Polled for group${ed25519Str(pubkey)} got ${countMessages} messages back.` ); let lastPolledTimestamp = Date.now(); if (countMessages >= minMsgCountShouldRetry) { @@ -304,7 +312,7 @@ export class SwarmPolling { await SwarmPollingUserConfig.handleUserSharedConfigMessages(confMessages); return; } - if (type === ConversationTypeEnum.GROUPV2 && PubKey.isClosedGroupV2(pubkey)) { + if (type === ConversationTypeEnum.GROUPV2 && PubKey.is03Pubkey(pubkey)) { await SwarmPollingGroupConfig.handleGroupSharedConfigMessages(confMessages, pubkey); } } @@ -369,33 +377,18 @@ export class SwarmPolling { return; } - perfStart(`handleSeenMessages-${pubkey}`); const newMessages = await this.handleSeenMessages(uniqOtherMsgs); - perfEnd(`handleSeenMessages-${pubkey}`, 'handleSeenMessages'); if (type === ConversationTypeEnum.GROUPV2) { - for (let index = 0; index < newMessages.length; index++) { - const msg = newMessages[index]; - const retrieveResult = new Uint8Array(StringUtils.encode(msg.data, 'base64')); - try { - const envelopePlus = await decryptForGroupV2({ - content: retrieveResult, - groupPk: pubkey, - sentTimestamp: msg.timestamp, - }); - if (!envelopePlus) { - throw new Error('decryptForGroupV2 returned empty envelope'); - } - - // this is the processing of the message itself, which can be long. - Receiver.handleRequest(envelopePlus.content, envelopePlus.source, msg.hash); - } catch (e) { - window.log.warn('failed to handle groupv2 otherMessage because of: ', e.message); - } - } + // groupv2 messages are not stored in the cache, so for each that we process, we also add it as seen message. + // this is to take care of a crash half way through processing messages. We'd get the same 100 messages back, and we'd skip up to the first not seen message + await handleMessagesForGroupV2(newMessages, pubkey); return; } - // trigger the handling of all the other messages, not shared config related + // private and legacy groups are cached, so we can mark them as seen right away, they are still in the cache until processed correctly. + // at some point we should get rid of the cache completely, and do the same logic as for groupv2 above + await this.updateSeenMessages(newMessages); + // trigger the handling of all the other messages, not shared config related and not groupv2 encrypted newMessages.forEach(m => { const content = extractWebSocketContent(m.data); @@ -421,7 +414,7 @@ export class SwarmPolling { // this can happen when a group is removed from the wrapper while we were polling const newGroupButNotInWrapper = - PubKey.isClosedGroupV2(pubkey) && !allGroupsInWrapper.some(m => m.pubkeyHex === pubkey); + PubKey.is03Pubkey(pubkey) && !allGroupsInWrapper.some(m => m.pubkeyHex === pubkey); const legacyGroupButNoInWrapper = type === ConversationTypeEnum.GROUP && pubkey.startsWith('05') && @@ -453,12 +446,12 @@ export class SwarmPolling { window.log.warn(`failed to get currentHashes for user variant ${variant}`); } } - window.log.debug(`configHashesToBump private: ${configHashesToBump}`); + window.log.debug(`configHashesToBump private count: ${configHashesToBump.length}`); return configHashesToBump; } - if (type === ConversationTypeEnum.GROUPV2 && PubKey.isClosedGroupV2(pubkey)) { + if (type === ConversationTypeEnum.GROUPV2 && PubKey.is03Pubkey(pubkey)) { const toBump = await MetaGroupWrapperActions.currentHashes(pubkey); - window.log.debug(`configHashesToBump group: ${toBump}`); + window.log.debug(`configHashesToBump group count: ${toBump.length}`); return toBump; } return []; @@ -583,14 +576,17 @@ export class SwarmPolling { const dupHashes = await Data.getSeenMessagesByHashList(incomingHashes); const newMessages = messages.filter((m: RetrieveMessageItem) => !dupHashes.includes(m.hash)); - if (newMessages.length) { - const newHashes = newMessages.map((m: RetrieveMessageItem) => ({ + return newMessages; + } + + private async updateSeenMessages(processedMessages: Array) { + if (processedMessages.length) { + const newHashes = processedMessages.map((m: RetrieveMessageItem) => ({ expiresAt: m.expiration, hash: m.hash, })); await Data.saveSeenMessageHashes(newHashes); } - return newMessages; } // eslint-disable-next-line consistent-return @@ -745,7 +741,7 @@ async function decryptForGroupV2(retrieveResult: { window?.log?.info('received closed group message v2'); try { const groupPk = retrieveResult.groupPk; - if (!PubKey.isClosedGroupV2(groupPk)) { + if (!PubKey.is03Pubkey(groupPk)) { throw new PreConditionFailed('decryptForGroupV2: not a 03 prefixed group'); } @@ -756,9 +752,19 @@ async function decryptForGroupV2(retrieveResult: { receivedAt: Date.now(), content: decrypted.plaintext, source: groupPk, - type: signalservice.Envelope.Type.CLOSED_GROUP_MESSAGE, + type: SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, timestamp: retrieveResult.sentTimestamp, }; + try { + // just try to parse what we have, it should be a protobuf content decrypted already + const parsedEnvelope = SignalService.Envelope.decode(new Uint8Array(decrypted.plaintext)); + + SignalService.Content.decode(parsedEnvelope.content); + envelopePlus.content = parsedEnvelope.content; + } catch (e) { + throw new Error('content got from libsession does not look to be envelope+decryptedContent'); + } + // the receiving pipeline relies on the envelope.senderIdentity field to know who is the author of a message return envelopePlus; @@ -767,3 +773,51 @@ async function decryptForGroupV2(retrieveResult: { return null; } } + +async function handleMessagesForGroupV2( + newMessages: Array, + groupPk: GroupPubkeyType +) { + for (let index = 0; index < newMessages.length; index++) { + const msg = newMessages[index]; + const retrieveResult = new Uint8Array(StringUtils.encode(msg.data, 'base64')); + try { + const envelopePlus = await decryptForGroupV2({ + content: retrieveResult, + groupPk, + sentTimestamp: msg.timestamp, + }); + if (!envelopePlus) { + throw new Error('decryptForGroupV2 returned empty envelope'); + } + + // this is the processing of the message itself, which can be long. + // We allow 1 minute per message at most, which should be plenty + await Receiver.handleSwarmContentDecryptedWithTimeout({ + envelope: envelopePlus, + contentDecrypted: envelopePlus.content, + messageHash: msg.hash, + sentAtTimestamp: toNumber(envelopePlus.timestamp), + }); + } catch (e) { + window.log.warn('failed to handle groupv2 otherMessage because of: ', e.message); + } finally { + // that message was processed, add it to the seen messages list + try { + await Data.saveSeenMessageHashes([ + { + hash: msg.hash, + expiresAt: msg.expiration, + }, + ]); + } catch (e) { + window.log.warn('failed saveSeenMessageHashes: ', e.message); + } + } + } + + // make sure that all the message above are indeed seen (extra check as everything should already be marked as seen in the loop above) + await Data.saveSeenMessageHashes( + newMessages.map(m => ({ hash: m.hash, expiresAt: m.expiration })) + ); +} diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 398543f2db..d7d16a6ef5 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -11,12 +11,12 @@ async function handleGroupSharedConfigMessages( groupConfigMessagesMerged: Array, groupPk: GroupPubkeyType ) { - window.log.info( - `received groupConfigMessagesMerged count: ${ - groupConfigMessagesMerged.length - } for groupPk:${ed25519Str(groupPk)}` - ); try { + window.log.info( + `received groupConfigMessagesMerged count: ${ + groupConfigMessagesMerged.length + } for groupPk:${ed25519Str(groupPk)}` + ); const infos = groupConfigMessagesMerged .filter(m => m.namespace === SnodeNamespaces.ClosedGroupInfo) .map(info => { diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts index 8d9ac1ea4a..c0763baf2f 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingUserConfig.ts @@ -4,9 +4,12 @@ import { RetrieveMessageItemWithNamespace } from '../types'; async function handleUserSharedConfigMessages( userConfigMessagesMerged: Array ) { - window.log.info(`received userConfigMessagesMerged count: ${userConfigMessagesMerged.length}`); try { if (userConfigMessagesMerged.length) { + window.log.info( + `received userConfigMessagesMerged count: ${userConfigMessagesMerged.length}` + ); + try { window.log.info( `handleConfigMessagesViaLibSession of "${userConfigMessagesMerged.length}" messages with libsession` diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 078c43b798..d5e2f143a7 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -97,7 +97,7 @@ class ConvoController { throw new TypeError(`'type' must be 'private' or 'group' or 'groupv2' but got: '${type}'`); } - if (type === ConversationTypeEnum.GROUPV2 && !PubKey.isClosedGroupV2(id)) { + if (type === ConversationTypeEnum.GROUPV2 && !PubKey.is03Pubkey(id)) { throw new Error( 'required v3 closed group but the pubkey does not match the 03 prefix for them' ); @@ -220,7 +220,7 @@ class ConvoController { // if we were kicked or sent our left message, we have nothing to do more with that group. // Just delete everything related to it, not trying to add update message or send a left message. await this.removeGroupOrCommunityFromDBAndRedux(groupId); - if (PubKey.isClosedGroupV2(groupId)) { + if (PubKey.is03Pubkey(groupId)) { await remove03GroupFromWrappers(groupId); } else { await removeLegacyGroupFromWrappers(groupId); diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index 0668ac2856..fe8b955a2d 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -1,5 +1,5 @@ import _, { isFinite, isNumber } from 'lodash'; -import { ClosedGroup, getMessageQueue } from '..'; +import { getMessageQueue } from '..'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { addKeyPairToCacheAndDBIfNeeded } from '../../receiver/closedGroups'; import { ECKeyPair } from '../../receiver/keypairs'; @@ -8,6 +8,7 @@ import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { getSwarmPollingInstance } from '../apis/snode_api'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { generateClosedGroupPublicKey, generateCurve25519KeyPairWithoutPrefix } from '../crypto'; +import { ClosedGroup, GroupInfo } from '../group/closed-group'; import { ClosedGroupNewMessage, ClosedGroupNewMessageParams, @@ -53,7 +54,7 @@ export async function createClosedGroup(groupName: string, members: Array; leavingMembers?: Array; kickedMembers?: Array; + promotedMembers?: Array; } /** @@ -55,16 +57,16 @@ export interface MemberChanges { * @param members the new members (or just pass the old one if nothing changed) * @returns nothing */ -export async function initiateClosedGroupUpdate( +async function initiateClosedGroupUpdate( groupId: string, groupName: string, members: Array ) { - const isGroupV2 = PubKey.isClosedGroupV2(groupId); - const convo = await ConvoHub.use().getOrCreateAndWait( - groupId, - isGroupV2 ? ConversationTypeEnum.GROUPV2 : ConversationTypeEnum.GROUP - ); + const isGroupV2 = PubKey.is03Pubkey(groupId); + if (isGroupV2) { + throw new PreConditionFailed('initiateClosedGroupUpdate does not handle closedgroupv2'); + } + const convo = await ConvoHub.use().getOrCreateAndWait(groupId, ConversationTypeEnum.GROUP); // do not give an admins field here. We don't want to be able to update admins and // updateOrCreateClosedGroup() will update them if given the choice. @@ -93,7 +95,7 @@ export async function initiateClosedGroupUpdate( if (diff.newName?.length) { const nameOnlyDiff: GroupDiff = _.pick(diff, 'newName'); - const dbMessageName = await addUpdateMessage( + const dbMessageName = await ClosedGroup.addUpdateMessage( convo, nameOnlyDiff, UserUtils.getOurPubKeyStrFromCache(), @@ -105,7 +107,7 @@ export async function initiateClosedGroupUpdate( if (diff.joiningMembers?.length) { const joiningOnlyDiff: GroupDiff = _.pick(diff, 'joiningMembers'); - const dbMessageAdded = await addUpdateMessage( + const dbMessageAdded = await ClosedGroup.addUpdateMessage( convo, joiningOnlyDiff, UserUtils.getOurPubKeyStrFromCache(), @@ -116,7 +118,7 @@ export async function initiateClosedGroupUpdate( if (diff.leavingMembers?.length) { const leavingOnlyDiff: GroupDiff = { kickedMembers: diff.leavingMembers }; - const dbMessageLeaving = await addUpdateMessage( + const dbMessageLeaving = await ClosedGroup.addUpdateMessage( convo, leavingOnlyDiff, UserUtils.getOurPubKeyStrFromCache(), @@ -133,7 +135,7 @@ export async function initiateClosedGroupUpdate( await convo.commit(); } -export async function addUpdateMessage( +async function addUpdateMessage( convo: ConversationModel, diff: GroupDiff, sender: string, @@ -203,10 +205,10 @@ function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff return groupDiff; } -export async function updateOrCreateClosedGroup(details: GroupInfo) { +async function updateOrCreateClosedGroup(details: GroupInfo) { const { id, expireTimer } = details; - const isV3 = PubKey.isClosedGroupV2(id); + const isV3 = PubKey.is03Pubkey(id); const conversation = await ConvoHub.use().getOrCreateAndWait( id, @@ -324,7 +326,7 @@ async function sendAddedMembers( await Promise.all(promises); } -export async function sendRemovedMembers( +async function sendRemovedMembers( convo: ConversationModel, removedMembers: Array, stillMembers: Array, @@ -435,7 +437,7 @@ async function generateAndSendNewEncryptionKeyPair( }); } -export async function buildEncryptionKeyPairWrappers( +async function buildEncryptionKeyPairWrappers( targetMembers: Array, encryptionKeyPair: ECKeyPair ) { @@ -464,3 +466,10 @@ export async function buildEncryptionKeyPairWrappers( ); return wrappers; } + +export const ClosedGroup = { + addUpdateMessage, + initiateClosedGroupUpdate, + updateOrCreateClosedGroup, + buildEncryptionKeyPairWrappers, +}; diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts index c5af608f48..2156a9e68b 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts @@ -8,14 +8,14 @@ export interface GroupUpdateMessageParams extends MessageParams { } export abstract class GroupUpdateMessage extends DataMessage { - public readonly groupPk: GroupUpdateMessageParams['groupPk']; + public readonly destination: GroupUpdateMessageParams['groupPk']; constructor(params: GroupUpdateMessageParams) { super(params); - this.groupPk = params.groupPk; - if (!this.groupPk || this.groupPk.length === 0) { - throw new Error('groupPk must be set'); + this.destination = params.groupPk; + if (!this.destination || this.destination.length === 0) { + throw new Error('destination must be set to the groupPubkey'); } } diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts index 84012654ca..cfebd4e606 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts @@ -1,6 +1,7 @@ import { PubkeyType } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; import { SignalService } from '../../../../../../protobuf'; +import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; import { Preconditions } from '../../../preconditions'; import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; @@ -15,6 +16,7 @@ type Params = GroupUpdateMessageParams & { export class GroupUpdateDeleteMemberContentMessage extends GroupUpdateMessage { public readonly memberSessionIds: Params['memberSessionIds']; public readonly adminSignature: Params['adminSignature']; + public readonly namespace = SnodeNamespaces.ClosedGroupMessages; constructor(params: Params) { super(params); diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts index c8ded96230..6fb7b40b7d 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts @@ -1,5 +1,6 @@ import { isEmpty, isFinite } from 'lodash'; import { SignalService } from '../../../../../../protobuf'; +import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; type NameChangeParams = GroupUpdateMessageParams & { @@ -23,6 +24,7 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { public readonly typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type; public readonly updatedName: string = ''; public readonly updatedExpirationSeconds: number = 0; + public readonly namespace = SnodeNamespaces.ClosedGroupMessages; constructor(params: NameChangeParams | AvatarChangeParams | DisappearingMessageChangeParams) { super(params); diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts index 428e84bf53..eb038f1500 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage.ts @@ -1,4 +1,5 @@ import { SignalService } from '../../../../../../protobuf'; +import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; import { getOurProfile } from '../../../../../utils/User'; import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; @@ -13,6 +14,8 @@ type Params = GroupUpdateMessageParams & { */ export class GroupUpdateInviteResponseMessage extends GroupUpdateMessage { public readonly isApproved: Params['isApproved']; + public readonly namespace = SnodeNamespaces.ClosedGroupMessages; + constructor(params: Params) { super(params); this.isApproved = params.isApproved; diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts index 9783f82229..d6ae144ed4 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts @@ -2,6 +2,7 @@ import { PubkeyType } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; import { SignalService } from '../../../../../../protobuf'; import { assertUnreachable } from '../../../../../../types/sqlSharedTypes'; +import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; type MembersAddedMessageParams = GroupUpdateMessageParams & { @@ -25,6 +26,7 @@ type MembersPromotedMessageParams = GroupUpdateMessageParams & { export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { public readonly typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type; public readonly memberSessionIds: Array = []; // added, removed, promoted based on the type. + public readonly namespace = SnodeNamespaces.ClosedGroupMessages; constructor( params: MembersAddedMessageParams | MembersRemovedMessageParams | MembersPromotedMessageParams diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts index de46bdedd1..816c0f0f3e 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage.ts @@ -1,4 +1,5 @@ import { SignalService } from '../../../../../../protobuf'; +import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; import { GroupUpdateMessage } from '../GroupUpdateMessage'; /** @@ -7,6 +8,8 @@ import { GroupUpdateMessage } from '../GroupUpdateMessage'; * */ export class GroupUpdateMemberLeftMessage extends GroupUpdateMessage { + public readonly namespace = SnodeNamespaces.ClosedGroupMessages; + public dataProto(): SignalService.DataMessage { const memberLeftMessage = new SignalService.GroupUpdateMemberLeftMessage({}); diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts index 6362292636..8923a54996 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts @@ -27,7 +27,7 @@ export class GroupUpdateDeleteMessage extends GroupUpdateMessage { public dataProto(): SignalService.DataMessage { const deleteMessage = new SignalService.GroupUpdateDeleteMessage({ - groupSessionId: this.groupPk, + groupSessionId: this.destination, adminSignature: this.adminSignature, }); diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts index 93c253d041..0ff17c7456 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage.ts @@ -43,7 +43,7 @@ export class GroupUpdateInviteMessage extends GroupUpdateMessage { public dataProto(): SignalService.DataMessage { const ourProfile = UserUtils.getOurProfile(); const inviteMessage = new SignalService.GroupUpdateInviteMessage({ - groupSessionId: this.groupPk, + groupSessionId: this.destination, name: this.groupName, adminSignature: this.adminSignature, memberAuthData: this.memberAuthData, diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index 1513257384..95f2b89eea 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -27,7 +27,7 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage { throw new Error('ClosedGroupVisibleMessage: groupId must be set'); } - if (PubKey.isClosedGroupV2(PubKey.cast(params.groupId).key)) { + if (PubKey.is03Pubkey(PubKey.cast(params.groupId).key)) { throw new Error('GroupContext should not be used anymore with closed group v3'); } } @@ -69,7 +69,7 @@ export class ClosedGroupV2VisibleMessage extends DataMessage { }); this.chatMessage = params.chatMessage; - if (!PubKey.isClosedGroupV2(params.destination)) { + if (!PubKey.is03Pubkey(params.destination)) { throw new Error('ClosedGroupV2VisibleMessage only work with 03-groups destination'); } this.destination = params.destination; diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index a1e795d913..afc5b2b556 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -31,6 +31,11 @@ import { } from '../apis/snode_api/namespaces'; import { CallMessage } from '../messages/outgoing/controlMessage/CallMessage'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; +import { GroupUpdateDeleteMemberContentMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage'; +import { GroupUpdateInfoChangeMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; +import { GroupUpdateMemberChangeMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; +import { GroupUpdateMemberLeftMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage'; +import { GroupUpdateDeleteMessage } from '../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage'; import { GroupUpdateInviteMessage } from '../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; @@ -202,7 +207,12 @@ export class MessageQueue { message, sentCb, }: { - message: ClosedGroupV2VisibleMessage; + message: + | ClosedGroupV2VisibleMessage + | GroupUpdateMemberChangeMessage + | GroupUpdateInfoChangeMessage + | GroupUpdateDeleteMemberContentMessage + | GroupUpdateMemberLeftMessage; sentCb?: (message: RawMessage) => Promise; }): Promise { if (!message.destination) { @@ -254,7 +264,8 @@ export class MessageQueue { | ClosedGroupNewMessage | CallMessage | ClosedGroupMemberLeftMessage - | GroupUpdateInviteMessage; + | GroupUpdateInviteMessage + | GroupUpdateDeleteMessage; namespace: SnodeNamespaces; }): Promise { let rawMessage; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 189700447e..eea887dca2 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -30,6 +30,7 @@ import { import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/signature/snodeSignatures'; import { getSwarmFor } from '../apis/snode_api/snodePool'; import { SnodeAPIStore } from '../apis/snode_api/storeMessage'; +import { TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; import { MessageEncrypter } from '../crypto'; import { addMessagePadding } from '../crypto/BufferPadding'; @@ -111,9 +112,13 @@ async function send( retryMinTimeout?: number, // in ms isASyncMessage?: boolean ): Promise<{ wrappedEnvelope: Uint8Array; effectiveTimestamp: number }> { + const destination = message.device; + if (!PubKey.is03Pubkey(destination) && !PubKey.is05Pubkey(destination)) { + throw new Error('MessageSender rawMessage was given invalid pubkey'); + } + return pRetry( async () => { - const recipient = PubKey.cast(message.device); const { ttl } = message; // we can only have a single message in this send function for now @@ -141,26 +146,24 @@ async function send( const batchResult = await MessageSender.sendMessagesDataToSnode( [ { - pubkey: recipient.key, + pubkey: destination, data64: encryptedAndWrapped.data64, ttl, timestamp: encryptedAndWrapped.networkTimestamp, namespace: encryptedAndWrapped.namespace, }, ], - recipient.key, + destination, null, 'batch' ); - const isDestinationClosedGroup = ConvoHub.use().get(recipient.key)?.isClosedGroup(); + const isDestinationClosedGroup = ConvoHub.use().get(destination)?.isClosedGroup(); // If message also has a sync message, save that hash. Otherwise save the hash from the regular message send i.e. only closed groups in this case. if ( encryptedAndWrapped.identifier && (encryptedAndWrapped.isSyncMessage || isDestinationClosedGroup) && - batchResult && - !isEmpty(batchResult) && - batchResult[0].code === 200 && + batchResult?.[0].code === 200 && !isEmpty(batchResult[0].body.hash) ) { const messageSendHash = batchResult[0].body.hash; @@ -168,6 +171,13 @@ async function send( if (foundMessage) { await foundMessage.updateMessageHash(messageSendHash); await foundMessage.commit(); + await Data.saveSeenMessageHashes([ + { + hash: messageSendHash, + expiresAt: encryptedAndWrapped.networkTimestamp + TTL_DEFAULT.TTL_MAX, // non config msg expire at TTL_MAX at most + }, + ]); + window?.log?.info( `updated message ${foundMessage.get('id')} with hash: ${foundMessage.get( 'messageHash' @@ -211,7 +221,7 @@ async function getSignatureParamsFromNamespace( SnodeNamespace.isGroupConfigNamespace(item.namespace) || item.namespace === SnodeNamespaces.ClosedGroupMessages ) { - if (!PubKey.isClosedGroupV2(destination)) { + if (!PubKey.is03Pubkey(destination)) { throw new Error( 'getSignatureParamsFromNamespace: groupconfig namespace required a 03 pubkey' ); @@ -229,7 +239,7 @@ async function getSignatureParamsFromNamespace( async function sendMessagesDataToSnode( params: Array, - destination: string, + destination: PubkeyType | GroupPubkeyType, messagesHashesToDelete: Set | null, method: 'batch' | 'sequence' ): Promise { @@ -256,11 +266,17 @@ async function sendMessagesDataToSnode( const signedDeleteOldHashesRequest = messagesHashesToDelete && messagesHashesToDelete.size - ? await SnodeSignature.getSnodeSignatureByHashesParams({ - method: 'delete' as const, - messagesHashes: [...messagesHashesToDelete], - pubkey: destination, - }) + ? PubKey.is03Pubkey(destination) + ? await SnodeGroupSignature.getGroupSignatureByHashesParams({ + method: 'delete' as const, + messagesHashes: [...messagesHashesToDelete], + pubkey: destination, + }) + : await SnodeSignature.getSnodeSignatureByHashesParams({ + method: 'delete' as const, + messagesHashes: [...messagesHashesToDelete], + pubkey: destination, + }) : null; const snode = sample(swarm); @@ -281,7 +297,9 @@ async function sendMessagesDataToSnode( window?.log?.info( `sendMessagesDataToSnode - Successfully stored messages to ${ed25519Str(destination)} via ${ snode.ip - }:${snode.port} on namespaces: ${rightDestination.map(m => m.namespace).join(',')}` + }:${snode.port} on namespaces: ${SnodeNamespace.toRoles( + rightDestination.map(m => m.namespace) + ).join(',')}` ); } @@ -377,7 +395,7 @@ async function encryptMessageAndWrap( ttl, } = params; - if (PubKey.isClosedGroupV2(destination)) { + if (PubKey.is03Pubkey(destination)) { return encryptForGroupV2(params); } diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index 4f7dc8554f..3128c4148c 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -236,7 +236,7 @@ export class PubKey { } // TODO we should probably move those to a libsession exported ts file - public static isClosedGroupV2(key: string): key is GroupPubkeyType { + public static is03Pubkey(key: string): key is GroupPubkeyType { const regex = new RegExp(`^${KeyPrefixType.groupV2}${PubKey.HEX}{64}$`); return regex.test(key); } diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index ad83f39f3b..8d91f2ce87 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -66,13 +66,16 @@ async function confirmPushedAndDump( return LibSessionUtil.saveDumpsToDb(groupPk); } -async function pushChangesToGroupSwarmIfNeeded(groupPk: GroupPubkeyType): Promise { +async function pushChangesToGroupSwarmIfNeeded( + groupPk: GroupPubkeyType, + supplementKeys: Array +): Promise { // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc await LibSessionUtil.saveDumpsToDb(groupPk); const changesToPush = await LibSessionUtil.pendingChangesForGroup(groupPk); // If there are no pending changes then the job can just complete (next time something // is updated we want to try and run immediately so don't schedule another run in this case) - if (isEmpty(changesToPush?.messages)) { + if (isEmpty(changesToPush?.messages) && !supplementKeys.length) { return RunJobResult.Success; } @@ -85,6 +88,17 @@ async function pushChangesToGroupSwarmIfNeeded(groupPk: GroupPubkeyType): Promis data: item.ciphertext, }; }); + if (supplementKeys.length) { + supplementKeys.forEach(key => + msgs.push({ + namespace: SnodeNamespaces.ClosedGroupKeys, + pubkey: groupPk, + ttl: TTL_DEFAULT.TTL_CONFIG, + networkTimestamp: GetNetworkTime.getNowWithNetworkOffset(), + data: key, + }) + ); + } const result = await MessageSender.sendEncryptedDataToSnode( msgs, @@ -93,7 +107,9 @@ async function pushChangesToGroupSwarmIfNeeded(groupPk: GroupPubkeyType): Promis ); const expectedReplyLength = - changesToPush.messages.length + (changesToPush.allOldHashes.size ? 1 : 0); + changesToPush.messages.length + + (changesToPush.allOldHashes.size ? 1 : 0) + + supplementKeys.length; // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { @@ -141,7 +157,7 @@ class GroupSyncJob extends PersistedJob { try { const thisJobDestination = this.persistedData.identifier; - if (!PubKey.isClosedGroupV2(thisJobDestination)) { + if (!PubKey.is03Pubkey(thisJobDestination)) { return RunJobResult.PermanentFailure; } @@ -157,7 +173,7 @@ class GroupSyncJob extends PersistedJob { } // return await so we catch exceptions in here - return await GroupSync.pushChangesToGroupSwarmIfNeeded(thisJobDestination); + return await GroupSync.pushChangesToGroupSwarmIfNeeded(thisJobDestination, []); // eslint-disable-next-line no-useless-catch } catch (e) { diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index c2424508fb..06c86f9d77 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -178,7 +178,7 @@ async function pendingChangesForUs(): Promise { * @returns an object with a list of messages to be pushed and the list of hashes to bump expiry, server side */ async function pendingChangesForGroup(groupPk: GroupPubkeyType): Promise { - if (!PubKey.isClosedGroupV2(groupPk)) { + if (!PubKey.is03Pubkey(groupPk)) { throw new Error(`pendingChangesForGroup only works for user or 03 group pubkeys`); } // one of the wrapper behind the metagroup needs a push @@ -254,7 +254,7 @@ function resultShouldBeIncluded }; +type WithAddWithHistoryMembers = { withHistory: Array }; +type WithRemoveMembers = { removed: Array }; +type WithFromCurrentDevice = { fromCurrentDevice: boolean }; // there are some changes we want to do only when the current user do the change, and not when a network change triggers it. + export type GroupState = { infos: Record; members: Record>; creationFromUIPending: boolean; + memberChangesFromUIPending: boolean; + nameChangesFromUIPending: boolean; }; export const initialGroupState: GroupState = { infos: {}, members: {}, creationFromUIPending: false, + memberChangesFromUIPending: false, + nameChangesFromUIPending: false, }; type GroupDetailsUpdate = { @@ -127,18 +148,19 @@ const initNewGroupInWrapper = createAsyncThunk( `memberGetAll of ${groupPk} returned empty result even if it was just init.` ); } - // now that we've added members to the group, make sure to make a full key rotation // to include them and marks the corresponding wrappers as dirty await MetaGroupWrapperActions.keyRekey(groupPk); + const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); await convo.setIsApproved(true, false); - const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); if (result !== RunJobResult.Success) { window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); throw new Error('failed to pushChangesToGroupSwarmIfNeeded'); } + getSwarmPollingInstance().addGroupId(new PubKey(groupPk)); await convo.unhideIfNeeded(); convo.set({ active_at: Date.now() }); @@ -186,7 +208,12 @@ const handleUserGroupUpdate = createAsyncThunk( const state = payloadCreator.getState() as StateType; const groupPk = userGroup.pubkeyHex; if (state.groups.infos[groupPk] && state.groups.members[groupPk]) { - throw new Error('handleUserGroupUpdate group already present in redux slice'); + window.log.info('handleUserGroupUpdate group already present in redux slice'); + return { + groupPk, + infos: await MetaGroupWrapperActions.infoGet(groupPk), + members: await MetaGroupWrapperActions.memberGetAll(groupPk), + }; } const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); @@ -333,6 +360,385 @@ const destroyGroupDetails = createAsyncThunk( } ); +function validateMemberChange({ + groupPk, + withHistory: addMembersWithHistory, + withoutHistory: addMembersWithoutHistory, + removed: removeMembers, +}: WithGroupPubkey & WithAddWithoutHistoryMembers & WithAddWithHistoryMembers & WithRemoveMembers) { + const us = UserUtils.getOurPubKeyStrFromCache(); + if ( + addMembersWithHistory.includes(us) || + addMembersWithoutHistory.includes(us) || + removeMembers.includes(us) + ) { + throw new PreConditionFailed( + 'currentDeviceGroupMembersChange cannot be used for changes of our own state in the group' + ); + } + + const withHistory = uniq(addMembersWithHistory); + const withoutHistory = uniq(addMembersWithoutHistory); + const removed = uniq(removeMembers); + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + throw new PreConditionFailed('currentDeviceGroupMembersChange convo not present in convohub'); + } + if (intersection(withHistory, withoutHistory).length) { + throw new Error( + 'withHistory and withoutHistory can only have values which are not in the other' + ); + } + + if ( + intersection(withHistory, removed).length || + intersection(withHistory, removed).length || + intersection(withoutHistory, removed).length + ) { + throw new Error( + 'withHistory/without and removed can only have values which are not in the other' + ); + } + return { withoutHistory, withHistory, removed, us, convo }; +} + +function validateNameChange({ + groupPk, + newName, + currentName, +}: WithGroupPubkey & { newName: string; currentName: string }) { + const us = UserUtils.getOurPubKeyStrFromCache(); + if (!newName || isEmpty(newName)) { + throw new PreConditionFailed('validateNameChange needs a non empty name'); + } + + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + throw new PreConditionFailed('validateNameChange convo not present in convohub'); + } + if (newName === currentName) { + throw new PreConditionFailed('validateNameChange no name change detected'); + } + + return { newName, us, convo }; +} + +async function handleWithHistoryMembers({ + groupPk, + withHistory, +}: WithGroupPubkey & { + withHistory: Array; +}) { + for (let index = 0; index < withHistory.length; index++) { + const member = withHistory[index]; + const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); + await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); + } + const supplementKeys = withHistory.length + ? await MetaGroupWrapperActions.generateSupplementKeys(groupPk, withHistory) + : []; + return supplementKeys; +} + +async function handleWithoutHistoryMembers({ + groupPk, + withoutHistory, +}: WithGroupPubkey & WithAddWithoutHistoryMembers) { + for (let index = 0; index < withoutHistory.length; index++) { + const member = withoutHistory[index]; + const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); + await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); + } +} + +async function handleRemoveMembers({ + groupPk, + removed, + secretKey, + fromCurrentDevice, +}: WithGroupPubkey & WithRemoveMembers & WithFromCurrentDevice & { secretKey: Uint8Array }) { + if (!fromCurrentDevice) { + return; + } + await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, removed); + + const timestamp = GetNetworkTime.getNowWithNetworkOffset(); + await Promise.all( + removed.map(async m => { + const adminSignature = await SnodeGroupSignature.signDataWithAdminSecret( + `DELETE${m}${timestamp}`, + { secretKey } + ); + const deleteMessage = new GroupUpdateDeleteMessage({ + groupPk, + timestamp, + adminSignature: from_base64(adminSignature.signature, base64_variants.ORIGINAL), + }); + + const sentStatus = await getMessageQueue().sendToPubKeyNonDurably({ + pubkey: PubKey.cast(m), + message: deleteMessage, + namespace: SnodeNamespaces.Default, + }); + if (!sentStatus) { + window.log.warn('Failed to send a GroupUpdateDeleteMessage to a member removed: ', m); + throw new Error('Failed to send a GroupUpdateDeleteMessage to a member removed'); + } + }) + ); +} + +async function getPendingRevokeChanges({ + withoutHistory, + withHistory, + removed, + groupPk, +}: WithGroupPubkey & + WithAddWithoutHistoryMembers & + WithAddWithHistoryMembers & + WithRemoveMembers): Promise { + const revokeChanges: RevokeChanges = []; + + for (let index = 0; index < withoutHistory.length; index++) { + const m = withoutHistory[index]; + const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); + revokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); + } + for (let index = 0; index < withHistory.length; index++) { + const m = withHistory[index]; + const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); + revokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); + } + for (let index = 0; index < removed.length; index++) { + const m = removed[index]; + const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); + revokeChanges.push({ action: 'revoke_subaccount', tokenToRevokeHex: token }); + } + + return revokeChanges; +} + +async function handleMemberChangeFromUIOrNot({ + addMembersWithHistory, + addMembersWithoutHistory, + groupPk, + removeMembers, + fromCurrentDevice, +}: WithFromCurrentDevice & + WithGroupPubkey & { + addMembersWithHistory: Array; + addMembersWithoutHistory: Array; + removeMembers: Array; + }) { + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (!group || !group.secretKey || isEmpty(group.secretKey)) { + throw new Error('tried to make change to group but we do not have the admin secret key'); + } + + const { removed, withHistory, withoutHistory, convo, us } = validateMemberChange({ + withHistory: addMembersWithHistory, + withoutHistory: addMembersWithoutHistory, + groupPk, + removed: removeMembers, + }); + // first, unrevoke people who are added, and sevoke people who are removed + const revokeChanges = await getPendingRevokeChanges({ + groupPk, + withHistory, + withoutHistory, + removed, + }); + + await SnodeAPIRevoke.revokeSubAccounts(groupPk, revokeChanges, group.secretKey); + + // then, handle the addition with history of messages by generating supplement keys. + // this adds them to the members wrapper etc + const supplementKeys = await handleWithHistoryMembers({ groupPk, withHistory }); + + // then handle the addition without history of messages (full rotation of keys). + // this adds them to the members wrapper etc + await handleWithoutHistoryMembers({ groupPk, withoutHistory }); + + // lastly, handle the removal of members. + // we've already revoked their token above + // this removes them from the wrapper + await handleRemoveMembers({ groupPk, removed, secretKey: group.secretKey, fromCurrentDevice }); + + // push new members & key supplement in a single batch call + const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, supplementKeys); + if (batchResult !== RunJobResult.Success) { + throw new Error( + 'currentDeviceGroupMembersChange: pushChangesToGroupSwarmIfNeeded did not return success' + ); + } + + // schedule send invite details, auth signature, etc. to the new users + for (let index = 0; index < withoutHistory.length; index++) { + const member = withoutHistory[index]; + await GroupInvite.addGroupInviteJob({ groupPk, member }); + } + for (let index = 0; index < withHistory.length; index++) { + const member = withHistory[index]; + await GroupInvite.addGroupInviteJob({ groupPk, member }); + } + + const allAdded = [...withHistory, ...withoutHistory]; // those are already enforced to be unique (and without intersection) in `validateMemberChange()` + const timestamp = Date.now(); + if (fromCurrentDevice && allAdded.length) { + const msg = await ClosedGroup.addUpdateMessage( + convo, + { joiningMembers: allAdded }, + us, + timestamp + ); + await getMessageQueue().sendToGroupV2({ + message: new GroupUpdateMemberChangeMessage({ + added: allAdded, + groupPk, + typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.ADDED, + identifier: msg.id, + timestamp, + }), + }); + } + if (fromCurrentDevice && removed.length) { + const msg = await ClosedGroup.addUpdateMessage( + convo, + { kickedMembers: removed }, + us, + timestamp + ); + await getMessageQueue().sendToGroupV2({ + message: new GroupUpdateMemberChangeMessage({ + removed, + groupPk, + typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED, + identifier: msg.id, + timestamp: Date.now(), + }), + }); + } + + convo.set({ + active_at: timestamp, + }); + await convo.commit(); +} + +async function handleNameChangeFromUIOrNot({ + groupPk, + newName: uncheckedName, + fromCurrentDevice, +}: WithFromCurrentDevice & + WithGroupPubkey & { + newName: string; + }) { + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (!group || !group.secretKey || isEmpty(group.secretKey)) { + throw new Error('tried to make change to group but we do not have the admin secret key'); + } + + // this throws if the name is the same, or empty + const { newName, convo, us } = validateNameChange({ + newName: uncheckedName, + currentName: group.name || '', + groupPk, + }); + + group.name = newName; + await UserGroupsWrapperActions.setGroup(group); + console.warn('after set and refetcj', await UserGroupsWrapperActions.getGroup(group.pubkeyHex)); + const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); + if (batchResult !== RunJobResult.Success) { + throw new Error( + 'handleNameChangeFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' + ); + } + + const timestamp = Date.now(); + + if (fromCurrentDevice) { + const msg = await ClosedGroup.addUpdateMessage(convo, { newName }, us, timestamp); + await getMessageQueue().sendToGroupV2({ + message: new GroupUpdateInfoChangeMessage({ + groupPk, + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.NAME, + updatedName: newName, + identifier: msg.id, + timestamp: Date.now(), + }), + }); + } + + convo.set({ + active_at: timestamp, + }); + await convo.commit(); +} + +/** + * This action is used to trigger a change when the local user does a change to a group v2 members list. + * GroupV2 added members can be added two ways: with and without the history of messages. + * GroupV2 removed members have their subaccount token revoked on the server side so they cannot poll anymore from the group's swarm. + */ +const currentDeviceGroupMembersChange = createAsyncThunk( + 'group/currentDeviceGroupMembersChange', + async ( + { + groupPk, + ...args + }: { + groupPk: GroupPubkeyType; + addMembersWithHistory: Array; + addMembersWithoutHistory: Array; + removeMembers: Array; + }, + payloadCreator + ): Promise => { + const state = payloadCreator.getState() as StateType; + if (!state.groups.infos[groupPk] || !state.groups.members[groupPk]) { + throw new PreConditionFailed( + 'currentDeviceGroupMembersChange group not present in redux slice' + ); + } + + await handleMemberChangeFromUIOrNot({ groupPk, ...args, fromCurrentDevice: true }); + + return { + groupPk, + infos: await MetaGroupWrapperActions.infoGet(groupPk), + members: await MetaGroupWrapperActions.memberGetAll(groupPk), + }; + } +); + +const currentDeviceGroupNameChange = createAsyncThunk( + 'group/currentDeviceGroupNameChange', + async ( + { + groupPk, + ...args + }: { + groupPk: GroupPubkeyType; + newName: string; + }, + payloadCreator + ): Promise => { + const state = payloadCreator.getState() as StateType; + if (!state.groups.infos[groupPk] || !state.groups.members[groupPk]) { + throw new PreConditionFailed('currentDeviceGroupNameChange group not present in redux slice'); + } + + await handleNameChangeFromUIOrNot({ groupPk, ...args, fromCurrentDevice: true }); + + return { + groupPk, + infos: await MetaGroupWrapperActions.infoGet(groupPk), + members: await MetaGroupWrapperActions.memberGetAll(groupPk), + }; + } +); + /** * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. */ @@ -348,8 +754,8 @@ const groupSlice = createSlice({ state.creationFromUIPending = false; return state; }); - builder.addCase(initNewGroupInWrapper.rejected, state => { - window.log.error('a initNewGroupInWrapper was rejected'); + builder.addCase(initNewGroupInWrapper.rejected, (state, action) => { + window.log.error('a initNewGroupInWrapper was rejected', action.error); state.creationFromUIPending = false; return state; // FIXME delete the wrapper completely & corresponding dumps, and usergroups entry? @@ -368,8 +774,8 @@ const groupSlice = createSlice({ }); return state; }); - builder.addCase(loadMetaDumpsFromDB.rejected, state => { - window.log.error('a loadMetaDumpsFromDB was rejected'); + builder.addCase(loadMetaDumpsFromDB.rejected, (state, action) => { + window.log.error('a loadMetaDumpsFromDB was rejected', action.error); return state; }); builder.addCase(refreshGroupDetailsFromWrapper.fulfilled, (state, action) => { @@ -378,8 +784,8 @@ const groupSlice = createSlice({ state.infos[groupPk] = infos; state.members[groupPk] = members; - window.log.debug(`groupInfo after merge: ${stringify(infos)}`); - window.log.debug(`groupMembers after merge: ${stringify(members)}`); + // window.log.debug(`groupInfo after merge: ${stringify(infos)}`); + // window.log.debug(`groupMembers after merge: ${stringify(members)}`); } else { window.log.debug( `refreshGroupDetailsFromWrapper no details found, removing from slice: ${groupPk}}` @@ -390,8 +796,8 @@ const groupSlice = createSlice({ } return state; }); - builder.addCase(refreshGroupDetailsFromWrapper.rejected, () => { - window.log.error('a refreshGroupDetailsFromWrapper was rejected'); + builder.addCase(refreshGroupDetailsFromWrapper.rejected, (_state, action) => { + window.log.error('a refreshGroupDetailsFromWrapper was rejected', action.error); }); builder.addCase(destroyGroupDetails.fulfilled, (state, action) => { const { groupPk } = action.payload; @@ -399,8 +805,8 @@ const groupSlice = createSlice({ delete state.infos[groupPk]; delete state.members[groupPk]; }); - builder.addCase(destroyGroupDetails.rejected, () => { - window.log.error('a destroyGroupDetails was rejected'); + builder.addCase(destroyGroupDetails.rejected, (_state, action) => { + window.log.error('a destroyGroupDetails was rejected', action.error); }); builder.addCase(handleUserGroupUpdate.fulfilled, (state, action) => { const { infos, members, groupPk } = action.payload; @@ -419,8 +825,43 @@ const groupSlice = createSlice({ delete state.members[groupPk]; } }); - builder.addCase(handleUserGroupUpdate.rejected, () => { - window.log.error('a handleUserGroupUpdate was rejected'); + builder.addCase(handleUserGroupUpdate.rejected, (_state, action) => { + window.log.error('a handleUserGroupUpdate was rejected', action.error); + }); + builder.addCase(currentDeviceGroupMembersChange.fulfilled, (state, action) => { + state.memberChangesFromUIPending = false; + + const { infos, members, groupPk } = action.payload; + state.infos[groupPk] = infos; + state.members[groupPk] = members; + + window.log.debug(`groupInfo after currentDeviceGroupMembersChange: ${stringify(infos)}`); + window.log.debug(`groupMembers after currentDeviceGroupMembersChange: ${stringify(members)}`); + }); + builder.addCase(currentDeviceGroupMembersChange.rejected, (state, action) => { + window.log.error('a currentDeviceGroupMembersChange was rejected', action.error); + state.memberChangesFromUIPending = false; + }); + builder.addCase(currentDeviceGroupMembersChange.pending, state => { + state.memberChangesFromUIPending = true; + }); + + builder.addCase(currentDeviceGroupNameChange.fulfilled, (state, action) => { + state.nameChangesFromUIPending = false; + + const { infos, members, groupPk } = action.payload; + state.infos[groupPk] = infos; + state.members[groupPk] = members; + + window.log.debug(`groupInfo after currentDeviceGroupNameChange: ${stringify(infos)}`); + window.log.debug(`groupMembers after currentDeviceGroupNameChange: ${stringify(members)}`); + }); + builder.addCase(currentDeviceGroupNameChange.rejected, (state, action) => { + window.log.error('a currentDeviceGroupNameChange was rejected', action.error); + state.nameChangesFromUIPending = false; + }); + builder.addCase(currentDeviceGroupNameChange.pending, state => { + state.nameChangesFromUIPending = true; }); }, }); @@ -431,6 +872,8 @@ export const groupInfoActions = { destroyGroupDetails, refreshGroupDetailsFromWrapper, handleUserGroupUpdate, + currentDeviceGroupMembersChange, + currentDeviceGroupNameChange, ...groupSlice.actions, }; export const groupReducer = groupSlice.reducer; diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index fb9e88e8d1..333dd50032 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -10,7 +10,7 @@ function getMembersOfGroup(state: StateType, convo?: string): Array, memberPk: string) { return members.find(m => m.pubkeyHex === memberPk); } -export function getLibMembersPubkeys(state: StateType, convo?: string): Array { +export function getLibMembersPubkeys(state: StateType, convo?: string): Array { const members = getMembersOfGroup(state, convo); return members.map(m => m.pubkeyHex); @@ -32,6 +32,10 @@ function getIsCreatingGroupFromUI(state: StateType): boolean { return getLibGroupsState(state).creationFromUIPending; } +function getIsMemberGroupChangePendingFromUI(state: StateType): boolean { + return getLibGroupsState(state).memberChangesFromUIPending; +} + export function getLibAdminsPubkeys(state: StateType, convo?: string): Array { const members = getMembersOfGroup(state, convo); @@ -71,7 +75,7 @@ function getLibGroupName(state: StateType, convo?: string): string | undefined { if (!convo) { return undefined; } - if (!PubKey.isClosedGroupV2(convo)) { + if (!PubKey.is03Pubkey(convo)) { return undefined; } @@ -83,7 +87,7 @@ export function useLibGroupName(convoId?: string): string | undefined { return useSelector((state: StateType) => getLibGroupName(state, convoId)); } -export function useLibGroupMembers(convoId?: string): Array { +export function useLibGroupMembers(convoId?: string): Array { return useSelector((state: StateType) => getLibMembersPubkeys(state, convoId)); } @@ -124,6 +128,11 @@ export function useMemberIsPromoted(member: PubkeyType, groupPk: GroupPubkeyType export function useMemberPromotionFailed(member: PubkeyType, groupPk: GroupPubkeyType) { return useSelector((state: StateType) => getMemberPromotionFailed(state, member, groupPk)); } + export function useMemberPromotionPending(member: PubkeyType, groupPk: GroupPubkeyType) { return useSelector((state: StateType) => getMemberPromotionPending(state, member, groupPk)); } + +export function useMemberGroupChangePending() { + return useSelector(getIsMemberGroupChangePendingFromUI); +} diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index 810eef4d2a..d4e51397df 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -134,7 +134,7 @@ const getSelectedConversationIsGroupV2 = (state: StateType): boolean => { return false; } return selected.type - ? selected.type === ConversationTypeEnum.GROUPV2 && PubKey.isClosedGroupV2(selected.id) + ? selected.type === ConversationTypeEnum.GROUPV2 && PubKey.is03Pubkey(selected.id) : false; }; @@ -158,7 +158,7 @@ const getSelectedMembersCount = (state: StateType): number => { if (!selected) { return 0; } - if (PubKey.isClosedGroupV2(selected.id)) { + if (PubKey.is03Pubkey(selected.id)) { return getLibMembersPubkeys(state, selected.id).length || 0; } if (selected.isPrivate || selected.isPublic) { @@ -319,7 +319,7 @@ export function useSelectedNicknameOrProfileNameOrShortenedPubkey() { if (isMe) { return window.i18n('noteToSelf'); } - if (selectedId && PubKey.isClosedGroupV2(selectedId)) { + if (selectedId && PubKey.is03Pubkey(selectedId)) { return libGroupName; } return nickname || profileName || shortenedPubkey; diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index ea73fc35fe..5bccb57ed4 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -226,7 +226,8 @@ describe('libsession_metagroup', () => { promotionPending: true, }); - metaGroupWrapper.memberErase(member2); + const rekeyed = metaGroupWrapper.memberEraseAndRekey([member2]); + expect(rekeyed).to.be.eq(true); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ ...emptyMember(member), @@ -287,8 +288,10 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper2.keysNeedsRekey()).to.be.eq(false); // remove m2 from wrapper2, and m1 from wrapper1 - metaGroupWrapper2.memberErase(m2); - metaGroupWrapper.memberErase(m1); + const rekeyed1 = metaGroupWrapper2.memberEraseAndRekey([m2]); + const rekeyed2 = metaGroupWrapper.memberEraseAndRekey([m1]); + expect(rekeyed1).to.be.eq(true); + expect(rekeyed2).to.be.eq(true); // const push1 = metaGroupWrapper.push(); // metaGroupWrapper2.metaMerge([push1]); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index fb4b28fa27..a3dfa5bbdf 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -271,7 +271,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); it('call savesDumpToDb even if no changes are required on the serverside', async () => { - const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); pendingChangesForGroupStub.resolves(undefined); expect(result).to.be.eq(RunJobResult.Success); expect(sendStub.callCount).to.be.eq(0); @@ -290,7 +290,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { messages: [info, member], allOldHashes: new Set('123'), }); - const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); sendStub.resolves(undefined); expect(result).to.be.eq(RunJobResult.RetryJobIfPossible); // not returning anything in the sendstub so network issue happened @@ -349,7 +349,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { { code: 200, body: { hash: 'hashmember' } }, { code: 200, body: {} }, // because we are giving a set of allOldHashes ]); - const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); expect(sendStub.callCount).to.be.eq(1); expect(pendingChangesForGroupStub.callCount).to.be.eq(1); diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 70afb91a25..2959a88596 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -423,9 +423,9 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberGetAll']) as Promise< ReturnType >, - memberErase: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => - callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberErase', pubkeyHex]) as Promise< - ReturnType + memberEraseAndRekey: async (groupPk: GroupPubkeyType, members: Array) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberEraseAndRekey', members]) as Promise< + ReturnType >, memberSetAccepted: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberSetAccepted', pubkeyHex]) as Promise< @@ -506,6 +506,12 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { 'makeSwarmSubAccount', memberPubkeyHex, ]) as Promise>, + generateSupplementKeys: async (groupPk: GroupPubkeyType, membersPubkeyHex: Array) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'generateSupplementKeys', + membersPubkeyHex, + ]) as Promise>, swarmSubaccountSign: async ( groupPk: GroupPubkeyType, message: Uint8Array, @@ -517,6 +523,19 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { message, authData, ]) as Promise>, + + swarmSubAccountToken: async (groupPk: GroupPubkeyType, memberPk: PubkeyType) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'swarmSubAccountToken', + memberPk, + ]) as Promise>, + swarmVerifySubAccount: async (groupPk: GroupPubkeyType, signingValue: Uint8ArrayLen100) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'swarmVerifySubAccount', + signingValue, + ]) as Promise>, }; export const callLibSessionWorker = async ( From 9595f09085131e1a984562d0d8b863ca912ccb5a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 13 Nov 2023 16:22:10 +1100 Subject: [PATCH 058/302] fix: add setadmin on promote accepts also sign/verify group update messages --- protos/SignalService.proto | 19 +- ts/models/message.ts | 4 +- ts/receiver/contentMessage.ts | 2 - ts/receiver/groupv2/handleGroupV2Message.ts | 368 ++++++++++++++++-- ts/session/apis/snode_api/namespaces.ts | 11 + ts/session/group/closed-group.ts | 24 +- .../group_v2/GroupUpdateMessage.ts | 6 + .../to_group/GroupUpdateInfoChangeMessage.ts | 63 ++- .../GroupUpdateMemberChangeMessage.ts | 23 +- .../to_user/GroupUpdateDeleteMessage.ts | 4 +- ts/session/sending/MessageSender.ts | 2 + ts/state/ducks/groups.ts | 75 +++- .../libsession_wrapper_metagroup_test.ts | 1 + .../browser/libsession_worker_interface.ts | 4 + 14 files changed, 517 insertions(+), 89 deletions(-) diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 30e7e65ddb..053403f389 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -90,13 +90,12 @@ message GroupUpdateInviteMessage { required string name = 2; required bytes memberAuthData = 3; // @required - required bytes adminSignature = 6; + required bytes adminSignature = 4; } + message GroupUpdateDeleteMessage { - // @required - required string groupSessionId = 1; // The `groupIdentityPublicKey` with a `03` prefix - // @required - required bytes adminSignature = 2; + repeated string memberSessionIds = 1; + required bytes adminSignature = 2; } @@ -111,6 +110,7 @@ message GroupUpdateInfoChangeMessage { required Type type = 1; optional string updatedName = 2; optional uint32 updatedExpiration = 3; + required bytes adminSignature = 4; } message GroupUpdateMemberChangeMessage { @@ -122,7 +122,8 @@ message GroupUpdateMemberChangeMessage { // @required required Type type = 1; - repeated string memberSessionIds = 2; + repeated string memberSessionIds = 2; + required bytes adminSignature = 3; } @@ -142,9 +143,9 @@ message GroupUpdateInviteResponseMessage { message GroupUpdateDeleteMemberContentMessage { - repeated string memberSessionIds = 1; - // @required - required bytes adminSignature = 2; + repeated string memberSessionIds = 1; + repeated string messageHashes = 2; + optional bytes adminSignature = 3; } message GroupUpdateMessage { diff --git a/ts/models/message.ts b/ts/models/message.ts index 2b6ab91851..2c4b13460a 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -997,14 +997,12 @@ export class MessageModel extends Backbone.Model { if (!this.id) { throw new Error('A message always needs an id'); } - - perfStart(`messageCommit-${this.id}`); + console.warn('this.attributes', JSON.stringify(this.attributes)); // because the saving to db calls _cleanData which mutates the field for cleaning, we need to save a copy const id = await Data.saveMessage(cloneDeep(this.attributes)); if (triggerUIUpdate) { this.dispatchMessageUpdate(); } - perfEnd(`messageCommit-${this.id}`, 'messageCommit'); return id; } diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index be56c56afe..a45e389cda 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -38,8 +38,6 @@ import { ECKeyPair } from './keypairs'; export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageHash: string) { try { - console.warn('444 envelope.source', envelope.source); - console.warn('444 envelope.senderIdentity', envelope.senderIdentity); const decryptedForAll = await decrypt(envelope); if (!decryptedForAll || !decryptedForAll.decryptedContent || isEmpty(decryptedForAll)) { diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index e857cc3c00..71c2f7b33c 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -1,16 +1,22 @@ -import { PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; -import { isEmpty } from 'lodash'; +import { GroupPubkeyType, PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; +import { isEmpty, isFinite, isNumber } from 'lodash'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { ConvoHub } from '../../session/conversations'; +import { getSodiumRenderer } from '../../session/crypto'; import { ClosedGroup } from '../../session/group/closed-group'; import { ed25519Str } from '../../session/onions/onionPath'; import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; +import { stringToUint8Array } from '../../session/utils/String'; +import { PreConditionFailed } from '../../session/utils/errors'; +import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; +import { groupInfoActions } from '../../state/ducks/groups'; import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; +import { BlockedNumberController } from '../../util'; import { MetaGroupWrapperActions, UserGroupsWrapperActions, @@ -27,11 +33,7 @@ type GroupInviteDetails = { } & WithEnvelopeTimestamp & WithAuthor; -type GroupMemberChangeDetails = { - memberChangeDetails: SignalService.GroupUpdateMemberChangeMessage; -} & WithEnvelopeTimestamp & - WithGroupPubkey & - WithAuthor; +type GroupUpdateGeneric = { change: T } & WithEnvelopeTimestamp & WithGroupPubkey & WithAuthor; type GroupUpdateDetails = { updateMessage: SignalService.GroupUpdateMessage; @@ -43,22 +45,39 @@ async function handleGroupInviteMessage({ envelopeTimestamp, }: GroupInviteDetails) { if (!PubKey.is03Pubkey(inviteMessage.groupSessionId)) { - // invite to a group which has not a 03 prefix, we can just drop it. return; } + + if (BlockedNumberController.isBlocked(author)) { + window.log.info( + `received invite to group ${ed25519Str( + inviteMessage.groupSessionId + )} by blocked user:${ed25519Str(author)}... dropping it` + ); + return; + } + const sigValid = await verifySig({ + pubKey: HexString.fromHexString(inviteMessage.groupSessionId), + signature: inviteMessage.adminSignature, + data: stringToUint8Array(`INVITE${UserUtils.getOurPubKeyStrFromCache()}${envelopeTimestamp}`), + }); + + if (!sigValid) { + window.log.warn('received group invite with invalid signature. dropping'); + return; + } + window.log.debug( `received invite to group ${ed25519Str(inviteMessage.groupSessionId)} by user:${ed25519Str( author )}` ); - // TODO verify sig invite adminSignature const convo = await ConvoHub.use().getOrCreateAndWait( inviteMessage.groupSessionId, ConversationTypeEnum.GROUPV2 ); convo.set({ active_at: envelopeTimestamp, - didApproveMe: true, }); if (inviteMessage.name && isEmpty(convo.getRealSessionUsername())) { @@ -94,33 +113,107 @@ async function handleGroupInviteMessage({ ).buffer, }); await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); + await UserSync.queueNewJobIfNeeded(); // TODO use the pending so we actually don't start polling here unless it is not in the pending state. // once everything is ready, start polling using that authData to get the keys, members, details of that group, and its messages. getSwarmPollingInstance().addGroupId(inviteMessage.groupSessionId); } -async function handleGroupMemberChangeMessage({ - memberChangeDetails, +async function verifySig({ + data, + pubKey, + signature, +}: { + data: Uint8Array; + signature: Uint8Array; + pubKey: Uint8Array; +}) { + const sodium = await getSodiumRenderer(); + return sodium.crypto_sign_verify_detached(signature, data, pubKey); +} + +async function handleGroupInfoChangeMessage({ + change, groupPk, envelopeTimestamp, author, -}: GroupMemberChangeDetails) { - if (!PubKey.is03Pubkey(groupPk)) { - // invite to a group which has not a 03 prefix, we can just drop it. +}: GroupUpdateGeneric) { + const sigValid = await verifySig({ + pubKey: HexString.fromHexString(groupPk), + signature: change.adminSignature, + data: stringToUint8Array(`INFO_CHANGE${change.type}${envelopeTimestamp}`), + }); + if (!sigValid) { + window.log.warn('received group info change with invalid signature. dropping'); return; } - // TODO verify sig invite adminSignature const convo = ConvoHub.use().get(groupPk); if (!convo) { return; } - switch (memberChangeDetails.type) { + switch (change.type) { + case SignalService.GroupUpdateInfoChangeMessage.Type.NAME: { + await ClosedGroup.addUpdateMessage( + convo, + { newName: change.updatedName }, + author, + envelopeTimestamp + ); + + break; + } + case SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR: { + console.warn('Not implemented'); + throw new Error('Not implemented'); + } + case SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES: { + if ( + change.updatedExpiration && + isNumber(change.updatedExpiration) && + isFinite(change.updatedExpiration) && + change.updatedExpiration >= 0 + ) { + await convo.updateExpireTimer(change.updatedExpiration, author, envelopeTimestamp); + } + break; + } + default: + return; + } + + convo.set({ + active_at: envelopeTimestamp, + }); +} + +async function handleGroupMemberChangeMessage({ + change, + groupPk, + envelopeTimestamp, + author, +}: GroupUpdateGeneric) { + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + return; + } + + const sigValid = await verifySig({ + pubKey: HexString.fromHexString(groupPk), + signature: change.adminSignature, + data: stringToUint8Array(`MEMBER_CHANGE${change.type}${envelopeTimestamp}`), + }); + if (!sigValid) { + window.log.warn('received group member change with invalid signature. dropping'); + return; + } + + switch (change.type) { case SignalService.GroupUpdateMemberChangeMessage.Type.ADDED: { await ClosedGroup.addUpdateMessage( convo, - { joiningMembers: memberChangeDetails.memberSessionIds }, + { joiningMembers: change.memberSessionIds }, author, envelopeTimestamp ); @@ -130,7 +223,7 @@ async function handleGroupMemberChangeMessage({ case SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED: { await ClosedGroup.addUpdateMessage( convo, - { kickedMembers: memberChangeDetails.memberSessionIds }, + { kickedMembers: change.memberSessionIds }, author, envelopeTimestamp ); @@ -139,7 +232,7 @@ async function handleGroupMemberChangeMessage({ case SignalService.GroupUpdateMemberChangeMessage.Type.PROMOTED: { await ClosedGroup.addUpdateMessage( convo, - { promotedMembers: memberChangeDetails.memberSessionIds }, + { promotedMembers: change.memberSessionIds }, author, envelopeTimestamp ); @@ -151,27 +244,187 @@ async function handleGroupMemberChangeMessage({ convo.set({ active_at: envelopeTimestamp, - didApproveMe: true, }); } -async function handleGroupUpdateMessage( +async function handleGroupMemberLeftMessage({ + groupPk, + envelopeTimestamp, + author, +}: GroupUpdateGeneric) { + // No need to verify sig, the author is already verified with the libsession.decrypt() + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + return; + } + + await ClosedGroup.addUpdateMessage( + convo, + { leavingMembers: [author] }, + author, + envelopeTimestamp + ); + convo.set({ + active_at: envelopeTimestamp, + }); + // TODO We should process this message type even if the sender is blocked +} + +async function handleGroupDeleteMemberContentMessage({ + groupPk, + envelopeTimestamp, + change, +}: GroupUpdateGeneric) { + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + return; + } + + const sigValid = await verifySig({ + pubKey: HexString.fromHexString(groupPk), + signature: change.adminSignature, + data: stringToUint8Array( + `DELETE_CONTENT${envelopeTimestamp}${change.memberSessionIds.join()}${change.messageHashes.join()}` + ), + }); + + if (!sigValid) { + window.log.warn('received group member delete content with invalid signature. dropping'); + return; + } + + // TODO we should process this message type even if the sender is blocked + console.warn('Not implemented'); + convo.set({ + active_at: envelopeTimestamp, + }); + throw new Error('Not implemented'); +} + +async function handleGroupUpdateDeleteMessage({ + groupPk, + envelopeTimestamp, + change, +}: GroupUpdateGeneric) { + // TODO verify sig? + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + return; + } + const sigValid = await verifySig({ + pubKey: HexString.fromHexString(groupPk), + signature: change.adminSignature, + data: stringToUint8Array(`DELETE${envelopeTimestamp}${change.memberSessionIds.join()}`), + }); + + if (!sigValid) { + window.log.warn('received group delete message with invalid signature. dropping'); + return; + } + convo.set({ + active_at: envelopeTimestamp, + }); + console.warn('Not implemented'); + throw new Error('Not implemented'); + // TODO We should process this message type even if the sender is blocked +} + +async function handleGroupUpdateInviteResponseMessage({ + groupPk, + envelopeTimestamp, +}: GroupUpdateGeneric) { + // no sig verify for this type of messages + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + return; + } + convo.set({ + active_at: envelopeTimestamp, + }); + console.warn('Not implemented'); + + // TODO We should process this message type even if the sender is blocked + throw new Error('Not implemented'); +} + +async function handleGroupUpdatePromoteMessage({ + change, +}: Omit, 'groupPk'>) { + const seed = change.groupIdentitySeed; + const sodium = await getSodiumRenderer(); + const groupKeypair = sodium.crypto_sign_seed_keypair(seed); + + const groupPk = `03${HexString.toHexString(groupKeypair.publicKey)}` as GroupPubkeyType; + + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + return; + } + // no group update message here, another message is sent to the group's swarm for the update message. + // this message is just about the keys that we need to save, and accepting the promotion. + + const found = await UserGroupsWrapperActions.getGroup(groupPk); + + if (!found) { + // could have been removed by the user already so let's not force create it + window.log.info( + 'received group promote message but that group is not in the usergroups wrapper' + ); + return; + } + found.secretKey = groupKeypair.privateKey; + await UserGroupsWrapperActions.setGroup(found); + await UserSync.queueNewJobIfNeeded(); + + window.inboxStore.dispatch( + groupInfoActions.markUsAsAdmin({ + groupPk, + }) + ); + + // TODO we should process this even if the sender is blocked +} + +async function handle1o1GroupUpdateMessage( details: GroupUpdateDetails & WithUncheckedSource & WithUncheckedSenderIdentity ) { - if (details.updateMessage.inviteMessage) { - // the invite message is received from our own swarm, so source is the sender, and senderIdentity is empty - const author = details.source; - if (!PubKey.is05Pubkey(author)) { - window.log.warn('received group inviteMessage with invalid author'); - return; + // the message types below are received from our own swarm, so source is the sender, and senderIdentity is empty + + if (details.updateMessage.inviteMessage || details.updateMessage.promoteMessage) { + if (!PubKey.is05Pubkey(details.source)) { + window.log.warn('received group invite/promote with invalid author'); + throw new PreConditionFailed('received group invite/promote with invalid author'); } - await handleGroupInviteMessage({ - inviteMessage: details.updateMessage.inviteMessage as SignalService.GroupUpdateInviteMessage, - ...details, - author, - }); + if (details.updateMessage.inviteMessage) { + await handleGroupInviteMessage({ + inviteMessage: details.updateMessage + .inviteMessage as SignalService.GroupUpdateInviteMessage, + ...details, + author: details.source, + }); + } else if (details.updateMessage.promoteMessage) { + await handleGroupUpdatePromoteMessage({ + change: details.updateMessage.promoteMessage as SignalService.GroupUpdatePromoteMessage, + ...details, + author: details.source, + }); + } + + // returns true for all cases where this message was expected to be a 1o1 message, even if not processed + return true; + } + + return false; +} + +async function handleGroupUpdateMessage( + details: GroupUpdateDetails & WithUncheckedSource & WithUncheckedSenderIdentity +) { + const was1o1Message = await handle1o1GroupUpdateMessage(details); + if (was1o1Message) { return; } + // other messages are received from the groups swarm, so source is the groupPk, and senderIdentity is the author const author = details.senderIdentity; const groupPk = details.source; @@ -179,16 +432,57 @@ async function handleGroupUpdateMessage( window.log.warn('received group update message with invalid author or groupPk'); return; } + const detailsWithContext = { ...details, author, groupPk }; + if (details.updateMessage.memberChangeMessage) { await handleGroupMemberChangeMessage({ - memberChangeDetails: details.updateMessage + change: details.updateMessage .memberChangeMessage as SignalService.GroupUpdateMemberChangeMessage, - ...details, - author, - groupPk, + ...detailsWithContext, + }); + return; + } + + if (details.updateMessage.infoChangeMessage) { + await handleGroupInfoChangeMessage({ + change: details.updateMessage.infoChangeMessage as SignalService.GroupUpdateInfoChangeMessage, + ...detailsWithContext, }); return; } + + if (details.updateMessage.memberLeftMessage) { + await handleGroupMemberLeftMessage({ + change: details.updateMessage.memberLeftMessage as SignalService.GroupUpdateMemberLeftMessage, + ...detailsWithContext, + }); + return; + } + if (details.updateMessage.deleteMemberContent) { + await handleGroupDeleteMemberContentMessage({ + change: details.updateMessage + .deleteMemberContent as SignalService.GroupUpdateDeleteMemberContentMessage, + ...detailsWithContext, + }); + return; + } + if (details.updateMessage.deleteMessage) { + await handleGroupUpdateDeleteMessage({ + change: details.updateMessage.deleteMessage as SignalService.GroupUpdateDeleteMessage, + ...detailsWithContext, + }); + return; + } + if (details.updateMessage.inviteResponse) { + await handleGroupUpdateInviteResponseMessage({ + change: details.updateMessage + .inviteResponse as SignalService.GroupUpdateInviteResponseMessage, + ...detailsWithContext, + }); + return; + } + + window.log.warn('received group update of unknown type. Discarding...'); } export const GroupV2Receiver = { handleGroupUpdateMessage }; diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index d3402103ed..9df6de690f 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -31,6 +31,11 @@ export enum SnodeNamespaces { */ UserGroups = 5, + /** + * This is the namespace that revoked members can still poll messages from + */ + ClosedGroupRevokedRetrievableMessages = -11, + /** * This is the namespace used to sync the closed group messages for each closed group */ @@ -97,6 +102,7 @@ function isUserConfigNamespace(namespace: SnodeNamespaces): namespace is UserCon case SnodeNamespaces.ClosedGroupMembers: case SnodeNamespaces.ClosedGroupMessages: case SnodeNamespaces.LegacyClosedGroup: + case SnodeNamespaces.ClosedGroupRevokedRetrievableMessages: case SnodeNamespaces.Default: // user messages is not hosting config based messages return false; @@ -125,6 +131,7 @@ function isGroupConfigNamespace( case SnodeNamespaces.ConvoInfoVolatile: case SnodeNamespaces.LegacyClosedGroup: case SnodeNamespaces.ClosedGroupMessages: + case SnodeNamespaces.ClosedGroupRevokedRetrievableMessages: return false; case SnodeNamespaces.ClosedGroupInfo: case SnodeNamespaces.ClosedGroupKeys: @@ -153,6 +160,9 @@ function isGroupNamespace(namespace: SnodeNamespaces): namespace is SnodeNamespa if (namespace === SnodeNamespaces.ClosedGroupMessages) { return true; } + if (namespace === SnodeNamespaces.ClosedGroupRevokedRetrievableMessages) { + return true; + } switch (namespace) { case SnodeNamespaces.Default: case SnodeNamespaces.UserContacts: @@ -185,6 +195,7 @@ function namespacePriority(namespace: SnodeNamespaces): 10 | 1 { case SnodeNamespaces.ClosedGroupInfo: case SnodeNamespaces.ClosedGroupMembers: case SnodeNamespaces.ClosedGroupKeys: + case SnodeNamespaces.ClosedGroupRevokedRetrievableMessages: return 1; default: diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 92ccf2935c..7a2fc7dfbe 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -1,11 +1,13 @@ import _, { isFinite, isNumber } from 'lodash'; import { v4 as uuidv4 } from 'uuid'; +import { PubkeyType } from 'libsession_util_nodejs'; import { getMessageQueue } from '..'; import { Data } from '../../data/data'; import { ConversationModel } from '../../models/conversation'; import { ConversationAttributes, ConversationTypeEnum } from '../../models/conversationAttributes'; import { MessageModel } from '../../models/message'; +import { MessageGroupUpdate } from '../../models/messageType'; import { SignalService } from '../../protobuf'; import { addKeyPairToCacheAndDBIfNeeded, @@ -37,10 +39,6 @@ export type GroupInfo = { admins?: Array; }; -export interface GroupDiff extends MemberChanges { - newName?: string; -} - export interface MemberChanges { joiningMembers?: Array; leavingMembers?: Array; @@ -48,6 +46,10 @@ export interface MemberChanges { promotedMembers?: Array; } +export interface GroupDiff extends MemberChanges { + newName?: string; +} + /** * This function is only called when the local user makes a change to a group. * So this function is not called on group updates from the network, even from another of our devices. @@ -141,7 +143,7 @@ async function addUpdateMessage( sender: string, sentAt: number ): Promise { - const groupUpdate: any = {}; + const groupUpdate: MessageGroupUpdate = {}; if (diff.newName) { groupUpdate.name = diff.newName; @@ -149,14 +151,14 @@ async function addUpdateMessage( if (diff.joiningMembers) { groupUpdate.joined = diff.joiningMembers; - } - - if (diff.leavingMembers) { + } else if (diff.leavingMembers) { groupUpdate.left = diff.leavingMembers; - } - - if (diff.kickedMembers) { + } else if (diff.kickedMembers) { groupUpdate.kicked = diff.kickedMembers; + } else if (diff.promotedMembers) { + groupUpdate.promoted = diff.promotedMembers as Array; + } else { + throw new Error('addUpdateMessage with unknown type of change'); } if (UserUtils.isUsFromCache(sender)) { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts index 2156a9e68b..c4d122950f 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts @@ -1,8 +1,14 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { SignalService } from '../../../../../protobuf'; +import { LibSodiumWrappers } from '../../../../crypto'; import { DataMessage } from '../../DataMessage'; import { MessageParams } from '../../Message'; +export type AdminSigDetails = { + secretKey: Uint8Array; + sodium: LibSodiumWrappers; +}; + export interface GroupUpdateMessageParams extends MessageParams { groupPk: GroupPubkeyType; } diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts index 6fb7b40b7d..67fa4b101f 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts @@ -1,21 +1,31 @@ import { isEmpty, isFinite } from 'lodash'; import { SignalService } from '../../../../../../protobuf'; import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; -import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; +import { LibSodiumWrappers } from '../../../../../crypto'; +import { stringToUint8Array } from '../../../../../utils/String'; +import { PreConditionFailed } from '../../../../../utils/errors'; +import { + AdminSigDetails, + GroupUpdateMessage, + GroupUpdateMessageParams, +} from '../GroupUpdateMessage'; -type NameChangeParams = GroupUpdateMessageParams & { - typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.NAME; - updatedName: string; -}; +type NameChangeParams = GroupUpdateMessageParams & + AdminSigDetails & { + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.NAME; + updatedName: string; + }; -type AvatarChangeParams = GroupUpdateMessageParams & { - typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR; -}; +type AvatarChangeParams = GroupUpdateMessageParams & + AdminSigDetails & { + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR; + }; -type DisappearingMessageChangeParams = GroupUpdateMessageParams & { - typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES; - updatedExpirationSeconds: number; -}; +type DisappearingMessageChangeParams = GroupUpdateMessageParams & + AdminSigDetails & { + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES; + updatedExpirationSeconds: number; + }; /** * GroupUpdateInfoChangeMessage is sent as a message to group's swarm. @@ -25,12 +35,16 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { public readonly updatedName: string = ''; public readonly updatedExpirationSeconds: number = 0; public readonly namespace = SnodeNamespaces.ClosedGroupMessages; + private readonly secretKey: Uint8Array; // not sent, only used for signing content as part of the message + private readonly sodium: LibSodiumWrappers; constructor(params: NameChangeParams | AvatarChangeParams | DisappearingMessageChangeParams) { super(params); const types = SignalService.GroupUpdateInfoChangeMessage.Type; this.typeOfChange = params.typeOfChange; + this.secretKey = params.secretKey; + this.sodium = params.sodium; switch (params.typeOfChange) { case types.NAME: { @@ -42,6 +56,7 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { } case types.AVATAR: // nothing to do for avatar + throw new PreConditionFailed('not implemented'); break; case types.DISAPPEARING_MESSAGES: { if (!isFinite(params.updatedExpirationSeconds) || params.updatedExpirationSeconds < 0) { @@ -58,16 +73,26 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { public dataProto(): SignalService.DataMessage { const infoChangeMessage = new SignalService.GroupUpdateInfoChangeMessage({ type: this.typeOfChange, + adminSignature: this.sodium.crypto_sign_detached( + stringToUint8Array(`INFO_CHANGE${this.typeOfChange}${this.timestamp}`), + this.secretKey + ), }); + switch (this.typeOfChange) { + case SignalService.GroupUpdateInfoChangeMessage.Type.NAME: + infoChangeMessage.updatedName = this.updatedName; - if (this.typeOfChange === SignalService.GroupUpdateInfoChangeMessage.Type.NAME) { - infoChangeMessage.updatedName = this.updatedName; - } - if ( - this.typeOfChange === SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES - ) { - infoChangeMessage.updatedExpiration = this.updatedExpirationSeconds; + break; + case SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES: + infoChangeMessage.updatedExpiration = this.updatedExpirationSeconds; + + break; + + case SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR: + default: + break; } + return new SignalService.DataMessage({ groupUpdateMessage: { infoChangeMessage } }); } diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts index d6ae144ed4..fc3a4e38a9 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts @@ -3,7 +3,13 @@ import { isEmpty } from 'lodash'; import { SignalService } from '../../../../../../protobuf'; import { assertUnreachable } from '../../../../../../types/sqlSharedTypes'; import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; -import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; +import { LibSodiumWrappers } from '../../../../../crypto'; +import { stringToUint8Array } from '../../../../../utils/String'; +import { + AdminSigDetails, + GroupUpdateMessage, + GroupUpdateMessageParams, +} from '../GroupUpdateMessage'; type MembersAddedMessageParams = GroupUpdateMessageParams & { typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.ADDED; @@ -27,15 +33,24 @@ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { public readonly typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type; public readonly memberSessionIds: Array = []; // added, removed, promoted based on the type. public readonly namespace = SnodeNamespaces.ClosedGroupMessages; + private readonly secretKey: Uint8Array; // not sent, only used for signing content as part of the message + private readonly sodium: LibSodiumWrappers; constructor( - params: MembersAddedMessageParams | MembersRemovedMessageParams | MembersPromotedMessageParams + params: ( + | MembersAddedMessageParams + | MembersRemovedMessageParams + | MembersPromotedMessageParams + ) & + AdminSigDetails ) { super(params); const { Type } = SignalService.GroupUpdateMemberChangeMessage; const { typeOfChange } = params; this.typeOfChange = typeOfChange; + this.secretKey = params.secretKey; + this.sodium = params.sodium; switch (typeOfChange) { case Type.ADDED: { @@ -68,6 +83,10 @@ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { const memberChangeMessage = new SignalService.GroupUpdateMemberChangeMessage({ type: this.typeOfChange, memberSessionIds: this.memberSessionIds, + adminSignature: this.sodium.crypto_sign_detached( + stringToUint8Array(`MEMBER_CHANGE${this.typeOfChange}${this.timestamp}`), + this.secretKey + ), }); return new SignalService.DataMessage({ groupUpdateMessage: { memberChangeMessage } }); diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts index 8923a54996..4059cfeeec 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts @@ -7,7 +7,7 @@ interface Params extends GroupUpdateMessageParams { } /** - * GroupUpdateDeleteMessage is sent as a 1o1 message to the recipient, not through the group's swarm. + * GroupUpdateDeleteMessage is sent to the group's swarm on the `revokedRetrievableGroupMessages` */ export class GroupUpdateDeleteMessage extends GroupUpdateMessage { public readonly adminSignature: Params['adminSignature']; @@ -27,9 +27,9 @@ export class GroupUpdateDeleteMessage extends GroupUpdateMessage { public dataProto(): SignalService.DataMessage { const deleteMessage = new SignalService.GroupUpdateDeleteMessage({ - groupSessionId: this.destination, adminSignature: this.adminSignature, }); + throw new Error('Not implemented'); return new SignalService.DataMessage({ groupUpdateMessage: { deleteMessage } }); } diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index eea887dca2..4783f944bd 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -61,7 +61,9 @@ function overwriteOutgoingTimestampWithNetworkTimestamp(message: { plainTextBuff if ( dataMessage.syncTarget || dataMessage.groupUpdateMessage?.inviteMessage || + dataMessage.groupUpdateMessage?.infoChangeMessage || dataMessage.groupUpdateMessage?.deleteMemberContent || + dataMessage.groupUpdateMessage?.memberChangeMessage || dataMessage.groupUpdateMessage?.deleteMessage ) { return { diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index ef5a7527ae..c66adedebb 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -21,6 +21,7 @@ import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces'; import { RevokeChanges, SnodeAPIRevoke } from '../../session/apis/snode_api/revokeSubaccount'; import { SnodeGroupSignature } from '../../session/apis/snode_api/signature/groupSignature'; import { ConvoHub } from '../../session/conversations'; +import { getSodiumRenderer } from '../../session/crypto'; import { ClosedGroup } from '../../session/group/closed-group'; import { GroupUpdateInfoChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { GroupUpdateMemberChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; @@ -32,6 +33,7 @@ import { PreConditionFailed } from '../../session/utils/errors'; import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; import { GroupInvite } from '../../session/utils/job_runners/jobs/GroupInviteJob'; import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; +import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { getGroupPubkeyFromWrapperType, @@ -129,7 +131,7 @@ const initNewGroupInWrapper = createAsyncThunk( const member = uniqMembers[index]; const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); if (created.pubkeyHex === us) { - await MetaGroupWrapperActions.memberSetPromoted(groupPk, created.pubkeyHex, false); + await MetaGroupWrapperActions.memberSetAdmin(groupPk, created.pubkeyHex); } else { await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); } @@ -474,11 +476,14 @@ async function handleRemoveMembers({ timestamp, adminSignature: from_base64(adminSignature.signature, base64_variants.ORIGINAL), }); + console.warn( + 'TODO: poll from namespace -11, handle messages and sig for it, batch request handle 401/403, but 200 ok for this -11 namespace' + ); const sentStatus = await getMessageQueue().sendToPubKeyNonDurably({ pubkey: PubKey.cast(m), message: deleteMessage, - namespace: SnodeNamespaces.Default, + namespace: SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, }); if (!sentStatus) { window.log.warn('Failed to send a GroupUpdateDeleteMessage to a member removed: ', m); @@ -581,6 +586,7 @@ async function handleMemberChangeFromUIOrNot({ const member = withHistory[index]; await GroupInvite.addGroupInviteJob({ groupPk, member }); } + const sodium = await getSodiumRenderer(); const allAdded = [...withHistory, ...withoutHistory]; // those are already enforced to be unique (and without intersection) in `validateMemberChange()` const timestamp = Date.now(); @@ -598,6 +604,8 @@ async function handleMemberChangeFromUIOrNot({ typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.ADDED, identifier: msg.id, timestamp, + secretKey: group.secretKey, + sodium, }), }); } @@ -614,7 +622,9 @@ async function handleMemberChangeFromUIOrNot({ groupPk, typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED, identifier: msg.id, - timestamp: Date.now(), + timestamp: GetNetworkTime.getNowWithNetworkOffset(), + secretKey: group.secretKey, + sodium, }), }); } @@ -637,6 +647,10 @@ async function handleNameChangeFromUIOrNot({ if (!group || !group.secretKey || isEmpty(group.secretKey)) { throw new Error('tried to make change to group but we do not have the admin secret key'); } + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + if (!infos) { + throw new PreConditionFailed('nameChange infoGet is empty'); + } // this throws if the name is the same, or empty const { newName, convo, us } = validateNameChange({ @@ -646,8 +660,10 @@ async function handleNameChangeFromUIOrNot({ }); group.name = newName; + infos.name = newName; await UserGroupsWrapperActions.setGroup(group); - console.warn('after set and refetcj', await UserGroupsWrapperActions.getGroup(group.pubkeyHex)); + await MetaGroupWrapperActions.infoSet(groupPk, infos); + const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); if (batchResult !== RunJobResult.Success) { throw new Error( @@ -655,6 +671,8 @@ async function handleNameChangeFromUIOrNot({ ); } + await UserSync.queueNewJobIfNeeded(); + const timestamp = Date.now(); if (fromCurrentDevice) { @@ -666,6 +684,8 @@ async function handleNameChangeFromUIOrNot({ updatedName: newName, identifier: msg.id, timestamp: Date.now(), + secretKey: group.secretKey, + sodium: await getSodiumRenderer(), }), }); } @@ -712,6 +732,41 @@ const currentDeviceGroupMembersChange = createAsyncThunk( } ); +const markUsAsAdmin = createAsyncThunk( + 'group/markUsAsAdmin', + async ( + { + groupPk, + }: { + groupPk: GroupPubkeyType; + }, + payloadCreator + ): Promise => { + const state = payloadCreator.getState() as StateType; + if (!state.groups.infos[groupPk] || !state.groups.members[groupPk]) { + throw new PreConditionFailed('markUsAsAdmin group not present in redux slice'); + } + const us = UserUtils.getOurPubKeyStrFromCache(); + + if (state.groups.members[groupPk].find(m => m.pubkeyHex === us)?.admin) { + // we are already an admin, nothing to do + return { + groupPk, + infos: await MetaGroupWrapperActions.infoGet(groupPk), + members: await MetaGroupWrapperActions.memberGetAll(groupPk), + }; + } + await MetaGroupWrapperActions.memberSetAdmin(groupPk, us); + await GroupSync.queueNewJobIfNeeded(groupPk); + + return { + groupPk, + infos: await MetaGroupWrapperActions.infoGet(groupPk), + members: await MetaGroupWrapperActions.memberGetAll(groupPk), + }; + } +); + const currentDeviceGroupNameChange = createAsyncThunk( 'group/currentDeviceGroupNameChange', async ( @@ -863,6 +918,17 @@ const groupSlice = createSlice({ builder.addCase(currentDeviceGroupNameChange.pending, state => { state.nameChangesFromUIPending = true; }); + builder.addCase(markUsAsAdmin.fulfilled, (state, action) => { + const { infos, members, groupPk } = action.payload; + state.infos[groupPk] = infos; + state.members[groupPk] = members; + + window.log.debug(`groupInfo after markUsAsAdmin: ${stringify(infos)}`); + window.log.debug(`groupMembers after markUsAsAdmin: ${stringify(members)}`); + }); + builder.addCase(markUsAsAdmin.rejected, (_state, action) => { + window.log.error('a markUsAsAdmin was rejected', action.error); + }); }, }); @@ -873,6 +939,7 @@ export const groupInfoActions = { refreshGroupDetailsFromWrapper, handleUserGroupUpdate, currentDeviceGroupMembersChange, + markUsAsAdmin, currentDeviceGroupNameChange, ...groupSlice.actions, }; diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 5bccb57ed4..639fd0c165 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -28,6 +28,7 @@ function emptyMember(pubkeyHex: PubkeyType): GroupMemberGet { promoted: false, promotionFailed: false, promotionPending: false, + admin: false, pubkeyHex, }; } diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 2959a88596..cf489d9a7b 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -438,6 +438,10 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { pubkeyHex, failed, ]) as Promise>, + memberSetAdmin: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberSetAdmin', pubkeyHex]) as Promise< + ReturnType + >, memberSetInvited: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, failed: boolean) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, From 93d87d82ae0af14acfc3119e2331a41a8e6f86b6 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 14 Nov 2023 14:29:32 +1100 Subject: [PATCH 059/302] chore: renamed getnowwithnetworkoffset to now() --- protos/SignalService.proto | 5 +- ts/models/conversation.ts | 8 +-- ts/models/message.ts | 2 +- ts/node/hexStrings.ts | 15 ++++- ts/receiver/callMessage.ts | 4 +- ts/receiver/dataMessage.ts | 14 +---- ts/receiver/groupv2/handleGroupV2Message.ts | 41 +++++++++---- .../opengroupV2/OpenGroupPollingUtils.ts | 8 +-- ts/session/apis/snode_api/expire.ts | 2 +- ts/session/apis/snode_api/getNetworkTime.ts | 12 ++-- ts/session/apis/snode_api/retrieveRequest.ts | 4 +- ts/session/apis/snode_api/revokeSubaccount.ts | 2 +- .../snode_api/signature/groupSignature.ts | 11 ++-- .../snode_api/signature/signatureShared.ts | 2 +- .../snode_api/signature/snodeSignatures.ts | 2 +- .../conversations/ConversationController.ts | 2 +- ts/session/group/closed-group.ts | 2 +- ts/session/messages/outgoing/Message.ts | 5 +- .../outgoing/visibleMessage/VisibleMessage.ts | 2 - ts/session/sending/MessageSender.ts | 10 ++-- ts/session/utils/calling/CallManager.ts | 24 ++++---- .../utils/job_runners/jobs/GroupSyncJob.ts | 4 +- .../utils/job_runners/jobs/UserSyncJob.ts | 2 +- ts/state/ducks/groups.ts | 60 ++++++++++++++++++- .../unit/crypto/SnodeSignatures_test.ts | 4 +- .../libsession_util/libsession_utils_test.ts | 6 +- .../group_sync_job/GroupSyncJob_test.ts | 2 +- .../user_sync_job/UserSyncJob_test.ts | 2 +- ts/util/releaseFeature.ts | 5 +- 29 files changed, 169 insertions(+), 93 deletions(-) diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 053403f389..5093fa2ab7 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -162,6 +162,10 @@ message GroupUpdateMessage { message DataMessage { + // 7 = timestamp unused and should not be used + reserved 7; + reserved "timestamp"; + enum Flags { EXPIRATION_TIMER_UPDATE = 2; } @@ -253,7 +257,6 @@ message DataMessage { optional uint32 flags = 4; optional uint32 expireTimer = 5; optional bytes profileKey = 6; - optional uint64 timestamp = 7; optional Quote quote = 8; repeated Preview preview = 10; optional Reaction reaction = 11; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index ea64998e1d..727c045f40 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -553,7 +553,7 @@ export class ConversationModel extends Backbone.Model { const chatMessageParams: VisibleMessageParams = { body: '', // we need to use a new timestamp here, otherwise android&iOS will consider this message as a duplicate and drop the synced reaction - timestamp: GetNetworkTime.getNowWithNetworkOffset(), + timestamp: GetNetworkTime.now(), reaction, lokiProfile: UserUtils.getOurProfile(), }; @@ -744,7 +744,7 @@ export class ConversationModel extends Backbone.Model { const { attachments, body, groupInvitation, preview, quote } = msg; this.clearTypingTimers(); const expireTimer = this.get('expireTimer'); - const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset(); + const networkTimestamp = GetNetworkTime.now(); window?.log?.info( 'Sending message to conversation', @@ -2219,9 +2219,9 @@ export class ConversationModel extends Backbone.Model { } const typingParams = { - timestamp: GetNetworkTime.getNowWithNetworkOffset(), + timestamp: GetNetworkTime.now(), isTyping, - typingTimestamp: GetNetworkTime.getNowWithNetworkOffset(), + typingTimestamp: GetNetworkTime.now(), }; const typingMessage = new TypingMessage(typingParams); diff --git a/ts/models/message.ts b/ts/models/message.ts index 2c4b13460a..0d1ffd4628 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -791,7 +791,7 @@ export class MessageModel extends Backbone.Model { if (conversation.isPublic()) { const openGroupParams: VisibleMessageParams = { identifier: this.id, - timestamp: GetNetworkTime.getNowWithNetworkOffset(), + timestamp: GetNetworkTime.now(), lokiProfile: UserUtils.getOurProfile(), body, attachments, diff --git a/ts/node/hexStrings.ts b/ts/node/hexStrings.ts index 574e191789..782da7a1de 100644 --- a/ts/node/hexStrings.ts +++ b/ts/node/hexStrings.ts @@ -14,7 +14,7 @@ const isHexString = (maybeHex: string) => * * Throws an error if this string is not a hex string. * @param hexString the string to convert from - * @returns the Uint8Arraty + * @returns the Uint8Arrat */ const fromHexString = (hexString: string): Uint8Array => { if (!isHexString(hexString)) { @@ -27,11 +27,24 @@ const fromHexString = (hexString: string): Uint8Array => { return Uint8Array.from(matches.map(byte => parseInt(byte, 16))); }; +/** + * Returns the Uint8Array corresponding to the given string, without a 03/05 prefix when there is a prefix + * Note: this is different than the libsodium.from_hex(). + */ +const fromHexStringNoPrefix = (hexString: string): Uint8Array => { + const asHex = fromHexString(hexString); + if (asHex.length === 33) { + return asHex.slice(1); + } + return asHex; +}; + const toHexString = (bytes: Uint8Array) => bytes.reduce((str, byte) => str + byte.toString(16).padStart(2, '0'), ''); export const HexString = { toHexString, fromHexString, + fromHexStringNoPrefix, isHexString, }; diff --git a/ts/receiver/callMessage.ts b/ts/receiver/callMessage.ts index 2378bdf1ef..0f5d14dddc 100644 --- a/ts/receiver/callMessage.ts +++ b/ts/receiver/callMessage.ts @@ -49,9 +49,7 @@ export async function handleCallMessage( } if (type === SignalService.CallMessage.Type.OFFER) { - if ( - Math.max(sentTimestamp - GetNetworkTime.getNowWithNetworkOffset()) > TTL_DEFAULT.CALL_MESSAGE - ) { + if (Math.max(sentTimestamp - GetNetworkTime.now()) > TTL_DEFAULT.CALL_MESSAGE) { window?.log?.info('Dropping incoming OFFER callMessage sent a while ago: ', sentTimestamp); await IncomingMessageCache.removeFromCache(envelope); diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index f80a691680..7f156cd91e 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -1,5 +1,5 @@ /* eslint-disable no-param-reassign */ -import { isEmpty, isFinite, noop, omit, toNumber } from 'lodash'; +import { isEmpty, noop, omit, toNumber } from 'lodash'; import { SignalService } from '../protobuf'; import { IncomingMessageCache } from './cache'; @@ -100,10 +100,7 @@ export function messageHasVisibleContent(message: SignalService.DataMessage) { ); } -export function cleanIncomingDataMessage( - rawDataMessage: SignalService.DataMessage, - envelope?: EnvelopePlus -) { +export function cleanIncomingDataMessage(rawDataMessage: SignalService.DataMessage) { const FLAGS = SignalService.DataMessage.Flags; // Now that its decrypted, validate the message and clean it up for consumer @@ -134,11 +131,6 @@ export function cleanIncomingDataMessage( } cleanAttachments(rawDataMessage); - // if the decrypted dataMessage timestamp is not set, copy the one from the envelope - if (!isFinite(rawDataMessage?.timestamp) && envelope) { - rawDataMessage.timestamp = envelope.timestamp; - } - return rawDataMessage; } @@ -162,7 +154,7 @@ export async function handleSwarmDataMessage( ): Promise { window.log.info('handleSwarmDataMessage'); - const cleanDataMessage = cleanIncomingDataMessage(rawDataMessage, envelope); + const cleanDataMessage = cleanIncomingDataMessage(rawDataMessage); if (cleanDataMessage.groupUpdateMessage) { await GroupV2Receiver.handleGroupUpdateMessage({ diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 71c2f7b33c..9a61f585f1 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -4,10 +4,13 @@ import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; +import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../../session/conversations'; import { getSodiumRenderer } from '../../session/crypto'; import { ClosedGroup } from '../../session/group/closed-group'; +import { GroupUpdateInviteResponseMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage'; import { ed25519Str } from '../../session/onions/onionPath'; +import { getMessageQueue } from '../../session/sending'; import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { stringToUint8Array } from '../../session/utils/String'; @@ -57,7 +60,7 @@ async function handleGroupInviteMessage({ return; } const sigValid = await verifySig({ - pubKey: HexString.fromHexString(inviteMessage.groupSessionId), + pubKey: HexString.fromHexStringNoPrefix(inviteMessage.groupSessionId), signature: inviteMessage.adminSignature, data: stringToUint8Array(`INVITE${UserUtils.getOurPubKeyStrFromCache()}${envelopeTimestamp}`), }); @@ -108,13 +111,23 @@ async function handleGroupInviteMessage({ groupEd25519Secretkey: null, userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64).buffer, groupEd25519Pubkey: toFixedUint8ArrayOfLength( - HexString.fromHexString(inviteMessage.groupSessionId.slice(2)), + HexString.fromHexStringNoPrefix(inviteMessage.groupSessionId), 32 ).buffer, }); await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); await UserSync.queueNewJobIfNeeded(); + // TODO currently sending auto-accept of invite. needs to be removed once we get the Group message request logic + console.warn('currently sending auto accept invite response'); + await getMessageQueue().sendToGroupV2({ + message: new GroupUpdateInviteResponseMessage({ + groupPk: inviteMessage.groupSessionId, + isApproved: true, + timestamp: GetNetworkTime.now(), + }), + }); + // TODO use the pending so we actually don't start polling here unless it is not in the pending state. // once everything is ready, start polling using that authData to get the keys, members, details of that group, and its messages. getSwarmPollingInstance().addGroupId(inviteMessage.groupSessionId); @@ -140,7 +153,7 @@ async function handleGroupInfoChangeMessage({ author, }: GroupUpdateGeneric) { const sigValid = await verifySig({ - pubKey: HexString.fromHexString(groupPk), + pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, data: stringToUint8Array(`INFO_CHANGE${change.type}${envelopeTimestamp}`), }); @@ -200,7 +213,7 @@ async function handleGroupMemberChangeMessage({ } const sigValid = await verifySig({ - pubKey: HexString.fromHexString(groupPk), + pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, data: stringToUint8Array(`MEMBER_CHANGE${change.type}${envelopeTimestamp}`), }); @@ -281,7 +294,7 @@ async function handleGroupDeleteMemberContentMessage({ } const sigValid = await verifySig({ - pubKey: HexString.fromHexString(groupPk), + pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, data: stringToUint8Array( `DELETE_CONTENT${envelopeTimestamp}${change.memberSessionIds.join()}${change.messageHashes.join()}` @@ -312,7 +325,7 @@ async function handleGroupUpdateDeleteMessage({ return; } const sigValid = await verifySig({ - pubKey: HexString.fromHexString(groupPk), + pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, data: stringToUint8Array(`DELETE${envelopeTimestamp}${change.memberSessionIds.join()}`), }); @@ -331,20 +344,22 @@ async function handleGroupUpdateDeleteMessage({ async function handleGroupUpdateInviteResponseMessage({ groupPk, - envelopeTimestamp, + change, + author, }: GroupUpdateGeneric) { - // no sig verify for this type of messages + // no sig verify for this type of message const convo = ConvoHub.use().get(groupPk); if (!convo) { return; } - convo.set({ - active_at: envelopeTimestamp, - }); - console.warn('Not implemented'); + if (!change.isApproved) { + window.log.info('got inviteResponse but isApproved is false. Dropping'); + return; + } + + window.inboxStore.dispatch(groupInfoActions.inviteResponseReceived({ groupPk, member: author })); // TODO We should process this message type even if the sender is blocked - throw new Error('Not implemented'); } async function handleGroupUpdatePromoteMessage({ diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts index 31559840ea..468c84ec18 100644 --- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts +++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts @@ -1,12 +1,12 @@ import { compact } from 'lodash'; import { OpenGroupData, OpenGroupV2Room } from '../../../../data/opengroups'; -import { OpenGroupMessageV2 } from './OpenGroupMessageV2'; +import { getSodiumRenderer } from '../../../crypto'; import { UserUtils } from '../../../utils'; import { fromHexToArray } from '../../../utils/String'; -import { getSodiumRenderer } from '../../../crypto'; -import { SogsBlinding } from '../sogsv3/sogsBlinding'; import { GetNetworkTime } from '../../snode_api/getNetworkTime'; +import { SogsBlinding } from '../sogsv3/sogsBlinding'; +import { OpenGroupMessageV2 } from './OpenGroupMessageV2'; export type OpenGroupRequestHeaders = { 'X-SOGS-Pubkey': string; @@ -42,7 +42,7 @@ const getOurOpenGroupHeaders = async ( const nonce = (await getSodiumRenderer()).randombytes_buf(16); - const timestamp = Math.floor(GetNetworkTime.getNowWithNetworkOffset() / 1000); + const timestamp = Math.floor(GetNetworkTime.now() / 1000); return SogsBlinding.getOpenGroupHeaders({ signingKeys, serverPK: fromHexToArray(serverPublicKey), diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts index 7d1a8e8bed..878be242c9 100644 --- a/ts/session/apis/snode_api/expire.ts +++ b/ts/session/apis/snode_api/expire.ts @@ -196,7 +196,7 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) { const swarm = await getSwarmFor(ourPubKey); - const expiry = GetNetworkTime.getNowWithNetworkOffset() + expireTimer; + const expiry = GetNetworkTime.now() + expireTimer; const signResult = await SnodeSignature.generateUpdateExpiryOurSignature({ shortenOrExtend, timestamp: expiry, diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index 086d849b6b..819449a8e2 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -6,8 +6,8 @@ import { isNumber } from 'lodash'; import { Snode } from '../../../data/data'; -import { doSnodeBatchRequest } from './batchRequest'; import { NetworkTimeSubRequest } from './SnodeRequestTypes'; +import { doSnodeBatchRequest } from './batchRequest'; function getNetworkTimeSubRequests(): Array { const request: NetworkTimeSubRequest = { method: 'info', params: {} }; @@ -43,11 +43,11 @@ let latestTimestampOffset = Number.MAX_SAFE_INTEGER; function handleTimestampOffsetFromNetwork(_request: string, snodeTimestamp: number) { if (snodeTimestamp && isNumber(snodeTimestamp) && snodeTimestamp > 1609419600 * 1000) { // first january 2021. Arbitrary, just want to make sure the return timestamp is somehow valid and not some crazy low value - const now = Date.now(); + const clockTime = Date.now(); if (latestTimestampOffset === Number.MAX_SAFE_INTEGER) { - window?.log?.info(`first timestamp offset received: ${now - snodeTimestamp}ms`); + window?.log?.info(`first timestamp offset received: ${clockTime - snodeTimestamp}ms`); } - latestTimestampOffset = now - snodeTimestamp; + latestTimestampOffset = clockTime - snodeTimestamp; } } @@ -65,7 +65,7 @@ function getLatestTimestampOffset() { return latestTimestampOffset; } -function getNowWithNetworkOffset() { +function now() { // make sure to call exports here, as we stub the exported one for testing. return Date.now() - GetNetworkTime.getLatestTimestampOffset(); } @@ -74,5 +74,5 @@ export const GetNetworkTime = { getNetworkTime, handleTimestampOffsetFromNetwork, getLatestTimestampOffset, - getNowWithNetworkOffset, + now, }; diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 18ad5325e8..8fa70c5d1e 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -140,7 +140,7 @@ async function buildRetrieveRequest( const retrieveParam = { pubkey, last_hash: lastHashes.at(index) || '', - timestamp: GetNetworkTime.getNowWithNetworkOffset(), + timestamp: GetNetworkTime.now(), max_size: foundMaxSize, }; @@ -163,7 +163,7 @@ async function buildRetrieveRequest( ); if (configHashesToBump?.length) { - const expiry = GetNetworkTime.getNowWithNetworkOffset() + DURATION.DAYS * 30; + const expiry = GetNetworkTime.now() + DURATION.DAYS * 30; if (isUs) { const signResult = await SnodeSignature.generateUpdateExpiryOurSignature({ shortenOrExtend: '', diff --git a/ts/session/apis/snode_api/revokeSubaccount.ts b/ts/session/apis/snode_api/revokeSubaccount.ts index 2062178b2e..f8af2e6fc8 100644 --- a/ts/session/apis/snode_api/revokeSubaccount.ts +++ b/ts/session/apis/snode_api/revokeSubaccount.ts @@ -29,7 +29,7 @@ async function getRevokeSubaccountRequest({ throw new Error('revokeSubaccountForGroup: not a 03 group'); } - const timestamp = GetNetworkTime.getNowWithNetworkOffset(); + const timestamp = GetNetworkTime.now(); const revokeParams: Array = await Promise.all( diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index a74431f9bb..69e2bab486 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -13,7 +13,7 @@ import { import { getSodiumRenderer } from '../../../crypto/MessageEncrypter'; import { GroupUpdateInviteMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; import { StringUtils, UserUtils } from '../../../utils'; -import { fromUInt8ArrayToBase64 } from '../../../utils/String'; +import { fromUInt8ArrayToBase64, stringToUint8Array } from '../../../utils/String'; import { PreConditionFailed } from '../../../utils/errors'; import { GetNetworkTime } from '../getNetworkTime'; import { SnodeNamespacesGroup } from '../namespaces'; @@ -33,15 +33,18 @@ async function getGroupInviteMessage({ groupPk: GroupPubkeyType; }) { const sodium = await getSodiumRenderer(); - const timestamp = GetNetworkTime.getNowWithNetworkOffset(); + const timestamp = GetNetworkTime.now(); if (UserUtils.isUsFromCache(member)) { throw new Error('getGroupInviteMessage: we cannot invite ourselves'); } - const tosign = `INVITE${member}${timestamp}`; + debugger; // Note: as the signature is built with the timestamp here, we cannot override the timestamp later on the sending pipeline - const adminSignature = sodium.crypto_sign_detached(tosign, secretKey); + const adminSignature = sodium.crypto_sign_detached( + stringToUint8Array(`INVITE${member}${timestamp}`), + secretKey + ); const memberAuthData = await MetaGroupWrapperActions.makeSwarmSubAccount(groupPk, member); const invite = new GroupUpdateInviteMessage({ diff --git a/ts/session/apis/snode_api/signature/signatureShared.ts b/ts/session/apis/snode_api/signature/signatureShared.ts index 7444616563..85f17f5d3d 100644 --- a/ts/session/apis/snode_api/signature/signatureShared.ts +++ b/ts/session/apis/snode_api/signature/signatureShared.ts @@ -27,7 +27,7 @@ export type SnodeSigParamsUs = SnodeSigParamsShared & { }; function getVerificationDataForStoreRetrieve(params: SnodeSigParamsShared) { - const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset(); + const signatureTimestamp = GetNetworkTime.now(); const verificationData = StringUtils.encode( `${params.method}${params.namespace === 0 ? '' : params.namespace}${signatureTimestamp}`, 'utf8' diff --git a/ts/session/apis/snode_api/signature/snodeSignatures.ts b/ts/session/apis/snode_api/signature/snodeSignatures.ts index 0341b9b808..17afe5395c 100644 --- a/ts/session/apis/snode_api/signature/snodeSignatures.ts +++ b/ts/session/apis/snode_api/signature/snodeSignatures.ts @@ -84,7 +84,7 @@ function isSigParamsForGroupAdmin( } function getVerificationData(params: SnodeSigParamsShared) { - const signatureTimestamp = GetNetworkTime.getNowWithNetworkOffset(); + const signatureTimestamp = GetNetworkTime.now(); const verificationData = StringUtils.encode( `${params.method}${params.namespace === 0 ? '' : params.namespace}${signatureTimestamp}`, 'utf8' diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index d5e2f143a7..49f7e9c5d4 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -473,7 +473,7 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { await convo.updateGroupAdmins(admins, false); await convo.commit(); - const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset(); + const networkTimestamp = GetNetworkTime.now(); getSwarmPollingInstance().removePubkey(groupId, 'leaveClosedGroup'); diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 7a2fc7dfbe..0d3db88785 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -414,7 +414,7 @@ async function generateAndSendNewEncryptionKeyPair( const keypairsMessage = new ClosedGroupEncryptionPairMessage({ groupId: toHex(groupId), - timestamp: GetNetworkTime.getNowWithNetworkOffset(), + timestamp: GetNetworkTime.now(), encryptedKeyPairs: wrappers, }); diff --git a/ts/session/messages/outgoing/Message.ts b/ts/session/messages/outgoing/Message.ts index 98716b8b88..6930ea6b04 100644 --- a/ts/session/messages/outgoing/Message.ts +++ b/ts/session/messages/outgoing/Message.ts @@ -14,8 +14,9 @@ export abstract class Message { if (identifier && identifier.length === 0) { throw new Error('Cannot set empty identifier'); } - if (!timestamp) { - throw new Error('Cannot set undefined timestamp'); + + if (!timestamp || timestamp <= 0) { + throw new Error('Cannot set undefined timestamp or <=0'); } this.identifier = identifier || uuid(); } diff --git a/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts index db68a7cdb5..552532455f 100644 --- a/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts @@ -175,8 +175,6 @@ export class VisibleMessage extends DataMessage { }); } - dataMessage.timestamp = this.timestamp; - return dataMessage; } diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 4783f944bd..82de569360 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -3,7 +3,7 @@ import { AbortController } from 'abort-controller'; import ByteBuffer from 'bytebuffer'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import _, { isEmpty, sample, toNumber } from 'lodash'; +import { isEmpty, sample, toNumber } from 'lodash'; import pRetry from 'p-retry'; import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; @@ -48,7 +48,7 @@ import { EmptySwarmError } from '../utils/errors'; // ================ SNODE STORE ================ function overwriteOutgoingTimestampWithNetworkTimestamp(message: { plainTextBuffer: Uint8Array }) { - const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset(); + const networkTimestamp = GetNetworkTime.now(); const { plainTextBuffer } = message; const contentDecoded = SignalService.Content.decode(plainTextBuffer); @@ -68,7 +68,7 @@ function overwriteOutgoingTimestampWithNetworkTimestamp(message: { plainTextBuff ) { return { overRiddenTimestampBuffer: plainTextBuffer, - networkTimestamp: _.toNumber(dataMessage.timestamp), + networkTimestamp: toNumber(dataMessage.timestamp), }; } dataMessage.timestamp = networkTimestamp; @@ -533,7 +533,7 @@ async function sendToOpenGroupV2( // we agreed to pad message for opengroupv2 const paddedBody = addMessagePadding(rawMessage.plainTextBuffer()); const v2Message = new OpenGroupMessageV2({ - sentTimestamp: GetNetworkTime.getNowWithNetworkOffset(), + sentTimestamp: GetNetworkTime.now(), base64EncodedData: fromUInt8ArrayToBase64(paddedBody), filesToLink, }); @@ -558,7 +558,7 @@ async function sendToOpenGroupV2BlindedRequest( recipientBlindedId: string ): Promise<{ serverId: number; serverTimestamp: number }> { const v2Message = new OpenGroupMessageV2({ - sentTimestamp: GetNetworkTime.getNowWithNetworkOffset(), + sentTimestamp: GetNetworkTime.now(), base64EncodedData: fromUInt8ArrayToBase64(encryptedContent), }); diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 0b39ec2df2..5f9b350a21 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -5,34 +5,34 @@ import { v4 as uuidv4 } from 'uuid'; import { MessageUtils, ToastUtils, UserUtils } from '..'; import { SignalService } from '../../../protobuf'; -import { openConversationWithMessages } from '../../../state/ducks/conversations'; import { + CallStatusEnum, answerCall, callConnected, callReconnecting, - CallStatusEnum, endCall, incomingCall, setFullScreenCall, startingCallWith, } from '../../../state/ducks/call'; +import { openConversationWithMessages } from '../../../state/ducks/conversations'; import { ConvoHub } from '../../conversations'; import { CallMessage } from '../../messages/outgoing/controlMessage/CallMessage'; import { ed25519Str } from '../../onions/onionPath'; import { PubKey } from '../../types'; -import { getIsRinging } from '../RingingManager'; -import { getBlackSilenceMediaStream } from './Silence'; import { getMessageQueue } from '../..'; -import { MessageSender } from '../../sending'; -import { DURATION } from '../../constants'; -import { Data } from '../../../data/data'; import { getCallMediaPermissionsSettings } from '../../../components/settings/SessionSettings'; -import { PnServer } from '../../apis/push_notification_api'; +import { Data } from '../../../data/data'; import { approveConvoAndSendResponse } from '../../../interactions/conversationInteractions'; +import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes'; +import { PnServer } from '../../apis/push_notification_api'; import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../apis/snode_api/namespaces'; -import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes'; +import { DURATION } from '../../constants'; +import { MessageSender } from '../../sending'; +import { getIsRinging } from '../RingingManager'; +import { getBlackSilenceMediaStream } from './Silence'; export type InputItem = { deviceId: string; label: string }; @@ -856,7 +856,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) { await peerConnection.addIceCandidate(candicate); } } - const networkTimestamp = GetNetworkTime.getNowWithNetworkOffset(); + const networkTimestamp = GetNetworkTime.now(); const callerConvo = ConvoHub.use().get(fromSender); callerConvo.set('active_at', networkTimestamp); await callerConvo.unhideIfNeeded(false); @@ -1192,14 +1192,14 @@ async function addMissedCallMessage(callerPubkey: string, sentAt: number) { const incomingCallConversation = ConvoHub.use().get(callerPubkey); if (incomingCallConversation.isActive() || incomingCallConversation.isHidden()) { - incomingCallConversation.set('active_at', GetNetworkTime.getNowWithNetworkOffset()); + incomingCallConversation.set('active_at', GetNetworkTime.now()); await incomingCallConversation.unhideIfNeeded(false); } await incomingCallConversation?.addSingleIncomingMessage({ source: callerPubkey, sent_at: sentAt, - received_at: GetNetworkTime.getNowWithNetworkOffset(), + received_at: GetNetworkTime.now(), expireTimer: 0, callNotificationType: 'missed-call', unread: READ_MESSAGE_STATE.unread, diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index 8d91f2ce87..4cf02a72b7 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -83,7 +83,7 @@ async function pushChangesToGroupSwarmIfNeeded( return { namespace: item.namespace, pubkey: groupPk, - networkTimestamp: GetNetworkTime.getNowWithNetworkOffset(), + networkTimestamp: GetNetworkTime.now(), ttl: TTL_DEFAULT.TTL_CONFIG, data: item.ciphertext, }; @@ -94,7 +94,7 @@ async function pushChangesToGroupSwarmIfNeeded( namespace: SnodeNamespaces.ClosedGroupKeys, pubkey: groupPk, ttl: TTL_DEFAULT.TTL_CONFIG, - networkTimestamp: GetNetworkTime.getNowWithNetworkOffset(), + networkTimestamp: GetNetworkTime.now(), data: key, }) ); diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index afc3cf2035..1d8aeefa23 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -90,7 +90,7 @@ async function pushChangesToUserSwarmIfNeeded() { return { namespace: item.namespace, pubkey: us, - networkTimestamp: GetNetworkTime.getNowWithNetworkOffset(), + networkTimestamp: GetNetworkTime.now(), ttl: TTL_DEFAULT.TTL_CONFIG, data: item.ciphertext, }; diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index c66adedebb..0cad575c4a 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -74,6 +74,15 @@ type GroupDetailsUpdate = { members: Array; }; +async function checkWeAreAdminOrThrow(groupPk: GroupPubkeyType, context: string) { + const us = UserUtils.getOurPubKeyStrFromCache(); + const inGroup = await MetaGroupWrapperActions.memberGet(groupPk, us); + const haveAdminkey = await UserGroupsWrapperActions.getGroup(groupPk); + if (!haveAdminkey || inGroup?.promoted) { + throw new Error(`checkWeAreAdminOrThrow failed with ctx: ${context}`); + } +} + /** * Create a brand new group with a 03 prefix. * To be called only when our current logged in user, through the UI, creates a brand new closed group given a name and a list of members. @@ -464,7 +473,7 @@ async function handleRemoveMembers({ } await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, removed); - const timestamp = GetNetworkTime.getNowWithNetworkOffset(); + const timestamp = GetNetworkTime.now(); await Promise.all( removed.map(async m => { const adminSignature = await SnodeGroupSignature.signDataWithAdminSecret( @@ -540,6 +549,8 @@ async function handleMemberChangeFromUIOrNot({ throw new Error('tried to make change to group but we do not have the admin secret key'); } + await checkWeAreAdminOrThrow(groupPk, 'handleMemberChangeFromUIOrNot'); + const { removed, withHistory, withoutHistory, convo, us } = validateMemberChange({ withHistory: addMembersWithHistory, withoutHistory: addMembersWithoutHistory, @@ -622,7 +633,7 @@ async function handleMemberChangeFromUIOrNot({ groupPk, typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED, identifier: msg.id, - timestamp: GetNetworkTime.getNowWithNetworkOffset(), + timestamp: GetNetworkTime.now(), secretKey: group.secretKey, sodium, }), @@ -652,6 +663,8 @@ async function handleNameChangeFromUIOrNot({ throw new PreConditionFailed('nameChange infoGet is empty'); } + await checkWeAreAdminOrThrow(groupPk, 'handleNameChangeFromUIOrNot'); + // this throws if the name is the same, or empty const { newName, convo, us } = validateNameChange({ newName: uncheckedName, @@ -767,6 +780,35 @@ const markUsAsAdmin = createAsyncThunk( } ); +const inviteResponseReceived = createAsyncThunk( + 'group/inviteResponseReceived', + async ( + { + groupPk, + member, + }: { + groupPk: GroupPubkeyType; + member: PubkeyType; + }, + payloadCreator + ): Promise => { + const state = payloadCreator.getState() as StateType; + if (!state.groups.infos[groupPk] || !state.groups.members[groupPk]) { + throw new PreConditionFailed('inviteResponseReceived group but not present in redux slice'); + } + await checkWeAreAdminOrThrow(groupPk, 'inviteResponseReceived'); + + await MetaGroupWrapperActions.memberSetAccepted(groupPk, member); + await GroupSync.queueNewJobIfNeeded(groupPk); + + return { + groupPk, + infos: await MetaGroupWrapperActions.infoGet(groupPk), + members: await MetaGroupWrapperActions.memberGetAll(groupPk), + }; + } +); + const currentDeviceGroupNameChange = createAsyncThunk( 'group/currentDeviceGroupNameChange', async ( @@ -783,6 +825,7 @@ const currentDeviceGroupNameChange = createAsyncThunk( if (!state.groups.infos[groupPk] || !state.groups.members[groupPk]) { throw new PreConditionFailed('currentDeviceGroupNameChange group not present in redux slice'); } + await checkWeAreAdminOrThrow(groupPk, 'currentDeviceGroupNameChange'); await handleNameChangeFromUIOrNot({ groupPk, ...args, fromCurrentDevice: true }); @@ -929,6 +972,18 @@ const groupSlice = createSlice({ builder.addCase(markUsAsAdmin.rejected, (_state, action) => { window.log.error('a markUsAsAdmin was rejected', action.error); }); + + builder.addCase(inviteResponseReceived.fulfilled, (state, action) => { + const { infos, members, groupPk } = action.payload; + state.infos[groupPk] = infos; + state.members[groupPk] = members; + + window.log.debug(`groupInfo after inviteResponseReceived: ${stringify(infos)}`); + window.log.debug(`groupMembers after inviteResponseReceived: ${stringify(members)}`); + }); + builder.addCase(inviteResponseReceived.rejected, (_state, action) => { + window.log.error('a inviteResponseReceived was rejected', action.error); + }); }, }); @@ -940,6 +995,7 @@ export const groupInfoActions = { handleUserGroupUpdate, currentDeviceGroupMembersChange, markUsAsAdmin, + inviteResponseReceived, currentDeviceGroupNameChange, ...groupSlice.actions, }; diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts index 22dd4e0f56..300d2123c2 100644 --- a/ts/test/session/unit/crypto/SnodeSignatures_test.ts +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -50,7 +50,7 @@ describe('SnodeSignature', () => { describe('getSnodeGroupAdminSignatureParams', () => { beforeEach(() => { - Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(hardcodedTimestamp); + Sinon.stub(GetNetworkTime, 'now').returns(hardcodedTimestamp); }); describe('retrieve', () => { @@ -162,7 +162,7 @@ describe('SnodeSignature', () => { // describe('getSnodeGroupSubAccountSignatureParams', () => { // beforeEach(() => { - // Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(hardcodedTimestamp); + // Sinon.stub(GetNetworkTime, 'now').returns(hardcodedTimestamp); // }); // describe('retrieve', () => { diff --git a/ts/test/session/unit/libsession_util/libsession_utils_test.ts b/ts/test/session/unit/libsession_util/libsession_utils_test.ts index f68731b2f5..6c4dc3cc76 100644 --- a/ts/test/session/unit/libsession_util/libsession_utils_test.ts +++ b/ts/test/session/unit/libsession_util/libsession_utils_test.ts @@ -164,7 +164,7 @@ describe('LibSessionUtil pendingChangesForGroup', () => { }; Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(true); Sinon.stub(MetaGroupWrapperActions, 'push').resolves(pushResults); - Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(1234); + Sinon.stub(GetNetworkTime, 'now').returns(1234); const result = await LibSessionUtil.pendingChangesForGroup(groupPk); expect(result.allOldHashes.size).to.be.equal(4); // check that all of the hashes are there @@ -245,7 +245,7 @@ describe('LibSessionUtil pendingChangesForUs', () => { .withArgs('ConvoInfoVolatileConfig') .resolves(pushResultsConvo); - Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(1234); + Sinon.stub(GetNetworkTime, 'now').returns(1234); const result = await LibSessionUtil.pendingChangesForUs(); expect(needsPush.callCount).to.be.eq(4); expect(needsPush.getCalls().map(m => m.args)).to.be.deep.eq([ @@ -313,7 +313,7 @@ describe('LibSessionUtil pendingChangesForUs', () => { .withArgs('ConvoInfoVolatileConfig') .resolves(pushConvo); - Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(1234); + Sinon.stub(GetNetworkTime, 'now').returns(1234); const result = await LibSessionUtil.pendingChangesForUs(); expect(needsPush.callCount).to.be.eq(4); expect(needsPush.getCalls().map(m => m.args)).to.be.deep.eq([ diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index a3dfa5bbdf..e1e6c8424c 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -285,7 +285,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { const member = validMembers(sodium); const networkTimestamp = 4444; const ttl = TTL_DEFAULT.TTL_CONFIG; - Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(networkTimestamp); + Sinon.stub(GetNetworkTime, 'now').returns(networkTimestamp); pendingChangesForGroupStub.resolves({ messages: [info, member], allOldHashes: new Set('123'), diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index 6a91e0b472..2a7105faea 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -281,7 +281,7 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); const networkTimestamp = 4444; const ttl = TTL_DEFAULT.TTL_CONFIG; - Sinon.stub(GetNetworkTime, 'getNowWithNetworkOffset').returns(networkTimestamp); + Sinon.stub(GetNetworkTime, 'now').returns(networkTimestamp); pendingChangesForUsStub.resolves({ messages: [profile, contact], diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts index 6f3c4b762b..7d122fd232 100644 --- a/ts/util/releaseFeature.ts +++ b/ts/util/releaseFeature.ts @@ -79,10 +79,7 @@ async function checkIsFeatureReleased(featureName: FeatureNameTracked): Promise< const featureAlreadyReleased = await getIsFeatureReleased(featureName); // Is it time to release the feature based on the network timestamp? - if ( - !featureAlreadyReleased && - GetNetworkTime.getNowWithNetworkOffset() >= getFeatureReleaseTimestamp(featureName) - ) { + if (!featureAlreadyReleased && GetNetworkTime.now() >= getFeatureReleaseTimestamp(featureName)) { window.log.info(`[releaseFeature]: It is time to release ${featureName}. Releasing it now`); await Storage.put(featureStorageItemId(featureName), true); setIsFeatureReleasedCached(featureName, true); From 08c5f76a158cdb0e7fab6082b1bfea91ecf378d3 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 14 Nov 2023 14:31:22 +1100 Subject: [PATCH 060/302] fix: store envelopetimestamp in cache, and make sure we use network one everywhere --- .../conversations/unsendingInteractions.ts | 10 +-- ts/models/conversation.ts | 40 ++++----- ts/models/message.ts | 5 +- ts/receiver/closedGroups.ts | 3 +- ts/receiver/groupv2/handleGroupV2Message.ts | 4 +- .../snode_api/signature/groupSignature.ts | 6 +- .../conversations/ConversationController.ts | 4 +- ts/session/conversations/createClosedGroup.ts | 5 +- ts/session/group/closed-group.ts | 10 +-- ts/session/messages/outgoing/Message.ts | 17 ++-- .../outgoing/controlMessage/CallMessage.ts | 9 +- .../DataExtractionNotificationMessage.ts | 26 +++--- .../ExpirationTimerUpdateMessage.ts | 5 +- .../controlMessage/MessageRequestResponse.ts | 2 +- .../outgoing/controlMessage/TypingMessage.ts | 20 ++--- .../outgoing/controlMessage/UnsendMessage.ts | 8 +- .../group/ClosedGroupAddedMembersMessage.ts | 2 +- .../group/ClosedGroupEncryptionPairMessage.ts | 2 +- .../group/ClosedGroupMessage.ts | 2 +- .../group/ClosedGroupNameChangeMessage.ts | 2 +- .../group/ClosedGroupNewMessage.ts | 6 +- .../group/ClosedGroupRemovedMembersMessage.ts | 2 +- .../to_group/GroupUpdateInfoChangeMessage.ts | 2 +- .../GroupUpdateMemberChangeMessage.ts | 2 +- .../receipt/ReadReceiptMessage.ts | 4 +- .../ClosedGroupVisibleMessage.ts | 4 +- .../visibleMessage/GroupInvitationMessage.ts | 5 +- .../outgoing/visibleMessage/VisibleMessage.ts | 10 ++- ts/session/sending/MessageQueue.ts | 16 ++-- ts/session/sending/MessageSender.ts | 60 +++----------- ts/session/sending/MessageSentHandler.ts | 6 +- ts/session/sending/PendingMessageCache.ts | 82 +++++++++++++------ ts/session/types/RawMessage.ts | 19 +++-- ts/session/utils/Messages.ts | 19 +++-- ts/session/utils/calling/CallManager.ts | 14 ++-- ts/session/utils/sync/syncUtils.ts | 8 +- ts/state/ducks/groups.ts | 31 ++++--- .../session/unit/messages/ChatMessage_test.ts | 20 ++--- .../messages/GroupInvitationMessage_test.ts | 4 +- .../messages/MessageRequestResponse_test.ts | 20 ++--- .../unit/messages/ReceiptMessage_test.ts | 6 +- .../unit/messages/TypingMessage_test.ts | 14 ++-- .../ClosedGroupChatMessage_test.ts | 18 ++-- .../session/unit/sending/MessageQueue_test.ts | 4 +- .../unit/sending/MessageSender_test.ts | 4 +- ts/test/session/unit/utils/Messages_test.ts | 12 +-- .../stubs/sending/PendingMessageCacheStub.ts | 8 +- ts/test/test-utils/utils/message.ts | 16 ++-- 48 files changed, 315 insertions(+), 283 deletions(-) diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 62619599fc..16328c5a10 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -1,19 +1,19 @@ import { compact } from 'lodash'; +import { SessionButtonColor } from '../../components/basic/SessionButton'; import { Data } from '../../data/data'; import { ConversationModel } from '../../models/conversation'; import { MessageModel } from '../../models/message'; import { getMessageQueue } from '../../session'; +import { deleteSogsMessageByServerIds } from '../../session/apis/open_group_api/sogsv3/sogsV3DeleteMessages'; +import { SnodeAPI } from '../../session/apis/snode_api/SNodeAPI'; +import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces'; import { ConvoHub } from '../../session/conversations'; import { UnsendMessage } from '../../session/messages/outgoing/controlMessage/UnsendMessage'; import { ed25519Str } from '../../session/onions/onionPath'; -import { SnodeAPI } from '../../session/apis/snode_api/SNodeAPI'; import { PubKey } from '../../session/types'; import { ToastUtils, UserUtils } from '../../session/utils'; import { resetSelectedMessageIds } from '../../state/ducks/conversations'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; -import { SessionButtonColor } from '../../components/basic/SessionButton'; -import { deleteSogsMessageByServerIds } from '../../session/apis/open_group_api/sogsv3/sogsV3DeleteMessages'; -import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces'; /** * Deletes messages for everyone in a 1-1 or everyone in a closed group conversation. @@ -84,7 +84,7 @@ function getUnsendMessagesObjects(messages: Array) { } const unsendParams = { - timestamp, + createAtNetworkTimestamp: timestamp, author, }; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 727c045f40..2d0d4fc8e2 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -553,7 +553,7 @@ export class ConversationModel extends Backbone.Model { const chatMessageParams: VisibleMessageParams = { body: '', // we need to use a new timestamp here, otherwise android&iOS will consider this message as a duplicate and drop the synced reaction - timestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), reaction, lokiProfile: UserUtils.getOurProfile(), }; @@ -726,10 +726,8 @@ export class ConversationModel extends Backbone.Model { return; } - const timestamp = Date.now(); - const messageRequestResponseParams: MessageRequestResponseParams = { - timestamp, + createAtNetworkTimestamp: GetNetworkTime.now(), lokiProfile: UserUtils.getOurProfile(), }; @@ -758,7 +756,6 @@ export class ConversationModel extends Backbone.Model { quote: isEmpty(quote) ? undefined : quote, preview, attachments, - sent_at: networkTimestamp, expireTimer, serverTimestamp: this.isPublic() ? networkTimestamp : undefined, groupInvitation, @@ -832,7 +829,7 @@ export class ConversationModel extends Backbone.Model { // When we add a disappearing messages notification to the conversation, we want it // to be above the message that initiated that change, hence the subtraction. - const timestamp = (receivedAt || Date.now()) - 1; + const createAtNetworkTimestamp = (receivedAt || GetNetworkTime.now()) - 1; this.set({ expireTimer }); @@ -851,7 +848,7 @@ export class ConversationModel extends Backbone.Model { if (isOutgoing) { message = await this.addSingleOutgoingMessage({ ...commonAttributes, - sent_at: timestamp, + sent_at: createAtNetworkTimestamp, }); } else { message = await this.addSingleIncomingMessage({ @@ -860,13 +857,13 @@ export class ConversationModel extends Backbone.Model { // indicator above it. We set it to 'unread' to trigger that placement. unread: READ_MESSAGE_STATE.unread, source, - sent_at: timestamp, - received_at: timestamp, + sent_at: createAtNetworkTimestamp, + received_at: createAtNetworkTimestamp, }); } if (this.isActive()) { - this.set('active_at', timestamp); + this.set('active_at', createAtNetworkTimestamp); } if (shouldCommit) { @@ -880,7 +877,7 @@ export class ConversationModel extends Backbone.Model { const expireUpdate = { identifier: message.id, - timestamp, + createAtNetworkTimestamp, expireTimer: expireTimer || (null as number | null), }; @@ -1046,7 +1043,7 @@ export class ConversationModel extends Backbone.Model { // we should probably stack read receipts and send them every 5 seconds for instance per conversation const receiptMessage = new ReadReceiptMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), timestamps, }); @@ -1785,9 +1782,10 @@ export class ConversationModel extends Backbone.Model { const destination = this.id as string; const sentAt = message.get('sent_at'); - if (!sentAt) { - throw new Error('sendMessageJob() sent_at must be set.'); + if (sentAt) { + throw new Error('sendMessageJob() sent_at is already set.'); } + const networkTimestamp = GetNetworkTime.now(); // we are trying to send a message to someone. Make sure this convo is not hidden await this.unhideIfNeeded(true); @@ -1797,7 +1795,7 @@ export class ConversationModel extends Backbone.Model { const chatMessageParams: VisibleMessageParams = { body, identifier: id, - timestamp: sentAt, + createAtNetworkTimestamp: networkTimestamp, attachments, expireTimer, preview: preview ? [preview] : [], @@ -1866,7 +1864,7 @@ export class ConversationModel extends Backbone.Model { const groupInvitation = message.get('groupInvitation'); const groupInvitMessage = new GroupInvitationMessage({ identifier: id, - timestamp: sentAt, + createAtNetworkTimestamp: networkTimestamp, name: groupInvitation.name, url: groupInvitation.url, expireTimer: this.get('expireTimer'), @@ -2219,15 +2217,19 @@ export class ConversationModel extends Backbone.Model { } const typingParams = { - timestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), isTyping, typingTimestamp: GetNetworkTime.now(), }; const typingMessage = new TypingMessage(typingParams); - const device = new PubKey(recipientId); + const pubkey = new PubKey(recipientId); void getMessageQueue() - .sendToPubKey(device, typingMessage, SnodeNamespaces.Default) + .sendToPubKeyNonDurably({ + pubkey, + message: typingMessage, + namespace: SnodeNamespaces.Default, + }) .catch(window?.log?.error); } diff --git a/ts/models/message.ts b/ts/models/message.ts index 0d1ffd4628..d69bba46f5 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -791,7 +791,7 @@ export class MessageModel extends Backbone.Model { if (conversation.isPublic()) { const openGroupParams: VisibleMessageParams = { identifier: this.id, - timestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), lokiProfile: UserUtils.getOurProfile(), body, attachments, @@ -817,7 +817,7 @@ export class MessageModel extends Backbone.Model { const chatParams = { identifier: this.id, body, - timestamp: Date.now(), // force a new timestamp to handle user fixed his clock + createAtNetworkTimestamp: GetNetworkTime.now(), expireTimer: this.get('expireTimer'), attachments, preview: preview ? [preview] : [], @@ -997,7 +997,6 @@ export class MessageModel extends Backbone.Model { if (!this.id) { throw new Error('A message always needs an id'); } - console.warn('this.attributes', JSON.stringify(this.attributes)); // because the saving to db calls _cleanData which mutates the field for cleaning, we need to save a copy const id = await Data.saveMessage(cloneDeep(this.attributes)); if (triggerUIUpdate) { diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index c09ccd08b1..f304f6d3ac 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -20,6 +20,7 @@ import { perfEnd, perfStart } from '../session/utils/Performance'; import { ReleasedFeatures } from '../util/releaseFeature'; import { Storage } from '../util/storage'; // eslint-disable-next-line import/no-unresolved, import/extensions +import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { ClosedGroup, GroupDiff, GroupInfo } from '../session/group/closed-group'; import { ConfigWrapperUser } from '../webworker/workers/browser/libsession_worker_functions'; import { IncomingMessageCache } from './cache'; @@ -915,7 +916,7 @@ async function sendLatestKeyPairToUsers( const keypairsMessage = new ClosedGroupEncryptionPairReplyMessage({ groupId: groupPubKey, - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), encryptedKeyPairs: wrappers, }); diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 9a61f585f1..c1a8bd6078 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -59,6 +59,7 @@ async function handleGroupInviteMessage({ ); return; } + debugger; const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(inviteMessage.groupSessionId), signature: inviteMessage.adminSignature, @@ -119,12 +120,13 @@ async function handleGroupInviteMessage({ await UserSync.queueNewJobIfNeeded(); // TODO currently sending auto-accept of invite. needs to be removed once we get the Group message request logic + debugger; console.warn('currently sending auto accept invite response'); await getMessageQueue().sendToGroupV2({ message: new GroupUpdateInviteResponseMessage({ groupPk: inviteMessage.groupSessionId, isApproved: true, - timestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), }), }); diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 69e2bab486..c4c8493891 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -33,7 +33,7 @@ async function getGroupInviteMessage({ groupPk: GroupPubkeyType; }) { const sodium = await getSodiumRenderer(); - const timestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = GetNetworkTime.now(); if (UserUtils.isUsFromCache(member)) { throw new Error('getGroupInviteMessage: we cannot invite ourselves'); @@ -42,7 +42,7 @@ async function getGroupInviteMessage({ // Note: as the signature is built with the timestamp here, we cannot override the timestamp later on the sending pipeline const adminSignature = sodium.crypto_sign_detached( - stringToUint8Array(`INVITE${member}${timestamp}`), + stringToUint8Array(`INVITE${member}${createAtNetworkTimestamp}`), secretKey ); const memberAuthData = await MetaGroupWrapperActions.makeSwarmSubAccount(groupPk, member); @@ -50,7 +50,7 @@ async function getGroupInviteMessage({ const invite = new GroupUpdateInviteMessage({ groupName, groupPk, - timestamp, + createAtNetworkTimestamp, adminSignature, memberAuthData, }); diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 49f7e9c5d4..8efcb22fa6 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -473,8 +473,6 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { await convo.updateGroupAdmins(admins, false); await convo.commit(); - const networkTimestamp = GetNetworkTime.now(); - getSwarmPollingInstance().removePubkey(groupId, 'leaveClosedGroup'); if (fromSyncMessage) { @@ -491,7 +489,7 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { // Send the update to the group const ourLeavingMessage = new ClosedGroupMemberLeftMessage({ - timestamp: networkTimestamp, + createAtNetworkTimestamp: GetNetworkTime.now(), groupId, }); diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index fe8b955a2d..e15014c8c7 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -6,6 +6,7 @@ import { ECKeyPair } from '../../receiver/keypairs'; import { openConversationWithMessages } from '../../state/ducks/conversations'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { getSwarmPollingInstance } from '../apis/snode_api'; +import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { generateClosedGroupPublicKey, generateCurve25519KeyPairWithoutPrefix } from '../crypto'; import { ClosedGroup, GroupInfo } from '../group/closed-group'; @@ -191,6 +192,8 @@ function createInvitePromises( encryptionKeyPair: ECKeyPair, existingExpireTimer: number ) { + const createAtNetworkTimestamp = GetNetworkTime.now(); + return listOfMembers.map(async m => { const messageParams: ClosedGroupNewMessageParams = { groupId: groupPublicKey, @@ -198,7 +201,7 @@ function createInvitePromises( members: listOfMembers, admins, keypair: encryptionKeyPair, - timestamp: Date.now(), + createAtNetworkTimestamp, expireTimer: existingExpireTimer, }; const message = new ClosedGroupNewMessage(messageParams); diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 0d3db88785..d95a6ee9a9 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -259,7 +259,7 @@ async function sendNewName(convo: ConversationModel, name: string, messageId: st // Send the update to the group const nameChangeMessage = new ClosedGroupNameChangeMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), groupId, identifier: messageId, name, @@ -294,7 +294,7 @@ async function sendAddedMembers( const existingExpireTimer = convo.get('expireTimer') || 0; // Send the Added Members message to the group (only members already in the group will get it) const closedGroupControlMessage = new ClosedGroupAddedMembersMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), groupId, addedMembers, identifier: messageId, @@ -306,7 +306,7 @@ async function sendAddedMembers( // Send closed group update messages to any new members individually const newClosedGroupUpdate = new ClosedGroupNewMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), name: groupName, groupId, admins, @@ -352,7 +352,7 @@ async function sendRemovedMembers( } // Send the update to the group and generate + distribute a new encryption key pair if needed const mainClosedGroupControlMessage = new ClosedGroupRemovedMembersMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), groupId, removedMembers, identifier: messageId, @@ -414,7 +414,7 @@ async function generateAndSendNewEncryptionKeyPair( const keypairsMessage = new ClosedGroupEncryptionPairMessage({ groupId: toHex(groupId), - timestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), encryptedKeyPairs: wrappers, }); diff --git a/ts/session/messages/outgoing/Message.ts b/ts/session/messages/outgoing/Message.ts index 6930ea6b04..16a4e7fcb9 100644 --- a/ts/session/messages/outgoing/Message.ts +++ b/ts/session/messages/outgoing/Message.ts @@ -1,22 +1,27 @@ import { v4 as uuid } from 'uuid'; export interface MessageParams { - timestamp: number; + createAtNetworkTimestamp: number; identifier?: string; } export abstract class Message { - public readonly timestamp: number; + /** + * This is the network timestamp when this message was created (and so, potentially signed). + * This must be used as the envelope timestamp, as other devices are going to use it to verify messages. + * There is also the stored_at/effectiveTimestamp which we get back once we sent a message to the recipient's swarm, but that's not included here. + */ + public readonly createAtNetworkTimestamp: number; public readonly identifier: string; - constructor({ timestamp, identifier }: MessageParams) { - this.timestamp = timestamp; + constructor({ createAtNetworkTimestamp, identifier }: MessageParams) { + this.createAtNetworkTimestamp = createAtNetworkTimestamp; if (identifier && identifier.length === 0) { throw new Error('Cannot set empty identifier'); } - if (!timestamp || timestamp <= 0) { - throw new Error('Cannot set undefined timestamp or <=0'); + if (!createAtNetworkTimestamp || createAtNetworkTimestamp <= 0) { + throw new Error('Cannot set undefined createAtNetworkTimestamp or <=0'); } this.identifier = identifier || uuid(); } diff --git a/ts/session/messages/outgoing/controlMessage/CallMessage.ts b/ts/session/messages/outgoing/controlMessage/CallMessage.ts index b0c2609d92..04884b6a86 100644 --- a/ts/session/messages/outgoing/controlMessage/CallMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/CallMessage.ts @@ -1,8 +1,8 @@ -import { SignalService } from '../../../../protobuf'; -import { MessageParams } from '../Message'; import { ContentMessage } from '..'; +import { SignalService } from '../../../../protobuf'; import { signalservice } from '../../../../protobuf/compiled'; import { TTL_DEFAULT } from '../../../constants'; +import { MessageParams } from '../Message'; interface CallMessageParams extends MessageParams { type: SignalService.CallMessage.Type; @@ -20,7 +20,10 @@ export class CallMessage extends ContentMessage { public readonly uuid: string; constructor(params: CallMessageParams) { - super({ timestamp: params.timestamp, identifier: params.identifier }); + super({ + createAtNetworkTimestamp: params.createAtNetworkTimestamp, + identifier: params.identifier, + }); this.type = params.type; this.sdpMLineIndexes = params.sdpMLineIndexes; this.sdpMids = params.sdpMids; diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts index d3962fdad3..5b07a5a961 100644 --- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts @@ -1,15 +1,16 @@ import { v4 as uuid } from 'uuid'; -import { SignalService } from '../../../../protobuf'; -import { MessageParams } from '../Message'; import { ContentMessage } from '..'; -import { PubKey } from '../../../types'; import { getMessageQueue } from '../../..'; -import { ConvoHub } from '../../../conversations'; -import { UserUtils } from '../../../utils'; import { SettingsKey } from '../../../../data/settings-key'; +import { SignalService } from '../../../../protobuf'; import { Storage } from '../../../../util/storage'; +import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; +import { ConvoHub } from '../../../conversations'; +import { PubKey } from '../../../types'; +import { UserUtils } from '../../../utils'; +import { MessageParams } from '../Message'; interface DataExtractionNotificationMessageParams extends MessageParams { referencedAttachmentTimestamp: number; @@ -19,7 +20,10 @@ export class DataExtractionNotificationMessage extends ContentMessage { public readonly referencedAttachmentTimestamp: number; constructor(params: DataExtractionNotificationMessageParams) { - super({ timestamp: params.timestamp, identifier: params.identifier }); + super({ + createAtNetworkTimestamp: params.createAtNetworkTimestamp, + identifier: params.identifier, + }); this.referencedAttachmentTimestamp = params.referencedAttachmentTimestamp; // this does not make any sense if (!this.referencedAttachmentTimestamp) { @@ -68,7 +72,7 @@ export const sendDataExtractionNotification = async ( const dataExtractionNotificationMessage = new DataExtractionNotificationMessage({ referencedAttachmentTimestamp, identifier: uuid(), - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), }); const pubkey = PubKey.cast(conversationId); window.log.info( @@ -76,11 +80,11 @@ export const sendDataExtractionNotification = async ( ); try { - await getMessageQueue().sendToPubKey( + await getMessageQueue().sendToPubKeyNonDurably({ pubkey, - dataExtractionNotificationMessage, - SnodeNamespaces.Default - ); + message: dataExtractionNotificationMessage, + namespace: SnodeNamespaces.Default, + }); } catch (e) { window.log.warn('failed to send data extraction notification', e); } diff --git a/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts b/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts index d99a31ab0e..e05f9956e7 100644 --- a/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts @@ -16,7 +16,10 @@ export class ExpirationTimerUpdateMessage extends DataMessage { public readonly expireTimer: number | null; constructor(params: ExpirationTimerUpdateMessageParams) { - super({ timestamp: params.timestamp, identifier: params.identifier }); + super({ + createAtNetworkTimestamp: params.createAtNetworkTimestamp, + identifier: params.identifier, + }); this.expireTimer = params.expireTimer; const { groupId, syncTarget } = params; diff --git a/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts b/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts index 0bc5af5cab..027233e928 100644 --- a/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts +++ b/ts/session/messages/outgoing/controlMessage/MessageRequestResponse.ts @@ -16,7 +16,7 @@ export class MessageRequestResponse extends ContentMessage { constructor(params: MessageRequestResponseParams) { super({ - timestamp: params.timestamp, + createAtNetworkTimestamp: params.createAtNetworkTimestamp, } as MessageRequestResponseParams); const profile = buildProfileForOutgoingMessage(params); diff --git a/ts/session/messages/outgoing/controlMessage/TypingMessage.ts b/ts/session/messages/outgoing/controlMessage/TypingMessage.ts index 719f729634..827138569f 100644 --- a/ts/session/messages/outgoing/controlMessage/TypingMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/TypingMessage.ts @@ -1,7 +1,7 @@ +import { ContentMessage } from '..'; +import { Constants } from '../../..'; import { SignalService } from '../../../../protobuf'; import { MessageParams } from '../Message'; -import { Constants } from '../../..'; -import { ContentMessage } from '..'; interface TypingMessageParams extends MessageParams { isTyping: boolean; @@ -10,12 +10,13 @@ interface TypingMessageParams extends MessageParams { export class TypingMessage extends ContentMessage { public readonly isTyping: boolean; - public readonly typingTimestamp?: number; constructor(params: TypingMessageParams) { - super({ timestamp: params.timestamp, identifier: params.identifier }); + super({ + createAtNetworkTimestamp: params.createAtNetworkTimestamp, + identifier: params.identifier, + }); this.isTyping = params.isTyping; - this.typingTimestamp = params.typingTimestamp; } public ttl(): number { @@ -29,14 +30,13 @@ export class TypingMessage extends ContentMessage { } protected typingProto(): SignalService.TypingMessage { - const ACTION_ENUM = SignalService.TypingMessage.Action; - - const action = this.isTyping ? ACTION_ENUM.STARTED : ACTION_ENUM.STOPPED; - const finalTimestamp = this.typingTimestamp || Date.now(); + const action = this.isTyping + ? SignalService.TypingMessage.Action.STARTED + : SignalService.TypingMessage.Action.STOPPED; const typingMessage = new SignalService.TypingMessage(); typingMessage.action = action; - typingMessage.timestamp = finalTimestamp; + typingMessage.timestamp = this.createAtNetworkTimestamp; return typingMessage; } diff --git a/ts/session/messages/outgoing/controlMessage/UnsendMessage.ts b/ts/session/messages/outgoing/controlMessage/UnsendMessage.ts index 2fc93ab7a6..ca5323f744 100644 --- a/ts/session/messages/outgoing/controlMessage/UnsendMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/UnsendMessage.ts @@ -3,7 +3,6 @@ import { ContentMessage } from '../ContentMessage'; import { MessageParams } from '../Message'; interface UnsendMessageParams extends MessageParams { - timestamp: number; author: string; } @@ -11,7 +10,10 @@ export class UnsendMessage extends ContentMessage { private readonly author: string; constructor(params: UnsendMessageParams) { - super({ timestamp: params.timestamp, author: params.author } as MessageParams); + super({ + createAtNetworkTimestamp: params.createAtNetworkTimestamp, + author: params.author, + } as MessageParams); this.author = params.author; } @@ -23,7 +25,7 @@ export class UnsendMessage extends ContentMessage { public unsendProto(): SignalService.Unsend { return new SignalService.Unsend({ - timestamp: this.timestamp, + timestamp: this.createAtNetworkTimestamp, author: this.author, }); } diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts index c8a43a7775..57de3f3422 100644 --- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage.ts @@ -11,7 +11,7 @@ export class ClosedGroupAddedMembersMessage extends ClosedGroupMessage { constructor(params: ClosedGroupAddedMembersMessageParams) { super({ - timestamp: params.timestamp, + createAtNetworkTimestamp: params.createAtNetworkTimestamp, identifier: params.identifier, groupId: params.groupId, }); diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts index e1252396fa..8c32d2676b 100644 --- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage.ts @@ -10,7 +10,7 @@ export class ClosedGroupEncryptionPairMessage extends ClosedGroupMessage { constructor(params: ClosedGroupEncryptionPairMessageParams) { super({ - timestamp: params.timestamp, + createAtNetworkTimestamp: params.createAtNetworkTimestamp, identifier: params.identifier, groupId: params.groupId, }); diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts index c7a5465105..2d841311b1 100644 --- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts @@ -12,7 +12,7 @@ export abstract class ClosedGroupMessage extends DataMessage { constructor(params: ClosedGroupMessageParams) { super({ - timestamp: params.timestamp, + createAtNetworkTimestamp: params.createAtNetworkTimestamp, identifier: params.identifier, }); diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts index 71a390c67f..720a849a0e 100644 --- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage.ts @@ -10,7 +10,7 @@ export class ClosedGroupNameChangeMessage extends ClosedGroupMessage { constructor(params: ClosedGroupNameChangeMessageParams) { super({ - timestamp: params.timestamp, + createAtNetworkTimestamp: params.createAtNetworkTimestamp, identifier: params.identifier, groupId: params.groupId, }); diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage.ts index 559ed7a5ac..ec4c8de0f7 100644 --- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupNewMessage.ts @@ -1,7 +1,7 @@ import { SignalService } from '../../../../../protobuf'; -import { ClosedGroupMessage, ClosedGroupMessageParams } from './ClosedGroupMessage'; -import { fromHexToArray } from '../../../../utils/String'; import { ECKeyPair } from '../../../../../receiver/keypairs'; +import { fromHexToArray } from '../../../../utils/String'; +import { ClosedGroupMessage, ClosedGroupMessageParams } from './ClosedGroupMessage'; export interface ClosedGroupNewMessageParams extends ClosedGroupMessageParams { name: string; @@ -20,7 +20,7 @@ export class ClosedGroupNewMessage extends ClosedGroupMessage { constructor(params: ClosedGroupNewMessageParams) { super({ - timestamp: params.timestamp, + createAtNetworkTimestamp: params.createAtNetworkTimestamp, identifier: params.identifier, groupId: params.groupId, }); diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts index 019d832bcd..111cfb6efb 100644 --- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage.ts @@ -11,7 +11,7 @@ export class ClosedGroupRemovedMembersMessage extends ClosedGroupMessage { constructor(params: ClosedGroupRemovedMembersMessageParams) { super({ - timestamp: params.timestamp, + createAtNetworkTimestamp: params.createAtNetworkTimestamp, identifier: params.identifier, groupId: params.groupId, }); diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts index 67fa4b101f..564c75f9fb 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts @@ -74,7 +74,7 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { const infoChangeMessage = new SignalService.GroupUpdateInfoChangeMessage({ type: this.typeOfChange, adminSignature: this.sodium.crypto_sign_detached( - stringToUint8Array(`INFO_CHANGE${this.typeOfChange}${this.timestamp}`), + stringToUint8Array(`INFO_CHANGE${this.typeOfChange}${this.createAtNetworkTimestamp}`), this.secretKey ), }); diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts index fc3a4e38a9..0def779784 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts @@ -84,7 +84,7 @@ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { type: this.typeOfChange, memberSessionIds: this.memberSessionIds, adminSignature: this.sodium.crypto_sign_detached( - stringToUint8Array(`MEMBER_CHANGE${this.typeOfChange}${this.timestamp}`), + stringToUint8Array(`MEMBER_CHANGE${this.typeOfChange}${this.createAtNetworkTimestamp}`), this.secretKey ), }); diff --git a/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts b/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts index 3ca1c848c0..22770934a8 100644 --- a/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage.ts @@ -8,8 +8,8 @@ interface ReadReceiptMessageParams extends MessageParams { export class ReadReceiptMessage extends ContentMessage { public readonly timestamps: Array; - constructor({ timestamp, identifier, timestamps }: ReadReceiptMessageParams) { - super({ timestamp, identifier }); + constructor({ createAtNetworkTimestamp, identifier, timestamps }: ReadReceiptMessageParams) { + super({ createAtNetworkTimestamp, identifier }); this.timestamps = timestamps; } diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index 95f2b89eea..d0d6357c48 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -18,7 +18,7 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage { constructor(params: ClosedGroupVisibleMessageParams) { super({ - timestamp: params.chatMessage.timestamp, + createAtNetworkTimestamp: params.chatMessage.createAtNetworkTimestamp, identifier: params.identifier ?? params.chatMessage.identifier, groupId: params.groupId, }); @@ -64,7 +64,7 @@ export class ClosedGroupV2VisibleMessage extends DataMessage { WithGroupMessageNamespace ) { super({ - timestamp: params.chatMessage.timestamp, + createAtNetworkTimestamp: params.chatMessage.createAtNetworkTimestamp, identifier: params.identifier ?? params.chatMessage.identifier, }); this.chatMessage = params.chatMessage; diff --git a/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts b/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts index a04deeb063..735f4d1330 100644 --- a/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts @@ -16,7 +16,10 @@ export class GroupInvitationMessage extends DataMessage { private readonly expireTimer?: number; constructor(params: GroupInvitationMessageParams) { - super({ timestamp: params.timestamp, identifier: params.identifier }); + super({ + createAtNetworkTimestamp: params.createAtNetworkTimestamp, + identifier: params.identifier, + }); this.url = params.url; this.name = params.name; this.expireTimer = params.expireTimer; diff --git a/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts index 552532455f..af3f90aa4e 100644 --- a/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts @@ -89,7 +89,10 @@ export class VisibleMessage extends DataMessage { private readonly syncTarget?: string; constructor(params: VisibleMessageParams) { - super({ timestamp: params.timestamp, identifier: params.identifier }); + super({ + createAtNetworkTimestamp: params.createAtNetworkTimestamp, + identifier: params.identifier, + }); this.attachments = params.attachments; this.body = params.body; this.quote = params.quote; @@ -179,7 +182,10 @@ export class VisibleMessage extends DataMessage { } public isEqual(comparator: VisibleMessage): boolean { - return this.identifier === comparator.identifier && this.timestamp === comparator.timestamp; + return ( + this.identifier === comparator.identifier && + this.createAtNetworkTimestamp === comparator.createAtNetworkTimestamp + ); } } diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index afc5b2b556..002f27b0b7 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -3,7 +3,7 @@ import { AbortController } from 'abort-controller'; import { MessageSender } from '.'; import { ClosedGroupMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMessage'; import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage'; -import { PubKey, RawMessage } from '../types'; +import { OutgoingRawMessage, PubKey } from '../types'; import { JobQueue, MessageUtils, UserUtils } from '../utils'; import { PendingMessageCache } from './PendingMessageCache'; @@ -30,6 +30,8 @@ import { SnodeNamespacesUser, } from '../apis/snode_api/namespaces'; import { CallMessage } from '../messages/outgoing/controlMessage/CallMessage'; +import { DataExtractionNotificationMessage } from '../messages/outgoing/controlMessage/DataExtractionNotificationMessage'; +import { TypingMessage } from '../messages/outgoing/controlMessage/TypingMessage'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; import { GroupUpdateDeleteMemberContentMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage'; import { GroupUpdateInfoChangeMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; @@ -64,7 +66,7 @@ export class MessageQueue { destinationPubKey: PubKey, message: ContentMessage, namespace: SnodeNamespaces, - sentCb?: (message: RawMessage) => Promise, + sentCb?: (message: OutgoingRawMessage) => Promise, isGroup = false ): Promise { if ((message as any).syncTarget) { @@ -187,7 +189,7 @@ export class MessageQueue { }: { message: ClosedGroupMessageType; namespace: SnodeNamespacesLegacyGroup; - sentCb?: (message: RawMessage) => Promise; + sentCb?: (message: OutgoingRawMessage) => Promise; groupPubKey?: PubKey; }): Promise { let destinationPubKey: PubKey | undefined = groupPubKey; @@ -213,7 +215,7 @@ export class MessageQueue { | GroupUpdateInfoChangeMessage | GroupUpdateDeleteMemberContentMessage | GroupUpdateMemberLeftMessage; - sentCb?: (message: RawMessage) => Promise; + sentCb?: (message: OutgoingRawMessage) => Promise; }): Promise { if (!message.destination) { throw new Error('Invalid group message passed in sendToGroupV2.'); @@ -235,7 +237,7 @@ export class MessageQueue { }: { namespace: SnodeNamespacesUser; message?: SyncMessageType; - sentCb?: (message: RawMessage) => Promise; + sentCb?: (message: OutgoingRawMessage) => Promise; }): Promise { if (!message) { return; @@ -262,6 +264,8 @@ export class MessageQueue { pubkey: PubKey; message: | ClosedGroupNewMessage + | TypingMessage // no point of caching the typing message, they are very short lived + | DataExtractionNotificationMessage | CallMessage | ClosedGroupMemberLeftMessage | GroupUpdateInviteMessage @@ -351,7 +355,7 @@ export class MessageQueue { destinationPk: PubKey, message: ContentMessage, namespace: SnodeNamespaces, - sentCb?: (message: RawMessage) => Promise, + sentCb?: (message: OutgoingRawMessage) => Promise, isGroup = false ): Promise { // Don't send to ourselves diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 82de569360..b437083c39 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -3,7 +3,7 @@ import { AbortController } from 'abort-controller'; import ByteBuffer from 'bytebuffer'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import { isEmpty, sample, toNumber } from 'lodash'; +import { isEmpty, sample } from 'lodash'; import pRetry from 'p-retry'; import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; @@ -40,53 +40,13 @@ import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; import { ed25519Str } from '../onions/onionPath'; import { PubKey } from '../types'; -import { RawMessage } from '../types/RawMessage'; +import { OutgoingRawMessage } from '../types/RawMessage'; import { UserUtils } from '../utils'; import { fromUInt8ArrayToBase64 } from '../utils/String'; import { EmptySwarmError } from '../utils/errors'; // ================ SNODE STORE ================ -function overwriteOutgoingTimestampWithNetworkTimestamp(message: { plainTextBuffer: Uint8Array }) { - const networkTimestamp = GetNetworkTime.now(); - - const { plainTextBuffer } = message; - const contentDecoded = SignalService.Content.decode(plainTextBuffer); - - const { dataMessage, dataExtractionNotification, typingMessage } = contentDecoded; - if (dataMessage && dataMessage.timestamp && toNumber(dataMessage.timestamp) > 0) { - // for a few message types, we cannot override the timestamp when sending it. - // - for a sync message - // - groupv2InviteMessage, groupUpdateDeleteMemberContentMessage, groupUpdateDeleteMessage as the embedded signature depends on the timestamp inside - if ( - dataMessage.syncTarget || - dataMessage.groupUpdateMessage?.inviteMessage || - dataMessage.groupUpdateMessage?.infoChangeMessage || - dataMessage.groupUpdateMessage?.deleteMemberContent || - dataMessage.groupUpdateMessage?.memberChangeMessage || - dataMessage.groupUpdateMessage?.deleteMessage - ) { - return { - overRiddenTimestampBuffer: plainTextBuffer, - networkTimestamp: toNumber(dataMessage.timestamp), - }; - } - dataMessage.timestamp = networkTimestamp; - } - if ( - dataExtractionNotification && - dataExtractionNotification.timestamp && - toNumber(dataExtractionNotification.timestamp) > 0 - ) { - dataExtractionNotification.timestamp = networkTimestamp; - } - if (typingMessage && typingMessage.timestamp && toNumber(typingMessage.timestamp) > 0) { - typingMessage.timestamp = networkTimestamp; - } - const overRiddenTimestampBuffer = SignalService.Content.encode(contentDecoded).finish(); - return { overRiddenTimestampBuffer, networkTimestamp }; -} - function getMinRetryTimeout() { return 1000; } @@ -109,7 +69,7 @@ function isSyncMessage(message: ContentMessage) { * @param attempts The amount of times to attempt sending. Minimum value is 1. */ async function send( - message: RawMessage, + message: OutgoingRawMessage, attempts: number = 3, retryMinTimeout?: number, // in ms isASyncMessage?: boolean @@ -131,7 +91,8 @@ async function send( namespace: message.namespace, ttl, identifier: message.identifier, - isSyncMessage: Boolean(isASyncMessage), + isSyncMessage: !!isASyncMessage, + networkTimestamp: message.networkTimestampCreated, }, ]); @@ -332,6 +293,7 @@ type EncryptAndWrapMessage = { plainTextBuffer: Uint8Array; destination: string; namespace: number; + networkTimestamp: number; } & SharedEncryptAndWrap; type EncryptAndWrapMessageResults = { @@ -353,15 +315,14 @@ async function encryptForGroupV2( namespace, plainTextBuffer, ttl, + networkTimestamp, } = params; - const { overRiddenTimestampBuffer, networkTimestamp } = - overwriteOutgoingTimestampWithNetworkTimestamp({ plainTextBuffer }); const envelope = await buildEnvelope( SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, destination, networkTimestamp, - overRiddenTimestampBuffer + plainTextBuffer ); const recipient = PubKey.cast(destination); @@ -395,19 +356,18 @@ async function encryptMessageAndWrap( namespace, plainTextBuffer, ttl, + networkTimestamp, } = params; if (PubKey.is03Pubkey(destination)) { return encryptForGroupV2(params); } - const { overRiddenTimestampBuffer, networkTimestamp } = - overwriteOutgoingTimestampWithNetworkTimestamp({ plainTextBuffer }); const recipient = PubKey.cast(destination); const { envelopeType, cipherText } = await MessageEncrypter.encrypt( recipient, - overRiddenTimestampBuffer, + plainTextBuffer, encryptionBasedOnConversation(recipient) ); diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts index 0f5dbcea89..6229f1470e 100644 --- a/ts/session/sending/MessageSentHandler.ts +++ b/ts/session/sending/MessageSentHandler.ts @@ -3,7 +3,7 @@ import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; import { PnServer } from '../apis/push_notification_api'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; -import { RawMessage } from '../types'; +import { OutgoingRawMessage } from '../types'; import { UserUtils } from '../utils'; async function handlePublicMessageSentSuccess( @@ -41,7 +41,7 @@ async function handlePublicMessageSentSuccess( } async function handleMessageSentSuccess( - sentMessage: RawMessage, + sentMessage: OutgoingRawMessage, effectiveTimestamp: number, wrappedEnvelope?: Uint8Array ) { @@ -135,7 +135,7 @@ async function handleMessageSentSuccess( } async function handleMessageSentFailure( - sentMessage: RawMessage | OpenGroupVisibleMessage, + sentMessage: OutgoingRawMessage | OpenGroupVisibleMessage, error: any ) { const fetchedMessage = await fetchHandleMessageSentData(sentMessage.identifier); diff --git a/ts/session/sending/PendingMessageCache.ts b/ts/session/sending/PendingMessageCache.ts index f199dd8fd5..153a635f03 100644 --- a/ts/session/sending/PendingMessageCache.ts +++ b/ts/session/sending/PendingMessageCache.ts @@ -1,10 +1,11 @@ -import _ from 'lodash'; +import { from_hex, to_hex } from 'libsodium-wrappers-sumo'; +import _, { compact, isNumber } from 'lodash'; import { Data } from '../../data/data'; import { Storage } from '../../util/storage'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { ContentMessage } from '../messages/outgoing'; import { PubKey } from '../types'; -import { PartialRawMessage, RawMessage } from '../types/RawMessage'; +import { OutgoingRawMessage, StoredRawMessage } from '../types/RawMessage'; import { MessageUtils } from '../utils'; // This is an abstraction for storing pending messages. @@ -15,18 +16,18 @@ import { MessageUtils } from '../utils'; // memory and sync its state with the database on modification (add or remove). export class PendingMessageCache { - public callbacks: Map Promise> = new Map(); + public callbacks: Map Promise> = new Map(); protected loadPromise: Promise | undefined; - protected cache: Array = []; + protected cache: Array = []; - public async getAllPending(): Promise> { + public async getAllPending(): Promise> { await this.loadFromDBIfNeeded(); // Get all pending from cache return [...this.cache]; } - public async getForDevice(device: PubKey): Promise> { + public async getForDevice(device: PubKey): Promise> { const pending = await this.getAllPending(); return pending.filter(m => m.device === device.key); } @@ -46,7 +47,7 @@ export class PendingMessageCache { namespace: SnodeNamespaces, sentCb?: (message: any) => Promise, isGroup = false - ): Promise { + ): Promise { await this.loadFromDBIfNeeded(); const rawMessage = await MessageUtils.toRawMessage( destinationPubKey, @@ -69,7 +70,7 @@ export class PendingMessageCache { return rawMessage; } - public async remove(message: RawMessage): Promise | undefined> { + public async remove(message: OutgoingRawMessage): Promise | undefined> { await this.loadFromDBIfNeeded(); // Should only be called after message is processed @@ -89,7 +90,7 @@ export class PendingMessageCache { return updatedCache; } - public find(message: RawMessage): RawMessage | undefined { + public find(message: OutgoingRawMessage): OutgoingRawMessage | undefined { // Find a message in the cache return this.cache.find(m => m.device === message.device && m.identifier === message.identifier); } @@ -114,33 +115,62 @@ export class PendingMessageCache { this.cache = messages; } - protected async getFromStorage(): Promise> { + protected async getFromStorage(): Promise> { const data = await Data.getItemById('pendingMessages'); if (!data || !data.value) { return []; } - const barePending = JSON.parse(String(data.value)) as Array; - - // Rebuild plainTextBuffer - return barePending.map((message: PartialRawMessage) => { - return { - ...message, - plainTextBuffer: new Uint8Array(message.plainTextBuffer), - } as RawMessage; - }); + try { + // let's do some cleanup, read what we have in DB, remove what is invalid, write to DB, and return filtered data. + // this is because we've added some mandatory fields recently, and the current stored messages won't have them. + const barePending = JSON.parse(String(data.value)) as Array; + + const filtered = compact( + barePending.map((message: StoredRawMessage) => { + try { + // let's skip outgoing messages which have no networkTimestamp associated with them, as we need one to send a message (mapped to the envelope one) + + if ( + !message.networkTimestampCreated || + !isNumber(message.networkTimestampCreated) || + message.networkTimestampCreated <= 0 + ) { + throw new Error('networkTimestampCreated is emptyo <=0'); + } + + const plainTextBuffer = from_hex(message.plainTextBufferHex); // if a plaintextBufferHex is unset or not hex, this throws and we remove that message entirely + return { + ...message, + plainTextBuffer, + } as OutgoingRawMessage; + } catch (e) { + window.log.warn('failed to decode from message cache:', e.message); + return null; + } + + // let's also remove that logic with the plaintextbuffer stored as array of numbers, and use base64 strings instead + }) + ); + await this.saveToDBWithData(filtered); + return filtered; + } catch (e) { + window.log.warn('getFromStorage failed with', e.message); + return []; + } } - protected async saveToDB() { - // For each plainTextBuffer in cache, save in as a simple Array to avoid - // Node issues with JSON stringifying Buffer without strict typing - const encodedCache = [...this.cache].map(item => { - const plainTextBuffer = Array.from(item.plainTextBuffer); - - return { ...item, plainTextBuffer }; + private async saveToDBWithData(msg: Array) { + // For each plainTextBuffer in cache, save it as hex (because Uint8Array are not serializable as is) + const encodedCache = msg.map(item => { + return { ...item, plainTextBufferHex: to_hex(item.plainTextBuffer) }; }); const encodedPendingMessages = JSON.stringify(encodedCache) || '[]'; await Storage.put('pendingMessages', encodedPendingMessages); } + + protected async saveToDB() { + await this.saveToDBWithData(this.cache); + } } diff --git a/ts/session/types/RawMessage.ts b/ts/session/types/RawMessage.ts index 012dc65352..df8b912e05 100644 --- a/ts/session/types/RawMessage.ts +++ b/ts/session/types/RawMessage.ts @@ -1,20 +1,21 @@ import { SignalService } from '../../protobuf'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; -export type RawMessage = { +export type OutgoingRawMessage = { identifier: string; plainTextBuffer: Uint8Array; device: string; ttl: number; + networkTimestampCreated: number; encryption: SignalService.Envelope.Type; namespace: SnodeNamespaces; }; -// For building RawMessages from JSON -export interface PartialRawMessage { - identifier: string; - plainTextBuffer: any; - device: string; - ttl: number; - encryption: number; -} +export type StoredRawMessage = Pick< + OutgoingRawMessage, + 'identifier' | 'device' | 'ttl' | 'networkTimestampCreated' +> & { + plainTextBufferHex: string; + encryption: number; // read it as number, we need to check that it is indeed a valid encryption once loaded + namespace: number; // read it as number, we need to check that it is indeed a valid namespace once loaded +}; diff --git a/ts/session/utils/Messages.ts b/ts/session/utils/Messages.ts index 36384d2600..6355f65b0b 100644 --- a/ts/session/utils/Messages.ts +++ b/ts/session/utils/Messages.ts @@ -1,13 +1,13 @@ -import { RawMessage } from '../types/RawMessage'; +import { OutgoingRawMessage } from '../types/RawMessage'; -import { PubKey } from '../types'; -import { ClosedGroupMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMessage'; -import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; -import { ClosedGroupEncryptionPairReplyMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage'; -import { ContentMessage } from '../messages/outgoing'; -import { ExpirationTimerUpdateMessage } from '../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; import { SignalService } from '../../protobuf'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; +import { ContentMessage } from '../messages/outgoing'; +import { ExpirationTimerUpdateMessage } from '../messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; +import { ClosedGroupEncryptionPairReplyMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage'; +import { ClosedGroupMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMessage'; +import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; +import { PubKey } from '../types'; function getEncryptionTypeFromMessageType( message: ContentMessage, @@ -38,19 +38,20 @@ export async function toRawMessage( message: ContentMessage, namespace: SnodeNamespaces, isGroup = false -): Promise { +): Promise { const ttl = message.ttl(); const plainTextBuffer = message.plainTextBuffer(); const encryption = getEncryptionTypeFromMessageType(message, isGroup); - const rawMessage: RawMessage = { + const rawMessage: OutgoingRawMessage = { identifier: message.identifier, plainTextBuffer, device: destinationPubKey.key, ttl, encryption, namespace, + networkTimestampCreated: message.createAtNetworkTimestamp, }; return rawMessage; diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 5f9b350a21..cce8be1624 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -412,7 +412,7 @@ async function createOfferAndSendIt(recipient: string) { ); const offerMessage = new CallMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), type: SignalService.CallMessage.Type.OFFER, sdps: [overridenSdps], uuid: currentCallUUID, @@ -499,7 +499,7 @@ export async function USER_callRecipient(recipient: string) { peerConnection = createOrGetPeerConnection(recipient); // send a pre offer just to wake up the device on the remote side const preOfferMsg = new CallMessage({ - timestamp: now, + createAtNetworkTimestamp: GetNetworkTime.now(), type: SignalService.CallMessage.Type.PRE_OFFER, uuid: currentCallUUID, }); @@ -572,7 +572,7 @@ const iceSenderDebouncer = _.debounce(async (recipient: string) => { return; } const callIceCandicates = new CallMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), type: SignalService.CallMessage.Type.ICE_CANDIDATES, sdpMLineIndexes: validCandidates.map(c => c.sdpMLineIndex), sdpMids: validCandidates.map(c => c.sdpMid), @@ -881,7 +881,7 @@ export async function rejectCallAlreadyAnotherCall(fromSender: string, forcedUUI rejectedCallUUIDS.add(forcedUUID); const rejectCallMessage = new CallMessage({ type: SignalService.CallMessage.Type.END_CALL, - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), uuid: forcedUUID, }); await sendCallMessageAndSync(rejectCallMessage, fromSender); @@ -904,7 +904,7 @@ export async function USER_rejectIncomingCallRequest(fromSender: string) { rejectedCallUUIDS.add(aboutCallUUID); const endCallMessage = new CallMessage({ type: SignalService.CallMessage.Type.END_CALL, - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), uuid: aboutCallUUID, }); // sync the reject event so our other devices remove the popup too @@ -946,7 +946,7 @@ export async function USER_hangup(fromSender: string) { rejectedCallUUIDS.add(currentCallUUID); const endCallMessage = new CallMessage({ type: SignalService.CallMessage.Type.END_CALL, - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), uuid: currentCallUUID, }); void getMessageQueue().sendToPubKeyNonDurably({ @@ -1020,7 +1020,7 @@ async function buildAnswerAndSendIt(sender: string) { } const answerSdp = answer.sdp; const callAnswerMessage = new CallMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: GetNetworkTime.now(), type: SignalService.CallMessage.Type.ANSWER, sdps: [answerSdp], uuid: currentCallUUID, diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts index d6573a2625..6519964c83 100644 --- a/ts/session/utils/sync/syncUtils.ts +++ b/ts/session/utils/sync/syncUtils.ts @@ -43,7 +43,7 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal const buildSyncVisibleMessage = ( identifier: string, dataMessage: SignalService.DataMessage, - timestamp: number, + createAtNetworkTimestamp: number, syncTarget: string ) => { const body = dataMessage.body || undefined; @@ -74,7 +74,7 @@ const buildSyncVisibleMessage = ( return new VisibleMessage({ identifier, - timestamp, + createAtNetworkTimestamp, attachments, body, quote, @@ -87,14 +87,14 @@ const buildSyncVisibleMessage = ( const buildSyncExpireTimerMessage = ( identifier: string, dataMessage: SignalService.DataMessage, - timestamp: number, + createAtNetworkTimestamp: number, syncTarget: string ) => { const expireTimer = dataMessage.expireTimer; return new ExpirationTimerUpdateMessage({ identifier, - timestamp, + createAtNetworkTimestamp, expireTimer, syncTarget, }); diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index 0cad575c4a..190e69f249 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -473,16 +473,16 @@ async function handleRemoveMembers({ } await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, removed); - const timestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = GetNetworkTime.now(); await Promise.all( removed.map(async m => { const adminSignature = await SnodeGroupSignature.signDataWithAdminSecret( - `DELETE${m}${timestamp}`, + `DELETE${m}${createAtNetworkTimestamp}`, { secretKey } ); const deleteMessage = new GroupUpdateDeleteMessage({ groupPk, - timestamp, + createAtNetworkTimestamp, adminSignature: from_base64(adminSignature.signature, base64_variants.ORIGINAL), }); console.warn( @@ -600,13 +600,13 @@ async function handleMemberChangeFromUIOrNot({ const sodium = await getSodiumRenderer(); const allAdded = [...withHistory, ...withoutHistory]; // those are already enforced to be unique (and without intersection) in `validateMemberChange()` - const timestamp = Date.now(); + const createAtNetworkTimestamp = GetNetworkTime.now(); if (fromCurrentDevice && allAdded.length) { const msg = await ClosedGroup.addUpdateMessage( convo, { joiningMembers: allAdded }, us, - timestamp + createAtNetworkTimestamp ); await getMessageQueue().sendToGroupV2({ message: new GroupUpdateMemberChangeMessage({ @@ -614,7 +614,7 @@ async function handleMemberChangeFromUIOrNot({ groupPk, typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.ADDED, identifier: msg.id, - timestamp, + createAtNetworkTimestamp, secretKey: group.secretKey, sodium, }), @@ -625,7 +625,7 @@ async function handleMemberChangeFromUIOrNot({ convo, { kickedMembers: removed }, us, - timestamp + createAtNetworkTimestamp ); await getMessageQueue().sendToGroupV2({ message: new GroupUpdateMemberChangeMessage({ @@ -633,7 +633,7 @@ async function handleMemberChangeFromUIOrNot({ groupPk, typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED, identifier: msg.id, - timestamp: GetNetworkTime.now(), + createAtNetworkTimestamp, secretKey: group.secretKey, sodium, }), @@ -641,7 +641,7 @@ async function handleMemberChangeFromUIOrNot({ } convo.set({ - active_at: timestamp, + active_at: createAtNetworkTimestamp, }); await convo.commit(); } @@ -686,17 +686,22 @@ async function handleNameChangeFromUIOrNot({ await UserSync.queueNewJobIfNeeded(); - const timestamp = Date.now(); + const createAtNetworkTimestamp = GetNetworkTime.now(); if (fromCurrentDevice) { - const msg = await ClosedGroup.addUpdateMessage(convo, { newName }, us, timestamp); + const msg = await ClosedGroup.addUpdateMessage( + convo, + { newName }, + us, + createAtNetworkTimestamp + ); await getMessageQueue().sendToGroupV2({ message: new GroupUpdateInfoChangeMessage({ groupPk, typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.NAME, updatedName: newName, identifier: msg.id, - timestamp: Date.now(), + createAtNetworkTimestamp, secretKey: group.secretKey, sodium: await getSodiumRenderer(), }), @@ -704,7 +709,7 @@ async function handleNameChangeFromUIOrNot({ } convo.set({ - active_at: timestamp, + active_at: createAtNetworkTimestamp, }); await convo.commit(); } diff --git a/ts/test/session/unit/messages/ChatMessage_test.ts b/ts/test/session/unit/messages/ChatMessage_test.ts index 72a39452dd..7e5e47335e 100644 --- a/ts/test/session/unit/messages/ChatMessage_test.ts +++ b/ts/test/session/unit/messages/ChatMessage_test.ts @@ -1,5 +1,5 @@ -import { TextEncoder } from 'util'; import { expect } from 'chai'; +import { TextEncoder } from 'util'; import { toNumber } from 'lodash'; import { SignalService } from '../../../../protobuf'; @@ -14,7 +14,7 @@ import { describe('VisibleMessage', () => { it('can create empty message with just a timestamp', () => { const message = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), }); const plainText = message.plainTextBuffer(); const decoded = SignalService.Content.decode(plainText); @@ -24,7 +24,7 @@ describe('VisibleMessage', () => { it('can create message with a body', () => { const message = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), body: 'body', }); const plainText = message.plainTextBuffer(); @@ -34,7 +34,7 @@ describe('VisibleMessage', () => { it('can create message with a expire timer', () => { const message = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), expireTimer: 3600, }); const plainText = message.plainTextBuffer(); @@ -51,7 +51,7 @@ describe('VisibleMessage', () => { profileKey, }; const message = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), lokiProfile, }); const plainText = message.plainTextBuffer(); @@ -70,7 +70,7 @@ describe('VisibleMessage', () => { it('can create message with a quote without attachments', () => { const quote: Quote = { id: 1234, author: 'author', text: 'text' }; const message = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), quote, }); const plainText = message.plainTextBuffer(); @@ -87,7 +87,7 @@ describe('VisibleMessage', () => { previews.push(preview); const message = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), preview: previews, }); const plainText = message.plainTextBuffer(); @@ -109,7 +109,7 @@ describe('VisibleMessage', () => { attachments.push(attachment); const message = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), attachments, }); const plainText = message.plainTextBuffer(); @@ -124,14 +124,14 @@ describe('VisibleMessage', () => { it('correct ttl', () => { const message = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), }); expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX); }); it('has an identifier', () => { const message = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), }); expect(message.identifier).to.not.equal(null, 'identifier cannot be null'); expect(message.identifier).to.not.equal(undefined, 'identifier cannot be undefined'); diff --git a/ts/test/session/unit/messages/GroupInvitationMessage_test.ts b/ts/test/session/unit/messages/GroupInvitationMessage_test.ts index ba40c6d8a4..220dd3c151 100644 --- a/ts/test/session/unit/messages/GroupInvitationMessage_test.ts +++ b/ts/test/session/unit/messages/GroupInvitationMessage_test.ts @@ -7,13 +7,13 @@ import { GroupInvitationMessage } from '../../../../session/messages/outgoing/vi describe('GroupInvitationMessage', () => { let message: GroupInvitationMessage; - const timestamp = Date.now(); + const createAtNetworkTimestamp = Date.now(); const url = 'http://localhost'; const name = 'test'; beforeEach(() => { message = new GroupInvitationMessage({ - timestamp, + createAtNetworkTimestamp, url, name, }); diff --git a/ts/test/session/unit/messages/MessageRequestResponse_test.ts b/ts/test/session/unit/messages/MessageRequestResponse_test.ts index 6473a562bb..0e620a817c 100644 --- a/ts/test/session/unit/messages/MessageRequestResponse_test.ts +++ b/ts/test/session/unit/messages/MessageRequestResponse_test.ts @@ -9,7 +9,7 @@ describe('MessageRequestResponse', () => { let message: MessageRequestResponse | undefined; it('correct ttl', () => { message = new MessageRequestResponse({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), }); expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TTL_MAX); @@ -17,7 +17,7 @@ describe('MessageRequestResponse', () => { it('has an identifier', () => { message = new MessageRequestResponse({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), }); expect(message.identifier).to.not.equal(null, 'identifier cannot be null'); @@ -27,7 +27,7 @@ describe('MessageRequestResponse', () => { it('has an identifier matching if given', () => { const identifier = v4(); message = new MessageRequestResponse({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), identifier, }); @@ -36,7 +36,7 @@ describe('MessageRequestResponse', () => { it('isApproved is always true', () => { message = new MessageRequestResponse({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), }); const plainText = message.plainTextBuffer(); const decoded = SignalService.Content.decode(plainText); @@ -47,7 +47,7 @@ describe('MessageRequestResponse', () => { it('can create response without lokiProfile', () => { message = new MessageRequestResponse({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), }); const plainText = message.plainTextBuffer(); const decoded = SignalService.Content.decode(plainText); @@ -58,7 +58,7 @@ describe('MessageRequestResponse', () => { it('can create response with display name only', () => { message = new MessageRequestResponse({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), lokiProfile: { displayName: 'Jane', profileKey: null }, }); const plainText = message.plainTextBuffer(); @@ -71,7 +71,7 @@ describe('MessageRequestResponse', () => { it('empty profileKey does not get included', () => { message = new MessageRequestResponse({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), lokiProfile: { displayName: 'Jane', profileKey: new Uint8Array(0) }, }); const plainText = message.plainTextBuffer(); @@ -85,7 +85,7 @@ describe('MessageRequestResponse', () => { it('can create response with display name and profileKey and profileImage', () => { message = new MessageRequestResponse({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), lokiProfile: { displayName: 'Jane', profileKey: new Uint8Array([1, 2, 3, 4, 5, 6]), @@ -117,7 +117,7 @@ describe('MessageRequestResponse', () => { it('profileKey not included if profileUrl not set', () => { message = new MessageRequestResponse({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), lokiProfile: { displayName: 'Jane', profileKey: new Uint8Array([1, 2, 3, 4, 5, 6]) }, }); const plainText = message.plainTextBuffer(); @@ -135,7 +135,7 @@ describe('MessageRequestResponse', () => { it('url not included if profileKey not set', () => { message = new MessageRequestResponse({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), lokiProfile: { displayName: 'Jane', profileKey: null, diff --git a/ts/test/session/unit/messages/ReceiptMessage_test.ts b/ts/test/session/unit/messages/ReceiptMessage_test.ts index 977f94699f..e8d0ac9011 100644 --- a/ts/test/session/unit/messages/ReceiptMessage_test.ts +++ b/ts/test/session/unit/messages/ReceiptMessage_test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { beforeEach } from 'mocha'; import { toNumber } from 'lodash'; +import { beforeEach } from 'mocha'; import { SignalService } from '../../../../protobuf'; import { Constants } from '../../../../session'; @@ -12,8 +12,8 @@ describe('ReceiptMessage', () => { beforeEach(() => { timestamps = [987654321, 123456789]; - const timestamp = Date.now(); - readMessage = new ReadReceiptMessage({ timestamp, timestamps }); + const createAtNetworkTimestamp = Date.now(); + readMessage = new ReadReceiptMessage({ createAtNetworkTimestamp, timestamps }); }); it('content of a read receipt is correct', () => { diff --git a/ts/test/session/unit/messages/TypingMessage_test.ts b/ts/test/session/unit/messages/TypingMessage_test.ts index 621d5f8779..f95d8d2bc7 100644 --- a/ts/test/session/unit/messages/TypingMessage_test.ts +++ b/ts/test/session/unit/messages/TypingMessage_test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import Long from 'long'; import { toNumber } from 'lodash'; +import Long from 'long'; import { SignalService } from '../../../../protobuf'; import { Constants } from '../../../../session'; import { TypingMessage } from '../../../../session/messages/outgoing/controlMessage/TypingMessage'; @@ -9,7 +9,7 @@ import { TypingMessage } from '../../../../session/messages/outgoing/controlMess describe('TypingMessage', () => { it('has Action.STARTED if isTyping = true', () => { const message = new TypingMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), isTyping: true, }); const plainText = message.plainTextBuffer(); @@ -22,7 +22,7 @@ describe('TypingMessage', () => { it('has Action.STOPPED if isTyping = false', () => { const message = new TypingMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), isTyping: false, }); const plainText = message.plainTextBuffer(); @@ -35,7 +35,7 @@ describe('TypingMessage', () => { it('has typingTimestamp set if value passed', () => { const message = new TypingMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), isTyping: true, typingTimestamp: 111111111, }); @@ -47,7 +47,7 @@ describe('TypingMessage', () => { it('has typingTimestamp set with Date.now() if value not passed', () => { const message = new TypingMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), isTyping: true, }); const plainText = message.plainTextBuffer(); @@ -61,7 +61,7 @@ describe('TypingMessage', () => { it('correct ttl', () => { const message = new TypingMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), isTyping: true, }); expect(message.ttl()).to.equal(Constants.TTL_DEFAULT.TYPING_MESSAGE); @@ -69,7 +69,7 @@ describe('TypingMessage', () => { it('has an identifier', () => { const message = new TypingMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), isTyping: true, }); expect(message.identifier).to.not.equal(null, 'identifier cannot be null'); diff --git a/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts index e32bb28a6b..7ba0d34f7f 100644 --- a/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts +++ b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts @@ -1,12 +1,12 @@ import { expect } from 'chai'; import { SignalService } from '../../../../../protobuf'; -import { TestUtils } from '../../../../test-utils'; -import { StringUtils } from '../../../../../session/utils'; -import { PubKey } from '../../../../../session/types'; import { Constants } from '../../../../../session'; import { ClosedGroupVisibleMessage } from '../../../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { VisibleMessage } from '../../../../../session/messages/outgoing/visibleMessage/VisibleMessage'; +import { PubKey } from '../../../../../session/types'; +import { StringUtils } from '../../../../../session/utils'; +import { TestUtils } from '../../../../test-utils'; describe('ClosedGroupVisibleMessage', () => { let groupId: string; @@ -15,7 +15,7 @@ describe('ClosedGroupVisibleMessage', () => { }); it('can create empty message with timestamp, groupId and chatMessage', () => { const chatMessage = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), body: 'body', }); const message = new ClosedGroupVisibleMessage({ @@ -37,12 +37,12 @@ describe('ClosedGroupVisibleMessage', () => { expect(decoded.dataMessage).to.have.deep.property('body', 'body'); // we use the timestamp of the chatMessage as parent timestamp - expect(message).to.have.property('timestamp').to.be.equal(chatMessage.timestamp); + expect(message).to.have.property('timestamp').to.be.equal(chatMessage.createAtNetworkTimestamp); }); it('correct ttl', () => { const chatMessage = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), }); const message = new ClosedGroupVisibleMessage({ groupId, @@ -53,7 +53,7 @@ describe('ClosedGroupVisibleMessage', () => { it('has an identifier', () => { const chatMessage = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), }); const message = new ClosedGroupVisibleMessage({ groupId, @@ -65,7 +65,7 @@ describe('ClosedGroupVisibleMessage', () => { it('should use the identifier passed into it over the one set in chatMessage', () => { const chatMessage = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), body: 'body', identifier: 'chatMessage', }); @@ -79,7 +79,7 @@ describe('ClosedGroupVisibleMessage', () => { it('should use the identifier of the chatMessage if one is not specified on the closed group message', () => { const chatMessage = new VisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), body: 'body', identifier: 'chatMessage', }); diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index 2baf03ee24..90f293c750 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -18,7 +18,7 @@ import { ContentMessage } from '../../../../session/messages/outgoing'; import { ClosedGroupMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupMessage'; import { MessageSender } from '../../../../session/sending'; import { MessageQueue } from '../../../../session/sending/MessageQueue'; -import { PubKey, RawMessage } from '../../../../session/types'; +import { OutgoingRawMessage, PubKey } from '../../../../session/types'; import { PromiseUtils, UserUtils } from '../../../../session/utils'; import { TestUtils } from '../../../test-utils'; import { PendingMessageCacheStub } from '../../../test-utils/stubs'; @@ -46,7 +46,7 @@ describe('MessageQueue', () => { // Message Sender Stubs let sendStub: sinon.SinonStub< - [RawMessage, (number | undefined)?, (number | undefined)?, (boolean | undefined)?] + [OutgoingRawMessage, (number | undefined)?, (number | undefined)?, (boolean | undefined)?] >; beforeEach(() => { diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index afc7e6b03c..68f82fb4b7 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -15,7 +15,7 @@ import { MessageEncrypter } from '../../../../session/crypto'; import { OnionSending } from '../../../../session/onions/onionSend'; import { OnionV4 } from '../../../../session/onions/onionv4'; import { MessageSender } from '../../../../session/sending'; -import { PubKey, RawMessage } from '../../../../session/types'; +import { OutgoingRawMessage, PubKey } from '../../../../session/types'; import { MessageUtils, UserUtils } from '../../../../session/utils'; import { fromBase64ToArrayBuffer } from '../../../../session/utils/String'; import { TestUtils } from '../../../test-utils'; @@ -57,7 +57,7 @@ describe('MessageSender', () => { }); describe('retry', () => { - let rawMessage: RawMessage; + let rawMessage: OutgoingRawMessage; beforeEach(async () => { rawMessage = await MessageUtils.toRawMessage( diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts index babd9e70cf..ef175170c2 100644 --- a/ts/test/session/unit/utils/Messages_test.ts +++ b/ts/test/session/unit/utils/Messages_test.ts @@ -110,7 +110,7 @@ describe('Message Utils', () => { const member = TestUtils.generateFakePubKey().key; const msg = new ClosedGroupNewMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), name: 'df', members: [member], admins: [member], @@ -126,7 +126,7 @@ describe('Message Utils', () => { const device = TestUtils.generateFakePubKey(); const msg = new ClosedGroupNameChangeMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), name: 'df', groupId: TestUtils.generateFakePubKey().key, }); @@ -138,7 +138,7 @@ describe('Message Utils', () => { const device = TestUtils.generateFakePubKey(); const msg = new ClosedGroupAddedMembersMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), addedMembers: [TestUtils.generateFakePubKey().key], groupId: TestUtils.generateFakePubKey().key, }); @@ -150,7 +150,7 @@ describe('Message Utils', () => { const device = TestUtils.generateFakePubKey(); const msg = new ClosedGroupRemovedMembersMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), removedMembers: [TestUtils.generateFakePubKey().key], groupId: TestUtils.generateFakePubKey().key, }); @@ -170,7 +170,7 @@ describe('Message Utils', () => { }) ); const msg = new ClosedGroupEncryptionPairMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), groupId: TestUtils.generateFakePubKey().key, encryptedKeyPairs: fakeWrappers, }); @@ -190,7 +190,7 @@ describe('Message Utils', () => { }) ); const msg = new ClosedGroupEncryptionPairReplyMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), groupId: TestUtils.generateFakePubKey().key, encryptedKeyPairs: fakeWrappers, }); diff --git a/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts b/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts index b1a468298a..edd2625846 100644 --- a/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts +++ b/ts/test/test-utils/stubs/sending/PendingMessageCacheStub.ts @@ -1,14 +1,14 @@ import { PendingMessageCache } from '../../../../session/sending'; -import { RawMessage } from '../../../../session/types'; +import { OutgoingRawMessage } from '../../../../session/types'; export class PendingMessageCacheStub extends PendingMessageCache { - public dbData: Array; - constructor(dbData: Array = []) { + public dbData: Array; + constructor(dbData: Array = []) { super(); this.dbData = dbData; } - public getCache(): Readonly> { + public getCache(): Readonly> { return this.cache; } diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts index 9fd9f02755..c3d4f7066c 100644 --- a/ts/test/test-utils/utils/message.ts +++ b/ts/test/test-utils/utils/message.ts @@ -1,17 +1,17 @@ import { v4 as uuid } from 'uuid'; -import { generateFakePubKey } from './pubkey'; -import { ClosedGroupVisibleMessage } from '../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; -import { VisibleMessage } from '../../../session/messages/outgoing/visibleMessage/VisibleMessage'; -import { OpenGroupMessageV2 } from '../../../session/apis/open_group_api/opengroupV2/OpenGroupMessageV2'; import { TestUtils } from '..'; -import { OpenGroupRequestCommonType } from '../../../session/apis/open_group_api/opengroupV2/ApiUtil'; -import { OpenGroupVisibleMessage } from '../../../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; import { MessageModel } from '../../../models/message'; +import { OpenGroupRequestCommonType } from '../../../session/apis/open_group_api/opengroupV2/ApiUtil'; +import { OpenGroupMessageV2 } from '../../../session/apis/open_group_api/opengroupV2/OpenGroupMessageV2'; import { OpenGroupMessageV4, OpenGroupReactionMessageV4, } from '../../../session/apis/open_group_api/opengroupV2/OpenGroupServerPoller'; +import { ClosedGroupVisibleMessage } from '../../../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; +import { OpenGroupVisibleMessage } from '../../../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; +import { VisibleMessage } from '../../../session/messages/outgoing/visibleMessage/VisibleMessage'; import { OpenGroupReaction } from '../../../types/Reaction'; +import { generateFakePubKey } from './pubkey'; export function generateVisibleMessage({ identifier, @@ -23,7 +23,7 @@ export function generateVisibleMessage({ return new VisibleMessage({ body: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit', identifier: identifier ?? uuid(), - timestamp: timestamp || Date.now(), + createAtNetworkTimestamp: timestamp || Date.now(), attachments: undefined, quote: undefined, expireTimer: undefined, @@ -70,7 +70,7 @@ export function generateOpenGroupMessageV2WithServerId( export function generateOpenGroupVisibleMessage(): OpenGroupVisibleMessage { return new OpenGroupVisibleMessage({ - timestamp: Date.now(), + createAtNetworkTimestamp: Date.now(), }); } From bbb376fc2ad0c7bd1d3ad73ef0280f75e5323ae4 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 14 Nov 2023 15:33:23 +1100 Subject: [PATCH 061/302] fix: mark SharedConfigMessage as reserved --- protos/SignalService.proto | 41 ++----------------- ts/receiver/contentMessage.ts | 6 --- .../messages/incoming/IncomingMessage.ts | 3 +- .../session/unit/messages/ChatMessage_test.ts | 1 + 4 files changed, 5 insertions(+), 46 deletions(-) diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 5093fa2ab7..c6fcdada51 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -38,22 +38,11 @@ message MessageRequestResponse { optional DataMessage.LokiProfile profile = 3; } -message SharedConfigMessage { - enum Kind { - USER_PROFILE = 1; - CONTACTS = 2; - CONVO_INFO_VOLATILE = 3; - USER_GROUPS = 4; - } - - required Kind kind = 1; - required int64 seqno = 2; - required bytes data = 3; -} message Content { - reserved 7; - reserved "configurationMessage"; + reserved 7, 11; + reserved "configurationMessage", "sharedConfigMessage"; + optional DataMessage dataMessage = 1; optional CallMessage callMessage = 3; optional ReceiptMessage receiptMessage = 5; @@ -61,13 +50,10 @@ message Content { optional DataExtractionNotification dataExtractionNotification = 8; optional Unsend unsendMessage = 9; optional MessageRequestResponse messageRequestResponse = 10; - optional SharedConfigMessage sharedConfigMessage = 11; } message KeyPair { - // @required required bytes publicKey = 1; - // @required required bytes privateKey = 2; } @@ -78,18 +64,14 @@ message DataExtractionNotification { MEDIA_SAVED = 2; // timestamp } - // @required required Type type = 1; optional uint64 timestamp = 2; } message GroupUpdateInviteMessage { - // @required required string groupSessionId = 1; // The `groupIdentityPublicKey` with a `03` prefix - // @required required string name = 2; required bytes memberAuthData = 3; - // @required required bytes adminSignature = 4; } @@ -106,7 +88,6 @@ message GroupUpdateInfoChangeMessage { DISAPPEARING_MESSAGES = 3; } - // @required required Type type = 1; optional string updatedName = 2; optional uint32 updatedExpiration = 3; @@ -120,7 +101,6 @@ message GroupUpdateMemberChangeMessage { PROMOTED = 3; } - // @required required Type type = 1; repeated string memberSessionIds = 2; required bytes adminSignature = 3; @@ -128,7 +108,6 @@ message GroupUpdateMemberChangeMessage { message GroupUpdatePromoteMessage { - // @required required bytes groupIdentitySeed = 1; } @@ -137,7 +116,6 @@ message GroupUpdateMemberLeftMessage { } message GroupUpdateInviteResponseMessage { - // @required required bool isApproved = 1; // Whether the request was approved } @@ -175,12 +153,9 @@ message DataMessage { REACT = 0; REMOVE = 1; } - // @required required uint64 id = 1; // Message timestamp - // @required required string author = 2; optional string emoji = 3; - // @required required Action action = 4; } @@ -192,16 +167,13 @@ message DataMessage { optional AttachmentPointer thumbnail = 3; } - // @required required uint64 id = 1; - // @required required string author = 2; optional string text = 3; repeated QuotedAttachment attachments = 4; } message Preview { - // @required required string url = 1; optional string title = 2; optional AttachmentPointer image = 3; @@ -213,9 +185,7 @@ message DataMessage { } message OpenGroupInvitation { - // @required required string url = 1; - // @required required string name = 3; } @@ -233,13 +203,10 @@ message DataMessage { message KeyPairWrapper { - // @required required bytes publicKey = 1; // The public key of the user the key pair is meant for - // @required required bytes encryptedKeyPair = 2; // The encrypted key pair } - // @required required Type type = 1; optional bytes publicKey = 2; optional string name = 3; @@ -278,13 +245,11 @@ message CallMessage { END_CALL = 5; } - // @required required Type type = 1; repeated string sdps = 2; repeated uint32 sdpMLineIndexes = 3; repeated string sdpMids = 4; - // @required required string uuid = 5; } diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index a45e389cda..33f13b55e4 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -491,12 +491,6 @@ export async function innerHandleSwarmContentMessage({ return; } - if (content.sharedConfigMessage) { - window.log.warn('content.sharedConfigMessage are handled outside of the receiving pipeline'); - // this should never happen, but remove it from cache just in case something is messed up - await IncomingMessageCache.removeFromCache(envelope); - return; - } if (content.dataExtractionNotification) { perfStart(`handleDataExtractionNotification-${envelope.id}`); diff --git a/ts/session/messages/incoming/IncomingMessage.ts b/ts/session/messages/incoming/IncomingMessage.ts index 995e2b27bd..d7b042a33f 100644 --- a/ts/session/messages/incoming/IncomingMessage.ts +++ b/ts/session/messages/incoming/IncomingMessage.ts @@ -8,8 +8,7 @@ type IncomingMessageAvailableTypes = | SignalService.TypingMessage | SignalService.DataExtractionNotification | SignalService.Unsend - | SignalService.MessageRequestResponse - | SignalService.ISharedConfigMessage; + | SignalService.MessageRequestResponse; export class IncomingMessage { public readonly envelopeTimestamp: number; diff --git a/ts/test/session/unit/messages/ChatMessage_test.ts b/ts/test/session/unit/messages/ChatMessage_test.ts index 7e5e47335e..cf18a88bd6 100644 --- a/ts/test/session/unit/messages/ChatMessage_test.ts +++ b/ts/test/session/unit/messages/ChatMessage_test.ts @@ -1,4 +1,5 @@ import { expect } from 'chai'; +// eslint-disable-next-line import/order import { TextEncoder } from 'util'; import { toNumber } from 'lodash'; From b259d1844307399716e8134bca6d61d4fb2df4d5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Nov 2023 10:52:43 +1100 Subject: [PATCH 062/302] fix: add still broken promote handling with set_sig_keys --- package.json | 3 +- protos/SignalService.proto | 4 +- ts/components/MemberListItem.tsx | 47 ++++-- ts/components/basic/Flex.tsx | 2 + .../message-item/GroupUpdateMessage.tsx | 10 +- ts/models/conversation.ts | 7 +- ts/receiver/configMessage.ts | 2 +- ts/receiver/contentMessage.ts | 13 +- ts/receiver/dataMessage.ts | 10 +- ts/receiver/groupv2/handleGroupV2Message.ts | 4 +- ts/receiver/receiver.ts | 26 ++- .../apis/open_group_api/sogsv3/sogsApiV3.ts | 2 +- ts/session/apis/snode_api/retrieveRequest.ts | 17 +- .../snode_api/signature/groupSignature.ts | 26 ++- ts/session/apis/snode_api/swarmPolling.ts | 66 ++++---- .../SwarmPollingGroupConfig.ts | 28 ++-- ts/session/apis/snode_api/types.ts | 4 +- ts/session/crypto/MessageEncrypter.ts | 5 +- ts/session/group/closed-group.ts | 4 +- ts/session/sending/MessageQueue.ts | 3 + ts/session/sending/PendingMessageCache.ts | 2 +- ts/session/utils/Promise.ts | 7 - ts/session/utils/job_runners/JobRunner.ts | 8 + ts/session/utils/job_runners/PersistedJob.ts | 10 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 8 +- .../utils/job_runners/jobs/GroupPromoteJob.ts | 151 ++++++++++++++++++ .../utils/job_runners/jobs/JobRunnerType.ts | 3 +- ts/state/ducks/groups.ts | 56 ++++--- ts/state/selectors/conversations.ts | 2 +- ts/types/sqlSharedTypes.ts | 6 +- ts/webworker/worker_interface.ts | 2 +- .../browser/libsession_worker_interface.ts | 6 + yarn.lock | 5 + 33 files changed, 408 insertions(+), 141 deletions(-) create mode 100644 ts/session/utils/job_runners/jobs/GroupPromoteJob.ts diff --git a/package.json b/package.json index 6a8f22d9af..20c59c7ea4 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,8 @@ "semver": "^7.5.4", "styled-components": "5.1.1", "uuid": "8.3.2", - "webrtc-adapter": "^4.1.1" + "webrtc-adapter": "^4.1.1", + "zod": "^3.22.4" }, "devDependencies": { "@commitlint/cli": "^17.7.1", diff --git a/protos/SignalService.proto b/protos/SignalService.proto index c6fcdada51..eb0af27df0 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -80,7 +80,6 @@ message GroupUpdateDeleteMessage { required bytes adminSignature = 2; } - message GroupUpdateInfoChangeMessage { enum Type { NAME = 1; @@ -232,7 +231,8 @@ message DataMessage { optional ClosedGroupControlMessage closedGroupControlMessage = 104; optional string syncTarget = 105; optional bool blocksCommunityMessageRequests = 106; - optional GroupUpdateMessage groupUpdateMessage = 120;} + optional GroupUpdateMessage groupUpdateMessage = 120; +} message CallMessage { diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index f785430af3..d66eebbd36 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -6,6 +6,7 @@ import { useConversationUsernameOrShorten } from '../hooks/useParamSelector'; import { PubKey } from '../session/types'; import { UserUtils } from '../session/utils'; import { GroupInvite } from '../session/utils/job_runners/jobs/GroupInviteJob'; +import { GroupPromote } from '../session/utils/job_runners/jobs/GroupPromoteJob'; import { useMemberInviteFailed, useMemberInvitePending, @@ -14,7 +15,12 @@ import { } from '../state/selectors/groups'; import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar'; import { Flex } from './basic/Flex'; -import { SessionButton, SessionButtonShape, SessionButtonType } from './basic/SessionButton'; +import { + SessionButton, + SessionButtonColor, + SessionButtonShape, + SessionButtonType, +} from './basic/SessionButton'; import { SessionRadio } from './basic/SessionRadio'; const AvatarContainer = styled.div` @@ -92,7 +98,7 @@ type MemberListItemProps = { groupPk?: string; }; -const ResendInviteContainer = ({ +const ResendContainer = ({ displayGroupStatus, groupPk, pubkey, @@ -105,8 +111,14 @@ const ResendInviteContainer = ({ !UserUtils.isUsFromCache(pubkey) ) { return ( - + + ); } @@ -177,7 +189,28 @@ const ResendInviteButton = ({ buttonType={SessionButtonType.Solid} text={window.i18n('resend')} onClick={() => { - void GroupInvite.addGroupInviteJob({ groupPk, member: pubkey }); + void GroupInvite.addJob({ groupPk, member: pubkey }); + }} + /> + ); +}; + +const ResendPromoteButton = ({ + groupPk, + pubkey, +}: { + pubkey: PubkeyType; + groupPk: GroupPubkeyType; +}) => { + return ( + { + void GroupPromote.addJob({ groupPk, member: pubkey }); }} /> ); @@ -234,11 +267,7 @@ export const MemberListItem = ({ - + {!inMentions && ( diff --git a/ts/components/basic/Flex.tsx b/ts/components/basic/Flex.tsx index 650e669822..63dd034a4a 100644 --- a/ts/components/basic/Flex.tsx +++ b/ts/components/basic/Flex.tsx @@ -27,6 +27,7 @@ export interface FlexProps { | 'inherit'; // Child Props flexGrow?: number; + gap?: string; flexShrink?: number; flexBasis?: number; // Common Layout Props @@ -52,6 +53,7 @@ export const Flex = styled.div` align-items: ${props => props.alignItems || 'stretch'}; margin: ${props => props.margin || '0'}; padding: ${props => props.padding || '0'}; + gap: ${props => props.gap || undefined}; width: ${props => props.width || 'auto'}; height: ${props => props.height || 'auto'}; max-width: ${props => props.maxWidth || 'none'}; diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx index 5cfc34cc77..d077577ca7 100644 --- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx +++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { PubkeyType } from 'libsession_util_nodejs'; -import { useConversationsUsernameWithQuoteOrFullPubkey } from '../../../../hooks/useParamSelector'; +import { useConversationsUsernameWithQuoteOrShortPk } from '../../../../hooks/useParamSelector'; import { arrayContainsUsOnly } from '../../../../models/message'; import { PreConditionFailed } from '../../../../session/utils/errors'; import { @@ -89,7 +89,7 @@ const ChangeItemJoined = (added: Array): string => { if (!added.length) { throw new Error('Group update add is missing contacts'); } - const names = useConversationsUsernameWithQuoteOrFullPubkey(added); + const names = useConversationsUsernameWithQuoteOrShortPk(added); const isGroupV2 = useSelectedIsGroupV2(); const us = useOurPkStr(); if (isGroupV2) { @@ -107,7 +107,7 @@ const ChangeItemKicked = (removed: Array): string => { if (!removed.length) { throw new Error('Group update removed is missing contacts'); } - const names = useConversationsUsernameWithQuoteOrFullPubkey(removed); + const names = useConversationsUsernameWithQuoteOrShortPk(removed); const isGroupV2 = useSelectedIsGroupV2(); const us = useOurPkStr(); if (isGroupV2) { @@ -130,7 +130,7 @@ const ChangeItemPromoted = (promoted: Array): string => { if (!promoted.length) { throw new Error('Group update promoted is missing contacts'); } - const names = useConversationsUsernameWithQuoteOrFullPubkey(promoted); + const names = useConversationsUsernameWithQuoteOrShortPk(promoted); const isGroupV2 = useSelectedIsGroupV2(); const us = useOurPkStr(); if (isGroupV2) { @@ -148,7 +148,7 @@ const ChangeItemLeft = (left: Array): string => { throw new Error('Group update remove is missing contacts'); } - const names = useConversationsUsernameWithQuoteOrFullPubkey(left); + const names = useConversationsUsernameWithQuoteOrShortPk(left); if (arrayContainsUsOnly(left)) { return window.i18n('youLeftTheGroup'); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 2d0d4fc8e2..5de2f69e70 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -759,6 +759,7 @@ export class ConversationModel extends Backbone.Model { expireTimer, serverTimestamp: this.isPublic() ? networkTimestamp : undefined, groupInvitation, + sent_at: networkTimestamp, // overriden later, but we need one to have the sorting done in the UI even when the sending is pending }); // We're offline! @@ -1781,9 +1782,9 @@ export class ConversationModel extends Backbone.Model { const { id } = message; const destination = this.id as string; - const sentAt = message.get('sent_at'); - if (sentAt) { - throw new Error('sendMessageJob() sent_at is already set.'); + const sentAt = message.get('sent_at'); // this is used to store the timestamp when we tried sending that message, it should be set by the caller + if (!sentAt) { + throw new Error('sendMessageJob() sent_at is not set.'); } const networkTimestamp = GetNetworkTime.now(); diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 58a83d25bf..08aace3f78 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -131,7 +131,7 @@ async function mergeUserConfigsWithIncomingUpdates( const needsPush = await GenericWrapperActions.needsPush(variant); const mergedTimestamps = sameVariant .filter(m => hashesMerged.includes(m.hash)) - .map(m => m.timestamp); + .map(m => m.storedAt); const latestEnvelopeTimestamp = Math.max(...mergedTimestamps); window.log.debug( diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 33f13b55e4..2c755fb792 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -44,12 +44,13 @@ export async function handleSwarmContentMessage(envelope: EnvelopePlus, messageH return; } - const sentAtTimestamp = toNumber(envelope.timestamp); + const envelopeTimestamp = toNumber(envelope.timestamp); + // swarm messages already comes with a timestamp in milliseconds, so this sentAtTimestamp is correct. // the sogs messages do not come as milliseconds but just seconds, so we override it await innerHandleSwarmContentMessage({ envelope, - sentAtTimestamp, + envelopeTimestamp, contentDecrypted: decryptedForAll.decryptedContent, messageHash, }); @@ -400,10 +401,10 @@ export async function innerHandleSwarmContentMessage({ contentDecrypted, envelope, messageHash, - sentAtTimestamp, + envelopeTimestamp, }: { envelope: EnvelopePlus; - sentAtTimestamp: number; + envelopeTimestamp: number; contentDecrypted: ArrayBuffer; messageHash: string; }): Promise { @@ -437,7 +438,7 @@ export async function innerHandleSwarmContentMessage({ const isPrivateConversationMessage = !envelope.senderIdentity; if (isPrivateConversationMessage) { - if (await shouldDropIncomingPrivateMessage(sentAtTimestamp, envelope, content)) { + if (await shouldDropIncomingPrivateMessage(envelopeTimestamp, envelope, content)) { await IncomingMessageCache.removeFromCache(envelope); return; } @@ -468,7 +469,7 @@ export async function innerHandleSwarmContentMessage({ } await handleSwarmDataMessage( envelope, - sentAtTimestamp, + envelopeTimestamp, content.dataMessage as SignalService.DataMessage, messageHash, senderConversationModel diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index 7f156cd91e..1a2624e802 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -147,7 +147,7 @@ export function cleanIncomingDataMessage(rawDataMessage: SignalService.DataMessa */ export async function handleSwarmDataMessage( envelope: EnvelopePlus, - sentAtTimestamp: number, + envelopeTimestamp: number, rawDataMessage: SignalService.DataMessage, messageHash: string, senderConversationModel: ConversationModel @@ -158,7 +158,7 @@ export async function handleSwarmDataMessage( if (cleanDataMessage.groupUpdateMessage) { await GroupV2Receiver.handleGroupUpdateMessage({ - envelopeTimestamp: sentAtTimestamp, + envelopeTimestamp, updateMessage: rawDataMessage.groupUpdateMessage as SignalService.GroupUpdateMessage, source: envelope.source, senderIdentity: envelope.senderIdentity, @@ -252,19 +252,19 @@ export async function handleSwarmDataMessage( ? createSwarmMessageSentFromUs({ conversationId: convoIdToAddTheMessageTo, messageHash, - sentAt: sentAtTimestamp, + sentAt: envelopeTimestamp, }) : createSwarmMessageSentFromNotUs({ conversationId: convoIdToAddTheMessageTo, messageHash, sender: senderConversationModel.id, - sentAt: sentAtTimestamp, + sentAt: envelopeTimestamp, }); await handleSwarmMessage( msgModel, messageHash, - sentAtTimestamp, + envelopeTimestamp, cleanDataMessage, convoToAddMessageTo, // eslint-disable-next-line @typescript-eslint/no-misused-promises diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index c1a8bd6078..72efa8b8d8 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -59,7 +59,7 @@ async function handleGroupInviteMessage({ ); return; } - debugger; + const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(inviteMessage.groupSessionId), signature: inviteMessage.adminSignature, @@ -120,7 +120,6 @@ async function handleGroupInviteMessage({ await UserSync.queueNewJobIfNeeded(); // TODO currently sending auto-accept of invite. needs to be removed once we get the Group message request logic - debugger; console.warn('currently sending auto accept invite response'); await getMessageQueue().sendToGroupV2({ message: new GroupUpdateInviteResponseMessage({ @@ -396,6 +395,7 @@ async function handleGroupUpdatePromoteMessage({ window.inboxStore.dispatch( groupInfoActions.markUsAsAdmin({ groupPk, + secret: groupKeypair.privateKey, }) ); diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts index 8040dd9ad2..f55b6b6463 100644 --- a/ts/receiver/receiver.ts +++ b/ts/receiver/receiver.ts @@ -1,5 +1,5 @@ /* eslint-disable more/no-then */ -import _, { isEmpty, last } from 'lodash'; +import { isEmpty, last, toNumber } from 'lodash'; import { v4 as uuidv4 } from 'uuid'; import { EnvelopePlus } from './types'; @@ -27,12 +27,12 @@ const incomingMessagePromises: Array> = []; export async function handleSwarmContentDecryptedWithTimeout({ envelope, messageHash, - sentAtTimestamp, + envelopeTimestamp, contentDecrypted, }: { envelope: EnvelopePlus; messageHash: string; - sentAtTimestamp: number; + envelopeTimestamp: number; contentDecrypted: ArrayBuffer; }) { let taskDone = false; @@ -54,7 +54,7 @@ export async function handleSwarmContentDecryptedWithTimeout({ envelope, messageHash, contentDecrypted, - sentAtTimestamp, + envelopeTimestamp, }); await IncomingMessageCache.removeFromCache(envelope); } catch (e) { @@ -297,16 +297,14 @@ async function handleDecryptedEnvelope({ contentDecrypted: ArrayBuffer; messageHash: string; }) { - if (envelope.content) { - const sentAtTimestamp = _.toNumber(envelope.timestamp); - - await innerHandleSwarmContentMessage({ - envelope, - sentAtTimestamp, - contentDecrypted, - messageHash, - }); - } else { + if (!envelope.content) { await IncomingMessageCache.removeFromCache(envelope); } + + return innerHandleSwarmContentMessage({ + envelope, + contentDecrypted, + messageHash, + envelopeTimestamp: toNumber(envelope.timestamp), + }); } diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts index 7f412259f0..38c0f36d52 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts @@ -475,7 +475,7 @@ async function handleInboxOutboxMessages( await innerHandleSwarmContentMessage({ envelope: builtEnvelope, - sentAtTimestamp: postedAtInMs, + envelopeTimestamp: postedAtInMs, contentDecrypted: builtEnvelope.content, messageHash: '', }); diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 8fa70c5d1e..50fccb03bb 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -134,13 +134,15 @@ async function buildRetrieveRequest( ): Promise> { const isUs = pubkey === ourPubkey; const maxSizeMap = SnodeNamespace.maxSizeMap(namespaces); + const now = GetNetworkTime.now(); + const retrieveRequestsParams: Array = await Promise.all( namespaces.map(async (namespace, index) => { const foundMaxSize = maxSizeMap.find(m => m.namespace === namespace)?.maxSize; const retrieveParam = { pubkey, last_hash: lastHashes.at(index) || '', - timestamp: GetNetworkTime.now(), + timestamp: now, max_size: foundMaxSize, }; @@ -197,7 +199,7 @@ async function buildRetrieveRequest( params: { messages: configHashesToBump, expiry, - ...signResult, + ...omit(signResult, 'timestamp'), pubkey, }, }; @@ -262,13 +264,12 @@ async function retrieveNextMessages( `_retrieveNextMessages - retrieve result is not 200 with ${targetNode.ip}:${targetNode.port} but ${firstResult.code}` ); } - + if (!window.inboxStore?.getState().onionPaths.isOnline) { + window.inboxStore?.dispatch(updateIsOnline(true)); + } try { // we rely on the code of the first one to check for online status const bodyFirstResult = firstResult.body; - if (!window.inboxStore?.getState().onionPaths.isOnline) { - window.inboxStore?.dispatch(updateIsOnline(true)); - } GetNetworkTime.handleTimestampOffsetFromNetwork('retrieve', bodyFirstResult.t); @@ -280,9 +281,7 @@ async function retrieveNextMessages( })); } catch (e) { window?.log?.warn('exception while parsing json of nextMessage:', e); - if (!window.inboxStore?.getState().onionPaths.isOnline) { - window.inboxStore?.dispatch(updateIsOnline(true)); - } + throw new Error( `_retrieveNextMessages - exception while parsing json of nextMessage ${targetNode.ip}:${targetNode.port}: ${e?.message}` ); diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index c4c8493891..3d2545188a 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -12,6 +12,7 @@ import { } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { getSodiumRenderer } from '../../../crypto/MessageEncrypter'; import { GroupUpdateInviteMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; +import { GroupUpdatePromoteMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage'; import { StringUtils, UserUtils } from '../../../utils'; import { fromUInt8ArrayToBase64, stringToUint8Array } from '../../../utils/String'; import { PreConditionFailed } from '../../../utils/errors'; @@ -38,7 +39,6 @@ async function getGroupInviteMessage({ if (UserUtils.isUsFromCache(member)) { throw new Error('getGroupInviteMessage: we cannot invite ourselves'); } - debugger; // Note: as the signature is built with the timestamp here, we cannot override the timestamp later on the sending pipeline const adminSignature = sodium.crypto_sign_detached( @@ -57,6 +57,29 @@ async function getGroupInviteMessage({ return invite; } +async function getGroupPromoteMessage({ + member, + secretKey, + groupPk, +}: { + member: PubkeyType; + secretKey: Uint8ArrayLen64; // len 64 + groupPk: GroupPubkeyType; +}) { + const createAtNetworkTimestamp = GetNetworkTime.now(); + + if (UserUtils.isUsFromCache(member)) { + throw new Error('getGroupPromoteMessage: we cannot promote ourselves'); + } + + const msg = new GroupUpdatePromoteMessage({ + groupPk, + createAtNetworkTimestamp, + groupIdentitySeed: secretKey.slice(0, 32), // the seed is the first 32 bytes of the secretkey + }); + return msg; +} + type ParamsShared = { groupPk: GroupPubkeyType; namespace: SnodeNamespacesGroup; @@ -275,6 +298,7 @@ async function getGroupSignatureByHashesParams({ export const SnodeGroupSignature = { generateUpdateExpiryGroupSignature, getGroupInviteMessage, + getGroupPromoteMessage, getSnodeGroupSignature, getGroupSignatureByHashesParams, signDataWithAdminSecret, diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 90a3f7c215..eccd290bd8 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -2,6 +2,8 @@ /* eslint-disable more/no-then */ /* eslint-disable @typescript-eslint/no-misused-promises */ import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { z } from 'zod'; + import { compact, concat, @@ -9,6 +11,7 @@ import { flatten, isArray, last, + omit, sample, toNumber, uniqBy, @@ -23,7 +26,6 @@ import * as snodePool from './snodePool'; import { ConversationModel } from '../../../models/conversation'; import { ConversationTypeEnum } from '../../../models/conversationAttributes'; -import { EnvelopePlus } from '../../../receiver/types'; import { updateIsOnline } from '../../../state/ducks/onion'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { @@ -35,6 +37,7 @@ import { DURATION, SWARM_POLLING_TIMEOUT } from '../../constants'; import { ConvoHub } from '../../conversations'; import { ed25519Str } from '../../onions/onionPath'; import { StringUtils, UserUtils } from '../../utils'; +import { sleepFor } from '../../utils/Promise'; import { PreConditionFailed } from '../../utils/errors'; import { LibSessionUtil } from '../../utils/libsession/libsession_utils'; import { SnodeNamespace, SnodeNamespaces, UserConfigNamespaces } from './namespaces'; @@ -313,6 +316,7 @@ export class SwarmPolling { return; } if (type === ConversationTypeEnum.GROUPV2 && PubKey.is03Pubkey(pubkey)) { + await sleepFor(100); await SwarmPollingGroupConfig.handleGroupSharedConfigMessages(confMessages, pubkey); } } @@ -671,11 +675,30 @@ export class SwarmPolling { } } -function retrieveItemWithNamespace(results: Array) { +// zod schema for retrieve items as returned by the snodes +const retrieveItemSchema = z.object({ + hash: z.string(), + data: z.string(), + expiration: z.number(), + timestamp: z.number(), +}); + +function retrieveItemWithNamespace( + results: Array +): Array { return flatten( compact( results.map( - result => result.messages.messages?.map(r => ({ ...r, namespace: result.namespace })) + result => + result.messages.messages?.map(r => { + // throws if the result is not expected + const parsedItem = retrieveItemSchema.parse(r); + return { + ...omit(parsedItem, 'timestamp'), + namespace: result.namespace, + storedAt: parsedItem.timestamp, + }; + }) ) ) ); @@ -698,7 +721,6 @@ function filterMessagesPerTypeOfConvo( ); const confMessages = retrieveItemWithNamespace(userConfs); - const otherMessages = retrieveItemWithNamespace(userOthers); return { confMessages, otherMessages: uniqBy(otherMessages, x => x.hash) }; @@ -719,7 +741,6 @@ function filterMessagesPerTypeOfConvo( ); const groupConfMessages = retrieveItemWithNamespace(groupConfs); - const groupOtherMessages = retrieveItemWithNamespace(groupOthers); return { @@ -733,11 +754,7 @@ function filterMessagesPerTypeOfConvo( } } -async function decryptForGroupV2(retrieveResult: { - groupPk: string; - content: Uint8Array; - sentTimestamp: number; -}): Promise { +async function decryptForGroupV2(retrieveResult: { groupPk: string; content: Uint8Array }) { window?.log?.info('received closed group message v2'); try { const groupPk = retrieveResult.groupPk; @@ -746,28 +763,22 @@ async function decryptForGroupV2(retrieveResult: { } const decrypted = await MetaGroupWrapperActions.decryptMessage(groupPk, retrieveResult.content); - const envelopePlus: EnvelopePlus = { + // just try to parse what we have, it should be a protobuf content decrypted already + const parsedEnvelope = SignalService.Envelope.decode(new Uint8Array(decrypted.plaintext)); + + // not doing anything, just enforcing that the content is indeed a protobuf object of type Content, or throws + SignalService.Content.decode(parsedEnvelope.content); + + // the receiving pipeline relies on the envelope.senderIdentity field to know who is the author of a message + return { id: v4(), senderIdentity: decrypted.pubkeyHex, receivedAt: Date.now(), - content: decrypted.plaintext, + content: parsedEnvelope.content, source: groupPk, type: SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, - timestamp: retrieveResult.sentTimestamp, + timestamp: parsedEnvelope.timestamp, }; - try { - // just try to parse what we have, it should be a protobuf content decrypted already - const parsedEnvelope = SignalService.Envelope.decode(new Uint8Array(decrypted.plaintext)); - - SignalService.Content.decode(parsedEnvelope.content); - envelopePlus.content = parsedEnvelope.content; - } catch (e) { - throw new Error('content got from libsession does not look to be envelope+decryptedContent'); - } - - // the receiving pipeline relies on the envelope.senderIdentity field to know who is the author of a message - - return envelopePlus; } catch (e) { window.log.warn('failed to decrypt message with error: ', e.message); return null; @@ -785,7 +796,6 @@ async function handleMessagesForGroupV2( const envelopePlus = await decryptForGroupV2({ content: retrieveResult, groupPk, - sentTimestamp: msg.timestamp, }); if (!envelopePlus) { throw new Error('decryptForGroupV2 returned empty envelope'); @@ -797,7 +807,7 @@ async function handleMessagesForGroupV2( envelope: envelopePlus, contentDecrypted: envelopePlus.content, messageHash: msg.hash, - sentAtTimestamp: toNumber(envelopePlus.timestamp), + envelopeTimestamp: toNumber(envelopePlus.timestamp), }); } catch (e) { window.log.warn('failed to handle groupv2 otherMessage because of: ', e.message); diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index d7d16a6ef5..5f460acbd1 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -8,32 +8,37 @@ import { SnodeNamespaces } from '../namespaces'; import { RetrieveMessageItemWithNamespace } from '../types'; async function handleGroupSharedConfigMessages( - groupConfigMessagesMerged: Array, + groupConfigMessages: Array, groupPk: GroupPubkeyType ) { try { window.log.info( - `received groupConfigMessagesMerged count: ${ - groupConfigMessagesMerged.length - } for groupPk:${ed25519Str(groupPk)}` + `received groupConfigMessages count: ${groupConfigMessages.length} for groupPk:${ed25519Str( + groupPk + )}` ); - const infos = groupConfigMessagesMerged + + if (groupConfigMessages.find(m => !m.storedAt)) { + debugger; + throw new Error('all incoming group config message should have a timestamp'); + } + const infos = groupConfigMessages .filter(m => m.namespace === SnodeNamespaces.ClosedGroupInfo) .map(info => { return { data: fromBase64ToArray(info.data), hash: info.hash }; }); - const members = groupConfigMessagesMerged + const members = groupConfigMessages .filter(m => m.namespace === SnodeNamespaces.ClosedGroupMembers) .map(info => { return { data: fromBase64ToArray(info.data), hash: info.hash }; }); - const keys = groupConfigMessagesMerged + const keys = groupConfigMessages .filter(m => m.namespace === SnodeNamespaces.ClosedGroupKeys) .map(info => { return { data: fromBase64ToArray(info.data), hash: info.hash, - timestampMs: info.timestamp, + timestampMs: info.storedAt, }; }); const toMerge = { @@ -42,6 +47,11 @@ async function handleGroupSharedConfigMessages( groupMember: members, }; + window.log.info( + `received keys: ${toMerge.groupKeys.length},infos: ${toMerge.groupInfo.length},members: ${ + toMerge.groupMember.length + } for groupPk:${ed25519Str(groupPk)}` + ); // do the merge with our current state await MetaGroupWrapperActions.metaMerge(groupPk, toMerge); // save updated dumps to the DB right away @@ -55,7 +65,7 @@ async function handleGroupSharedConfigMessages( ); } catch (e) { window.log.warn( - `handleGroupSharedConfigMessages of ${groupConfigMessagesMerged.length} failed with ${e.message}` + `handleGroupSharedConfigMessages of ${groupConfigMessages.length} failed with ${e.message}` ); // not rethrowing } diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index d7fd39145a..dec8dece2d 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -3,8 +3,8 @@ import { SnodeNamespaces } from './namespaces'; export type RetrieveMessageItem = { hash: string; expiration: number; - data: string; // base64 encrypted content of the emssage - timestamp: number; + data: string; // base64 encrypted content of the message + storedAt: number; // **not** the envelope timestamp, but when the message was effectively stored on the snode }; export type RetrieveMessageItemWithNamespace = RetrieveMessageItem & { diff --git a/ts/session/crypto/MessageEncrypter.ts b/ts/session/crypto/MessageEncrypter.ts index f0deb80f40..3cca8a2feb 100644 --- a/ts/session/crypto/MessageEncrypter.ts +++ b/ts/session/crypto/MessageEncrypter.ts @@ -1,4 +1,5 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { isEmpty } from 'lodash'; import { MessageEncrypter, concatUInt8Array, getSodiumRenderer } from '.'; import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; @@ -116,14 +117,14 @@ export async function encryptUsingSessionProtocol( ); const signature = sodium.crypto_sign_detached(verificationData, userED25519SecretKeyBytes); - if (!signature || signature.length === 0) { + if (isEmpty(signature)) { throw new Error("Couldn't sign message"); } const plaintextWithMetadata = concatUInt8Array(plaintext, userED25519PubKeyBytes, signature); const ciphertext = sodium.crypto_box_seal(plaintextWithMetadata, recipientX25519PublicKey); - if (!ciphertext) { + if (isEmpty(ciphertext)) { throw new Error("Couldn't encrypt message."); } return ciphertext; diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index d95a6ee9a9..7f7dddf283 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -147,9 +147,7 @@ async function addUpdateMessage( if (diff.newName) { groupUpdate.name = diff.newName; - } - - if (diff.joiningMembers) { + } else if (diff.joiningMembers) { groupUpdate.joined = diff.joiningMembers; } else if (diff.leavingMembers) { groupUpdate.left = diff.leavingMembers; diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 002f27b0b7..1e938fb55c 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -39,6 +39,7 @@ import { GroupUpdateMemberChangeMessage } from '../messages/outgoing/controlMess import { GroupUpdateMemberLeftMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage'; import { GroupUpdateDeleteMessage } from '../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage'; import { GroupUpdateInviteMessage } from '../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; +import { GroupUpdatePromoteMessage } from '../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; type ClosedGroupMessageType = @@ -269,6 +270,7 @@ export class MessageQueue { | CallMessage | ClosedGroupMemberLeftMessage | GroupUpdateInviteMessage + | GroupUpdatePromoteMessage | GroupUpdateDeleteMessage; namespace: SnodeNamespaces; }): Promise { @@ -283,6 +285,7 @@ export class MessageQueue { ); return effectiveTimestamp; } catch (error) { + window.log.error('failed to send message with: ', error.message); if (rawMessage) { await MessageSentHandler.handleMessageSentFailure(rawMessage, error); } diff --git a/ts/session/sending/PendingMessageCache.ts b/ts/session/sending/PendingMessageCache.ts index 153a635f03..917a02dfbd 100644 --- a/ts/session/sending/PendingMessageCache.ts +++ b/ts/session/sending/PendingMessageCache.ts @@ -136,7 +136,7 @@ export class PendingMessageCache { !isNumber(message.networkTimestampCreated) || message.networkTimestampCreated <= 0 ) { - throw new Error('networkTimestampCreated is emptyo <=0'); + throw new Error('networkTimestampCreated is empty <=0'); } const plainTextBuffer = from_hex(message.plainTextBufferHex); // if a plaintextBufferHex is unset or not hex, this throws and we remove that message entirely diff --git a/ts/session/utils/Promise.ts b/ts/session/utils/Promise.ts index 087568e2bf..c9de5b7300 100644 --- a/ts/session/utils/Promise.ts +++ b/ts/session/utils/Promise.ts @@ -203,13 +203,6 @@ export async function timeout(promise: Promise, timeoutMs: number): Promis return Promise.race([timeoutPromise, promise]); } -export async function delay(timeoutMs: number = 2000): Promise { - return new Promise(resolve => { - setTimeout(() => { - resolve(true); - }, timeoutMs); - }); -} export const sleepFor = async (ms: number, showLog = false) => { if (showLog) { diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts index f5c3b5ae1a..60cb65b4c2 100644 --- a/ts/session/utils/job_runners/JobRunner.ts +++ b/ts/session/utils/job_runners/JobRunner.ts @@ -6,6 +6,7 @@ import { persistedJobFromData } from './JobDeserialization'; import { AvatarDownloadPersistedData, GroupInvitePersistedData, + GroupPromotePersistedData, GroupSyncPersistedData, PersistedJob, RunJobResult, @@ -359,14 +360,21 @@ const avatarDownloadRunner = new PersistedJobRunner 'AvatarDownloadJob', null ); + const groupInviteJobRunner = new PersistedJobRunner( 'GroupInviteJob', null ); +const groupPromoteJobRunner = new PersistedJobRunner( + 'GroupPromoteJob', + null +); + export const runners = { userSyncRunner, groupSyncRunner, avatarDownloadRunner, groupInviteJobRunner, + groupPromoteJobRunner, }; diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts index c496d71848..4d031c63ce 100644 --- a/ts/session/utils/job_runners/PersistedJob.ts +++ b/ts/session/utils/job_runners/PersistedJob.ts @@ -6,6 +6,7 @@ export type PersistedJobType = | 'GroupSyncJobType' | 'AvatarDownloadJobType' | 'GroupInviteJobType' + | 'GroupPromoteJobType' | 'FakeSleepForJobType' | 'FakeSleepForJobMultiType'; @@ -40,6 +41,12 @@ export interface GroupInvitePersistedData extends PersistedJobData { member: PubkeyType; } +export interface GroupPromotePersistedData extends PersistedJobData { + jobType: 'GroupPromoteJobType'; + groupPk: GroupPubkeyType; + member: PubkeyType; +} + export interface UserSyncPersistedData extends PersistedJobData { jobType: 'UserSyncJobType'; } @@ -53,7 +60,8 @@ export type TypeOfPersistedData = | FakeSleepJobData | FakeSleepForMultiJobData | GroupSyncPersistedData - | GroupInvitePersistedData; + | GroupInvitePersistedData + | GroupPromotePersistedData; export type AddJobCheckReturn = 'skipAddSameJobPresent' | 'sameJobDataAlreadyInQueue' | null; diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 85c7d41d25..4fb1636a5d 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -26,7 +26,7 @@ type JobExtraArgs = { member: PubkeyType; }; -export function shouldAddGroupInviteJob(args: JobExtraArgs) { +export function shouldAddJob(args: JobExtraArgs) { if (UserUtils.isUsFromCache(args.member)) { return false; } @@ -42,8 +42,8 @@ const invitesFailed = new Map< } >(); -async function addGroupInviteJob({ groupPk, member }: JobExtraArgs) { - if (shouldAddGroupInviteJob({ groupPk, member })) { +async function addJob({ groupPk, member }: JobExtraArgs) { + if (shouldAddJob({ groupPk, member })) { const groupInviteJob = new GroupInviteJob({ groupPk, member, @@ -190,7 +190,7 @@ class GroupInviteJob extends PersistedJob { export const GroupInvite = { GroupInviteJob, - addGroupInviteJob, + addJob, }; function updateFailedStateForMember(groupPk: GroupPubkeyType, member: PubkeyType, failed: boolean) { let thisGroupFailure = invitesFailed.get(groupPk); diff --git a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts new file mode 100644 index 0000000000..a8e9f17104 --- /dev/null +++ b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts @@ -0,0 +1,151 @@ +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { isNumber } from 'lodash'; +import { v4 } from 'uuid'; +import { UserUtils } from '../..'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; +import { SnodeGroupSignature } from '../../../apis/snode_api/signature/groupSignature'; +import { getMessageQueue } from '../../../sending'; +import { PubKey } from '../../../types'; +import { runners } from '../JobRunner'; +import { + AddJobCheckReturn, + GroupPromotePersistedData, + PersistedJob, + RunJobResult, +} from '../PersistedJob'; + +const defaultMsBetweenRetries = 10000; +const defaultMaxAttemps = 1; + +type JobExtraArgs = { + groupPk: GroupPubkeyType; + member: PubkeyType; +}; + +export function shouldAddJob(args: JobExtraArgs) { + if (UserUtils.isUsFromCache(args.member)) { + return false; + } + + return true; +} + +async function addJob({ groupPk, member }: JobExtraArgs) { + if (shouldAddJob({ groupPk, member })) { + const groupPromoteJob = new GroupPromoteJob({ + groupPk, + member, + nextAttemptTimestamp: Date.now(), + }); + window.log.debug(`addGroupPromoteJob: adding group promote for ${groupPk}:${member} `); + await runners.groupPromoteJobRunner.addJob(groupPromoteJob); + } +} + +class GroupPromoteJob extends PersistedJob { + constructor({ + groupPk, + member, + nextAttemptTimestamp, + maxAttempts, + currentRetry, + identifier, + }: Pick & + Partial< + Pick< + GroupPromotePersistedData, + | 'nextAttemptTimestamp' + | 'identifier' + | 'maxAttempts' + | 'delayBetweenRetries' + | 'currentRetry' + > + >) { + super({ + jobType: 'GroupPromoteJobType', + identifier: identifier || v4(), + member, + groupPk, + delayBetweenRetries: defaultMsBetweenRetries, + maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttemps, + nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries, + currentRetry: isNumber(currentRetry) ? currentRetry : 0, + }); + } + + public async run(): Promise { + const { groupPk, member, jobType, identifier } = this.persistedData; + + window.log.info( + `running job ${jobType} with groupPk:"${groupPk}" member: ${member} id:"${identifier}" ` + ); + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (!group || !group.secretKey || !group.name) { + window.log.warn(`GroupPromoteJob: Did not find group in wrapper or no valid info in wrapper`); + return RunJobResult.PermanentFailure; + } + + if (UserUtils.isUsFromCache(member)) { + return RunJobResult.Success; + } + let failed = true; + try { + const message = await SnodeGroupSignature.getGroupPromoteMessage({ + member, + secretKey: group.secretKey, + groupPk, + }); + + const storedAt = await getMessageQueue().sendToPubKeyNonDurably({ + message, + namespace: SnodeNamespaces.Default, + pubkey: PubKey.cast(member), + }); + if (storedAt !== null) { + failed = false; + } + } finally { + try { + await MetaGroupWrapperActions.memberSetPromoted(groupPk, member, failed); + } catch (e) { + window.log.warn('GroupPromoteJob memberSetPromoted failed with', e.message); + } + } + // return true so this job is marked as a success and we don't need to retry it + return RunJobResult.Success; + } + + public serializeJob(): GroupPromotePersistedData { + return super.serializeBase(); + } + + public nonRunningJobsToRemove(_jobs: Array) { + return []; + } + + public addJobCheck(jobs: Array): AddJobCheckReturn { + // avoid adding the same job if the exact same one is already planned + const hasSameJob = jobs.some(j => { + return j.groupPk === this.persistedData.groupPk && j.member === this.persistedData.member; + }); + + if (hasSameJob) { + return 'skipAddSameJobPresent'; + } + + return null; + } + + public getJobTimeoutMs(): number { + return 15000; + } +} + +export const GroupPromote = { + GroupPromoteJob, + addJob, +}; diff --git a/ts/session/utils/job_runners/jobs/JobRunnerType.ts b/ts/session/utils/job_runners/jobs/JobRunnerType.ts index a9ac9aba7f..ecd573ef1e 100644 --- a/ts/session/utils/job_runners/jobs/JobRunnerType.ts +++ b/ts/session/utils/job_runners/jobs/JobRunnerType.ts @@ -4,4 +4,5 @@ export type JobRunnerType = | 'FakeSleepForJob' | 'FakeSleepForMultiJob' | 'AvatarDownloadJob' - | 'GroupInviteJob'; + | 'GroupInviteJob' + | 'GroupPromoteJob'; diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index 190e69f249..710be201cb 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -5,6 +5,7 @@ import { GroupMemberGet, GroupPubkeyType, PubkeyType, + Uint8ArrayLen64, UserGroupsGet, WithGroupPubkey, } from 'libsession_util_nodejs'; @@ -17,7 +18,6 @@ import { SignalService } from '../../protobuf'; import { getMessageQueue } from '../../session'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; -import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces'; import { RevokeChanges, SnodeAPIRevoke } from '../../session/apis/snode_api/revokeSubaccount'; import { SnodeGroupSignature } from '../../session/apis/snode_api/signature/groupSignature'; import { ConvoHub } from '../../session/conversations'; @@ -76,9 +76,10 @@ type GroupDetailsUpdate = { async function checkWeAreAdminOrThrow(groupPk: GroupPubkeyType, context: string) { const us = UserUtils.getOurPubKeyStrFromCache(); - const inGroup = await MetaGroupWrapperActions.memberGet(groupPk, us); - const haveAdminkey = await UserGroupsWrapperActions.getGroup(groupPk); - if (!haveAdminkey || inGroup?.promoted) { + + const usInGroup = await MetaGroupWrapperActions.memberGet(groupPk, us); + const inUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); + if (isEmpty(inUserGroup?.secretKey) || !usInGroup?.promoted) { throw new Error(`checkWeAreAdminOrThrow failed with ctx: ${context}`); } } @@ -185,7 +186,7 @@ const initNewGroupInWrapper = createAsyncThunk( // can update the groupwrapper with a failed state if a message fails to be sent. for (let index = 0; index < membersFromWrapper.length; index++) { const member = membersFromWrapper[index]; - await GroupInvite.addGroupInviteJob({ member: member.pubkeyHex, groupPk }); + await GroupInvite.addJob({ member: member.pubkeyHex, groupPk }); } await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); @@ -460,6 +461,10 @@ async function handleWithoutHistoryMembers({ const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); } + + if (!isEmpty(withoutHistory)) { + await MetaGroupWrapperActions.keyRekey(groupPk); + } } async function handleRemoveMembers({ @@ -471,6 +476,7 @@ async function handleRemoveMembers({ if (!fromCurrentDevice) { return; } + await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, removed); const createAtNetworkTimestamp = GetNetworkTime.now(); @@ -489,15 +495,14 @@ async function handleRemoveMembers({ 'TODO: poll from namespace -11, handle messages and sig for it, batch request handle 401/403, but 200 ok for this -11 namespace' ); - const sentStatus = await getMessageQueue().sendToPubKeyNonDurably({ - pubkey: PubKey.cast(m), - message: deleteMessage, - namespace: SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, - }); - if (!sentStatus) { - window.log.warn('Failed to send a GroupUpdateDeleteMessage to a member removed: ', m); - throw new Error('Failed to send a GroupUpdateDeleteMessage to a member removed'); - } + // const sentStatus = await getMessageQueue().sendToPubKeyNonDurably({ + // pubkey: PubKey.cast(m), + // message: deleteMessage, + // namespace: SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, + // }); + // if (!sentStatus) { + // window.log.warn('Failed to send a GroupUpdateDeleteMessage to a member removed: ', m); + // } }) ); } @@ -591,11 +596,11 @@ async function handleMemberChangeFromUIOrNot({ // schedule send invite details, auth signature, etc. to the new users for (let index = 0; index < withoutHistory.length; index++) { const member = withoutHistory[index]; - await GroupInvite.addGroupInviteJob({ groupPk, member }); + await GroupInvite.addJob({ groupPk, member }); } for (let index = 0; index < withHistory.length; index++) { const member = withHistory[index]; - await GroupInvite.addGroupInviteJob({ groupPk, member }); + await GroupInvite.addJob({ groupPk, member }); } const sodium = await getSodiumRenderer(); @@ -755,8 +760,10 @@ const markUsAsAdmin = createAsyncThunk( async ( { groupPk, + secret, }: { groupPk: GroupPubkeyType; + secret: Uint8ArrayLen64; }, payloadCreator ): Promise => { @@ -764,6 +771,12 @@ const markUsAsAdmin = createAsyncThunk( if (!state.groups.infos[groupPk] || !state.groups.members[groupPk]) { throw new PreConditionFailed('markUsAsAdmin group not present in redux slice'); } + if (secret.length !== 64) { + throw new PreConditionFailed('markUsAsAdmin secret needs to be 64'); + } + console.warn('before setSigKeys ', groupPk, stringify(secret)); + await MetaGroupWrapperActions.setSigKeys(groupPk, secret); + console.warn('after setSigKeys'); const us = UserUtils.getOurPubKeyStrFromCache(); if (state.groups.members[groupPk].find(m => m.pubkeyHex === us)?.admin) { @@ -801,10 +814,15 @@ const inviteResponseReceived = createAsyncThunk( if (!state.groups.infos[groupPk] || !state.groups.members[groupPk]) { throw new PreConditionFailed('inviteResponseReceived group but not present in redux slice'); } - await checkWeAreAdminOrThrow(groupPk, 'inviteResponseReceived'); + try { + await checkWeAreAdminOrThrow(groupPk, 'inviteResponseReceived'); - await MetaGroupWrapperActions.memberSetAccepted(groupPk, member); - await GroupSync.queueNewJobIfNeeded(groupPk); + await MetaGroupWrapperActions.memberSetAccepted(groupPk, member); + await GroupSync.queueNewJobIfNeeded(groupPk); + } catch (e) { + window.log.info('inviteResponseReceived failed with', e.message); + // only admins can do the steps above, but we don't want to throw if we are not an admin + } return { groupPk, diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 0a4c55870f..d60c5a6a29 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -1,6 +1,6 @@ /* eslint-disable no-restricted-syntax */ import { createSelector } from '@reduxjs/toolkit'; -import { filter, isEmpty, isNumber, pick, sortBy, toNumber, isFinite } from 'lodash'; +import { filter, isEmpty, isFinite, isNumber, pick, sortBy, toNumber } from 'lodash'; import { ConversationLookupType, diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 8dc30380a7..87de18d4f6 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -290,7 +290,7 @@ export function toFixedUint8ArrayOfLength( } export function stringify(obj: unknown) { - return JSON.stringify(obj, (_key, value) => - value instanceof Uint8Array ? `Uint8Array(${value.length}): ${toHex(value)}` : value - ); + return JSON.stringify(obj, (_key, value) => { + return value instanceof Uint8Array ? `Uint8Array(${value.length}): ${toHex(value)}` : value; + }); } diff --git a/ts/webworker/worker_interface.ts b/ts/webworker/worker_interface.ts index 84f29845ad..6c3836f545 100644 --- a/ts/webworker/worker_interface.ts +++ b/ts/webworker/worker_interface.ts @@ -106,7 +106,7 @@ export class WorkerInterface { reject: (error: any) => { this._removeJob(id); const end = Date.now(); - window.log.info( + window.log.debug( `Worker job ${id} (${fnName}) failed in ${end - start}ms with ${error.message}` ); return reject(error); diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index cf489d9a7b..5c6e6fbd28 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -14,6 +14,7 @@ import { ProfilePicture, PubkeyType, Uint8ArrayLen100, + Uint8ArrayLen64, UserConfigWrapperActionsCalls, UserGroupsSet, UserGroupsWrapperActionsCalls, @@ -540,6 +541,11 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { 'swarmVerifySubAccount', signingValue, ]) as Promise>, + setSigKeys: async (groupPk: GroupPubkeyType, secret: Uint8ArrayLen64) => { + return callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'setSigKeys', secret]) as Promise< + ReturnType + >; + }, }; export const callLibSessionWorker = async ( diff --git a/yarn.lock b/yarn.lock index f9c7f8bea4..418d42219d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7870,3 +7870,8 @@ yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + +zod@^3.22.4: + version "3.22.4" + resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff" + integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg== From f4fc803b07c519743f5ff1540ecd0f13bedc5180 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Nov 2023 11:31:01 +1100 Subject: [PATCH 063/302] fix: hide composition box when canWrite is false --- _locales/ar/messages.json | 2 +- _locales/be/messages.json | 2 +- _locales/bg/messages.json | 2 +- _locales/ca/messages.json | 2 +- _locales/cs/messages.json | 2 +- _locales/da/messages.json | 2 +- _locales/de/messages.json | 2 +- _locales/el/messages.json | 2 +- _locales/en/messages.json | 2 +- _locales/eo/messages.json | 2 +- _locales/es/messages.json | 2 +- _locales/es_419/messages.json | 2 +- _locales/et/messages.json | 2 +- _locales/fa/messages.json | 2 +- _locales/fi/messages.json | 2 +- _locales/fil/messages.json | 2 +- _locales/fr/messages.json | 2 +- _locales/he/messages.json | 2 +- _locales/hi/messages.json | 2 +- _locales/hr/messages.json | 2 +- _locales/hu/messages.json | 2 +- _locales/hy-AM/messages.json | 2 +- _locales/id/messages.json | 2 +- _locales/it/messages.json | 2 +- _locales/ja/messages.json | 2 +- _locales/ka/messages.json | 2 +- _locales/km/messages.json | 2 +- _locales/kmr/messages.json | 2 +- _locales/kn/messages.json | 2 +- _locales/ko/messages.json | 2 +- _locales/lt/messages.json | 2 +- _locales/lv/messages.json | 2 +- _locales/mk/messages.json | 2 +- _locales/nb/messages.json | 2 +- _locales/nl/messages.json | 2 +- _locales/no/messages.json | 2 +- _locales/pa/messages.json | 2 +- _locales/pl/messages.json | 2 +- _locales/pt_BR/messages.json | 2 +- _locales/pt_PT/messages.json | 2 +- _locales/ro/messages.json | 2 +- _locales/ru/messages.json | 2 +- _locales/si/messages.json | 2 +- _locales/sk/messages.json | 2 +- _locales/sl/messages.json | 2 +- _locales/sq/messages.json | 2 +- _locales/sr/messages.json | 2 +- _locales/sv/messages.json | 2 +- _locales/ta/messages.json | 2 +- _locales/th/messages.json | 2 +- _locales/tl/messages.json | 2 +- _locales/tr/messages.json | 2 +- _locales/uk/messages.json | 2 +- _locales/uz/messages.json | 2 +- _locales/vi/messages.json | 2 +- _locales/zh_CN/messages.json | 2 +- _locales/zh_TW/messages.json | 2 +- .../conversation/SubtleNotification.tsx | 2 +- .../composition/CompositionBox.tsx | 22 +++++++++++-------- ts/types/LocalizerKeys.ts | 10 +-------- 60 files changed, 72 insertions(+), 76 deletions(-) diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json index 05b7409dce..fc983b067d 100644 --- a/_locales/ar/messages.json +++ b/_locales/ar/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/be/messages.json b/_locales/be/messages.json index 4250d4c4f8..e72bdd46b5 100644 --- a/_locales/be/messages.json +++ b/_locales/be/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json index 6f07fdbd98..014132bdc7 100644 --- a/_locales/bg/messages.json +++ b/_locales/bg/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/ca/messages.json b/_locales/ca/messages.json index b278cd87cb..d5d03c63a7 100644 --- a/_locales/ca/messages.json +++ b/_locales/ca/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json index 1491df5c9b..d02e0365be 100644 --- a/_locales/cs/messages.json +++ b/_locales/cs/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Máte novou žádost o přátelství", "clearAllConfirmationTitle": "Vymazat všechny žádosti o zprávy", "clearAllConfirmationBody": "Jste si jisti, že chcete vymazat všechny žádosti o zprávy?", - "noMessagesInReadOnly": "V $name$ nejsou žádné zprávy.", + "thereAreNoMessagesIn": "V $name$ nejsou žádné zprávy.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "V $name$ nemáte žádné zprávy.", "noMessagesInEverythingElse": "Nemáte žádné zprávy od $name$. Pošlete zprávu pro zahájení konverzace!", diff --git a/_locales/da/messages.json b/_locales/da/messages.json index caca774ce7..710ca59a23 100644 --- a/_locales/da/messages.json +++ b/_locales/da/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 12ba435cab..904f466666 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Du hast eine neue Freundschaftsanfrage", "clearAllConfirmationTitle": "Alle Nachrichtenanfragen löschen", "clearAllConfirmationBody": "Bist Du sicher, dass Du alle Nachrichtenanfragen löschen möchtest?", - "noMessagesInReadOnly": "Es sind keine Nachrichten in $name$.", + "thereAreNoMessagesIn": "Es sind keine Nachrichten in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "Sie haben keine Nachrichten in $name$.", "noMessagesInEverythingElse": "Sie haben keine Nachrichten von $name$. Senden Sie eine Nachricht, um das Gespräch zu beginnen!", diff --git a/_locales/el/messages.json b/_locales/el/messages.json index 72873066ad..22c9faf37e 100644 --- a/_locales/el/messages.json +++ b/_locales/el/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Έχετε ένα νέο αίτημα φιλίας", "clearAllConfirmationTitle": "Διαγραφή Όλων των Αιτημάτων Μηνυμάτων", "clearAllConfirmationBody": "Σίγουρα θέλετε να διαγράψετε όλα τα αιτήματα μηνυμάτων;", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 8856d9063e..7cc6472071 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -513,7 +513,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/eo/messages.json b/_locales/eo/messages.json index baf69fbfe6..3eca67d7e5 100644 --- a/_locales/eo/messages.json +++ b/_locales/eo/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/es/messages.json b/_locales/es/messages.json index 9163088fee..4860a0be8a 100644 --- a/_locales/es/messages.json +++ b/_locales/es/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Tienes una nueva solicitud de amistad", "clearAllConfirmationTitle": "Borrar todas las solicitudes de mensajes", "clearAllConfirmationBody": "¿Estás seguro/a que quieres borrar todas las solicitudes de mensajes?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/es_419/messages.json b/_locales/es_419/messages.json index 635fea2788..45edf55483 100644 --- a/_locales/es_419/messages.json +++ b/_locales/es_419/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Tiene una nueva solicitud de amistad", "clearAllConfirmationTitle": "Borrar todas las solicitudes de mensajes", "clearAllConfirmationBody": "¿Estás seguro/a que quieres borrar todas las solicitudes de mensajes?", - "noMessagesInReadOnly": "No hay mensajes en $name$.", + "thereAreNoMessagesIn": "No hay mensajes en $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "No tienes mensajes en $name$.", "noMessagesInEverythingElse": "No tienes mensajes de $name$. ¡Envía un mensaje para iniciar la conversación!", diff --git a/_locales/et/messages.json b/_locales/et/messages.json index 7c3b53f85b..5b900d8eb9 100644 --- a/_locales/et/messages.json +++ b/_locales/et/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/fa/messages.json b/_locales/fa/messages.json index 7cb0acde22..f9e63d2fe6 100644 --- a/_locales/fa/messages.json +++ b/_locales/fa/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "شما درخواست دوستی جدیدی دارید", "clearAllConfirmationTitle": "پاک کردن تمام درخواست ها", "clearAllConfirmationBody": "از پاک کردن تمام درخواست مکالمات مطمئن هستید?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json index 77b51855cc..cddaafdce1 100644 --- a/_locales/fi/messages.json +++ b/_locales/fi/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Sinulla on uusi kaveripyyntö", "clearAllConfirmationTitle": "Tyhjennä kaikki viestipyynnöt", "clearAllConfirmationBody": "Haluatko varmasti tyhjentää kaikki viestipyynnöt?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/fil/messages.json b/_locales/fil/messages.json index 8d3e3d29f7..52e13aec3f 100644 --- a/_locales/fil/messages.json +++ b/_locales/fil/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "May bago kang friend request", "clearAllConfirmationTitle": "I-clear ang Lahat ng Kahilingan sa Pagmemensahe", "clearAllConfirmationBody": "Sigurado ka bang gusto mong i-clear ang lahat ng kahilingan sa pagmemensahe?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index b480c604aa..00ed6fbaeb 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Vous avez une nouvelle demande d’ami", "clearAllConfirmationTitle": "Effacer toutes les demandes de message", "clearAllConfirmationBody": "Êtes-vous sûr de vouloir supprimer toutes les demandes de message ?", - "noMessagesInReadOnly": "Il n'y a aucun message dans $name$.", + "thereAreNoMessagesIn": "Il n'y a aucun message dans $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "Vous n'avez aucun message dans $name$.", "noMessagesInEverythingElse": "Vous n'avez aucun message de $name$. Envoyez un message pour démarrer la conversation !", diff --git a/_locales/he/messages.json b/_locales/he/messages.json index 49a966f82e..1da2d23d9b 100644 --- a/_locales/he/messages.json +++ b/_locales/he/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "יש לך בקשת חברות חדשה", "clearAllConfirmationTitle": "ניקוי כל בקשות ההודעות", "clearAllConfirmationBody": "האם את/ה בטוח/ה שברצונך למחוק את כל בקשות ההודעות?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/hi/messages.json b/_locales/hi/messages.json index 5c857627c2..723f407b05 100644 --- a/_locales/hi/messages.json +++ b/_locales/hi/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/hr/messages.json b/_locales/hr/messages.json index a2887f2534..b8129aab14 100644 --- a/_locales/hr/messages.json +++ b/_locales/hr/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json index 429658e279..241203f294 100644 --- a/_locales/hu/messages.json +++ b/_locales/hu/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Új barátkérésed van", "clearAllConfirmationTitle": "Minden üzenetkérelem törlése", "clearAllConfirmationBody": "Biztos, hogy törölni akarod az összes üzenetkérelmed?", - "noMessagesInReadOnly": "A $name$-ban nincsenek üzenetek.", + "thereAreNoMessagesIn": "A $name$-ban nincsenek üzenetek.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "Nincsenek üzeneteid a $name$ könyvtárban.", "noMessagesInEverythingElse": "Nincsenek üzeneteid a $name$ címzettől. Küldj üzenetet a beszélgetés megkezdéséhez!", diff --git a/_locales/hy-AM/messages.json b/_locales/hy-AM/messages.json index fa6ad5ad11..289c031bfb 100644 --- a/_locales/hy-AM/messages.json +++ b/_locales/hy-AM/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Դուք ունեք նոր հաղորդագրության հարցում", "clearAllConfirmationTitle": "Մաքրել բոլոր հաղորդագրությունների հարցումները", "clearAllConfirmationBody": "Իսկապե՞ս ուզում եք ջնջել հաղորդագրությունների բոլոր հարցումները:", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/id/messages.json b/_locales/id/messages.json index 646f4a66a4..6847163b30 100644 --- a/_locales/id/messages.json +++ b/_locales/id/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Anda memiliki permintaan pertemanan baru", "clearAllConfirmationTitle": "Hapus Semua Permintaan Pesan", "clearAllConfirmationBody": "Yakin ingin menghapus semua permintaan pesan?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/it/messages.json b/_locales/it/messages.json index ab6d732ba3..851f8b67c9 100644 --- a/_locales/it/messages.json +++ b/_locales/it/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Hai una nuova richiesta d'amicizia", "clearAllConfirmationTitle": "Elimina Tutte Le Richieste Di Messaggio", "clearAllConfirmationBody": "Sei sicuro di voler eliminare tutte le richieste di messaggio?", - "noMessagesInReadOnly": "Non ci sono messaggi in $name$.", + "thereAreNoMessagesIn": "Non ci sono messaggi in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "Non hai messaggi in $name$.", "noMessagesInEverythingElse": "Non hai messaggi da $name$. Invia un messaggio e inizia la conversazione!", diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json index bd0a07eeba..fc4bc5e5ea 100644 --- a/_locales/ja/messages.json +++ b/_locales/ja/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "友達申請が来ています。", "clearAllConfirmationTitle": "すべてのメッセージリクエストを削除", "clearAllConfirmationBody": "本当に全てのメッセージリクエストを消去しますか？", - "noMessagesInReadOnly": "$name$ にはメッセージがありません。", + "thereAreNoMessagesIn": "$name$ にはメッセージがありません。", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "$name$ にはメッセージがありません。", "noMessagesInEverythingElse": "$name$からのメッセージがありません。会話を開始するにはメッセージを送信してください。", diff --git a/_locales/ka/messages.json b/_locales/ka/messages.json index 393876855a..3e346774d9 100644 --- a/_locales/ka/messages.json +++ b/_locales/ka/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/km/messages.json b/_locales/km/messages.json index 524f95e29c..3ef7e3f6f9 100644 --- a/_locales/km/messages.json +++ b/_locales/km/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "អ្នក​មាន​ការស្នើសុំ​សារ​ថ្មីមួយ", "clearAllConfirmationTitle": "ជម្រះការស្នើសុំសារទាំងអស់", "clearAllConfirmationBody": "តើអ្នកប្រាកដទេថា អ្នកពិតចង់លុបសំណើសារទាំងអស់ចេញ?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/kmr/messages.json b/_locales/kmr/messages.json index e9dcb76c79..74802b7445 100644 --- a/_locales/kmr/messages.json +++ b/_locales/kmr/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/kn/messages.json b/_locales/kn/messages.json index a86c2343a3..d2321b3d7f 100644 --- a/_locales/kn/messages.json +++ b/_locales/kn/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json index 3e5f039cf5..211e9f002e 100644 --- a/_locales/ko/messages.json +++ b/_locales/ko/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "친구 요청이 들어왔습니다.", "clearAllConfirmationTitle": "모든 메세지 요청 삭제", "clearAllConfirmationBody": "모든 메세지 요청을 삭제하시겠습니까?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/lt/messages.json b/_locales/lt/messages.json index 8a30820560..2d2f50b00d 100644 --- a/_locales/lt/messages.json +++ b/_locales/lt/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/lv/messages.json b/_locales/lv/messages.json index 09a67aa7be..15a0399b61 100644 --- a/_locales/lv/messages.json +++ b/_locales/lv/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/mk/messages.json b/_locales/mk/messages.json index c6f1bb5d33..d32e919d71 100644 --- a/_locales/mk/messages.json +++ b/_locales/mk/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/nb/messages.json b/_locales/nb/messages.json index f8c0ad6a0a..a4e3f73f71 100644 --- a/_locales/nb/messages.json +++ b/_locales/nb/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Du har en ny venneforespørsel", "clearAllConfirmationTitle": "Fjern alle meldingsforespørsler", "clearAllConfirmationBody": "Er du sikker på at du ønsker å slette alle meldingsforespørsler?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json index b4503cae65..70877b348c 100644 --- a/_locales/nl/messages.json +++ b/_locales/nl/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "U heeft een nieuw vriendverzoek", "clearAllConfirmationTitle": "Wis alle berichtverzoeken", "clearAllConfirmationBody": "Weet je zeker dat je alle berichtverzoeken wilt wissen?", - "noMessagesInReadOnly": "Er zijn geen berichten in $name$.", + "thereAreNoMessagesIn": "Er zijn geen berichten in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "Je hebt geen berichten in $name$.", "noMessagesInEverythingElse": "Je hebt geen berichten van $name$. Stuur een bericht om het gesprek te starten!", diff --git a/_locales/no/messages.json b/_locales/no/messages.json index d7195650c6..9575fd7490 100644 --- a/_locales/no/messages.json +++ b/_locales/no/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Du har en ny venneforespørsel", "clearAllConfirmationTitle": "Fjern alle meldingsforespørsler", "clearAllConfirmationBody": "Er du sikker på at du ønsker å slette alle meldingsforespørsler?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/pa/messages.json b/_locales/pa/messages.json index d3116ae39b..922d8302da 100644 --- a/_locales/pa/messages.json +++ b/_locales/pa/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json index 09a33c1ea5..88d25da217 100644 --- a/_locales/pl/messages.json +++ b/_locales/pl/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Masz nowe zaproszenie do znajomych", "clearAllConfirmationTitle": "Wyczyść wszystkie żądania wiadomości", "clearAllConfirmationBody": "Czy na pewno chcesz wyczyścić wszystkie żądania wiadomości?", - "noMessagesInReadOnly": "Brak wiadomości w $name$.", + "thereAreNoMessagesIn": "Brak wiadomości w $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "Nie masz żadnych wiadomości w $name$.", "noMessagesInEverythingElse": "Nie masz wiadomości od $name$. Wyślij wiadomość, aby rozpocząć rozmowę!", diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json index d4177a31d0..d7dc1453fb 100644 --- a/_locales/pt_BR/messages.json +++ b/_locales/pt_BR/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Você tem uma nova solicitação de amizade", "clearAllConfirmationTitle": "Limpar todas as solicitações de mensagem", "clearAllConfirmationBody": "Tem certeza de que deseja excluir todas as solicitações de mensagem?", - "noMessagesInReadOnly": "Não há mensagens em $name$.", + "thereAreNoMessagesIn": "Não há mensagens em $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "Você não tem mensagens em $name$.", "noMessagesInEverythingElse": "Você não tem mensagens de $name$. Envie uma mensagem para iniciar a conversa!", diff --git a/_locales/pt_PT/messages.json b/_locales/pt_PT/messages.json index 78959c9c28..2e7f82f745 100644 --- a/_locales/pt_PT/messages.json +++ b/_locales/pt_PT/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/ro/messages.json b/_locales/ro/messages.json index 5bc52b2575..61c5238d54 100644 --- a/_locales/ro/messages.json +++ b/_locales/ro/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index 242187a223..74485d4681 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "У вас новая заявка в друзья", "clearAllConfirmationTitle": "Очистить все запросы на переписку", "clearAllConfirmationBody": "Вы уверены, что хотите удалить все запросы на переписку?", - "noMessagesInReadOnly": "Нет никаких сообщений в $name$.", + "thereAreNoMessagesIn": "Нет никаких сообщений в $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "У Вас нет сообщений в $name$.", "noMessagesInEverythingElse": "У Вас нет сообщений от $name$. Отправьте сообщение, чтобы начать чат!", diff --git a/_locales/si/messages.json b/_locales/si/messages.json index 3b5c87a4d0..5f59257414 100644 --- a/_locales/si/messages.json +++ b/_locales/si/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "ඔබට නව මිතුරු ඉල්ලීමක් ඇත", "clearAllConfirmationTitle": "සියලුම පණිවිඩ ඉල්ලීම් හිස් කරන්න", "clearAllConfirmationBody": "ඔබට සියලු පණිවිඩ ඉල්ලීම් ඉවත් කිරීමට අවශ්‍ය බව විශ්වාසද?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/sk/messages.json b/_locales/sk/messages.json index d9cc960afe..c8604b1dd4 100644 --- a/_locales/sk/messages.json +++ b/_locales/sk/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Máte novú žiadosť o priateľstvo", "clearAllConfirmationTitle": "Vyčistiť všetky žiadosti o správy", "clearAllConfirmationBody": "Ste si istí, že chcete vyčistiť všetky žiadosti o správu?", - "noMessagesInReadOnly": "V $name$ nie sú žiadne správy.", + "thereAreNoMessagesIn": "V $name$ nie sú žiadne správy.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "V $name$ nemáte žiadne správy.", "noMessagesInEverythingElse": "Nemáte žiadne správy od $name$. Pošlite správu a začnite konverzáciu!", diff --git a/_locales/sl/messages.json b/_locales/sl/messages.json index 57e1c747a9..372d7eaa6e 100644 --- a/_locales/sl/messages.json +++ b/_locales/sl/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/sq/messages.json b/_locales/sq/messages.json index 141bf7fc0a..3f26f235ff 100644 --- a/_locales/sq/messages.json +++ b/_locales/sq/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json index 96dbe432b4..76c1c876f5 100644 --- a/_locales/sr/messages.json +++ b/_locales/sr/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json index 06c4e56ad9..6502a2c8d5 100644 --- a/_locales/sv/messages.json +++ b/_locales/sv/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Du har en ny vänförfrågan", "clearAllConfirmationTitle": "Rensa alla meddelandeförfrågningar", "clearAllConfirmationBody": "Är du säker på att du vill rensa alla meddelandeförfrågningar?", - "noMessagesInReadOnly": "Det finns inga meddelanden i $name$.", + "thereAreNoMessagesIn": "Det finns inga meddelanden i $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "Det finns inga meddelanden i $name$.", "noMessagesInEverythingElse": "Du har inga meddelanden från $name$. Skicka ett meddelande för att starta konversationen!", diff --git a/_locales/ta/messages.json b/_locales/ta/messages.json index 7ecb124eba..c3d483e351 100644 --- a/_locales/ta/messages.json +++ b/_locales/ta/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/th/messages.json b/_locales/th/messages.json index 064717587b..072e2befc7 100644 --- a/_locales/th/messages.json +++ b/_locales/th/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/tl/messages.json b/_locales/tl/messages.json index bacb8e111b..e8a6aa9082 100644 --- a/_locales/tl/messages.json +++ b/_locales/tl/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json index 54375e8cdf..300650b519 100644 --- a/_locales/tr/messages.json +++ b/_locales/tr/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "Yeni bir arkadaşlık isteğin var", "clearAllConfirmationTitle": "Tüm Mesaj İsteklerini temizle", "clearAllConfirmationBody": "Tüm mesaj isteklerinizi silmek istediğinizden emin misiniz?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json index bb787a8446..fb6cbe37a8 100644 --- a/_locales/uk/messages.json +++ b/_locales/uk/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "У вас є новий запит у друзі", "clearAllConfirmationTitle": "Очистити всі запити", "clearAllConfirmationBody": "Ви впевнені, що бажаєте очистити всі запити на повідомлення?", - "noMessagesInReadOnly": "Немає повідомлень в $name$.", + "thereAreNoMessagesIn": "Немає повідомлень в $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "У вас відсутні повідомлення в $name$.", "noMessagesInEverythingElse": "У вас немає повідомлень від $name$. Надішліть повідомлення, щоб розпочати розмову!", diff --git a/_locales/uz/messages.json b/_locales/uz/messages.json index ba1e72be8f..a41bc90e5b 100644 --- a/_locales/uz/messages.json +++ b/_locales/uz/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/vi/messages.json b/_locales/vi/messages.json index af9cc42b2b..95983f92b3 100644 --- a/_locales/vi/messages.json +++ b/_locales/vi/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json index 76c1ccbfb3..b1aa59ad99 100644 --- a/_locales/zh_CN/messages.json +++ b/_locales/zh_CN/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "您有一个新的好友申请", "clearAllConfirmationTitle": "清除所有的消息请求", "clearAllConfirmationBody": "您确定要清除所有的消息请求吗？", - "noMessagesInReadOnly": "$name$中没有消息", + "thereAreNoMessagesIn": "$name$中没有消息", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "你在$name$中没有消息", "noMessagesInEverythingElse": "您没有来自 $name$的消息。发送一条消息开始对话！", diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json index 25289645a1..e9011022f5 100644 --- a/_locales/zh_TW/messages.json +++ b/_locales/zh_TW/messages.json @@ -490,7 +490,7 @@ "youHaveANewFriendRequest": "您有一個新的好友請求", "clearAllConfirmationTitle": "清除所有訊息請求", "clearAllConfirmationBody": "您確定要清除所有訊息請求嗎？", - "noMessagesInReadOnly": "There are no messages in $name$.", + "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index efce31456b..35bf1cc899 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -74,7 +74,7 @@ export const NoMessageInConversation = () => { if (privateBlindedAndBlockingMsgReqs) { localizedKey = 'noMessagesInBlindedDisabledMsgRequests'; } else { - localizedKey = 'noMessagesInReadOnly'; + localizedKey = 'thereAreNoMessagesIn'; } } else if (isMe) { localizedKey = 'noMessagesInNoteToSelf'; diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx index f63295727d..eedf5114d1 100644 --- a/ts/components/conversation/composition/CompositionBox.tsx +++ b/ts/components/conversation/composition/CompositionBox.tsx @@ -422,6 +422,11 @@ class CompositionBoxInner extends React.Component { const { typingEnabled } = this.props; /* eslint-disable @typescript-eslint/no-misused-promises */ + // we completely hide the composition box when typing is not enabled now. + if (!typingEnabled) { + return null; + } + return ( { alignItems={'center'} width={'100%'} > - {typingEnabled && } + { type="file" onChange={this.onChoseAttachment} /> - {typingEnabled && } + { > {this.renderTextArea()} - {typingEnabled && ( - - )} - {typingEnabled && } - {typingEnabled && showEmojiPanel && ( + + + + + {showEmojiPanel && ( { if (!this.props.selectedConversation) { return null; } + // Note: we completely hide the composition box if typing is not enabled now, so this component is not rendered const makeMessagePlaceHolderText = () => { if (isKickedFromGroup) { @@ -494,7 +500,6 @@ class CompositionBoxInner extends React.Component { const { isKickedFromGroup, left, isBlocked } = this.props.selectedConversation; const messagePlaceHolder = makeMessagePlaceHolderText(); - const { typingEnabled } = this.props; const neverMatchingRegex = /($a)/; const style = sendMessageStyle(htmlDirection); @@ -511,7 +516,6 @@ class CompositionBoxInner extends React.Component { spellCheck={true} dir={htmlDirection} inputRef={this.textarea} - disabled={!typingEnabled} rows={1} data-testid="message-input-text-area" style={style} diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 14fa5beba1..7e20bb9737 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -24,7 +24,6 @@ export type LocalizerKeys = | 'audioMessageAutoplayTitle' | 'audioNotificationsSettingsTitle' | 'audioPermissionNeeded' - | 'audioPermissionNeededTitle' | 'autoUpdateDownloadButtonLabel' | 'autoUpdateDownloadInstructions' | 'autoUpdateDownloadedMessage' @@ -50,9 +49,7 @@ export type LocalizerKeys = | 'callMissed' | 'callMissedCausePermission' | 'callMissedNotApproved' - | 'callMissedTitle' | 'cameraPermissionNeeded' - | 'cameraPermissionNeededTitle' | 'cancel' | 'cannotMixImageAndNonImageAttachments' | 'cannotRemoveCreatorFromGroup' @@ -65,7 +62,6 @@ export type LocalizerKeys = | 'changeNicknameMessage' | 'changePassword' | 'changePasswordInvalid' - | 'changePasswordTitle' | 'changePasswordToastDescription' | 'chooseAnAction' | 'classicDarkThemeTitle' @@ -307,7 +303,6 @@ export type LocalizerKeys = | 'noMessagesInBlindedDisabledMsgRequests' | 'noMessagesInEverythingElse' | 'noMessagesInNoteToSelf' - | 'noMessagesInReadOnly' | 'noModeratorsToRemove' | 'noNameOrMessage' | 'noSearchResults' @@ -331,7 +326,6 @@ export type LocalizerKeys = | 'oneNonImageAtATimeToast' | 'onionPathIndicatorDescription' | 'onionPathIndicatorTitle' - | 'onlyAdminCanRemoveMembers' | 'onlyAdminCanRemoveMembersDesc' | 'open' | 'openGroupInvitation' @@ -395,7 +389,6 @@ export type LocalizerKeys = | 'removeModerators' | 'removePassword' | 'removePasswordInvalid' - | 'removePasswordTitle' | 'removePasswordToastDescription' | 'removeResidueMembers' | 'replyToMessage' @@ -427,7 +420,6 @@ export type LocalizerKeys = | 'setPassword' | 'setPasswordFail' | 'setPasswordInvalid' - | 'setPasswordTitle' | 'setPasswordToastDescription' | 'settingsHeader' | 'shareBugDetails' @@ -450,6 +442,7 @@ export type LocalizerKeys = | 'support' | 'surveyTitle' | 'themesSettingTitle' + | 'thereAreNoMessagesIn' | 'theyChangedTheTimer' | 'thisMonth' | 'thisWeek' @@ -496,7 +489,6 @@ export type LocalizerKeys = | 'typingIndicatorsSettingDescription' | 'typingIndicatorsSettingTitle' | 'unableToCall' - | 'unableToCallTitle' | 'unableToLoadAttachment' | 'unbanUser' | 'unblock' From 315bc3ea70a56dc5ee67465bb05aa664db6b4312 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Nov 2023 14:10:08 +1100 Subject: [PATCH 064/302] fix: when promoted call loadAdminKeys --- ts/state/ducks/groups.ts | 5 ++--- ts/webworker/workers/browser/libsession_worker_interface.ts | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/groups.ts index 710be201cb..ac7c1628e8 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/groups.ts @@ -774,9 +774,7 @@ const markUsAsAdmin = createAsyncThunk( if (secret.length !== 64) { throw new PreConditionFailed('markUsAsAdmin secret needs to be 64'); } - console.warn('before setSigKeys ', groupPk, stringify(secret)); - await MetaGroupWrapperActions.setSigKeys(groupPk, secret); - console.warn('after setSigKeys'); + await MetaGroupWrapperActions.loadAdminKeys(groupPk, secret); const us = UserUtils.getOurPubKeyStrFromCache(); if (state.groups.members[groupPk].find(m => m.pubkeyHex === us)?.admin) { @@ -788,6 +786,7 @@ const markUsAsAdmin = createAsyncThunk( }; } await MetaGroupWrapperActions.memberSetAdmin(groupPk, us); + await GroupSync.queueNewJobIfNeeded(groupPk); return { diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 5c6e6fbd28..77a5d91863 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -541,9 +541,9 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { 'swarmVerifySubAccount', signingValue, ]) as Promise>, - setSigKeys: async (groupPk: GroupPubkeyType, secret: Uint8ArrayLen64) => { - return callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'setSigKeys', secret]) as Promise< - ReturnType + loadAdminKeys: async (groupPk: GroupPubkeyType, secret: Uint8ArrayLen64) => { + return callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'loadAdminKeys', secret]) as Promise< + ReturnType >; }, }; From e5c76d3b70cc528a61f8e824a1156372d4ce5fdf Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 22 Nov 2023 11:48:02 +1100 Subject: [PATCH 065/302] feat: group message requests kind of working still need to have them visible in the msg request only --- _locales/en/messages.json | 4 + ts/components/SessionInboxView.tsx | 26 +++-- .../conversation/MessageRequestButtons.tsx | 95 +++++++++++----- .../conversation/SessionConversation.tsx | 3 +- .../SessionMessagesListContainer.tsx | 2 - .../conversation/SubtleNotification.tsx | 103 +++++++++++++++--- .../message/message-content/MessageAvatar.tsx | 2 +- ts/components/dialog/InviteContactsDialog.tsx | 2 +- .../dialog/UpdateGroupMembersDialog.tsx | 2 +- .../dialog/UpdateGroupNameDialog.tsx | 2 +- .../leftpane/overlay/OverlayClosedGroup.tsx | 2 +- .../overlay/OverlayMessageRequest.tsx | 3 +- ts/components/menu/Menu.tsx | 19 +++- ts/hooks/useParamSelector.ts | 1 + ts/interactions/conversationInteractions.ts | 79 +++++++++++--- ts/models/conversation.ts | 59 ++++++++-- ts/models/conversationAttributes.ts | 2 +- ts/receiver/configMessage.ts | 2 +- ts/receiver/groupv2/handleGroupV2Message.ts | 45 +++++--- .../apis/open_group_api/sogsv3/sogsApiV3.ts | 2 +- ts/session/apis/snode_api/swarmPolling.ts | 17 ++- .../SwarmPollingGroupConfig.ts | 3 +- .../conversations/ConversationController.ts | 3 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 1 + ts/state/actions.ts | 10 +- ts/state/ducks/conversations.ts | 6 + ts/state/ducks/{groups.ts => metaGroups.ts} | 12 +- ts/state/ducks/userGroups.ts | 35 ++++++ ts/state/reducer.ts | 27 +++-- ts/state/selectors/conversations.ts | 21 +++- ts/state/selectors/groups.ts | 2 +- ts/state/selectors/selectedConversation.ts | 12 +- ts/state/selectors/userGroups.ts | 20 ++++ ts/types/LocalizerKeys.ts | 4 + .../browser/libsession_worker_interface.ts | 89 +++++++++++---- 35 files changed, 551 insertions(+), 166 deletions(-) rename ts/state/ducks/{groups.ts => metaGroups.ts} (99%) create mode 100644 ts/state/ducks/userGroups.ts create mode 100644 ts/state/selectors/userGroups.ts diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 7cc6472071..e8b055b947 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -504,7 +504,11 @@ "messageRequestAcceptedOurs": "You have accepted $name$'s message request", "messageRequestAcceptedOursNoName": "You have accepted the message request", "declineRequestMessage": "Are you sure you want to decline this message request?", + "deleteGroupRequest": "Are you sure you want to delete this group invite?", + "deleteGroupRequestAndBlock": "Are you sure you want to block $name$? Blocked users cannot send you message requests, group invites or call you.", "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.", + "respondingToGroupRequestWarning": "Sending a message to this group will automatically accept the group invite.", + "userInvitedYouToGroup": "$name$ invited you to join $groupName$.", "hideRequestBanner": "Hide Message Request Banner", "openMessageRequestInbox": "Message Requests", "noMessageRequestsPending": "No pending message requests", diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index 8e5207e5ff..2bd74fbec1 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -1,12 +1,12 @@ +import { fromPairs, map } from 'lodash'; import moment from 'moment'; import React from 'react'; import { Provider } from 'react-redux'; -import styled from 'styled-components'; -import { fromPairs, map } from 'lodash'; +import useMount from 'react-use/lib/useMount'; +import useUpdate from 'react-use/lib/useUpdate'; import { persistStore } from 'redux-persist'; import { PersistGate } from 'redux-persist/integration/react'; -import useUpdate from 'react-use/lib/useUpdate'; -import useMount from 'react-use/lib/useMount'; +import styled from 'styled-components'; import { LeftPane } from './leftpane/LeftPane'; // moment does not support es-419 correctly (and cause white screen on app start) @@ -33,13 +33,14 @@ import { ExpirationTimerOptions } from '../util/expiringMessages'; import { SessionMainPanel } from './SessionMainPanel'; import { SettingsKey } from '../data/settings-key'; +import { groupInfoActions, initialGroupState } from '../state/ducks/metaGroups'; import { getSettingsInitialState, updateAllOnStorageReady } from '../state/ducks/settings'; import { initialSogsRoomInfoState } from '../state/ducks/sogsRoomInfo'; import { useHasDeviceOutdatedSyncing } from '../state/selectors/settings'; import { Storage } from '../util/storage'; +import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; import { NoticeBanner } from './NoticeBanner'; import { Flex } from './basic/Flex'; -import { groupInfoActions, initialGroupState } from '../state/ducks/groups'; function makeLookup(items: Array, key: string): { [key: string]: T } { // Yep, we can't index into item without knowing what it is. True. But we want to. @@ -59,12 +60,18 @@ const StyledGutter = styled.div` transition: none; `; -function createSessionInboxStore() { +async function createSessionInboxStore() { // Here we set up a full redux store with initial state for our LeftPane Root const conversations = ConvoHub.use() .getConversations() .map(conversation => conversation.getConversationModelProps()); + const userGroups: Record = {}; + + (await UserGroupsWrapperActions.getAllGroups()).forEach(m => { + userGroups[m.pubkeyHex] = m; + }); + const timerOptions: TimerOptionsArray = ExpirationTimerOptions.getTimerSecondsWithName(); const initialState: StateType = { conversations: { @@ -90,14 +97,15 @@ function createSessionInboxStore() { sogsRoomInfo: initialSogsRoomInfoState, settings: getSettingsInitialState(), groups: initialGroupState, + userGroups: { userGroups }, }; return createStore(initialState); } -function setupLeftPane(forceUpdateInboxComponent: () => void) { +async function setupLeftPane(forceUpdateInboxComponent: () => void) { window.openConversationWithMessages = openConversationWithMessages; - window.inboxStore = createSessionInboxStore(); + window.inboxStore = await createSessionInboxStore(); window.inboxStore.dispatch(updateAllOnStorageReady()); window.inboxStore.dispatch(groupInfoActions.loadMetaDumpsFromDB()); // this loads the dumps from DB and fills the 03-groups slice with the corresponding details forceUpdateInboxComponent(); @@ -125,7 +133,7 @@ export const SessionInboxView = () => { const update = useUpdate(); // run only on mount useMount(() => { - setupLeftPane(update); + void setupLeftPane(update); }); if (!window.inboxStore) { diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index 59bdc0d137..81ae85af3b 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -1,18 +1,29 @@ import React from 'react'; -import { useSelector } from 'react-redux'; import styled from 'styled-components'; import { useIsIncomingRequest } from '../../hooks/useParamSelector'; import { approveConvoAndSendResponse, declineConversationWithConfirm, } from '../../interactions/conversationInteractions'; +import { getSwarmPollingInstance } from '../../session/apis/snode_api/swarmPolling'; import { ConvoHub } from '../../session/conversations'; -import { hasSelectedConversationIncomingMessages } from '../../state/selectors/conversations'; -import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; +import { PubKey } from '../../session/types'; +import { + useSelectedConversationIdOrigin, + useSelectedConversationKey, + useSelectedIsGroupV2, + useSelectedIsPrivateFriend, +} from '../../state/selectors/selectedConversation'; +import { useLibGroupInvitePending } from '../../state/selectors/userGroups'; +import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { SessionButton, SessionButtonColor } from '../basic/SessionButton'; -import { ConversationRequestExplanation } from './SubtleNotification'; +import { + ConversationRequestExplanation, + GroupRequestExplanation, + InvitedToGroupControlMessage, +} from './SubtleNotification'; -const ConversationRequestBanner = styled.div` +const MessageRequestContainer = styled.div` display: flex; flex-direction: column; justify-content: center; @@ -40,24 +51,31 @@ const StyledBlockUserText = styled.span` font-weight: 700; `; -const handleDeclineConversationRequest = (convoId: string, currentSelected: string | undefined) => { +const handleDeclineConversationRequest = ( + convoId: string, + currentSelected: string | undefined, + conversationIdOrigin: string | null +) => { declineConversationWithConfirm({ conversationId: convoId, syncToDevices: true, - blockContact: false, + alsoBlock: false, currentlySelectedConvo: currentSelected, + conversationIdOrigin, }); }; const handleDeclineAndBlockConversationRequest = ( convoId: string, - currentSelected: string | undefined + currentSelected: string | undefined, + conversationIdOrigin: string | null ) => { declineConversationWithConfirm({ conversationId: convoId, syncToDevices: true, - blockContact: true, + alsoBlock: true, currentlySelectedConvo: currentSelected, + conversationIdOrigin, }); }; @@ -69,17 +87,34 @@ const handleAcceptConversationRequest = async (convoId: string) => { await convo.setDidApproveMe(true, false); await convo.setIsApproved(true, false); await convo.commit(); - await convo.addOutgoingApprovalMessage(Date.now()); - await approveConvoAndSendResponse(convoId, true); + if (convo.isPrivate()) { + await convo.addOutgoingApprovalMessage(Date.now()); + await approveConvoAndSendResponse(convoId, true); + } else if (PubKey.is03Pubkey(convoId)) { + const found = await UserGroupsWrapperActions.getGroup(convoId); + if (!found) { + window.log.warn('cannot approve a non existing group in usergroup'); + return; + } + // this updates the wrapper and refresh the redux slice + await UserGroupsWrapperActions.setGroup({ ...found, invitePending: false }); + getSwarmPollingInstance().addGroupId(convoId); + } }; export const ConversationMessageRequestButtons = () => { const selectedConvoId = useSelectedConversationKey(); - - const hasIncomingMessages = useSelector(hasSelectedConversationIncomingMessages); const isIncomingRequest = useIsIncomingRequest(selectedConvoId); + const isGroupV2 = useSelectedIsGroupV2(); + const isPrivateAndFriend = useSelectedIsPrivateFriend(); + const isGroupPendingInvite = useLibGroupInvitePending(selectedConvoId); + const convoOrigin = useSelectedConversationIdOrigin() ?? null; - if (!selectedConvoId || !hasIncomingMessages) { + if ( + !selectedConvoId || + isPrivateAndFriend || // if we are already friends, there is no need for the msg request buttons + (isGroupV2 && !isGroupPendingInvite) + ) { return null; } @@ -88,18 +123,8 @@ export const ConversationMessageRequestButtons = () => { } return ( - - { - handleDeclineAndBlockConversationRequest(selectedConvoId, selectedConvoId); - }} - data-testid="decline-and-block-message-request" - > - {window.i18n('block')} - - - - + + { @@ -110,13 +135,25 @@ export const ConversationMessageRequestButtons = () => { /> { - handleDeclineConversationRequest(selectedConvoId, selectedConvoId); + handleDeclineConversationRequest(selectedConvoId, selectedConvoId, convoOrigin); }} dataTestId="decline-message-request" /> - + {isGroupV2 ? : } + + {(isGroupV2 && !!convoOrigin) || !isGroupV2 ? ( + { + handleDeclineAndBlockConversationRequest(selectedConvoId, selectedConvoId, convoOrigin); + }} + data-testid="decline-and-block-message-request" + > + {window.i18n('block')} + + ) : null} + ); }; diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index 5efadffea5..83efd38701 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -55,6 +55,7 @@ import { MessageDetail } from './message/message-item/MessageDetail'; import { HTMLDirection } from '../../util/i18n'; import { SessionSpinner } from '../basic/SessionSpinner'; +import { ConversationMessageRequestButtons } from './MessageRequestButtons'; const DEFAULT_JPEG_QUALITY = 0.85; @@ -270,7 +271,7 @@ export class SessionConversation extends React.Component {
- + } bottom={ diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx index 92941a56df..1c693051ed 100644 --- a/ts/components/conversation/SessionMessagesListContainer.tsx +++ b/ts/components/conversation/SessionMessagesListContainer.tsx @@ -24,7 +24,6 @@ import { import { getSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { SessionMessagesList } from './SessionMessagesList'; import { TypingBubble } from './TypingBubble'; -import { ConversationMessageRequestButtons } from './MessageRequestButtons'; export type SessionMessageListProps = { messageContainerRef: React.RefObject; @@ -126,7 +125,6 @@ class SessionMessagesListContainerInner extends React.Component { isTyping={!!conversation.isTyping} key="typing-bubble" /> - + + + + + ); +} + /** * This component is used to display a warning when the user is responding to a message request. - * */ export const ConversationRequestExplanation = () => { const selectedConversation = useSelectedConversationKey(); @@ -46,9 +66,64 @@ export const ConversationRequestExplanation = () => { } return ( - - {window.i18n('respondingToRequestWarning')} - + + ); +}; + +/** + * This component is used to display a warning when the user is responding to a group message request. + */ +export const GroupRequestExplanation = () => { + const selectedConversation = useSelectedConversationKey(); + const isIncomingMessageRequest = useIsIncomingRequest(selectedConversation); + const isGroupV2 = useSelectedIsGroupV2(); + const showMsgRequestUI = selectedConversation && isIncomingMessageRequest; + // isApproved in DB is tracking the pending state for a group + const isApproved = useSelectedIsApproved(); + const isGroupPendingInvite = useLibGroupInvitePending(selectedConversation); + + if (!showMsgRequestUI || isApproved || !isGroupV2 || !isGroupPendingInvite) { + return null; + } + return ( + + ); +}; + +export const InvitedToGroupControlMessage = () => { + const selectedConversation = useSelectedConversationKey(); + const isGroupV2 = useSelectedIsGroupV2(); + const hasMessages = useSelectedHasMessages(); + const isApproved = useSelectedIsApproved(); + + const groupName = useLibGroupInviteGroupName(selectedConversation) || window.i18n('unknown'); + const conversationOrigin = useSelectedConversationIdOrigin(); + const adminNameInvitedUs = + useConversationUsernameOrShorten(conversationOrigin) || window.i18n('unknown'); + const isGroupPendingInvite = useLibGroupInvitePending(selectedConversation); + if ( + !selectedConversation || + isApproved || + hasMessages || // we don't want to display that "xx invited you" message if there are already other messages (incoming or outgoing) + !isGroupV2 || + !conversationOrigin || + !PubKey.is05Pubkey(conversationOrigin) || + !isGroupPendingInvite + ) { + return null; + } + + return ( + ); }; @@ -58,7 +133,9 @@ export const ConversationRequestExplanation = () => { export const NoMessageInConversation = () => { const selectedConversation = useSelectedConversationKey(); - const hasMessage = useSelector(getSelectedHasMessages); + const hasMessage = useSelectedHasMessages(); + const isGroupV2 = useSelectedIsGroupV2(); + const isInvitePending = useLibGroupInvitePending(selectedConversation); const isMe = useSelectedIsNoteToSelf(); const canWrite = useSelector(getSelectedCanWrite); @@ -66,7 +143,8 @@ export const NoMessageInConversation = () => { // TODOLATER use this selector accross the whole application (left pane excluded) const nameToRender = useSelectedNicknameOrProfileNameOrShortenedPubkey() || ''; - if (!selectedConversation || hasMessage) { + // groupV2 use its own invite logic as part of + if (!selectedConversation || hasMessage || (isGroupV2 && isInvitePending)) { return null; } let localizedKey: LocalizerKeys = 'noMessagesInEverythingElse'; @@ -81,10 +159,9 @@ export const NoMessageInConversation = () => { } return ( - - - - - + ); }; diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx index bec16a9cbd..8454e186db 100644 --- a/ts/components/conversation/message/message-content/MessageAvatar.tsx +++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx @@ -100,7 +100,7 @@ export const MessageAvatar = (props: Props) => { privateConvoToOpen = foundRealSessionId || privateConvoToOpen; } - await ConvoHub.use().get(privateConvoToOpen).setOriginConversationID(selectedConvoKey); + await ConvoHub.use().get(privateConvoToOpen).setOriginConversationID(selectedConvoKey, true); // public and blinded key for that message, we should open the convo as is and see if the user wants // to send a sogs blinded message request. diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index f90e1bb573..61f3c352c4 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -22,7 +22,7 @@ import { useSet } from '../../hooks/useSet'; import { ClosedGroup } from '../../session/group/closed-group'; import { PubKey } from '../../session/types'; import { SessionUtilUserGroups } from '../../session/utils/libsession/libsession_utils_user_groups'; -import { groupInfoActions } from '../../state/ducks/groups'; +import { groupInfoActions } from '../../state/ducks/metaGroups'; import { getPrivateContactsPubkeys } from '../../state/selectors/conversations'; import { useMemberGroupChangePending } from '../../state/selectors/groups'; import { MemberListItem } from '../MemberListItem'; diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index d8d9997d8a..1fdad5c58b 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -27,7 +27,7 @@ import { useSet } from '../../hooks/useSet'; import { ConvoHub } from '../../session/conversations'; import { ClosedGroup } from '../../session/group/closed-group'; import { PubKey } from '../../session/types'; -import { groupInfoActions } from '../../state/ducks/groups'; +import { groupInfoActions } from '../../state/ducks/metaGroups'; import { useMemberGroupChangePending } from '../../state/selectors/groups'; import { useSelectedIsGroupV2 } from '../../state/selectors/selectedConversation'; import { SessionSpinner } from '../basic/SessionSpinner'; diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx index 59c18883f8..2a047899d2 100644 --- a/ts/components/dialog/UpdateGroupNameDialog.tsx +++ b/ts/components/dialog/UpdateGroupNameDialog.tsx @@ -9,7 +9,7 @@ import { ConvoHub } from '../../session/conversations'; import { ClosedGroup } from '../../session/group/closed-group'; import { initiateOpenGroupUpdate } from '../../session/group/open-group'; import { PubKey } from '../../session/types'; -import { groupInfoActions } from '../../state/ducks/groups'; +import { groupInfoActions } from '../../state/ducks/metaGroups'; import { updateGroupNameModal } from '../../state/ducks/modalDialog'; import { getLibGroupNameOutsideRedux } from '../../state/selectors/groups'; import { pickFileForAvatar } from '../../types/attachments/VisualAttachment'; diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index f9c54fdbdc..386932230e 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -15,7 +15,7 @@ import { useSet } from '../../../hooks/useSet'; import { VALIDATION } from '../../../session/constants'; import { createClosedGroup } from '../../../session/conversations/createClosedGroup'; import { ToastUtils } from '../../../session/utils'; -import { groupInfoActions } from '../../../state/ducks/groups'; +import { groupInfoActions } from '../../../state/ducks/metaGroups'; import { resetOverlayMode } from '../../../state/ducks/section'; import { getPrivateContactsPubkeys } from '../../../state/selectors/conversations'; import { useIsCreatingGroupFromUIPending } from '../../../state/selectors/groups'; diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx index 529ffd6197..99a1646980 100644 --- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx +++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx @@ -78,10 +78,11 @@ export const OverlayMessageRequest = () => { const convoId = messageRequests[index]; // eslint-disable-next-line no-await-in-loop await declineConversationWithoutConfirm({ - blockContact: false, + alsoBlock: false, conversationId: convoId, currentlySelectedConvo, syncToDevices: false, + conversationIdOrigin: null, // block is false, no need for conversationIdOrigin }); } diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index 235f43251b..aa0cd739ce 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -9,6 +9,7 @@ import { useIsActive, useIsBlinded, useIsBlocked, + useIsGroupV2, useIsIncomingRequest, useIsKickedFromGroup, useIsLeft, @@ -48,6 +49,7 @@ import { updateConfirmModal, updateUserDetailsModal, } from '../../state/ducks/modalDialog'; +import { useConversationIdOrigin } from '../../state/selectors/conversations'; import { getIsMessageSection } from '../../state/selectors/section'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { LocalizerKeys } from '../../types/LocalizerKeys'; @@ -502,20 +504,21 @@ export const DeclineMsgRequestMenuItem = () => { const isRequest = useIsIncomingRequest(convoId); const isPrivate = useIsPrivate(convoId); const selected = useSelectedConversationKey(); - - if (isPrivate && isRequest) { + const isGroupV2 = useIsGroupV2(convoId); + if ((isPrivate || isGroupV2) && isRequest) { return ( { declineConversationWithConfirm({ conversationId: convoId, syncToDevices: true, - blockContact: false, + alsoBlock: false, currentlySelectedConvo: selected || undefined, + conversationIdOrigin: null, }); }} > - {window.i18n('decline')} + {isGroupV2 ? window.i18n('delete') : window.i18n('decline')} ); } @@ -527,16 +530,20 @@ export const DeclineAndBlockMsgRequestMenuItem = () => { const isRequest = useIsIncomingRequest(convoId); const selected = useSelectedConversationKey(); const isPrivate = useIsPrivate(convoId); + const isGroupV2 = useIsGroupV2(convoId); + const convoOrigin = useConversationIdOrigin(convoId); - if (isRequest && isPrivate) { + if (isRequest && (isPrivate || (isGroupV2 && convoOrigin))) { + // to block the author of a groupv2 invitge we need the convoOrigin set return ( { declineConversationWithConfirm({ conversationId: convoId, syncToDevices: true, - blockContact: true, + alsoBlock: true, currentlySelectedConvo: selected || undefined, + conversationIdOrigin: convoOrigin ?? null, }); }} > diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index c68358eec3..2b5d11818d 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -231,6 +231,7 @@ export function useIsIncomingRequest(convoId?: string) { return Boolean( convoProps && hasValidIncomingRequestValues({ + id: convoProps.id, isMe: convoProps.isMe || false, isApproved: convoProps.isApproved || false, isPrivate: convoProps.isPrivate || false, diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 7c1f472873..c3e3011b06 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -14,6 +14,7 @@ import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; import { ConvoHub } from '../session/conversations'; import { getSodiumRenderer } from '../session/crypto'; import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; +import { PubKey } from '../session/types'; import { perfEnd, perfStart } from '../session/utils/Performance'; import { fromHexToArray, toHex } from '../session/utils/String'; import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; @@ -36,6 +37,7 @@ import { updateRemoveModeratorsModal, } from '../state/ducks/modalDialog'; import { MIME } from '../types'; +import { LocalizerKeys } from '../types/LocalizerKeys'; import { IMAGE_JPEG } from '../types/MIME'; import { processNewAttachment } from '../types/MessageAttachment'; import { urlToBlob } from '../types/attachments/VisualAttachment'; @@ -70,11 +72,6 @@ export async function blockConvoById(conversationId: string) { return; } - // I don't think we want to reset the approved fields when blocking a contact - // if (conversation.isPrivate()) { - // await conversation.setIsApproved(false); - // } - await BlockedNumberController.block(conversation.id); await conversation.commit(); ToastUtils.pushToastSuccess('blocked', window.i18n('blocked')); @@ -124,19 +121,24 @@ export const approveConvoAndSendResponse = async ( }; export async function declineConversationWithoutConfirm({ - blockContact, + alsoBlock, conversationId, currentlySelectedConvo, syncToDevices, + conversationIdOrigin, }: { conversationId: string; currentlySelectedConvo: string | undefined; syncToDevices: boolean; - blockContact: boolean; // if set to false, the contact will just be set to not approved + alsoBlock: boolean; + conversationIdOrigin: string | null; }) { const conversationToDecline = ConvoHub.use().get(conversationId); - if (!conversationToDecline || !conversationToDecline.isPrivate()) { + if ( + !conversationToDecline || + (!conversationToDecline.isPrivate() && !conversationToDecline.isClosedGroupV2()) + ) { window?.log?.info('No conversation to decline.'); return; } @@ -144,10 +146,20 @@ export async function declineConversationWithoutConfirm({ // Note: do not set the active_at undefined as this would make that conversation not synced with the libsession wrapper await conversationToDecline.setIsApproved(false, false); await conversationToDecline.setDidApproveMe(false, false); + await conversationToDecline.setOriginConversationID('', false); // this will update the value in the wrapper if needed but not remove the entry if we want it gone. The remove is done below with removeContactFromWrapper await conversationToDecline.commit(); - if (blockContact) { - await blockConvoById(conversationId); + if (alsoBlock) { + if (PubKey.is03Pubkey(conversationId)) { + // Note: if we do want to block this convo, we actually want to block the person who invited us, not the 03 pubkey itself + if (conversationIdOrigin && !PubKey.is03Pubkey(conversationIdOrigin)) { + // restoring from seed we can be missing the conversationIdOrigin, so we wouldn't be able to block the person who invited us + + await blockConvoById(conversationIdOrigin); + } + } else { + await blockConvoById(conversationId); + } } // when removing a message request, without blocking it, we actually have no need to store the conversation in the wrapper. So just remove the entry @@ -158,6 +170,10 @@ export async function declineConversationWithoutConfirm({ await SessionUtilContact.removeContactFromWrapper(conversationToDecline.id); } + if (PubKey.is03Pubkey(conversationId)) { + await UserGroupsWrapperActions.eraseGroup(conversationId); + } + if (syncToDevices) { await forceSyncConfigurationNowIfNeeded(); } @@ -169,25 +185,58 @@ export async function declineConversationWithoutConfirm({ export const declineConversationWithConfirm = ({ conversationId, syncToDevices, - blockContact, + alsoBlock, currentlySelectedConvo, + conversationIdOrigin, }: { conversationId: string; currentlySelectedConvo: string | undefined; syncToDevices: boolean; - blockContact: boolean; // if set to false, the contact will just be set to not approved + alsoBlock: boolean; + conversationIdOrigin: string | null; }) => { + const isGroupV2 = PubKey.is03Pubkey(conversationId); + + const okKey: LocalizerKeys = alsoBlock ? 'block' : isGroupV2 ? 'delete' : 'decline'; + const nameToBlock = + alsoBlock && !!conversationIdOrigin + ? ConvoHub.use().get(conversationIdOrigin)?.getContactProfileNameOrShortenedPubKey() + : null; + const messageKey: LocalizerKeys = isGroupV2 + ? alsoBlock && nameToBlock + ? 'deleteGroupRequestAndBlock' + : 'deleteGroupRequest' + : 'declineRequestMessage'; + + let message = ''; + // restoring from seeed we might not have the sender of that invite, so we need to take care of not having one (and not block) + if (isGroupV2 && messageKey === 'deleteGroupRequestAndBlock') { + if (!nameToBlock) { + throw new Error( + 'deleteGroupRequestAndBlock needs a nameToBlock (or block should not be visible)' + ); + } + + message = window.i18n( + messageKey, + messageKey === 'deleteGroupRequestAndBlock' ? [nameToBlock] : [] + ); + } else { + message = window.i18n(messageKey); + } + window?.inboxStore?.dispatch( updateConfirmModal({ - okText: blockContact ? window.i18n('block') : window.i18n('decline'), + okText: window.i18n(okKey), cancelText: window.i18n('cancel'), - message: window.i18n('declineRequestMessage'), + message, onClickOk: async () => { await declineConversationWithoutConfirm({ conversationId, currentlySelectedConvo, - blockContact, + alsoBlock, syncToDevices, + conversationIdOrigin, }); }, onClickCancel: () => { diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 5de2f69e70..292a98987c 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -237,6 +237,10 @@ export class ConversationModel extends Backbone.Model { return isDirectConversation(this.get('type')); } + public isPrivateAndBlinded() { + return this.isPrivate() && PubKey.isBlinded(this.id); + } + // returns true if this is a closed/medium or open group public isGroup() { return isOpenOrClosedGroup(this.get('type')); @@ -383,8 +387,11 @@ export class ConversationModel extends Backbone.Model { toRet.groupAdmins = this.getGroupAdmins(); } - // those are values coming only from the DB when this is a closed group + if (this.isClosedGroupV2() || this.isPrivateAndBlinded()) { + toRet.conversationIdOrigin = this.getConversationIdOrigin(); + } if (this.isClosedGroup()) { + // those are values coming only from the DB when this is a closed group if (this.isKickedFromGroup()) { toRet.isKickedFromGroup = this.isKickedFromGroup(); } @@ -660,6 +667,7 @@ export class ConversationModel extends Backbone.Model { */ public isIncomingRequest(): boolean { return hasValidIncomingRequestValues({ + id: this.id, isMe: this.isMe(), isApproved: this.isApproved(), isBlocked: this.isBlocked(), @@ -1359,14 +1367,29 @@ export class ConversationModel extends Backbone.Model { } } - public async setOriginConversationID(conversationIdOrigin: string) { - if (conversationIdOrigin === this.get('conversationIdOrigin')) { + public async setOriginConversationID(conversationIdOrigin: string, shouldCommit: boolean) { + if (conversationIdOrigin === this.getConversationIdOrigin()) { return; } + // conversationIdOrigin can only be a 05 pubkey (invite to a 03 group from a 05 person, or a sogs url), or undefined + if ( + conversationIdOrigin && + !PubKey.is05Pubkey(conversationIdOrigin) && + !OpenGroupUtils.isOpenGroupV2(conversationIdOrigin) + ) { + window.log.warn( + 'tried to setOriginConversationID with invalid parameter:', + conversationIdOrigin + ); + throw new Error('tried to setOriginConversationID with invalid parameter '); + } this.set({ conversationIdOrigin, }); - await this.commit(); + + if (shouldCommit) { + await this.commit(); + } } /** @@ -1735,6 +1758,7 @@ export class ConversationModel extends Backbone.Model { public isLeft(): boolean { if (this.isClosedGroup()) { if (this.isClosedGroupV2()) { + // getLibGroupNameOutsideRedux(this.id) || // console.info('isLeft using lib todo'); // debugger } return !!this.get('left'); @@ -1931,7 +1955,7 @@ export class ConversationModel extends Backbone.Model { private async sendBlindedMessageRequest(messageParams: VisibleMessageParams) { const ourSignKeyBytes = await UserUtils.getUserED25519KeyPairBytes(); - const groupUrl = this.getSogsOriginMessage(); + const groupUrl = this.getConversationIdOrigin(); if (!PubKey.isBlinded(this.id)) { window?.log?.warn('sendBlindedMessageRequest - convo is not a blinded one'); @@ -2091,10 +2115,18 @@ export class ConversationModel extends Backbone.Model { } /** - * - * @returns The open group conversationId this conversation originated from + * @link ConversationAttributes#conversationIdOrigin */ - private getSogsOriginMessage() { + private getConversationIdOrigin() { + if (!this.isClosedGroupV2() && !this.isPrivateAndBlinded()) { + window.log.warn( + 'getConversationIdOrigin can only be set with 03-group or blinded conversation (15 prefix), got:', + this.id + ); + throw new Error( + 'getConversationIdOrigin can only be set with 03-group or blinded conversation (15 prefix)' + ); + } return this.get('conversationIdOrigin'); } @@ -2443,6 +2475,7 @@ export function hasValidOutgoingRequestValues({ * @param values Required properties to evaluate if this is a message request */ export function hasValidIncomingRequestValues({ + id, isMe, isApproved, isBlocked, @@ -2450,6 +2483,7 @@ export function hasValidIncomingRequestValues({ activeAt, didApproveMe, }: { + id: string; isMe: boolean; isApproved: boolean; isBlocked: boolean; @@ -2459,5 +2493,12 @@ export function hasValidIncomingRequestValues({ }): boolean { // if a convo is not active, it means we didn't get any messages nor sent any. const isActive = activeAt && isFinite(activeAt) && activeAt > 0; - return Boolean(isPrivate && !isMe && !isApproved && !isBlocked && isActive && didApproveMe); + return Boolean( + (isPrivate || PubKey.is03Pubkey(id)) && + !isMe && + !isApproved && + !isBlocked && + isActive && + didApproveMe + ); } diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts index 80f0cd4e71..0450bbf57f 100644 --- a/ts/models/conversationAttributes.ts +++ b/ts/models/conversationAttributes.ts @@ -73,7 +73,7 @@ export interface ConversationAttributes { isTrustedForAttachmentDownload: boolean; // not synced accross devices, this field is used if we should auto download attachments from this conversation or not - conversationIdOrigin?: string; // Blinded message requests ONLY: The community from which this conversation originated from + conversationIdOrigin?: string; // The conversation from which this conversation originated from: blinded message request or 03-group admin who invited us // TODOLATER those two items are only used for legacy closed groups and will be removed when we get rid of the legacy closed groups support lastJoinedTimestamp: number; // ClosedGroup: last time we were added to this group // TODOLATER to remove after legacy closed group are dropped diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 08aace3f78..3019f19924 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -34,7 +34,7 @@ import { } from '../session/apis/snode_api/namespaces'; import { RetrieveMessageItemWithNamespace } from '../session/apis/snode_api/types'; import { ClosedGroup, GroupInfo } from '../session/group/closed-group'; -import { groupInfoActions } from '../state/ducks/groups'; +import { groupInfoActions } from '../state/ducks/metaGroups'; import { ConfigWrapperObjectTypesMeta, ConfigWrapperUser, diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 72efa8b8d8..e97c3648c0 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -3,6 +3,7 @@ import { isEmpty, isFinite, isNumber } from 'lodash'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; +import { getMessageQueue } from '../../session'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../../session/conversations'; @@ -10,14 +11,13 @@ import { getSodiumRenderer } from '../../session/crypto'; import { ClosedGroup } from '../../session/group/closed-group'; import { GroupUpdateInviteResponseMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage'; import { ed25519Str } from '../../session/onions/onionPath'; -import { getMessageQueue } from '../../session/sending'; import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { stringToUint8Array } from '../../session/utils/String'; import { PreConditionFailed } from '../../session/utils/errors'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; -import { groupInfoActions } from '../../state/ducks/groups'; +import { groupInfoActions } from '../../state/ducks/metaGroups'; import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { BlockedNumberController } from '../../util'; import { @@ -42,6 +42,20 @@ type GroupUpdateDetails = { updateMessage: SignalService.GroupUpdateMessage; } & WithEnvelopeTimestamp; +async function sendInviteResponseToGroup({ groupPk }: { groupPk: GroupPubkeyType }) { + await getMessageQueue().sendToGroupV2({ + message: new GroupUpdateInviteResponseMessage({ + groupPk, + isApproved: true, + createAtNetworkTimestamp: GetNetworkTime.now(), + }), + }); + + // TODO use the pending so we actually don't start polling here unless it is not in the pending state. + // once everything is ready, start polling using that authData to get the keys, members, details of that group, and its messages. + getSwarmPollingInstance().addGroupId(groupPk); +} + async function handleGroupInviteMessage({ inviteMessage, author, @@ -82,6 +96,8 @@ async function handleGroupInviteMessage({ ); convo.set({ active_at: envelopeTimestamp, + didApproveMe: true, + conversationIdOrigin: author, }); if (inviteMessage.name && isEmpty(convo.getRealSessionUsername())) { @@ -90,6 +106,7 @@ async function handleGroupInviteMessage({ }); } await convo.commit(); + const userEd25519Secretkey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes; let found = await UserGroupsWrapperActions.getGroup(inviteMessage.groupSessionId); if (!found) { @@ -100,12 +117,16 @@ async function handleGroupInviteMessage({ priority: 0, pubkeyHex: inviteMessage.groupSessionId, secretKey: null, + kicked: false, + invitePending: true, }; + } else { + found.kicked = false; + found.name = inviteMessage.name; } // not sure if we should drop it, or set it again? They should be the same anyway found.authData = inviteMessage.memberAuthData; - const userEd25519Secretkey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes; await UserGroupsWrapperActions.setGroup(found); await MetaGroupWrapperActions.init(inviteMessage.groupSessionId, { metaDumped: null, @@ -118,20 +139,10 @@ async function handleGroupInviteMessage({ }); await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); await UserSync.queueNewJobIfNeeded(); - - // TODO currently sending auto-accept of invite. needs to be removed once we get the Group message request logic - console.warn('currently sending auto accept invite response'); - await getMessageQueue().sendToGroupV2({ - message: new GroupUpdateInviteResponseMessage({ - groupPk: inviteMessage.groupSessionId, - isApproved: true, - createAtNetworkTimestamp: GetNetworkTime.now(), - }), - }); - - // TODO use the pending so we actually don't start polling here unless it is not in the pending state. - // once everything is ready, start polling using that authData to get the keys, members, details of that group, and its messages. - getSwarmPollingInstance().addGroupId(inviteMessage.groupSessionId); + if (!found.invitePending) { + // if this group should already be polling + getSwarmPollingInstance().addGroupId(inviteMessage.groupSessionId); + } } async function verifySig({ diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts index 38c0f36d52..6f8b71a5f4 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts @@ -436,7 +436,7 @@ async function handleInboxOutboxMessages( messageHash: '', sentAt: postedAtInMs, }); - await outboxConversationModel.setOriginConversationID(serverConversationId); + await outboxConversationModel.setOriginConversationID(serverConversationId, true); await handleOutboxMessageModel( msgModel, diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index eccd290bd8..001f2ba7ca 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -189,6 +189,9 @@ export class SwarmPolling { } public async getPollingDetails(pollingEntries: Array) { + // Note: all of those checks are explicitely made only based on the libsession wrappers data, and NOT the DB. + // Eventually, we want to get rid of the duplication between the DB and libsession wrappers. + // If you need to add a check based on the DB, this is code smell. let toPollDetails: Array = []; const ourPubkey = UserUtils.getOurPubKeyStrFromCache(); @@ -230,7 +233,12 @@ export class SwarmPolling { const allGroupsTracked = groups .filter(m => this.shouldPollByTimeout(m)) // should we poll from it depending on this group activity? - .filter(m => allGroupsInWrapper.some(w => w.pubkeyHex === m.pubkey.key)) // we don't poll from groups which are not in the usergroup wrapper + .filter(m => { + // We don't poll from groups which are not in the usergroup wrapper, and for those which are not marked as accepted + // We don't want to leave them, we just don't want to poll from them. + const found = allGroupsInWrapper.find(w => w.pubkeyHex === m.pubkey.key); + return found && !found.invitePending; + }) .map(m => m.pubkey.key as GroupPubkeyType) // extract the pubkey .map(m => [m, ConversationTypeEnum.GROUPV2] as PollForGroup); @@ -560,7 +568,12 @@ export class SwarmPolling { const closedGroupsOnly = convos.filter( (c: ConversationModel) => - c.isClosedGroup() && !c.isBlocked() && !c.isKickedFromGroup() && !c.isLeft() + (c.isClosedGroupV2() && + !c.isBlocked() && + !c.isKickedFromGroup() && + !c.isLeft() && + c.isApproved()) || + (c.isClosedGroup() && !c.isBlocked() && !c.isKickedFromGroup() && !c.isLeft()) ); closedGroupsOnly.forEach(c => { diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 5f460acbd1..f3c9d618d8 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -1,5 +1,5 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { groupInfoActions } from '../../../../state/ducks/groups'; +import { groupInfoActions } from '../../../../state/ducks/metaGroups'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { ed25519Str } from '../../../onions/onionPath'; import { fromBase64ToArray } from '../../../utils/String'; @@ -19,7 +19,6 @@ async function handleGroupSharedConfigMessages( ); if (groupConfigMessages.find(m => !m.storedAt)) { - debugger; throw new Error('all incoming group config message should have a timestamp'); } const infos = groupConfigMessages diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 8efcb22fa6..b9b8ff5b9a 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -18,7 +18,7 @@ import { getMessageQueue } from '..'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/conversationAttributes'; import { removeAllClosedGroupEncryptionKeyPairs } from '../../receiver/closedGroups'; -import { groupInfoActions } from '../../state/ducks/groups'; +import { groupInfoActions } from '../../state/ducks/metaGroups'; import { getCurrentlySelectedConversationOutsideRedux } from '../../state/selectors/conversations'; import { assertUnreachable } from '../../types/sqlSharedTypes'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; @@ -212,7 +212,6 @@ class ConvoController { } window.log.info(`deleteClosedGroup: ${groupId}, sendLeaveMessage?:${options.sendLeaveMessage}`); getSwarmPollingInstance().removePubkey(groupId, 'deleteClosedGroup'); // we don't need to keep polling anymore. - if (options.sendLeaveMessage) { await leaveClosedGroup(groupId, options.fromSyncMessage); } diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 4fb1636a5d..bfa75c18b6 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -153,6 +153,7 @@ class GroupInviteJob extends PersistedJob { } finally { updateFailedStateForMember(groupPk, member, failed); try { + debugger; await MetaGroupWrapperActions.memberSetInvited(groupPk, member, failed); } catch (e) { window.log.warn('GroupInviteJob memberSetInvited failed with', e.message); diff --git a/ts/state/actions.ts b/ts/state/actions.ts index 921a3d7143..a5609fbc8a 100644 --- a/ts/state/actions.ts +++ b/ts/state/actions.ts @@ -1,13 +1,13 @@ import { bindActionCreators, Dispatch } from '@reduxjs/toolkit'; -import { actions as search } from './ducks/search'; import { actions as conversations } from './ducks/conversations'; -import { actions as user } from './ducks/user'; -import { actions as sections } from './ducks/section'; -import { actions as theme } from './ducks/theme'; +import { groupInfoActions } from './ducks/metaGroups'; import { actions as modalDialog } from './ducks/modalDialog'; import { actions as primaryColor } from './ducks/primaryColor'; -import { groupInfoActions } from './ducks/groups'; +import { actions as search } from './ducks/search'; +import { actions as sections } from './ducks/section'; +import { actions as theme } from './ducks/theme'; +import { actions as user } from './ducks/user'; export function mapDispatchToProps(dispatch: Dispatch): object { return { diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 93ce75ae20..f879c5bcdf 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -8,6 +8,8 @@ import { LightBoxOptions } from '../../components/conversation/SessionConversati import { Data } from '../../data/data'; import { CONVERSATION_PRIORITIES, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + ConversationAttributes, ConversationNotificationSettingType, ConversationTypeEnum, } from '../../models/conversationAttributes'; @@ -253,6 +255,10 @@ export interface ReduxConversationType { * If this is undefined, it means all notification are enabled */ currentNotificationSetting?: ConversationNotificationSettingType; + /** + * @see {@link ConversationAttributes#conversationIdOrigin}. + */ + conversationIdOrigin?: string; priority?: number; // undefined means 0 isInitialFetchingInProgress?: boolean; diff --git a/ts/state/ducks/groups.ts b/ts/state/ducks/metaGroups.ts similarity index 99% rename from ts/state/ducks/groups.ts rename to ts/state/ducks/metaGroups.ts index ac7c1628e8..b3b60b3a40 100644 --- a/ts/state/ducks/groups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -34,6 +34,7 @@ import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; import { GroupInvite } from '../../session/utils/job_runners/jobs/GroupInviteJob'; import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; +import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { getGroupPubkeyFromWrapperType, @@ -585,6 +586,8 @@ async function handleMemberChangeFromUIOrNot({ // this removes them from the wrapper await handleRemoveMembers({ groupPk, removed, secretKey: group.secretKey, fromCurrentDevice }); + await LibSessionUtil.saveDumpsToDb(groupPk); + // push new members & key supplement in a single batch call const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, supplementKeys); if (batchResult !== RunJobResult.Success) { @@ -644,6 +647,7 @@ async function handleMemberChangeFromUIOrNot({ }), }); } + await LibSessionUtil.saveDumpsToDb(groupPk); convo.set({ active_at: createAtNetworkTimestamp, @@ -862,8 +866,8 @@ const currentDeviceGroupNameChange = createAsyncThunk( /** * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. */ -const groupSlice = createSlice({ - name: 'group', +const metaGroupSlice = createSlice({ + name: 'metaGroup', initialState: initialGroupState, reducers: {}, extraReducers: builder => { @@ -1019,6 +1023,6 @@ export const groupInfoActions = { markUsAsAdmin, inviteResponseReceived, currentDeviceGroupNameChange, - ...groupSlice.actions, + ...metaGroupSlice.actions, }; -export const groupReducer = groupSlice.reducer; +export const groupReducer = metaGroupSlice.reducer; diff --git a/ts/state/ducks/userGroups.ts b/ts/state/ducks/userGroups.ts new file mode 100644 index 0000000000..4a24beee0b --- /dev/null +++ b/ts/state/ducks/userGroups.ts @@ -0,0 +1,35 @@ +/* eslint-disable no-await-in-loop */ +import { PayloadAction, createSlice } from '@reduxjs/toolkit'; +import { GroupPubkeyType, UserGroupsGet } from 'libsession_util_nodejs'; + +export type UserGroupState = { + userGroups: Record; +}; + +export const initialUserGroupState: UserGroupState = { + userGroups: {}, +}; + +const userGroupSlice = createSlice({ + name: 'userGroup', + initialState: initialUserGroupState, + + reducers: { + refreshUserGroupsSlice( + state: UserGroupState, + action: PayloadAction<{ groups: Array }> + ) { + state.userGroups = {}; + action.payload.groups.forEach(m => { + state.userGroups[m.pubkeyHex] = m; + }); + + return state; + }, + }, +}); + +export const userGroupsActions = { + ...userGroupSlice.actions, +}; +export const userGroupReducer = userGroupSlice.reducer; diff --git a/ts/state/reducer.ts b/ts/state/reducer.ts index 3ab29c0481..9c9eb18de3 100644 --- a/ts/state/reducer.ts +++ b/ts/state/reducer.ts @@ -1,26 +1,27 @@ import { combineReducers } from '@reduxjs/toolkit'; -import { reducer as search, SearchStateType } from './ducks/search'; -import { ConversationsStateType, reducer as conversations } from './ducks/conversations'; -import { reducer as user, UserStateType } from './ducks/user'; -import { reducer as theme } from './ducks/theme'; +import { callReducer as call, CallStateType } from './ducks/call'; +import { reducer as conversations, ConversationsStateType } from './ducks/conversations'; +import { defaultRoomReducer as defaultRooms, DefaultRoomsState } from './ducks/defaultRooms'; import { reducer as primaryColor } from './ducks/primaryColor'; +import { reducer as search, SearchStateType } from './ducks/search'; import { reducer as section, SectionStateType } from './ducks/section'; -import { defaultRoomReducer as defaultRooms, DefaultRoomsState } from './ducks/defaultRooms'; import { ReduxSogsRoomInfos, SogsRoomInfoState } from './ducks/sogsRoomInfo'; -import { callReducer as call, CallStateType } from './ducks/call'; +import { reducer as theme } from './ducks/theme'; +import { reducer as user, UserStateType } from './ducks/user'; -import { defaultOnionReducer as onionPaths, OnionState } from './ducks/onion'; +import { PrimaryColorStateType, ThemeStateType } from '../themes/constants/colors'; +import { groupReducer, GroupState } from './ducks/metaGroups'; import { modalReducer as modals, ModalState } from './ducks/modalDialog'; -import { userConfigReducer as userConfig, UserConfigState } from './ducks/userConfig'; -import { timerOptionReducer as timerOptions, TimerOptionsState } from './ducks/timerOptions'; +import { defaultOnionReducer as onionPaths, OnionState } from './ducks/onion'; +import { settingsReducer, SettingsState } from './ducks/settings'; import { reducer as stagedAttachments, StagedAttachmentsStateType, } from './ducks/stagedAttachments'; -import { PrimaryColorStateType, ThemeStateType } from '../themes/constants/colors'; -import { settingsReducer, SettingsState } from './ducks/settings'; -import { groupReducer, GroupState } from './ducks/groups'; +import { timerOptionReducer as timerOptions, TimerOptionsState } from './ducks/timerOptions'; +import { userConfigReducer as userConfig, UserConfigState } from './ducks/userConfig'; +import { userGroupReducer, UserGroupState } from './ducks/userGroups'; export type StateType = { search: SearchStateType; @@ -39,6 +40,7 @@ export type StateType = { sogsRoomInfo: SogsRoomInfoState; settings: SettingsState; groups: GroupState; + userGroups: UserGroupState; }; export const reducers = { @@ -58,6 +60,7 @@ export const reducers = { sogsRoomInfo: ReduxSogsRoomInfos.sogsRoomInfoReducer, settings: settingsReducer, groups: groupReducer, + userGroups: userGroupReducer, }; // Making this work would require that our reducer signature supported AnyAction, not diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index d60c5a6a29..8c9dab9d7e 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -2,6 +2,7 @@ import { createSelector } from '@reduxjs/toolkit'; import { filter, isEmpty, isFinite, isNumber, pick, sortBy, toNumber } from 'lodash'; +import { useSelector } from 'react-redux'; import { ConversationLookupType, ConversationsStateType, @@ -93,6 +94,13 @@ export const hasSelectedConversationIncomingMessages = createSelector( } ); +export const hasSelectedConversationOutgoingMessages = createSelector( + getSortedMessagesOfSelectedConversation, + (messages: Array): boolean => { + return messages.some(m => m.propsForMessage.direction === 'outgoing'); + } +); + export const getFirstUnreadMessageId = (state: StateType): string | undefined => { return state.conversations.firstUnreadMessageId; }; @@ -379,8 +387,9 @@ const _getConversationRequests = ( sortedConversations: Array ): Array => { return filter(sortedConversations, conversation => { - const { isApproved, isBlocked, isPrivate, isMe, activeAt, didApproveMe } = conversation; + const { isApproved, isBlocked, isPrivate, isMe, activeAt, didApproveMe, id } = conversation; const isIncomingRequest = hasValidIncomingRequestValues({ + id, isApproved: isApproved || false, isBlocked: isBlocked || false, isPrivate: isPrivate || false, @@ -613,8 +622,8 @@ export function getLoadedMessagesLength(state: StateType) { return getMessagesFromState(state).length; } -export function getSelectedHasMessages(state: StateType): boolean { - return !isEmpty(getMessagesFromState(state)); +export function useSelectedHasMessages(): boolean { + return useSelector((state: StateType) => !isEmpty(getMessagesFromState(state))); } export const isFirstUnreadMessageIdAbove = createSelector( @@ -962,3 +971,9 @@ export const getIsSelectedConvoInitialLoadingInProgress = (state: StateType): bo export function getCurrentlySelectedConversationOutsideRedux() { return window?.inboxStore?.getState().conversations.selectedConversation as string | undefined; } + +export function useConversationIdOrigin(convoId: string | undefined) { + return useSelector((state: StateType) => + convoId ? state.conversations.conversationLookup?.[convoId]?.conversationIdOrigin : undefined + ); +} diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index 333dd50032..1903aef7c5 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -1,7 +1,7 @@ import { GroupMemberGet, GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { useSelector } from 'react-redux'; import { PubKey } from '../../session/types'; -import { GroupState } from '../ducks/groups'; +import { GroupState } from '../ducks/metaGroups'; import { StateType } from '../reducer'; const getLibGroupsState = (state: StateType): GroupState => state.groups; diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index d4e51397df..a8dd33e750 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -36,10 +36,6 @@ const getIsSelectedBlocked = (state: StateType): boolean => { return Boolean(getSelectedConversation(state)?.isBlocked) || false; }; -const getSelectedIsApproved = (state: StateType): boolean => { - return Boolean(getSelectedConversation(state)?.isApproved) || false; -}; - const getSelectedApprovedMe = (state: StateType): boolean => { return Boolean(getSelectedConversation(state)?.didApproveMe) || false; }; @@ -210,7 +206,9 @@ export function useSelectedIsBlocked() { } export function useSelectedIsApproved() { - return useSelector(getSelectedIsApproved); + return useSelector((state: StateType): boolean => { + return !!(getSelectedConversation(state)?.isApproved || false); + }); } export function useSelectedApprovedMe() { @@ -280,6 +278,10 @@ export function useSelectedIsLeft() { return useSelector((state: StateType) => Boolean(getSelectedConversation(state)?.left) || false); } +export function useSelectedConversationIdOrigin() { + return useSelector((state: StateType) => getSelectedConversation(state)?.conversationIdOrigin); +} + export function useSelectedNickname() { return useSelector((state: StateType) => getSelectedConversation(state)?.nickname); } diff --git a/ts/state/selectors/userGroups.ts b/ts/state/selectors/userGroups.ts new file mode 100644 index 0000000000..801217b3ad --- /dev/null +++ b/ts/state/selectors/userGroups.ts @@ -0,0 +1,20 @@ +import { useSelector } from 'react-redux'; +import { PubKey } from '../../session/types'; +import { UserGroupState } from '../ducks/userGroups'; +import { StateType } from '../reducer'; + +const getUserGroupState = (state: StateType): UserGroupState => state.userGroups; + +const getGroupById = (state: StateType, convoId?: string) => { + return convoId && PubKey.is03Pubkey(convoId) + ? getUserGroupState(state).userGroups[convoId] + : undefined; +}; + +export function useLibGroupInvitePending(convoId?: string) { + return useSelector((state: StateType) => getGroupById(state, convoId)?.invitePending); +} + +export function useLibGroupInviteGroupName(convoId?: string) { + return useSelector((state: StateType) => getGroupById(state, convoId)?.name); +} diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 7e20bb9737..b094f1391d 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -126,6 +126,8 @@ export type LocalizerKeys = | 'deleteConversationConfirmation' | 'deleteForEveryone' | 'deleteFromAllMyDevices' + | 'deleteGroupRequest' + | 'deleteGroupRequestAndBlock' | 'deleteJustForMe' | 'deleteMessageQuestion' | 'deleteMessages' @@ -397,6 +399,7 @@ export type LocalizerKeys = | 'requestsPlaceholder' | 'requestsSubtitle' | 'resend' + | 'respondingToGroupRequestWarning' | 'respondingToRequestWarning' | 'restoreUsingRecoveryPhrase' | 'ringing' @@ -502,6 +505,7 @@ export type LocalizerKeys = | 'userAddedToModerators' | 'userBanFailed' | 'userBanned' + | 'userInvitedYouToGroup' | 'userRemovedFromModerators' | 'userUnbanFailed' | 'userUnbanned' diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 77a5d91863..b2e9c8baf7 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -16,13 +16,16 @@ import { Uint8ArrayLen100, Uint8ArrayLen64, UserConfigWrapperActionsCalls, + UserGroupsGet, UserGroupsSet, UserGroupsWrapperActionsCalls, } from 'libsession_util_nodejs'; // eslint-disable-next-line import/order import { join } from 'path'; +import { cloneDeep } from 'lodash'; import { getAppRootPath } from '../../../node/getRootPath'; +import { userGroupsActions } from '../../../state/ducks/userGroups'; import { WorkerInterface } from '../../worker_interface'; import { ConfigWrapperUser, LibSessionWorkerFunctions } from './libsession_worker_functions'; @@ -115,11 +118,11 @@ function createBaseActionsFor(wrapperType: ConfigWrapperUser) { GenericWrapperActions.confirmPushed(wrapperType, seqno, hash), dump: async () => GenericWrapperActions.dump(wrapperType), makeDump: async () => GenericWrapperActions.makeDump(wrapperType), - merge: async (toMerge: Array) => GenericWrapperActions.merge(wrapperType, toMerge), needsDump: async () => GenericWrapperActions.needsDump(wrapperType), needsPush: async () => GenericWrapperActions.needsPush(wrapperType), push: async () => GenericWrapperActions.push(wrapperType), currentHashes: async () => GenericWrapperActions.currentHashes(wrapperType), + merge: async (toMerge: Array) => GenericWrapperActions.merge(wrapperType, toMerge), }; } @@ -184,9 +187,24 @@ export const ContactsWrapperActions: ContactsWrapperActionsCalls = { >, }; +// this is a cache of the new groups only. Anytime we create, update, delete, or merge a group, we update this +const groups: Map = new Map(); + +function dispatchCachedGroupsToRedux() { + window?.inboxStore?.dispatch?.( + userGroupsActions.refreshUserGroupsSlice({ groups: [...groups.values()] }) + ); +} + export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = { /* Reuse the GenericWrapperActions with the UserGroupsConfig argument */ ...createBaseActionsFor('UserGroupsConfig'), + // override the merge() as we need to refresh the cached groups + merge: async (toMerge: Array) => { + const mergeRet = await GenericWrapperActions.merge('UserGroupsConfig', toMerge); + await UserGroupsWrapperActions.getAllGroups(); // this refreshes the cached data after merge + return mergeRet; + }, /** UserGroups wrapper specific actions */ @@ -245,30 +263,61 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = { ReturnType >, - createGroup: async () => - callLibSessionWorker(['UserGroupsConfig', 'createGroup']) as Promise< + createGroup: async () => { + const group = (await callLibSessionWorker(['UserGroupsConfig', 'createGroup'])) as Awaited< ReturnType - >, + >; + groups.set(group.pubkeyHex, group); + dispatchCachedGroupsToRedux(); + return cloneDeep(group); + }, - getGroup: async (pubkeyHex: GroupPubkeyType) => - callLibSessionWorker(['UserGroupsConfig', 'getGroup', pubkeyHex]) as Promise< - ReturnType - >, + getGroup: async (pubkeyHex: GroupPubkeyType) => { + const group = (await callLibSessionWorker([ + 'UserGroupsConfig', + 'getGroup', + pubkeyHex, + ])) as Awaited>; + if (group) { + groups.set(group.pubkeyHex, group); + } else { + groups.delete(pubkeyHex); + } + dispatchCachedGroupsToRedux(); + return cloneDeep(group); + }, - getAllGroups: async () => - callLibSessionWorker(['UserGroupsConfig', 'getAllGroups']) as Promise< - ReturnType - >, + getAllGroups: async () => { + const groupsFetched = (await callLibSessionWorker([ + 'UserGroupsConfig', + 'getAllGroups', + ])) as Awaited>; + groups.clear(); + groupsFetched.forEach(f => groups.set(f.pubkeyHex, f)); + dispatchCachedGroupsToRedux(); + return cloneDeep(groupsFetched); + }, - setGroup: async (info: UserGroupsSet) => - callLibSessionWorker(['UserGroupsConfig', 'setGroup', info]) as Promise< + setGroup: async (info: UserGroupsSet) => { + const group = (await callLibSessionWorker(['UserGroupsConfig', 'setGroup', info])) as Awaited< ReturnType - >, + >; + groups.set(group.pubkeyHex, group); + dispatchCachedGroupsToRedux(); + return cloneDeep(group); + }, - eraseGroup: async (pubkeyHex: GroupPubkeyType) => - callLibSessionWorker(['UserGroupsConfig', 'eraseGroup', pubkeyHex]) as Promise< - ReturnType - >, + eraseGroup: async (pubkeyHex: GroupPubkeyType) => { + const ret = (await callLibSessionWorker([ + 'UserGroupsConfig', + 'eraseGroup', + pubkeyHex, + ])) as Awaited>; + + groups.delete(pubkeyHex); + dispatchCachedGroupsToRedux(); + return ret; + }, }; export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCalls = { @@ -541,7 +590,7 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { 'swarmVerifySubAccount', signingValue, ]) as Promise>, - loadAdminKeys: async (groupPk: GroupPubkeyType, secret: Uint8ArrayLen64) => { + loadAdminKeys: async (groupPk: GroupPubkeyType, secret: Uint8ArrayLen64) => { return callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'loadAdminKeys', secret]) as Promise< ReturnType >; From ba513b29ca1f04706e246626798c0dc0a82abc57 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 3 Jan 2024 11:07:53 +1100 Subject: [PATCH 066/302] fix: fallback when we have an invite state without who invited us --- _locales/en/messages.json | 1 + .../conversation/MessageRequestButtons.tsx | 10 ++-- .../conversation/SubtleNotification.tsx | 49 ++++++++++--------- ts/components/menu/Menu.tsx | 2 +- ts/interactions/conversationInteractions.ts | 2 +- ts/receiver/groupv2/handleGroupV2Message.ts | 10 ++++ ts/state/selectors/conversations.ts | 8 +++ ts/types/LocalizerKeys.ts | 1 + .../browser/libsession_worker_interface.ts | 8 ++- 9 files changed, 58 insertions(+), 33 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index e8b055b947..5e0c19ee59 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -509,6 +509,7 @@ "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.", "respondingToGroupRequestWarning": "Sending a message to this group will automatically accept the group invite.", "userInvitedYouToGroup": "$name$ invited you to join $groupName$.", + "youWereInvitedToGroup": "You were invited to join $groupName$.", "hideRequestBanner": "Hide Message Request Banner", "openMessageRequestInbox": "Message Requests", "noMessageRequestsPending": "No pending message requests", diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index 81ae85af3b..9f07e8e521 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -17,11 +17,7 @@ import { import { useLibGroupInvitePending } from '../../state/selectors/userGroups'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { SessionButton, SessionButtonColor } from '../basic/SessionButton'; -import { - ConversationRequestExplanation, - GroupRequestExplanation, - InvitedToGroupControlMessage, -} from './SubtleNotification'; +import { InvitedToGroupControlMessage, MessageRequestExplanation } from './SubtleNotification'; const MessageRequestContainer = styled.div` display: flex; @@ -135,14 +131,14 @@ export const ConversationMessageRequestButtons = () => { /> { handleDeclineConversationRequest(selectedConvoId, selectedConvoId, convoOrigin); }} dataTestId="decline-message-request" /> - {isGroupV2 ? : } + {(isGroupV2 && !!convoOrigin) || !isGroupV2 ? ( { +export const MessageRequestExplanation = () => { + const isGroupV2 = useSelectedIsGroupV2(); + + return isGroupV2 ? : ; +}; + +const ConversationRequestExplanation = () => { const selectedConversation = useSelectedConversationKey(); const isIncomingMessageRequest = useIsIncomingRequest(selectedConversation); const showMsgRequestUI = selectedConversation && isIncomingMessageRequest; - const hasIncomingMessages = useSelector(hasSelectedConversationIncomingMessages); + const hasOutgoingMessages = useSelector(hasSelectedConversationOutgoingMessages); - if (!showMsgRequestUI || !hasIncomingMessages) { + if (!showMsgRequestUI || hasOutgoingMessages) { return null; } @@ -73,10 +77,7 @@ export const ConversationRequestExplanation = () => { ); }; -/** - * This component is used to display a warning when the user is responding to a group message request. - */ -export const GroupRequestExplanation = () => { +const GroupRequestExplanation = () => { const selectedConversation = useSelectedConversationKey(); const isIncomingMessageRequest = useIsIncomingRequest(selectedConversation); const isGroupV2 = useSelectedIsGroupV2(); @@ -112,24 +113,19 @@ export const InvitedToGroupControlMessage = () => { isApproved || hasMessages || // we don't want to display that "xx invited you" message if there are already other messages (incoming or outgoing) !isGroupV2 || - !conversationOrigin || - !PubKey.is05Pubkey(conversationOrigin) || + (conversationOrigin && !PubKey.is05Pubkey(conversationOrigin)) || !isGroupPendingInvite ) { return null; } + // when restoring from seed we might not have the pubkey of who invited us, in that case, we just use a fallback + const html = conversationOrigin + ? window.i18n('userInvitedYouToGroup', [adminNameInvitedUs, groupName]) + : window.i18n('youWereInvitedToGroup', [groupName]); - return ( - - ); + return ; }; -/** - * This component is used to display a warning when the user is looking at an empty conversation. - */ export const NoMessageInConversation = () => { const selectedConversation = useSelectedConversationKey(); @@ -142,9 +138,16 @@ export const NoMessageInConversation = () => { const privateBlindedAndBlockingMsgReqs = useSelectedHasDisabledBlindedMsgRequests(); // TODOLATER use this selector accross the whole application (left pane excluded) const nameToRender = useSelectedNicknameOrProfileNameOrShortenedPubkey() || ''; + const isPrivate = useSelectedIsPrivate(); + const isIncomingRequest = useIsIncomingRequest(selectedConversation); // groupV2 use its own invite logic as part of - if (!selectedConversation || hasMessage || (isGroupV2 && isInvitePending)) { + if ( + !selectedConversation || + hasMessage || + (isGroupV2 && isInvitePending) || + (isPrivate && isIncomingRequest) + ) { return null; } let localizedKey: LocalizerKeys = 'noMessagesInEverythingElse'; diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index aa0cd739ce..b40c05c9bc 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -518,7 +518,7 @@ export const DeclineMsgRequestMenuItem = () => { }); }} > - {isGroupV2 ? window.i18n('delete') : window.i18n('decline')} + {window.i18n('delete')} ); } diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index c3e3011b06..615c05d642 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -197,7 +197,7 @@ export const declineConversationWithConfirm = ({ }) => { const isGroupV2 = PubKey.is03Pubkey(conversationId); - const okKey: LocalizerKeys = alsoBlock ? 'block' : isGroupV2 ? 'delete' : 'decline'; + const okKey: LocalizerKeys = alsoBlock ? 'block' : 'delete'; const nameToBlock = alsoBlock && !!conversationIdOrigin ? ConvoHub.use().get(conversationIdOrigin)?.getContactProfileNameOrShortenedPubKey() diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index e97c3648c0..4df86239d6 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -74,6 +74,8 @@ async function handleGroupInviteMessage({ return; } + const authorIsApproved = ConvoHub.use().get(author)?.isApproved() || false; + const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(inviteMessage.groupSessionId), signature: inviteMessage.adminSignature, @@ -124,6 +126,10 @@ async function handleGroupInviteMessage({ found.kicked = false; found.name = inviteMessage.name; } + if (authorIsApproved) { + // pre approve invite to groups when we've already approved the person who invited us + found.invitePending = false; + } // not sure if we should drop it, or set it again? They should be the same anyway found.authData = inviteMessage.memberAuthData; @@ -142,6 +148,10 @@ async function handleGroupInviteMessage({ if (!found.invitePending) { // if this group should already be polling getSwarmPollingInstance().addGroupId(inviteMessage.groupSessionId); + console.warn( + 'we need to do a first poll to fetch the keys etc before we can send our invite response...' + ); + await sendInviteResponseToGroup({ groupPk: inviteMessage.groupSessionId }); } } diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 8c9dab9d7e..5333b9c143 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -38,6 +38,7 @@ import { MessageReactsSelectorProps } from '../../components/conversation/messag import { processQuoteAttachment } from '../../models/message'; import { isUsAnySogsFromCache } from '../../session/apis/open_group_api/sogsv3/knownBlindedkeys'; import { PubKey } from '../../session/types'; +import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { getSelectedConversationKey } from './selectedConversation'; import { getModeratorsOutsideRedux } from './sogsRoomInfo'; @@ -272,6 +273,13 @@ const _getLeftPaneConversationIds = ( return false; } + if ( + PubKey.is03Pubkey(conversation.id) && + UserGroupsWrapperActions.getCachedGroup(conversation.id)?.invitePending + ) { + return false; + } + // a non private conversation is always returned here if (!conversation.isPrivate) { return true; diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index b094f1391d..40c8b971de 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -528,6 +528,7 @@ export type LocalizerKeys = | 'youGotKickedFromGroup' | 'youHaveANewFriendRequest' | 'youLeftTheGroup' + | 'youWereInvitedToGroup' | 'yourSessionID' | 'yourUniqueSessionID' | 'zoomFactorSettingTitle'; diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index b2e9c8baf7..af1c8c92fd 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -196,7 +196,9 @@ function dispatchCachedGroupsToRedux() { ); } -export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = { +export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls & { + getCachedGroup: (pubkeyHex: GroupPubkeyType) => UserGroupsGet | undefined; +} = { /* Reuse the GenericWrapperActions with the UserGroupsConfig argument */ ...createBaseActionsFor('UserGroupsConfig'), // override the merge() as we need to refresh the cached groups @@ -287,6 +289,10 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls = { return cloneDeep(group); }, + getCachedGroup: (pubkeyHex: GroupPubkeyType) => { + return groups.get(pubkeyHex); + }, + getAllGroups: async () => { const groupsFetched = (await callLibSessionWorker([ 'UserGroupsConfig', From 3eac45d534775ae12a70547183e0cd2b4ef246af Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 5 Jan 2024 13:09:24 +1100 Subject: [PATCH 067/302] chore: commit updated yarn.lock --- yarn.lock | 8039 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 8039 insertions(+) create mode 100644 yarn.lock diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000000..93fb339f67 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,8039 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"7zip-bin@~5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" + integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== + +"@aashutoshrathi/word-wrap@^1.2.3": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" + integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== + +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" + integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== + dependencies: + "@babel/highlight" "^7.23.4" + chalk "^2.4.2" + +"@babel/generator@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" + integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== + dependencies: + "@babel/types" "^7.23.6" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + +"@babel/helper-annotate-as-pure@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" + integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-environment-visitor@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" + integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== + +"@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== + dependencies: + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" + +"@babel/helper-hoist-variables@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" + integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" + integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== + dependencies: + "@babel/types" "^7.22.15" + +"@babel/helper-plugin-utils@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" + integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== + +"@babel/helper-split-export-declaration@^7.22.6": + version "7.22.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" + integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== + dependencies: + "@babel/types" "^7.22.5" + +"@babel/helper-string-parser@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" + integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== + +"@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== + +"@babel/highlight@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" + integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== + dependencies: + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" + js-tokens "^4.0.0" + +"@babel/parser@^7.20.15", "@babel/parser@^7.22.15", "@babel/parser@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" + integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== + +"@babel/plugin-syntax-jsx@^7.22.5": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473" + integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg== + dependencies: + "@babel/helper-plugin-utils" "^7.22.5" + +"@babel/runtime@7.4.5": + version "7.4.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12" + integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ== + dependencies: + regenerator-runtime "^0.13.2" + +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.7.tgz#dd7c88deeb218a0f8bd34d5db1aa242e0f203193" + integrity sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA== + dependencies: + regenerator-runtime "^0.14.0" + +"@babel/template@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + +"@babel/traverse@^7.4.5": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305" + integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg== + dependencies: + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.6" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.23.6" + "@babel/types" "^7.23.6" + debug "^4.3.1" + globals "^11.1.0" + +"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6": + version "7.23.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" + integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== + dependencies: + "@babel/helper-string-parser" "^7.23.4" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + +"@commitlint/cli@^17.7.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.8.1.tgz#10492114a022c91dcfb1d84dac773abb3db76d33" + integrity sha512-ay+WbzQesE0Rv4EQKfNbSMiJJ12KdKTDzIt0tcK4k11FdsWmtwP0Kp1NWMOUswfIWo6Eb7p7Ln721Nx9FLNBjg== + dependencies: + "@commitlint/format" "^17.8.1" + "@commitlint/lint" "^17.8.1" + "@commitlint/load" "^17.8.1" + "@commitlint/read" "^17.8.1" + "@commitlint/types" "^17.8.1" + execa "^5.0.0" + lodash.isfunction "^3.0.9" + resolve-from "5.0.0" + resolve-global "1.0.0" + yargs "^17.0.0" + +"@commitlint/config-conventional@^17.7.0": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-17.8.1.tgz#e5bcf0cfec8da7ac50bc04dc92e0a4ea74964ce0" + integrity sha512-NxCOHx1kgneig3VLauWJcDWS40DVjg7nKOpBEEK9E5fjJpQqLCilcnKkIIjdBH98kEO1q3NpE5NSrZ2kl/QGJg== + dependencies: + conventional-changelog-conventionalcommits "^6.1.0" + +"@commitlint/config-validator@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/config-validator/-/config-validator-17.8.1.tgz#5cc93b6b49d5524c9cc345a60e5bf74bcca2b7f9" + integrity sha512-UUgUC+sNiiMwkyiuIFR7JG2cfd9t/7MV8VB4TZ+q02ZFkHoduUS4tJGsCBWvBOGD9Btev6IecPMvlWUfJorkEA== + dependencies: + "@commitlint/types" "^17.8.1" + ajv "^8.11.0" + +"@commitlint/ensure@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-17.8.1.tgz#59183557844999dbb6aab6d03629a3d104d01a8d" + integrity sha512-xjafwKxid8s1K23NFpL8JNo6JnY/ysetKo8kegVM7c8vs+kWLP8VrQq+NbhgVlmCojhEDbzQKp4eRXSjVOGsow== + dependencies: + "@commitlint/types" "^17.8.1" + lodash.camelcase "^4.3.0" + lodash.kebabcase "^4.1.1" + lodash.snakecase "^4.1.1" + lodash.startcase "^4.4.0" + lodash.upperfirst "^4.3.1" + +"@commitlint/execute-rule@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-17.8.1.tgz#504ed69eb61044eeb84fdfd10cc18f0dab14f34c" + integrity sha512-JHVupQeSdNI6xzA9SqMF+p/JjrHTcrJdI02PwesQIDCIGUrv04hicJgCcws5nzaoZbROapPs0s6zeVHoxpMwFQ== + +"@commitlint/format@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-17.8.1.tgz#6108bb6b4408e711006680649927e1b559bdc5f8" + integrity sha512-f3oMTyZ84M9ht7fb93wbCKmWxO5/kKSbwuYvS867duVomoOsgrgljkGGIztmT/srZnaiGbaK8+Wf8Ik2tSr5eg== + dependencies: + "@commitlint/types" "^17.8.1" + chalk "^4.1.0" + +"@commitlint/is-ignored@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.8.1.tgz#cf25bcd8409c79684b63f8bdeb35df48edda244e" + integrity sha512-UshMi4Ltb4ZlNn4F7WtSEugFDZmctzFpmbqvpyxD3la510J+PLcnyhf9chs7EryaRFJMdAKwsEKfNK0jL/QM4g== + dependencies: + "@commitlint/types" "^17.8.1" + semver "7.5.4" + +"@commitlint/lint@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.8.1.tgz#bfc21215f6b18d41d4d43e2aa3cb79a5d7726cd8" + integrity sha512-aQUlwIR1/VMv2D4GXSk7PfL5hIaFSfy6hSHV94O8Y27T5q+DlDEgd/cZ4KmVI+MWKzFfCTiTuWqjfRSfdRllCA== + dependencies: + "@commitlint/is-ignored" "^17.8.1" + "@commitlint/parse" "^17.8.1" + "@commitlint/rules" "^17.8.1" + "@commitlint/types" "^17.8.1" + +"@commitlint/load@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.8.1.tgz#fa061e7bfa53281eb03ca8517ca26d66a189030c" + integrity sha512-iF4CL7KDFstP1kpVUkT8K2Wl17h2yx9VaR1ztTc8vzByWWcbO/WaKwxsnCOqow9tVAlzPfo1ywk9m2oJ9ucMqA== + dependencies: + "@commitlint/config-validator" "^17.8.1" + "@commitlint/execute-rule" "^17.8.1" + "@commitlint/resolve-extends" "^17.8.1" + "@commitlint/types" "^17.8.1" + "@types/node" "20.5.1" + chalk "^4.1.0" + cosmiconfig "^8.0.0" + cosmiconfig-typescript-loader "^4.0.0" + lodash.isplainobject "^4.0.6" + lodash.merge "^4.6.2" + lodash.uniq "^4.5.0" + resolve-from "^5.0.0" + ts-node "^10.8.1" + typescript "^4.6.4 || ^5.2.2" + +"@commitlint/message@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-17.8.1.tgz#a5cd226c419be20ee03c3d237db6ac37b95958b3" + integrity sha512-6bYL1GUQsD6bLhTH3QQty8pVFoETfFQlMn2Nzmz3AOLqRVfNNtXBaSY0dhZ0dM6A2MEq4+2d7L/2LP8TjqGRkA== + +"@commitlint/parse@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-17.8.1.tgz#6e00b8f50ebd63562d25dcf4230da2c9f984e626" + integrity sha512-/wLUickTo0rNpQgWwLPavTm7WbwkZoBy3X8PpkUmlSmQJyWQTj0m6bDjiykMaDt41qcUbfeFfaCvXfiR4EGnfw== + dependencies: + "@commitlint/types" "^17.8.1" + conventional-changelog-angular "^6.0.0" + conventional-commits-parser "^4.0.0" + +"@commitlint/read@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-17.8.1.tgz#b3f28777607c756078356cc133368b0e8c08092f" + integrity sha512-Fd55Oaz9irzBESPCdMd8vWWgxsW3OWR99wOntBDHgf9h7Y6OOHjWEdS9Xzen1GFndqgyoaFplQS5y7KZe0kO2w== + dependencies: + "@commitlint/top-level" "^17.8.1" + "@commitlint/types" "^17.8.1" + fs-extra "^11.0.0" + git-raw-commits "^2.0.11" + minimist "^1.2.6" + +"@commitlint/resolve-extends@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-17.8.1.tgz#9af01432bf2fd9ce3dd5a00d266cce14e4c977e7" + integrity sha512-W/ryRoQ0TSVXqJrx5SGkaYuAaE/BUontL1j1HsKckvM6e5ZaG0M9126zcwL6peKSuIetJi7E87PRQF8O86EW0Q== + dependencies: + "@commitlint/config-validator" "^17.8.1" + "@commitlint/types" "^17.8.1" + import-fresh "^3.0.0" + lodash.mergewith "^4.6.2" + resolve-from "^5.0.0" + resolve-global "^1.0.0" + +"@commitlint/rules@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.8.1.tgz#da49cab1b7ebaf90d108de9f58f684dc4ccb65a0" + integrity sha512-2b7OdVbN7MTAt9U0vKOYKCDsOvESVXxQmrvuVUZ0rGFMCrCPJWWP1GJ7f0lAypbDAhaGb8zqtdOr47192LBrIA== + dependencies: + "@commitlint/ensure" "^17.8.1" + "@commitlint/message" "^17.8.1" + "@commitlint/to-lines" "^17.8.1" + "@commitlint/types" "^17.8.1" + execa "^5.0.0" + +"@commitlint/to-lines@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-17.8.1.tgz#a5c4a7cf7dff3dbdd69289fc0eb19b66f3cfe017" + integrity sha512-LE0jb8CuR/mj6xJyrIk8VLz03OEzXFgLdivBytoooKO5xLt5yalc8Ma5guTWobw998sbR3ogDd+2jed03CFmJA== + +"@commitlint/top-level@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-17.8.1.tgz#206d37d6782f33c9572e44fbe3758392fdeea7bc" + integrity sha512-l6+Z6rrNf5p333SHfEte6r+WkOxGlWK4bLuZKbtf/2TXRN+qhrvn1XE63VhD8Oe9oIHQ7F7W1nG2k/TJFhx2yA== + dependencies: + find-up "^5.0.0" + +"@commitlint/types@^17.4.4", "@commitlint/types@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-17.8.1.tgz#883a0ad35c5206d5fef7bc6ce1bbe648118af44e" + integrity sha512-PXDQXkAmiMEG162Bqdh9ChML/GJZo6vU+7F03ALKDK8zYc6SuAr47LjG7hGYRqUOz+WK0dU7bQ0xzuqFMdxzeQ== + dependencies: + chalk "^4.1.0" + +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" + integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== + dependencies: + "@jridgewell/trace-mapping" "0.3.9" + +"@develar/schema-utils@~2.6.5": + version "2.6.5" + resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" + integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig== + dependencies: + ajv "^6.12.0" + ajv-keywords "^3.4.1" + +"@discoveryjs/json-ext@^0.5.0": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== + +"@electron/get@^2.0.0": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.3.tgz#fba552683d387aebd9f3fcadbcafc8e12ee4f960" + integrity sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^11.8.5" + progress "^2.0.3" + semver "^6.2.0" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^3.0.0" + +"@electron/notarize@^2.1.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.0.tgz#40455f9d8ca8098a74567aa4613b709089d82657" + integrity sha512-Sf7RG47rafeGuUm+kLEbTXMN8XZeYXN70dMBstrcgiykxCq3SLl1uqxFWndxSI1LfMqv4Eq9PTDHLPwiya31Kg== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.1" + promise-retry "^2.0.1" + +"@electron/universal@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339" + integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== + dependencies: + "@malept/cross-spawn-promise" "^1.1.0" + asar "^3.1.0" + debug "^4.3.1" + dir-compare "^2.4.0" + fs-extra "^9.0.1" + minimatch "^3.0.4" + plist "^3.0.4" + +"@emoji-mart/data@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.1.2.tgz#777c976f8f143df47cbb23a7077c9ca9fe5fc513" + integrity sha512-1HP8BxD2azjqWJvxIaWAMyTySeZY0Osr83ukYjltPVkNXeJvTz7yDrPLBtnrD5uqJ3tg4CcLuuBW09wahqL/fg== + +"@emoji-mart/react@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@emoji-mart/react/-/react-1.1.1.tgz#ddad52f93a25baf31c5383c3e7e4c6e05554312a" + integrity sha512-NMlFNeWgv1//uPsvLxvGQoIerPuVdXwK/EUek8OOkJ6wVOWPUizRBJU0hDqWZCOROVpfBgCemaC3m6jDOXi03g== + +"@emotion/is-prop-valid@^0.8.8": + version "0.8.8" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" + integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== + dependencies: + "@emotion/memoize" "0.7.4" + +"@emotion/memoize@0.7.4": + version "0.7.4" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" + integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== + +"@emotion/stylis@^0.8.4": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" + integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== + +"@emotion/unitless@^0.7.4": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" + integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== + +"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" + integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== + dependencies: + eslint-visitor-keys "^3.3.0" + +"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" + integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== + +"@eslint/eslintrc@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" + integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== + dependencies: + ajv "^6.12.4" + debug "^4.3.2" + espree "^9.6.0" + globals "^13.19.0" + ignore "^5.2.0" + import-fresh "^3.2.1" + js-yaml "^4.1.0" + minimatch "^3.1.2" + strip-json-comments "^3.1.1" + +"@eslint/js@8.56.0": + version "8.56.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" + integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== + +"@humanwhocodes/config-array@^0.11.13": + version "0.11.13" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" + integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ== + dependencies: + "@humanwhocodes/object-schema" "^2.0.1" + debug "^4.1.1" + minimatch "^3.0.5" + +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + +"@humanwhocodes/object-schema@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" + integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== + +"@iconify/react@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@iconify/react/-/react-4.1.1.tgz#da1bf03cdca9427f07cf22cf5b63fa8f02db4722" + integrity sha512-jed14EjvKjee8mc0eoscGxlg7mSQRkwQG3iX3cPBCO7UlOjz0DtlvTqxqEcHUJGh+z1VJ31Yhu5B9PxfO0zbdg== + dependencies: + "@iconify/types" "^2.0.0" + +"@iconify/types@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57" + integrity sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg== + +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" + integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" + integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + +"@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/source-map@^0.3.3": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91" + integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + +"@jridgewell/trace-mapping@0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" + integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.20" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f" + integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + +"@jsdoc/salty@^0.2.1": + version "0.2.7" + resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.7.tgz#98ddce519fd95d7bee605a658fabf6e8cbf7556d" + integrity sha512-mh8LbS9d4Jq84KLw8pzho7XC2q2/IJGiJss3xwRoLD1A+EE16SjN4PfaG4jRCzKegTFLlN0Zd8SdUPE6XdoPFg== + dependencies: + lodash "^4.17.21" + +"@malept/cross-spawn-promise@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" + integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== + dependencies: + cross-spawn "^7.0.1" + +"@malept/flatpak-bundler@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" + integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.0" + lodash "^4.17.15" + tmp-promise "^3.0.2" + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" + integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ== + +"@protobufjs/base64@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" + integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== + +"@protobufjs/codegen@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" + integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== + +"@protobufjs/eventemitter@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" + integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q== + +"@protobufjs/fetch@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" + integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ== + dependencies: + "@protobufjs/aspromise" "^1.1.1" + "@protobufjs/inquire" "^1.1.0" + +"@protobufjs/float@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" + integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ== + +"@protobufjs/inquire@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" + integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q== + +"@protobufjs/path@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" + integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA== + +"@protobufjs/pool@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" + integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw== + +"@protobufjs/utf8@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" + integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== + +"@reduxjs/toolkit@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.8.5.tgz#c14bece03ee08be88467f22dc0ecf9cf875527cd" + integrity sha512-f4D5EXO7A7Xq35T0zRbWq5kJQyXzzscnHKmjnu2+37B3rwHU6mX9PYlbfXdnxcY6P/7zfmjhgan0Z+yuOfeBmA== + dependencies: + immer "^9.0.7" + redux "^4.1.2" + redux-thunk "^2.4.1" + reselect "^4.1.5" + +"@signalapp/better-sqlite3@^8.4.3": + version "8.6.0" + resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.6.0.tgz#0413f4d0626b99838cd64ad09c88720aa2bec6ed" + integrity sha512-dSLWG4m6XtPq/jbUjckLaiR/nFFkY95pWZI8VSm0dEVJC8S2YTXHm6VZ7vZiErt4h6EjBaa827WyK1oheElE2A== + dependencies: + bindings "^1.5.0" + tar "^6.1.0" + +"@sindresorhus/is@^4.0.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" + integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== + +"@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2": + version "1.8.6" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9" + integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^6.0.0", "@sinonjs/fake-timers@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" + integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== + dependencies: + "@sinonjs/commons" "^1.7.0" + +"@sinonjs/formatio@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz#f13e713cb3313b1ab965901b01b0828ea6b77089" + integrity sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ== + dependencies: + "@sinonjs/commons" "^1" + "@sinonjs/samsam" "^5.0.2" + +"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.0.3": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz#375a45fe6ed4e92fca2fb920e007c48232a6507f" + integrity sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg== + dependencies: + "@sinonjs/commons" "^1.6.0" + lodash.get "^4.4.2" + type-detect "^4.0.8" + +"@sinonjs/text-encoding@^0.7.1": + version "0.7.2" + resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918" + integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ== + +"@szmarczak/http-timer@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" + integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== + dependencies: + defer-to-connect "^2.0.0" + +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + +"@tsconfig/node10@^1.0.7": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" + integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== + +"@tsconfig/node12@^1.0.7": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" + integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== + +"@tsconfig/node14@^1.0.0": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" + integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== + +"@tsconfig/node16@^1.0.2": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" + integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== + +"@types/backbone@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@types/backbone/-/backbone-1.4.2.tgz#2af5ca6536d4cd510842eea6eeea11a42fa704b9" + integrity sha512-+yfi5cLeIPU3JuCrFP4Bodpv8oLrE5sbiqQIMPvHIKaVCz0JCBt9GEQKZsz2haibrTV4Axks6ovoHc2yUbpWzg== + dependencies: + "@types/jquery" "*" + "@types/underscore" "*" + +"@types/blueimp-load-image@5.14.4": + version "5.14.4" + resolved "https://registry.yarnpkg.com/@types/blueimp-load-image/-/blueimp-load-image-5.14.4.tgz#14a438e88b814b4ede9c79e3b2e68324bd591327" + integrity sha512-IoT8BXBuuWWscQnscGtAYH4dGEOr3uQ85MJdE9LAfperio8FQwyFaigHITPJSy+NSS4w9UHKhzmtQXt5A+544g== + +"@types/buffer-crc32@^0.2.0": + version "0.2.4" + resolved "https://registry.yarnpkg.com/@types/buffer-crc32/-/buffer-crc32-0.2.4.tgz#d70dbf4d968fe98913324d580934b8fb0c857512" + integrity sha512-GSrhSZOK1/wazf2CjDp3CVJQKWzSc5Ugq3NyZ/RQqg1MWtmA9mAT6i6LzGKhzcRxDOl8aLB+AzvObDSlrMpvLw== + dependencies: + "@types/node" "*" + +"@types/bunyan@^1.8.8": + version "1.8.11" + resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.11.tgz#0b9e7578a5aa2390faf12a460827154902299638" + integrity sha512-758fRH7umIMk5qt5ELmRMff4mLDlN+xyYzC+dkPTdKwbSkJFvz6xwyScrytPU0QIBbRRwbiE8/BIg8bpajerNQ== + dependencies: + "@types/node" "*" + +"@types/bytebuffer@^5.0.41": + version "5.0.48" + resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.48.tgz#0e6b0e8b8dbafde3314148ed378b8aed6eaac4f1" + integrity sha512-ormKm68NtTOtR8C/4jyRJEYbwKABXRkHHR/1fmkiuFbCQkltgtXSUGfldCSmJzvuyJvmBzWjBbOi79Ry/oJQug== + dependencies: + "@types/long" "^3.0.0" + "@types/node" "*" + +"@types/cacheable-request@^6.0.1": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" + integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== + dependencies: + "@types/http-cache-semantics" "*" + "@types/keyv" "^3.1.4" + "@types/node" "*" + "@types/responselike" "^1.0.0" + +"@types/chai-as-promised@^7.1.2": + version "7.1.8" + resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.8.tgz#f2b3d82d53c59626b5d6bbc087667ccb4b677fe9" + integrity sha512-ThlRVIJhr69FLlh6IctTXFkmhtP3NpMZ2QGq69StYLyKZFp/HOp1VdKZj7RvfNWYYcJ1xlbLGLLWj1UvP5u/Gw== + dependencies: + "@types/chai" "*" + +"@types/chai@*": + version "4.3.11" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.11.tgz#e95050bf79a932cb7305dd130254ccdf9bde671c" + integrity sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ== + +"@types/chai@4.2.18": + version "4.2.18" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.18.tgz#0c8e298dbff8205e2266606c1ea5fbdba29b46e4" + integrity sha512-rS27+EkB/RE1Iz3u0XtVL5q36MGDWbgYe7zWiodyKNUnthxY0rukK5V36eiUCtCisB7NN8zKYH6DO2M37qxFEQ== + +"@types/classnames@2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5" + integrity sha512-x15/Io+JdzrkM9gnX6SWUs/EmqQzd65TD9tcZIAQ1VIdb93XErNuYmB7Yho8JUCE189ipUSESsWvGvYXRRIvYA== + +"@types/config@0.0.34": + version "0.0.34" + resolved "https://registry.yarnpkg.com/@types/config/-/config-0.0.34.tgz#123f91bdb5afdd702294b9de9ca04d9ea11137b0" + integrity sha512-jWi9DXx77hnzN4kHCNEvP/kab+nchRLTg9yjXYxjTcMBkuc5iBb3QuwJ4sPrb+nzy1GQjrfyfMqZOdR4i7opRQ== + +"@types/debug@^4.1.6": + version "4.1.12" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917" + integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ== + dependencies: + "@types/ms" "*" + +"@types/dompurify@^2.0.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9" + integrity sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg== + dependencies: + "@types/trusted-types" "*" + +"@types/electron-localshortcut@^3.1.0": + version "3.1.3" + resolved "https://registry.yarnpkg.com/@types/electron-localshortcut/-/electron-localshortcut-3.1.3.tgz#f248a9c8016ff28cd783708d8664b806e45c4787" + integrity sha512-D+CRdDTRZ4/9UmcSaZ5qvW4uq2VyyVmqsH9cdNReB4CL6MSIgyhr9w2PKeNEb0J/ZS7db7irJM/+ZiA5uSQsLw== + dependencies: + electron "*" + +"@types/eslint-scope@^3.7.3": + version "3.7.7" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" + integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "8.56.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.1.tgz#988cabb39c973e9200f35fdbb29d17992965bb08" + integrity sha512-18PLWRzhy9glDQp3+wOgfLYRWlhgX0azxgJ63rdpoUHyrC9z0f5CkFburjQx4uD7ZCruw85ZtMt6K+L+R8fLJQ== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^1.0.0": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" + integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== + +"@types/filesize@3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@types/filesize/-/filesize-3.6.0.tgz#5f1a25c7b4e3d5ee2bc63133d374d096b7008c8d" + integrity sha512-rOWxCKMjt2DBuwddUnl5GOpf/jAkkqteB+XldncpVxVX+HPTmK2c5ACMOVEbp9gaH81IlhTdC3TwvRa5nopasw== + +"@types/firstline@^2.0.2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/firstline/-/firstline-2.0.4.tgz#b8d3f8f7396d1589efea89db183c047a42efaf04" + integrity sha512-EYoMzk783ncj3soLGADXD/rklDMw1PAO5Hc3lRZa5G21vkfacwkdTlIdhTJ39omqDLezTSmxjDG1psd4A/mUHg== + dependencies: + "@types/node" "*" + +"@types/fs-extra@5.0.5": + version "5.0.5" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.5.tgz#080d90a792f3fa2c5559eb44bd8ef840aae9104b" + integrity sha512-w7iqhDH9mN8eLClQOYTkhdYUOSpp25eXxfc6VbFOGtzxW34JcvctH2bKjj4jD4++z4R5iO5D+pg48W2e03I65A== + dependencies: + "@types/node" "*" + +"@types/fs-extra@^9.0.11": + version "9.0.13" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" + integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== + dependencies: + "@types/node" "*" + +"@types/glob@*": + version "8.1.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc" + integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w== + dependencies: + "@types/minimatch" "^5.1.2" + "@types/node" "*" + +"@types/glob@^7.1.1": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" + integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1": + version "3.3.5" + resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494" + integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg== + dependencies: + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + +"@types/http-cache-semantics@*": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4" + integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA== + +"@types/jquery@*": + version "3.5.29" + resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.29.tgz#3c06a1f519cd5fc3a7a108971436c00685b5dcea" + integrity sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg== + dependencies: + "@types/sizzle" "*" + +"@types/js-cookie@^2.2.6": + version "2.2.7" + resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.7.tgz#226a9e31680835a6188e887f3988e60c04d3f6a3" + integrity sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA== + +"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" + integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== + +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== + +"@types/keyv@^3.1.4": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" + integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== + dependencies: + "@types/node" "*" + +"@types/libsodium-wrappers-sumo@^0.7.5": + version "0.7.8" + resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.8.tgz#33e32b454fb6b340758c9ffdb1f9657e1be058ff" + integrity sha512-N2+df4MB/A+W0RAcTw7A5oxKgzD+Vh6Ye7lfjWIi5SdTzVLfHPzxUjhwPqHLO5Ev9fv/+VHl+sUaUuTg4fUPqw== + dependencies: + "@types/libsodium-wrappers" "*" + +"@types/libsodium-wrappers@*": + version "0.7.13" + resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.13.tgz#769c4ea01de96bb297207586a70777ebf066dcb4" + integrity sha512-KeAKtlObirLJk/na6jHBFEdTDjDfFS6Vcr0eG2FjiHKn3Nw8axJFfIu0Y9TpwaauRldQBj/pZm/MHtK76r6OWg== + +"@types/linkify-it@*", "@types/linkify-it@^3.0.2": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.5.tgz#1e78a3ac2428e6d7e6c05c1665c242023a4601d8" + integrity sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw== + +"@types/lodash@^4.14.194": + version "4.14.202" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8" + integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ== + +"@types/long@^3.0.0": + version "3.0.32" + resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69" + integrity sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA== + +"@types/markdown-it@^12.2.3": + version "12.2.3" + resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51" + integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ== + dependencies: + "@types/linkify-it" "*" + "@types/mdurl" "*" + +"@types/mdurl@*": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.5.tgz#3e0d2db570e9fb6ccb2dc8fde0be1d79ac810d39" + integrity sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA== + +"@types/minimatch@*", "@types/minimatch@^5.1.2": + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" + integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== + +"@types/minimist@^1.2.0": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" + integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== + +"@types/mocha@5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.0.0.tgz#a3014921991066193f6c8e47290d4d598dfd19e6" + integrity sha512-ZS0vBV7Jn5Z/Q4T3VXauEKMDCV8nWOtJJg90OsDylkYJiQwcWtKuLzohWzrthBkerUF7DLMmJcwOPEP0i/AOXw== + +"@types/ms@*": + version "0.7.34" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" + integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== + +"@types/node-fetch@^2.5.7": + version "2.6.10" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.10.tgz#ff5c1ceacab782f2b7ce69957d38c1c27b0dc469" + integrity sha512-PPpPK6F9ALFTn59Ka3BaL+qGuipRfxNE8qVgkp0bVixeiR2c2/L+IVOiBdu9JhhT22sWnQEp6YyHGI2b2+CMcA== + dependencies: + "@types/node" "*" + form-data "^4.0.0" + +"@types/node@*", "@types/node@>=13.7.0": + version "20.10.6" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.6.tgz#a3ec84c22965802bf763da55b2394424f22bfbb5" + integrity sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw== + dependencies: + undici-types "~5.26.4" + +"@types/node@20.5.1": + version "20.5.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.1.tgz#178d58ee7e4834152b0e8b4d30cbfab578b9bb30" + integrity sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg== + +"@types/node@^18.11.18": + version "18.19.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.4.tgz#89672e84f11a2c19543d694dac00ab8d7bc20ddb" + integrity sha512-xNzlUhzoHotIsnFoXmJB+yWmBvFZgKCI9TtPIEdYIMM1KWfwuY8zh7wvc1u1OAXlC7dlf6mZVx/s+Y5KfFz19A== + dependencies: + undici-types "~5.26.4" + +"@types/normalize-package-data@^2.4.0": + version "2.4.4" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" + integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== + +"@types/pify@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/pify/-/pify-3.0.2.tgz#1bc75dac43e31dba981c37e0a08edddc1b49cd39" + integrity sha512-a5AKF1/9pCU3HGMkesgY6LsBdXHUY3WU+I2qgpU0J+I8XuJA1aFr59eS84/HP0+dxsyBSNbt+4yGI2adUpHwSg== + +"@types/plist@^3.0.1": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.5.tgz#9a0c49c0f9886c8c8696a7904dd703f6284036e0" + integrity sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA== + dependencies: + "@types/node" "*" + xmlbuilder ">=11.0.1" + +"@types/prop-types@*": + version "15.7.11" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563" + integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng== + +"@types/react-dom@^17.0.2": + version "17.0.25" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5" + integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA== + dependencies: + "@types/react" "^17" + +"@types/react-mentions@^4.1.8": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@types/react-mentions/-/react-mentions-4.1.13.tgz#293e56e14c502f6a73217fece0b870e54a0cc657" + integrity sha512-kRulAAjlmhCtsJ9bapO0foocknaE/rEuFKpmFEU81fBfnXZmZNBaJ9J/DBjwigT3WDHjQVUmYoi5sxEXrcdzAw== + dependencies: + "@types/react" "*" + +"@types/react-redux@^7.1.24": + version "7.1.33" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15" + integrity sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg== + dependencies: + "@types/hoist-non-react-statics" "^3.3.0" + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + redux "^4.0.0" + +"@types/react-virtualized@9.18.12": + version "9.18.12" + resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.12.tgz#541e65c5e0b4629d6a1c6f339171c7943e016ecb" + integrity sha512-Msdpt9zvYlb5Ul4PA339QUkJ0/z2O+gaFxed1rG+2rZjbe6XdYo7jWfJe206KBnjj84DwPPIbPFQCtoGuNwNTQ== + dependencies: + "@types/prop-types" "*" + "@types/react" "*" + +"@types/react@*", "@types/react@17.0.2", "@types/react@^17": + version "17.0.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" + integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" + +"@types/react@^17.0.2": + version "17.0.74" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.74.tgz#ea93059a55e5cfc7a76e7712fe8db5317dd29ee3" + integrity sha512-nBtFGaeTMzpiL/p73xbmCi00SiCQZDTJUk9ZuHOLtil3nI+y7l269LHkHIAYpav99ZwGnPJzuJsJpfLXjiQ52g== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + +"@types/redux-logger@3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0" + integrity sha512-oV9qiCuowhVR/ehqUobWWkXJjohontbDGLV88Be/7T4bqMQ3kjXwkFNL7doIIqlbg3X2PC5WPziZ8/j/QHNQ4A== + dependencies: + redux "^3.6.0" + +"@types/responselike@^1.0.0": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.3.tgz#cc29706f0a397cfe6df89debfe4bf5cea159db50" + integrity sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw== + dependencies: + "@types/node" "*" + +"@types/retry@0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" + integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== + +"@types/rimraf@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e" + integrity sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ== + dependencies: + "@types/glob" "*" + "@types/node" "*" + +"@types/scheduler@*": + version "0.16.8" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff" + integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A== + +"@types/semver@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" + integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== + +"@types/semver@^7.3.6", "@types/semver@^7.5.0": + version "7.5.6" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" + integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== + +"@types/sinon@9.0.4": + version "9.0.4" + resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.4.tgz#e934f904606632287a6e7f7ab0ce3f08a0dad4b1" + integrity sha512-sJmb32asJZY6Z2u09bl0G2wglSxDlROlAejCjsnor+LzBMz17gu8IU7vKC/vWDnv9zEq2wqADHVXFjf4eE8Gdw== + dependencies: + "@types/sinonjs__fake-timers" "*" + +"@types/sinonjs__fake-timers@*": + version "8.1.5" + resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz#5fd3592ff10c1e9695d377020c033116cc2889f2" + integrity sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ== + +"@types/sizzle@*": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz#518609aefb797da19bf222feb199e8f653ff7627" + integrity sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg== + +"@types/styled-components@^5.1.4": + version "5.1.34" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.34.tgz#4107df8ef8a7eaba4fa6b05f78f93fba4daf0300" + integrity sha512-mmiVvwpYklFIv9E8qfxuPyIt/OuyIrn6gMOAMOFUO3WJfSrSE+sGUoa4PiZj77Ut7bKZpaa6o1fBKS/4TOEvnA== + dependencies: + "@types/hoist-non-react-statics" "*" + "@types/react" "*" + csstype "^3.0.2" + +"@types/trusted-types@*": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" + integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== + +"@types/underscore@*": + version "1.11.15" + resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.15.tgz#29c776daecf6f1935da9adda17509686bf979947" + integrity sha512-HP38xE+GuWGlbSRq9WrZkousaQ7dragtZCruBVMi0oX1migFZavZ3OROKHSkNp/9ouq82zrWtZpg18jFnVN96g== + +"@types/use-sync-external-store@^0.0.3": + version "0.0.3" + resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43" + integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA== + +"@types/uuid@8.3.4": + version "8.3.4" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" + integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== + +"@types/verror@^1.10.3": + version "1.10.9" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.9.tgz#420c32adb9a2dd50b3db4c8f96501e05a0e72941" + integrity sha512-MLx9Z+9lGzwEuW16ubGeNkpBDE84RpB/NyGgg6z2BTpWzKkGU451cAY3UkUzZEp72RHF585oJ3V8JVNqIplcAQ== + +"@types/yargs-parser@*": + version "21.0.3" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15" + integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ== + +"@types/yargs@^17.0.1": + version "17.0.32" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229" + integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog== + dependencies: + "@types/yargs-parser" "*" + +"@types/yauzl@^2.9.1": + version "2.10.3" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999" + integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q== + dependencies: + "@types/node" "*" + +"@typescript-eslint/eslint-plugin@^6.1.0": + version "6.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.17.0.tgz#dfc38f790704ba8a54a1277c51efdb489f6ecf9f" + integrity sha512-Vih/4xLXmY7V490dGwBQJTpIZxH4ZFH6eCVmQ4RFkB+wmaCTDAx4dtgoWwMNGKLkqRY1L6rPqzEbjorRnDo4rQ== + dependencies: + "@eslint-community/regexpp" "^4.5.1" + "@typescript-eslint/scope-manager" "6.17.0" + "@typescript-eslint/type-utils" "6.17.0" + "@typescript-eslint/utils" "6.17.0" + "@typescript-eslint/visitor-keys" "6.17.0" + debug "^4.3.4" + graphemer "^1.4.0" + ignore "^5.2.4" + natural-compare "^1.4.0" + semver "^7.5.4" + ts-api-utils "^1.0.1" + +"@typescript-eslint/parser@^6.1.0": + version "6.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.17.0.tgz#8cd7a0599888ca6056082225b2fdf9a635bf32a1" + integrity sha512-C4bBaX2orvhK+LlwrY8oWGmSl4WolCfYm513gEccdWZj0CwGadbIADb0FtVEcI+WzUyjyoBj2JRP8g25E6IB8A== + dependencies: + "@typescript-eslint/scope-manager" "6.17.0" + "@typescript-eslint/types" "6.17.0" + "@typescript-eslint/typescript-estree" "6.17.0" + "@typescript-eslint/visitor-keys" "6.17.0" + debug "^4.3.4" + +"@typescript-eslint/scope-manager@6.17.0": + version "6.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.17.0.tgz#70e6c1334d0d76562dfa61aed9009c140a7601b4" + integrity sha512-RX7a8lwgOi7am0k17NUO0+ZmMOX4PpjLtLRgLmT1d3lBYdWH4ssBUbwdmc5pdRX8rXon8v9x8vaoOSpkHfcXGA== + dependencies: + "@typescript-eslint/types" "6.17.0" + "@typescript-eslint/visitor-keys" "6.17.0" + +"@typescript-eslint/type-utils@6.17.0": + version "6.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.17.0.tgz#5febad3f523e393006614cbda28b826925b728d5" + integrity sha512-hDXcWmnbtn4P2B37ka3nil3yi3VCQO2QEB9gBiHJmQp5wmyQWqnjA85+ZcE8c4FqnaB6lBwMrPkgd4aBYz3iNg== + dependencies: + "@typescript-eslint/typescript-estree" "6.17.0" + "@typescript-eslint/utils" "6.17.0" + debug "^4.3.4" + ts-api-utils "^1.0.1" + +"@typescript-eslint/types@6.17.0": + version "6.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.17.0.tgz#844a92eb7c527110bf9a7d177e3f22bd5a2f40cb" + integrity sha512-qRKs9tvc3a4RBcL/9PXtKSehI/q8wuU9xYJxe97WFxnzH8NWWtcW3ffNS+EWg8uPvIerhjsEZ+rHtDqOCiH57A== + +"@typescript-eslint/typescript-estree@6.17.0": + version "6.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.17.0.tgz#b913d19886c52d8dc3db856903a36c6c64fd62aa" + integrity sha512-gVQe+SLdNPfjlJn5VNGhlOhrXz4cajwFd5kAgWtZ9dCZf4XJf8xmgCTLIqec7aha3JwgLI2CK6GY1043FRxZwg== + dependencies: + "@typescript-eslint/types" "6.17.0" + "@typescript-eslint/visitor-keys" "6.17.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + minimatch "9.0.3" + semver "^7.5.4" + ts-api-utils "^1.0.1" + +"@typescript-eslint/utils@6.17.0": + version "6.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.17.0.tgz#f2b16d4c9984474656c420438cdede7eccd4079e" + integrity sha512-LofsSPjN/ITNkzV47hxas2JCsNCEnGhVvocfyOcLzT9c/tSZE7SfhS/iWtzP1lKNOEfLhRTZz6xqI8N2RzweSQ== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@types/json-schema" "^7.0.12" + "@types/semver" "^7.5.0" + "@typescript-eslint/scope-manager" "6.17.0" + "@typescript-eslint/types" "6.17.0" + "@typescript-eslint/typescript-estree" "6.17.0" + semver "^7.5.4" + +"@typescript-eslint/visitor-keys@6.17.0": + version "6.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.17.0.tgz#3ed043709c39b43ec1e58694f329e0b0430c26b6" + integrity sha512-H6VwB/k3IuIeQOyYczyyKN8wH6ed8EwliaYHLxOIhyF0dYEIsN8+Bk3GE19qafeMKyZJJHP8+O1HiFhFLUNKSg== + dependencies: + "@typescript-eslint/types" "6.17.0" + eslint-visitor-keys "^3.4.1" + +"@ungap/promise-all-settled@1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" + integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== + +"@ungap/structured-clone@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" + integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== + +"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" + integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + +"@webassemblyjs/floating-point-hex-parser@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" + integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== + +"@webassemblyjs/helper-api-error@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" + integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== + +"@webassemblyjs/helper-buffer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" + integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== + +"@webassemblyjs/helper-numbers@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" + integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" + integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== + +"@webassemblyjs/helper-wasm-section@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" + integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + +"@webassemblyjs/ieee754@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" + integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" + integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" + integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== + +"@webassemblyjs/wasm-edit@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" + integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-opt" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/wast-printer" "1.11.6" + +"@webassemblyjs/wasm-gen@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" + integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + +"@webassemblyjs/wasm-opt@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" + integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + +"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" + integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + +"@webassemblyjs/wast-printer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" + integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@xtuc/long" "4.2.2" + +"@webpack-cli/configtest@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== + +"@webpack-cli/info@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== + +"@webpack-cli/serve@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== + +"@xmldom/xmldom@^0.8.8": + version "0.8.10" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" + integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== + +"@xobotyi/scrollbar-width@^1.9.5": + version "1.9.5" + resolved "https://registry.yarnpkg.com/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d" + integrity sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ== + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + +JSONStream@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + +abab@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== + +abort-controller@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + +acorn-import-assertions@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" + integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== + +acorn-jsx@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== + +acorn-walk@^8.1.1: + version "8.3.1" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.1.tgz#2f10f5b69329d90ae18c58bf1fa8fccd8b959a43" + integrity sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw== + +acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0: + version "8.11.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" + integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + +ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv-keywords@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== + dependencies: + fast-deep-equal "^3.1.3" + +ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.0, ajv@^8.11.0, ajv@^8.9.0: + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + +ansi-align@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== + dependencies: + string-width "^4.1.0" + +ansi-colors@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-escapes@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6" + integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA== + dependencies: + type-fest "^1.0.2" + +ansi-regex@^2.0.0, ansi-regex@^4.1.1, ansi-regex@^5.0.1, ansi-regex@^6.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" + integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== + +ansi-styles@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" + integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== + +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +ansi-styles@^6.0.0, ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + +anymatch@~3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +app-builder-bin@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" + integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== + +app-builder-lib@23.0.8: + version "23.0.8" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.8.tgz#06750dac27b564333f4026db813f4987cabd41b1" + integrity sha512-IObTdRc/0TQsfGn9IvaEXULE/QacgyFgpz3+vmlpZgHHjQ6V1c/T4pKlzNTsNHGjJBuEg2FvTvYi9ZVFfhyWow== + dependencies: + "7zip-bin" "~5.1.1" + "@develar/schema-utils" "~2.6.5" + "@electron/universal" "1.2.1" + "@malept/flatpak-bundler" "^0.4.0" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.9" + builder-util "23.0.8" + builder-util-runtime "9.0.2" + chromium-pickle-js "^0.2.0" + debug "^4.3.4" + ejs "^3.1.7" + electron-osx-sign "^0.6.0" + electron-publish "23.0.8" + form-data "^4.0.0" + fs-extra "^10.1.0" + hosted-git-info "^4.1.0" + is-ci "^3.0.0" + isbinaryfile "^4.0.10" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + minimatch "^3.1.2" + read-config-file "6.2.0" + sanitize-filename "^1.6.3" + semver "^7.3.7" + tar "^6.1.11" + temp-file "^3.4.0" + +app-builder-lib@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" + integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== + dependencies: + "7zip-bin" "~5.1.1" + "@develar/schema-utils" "~2.6.5" + "@electron/universal" "1.2.1" + "@malept/flatpak-bundler" "^0.4.0" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.9" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + chromium-pickle-js "^0.2.0" + debug "^4.3.4" + ejs "^3.1.7" + electron-osx-sign "^0.6.0" + electron-publish "23.6.0" + form-data "^4.0.0" + fs-extra "^10.1.0" + hosted-git-info "^4.1.0" + is-ci "^3.0.0" + isbinaryfile "^4.0.10" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + minimatch "^3.1.2" + read-config-file "6.2.0" + sanitize-filename "^1.6.3" + semver "^7.3.7" + tar "^6.1.11" + temp-file "^3.4.0" + +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + +arg@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +array-buffer-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" + integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== + dependencies: + call-bind "^1.0.2" + is-array-buffer "^3.0.1" + +array-ify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" + integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng== + +array-includes@^3.1.6, array-includes@^3.1.7: + version "3.1.7" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda" + integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + is-string "^1.0.7" + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +array.prototype.findlastindex@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207" + integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + get-intrinsic "^1.2.1" + +array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18" + integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + +array.prototype.flatmap@^1.3.1, array.prototype.flatmap@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527" + integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + +array.prototype.tosorted@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz#620eff7442503d66c799d95503f82b475745cefd" + integrity sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + get-intrinsic "^1.2.1" + +arraybuffer.prototype.slice@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" + integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw== + dependencies: + array-buffer-byte-length "^1.0.0" + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + is-array-buffer "^3.0.2" + is-shared-array-buffer "^1.0.2" + +arrify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== + +asar@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221" + integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + +asbycountry@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/asbycountry/-/asbycountry-1.4.2.tgz#26bf0e090225b93f7d1fc5a177899c900b5c8258" + integrity sha512-NnIJ1lUYJ/M0XmoOA1T5uLQWbD81MDz5MpwufSHymw8j3DauFyTDki7ixxG8nMeUo5GBkFT1U/USOcz0mJnrNQ== + dependencies: + chalk "^1.1.3" + fetch "^1.1.0" + +assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== + +assertion-error@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" + integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + +async-exit-hook@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" + integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== + +async@^2.6.4, async@^3.2.3: + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== + dependencies: + lodash "^4.17.14" + +asynciterator.prototype@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62" + integrity sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg== + dependencies: + has-symbols "^1.0.3" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +auto-bind@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb" + integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ== + +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== + +axios@^1.3.2: + version "1.6.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.4.tgz#184ee1f63d412caffcf30d2c50982253c3ee86e0" + integrity sha512-heJnIs6N4aa1eSthhN9M5ioILu8Wi8vmQW9iHQ9NUvfkJb0lEEDUiIdQNAuBtfUt3FxReaKdpQA5DbmMOqzF/A== + dependencies: + follow-redirects "^1.15.4" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + +"babel-plugin-styled-components@>= 1": + version "2.1.4" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz#9a1f37c7f32ef927b4b008b529feb4a2c82b1092" + integrity sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-module-imports" "^7.22.5" + "@babel/plugin-syntax-jsx" "^7.22.5" + lodash "^4.17.21" + picomatch "^2.3.1" + +backbone@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999" + integrity sha512-aK+k3TiU4tQDUrRCymDDE7XDFnMVuyE6zbZ4JX7mb4pJbQTVOH997/kyBzb8wB2s5Y/Oh7EUfj+sZhwRPxWwow== + dependencies: + underscore ">=1.8.3" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1, base64-js@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +biskviit@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/biskviit/-/biskviit-1.0.1.tgz#037a0cd4b71b9e331fd90a1122de17dc49e420a7" + integrity sha512-VGCXdHbdbpEkFgtjkeoBN8vRlbj1ZRX2/mxhE8asCCRalUx2nBzOomLJv8Aw/nRt5+ccDb+tPKidg4XxcfGW4w== + dependencies: + psl "^1.1.7" + +blob-util@2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb" + integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ== + +bluebird-lst@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" + integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== + dependencies: + bluebird "^3.5.5" + +bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +blueimp-load-image@5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-5.14.0.tgz#e8086415e580df802c33ff0da6b37a8d20205cc6" + integrity sha512-g5l+4dCOESBG8HkPLdGnBx8dhEwpQHaOZ0en623sl54o3bGhGMLYGc54L5cWfGmPvfKUjbsY7LOAmcW/xlkBSA== + +boolean@^3.0.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" + integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== + +boxen@^5.0.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== + dependencies: + ansi-align "^3.0.0" + camelcase "^6.2.0" + chalk "^4.1.0" + cli-boxes "^2.2.1" + string-width "^4.2.2" + type-fest "^0.20.2" + widest-line "^3.1.0" + wrap-ansi "^7.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.2, braces@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +browser-stdout@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" + integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== + +browserslist@^4.14.5: + version "4.22.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b" + integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A== + dependencies: + caniuse-lite "^1.0.30001565" + electron-to-chromium "^1.4.601" + node-releases "^2.0.14" + update-browserslist-db "^1.0.13" + +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + +buffer-crc32@0.2.13, buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== + +buffer-equal@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== + +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer@^5.1.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +builder-util-runtime@8.9.2: + version "8.9.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28" + integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A== + dependencies: + debug "^4.3.2" + sax "^1.2.4" + +builder-util-runtime@9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.2.tgz#dc54f8581bbcf1e0428da4483fa46d09524be857" + integrity sha512-xF55W/8mgfT6+sMbX0TeiJkTusA5GMOzckM4rajN4KirFcUIuLTH8oEaTYmM86YwVCZaTwa/7GyFhauXaEICwA== + dependencies: + debug "^4.3.4" + sax "^1.2.4" + +builder-util-runtime@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" + integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== + dependencies: + debug "^4.3.4" + sax "^1.2.4" + +builder-util@23.0.8: + version "23.0.8" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.8.tgz#b59af2248f23270ed669cffc4a442418df83a303" + integrity sha512-xPpnoLLAEPx5oxxzRFINRnxmLNQDn+FddU7QRvCJDQi0jvUJ7UjdoGoM+UPy9yh+p9O82/nC7MHGuUptJkOXyQ== + dependencies: + "7zip-bin" "~5.1.1" + "@types/debug" "^4.1.6" + "@types/fs-extra" "^9.0.11" + app-builder-bin "4.0.0" + bluebird-lst "^1.0.9" + builder-util-runtime "9.0.2" + chalk "^4.1.1" + cross-spawn "^7.0.3" + debug "^4.3.4" + fs-extra "^10.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" + source-map-support "^0.5.19" + stat-mode "^1.0.0" + temp-file "^3.4.0" + +builder-util@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" + integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== + dependencies: + "7zip-bin" "~5.1.1" + "@types/debug" "^4.1.6" + "@types/fs-extra" "^9.0.11" + app-builder-bin "4.0.0" + bluebird-lst "^1.0.9" + builder-util-runtime "9.1.1" + chalk "^4.1.1" + cross-spawn "^7.0.3" + debug "^4.3.4" + fs-extra "^10.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" + source-map-support "^0.5.19" + stat-mode "^1.0.0" + temp-file "^3.4.0" + +"bunyan@https://github.com/Bilb/node-bunyan": + version "2.0.5" + resolved "https://github.com/Bilb/node-bunyan#1f69cb340cd25485c508e65197d05ae534b212e2" + dependencies: + exeunt "1.1.0" + optionalDependencies: + moment "^2.19.3" + mv "~2" + safe-json-stringify "~1" + +bytebuffer@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" + integrity sha512-IuzSdmADppkZ6DlpycMkm8l9zeEq16fWtLvunEwFiYciR/BHo4E8/xs5piFquG+Za8OWmMqHF8zuRviz2LHvRQ== + dependencies: + long "~3" + +cacheable-lookup@^5.0.3: + version "5.0.4" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" + integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== + +cacheable-request@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817" + integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^4.0.0" + lowercase-keys "^2.0.0" + normalize-url "^6.0.1" + responselike "^2.0.0" + +call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" + integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== + dependencies: + function-bind "^1.1.2" + get-intrinsic "^1.2.1" + set-function-length "^1.1.1" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camelcase-keys@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" + integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== + dependencies: + camelcase "^5.3.1" + map-obj "^4.0.0" + quick-lru "^4.0.1" + +camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +camelcase@^6.0.0, camelcase@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== + +camelize@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3" + integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ== + +caniuse-lite@^1.0.30001565: + version "1.0.30001574" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001574.tgz#fb4f1359c77f6af942510493672e1ec7ec80230c" + integrity sha512-BtYEK4r/iHt/txm81KBudCUcTy7t+s9emrIaHqjYurQ10x71zJ5VQ9x1dYPcz/b+pKSp4y/v1xSI67A+LzpNyg== + +catharsis@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121" + integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A== + dependencies: + lodash "^4.17.15" + +chai-as-promised@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0" + integrity sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA== + dependencies: + check-error "^1.0.2" + +chai-bytes@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/chai-bytes/-/chai-bytes-0.1.2.tgz#c297e81d47eb3106af0676ded5bb5e0c9f981db3" + integrity sha512-0ol6oJS0y1ozj6AZK8n1pyv1/G+l44nqUJygAkK1UrYl+IOGie5vcrEdrAlwmLYGIA9NVvtHWosPYwWWIXf/XA== + +chai@^4.3.4: + version "4.3.10" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.10.tgz#d784cec635e3b7e2ffb66446a63b4e33bd390384" + integrity sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g== + dependencies: + assertion-error "^1.1.0" + check-error "^1.0.3" + deep-eql "^4.1.3" + get-func-name "^2.0.2" + loupe "^2.3.6" + pathval "^1.1.1" + type-detect "^4.0.8" + +chalk@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" + integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== + +chalk@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" + integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== + dependencies: + ansi-styles "^2.2.1" + escape-string-regexp "^1.0.2" + has-ansi "^2.0.0" + strip-ansi "^3.0.0" + supports-color "^2.0.0" + +chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +check-error@^1.0.2, check-error@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.3.tgz#a6502e4312a7ee969f646e83bb3ddd56281bd694" + integrity sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg== + dependencies: + get-func-name "^2.0.2" + +chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0": + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +chrome-trace-event@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + +chromium-pickle-js@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" + integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +ci-info@^3.2.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" + integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== + +classnames@2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d" + integrity sha512-DTt3GhOUDKhh4ONwIJW4lmhyotQmV2LjNlGK/J2hkwUcqcbKkCLAdJPtxQnxnlc7SR3f1CEXCyMmc7WLUsWbNA== + +classnames@^2.2.5: + version "2.5.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b" + integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow== + +cli-boxes@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + +cli-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea" + integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg== + dependencies: + restore-cursor "^4.0.0" + +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== + dependencies: + slice-ansi "^3.0.0" + string-width "^4.2.0" + +cli-truncate@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389" + integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA== + dependencies: + slice-ansi "^5.0.0" + string-width "^5.0.0" + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + +clone-response@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" + integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== + dependencies: + mimic-response "^1.0.0" + +clsx@^1.0.4, clsx@^1.1.1, clsx@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" + integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== + +cmake-js@^7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.2.1.tgz#757c0d39994121b084bab96290baf115ee7712cd" + integrity sha512-AdPSz9cSIJWdKvm0aJgVu3X8i0U3mNTswJkSHzZISqmYVjZk7Td4oDFg0mCBA383wO+9pG5Ix7pEP1CZH9x2BA== + dependencies: + axios "^1.3.2" + debug "^4" + fs-extra "^10.1.0" + lodash.isplainobject "^4.0.6" + memory-stream "^1.0.0" + node-api-headers "^0.0.2" + npmlog "^6.0.2" + rc "^1.2.7" + semver "^7.3.8" + tar "^6.1.11" + url-join "^4.0.1" + which "^2.0.2" + yargs "^17.6.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + +colorette@^2.0.14, colorette@^2.0.20: + version "2.0.20" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" + integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== + +colors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +commander@11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67" + integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ== + +commander@2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A== + dependencies: + graceful-readlink ">= 1.0.0" + +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== + +compare-func@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3" + integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA== + dependencies: + array-ify "^1.0.0" + dot-prop "^5.1.0" + +compare-version@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" + integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== + +config@1.28.1: + version "1.28.1" + resolved "https://registry.yarnpkg.com/config/-/config-1.28.1.tgz#7625d2a1e4c90f131d8a73347982d93c3873282d" + integrity sha512-NT2hna+ec7G1hLB+Jimu6tuzQQqAG81YJM2P4x31hM9qffcOeaMlue6tc/TTEEfRcyzVTJFzBzweRQf0FBHghQ== + dependencies: + json5 "0.4.0" + os-homedir "1.0.2" + +configstore@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== + dependencies: + dot-prop "^5.2.0" + graceful-fs "^4.1.2" + make-dir "^3.0.0" + unique-string "^2.0.0" + write-file-atomic "^3.0.0" + xdg-basedir "^4.0.0" + +confusing-browser-globals@^1.0.10: + version "1.0.11" + resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" + integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA== + +console-control-strings@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + +conventional-changelog-angular@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-6.0.0.tgz#a9a9494c28b7165889144fd5b91573c4aa9ca541" + integrity sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg== + dependencies: + compare-func "^2.0.0" + +conventional-changelog-conventionalcommits@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-6.1.0.tgz#3bad05f4eea64e423d3d90fc50c17d2c8cf17652" + integrity sha512-3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw== + dependencies: + compare-func "^2.0.0" + +conventional-commits-parser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz#02ae1178a381304839bce7cea9da5f1b549ae505" + integrity sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg== + dependencies: + JSONStream "^1.3.5" + is-text-path "^1.0.1" + meow "^8.1.2" + split2 "^3.2.2" + +copy-to-clipboard@^3.3.1: + version "3.3.3" + resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0" + integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA== + dependencies: + toggle-selection "^1.0.6" + +core-util-is@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== + +cosmiconfig-typescript-loader@^4.0.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.4.0.tgz#f3feae459ea090f131df5474ce4b1222912319f9" + integrity sha512-BabizFdC3wBHhbI4kJh0VkQP9GkBfoHPydD0COMce1nJ1kJAB3F2TmJ/I7diULBKtmEWSwEbuN/KDtgnmUUVmw== + +cosmiconfig@^8.0.0: + version "8.3.6" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3" + integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA== + dependencies: + import-fresh "^3.3.0" + js-yaml "^4.1.0" + parse-json "^5.2.0" + path-type "^4.0.0" + +country-code-lookup@^0.0.19: + version "0.0.19" + resolved "https://registry.yarnpkg.com/country-code-lookup/-/country-code-lookup-0.0.19.tgz#3fbf0192758ecf0d5eee0efbc220d62706c50fd6" + integrity sha512-lpvgdPyj8RuP0CSZhACNf5ueKlLbv/IQUAQfg7yr/qJbFrdcWV7Y+aDN9K/u/bx3MXRfcsjuW+TdIc0AEj7kDw== + +crc@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== + dependencies: + buffer "^5.1.0" + +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + +cross-env@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941" + integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag== + dependencies: + cross-spawn "^7.0.0" + +cross-spawn@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +crypto-random-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== + +css-color-keywords@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" + integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg== + +css-in-js-utils@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz#640ae6a33646d401fc720c54fc61c42cd76ae2bb" + integrity sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A== + dependencies: + hyphenate-style-name "^1.0.3" + +css-loader@^6.7.2: + version "6.8.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.8.1.tgz#0f8f52699f60f5e679eab4ec0fcd68b8e8a50a88" + integrity sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g== + dependencies: + icss-utils "^5.1.0" + postcss "^8.4.21" + postcss-modules-extract-imports "^3.0.0" + postcss-modules-local-by-default "^4.0.3" + postcss-modules-scope "^3.0.0" + postcss-modules-values "^4.0.0" + postcss-value-parser "^4.2.0" + semver "^7.3.8" + +css-to-react-native@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32" + integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ== + dependencies: + camelize "^1.0.0" + css-color-keywords "^1.0.0" + postcss-value-parser "^4.0.2" + +css-tree@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== + dependencies: + mdn-data "2.0.14" + source-map "^0.6.1" + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +cssstyle@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a" + integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg== + dependencies: + rrweb-cssom "^0.6.0" + +csstype@^3.0.2, csstype@^3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" + integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== + +"curve25519-js@https://github.com/oxen-io/curve25519-js": + version "0.0.4" + resolved "https://github.com/oxen-io/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6" + +dargs@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" + integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg== + +data-urls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4" + integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g== + dependencies: + abab "^2.0.6" + whatwg-mimetype "^3.0.0" + whatwg-url "^12.0.0" + +debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +debug@^2.6.8: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +decamelize-keys@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" + integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg== + dependencies: + decamelize "^1.1.0" + map-obj "^1.0.0" + +decamelize@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== + +decamelize@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" + integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== + +decimal.js@^10.4.3: + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== + +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + +deep-diff@^0.3.5: + version "0.3.8" + resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" + integrity sha512-yVn6RZmHiGnxRKR9sJb3iVV2XTF1Ghh2DiWRZ3dMnGc43yUdWWF/kX6lQyk3+P84iprfWKU/8zFTrlkvtFm1ug== + +deep-eql@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d" + integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw== + dependencies: + type-detect "^4.0.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +deep-is@^0.1.3, deep-is@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +defer-to-connect@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" + integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== + +define-data-property@^1.0.1, define-data-property@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" + integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== + dependencies: + get-intrinsic "^1.2.1" + gopd "^1.0.1" + has-property-descriptors "^1.0.0" + +define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" + integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== + dependencies: + define-data-property "^1.0.1" + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== + +detect-node@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== + +diff@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" + integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== + +diff@^4.0.1, diff@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + +dir-compare@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" + integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== + dependencies: + buffer-equal "1.0.0" + colors "1.0.3" + commander "2.9.0" + minimatch "3.0.4" + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +dmg-builder@23.0.8: + version "23.0.8" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.8.tgz#c68d9811da8d1891e6121c1e0807635519856800" + integrity sha512-dXguxjekxY70hzgAW+0NPCI7bagQ2ZrLDwYf1bvHSwlVfVizyJ/EC+e71U/NUgiWlXU5nogbWcGC3H74mFu0iw== + dependencies: + app-builder-lib "23.0.8" + builder-util "23.0.8" + builder-util-runtime "9.0.2" + fs-extra "^10.0.0" + iconv-lite "^0.6.2" + js-yaml "^4.1.0" + optionalDependencies: + dmg-license "^1.0.11" + +dmg-builder@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" + integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== + dependencies: + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + fs-extra "^10.0.0" + iconv-lite "^0.6.2" + js-yaml "^4.1.0" + optionalDependencies: + dmg-license "^1.0.11" + +dmg-license@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" + integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== + dependencies: + "@types/plist" "^3.0.1" + "@types/verror" "^1.10.3" + ajv "^6.10.0" + crc "^3.8.0" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" + smart-buffer "^4.0.2" + verror "^1.10.0" + +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== + dependencies: + esutils "^2.0.2" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +dom-helpers@^5.0.1, dom-helpers@^5.1.3: + version "5.2.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902" + integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA== + dependencies: + "@babel/runtime" "^7.8.7" + csstype "^3.0.2" + +domexception@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" + integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== + dependencies: + webidl-conversions "^7.0.0" + +dompurify@^2.0.7: + version "2.4.7" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.7.tgz#277adeb40a2c84be2d42a8bcd45f582bfa4d0cfc" + integrity sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ== + +dot-prop@^5.1.0, dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== + +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + +ejs@^3.1.7: + version "3.1.9" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" + integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== + dependencies: + jake "^10.8.5" + +electron-builder@23.0.8: + version "23.0.8" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.8.tgz#7379b91905aa73d4757234550d76dbce3fd17433" + integrity sha512-7WxdR4+l+VL4QN/K6NdqRQg7+cbIka4By1+4eN8odMPySSTI5d6nrV8R+SSRt9MXeWVdWlW8RCX5Pk6L0oaRug== + dependencies: + "@types/yargs" "^17.0.1" + app-builder-lib "23.0.8" + builder-util "23.0.8" + builder-util-runtime "9.0.2" + chalk "^4.1.1" + dmg-builder "23.0.8" + fs-extra "^10.0.0" + is-ci "^3.0.0" + lazy-val "^1.0.5" + read-config-file "6.2.0" + update-notifier "^5.1.0" + yargs "^17.0.1" + +electron-is-accelerator@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b" + integrity sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA== + +electron-localshortcut@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz#cfc83a3eff5e28faf98ddcc87f80a2ce4f623cd3" + integrity sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q== + dependencies: + debug "^4.0.1" + electron-is-accelerator "^0.1.0" + keyboardevent-from-electron-accelerator "^2.0.0" + keyboardevents-areequal "^0.2.1" + +electron-osx-sign@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" + integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== + dependencies: + bluebird "^3.5.0" + compare-version "^0.1.2" + debug "^2.6.8" + isbinaryfile "^3.0.2" + minimist "^1.2.0" + plist "^3.0.1" + +electron-publish@23.0.8: + version "23.0.8" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.8.tgz#a55b0c4a9ceec1eadb9b1b19194b9d9f2ae4ec33" + integrity sha512-GnqJH7Wh8LnapN4npl1Xs2Er/486/qxE3dV42WxXHX2VeoKAJTOuCzOVWCxpajaR3Msji4SkS0p81R018uK6Mg== + dependencies: + "@types/fs-extra" "^9.0.11" + builder-util "23.0.8" + builder-util-runtime "9.0.2" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" + +electron-publish@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" + integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== + dependencies: + "@types/fs-extra" "^9.0.11" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" + +electron-to-chromium@^1.4.601: + version "1.4.622" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.622.tgz#925d8b2264abbcbe264a9a6290d97b9e5a1af205" + integrity sha512-GZ47DEy0Gm2Z8RVG092CkFvX7SdotG57c4YZOe8W8qD4rOmk3plgeNmiLVRHP/Liqj1wRiY3uUUod9vb9hnxZA== + +electron-updater@^4.2.2: + version "4.6.5" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.5.tgz#e9a75458bbfd6bb41a58a829839e150ad2eb2d3d" + integrity sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA== + dependencies: + "@types/semver" "^7.3.6" + builder-util-runtime "8.9.2" + fs-extra "^10.0.0" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + lodash.escaperegexp "^4.1.2" + lodash.isequal "^4.5.0" + semver "^7.3.5" + +electron@*: + version "28.1.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-28.1.1.tgz#37254967e32a4a69e18378f3b1aba1475522d08d" + integrity sha512-HJSbGHpRl46jWCp5G4OH57KSm2F5u15tB10ixD8iFiz9dhwojqlSQTRAcjSwvga+Vqs1jv7iqwQRrolXP4DgOA== + dependencies: + "@electron/get" "^2.0.0" + "@types/node" "^18.11.18" + extract-zip "^2.0.1" + +electron@^25.8.4: + version "25.9.8" + resolved "https://registry.yarnpkg.com/electron/-/electron-25.9.8.tgz#7c125ccbddad02861736275b0d4a387c59a91469" + integrity sha512-PGgp6PH46QVENHuAHc2NT1Su8Q1qov7qIl2jI5tsDpTibwV2zD8539AeWBQySeBU4dhbj9onIl7+1bXQ0wefBg== + dependencies: + "@electron/get" "^2.0.0" + "@types/node" "^18.11.18" + extract-zip "^2.0.1" + +emoji-mart@^5.5.2: + version "5.5.2" + resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.5.2.tgz#3ddbaf053139cf4aa217650078bc1c50ca8381af" + integrity sha512-Sqc/nso4cjxhOwWJsp9xkVm8OF5c+mJLZJFoFfzRuKO+yWiN7K8c96xmtughYb0d/fZ8UC6cLIQ/p4BR6Pv3/A== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +encoding@0.1.12: + version "0.1.12" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" + integrity sha512-bl1LAgiQc4ZWr++pNYUdRe/alecaHFeHxIJ/pNciqGdKXghaTCOwKkbKp6ye7pKZGu/GcaSXFk8PBVhgs+dJdA== + dependencies: + iconv-lite "~0.4.13" + +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enhanced-resolve@^5.0.0, enhanced-resolve@^5.12.0, enhanced-resolve@^5.15.0: + version "5.15.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" + integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +entities@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== + +entities@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" + integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== + +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +envinfo@^7.7.3: + version "7.11.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.0.tgz#c3793f44284a55ff8c82faf1ffd91bc6478ea01f" + integrity sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg== + +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +error-stack-parser@^2.0.6: + version "2.1.4" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" + integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== + dependencies: + stackframe "^1.3.4" + +es-abstract@^1.22.1: + version "1.22.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32" + integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA== + dependencies: + array-buffer-byte-length "^1.0.0" + arraybuffer.prototype.slice "^1.0.2" + available-typed-arrays "^1.0.5" + call-bind "^1.0.5" + es-set-tostringtag "^2.0.1" + es-to-primitive "^1.2.1" + function.prototype.name "^1.1.6" + get-intrinsic "^1.2.2" + get-symbol-description "^1.0.0" + globalthis "^1.0.3" + gopd "^1.0.1" + has-property-descriptors "^1.0.0" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + internal-slot "^1.0.5" + is-array-buffer "^3.0.2" + is-callable "^1.2.7" + is-negative-zero "^2.0.2" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.2" + is-string "^1.0.7" + is-typed-array "^1.1.12" + is-weakref "^1.0.2" + object-inspect "^1.13.1" + object-keys "^1.1.1" + object.assign "^4.1.4" + regexp.prototype.flags "^1.5.1" + safe-array-concat "^1.0.1" + safe-regex-test "^1.0.0" + string.prototype.trim "^1.2.8" + string.prototype.trimend "^1.0.7" + string.prototype.trimstart "^1.0.7" + typed-array-buffer "^1.0.0" + typed-array-byte-length "^1.0.0" + typed-array-byte-offset "^1.0.0" + typed-array-length "^1.0.4" + unbox-primitive "^1.0.2" + which-typed-array "^1.1.13" + +es-iterator-helpers@^1.0.12: + version "1.0.15" + resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz#bd81d275ac766431d19305923707c3efd9f1ae40" + integrity sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g== + dependencies: + asynciterator.prototype "^1.0.0" + call-bind "^1.0.2" + define-properties "^1.2.1" + es-abstract "^1.22.1" + es-set-tostringtag "^2.0.1" + function-bind "^1.1.1" + get-intrinsic "^1.2.1" + globalthis "^1.0.3" + has-property-descriptors "^1.0.0" + has-proto "^1.0.1" + has-symbols "^1.0.3" + internal-slot "^1.0.5" + iterator.prototype "^1.1.2" + safe-array-concat "^1.0.1" + +es-module-lexer@^1.2.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5" + integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w== + +es-set-tostringtag@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" + integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q== + dependencies: + get-intrinsic "^1.2.2" + has-tostringtag "^1.0.0" + hasown "^2.0.0" + +es-shim-unscopables@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" + integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== + dependencies: + hasown "^2.0.0" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +es6-error@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" + integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-goat@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== + +escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== + +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + +escodegen@^1.13.0: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +eslint-config-airbnb-base@^15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236" + integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig== + dependencies: + confusing-browser-globals "^1.0.10" + object.assign "^4.1.2" + object.entries "^1.1.5" + semver "^6.3.0" + +eslint-config-prettier@^8.8.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11" + integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg== + +eslint-import-resolver-node@^0.3.9: + version "0.3.9" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac" + integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g== + dependencies: + debug "^3.2.7" + is-core-module "^2.13.0" + resolve "^1.22.4" + +eslint-import-resolver-typescript@^3.6.0: + version "3.6.1" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz#7b983680edd3f1c5bce1a5829ae0bc2d57fe9efa" + integrity sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg== + dependencies: + debug "^4.3.4" + enhanced-resolve "^5.12.0" + eslint-module-utils "^2.7.4" + fast-glob "^3.3.1" + get-tsconfig "^4.5.0" + is-core-module "^2.11.0" + is-glob "^4.0.3" + +eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" + integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== + dependencies: + debug "^3.2.7" + +eslint-plugin-import@^2.27.5: + version "2.29.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643" + integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw== + dependencies: + array-includes "^3.1.7" + array.prototype.findlastindex "^1.2.3" + array.prototype.flat "^1.3.2" + array.prototype.flatmap "^1.3.2" + debug "^3.2.7" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.9" + eslint-module-utils "^2.8.0" + hasown "^2.0.0" + is-core-module "^2.13.1" + is-glob "^4.0.3" + minimatch "^3.1.2" + object.fromentries "^2.0.7" + object.groupby "^1.0.1" + object.values "^1.1.7" + semver "^6.3.1" + tsconfig-paths "^3.15.0" + +eslint-plugin-mocha@^10.1.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.2.0.tgz#15b05ce5be4b332bb0d76826ec1c5ebf67102ad6" + integrity sha512-ZhdxzSZnd1P9LqDPF0DBcFLpRIGdh1zkF2JHnQklKQOvrQtT73kdP5K9V2mzvbLR+cCAO9OI48NXK/Ax9/ciCQ== + dependencies: + eslint-utils "^3.0.0" + rambda "^7.4.0" + +eslint-plugin-more@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-more/-/eslint-plugin-more-1.0.5.tgz#667bffc2a64bde2d48b98c8faa111e213b2f873f" + integrity sha512-zjDza5jeNBHWf8ZezyW2Llk99abndcGlSz9GIKgVOGwISx0m+f4QoZAapjSmUjKSxHvmOa7Lt68Pk8XbRzWb7w== + +eslint-plugin-react-hooks@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" + integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== + +eslint-plugin-react@^7.33.0: + version "7.33.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608" + integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw== + dependencies: + array-includes "^3.1.6" + array.prototype.flatmap "^1.3.1" + array.prototype.tosorted "^1.1.1" + doctrine "^2.1.0" + es-iterator-helpers "^1.0.12" + estraverse "^5.3.0" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.1.2" + object.entries "^1.1.6" + object.fromentries "^2.0.6" + object.hasown "^1.1.2" + object.values "^1.1.6" + prop-types "^15.8.1" + resolve "^2.0.0-next.4" + semver "^6.3.1" + string.prototype.matchall "^4.0.8" + +eslint-scope@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-scope@^7.2.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" + integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" + integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== + +eslint@^8.45.0: + version "8.56.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" + integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@eslint-community/regexpp" "^4.6.1" + "@eslint/eslintrc" "^2.1.4" + "@eslint/js" "8.56.0" + "@humanwhocodes/config-array" "^0.11.13" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" + "@ungap/structured-clone" "^1.2.0" + ajv "^6.12.4" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.3.2" + doctrine "^3.0.0" + escape-string-regexp "^4.0.0" + eslint-scope "^7.2.2" + eslint-visitor-keys "^3.4.3" + espree "^9.6.1" + esquery "^1.4.2" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.19.0" + graphemer "^1.4.0" + ignore "^5.2.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + is-path-inside "^3.0.3" + js-yaml "^4.1.0" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.1.2" + natural-compare "^1.4.0" + optionator "^0.9.3" + strip-ansi "^6.0.1" + text-table "^0.2.0" + +espree@^9.0.0, espree@^9.6.0, espree@^9.6.1: + version "9.6.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" + integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== + dependencies: + acorn "^8.9.0" + acorn-jsx "^5.3.2" + eslint-visitor-keys "^3.4.1" + +esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.4.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" + integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1, estraverse@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +event-target-shim@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + +eventemitter3@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== + +events@^3.2.0, events@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +execa@7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9" + integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.1" + human-signals "^4.3.0" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^3.0.7" + strip-final-newline "^3.0.0" + +execa@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" + integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +exeunt@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/exeunt/-/exeunt-1.1.0.tgz#af72db6f94b3cb75e921aee375d513049843d284" + integrity sha512-dd++Yn/0Fp+gtJ04YHov7MeAii+LFivJc6KqnJNfplzLVUkUDrfKoQDTLlCgzcW15vY5hKlHasWeIsQJ8agHsw== + +extract-zip@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== + dependencies: + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" + +extsprintf@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== + +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@^3.2.9, fast-glob@^3.3.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" + integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== + +fast-loops@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/fast-loops/-/fast-loops-1.1.3.tgz#ce96adb86d07e7bf9b4822ab9c6fac9964981f75" + integrity sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g== + +fast-shallow-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz#d4dcaf6472440dcefa6f88b98e3251e27f25628b" + integrity sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw== + +fastest-levenshtein@^1.0.12: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== + +fastest-stable-stringify@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz#3757a6774f6ec8de40c4e86ec28ea02417214c76" + integrity sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q== + +fastq@^1.6.0: + version "1.16.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.16.0.tgz#83b9a9375692db77a822df081edb6a9cf6839320" + integrity sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA== + dependencies: + reusify "^1.0.4" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== + dependencies: + pend "~1.2.0" + +fetch@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fetch/-/fetch-1.1.0.tgz#0a8279f06be37f9f0ebb567560a30a480da59a2e" + integrity sha512-5O8TwrGzoNblBG/jtK4NFuZwNCkZX6s5GfRNOaGtm+QGJEuNakSC/i2RW0R93KX6E0jVjNXm6O3CRN4Ql3K+yA== + dependencies: + biskviit "1.0.1" + encoding "0.1.12" + +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + +file-type@^10.10.0: + version "10.11.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890" + integrity sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw== + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +filelist@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== + dependencies: + minimatch "^5.0.1" + +filesize@3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" + integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +find-up@5.0.0, find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +find-up@^4.0.0, find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +find-yarn-workspace-root@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" + integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== + dependencies: + micromatch "^4.0.2" + +firstline@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/firstline/-/firstline-1.2.1.tgz#b88673c42009f8821fac2926e99720acee924fae" + integrity sha512-6eMQNJtDzyXSC1yeCBWspqA6LeV5la2XHGTXQq4O0xkglAutpyny/sB+zVdXTZ9nzcDW9ZGLxwXXkB+ZEtJuPw== + +flat-cache@^3.0.4: + version "3.2.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" + integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw== + dependencies: + flatted "^3.2.9" + keyv "^4.5.3" + rimraf "^3.0.2" + +flat@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" + integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== + +flatted@^3.2.9: + version "3.2.9" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" + integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== + +follow-redirects@^1.15.4: + version "1.15.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" + integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== + +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +fs-extra@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3" + integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^1.0.0" + +fs-extra@^10.0.0, fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-extra@^11.0.0: + version "11.2.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" + integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-extra@^9.0.0, fs-extra@^9.0.1: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== + +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + +function-bind@^1.1.1, function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + +function.prototype.name@^1.1.5, function.prototype.name@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" + integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + functions-have-names "^1.2.3" + +functions-have-names@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" + integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== + +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" + +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-func-name@^2.0.1, get-func-name@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41" + integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ== + +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" + integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== + dependencies: + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + +get-stream@^5.0.0, get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-stream@^6.0.0, get-stream@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + +get-tsconfig@^4.5.0: + version "4.7.2" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.2.tgz#0dcd6fb330391d46332f4c6c1bf89a6514c2ddce" + integrity sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A== + dependencies: + resolve-pkg-maps "^1.0.0" + +getobject@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.1.1.tgz#29f7858609fee7ef1c58d062f1b2335e425bdb45" + integrity sha512-Rftr+NsUMxFcCmFopFmyCCfsJPaqUmf7TW61CtKMu0aE93ir62I6VjXt2koiCQgcunGgVog/U6g24tBPq67rlg== + +git-raw-commits@^2.0.11: + version "2.0.11" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723" + integrity sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A== + dependencies: + dargs "^7.0.0" + lodash "^4.17.15" + meow "^8.0.0" + split2 "^3.0.0" + through2 "^4.0.0" + +glob-parent@^5.1.2, glob-parent@^6.0.1, glob-parent@^6.0.2, glob-parent@~5.1.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== + dependencies: + is-glob "^4.0.3" + +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + +glob@7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" + integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^6.0.1: + version "6.0.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" + integrity sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A== + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.0.5, glob@^7.1.3, glob@^7.1.6: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== + dependencies: + boolean "^3.0.1" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + +global-dirs@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" + integrity sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg== + dependencies: + ini "^1.3.4" + +global-dirs@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485" + integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA== + dependencies: + ini "2.0.0" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globals@^13.19.0: + version "13.24.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" + integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ== + dependencies: + type-fest "^0.20.2" + +globalthis@^1.0.1, globalthis@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" + integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + dependencies: + define-properties "^1.1.3" + +globby@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^3.0.0" + +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + +got@^11.8.5, got@^9.6.0: + version "11.8.6" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" + integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== + dependencies: + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + +"graceful-readlink@>= 1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w== + +graphemer@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" + integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== + +hard-rejection@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" + integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== + +has-ansi@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" + integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg== + dependencies: + ansi-regex "^2.0.0" + +has-bigints@^1.0.1, has-bigints@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" + integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-property-descriptors@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" + integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== + dependencies: + get-intrinsic "^1.2.2" + +has-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" + integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== + +has-symbols@^1.0.2, has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + +has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== + +has-yarn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== + +hasown@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" + integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== + dependencies: + function-bind "^1.1.2" + +he@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + +hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== + dependencies: + react-is "^16.7.0" + +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + +hosted-git-info@^4.0.1, hosted-git-info@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== + dependencies: + lru-cache "^6.0.0" + +html-encoding-sniffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" + integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== + dependencies: + whatwg-encoding "^2.0.0" + +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== + +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + +http2-wrapper@^1.0.0-beta.5.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + +https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +human-signals@^4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" + integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== + +husky@^8.0.0: + version "8.0.3" + resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" + integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg== + +hyphenate-style-name@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" + integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== + +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== + dependencies: + cli-truncate "^2.1.0" + node-addon-api "^1.6.3" + +iconv-lite@0.6.3, iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +iconv-lite@~0.4.13: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +icss-utils@^5.0.0, icss-utils@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +ignore@^5.2.0, ignore@^5.2.4: + version "5.3.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" + integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== + +image-type@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/image-type/-/image-type-4.1.0.tgz#72a88d64ff5021371ed67b9a466442100be57cd1" + integrity sha512-CFJMJ8QK8lJvRlTCEgarL4ro6hfDQKif2HjSvYCdQZESaIPV4v9imrf7BQHK+sQeTeNeMpWciR9hyC/g8ybXEg== + dependencies: + file-type "^10.10.0" + +immer@^9.0.7: + version "9.0.21" + resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176" + integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA== + +immutable@^4.0.0: + version "4.3.4" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f" + integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA== + +import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== + +import-local@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@2.0.0, ini@^1.3.4, ini@^1.3.6, ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +inline-style-prefixer@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-7.0.0.tgz#991d550735d42069f528ac1bcdacd378d1305442" + integrity sha512-I7GEdScunP1dQ6IM2mQWh6v0mOYdYmH3Bp31UecKdrcUgcURTcctSe1IECdUznSHKSmsHtjrT3CwCPI1pyxfUQ== + dependencies: + css-in-js-utils "^3.1.0" + fast-loops "^1.1.3" + +internal-slot@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" + integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg== + dependencies: + get-intrinsic "^1.2.2" + hasown "^2.0.0" + side-channel "^1.0.4" + +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== + +invariant@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== + dependencies: + loose-envify "^1.0.0" + +invert-kv@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-3.0.1.tgz#a93c7a3d4386a1dc8325b97da9bb1620c0282523" + integrity sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw== + +ip2country@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/ip2country/-/ip2country-1.0.1.tgz#e2ab284b774b65c89509679fcb82552afcff9804" + integrity sha512-wYhIyQzcP85tKo17HwitnHB7F3vbN+gA7DqZzeE5K1NLfr4XnKZQ1RNsMGm3bNhf1eA3bz9QFjSXo4q6VKRqCw== + dependencies: + asbycountry "^1.4.2" + +is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" + integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.0" + is-typed-array "^1.1.10" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + +is-async-function@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" + integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== + dependencies: + has-tostringtag "^1.0.0" + +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" + integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== + +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + +is-ci@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== + dependencies: + ci-info "^3.2.0" + +is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0: + version "2.13.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" + integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== + dependencies: + hasown "^2.0.0" + +is-date-object@^1.0.1, is-date-object@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" + +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== + +is-finalizationregistry@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6" + integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw== + dependencies: + call-bind "^1.0.2" + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-fullwidth-code-point@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" + integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== + +is-generator-function@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + dependencies: + has-tostringtag "^1.0.0" + +is-glob@^4.0.0, is-glob@^4.0.3, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-installed-globally@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== + dependencies: + global-dirs "^3.0.0" + is-path-inside "^3.0.2" + +is-map@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" + integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== + +is-negative-zero@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== + +is-npm@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" + integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== + +is-number-object@^1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" + integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== + dependencies: + has-tostringtag "^1.0.0" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-path-inside@^3.0.2, is-path-inside@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + +is-plain-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== + +is-plain-obj@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + +is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-set@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" + integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== + +is-shared-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" + integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== + dependencies: + call-bind "^1.0.2" + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" + integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== + +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + +is-text-path@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e" + integrity sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w== + dependencies: + text-extensions "^1.0.0" + +is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: + version "1.1.12" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" + integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== + dependencies: + which-typed-array "^1.1.11" + +is-typedarray@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== + +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + +is-weakmap@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" + integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== + +is-weakref@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== + dependencies: + call-bind "^1.0.2" + +is-weakset@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" + integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + +is-wsl@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +is-yarn-global@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== + +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== + +isbinaryfile@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== + dependencies: + buffer-alloc "^1.2.0" + +isbinaryfile@^4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" + integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== + +iterator.prototype@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0" + integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w== + dependencies: + define-properties "^1.2.1" + get-intrinsic "^1.2.1" + has-symbols "^1.0.3" + reflect.getprototypeof "^1.0.4" + set-function-name "^2.0.1" + +jake@^10.8.5: + version "10.8.7" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" + integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w== + dependencies: + async "^3.2.3" + chalk "^4.0.2" + filelist "^1.0.4" + minimatch "^3.1.2" + +jest-worker@^27.4.5: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jpeg-js@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa" + integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg== + +js-cookie@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" + integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@4.1.0, js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +js2xmlparser@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a" + integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA== + dependencies: + xmlcreate "^2.0.4" + +jsdoc@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e" + integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg== + dependencies: + "@babel/parser" "^7.20.15" + "@jsdoc/salty" "^0.2.1" + "@types/markdown-it" "^12.2.3" + bluebird "^3.7.2" + catharsis "^0.9.0" + escape-string-regexp "^2.0.0" + js2xmlparser "^4.0.2" + klaw "^3.0.0" + markdown-it "^12.3.2" + markdown-it-anchor "^8.4.1" + marked "^4.0.10" + mkdirp "^1.0.4" + requizzle "^0.2.3" + strip-json-comments "^3.1.0" + underscore "~1.13.2" + +jsdom-global@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9" + integrity sha512-t1KMcBkz/pT5JrvcJbpUR2u/w1kO9jXctaaGJ0vZDzwFnIvGWw9IDSRciT83kIs8Bnw4qpOl8bQK08V01YgMPg== + +jsdom@^22.1.0: + version "22.1.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8" + integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw== + dependencies: + abab "^2.0.6" + cssstyle "^3.0.0" + data-urls "^4.0.0" + decimal.js "^10.4.3" + domexception "^4.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.4" + parse5 "^7.1.2" + rrweb-cssom "^0.6.0" + saxes "^6.0.0" + symbol-tree "^3.2.4" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^12.0.1" + ws "^8.13.0" + xml-name-validator "^4.0.0" + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== + +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== + +json-stringify-safe@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== + +json5@0.4.0, json5@^1.0.2, json5@^2.1.2, json5@^2.2.0, json5@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== + optionalDependencies: + graceful-fs "^4.1.6" + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +jsonparse@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== + +"jsx-ast-utils@^2.4.1 || ^3.0.0": + version "3.3.5" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" + integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ== + dependencies: + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + object.assign "^4.1.4" + object.values "^1.1.6" + +just-extend@^4.0.2: + version "4.2.1" + resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744" + integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg== + +keyboardevent-from-electron-accelerator@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz#ace21b1aa4e47148815d160057f9edb66567c50c" + integrity sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA== + +keyboardevents-areequal@^0.2.1: + version "0.2.2" + resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194" + integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw== + +keyv@^4.0.0, keyv@^4.5.3: + version "4.5.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== + dependencies: + json-buffer "3.0.1" + +kind-of@^6.0.2, kind-of@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +klaw-sync@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" + integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== + dependencies: + graceful-fs "^4.1.11" + +klaw@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146" + integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g== + dependencies: + graceful-fs "^4.1.9" + +lamejs@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.1.tgz#0f92d38729213f106d4a19ded20821da7e89c8e4" + integrity sha512-s7bxvjvYthw6oPLCm5pFxvA84wUROODB8jEO2+CE1adhKgrIvVOlmMgY8zyugxGrvRaDHNJanOiS21/emty6dQ== + dependencies: + use-strict "1.0.1" + +latest-version@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== + dependencies: + package-json "^6.3.0" + +lazy-val@^1.0.4, lazy-val@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" + integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== + +lcid@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-3.1.1.tgz#9030ec479a058fc36b5e8243ebaac8b6ac582fd0" + integrity sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg== + dependencies: + invert-kv "^3.0.0" + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.2/libsession_util_nodejs-v0.4.2.tar.gz": + version "0.4.2" + resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.2/libsession_util_nodejs-v0.4.2.tar.gz#b9512520ab37225e1c40e915fe1927cc9551fd91" + dependencies: + cmake-js "^7.2.1" + node-addon-api "^6.1.0" + +libsodium-sumo@^0.7.13: + version "0.7.13" + resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.13.tgz#533b97d2be44b1277e59c1f9f60805978ac5542d" + integrity sha512-zTGdLu4b9zSNLfovImpBCbdAA4xkpkZbMnSQjP8HShyOutnGjRHmSOKlsylh1okao6QhLiz7nG98EGn+04cZjQ== + +libsodium-wrappers-sumo@^0.7.9: + version "0.7.13" + resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.13.tgz#a33aea845a0bb56db067548f04feba28c730ab8e" + integrity sha512-lz4YdplzDRh6AhnLGF2Dj2IUj94xRN6Bh8T0HLNwzYGwPehQJX6c7iYVrFUPZ3QqxE0bqC+K0IIqqZJYWumwSQ== + dependencies: + libsodium-sumo "^0.7.13" + +lilconfig@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" + integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== + +lines-and-columns@^1.1.6: + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== + +linkify-it@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e" + integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ== + dependencies: + uc.micro "^1.0.1" + +linkify-it@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec" + integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw== + dependencies: + uc.micro "^1.0.1" + +lint-staged@^14.0.1: + version "14.0.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-14.0.1.tgz#57dfa3013a3d60762d9af5d9c83bdb51291a6232" + integrity sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw== + dependencies: + chalk "5.3.0" + commander "11.0.0" + debug "4.3.4" + execa "7.2.0" + lilconfig "2.1.0" + listr2 "6.6.1" + micromatch "4.0.5" + pidtree "0.6.0" + string-argv "0.3.2" + yaml "2.3.1" + +listr2@6.6.1: + version "6.6.1" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-6.6.1.tgz#08b2329e7e8ba6298481464937099f4a2cd7f95d" + integrity sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg== + dependencies: + cli-truncate "^3.1.0" + colorette "^2.0.20" + eventemitter3 "^5.0.1" + log-update "^5.0.1" + rfdc "^1.3.0" + wrap-ansi "^8.1.0" + +loader-runner@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" + integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== + +loader-utils@^2.0.0, loader-utils@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" + integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + +lodash-es@^4.2.1: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== + +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== + +lodash.escaperegexp@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347" + integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw== + +lodash.get@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== + +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== + +lodash.isfunction@^3.0.9: + version "3.0.9" + resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" + integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw== + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== + +lodash.kebabcase@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" + integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g== + +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash.mergewith@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" + integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ== + +lodash.snakecase@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" + integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw== + +lodash.startcase@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8" + integrity sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg== + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== + +lodash.upperfirst@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" + integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== + +lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-symbols@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" + +log-update@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09" + integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw== + dependencies: + ansi-escapes "^5.0.0" + cli-cursor "^4.0.0" + slice-ansi "^5.0.0" + strip-ansi "^7.0.1" + wrap-ansi "^8.0.1" + +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + +long@^5.0.0: + version "5.2.3" + resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" + integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== + +long@~3: + version "3.2.0" + resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" + integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg== + +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +loupe@^2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697" + integrity sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA== + dependencies: + get-func-name "^2.0.1" + +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +make-error@^1.1.1: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + +map-age-cleaner@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" + integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== + dependencies: + p-defer "^1.0.0" + +map-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== + +map-obj@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" + integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== + +markdown-it-anchor@^8.4.1: + version "8.6.7" + resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634" + integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA== + +markdown-it@^12.3.2: + version "12.3.2" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90" + integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== + dependencies: + argparse "^2.0.1" + entities "~2.1.0" + linkify-it "^3.0.1" + mdurl "^1.0.1" + uc.micro "^1.0.5" + +marked@^4.0.10: + version "4.3.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" + integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== + +matcher@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" + integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== + dependencies: + escape-string-regexp "^4.0.0" + +mdn-data@2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== + +mdurl@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" + integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g== + +mem@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/mem/-/mem-5.1.1.tgz#7059b67bf9ac2c924c9f1cff7155a064394adfb3" + integrity sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw== + dependencies: + map-age-cleaner "^0.1.3" + mimic-fn "^2.1.0" + p-is-promise "^2.1.0" + +memory-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-1.0.0.tgz#481dfd259ccdf57b03ec2c9632960044180e73c2" + integrity sha512-Wm13VcsPIMdG96dzILfij09PvuS3APtcKNh7M28FsCA/w6+1mjR7hhPmfFNoilX9xU7wTdhsH5lJAm6XNzdtww== + dependencies: + readable-stream "^3.4.0" + +meow@^8.0.0, meow@^8.1.2: + version "8.1.2" + resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" + integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q== + dependencies: + "@types/minimist" "^1.2.0" + camelcase-keys "^6.2.2" + decamelize-keys "^1.1.0" + hard-rejection "^2.1.0" + minimist-options "4.1.0" + normalize-package-data "^3.0.0" + read-pkg-up "^7.0.1" + redent "^3.0.0" + trim-newlines "^3.0.0" + type-fest "^0.18.0" + yargs-parser "^20.2.3" + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.3.0, merge2@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +mic-recorder-to-mp3@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/mic-recorder-to-mp3/-/mic-recorder-to-mp3-2.2.2.tgz#32e767d1196fb81d10e279f31c304350c9501d01" + integrity sha512-xDkOaHbojW3bdKOGn9CI5dT+Mc0RrfczsX/Y1zGJp3FUB4zei5ZKFnNm7Nguc9v910wkd7T3csnCTq5EtCF3Zw== + dependencies: + lamejs "^1.2.0" + +micromatch@4.0.5, micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + dependencies: + braces "^3.0.2" + picomatch "^2.3.1" + +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12, mime-types@^2.1.27: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +mime@^2.5.2: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" + integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== + +mimic-response@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + +min-indent@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" + integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== + +mini-css-extract-plugin@^2.7.5: + version "2.7.6" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz#282a3d38863fddcd2e0c220aaed5b90bc156564d" + integrity sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw== + dependencies: + schema-utils "^4.0.0" + +"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@9.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +minimist-options@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" + integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== + dependencies: + arrify "^1.0.1" + is-plain-obj "^1.1.0" + kind-of "^6.0.3" + +minimist@^1.2.0, minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + +minipass@^3.0.0: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== + dependencies: + yallist "^4.0.0" + +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + +minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +mkdirp@~0.5.1: + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== + dependencies: + minimist "^1.2.6" + +mocha@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9" + integrity sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA== + dependencies: + "@ungap/promise-all-settled" "1.1.2" + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.3" + debug "4.3.4" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.2.0" + he "1.2.0" + js-yaml "4.1.0" + log-symbols "4.1.0" + minimatch "5.0.1" + ms "2.1.3" + nanoid "3.3.3" + serialize-javascript "6.0.0" + strip-json-comments "3.1.1" + supports-color "8.1.1" + workerpool "6.2.1" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + +moment@^2.19.3, moment@^2.29.4: + version "2.30.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" + integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@2.1.3, ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +mv@~2: + version "2.1.1" + resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2" + integrity sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg== + dependencies: + mkdirp "~0.5.1" + ncp "~2.0.0" + rimraf "~2.4.0" + +nano-css@^5.6.1: + version "5.6.1" + resolved "https://registry.yarnpkg.com/nano-css/-/nano-css-5.6.1.tgz#964120cb1af6cccaa6d0717a473ccd876b34c197" + integrity sha512-T2Mhc//CepkTa3X4pUhKgbEheJHYAxD0VptuqFhDbGMUWVV2m+lkNiW/Ieuj35wrfC8Zm0l7HvssQh7zcEttSw== + dependencies: + "@jridgewell/sourcemap-codec" "^1.4.15" + css-tree "^1.1.2" + csstype "^3.1.2" + fastest-stable-stringify "^2.0.2" + inline-style-prefixer "^7.0.0" + rtl-css-js "^1.16.1" + stacktrace-js "^2.0.2" + stylis "^4.3.0" + +nanoid@3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" + integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== + +nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== + +ncp@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" + integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA== + +neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +nise@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/nise/-/nise-4.1.0.tgz#8fb75a26e90b99202fa1e63f448f58efbcdedaf6" + integrity sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA== + dependencies: + "@sinonjs/commons" "^1.7.0" + "@sinonjs/fake-timers" "^6.0.0" + "@sinonjs/text-encoding" "^0.7.1" + just-extend "^4.0.2" + path-to-regexp "^1.7.0" + +node-addon-api@^1.6.3: + version "1.7.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== + +node-addon-api@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76" + integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA== + +node-api-headers@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-0.0.2.tgz#31f4c6c2750b63e598128e76a60aefca6d76ac5d" + integrity sha512-YsjmaKGPDkmhoNKIpkChtCsPVaRE0a274IdERKnuc/E8K1UJdBZ4/mvI006OijlQZHCfpRNOH3dfHQs92se8gg== + +node-fetch@^2.6.7: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + +node-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562" + integrity sha512-I5VN34NO4/5UYJaUBtkrODPWxbobrE4hgDqPrjB25yPkonFhCmZ146vTH+Zg417E9Iwoh1l/MbRs1apc5J295Q== + dependencies: + loader-utils "^2.0.0" + +node-releases@^2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" + integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== + +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-package-data@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" + integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== + dependencies: + hosted-git-info "^4.0.1" + is-core-module "^2.5.0" + semver "^7.3.4" + validate-npm-package-license "^3.0.1" + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== + +npm-run-path@^4.0.0, npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +npm-run-path@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.2.0.tgz#224cdd22c755560253dd71b83a1ef2f758b2e955" + integrity sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg== + dependencies: + path-key "^4.0.0" + +npmlog@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" + +nwsapi@^2.2.4: + version "2.2.7" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" + integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== + +object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + +object-inspect@^1.13.1, object-inspect@^1.9.0: + version "1.13.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" + integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== + +object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object.assign@^4.1.2, object.assign@^4.1.4: + version "4.1.5" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" + integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== + dependencies: + call-bind "^1.0.5" + define-properties "^1.2.1" + has-symbols "^1.0.3" + object-keys "^1.1.1" + +object.entries@^1.1.5, object.entries@^1.1.6: + version "1.1.7" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131" + integrity sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + +object.fromentries@^2.0.6, object.fromentries@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" + integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + +object.groupby@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee" + integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + +object.hasown@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.3.tgz#6a5f2897bb4d3668b8e79364f98ccf971bda55ae" + integrity sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA== + dependencies: + define-properties "^1.2.0" + es-abstract "^1.22.1" + +object.values@^1.1.6, object.values@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a" + integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== + dependencies: + wrappy "1" + +onetime@^5.1.0, onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +onetime@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" + integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ== + dependencies: + mimic-fn "^4.0.0" + +open@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +optionator@^0.9.3: + version "0.9.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" + integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== + dependencies: + "@aashutoshrathi/word-wrap" "^1.2.3" + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + +os-homedir@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== + +os-locale@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-5.0.0.tgz#6d26c1d95b6597c5d5317bf5fba37eccec3672e0" + integrity sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA== + dependencies: + execa "^4.0.0" + lcid "^3.0.0" + mem "^5.0.0" + +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== + +p-cancelable@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" + integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== + +p-defer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" + integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw== + +p-is-promise@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" + integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +p-retry@^4.2.0: + version "4.6.2" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" + integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== + dependencies: + "@types/retry" "0.12.0" + retry "^0.13.1" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +package-json@^6.3.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== + dependencies: + got "^9.6.0" + registry-auth-token "^4.0.0" + registry-url "^5.0.0" + semver "^6.2.0" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-json@^5.0.0, parse-json@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +parse5@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + dependencies: + entities "^4.4.0" + +patch-package@^6.4.7: + version "6.5.1" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.5.1.tgz#3e5d00c16997e6160291fee06a521c42ac99b621" + integrity sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + chalk "^4.1.2" + cross-spawn "^6.0.5" + find-yarn-workspace-root "^2.0.0" + fs-extra "^9.0.0" + is-ci "^2.0.0" + klaw-sync "^6.0.0" + minimist "^1.2.6" + open "^7.4.2" + rimraf "^2.6.3" + semver "^5.6.0" + slash "^2.0.0" + tmp "^0.0.33" + yaml "^1.10.2" + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== + +path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-key@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" + integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== + +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-to-regexp@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== + dependencies: + isarray "0.0.1" + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +pathval@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" + integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== + +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pidtree@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c" + integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== + +pify@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== + +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +plist@^3.0.1, plist@^3.0.4: + version "3.1.0" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" + integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ== + dependencies: + "@xmldom/xmldom" "^0.8.8" + base64-js "^1.5.1" + xmlbuilder "^15.1.1" + +postcss-modules-extract-imports@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== + +postcss-modules-local-by-default@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524" + integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA== + dependencies: + icss-utils "^5.0.0" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.1.0" + +postcss-modules-scope@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.1.0.tgz#fbfddfda93a31f310f1d152c2bb4d3f3c5592ee0" + integrity sha512-SaIbK8XW+MZbd0xHPf7kdfA/3eOt7vxJ72IRecn3EzuZVLr1r0orzf0MX/pN8m+NMDoo6X/SQd8oeKqGZd8PXg== + dependencies: + postcss-selector-parser "^6.0.4" + +postcss-modules-values@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== + dependencies: + icss-utils "^5.0.0" + +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: + version "6.0.15" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535" + integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== + +postcss@^8.4.21: + version "8.4.33" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742" + integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.0.2" + +postinstall-prepare@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/postinstall-prepare/-/postinstall-prepare-1.0.1.tgz#dac9b5d91b054389141b13c0192eb68a0aa002b5" + integrity sha512-4zxO4DjrV0XfD+ABUFEP0MiQmhKOGBnov5LfLsra/XVOUcQ5gMLLMcV3b8K8wJUfNDv1ozleGblYb06gPbjVUQ== + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== + +prettier@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.1.tgz#6ba9f23165d690b6cbdaa88cb0807278f7019848" + integrity sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw== + +progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + +prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.13.1" + +protobufjs-cli@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.2.tgz#b32a7dc6aa3866cc103278539561bb4758249c8b" + integrity sha512-8ivXWxT39gZN4mm4ArQyJrRgnIwZqffBWoLDsE21TmMcKI3XwJMV4lEF2WU02C4JAtgYYc2SfJIltelD8to35g== + dependencies: + chalk "^4.0.0" + escodegen "^1.13.0" + espree "^9.0.0" + estraverse "^5.1.0" + glob "^8.0.0" + jsdoc "^4.0.0" + minimist "^1.2.0" + semver "^7.1.2" + tmp "^0.2.1" + uglify-js "^3.7.7" + +protobufjs@^7.2.4: + version "7.2.5" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.5.tgz#45d5c57387a6d29a17aab6846dcc283f9b8e7f2d" + integrity sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/node" ">=13.7.0" + long "^5.0.0" + +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +psl@^1.1.33, psl@^1.1.7: + version "1.9.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" + integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== + +pupa@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== + dependencies: + escape-goat "^2.0.0" + +qr.js@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f" + integrity sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ== + +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +quick-lru@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" + integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== + +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== + +rambda@^7.4.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.5.0.tgz#1865044c59bc0b16f63026c6e5a97e4b1bbe98fe" + integrity sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA== + +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +rc-slider@^10.2.1: + version "10.5.0" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.5.0.tgz#1bd4853d114cb3403b67c485125887adb6a2a117" + integrity sha512-xiYght50cvoODZYI43v3Ylsqiw14+D7ELsgzR40boDZaya1HFa1Etnv9MDkQE8X/UrXAffwv2AcNAhslgYuDTw== + dependencies: + "@babel/runtime" "^7.10.1" + classnames "^2.2.5" + rc-util "^5.27.0" + +rc-util@^5.27.0: + version "5.38.1" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.38.1.tgz#4915503b89855f5c5cd9afd4c72a7a17568777bb" + integrity sha512-e4ZMs7q9XqwTuhIK7zBIVFltUtMSjphuPPQXHoHlzRzNdOwUxDejo0Zls5HYaJfRKNURcsS/ceKVULlhjBrxng== + dependencies: + "@babel/runtime" "^7.18.3" + react-is "^18.2.0" + +rc@1.2.8, rc@^1.2.7, rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +react-contexify@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/react-contexify/-/react-contexify-6.0.0.tgz#52959bb507d6a31224fe870ae147e211e359abe1" + integrity sha512-jMhz6yZI81Jv3UDj7TXqCkhdkCFEEmvwGCPXsQuA2ZUC8EbCuVQ6Cy8FzKMXa0y454XTDClBN2YFvvmoFlrFkg== + dependencies: + clsx "^1.2.1" + +react-dom@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler "^0.20.2" + +react-draggable@^4.4.4: + version "4.4.6" + resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.6.tgz#63343ee945770881ca1256a5b6fa5c9f5983fe1e" + integrity sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw== + dependencies: + clsx "^1.1.1" + prop-types "^15.8.1" + +react-h5-audio-player@^3.2.0: + version "3.9.1" + resolved "https://registry.yarnpkg.com/react-h5-audio-player/-/react-h5-audio-player-3.9.1.tgz#8a9721fd7a5ff6a9185ce626435207bee1774e83" + integrity sha512-ILJdTXZgHEfv7WsvYPoN7afJncroYyg5Cxvs2qqrsnTzhtBdEuzlM0ETkhUhjqXOsAkbwAdHF9YgnEwgBJ8dCQ== + dependencies: + "@babel/runtime" "^7.10.2" + "@iconify/react" "^4.1.1" + +react-intersection-observer@^8.30.3: + version "8.34.0" + resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-8.34.0.tgz#6f6e67831c52e6233f6b6cc7eb55814820137c42" + integrity sha512-TYKh52Zc0Uptp5/b4N91XydfSGKubEhgZRtcg1rhTKABXijc4Sdr1uTp5lJ8TN27jwUsdXxjHXtHa0kPj704sw== + +react-is@^16.13.1, react-is@^16.7.0: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + +react-is@^18.0.0, react-is@^18.2.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== + +react-lifecycles-compat@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" + integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== + +react-mentions@^4.4.9: + version "4.4.10" + resolved "https://registry.yarnpkg.com/react-mentions/-/react-mentions-4.4.10.tgz#ae6c1e310a405597e83ce786f12c5bfb93b097ce" + integrity sha512-JHiQlgF1oSZR7VYPjq32wy97z1w1oE4x10EuhKjPr4WUKhVzG1uFQhQjKqjQkbVqJrmahf+ldgBTv36NrkpKpA== + dependencies: + "@babel/runtime" "7.4.5" + invariant "^2.2.4" + prop-types "^15.5.8" + substyle "^9.1.0" + +react-qr-svg@^2.2.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/react-qr-svg/-/react-qr-svg-2.4.0.tgz#c703d95907b9713192730a5bbeffb57e4aa782bd" + integrity sha512-3Q/LyjBi+eWjJ0WyZvBzyY3rCMlUBZyRnbTcKbXQ39J1bd0/vgqYhXoYai7XlDTS42Ro50BBY4TmeUVyIZh+nA== + dependencies: + prop-types "^15.5.8" + qr.js "0.0.0" + +react-redux@8.0.4: + version "8.0.4" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.0.4.tgz#80c31dffa8af9526967c4267022ae1525ff0e36a" + integrity sha512-yMfQ7mX6bWuicz2fids6cR1YT59VTuT8MKyyE310wJQlINKENCeT1UcPdEiX6znI5tF8zXyJ/VYvDgeGuaaNwQ== + dependencies: + "@babel/runtime" "^7.12.1" + "@types/hoist-non-react-statics" "^3.3.1" + "@types/use-sync-external-store" "^0.0.3" + hoist-non-react-statics "^3.3.2" + react-is "^18.0.0" + use-sync-external-store "^1.0.0" + +react-toastify@^6.0.9: + version "6.2.0" + resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-6.2.0.tgz#f2d76747c70b9de91f71f253d9feae6b53dc836c" + integrity sha512-XpjFrcBhQ0/nBOL4syqgP/TywFnOyxmstYLWgSQWcj39qpp+WU4vPt3C/ayIDx7RFyxRWfzWTdR2qOcDGo7G0w== + dependencies: + clsx "^1.1.1" + prop-types "^15.7.2" + react-transition-group "^4.4.1" + +react-transition-group@^4.4.1: + version "4.4.5" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1" + integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + +react-universal-interface@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b" + integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw== + +react-use@^17.4.0: + version "17.4.2" + resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.4.2.tgz#26d43c774ccb733a17a87be62e12fbcbc5654173" + integrity sha512-1jPtmWLD8OJJNYCdYLJEH/HM+bPDfJuyGwCYeJFgPmWY8ttwpgZnW5QnzgM55CYUByUiTjHxsGOnEpLl6yQaoQ== + dependencies: + "@types/js-cookie" "^2.2.6" + "@xobotyi/scrollbar-width" "^1.9.5" + copy-to-clipboard "^3.3.1" + fast-deep-equal "^3.1.3" + fast-shallow-equal "^1.0.0" + js-cookie "^2.2.1" + nano-css "^5.6.1" + react-universal-interface "^0.6.2" + resize-observer-polyfill "^1.5.1" + screenfull "^5.1.0" + set-harmonic-interval "^1.0.1" + throttle-debounce "^3.0.1" + ts-easing "^0.2.0" + tslib "^2.1.0" + +react-virtualized@^9.22.4: + version "9.22.5" + resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.5.tgz#bfb96fed519de378b50d8c0064b92994b3b91620" + integrity sha512-YqQMRzlVANBv1L/7r63OHa2b0ZsAaDp1UhVNEdUaXI8A5u6hTpA5NYtUueLH2rFuY/27mTGIBl7ZhqFKzw18YQ== + dependencies: + "@babel/runtime" "^7.7.2" + clsx "^1.0.4" + dom-helpers "^5.1.3" + loose-envify "^1.4.0" + prop-types "^15.7.2" + react-lifecycles-compat "^3.0.4" + +react@17.0.2, react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +read-config-file@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" + integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== + dependencies: + dotenv "^9.0.2" + dotenv-expand "^5.1.0" + js-yaml "^4.1.0" + json5 "^2.2.0" + lazy-val "^1.0.4" + +read-last-lines-ts@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/read-last-lines-ts/-/read-last-lines-ts-1.2.1.tgz#99e46288c5373c06e16e90e666a46b595dad80a1" + integrity sha512-1VcCrAU38DILYiF4sbNY13zdrMGwrFqjGQnXJy28G1zLJItvnWtgCbqoAJlnZZSiEICMKdM4Ol7LYvVMEoKrAg== + +read-pkg-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + +read-pkg@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + +readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== + dependencies: + resolve "^1.20.0" + +redent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" + integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== + dependencies: + indent-string "^4.0.0" + strip-indent "^3.0.0" + +redux-logger@3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf" + integrity sha512-JoCIok7bg/XpqA1JqCqXFypuqBbQzGQySrhFzewB7ThcnysTO30l4VCst86AuB9T9tuT03MAA56Jw2PNhRSNCg== + dependencies: + deep-diff "^0.3.5" + +redux-persist@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8" + integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ== + +redux-promise-middleware@^6.1.2: + version "6.2.0" + resolved "https://registry.yarnpkg.com/redux-promise-middleware/-/redux-promise-middleware-6.2.0.tgz#d139dfef50992d456860f8cf07a12085bd53f89d" + integrity sha512-TEzfMeLX63gju2WqkdFQlQMvUGYzFvJNePIJJsBlbPHs3Txsbc/5Rjhmtha1XdMU6lkeiIlp1Qx7AR3Zo9he9g== + +redux-thunk@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b" + integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q== + +redux@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13" + integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA== + dependencies: + "@babel/runtime" "^7.9.2" + +redux@^3.6.0: + version "3.7.2" + resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" + integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A== + dependencies: + lodash "^4.2.1" + lodash-es "^4.2.1" + loose-envify "^1.1.0" + symbol-observable "^1.0.3" + +redux@^4.0.0, redux@^4.1.2: + version "4.2.1" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197" + integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w== + dependencies: + "@babel/runtime" "^7.9.2" + +reflect.getprototypeof@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz#aaccbf41aca3821b87bb71d9dcbc7ad0ba50a3f3" + integrity sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + globalthis "^1.0.3" + which-builtin-type "^1.1.3" + +regenerator-runtime@^0.13.2: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== + +regenerator-runtime@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== + +regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" + integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + set-function-name "^2.0.0" + +registry-auth-token@^4.0.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" + integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== + dependencies: + rc "1.2.8" + +registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== + dependencies: + rc "^1.2.8" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + +requizzle@^0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c" + integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw== + dependencies: + lodash "^4.17.21" + +reselect@^4.1.5: + version "4.1.8" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524" + integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ== + +resize-observer-polyfill@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" + integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== + +resolve-alpn@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" + integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@5.0.0, resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-global@1.0.0, resolve-global@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255" + integrity sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw== + dependencies: + global-dirs "^0.1.1" + +resolve-pkg-maps@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" + integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== + +resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.4: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +resolve@^2.0.0-next.4: + version "2.0.0-next.5" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c" + integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +responselike@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" + integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== + dependencies: + lowercase-keys "^2.0.0" + +restore-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9" + integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + +retry@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" + integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rfdc@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" + integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== + +rimraf@2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w== + dependencies: + glob "^7.0.5" + +rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^3.0.0, rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +rimraf@~2.4.0: + version "2.4.5" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" + integrity sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ== + dependencies: + glob "^6.0.1" + +roarr@^2.15.3: + version "2.15.4" + resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" + integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== + dependencies: + boolean "^3.0.1" + detect-node "^2.0.4" + globalthis "^1.0.1" + json-stringify-safe "^5.0.1" + semver-compare "^1.0.0" + sprintf-js "^1.1.2" + +rrweb-cssom@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1" + integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw== + +rtl-css-js@^1.16.1: + version "1.16.1" + resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.16.1.tgz#4b48b4354b0ff917a30488d95100fbf7219a3e80" + integrity sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg== + dependencies: + "@babel/runtime" "^7.1.2" + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +run-script-os@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347" + integrity sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw== + +safe-array-concat@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c" + integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + has-symbols "^1.0.3" + isarray "^2.0.5" + +safe-buffer@^5.1.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-json-stringify@~1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" + integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg== + +safe-regex-test@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" + integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.3" + is-regex "^1.1.4" + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sanitize-filename@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" + integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== + dependencies: + truncate-utf8-bytes "^1.0.0" + +sanitize.css@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-12.0.1.tgz#f20369357557ba2b41d7278eeb3ea691a3bee514" + integrity sha512-QbusSBnWHaRBZeTxsJyknwI0q+q6m1NtLBmB76JfW/rdVN7Ws6Zz70w65+430/ouVcdNVT3qwrDgrM6PaYyRtw== + +sass-loader@^13.2.2: + version "13.3.3" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.3.tgz#60df5e858788cffb1a3215e5b92e9cba61e7e133" + integrity sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA== + dependencies: + neo-async "^2.6.2" + +sass@^1.60.0: + version "1.69.7" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.7.tgz#6e7e1c8f51e8162faec3e9619babc7da780af3b7" + integrity sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + +sax@^1.2.4: + version "1.3.0" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0" + integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA== + +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== + dependencies: + xmlchars "^2.2.0" + +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +schema-utils@^3.1.1, schema-utils@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" + integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + +schema-utils@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" + integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.9.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.1.0" + +screenfull@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba" + integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA== + +sdp@^2.1.0: + version "2.12.0" + resolved "https://registry.yarnpkg.com/sdp/-/sdp-2.12.0.tgz#338a106af7560c86e4523f858349680350d53b22" + integrity sha512-jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw== + +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== + +semver-diff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== + dependencies: + semver "^6.3.0" + +"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0: + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== + +semver@7.5.4, semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + +serialize-error@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" + integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== + dependencies: + type-fest "^0.13.1" + +serialize-javascript@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + dependencies: + randombytes "^2.1.0" + +serialize-javascript@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" + integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== + dependencies: + randombytes "^2.1.0" + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== + +set-function-length@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed" + integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ== + dependencies: + define-data-property "^1.1.1" + get-intrinsic "^1.2.1" + gopd "^1.0.1" + has-property-descriptors "^1.0.0" + +set-function-name@^2.0.0, set-function-name@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" + integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA== + dependencies: + define-data-property "^1.0.1" + functions-have-names "^1.2.3" + has-property-descriptors "^1.0.0" + +set-harmonic-interval@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249" + integrity sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g== + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + +shallowequal@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + +signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + +sinon@9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d" + integrity sha512-0uF8Q/QHkizNUmbK3LRFqx5cpTttEVXudywY9Uwzy8bTfZUhljZ7ARzSxnRHWYWtVTeh4Cw+tTb3iU21FQVO9A== + dependencies: + "@sinonjs/commons" "^1.7.2" + "@sinonjs/fake-timers" "^6.0.1" + "@sinonjs/formatio" "^5.0.1" + "@sinonjs/samsam" "^5.0.3" + diff "^4.0.2" + nise "^4.0.1" + supports-color "^7.1.0" + +slash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +slice-ansi@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" + integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== + dependencies: + ansi-styles "^6.0.0" + is-fullwidth-code-point "^4.0.0" + +smart-buffer@^4.0.2: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== + +source-map-support@^0.5.19, source-map-support@~0.5.20: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@0.5.6: + version "0.5.6" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" + integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA== + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@^0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + +spdx-correct@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" + integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.16" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" + integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== + +split2@^3.0.0, split2@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" + integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== + dependencies: + readable-stream "^3.0.0" + +sprintf-js@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" + integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== + +stack-generator@^2.0.5: + version "2.0.10" + resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.10.tgz#8ae171e985ed62287d4f1ed55a1633b3fb53bb4d" + integrity sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ== + dependencies: + stackframe "^1.3.4" + +stackframe@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" + integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== + +stacktrace-gps@^3.0.4: + version "3.1.2" + resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz#0c40b24a9b119b20da4525c398795338966a2fb0" + integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ== + dependencies: + source-map "0.5.6" + stackframe "^1.3.4" + +stacktrace-js@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/stacktrace-js/-/stacktrace-js-2.0.2.tgz#4ca93ea9f494752d55709a081d400fdaebee897b" + integrity sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg== + dependencies: + error-stack-parser "^2.0.6" + stack-generator "^2.0.5" + stacktrace-gps "^3.0.4" + +stat-mode@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" + integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== + +string-argv@0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" + integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^5.0.0, string-width@^5.0.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + +string.prototype.matchall@^4.0.8: + version "4.0.10" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100" + integrity sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + has-symbols "^1.0.3" + internal-slot "^1.0.5" + regexp.prototype.flags "^1.5.0" + set-function-name "^2.0.0" + side-channel "^1.0.4" + +string.prototype.trim@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" + integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + +string.prototype.trimend@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" + integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + +string.prototype.trimstart@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" + integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +strip-ansi@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== + dependencies: + ansi-regex "^2.0.0" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-final-newline@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" + integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== + +strip-indent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" + integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== + dependencies: + min-indent "^1.0.0" + +strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== + +styled-components@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d" + integrity sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/traverse" "^7.4.5" + "@emotion/is-prop-valid" "^0.8.8" + "@emotion/stylis" "^0.8.4" + "@emotion/unitless" "^0.7.4" + babel-plugin-styled-components ">= 1" + css-to-react-native "^3.0.0" + hoist-non-react-statics "^3.0.0" + shallowequal "^1.1.0" + supports-color "^5.5.0" + +stylis@^4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.1.tgz#ed8a9ebf9f76fe1e12d462f5cc3c4c980b23a7eb" + integrity sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ== + +substyle@^9.1.0: + version "9.4.1" + resolved "https://registry.yarnpkg.com/substyle/-/substyle-9.4.1.tgz#6a4647f363bc14fecc51aac371d4dbeda082aa50" + integrity sha512-VOngeq/W1/UkxiGzeqVvDbGDPM8XgUyJVWjrqeh+GgKqspEPiLYndK+XRcsKUHM5Muz/++1ctJ1QCF/OqRiKWA== + dependencies: + "@babel/runtime" "^7.3.4" + invariant "^2.2.4" + +sumchecker@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" + integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== + dependencies: + debug "^4.1.0" + +supports-color@8.1.1, supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-color@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== + +supports-color@^5.3.0, supports-color@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +symbol-observable@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + +tapable@^2.1.1, tapable@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== + +tar@^6.1.0, tar@^6.1.11: + version "6.2.0" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" + integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^5.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +temp-file@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" + integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== + dependencies: + async-exit-hook "^2.0.1" + fs-extra "^10.0.0" + +terser-webpack-plugin@^5.3.7: + version "5.3.10" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" + integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== + dependencies: + "@jridgewell/trace-mapping" "^0.3.20" + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.1" + terser "^5.26.0" + +terser@^5.14.2, terser@^5.26.0: + version "5.26.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.26.0.tgz#ee9f05d929f4189a9c28a0feb889d96d50126fe1" + integrity sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ== + dependencies: + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" + commander "^2.20.0" + source-map-support "~0.5.20" + +text-extensions@^1.0.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" + integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ== + +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== + +throttle-debounce@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb" + integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg== + +through2@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" + integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw== + dependencies: + readable-stream "3" + +"through@>=2.2.7 <3": + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== + +tmp-promise@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" + integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== + dependencies: + tmp "^0.2.0" + +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + +tmp@^0.2.0, tmp@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toggle-selection@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" + integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ== + +tough-cookie@^4.1.2: + version "4.1.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" + integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + +tr46@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469" + integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw== + dependencies: + punycode "^2.3.0" + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + +trim-newlines@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" + integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== + +truncate-utf8-bytes@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" + integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== + dependencies: + utf8-byte-length "^1.0.1" + +ts-api-utils@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331" + integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg== + +ts-easing@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/ts-easing/-/ts-easing-0.2.0.tgz#c8a8a35025105566588d87dbda05dd7fbfa5a4ec" + integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ== + +ts-loader@^9.4.2: + version "9.5.1" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.1.tgz#63d5912a86312f1fbe32cef0859fb8b2193d9b89" + integrity sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg== + dependencies: + chalk "^4.1.0" + enhanced-resolve "^5.0.0" + micromatch "^4.0.0" + semver "^7.3.4" + source-map "^0.7.4" + +ts-node@^10.8.1: + version "10.9.2" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f" + integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ== + dependencies: + "@cspotcode/source-map-support" "^0.8.0" + "@tsconfig/node10" "^1.0.7" + "@tsconfig/node12" "^1.0.7" + "@tsconfig/node14" "^1.0.0" + "@tsconfig/node16" "^1.0.2" + acorn "^8.4.1" + acorn-walk "^8.1.1" + arg "^4.1.0" + create-require "^1.1.0" + diff "^4.0.1" + make-error "^1.1.1" + v8-compile-cache-lib "^3.0.1" + yn "3.1.1" + +tsconfig-paths@^3.15.0: + version "3.15.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" + integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.2" + minimist "^1.2.6" + strip-bom "^3.0.0" + +tslib@^2.1.0: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== + dependencies: + prelude-ls "~1.1.2" + +type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + +type-fest@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" + integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== + +type-fest@^0.18.0: + version "0.18.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" + integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +type-fest@^1.0.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" + integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== + +typed-array-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" + integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + is-typed-array "^1.1.10" + +typed-array-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" + integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + +typed-array-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" + integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + +typed-array-length@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" + integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + is-typed-array "^1.1.9" + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + +"typescript@^4.6.4 || ^5.2.2", typescript@^5.1.6: + version "5.3.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" + integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== + +uc.micro@^1.0.1, uc.micro@^1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" + integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== + +uglify-js@^3.7.7: + version "3.17.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" + integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== + +unbox-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" + integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== + dependencies: + call-bind "^1.0.2" + has-bigints "^1.0.2" + has-symbols "^1.0.3" + which-boxed-primitive "^1.0.2" + +underscore@>=1.8.3, underscore@~1.13.2: + version "1.13.6" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" + integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== + +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + +unique-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== + dependencies: + crypto-random-string "^2.0.0" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + +universalify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" + integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== + +universalify@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" + integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== + +update-browserslist-db@^1.0.13: + version "1.0.13" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" + integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + +update-notifier@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== + dependencies: + boxen "^5.0.0" + chalk "^4.1.0" + configstore "^5.0.1" + has-yarn "^2.1.0" + import-lazy "^2.1.0" + is-ci "^2.0.0" + is-installed-globally "^0.4.0" + is-npm "^5.0.0" + is-yarn-global "^0.3.0" + latest-version "^5.1.0" + pupa "^2.1.1" + semver "^7.3.4" + semver-diff "^3.1.1" + xdg-basedir "^4.0.0" + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-join@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" + integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== + +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +use-strict@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0" + integrity sha512-IeiWvvEXfW5ltKVMkxq6FvNf2LojMKvB2OCeja6+ct24S1XOmQw2dGr2JyndwACWAGJva9B7yPHwAmeA9QCqAQ== + +use-sync-external-store@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" + integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== + +utf8-byte-length@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" + integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== + +util-deprecate@^1.0.1, util-deprecate@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + +uuid@8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + +v8-compile-cache-lib@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" + integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +verror@^1.10.0: + version "1.10.1" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" + integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +w3c-xmlserializer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" + integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== + dependencies: + xml-name-validator "^4.0.0" + +watchpack@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" + integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== + +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + +webpack-cli@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== + dependencies: + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" + colorette "^2.0.14" + commander "^10.0.1" + cross-spawn "^7.0.3" + envinfo "^7.7.3" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^3.1.1" + rechoir "^0.8.0" + webpack-merge "^5.7.3" + +webpack-merge@^5.7.3: + version "5.10.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" + integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA== + dependencies: + clone-deep "^4.0.1" + flat "^5.0.2" + wildcard "^2.0.0" + +webpack-sources@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" + integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== + +webpack@^5.76.3: + version "5.89.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc" + integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw== + dependencies: + "@types/eslint-scope" "^3.7.3" + "@types/estree" "^1.0.0" + "@webassemblyjs/ast" "^1.11.5" + "@webassemblyjs/wasm-edit" "^1.11.5" + "@webassemblyjs/wasm-parser" "^1.11.5" + acorn "^8.7.1" + acorn-import-assertions "^1.9.0" + browserslist "^4.14.5" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.15.0" + es-module-lexer "^1.2.1" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.9" + json-parse-even-better-errors "^2.3.1" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.2.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.3.7" + watchpack "^2.4.0" + webpack-sources "^3.2.3" + +webrtc-adapter@^4.1.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-4.2.2.tgz#17896c047084fd4c567958a0cd4321e17f32773c" + integrity sha512-JV2mqgwd8K+n0YrwohZgpZceojJRmC+1CsSTNOTdjDOKwCpffeY49d/0lks7dzw+nMtz8XQs9yaUafXh4iCINg== + dependencies: + sdp "^2.1.0" + +whatwg-encoding@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" + integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== + dependencies: + iconv-lite "0.6.3" + +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + +whatwg-url@^12.0.0, whatwg-url@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c" + integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ== + dependencies: + tr46 "^4.1.1" + webidl-conversions "^7.0.0" + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which-builtin-type@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b" + integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw== + dependencies: + function.prototype.name "^1.1.5" + has-tostringtag "^1.0.0" + is-async-function "^2.0.0" + is-date-object "^1.0.5" + is-finalizationregistry "^1.0.2" + is-generator-function "^1.0.10" + is-regex "^1.1.4" + is-weakref "^1.0.2" + isarray "^2.0.5" + which-boxed-primitive "^1.0.2" + which-collection "^1.0.1" + which-typed-array "^1.1.9" + +which-collection@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" + integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== + dependencies: + is-map "^2.0.1" + is-set "^2.0.1" + is-weakmap "^2.0.1" + is-weakset "^2.0.1" + +which-typed-array@^1.1.11, which-typed-array@^1.1.13, which-typed-array@^1.1.9: + version "1.1.13" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36" + integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.4" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1, which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + +widest-line@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== + dependencies: + string-width "^4.0.0" + +wildcard@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" + integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== + +word-wrap@~1.2.3: + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + +workerpool@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" + integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== + +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +ws@^8.13.0: + version "8.16.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" + integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + +xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== + +xml-name-validator@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" + integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== + +xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + +xmlcreate@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be" + integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" + integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== + +yaml@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yargs-parser@20.2.4: + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + +yargs-parser@^20.2.2, yargs-parser@^20.2.3: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + +yargs-unparser@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" + integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== + dependencies: + camelcase "^6.0.0" + decamelize "^4.0.0" + flat "^5.0.2" + is-plain-obj "^2.1.0" + +yargs@16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yargs@^17.0.0, yargs@^17.0.1, yargs@^17.6.0: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + +zod@^3.22.4: + version "3.22.4" + resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff" + integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg== From d839ff936d22cb26a1bc8a6b65b006ea64f11e78 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 5 Jan 2024 14:42:17 +1100 Subject: [PATCH 068/302] chore: resolve compilation errors --- .../conversation/MessageRequestButtons.tsx | 2 +- .../SessionMessagesListContainer.tsx | 1 - .../conversation/SubtleNotification.tsx | 4 +- .../conversation/TimerNotification.tsx | 1 + .../header/ConversationHeaderTitle.tsx | 23 +- .../message-content/MessageReactBar.tsx | 4 +- .../message-content/MessageReactions.tsx | 10 +- .../message-item/ExpirableReadableMessage.tsx | 1 + .../message/reactions/Reaction.tsx | 4 +- .../message/reactions/ReactionPopup.tsx | 6 +- ts/components/dialog/EditProfileDialog.tsx | 8 +- ts/components/dialog/ReactClearAllModal.tsx | 6 +- ts/components/dialog/ReactListModal.tsx | 8 +- ts/models/message.ts | 13 +- ts/receiver/configMessage.ts | 6 +- ts/receiver/groupv2/handleGroupV2Message.ts | 66 +- ts/session/apis/snode_api/expireRequest.ts | 6 +- .../snode_api/signature/groupSignature.ts | 4 + .../group_v2/GroupUpdateMessage.ts | 7 +- ts/state/ducks/metaGroups.ts | 70 +- .../ExpireRequest_test.ts | 4 +- .../GetExpiriesRequest_test.ts | 4 +- yarn.lock | 1695 ++++++++--------- 23 files changed, 969 insertions(+), 984 deletions(-) diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index 9f07e8e521..2c5e233e13 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -85,7 +85,7 @@ const handleAcceptConversationRequest = async (convoId: string) => { await convo.commit(); if (convo.isPrivate()) { await convo.addOutgoingApprovalMessage(Date.now()); - await approveConvoAndSendResponse(convoId, true); + await approveConvoAndSendResponse(convoId); } else if (PubKey.is03Pubkey(convoId)) { const found = await UserGroupsWrapperActions.getGroup(convoId); if (!found) { diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx index 9f3f83f2ab..fc256cd8e5 100644 --- a/ts/components/conversation/SessionMessagesListContainer.tsx +++ b/ts/components/conversation/SessionMessagesListContainer.tsx @@ -22,7 +22,6 @@ import { getSortedMessagesOfSelectedConversation, } from '../../state/selectors/conversations'; import { getSelectedConversationKey } from '../../state/selectors/selectedConversation'; -import { ConversationMessageRequestButtons } from './MessageRequestButtons'; import { SessionMessagesList } from './SessionMessagesList'; import { TypingBubble } from './TypingBubble'; diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index af4a457b22..ac0a34e350 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -2,8 +2,8 @@ import React from 'react'; import { useSelector } from 'react-redux'; import styled from 'styled-components'; import { - useConversationUsernameOrShorten, useIsIncomingRequest, + useNicknameOrProfileNameOrShortenedPubkey, } from '../../hooks/useParamSelector'; import { PubKey } from '../../session/types'; import { @@ -106,7 +106,7 @@ export const InvitedToGroupControlMessage = () => { const groupName = useLibGroupInviteGroupName(selectedConversation) || window.i18n('unknown'); const conversationOrigin = useSelectedConversationIdOrigin(); const adminNameInvitedUs = - useConversationUsernameOrShorten(conversationOrigin) || window.i18n('unknown'); + useNicknameOrProfileNameOrShortenedPubkey(conversationOrigin) || window.i18n('unknown'); const isGroupPendingInvite = useLibGroupInvitePending(selectedConversation); if ( !selectedConversation || diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index afb18da793..121b9031ae 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -21,6 +21,7 @@ import { TextWithChildren } from '../basic/Text'; import { ExpirableReadableMessage } from './message/message-item/ExpirableReadableMessage'; // eslint-disable-next-line import/order import { ConversationInteraction } from '../../interactions'; +import { ConvoHub } from '../../session/conversations'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { SessionButtonColor } from '../basic/SessionButton'; import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; diff --git a/ts/components/conversation/header/ConversationHeaderTitle.tsx b/ts/components/conversation/header/ConversationHeaderTitle.tsx index 0c20b85876..92f8533251 100644 --- a/ts/components/conversation/header/ConversationHeaderTitle.tsx +++ b/ts/components/conversation/header/ConversationHeaderTitle.tsx @@ -13,7 +13,7 @@ import { useSelectedIsKickedFromGroup, useSelectedIsNoteToSelf, useSelectedIsPublic, - useSelectedMembers, + useSelectedMembersCount, useSelectedNicknameOrProfileNameOrShortenedPubkey, useSelectedNotificationSetting, useSelectedSubscriberCount, @@ -44,14 +44,13 @@ export const ConversationHeaderTitle = () => { const isKickedFromGroup = useSelectedIsKickedFromGroup(); const isMe = useSelectedIsNoteToSelf(); const isGroup = useSelectedIsGroup(); - const members = useSelectedMembers(); + const selectedMembersCount = useSelectedMembersCount(); const expirationMode = useSelectedConversationDisappearingMode(); const expireTimer = useSelectedExpireTimer(); - const [visibleSubtitle, setVisibleSubtitle] = useState( - 'disappearingMessages' - ); + const [visibleSubtitle, setVisibleSubtitle] = + useState('disappearingMessages'); const [subtitleStrings, setSubtitleStrings] = useState({}); const [subtitleArray, setSubtitleArray] = useState>([]); @@ -69,7 +68,7 @@ export const ConversationHeaderTitle = () => { if (isPublic) { memberCount = subscriberCount || 0; } else { - memberCount = members.length; + memberCount = selectedMembersCount; } } @@ -79,7 +78,7 @@ export const ConversationHeaderTitle = () => { } return null; - }, [i18n, isGroup, isKickedFromGroup, isPublic, members.length, subscriberCount]); + }, [i18n, isGroup, isKickedFromGroup, isPublic, selectedMembersCount, subscriberCount]); // TODO legacy messages support will be removed in a future release // NOTE If disappearing messages is defined we must show it first @@ -88,12 +87,12 @@ export const ConversationHeaderTitle = () => { expirationMode === 'deleteAfterRead' ? window.i18n('disappearingMessagesModeAfterRead') : expirationMode === 'deleteAfterSend' - ? window.i18n('disappearingMessagesModeAfterSend') - : expirationMode === 'legacy' - ? isMe || (isGroup && !isPublic) ? window.i18n('disappearingMessagesModeAfterSend') - : window.i18n('disappearingMessagesModeAfterRead') - : null; + : expirationMode === 'legacy' + ? isMe || (isGroup && !isPublic) + ? window.i18n('disappearingMessagesModeAfterSend') + : window.i18n('disappearingMessagesModeAfterRead') + : null; const abbreviatedExpireTime = isNumber(expireTimer) ? TimerOptions.getAbbreviated(expireTimer) diff --git a/ts/components/conversation/message/message-content/MessageReactBar.tsx b/ts/components/conversation/message/message-content/MessageReactBar.tsx index 8a9f814a9a..48b0824cb8 100644 --- a/ts/components/conversation/message/message-content/MessageReactBar.tsx +++ b/ts/components/conversation/message/message-content/MessageReactBar.tsx @@ -1,5 +1,5 @@ import { isEqual } from 'lodash'; -import React, { ReactElement, useState } from 'react'; +import React, { useState } from 'react'; import useMount from 'react-use/lib/useMount'; import styled from 'styled-components'; @@ -53,7 +53,7 @@ const ReactButton = styled.span` } `; -export const MessageReactBar = (props: Props): ReactElement => { +export const MessageReactBar = (props: Props) => { const { action, additionalAction } = props; const [recentReactions, setRecentReactions] = useState(); diff --git a/ts/components/conversation/message/message-content/MessageReactions.tsx b/ts/components/conversation/message/message-content/MessageReactions.tsx index b7567d70e4..2956638278 100644 --- a/ts/components/conversation/message/message-content/MessageReactions.tsx +++ b/ts/components/conversation/message/message-content/MessageReactions.tsx @@ -1,8 +1,9 @@ import { isEmpty, isEqual } from 'lodash'; -import React, { ReactElement, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; import { useMessageReactsPropsById } from '../../../../hooks/useParamSelector'; import { MessageRenderingProps } from '../../../../models/messageType'; +import { REACT_LIMIT } from '../../../../session/constants'; import { useSelectedIsGroup } from '../../../../state/selectors/selectedConversation'; import { SortedReactionList } from '../../../../types/Reaction'; import { nativeEmojiData } from '../../../../util/emoji'; @@ -10,7 +11,6 @@ import { Flex } from '../../../basic/Flex'; import { SessionIcon } from '../../../icon'; import { Reaction, ReactionProps } from '../reactions/Reaction'; import { StyledPopupContainer } from '../reactions/ReactionPopup'; -import { REACT_LIMIT } from '../../../../session/constants'; export const popupXDefault = -81; export const popupYDefault = -90; @@ -65,7 +65,7 @@ const StyledReadLess = styled.span` type ReactionsProps = Omit; -const Reactions = (props: ReactionsProps): ReactElement => { +const Reactions = (props: ReactionsProps) => { const { messageId, reactions, inModal } = props; return ( void; } -const CompressedReactions = (props: ExpandReactionsProps): ReactElement => { +const CompressedReactions = (props: ExpandReactionsProps) => { const { messageId, reactions, inModal, handleExpand } = props; return ( { ); }; -const ExpandedReactions = (props: ExpandReactionsProps): ReactElement => { +const ExpandedReactions = (props: ExpandReactionsProps) => { const { handleExpand } = props; return ( diff --git a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx index 9c4a85440f..2c8765c5fb 100644 --- a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx +++ b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx @@ -5,6 +5,7 @@ import styled from 'styled-components'; import { Data } from '../../../../data/data'; import { useMessageExpirationPropsById } from '../../../../hooks/useParamSelector'; import { MessageModelType } from '../../../../models/messageType'; +import { ConvoHub } from '../../../../session/conversations'; import { PropsForExpiringMessage, messagesExpired } from '../../../../state/ducks/conversations'; import { getIncrement } from '../../../../util/timer'; import { ExpireTimer } from '../../ExpireTimer'; diff --git a/ts/components/conversation/message/reactions/Reaction.tsx b/ts/components/conversation/message/reactions/Reaction.tsx index f0445a8c08..da23f716fa 100644 --- a/ts/components/conversation/message/reactions/Reaction.tsx +++ b/ts/components/conversation/message/reactions/Reaction.tsx @@ -1,4 +1,4 @@ -import React, { ReactElement, useRef, useState } from 'react'; +import React, { useRef, useState } from 'react'; import { useMouse } from 'react-use'; import styled from 'styled-components'; import { isUsAnySogsFromCache } from '../../../../session/apis/open_group_api/sogsv3/knownBlindedkeys'; @@ -53,7 +53,7 @@ export type ReactionProps = { handlePopupClick?: () => void; }; -export const Reaction = (props: ReactionProps): ReactElement => { +export const Reaction = (props: ReactionProps) => { const { emoji, messageId, diff --git a/ts/components/conversation/message/reactions/ReactionPopup.tsx b/ts/components/conversation/message/reactions/ReactionPopup.tsx index cefd352cf6..f8a13f587b 100644 --- a/ts/components/conversation/message/reactions/ReactionPopup.tsx +++ b/ts/components/conversation/message/reactions/ReactionPopup.tsx @@ -1,11 +1,11 @@ -import React, { ReactElement, useEffect, useState } from 'react'; +import React, { useEffect, useState } from 'react'; import { useSelector } from 'react-redux'; import styled from 'styled-components'; import { Data } from '../../../../data/data'; +import { findAndFormatContact } from '../../../../models/message'; import { PubKey } from '../../../../session/types/PubKey'; import { isDarkTheme } from '../../../../state/selectors/theme'; import { nativeEmojiData } from '../../../../util/emoji'; -import { findAndFormatContact } from '../../../../models/message'; export type TipPosition = 'center' | 'left' | 'right'; @@ -142,7 +142,7 @@ type Props = { onClick: (...args: Array) => void; }; -export const ReactionPopup = (props: Props): ReactElement => { +export const ReactionPopup = (props: Props) => { const { messageId, emoji, count, senders, tooltipPosition = 'center', onClick } = props; const [contacts, setContacts] = useState>([]); diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx index f9e9cea771..cfeba8936a 100644 --- a/ts/components/dialog/EditProfileDialog.tsx +++ b/ts/components/dialog/EditProfileDialog.tsx @@ -1,6 +1,6 @@ import { useDispatch } from 'react-redux'; // eslint-disable-next-line import/no-named-default -import { ChangeEvent, MouseEvent, default as React, ReactElement, useState } from 'react'; +import { ChangeEvent, MouseEvent, default as React, useState } from 'react'; import { QRCode } from 'react-qr-svg'; import styled from 'styled-components'; import { Avatar, AvatarSize } from '../avatar/Avatar'; @@ -69,7 +69,7 @@ type ProfileAvatarProps = { ourId: string; }; -export const ProfileAvatar = (props: ProfileAvatarProps): ReactElement => { +export const ProfileAvatar = (props: ProfileAvatarProps) => { const { newAvatarObjectUrl, avatarPath, profileName, ourId } = props; return ( void; }; -const ProfileHeader = (props: ProfileHeaderProps): ReactElement => { +const ProfileHeader = (props: ProfileHeaderProps) => { const { avatarPath, profileName, ourId, onClick, setMode } = props; return ( @@ -114,7 +114,7 @@ const ProfileHeader = (props: ProfileHeaderProps): ReactElement => { }; type ProfileDialogModes = 'default' | 'edit' | 'qr'; -export const EditProfileDialog = (): ReactElement => { +export const EditProfileDialog = () => { const dispatch = useDispatch(); const _profileName = useOurConversationUsername() || ''; diff --git a/ts/components/dialog/ReactClearAllModal.tsx b/ts/components/dialog/ReactClearAllModal.tsx index ea1303a9b8..6abccb514f 100644 --- a/ts/components/dialog/ReactClearAllModal.tsx +++ b/ts/components/dialog/ReactClearAllModal.tsx @@ -1,14 +1,14 @@ -import React, { ReactElement, useState } from 'react'; +import React, { useState } from 'react'; import { useDispatch } from 'react-redux'; import styled from 'styled-components'; import { useMessageReactsPropsById } from '../../hooks/useParamSelector'; import { clearSogsReactionByServerId } from '../../session/apis/open_group_api/sogsv3/sogsV3ClearReaction'; import { ConvoHub } from '../../session/conversations'; import { updateReactClearAllModal } from '../../state/ducks/modalDialog'; +import { SessionWrapperModal } from '../SessionWrapperModal'; import { Flex } from '../basic/Flex'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; import { SessionSpinner } from '../basic/SessionSpinner'; -import { SessionWrapperModal } from '../SessionWrapperModal'; type Props = { reaction: string; @@ -46,7 +46,7 @@ const StyledReactClearAllContainer = styled(Flex)` } `; -export const ReactClearAllModal = (props: Props): ReactElement => { +export const ReactClearAllModal = (props: Props) => { const { reaction, messageId } = props; const [clearingInProgress, setClearingInProgress] = useState(false); diff --git a/ts/components/dialog/ReactListModal.tsx b/ts/components/dialog/ReactListModal.tsx index b6ac1c8408..fbf943c32a 100644 --- a/ts/components/dialog/ReactListModal.tsx +++ b/ts/components/dialog/ReactListModal.tsx @@ -1,9 +1,10 @@ import { isEmpty, isEqual } from 'lodash'; -import React, { ReactElement, useEffect, useMemo, useState } from 'react'; +import React, { useEffect, useMemo, useState } from 'react'; import { useDispatch } from 'react-redux'; import styled from 'styled-components'; import { Data } from '../../data/data'; import { useMessageReactsPropsById } from '../../hooks/useParamSelector'; +import { findAndFormatContact } from '../../models/message'; import { isUsAnySogsFromCache } from '../../session/apis/open_group_api/sogsv3/knownBlindedkeys'; import { UserUtils } from '../../session/utils'; import { @@ -18,6 +19,7 @@ import { import { SortedReactionList } from '../../types/Reaction'; import { nativeEmojiData } from '../../util/emoji'; import { Reactions } from '../../util/reactions'; +import { SessionWrapperModal } from '../SessionWrapperModal'; import { Avatar, AvatarSize } from '../avatar/Avatar'; import { Flex } from '../basic/Flex'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; @@ -25,8 +27,6 @@ import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; import { ContactName } from '../conversation/ContactName'; import { MessageReactions } from '../conversation/message/message-content/MessageReactions'; import { SessionIconButton } from '../icon'; -import { SessionWrapperModal } from '../SessionWrapperModal'; -import { findAndFormatContact } from '../../models/message'; const StyledReactListContainer = styled(Flex)` width: 376px; @@ -218,7 +218,7 @@ const handleSenders = (senders: Array, me: string) => { return updatedSenders; }; -export const ReactListModal = (props: Props): ReactElement => { +export const ReactListModal = (props: Props) => { const { reaction, messageId } = props; const dispatch = useDispatch(); diff --git a/ts/models/message.ts b/ts/models/message.ts index 8400874c61..f7c49261e6 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -906,7 +906,6 @@ export class MessageModel extends Backbone.Model { identifier: this.id, body, createAtNetworkTimestamp, - expireTimer: this.get('expireTimer'), attachments, preview: preview ? [preview] : [], quote, @@ -1253,18 +1252,18 @@ export class MessageModel extends Backbone.Model { const left: Array | undefined = Array.isArray(groupUpdate.left) ? groupUpdate.left : groupUpdate.left - ? [groupUpdate.left] - : undefined; + ? [groupUpdate.left] + : undefined; const kicked: Array | undefined = Array.isArray(groupUpdate.kicked) ? groupUpdate.kicked : groupUpdate.kicked - ? [groupUpdate.kicked] - : undefined; + ? [groupUpdate.kicked] + : undefined; const joined: Array | undefined = Array.isArray(groupUpdate.joined) ? groupUpdate.joined : groupUpdate.joined - ? [groupUpdate.joined] - : undefined; + ? [groupUpdate.joined] + : undefined; const forcedArrayUpdate: MessageGroupUpdate = {}; diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 08f30a8c55..0b2985ac52 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -349,7 +349,7 @@ async function deleteContactsFromDB(contactsToRemove: Array) { } } -async function handleContactsUpdate() { +async function handleContactsUpdate(result: IncomingUserResult) { const us = UserUtils.getOurPubKeyStrFromCache(); const allContactsInWrapper = await ContactsWrapperActions.getAll(); @@ -407,7 +407,7 @@ async function handleContactsUpdate() { providedDisappearingMode: wrapperConvo.expirationMode, providedExpireTimer: wrapperConvo.expirationTimerSeconds, providedSource: wrapperConvo.id, - receivedAt: result.latestEnvelopeTimestamp, + receivedAt: result.latestEnvelopeTimestamp, // this is most likely incorrect, but that's all we have fromSync: true, fromCurrentDevice: false, shouldCommitConvo: false, @@ -947,7 +947,7 @@ async function processUserMergingResults(results: Map= 0 ) { - await convo.updateExpireTimer(change.updatedExpiration, author, envelopeTimestamp); + await convo.updateExpireTimer({ + providedExpireTimer: change.updatedExpiration, + providedSource: author, + receivedAt: envelopeTimestamp, + fromCurrentDevice: false, + fromSync: false, + fromConfigMessage: false, + }); } break; } @@ -244,33 +255,29 @@ async function handleGroupMemberChangeMessage({ return; } + const sharedDetails = { convo, sender: author, sentAt: envelopeTimestamp, expireUpdate: null }; + switch (change.type) { case SignalService.GroupUpdateMemberChangeMessage.Type.ADDED: { - await ClosedGroup.addUpdateMessage( - convo, - { joiningMembers: change.memberSessionIds }, - author, - envelopeTimestamp - ); + await ClosedGroup.addUpdateMessage({ + diff: { joiningMembers: change.memberSessionIds }, + ...sharedDetails, + }); break; } case SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED: { - await ClosedGroup.addUpdateMessage( - convo, - { kickedMembers: change.memberSessionIds }, - author, - envelopeTimestamp - ); + await ClosedGroup.addUpdateMessage({ + diff: { kickedMembers: change.memberSessionIds }, + ...sharedDetails, + }); break; } case SignalService.GroupUpdateMemberChangeMessage.Type.PROMOTED: { - await ClosedGroup.addUpdateMessage( - convo, - { promotedMembers: change.memberSessionIds }, - author, - envelopeTimestamp - ); + await ClosedGroup.addUpdateMessage({ + diff: { promotedMembers: change.memberSessionIds }, + ...sharedDetails, + }); break; } default: @@ -293,12 +300,13 @@ async function handleGroupMemberLeftMessage({ return; } - await ClosedGroup.addUpdateMessage( + await ClosedGroup.addUpdateMessage({ convo, - { leavingMembers: [author] }, - author, - envelopeTimestamp - ); + diff: { leavingMembers: [author] }, + sender: author, + sentAt: envelopeTimestamp, + expireUpdate: null, + }); convo.set({ active_at: envelopeTimestamp, }); diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index 0229034975..c8b39feac6 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -19,7 +19,7 @@ import { EmptySwarmError } from '../../utils/errors'; import { SeedNodeAPI } from '../seed_node_api'; import { MAX_SUBREQUESTS_COUNT, - UpdateExpiryOnNodeSubRequest, + UpdateExpiryOnNodeUserSubRequest, WithShortenOrExtend, fakeHash, } from './SnodeRequestTypes'; @@ -155,7 +155,7 @@ type UpdatedExpiryWithHash = { messageHash: string; updatedExpiryMs: number }; async function updateExpiryOnNodes( targetNode: Snode, ourPubKey: string, - expireRequests: Array + expireRequests: Array ): Promise> { try { const result = await doSnodeBatchRequest(expireRequests, targetNode, 4000, ourPubKey, 'batch'); @@ -290,7 +290,7 @@ export async function buildExpireRequestBatchExpiry( export async function buildExpireRequestSingleExpiry( expireDetails: ExpireMessageWithExpiryOnSnodeProps -): Promise { +): Promise { const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); if (!ourPubKey) { window.log.error('[buildExpireRequestSingleExpiry] No user pubkey'); diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 3d2545188a..fc01a8c218 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -53,6 +53,8 @@ async function getGroupInviteMessage({ createAtNetworkTimestamp, adminSignature, memberAuthData, + expirationType: 'unknown', // TODO audric do we want those not expiring? + expireTimer: 0, }); return invite; } @@ -76,6 +78,8 @@ async function getGroupPromoteMessage({ groupPk, createAtNetworkTimestamp, groupIdentitySeed: secretKey.slice(0, 32), // the seed is the first 32 bytes of the secretkey + expirationType: 'unknown', // TODO audric do we want those not expiring? + expireTimer: 0, }); return msg; } diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts index c4d122950f..7dbd0d144a 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts @@ -1,19 +1,18 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { SignalService } from '../../../../../protobuf'; import { LibSodiumWrappers } from '../../../../crypto'; -import { DataMessage } from '../../DataMessage'; -import { MessageParams } from '../../Message'; +import { ExpirableMessage, ExpirableMessageParams } from '../../ExpirableMessage'; export type AdminSigDetails = { secretKey: Uint8Array; sodium: LibSodiumWrappers; }; -export interface GroupUpdateMessageParams extends MessageParams { +export interface GroupUpdateMessageParams extends ExpirableMessageParams { groupPk: GroupPubkeyType; } -export abstract class GroupUpdateMessage extends DataMessage { +export abstract class GroupUpdateMessage extends ExpirableMessage { public readonly destination: GroupUpdateMessageParams['groupPk']; constructor(params: GroupUpdateMessageParams) { diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index b3b60b3a40..b40347550e 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -9,9 +9,9 @@ import { UserGroupsGet, WithGroupPubkey, } from 'libsession_util_nodejs'; -import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo'; import { intersection, isEmpty, uniq } from 'lodash'; import { ConfigDumpData } from '../../data/configDump/configDump'; +import { ConversationModel } from '../../models/conversation'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; @@ -22,10 +22,10 @@ import { RevokeChanges, SnodeAPIRevoke } from '../../session/apis/snode_api/revo import { SnodeGroupSignature } from '../../session/apis/snode_api/signature/groupSignature'; import { ConvoHub } from '../../session/conversations'; import { getSodiumRenderer } from '../../session/crypto'; +import { DisappearingMessages } from '../../session/disappearing_messages'; import { ClosedGroup } from '../../session/group/closed-group'; import { GroupUpdateInfoChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { GroupUpdateMemberChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; -import { GroupUpdateDeleteMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage'; import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { getUserED25519KeyPairBytes } from '../../session/utils/User'; @@ -487,11 +487,11 @@ async function handleRemoveMembers({ `DELETE${m}${createAtNetworkTimestamp}`, { secretKey } ); - const deleteMessage = new GroupUpdateDeleteMessage({ - groupPk, - createAtNetworkTimestamp, - adminSignature: from_base64(adminSignature.signature, base64_variants.ORIGINAL), - }); + // const deleteMessage = new GroupUpdateDeleteMessage({ + // groupPk, + // createAtNetworkTimestamp, + // adminSignature: from_base64(adminSignature.signature, base64_variants.ORIGINAL), + // }); console.warn( 'TODO: poll from namespace -11, handle messages and sig for it, batch request handle 401/403, but 200 ok for this -11 namespace' ); @@ -538,6 +538,19 @@ async function getPendingRevokeChanges({ return revokeChanges; } +function getConvoExpireDetailsForMsg(convo: ConversationModel) { + const expireTimer = convo.getExpireTimer(); + const expireDetails = { + expirationType: DisappearingMessages.changeToDisappearingMessageType( + convo, + expireTimer, + convo.getExpirationMode() + ), + expireTimer, + }; + return expireDetails; +} + async function handleMemberChangeFromUIOrNot({ addMembersWithHistory, addMembersWithoutHistory, @@ -606,16 +619,21 @@ async function handleMemberChangeFromUIOrNot({ await GroupInvite.addJob({ groupPk, member }); } const sodium = await getSodiumRenderer(); + const createAtNetworkTimestamp = GetNetworkTime.now(); + + const shared = { + convo, + sender: us, + sentAt: createAtNetworkTimestamp, + expireUpdate: null, + }; const allAdded = [...withHistory, ...withoutHistory]; // those are already enforced to be unique (and without intersection) in `validateMemberChange()` - const createAtNetworkTimestamp = GetNetworkTime.now(); if (fromCurrentDevice && allAdded.length) { - const msg = await ClosedGroup.addUpdateMessage( - convo, - { joiningMembers: allAdded }, - us, - createAtNetworkTimestamp - ); + const msg = await ClosedGroup.addUpdateMessage({ + diff: { joiningMembers: allAdded }, + ...shared, + }); await getMessageQueue().sendToGroupV2({ message: new GroupUpdateMemberChangeMessage({ added: allAdded, @@ -625,16 +643,15 @@ async function handleMemberChangeFromUIOrNot({ createAtNetworkTimestamp, secretKey: group.secretKey, sodium, + ...getConvoExpireDetailsForMsg(convo), }), }); } if (fromCurrentDevice && removed.length) { - const msg = await ClosedGroup.addUpdateMessage( - convo, - { kickedMembers: removed }, - us, - createAtNetworkTimestamp - ); + const msg = await ClosedGroup.addUpdateMessage({ + diff: { kickedMembers: removed }, + ...shared, + }); await getMessageQueue().sendToGroupV2({ message: new GroupUpdateMemberChangeMessage({ removed, @@ -644,6 +661,7 @@ async function handleMemberChangeFromUIOrNot({ createAtNetworkTimestamp, secretKey: group.secretKey, sodium, + ...getConvoExpireDetailsForMsg(convo), }), }); } @@ -698,12 +716,13 @@ async function handleNameChangeFromUIOrNot({ const createAtNetworkTimestamp = GetNetworkTime.now(); if (fromCurrentDevice) { - const msg = await ClosedGroup.addUpdateMessage( + const msg = await ClosedGroup.addUpdateMessage({ convo, - { newName }, - us, - createAtNetworkTimestamp - ); + diff: { newName }, + sender: us, + sentAt: createAtNetworkTimestamp, + expireUpdate: null, + }); await getMessageQueue().sendToGroupV2({ message: new GroupUpdateInfoChangeMessage({ groupPk, @@ -713,6 +732,7 @@ async function handleNameChangeFromUIOrNot({ createAtNetworkTimestamp, secretKey: group.secretKey, sodium: await getSodiumRenderer(), + ...getConvoExpireDetailsForMsg(convo), }), }); } diff --git a/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts b/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts index ec080828a0..72e84f1074 100644 --- a/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts +++ b/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts @@ -1,5 +1,6 @@ import chai, { expect } from 'chai'; import chaiAsPromised from 'chai-as-promised'; +import { PubkeyType } from 'libsession_util_nodejs'; import Sinon from 'sinon'; import { UpdateExpiryOnNodeUserSubRequest } from '../../../../session/apis/snode_api/SnodeRequestTypes'; import { @@ -19,7 +20,8 @@ chai.use(chaiAsPromised as any); describe('ExpireRequest', () => { const getLatestTimestampOffset = 200000; - const ourNumber = '37e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309'; + const ourNumber = + '37e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309' as PubkeyType; const ourUserEd25516Keypair = { pubKey: '37e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309', privKey: diff --git a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts index 5e0f5919e4..b0c4c01cd8 100644 --- a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts +++ b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts @@ -1,5 +1,6 @@ import chai, { expect } from 'chai'; import chaiAsPromised from 'chai-as-promised'; +import { PubkeyType } from 'libsession_util_nodejs'; import Sinon from 'sinon'; import { GetExpiriesFromNodeSubRequest, @@ -23,7 +24,8 @@ describe('GetExpiriesRequest', () => { stubWindowLog(); const getLatestTimestampOffset = 200000; - const ourNumber = '37e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309'; + const ourNumber = + '37e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309' as PubkeyType; const ourUserEd25516Keypair = { pubKey: '37e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309', privKey: diff --git a/yarn.lock b/yarn.lock index 93fb339f67..ff41fe0d25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,20 +12,20 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" - integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== dependencies: - "@babel/highlight" "^7.23.4" + "@babel/highlight" "^7.22.13" chalk "^2.4.2" -"@babel/generator@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" - integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== +"@babel/generator@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339" + integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA== dependencies: - "@babel/types" "^7.23.6" + "@babel/types" "^7.22.15" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -37,18 +37,18 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-environment-visitor@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" - integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== +"@babel/helper-environment-visitor@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" + integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q== -"@babel/helper-function-name@^7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" - integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== +"@babel/helper-function-name@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" + integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== dependencies: - "@babel/template" "^7.22.15" - "@babel/types" "^7.23.0" + "@babel/template" "^7.22.5" + "@babel/types" "^7.22.5" "@babel/helper-hoist-variables@^7.22.5": version "7.22.5" @@ -76,34 +76,34 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" - integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== +"@babel/helper-string-parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" + integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== +"@babel/helper-validator-identifier@^7.22.15", "@babel/helper-validator-identifier@^7.22.5": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz#601fa28e4cc06786c18912dca138cec73b882044" + integrity sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ== -"@babel/highlight@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" - integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== +"@babel/highlight@^7.22.13": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16" + integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ== dependencies: - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-validator-identifier" "^7.22.5" chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/parser@^7.20.15", "@babel/parser@^7.22.15", "@babel/parser@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" - integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== +"@babel/parser@^7.20.15", "@babel/parser@^7.22.15": + version "7.22.16" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95" + integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA== "@babel/plugin-syntax-jsx@^7.22.5": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz#8f2e4f8a9b5f9aa16067e142c1ac9cd9f810f473" - integrity sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg== + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918" + integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg== dependencies: "@babel/helper-plugin-utils" "^7.22.5" @@ -115,13 +115,13 @@ regenerator-runtime "^0.13.2" "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.23.7" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.7.tgz#dd7c88deeb218a0f8bd34d5db1aa242e0f203193" - integrity sha512-w06OXVOFso7LcbzMiDGt+3X7Rh7Ho8MmgPoWU3rarH+8upf+wSU/grlGbWzQyr3DkdN6ZeuMFjpdwW0Q+HxobA== + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8" + integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA== dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.22.15": +"@babel/template@^7.22.5": version "7.22.15" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== @@ -131,40 +131,40 @@ "@babel/types" "^7.22.15" "@babel/traverse@^7.4.5": - version "7.23.7" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305" - integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg== - dependencies: - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.15.tgz#75be4d2d6e216e880e93017f4e2389aeb77ef2d9" + integrity sha512-DdHPwvJY0sEeN4xJU5uRLmZjgMMDIvMPniLuYzUVXj/GGzysPl0/fwt44JBkyUIzGJPV8QgHMcQdQ34XFuKTYQ== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/generator" "^7.22.15" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" "@babel/helper-hoist-variables" "^7.22.5" "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.6" - "@babel/types" "^7.23.6" - debug "^4.3.1" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" - integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== +"@babel/types@^7.22.15", "@babel/types@^7.22.5": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.15.tgz#266cb21d2c5fd0b3931e7a91b6dd72d2f617d282" + integrity sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA== dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.15" to-fast-properties "^2.0.0" "@commitlint/cli@^17.7.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.8.1.tgz#10492114a022c91dcfb1d84dac773abb3db76d33" - integrity sha512-ay+WbzQesE0Rv4EQKfNbSMiJJ12KdKTDzIt0tcK4k11FdsWmtwP0Kp1NWMOUswfIWo6Eb7p7Ln721Nx9FLNBjg== - dependencies: - "@commitlint/format" "^17.8.1" - "@commitlint/lint" "^17.8.1" - "@commitlint/load" "^17.8.1" - "@commitlint/read" "^17.8.1" - "@commitlint/types" "^17.8.1" + version "17.7.1" + resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.7.1.tgz#f3ab35bd38d82fcd4ab03ec5a1e9db26d57fe1b0" + integrity sha512-BCm/AT06SNCQtvFv921iNhudOHuY16LswT0R3OeolVGLk8oP+Rk9TfQfgjH7QPMjhvp76bNqGFEcpKojxUNW1g== + dependencies: + "@commitlint/format" "^17.4.4" + "@commitlint/lint" "^17.7.0" + "@commitlint/load" "^17.7.1" + "@commitlint/read" "^17.5.1" + "@commitlint/types" "^17.4.4" execa "^5.0.0" lodash.isfunction "^3.0.9" resolve-from "5.0.0" @@ -172,73 +172,73 @@ yargs "^17.0.0" "@commitlint/config-conventional@^17.7.0": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-17.8.1.tgz#e5bcf0cfec8da7ac50bc04dc92e0a4ea74964ce0" - integrity sha512-NxCOHx1kgneig3VLauWJcDWS40DVjg7nKOpBEEK9E5fjJpQqLCilcnKkIIjdBH98kEO1q3NpE5NSrZ2kl/QGJg== + version "17.7.0" + resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-17.7.0.tgz#1bbf2bce7851db63c1a8aa8d924277ad4938247e" + integrity sha512-iicqh2o6et+9kWaqsQiEYZzfLbtoWv9uZl8kbI8EGfnc0HeGafQBF7AJ0ylN9D/2kj6txltsdyQs8+2fTMwWEw== dependencies: conventional-changelog-conventionalcommits "^6.1.0" -"@commitlint/config-validator@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/config-validator/-/config-validator-17.8.1.tgz#5cc93b6b49d5524c9cc345a60e5bf74bcca2b7f9" - integrity sha512-UUgUC+sNiiMwkyiuIFR7JG2cfd9t/7MV8VB4TZ+q02ZFkHoduUS4tJGsCBWvBOGD9Btev6IecPMvlWUfJorkEA== +"@commitlint/config-validator@^17.6.7": + version "17.6.7" + resolved "https://registry.yarnpkg.com/@commitlint/config-validator/-/config-validator-17.6.7.tgz#c664d42a1ecf5040a3bb0843845150f55734df41" + integrity sha512-vJSncmnzwMvpr3lIcm0I8YVVDJTzyjy7NZAeXbTXy+MPUdAr9pKyyg7Tx/ebOQ9kqzE6O9WT6jg2164br5UdsQ== dependencies: - "@commitlint/types" "^17.8.1" + "@commitlint/types" "^17.4.4" ajv "^8.11.0" -"@commitlint/ensure@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-17.8.1.tgz#59183557844999dbb6aab6d03629a3d104d01a8d" - integrity sha512-xjafwKxid8s1K23NFpL8JNo6JnY/ysetKo8kegVM7c8vs+kWLP8VrQq+NbhgVlmCojhEDbzQKp4eRXSjVOGsow== +"@commitlint/ensure@^17.6.7": + version "17.6.7" + resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-17.6.7.tgz#77a77a0c05e6a1c34589f59e82e6cb937101fc4b" + integrity sha512-mfDJOd1/O/eIb/h4qwXzUxkmskXDL9vNPnZ4AKYKiZALz4vHzwMxBSYtyL2mUIDeU9DRSpEUins8SeKtFkYHSw== dependencies: - "@commitlint/types" "^17.8.1" + "@commitlint/types" "^17.4.4" lodash.camelcase "^4.3.0" lodash.kebabcase "^4.1.1" lodash.snakecase "^4.1.1" lodash.startcase "^4.4.0" lodash.upperfirst "^4.3.1" -"@commitlint/execute-rule@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-17.8.1.tgz#504ed69eb61044eeb84fdfd10cc18f0dab14f34c" - integrity sha512-JHVupQeSdNI6xzA9SqMF+p/JjrHTcrJdI02PwesQIDCIGUrv04hicJgCcws5nzaoZbROapPs0s6zeVHoxpMwFQ== +"@commitlint/execute-rule@^17.4.0": + version "17.4.0" + resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-17.4.0.tgz#4518e77958893d0a5835babe65bf87e2638f6939" + integrity sha512-LIgYXuCSO5Gvtc0t9bebAMSwd68ewzmqLypqI2Kke1rqOqqDbMpYcYfoPfFlv9eyLIh4jocHWwCK5FS7z9icUA== -"@commitlint/format@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-17.8.1.tgz#6108bb6b4408e711006680649927e1b559bdc5f8" - integrity sha512-f3oMTyZ84M9ht7fb93wbCKmWxO5/kKSbwuYvS867duVomoOsgrgljkGGIztmT/srZnaiGbaK8+Wf8Ik2tSr5eg== +"@commitlint/format@^17.4.4": + version "17.4.4" + resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-17.4.4.tgz#0f6e1b4d7a301c7b1dfd4b6334edd97fc050b9f5" + integrity sha512-+IS7vpC4Gd/x+uyQPTAt3hXs5NxnkqAZ3aqrHd5Bx/R9skyCAWusNlNbw3InDbAK6j166D9asQM8fnmYIa+CXQ== dependencies: - "@commitlint/types" "^17.8.1" + "@commitlint/types" "^17.4.4" chalk "^4.1.0" -"@commitlint/is-ignored@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.8.1.tgz#cf25bcd8409c79684b63f8bdeb35df48edda244e" - integrity sha512-UshMi4Ltb4ZlNn4F7WtSEugFDZmctzFpmbqvpyxD3la510J+PLcnyhf9chs7EryaRFJMdAKwsEKfNK0jL/QM4g== +"@commitlint/is-ignored@^17.7.0": + version "17.7.0" + resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.7.0.tgz#df9b284420bdb1aed5fdb2be44f4e98cc4826014" + integrity sha512-043rA7m45tyEfW7Zv2vZHF++176MLHH9h70fnPoYlB1slKBeKl8BwNIlnPg4xBdRBVNPaCqvXxWswx2GR4c9Hw== dependencies: - "@commitlint/types" "^17.8.1" + "@commitlint/types" "^17.4.4" semver "7.5.4" -"@commitlint/lint@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.8.1.tgz#bfc21215f6b18d41d4d43e2aa3cb79a5d7726cd8" - integrity sha512-aQUlwIR1/VMv2D4GXSk7PfL5hIaFSfy6hSHV94O8Y27T5q+DlDEgd/cZ4KmVI+MWKzFfCTiTuWqjfRSfdRllCA== - dependencies: - "@commitlint/is-ignored" "^17.8.1" - "@commitlint/parse" "^17.8.1" - "@commitlint/rules" "^17.8.1" - "@commitlint/types" "^17.8.1" - -"@commitlint/load@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.8.1.tgz#fa061e7bfa53281eb03ca8517ca26d66a189030c" - integrity sha512-iF4CL7KDFstP1kpVUkT8K2Wl17h2yx9VaR1ztTc8vzByWWcbO/WaKwxsnCOqow9tVAlzPfo1ywk9m2oJ9ucMqA== - dependencies: - "@commitlint/config-validator" "^17.8.1" - "@commitlint/execute-rule" "^17.8.1" - "@commitlint/resolve-extends" "^17.8.1" - "@commitlint/types" "^17.8.1" - "@types/node" "20.5.1" +"@commitlint/lint@^17.7.0": + version "17.7.0" + resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.7.0.tgz#33f831298dc43679e4de6b088aea63d1f884c7e7" + integrity sha512-TCQihm7/uszA5z1Ux1vw+Nf3yHTgicus/+9HiUQk+kRSQawByxZNESeQoX9ujfVd3r4Sa+3fn0JQAguG4xvvbA== + dependencies: + "@commitlint/is-ignored" "^17.7.0" + "@commitlint/parse" "^17.7.0" + "@commitlint/rules" "^17.7.0" + "@commitlint/types" "^17.4.4" + +"@commitlint/load@^17.7.1": + version "17.7.1" + resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.7.1.tgz#0723b11723a20043a304a74960602dead89b5cdd" + integrity sha512-S/QSOjE1ztdogYj61p6n3UbkUvweR17FQ0zDbNtoTLc+Hz7vvfS7ehoTMQ27hPSjVBpp7SzEcOQu081RLjKHJQ== + dependencies: + "@commitlint/config-validator" "^17.6.7" + "@commitlint/execute-rule" "^17.4.0" + "@commitlint/resolve-extends" "^17.6.7" + "@commitlint/types" "^17.4.4" + "@types/node" "20.4.7" chalk "^4.1.0" cosmiconfig "^8.0.0" cosmiconfig-typescript-loader "^4.0.0" @@ -247,72 +247,72 @@ lodash.uniq "^4.5.0" resolve-from "^5.0.0" ts-node "^10.8.1" - typescript "^4.6.4 || ^5.2.2" + typescript "^4.6.4 || ^5.0.0" -"@commitlint/message@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-17.8.1.tgz#a5cd226c419be20ee03c3d237db6ac37b95958b3" - integrity sha512-6bYL1GUQsD6bLhTH3QQty8pVFoETfFQlMn2Nzmz3AOLqRVfNNtXBaSY0dhZ0dM6A2MEq4+2d7L/2LP8TjqGRkA== +"@commitlint/message@^17.4.2": + version "17.4.2" + resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-17.4.2.tgz#f4753a79701ad6db6db21f69076e34de6580e22c" + integrity sha512-3XMNbzB+3bhKA1hSAWPCQA3lNxR4zaeQAQcHj0Hx5sVdO6ryXtgUBGGv+1ZCLMgAPRixuc6en+iNAzZ4NzAa8Q== -"@commitlint/parse@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-17.8.1.tgz#6e00b8f50ebd63562d25dcf4230da2c9f984e626" - integrity sha512-/wLUickTo0rNpQgWwLPavTm7WbwkZoBy3X8PpkUmlSmQJyWQTj0m6bDjiykMaDt41qcUbfeFfaCvXfiR4EGnfw== +"@commitlint/parse@^17.7.0": + version "17.7.0" + resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-17.7.0.tgz#aacb2d189e50ab8454154b1df150aaf20478ae47" + integrity sha512-dIvFNUMCUHqq5Abv80mIEjLVfw8QNuA4DS7OWip4pcK/3h5wggmjVnlwGCDvDChkw2TjK1K6O+tAEV78oxjxag== dependencies: - "@commitlint/types" "^17.8.1" + "@commitlint/types" "^17.4.4" conventional-changelog-angular "^6.0.0" conventional-commits-parser "^4.0.0" -"@commitlint/read@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-17.8.1.tgz#b3f28777607c756078356cc133368b0e8c08092f" - integrity sha512-Fd55Oaz9irzBESPCdMd8vWWgxsW3OWR99wOntBDHgf9h7Y6OOHjWEdS9Xzen1GFndqgyoaFplQS5y7KZe0kO2w== +"@commitlint/read@^17.5.1": + version "17.5.1" + resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-17.5.1.tgz#fec903b766e2c41e3cefa80630040fcaba4f786c" + integrity sha512-7IhfvEvB//p9aYW09YVclHbdf1u7g7QhxeYW9ZHSO8Huzp8Rz7m05aCO1mFG7G8M+7yfFnXB5xOmG18brqQIBg== dependencies: - "@commitlint/top-level" "^17.8.1" - "@commitlint/types" "^17.8.1" + "@commitlint/top-level" "^17.4.0" + "@commitlint/types" "^17.4.4" fs-extra "^11.0.0" git-raw-commits "^2.0.11" minimist "^1.2.6" -"@commitlint/resolve-extends@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-17.8.1.tgz#9af01432bf2fd9ce3dd5a00d266cce14e4c977e7" - integrity sha512-W/ryRoQ0TSVXqJrx5SGkaYuAaE/BUontL1j1HsKckvM6e5ZaG0M9126zcwL6peKSuIetJi7E87PRQF8O86EW0Q== +"@commitlint/resolve-extends@^17.6.7": + version "17.6.7" + resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-17.6.7.tgz#9c53a4601c96ab2dd20b90fb35c988639307735d" + integrity sha512-PfeoAwLHtbOaC9bGn/FADN156CqkFz6ZKiVDMjuC2N5N0740Ke56rKU7Wxdwya8R8xzLK9vZzHgNbuGhaOVKIg== dependencies: - "@commitlint/config-validator" "^17.8.1" - "@commitlint/types" "^17.8.1" + "@commitlint/config-validator" "^17.6.7" + "@commitlint/types" "^17.4.4" import-fresh "^3.0.0" lodash.mergewith "^4.6.2" resolve-from "^5.0.0" resolve-global "^1.0.0" -"@commitlint/rules@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.8.1.tgz#da49cab1b7ebaf90d108de9f58f684dc4ccb65a0" - integrity sha512-2b7OdVbN7MTAt9U0vKOYKCDsOvESVXxQmrvuVUZ0rGFMCrCPJWWP1GJ7f0lAypbDAhaGb8zqtdOr47192LBrIA== +"@commitlint/rules@^17.7.0": + version "17.7.0" + resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.7.0.tgz#b97a4933c5cba11a659a19ee467f6f000f31533e" + integrity sha512-J3qTh0+ilUE5folSaoK91ByOb8XeQjiGcdIdiB/8UT1/Rd1itKo0ju/eQVGyFzgTMYt8HrDJnGTmNWwcMR1rmA== dependencies: - "@commitlint/ensure" "^17.8.1" - "@commitlint/message" "^17.8.1" - "@commitlint/to-lines" "^17.8.1" - "@commitlint/types" "^17.8.1" + "@commitlint/ensure" "^17.6.7" + "@commitlint/message" "^17.4.2" + "@commitlint/to-lines" "^17.4.0" + "@commitlint/types" "^17.4.4" execa "^5.0.0" -"@commitlint/to-lines@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-17.8.1.tgz#a5c4a7cf7dff3dbdd69289fc0eb19b66f3cfe017" - integrity sha512-LE0jb8CuR/mj6xJyrIk8VLz03OEzXFgLdivBytoooKO5xLt5yalc8Ma5guTWobw998sbR3ogDd+2jed03CFmJA== +"@commitlint/to-lines@^17.4.0": + version "17.4.0" + resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-17.4.0.tgz#9bd02e911e7d4eab3fb4a50376c4c6d331e10d8d" + integrity sha512-LcIy/6ZZolsfwDUWfN1mJ+co09soSuNASfKEU5sCmgFCvX5iHwRYLiIuoqXzOVDYOy7E7IcHilr/KS0e5T+0Hg== -"@commitlint/top-level@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-17.8.1.tgz#206d37d6782f33c9572e44fbe3758392fdeea7bc" - integrity sha512-l6+Z6rrNf5p333SHfEte6r+WkOxGlWK4bLuZKbtf/2TXRN+qhrvn1XE63VhD8Oe9oIHQ7F7W1nG2k/TJFhx2yA== +"@commitlint/top-level@^17.4.0": + version "17.4.0" + resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-17.4.0.tgz#540cac8290044cf846fbdd99f5cc51e8ac5f27d6" + integrity sha512-/1loE/g+dTTQgHnjoCy0AexKAEFyHsR2zRB4NWrZ6lZSMIxAhBJnmCqwao7b4H8888PsfoTBCLBYIw8vGnej8g== dependencies: find-up "^5.0.0" -"@commitlint/types@^17.4.4", "@commitlint/types@^17.8.1": - version "17.8.1" - resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-17.8.1.tgz#883a0ad35c5206d5fef7bc6ce1bbe648118af44e" - integrity sha512-PXDQXkAmiMEG162Bqdh9ChML/GJZo6vU+7F03ALKDK8zYc6SuAr47LjG7hGYRqUOz+WK0dU7bQ0xzuqFMdxzeQ== +"@commitlint/types@^17.4.4": + version "17.4.4" + resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-17.4.4.tgz#1416df936e9aad0d6a7bbc979ecc31e55dade662" + integrity sha512-amRN8tRLYOsxRr6mTnGGGvB5EmW/4DDjLMgiwK3CCVEmN6Sr/6xePGEpWaspKkckILuUORCwe6VfDBw6uj4axQ== dependencies: chalk "^4.1.0" @@ -352,9 +352,9 @@ global-agent "^3.0.0" "@electron/notarize@^2.1.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.0.tgz#40455f9d8ca8098a74567aa4613b709089d82657" - integrity sha512-Sf7RG47rafeGuUm+kLEbTXMN8XZeYXN70dMBstrcgiykxCq3SLl1uqxFWndxSI1LfMqv4Eq9PTDHLPwiya31Kg== + version "2.1.0" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.1.0.tgz#76aaec10c8687225e8d0a427cc9df67611c46ff3" + integrity sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA== dependencies: debug "^4.1.1" fs-extra "^9.0.1" @@ -413,14 +413,14 @@ eslint-visitor-keys "^3.3.0" "@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" - integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== + version "4.8.0" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.0.tgz#11195513186f68d42fbf449f9a7136b2c0c92005" + integrity sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg== -"@eslint/eslintrc@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" - integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== +"@eslint/eslintrc@^2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396" + integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g== dependencies: ajv "^6.12.4" debug "^4.3.2" @@ -432,17 +432,17 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.56.0": - version "8.56.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" - integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== +"@eslint/js@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb" + integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw== -"@humanwhocodes/config-array@^0.11.13": - version "0.11.13" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297" - integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ== +"@humanwhocodes/config-array@^0.11.10": + version "0.11.11" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.11.tgz#88a04c570dbbc7dd943e4712429c3df09bc32844" + integrity sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA== dependencies: - "@humanwhocodes/object-schema" "^2.0.1" + "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" minimatch "^3.0.5" @@ -451,22 +451,20 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/object-schema@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" - integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== +"@humanwhocodes/object-schema@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -"@iconify/react@^4.1.1": - version "4.1.1" - resolved "https://registry.yarnpkg.com/@iconify/react/-/react-4.1.1.tgz#da1bf03cdca9427f07cf22cf5b63fa8f02db4722" - integrity sha512-jed14EjvKjee8mc0eoscGxlg7mSQRkwQG3iX3cPBCO7UlOjz0DtlvTqxqEcHUJGh+z1VJ31Yhu5B9PxfO0zbdg== - dependencies: - "@iconify/types" "^2.0.0" +"@iconify/icons-mdi@~1.1.0": + version "1.1.47" + resolved "https://registry.yarnpkg.com/@iconify/icons-mdi/-/icons-mdi-1.1.47.tgz#4bbe1e5d126de7acde05a66addd869c66bd97ca0" + integrity sha512-6AZfvWru20Rl9pXULStkVvTWnua6VG56zOIKdkCzLh25XVeTDEp6f1dL7iX9w+way5+1hI0BBuqTQd61qYaKdg== -"@iconify/types@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57" - integrity sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg== +"@iconify/react@^3.1.3": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@iconify/react/-/react-3.2.2.tgz#ab5241dc01562076bae3b0c22238aff7e5f029cc" + integrity sha512-z3+Jno3VcJzgNHsN5mEvYMsgCkOZkydqdIwOxjXh45+i2Vs9RGH68Y52vt39izwFSfuYUXhaW+1u7m7+IhCn/g== "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.3" @@ -495,7 +493,7 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15": +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": version "1.4.15" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== @@ -508,18 +506,18 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.20" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f" - integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q== +"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": + version "0.3.19" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811" + integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw== dependencies: "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" "@jsdoc/salty@^0.2.1": - version "0.2.7" - resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.7.tgz#98ddce519fd95d7bee605a658fabf6e8cbf7556d" - integrity sha512-mh8LbS9d4Jq84KLw8pzho7XC2q2/IJGiJss3xwRoLD1A+EE16SjN4PfaG4jRCzKegTFLlN0Zd8SdUPE6XdoPFg== + version "0.2.5" + resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692" + integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw== dependencies: lodash "^4.17.21" @@ -625,9 +623,9 @@ reselect "^4.1.5" "@signalapp/better-sqlite3@^8.4.3": - version "8.6.0" - resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.6.0.tgz#0413f4d0626b99838cd64ad09c88720aa2bec6ed" - integrity sha512-dSLWG4m6XtPq/jbUjckLaiR/nFFkY95pWZI8VSm0dEVJC8S2YTXHm6VZ7vZiErt4h6EjBaa827WyK1oheElE2A== + version "8.5.2" + resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.5.2.tgz#910669f44e76a46d06df45fabefcd3ac2e7c4cce" + integrity sha512-t7XalDxuRP115EratM6i1kbvIXJvzETcl8wqnt3NlWZdzil7kelS/RYz+PE1G+z8ZwtFyn/ViAFMt76AsArifw== dependencies: bindings "^1.5.0" tar "^6.1.0" @@ -719,23 +717,23 @@ integrity sha512-IoT8BXBuuWWscQnscGtAYH4dGEOr3uQ85MJdE9LAfperio8FQwyFaigHITPJSy+NSS4w9UHKhzmtQXt5A+544g== "@types/buffer-crc32@^0.2.0": - version "0.2.4" - resolved "https://registry.yarnpkg.com/@types/buffer-crc32/-/buffer-crc32-0.2.4.tgz#d70dbf4d968fe98913324d580934b8fb0c857512" - integrity sha512-GSrhSZOK1/wazf2CjDp3CVJQKWzSc5Ugq3NyZ/RQqg1MWtmA9mAT6i6LzGKhzcRxDOl8aLB+AzvObDSlrMpvLw== + version "0.2.2" + resolved "https://registry.yarnpkg.com/@types/buffer-crc32/-/buffer-crc32-0.2.2.tgz#e115de47913ce34cc2662be43d708d8bef874ab7" + integrity sha512-UpJyUKgG33LVehYtv9k2x4HUEY5ThV62YNGFBbQNBgtoky/0tQCceh8BPI9r3XL5hQ1tGmq34jGWNRBKf2P1UQ== dependencies: "@types/node" "*" "@types/bunyan@^1.8.8": - version "1.8.11" - resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.11.tgz#0b9e7578a5aa2390faf12a460827154902299638" - integrity sha512-758fRH7umIMk5qt5ELmRMff4mLDlN+xyYzC+dkPTdKwbSkJFvz6xwyScrytPU0QIBbRRwbiE8/BIg8bpajerNQ== + version "1.8.8" + resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.8.tgz#8d6d33f090f37c07e2a80af30ae728450a101008" + integrity sha512-Cblq+Yydg3u+sGiz2mjHjC5MPmdjY+No4qvHrF+BUhblsmSfMvsHLbOG62tPbonsqBj6sbWv1LHcsoe5Jw+/Ow== dependencies: "@types/node" "*" "@types/bytebuffer@^5.0.41": - version "5.0.48" - resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.48.tgz#0e6b0e8b8dbafde3314148ed378b8aed6eaac4f1" - integrity sha512-ormKm68NtTOtR8C/4jyRJEYbwKABXRkHHR/1fmkiuFbCQkltgtXSUGfldCSmJzvuyJvmBzWjBbOi79Ry/oJQug== + version "5.0.44" + resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.44.tgz#553015fb34db1fc3eb3f7b232bff91c006c251a1" + integrity sha512-k1qonHga/SfQT02NF633i+7tIfKd+cfC/8pjnedcfuXJNMWooss/FkCgRMSnLf2WorLjbuH4bfgAZEbtyHBDoQ== dependencies: "@types/long" "^3.0.0" "@types/node" "*" @@ -751,16 +749,16 @@ "@types/responselike" "^1.0.0" "@types/chai-as-promised@^7.1.2": - version "7.1.8" - resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.8.tgz#f2b3d82d53c59626b5d6bbc087667ccb4b677fe9" - integrity sha512-ThlRVIJhr69FLlh6IctTXFkmhtP3NpMZ2QGq69StYLyKZFp/HOp1VdKZj7RvfNWYYcJ1xlbLGLLWj1UvP5u/Gw== + version "7.1.6" + resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.6.tgz#3b08cbe1e7206567a480dc6538bade374b19e4e1" + integrity sha512-cQLhk8fFarRVZAXUQV1xEnZgMoPxqKojBvRkqPCKPQCzEhpbbSKl1Uu75kDng7k5Ln6LQLUmNBjLlFthCgm1NA== dependencies: "@types/chai" "*" "@types/chai@*": - version "4.3.11" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.11.tgz#e95050bf79a932cb7305dd130254ccdf9bde671c" - integrity sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ== + version "4.3.6" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.6.tgz#7b489e8baf393d5dd1266fb203ddd4ea941259e6" + integrity sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw== "@types/chai@4.2.18": version "4.2.18" @@ -778,9 +776,9 @@ integrity sha512-jWi9DXx77hnzN4kHCNEvP/kab+nchRLTg9yjXYxjTcMBkuc5iBb3QuwJ4sPrb+nzy1GQjrfyfMqZOdR4i7opRQ== "@types/debug@^4.1.6": - version "4.1.12" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917" - integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ== + version "4.1.8" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317" + integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ== dependencies: "@types/ms" "*" @@ -792,32 +790,32 @@ "@types/trusted-types" "*" "@types/electron-localshortcut@^3.1.0": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@types/electron-localshortcut/-/electron-localshortcut-3.1.3.tgz#f248a9c8016ff28cd783708d8664b806e45c4787" - integrity sha512-D+CRdDTRZ4/9UmcSaZ5qvW4uq2VyyVmqsH9cdNReB4CL6MSIgyhr9w2PKeNEb0J/ZS7db7irJM/+ZiA5uSQsLw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/@types/electron-localshortcut/-/electron-localshortcut-3.1.0.tgz#eb3c270bb47f1e0b583749c7e988f5c5c1e7e4a1" + integrity sha512-upKSXMxBPRdz5kmcXfdfn+hWH9PCAvwhyVozDXTIwwHQ1lUJcdSgGUfxOC1QBlnAPKPqcW/r4icWfMosKz8ibg== dependencies: electron "*" "@types/eslint-scope@^3.7.3": - version "3.7.7" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" - integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== + version "3.7.4" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" + integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== dependencies: "@types/eslint" "*" "@types/estree" "*" "@types/eslint@*": - version "8.56.1" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.1.tgz#988cabb39c973e9200f35fdbb29d17992965bb08" - integrity sha512-18PLWRzhy9glDQp3+wOgfLYRWlhgX0azxgJ63rdpoUHyrC9z0f5CkFburjQx4uD7ZCruw85ZtMt6K+L+R8fLJQ== + version "8.44.2" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.2.tgz#0d21c505f98a89b8dd4d37fa162b09da6089199a" + integrity sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg== dependencies: "@types/estree" "*" "@types/json-schema" "*" "@types/estree@*", "@types/estree@^1.0.0": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" - integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" + integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== "@types/filesize@3.6.0": version "3.6.0" @@ -825,9 +823,9 @@ integrity sha512-rOWxCKMjt2DBuwddUnl5GOpf/jAkkqteB+XldncpVxVX+HPTmK2c5ACMOVEbp9gaH81IlhTdC3TwvRa5nopasw== "@types/firstline@^2.0.2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/firstline/-/firstline-2.0.4.tgz#b8d3f8f7396d1589efea89db183c047a42efaf04" - integrity sha512-EYoMzk783ncj3soLGADXD/rklDMw1PAO5Hc3lRZa5G21vkfacwkdTlIdhTJ39omqDLezTSmxjDG1psd4A/mUHg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/firstline/-/firstline-2.0.2.tgz#b7b051c235a667f25f205eaedbfaeeb6c92b8488" + integrity sha512-/Qjs+MO7PwS7EI2k6Iwcc7jHLqf7AlIMDyEmPGB7LrIUFqQWZtbk6UsQxqlPMpOM10f0XiSc6RMsEIKbEGOrGw== dependencies: "@types/node" "*" @@ -862,22 +860,22 @@ "@types/node" "*" "@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1": - version "3.3.5" - resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494" - integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg== + version "3.3.1" + resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" + integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== dependencies: "@types/react" "*" hoist-non-react-statics "^3.3.0" "@types/http-cache-semantics@*": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4" - integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA== + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" + integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== "@types/jquery@*": - version "3.5.29" - resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.29.tgz#3c06a1f519cd5fc3a7a108971436c00685b5dcea" - integrity sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg== + version "3.5.18" + resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.18.tgz#2a4979866954e601361ddc62ea304c9e46311b77" + integrity sha512-sNm7O6LECFhHmF+3KYo6QIl2fIbjlPYa0PDgDQwfOaEJzwpK20Eub9Ke7VKkGsSJ2K0HUR50S266qYzRX4GlSw== dependencies: "@types/sizzle" "*" @@ -887,9 +885,9 @@ integrity sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA== "@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.15" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" - integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== + version "7.0.12" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" + integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA== "@types/json5@^0.0.29": version "0.0.29" @@ -904,26 +902,26 @@ "@types/node" "*" "@types/libsodium-wrappers-sumo@^0.7.5": - version "0.7.8" - resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.8.tgz#33e32b454fb6b340758c9ffdb1f9657e1be058ff" - integrity sha512-N2+df4MB/A+W0RAcTw7A5oxKgzD+Vh6Ye7lfjWIi5SdTzVLfHPzxUjhwPqHLO5Ev9fv/+VHl+sUaUuTg4fUPqw== + version "0.7.6" + resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.6.tgz#3ebaf627ddb4957fd6417dd1823490cc2633f01d" + integrity sha512-86R2bYU/DKVWw3q2btxTUlFO3lYKLyodbCsxxSybNQonPzPxmQkNtKCYmkV0dWQ9ZQsGIOzNNPU9RjJUALjoEg== dependencies: "@types/libsodium-wrappers" "*" "@types/libsodium-wrappers@*": - version "0.7.13" - resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.13.tgz#769c4ea01de96bb297207586a70777ebf066dcb4" - integrity sha512-KeAKtlObirLJk/na6jHBFEdTDjDfFS6Vcr0eG2FjiHKn3Nw8axJFfIu0Y9TpwaauRldQBj/pZm/MHtK76r6OWg== + version "0.7.11" + resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz#4ac53b8a16a4c80d062e32b3849e9d5b8c2f92ed" + integrity sha512-8avZYJny690B6lFZQEDz4PEdCgC8D8qmGE/mhJBzCwzZvsqne61tCRbtJOhxsjYMItEZd3k4SoR4xKKLnI9Ztg== "@types/linkify-it@*", "@types/linkify-it@^3.0.2": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.5.tgz#1e78a3ac2428e6d7e6c05c1665c242023a4601d8" - integrity sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw== + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.3.tgz#15a0712296c5041733c79efe233ba17ae5a7587b" + integrity sha512-pTjcqY9E4nOI55Wgpz7eiI8+LzdYnw3qxXCfHyBDdPbYvbyLgWLJGh8EdPvqawwMK1Uo1794AUkkR38Fr0g+2g== "@types/lodash@^4.14.194": - version "4.14.202" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8" - integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ== + version "4.14.198" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.198.tgz#4d27465257011aedc741a809f1269941fa2c5d4c" + integrity sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg== "@types/long@^3.0.0": version "3.0.32" @@ -939,9 +937,9 @@ "@types/mdurl" "*" "@types/mdurl@*": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.5.tgz#3e0d2db570e9fb6ccb2dc8fde0be1d79ac810d39" - integrity sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA== + version "1.0.2" + resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9" + integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== "@types/minimatch@*", "@types/minimatch@^5.1.2": version "5.1.2" @@ -949,9 +947,9 @@ integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== "@types/minimist@^1.2.0": - version "1.2.5" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" - integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== + version "1.2.2" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" + integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/mocha@5.0.0": version "5.0.0" @@ -959,41 +957,37 @@ integrity sha512-ZS0vBV7Jn5Z/Q4T3VXauEKMDCV8nWOtJJg90OsDylkYJiQwcWtKuLzohWzrthBkerUF7DLMmJcwOPEP0i/AOXw== "@types/ms@*": - version "0.7.34" - resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" - integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== + version "0.7.31" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node-fetch@^2.5.7": - version "2.6.10" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.10.tgz#ff5c1ceacab782f2b7ce69957d38c1c27b0dc469" - integrity sha512-PPpPK6F9ALFTn59Ka3BaL+qGuipRfxNE8qVgkp0bVixeiR2c2/L+IVOiBdu9JhhT22sWnQEp6YyHGI2b2+CMcA== + version "2.6.4" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660" + integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg== dependencies: "@types/node" "*" - form-data "^4.0.0" + form-data "^3.0.0" "@types/node@*", "@types/node@>=13.7.0": - version "20.10.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.6.tgz#a3ec84c22965802bf763da55b2394424f22bfbb5" - integrity sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw== - dependencies: - undici-types "~5.26.4" + version "20.5.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.9.tgz#a70ec9d8fa0180a314c3ede0e20ea56ff71aed9a" + integrity sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ== -"@types/node@20.5.1": - version "20.5.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.1.tgz#178d58ee7e4834152b0e8b4d30cbfab578b9bb30" - integrity sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg== +"@types/node@20.4.7": + version "20.4.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.7.tgz#74d323a93f1391a63477b27b9aec56669c98b2ab" + integrity sha512-bUBrPjEry2QUTsnuEjzjbS7voGWCc30W0qzgMf90GPeDGFRakvrz47ju+oqDAKCXLUCe39u57/ORMl/O/04/9g== "@types/node@^18.11.18": - version "18.19.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.4.tgz#89672e84f11a2c19543d694dac00ab8d7bc20ddb" - integrity sha512-xNzlUhzoHotIsnFoXmJB+yWmBvFZgKCI9TtPIEdYIMM1KWfwuY8zh7wvc1u1OAXlC7dlf6mZVx/s+Y5KfFz19A== - dependencies: - undici-types "~5.26.4" + version "18.17.14" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.14.tgz#a621ad26e7eb076d6846dd3d39557ddf9d89f04b" + integrity sha512-ZE/5aB73CyGqgQULkLG87N9GnyGe5TcQjv34pwS8tfBs1IkCh0ASM69mydb2znqd6v0eX+9Ytvk6oQRqu8T1Vw== "@types/normalize-package-data@^2.4.0": - version "2.4.4" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" - integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" + integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== "@types/pify@3.0.2": version "3.0.2" @@ -1001,36 +995,36 @@ integrity sha512-a5AKF1/9pCU3HGMkesgY6LsBdXHUY3WU+I2qgpU0J+I8XuJA1aFr59eS84/HP0+dxsyBSNbt+4yGI2adUpHwSg== "@types/plist@^3.0.1": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.5.tgz#9a0c49c0f9886c8c8696a7904dd703f6284036e0" - integrity sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA== + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" + integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw== dependencies: "@types/node" "*" xmlbuilder ">=11.0.1" "@types/prop-types@*": - version "15.7.11" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563" - integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng== + version "15.7.5" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" + integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== "@types/react-dom@^17.0.2": - version "17.0.25" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5" - integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA== + version "17.0.20" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.20.tgz#e0c8901469d732b36d8473b40b679ad899da1b53" + integrity sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA== dependencies: "@types/react" "^17" "@types/react-mentions@^4.1.8": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@types/react-mentions/-/react-mentions-4.1.13.tgz#293e56e14c502f6a73217fece0b870e54a0cc657" - integrity sha512-kRulAAjlmhCtsJ9bapO0foocknaE/rEuFKpmFEU81fBfnXZmZNBaJ9J/DBjwigT3WDHjQVUmYoi5sxEXrcdzAw== + version "4.1.8" + resolved "https://registry.yarnpkg.com/@types/react-mentions/-/react-mentions-4.1.8.tgz#4bebe54c5c74181d8eedf1e613a208d03b4a8d7e" + integrity sha512-Go86ozdnh0FTNbiGiDPAcNqYqtab9iGzLOgZPYUKrnhI4539jGzfJtP6rFHcXgi9Koe58yhkeyKYib6Ucul/sQ== dependencies: "@types/react" "*" "@types/react-redux@^7.1.24": - version "7.1.33" - resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15" - integrity sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg== + version "7.1.26" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.26.tgz#84149f5614e40274bb70fcbe8f7cae6267d548b1" + integrity sha512-UKPo7Cm7rswYU6PH6CmTNCRv5NYF3HrgKuHEYTK8g/3czYLrUux50gQ2pkxc9c7ZpQZi+PNhgmI8oNIRoiVIxg== dependencies: "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" @@ -1054,9 +1048,9 @@ csstype "^3.0.2" "@types/react@^17.0.2": - version "17.0.74" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.74.tgz#ea93059a55e5cfc7a76e7712fe8db5317dd29ee3" - integrity sha512-nBtFGaeTMzpiL/p73xbmCi00SiCQZDTJUk9ZuHOLtil3nI+y7l269LHkHIAYpav99ZwGnPJzuJsJpfLXjiQ52g== + version "17.0.65" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.65.tgz#95f6a2ab61145ffb69129d07982d047f9e0870cd" + integrity sha512-oxur785xZYHvnI7TRS61dXbkIhDPnGfsXKv0cNXR/0ml4SipRIFpSMzA7HMEfOywFwJ5AOnPrXYTEiTRUQeGlQ== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -1070,9 +1064,9 @@ redux "^3.6.0" "@types/responselike@^1.0.0": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.3.tgz#cc29706f0a397cfe6df89debfe4bf5cea159db50" - integrity sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw== + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" + integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== dependencies: "@types/node" "*" @@ -1090,9 +1084,9 @@ "@types/node" "*" "@types/scheduler@*": - version "0.16.8" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff" - integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A== + version "0.16.3" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5" + integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ== "@types/semver@5.5.0": version "5.5.0" @@ -1100,9 +1094,9 @@ integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== "@types/semver@^7.3.6", "@types/semver@^7.5.0": - version "7.5.6" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" - integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== + version "7.5.1" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.1.tgz#0480eeb7221eb9bc398ad7432c9d7e14b1a5a367" + integrity sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg== "@types/sinon@9.0.4": version "9.0.4" @@ -1112,33 +1106,33 @@ "@types/sinonjs__fake-timers" "*" "@types/sinonjs__fake-timers@*": - version "8.1.5" - resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz#5fd3592ff10c1e9695d377020c033116cc2889f2" - integrity sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ== + version "8.1.2" + resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz#bf2e02a3dbd4aecaf95942ecd99b7402e03fad5e" + integrity sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA== "@types/sizzle@*": - version "2.3.8" - resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz#518609aefb797da19bf222feb199e8f653ff7627" - integrity sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg== + version "2.3.3" + resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef" + integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ== "@types/styled-components@^5.1.4": - version "5.1.34" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.34.tgz#4107df8ef8a7eaba4fa6b05f78f93fba4daf0300" - integrity sha512-mmiVvwpYklFIv9E8qfxuPyIt/OuyIrn6gMOAMOFUO3WJfSrSE+sGUoa4PiZj77Ut7bKZpaa6o1fBKS/4TOEvnA== + version "5.1.26" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.26.tgz#5627e6812ee96d755028a98dae61d28e57c233af" + integrity sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw== dependencies: "@types/hoist-non-react-statics" "*" "@types/react" "*" csstype "^3.0.2" "@types/trusted-types@*": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" - integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.3.tgz#a136f83b0758698df454e328759dbd3d44555311" + integrity sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g== "@types/underscore@*": - version "1.11.15" - resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.15.tgz#29c776daecf6f1935da9adda17509686bf979947" - integrity sha512-HP38xE+GuWGlbSRq9WrZkousaQ7dragtZCruBVMi0oX1migFZavZ3OROKHSkNp/9ouq82zrWtZpg18jFnVN96g== + version "1.11.9" + resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.9.tgz#76a071d27e544e422dbf00f956818b1057f377b2" + integrity sha512-M63wKUdsjDFUfyFt1TCUZHGFk9KDAa5JP0adNUErbm0U45Lr06HtANdYRP+GyleEopEoZ4UyBcdAC5TnW4Uz2w== "@types/use-sync-external-store@^0.0.3": version "0.0.3" @@ -1151,39 +1145,39 @@ integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== "@types/verror@^1.10.3": - version "1.10.9" - resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.9.tgz#420c32adb9a2dd50b3db4c8f96501e05a0e72941" - integrity sha512-MLx9Z+9lGzwEuW16ubGeNkpBDE84RpB/NyGgg6z2BTpWzKkGU451cAY3UkUzZEp72RHF585oJ3V8JVNqIplcAQ== + version "1.10.6" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" + integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ== "@types/yargs-parser@*": - version "21.0.3" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15" - integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ== + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.1": - version "17.0.32" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229" - integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog== + version "17.0.24" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902" + integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw== dependencies: "@types/yargs-parser" "*" "@types/yauzl@^2.9.1": - version "2.10.3" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999" - integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q== + version "2.10.0" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" + integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== dependencies: "@types/node" "*" "@typescript-eslint/eslint-plugin@^6.1.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.17.0.tgz#dfc38f790704ba8a54a1277c51efdb489f6ecf9f" - integrity sha512-Vih/4xLXmY7V490dGwBQJTpIZxH4ZFH6eCVmQ4RFkB+wmaCTDAx4dtgoWwMNGKLkqRY1L6rPqzEbjorRnDo4rQ== + version "6.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.6.0.tgz#19ba09aa34fd504696445100262e5a9e1b1d7024" + integrity sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA== dependencies: "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "6.17.0" - "@typescript-eslint/type-utils" "6.17.0" - "@typescript-eslint/utils" "6.17.0" - "@typescript-eslint/visitor-keys" "6.17.0" + "@typescript-eslint/scope-manager" "6.6.0" + "@typescript-eslint/type-utils" "6.6.0" + "@typescript-eslint/utils" "6.6.0" + "@typescript-eslint/visitor-keys" "6.6.0" debug "^4.3.4" graphemer "^1.4.0" ignore "^5.2.4" @@ -1192,72 +1186,71 @@ ts-api-utils "^1.0.1" "@typescript-eslint/parser@^6.1.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.17.0.tgz#8cd7a0599888ca6056082225b2fdf9a635bf32a1" - integrity sha512-C4bBaX2orvhK+LlwrY8oWGmSl4WolCfYm513gEccdWZj0CwGadbIADb0FtVEcI+WzUyjyoBj2JRP8g25E6IB8A== - dependencies: - "@typescript-eslint/scope-manager" "6.17.0" - "@typescript-eslint/types" "6.17.0" - "@typescript-eslint/typescript-estree" "6.17.0" - "@typescript-eslint/visitor-keys" "6.17.0" + version "6.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.6.0.tgz#fe323a7b4eafb6d5ea82b96216561810394a739e" + integrity sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w== + dependencies: + "@typescript-eslint/scope-manager" "6.6.0" + "@typescript-eslint/types" "6.6.0" + "@typescript-eslint/typescript-estree" "6.6.0" + "@typescript-eslint/visitor-keys" "6.6.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@6.17.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.17.0.tgz#70e6c1334d0d76562dfa61aed9009c140a7601b4" - integrity sha512-RX7a8lwgOi7am0k17NUO0+ZmMOX4PpjLtLRgLmT1d3lBYdWH4ssBUbwdmc5pdRX8rXon8v9x8vaoOSpkHfcXGA== +"@typescript-eslint/scope-manager@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz#57105d4419d6de971f7d2c30a2ff4ac40003f61a" + integrity sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw== dependencies: - "@typescript-eslint/types" "6.17.0" - "@typescript-eslint/visitor-keys" "6.17.0" + "@typescript-eslint/types" "6.6.0" + "@typescript-eslint/visitor-keys" "6.6.0" -"@typescript-eslint/type-utils@6.17.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.17.0.tgz#5febad3f523e393006614cbda28b826925b728d5" - integrity sha512-hDXcWmnbtn4P2B37ka3nil3yi3VCQO2QEB9gBiHJmQp5wmyQWqnjA85+ZcE8c4FqnaB6lBwMrPkgd4aBYz3iNg== +"@typescript-eslint/type-utils@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.6.0.tgz#14f651d13b884915c4fca0d27adeb652a4499e86" + integrity sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg== dependencies: - "@typescript-eslint/typescript-estree" "6.17.0" - "@typescript-eslint/utils" "6.17.0" + "@typescript-eslint/typescript-estree" "6.6.0" + "@typescript-eslint/utils" "6.6.0" debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@6.17.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.17.0.tgz#844a92eb7c527110bf9a7d177e3f22bd5a2f40cb" - integrity sha512-qRKs9tvc3a4RBcL/9PXtKSehI/q8wuU9xYJxe97WFxnzH8NWWtcW3ffNS+EWg8uPvIerhjsEZ+rHtDqOCiH57A== +"@typescript-eslint/types@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.6.0.tgz#95e7ea650a2b28bc5af5ea8907114a48f54618c2" + integrity sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg== -"@typescript-eslint/typescript-estree@6.17.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.17.0.tgz#b913d19886c52d8dc3db856903a36c6c64fd62aa" - integrity sha512-gVQe+SLdNPfjlJn5VNGhlOhrXz4cajwFd5kAgWtZ9dCZf4XJf8xmgCTLIqec7aha3JwgLI2CK6GY1043FRxZwg== +"@typescript-eslint/typescript-estree@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz#373c420d2e12c28220f4a83352280a04823a91b7" + integrity sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA== dependencies: - "@typescript-eslint/types" "6.17.0" - "@typescript-eslint/visitor-keys" "6.17.0" + "@typescript-eslint/types" "6.6.0" + "@typescript-eslint/visitor-keys" "6.6.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" - minimatch "9.0.3" semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.17.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.17.0.tgz#f2b16d4c9984474656c420438cdede7eccd4079e" - integrity sha512-LofsSPjN/ITNkzV47hxas2JCsNCEnGhVvocfyOcLzT9c/tSZE7SfhS/iWtzP1lKNOEfLhRTZz6xqI8N2RzweSQ== +"@typescript-eslint/utils@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.6.0.tgz#2d686c0f0786da6362d909e27a9de1c13ba2e7dc" + integrity sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw== dependencies: "@eslint-community/eslint-utils" "^4.4.0" "@types/json-schema" "^7.0.12" "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.17.0" - "@typescript-eslint/types" "6.17.0" - "@typescript-eslint/typescript-estree" "6.17.0" + "@typescript-eslint/scope-manager" "6.6.0" + "@typescript-eslint/types" "6.6.0" + "@typescript-eslint/typescript-estree" "6.6.0" semver "^7.5.4" -"@typescript-eslint/visitor-keys@6.17.0": - version "6.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.17.0.tgz#3ed043709c39b43ec1e58694f329e0b0430c26b6" - integrity sha512-H6VwB/k3IuIeQOyYczyyKN8wH6ed8EwliaYHLxOIhyF0dYEIsN8+Bk3GE19qafeMKyZJJHP8+O1HiFhFLUNKSg== +"@typescript-eslint/visitor-keys@6.6.0": + version "6.6.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz#1109088b4346c8b2446f3845db526374d9a3bafc" + integrity sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ== dependencies: - "@typescript-eslint/types" "6.17.0" + "@typescript-eslint/types" "6.6.0" eslint-visitor-keys "^3.4.1" "@ungap/promise-all-settled@1.1.2": @@ -1265,11 +1258,6 @@ resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== -"@ungap/structured-clone@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" - integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== - "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": version "1.11.6" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" @@ -1462,14 +1450,14 @@ acorn-jsx@^5.3.2: integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^8.1.1: - version "8.3.1" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.1.tgz#2f10f5b69329d90ae18c58bf1fa8fccd8b959a43" - integrity sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw== + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0: - version "8.11.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" - integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== + version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== agent-base@6: version "6.0.2" @@ -1678,7 +1666,7 @@ array-ify@^1.0.0: resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng== -array-includes@^3.1.6, array-includes@^3.1.7: +array-includes@^3.1.6: version "3.1.7" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda" integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ== @@ -1694,7 +1682,7 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array.prototype.findlastindex@^1.2.3: +array.prototype.findlastindex@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207" integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA== @@ -1705,7 +1693,7 @@ array.prototype.findlastindex@^1.2.3: es-shim-unscopables "^1.0.0" get-intrinsic "^1.2.1" -array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2: +array.prototype.flat@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18" integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA== @@ -1715,28 +1703,28 @@ array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2: es-abstract "^1.22.1" es-shim-unscopables "^1.0.0" -array.prototype.flatmap@^1.3.1, array.prototype.flatmap@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527" - integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ== +array.prototype.flatmap@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" + integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== dependencies: call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + define-properties "^1.1.4" + es-abstract "^1.20.4" es-shim-unscopables "^1.0.0" array.prototype.tosorted@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz#620eff7442503d66c799d95503f82b475745cefd" - integrity sha512-HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532" + integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ== dependencies: call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + define-properties "^1.1.4" + es-abstract "^1.20.4" es-shim-unscopables "^1.0.0" - get-intrinsic "^1.2.1" + get-intrinsic "^1.1.3" -arraybuffer.prototype.slice@^1.0.2: +arraybuffer.prototype.slice@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw== @@ -1829,11 +1817,11 @@ available-typed-arrays@^1.0.5: integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== axios@^1.3.2: - version "1.6.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.4.tgz#184ee1f63d412caffcf30d2c50982253c3ee86e0" - integrity sha512-heJnIs6N4aa1eSthhN9M5ioILu8Wi8vmQW9iHQ9NUvfkJb0lEEDUiIdQNAuBtfUt3FxReaKdpQA5DbmMOqzF/A== + version "1.6.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" + integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A== dependencies: - follow-redirects "^1.15.4" + follow-redirects "^1.15.0" form-data "^4.0.0" proxy-from-env "^1.1.0" @@ -1951,14 +1939,14 @@ browser-stdout@1.3.1: integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== browserslist@^4.14.5: - version "4.22.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b" - integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A== + version "4.21.10" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0" + integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ== dependencies: - caniuse-lite "^1.0.30001565" - electron-to-chromium "^1.4.601" - node-releases "^2.0.14" - update-browserslist-db "^1.0.13" + caniuse-lite "^1.0.30001517" + electron-to-chromium "^1.4.477" + node-releases "^2.0.13" + update-browserslist-db "^1.0.11" buffer-alloc-unsafe@^1.1.0: version "1.1.0" @@ -2106,14 +2094,13 @@ cacheable-request@^7.0.2: normalize-url "^6.0.1" responselike "^2.0.0" -call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" - integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: - function-bind "^1.1.2" - get-intrinsic "^1.2.1" - set-function-length "^1.1.1" + function-bind "^1.1.1" + get-intrinsic "^1.0.2" callsites@^3.0.0: version "3.1.0" @@ -2144,10 +2131,10 @@ camelize@^1.0.0: resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3" integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ== -caniuse-lite@^1.0.30001565: - version "1.0.30001574" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001574.tgz#fb4f1359c77f6af942510493672e1ec7ec80230c" - integrity sha512-BtYEK4r/iHt/txm81KBudCUcTy7t+s9emrIaHqjYurQ10x71zJ5VQ9x1dYPcz/b+pKSp4y/v1xSI67A+LzpNyg== +caniuse-lite@^1.0.30001517: + version "1.0.30001527" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001527.tgz#813826554828245ccee776c850566dce12bdeaba" + integrity sha512-YkJi7RwPgWtXVSgK4lG9AHH57nSzvvOp9MesgXmw4Q7n0C3H04L0foHqfxcmSAm5AcWb8dW9AYj2tR7/5GnddQ== catharsis@^0.9.0: version "0.9.0" @@ -2169,17 +2156,17 @@ chai-bytes@^0.1.2: integrity sha512-0ol6oJS0y1ozj6AZK8n1pyv1/G+l44nqUJygAkK1UrYl+IOGie5vcrEdrAlwmLYGIA9NVvtHWosPYwWWIXf/XA== chai@^4.3.4: - version "4.3.10" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.10.tgz#d784cec635e3b7e2ffb66446a63b4e33bd390384" - integrity sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g== + version "4.3.8" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.8.tgz#40c59718ad6928da6629c70496fe990b2bb5b17c" + integrity sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ== dependencies: assertion-error "^1.1.0" - check-error "^1.0.3" - deep-eql "^4.1.3" - get-func-name "^2.0.2" - loupe "^2.3.6" + check-error "^1.0.2" + deep-eql "^4.1.2" + get-func-name "^2.0.0" + loupe "^2.3.1" pathval "^1.1.1" - type-detect "^4.0.8" + type-detect "^4.0.5" chalk@5.3.0: version "5.3.0" @@ -2214,12 +2201,10 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" -check-error@^1.0.2, check-error@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.3.tgz#a6502e4312a7ee969f646e83bb3ddd56281bd694" - integrity sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg== - dependencies: - get-func-name "^2.0.2" +check-error@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" + integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA== chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0": version "3.5.3" @@ -2257,9 +2242,9 @@ ci-info@^2.0.0: integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== ci-info@^3.2.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" - integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== classnames@2.2.5: version "2.2.5" @@ -2267,9 +2252,9 @@ classnames@2.2.5: integrity sha512-DTt3GhOUDKhh4ONwIJW4lmhyotQmV2LjNlGK/J2hkwUcqcbKkCLAdJPtxQnxnlc7SR3f1CEXCyMmc7WLUsWbNA== classnames@^2.2.5: - version "2.5.1" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b" - integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow== + version "2.3.2" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" + integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== cli-boxes@^2.2.1: version "2.2.1" @@ -2520,9 +2505,9 @@ cosmiconfig-typescript-loader@^4.0.0: integrity sha512-BabizFdC3wBHhbI4kJh0VkQP9GkBfoHPydD0COMce1nJ1kJAB3F2TmJ/I7diULBKtmEWSwEbuN/KDtgnmUUVmw== cosmiconfig@^8.0.0: - version "8.3.6" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3" - integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA== + version "8.3.4" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.4.tgz#ee1356e7f24e248a6bb34ec5d438c3dcebeb410c" + integrity sha512-SF+2P8+o/PTV05rgsAjDzL4OFdVXAulSfC/L19VaeVT7+tpOOSscCt2QLxDZ+CLxF2WOiq6y1K5asvs8qUJT/Q== dependencies: import-fresh "^3.3.0" js-yaml "^4.1.0" @@ -2633,10 +2618,10 @@ cssstyle@^3.0.0: dependencies: rrweb-cssom "^0.6.0" -csstype@^3.0.2, csstype@^3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" - integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== +csstype@^3.0.2, csstype@^3.0.6: + version "3.1.2" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" + integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== "curve25519-js@https://github.com/oxen-io/curve25519-js": version "0.0.4" @@ -2712,7 +2697,7 @@ deep-diff@^0.3.5: resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" integrity sha512-yVn6RZmHiGnxRKR9sJb3iVV2XTF1Ghh2DiWRZ3dMnGc43yUdWWF/kX6lQyk3+P84iprfWKU/8zFTrlkvtFm1ug== -deep-eql@^4.1.3: +deep-eql@^4.1.2: version "4.1.3" resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d" integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw== @@ -2734,21 +2719,11 @@ defer-to-connect@^2.0.0: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== -define-data-property@^1.0.1, define-data-property@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" - integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== - dependencies: - get-intrinsic "^1.2.1" - gopd "^1.0.1" - has-property-descriptors "^1.0.0" - -define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" - integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== +define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== dependencies: - define-data-property "^1.0.1" has-property-descriptors "^1.0.0" object-keys "^1.1.1" @@ -2970,10 +2945,10 @@ electron-publish@23.6.0: lazy-val "^1.0.5" mime "^2.5.2" -electron-to-chromium@^1.4.601: - version "1.4.622" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.622.tgz#925d8b2264abbcbe264a9a6290d97b9e5a1af205" - integrity sha512-GZ47DEy0Gm2Z8RVG092CkFvX7SdotG57c4YZOe8W8qD4rOmk3plgeNmiLVRHP/Liqj1wRiY3uUUod9vb9hnxZA== +electron-to-chromium@^1.4.477: + version "1.4.509" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.509.tgz#9e276f8fcd70e1dfac541390da56a1ed7eea43d1" + integrity sha512-G5KlSWY0zzhANtX15tkikHl4WB7zil2Y65oT52EZUL194abjUXBZym12Ht7Bhuwm/G3LJFEqMADyv2Cks56dmg== electron-updater@^4.2.2: version "4.6.5" @@ -2990,18 +2965,18 @@ electron-updater@^4.2.2: semver "^7.3.5" electron@*: - version "28.1.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-28.1.1.tgz#37254967e32a4a69e18378f3b1aba1475522d08d" - integrity sha512-HJSbGHpRl46jWCp5G4OH57KSm2F5u15tB10ixD8iFiz9dhwojqlSQTRAcjSwvga+Vqs1jv7iqwQRrolXP4DgOA== + version "26.1.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-26.1.0.tgz#d26fefba5a5c68069b07a117d87aee1c4e5d172d" + integrity sha512-qEh19H09Pysn3ibms5nZ0haIh5pFoOd7/5Ww7gzmAwDQOulRi8Sa2naeueOyIb1GKpf+6L4ix3iceYRAuA5r5Q== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18" extract-zip "^2.0.1" electron@^25.8.4: - version "25.9.8" - resolved "https://registry.yarnpkg.com/electron/-/electron-25.9.8.tgz#7c125ccbddad02861736275b0d4a387c59a91469" - integrity sha512-PGgp6PH46QVENHuAHc2NT1Su8Q1qov7qIl2jI5tsDpTibwV2zD8539AeWBQySeBU4dhbj9onIl7+1bXQ0wefBg== + version "25.8.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.4.tgz#b50877aac7d96323920437baf309ad86382cb455" + integrity sha512-hUYS3RGdaa6E1UWnzeGnsdsBYOggwMMg4WGxNGvAoWtmRrr6J1BsjFW/yRq4WsJHJce2HdzQXtz4OGXV6yUCLg== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18" @@ -3065,9 +3040,9 @@ env-paths@^2.2.0: integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== envinfo@^7.7.3: - version "7.11.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.0.tgz#c3793f44284a55ff8c82faf1ffd91bc6478ea01f" - integrity sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg== + version "7.10.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13" + integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw== err-code@^2.0.2: version "2.0.3" @@ -3088,26 +3063,26 @@ error-stack-parser@^2.0.6: dependencies: stackframe "^1.3.4" -es-abstract@^1.22.1: - version "1.22.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32" - integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA== +es-abstract@^1.20.4, es-abstract@^1.22.1: + version "1.22.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc" + integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw== dependencies: array-buffer-byte-length "^1.0.0" - arraybuffer.prototype.slice "^1.0.2" + arraybuffer.prototype.slice "^1.0.1" available-typed-arrays "^1.0.5" - call-bind "^1.0.5" + call-bind "^1.0.2" es-set-tostringtag "^2.0.1" es-to-primitive "^1.2.1" - function.prototype.name "^1.1.6" - get-intrinsic "^1.2.2" + function.prototype.name "^1.1.5" + get-intrinsic "^1.2.1" get-symbol-description "^1.0.0" globalthis "^1.0.3" gopd "^1.0.1" + has "^1.0.3" has-property-descriptors "^1.0.0" has-proto "^1.0.1" has-symbols "^1.0.3" - hasown "^2.0.0" internal-slot "^1.0.5" is-array-buffer "^3.0.2" is-callable "^1.2.7" @@ -3115,32 +3090,32 @@ es-abstract@^1.22.1: is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" is-string "^1.0.7" - is-typed-array "^1.1.12" + is-typed-array "^1.1.10" is-weakref "^1.0.2" - object-inspect "^1.13.1" + object-inspect "^1.12.3" object-keys "^1.1.1" object.assign "^4.1.4" - regexp.prototype.flags "^1.5.1" - safe-array-concat "^1.0.1" + regexp.prototype.flags "^1.5.0" + safe-array-concat "^1.0.0" safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.8" - string.prototype.trimend "^1.0.7" - string.prototype.trimstart "^1.0.7" + string.prototype.trim "^1.2.7" + string.prototype.trimend "^1.0.6" + string.prototype.trimstart "^1.0.6" typed-array-buffer "^1.0.0" typed-array-byte-length "^1.0.0" typed-array-byte-offset "^1.0.0" typed-array-length "^1.0.4" unbox-primitive "^1.0.2" - which-typed-array "^1.1.13" + which-typed-array "^1.1.10" es-iterator-helpers@^1.0.12: - version "1.0.15" - resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz#bd81d275ac766431d19305923707c3efd9f1ae40" - integrity sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g== + version "1.0.14" + resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.14.tgz#19cd7903697d97e21198f3293b55e8985791c365" + integrity sha512-JgtVnwiuoRuzLvqelrvN3Xu7H9bu2ap/kQ2CrM62iidP8SKuD99rWU3CJy++s7IVL2qb/AjXPGR/E7i9ngd/Cw== dependencies: asynciterator.prototype "^1.0.0" call-bind "^1.0.2" - define-properties "^1.2.1" + define-properties "^1.2.0" es-abstract "^1.22.1" es-set-tostringtag "^2.0.1" function-bind "^1.1.1" @@ -3150,29 +3125,29 @@ es-iterator-helpers@^1.0.12: has-proto "^1.0.1" has-symbols "^1.0.3" internal-slot "^1.0.5" - iterator.prototype "^1.1.2" - safe-array-concat "^1.0.1" + iterator.prototype "^1.1.0" + safe-array-concat "^1.0.0" es-module-lexer@^1.2.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5" - integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w== + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f" + integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA== es-set-tostringtag@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" - integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q== + version "2.0.1" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" + integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== dependencies: - get-intrinsic "^1.2.2" + get-intrinsic "^1.1.3" + has "^1.0.3" has-tostringtag "^1.0.0" - hasown "^2.0.0" es-shim-unscopables@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" - integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" + integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== dependencies: - hasown "^2.0.0" + has "^1.0.3" es-to-primitive@^1.2.1: version "1.2.1" @@ -3240,7 +3215,7 @@ eslint-config-prettier@^8.8.0: resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11" integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg== -eslint-import-resolver-node@^0.3.9: +eslint-import-resolver-node@^0.3.7: version "0.3.9" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac" integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g== @@ -3250,9 +3225,9 @@ eslint-import-resolver-node@^0.3.9: resolve "^1.22.4" eslint-import-resolver-typescript@^3.6.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz#7b983680edd3f1c5bce1a5829ae0bc2d57fe9efa" - integrity sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg== + version "3.6.0" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.0.tgz#36f93e1eb65a635e688e16cae4bead54552e3bbd" + integrity sha512-QTHR9ddNnn35RTxlaEnx2gCxqFlF2SEN0SE2d17SqwyM7YOSI2GHWRYp5BiRkObTUNYPupC/3Fq2a0PpT+EKpg== dependencies: debug "^4.3.4" enhanced-resolve "^5.12.0" @@ -3270,35 +3245,35 @@ eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0: debug "^3.2.7" eslint-plugin-import@^2.27.5: - version "2.29.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643" - integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw== - dependencies: - array-includes "^3.1.7" - array.prototype.findlastindex "^1.2.3" - array.prototype.flat "^1.3.2" - array.prototype.flatmap "^1.3.2" + version "2.28.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz#63b8b5b3c409bfc75ebaf8fb206b07ab435482c4" + integrity sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A== + dependencies: + array-includes "^3.1.6" + array.prototype.findlastindex "^1.2.2" + array.prototype.flat "^1.3.1" + array.prototype.flatmap "^1.3.1" debug "^3.2.7" doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.9" + eslint-import-resolver-node "^0.3.7" eslint-module-utils "^2.8.0" - hasown "^2.0.0" - is-core-module "^2.13.1" + has "^1.0.3" + is-core-module "^2.13.0" is-glob "^4.0.3" minimatch "^3.1.2" - object.fromentries "^2.0.7" - object.groupby "^1.0.1" - object.values "^1.1.7" + object.fromentries "^2.0.6" + object.groupby "^1.0.0" + object.values "^1.1.6" semver "^6.3.1" - tsconfig-paths "^3.15.0" + tsconfig-paths "^3.14.2" eslint-plugin-mocha@^10.1.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.2.0.tgz#15b05ce5be4b332bb0d76826ec1c5ebf67102ad6" - integrity sha512-ZhdxzSZnd1P9LqDPF0DBcFLpRIGdh1zkF2JHnQklKQOvrQtT73kdP5K9V2mzvbLR+cCAO9OI48NXK/Ax9/ciCQ== + version "10.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz#69325414f875be87fb2cb00b2ef33168d4eb7c8d" + integrity sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw== dependencies: eslint-utils "^3.0.0" - rambda "^7.4.0" + rambda "^7.1.0" eslint-plugin-more@^1.0.5: version "1.0.5" @@ -3366,18 +3341,17 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint@^8.45.0: - version "8.56.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" - integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== + version "8.48.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.48.0.tgz#bf9998ba520063907ba7bfe4c480dc8be03c2155" + integrity sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.56.0" - "@humanwhocodes/config-array" "^0.11.13" + "@eslint/eslintrc" "^2.1.2" + "@eslint/js" "8.48.0" + "@humanwhocodes/config-array" "^0.11.10" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" - "@ungap/structured-clone" "^1.2.0" ajv "^6.12.4" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -3539,9 +3513,9 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-glob@^3.2.9, fast-glob@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" - integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== + version "3.3.1" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" + integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -3580,9 +3554,9 @@ fastest-stable-stringify@^2.0.2: integrity sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q== fastq@^1.6.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.16.0.tgz#83b9a9375692db77a822df081edb6a9cf6839320" - integrity sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" @@ -3666,11 +3640,11 @@ firstline@1.2.1: integrity sha512-6eMQNJtDzyXSC1yeCBWspqA6LeV5la2XHGTXQq4O0xkglAutpyny/sB+zVdXTZ9nzcDW9ZGLxwXXkB+ZEtJuPw== flat-cache@^3.0.4: - version "3.2.0" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" - integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.0.tgz#0e54ab4a1a60fe87e2946b6b00657f1c99e1af3f" + integrity sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew== dependencies: - flatted "^3.2.9" + flatted "^3.2.7" keyv "^4.5.3" rimraf "^3.0.2" @@ -3679,15 +3653,15 @@ flat@^5.0.2: resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== -flatted@^3.2.9: - version "3.2.9" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" - integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== +flatted@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" + integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== -follow-redirects@^1.15.4: - version "1.15.4" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" - integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== +follow-redirects@^1.15.0: + version "1.15.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" + integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== for-each@^0.3.3: version "0.3.3" @@ -3696,6 +3670,15 @@ for-each@^0.3.3: dependencies: is-callable "^1.1.3" +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -3725,9 +3708,9 @@ fs-extra@^10.0.0, fs-extra@^10.1.0: universalify "^2.0.0" fs-extra@^11.0.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" - integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== + version "11.1.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" + integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -3769,12 +3752,12 @@ fsevents@~2.3.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== -function-bind@^1.1.1, function-bind@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" - integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== -function.prototype.name@^1.1.5, function.prototype.name@^1.1.6: +function.prototype.name@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== @@ -3808,20 +3791,20 @@ get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-func-name@^2.0.1, get-func-name@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41" - integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ== +get-func-name@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" + integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" - integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== dependencies: - function-bind "^1.1.2" + function-bind "^1.1.1" + has "^1.0.3" has-proto "^1.0.1" has-symbols "^1.0.3" - hasown "^2.0.0" get-stream@^5.0.0, get-stream@^5.1.0: version "5.2.0" @@ -3844,9 +3827,9 @@ get-symbol-description@^1.0.0: get-intrinsic "^1.1.1" get-tsconfig@^4.5.0: - version "4.7.2" - resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.2.tgz#0dcd6fb330391d46332f4c6c1bf89a6514c2ddce" - integrity sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A== + version "4.7.0" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.0.tgz#06ce112a1463e93196aa90320c35df5039147e34" + integrity sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw== dependencies: resolve-pkg-maps "^1.0.0" @@ -3968,9 +3951,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.19.0: - version "13.24.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" - integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ== + version "13.21.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571" + integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg== dependencies: type-fest "^0.20.2" @@ -4060,11 +4043,11 @@ has-flag@^4.0.0: integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== has-property-descriptors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" - integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== dependencies: - get-intrinsic "^1.2.2" + get-intrinsic "^1.1.1" has-proto@^1.0.1: version "1.0.1" @@ -4093,12 +4076,12 @@ has-yarn@^2.1.0: resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== -hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: - function-bind "^1.1.2" + function-bind "^1.1.1" he@1.2.0: version "1.2.0" @@ -4219,9 +4202,9 @@ ieee754@^1.1.13: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.2.0, ignore@^5.2.4: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" - integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== image-type@^4.1.0: version "4.1.0" @@ -4289,21 +4272,21 @@ ini@2.0.0, ini@^1.3.4, ini@^1.3.6, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -inline-style-prefixer@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-7.0.0.tgz#991d550735d42069f528ac1bcdacd378d1305442" - integrity sha512-I7GEdScunP1dQ6IM2mQWh6v0mOYdYmH3Bp31UecKdrcUgcURTcctSe1IECdUznSHKSmsHtjrT3CwCPI1pyxfUQ== +inline-style-prefixer@^6.0.0: + version "6.0.4" + resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-6.0.4.tgz#4290ed453ab0e4441583284ad86e41ad88384f44" + integrity sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg== dependencies: css-in-js-utils "^3.1.0" fast-loops "^1.1.3" internal-slot@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" - integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg== + version "1.0.5" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" + integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== dependencies: - get-intrinsic "^1.2.2" - hasown "^2.0.0" + get-intrinsic "^1.2.0" + has "^1.0.3" side-channel "^1.0.4" interpret@^3.1.1: @@ -4392,12 +4375,12 @@ is-ci@^3.0.0: dependencies: ci-info "^3.2.0" -is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0: - version "2.13.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" - integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== +is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.9.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" + integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== dependencies: - hasown "^2.0.0" + has "^1.0.3" is-date-object@^1.0.1, is-date-object@^1.0.5: version "1.0.5" @@ -4565,7 +4548,7 @@ is-text-path@^1.0.1: dependencies: text-extensions "^1.0.0" -is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: +is-typed-array@^1.1.10, is-typed-array@^1.1.9: version "1.1.12" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== @@ -4646,16 +4629,15 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== -iterator.prototype@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0" - integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w== +iterator.prototype@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.1.tgz#ab5b790e23ec00658f5974e032a2b05188bd3a5c" + integrity sha512-9E+nePc8C9cnQldmNl6bgpTY6zI4OPRZd97fhJ/iVZ1GifIUDVV5F6x1nEDqpe8KaMEZGT4xgrwKQDxXnjOIZQ== dependencies: - define-properties "^1.2.1" + define-properties "^1.2.0" get-intrinsic "^1.2.1" has-symbols "^1.0.3" - reflect.getprototypeof "^1.0.4" - set-function-name "^2.0.1" + reflect.getprototypeof "^1.0.3" jake@^10.8.5: version "10.8.7" @@ -4847,9 +4829,9 @@ keyboardevents-areequal@^0.2.1: integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw== keyv@^4.0.0, keyv@^4.5.3: - version "4.5.4" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" - integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== + version "4.5.3" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25" + integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug== dependencies: json-buffer "3.0.1" @@ -4914,24 +4896,24 @@ 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.4.2/libsession_util_nodejs-v0.4.2.tar.gz": - version "0.4.2" - resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.2/libsession_util_nodejs-v0.4.2.tar.gz#b9512520ab37225e1c40e915fe1927cc9551fd91" +"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.1/libsession_util_nodejs-v0.3.1.tar.gz": + version "0.3.1" + resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.1/libsession_util_nodejs-v0.3.1.tar.gz#d2c94bfaae6e3ef594609abb08cf8be485fa5d39" dependencies: cmake-js "^7.2.1" node-addon-api "^6.1.0" -libsodium-sumo@^0.7.13: - version "0.7.13" - resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.13.tgz#533b97d2be44b1277e59c1f9f60805978ac5542d" - integrity sha512-zTGdLu4b9zSNLfovImpBCbdAA4xkpkZbMnSQjP8HShyOutnGjRHmSOKlsylh1okao6QhLiz7nG98EGn+04cZjQ== +libsodium-sumo@^0.7.11: + version "0.7.11" + resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.11.tgz#ab0389e2424fca5c1dc8c4fd394906190da88a11" + integrity sha512-bY+7ph7xpk51Ez2GbE10lXAQ5sJma6NghcIDaSPbM/G9elfrjLa0COHl/7P6Wb/JizQzl5UQontOOP1z0VwbLA== libsodium-wrappers-sumo@^0.7.9: - version "0.7.13" - resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.13.tgz#a33aea845a0bb56db067548f04feba28c730ab8e" - integrity sha512-lz4YdplzDRh6AhnLGF2Dj2IUj94xRN6Bh8T0HLNwzYGwPehQJX6c7iYVrFUPZ3QqxE0bqC+K0IIqqZJYWumwSQ== + version "0.7.11" + resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.11.tgz#d96329ee3c0e7ec7f5fcf4cdde16cc3a1ae91d82" + integrity sha512-DGypHOmJbB1nZn89KIfGOAkDgfv5N6SBGC3Qvmy/On0P0WD1JQvNRS/e3UL3aFF+xC0m+MYz5M+MnRnK2HMrKQ== dependencies: - libsodium-sumo "^0.7.13" + libsodium-sumo "^0.7.11" lilconfig@2.1.0: version "2.1.0" @@ -5129,12 +5111,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -loupe@^2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697" - integrity sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA== +loupe@^2.3.1: + version "2.3.6" + resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53" + integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA== dependencies: - get-func-name "^2.0.1" + get-func-name "^2.0.0" lowercase-keys@^2.0.0: version "2.0.0" @@ -5322,7 +5304,7 @@ mini-css-extract-plugin@^2.7.5: dependencies: schema-utils "^4.0.0" -"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@9.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1: +"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -5404,9 +5386,9 @@ mocha@10.0.0: yargs-unparser "2.0.0" moment@^2.19.3, moment@^2.29.4: - version "2.30.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" - integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== + version "2.29.4" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== ms@2.0.0: version "2.0.0" @@ -5432,29 +5414,29 @@ mv@~2: ncp "~2.0.0" rimraf "~2.4.0" -nano-css@^5.6.1: - version "5.6.1" - resolved "https://registry.yarnpkg.com/nano-css/-/nano-css-5.6.1.tgz#964120cb1af6cccaa6d0717a473ccd876b34c197" - integrity sha512-T2Mhc//CepkTa3X4pUhKgbEheJHYAxD0VptuqFhDbGMUWVV2m+lkNiW/Ieuj35wrfC8Zm0l7HvssQh7zcEttSw== +nano-css@^5.3.1: + version "5.3.5" + resolved "https://registry.yarnpkg.com/nano-css/-/nano-css-5.3.5.tgz#3075ea29ffdeb0c7cb6d25edb21d8f7fa8e8fe8e" + integrity sha512-vSB9X12bbNu4ALBu7nigJgRViZ6ja3OU7CeuiV1zMIbXOdmkLahgtPmh3GBOlDxbKY0CitqlPdOReGlBLSp+yg== dependencies: - "@jridgewell/sourcemap-codec" "^1.4.15" css-tree "^1.1.2" - csstype "^3.1.2" + csstype "^3.0.6" fastest-stable-stringify "^2.0.2" - inline-style-prefixer "^7.0.0" - rtl-css-js "^1.16.1" + inline-style-prefixer "^6.0.0" + rtl-css-js "^1.14.0" + sourcemap-codec "^1.4.8" stacktrace-js "^2.0.2" - stylis "^4.3.0" + stylis "^4.0.6" nanoid@3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== -nanoid@^3.3.7: - version "3.3.7" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" - integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== +nanoid@^3.3.6: + version "3.3.6" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== natural-compare@^1.4.0: version "1.4.0" @@ -5516,10 +5498,10 @@ node-loader@^2.0.0: dependencies: loader-utils "^2.0.0" -node-releases@^2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" - integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== +node-releases@^2.0.13: + version "2.0.13" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" + integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== normalize-package-data@^2.5.0: version "2.5.0" @@ -5559,9 +5541,9 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1: path-key "^3.0.0" npm-run-path@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.2.0.tgz#224cdd22c755560253dd71b83a1ef2f758b2e955" - integrity sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg== + version "5.1.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00" + integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q== dependencies: path-key "^4.0.0" @@ -5585,10 +5567,10 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-inspect@^1.13.1, object-inspect@^1.9.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" - integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== +object-inspect@^1.12.3, object-inspect@^1.9.0: + version "1.12.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" + integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== object-keys@^1.1.1: version "1.1.1" @@ -5596,12 +5578,12 @@ object-keys@^1.1.1: integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== object.assign@^4.1.2, object.assign@^4.1.4: - version "4.1.5" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" - integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== + version "4.1.4" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" + integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== dependencies: - call-bind "^1.0.5" - define-properties "^1.2.1" + call-bind "^1.0.2" + define-properties "^1.1.4" has-symbols "^1.0.3" object-keys "^1.1.1" @@ -5614,7 +5596,7 @@ object.entries@^1.1.5, object.entries@^1.1.6: define-properties "^1.2.0" es-abstract "^1.22.1" -object.fromentries@^2.0.6, object.fromentries@^2.0.7: +object.fromentries@^2.0.6: version "2.0.7" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA== @@ -5623,7 +5605,7 @@ object.fromentries@^2.0.6, object.fromentries@^2.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" -object.groupby@^1.0.1: +object.groupby@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee" integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ== @@ -5641,7 +5623,7 @@ object.hasown@^1.1.2: define-properties "^1.2.0" es-abstract "^1.22.1" -object.values@^1.1.6, object.values@^1.1.7: +object.values@^1.1.6: version "1.1.7" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a" integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng== @@ -5935,9 +5917,9 @@ postcss-modules-local-by-default@^4.0.3: postcss-value-parser "^4.1.0" postcss-modules-scope@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.1.0.tgz#fbfddfda93a31f310f1d152c2bb4d3f3c5592ee0" - integrity sha512-SaIbK8XW+MZbd0xHPf7kdfA/3eOt7vxJ72IRecn3EzuZVLr1r0orzf0MX/pN8m+NMDoo6X/SQd8oeKqGZd8PXg== + version "3.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== dependencies: postcss-selector-parser "^6.0.4" @@ -5949,9 +5931,9 @@ postcss-modules-values@^4.0.0: icss-utils "^5.0.0" postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.15" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535" - integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw== + version "6.0.13" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" + integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -5962,11 +5944,11 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^ integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== postcss@^8.4.21: - version "8.4.33" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.33.tgz#1378e859c9f69bf6f638b990a0212f43e2aaa742" - integrity sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg== + version "8.4.29" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.29.tgz#33bc121cf3b3688d4ddef50be869b2a54185a1dd" + integrity sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw== dependencies: - nanoid "^3.3.7" + nanoid "^3.3.6" picocolors "^1.0.0" source-map-js "^1.0.2" @@ -5985,10 +5967,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prettier@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.1.tgz#6ba9f23165d690b6cbdaa88cb0807278f7019848" - integrity sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw== +prettier@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.0.tgz#3bec4489d5eebcd52b95ddd2c22467b5c852fde1" + integrity sha512-GlAIjk6DjkNT6u/Bw5QCWrbzh9YlLKwwmJT//1YiCR3WDpZDnyss64aXHQZgF8VKeGlWnX6+tGsKSVxsZT/gtA== progress@^2.0.3: version "2.0.3" @@ -6065,9 +6047,9 @@ pump@^3.0.0: once "^1.3.1" punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" - integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== pupa@^2.1.1: version "2.1.1" @@ -6101,7 +6083,7 @@ quick-lru@^5.1.1: resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== -rambda@^7.4.0: +rambda@^7.1.0: version "7.5.0" resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.5.0.tgz#1865044c59bc0b16f63026c6e5a97e4b1bbe98fe" integrity sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA== @@ -6114,21 +6096,21 @@ randombytes@^2.1.0: safe-buffer "^5.1.0" rc-slider@^10.2.1: - version "10.5.0" - resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.5.0.tgz#1bd4853d114cb3403b67c485125887adb6a2a117" - integrity sha512-xiYght50cvoODZYI43v3Ylsqiw14+D7ELsgzR40boDZaya1HFa1Etnv9MDkQE8X/UrXAffwv2AcNAhslgYuDTw== + version "10.2.1" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.2.1.tgz#9b571d19f740adcacdde271f44901a47717fd8da" + integrity sha512-l355C/65iV4UFp7mXq5xBTNX2/tF2g74VWiTVlTpNp+6vjE/xaHHNiQq5Af+Uu28uUiqCuH/QXs5HfADL9KJ/A== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" rc-util "^5.27.0" rc-util@^5.27.0: - version "5.38.1" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.38.1.tgz#4915503b89855f5c5cd9afd4c72a7a17568777bb" - integrity sha512-e4ZMs7q9XqwTuhIK7zBIVFltUtMSjphuPPQXHoHlzRzNdOwUxDejo0Zls5HYaJfRKNURcsS/ceKVULlhjBrxng== + version "5.37.0" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.37.0.tgz#6df9a55cb469b41b6995530a45b5f3dd3219a4ea" + integrity sha512-cPMV8DzaHI1KDaS7XPRXAf4J7mtBqjvjikLpQieaeOO7+cEbqY2j7Kso/T0R0OiEZTNcLS/8Zl9YrlXiO9UbjQ== dependencies: "@babel/runtime" "^7.18.3" - react-is "^18.2.0" + react-is "^16.12.0" rc@1.2.8, rc@^1.2.7, rc@^1.2.8: version "1.2.8" @@ -6157,32 +6139,33 @@ react-dom@^17.0.2: scheduler "^0.20.2" react-draggable@^4.4.4: - version "4.4.6" - resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.6.tgz#63343ee945770881ca1256a5b6fa5c9f5983fe1e" - integrity sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw== + version "4.4.5" + resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.5.tgz#9e37fe7ce1a4cf843030f521a0a4cc41886d7e7c" + integrity sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g== dependencies: clsx "^1.1.1" prop-types "^15.8.1" react-h5-audio-player@^3.2.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/react-h5-audio-player/-/react-h5-audio-player-3.9.1.tgz#8a9721fd7a5ff6a9185ce626435207bee1774e83" - integrity sha512-ILJdTXZgHEfv7WsvYPoN7afJncroYyg5Cxvs2qqrsnTzhtBdEuzlM0ETkhUhjqXOsAkbwAdHF9YgnEwgBJ8dCQ== + version "3.8.6" + resolved "https://registry.yarnpkg.com/react-h5-audio-player/-/react-h5-audio-player-3.8.6.tgz#e7ee69ba6c0a82d317d4f987d83bb18b356a4415" + integrity sha512-eyViI47jRRybCcCkGdoAMd6yfhg3UMyXp39mqOWCbNQfAYI8U6zC0+0DLZjhrB7//DJtHhZx8h1q99HMxYkMWQ== dependencies: "@babel/runtime" "^7.10.2" - "@iconify/react" "^4.1.1" + "@iconify/icons-mdi" "~1.1.0" + "@iconify/react" "^3.1.3" react-intersection-observer@^8.30.3: version "8.34.0" resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-8.34.0.tgz#6f6e67831c52e6233f6b6cc7eb55814820137c42" integrity sha512-TYKh52Zc0Uptp5/b4N91XydfSGKubEhgZRtcg1rhTKABXijc4Sdr1uTp5lJ8TN27jwUsdXxjHXtHa0kPj704sw== -react-is@^16.13.1, react-is@^16.7.0: +react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^18.0.0, react-is@^18.2.0: +react-is@^18.0.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== @@ -6247,9 +6230,9 @@ react-universal-interface@^0.6.2: integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw== react-use@^17.4.0: - version "17.4.2" - resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.4.2.tgz#26d43c774ccb733a17a87be62e12fbcbc5654173" - integrity sha512-1jPtmWLD8OJJNYCdYLJEH/HM+bPDfJuyGwCYeJFgPmWY8ttwpgZnW5QnzgM55CYUByUiTjHxsGOnEpLl6yQaoQ== + version "17.4.0" + resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.4.0.tgz#cefef258b0a6c534a5c8021c2528ac6e1a4cdc6d" + integrity sha512-TgbNTCA33Wl7xzIJegn1HndB4qTS9u03QUwyNycUnXaweZkE4Kq2SB+Yoxx8qbshkZGYBDvUXbXWRUmQDcZZ/Q== dependencies: "@types/js-cookie" "^2.2.6" "@xobotyi/scrollbar-width" "^1.9.5" @@ -6257,7 +6240,7 @@ react-use@^17.4.0: fast-deep-equal "^3.1.3" fast-shallow-equal "^1.0.0" js-cookie "^2.2.1" - nano-css "^5.6.1" + nano-css "^5.3.1" react-universal-interface "^0.6.2" resize-observer-polyfill "^1.5.1" screenfull "^5.1.0" @@ -6365,9 +6348,9 @@ redux-persist@^6.0.0: integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ== redux-promise-middleware@^6.1.2: - version "6.2.0" - resolved "https://registry.yarnpkg.com/redux-promise-middleware/-/redux-promise-middleware-6.2.0.tgz#d139dfef50992d456860f8cf07a12085bd53f89d" - integrity sha512-TEzfMeLX63gju2WqkdFQlQMvUGYzFvJNePIJJsBlbPHs3Txsbc/5Rjhmtha1XdMU6lkeiIlp1Qx7AR3Zo9he9g== + version "6.1.3" + resolved "https://registry.yarnpkg.com/redux-promise-middleware/-/redux-promise-middleware-6.1.3.tgz#315f6a9fcabe1f02a9c2f30fa615f838d7b01b66" + integrity sha512-B/Hi5Ct5d9y5d/KG0f6MZUXKA0nrQh5583mHCx13HY3Avte8KfpoRH/TB5QT6k/FcjT6JCxjv7jedymidy2A1A== redux-thunk@^2.4.1: version "2.4.2" @@ -6398,7 +6381,7 @@ redux@^4.0.0, redux@^4.1.2: dependencies: "@babel/runtime" "^7.9.2" -reflect.getprototypeof@^1.0.4: +reflect.getprototypeof@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz#aaccbf41aca3821b87bb71d9dcbc7ad0ba50a3f3" integrity sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw== @@ -6416,18 +6399,18 @@ regenerator-runtime@^0.13.2: integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== regenerator-runtime@^0.14.0: - version "0.14.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" - integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== + version "0.14.0" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" + integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== -regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" - integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg== +regexp.prototype.flags@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" + integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== dependencies: call-bind "^1.0.2" define-properties "^1.2.0" - set-function-name "^2.0.0" + functions-have-names "^1.2.3" registry-auth-token@^4.0.0: version "4.2.2" @@ -6510,20 +6493,20 @@ resolve-pkg-maps@^1.0.0: integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.4: - version "1.22.8" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + version "1.22.4" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34" + integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg== dependencies: is-core-module "^2.13.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" resolve@^2.0.0-next.4: - version "2.0.0-next.5" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c" - integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA== + version "2.0.0-next.4" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660" + integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ== dependencies: - is-core-module "^2.13.0" + is-core-module "^2.9.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -6607,7 +6590,7 @@ rrweb-cssom@^0.6.0: resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1" integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw== -rtl-css-js@^1.16.1: +rtl-css-js@^1.14.0: version "1.16.1" resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.16.1.tgz#4b48b4354b0ff917a30488d95100fbf7219a3e80" integrity sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg== @@ -6626,7 +6609,7 @@ run-script-os@^1.1.6: resolved "https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347" integrity sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw== -safe-array-concat@^1.0.1: +safe-array-concat@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c" integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q== @@ -6673,25 +6656,25 @@ sanitize.css@^12.0.1: integrity sha512-QbusSBnWHaRBZeTxsJyknwI0q+q6m1NtLBmB76JfW/rdVN7Ws6Zz70w65+430/ouVcdNVT3qwrDgrM6PaYyRtw== sass-loader@^13.2.2: - version "13.3.3" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.3.tgz#60df5e858788cffb1a3215e5b92e9cba61e7e133" - integrity sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA== + version "13.3.2" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.2.tgz#460022de27aec772480f03de17f5ba88fa7e18c6" + integrity sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg== dependencies: neo-async "^2.6.2" sass@^1.60.0: - version "1.69.7" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.7.tgz#6e7e1c8f51e8162faec3e9619babc7da780af3b7" - integrity sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ== + version "1.66.1" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.66.1.tgz#04b51c4671e4650aa393740e66a4e58b44d055b1" + integrity sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" sax@^1.2.4: - version "1.3.0" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0" - integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA== + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== saxes@^6.0.0: version "6.0.0" @@ -6792,25 +6775,6 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== -set-function-length@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed" - integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ== - dependencies: - define-data-property "^1.1.1" - get-intrinsic "^1.2.1" - gopd "^1.0.1" - has-property-descriptors "^1.0.0" - -set-function-name@^2.0.0, set-function-name@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" - integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA== - dependencies: - define-data-property "^1.0.1" - functions-have-names "^1.2.3" - has-property-descriptors "^1.0.0" - set-harmonic-interval@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249" @@ -6934,10 +6898,10 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== +sourcemap-codec@^1.4.8: + version "1.4.8" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== spdx-correct@^3.0.0: version "3.2.0" @@ -6961,9 +6925,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.16" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" - integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== + version "3.0.13" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5" + integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w== split2@^3.0.0, split2@^3.2.2: version "3.2.2" @@ -6973,9 +6937,9 @@ split2@^3.0.0, split2@^3.2.2: readable-stream "^3.0.0" sprintf-js@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" - integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== stack-generator@^2.0.5: version "2.0.10" @@ -7035,9 +6999,9 @@ string-width@^5.0.0, string-width@^5.0.1: strip-ansi "^7.0.1" string.prototype.matchall@^4.0.8: - version "4.0.10" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100" - integrity sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ== + version "4.0.9" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.9.tgz#148779de0f75d36b13b15885fec5cadde994520d" + integrity sha512-6i5hL3MqG/K2G43mWXWgP+qizFW/QH/7kCNN13JrJS5q48FN5IKksLDscexKP3dnmB6cdm9jlNgAsWNLpSykmA== dependencies: call-bind "^1.0.2" define-properties "^1.2.0" @@ -7046,28 +7010,27 @@ string.prototype.matchall@^4.0.8: has-symbols "^1.0.3" internal-slot "^1.0.5" regexp.prototype.flags "^1.5.0" - set-function-name "^2.0.0" side-channel "^1.0.4" -string.prototype.trim@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" - integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ== +string.prototype.trim@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" + integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== dependencies: call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + define-properties "^1.1.4" + es-abstract "^1.20.4" -string.prototype.trimend@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" - integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA== +string.prototype.trimend@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" + integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== dependencies: call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" + define-properties "^1.1.4" + es-abstract "^1.20.4" -string.prototype.trimstart@^1.0.7: +string.prototype.trimstart@^1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg== @@ -7152,10 +7115,10 @@ styled-components@5.1.1: shallowequal "^1.1.0" supports-color "^5.5.0" -stylis@^4.3.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.1.tgz#ed8a9ebf9f76fe1e12d462f5cc3c4c980b23a7eb" - integrity sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ== +stylis@^4.0.6: + version "4.3.0" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.0.tgz#abe305a669fc3d8777e10eefcfc73ad861c5588c" + integrity sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ== substyle@^9.1.0: version "9.4.1" @@ -7239,20 +7202,20 @@ temp-file@^3.4.0: fs-extra "^10.0.0" terser-webpack-plugin@^5.3.7: - version "5.3.10" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" - integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== + version "5.3.9" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" + integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== dependencies: - "@jridgewell/trace-mapping" "^0.3.20" + "@jridgewell/trace-mapping" "^0.3.17" jest-worker "^27.4.5" schema-utils "^3.1.1" serialize-javascript "^6.0.1" - terser "^5.26.0" + terser "^5.16.8" -terser@^5.14.2, terser@^5.26.0: - version "5.26.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.26.0.tgz#ee9f05d929f4189a9c28a0feb889d96d50126fe1" - integrity sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ== +terser@^5.14.2, terser@^5.16.8: + version "5.19.4" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.4.tgz#941426fa482bf9b40a0308ab2b3cd0cf7c775ebd" + integrity sha512-6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -7359,9 +7322,9 @@ truncate-utf8-bytes@^1.0.0: utf8-byte-length "^1.0.1" ts-api-utils@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331" - integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.2.tgz#7c094f753b6705ee4faee25c3c684ade52d66d99" + integrity sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ== ts-easing@^0.2.0: version "0.2.0" @@ -7369,20 +7332,19 @@ ts-easing@^0.2.0: integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ== ts-loader@^9.4.2: - version "9.5.1" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.1.tgz#63d5912a86312f1fbe32cef0859fb8b2193d9b89" - integrity sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg== + version "9.4.4" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.4.tgz#6ceaf4d58dcc6979f84125335904920884b7cee4" + integrity sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w== dependencies: chalk "^4.1.0" enhanced-resolve "^5.0.0" micromatch "^4.0.0" semver "^7.3.4" - source-map "^0.7.4" ts-node@^10.8.1: - version "10.9.2" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f" - integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ== + version "10.9.1" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" + integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== dependencies: "@cspotcode/source-map-support" "^0.8.0" "@tsconfig/node10" "^1.0.7" @@ -7398,10 +7360,10 @@ ts-node@^10.8.1: v8-compile-cache-lib "^3.0.1" yn "3.1.1" -tsconfig-paths@^3.15.0: - version "3.15.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" - integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg== +tsconfig-paths@^3.14.2: + version "3.14.2" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088" + integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.2" @@ -7427,7 +7389,7 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.8: +type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== @@ -7508,10 +7470,10 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -"typescript@^4.6.4 || ^5.2.2", typescript@^5.1.6: - version "5.3.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== +"typescript@^4.6.4 || ^5.0.0", typescript@^5.1.6: + version "5.2.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" + integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" @@ -7538,11 +7500,6 @@ underscore@>=1.8.3, underscore@~1.13.2: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== -undici-types@~5.26.4: - version "5.26.5" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" - integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== - unique-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" @@ -7566,14 +7523,14 @@ universalify@^1.0.0: integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== universalify@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" - integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -update-browserslist-db@^1.0.13: - version "1.0.13" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" - integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== +update-browserslist-db@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" + integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== dependencies: escalade "^3.1.1" picocolors "^1.0.0" @@ -7710,12 +7667,11 @@ webpack-cli@^5.1.4: webpack-merge "^5.7.3" webpack-merge@^5.7.3: - version "5.10.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" - integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA== + version "5.9.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826" + integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg== dependencies: clone-deep "^4.0.1" - flat "^5.0.2" wildcard "^2.0.0" webpack-sources@^3.2.3: @@ -7724,9 +7680,9 @@ webpack-sources@^3.2.3: integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@^5.76.3: - version "5.89.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc" - integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw== + version "5.88.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e" + integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.0" @@ -7827,13 +7783,13 @@ which-collection@^1.0.1: is-weakmap "^2.0.1" is-weakset "^2.0.1" -which-typed-array@^1.1.11, which-typed-array@^1.1.13, which-typed-array@^1.1.9: - version "1.1.13" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36" - integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow== +which-typed-array@^1.1.10, which-typed-array@^1.1.11, which-typed-array@^1.1.9: + version "1.1.11" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a" + integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew== dependencies: available-typed-arrays "^1.0.5" - call-bind "^1.0.4" + call-bind "^1.0.2" for-each "^0.3.3" gopd "^1.0.1" has-tostringtag "^1.0.0" @@ -7915,9 +7871,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^8.13.0: - version "8.16.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4" - integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ== + version "8.14.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.0.tgz#6c5792c5316dc9266ba8e780433fc45e6680aecd" + integrity sha512-WR0RJE9Ehsio6U4TuM+LmunEsjQ5ncHlw4sn9ihD6RoJKZrVyH9FWV3dmnwu8B2aNib1OvG2X6adUCyFpQyWcg== xdg-basedir@^4.0.0: version "4.0.0" @@ -8032,8 +7988,3 @@ yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== - -zod@^3.22.4: - version "3.22.4" - resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff" - integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg== From c21f1a745fed046a4807eac83a3dd541d5257343 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 8 Jan 2024 10:49:40 +1100 Subject: [PATCH 069/302] chore: cleaned up proto to ts classes --- ts/session/messages/outgoing/DataMessage.ts | 2 ++ .../messages/outgoing/ExpirableMessage.ts | 21 ++++++------------- .../outgoing/controlMessage/CallMessage.ts | 4 ++-- .../DataExtractionNotificationMessage.ts | 4 ++-- .../ExpirationTimerUpdateMessage.ts | 2 +- .../group/ClosedGroupMessage.ts | 7 ++++--- .../group_v2/GroupUpdateMessage.ts | 9 ++++---- .../ClosedGroupVisibleMessage.ts | 4 ++-- .../visibleMessage/GroupInvitationMessage.ts | 6 +++--- .../outgoing/visibleMessage/VisibleMessage.ts | 7 ++++--- 10 files changed, 31 insertions(+), 35 deletions(-) diff --git a/ts/session/messages/outgoing/DataMessage.ts b/ts/session/messages/outgoing/DataMessage.ts index 33ef1ef64e..6cefd035f8 100644 --- a/ts/session/messages/outgoing/DataMessage.ts +++ b/ts/session/messages/outgoing/DataMessage.ts @@ -8,4 +8,6 @@ export abstract class DataMessage extends ExpirableMessage { dataMessage: this.dataProto(), }); } + + public abstract dataProto(): SignalService.DataMessage; } diff --git a/ts/session/messages/outgoing/ExpirableMessage.ts b/ts/session/messages/outgoing/ExpirableMessage.ts index f7ff94c84c..a6de8ec140 100644 --- a/ts/session/messages/outgoing/ExpirableMessage.ts +++ b/ts/session/messages/outgoing/ExpirableMessage.ts @@ -30,25 +30,16 @@ export class ExpirableMessage extends ContentMessage { this.expirationType === 'deleteAfterSend' ? SignalService.Content.ExpirationType.DELETE_AFTER_SEND : this.expirationType === 'deleteAfterRead' - ? SignalService.Content.ExpirationType.DELETE_AFTER_READ - : this.expirationType === 'unknown' - ? SignalService.Content.ExpirationType.UNKNOWN - : undefined, + ? SignalService.Content.ExpirationType.DELETE_AFTER_READ + : this.expirationType === 'unknown' + ? SignalService.Content.ExpirationType.UNKNOWN + : undefined, expirationTimer: this.expireTimer && this.expireTimer > -1 ? this.expireTimer : undefined, }); } - public dataProto(): SignalService.DataMessage { - return new SignalService.DataMessage({ - // TODO legacy messages support will be removed in a future release - expireTimer: - (this.expirationType === 'unknown' || !this.expirationType) && - this.expireTimer && - this.expireTimer > -1 - ? this.expireTimer - : undefined, - }); - } + // Note: dataProto() or anything else must be implemented in the child classes + // public dataProto() public getDisappearingMessageType(): DisappearingMessageType | undefined { return this.expirationType || undefined; diff --git a/ts/session/messages/outgoing/controlMessage/CallMessage.ts b/ts/session/messages/outgoing/controlMessage/CallMessage.ts index d8bb2831ed..f621ad8d17 100644 --- a/ts/session/messages/outgoing/controlMessage/CallMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/CallMessage.ts @@ -41,7 +41,7 @@ export class CallMessage extends ExpirableMessage { public contentProto(): SignalService.Content { const content = super.contentProto(); - content.callMessage = this.dataCallProto(); + content.callMessage = this.callProto(); return content; } @@ -49,7 +49,7 @@ export class CallMessage extends ExpirableMessage { return TTL_DEFAULT.CALL_MESSAGE; } - private dataCallProto(): SignalService.CallMessage { + private callProto(): SignalService.CallMessage { return new SignalService.CallMessage({ type: this.type, sdpMLineIndexes: this.sdpMLineIndexes, diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts index 690e79e40c..6cf91fcdc4 100644 --- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts @@ -28,11 +28,11 @@ export class DataExtractionNotificationMessage extends ExpirableMessage { public contentProto(): SignalService.Content { const content = super.contentProto(); - content.dataExtractionNotification = this.dataExtractionProto(); + content.dataExtractionNotification = this.extractionProto(); return content; } - protected dataExtractionProto(): SignalService.DataExtractionNotification { + protected extractionProto(): SignalService.DataExtractionNotification { const ACTION_ENUM = SignalService.DataExtractionNotification.Type; const action = ACTION_ENUM.MEDIA_SAVED; // we cannot know when user screenshots, so it can only be a media saved on desktop diff --git a/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts b/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts index ec1a4b18ca..3ccb31a4e6 100644 --- a/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage.ts @@ -37,7 +37,7 @@ export class ExpirationTimerUpdateMessage extends DataMessage { } public dataProto(): SignalService.DataMessage { - const data = super.dataProto(); + const data = new SignalService.DataMessage({}); data.flags = SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE; diff --git a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts index 2fcdba7c79..fa8ae6c0c8 100644 --- a/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group/ClosedGroupMessage.ts @@ -1,12 +1,13 @@ import { SignalService } from '../../../../../protobuf'; import { PubKey } from '../../../../types'; -import { ExpirableMessage, ExpirableMessageParams } from '../../ExpirableMessage'; +import { DataMessage } from '../../DataMessage'; +import { ExpirableMessageParams } from '../../ExpirableMessage'; export interface ClosedGroupMessageParams extends ExpirableMessageParams { groupId: string | PubKey; } -export abstract class ClosedGroupMessage extends ExpirableMessage { +export abstract class ClosedGroupMessage extends DataMessage { public readonly groupId: PubKey; constructor(params: ClosedGroupMessageParams) { @@ -41,7 +42,7 @@ export abstract class ClosedGroupMessage extends ExpirableMessage { } public dataProto(): SignalService.DataMessage { - const dataMessage = super.dataProto(); + const dataMessage = new SignalService.DataMessage({}); dataMessage.closedGroupControlMessage = new SignalService.DataMessage.ClosedGroupControlMessage(); diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts index 7dbd0d144a..7429c7c16e 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/GroupUpdateMessage.ts @@ -1,7 +1,7 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { SignalService } from '../../../../../protobuf'; import { LibSodiumWrappers } from '../../../../crypto'; -import { ExpirableMessage, ExpirableMessageParams } from '../../ExpirableMessage'; +import { DataMessage } from '../../DataMessage'; +import { ExpirableMessageParams } from '../../ExpirableMessage'; export type AdminSigDetails = { secretKey: Uint8Array; @@ -12,7 +12,7 @@ export interface GroupUpdateMessageParams extends ExpirableMessageParams { groupPk: GroupPubkeyType; } -export abstract class GroupUpdateMessage extends ExpirableMessage { +export abstract class GroupUpdateMessage extends DataMessage { public readonly destination: GroupUpdateMessageParams['groupPk']; constructor(params: GroupUpdateMessageParams) { @@ -24,7 +24,8 @@ export abstract class GroupUpdateMessage extends ExpirableMessage { } } - public abstract dataProto(): SignalService.DataMessage; + // do not override the dataProto here, we want it to be defined in the child classes + // public abstract dataProto(): SignalService.DataMessage; public abstract isFor1o1Swarm(): boolean; public abstract isForGroupSwarm(): boolean; diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index e44d2cb069..ab3bebc613 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -3,7 +3,7 @@ import { SignalService } from '../../../../protobuf'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; import { PubKey } from '../../../types'; import { StringUtils } from '../../../utils'; -import { ExpirableMessage } from '../ExpirableMessage'; +import { DataMessage } from '../DataMessage'; import { ClosedGroupMessage, ClosedGroupMessageParams, @@ -70,7 +70,7 @@ type WithDestinationGroupPk = { destination: GroupPubkeyType }; type WithGroupMessageNamespace = { namespace: SnodeNamespaces.ClosedGroupMessages }; // TODO audric debugger This will need to extend ExpirableMessage after Disappearing Messages V2 is merged and checkd still working -export class ClosedGroupV2VisibleMessage extends ExpirableMessage { +export class ClosedGroupV2VisibleMessage extends DataMessage { private readonly chatMessage: VisibleMessage; public readonly destination: GroupPubkeyType; public readonly namespace: SnodeNamespaces.ClosedGroupMessages; diff --git a/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts b/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts index c1c3942ae2..e647a29834 100644 --- a/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts @@ -1,12 +1,13 @@ import { SignalService } from '../../../../protobuf'; -import { ExpirableMessage, ExpirableMessageParams } from '../ExpirableMessage'; +import { DataMessage } from '../DataMessage'; +import { ExpirableMessageParams } from '../ExpirableMessage'; interface GroupInvitationMessageParams extends ExpirableMessageParams { url: string; name: string; } -export class GroupInvitationMessage extends ExpirableMessage { +export class GroupInvitationMessage extends DataMessage { private readonly url: string; private readonly name: string; @@ -28,7 +29,6 @@ export class GroupInvitationMessage extends ExpirableMessage { }); return new SignalService.DataMessage({ - ...super.dataProto(), openGroupInvitation, }); } diff --git a/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts index ec3b1369e2..8239b35b0b 100644 --- a/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/VisibleMessage.ts @@ -3,7 +3,8 @@ import { isEmpty } from 'lodash'; import { SignalService } from '../../../../protobuf'; import { LokiProfile } from '../../../../types/Message'; import { Reaction } from '../../../../types/Reaction'; -import { ExpirableMessage, ExpirableMessageParams } from '../ExpirableMessage'; +import { DataMessage } from '../DataMessage'; +import { ExpirableMessageParams } from '../ExpirableMessage'; interface AttachmentPointerCommon { contentType?: string; @@ -71,7 +72,7 @@ export interface VisibleMessageParams extends ExpirableMessageParams { syncTarget?: string; // undefined means it is not a synced message } -export class VisibleMessage extends ExpirableMessage { +export class VisibleMessage extends DataMessage { public readonly reaction?: Reaction; private readonly attachments?: Array; @@ -113,7 +114,7 @@ export class VisibleMessage extends ExpirableMessage { } public dataProto(): SignalService.DataMessage { - const dataMessage = super.dataProto(); + const dataMessage = new SignalService.DataMessage({}); if (this.body) { dataMessage.body = this.body; From 77fdc97bcfda5e65ea4b02db634299592b5daf07 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 10 Jan 2024 14:07:41 +1100 Subject: [PATCH 070/302] feat: force group msg request unread when handling invite --- .../conversation/MessageRequestButtons.tsx | 9 ++- ts/hooks/useParamSelector.ts | 3 + ts/models/conversation.ts | 12 +++- ts/receiver/groupv2/handleGroupV2Message.ts | 24 +++++--- .../libsession_utils_convo_info_volatile.ts | 33 ++++++++++- .../libsession_utils_user_groups.ts | 39 ++++++++++++- ts/state/selectors/conversations.ts | 18 +++--- ts/types/sqlSharedTypes.ts | 55 +++++++++++++++++++ .../browser/libsession_worker_interface.ts | 24 ++++++++ 9 files changed, 193 insertions(+), 24 deletions(-) diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index 2c5e233e13..9e684985ff 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -5,9 +5,11 @@ import { approveConvoAndSendResponse, declineConversationWithConfirm, } from '../../interactions/conversationInteractions'; +import { GroupV2Receiver } from '../../receiver/groupv2/handleGroupV2Message'; import { getSwarmPollingInstance } from '../../session/apis/snode_api/swarmPolling'; import { ConvoHub } from '../../session/conversations'; import { PubKey } from '../../session/types'; +import { sleepFor } from '../../session/utils/Promise'; import { useSelectedConversationIdOrigin, useSelectedConversationKey, @@ -94,7 +96,12 @@ const handleAcceptConversationRequest = async (convoId: string) => { } // this updates the wrapper and refresh the redux slice await UserGroupsWrapperActions.setGroup({ ...found, invitePending: false }); - getSwarmPollingInstance().addGroupId(convoId); + getSwarmPollingInstance().addGroupId(convoId, async () => { + // we need to do a first poll to fetch the keys etc before we can send our invite response + // this is pretty hacky, but also an admin seeing a message from that user in the group will mark it as not pending anymore + await sleepFor(2000); + await GroupV2Receiver.sendInviteResponseToGroup({ groupPk: convoId }); + }); } }; diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 979f414125..f238e76088 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -22,6 +22,7 @@ import { import { useLibGroupAdmins, useLibGroupMembers, useLibGroupName } from '../state/selectors/groups'; import { isPrivateAndFriend } from '../state/selectors/selectedConversation'; import { useOurPkStr } from '../state/selectors/user'; +import { useLibGroupInvitePending } from '../state/selectors/userGroups'; export function useAvatarPath(convoId: string | undefined) { const convoProps = useConversationPropsById(convoId); @@ -235,6 +236,7 @@ export function useIsApproved(convoId?: string) { export function useIsIncomingRequest(convoId?: string) { const convoProps = useConversationPropsById(convoId); + const invitePending = useLibGroupInvitePending(convoId) || false; if (!convoProps) { return false; } @@ -248,6 +250,7 @@ export function useIsIncomingRequest(convoId?: string) { isBlocked: convoProps.isBlocked || false, didApproveMe: convoProps.didApproveMe || false, activeAt: convoProps.activeAt || 0, + invitePending, }) ); } diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 1af32139de..6ec7ee9cd4 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -132,6 +132,7 @@ import { DisappearingMessageConversationModeType } from '../session/disappearing import { FetchMsgExpirySwarm } from '../session/utils/job_runners/jobs/FetchMsgExpirySwarmJob'; import { UpdateMsgExpirySwarm } from '../session/utils/job_runners/jobs/UpdateMsgExpirySwarmJob'; import { ReleasedFeatures } from '../util/releaseFeature'; +import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; import { markAttributesAsReadIfNeeded } from './messageFactory'; type InMemoryConvoInfos = { @@ -692,14 +693,19 @@ export class ConversationModel extends Backbone.Model { * Does this conversation contain the properties to be considered a message request */ public isIncomingRequest(): boolean { + const id = this.id; + const invitePending = PubKey.is03Pubkey(id) + ? UserGroupsWrapperActions.getCachedGroup(id)?.invitePending || false + : false; return hasValidIncomingRequestValues({ - id: this.id, + id, isMe: this.isMe(), isApproved: this.isApproved(), isBlocked: this.isBlocked(), isPrivate: this.isPrivate(), activeAt: this.getActiveAt(), didApproveMe: this.didApproveMe(), + invitePending, }); } @@ -2708,6 +2714,7 @@ export function hasValidIncomingRequestValues({ isPrivate, activeAt, didApproveMe, + invitePending, }: { id: string; isMe: boolean; @@ -2715,12 +2722,13 @@ export function hasValidIncomingRequestValues({ isBlocked: boolean; isPrivate: boolean; didApproveMe: boolean; + invitePending: boolean; activeAt: number | undefined; }): boolean { // if a convo is not active, it means we didn't get any messages nor sent any. const isActive = activeAt && isFinite(activeAt) && activeAt > 0; return Boolean( - (isPrivate || PubKey.is03Pubkey(id)) && + (isPrivate || (PubKey.is03Pubkey(id) && invitePending)) && !isMe && !isApproved && !isBlocked && diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index b3910a070b..28c85b7b9b 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -18,6 +18,7 @@ import { stringToUint8Array } from '../../session/utils/String'; import { PreConditionFailed } from '../../session/utils/errors'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; +import { SessionUtilConvoInfoVolatile } from '../../session/utils/libsession/libsession_utils_convo_info_volatile'; import { groupInfoActions } from '../../state/ducks/metaGroups'; import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { BlockedNumberController } from '../../util'; @@ -43,7 +44,14 @@ type GroupUpdateDetails = { updateMessage: SignalService.GroupUpdateMessage; } & WithEnvelopeTimestamp; +/** + * Send the invite response to the group's swarm. An admin will handle it and update our invite pending state to not pending. + * NOTE: + * This message can only be sent once we got the keys for the group, through a poll of the swarm. + */ async function sendInviteResponseToGroup({ groupPk }: { groupPk: GroupPubkeyType }) { + window.log.info(`sendInviteResponseToGroup for group ${ed25519Str(groupPk)}`); + await getMessageQueue().sendToGroupV2({ message: new GroupUpdateInviteResponseMessage({ groupPk, @@ -53,10 +61,6 @@ async function sendInviteResponseToGroup({ groupPk }: { groupPk: GroupPubkeyType expireTimer: 0, }), }); - - // TODO use the pending so we actually don't start polling here unless it is not in the pending state. - // once everything is ready, start polling using that authData to get the keys, members, details of that group, and its messages. - getSwarmPollingInstance().addGroupId(groupPk); } async function handleGroupInviteMessage({ @@ -92,6 +96,7 @@ async function handleGroupInviteMessage({ } window.log.debug(`received invite to group ${ed25519Str(groupPk)} by user:${ed25519Str(author)}`); + const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); convo.set({ active_at: envelopeTimestamp, @@ -104,7 +109,6 @@ async function handleGroupInviteMessage({ displayNameInProfile: inviteMessage.name, }); } - await convo.commit(); const userEd25519Secretkey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes; let found = await UserGroupsWrapperActions.getGroup(groupPk); @@ -131,6 +135,12 @@ async function handleGroupInviteMessage({ found.authData = inviteMessage.memberAuthData; await UserGroupsWrapperActions.setGroup(found); + // force markedAsUnread to be true so it shows the unread banner (we only show the banner if there are unread messages on at least one msg/group request) + await convo.markAsUnread(true, false); + await convo.commit(); + + await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id); + await MetaGroupWrapperActions.init(groupPk, { metaDumped: null, groupEd25519Secretkey: null, @@ -142,7 +152,7 @@ async function handleGroupInviteMessage({ await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); await UserSync.queueNewJobIfNeeded(); if (!found.invitePending) { - // if this group should already be polling + // if this group should already be polling based on if that author is pre-approved or we've already approved that group from another device. getSwarmPollingInstance().addGroupId(groupPk, async () => { // we need to do a first poll to fetch the keys etc before we can send our invite response // this is pretty hacky, but also an admin seeing a message from that user in the group will mark it as not pending anymore @@ -526,4 +536,4 @@ async function handleGroupUpdateMessage( window.log.warn('received group update of unknown type. Discarding...'); } -export const GroupV2Receiver = { handleGroupUpdateMessage }; +export const GroupV2Receiver = { handleGroupUpdateMessage, sendInviteResponseToGroup }; diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts index 269fc13365..44c55c0457 100644 --- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts +++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts @@ -11,6 +11,7 @@ import { } from '../../../webworker/workers/browser/libsession_worker_interface'; import { OpenGroupUtils } from '../../apis/open_group_api/utils'; import { ConvoHub } from '../../conversations'; +import { PubKey } from '../../types'; import { SessionUtilContact } from './libsession_utils_contacts'; import { SessionUtilUserGroups } from './libsession_utils_user_groups'; import { SessionUtilUserProfile } from './libsession_utils_user_profile'; @@ -57,7 +58,9 @@ function getConvoType(convo: ConversationModel): ConvoVolatileType { ? '1o1' : SessionUtilUserGroups.isCommunityToStoreInWrapper(convo) ? 'Community' - : 'LegacyGroup'; + : SessionUtilUserGroups.isLegacyGroupToStoreInWrapper(convo) + ? 'LegacyGroup' + : 'Group'; return convoType; } @@ -119,7 +122,21 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise< } break; case 'Group': - // we need to keep track of the convo volatile info for the new group now. // TODO AUDRIC debugger + try { + if (!PubKey.is03Pubkey(convoId)) { + throw new Error('group but not with 03 prefix'); + } + await ConvoInfoVolatileWrapperActions.setGroup( + convoId, + lastReadMessageTimestamp, + isForcedUnread + ); + await refreshConvoVolatileCached(convoId, true, false); + } catch (e) { + window.log.warn( + `ConvoInfoVolatileWrapperActions.setGroup of ${convoId} failed with ${e.message}` + ); + } break; case 'Community': try { @@ -175,6 +192,8 @@ async function refreshConvoVolatileCached( convoType = 'Community'; } else if (convoId.startsWith('05') && isLegacyGroup) { convoType = 'LegacyGroup'; + } else if (PubKey.is03Pubkey(convoId)) { + convoType = 'Group'; } else if (convoId.startsWith('05')) { convoType = '1o1'; } @@ -195,6 +214,16 @@ async function refreshConvoVolatileCached( } refreshed = true; break; + case 'Group': + if (!PubKey.is03Pubkey(convoId)) { + throw new Error('expected a 03 group'); + } + const fromWrapperGroup = await ConvoInfoVolatileWrapperActions.getGroup(convoId); + if (fromWrapperGroup) { + mappedGroupWrapperValues.set(convoId, fromWrapperGroup); + } + refreshed = true; + break; case 'Community': const fromWrapperCommunity = await ConvoInfoVolatileWrapperActions.getCommunity(convoId); if (fromWrapperCommunity && fromWrapperCommunity.fullUrlWithPubkey) { diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts index 52f553c397..fec96847fe 100644 --- a/ts/session/utils/libsession/libsession_utils_user_groups.ts +++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts @@ -17,7 +17,11 @@ import { PubKey } from '../../types'; * Returns true if that conversation is an active group */ function isUserGroupToStoreInWrapper(convo: ConversationModel): boolean { - return isCommunityToStoreInWrapper(convo) || isLegacyGroupToStoreInWrapper(convo); + return ( + isCommunityToStoreInWrapper(convo) || + isLegacyGroupToStoreInWrapper(convo) || + isGroupToStoreInWrapper(convo) + ); } function isCommunityToStoreInWrapper(convo: ConversationModel): boolean { @@ -36,7 +40,7 @@ function isLegacyGroupToStoreInWrapper(convo: ConversationModel): boolean { } function isGroupToStoreInWrapper(convo: ConversationModel): boolean { - return convo.isGroup() && PubKey.is03Pubkey(convo.id) && convo.isActive(); // TODO should we filter by left/kicked or they are on the wrapper itself? + return convo.isGroup() && PubKey.is03Pubkey(convo.id) && convo.isActive(); // debugger TODO should we filter by left/kicked or they are on the wrapper itself? } /** @@ -155,7 +159,36 @@ async function insertGroupsFromDBIntoWrapperAndRefresh( } break; case 'Group': - // debugger; + // The 03-group is a bit different that the others as most fields are not to be updated. + // Indeed, they are more up to date on the group's swarm than ours and we don't want to keep both in sync. + if (!PubKey.is03Pubkey(convoId)) { + throw new Error('not a 03 group'); + } + const groupInfo = { + pubkeyHex: convoId, + authData: null, // only updated when we process a new invite + invitePending: null, // only updated when we accept an invite + disappearingTimerSeconds: null, // not updated except when we process an invite/create a group + joinedAtSeconds: null, // no need to update this one except when we process an invite, maybe + name: null, // not updated except when we process an invite/create a group + secretKey: null, // not updated except when we process an promote/create a group + kicked: foundConvo.isKickedFromGroup() ?? null, + priority: foundConvo.getPriority() ?? null, + }; + try { + window.log.debug( + `inserting into usergroup wrapper "${foundConvo.id}"... }`, + JSON.stringify(groupInfo) + ); + // this does the create or the update of the matching existing group + await UserGroupsWrapperActions.setGroup(groupInfo); + + // returned for testing purposes only + return null; + } catch (e) { + window.log.warn(`UserGroupsWrapperActions.set of ${convoId} failed with ${e.message}`); + // we still let this go through + } break; default: diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 870170c4c1..d4d1d6af70 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -396,6 +396,9 @@ const _getConversationRequests = ( ): Array => { return filter(sortedConversations, conversation => { const { isApproved, isBlocked, isPrivate, isMe, activeAt, didApproveMe, id } = conversation; + const invitePending = PubKey.is03Pubkey(id) + ? UserGroupsWrapperActions.getCachedGroup(id)?.invitePending || false + : false; const isIncomingRequest = hasValidIncomingRequestValues({ id, isApproved: isApproved || false, @@ -404,29 +407,26 @@ const _getConversationRequests = ( isMe: isMe || false, activeAt: activeAt || 0, didApproveMe: didApproveMe || false, + invitePending, }); return isIncomingRequest; }); }; -export const getConversationRequests = createSelector( - getSortedConversations, - _getConversationRequests -); +const getConversationRequests = createSelector(getSortedConversations, _getConversationRequests); export const getConversationRequestsIds = createSelector(getConversationRequests, requests => requests.map(m => m.id) ); -export const hasConversationRequests = (state: StateType) => { - return !!getConversationRequests(state).length; -}; - const _getUnreadConversationRequests = ( sortedConversationRequests: Array ): Array => { return filter(sortedConversationRequests, conversation => { - return Boolean(conversation && conversation.unreadCount && conversation.unreadCount > 0); + return Boolean( + conversation && + ((conversation.unreadCount && conversation.unreadCount > 0) || conversation.isMarkedUnread) + ); }); }; diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 81ca526b7c..1b5b6e6f1c 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -266,6 +266,61 @@ export function getLegacyGroupInfoFromDBValues({ return legacyGroup; } +/** + * This function should only be used to update the libsession fields of a 03-group. + * Most of the fields tracked in the usergroup wrapper in libsession are actually not updated + * once the entry is created, but some of them needs to be updated. + */ +export function getGroupInfoFromDBValues({ + id, + priority, + members: maybeMembers, + displayNameInProfile, + expirationMode, + expireTimer, + encPubkeyHex, + encSeckeyHex, + groupAdmins: maybeAdmins, + lastJoinedTimestamp, +}: { + id: string; + priority: number; + displayNameInProfile: string | undefined; + expirationMode: DisappearingMessageConversationModeType | undefined; + expireTimer: number | undefined; + encPubkeyHex: string; + encSeckeyHex: string; + members: string | Array; + groupAdmins: string | Array; + lastJoinedTimestamp: number; +}) { + const admins: Array = maybeArrayJSONtoArray(maybeAdmins); + const members: Array = maybeArrayJSONtoArray(maybeMembers); + + const wrappedMembers: Array = (members || []).map(m => { + return { + isAdmin: admins.includes(m), + pubkeyHex: m, + }; + }); + + const legacyGroup: LegacyGroupInfo = { + pubkeyHex: id, + name: displayNameInProfile || '', + priority: priority || 0, + members: wrappedMembers, + disappearingTimerSeconds: + expirationMode && expirationMode !== 'off' && !!expireTimer && expireTimer > 0 + ? expireTimer + : 0, + encPubkey: !isEmpty(encPubkeyHex) ? from_hex(encPubkeyHex) : new Uint8Array(), + encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(), + joinedAtSeconds: Math.floor(lastJoinedTimestamp / 1000), + }; + + return legacyGroup; +} + /** * This function can be used to make sure all the possible values as input of a switch as taken care off, without having a default case. * diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 31d9c7905f..7cb4d47017 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -387,6 +387,30 @@ export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCal callLibSessionWorker(['ConvoInfoVolatileConfig', 'eraseLegacyGroup', pubkeyHex]) as Promise< ReturnType >, + // groups + getGroup: async (pubkeyHex: GroupPubkeyType) => + callLibSessionWorker(['ConvoInfoVolatileConfig', 'getGroup', pubkeyHex]) as Promise< + ReturnType + >, + + getAllGroups: async () => + callLibSessionWorker(['ConvoInfoVolatileConfig', 'getAllGroups']) as Promise< + ReturnType + >, + + setGroup: async (pubkeyHex: GroupPubkeyType, lastRead: number, unread: boolean) => + callLibSessionWorker([ + 'ConvoInfoVolatileConfig', + 'setGroup', + pubkeyHex, + lastRead, + unread, + ]) as Promise>, + + eraseGroup: async (pubkeyHex: GroupPubkeyType) => + callLibSessionWorker(['ConvoInfoVolatileConfig', 'eraseGroup', pubkeyHex]) as Promise< + ReturnType + >, // communities getCommunity: async (communityFullUrl: string) => From 3224fec04b4dd79dd22ebb1ccf38ccea3b8c6f13 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 11 Jan 2024 10:49:55 +1100 Subject: [PATCH 071/302] feat: marking pending member as invited when he sends a message to group --- ts/receiver/dataMessage.ts | 1 + ts/receiver/groupv2/handleGroupV2Message.ts | 12 ++- ts/receiver/queuedJob.ts | 94 ++++++++++++++------- ts/state/selectors/groups.ts | 8 ++ 4 files changed, 83 insertions(+), 32 deletions(-) diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index f7fd0c4de8..51c4cf2499 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -181,6 +181,7 @@ export async function handleSwarmDataMessage({ } // we handle legacy group updates from our other devices in handleLegacyClosedGroupControlMessage() if (cleanDataMessage.closedGroupControlMessage) { + // TODO DEPRECATED await handleLegacyClosedGroupControlMessage( envelope, cleanDataMessage.closedGroupControlMessage as SignalService.DataMessage.ClosedGroupControlMessage, diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 28c85b7b9b..af3d7a8f3e 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -38,7 +38,9 @@ type GroupInviteDetails = { } & WithEnvelopeTimestamp & WithAuthor; -type GroupUpdateGeneric = { change: T } & WithEnvelopeTimestamp & WithGroupPubkey & WithAuthor; +type GroupUpdateGeneric = { change: Omit } & WithEnvelopeTimestamp & + WithGroupPubkey & + WithAuthor; type GroupUpdateDetails = { updateMessage: SignalService.GroupUpdateMessage; @@ -381,7 +383,7 @@ async function handleGroupUpdateInviteResponseMessage({ groupPk, change, author, -}: GroupUpdateGeneric) { +}: Omit, 'envelopeTimestamp'>) { // no sig verify for this type of message const convo = ConvoHub.use().get(groupPk); if (!convo) { @@ -536,4 +538,8 @@ async function handleGroupUpdateMessage( window.log.warn('received group update of unknown type. Discarding...'); } -export const GroupV2Receiver = { handleGroupUpdateMessage, sendInviteResponseToGroup }; +export const GroupV2Receiver = { + handleGroupUpdateMessage, + sendInviteResponseToGroup, + handleGroupUpdateInviteResponseMessage, +}; diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index dcbebce60c..fc128b4bbe 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -1,4 +1,4 @@ -import _, { isEmpty, isNumber } from 'lodash'; +import _, { isEmpty, isNumber, toNumber } from 'lodash'; import { queueAttachmentDownloads } from './attachments'; import { Data } from '../data/data'; @@ -16,9 +16,11 @@ import { PubKey } from '../session/types'; import { UserUtils } from '../session/utils'; import { PropsForMessageWithoutConvoProps, lookupQuote } from '../state/ducks/conversations'; import { showMessageRequestBannerOutsideRedux } from '../state/ducks/userConfig'; +import { getMemberInvitePendingOutsideRedux } from '../state/selectors/groups'; import { getHideMessageRequestBannerOutsideRedux } from '../state/selectors/userConfig'; import { GoogleChrome } from '../util'; import { LinkPreviews } from '../util/linkPreviews'; +import { GroupV2Receiver } from './groupv2/handleGroupV2Message'; function contentTypeSupported(type: string): boolean { const Chrome = GoogleChrome; @@ -212,6 +214,66 @@ export function toRegularMessage(rawDataMessage: SignalService.DataMessage): Reg }; } +async function toggleMsgRequestBannerIfNeeded( + conversation: ConversationModel, + message: MessageModel, + source: string +) { + if (!conversation.isPrivate() || !message.isIncoming()) { + return; + } + + const incomingMessageCount = await Data.getMessageCountByType( + conversation.id, + MessageDirection.incoming + ); + const isFirstRequestMessage = incomingMessageCount < 2; + if ( + conversation.isIncomingRequest() && + isFirstRequestMessage && + getHideMessageRequestBannerOutsideRedux() + ) { + showMessageRequestBannerOutsideRedux(); + } + + // For edge case when messaging a client that's unable to explicitly send request approvals + if (conversation.isOutgoingRequest()) { + // Conversation was not approved before so a sync is needed + await conversation.addIncomingApprovalMessage(toNumber(message.get('sent_at')) - 1, source); + } + // should only occur after isOutgoing request as it relies on didApproveMe being false. + await conversation.setDidApproveMe(true); +} + +async function handleMessageFromPendingMember( + conversation: ConversationModel, + message: MessageModel, + source: string +) { + const convoId = conversation.id; + if ( + !conversation.isClosedGroupV2() || + !message.isIncoming() || + !conversation.weAreAdminUnblinded() || // this checks on libsession of that group if we are an admin + !conversation.getGroupMembers().includes(source) || // this check that the sender of that message is indeed a member of the group + !PubKey.is03Pubkey(convoId) || + !PubKey.is05Pubkey(source) + ) { + return; + } + + const isMemberInvitePending = getMemberInvitePendingOutsideRedux(source, convoId); + if (!isMemberInvitePending) { + return; // nothing else to do + } + // we are an admin and we received a message from a member whose invite is `pending`. Update that member state now and push a change. + await GroupV2Receiver.handleGroupUpdateInviteResponseMessage({ + groupPk: convoId, + author: source, + change: { isApproved: true }, + }); +} + async function handleRegularMessage( conversation: ConversationModel, sendingDeviceConversation: ConversationModel, @@ -220,7 +282,6 @@ async function handleRegularMessage( source: string, messageHash: string ): Promise { - const type = message.get('type'); // this does not trigger a UI update nor write to the db await copyFromQuotedMessage(message, rawDataMessage.quote); @@ -251,33 +312,8 @@ async function handleRegularMessage( await sendingDeviceConversation.updateBlocksSogsMsgReqsTimestamp(updateBlockTimestamp, false); } - if (type === 'incoming') { - if (conversation.isPrivate()) { - const incomingMessageCount = await Data.getMessageCountByType( - conversation.id, - MessageDirection.incoming - ); - const isFirstRequestMessage = incomingMessageCount < 2; - if ( - conversation.isIncomingRequest() && - isFirstRequestMessage && - getHideMessageRequestBannerOutsideRedux() - ) { - showMessageRequestBannerOutsideRedux(); - } - - // For edge case when messaging a client that's unable to explicitly send request approvals - if (conversation.isOutgoingRequest()) { - // Conversation was not approved before so a sync is needed - await conversation.addIncomingApprovalMessage( - _.toNumber(message.get('sent_at')) - 1, - source - ); - } - // should only occur after isOutgoing request as it relies on didApproveMe being false. - await conversation.setDidApproveMe(true); - } - } + await toggleMsgRequestBannerIfNeeded(conversation, message, source); + await handleMessageFromPendingMember(conversation, message, source); const conversationActiveAt = conversation.getActiveAt(); if ( diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index 1903aef7c5..4cea26c4b3 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -110,6 +110,14 @@ export function getLibGroupAdminsOutsideRedux(convoId: string): Array { return state ? getLibAdminsPubkeys(state, convoId) : []; } +export function getMemberInvitePendingOutsideRedux( + member: PubkeyType, + convoId: GroupPubkeyType +): boolean { + const state = window.inboxStore?.getState(); + return state ? getMemberInvitePending(state, member, convoId) : false; +} + export function useIsCreatingGroupFromUIPending() { return useSelector(getIsCreatingGroupFromUI); } From 0be10d1256a3b227a66c60b97f4ee3b459bacb9e Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 17 Jan 2024 13:49:43 +1100 Subject: [PATCH 072/302] fix: move revoke unrevoke to batched push group changes --- ts/models/message.ts | 24 +- .../apis/snode_api/SnodeRequestTypes.ts | 57 +- ts/session/apis/snode_api/namespaces.ts | 3 +- ts/session/apis/snode_api/revokeSubaccount.ts | 114 +--- .../snode_api/signature/groupSignature.ts | 9 +- .../snode_api/signature/snodeSignatures.ts | 11 +- ts/session/apis/snode_api/storeMessage.ts | 70 ++- ts/session/apis/snode_api/swarmPolling.ts | 4 +- ts/session/apis/snode_api/types.ts | 53 +- ts/session/crypto/MessageEncrypter.ts | 2 +- .../to_user/GroupUpdateDeleteMessage.ts | 10 +- ts/session/sending/MessageSender.ts | 150 +++++- .../utils/job_runners/jobs/GroupSyncJob.ts | 69 ++- .../utils/job_runners/jobs/UserSyncJob.ts | 8 +- ts/state/ducks/metaGroups.ts | 506 +++++++++++++----- .../libsession_wrapper_metagroup_test.ts | 4 +- .../group_sync_job/GroupSyncJob_test.ts | 24 +- .../browser/libsession_worker_interface.ts | 6 +- 18 files changed, 791 insertions(+), 333 deletions(-) diff --git a/ts/models/message.ts b/ts/models/message.ts index 4048a94b7f..f426021421 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -2,7 +2,7 @@ import Backbone from 'backbone'; import autoBind from 'auto-bind'; import filesize from 'filesize'; -import { PubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { cloneDeep, debounce, @@ -20,7 +20,10 @@ import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; import { ConvoHub } from '../session/conversations'; import { ContentMessage } from '../session/messages/outgoing'; -import { ClosedGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; +import { + ClosedGroupV2VisibleMessage, + ClosedGroupVisibleMessage, +} from '../session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage'; import { PubKey } from '../session/types'; import { UserUtils, @@ -818,8 +821,9 @@ export class MessageModel extends Backbone.Model { } window.log.info( - `Upload of message data for message ${this.idForLogging()} is finished in ${Date.now() - - start}ms.` + `Upload of message data for message ${this.idForLogging()} is finished in ${ + Date.now() - start + }ms.` ); return { body, @@ -947,6 +951,18 @@ export class MessageModel extends Backbone.Model { ); } + if (conversation.isClosedGroupV2()) { + const groupV2VisibleMessage = new ClosedGroupV2VisibleMessage({ + destination: PubKey.cast(this.get('conversationId')).key as GroupPubkeyType, + chatMessage, + namespace: SnodeNamespaces.ClosedGroupMessages, + }); + // we need the return await so that errors are caught in the catch {} + return await getMessageQueue().sendToGroupV2({ + message: groupV2VisibleMessage, + }); + } + const closedGroupVisibleMessage = new ClosedGroupVisibleMessage({ groupId: PubKey.cast(this.get('conversationId')).key, chatMessage, diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 1fb82f4302..41923d32ef 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1,10 +1,12 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { isEmpty } from 'lodash'; import { SnodeNamespaces, SnodeNamespacesGroup, SnodeNamespacesGroupConfig, UserConfigNamespaces, } from './namespaces'; +import { SignedGroupHashesParams, SignedHashesParams } from './types'; export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } }; @@ -152,12 +154,20 @@ type StoreOnNodeGroupConfig = StoreOnNodeShared & { namespace: SnodeNamespacesGroupConfig; }; +type StoreOnNodeGroupMessage = StoreOnNodeShared & { + pubkey: GroupPubkeyType; + namespace: SnodeNamespaces.ClosedGroupMessages; +}; + type StoreOnNodeUserConfig = StoreOnNodeShared & { pubkey: PubkeyType; namespace: UserConfigNamespaces; }; -export type StoreOnNodeData = StoreOnNodeGroupConfig | StoreOnNodeUserConfig; +export type StoreOnNodeData = + | StoreOnNodeGroupConfig + | StoreOnNodeUserConfig + | StoreOnNodeGroupMessage; export type StoreOnNodeSubRequest = { method: 'store'; @@ -215,28 +225,34 @@ type UpdateExpiryOnNodeSubRequest = | UpdateExpiryOnNodeUserSubRequest | UpdateExpiryOnNodeGroupSubRequest; -type RevokeSubaccountShared = { +type SignedRevokeSubaccountShared = { pubkey: GroupPubkeyType; signature: string; timestamp: number; }; -export type RevokeSubaccountParams = RevokeSubaccountShared & { - revoke: string; // the subaccount token to revoke in hex +export type SignedRevokeSubaccountParams = SignedRevokeSubaccountShared & { + revoke: Array; // the subaccounts token to revoke in hex }; -export type UnrevokeSubaccountParams = RevokeSubaccountShared & { - unrevoke: string; // the subaccount token to revoke in hex +export type SignedUnrevokeSubaccountParams = SignedRevokeSubaccountShared & { + unrevoke: Array; // the subaccounts token to unrevoke in hex }; +export type RevokeSubaccountParams = Omit; +export type UnrevokeSubaccountParams = Omit< + SignedUnrevokeSubaccountParams, + 'timestamp' | 'signature' +>; + export type RevokeSubaccountSubRequest = { method: 'revoke_subaccount'; - params: RevokeSubaccountParams; + params: SignedRevokeSubaccountParams; }; export type UnrevokeSubaccountSubRequest = { method: 'unrevoke_subaccount'; - params: UnrevokeSubaccountParams; + params: SignedUnrevokeSubaccountParams; }; export type GetExpiriesNodeParams = { @@ -283,3 +299,28 @@ export type NotEmptyArrayOfBatchResults = NonEmptyArray; export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; export const MAX_SUBREQUESTS_COUNT = 20; + +export type BatchStoreWithExtraParams = + | StoreOnNodeParams + | SignedGroupHashesParams + | SignedHashesParams + | RevokeSubaccountSubRequest + | UnrevokeSubaccountSubRequest; + +export function isUnrevokeRequest( + request: BatchStoreWithExtraParams +): request is UnrevokeSubaccountSubRequest { + return !isEmpty((request as UnrevokeSubaccountSubRequest)?.params?.unrevoke); +} + +export function isRevokeRequest( + request: BatchStoreWithExtraParams +): request is RevokeSubaccountSubRequest { + return !isEmpty((request as RevokeSubaccountSubRequest)?.params?.revoke); +} + +export function isDeleteByHashesParams( + request: BatchStoreWithExtraParams +): request is SignedGroupHashesParams | SignedHashesParams { + return !isEmpty((request as SignedGroupHashesParams | SignedHashesParams)?.messages); +} diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index 9df6de690f..39936d5381 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -74,7 +74,8 @@ export type SnodeNamespacesGroupConfig = PickEnum< */ export type SnodeNamespacesGroup = | SnodeNamespacesGroupConfig - | PickEnum; + | PickEnum + | PickEnum; export type SnodeNamespacesUser = PickEnum; diff --git a/ts/session/apis/snode_api/revokeSubaccount.ts b/ts/session/apis/snode_api/revokeSubaccount.ts index f8af2e6fc8..2f9f662a4f 100644 --- a/ts/session/apis/snode_api/revokeSubaccount.ts +++ b/ts/session/apis/snode_api/revokeSubaccount.ts @@ -1,102 +1,42 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { from_hex } from 'libsodium-wrappers-sumo'; -import _ from 'lodash'; -import { doSnodeBatchRequest } from './batchRequest'; -import { concatUInt8Array } from '../../crypto'; import { PubKey } from '../../types'; -import { StringUtils } from '../../utils'; -import { RevokeSubaccountSubRequest, UnrevokeSubaccountSubRequest } from './SnodeRequestTypes'; -import { GetNetworkTime } from './getNetworkTime'; -import { SnodeGroupSignature } from './signature/groupSignature'; -import { getSwarmFor } from './snodePool'; +import { RevokeSubaccountParams, UnrevokeSubaccountParams } from './SnodeRequestTypes'; export type RevokeChanges = Array<{ action: 'revoke_subaccount' | 'unrevoke_subaccount'; tokenToRevokeHex: string; }>; -async function getRevokeSubaccountRequest({ - groupPk, - revokeChanges, - groupSecretKey, -}: { - groupPk: GroupPubkeyType; - groupSecretKey: Uint8Array; - revokeChanges: RevokeChanges; -}): Promise> { +async function getRevokeSubaccountParams( + groupPk: GroupPubkeyType, + { + revokeChanges, + unrevokeChanges, + }: { revokeChanges: RevokeChanges; unrevokeChanges: RevokeChanges } +) { if (!PubKey.is03Pubkey(groupPk)) { throw new Error('revokeSubaccountForGroup: not a 03 group'); } - const timestamp = GetNetworkTime.now(); - - const revokeParams: Array = - await Promise.all( - revokeChanges.map(async change => { - const tokenBytes = from_hex(change.tokenToRevokeHex); - - const prefix = new Uint8Array(StringUtils.encode(`${change.action}${timestamp}`, 'utf8')); - const sigResult = await SnodeGroupSignature.signDataWithAdminSecret( - concatUInt8Array(prefix, tokenBytes), - { secretKey: groupSecretKey } - ); - - const args = - change.action === 'revoke_subaccount' - ? { - method: change.action, - params: { - revoke: change.tokenToRevokeHex, - ...sigResult, - pubkey: groupPk, - timestamp, - }, - } - : { - method: change.action, - params: { - unrevoke: change.tokenToRevokeHex, - ...sigResult, - pubkey: groupPk, - timestamp, - }, - }; - - return args; - }) - ); - - return revokeParams; -} - -async function revokeSubAccounts( - groupPk: GroupPubkeyType, - revokeChanges: RevokeChanges, - groupSecretKey: Uint8Array -): Promise { - try { - const swarm = await getSwarmFor(groupPk); - const snode = _.sample(swarm); - if (!snode) { - throw new Error('revoke subaccounts empty swarm'); - } - const revokeParams = await getRevokeSubaccountRequest({ - groupPk, - revokeChanges, - groupSecretKey, - }); - - const results = await doSnodeBatchRequest(revokeParams, snode, 7000, null); - - if (!results || !results.length) { - throw new Error(`_revokeSubAccounts could not talk to ${snode.ip}:${snode.port}`); - } - return true; - } catch (e) { - window?.log?.warn(`_revokeSubAccounts failed with ${e.message}`); - return false; - } + const revokeParams: RevokeSubaccountParams | null = revokeChanges.length + ? { + pubkey: groupPk, + revoke: revokeChanges.map(m => m.tokenToRevokeHex), + } + : null; + + const unrevokeParams: UnrevokeSubaccountParams | null = unrevokeChanges.length + ? { + pubkey: groupPk, + unrevoke: unrevokeChanges.map(m => m.tokenToRevokeHex), + } + : null; + + return { + revokeParams, + unrevokeParams, + }; } -export const SnodeAPIRevoke = { revokeSubAccounts }; +export const SnodeAPIRevoke = { getRevokeSubaccountParams }; diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index fc01a8c218..903c111ee8 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -18,7 +18,12 @@ import { fromUInt8ArrayToBase64, stringToUint8Array } from '../../../utils/Strin import { PreConditionFailed } from '../../../utils/errors'; import { GetNetworkTime } from '../getNetworkTime'; import { SnodeNamespacesGroup } from '../namespaces'; -import { WithMessagesHashes, WithShortenOrExtend, WithTimestamp } from '../types'; +import { + SignedGroupHashesParams, + WithMessagesHashes, + WithShortenOrExtend, + WithTimestamp, +} from '../types'; import { SignatureShared } from './signatureShared'; import { SnodeSignatureResult } from './snodeSignatures'; @@ -275,7 +280,7 @@ async function getGroupSignatureByHashesParams({ }: WithMessagesHashes & { pubkey: GroupPubkeyType; method: 'delete'; -}) { +}): Promise { const verificationData = StringUtils.encode(`${method}${messagesHashes.join('')}`, 'utf8'); const message = new Uint8Array(verificationData); diff --git a/ts/session/apis/snode_api/signature/snodeSignatures.ts b/ts/session/apis/snode_api/signature/snodeSignatures.ts index 968d72c904..456420ed52 100644 --- a/ts/session/apis/snode_api/signature/snodeSignatures.ts +++ b/ts/session/apis/snode_api/signature/snodeSignatures.ts @@ -12,7 +12,12 @@ import { StringUtils, UserUtils } from '../../../utils'; import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../../utils/String'; import { PreConditionFailed } from '../../../utils/errors'; import { GetNetworkTime } from '../getNetworkTime'; -import { WithMessagesHashes, WithShortenOrExtend, WithTimestamp } from '../types'; +import { + SignedHashesParams, + WithMessagesHashes, + WithShortenOrExtend, + WithTimestamp, +} from '../types'; export type SnodeSignatureResult = WithTimestamp & { signature: string; @@ -27,7 +32,7 @@ async function getSnodeSignatureByHashesParams({ }: WithMessagesHashes & { pubkey: PubkeyType; method: 'delete'; -}) { +}): Promise { const ourEd25519Key = await UserUtils.getUserED25519KeyPair(); if (!ourEd25519Key) { @@ -46,7 +51,7 @@ async function getSnodeSignatureByHashesParams({ return { signature: signatureBase64, - pubkey_ed25519: ourEd25519Key.pubKey, + pubkey_ed25519: ourEd25519Key.pubKey as PubkeyType, pubkey, messages: messagesHashes, }; diff --git a/ts/session/apis/snode_api/storeMessage.ts b/ts/session/apis/snode_api/storeMessage.ts index f4f449b97a..2415f2eae0 100644 --- a/ts/session/apis/snode_api/storeMessage.ts +++ b/ts/session/apis/snode_api/storeMessage.ts @@ -1,62 +1,60 @@ -import { isEmpty } from 'lodash'; import { Snode } from '../../../data/data'; -import { doSnodeBatchRequest } from './batchRequest'; -import { GetNetworkTime } from './getNetworkTime'; import { - DeleteByHashesFromNodeParams, - DeleteFromNodeSubRequest, + BatchStoreWithExtraParams, NotEmptyArrayOfBatchResults, - StoreOnNodeParams, - StoreOnNodeSubRequest, + SnodeApiSubRequests, + isDeleteByHashesParams, + isRevokeRequest, + isUnrevokeRequest, } from './SnodeRequestTypes'; +import { doSnodeBatchRequest } from './batchRequest'; +import { GetNetworkTime } from './getNetworkTime'; -function justStores(params: Array) { +function buildStoreRequests(params: Array): Array { return params.map(p => { + if (isDeleteByHashesParams(p)) { + return { + method: 'delete' as const, + params: p, + }; + } + + if (isRevokeRequest(p)) { + return p; + } + + if (isUnrevokeRequest(p)) { + return p; + } + return { method: 'store', params: p, - } as StoreOnNodeSubRequest; + }; }); } -function buildStoreRequests( - params: Array, - toDeleteOnSequence: DeleteByHashesFromNodeParams | null -): Array { - if (!toDeleteOnSequence || isEmpty(toDeleteOnSequence)) { - return justStores(params); - } - return [...justStores(params), ...buildDeleteByHashesSubRequest(toDeleteOnSequence)]; -} - -function buildDeleteByHashesSubRequest( - params: DeleteByHashesFromNodeParams -): Array { - return [ - { - method: 'delete', - params, - }, - ]; -} - /** * Send a 'store' request to the specified targetNode, using params as argument * @returns the Array of stored hashes if it is a success, or null */ -async function storeOnNode( +async function batchStoreOnNode( targetNode: Snode, - params: Array, - toDeleteOnSequence: DeleteByHashesFromNodeParams | null, + params: Array, method: 'batch' | 'sequence' ): Promise { try { - const subRequests = buildStoreRequests(params, toDeleteOnSequence); + const subRequests = buildStoreRequests(params); + const asssociatedWith = (params[0] as any)?.pubkey as string | undefined; + if (!asssociatedWith) { + // not ideal, + throw new Error('batchStoreOnNode first subrequest pubkey needs to be set'); + } const result = await doSnodeBatchRequest( subRequests, targetNode, 4000, - params[0].pubkey, + asssociatedWith, method ); @@ -84,4 +82,4 @@ async function storeOnNode( } } -export const SnodeAPIStore = { storeOnNode }; +export const SnodeAPIStore = { batchStoreOnNode }; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 3dde144981..e058e5f914 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -539,7 +539,7 @@ export class SwarmPolling { } results = results.slice(0, results.length - 1); } - + console.warn('results what when we get kicked out?: ', results); const lastMessages = results.map(r => { return last(r.messages.messages); }); @@ -645,6 +645,7 @@ export class SwarmPolling { } if (type === ConversationTypeEnum.GROUPV2) { return [ + SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, // if we are kicked from the group, this will still return a 200, other namespaces will be 401/403 SnodeNamespaces.ClosedGroupMessages, SnodeNamespaces.ClosedGroupInfo, SnodeNamespaces.ClosedGroupMembers, @@ -815,6 +816,7 @@ async function decryptForGroupV2(retrieveResult: { groupPk: string; content: Uin timestamp: parsedEnvelope.timestamp, }; } catch (e) { + debugger; window.log.warn('failed to decrypt message with error: ', e.message); return null; } diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index 0d0fa80372..cb15e304ae 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -1,3 +1,11 @@ +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { PubKey } from '../../types'; +import { + RevokeSubaccountParams, + RevokeSubaccountSubRequest, + UnrevokeSubaccountParams, + UnrevokeSubaccountSubRequest, +} from './SnodeRequestTypes'; import { SnodeNamespaces } from './namespaces'; export type RetrieveMessageItem = { @@ -23,13 +31,56 @@ export type RetrieveRequestResult = { messages: RetrieveMessagesResultsContent; namespace: SnodeNamespaces; }; +export type WithMessagesHashes = { messagesHashes: Array }; + +export type DeleteMessageByHashesGroupSubRequest = WithMessagesHashes & { + pubkey: GroupPubkeyType; + method: 'delete'; +}; + +export type DeleteMessageByHashesUserSubRequest = WithMessagesHashes & { + pubkey: PubkeyType; + method: 'delete'; +}; export type RetrieveMessagesResultsBatched = Array; export type WithTimestamp = { timestamp: number }; export type ShortenOrExtend = 'extend' | 'shorten' | ''; export type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; -export type WithMessagesHashes = { messagesHashes: Array }; +export type WithSignedRevokeRequests = { + signedRevokeRequests: Array | null; +}; + +export type WithRevokeParams = { + revokeParams: RevokeSubaccountParams | null; + unrevokeParams: UnrevokeSubaccountParams | null; +}; +export type WithMessagesToDeleteSubRequest = { + messagesToDelete: + | DeleteMessageByHashesUserSubRequest + | DeleteMessageByHashesGroupSubRequest + | null; +}; + +export type SignedHashesParams = { + signature: string; + pubkey: PubkeyType; + pubkey_ed25519: PubkeyType; + messages: Array; +}; + +export type SignedGroupHashesParams = { + signature: string; + pubkey: GroupPubkeyType; + messages: Array; +}; + +export function isDeleteByHashesGroup( + request: DeleteMessageByHashesUserSubRequest | DeleteMessageByHashesGroupSubRequest +): request is DeleteMessageByHashesGroupSubRequest { + return PubKey.is03Pubkey(request.pubkey); +} /** inherits from https://api.oxen.io/storage-rpc/#/recursive?id=recursive but we only care about these values */ export type ExpireMessageResultItem = { diff --git a/ts/session/crypto/MessageEncrypter.ts b/ts/session/crypto/MessageEncrypter.ts index 3cca8a2feb..ceab29754b 100644 --- a/ts/session/crypto/MessageEncrypter.ts +++ b/ts/session/crypto/MessageEncrypter.ts @@ -20,7 +20,7 @@ type EncryptResult = { async function encryptWithLibSession(destination: GroupPubkeyType, plainText: Uint8Array) { try { - return MetaGroupWrapperActions.encryptMessage(destination, plainText); + return (await MetaGroupWrapperActions.encryptMessages(destination, [plainText]))[0]; } catch (e) { window.log.warn('encrypt message for group failed with', e.message); throw new SigningFailed(e.message); diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts index 4059cfeeec..d731e85ddc 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts @@ -1,21 +1,25 @@ +import { PubkeyType } from 'libsession_util_nodejs'; import { SignalService } from '../../../../../../protobuf'; import { Preconditions } from '../../../preconditions'; import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; interface Params extends GroupUpdateMessageParams { - adminSignature: Uint8Array; // this is a signature of `"DELETE" || sessionId || timestamp ` + adminSignature: Uint8Array; // this is a signature of `"DELETE" || sessionId || timestamp` + memberSessionIds: Array; } /** - * GroupUpdateDeleteMessage is sent to the group's swarm on the `revokedRetrievableGroupMessages` + * GroupUpdateDeleteMessage is sent to the group's swarm on the `revokedRetrievableGroupMessages` namespace */ export class GroupUpdateDeleteMessage extends GroupUpdateMessage { public readonly adminSignature: Params['adminSignature']; + public readonly memberSessionIds: Params['memberSessionIds']; constructor(params: Params) { super(params); this.adminSignature = params.adminSignature; + this.memberSessionIds = params.memberSessionIds; Preconditions.checkUin8tArrayOrThrow({ data: this.adminSignature, @@ -28,8 +32,8 @@ export class GroupUpdateDeleteMessage extends GroupUpdateMessage { public dataProto(): SignalService.DataMessage { const deleteMessage = new SignalService.GroupUpdateDeleteMessage({ adminSignature: this.adminSignature, + memberSessionIds: this.memberSessionIds, }); - throw new Error('Not implemented'); return new SignalService.DataMessage({ groupUpdateMessage: { deleteMessage } }); } diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 1e29b75541..c44c11cdff 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -3,7 +3,8 @@ import { AbortController } from 'abort-controller'; import ByteBuffer from 'bytebuffer'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import { isEmpty, isNumber, isString, sample } from 'lodash'; +import { from_hex } from 'libsodium-wrappers-sumo'; +import { compact, isEmpty, isNumber, isString, sample } from 'lodash'; import pRetry from 'p-retry'; import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; @@ -16,9 +17,13 @@ import { } from '../apis/open_group_api/sogsv3/sogsV3SendMessage'; import { NotEmptyArrayOfBatchResults, + RevokeSubaccountParams, + RevokeSubaccountSubRequest, StoreOnNodeData, StoreOnNodeParams, StoreOnNodeParamsNoSig, + UnrevokeSubaccountParams, + UnrevokeSubaccountSubRequest, } from '../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; @@ -30,9 +35,10 @@ import { import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/signature/snodeSignatures'; import { getSwarmFor } from '../apis/snode_api/snodePool'; import { SnodeAPIStore } from '../apis/snode_api/storeMessage'; +import { WithMessagesHashes, WithRevokeParams } from '../apis/snode_api/types'; import { TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; -import { MessageEncrypter } from '../crypto'; +import { MessageEncrypter, concatUInt8Array } from '../crypto'; import { addMessagePadding } from '../crypto/BufferPadding'; import { ContentMessage } from '../messages/outgoing'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; @@ -41,7 +47,7 @@ import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/Ope import { ed25519Str } from '../onions/onionPath'; import { PubKey } from '../types'; import { OutgoingRawMessage } from '../types/RawMessage'; -import { UserUtils } from '../utils'; +import { StringUtils, UserUtils } from '../utils'; import { fromUInt8ArrayToBase64 } from '../utils/String'; import { EmptySwarmError } from '../utils/errors'; @@ -139,7 +145,7 @@ async function send({ }, ], destination, - null, + { messagesHashes: [], revokeParams: null, unrevokeParams: null }, 'batch' ); @@ -216,7 +222,8 @@ async function getSignatureParamsFromNamespace( if ( SnodeNamespace.isGroupConfigNamespace(item.namespace) || - item.namespace === SnodeNamespaces.ClosedGroupMessages + item.namespace === SnodeNamespaces.ClosedGroupMessages || + item.namespace === SnodeNamespaces.ClosedGroupRevokedRetrievableMessages ) { if (!PubKey.is03Pubkey(destination)) { throw new Error( @@ -234,10 +241,102 @@ async function getSignatureParamsFromNamespace( return {}; } +async function signDeleteHashesRequest( + destination: PubkeyType | GroupPubkeyType, + messagesHashes: Array +) { + if (isEmpty(messagesHashes)) { + return null; + } + const signedRequest = messagesHashes + ? PubKey.is03Pubkey(destination) + ? await SnodeGroupSignature.getGroupSignatureByHashesParams({ + messagesHashes, + pubkey: destination, + method: 'delete', + }) + : await SnodeSignature.getSnodeSignatureByHashesParams({ + messagesHashes, + pubkey: destination, + method: 'delete', + }) + : null; + + return signedRequest || null; +} + +async function signedRevokeRequest({ + destination, + revokeParams, + unrevokeParams, +}: WithRevokeParams & { destination: PubkeyType | GroupPubkeyType }) { + let revokeSignedRequest: RevokeSubaccountSubRequest | null = null; + let unrevokeSignedRequest: UnrevokeSubaccountSubRequest | null = null; + + if (!PubKey.is03Pubkey(destination) || (isEmpty(revokeParams) && isEmpty(unrevokeParams))) { + return { revokeSignedRequest, unrevokeSignedRequest }; + } + + const group = await UserGroupsWrapperActions.getGroup(destination); + const secretKey = group?.secretKey; + if (!secretKey || isEmpty(secretKey)) { + throw new Error('tried to signedRevokeRequest but we do not have the admin secret key'); + } + + const timestamp = GetNetworkTime.now(); + + if (revokeParams) { + const method = 'revoke_subaccount' as const; + const tokensBytes = from_hex(revokeParams.revoke.join('')); + + const prefix = new Uint8Array(StringUtils.encode(`${method}${timestamp}`, 'utf8')); + const sigResult = await SnodeGroupSignature.signDataWithAdminSecret( + concatUInt8Array(prefix, tokensBytes), + { secretKey } + ); + + revokeSignedRequest = { + method, + params: { + revoke: revokeParams.revoke, + ...sigResult, + pubkey: destination, + timestamp, + }, + }; + } + if (unrevokeParams) { + const method = 'unrevoke_subaccount' as const; + const tokensBytes = from_hex(unrevokeParams.unrevoke.join('')); + + const prefix = new Uint8Array(StringUtils.encode(`${method}${timestamp}`, 'utf8')); + const sigResult = await SnodeGroupSignature.signDataWithAdminSecret( + concatUInt8Array(prefix, tokensBytes), + { secretKey } + ); + + unrevokeSignedRequest = { + method, + params: { + unrevoke: unrevokeParams.unrevoke, + ...sigResult, + pubkey: destination, + timestamp, + }, + }; + } + + return { revokeSignedRequest, unrevokeSignedRequest }; +} + async function sendMessagesDataToSnode( params: Array, destination: PubkeyType | GroupPubkeyType, - messagesHashesToDelete: Set | null, + { + messagesHashes: messagesToDelete, + revokeParams, + unrevokeParams, + }: WithMessagesHashes & WithRevokeParams, method: 'batch' | 'sequence' ): Promise { const rightDestination = params.filter(m => m.pubkey === destination); @@ -261,32 +360,29 @@ async function sendMessagesDataToSnode( }) ); - const signedDeleteOldHashesRequest = - messagesHashesToDelete && messagesHashesToDelete.size - ? PubKey.is03Pubkey(destination) - ? await SnodeGroupSignature.getGroupSignatureByHashesParams({ - method: 'delete' as const, - messagesHashes: [...messagesHashesToDelete], - pubkey: destination, - }) - : await SnodeSignature.getSnodeSignatureByHashesParams({ - method: 'delete' as const, - messagesHashes: [...messagesHashesToDelete], - pubkey: destination, - }) - : null; - const snode = sample(swarm); if (!snode) { throw new EmptySwarmError(destination, 'Ran out of swarm nodes to query'); } + const signedDeleteHashesRequest = await signDeleteHashesRequest(destination, messagesToDelete); + const signedRevokeRequests = await signedRevokeRequest({ + destination, + revokeParams, + unrevokeParams, + }); + try { // No pRetry here as if this is a bad path it will be handled and retried in lokiOnionFetch. - const storeResults = await SnodeAPIStore.storeOnNode( + const storeResults = await SnodeAPIStore.batchStoreOnNode( snode, - withSigWhenRequired, - signedDeleteOldHashesRequest, + compact([ + ...withSigWhenRequired, + signedDeleteHashesRequest, + signedRevokeRequests?.revokeSignedRequest, + signedRevokeRequests?.unrevokeSignedRequest, + ]), + method ); @@ -437,7 +533,9 @@ async function encryptMessagesAndWrap( async function sendEncryptedDataToSnode( encryptedData: Array, destination: GroupPubkeyType | PubkeyType, - messagesHashesToDelete: Set | null + messagesHashesToDelete: Set | null, + revokeParams: RevokeSubaccountParams | null, + unrevokeParams: UnrevokeSubaccountParams | null ): Promise { try { const batchResults = await pRetry( @@ -451,7 +549,7 @@ async function sendEncryptedDataToSnode( namespace: content.namespace, })), destination, - messagesHashesToDelete, + { messagesHashes: [...(messagesHashesToDelete || [])], revokeParams, unrevokeParams }, 'sequence' ); }, diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index aa9ca52cec..278d00c08a 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -1,5 +1,5 @@ /* eslint-disable no-await-in-loop */ -import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; import { isArray, isEmpty, isNumber } from 'lodash'; import { UserUtils } from '../..'; import { assertUnreachable } from '../../../../types/sqlSharedTypes'; @@ -8,8 +8,11 @@ import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/l import { StoreOnNodeData } from '../../../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; +import { WithRevokeParams } from '../../../apis/snode_api/types'; import { TTL_DEFAULT } from '../../../constants'; import { ConvoHub } from '../../../conversations'; +import { GroupUpdateInfoChangeMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; +import { GroupUpdateMemberChangeMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; import { MessageSender } from '../../../sending/MessageSender'; import { PubKey } from '../../../types'; import { allowOnlyOneAtATime } from '../../Promise'; @@ -66,10 +69,17 @@ async function confirmPushedAndDump( return LibSessionUtil.saveDumpsToDb(groupPk); } -async function pushChangesToGroupSwarmIfNeeded( - groupPk: GroupPubkeyType, - supplementKeys: Array -): Promise { +async function pushChangesToGroupSwarmIfNeeded({ + revokeParams, + unrevokeParams, + updateMessages, + groupPk, + supplementKeys, +}: WithGroupPubkey & + WithRevokeParams & { + supplementKeys: Array; + updateMessages: Array; + }): Promise { // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc await LibSessionUtil.saveDumpsToDb(groupPk); const changesToPush = await LibSessionUtil.pendingChangesForGroup(groupPk); @@ -79,7 +89,7 @@ async function pushChangesToGroupSwarmIfNeeded( return RunJobResult.Success; } - const msgs: Array = changesToPush.messages.map(item => { + const encryptedMessage: Array = changesToPush.messages.map(item => { return { namespace: item.namespace, pubkey: groupPk, @@ -88,9 +98,12 @@ async function pushChangesToGroupSwarmIfNeeded( data: item.ciphertext, }; }); + + const extraMessagesToEncrypt: Array = []; + if (supplementKeys.length) { supplementKeys.forEach(key => - msgs.push({ + extraMessagesToEncrypt.push({ namespace: SnodeNamespaces.ClosedGroupKeys, pubkey: groupPk, ttl: TTL_DEFAULT.CONFIG_MESSAGE, @@ -100,16 +113,44 @@ async function pushChangesToGroupSwarmIfNeeded( ); } + if (updateMessages.length) { + updateMessages.forEach(updateMessage => + extraMessagesToEncrypt.push({ + namespace: SnodeNamespaces.ClosedGroupMessages, + pubkey: groupPk, + ttl: TTL_DEFAULT.CONTENT_MESSAGE, + networkTimestamp: GetNetworkTime.now(), + data: updateMessage.plainTextBuffer(), + }) + ); + } + + const encryptedData = await MetaGroupWrapperActions.encryptMessages( + groupPk, + extraMessagesToEncrypt.map(m => m.data) + ); + + const extraMessagesEncrypted = extraMessagesToEncrypt.map((requestDetails, index) => ({ + ...requestDetails, + data: encryptedData[index], + })); + + // const + const result = await MessageSender.sendEncryptedDataToSnode( - msgs, + [...encryptedMessage, ...extraMessagesEncrypted], groupPk, - changesToPush.allOldHashes + changesToPush.allOldHashes, + revokeParams, + unrevokeParams ); const expectedReplyLength = changesToPush.messages.length + (changesToPush.allOldHashes.size ? 1 : 0) + - supplementKeys.length; + (revokeParams?.revoke.length ? 1 : 0) + + (unrevokeParams?.unrevoke.length ? 1 : 0) + + (extraMessagesEncrypted?.length ? 1 : 0); // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { @@ -173,7 +214,13 @@ class GroupSyncJob extends PersistedJob { } // return await so we catch exceptions in here - return await GroupSync.pushChangesToGroupSwarmIfNeeded(thisJobDestination, []); + return await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk: thisJobDestination, + revokeParams: null, + unrevokeParams: null, + supplementKeys: [], + updateMessages: [], + }); // eslint-disable-next-line no-useless-catch } catch (e) { diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index cfc647f7c1..627422a4d8 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -96,7 +96,13 @@ async function pushChangesToUserSwarmIfNeeded() { }; }); - const result = await MessageSender.sendEncryptedDataToSnode(msgs, us, changesToPush.allOldHashes); + const result = await MessageSender.sendEncryptedDataToSnode( + msgs, + us, + changesToPush.allOldHashes, + null, + null + ); const expectedReplyLength = changesToPush.messages.length + (changesToPush.allOldHashes.size ? 1 : 0); diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index b40347550e..5eb0ad5b9e 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -9,6 +9,7 @@ import { UserGroupsGet, WithGroupPubkey, } from 'libsession_util_nodejs'; +import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo'; import { intersection, isEmpty, uniq } from 'lodash'; import { ConfigDumpData } from '../../data/configDump/configDump'; import { ConversationModel } from '../../models/conversation'; @@ -18,6 +19,7 @@ import { SignalService } from '../../protobuf'; import { getMessageQueue } from '../../session'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; +import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces'; import { RevokeChanges, SnodeAPIRevoke } from '../../session/apis/snode_api/revokeSubaccount'; import { SnodeGroupSignature } from '../../session/apis/snode_api/signature/groupSignature'; import { ConvoHub } from '../../session/conversations'; @@ -26,6 +28,7 @@ import { DisappearingMessages } from '../../session/disappearing_messages'; import { ClosedGroup } from '../../session/group/closed-group'; import { GroupUpdateInfoChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { GroupUpdateMemberChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; +import { GroupUpdateDeleteMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage'; import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { getUserED25519KeyPairBytes } from '../../session/utils/User'; @@ -53,6 +56,7 @@ type WithAddWithHistoryMembers = { withHistory: Array }; type WithRemoveMembers = { removed: Array }; type WithFromCurrentDevice = { fromCurrentDevice: boolean }; // there are some changes we want to do only when the current user do the change, and not when a network change triggers it. +type WithFromMemberLeftMessage = { fromMemberLeftMessage: boolean }; // there are some changes we want to skip when doing changes triggered from a memberLeft message. export type GroupState = { infos: Record; members: Record>; @@ -168,7 +172,15 @@ const initNewGroupInWrapper = createAsyncThunk( const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); await convo.setIsApproved(true, false); - const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); + console.warn('updateMessages for new group might need an update message?'); + + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + revokeParams: null, + unrevokeParams: null, + supplementKeys: [], + updateMessages: [], + }); if (result !== RunJobResult.Success) { window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); throw new Error('failed to pushChangesToGroupSwarmIfNeeded'); @@ -373,18 +385,13 @@ const destroyGroupDetails = createAsyncThunk( } ); -function validateMemberChange({ +function validateMemberAddChange({ groupPk, withHistory: addMembersWithHistory, withoutHistory: addMembersWithoutHistory, - removed: removeMembers, -}: WithGroupPubkey & WithAddWithoutHistoryMembers & WithAddWithHistoryMembers & WithRemoveMembers) { +}: WithGroupPubkey & WithAddWithoutHistoryMembers & WithAddWithHistoryMembers) { const us = UserUtils.getOurPubKeyStrFromCache(); - if ( - addMembersWithHistory.includes(us) || - addMembersWithoutHistory.includes(us) || - removeMembers.includes(us) - ) { + if (addMembersWithHistory.includes(us) || addMembersWithoutHistory.includes(us)) { throw new PreConditionFailed( 'currentDeviceGroupMembersChange cannot be used for changes of our own state in the group' ); @@ -392,7 +399,6 @@ function validateMemberChange({ const withHistory = uniq(addMembersWithHistory); const withoutHistory = uniq(addMembersWithoutHistory); - const removed = uniq(removeMembers); const convo = ConvoHub.use().get(groupPk); if (!convo) { throw new PreConditionFailed('currentDeviceGroupMembersChange convo not present in convohub'); @@ -403,16 +409,27 @@ function validateMemberChange({ ); } - if ( - intersection(withHistory, removed).length || - intersection(withHistory, removed).length || - intersection(withoutHistory, removed).length - ) { - throw new Error( - 'withHistory/without and removed can only have values which are not in the other' + return { withoutHistory, withHistory, us, convo }; +} + +function validateMemberRemoveChange({ + groupPk, + removed: removeMembers, +}: WithGroupPubkey & WithRemoveMembers) { + const us = UserUtils.getOurPubKeyStrFromCache(); + if (removeMembers.includes(us)) { + throw new PreConditionFailed( + 'currentDeviceGroupMembersChange cannot be used for changes of our own state in the group' ); } - return { withoutHistory, withHistory, removed, us, convo }; + + const removed = uniq(removeMembers); + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + throw new PreConditionFailed('currentDeviceGroupMembersChange convo not present in convohub'); + } + + return { removed, us, convo }; } function validateNameChange({ @@ -436,6 +453,10 @@ function validateNameChange({ return { newName, us, convo }; } +/** + * Update the GROUP_MEMBER wrapper state to have those members. + * @returns the supplementalKeys to be pushed + */ async function handleWithHistoryMembers({ groupPk, withHistory, @@ -453,6 +474,10 @@ async function handleWithHistoryMembers({ return supplementKeys; } +/** + * Update the GROUP_MEMBER wrapper state to have those members. + * Calls rekey() if at least one was present in the list. + */ async function handleWithoutHistoryMembers({ groupPk, withoutHistory, @@ -468,66 +493,83 @@ async function handleWithoutHistoryMembers({ } } -async function handleRemoveMembers({ +/** + * Send the GroupUpdateDeleteMessage encrypted with an encryption keypair that the removed members should have. + * Then, send that message to the namespace ClosedGroupRevokedRetrievableMessages. + * If that worked, remove the member from the metagroup wrapper, and rekey it. + * Any new messages encrypted with that wrapper won't be readable by the removed members, so we **have** to send it before we rekey(). + * + */ +async function handleRemoveMembersAndRekey({ groupPk, removed, secretKey, fromCurrentDevice, -}: WithGroupPubkey & WithRemoveMembers & WithFromCurrentDevice & { secretKey: Uint8Array }) { - if (!fromCurrentDevice) { + fromMemberLeftMessage, +}: WithGroupPubkey & + WithRemoveMembers & + WithFromCurrentDevice & + WithFromMemberLeftMessage & { secretKey: Uint8Array }) { + if (!fromCurrentDevice || !removed.length) { return; } + const createAtNetworkTimestamp = GetNetworkTime.now(); + const sortedRemoved = removed.sort(); - await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, removed); + if (!fromMemberLeftMessage) { + // We need to sign that message with the current admin key + const adminSignature = await SnodeGroupSignature.signDataWithAdminSecret( + `DELETE${createAtNetworkTimestamp}${sortedRemoved.join('')}`, + { secretKey } + ); + // We need to encrypt this message with the the current encryptionKey, before we call rekey() + const removedMemberMessage = new GroupUpdateDeleteMessage({ + groupPk, + createAtNetworkTimestamp, + adminSignature: from_base64(adminSignature.signature, base64_variants.ORIGINAL), + expirationType: null, // that message is not stored in DB and so don't have to disappear at all. + expireTimer: null, + memberSessionIds: sortedRemoved, + }); - const createAtNetworkTimestamp = GetNetworkTime.now(); - await Promise.all( - removed.map(async m => { - const adminSignature = await SnodeGroupSignature.signDataWithAdminSecret( - `DELETE${m}${createAtNetworkTimestamp}`, - { secretKey } - ); - // const deleteMessage = new GroupUpdateDeleteMessage({ - // groupPk, - // createAtNetworkTimestamp, - // adminSignature: from_base64(adminSignature.signature, base64_variants.ORIGINAL), - // }); - console.warn( - 'TODO: poll from namespace -11, handle messages and sig for it, batch request handle 401/403, but 200 ok for this -11 namespace' + const result = await getMessageQueue().sendToPubKeyNonDurably({ + message: removedMemberMessage, + pubkey: PubKey.cast(groupPk), + namespace: SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, + }); + if (!result) { + throw new Error( + 'Failed to send GroupUpdateDeleteMessage to ClosedGroupRevokedRetrievableMessages namespace' ); + } + } + // Note: we need to rekey only once the GroupUpdateDeleteMessage is sent because + // otherwise removed members won't be able to decrypt it (as rekey is called after erase) + await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, sortedRemoved); - // const sentStatus = await getMessageQueue().sendToPubKeyNonDurably({ - // pubkey: PubKey.cast(m), - // message: deleteMessage, - // namespace: SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, - // }); - // if (!sentStatus) { - // window.log.warn('Failed to send a GroupUpdateDeleteMessage to a member removed: ', m); - // } - }) + console.warn( + 'TODO: poll from namespace -11, handle messages and sig for it, batch request handle 401/403, but 200 ok for this -11 namespace' ); } -async function getPendingRevokeChanges({ +async function getPendingRevokeParams({ withoutHistory, withHistory, removed, groupPk, -}: WithGroupPubkey & - WithAddWithoutHistoryMembers & - WithAddWithHistoryMembers & - WithRemoveMembers): Promise { +}: WithGroupPubkey & WithAddWithoutHistoryMembers & WithAddWithHistoryMembers & WithRemoveMembers) { const revokeChanges: RevokeChanges = []; + const unrevokeChanges: RevokeChanges = []; for (let index = 0; index < withoutHistory.length; index++) { const m = withoutHistory[index]; const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); - revokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); + unrevokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); } for (let index = 0; index < withHistory.length; index++) { const m = withHistory[index]; const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); - revokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); + unrevokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); } for (let index = 0; index < removed.length; index++) { const m = removed[index]; @@ -535,7 +577,8 @@ async function getPendingRevokeChanges({ revokeChanges.push({ action: 'revoke_subaccount', tokenToRevokeHex: token }); } - return revokeChanges; + + return SnodeAPIRevoke.getRevokeSubaccountParams(groupPk, { revokeChanges, unrevokeChanges }); } function getConvoExpireDetailsForMsg(convo: ConversationModel) { @@ -551,41 +594,94 @@ function getConvoExpireDetailsForMsg(convo: ConversationModel) { return expireDetails; } -async function handleMemberChangeFromUIOrNot({ +/** + * Return the control messages to be pushed to the group's swarm. + * Those are not going to change the state, they are just here as a "notification". + * i.e. "Alice was removed from the group" + */ +async function getUpdateMessagesToPush({ + convo, + withHistory, + withoutHistory, + fromCurrentDevice, + groupPk, + removed, + adminSecretKey, + createAtNetworkTimestamp, +}: WithAddWithHistoryMembers & + WithAddWithoutHistoryMembers & + WithRemoveMembers & + WithFromCurrentDevice & + WithGroupPubkey & { + convo: ConversationModel; + adminSecretKey: Uint8ArrayLen64; + createAtNetworkTimestamp: number; + }) { + const sodium = await getSodiumRenderer(); + + const updateMessages: Array = []; + + const allAdded = [...withHistory, ...withoutHistory]; // those are already enforced to be unique (and without intersection) in `validateMemberChange()` + if (fromCurrentDevice && allAdded.length) { + updateMessages.push( + new GroupUpdateMemberChangeMessage({ + added: allAdded, + groupPk, + typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.ADDED, + createAtNetworkTimestamp, + secretKey: adminSecretKey, + sodium, + ...getConvoExpireDetailsForMsg(convo), + }) + ); + } + if (fromCurrentDevice && removed.length) { + updateMessages.push( + new GroupUpdateMemberChangeMessage({ + removed, + groupPk, + typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED, + createAtNetworkTimestamp, + secretKey: adminSecretKey, + sodium, + ...getConvoExpireDetailsForMsg(convo), + }) + ); + } + + return updateMessages; +} + +async function handleMemberAddedFromUIOrNot({ addMembersWithHistory, addMembersWithoutHistory, groupPk, - removeMembers, fromCurrentDevice, }: WithFromCurrentDevice & WithGroupPubkey & { addMembersWithHistory: Array; addMembersWithoutHistory: Array; - removeMembers: Array; }) { const group = await UserGroupsWrapperActions.getGroup(groupPk); if (!group || !group.secretKey || isEmpty(group.secretKey)) { throw new Error('tried to make change to group but we do not have the admin secret key'); } - await checkWeAreAdminOrThrow(groupPk, 'handleMemberChangeFromUIOrNot'); + await checkWeAreAdminOrThrow(groupPk, 'handleMemberAddedFromUIOrNot'); - const { removed, withHistory, withoutHistory, convo, us } = validateMemberChange({ + const { withHistory, withoutHistory, convo, us } = validateMemberAddChange({ withHistory: addMembersWithHistory, withoutHistory: addMembersWithoutHistory, groupPk, - removed: removeMembers, }); - // first, unrevoke people who are added, and sevoke people who are removed - const revokeChanges = await getPendingRevokeChanges({ + // first, get the unrevoke requests for people who are added + const revokeUnrevokeParams = await getPendingRevokeParams({ groupPk, withHistory, withoutHistory, - removed, + removed: [], }); - await SnodeAPIRevoke.revokeSubAccounts(groupPk, revokeChanges, group.secretKey); - // then, handle the addition with history of messages by generating supplement keys. // this adds them to the members wrapper etc const supplementKeys = await handleWithHistoryMembers({ groupPk, withHistory }); @@ -593,87 +689,180 @@ async function handleMemberChangeFromUIOrNot({ // then handle the addition without history of messages (full rotation of keys). // this adds them to the members wrapper etc await handleWithoutHistoryMembers({ groupPk, withoutHistory }); + const createAtNetworkTimestamp = GetNetworkTime.now(); - // lastly, handle the removal of members. - // we've already revoked their token above - // this removes them from the wrapper - await handleRemoveMembers({ groupPk, removed, secretKey: group.secretKey, fromCurrentDevice }); + const updateMessages = await getUpdateMessagesToPush({ + adminSecretKey: group.secretKey, + convo, + fromCurrentDevice, + groupPk, + removed: [], + withHistory, + withoutHistory, + createAtNetworkTimestamp, + }); await LibSessionUtil.saveDumpsToDb(groupPk); // push new members & key supplement in a single batch call - const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, supplementKeys); - if (batchResult !== RunJobResult.Success) { + const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + supplementKeys, + updateMessages, + ...revokeUnrevokeParams, + }); + if (sequenceResult !== RunJobResult.Success) { throw new Error( - 'currentDeviceGroupMembersChange: pushChangesToGroupSwarmIfNeeded did not return success' + 'handleMemberAddedFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' ); } // schedule send invite details, auth signature, etc. to the new users - for (let index = 0; index < withoutHistory.length; index++) { - const member = withoutHistory[index]; - await GroupInvite.addJob({ groupPk, member }); - } - for (let index = 0; index < withHistory.length; index++) { - const member = withHistory[index]; - await GroupInvite.addJob({ groupPk, member }); - } - const sodium = await getSodiumRenderer(); - const createAtNetworkTimestamp = GetNetworkTime.now(); + await scheduleGroupInviteJobs(groupPk, withHistory, withoutHistory); + await LibSessionUtil.saveDumpsToDb(groupPk); + + convo.set({ + active_at: createAtNetworkTimestamp, + }); + + const expiringDetails = getConvoExpireDetailsForMsg(convo); const shared = { convo, sender: us, sentAt: createAtNetworkTimestamp, - expireUpdate: null, + expireUpdate: { + expirationTimer: expiringDetails.expireTimer, + expirationType: expiringDetails.expirationType, + messageExpirationFromRetrieve: + expiringDetails.expireTimer > 0 + ? createAtNetworkTimestamp + expiringDetails.expireTimer + : null, + }, }; - - const allAdded = [...withHistory, ...withoutHistory]; // those are already enforced to be unique (and without intersection) in `validateMemberChange()` - if (fromCurrentDevice && allAdded.length) { - const msg = await ClosedGroup.addUpdateMessage({ - diff: { joiningMembers: allAdded }, + const additions = updateMessages.find( + m => m.typeOfChange === SignalService.GroupUpdateMemberChangeMessage.Type.ADDED + ); + if (additions) { + await ClosedGroup.addUpdateMessage({ + diff: { joiningMembers: additions.memberSessionIds }, ...shared, - }); - await getMessageQueue().sendToGroupV2({ - message: new GroupUpdateMemberChangeMessage({ - added: allAdded, - groupPk, - typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.ADDED, - identifier: msg.id, - createAtNetworkTimestamp, - secretKey: group.secretKey, - sodium, - ...getConvoExpireDetailsForMsg(convo), - }), + expireUpdate: { + expirationTimer: expiringDetails.expireTimer, + expirationType: expiringDetails.expirationType, + messageExpirationFromRetrieve: + expiringDetails.expireTimer > 0 + ? createAtNetworkTimestamp + expiringDetails.expireTimer + : null, + }, }); } - if (fromCurrentDevice && removed.length) { - const msg = await ClosedGroup.addUpdateMessage({ - diff: { kickedMembers: removed }, - ...shared, - }); - await getMessageQueue().sendToGroupV2({ - message: new GroupUpdateMemberChangeMessage({ - removed, - groupPk, - typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED, - identifier: msg.id, - createAtNetworkTimestamp, - secretKey: group.secretKey, - sodium, - ...getConvoExpireDetailsForMsg(convo), - }), - }); + await convo.commit(); +} + +async function handleMemberRemovedFromUIOrNot({ + groupPk, + removeMembers, + fromCurrentDevice, + fromMemberLeftMessage, +}: WithFromCurrentDevice & + WithFromMemberLeftMessage & + WithGroupPubkey & { + removeMembers: Array; + }) { + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (!group || !group.secretKey || isEmpty(group.secretKey)) { + throw new Error('tried to make change to group but we do not have the admin secret key'); } + + await checkWeAreAdminOrThrow(groupPk, 'handleMemberRemovedFromUIOrNot'); + + const { removed, convo, us } = validateMemberRemoveChange({ + groupPk, + removed: removeMembers, + }); + // first, get revoke requests that need to be pushed for removed members + const revokeUnrevokeParams = await getPendingRevokeParams({ + groupPk, + withHistory: [], + withoutHistory: [], + removed, + }); + + // Send the groupUpdateDeleteMessage that can still be decrypted by those removed members to namespace ClosedGroupRevokedRetrievableMessages. + // Then, rekey the wrapper, but don't push the changes yet, we want to batch all of the requests to be made together in the `pushChangesToGroupSwarmIfNeeded` below. + await handleRemoveMembersAndRekey({ + groupPk, + removed, + secretKey: group.secretKey, + fromCurrentDevice, + fromMemberLeftMessage, + }); + + const createAtNetworkTimestamp = GetNetworkTime.now(); + + const updateMessages = await getUpdateMessagesToPush({ + adminSecretKey: group.secretKey, + convo, + fromCurrentDevice, + groupPk, + removed, + withHistory: [], + withoutHistory: [], + createAtNetworkTimestamp, + }); + + await LibSessionUtil.saveDumpsToDb(groupPk); + + // revoked pubkeys, update messages, and libsession groups config in a single batchcall + const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + updateMessages, + supplementKeys: [], + ...revokeUnrevokeParams, + }); + if (sequenceResult !== RunJobResult.Success) { + throw new Error( + 'currentDeviceGroupMembersChange: pushChangesToGroupSwarmIfNeeded did not return success' + ); + } + await LibSessionUtil.saveDumpsToDb(groupPk); convo.set({ active_at: createAtNetworkTimestamp, }); + + const expiringDetails = getConvoExpireDetailsForMsg(convo); + + const shared = { + convo, + sender: us, + sentAt: createAtNetworkTimestamp, + expireUpdate: { + expirationTimer: expiringDetails.expireTimer, + expirationType: expiringDetails.expirationType, + messageExpirationFromRetrieve: + expiringDetails.expireTimer > 0 + ? createAtNetworkTimestamp + expiringDetails.expireTimer + : null, + }, + }; + + const removals = updateMessages.find( + m => m.typeOfChange === SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED + ); + + if (removals) { + await ClosedGroup.addUpdateMessage({ + diff: { kickedMembers: removed }, + ...shared, + }); + } await convo.commit(); } -async function handleNameChangeFromUIOrNot({ +async function handleNameChangeFromUI({ groupPk, newName: uncheckedName, fromCurrentDevice, @@ -703,28 +892,22 @@ async function handleNameChangeFromUIOrNot({ infos.name = newName; await UserGroupsWrapperActions.setGroup(group); await MetaGroupWrapperActions.infoSet(groupPk, infos); - - const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); - if (batchResult !== RunJobResult.Success) { - throw new Error( - 'handleNameChangeFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' - ); - } - - await UserSync.queueNewJobIfNeeded(); - const createAtNetworkTimestamp = GetNetworkTime.now(); + const updateMessages: Array = []; + // we want to add an update message even if the change was done remotely + const msg = await ClosedGroup.addUpdateMessage({ + convo, + diff: { newName }, + sender: us, + sentAt: createAtNetworkTimestamp, + expireUpdate: null, + }); + + // we want to send an update only if the change was made locally. if (fromCurrentDevice) { - const msg = await ClosedGroup.addUpdateMessage({ - convo, - diff: { newName }, - sender: us, - sentAt: createAtNetworkTimestamp, - expireUpdate: null, - }); - await getMessageQueue().sendToGroupV2({ - message: new GroupUpdateInfoChangeMessage({ + updateMessages.push( + new GroupUpdateInfoChangeMessage({ groupPk, typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.NAME, updatedName: newName, @@ -733,10 +916,26 @@ async function handleNameChangeFromUIOrNot({ secretKey: group.secretKey, sodium: await getSodiumRenderer(), ...getConvoExpireDetailsForMsg(convo), - }), - }); + }) + ); } + const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + supplementKeys: [], + revokeParams: null, + unrevokeParams: null, + updateMessages, + }); + + if (batchResult !== RunJobResult.Success) { + throw new Error( + 'handleNameChangeFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' + ); + } + + await UserSync.queueNewJobIfNeeded(); + convo.set({ active_at: createAtNetworkTimestamp, }); @@ -769,7 +968,19 @@ const currentDeviceGroupMembersChange = createAsyncThunk( ); } - await handleMemberChangeFromUIOrNot({ groupPk, ...args, fromCurrentDevice: true }); + await handleMemberRemovedFromUIOrNot({ + groupPk, + removeMembers: args.removeMembers, + fromCurrentDevice: true, + fromMemberLeftMessage: false, + }); + + await handleMemberAddedFromUIOrNot({ + groupPk, + fromCurrentDevice: true, + addMembersWithHistory: args.addMembersWithHistory, + addMembersWithoutHistory: args.addMembersWithoutHistory, + }); return { groupPk, @@ -873,7 +1084,7 @@ const currentDeviceGroupNameChange = createAsyncThunk( } await checkWeAreAdminOrThrow(groupPk, 'currentDeviceGroupNameChange'); - await handleNameChangeFromUIOrNot({ groupPk, ...args, fromCurrentDevice: true }); + await handleNameChangeFromUI({ groupPk, ...args, fromCurrentDevice: true }); return { groupPk, @@ -1046,3 +1257,18 @@ export const groupInfoActions = { ...metaGroupSlice.actions, }; export const groupReducer = metaGroupSlice.reducer; + +async function scheduleGroupInviteJobs( + groupPk: GroupPubkeyType, + withHistory: Array, + withoutHistory: Array +) { + for (let index = 0; index < withoutHistory.length; index++) { + const member = withoutHistory[index]; + await GroupInvite.addJob({ groupPk, member }); + } + for (let index = 0; index < withHistory.length; index++) { + const member = withHistory[index]; + await GroupInvite.addJob({ groupPk, member }); + } +} diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 639fd0c165..21e4bae15f 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -65,7 +65,7 @@ describe('libsession_metagroup', () => { it('can encrypt/decrypt message for group with us as author', async () => { const plaintext = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; const toEncrypt = new Uint8Array(plaintext); - const encrypted = metaGroupWrapper.encryptMessage(toEncrypt); + const [encrypted] = metaGroupWrapper.encryptMessages([toEncrypt]); const decrypted = metaGroupWrapper.decryptMessage(encrypted); expect(decrypted.plaintext).to.be.deep.eq(toEncrypt); @@ -75,7 +75,7 @@ describe('libsession_metagroup', () => { it('throws when encrypt/decrypt message when content is messed up', async () => { const plaintext = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; const toEncrypt = new Uint8Array(plaintext); - const encrypted = metaGroupWrapper.encryptMessage(toEncrypt); + const [encrypted] = metaGroupWrapper.encryptMessages([toEncrypt]); encrypted[1] -= 1; const func = () => metaGroupWrapper.decryptMessage(encrypted); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index c90183ae00..c4dce5ae8d 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -271,7 +271,13 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); it('call savesDumpToDb even if no changes are required on the serverside', async () => { - const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + revokeParams: null, + unrevokeParams: null, + supplementKeys: [], + updateMessages: [], + }); pendingChangesForGroupStub.resolves(undefined); expect(result).to.be.eq(RunJobResult.Success); expect(sendStub.callCount).to.be.eq(0); @@ -290,7 +296,13 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { messages: [info, member], allOldHashes: new Set('123'), }); - const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + revokeParams: null, + unrevokeParams: null, + supplementKeys: [], + updateMessages: [], + }); sendStub.resolves(undefined); expect(result).to.be.eq(RunJobResult.RetryJobIfPossible); // not returning anything in the sendstub so network issue happened @@ -349,7 +361,13 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { { code: 200, body: { hash: 'hashmember' } }, { code: 200, body: {} }, // because we are giving a set of allOldHashes ]); - const result = await GroupSync.pushChangesToGroupSwarmIfNeeded(groupPk, []); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + revokeParams: null, + unrevokeParams: null, + supplementKeys: [], + updateMessages: [], + }); expect(sendStub.callCount).to.be.eq(1); expect(pendingChangesForGroupStub.callCount).to.be.eq(1); diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 7cb4d47017..f7c875b7ef 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -583,9 +583,9 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { data, timestampMs, ]) as Promise>, - encryptMessage: async (groupPk: GroupPubkeyType, plaintext: Uint8Array) => - callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'encryptMessage', plaintext]) as Promise< - ReturnType + encryptMessages: async (groupPk: GroupPubkeyType, plaintexts: Array) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'encryptMessages', plaintexts]) as Promise< + ReturnType >, decryptMessage: async (groupPk: GroupPubkeyType, ciphertext: Uint8Array) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'decryptMessage', ciphertext]) as Promise< From 1b50715e8fbad9d1323962a69f7de1d3000ee846 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 17 Jan 2024 15:15:38 +1100 Subject: [PATCH 073/302] fix: wrap groupUpdatesMsg into Envelope before encryption --- preload.js | 3 ++ ts/session/sending/MessageSender.ts | 12 +++-- .../utils/job_runners/jobs/GroupSyncJob.ts | 53 +++++++++++-------- 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/preload.js b/preload.js index 6b152e77d3..99445f3191 100644 --- a/preload.js +++ b/preload.js @@ -242,6 +242,9 @@ data.initData(); const { ConvoHub } = require('./ts/session/conversations/ConversationController'); window.getConversationController = ConvoHub.use; +const { stringify } = require('./ts/types/sqlSharedTypes'); +window.stringify = stringify; + const { IncomingMessageCache } = require('./ts/receiver/cache'); window.IncomingMessageCache = IncomingMessageCache; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index c44c11cdff..562c71ea4f 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -448,7 +448,7 @@ async function encryptForGroupV2( networkTimestamp, } = params; - const envelope = await buildEnvelope( + const envelope = await wrapContentIntoEnvelope( SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, destination, networkTimestamp, @@ -501,7 +501,12 @@ async function encryptMessageAndWrap( encryptionBasedOnConversation(recipient) ); - const envelope = await buildEnvelope(envelopeType, recipient.key, networkTimestamp, cipherText); + const envelope = await wrapContentIntoEnvelope( + envelopeType, + recipient.key, + networkTimestamp, + cipherText + ); const data = wrapEnvelopeInWebSocketMessage(envelope); const data64 = ByteBuffer.wrap(data).toString('base64'); @@ -572,7 +577,7 @@ async function sendEncryptedDataToSnode( } } -async function buildEnvelope( +async function wrapContentIntoEnvelope( type: SignalService.Envelope.Type, sskSource: string | undefined, timestamp: number, @@ -673,4 +678,5 @@ export const MessageSender = { sendToOpenGroupV2, send, isContentSyncMessage, + wrapContentIntoEnvelope, }; diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index 278d00c08a..8cd25b94ba 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -2,6 +2,7 @@ import { GroupPubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; import { isArray, isEmpty, isNumber } from 'lodash'; import { UserUtils } from '../..'; +import { SignalService } from '../../../../protobuf'; import { assertUnreachable } from '../../../../types/sqlSharedTypes'; import { isSignInByLinking } from '../../../../util/storage'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; @@ -82,18 +83,20 @@ async function pushChangesToGroupSwarmIfNeeded({ }): Promise { // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc await LibSessionUtil.saveDumpsToDb(groupPk); - const changesToPush = await LibSessionUtil.pendingChangesForGroup(groupPk); + const { allOldHashes, messages } = await LibSessionUtil.pendingChangesForGroup(groupPk); // If there are no pending changes then the job can just complete (next time something // is updated we want to try and run immediately so don't schedule another run in this case) - if (isEmpty(changesToPush?.messages) && !supplementKeys.length) { + if (isEmpty(messages) && !supplementKeys.length) { return RunJobResult.Success; } - const encryptedMessage: Array = changesToPush.messages.map(item => { + const networkTimestamp = GetNetworkTime.now(); + + const encryptedMessage: Array = messages.map(item => { return { namespace: item.namespace, pubkey: groupPk, - networkTimestamp: GetNetworkTime.now(), + networkTimestamp, ttl: TTL_DEFAULT.CONFIG_MESSAGE, data: item.ciphertext, }; @@ -107,22 +110,27 @@ async function pushChangesToGroupSwarmIfNeeded({ namespace: SnodeNamespaces.ClosedGroupKeys, pubkey: groupPk, ttl: TTL_DEFAULT.CONFIG_MESSAGE, - networkTimestamp: GetNetworkTime.now(), + networkTimestamp, data: key, }) ); } - if (updateMessages.length) { - updateMessages.forEach(updateMessage => - extraMessagesToEncrypt.push({ - namespace: SnodeNamespaces.ClosedGroupMessages, - pubkey: groupPk, - ttl: TTL_DEFAULT.CONTENT_MESSAGE, - networkTimestamp: GetNetworkTime.now(), - data: updateMessage.plainTextBuffer(), - }) + for (let index = 0; index < updateMessages.length; index++) { + const updateMessage = updateMessages[index]; + const wrapped = await MessageSender.wrapContentIntoEnvelope( + SignalService.Envelope.Type.SESSION_MESSAGE, + undefined, + networkTimestamp, + updateMessage.plainTextBuffer() ); + extraMessagesToEncrypt.push({ + namespace: SnodeNamespaces.ClosedGroupMessages, + pubkey: groupPk, + ttl: TTL_DEFAULT.CONTENT_MESSAGE, + networkTimestamp, + data: SignalService.Envelope.encode(wrapped).finish(), + }); } const encryptedData = await MetaGroupWrapperActions.encryptMessages( @@ -140,17 +148,17 @@ async function pushChangesToGroupSwarmIfNeeded({ const result = await MessageSender.sendEncryptedDataToSnode( [...encryptedMessage, ...extraMessagesEncrypted], groupPk, - changesToPush.allOldHashes, + allOldHashes, revokeParams, unrevokeParams ); const expectedReplyLength = - changesToPush.messages.length + - (changesToPush.allOldHashes.size ? 1 : 0) + - (revokeParams?.revoke.length ? 1 : 0) + - (unrevokeParams?.unrevoke.length ? 1 : 0) + - (extraMessagesEncrypted?.length ? 1 : 0); + messages.length + // each of those messages are sent as a subrequest + extraMessagesEncrypted.length + // each of those messages are sent as a subrequest + (allOldHashes.size ? 1 : 0) + // we are sending all hashes changes as a single request + (revokeParams?.revoke.length ? 1 : 0) + // we are sending all revoke updates as a single request + (unrevokeParams?.unrevoke.length ? 1 : 0); // we are sending all revoke updates as a single request // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { @@ -162,7 +170,10 @@ async function pushChangesToGroupSwarmIfNeeded({ return RunJobResult.RetryJobIfPossible; } - const changes = LibSessionUtil.batchResultsToGroupSuccessfulChange(result, changesToPush); + const changes = LibSessionUtil.batchResultsToGroupSuccessfulChange(result, { + allOldHashes, + messages, + }); if (isEmpty(changes)) { return RunJobResult.RetryJobIfPossible; } From 528d15bf2d5677c3764e0c7613267d7b730f4777 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 18 Jan 2024 11:31:27 +1100 Subject: [PATCH 074/302] fix: fix convo volatile updates for 03-groups --- ts/receiver/configMessage.ts | 22 ++++++++++++++++++- .../libsession_utils_convo_info_volatile.ts | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 7218bba574..7e8e1bbe7d 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -919,7 +919,27 @@ async function handleConvoInfoVolatileUpdate() { break; case 'Group': - // debugger; // we need to update the current read messages of that group 03 with what we have in the wrapper // debugger + try { + const groupsV2 = await ConvoInfoVolatileWrapperActions.getAllGroups(); + for (let index = 0; index < groupsV2.length; index++) { + const fromWrapper = groupsV2[index]; + + try { + await applyConvoVolatileUpdateFromWrapper( + fromWrapper.pubkeyHex, + fromWrapper.unread, + fromWrapper.lastRead + ); + } catch (e) { + window.log.warn( + 'handleConvoInfoVolatileUpdate of "Group" failed with error: ', + e.message + ); + } + } + } catch (e) { + window.log.warn('getAllGroups of "Group" failed with error: ', e.message); + } break; default: diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts index 44c55c0457..aa96e4e87c 100644 --- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts +++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts @@ -309,7 +309,7 @@ async function removeContactFromWrapper(convoId: string) { * whole other bunch of issues because it is a native node module. */ function getConvoInfoVolatileTypes(): Array { - return ['1o1', 'LegacyGroup', 'Community']; + return ['1o1', 'LegacyGroup', 'Group', 'Community']; } export const SessionUtilConvoInfoVolatile = { From 77a62e82e7c56c340b71267b8c88e8b3a4a059f2 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 19 Jan 2024 11:27:10 +1100 Subject: [PATCH 075/302] fix: add avatar change message handling still needs to be able to send one, but that's chunk3 --- .../message-item/GroupUpdateMessage.tsx | 12 ++- ts/models/conversation.ts | 2 +- ts/models/message.ts | 7 ++ ts/models/messageType.ts | 1 + ts/receiver/configMessage.ts | 10 +- ts/receiver/groupv2/handleGroupV2Message.ts | 29 +++++- ts/session/apis/snode_api/swarmPolling.ts | 15 ++- .../conversations/ConversationController.ts | 96 +++++++++++++------ ts/session/conversations/createClosedGroup.ts | 2 +- ts/session/group/closed-group.ts | 10 +- .../DataExtractionNotificationMessage.ts | 2 +- .../to_group/GroupUpdateInfoChangeMessage.ts | 3 +- .../to_user/GroupUpdateDeleteMessage.ts | 2 + ts/session/sending/MessageQueue.ts | 72 ++++++++++++-- ts/session/utils/calling/CallManager.ts | 12 +-- .../utils/job_runners/jobs/GroupInviteJob.ts | 2 +- .../utils/job_runners/jobs/GroupPromoteJob.ts | 2 +- .../libsession_utils_convo_info_volatile.ts | 14 +-- ts/state/ducks/conversations.ts | 5 + ts/state/ducks/metaGroups.ts | 89 ++++++++++++++--- 20 files changed, 302 insertions(+), 85 deletions(-) diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx index 2e8a93131f..359d196d40 100644 --- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx +++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx @@ -143,6 +143,14 @@ const ChangeItemPromoted = (promoted: Array): string => { throw new PreConditionFailed('ChangeItemPromoted only applies to groupv2'); }; +const ChangeItemAvatar = (): string => { + const isGroupV2 = useSelectedIsGroupV2(); + if (isGroupV2) { + return window.i18n('groupAvatarChange'); + } + throw new PreConditionFailed('ChangeItemAvatar only applies to groupv2'); +}; + const ChangeItemLeft = (left: Array): string => { if (!left.length) { throw new Error('Group update remove is missing contacts'); @@ -175,14 +183,14 @@ const ChangeItem = (change: PropsForGroupUpdateType): string => { return ChangeItemName(change.newName); case 'add': return ChangeItemJoined(change.added); - case 'left': return ChangeItemLeft(change.left); - case 'kicked': return ChangeItemKicked(change.kicked); case 'promoted': return ChangeItemPromoted(change.promoted); + case 'avatarChange': + return ChangeItemAvatar(); default: assertUnreachable(type, `ChangeItem: Missing case error "${type}"`); return ''; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 6ec7ee9cd4..80ac25da8b 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -2459,7 +2459,7 @@ export class ConversationModel extends Backbone.Model { const pubkey = new PubKey(recipientId); void getMessageQueue() - .sendToPubKeyNonDurably({ + .sendTo1o1NonDurably({ pubkey, message: typingMessage, namespace: SnodeNamespaces.Default, diff --git a/ts/models/message.ts b/ts/models/message.ts index f426021421..1f7317c278 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -77,6 +77,7 @@ import { PropsForGroupInvitation, PropsForGroupUpdate, PropsForGroupUpdateAdd, + PropsForGroupUpdateAvatarChange, PropsForGroupUpdateKicked, PropsForGroupUpdateLeft, PropsForGroupUpdateName, @@ -488,6 +489,12 @@ export class MessageModel extends Backbone.Model { }; return { change, ...sharedProps }; } + if (groupUpdate.avatarChange) { + const change: PropsForGroupUpdateAvatarChange = { + type: 'avatarChange', + }; + return { change, ...sharedProps }; + } return null; } diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts index e4a94eb888..f851afc0e2 100644 --- a/ts/models/messageType.ts +++ b/ts/models/messageType.ts @@ -159,6 +159,7 @@ export type MessageGroupUpdate = { kicked?: Array; promoted?: Array; name?: string; + avatarChange?: boolean; }; export interface MessageAttributesOptionals { diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 7e8e1bbe7d..553817d58c 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -1,5 +1,5 @@ /* eslint-disable no-await-in-loop */ -import { ContactInfo, UserGroupsGet } from 'libsession_util_nodejs'; +import { ContactInfo, GroupPubkeyType, UserGroupsGet } from 'libsession_util_nodejs'; import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo'; import { compact, difference, isEmpty, isNil, isNumber, toNumber } from 'lodash'; import { ConfigDumpData } from '../data/configDump/configDump'; @@ -725,7 +725,7 @@ async function handleSingleGroupUpdate({ } } -async function handleSingleGroupUpdateToLeave(toLeave: string) { +async function handleSingleGroupUpdateToLeave(toLeave: GroupPubkeyType) { // that group is not in the wrapper but in our local DB. it must be removed and cleaned try { window.log.debug( @@ -747,12 +747,12 @@ async function handleSingleGroupUpdateToLeave(toLeave: string) { async function handleGroupUpdate(latestEnvelopeTimestamp: number) { // first let's check which groups needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); - const allGroupsInDb = ConvoHub.use() + const allGoupsIdsInDb = ConvoHub.use() .getConversations() - .filter(m => PubKey.is03Pubkey(m.id)); + .map(m => m.id) + .filter(PubKey.is03Pubkey); const allGoupsIdsInWrapper = allGroupsInWrapper.map(m => m.pubkeyHex); - const allGoupsIdsInDb = allGroupsInDb.map(m => m.id as string); window.log.debug('allGoupsIdsInWrapper', stringify(allGoupsIdsInWrapper)); window.log.debug('allGoupsIdsInDb', stringify(allGoupsIdsInDb)); diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index af3d7a8f3e..94c7b51187 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -202,7 +202,6 @@ async function handleGroupInfoChangeMessage({ await ClosedGroup.addUpdateMessage({ convo, diff: { newName: change.updatedName }, - sender: author, sentAt: envelopeTimestamp, expireUpdate: null, @@ -211,8 +210,14 @@ async function handleGroupInfoChangeMessage({ break; } case SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR: { - console.warn('Not implemented'); - throw new Error('Not implemented'); + await ClosedGroup.addUpdateMessage({ + convo, + diff: { avatarChange: true }, + sender: author, + sentAt: envelopeTimestamp, + expireUpdate: null, + }); + break; } case SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES: { if ( @@ -221,6 +226,13 @@ async function handleGroupInfoChangeMessage({ isFinite(change.updatedExpiration) && change.updatedExpiration >= 0 ) { + await ClosedGroup.addUpdateMessage({ + convo, + diff: { newName: change.updatedName }, + sender: author, + sentAt: envelopeTimestamp, + expireUpdate: null, + }); await convo.updateExpireTimer({ providedExpireTimer: change.updatedExpiration, providedSource: author, @@ -307,6 +319,14 @@ async function handleGroupMemberLeftMessage({ return; } + // this does nothing if we are not an admin + window.inboxStore.dispatch( + groupInfoActions.handleMemberLeftMessage({ + groupPk, + memberLeft: author, + }) + ); + await ClosedGroup.addUpdateMessage({ convo, diff: { leavingMembers: [author] }, @@ -314,10 +334,11 @@ async function handleGroupMemberLeftMessage({ sentAt: envelopeTimestamp, expireUpdate: null, }); + convo.set({ active_at: envelopeTimestamp, }); - // TODO We should process this message type even if the sender is blocked + // debugger TODO We should process this message type even if the sender is blocked } async function handleGroupDeleteMemberContentMessage({ diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index e058e5f914..d17c5078fd 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -440,6 +440,10 @@ export class SwarmPolling { type: ConversationTypeEnum; pubkey: string; }) { + const correctlyTypedPk = PubKey.is03Pubkey(pubkey) || PubKey.is05Pubkey(pubkey) ? pubkey : null; + if (!correctlyTypedPk) { + return false; + } const allLegacyGroupsInWrapper = await UserGroupsWrapperActions.getAllLegacyGroups(); const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); @@ -447,15 +451,16 @@ export class SwarmPolling { // this can happen when a group is removed from the wrapper while we were polling const newGroupButNotInWrapper = - PubKey.is03Pubkey(pubkey) && !allGroupsInWrapper.some(m => m.pubkeyHex === pubkey); + PubKey.is03Pubkey(correctlyTypedPk) && + !allGroupsInWrapper.some(m => m.pubkeyHex === correctlyTypedPk); const legacyGroupButNoInWrapper = type === ConversationTypeEnum.GROUP && - pubkey.startsWith('05') && + PubKey.is05Pubkey(correctlyTypedPk) && !allLegacyGroupsInWrapper.some(m => m.pubkeyHex === pubkey); if (newGroupButNotInWrapper || legacyGroupButNoInWrapper) { // not tracked anymore in the wrapper. Discard messages and stop polling - await this.notPollingForGroupAsNotInWrapper(pubkey, 'not in wrapper after poll'); + await this.notPollingForGroupAsNotInWrapper(correctlyTypedPk, 'not in wrapper after poll'); return true; } return false; @@ -574,6 +579,9 @@ export class SwarmPolling { } private async notPollingForGroupAsNotInWrapper(pubkey: string, reason: string) { + if (!PubKey.is03Pubkey(pubkey) && !PubKey.is05Pubkey(pubkey)) { + return; + } window.log.debug( `notPollingForGroupAsNotInWrapper ${ed25519Str(pubkey)} with reason:"${reason}"` ); @@ -581,7 +589,6 @@ export class SwarmPolling { fromSyncMessage: true, sendLeaveMessage: false, }); - return Promise.resolve(); } private loadGroupIds() { diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index d961fa3dfa..fb3e361e8c 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -1,6 +1,6 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable more/no-then */ -import { ConvoVolatileType, GroupPubkeyType } from 'libsession_util_nodejs'; +import { ConvoVolatileType, GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { isEmpty, isNil } from 'lodash'; import { Data } from '../../data/data'; @@ -27,6 +27,7 @@ import { getSwarmPollingInstance } from '../apis/snode_api'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage'; +import { GroupUpdateMemberLeftMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage'; import { ed25519Str } from '../onions/onionPath'; import { UserUtils } from '../utils'; import { UserSync } from '../utils/job_runners/jobs/UserSyncJob'; @@ -204,16 +205,21 @@ class ConvoController { public async deleteClosedGroup( groupId: string, - options: { fromSyncMessage: boolean; sendLeaveMessage: boolean } + { fromSyncMessage, sendLeaveMessage }: { fromSyncMessage: boolean; sendLeaveMessage: boolean } ) { - const conversation = await this.deleteConvoInitialChecks(groupId, 'LegacyGroup'); + if (!PubKey.is03Pubkey(groupId) && !PubKey.is05Pubkey(groupId)) { + return; + } + const typeOfDelete: ConvoVolatileType = PubKey.is03Pubkey(groupId) ? 'Group' : 'LegacyGroup'; + const conversation = await this.deleteConvoInitialChecks(groupId, typeOfDelete); if (!conversation || !conversation.isClosedGroup()) { return; } - window.log.info(`deleteClosedGroup: ${groupId}, sendLeaveMessage?:${options.sendLeaveMessage}`); + window.log.info(`deleteClosedGroup: ${groupId}, sendLeaveMessage?:${sendLeaveMessage}`); getSwarmPollingInstance().removePubkey(groupId, 'deleteClosedGroup'); // we don't need to keep polling anymore. - if (options.sendLeaveMessage) { - await leaveClosedGroup(groupId, options.fromSyncMessage); + // send the leave message before we delete everything for this group (including the key!) + if (sendLeaveMessage) { + await leaveClosedGroup(groupId, fromSyncMessage); } // if we were kicked or sent our left message, we have nothing to do more with that group. @@ -225,7 +231,7 @@ class ConvoController { await removeLegacyGroupFromWrappers(groupId); } - if (!options.fromSyncMessage) { + if (!fromSyncMessage) { await UserSync.queueNewJobIfNeeded(); } } @@ -390,23 +396,23 @@ class ConvoController { throw new Error(`ConvoHub.${deleteType} needs complete initial fetch`); } - window.log.info(`${deleteType} with ${convoId}`); + window.log.info(`${deleteType} with ${ed25519Str(convoId)}`); const conversation = this.conversations.get(convoId); if (!conversation) { - window.log.warn(`${deleteType} no such convo ${convoId}`); + window.log.warn(`${deleteType} no such convo ${ed25519Str(convoId)}`); return null; } // those are the stuff to do for all conversation types - window.log.info(`${deleteType} destroyingMessages: ${convoId}`); + window.log.info(`${deleteType} destroyingMessages: ${ed25519Str(convoId)}`); await deleteAllMessagesByConvoIdNoConfirmation(convoId); - window.log.info(`${deleteType} messages destroyed: ${convoId}`); + window.log.info(`${deleteType} messages destroyed: ${ed25519Str(convoId)}`); return conversation; } private async removeGroupOrCommunityFromDBAndRedux(convoId: string) { - window.log.info(`cleanUpGroupConversation, removing convo from DB: ${convoId}`); + window.log.info(`cleanUpGroupConversation, removing convo from DB: ${ed25519Str(convoId)}`); // not a private conversation, so not a contact for the ContactWrapper await Data.removeConversation(convoId); @@ -420,7 +426,7 @@ class ConvoController { } } - window.log.info(`cleanUpGroupConversation, convo removed from DB: ${convoId}`); + window.log.info(`cleanUpGroupConversation, convo removed from DB: ${ed25519Str(convoId)}`); const conversation = this.conversations.get(convoId); if (conversation) { @@ -432,7 +438,7 @@ class ConvoController { } window.inboxStore?.dispatch(conversationActions.conversationRemoved(convoId)); - window.log.info(`cleanUpGroupConversation, convo removed from store: ${convoId}`); + window.log.info(`cleanUpGroupConversation, convo removed from store: ${ed25519Str(convoId)}`); } } @@ -442,8 +448,8 @@ class ConvoController { * Note: `fromSyncMessage` is used to know if we need to send a leave group message to the group first. * So if the user made the action on this device, fromSyncMessage should be false, but if it happened from a linked device polled update, set this to true. */ -async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { - const convo = ConvoHub.use().get(groupId); +async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncMessage: boolean) { + const convo = ConvoHub.use().get(groupPk); if (!convo || !convo.isClosedGroup()) { window?.log?.error('Cannot leave non-existing group'); @@ -472,14 +478,49 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { await convo.updateGroupAdmins(admins, false); await convo.commit(); - getSwarmPollingInstance().removePubkey(groupId, 'leaveClosedGroup'); + getSwarmPollingInstance().removePubkey(groupPk, 'leaveClosedGroup'); if (fromSyncMessage) { // no need to send our leave message as our other device should already have sent it. return; } - const keypair = await Data.getLatestClosedGroupEncryptionKeyPair(groupId); + if (PubKey.is03Pubkey(groupPk)) { + // Send the update to the 03 group + const ourLeavingMessage = new GroupUpdateMemberLeftMessage({ + createAtNetworkTimestamp: GetNetworkTime.now(), + groupPk, + expirationType: null, // we keep that one **not** expiring + expireTimer: null, + }); + + window?.log?.info( + `We are leaving the group ${ed25519Str(groupPk)}. Sending our leaving message.` + ); + + // We might not be able to send our leaving messages (no encryption keypair, we were already removed, no network, etc). + // If that happens, we should just remove everything from our current user. + try { + const wasSent = await getMessageQueue().sendToGroupV2NonDurably({ + message: ourLeavingMessage, + }); + if (!wasSent) { + throw new Error( + `Even with the retries, leaving message for group ${ed25519Str( + groupPk + )} failed to be sent... Still deleting everything` + ); + } + } catch (e) { + window.log.warn('leaving groupv2 error:', e.message); + } + // the rest of the cleaning of that conversation is done in the `deleteClosedGroup()` + + return; + } + + // TODO remove legacy group support + const keypair = await Data.getLatestClosedGroupEncryptionKeyPair(groupPk); if (!keypair || isEmpty(keypair) || isEmpty(keypair.publicHex) || isEmpty(keypair.privateHex)) { // if we do not have a keypair, we won't be able to send our leaving message neither, so just skip sending it. // this can happen when getting a group from a broken libsession usergroup wrapper, but not only. @@ -489,31 +530,32 @@ async function leaveClosedGroup(groupId: string, fromSyncMessage: boolean) { // Send the update to the group const ourLeavingMessage = new ClosedGroupMemberLeftMessage({ createAtNetworkTimestamp: GetNetworkTime.now(), - groupId, + groupId: groupPk, expirationType: null, // we keep that one **not** expiring expireTimer: null, }); - window?.log?.info(`We are leaving the group ${groupId}. Sending our leaving message.`); + window?.log?.info(`We are leaving the legacygroup ${groupPk}. Sending our leaving message.`); // if we do not have a keypair for that group, we can't send our leave message, so just skip the message sending part - const wasSent = await getMessageQueue().sendToPubKeyNonDurably({ + const wasSent = await getMessageQueue().sendToLegacyGroupNonDurably({ message: ourLeavingMessage, namespace: SnodeNamespaces.LegacyClosedGroup, - pubkey: PubKey.cast(groupId), + destination: groupPk, }); - // TODO our leaving message might fail to be sent for some specific reason we want to still delete the group. - // for instance, if we do not have the encryption keypair anymore, we cannot send our left message, but we should still delete it's content + // The leaving message might fail to be sent for some specific reason we want to still delete the group. + // For instance, if we do not have the encryption keypair anymore, we cannot send our left message, but we should still delete its content if (wasSent) { window?.log?.info( - `Leaving message sent ${groupId}. Removing everything related to this group.` + `Leaving message sent ${ed25519Str(groupPk)}. Removing everything related to this group.` ); } else { window?.log?.info( - `Leaving message failed to be sent for ${groupId}. But still removing everything related to this group....` + `Leaving message failed to be sent for ${ed25519Str( + groupPk + )}. But still removing everything related to this group....` ); } - // the rest of the cleaning of that conversation is done in the `deleteClosedGroup()` } async function removeLegacyGroupFromWrappers(groupId: string) { diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index 52933b6e28..4a0c0aa4fd 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -197,7 +197,7 @@ function createInvitePromises( expireTimer: 0, }; const message = new ClosedGroupNewMessage(messageParams); - return getMessageQueue().sendToPubKeyNonDurably({ + return getMessageQueue().sendTo1o1NonDurably({ pubkey: PubKey.cast(m), message, namespace: SnodeNamespaces.Default, diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 5066397f36..4924308514 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -42,16 +42,14 @@ export type GroupInfo = { admins?: Array; }; -export interface MemberChanges { +export type GroupDiff = { joiningMembers?: Array; leavingMembers?: Array; kickedMembers?: Array; promotedMembers?: Array; -} - -export interface GroupDiff extends MemberChanges { newName?: string; -} + avatarChange?: boolean; +}; /** * This function is only called when the local user makes a change to a group. @@ -181,6 +179,8 @@ export async function addUpdateMessage({ groupUpdate.kicked = diff.kickedMembers; } else if (diff.promotedMembers) { groupUpdate.promoted = diff.promotedMembers as Array; + } else if (diff.avatarChange) { + groupUpdate.avatarChange = true; } else { throw new Error('addUpdateMessage with unknown type of change'); } diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts index 6cf91fcdc4..ee8bd51c66 100644 --- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts @@ -76,7 +76,7 @@ export const sendDataExtractionNotification = async ( ); try { - await getMessageQueue().sendToPubKeyNonDurably({ + await getMessageQueue().sendTo1o1NonDurably({ pubkey, message: dataExtractionNotificationMessage, namespace: SnodeNamespaces.Default, diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts index 564c75f9fb..84457c7342 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts @@ -3,7 +3,6 @@ import { SignalService } from '../../../../../../protobuf'; import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; import { LibSodiumWrappers } from '../../../../../crypto'; import { stringToUint8Array } from '../../../../../utils/String'; -import { PreConditionFailed } from '../../../../../utils/errors'; import { AdminSigDetails, GroupUpdateMessage, @@ -56,7 +55,6 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { } case types.AVATAR: // nothing to do for avatar - throw new PreConditionFailed('not implemented'); break; case types.DISAPPEARING_MESSAGES: { if (!isFinite(params.updatedExpirationSeconds) || params.updatedExpirationSeconds < 0) { @@ -89,6 +87,7 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { break; case SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR: + default: break; } diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts index d731e85ddc..9652a8d05a 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts @@ -1,5 +1,6 @@ import { PubkeyType } from 'libsession_util_nodejs'; import { SignalService } from '../../../../../../protobuf'; +import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; import { Preconditions } from '../../../preconditions'; import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; @@ -12,6 +13,7 @@ interface Params extends GroupUpdateMessageParams { * GroupUpdateDeleteMessage is sent to the group's swarm on the `revokedRetrievableGroupMessages` namespace */ export class GroupUpdateDeleteMessage extends GroupUpdateMessage { + public readonly namespace = SnodeNamespaces.ClosedGroupRevokedRetrievableMessages; public readonly adminSignature: Params['adminSignature']; public readonly memberSessionIds: Params['memberSessionIds']; diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index a0f9b2ba90..b33fb65cdc 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -12,7 +12,6 @@ import { ExpirationTimerUpdateMessage } from '../messages/outgoing/controlMessag import { ClosedGroupAddedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage'; import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage'; import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage'; -import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage'; import { ClosedGroupV2VisibleMessage, @@ -21,6 +20,7 @@ import { import { SyncMessageType } from '../utils/sync/syncUtils'; import { MessageSentHandler } from './MessageSentHandler'; +import { PubkeyType } from 'libsession_util_nodejs'; import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil'; import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2'; import { sendSogsReactionOnionV4 } from '../apis/open_group_api/sogsv3/sogsV3SendReaction'; @@ -33,6 +33,7 @@ import { CallMessage } from '../messages/outgoing/controlMessage/CallMessage'; import { DataExtractionNotificationMessage } from '../messages/outgoing/controlMessage/DataExtractionNotificationMessage'; import { TypingMessage } from '../messages/outgoing/controlMessage/TypingMessage'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; +import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { GroupUpdateDeleteMemberContentMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage'; import { GroupUpdateInfoChangeMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { GroupUpdateMemberChangeMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; @@ -231,6 +232,48 @@ export class MessageQueue { ); } + public async sendToGroupV2NonDurably({ + message, + }: { + message: + | ClosedGroupV2VisibleMessage + | GroupUpdateMemberChangeMessage + | GroupUpdateInfoChangeMessage + | GroupUpdateDeleteMemberContentMessage + | GroupUpdateMemberLeftMessage + | GroupUpdateDeleteMessage; + }) { + if (!message.destination || !PubKey.is03Pubkey(message.destination)) { + throw new Error('Invalid group message passed in sendToGroupV2NonDurably.'); + } + + return this.sendToPubKeyNonDurably({ + message, + namespace: message.namespace, + pubkey: PubKey.cast(message.destination), + }); + } + + public async sendToLegacyGroupNonDurably({ + message, + namespace, + destination, + }: { + message: ClosedGroupMemberLeftMessage; + namespace: SnodeNamespaces.LegacyClosedGroup; + destination: PubkeyType; + }) { + if (!destination || !PubKey.is05Pubkey(destination)) { + throw new Error('Invalid legacygroup message passed in sendToLegacyGroupNonDurably.'); + } + + return this.sendToPubKeyNonDurably({ + message, + namespace, + pubkey: PubKey.cast(destination), + }); + } + public async sendSyncMessage({ namespace, message, @@ -252,25 +295,40 @@ export class MessageQueue { } /** - * Sends a message that awaits until the message is completed sending + * Send a message to a 1o1 swarm * @param user user pub key to send to * @param message Message to be sent */ - public async sendToPubKeyNonDurably({ + public async sendTo1o1NonDurably({ namespace, message, pubkey, }: { pubkey: PubKey; message: - | ClosedGroupNewMessage | TypingMessage // no point of caching the typing message, they are very short lived | DataExtractionNotificationMessage | CallMessage - | ClosedGroupMemberLeftMessage + | ClosedGroupNewMessage | GroupUpdateInviteMessage - | GroupUpdatePromoteMessage - | GroupUpdateDeleteMessage; + | GroupUpdatePromoteMessage; + namespace: SnodeNamespaces.Default; + }): Promise { + return this.sendToPubKeyNonDurably({ message, namespace, pubkey }); + } + + /** + * Sends a message that awaits until the message is completed sending + * @param user user pub key to send to + * @param message Message to be sent + */ + private async sendToPubKeyNonDurably({ + namespace, + message, + pubkey, + }: { + pubkey: PubKey; + message: ContentMessage; namespace: SnodeNamespaces; }): Promise { let rawMessage; diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index a4cecb0678..ffef1105c1 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -439,7 +439,7 @@ async function createOfferAndSendIt(recipient: string, msgIdentifier: string | n }); window.log.info(`sending '${offer.type}'' with callUUID: ${currentCallUUID}`); - const negotiationOfferSendResult = await getMessageQueue().sendToPubKeyNonDurably({ + const negotiationOfferSendResult = await getMessageQueue().sendTo1o1NonDurably({ pubkey: PubKey.cast(recipient), message: offerMessage, namespace: SnodeNamespaces.Default, @@ -535,7 +535,7 @@ export async function USER_callRecipient(recipient: string) { // initiating a call is analogous to sending a message request await approveConvoAndSendResponse(recipient); - // Note: we do the sending of the preoffer manually as the sendToPubkeyNonDurably rely on having a message saved to the db for MessageSentSuccess + // Note: we do the sending of the preoffer manually as the sendTo1o1NonDurably rely on having a message saved to the db for MessageSentSuccess // which is not the case for a pre offer message (the message only exists in memory) const rawMessage = await MessageUtils.toRawMessage( PubKey.cast(recipient), @@ -623,7 +623,7 @@ const iceSenderDebouncer = _.debounce(async (recipient: string) => { `sending ICE CANDIDATES MESSAGE to ${ed25519Str(recipient)} about call ${currentCallUUID}` ); - await getMessageQueue().sendToPubKeyNonDurably({ + await getMessageQueue().sendTo1o1NonDurably({ pubkey: PubKey.cast(recipient), message: callIceCandicates, namespace: SnodeNamespaces.Default, @@ -1004,12 +1004,12 @@ export async function USER_rejectIncomingCallRequest(fromSender: string) { async function sendCallMessageAndSync(callmessage: CallMessage, user: string) { await Promise.all([ - getMessageQueue().sendToPubKeyNonDurably({ + getMessageQueue().sendTo1o1NonDurably({ pubkey: PubKey.cast(user), message: callmessage, namespace: SnodeNamespaces.Default, }), - getMessageQueue().sendToPubKeyNonDurably({ + getMessageQueue().sendTo1o1NonDurably({ pubkey: UserUtils.getOurPubKeyFromCache(), message: callmessage, namespace: SnodeNamespaces.Default, @@ -1039,7 +1039,7 @@ export async function USER_hangup(fromSender: string) { expirationType, expireTimer, }); - void getMessageQueue().sendToPubKeyNonDurably({ + void getMessageQueue().sendTo1o1NonDurably({ pubkey: PubKey.cast(fromSender), message: endCallMessage, namespace: SnodeNamespaces.Default, diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 4fb1636a5d..2055e40541 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -142,7 +142,7 @@ class GroupInviteJob extends PersistedJob { groupPk, }); - const storedAt = await getMessageQueue().sendToPubKeyNonDurably({ + const storedAt = await getMessageQueue().sendTo1o1NonDurably({ message: inviteDetails, namespace: SnodeNamespaces.Default, pubkey: PubKey.cast(member), diff --git a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts index a8e9f17104..587eab5bd2 100644 --- a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts @@ -100,7 +100,7 @@ class GroupPromoteJob extends PersistedJob { groupPk, }); - const storedAt = await getMessageQueue().sendToPubKeyNonDurably({ + const storedAt = await getMessageQueue().sendTo1o1NonDurably({ message, namespace: SnodeNamespaces.Default, pubkey: PubKey.cast(member), diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts index aa96e4e87c..02d7142af6 100644 --- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts +++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts @@ -278,11 +278,11 @@ async function removeLegacyGroupFromWrapper(convoId: string) { } async function removeGroupFromWrapper(groupPk: GroupPubkeyType) { - // try { - // await ConvoInfoVolatileWrapperActions.eraseGroup(groupPk); - // } catch (e) { - // window.log.warn('removeGroupFromWrapper failed with ', e.message); - // } + try { + await ConvoInfoVolatileWrapperActions.eraseGroup(groupPk); + } catch (e) { + window.log.warn('removeGroupFromWrapper failed with ', e.message); + } window.log.warn('removeGroupFromWrapper TODO'); mappedGroupWrapperValues.delete(groupPk); } @@ -324,10 +324,10 @@ export const SessionUtilConvoInfoVolatile = { removeContactFromWrapper, // legacy group - removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODOLATER + removeLegacyGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // group - removeGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // TODOLATER + removeGroupFromWrapper, // a group can be removed but also just marked hidden, so only call this function when the group is completely removed // communities removeCommunityFromWrapper, diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index b739aee924..0708d0ff77 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -117,6 +117,10 @@ export type PropsForGroupUpdatePromoted = { promoted: Array; }; +export type PropsForGroupUpdateAvatarChange = { + type: 'avatarChange'; +}; + export type PropsForGroupUpdateLeft = { type: 'left'; left: Array; @@ -131,6 +135,7 @@ export type PropsForGroupUpdateType = | PropsForGroupUpdateAdd | PropsForGroupUpdateKicked | PropsForGroupUpdatePromoted + | PropsForGroupUpdateAvatarChange | PropsForGroupUpdateName | PropsForGroupUpdateLeft; diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 5eb0ad5b9e..f9c1b6f0e8 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -19,7 +19,6 @@ import { SignalService } from '../../protobuf'; import { getMessageQueue } from '../../session'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; -import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces'; import { RevokeChanges, SnodeAPIRevoke } from '../../session/apis/snode_api/revokeSubaccount'; import { SnodeGroupSignature } from '../../session/apis/snode_api/signature/groupSignature'; import { ConvoHub } from '../../session/conversations'; @@ -79,12 +78,18 @@ type GroupDetailsUpdate = { members: Array; }; -async function checkWeAreAdminOrThrow(groupPk: GroupPubkeyType, context: string) { +async function checkWeAreAdmin(groupPk: GroupPubkeyType) { const us = UserUtils.getOurPubKeyStrFromCache(); const usInGroup = await MetaGroupWrapperActions.memberGet(groupPk, us); const inUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); - if (isEmpty(inUserGroup?.secretKey) || !usInGroup?.promoted) { + // if the secretKey is not empty AND we are a member of the group, we are a current admin + return Boolean(!isEmpty(inUserGroup?.secretKey) && usInGroup?.promoted); +} + +async function checkWeAreAdminOrThrow(groupPk: GroupPubkeyType, context: string) { + const areWeAdmin = await checkWeAreAdmin(groupPk); + if (!areWeAdmin) { throw new Error(`checkWeAreAdminOrThrow failed with ctx: ${context}`); } } @@ -532,10 +537,8 @@ async function handleRemoveMembersAndRekey({ memberSessionIds: sortedRemoved, }); - const result = await getMessageQueue().sendToPubKeyNonDurably({ + const result = await getMessageQueue().sendToGroupV2NonDurably({ message: removedMemberMessage, - pubkey: PubKey.cast(groupPk), - namespace: SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, }); if (!result) { throw new Error( @@ -577,7 +580,6 @@ async function getPendingRevokeParams({ revokeChanges.push({ action: 'revoke_subaccount', tokenToRevokeHex: token }); } - return SnodeAPIRevoke.getRevokeSubaccountParams(groupPk, { revokeChanges, unrevokeChanges }); } @@ -621,8 +623,12 @@ async function getUpdateMessagesToPush({ const updateMessages: Array = []; + if (!fromCurrentDevice) { + return updateMessages; + } + const allAdded = [...withHistory, ...withoutHistory]; // those are already enforced to be unique (and without intersection) in `validateMemberChange()` - if (fromCurrentDevice && allAdded.length) { + if (allAdded.length) { updateMessages.push( new GroupUpdateMemberChangeMessage({ added: allAdded, @@ -635,7 +641,7 @@ async function getUpdateMessagesToPush({ }) ); } - if (fromCurrentDevice && removed.length) { + if (removed.length) { updateMessages.push( new GroupUpdateMemberChangeMessage({ removed, @@ -760,6 +766,11 @@ async function handleMemberAddedFromUIOrNot({ await convo.commit(); } +/** + * This function is called in two cases: + * - to udpate the state when kicking a member from the group from the UI + * - to update the state when handling a MEMBER_LEFT message + */ async function handleMemberRemovedFromUIOrNot({ groupPk, removeMembers, @@ -781,7 +792,7 @@ async function handleMemberRemovedFromUIOrNot({ groupPk, removed: removeMembers, }); - // first, get revoke requests that need to be pushed for removed members + // first, get revoke requests that need to be pushed for leaving member const revokeUnrevokeParams = await getPendingRevokeParams({ groupPk, withHistory: [], @@ -789,7 +800,7 @@ async function handleMemberRemovedFromUIOrNot({ removed, }); - // Send the groupUpdateDeleteMessage that can still be decrypted by those removed members to namespace ClosedGroupRevokedRetrievableMessages. + // Send the groupUpdateDeleteMessage that can still be decrypted by those removed members to namespace ClosedGroupRevokedRetrievableMessages. (not when handling a MEMBER_LEFT message) // Then, rekey the wrapper, but don't push the changes yet, we want to batch all of the requests to be made together in the `pushChangesToGroupSwarmIfNeeded` below. await handleRemoveMembersAndRekey({ groupPk, @@ -990,6 +1001,45 @@ const currentDeviceGroupMembersChange = createAsyncThunk( } ); +/** + * This action is used to trigger a change when the local user does a change to a group v2 members list. + * GroupV2 added members can be added two ways: with and without the history of messages. + * GroupV2 removed members have their subaccount token revoked on the server side so they cannot poll anymore from the group's swarm. + */ +const handleMemberLeftMessage = createAsyncThunk( + 'group/handleMemberLeftMessage', + async ( + { + groupPk, + memberLeft, + }: { + groupPk: GroupPubkeyType; + memberLeft: PubkeyType; + }, + payloadCreator + ): Promise => { + const state = payloadCreator.getState() as StateType; + if (!state.groups.infos[groupPk] || !state.groups.members[groupPk]) { + throw new PreConditionFailed( + 'currentDeviceGroupMembersChange group not present in redux slice' + ); + } + + await handleMemberRemovedFromUIOrNot({ + groupPk, + removeMembers: [memberLeft], + fromCurrentDevice: true, + fromMemberLeftMessage: true, + }); + + return { + groupPk, + infos: await MetaGroupWrapperActions.infoGet(groupPk), + members: await MetaGroupWrapperActions.memberGetAll(groupPk), + }; + } +); + const markUsAsAdmin = createAsyncThunk( 'group/markUsAsAdmin', async ( @@ -1201,6 +1251,7 @@ const metaGroupSlice = createSlice({ state.memberChangesFromUIPending = true; }); + /** currentDeviceGroupNameChange */ builder.addCase(currentDeviceGroupNameChange.fulfilled, (state, action) => { state.nameChangesFromUIPending = false; @@ -1218,6 +1269,21 @@ const metaGroupSlice = createSlice({ builder.addCase(currentDeviceGroupNameChange.pending, state => { state.nameChangesFromUIPending = true; }); + + /** handleMemberLeftMessage */ + builder.addCase(handleMemberLeftMessage.fulfilled, (state, action) => { + const { infos, members, groupPk } = action.payload; + state.infos[groupPk] = infos; + state.members[groupPk] = members; + + window.log.debug(`groupInfo after handleMemberLeftMessage: ${stringify(infos)}`); + window.log.debug(`groupMembers after handleMemberLeftMessage: ${stringify(members)}`); + }); + builder.addCase(handleMemberLeftMessage.rejected, (_state, action) => { + window.log.error('a handleMemberLeftMessage was rejected', action.error); + }); + + /** markUsAsAdmin */ builder.addCase(markUsAsAdmin.fulfilled, (state, action) => { const { infos, members, groupPk } = action.payload; state.infos[groupPk] = infos; @@ -1253,6 +1319,7 @@ export const groupInfoActions = { currentDeviceGroupMembersChange, markUsAsAdmin, inviteResponseReceived, + handleMemberLeftMessage, currentDeviceGroupNameChange, ...metaGroupSlice.actions, }; From 456df58205d485772495851606b3f2a3b2de31ac Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 19 Jan 2024 13:02:34 +1100 Subject: [PATCH 076/302] chore: refactor messageSender.send to take an object --- ts/session/sending/MessageSender.ts | 20 ++++++++++++------- .../utils/job_runners/jobs/GroupSyncJob.ts | 14 ++++++------- .../utils/job_runners/jobs/UserSyncJob.ts | 14 ++++++------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 562c71ea4f..ab495712a7 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -535,13 +535,19 @@ async function encryptMessagesAndWrap( * @param destination the pubkey we should deposit those message to * @returns the hashes of successful deposit */ -async function sendEncryptedDataToSnode( - encryptedData: Array, - destination: GroupPubkeyType | PubkeyType, - messagesHashesToDelete: Set | null, - revokeParams: RevokeSubaccountParams | null, - unrevokeParams: UnrevokeSubaccountParams | null -): Promise { +async function sendEncryptedDataToSnode({ + destination, + encryptedData, + messagesHashesToDelete, + revokeParams, + unrevokeParams, +}: { + encryptedData: Array; + destination: GroupPubkeyType | PubkeyType; + messagesHashesToDelete: Set | null; + revokeParams: RevokeSubaccountParams | null; + unrevokeParams: UnrevokeSubaccountParams | null; +}): Promise { try { const batchResults = await pRetry( async () => { diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index 8cd25b94ba..8dfc57ca42 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -143,15 +143,13 @@ async function pushChangesToGroupSwarmIfNeeded({ data: encryptedData[index], })); - // const - - const result = await MessageSender.sendEncryptedDataToSnode( - [...encryptedMessage, ...extraMessagesEncrypted], - groupPk, - allOldHashes, + const result = await MessageSender.sendEncryptedDataToSnode({ + encryptedData: [...encryptedMessage, ...extraMessagesEncrypted], + destination: groupPk, + messagesHashesToDelete: allOldHashes, revokeParams, - unrevokeParams - ); + unrevokeParams, + }); const expectedReplyLength = messages.length + // each of those messages are sent as a subrequest diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index 627422a4d8..57bceefadf 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -96,13 +96,13 @@ async function pushChangesToUserSwarmIfNeeded() { }; }); - const result = await MessageSender.sendEncryptedDataToSnode( - msgs, - us, - changesToPush.allOldHashes, - null, - null - ); + const result = await MessageSender.sendEncryptedDataToSnode({ + encryptedData: msgs, + destination: us, + messagesHashesToDelete: changesToPush.allOldHashes, + revokeParams: null, + unrevokeParams: null, + }); const expectedReplyLength = changesToPush.messages.length + (changesToPush.allOldHashes.size ? 1 : 0); From 4e8ca31c2fdebb5f5ead404b5feb94943b487a60 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 22 Jan 2024 10:33:36 +1100 Subject: [PATCH 077/302] fix: remove isLeft flag as we can't have a left and unremoved group --- stylesheets/_session_conversation.scss | 1 + .../composition/CompositionBox.tsx | 9 +-------- .../overlay/OverlayRightPanelSettings.tsx | 13 ++++-------- ts/components/menu/Menu.tsx | 20 ++++--------------- ts/hooks/useParamSelector.ts | 2 +- ts/models/conversation.ts | 16 +-------------- ts/models/message.ts | 3 --- ts/receiver/closedGroups.ts | 4 ++-- ts/receiver/configMessage.ts | 4 ++-- ts/receiver/groupv2/handleGroupV2Message.ts | 2 -- ts/session/apis/snode_api/swarmPolling.ts | 3 +-- ts/session/group/closed-group.ts | 1 - ts/session/sending/MessageQueue.ts | 2 +- .../libsession_utils_user_groups.ts | 3 +-- ts/state/ducks/conversations.ts | 1 - ts/state/selectors/selectedConversation.ts | 5 ----- .../unit/selectors/conversations_test.ts | 11 ---------- 17 files changed, 19 insertions(+), 81 deletions(-) diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss index ea40c6ebe8..cecf846f1b 100644 --- a/stylesheets/_session_conversation.scss +++ b/stylesheets/_session_conversation.scss @@ -99,6 +99,7 @@ flex-grow: 1; width: 100%; height: 0; + overflow-y: auto; background-color: inherit; outline: none; position: relative; diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx index b0aaa25c7a..5f780c6ea8 100644 --- a/ts/components/conversation/composition/CompositionBox.tsx +++ b/ts/components/conversation/composition/CompositionBox.tsx @@ -489,16 +489,13 @@ class CompositionBoxInner extends React.Component { if (isKickedFromGroup) { return i18n('youGotKickedFromGroup'); } - if (left) { - return i18n('youLeftTheGroup'); - } if (isBlocked) { return i18n('unblockToSend'); } return i18n('sendMessage'); }; - const { isKickedFromGroup, left, isBlocked } = this.props.selectedConversation; + const { isKickedFromGroup, isBlocked } = this.props.selectedConversation; const messagePlaceHolder = makeMessagePlaceHolderText(); const neverMatchingRegex = /($a)/; @@ -932,10 +929,6 @@ class CompositionBoxInner extends React.Component { return; } - if (!selectedConversation.isPrivate && selectedConversation.left) { - ToastUtils.pushYouLeftTheGroup(); - return; - } if (!selectedConversation.isPrivate && selectedConversation.isKickedFromGroup) { ToastUtils.pushYouLeftTheGroup(); return; diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 312ff0021e..368c59761d 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -27,7 +27,6 @@ import { useSelectedIsBlocked, useSelectedIsGroup, useSelectedIsKickedFromGroup, - useSelectedIsLeft, useSelectedIsPublic, useSelectedSubscriberCount, useSelectedWeAreAdmin, @@ -117,14 +116,13 @@ const HeaderItem = () => { const dispatch = useDispatch(); const isBlocked = useSelectedIsBlocked(); const isKickedFromGroup = useSelectedIsKickedFromGroup(); - const left = useSelectedIsLeft(); const isGroup = useSelectedIsGroup(); if (!selectedConvoKey) { return null; } - const showInviteContacts = isGroup && !isKickedFromGroup && !isBlocked && !left; + const showInviteContacts = isGroup && !isKickedFromGroup && !isBlocked; return (
@@ -212,7 +210,6 @@ export const OverlayRightPanelSettings = () => { const displayNameInProfile = useSelectedDisplayNameInProfile(); const isBlocked = useSelectedIsBlocked(); const isKickedFromGroup = useSelectedIsKickedFromGroup(); - const left = useSelectedIsLeft(); const isGroup = useSelectedIsGroup(); const isPublic = useSelectedIsPublic(); const weAreAdmin = useSelectedWeAreAdmin(); @@ -264,15 +261,13 @@ export const OverlayRightPanelSettings = () => { } const showMemberCount = !!(subscriberCount && subscriberCount > 0); - const commonNoShow = isKickedFromGroup || left || isBlocked || !isActive; + const commonNoShow = isKickedFromGroup || isBlocked || !isActive; const hasDisappearingMessages = !isPublic && !commonNoShow; const leaveGroupString = isPublic ? window.i18n('leaveGroup') : isKickedFromGroup ? window.i18n('youGotKickedFromGroup') - : left - ? window.i18n('youLeftTheGroup') - : window.i18n('leaveGroup'); + : window.i18n('leaveGroup'); const showUpdateGroupNameButton = isGroup && weAreAdmin && !commonNoShow; // legacy groups non-admin cannot change groupname anymore const showAddRemoveModeratorsButton = weAreAdmin && !commonNoShow && isPublic; @@ -369,7 +364,7 @@ export const OverlayRightPanelSettings = () => { text={leaveGroupString} buttonColor={SessionButtonColor.Danger} buttonType={SessionButtonType.Simple} - disabled={isKickedFromGroup || left} + disabled={isKickedFromGroup} onClick={deleteConvoAction} /> diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index f98274a00b..0d9b206aa5 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -12,7 +12,6 @@ import { useIsGroupV2, useIsIncomingRequest, useIsKickedFromGroup, - useIsLeft, useIsMe, useIsPrivate, useIsPrivateAndFriend, @@ -138,14 +137,13 @@ export const DeleteGroupOrCommunityMenuItem = () => { const dispatch = useDispatch(); const convoId = useConvoIdFromContext(); const isPublic = useIsPublic(convoId); - const isLeft = useIsLeft(convoId); const isKickedFromGroup = useIsKickedFromGroup(convoId); const isPrivate = useIsPrivate(convoId); const isGroup = !isPrivate && !isPublic; // You need to have left a closed group first to be able to delete it completely as there is a leaving message to send first. // A community can just be removed right away. - if (isPublic || (isGroup && (isLeft || isKickedFromGroup))) { + if (isPublic || (isGroup && isKickedFromGroup)) { const menuItemText = isPublic ? window.i18n('leaveGroup') : window.i18n('editMenuDeleteGroup'); const onClickClose = () => { @@ -183,11 +181,10 @@ export const DeleteGroupOrCommunityMenuItem = () => { export const LeaveGroupMenuItem = () => { const convoId = useConvoIdFromContext(); const isPublic = useIsPublic(convoId); - const isLeft = useIsLeft(convoId); const isKickedFromGroup = useIsKickedFromGroup(convoId); const isPrivate = useIsPrivate(convoId); - if (!isKickedFromGroup && !isLeft && !isPrivate && !isPublic) { + if (!isKickedFromGroup && !isPrivate && !isPublic) { return ( { @@ -233,11 +230,10 @@ export const ShowUserDetailsMenuItem = () => { export const UpdateGroupNameMenuItem = () => { const convoId = useConvoIdFromContext(); - const left = useIsLeft(convoId); const isKickedFromGroup = useIsKickedFromGroup(convoId); const weAreAdmin = useWeAreAdmin(convoId); - if (!isKickedFromGroup && !left && weAreAdmin) { + if (!isKickedFromGroup && weAreAdmin) { return ( { @@ -562,19 +558,11 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => { const currentNotificationSetting = useNotificationSetting(convoId); const isBlocked = useIsBlocked(convoId); const isActive = useIsActive(convoId); - const isLeft = useIsLeft(convoId); const isKickedFromGroup = useIsKickedFromGroup(convoId); const isFriend = useIsPrivateAndFriend(convoId); const isPrivate = useIsPrivate(convoId); - if ( - !convoId || - isLeft || - isKickedFromGroup || - isBlocked || - !isActive || - (isPrivate && !isFriend) - ) { + if (!convoId || isKickedFromGroup || isBlocked || !isActive || (isPrivate && !isFriend)) { return null; } diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index f238e76088..884ea6b225 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -22,7 +22,7 @@ import { import { useLibGroupAdmins, useLibGroupMembers, useLibGroupName } from '../state/selectors/groups'; import { isPrivateAndFriend } from '../state/selectors/selectedConversation'; import { useOurPkStr } from '../state/selectors/user'; -import { useLibGroupInvitePending } from '../state/selectors/userGroups'; +import { useLibGroupInvitePending, useLibGroupKicked } from '../state/selectors/userGroups'; export function useAvatarPath(convoId: string | undefined) { const convoProps = useConversationPropsById(convoId); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 80ac25da8b..43015441da 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -411,9 +411,6 @@ export class ConversationModel extends Backbone.Model { if (this.isKickedFromGroup()) { toRet.isKickedFromGroup = this.isKickedFromGroup(); } - if (this.isLeft()) { - toRet.left = this.isLeft(); - } // to be dropped once we get rid of the legacy closed groups const zombies = this.getGroupZombies() || []; if (zombies?.length) { @@ -1916,24 +1913,13 @@ export class ConversationModel extends Backbone.Model { public isKickedFromGroup(): boolean { if (this.isClosedGroup()) { if (this.isClosedGroupV2()) { - // console.info('isKickedFromGroup using lib todo'); // debugger + return getLibGroupKickedOutsideRedux(this.id) || false; } return !!this.get('isKickedFromGroup'); } return false; } - public isLeft(): boolean { - if (this.isClosedGroup()) { - if (this.isClosedGroupV2()) { - // getLibGroupNameOutsideRedux(this.id) || - // console.info('isLeft using lib todo'); // debugger - } - return !!this.get('left'); - } - return false; - } - public getActiveAt(): number | undefined { return this.get('active_at'); } diff --git a/ts/models/message.ts b/ts/models/message.ts index 1f7317c278..9c78a03149 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -522,9 +522,6 @@ export class MessageModel extends Backbone.Model { return undefined; } - if (this.getConversation()?.isLeft()) { - return 'sent'; - } const readBy = this.get('read_by') || []; if (Storage.get(SettingsKey.settingsReadReceipt) && readBy.length > 0) { diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 867efb03a7..29957a26d3 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -304,8 +304,8 @@ export async function handleNewClosedGroup( const expireTimer = groupUpdate.expirationTimer; if (groupConvo) { - // if we did not left this group, just add the keypair we got if not already there - if (!groupConvo.isKickedFromGroup() && !groupConvo.isLeft()) { + // if we did not got kicked this group, just add the keypair we got if not already there + if (!groupConvo.isKickedFromGroup()) { const ecKeyPairAlreadyExistingConvo = new ECKeyPair( encryptionKeyPair!.publicKey, encryptionKeyPair!.privateKey diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 553817d58c..6c69bb8779 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -657,8 +657,8 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { changes = true; } - // start polling for this group if we haven't left it yet. The wrapper does not store this info for legacy group so we check from the DB entry instead - if (!legacyGroupConvo.isKickedFromGroup() && !legacyGroupConvo.isLeft()) { + // start polling for this group if we are still part of it. + if (!legacyGroupConvo.isKickedFromGroup()) { getSwarmPollingInstance().addGroupId(PubKey.cast(fromWrapper.pubkeyHex)); // save the encryption keypair if needed diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 94c7b51187..51144628ad 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -365,7 +365,6 @@ async function handleGroupDeleteMemberContentMessage({ } // TODO we should process this message type even if the sender is blocked - console.warn('Not implemented'); convo.set({ active_at: envelopeTimestamp, }); @@ -395,7 +394,6 @@ async function handleGroupUpdateDeleteMessage({ convo.set({ active_at: envelopeTimestamp, }); - console.warn('Not implemented'); throw new Error('Not implemented'); // TODO We should process this message type even if the sender is blocked } diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index d17c5078fd..f0e283f006 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -599,9 +599,8 @@ export class SwarmPolling { (c.isClosedGroupV2() && !c.isBlocked() && !c.isKickedFromGroup() && - !c.isLeft() && c.isApproved()) || - (c.isClosedGroup() && !c.isBlocked() && !c.isKickedFromGroup() && !c.isLeft()) + (c.isClosedGroup() && !c.isBlocked() && !c.isKickedFromGroup() ) ); closedGroupsOnly.forEach(c => { diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 4924308514..40a6edda03 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -1,7 +1,6 @@ import _ from 'lodash'; import { v4 as uuidv4 } from 'uuid'; -import { PubkeyType } from 'libsession_util_nodejs'; import { getMessageQueue } from '..'; import { Data } from '../../data/data'; import { ConversationModel } from '../../models/conversation'; diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index b33fb65cdc..56dcdc852f 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -1,5 +1,6 @@ import { AbortController } from 'abort-controller'; +import { PubkeyType } from 'libsession_util_nodejs'; import { MessageSender } from '.'; import { ClosedGroupMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMessage'; import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage'; @@ -20,7 +21,6 @@ import { import { SyncMessageType } from '../utils/sync/syncUtils'; import { MessageSentHandler } from './MessageSentHandler'; -import { PubkeyType } from 'libsession_util_nodejs'; import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil'; import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2'; import { sendSogsReactionOnionV4 } from '../apis/open_group_api/sogsv3/sogsV3SendReaction'; diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts index fec96847fe..99ad058931 100644 --- a/ts/session/utils/libsession/libsession_utils_user_groups.ts +++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts @@ -34,8 +34,7 @@ function isLegacyGroupToStoreInWrapper(convo: ConversationModel): boolean { !convo.isPublic() && convo.id.startsWith('05') && // new closed groups won't start with 05 convo.isActive() && - !convo.isKickedFromGroup() && - !convo.isLeft() + !convo.isKickedFromGroup() ); } diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 0708d0ff77..209041adac 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -264,7 +264,6 @@ export interface ReduxConversationType { isTyping?: boolean; isBlocked?: boolean; isKickedFromGroup?: boolean; - left?: boolean; avatarPath?: string | null; // absolute filepath to the avatar groupAdmins?: Array; // admins for closed groups and admins for open groups members?: Array; // members for closed groups only diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index 65fc38e585..e04c1220a2 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -90,7 +90,6 @@ export function getSelectedCanWrite(state: StateType) { return !( isBlocked || isKickedFromGroup || - left || readOnlySogs || isBlindedAndDisabledMsgRequests ); @@ -352,10 +351,6 @@ export function useSelectedConversationDisappearingMode(): return useSelector((state: StateType) => getSelectedConversation(state)?.expirationMode); } -export function useSelectedIsLeft() { - return useSelector((state: StateType) => Boolean(getSelectedConversation(state)?.left) || false); -} - export function useSelectedConversationIdOrigin() { return useSelector((state: StateType) => getSelectedConversation(state)?.conversationIdOrigin); } diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts index 86ab970ee6..a1c0556d28 100644 --- a/ts/test/session/unit/selectors/conversations_test.ts +++ b/ts/test/session/unit/selectors/conversations_test.ts @@ -26,7 +26,6 @@ describe('state/selectors/conversations', () => { isTyping: false, isBlocked: false, isKickedFromGroup: false, - left: false, isPublic: false, currentNotificationSetting: 'all', weAreAdmin: false, @@ -50,7 +49,6 @@ describe('state/selectors/conversations', () => { isTyping: false, isBlocked: false, isKickedFromGroup: false, - left: false, isPublic: false, currentNotificationSetting: 'all', weAreAdmin: false, @@ -73,7 +71,6 @@ describe('state/selectors/conversations', () => { isTyping: false, isBlocked: false, isKickedFromGroup: false, - left: false, isPublic: false, currentNotificationSetting: 'all', weAreAdmin: false, @@ -96,7 +93,6 @@ describe('state/selectors/conversations', () => { isTyping: false, isBlocked: false, isKickedFromGroup: false, - left: false, isPublic: false, currentNotificationSetting: 'all', weAreAdmin: false, @@ -119,13 +115,11 @@ describe('state/selectors/conversations', () => { isTyping: false, isBlocked: false, isKickedFromGroup: false, - left: false, isPublic: false, expireTimer: 0, currentNotificationSetting: 'all', weAreAdmin: false, isPrivate: false, - avatarPath: '', groupAdmins: [], lastMessage: undefined, @@ -159,7 +153,6 @@ describe('state/selectors/conversations', () => { isTyping: false, isBlocked: false, isKickedFromGroup: false, - left: false, expireTimer: 0, currentNotificationSetting: 'all', weAreAdmin: false, @@ -184,7 +177,6 @@ describe('state/selectors/conversations', () => { isTyping: false, isBlocked: false, isKickedFromGroup: false, - left: false, expireTimer: 0, currentNotificationSetting: 'all', weAreAdmin: false, @@ -209,7 +201,6 @@ describe('state/selectors/conversations', () => { isTyping: false, isBlocked: false, isKickedFromGroup: false, - left: false, expireTimer: 0, currentNotificationSetting: 'all', weAreAdmin: false, @@ -234,7 +225,6 @@ describe('state/selectors/conversations', () => { isTyping: false, isBlocked: false, isKickedFromGroup: false, - left: false, expireTimer: 0, currentNotificationSetting: 'all', weAreAdmin: false, @@ -258,7 +248,6 @@ describe('state/selectors/conversations', () => { isTyping: false, isBlocked: false, isKickedFromGroup: false, - left: false, expireTimer: 0, currentNotificationSetting: 'all', From 153846a12b691753dfab4cbbf928c85bb535b52a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 22 Jan 2024 10:34:20 +1100 Subject: [PATCH 078/302] fix: add better typings for groupUpdateMessages --- ts/hooks/useParamSelector.ts | 11 ++- ts/models/conversation.ts | 1 + ts/receiver/closedGroups.ts | 23 ++++-- ts/receiver/groupv2/handleGroupV2Message.ts | 22 +++-- ts/session/group/closed-group.ts | 81 +++++++++---------- .../to_group/GroupUpdateInfoChangeMessage.ts | 3 +- ts/state/ducks/metaGroups.ts | 14 ++-- ts/state/selectors/selectedConversation.ts | 2 +- ts/state/selectors/userGroups.ts | 14 ++++ 9 files changed, 100 insertions(+), 71 deletions(-) diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 884ea6b225..3b8c6b199c 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -186,14 +186,13 @@ export function useIsActive(convoId?: string) { return !!useActiveAt(convoId); } -export function useIsLeft(convoId?: string) { - const convoProps = useConversationPropsById(convoId); - return Boolean(convoProps && convoProps.left); -} - export function useIsKickedFromGroup(convoId?: string) { const convoProps = useConversationPropsById(convoId); - return Boolean(convoProps && convoProps.isKickedFromGroup); + const libIsKicked = useLibGroupKicked(convoId); + if (convoId && PubKey.is03Pubkey(convoId)) { + return libIsKicked; + } + return Boolean(convoProps && (convoProps.isKickedFromGroup || libIsKicked)); // not ideal, but until we trust what we get from libsession for all cases, we have to either trust what we have in the DB } export function useWeAreAdmin(convoId?: string) { diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 43015441da..537f1cbb4b 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -131,6 +131,7 @@ import { DisappearingMessages } from '../session/disappearing_messages'; import { DisappearingMessageConversationModeType } from '../session/disappearing_messages/types'; import { FetchMsgExpirySwarm } from '../session/utils/job_runners/jobs/FetchMsgExpirySwarmJob'; import { UpdateMsgExpirySwarm } from '../session/utils/job_runners/jobs/UpdateMsgExpirySwarmJob'; +import { getLibGroupKickedOutsideRedux } from '../state/selectors/userGroups'; import { ReleasedFeatures } from '../util/releaseFeature'; import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; import { markAttributesAsReadIfNeeded } from './messageFactory'; diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 29957a26d3..3c417a2990 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -626,6 +626,7 @@ async function handleClosedGroupNameChanged( if (newName !== convo.getRealSessionUsername()) { const groupDiff: GroupDiff = { newName, + type: 'name', }; await ClosedGroup.addUpdateMessage({ convo, @@ -654,7 +655,9 @@ async function handleClosedGroupMembersAdded( const { members: addedMembersBinary } = groupUpdate; const addedMembers = (addedMembersBinary || []).map(toHex); const oldMembers = convo.getGroupMembers() || []; - const membersNotAlreadyPresent = addedMembers.filter(m => !oldMembers.includes(m)); + const membersNotAlreadyPresent = addedMembers + .filter(m => !oldMembers.includes(m)) + .filter(PubKey.is05Pubkey); window?.log?.info(`Got a group update for group ${envelope.source}, type: MEMBERS_ADDED`); // make sure those members are not on our zombie list @@ -684,7 +687,8 @@ async function handleClosedGroupMembersAdded( ); const groupDiff: GroupDiff = { - joiningMembers: membersNotAlreadyPresent, + type: 'add', + added: membersNotAlreadyPresent, }; await ClosedGroup.addUpdateMessage({ convo, @@ -729,7 +733,9 @@ async function handleClosedGroupMembersRemoved( const removedMembers = groupUpdate.members.map(toHex); // effectivelyRemovedMembers are the members which where effectively on this group before the update // and is used for the group update message only - const effectivelyRemovedMembers = removedMembers.filter(m => currentMembers.includes(m)); + const effectivelyRemovedMembers = removedMembers + .filter(m => currentMembers.includes(m)) + .filter(PubKey.is05Pubkey); const groupPubKey = envelope.source; window?.log?.info(`Got a group update for group ${envelope.source}, type: MEMBERS_REMOVED`); @@ -771,7 +777,8 @@ async function handleClosedGroupMembersRemoved( // Only add update message if we have something to show if (membersAfterUpdate.length !== currentMembers.length) { const groupDiff: GroupDiff = { - kickedMembers: effectivelyRemovedMembers, + type: 'kicked', + kicked: effectivelyRemovedMembers, }; await ClosedGroup.addUpdateMessage({ convo, @@ -866,6 +873,11 @@ async function handleClosedGroupMemberLeft( expireUpdate: DisappearingMessageUpdate | null ) { const sender = envelope.senderIdentity; + + if (!PubKey.is05Pubkey(sender)) { + throw new Error('groupmember left sender should be a 05 pk'); + } + const groupPublicKey = envelope.source; const didAdminLeave = convo.getGroupAdmins().includes(sender) || false; // If the admin leaves the group is disbanded @@ -896,7 +908,8 @@ async function handleClosedGroupMemberLeft( // Another member left, not us, not the admin, just another member. // But this member was in the list of members (as performIfValid checks for that) const groupDiff: GroupDiff = { - leavingMembers: [sender], + type: 'left', + left: [sender], }; await ClosedGroup.addUpdateMessage({ diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 51144628ad..b84767a731 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -201,7 +201,7 @@ async function handleGroupInfoChangeMessage({ case SignalService.GroupUpdateInfoChangeMessage.Type.NAME: { await ClosedGroup.addUpdateMessage({ convo, - diff: { newName: change.updatedName }, + diff: { type: 'name', newName: change.updatedName }, sender: author, sentAt: envelopeTimestamp, expireUpdate: null, @@ -212,7 +212,7 @@ async function handleGroupInfoChangeMessage({ case SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR: { await ClosedGroup.addUpdateMessage({ convo, - diff: { avatarChange: true }, + diff: { type: 'avatarChange' }, sender: author, sentAt: envelopeTimestamp, expireUpdate: null, @@ -228,7 +228,7 @@ async function handleGroupInfoChangeMessage({ ) { await ClosedGroup.addUpdateMessage({ convo, - diff: { newName: change.updatedName }, + diff: { type: 'name', newName: change.updatedName }, sender: author, sentAt: envelopeTimestamp, expireUpdate: null, @@ -273,13 +273,19 @@ async function handleGroupMemberChangeMessage({ window.log.warn('received group member change with invalid signature. dropping'); return; } + const filteredMemberChange = change.memberSessionIds.filter(PubKey.is05Pubkey); + if (!filteredMemberChange) { + window.log.info('returning groupupdate of member change without associated members...'); + + return; + } const sharedDetails = { convo, sender: author, sentAt: envelopeTimestamp, expireUpdate: null }; switch (change.type) { case SignalService.GroupUpdateMemberChangeMessage.Type.ADDED: { await ClosedGroup.addUpdateMessage({ - diff: { joiningMembers: change.memberSessionIds }, + diff: { type: 'add', added: filteredMemberChange }, ...sharedDetails, }); @@ -287,14 +293,14 @@ async function handleGroupMemberChangeMessage({ } case SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED: { await ClosedGroup.addUpdateMessage({ - diff: { kickedMembers: change.memberSessionIds }, + diff: { type: 'kicked', kicked: filteredMemberChange }, ...sharedDetails, }); break; } case SignalService.GroupUpdateMemberChangeMessage.Type.PROMOTED: { await ClosedGroup.addUpdateMessage({ - diff: { promotedMembers: change.memberSessionIds }, + diff: { type: 'promoted', promoted: filteredMemberChange }, ...sharedDetails, }); break; @@ -315,7 +321,7 @@ async function handleGroupMemberLeftMessage({ }: GroupUpdateGeneric) { // No need to verify sig, the author is already verified with the libsession.decrypt() const convo = ConvoHub.use().get(groupPk); - if (!convo) { + if (!convo || !PubKey.is05Pubkey(author)) { return; } @@ -329,7 +335,7 @@ async function handleGroupMemberLeftMessage({ await ClosedGroup.addUpdateMessage({ convo, - diff: { leavingMembers: [author] }, + diff: { type: 'left', left: [author] }, sender: author, sentAt: envelopeTimestamp, expireUpdate: null, diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 40a6edda03..0d01617c05 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -13,6 +13,7 @@ import { distributingClosedGroupEncryptionKeyPairs, } from '../../receiver/closedGroups'; import { ECKeyPair } from '../../receiver/keypairs'; +import { PropsForGroupUpdateType } from '../../state/ducks/conversations'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { ConvoHub } from '../conversations'; @@ -41,14 +42,7 @@ export type GroupInfo = { admins?: Array; }; -export type GroupDiff = { - joiningMembers?: Array; - leavingMembers?: Array; - kickedMembers?: Array; - promotedMembers?: Array; - newName?: string; - avatarChange?: boolean; -}; +export type GroupDiff = PropsForGroupUpdateType; /** * This function is only called when the local user makes a change to a group. @@ -96,9 +90,15 @@ async function initiateClosedGroupUpdate( }; const diff = buildGroupDiff(convo, groupDetails); - await updateOrCreateClosedGroup(groupDetails); + if (!diff) { + window.log.warn('buildGroupDiff returned null'); + await convo.commit(); + + return; + } + const updateObj: GroupInfo = { id: groupId, name: groupName, @@ -115,8 +115,8 @@ async function initiateClosedGroupUpdate( convo, }; - if (diff.newName?.length) { - const nameOnlyDiff: GroupDiff = _.pick(diff, 'newName'); + if (diff.type === 'name' && diff.newName?.length) { + const nameOnlyDiff: GroupDiff = _.pick(diff, ['type', 'newName']); const dbMessageName = await addUpdateMessage({ diff: nameOnlyDiff, @@ -125,30 +125,25 @@ async function initiateClosedGroupUpdate( await sendNewName(convo, diff.newName, dbMessageName.id as string); } - if (diff.joiningMembers?.length) { - const joiningOnlyDiff: GroupDiff = _.pick(diff, 'joiningMembers'); + if (diff.type === 'add' && diff.added?.length) { + const joiningOnlyDiff: GroupDiff = _.pick(diff, ['type', 'added']); const dbMessageAdded = await addUpdateMessage({ diff: joiningOnlyDiff, ...sharedDetails, }); - await sendAddedMembers(convo, diff.joiningMembers, dbMessageAdded.id as string, updateObj); + await sendAddedMembers(convo, diff.added, dbMessageAdded.id as string, updateObj); } - if (diff.leavingMembers?.length) { - const leavingOnlyDiff: GroupDiff = { kickedMembers: diff.leavingMembers }; + if (diff.type === 'kicked' && diff.kicked?.length) { + const leavingOnlyDiff: GroupDiff = _.pick(diff, ['type', 'kicked']); const dbMessageLeaving = await addUpdateMessage({ diff: leavingOnlyDiff, ...sharedDetails, }); const stillMembers = members; - await sendRemovedMembers( - convo, - diff.leavingMembers, - stillMembers, - dbMessageLeaving.id as string - ); + await sendRemovedMembers(convo, diff.kicked, stillMembers, dbMessageLeaving.id as string); } await convo.commit(); } @@ -168,17 +163,17 @@ export async function addUpdateMessage({ }): Promise { const groupUpdate: MessageGroupUpdate = {}; - if (diff.newName) { + if (diff.type === 'name' && diff.newName) { groupUpdate.name = diff.newName; - } else if (diff.joiningMembers) { - groupUpdate.joined = diff.joiningMembers; - } else if (diff.leavingMembers) { - groupUpdate.left = diff.leavingMembers; - } else if (diff.kickedMembers) { - groupUpdate.kicked = diff.kickedMembers; - } else if (diff.promotedMembers) { - groupUpdate.promoted = diff.promotedMembers as Array; - } else if (diff.avatarChange) { + } else if (diff.type === 'add' && diff.added) { + groupUpdate.joined = diff.added; + } else if (diff.type === 'left' && diff.left) { + groupUpdate.left = diff.left; + } else if (diff.type === 'kicked' && diff.kicked) { + groupUpdate.kicked = diff.kicked; + } else if (diff.type === 'promoted' && diff.promoted) { + groupUpdate.promoted = diff.promoted; + } else if (diff.type === 'avatarChange') { groupUpdate.avatarChange = true; } else { throw new Error('addUpdateMessage with unknown type of change'); @@ -218,11 +213,9 @@ export async function addUpdateMessage({ }); } -function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff { - const groupDiff: GroupDiff = {}; - +function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff | null { if (convo.getRealSessionUsername() !== update.name) { - groupDiff.newName = update.name; + return { type: 'name', newName: update.name }; } const oldMembers = convo.getGroupMembers(); @@ -231,17 +224,21 @@ function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff const newMembersWithZombiesLeft = _.uniq(update.members.concat(update.zombies || [])); - const addedMembers = _.difference(newMembersWithZombiesLeft, oldMembersWithZombies); - if (addedMembers.length > 0) { - groupDiff.joiningMembers = addedMembers; + const added = _.difference(newMembersWithZombiesLeft, oldMembersWithZombies).filter( + PubKey.is05Pubkey + ); + if (added.length > 0) { + return { type: 'add', added }; } // Check if anyone got kicked: - const removedMembers = _.difference(oldMembersWithZombies, newMembersWithZombiesLeft); + const removedMembers = _.difference(oldMembersWithZombies, newMembersWithZombiesLeft).filter( + PubKey.is05Pubkey + ); if (removedMembers.length > 0) { - groupDiff.leavingMembers = removedMembers; + return { type: 'kicked', kicked: removedMembers }; } - return groupDiff; + return null; } export async function updateOrCreateClosedGroup(details: GroupInfo) { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts index 84457c7342..e97d149363 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts @@ -87,7 +87,8 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { break; case SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR: - + // nothing to do for the avatar case + break; default: break; } diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index f9c1b6f0e8..403f1fde75 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -521,12 +521,14 @@ async function handleRemoveMembersAndRekey({ const createAtNetworkTimestamp = GetNetworkTime.now(); const sortedRemoved = removed.sort(); - if (!fromMemberLeftMessage) { + // TODO implement the GroupUpdateDeleteMessage multi_encrypt_simple on chunk3 debugger + if (!fromMemberLeftMessage && false) { // We need to sign that message with the current admin key const adminSignature = await SnodeGroupSignature.signDataWithAdminSecret( `DELETE${createAtNetworkTimestamp}${sortedRemoved.join('')}`, { secretKey } ); + // We need to encrypt this message with the the current encryptionKey, before we call rekey() const removedMemberMessage = new GroupUpdateDeleteMessage({ groupPk, @@ -549,10 +551,6 @@ async function handleRemoveMembersAndRekey({ // Note: we need to rekey only once the GroupUpdateDeleteMessage is sent because // otherwise removed members won't be able to decrypt it (as rekey is called after erase) await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, sortedRemoved); - - console.warn( - 'TODO: poll from namespace -11, handle messages and sig for it, batch request handle 401/403, but 200 ok for this -11 namespace' - ); } async function getPendingRevokeParams({ @@ -751,7 +749,7 @@ async function handleMemberAddedFromUIOrNot({ ); if (additions) { await ClosedGroup.addUpdateMessage({ - diff: { joiningMembers: additions.memberSessionIds }, + diff: { type: 'add', added: additions.memberSessionIds }, ...shared, expireUpdate: { expirationTimer: expiringDetails.expireTimer, @@ -866,7 +864,7 @@ async function handleMemberRemovedFromUIOrNot({ if (removals) { await ClosedGroup.addUpdateMessage({ - diff: { kickedMembers: removed }, + diff: { type: 'kicked', kicked: removed }, ...shared, }); } @@ -909,7 +907,7 @@ async function handleNameChangeFromUI({ // we want to add an update message even if the change was done remotely const msg = await ClosedGroup.addUpdateMessage({ convo, - diff: { newName }, + diff: { type: 'name', newName }, sender: us, sentAt: createAtNetworkTimestamp, expireUpdate: null, diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index e04c1220a2..18e8832fe5 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -81,7 +81,7 @@ export function getSelectedCanWrite(state: StateType) { return false; } const canWriteSogs = getCanWrite(state, selectedConvoPubkey); - const { isBlocked, isKickedFromGroup, left, isPublic } = selectedConvo; + const { isBlocked, isKickedFromGroup, isPublic } = selectedConvo; const readOnlySogs = isPublic && !canWriteSogs; diff --git a/ts/state/selectors/userGroups.ts b/ts/state/selectors/userGroups.ts index 801217b3ad..42c3b59a79 100644 --- a/ts/state/selectors/userGroups.ts +++ b/ts/state/selectors/userGroups.ts @@ -18,3 +18,17 @@ export function useLibGroupInvitePending(convoId?: string) { export function useLibGroupInviteGroupName(convoId?: string) { return useSelector((state: StateType) => getGroupById(state, convoId)?.name); } + +function getLibGroupKicked(state: StateType, convoId?: string) { + return getGroupById(state, convoId)?.kicked; +} + +export function useLibGroupKicked(convoId?: string) { + return useSelector((state: StateType) => getLibGroupKicked(state, convoId)); +} + +export function getLibGroupKickedOutsideRedux(convoId?: string) { + const state = window.inboxStore?.getState(); + + return state ? getLibGroupKicked(state, convoId) : undefined; +} From 13da2b5632b94c97df4f2609b192755931d70765 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 24 Jan 2024 10:42:26 +1100 Subject: [PATCH 079/302] fix: add way to render group update add with history --- _locales/en/messages.json | 22 ++++--- protos/SignalService.proto | 4 +- .../conversation/TimerNotification.tsx | 4 +- .../message-item/GroupUpdateMessage.tsx | 16 ++++-- ts/models/message.ts | 10 +++- ts/models/messageType.ts | 1 + ts/receiver/closedGroups.ts | 1 + ts/receiver/groupv2/handleGroupV2Message.ts | 2 +- ts/session/group/closed-group.ts | 10 ++-- .../GroupUpdateMemberChangeMessage.ts | 38 ++++++++++--- ts/state/ducks/conversations.ts | 1 + ts/state/ducks/metaGroups.ts | 57 ++++++++++++------- ts/state/selectors/selectedConversation.ts | 7 +-- ts/types/LocalizerKeys.ts | 9 ++- 14 files changed, 121 insertions(+), 61 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index cb1f00a66e..53145bd93e 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -233,11 +233,12 @@ "disappearingMessagesModeLegacy": "Legacy", "disappearingMessagesModeLegacySubtitle": "Original version of disappearing messages.", "disappearingMessagesDisabled": "Disappearing messages disabled", - "disabledDisappearingMessages": "$name$ has turned off disappearing messages.", - "youDisabledDisappearingMessages": "You have turned off disappearing messages.", - "youDisabledYourDisappearingMessages": "You turned off disappearing messages. Messages you send will no longer disappear.", + "groupDisabledDisappearingMessages": "$name$ has turned disappearing messages off.", + "updateDisappearingMessagesFallback": "$name$ updated disappearing message settings.", + "youDisabledDisappearingMessages": "You have turned disappearing messages off.", + "youDisabledYourDisappearingMessages": "You turned disappearing messages off. Messages you send will no longer disappear.", "youSetYourDisappearingMessages": "You set your messages to disappear $time$ after they have been $type$.", - "theyDisabledTheirDisappearingMessages": "$name$ has turned off disappearing messages. Messages they send will no longer disappear.", + "theyDisabledTheirDisappearingMessages": "$name$ has turned disappearing messages off. Messages they send will no longer disappear.", "theySetTheirDisappearingMessages": "$name$ has set their messages to disappear $time$ after they have been $type$.", "timerSetTo": "Disappearing message time set to $time$", "set": "Set", @@ -271,10 +272,15 @@ "groupNameChangeFallback": "Group name updated.", "groupAvatarChange": "Group display picture updated.", - "groupOneJoined": "$name$ joined the group.", - "groupYouJoined": "You joined the group.", - "groupTwoJoined": "$first$ and $second$ joined the group.", - "groupOthersJoined": "$name$ and $count$ others joined the group.", + "groupOneJoined": "$name$ was invited to join the group.", + "groupYouJoined": "You were invited to join the group.", + "groupTwoJoined": "$first$ and $second$ were invited to join the group.", + "groupOthersJoined": "$name$ and $count$ others were invited to join the group.", + + "groupOneJoinedWithHistory": "$name$ was invited to join the group. Chat history was shared.", + "groupYouJoinedWithHistory": "You were invited to join the group. Chat history was shared.", + "groupTwoJoinedWithHistory": "$first$ and $second$ were invited to join the group. Chat history was shared.", + "groupOthersJoinedWithHistory": "$name$ and $count$ others were invited to join the group. Chat history was shared.", "groupOneRemoved": "$name$ was removed from the group.", "groupYouRemoved": "You were removed from the group.", diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 04237ac4f8..06da607614 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -112,7 +112,9 @@ message GroupUpdateMemberChangeMessage { required Type type = 1; repeated string memberSessionIds = 2; - required bytes adminSignature = 3; + optional bool historyShared = 3; + required bytes adminSignature = 4; + } diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index d556d5afcf..975530b462 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -150,7 +150,9 @@ function useTextToRender(props: PropsForExpirationTimer) { case 'fromOther': return disabled ? window.i18n( - ownSideOnly ? 'theyDisabledTheirDisappearingMessages' : 'disabledDisappearingMessages', + ownSideOnly + ? 'theyDisabledTheirDisappearingMessages' + : 'groupDisabledDisappearingMessages', [contact, timespanText] ) : mode diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx index 359d196d40..507ae6a75f 100644 --- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx +++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx @@ -57,7 +57,7 @@ function changeOfMembersV2({ type, us, }: { - type: 'added' | 'promoted' | 'removed'; + type: 'added' | 'addedWithHistory' | 'promoted' | 'removed'; changedWithNames: Array; us: PubkeyType; }): string { @@ -75,7 +75,13 @@ function changeOfMembersV2({ : 'Others'; const action = - type === 'added' ? 'Joined' : type === 'promoted' ? 'Promoted' : ('Removed' as const); + type === 'addedWithHistory' + ? 'JoinedWithHistory' + : type === 'added' + ? 'Joined' + : type === 'promoted' + ? 'Promoted' + : ('Removed' as const); const key = `group${subject}${action}` as const; return window.i18n( @@ -85,7 +91,7 @@ function changeOfMembersV2({ } // TODO those lookups might need to be memoized -const ChangeItemJoined = (added: Array): string => { +const ChangeItemJoined = (added: Array, withHistory: boolean): string => { if (!added.length) { throw new Error('Group update add is missing contacts'); } @@ -95,7 +101,7 @@ const ChangeItemJoined = (added: Array): string => { if (isGroupV2) { return changeOfMembersV2({ changedWithNames: mapIdsWithNames(added, names), - type: 'added', + type: withHistory ? 'addedWithHistory' : 'added', us, }); } @@ -182,7 +188,7 @@ const ChangeItem = (change: PropsForGroupUpdateType): string => { case 'name': return ChangeItemName(change.newName); case 'add': - return ChangeItemJoined(change.added); + return ChangeItemJoined(change.added, change.withHistory); case 'left': return ChangeItemLeft(change.left); case 'kicked': diff --git a/ts/models/message.ts b/ts/models/message.ts index 9c78a03149..65a2cb9370 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -455,6 +455,15 @@ export class MessageModel extends Backbone.Model { const change: PropsForGroupUpdateAdd = { type: 'add', added: groupUpdate.joined as Array, + withHistory: false, + }; + return { change, ...sharedProps }; + } + if (groupUpdate.joinedWithHistory?.length) { + const change: PropsForGroupUpdateAdd = { + type: 'add', + added: groupUpdate.joined as Array, + withHistory: true, }; return { change, ...sharedProps }; } @@ -522,7 +531,6 @@ export class MessageModel extends Backbone.Model { return undefined; } - const readBy = this.get('read_by') || []; if (Storage.get(SettingsKey.settingsReadReceipt) && readBy.length > 0) { return 'read'; diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts index f851afc0e2..7361468b58 100644 --- a/ts/models/messageType.ts +++ b/ts/models/messageType.ts @@ -156,6 +156,7 @@ export type PropsForMessageRequestResponse = MessageRequestResponseMsg & { export type MessageGroupUpdate = { left?: Array; joined?: Array; + joinedWithHistory?: Array; kicked?: Array; promoted?: Array; name?: string; diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 3c417a2990..0ae1bd6d61 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -689,6 +689,7 @@ async function handleClosedGroupMembersAdded( const groupDiff: GroupDiff = { type: 'add', added: membersNotAlreadyPresent, + withHistory: false, }; await ClosedGroup.addUpdateMessage({ convo, diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index b84767a731..7a6db1f06d 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -285,7 +285,7 @@ async function handleGroupMemberChangeMessage({ switch (change.type) { case SignalService.GroupUpdateMemberChangeMessage.Type.ADDED: { await ClosedGroup.addUpdateMessage({ - diff: { type: 'add', added: filteredMemberChange }, + diff: { type: 'add', added: filteredMemberChange, withHistory: change.historyShared }, ...sharedDetails, }); diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 0d01617c05..0f72a232fd 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -89,11 +89,11 @@ async function initiateClosedGroupUpdate( expireTimer, }; - const diff = buildGroupDiff(convo, groupDetails); + const diff = buildGroupV1Diff(convo, groupDetails); await updateOrCreateClosedGroup(groupDetails); if (!diff) { - window.log.warn('buildGroupDiff returned null'); + window.log.warn('buildGroupV1Diff returned null'); await convo.commit(); return; @@ -126,7 +126,7 @@ async function initiateClosedGroupUpdate( } if (diff.type === 'add' && diff.added?.length) { - const joiningOnlyDiff: GroupDiff = _.pick(diff, ['type', 'added']); + const joiningOnlyDiff: GroupDiff = _.pick(diff, ['type', 'added', 'withHistory']); const dbMessageAdded = await addUpdateMessage({ diff: joiningOnlyDiff, @@ -213,7 +213,7 @@ export async function addUpdateMessage({ }); } -function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff | null { +function buildGroupV1Diff(convo: ConversationModel, update: GroupInfo): GroupDiff | null { if (convo.getRealSessionUsername() !== update.name) { return { type: 'name', newName: update.name }; } @@ -228,7 +228,7 @@ function buildGroupDiff(convo: ConversationModel, update: GroupInfo): GroupDiff PubKey.is05Pubkey ); if (added.length > 0) { - return { type: 'add', added }; + return { type: 'add', added, withHistory: false }; } // Check if anyone got kicked: const removedMembers = _.difference(oldMembersWithZombies, newMembersWithZombiesLeft).filter( diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts index 0def779784..dbb4f33700 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts @@ -12,17 +12,22 @@ import { } from '../GroupUpdateMessage'; type MembersAddedMessageParams = GroupUpdateMessageParams & { - typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.ADDED; + typeOfChange: 'added'; + added: Array; +}; + +type MembersAddedWithHistoryMessageParams = GroupUpdateMessageParams & { + typeOfChange: 'addedWithHistory'; added: Array; }; type MembersRemovedMessageParams = GroupUpdateMessageParams & { - typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED; + typeOfChange: 'removed'; removed: Array; }; type MembersPromotedMessageParams = GroupUpdateMessageParams & { - typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.PROMOTED; + typeOfChange: 'promoted'; promoted: Array; }; @@ -30,7 +35,8 @@ type MembersPromotedMessageParams = GroupUpdateMessageParams & { * GroupUpdateInfoChangeMessage is sent to the group's swarm. */ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { - public readonly typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type; + public readonly typeOfChange: 'added' | 'addedWithHistory' | 'removed' | 'promoted'; + public readonly memberSessionIds: Array = []; // added, removed, promoted based on the type. public readonly namespace = SnodeNamespaces.ClosedGroupMessages; private readonly secretKey: Uint8Array; // not sent, only used for signing content as part of the message @@ -41,11 +47,11 @@ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { | MembersAddedMessageParams | MembersRemovedMessageParams | MembersPromotedMessageParams + | MembersAddedWithHistoryMessageParams ) & AdminSigDetails ) { super(params); - const { Type } = SignalService.GroupUpdateMemberChangeMessage; const { typeOfChange } = params; this.typeOfChange = typeOfChange; @@ -53,21 +59,28 @@ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { this.sodium = params.sodium; switch (typeOfChange) { - case Type.ADDED: { + case 'added': { if (isEmpty(params.added)) { throw new Error('added members list cannot be empty'); } this.memberSessionIds = params.added; break; } - case Type.REMOVED: { + case 'addedWithHistory': { + if (isEmpty(params.added)) { + throw new Error('addedWithHistory members list cannot be empty'); + } + this.memberSessionIds = params.added; + break; + } + case 'removed': { if (isEmpty(params.removed)) { throw new Error('removed members list cannot be empty'); } this.memberSessionIds = params.removed; break; } - case Type.PROMOTED: { + case 'promoted': { if (isEmpty(params.promoted)) { throw new Error('promoted members list cannot be empty'); } @@ -80,8 +93,15 @@ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { } public dataProto(): SignalService.DataMessage { + const { Type } = SignalService.GroupUpdateMemberChangeMessage; + const memberChangeMessage = new SignalService.GroupUpdateMemberChangeMessage({ - type: this.typeOfChange, + type: + this.typeOfChange === 'added' || this.typeOfChange === 'addedWithHistory' + ? Type.ADDED + : this.typeOfChange === 'removed' + ? Type.REMOVED + : Type.PROMOTED, memberSessionIds: this.memberSessionIds, adminSignature: this.sodium.crypto_sign_detached( stringToUint8Array(`MEMBER_CHANGE${this.typeOfChange}${this.createAtNetworkTimestamp}`), diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 209041adac..fa40a296c7 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -104,6 +104,7 @@ export type PropsForExpirationTimer = { export type PropsForGroupUpdateAdd = { type: 'add'; + withHistory: boolean; added: Array; }; diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 403f1fde75..7d5e0947cc 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -608,8 +608,10 @@ async function getUpdateMessagesToPush({ removed, adminSecretKey, createAtNetworkTimestamp, + fromMemberLeftMessage, }: WithAddWithHistoryMembers & WithAddWithoutHistoryMembers & + WithFromMemberLeftMessage & WithRemoveMembers & WithFromCurrentDevice & WithGroupPubkey & { @@ -621,17 +623,29 @@ async function getUpdateMessagesToPush({ const updateMessages: Array = []; - if (!fromCurrentDevice) { + if (!fromCurrentDevice || fromMemberLeftMessage) { return updateMessages; } - const allAdded = [...withHistory, ...withoutHistory]; // those are already enforced to be unique (and without intersection) in `validateMemberChange()` - if (allAdded.length) { + if (withoutHistory.length) { + updateMessages.push( + new GroupUpdateMemberChangeMessage({ + added: withoutHistory, + groupPk, + typeOfChange: 'added', + createAtNetworkTimestamp, + secretKey: adminSecretKey, + sodium, + ...getConvoExpireDetailsForMsg(convo), + }) + ); + } + if (withHistory.length) { updateMessages.push( new GroupUpdateMemberChangeMessage({ - added: allAdded, + added: withHistory, groupPk, - typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.ADDED, + typeOfChange: 'addedWithHistory', createAtNetworkTimestamp, secretKey: adminSecretKey, sodium, @@ -644,7 +658,7 @@ async function getUpdateMessagesToPush({ new GroupUpdateMemberChangeMessage({ removed, groupPk, - typeOfChange: SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED, + typeOfChange: 'removed', createAtNetworkTimestamp, secretKey: adminSecretKey, sodium, @@ -652,6 +666,7 @@ async function getUpdateMessagesToPush({ }) ); } + // TODO might need to add the promote case here return updateMessages; } @@ -704,6 +719,7 @@ async function handleMemberAddedFromUIOrNot({ withHistory, withoutHistory, createAtNetworkTimestamp, + fromMemberLeftMessage: false, }); await LibSessionUtil.saveDumpsToDb(groupPk); @@ -744,23 +760,21 @@ async function handleMemberAddedFromUIOrNot({ : null, }, }; - const additions = updateMessages.find( - m => m.typeOfChange === SignalService.GroupUpdateMemberChangeMessage.Type.ADDED - ); - if (additions) { + const additionsWithoutHistory = updateMessages.find(m => m.typeOfChange === 'added'); + const additionsWithHistory = updateMessages.find(m => m.typeOfChange === 'addedWithHistory'); + if (additionsWithoutHistory) { await ClosedGroup.addUpdateMessage({ - diff: { type: 'add', added: additions.memberSessionIds }, + diff: { type: 'add', added: additionsWithoutHistory.memberSessionIds, withHistory: false }, ...shared, - expireUpdate: { - expirationTimer: expiringDetails.expireTimer, - expirationType: expiringDetails.expirationType, - messageExpirationFromRetrieve: - expiringDetails.expireTimer > 0 - ? createAtNetworkTimestamp + expiringDetails.expireTimer - : null, - }, }); } + if (additionsWithHistory) { + await ClosedGroup.addUpdateMessage({ + diff: { type: 'add', added: additionsWithHistory.memberSessionIds, withHistory: true }, + ...shared, + }); + } + await convo.commit(); } @@ -819,6 +833,7 @@ async function handleMemberRemovedFromUIOrNot({ withHistory: [], withoutHistory: [], createAtNetworkTimestamp, + fromMemberLeftMessage, }); await LibSessionUtil.saveDumpsToDb(groupPk); @@ -858,9 +873,7 @@ async function handleMemberRemovedFromUIOrNot({ }, }; - const removals = updateMessages.find( - m => m.typeOfChange === SignalService.GroupUpdateMemberChangeMessage.Type.REMOVED - ); + const removals = updateMessages.find(m => m.typeOfChange === 'removed'); if (removals) { await ClosedGroup.addUpdateMessage({ diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index 18e8832fe5..2b37eb784b 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -87,12 +87,7 @@ export function getSelectedCanWrite(state: StateType) { const isBlindedAndDisabledMsgRequests = getSelectedBlindedDisabledMsgRequests(state); // true if isPrivate, blinded and explicitely disabled msgreq - return !( - isBlocked || - isKickedFromGroup || - readOnlySogs || - isBlindedAndDisabledMsgRequests - ); + return !(isBlocked || isKickedFromGroup || readOnlySogs || isBlindedAndDisabledMsgRequests); } function getSelectedBlindedDisabledMsgRequests(state: StateType) { diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 6fc59115e2..61e3904166 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -142,7 +142,6 @@ export type LocalizerKeys = | 'dialogClearAllDataDeletionFailedTitle' | 'dialogClearAllDataDeletionFailedTitleQuestion' | 'dialogClearAllDataDeletionQuestion' - | 'disabledDisappearingMessages' | 'disappearingMessages' | 'disappearingMessagesDisabled' | 'disappearingMessagesModeAfterRead' @@ -206,6 +205,7 @@ export type LocalizerKeys = | 'goToReleaseNotes' | 'goToSupportPage' | 'groupAvatarChange' + | 'groupDisabledDisappearingMessages' | 'groupInviteFailedOne' | 'groupInviteFailedOthers' | 'groupInviteFailedTwo' @@ -214,16 +214,20 @@ export type LocalizerKeys = | 'groupNameChangeFallback' | 'groupNamePlaceholder' | 'groupOneJoined' + | 'groupOneJoinedWithHistory' | 'groupOneLeft' | 'groupOnePromoted' | 'groupOneRemoved' | 'groupOthersJoined' + | 'groupOthersJoinedWithHistory' | 'groupOthersPromoted' | 'groupOthersRemoved' | 'groupTwoJoined' + | 'groupTwoJoinedWithHistory' | 'groupTwoPromoted' | 'groupTwoRemoved' | 'groupYouJoined' + | 'groupYouJoinedWithHistory' | 'groupYouLeft' | 'groupYouPromoted' | 'groupYouRemoved' @@ -534,6 +538,7 @@ export type LocalizerKeys = | 'unknownCountry' | 'unpinConversation' | 'unreadMessages' + | 'updateDisappearingMessagesFallback' | 'updateGroupDialogTitle' | 'userAddedToModerators' | 'userBanFailed' @@ -563,8 +568,8 @@ export type LocalizerKeys = | 'youGotKickedFromGroup' | 'youHaveANewFriendRequest' | 'youLeftTheGroup' - | 'youWereInvitedToGroup' | 'youSetYourDisappearingMessages' + | 'youWereInvitedToGroup' | 'yourSessionID' | 'yourUniqueSessionID' | 'zoomFactorSettingTitle'; From d3ed798d0ec8455f31f8417625878be54eefc7c0 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 24 Jan 2024 14:22:41 +1100 Subject: [PATCH 080/302] chore: show toast when trying to remove admin of groupv2 --- _locales/en/messages.json | 1 + .../dialog/UpdateGroupMembersDialog.tsx | 5 +++++ .../to_group/GroupUpdateMemberChangeMessage.ts | 16 +++++++++------- ts/session/sending/MessageSender.ts | 2 ++ ts/session/utils/Toast.tsx | 4 ++++ ts/state/ducks/metaGroups.ts | 4 ++++ ts/types/LocalizerKeys.ts | 1 + 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 53145bd93e..aaf4829d14 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -327,6 +327,7 @@ "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?", "cannotRemoveCreatorFromGroup": "Cannot remove this user", "cannotRemoveCreatorFromGroupDesc": "You cannot remove this user as they are the creator of the group.", + "cannotRemoveAdminFromGroup": "Admins cannot be removed", "noContactsForGroup": "You don't have any contacts yet", "failedToAddAsModerator": "Failed to add user as admin", "failedToRemoveFromModerator": "Failed to remove user from the admin list", diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 1fdad5c58b..6e88916ef4 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -249,6 +249,11 @@ export const UpdateGroupMembersDialog = (props: Props) => { return; } if (groupAdmins?.includes(member)) { + if (PubKey.is03Pubkey(conversationId)) { + ToastUtils.pushCannotRemoveAdminFromGroup(); + window?.log?.warn(`User ${member} cannot be removed as they are adn admin.`); + return; + } ToastUtils.pushCannotRemoveCreatorFromGroup(); window?.log?.warn( `User ${member} cannot be removed as they are the creator of the closed group.` diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts index dbb4f33700..f3d6692c49 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts @@ -95,16 +95,18 @@ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { public dataProto(): SignalService.DataMessage { const { Type } = SignalService.GroupUpdateMemberChangeMessage; + const type: SignalService.GroupUpdateMemberChangeMessage.Type = + this.typeOfChange === 'added' || this.typeOfChange === 'addedWithHistory' + ? Type.ADDED + : this.typeOfChange === 'removed' + ? Type.REMOVED + : Type.PROMOTED; + const memberChangeMessage = new SignalService.GroupUpdateMemberChangeMessage({ - type: - this.typeOfChange === 'added' || this.typeOfChange === 'addedWithHistory' - ? Type.ADDED - : this.typeOfChange === 'removed' - ? Type.REMOVED - : Type.PROMOTED, + type, memberSessionIds: this.memberSessionIds, adminSignature: this.sodium.crypto_sign_detached( - stringToUint8Array(`MEMBER_CHANGE${this.typeOfChange}${this.createAtNetworkTimestamp}`), + stringToUint8Array(`MEMBER_CHANGE${type}${this.createAtNetworkTimestamp}`), this.secretKey ), }); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index ab495712a7..6931ba8b25 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -493,6 +493,8 @@ async function encryptMessageAndWrap( return encryptForGroupV2(params); } + // can only be legacy group or 1o1 chats here + const recipient = PubKey.cast(destination); const { envelopeType, cipherText } = await MessageEncrypter.encrypt( diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx index fbaef40564..748d79371d 100644 --- a/ts/session/utils/Toast.tsx +++ b/ts/session/utils/Toast.tsx @@ -194,6 +194,10 @@ export function pushCannotRemoveCreatorFromGroup() { pushToastWarning('cannotRemoveCreatorFromGroup', window.i18n('cannotRemoveCreatorFromGroupDesc')); } +export function pushCannotRemoveAdminFromGroup() { + pushToastWarning('cannotRemoveAdminFromGroup', window.i18n('cannotRemoveAdminFromGroup')); +} + export function pushOnlyAdminCanRemove() { pushToastInfo('onlyAdminCanRemoveMembers', window.i18n('onlyAdminCanRemoveMembersDesc')); } diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 7d5e0947cc..02bb6cf983 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -11,6 +11,7 @@ import { } from 'libsession_util_nodejs'; import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo'; import { intersection, isEmpty, uniq } from 'lodash'; +import { v4 } from 'uuid'; import { ConfigDumpData } from '../../data/configDump/configDump'; import { ConversationModel } from '../../models/conversation'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; @@ -630,6 +631,7 @@ async function getUpdateMessagesToPush({ if (withoutHistory.length) { updateMessages.push( new GroupUpdateMemberChangeMessage({ + identifier: v4(), added: withoutHistory, groupPk, typeOfChange: 'added', @@ -643,6 +645,7 @@ async function getUpdateMessagesToPush({ if (withHistory.length) { updateMessages.push( new GroupUpdateMemberChangeMessage({ + identifier: v4(), added: withHistory, groupPk, typeOfChange: 'addedWithHistory', @@ -656,6 +659,7 @@ async function getUpdateMessagesToPush({ if (removed.length) { updateMessages.push( new GroupUpdateMemberChangeMessage({ + identifier: v4(), removed, groupPk, typeOfChange: 'removed', diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 61e3904166..131b88d8b5 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -52,6 +52,7 @@ export type LocalizerKeys = | 'cameraPermissionNeeded' | 'cancel' | 'cannotMixImageAndNonImageAttachments' + | 'cannotRemoveAdminFromGroup' | 'cannotRemoveCreatorFromGroup' | 'cannotRemoveCreatorFromGroupDesc' | 'cannotUpdate' From 6094e725fbb9010451a66df02f7f4ebdcb233875 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 24 Jan 2024 17:46:12 +1100 Subject: [PATCH 081/302] chore: move getExpiries request to class --- .../apis/snode_api/SnodeRequestTypes.ts | 392 ++++++++++++------ ts/session/apis/snode_api/batchRequest.ts | 15 +- .../apis/snode_api/getExpiriesRequest.ts | 80 +--- ts/session/apis/snode_api/getNetworkTime.ts | 11 +- .../apis/snode_api/getServiceNodesList.ts | 30 +- ts/session/apis/snode_api/getSwarmFor.ts | 14 +- ts/session/apis/snode_api/onsResolve.ts | 16 +- ts/session/apis/snode_api/revokeSubaccount.ts | 33 +- .../snode_api/signature/snodeSignatures.ts | 15 +- ts/session/apis/snode_api/storeMessage.ts | 50 ++- ts/session/apis/snode_api/types.ts | 28 +- ts/session/sending/MessageSender.ts | 106 +---- .../jobs/FetchMsgExpirySwarmJob.ts | 6 +- .../utils/job_runners/jobs/GroupSyncJob.ts | 20 +- .../utils/job_runners/jobs/UserSyncJob.ts | 4 +- ts/state/ducks/metaGroups.ts | 23 +- .../unit/crypto/SnodeSignatures_test.ts | 3 +- .../GetExpiriesRequest_test.ts | 21 +- .../group_sync_job/GroupSyncJob_test.ts | 12 +- 19 files changed, 439 insertions(+), 440 deletions(-) diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 41923d32ef..36199c3238 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1,19 +1,31 @@ -import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType, PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; +import { from_hex } from 'libsodium-wrappers-sumo'; import { isEmpty } from 'lodash'; +import { concatUInt8Array } from '../../crypto'; +import { StringUtils, UserUtils } from '../../utils'; +import { GetNetworkTime } from './getNetworkTime'; import { SnodeNamespaces, SnodeNamespacesGroup, SnodeNamespacesGroupConfig, UserConfigNamespaces, } from './namespaces'; -import { SignedGroupHashesParams, SignedHashesParams } from './types'; - -export type SwarmForSubRequest = { method: 'get_swarm'; params: { pubkey: string } }; +import { SnodeGroupSignature } from './signature/groupSignature'; +import { SnodeSignature } from './signature/snodeSignatures'; +import { + SignedGroupHashesParams, + SignedHashesParams, + WithMessagesHashes, + WithSecretKey, + WithSignature, + WithTimestamp, +} from './types'; type WithRetrieveMethod = { method: 'retrieve' }; type WithMaxCountSize = { max_count?: number; max_size?: number }; type WithPubkeyAsString = { pubkey: string }; type WithPubkeyAsGroupPubkey = { pubkey: GroupPubkeyType }; +export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; type RetrieveAlwaysNeeded = { namespace: number; @@ -23,12 +35,12 @@ type RetrieveAlwaysNeeded = { export type RetrievePubkeySubRequestType = WithRetrieveMethod & { params: { - signature: string; pubkey_ed25519: string; namespace: number; } & RetrieveAlwaysNeeded & WithMaxCountSize & - WithPubkeyAsString; + WithPubkeyAsString & + WithSignature; }; /** Those namespaces do not require to be authenticated for storing messages. @@ -49,21 +61,21 @@ export type RetrieveLegacyClosedGroupSubRequestType = WithRetrieveMethod & { export type RetrieveGroupAdminSubRequestType = WithRetrieveMethod & { params: { - signature: string; namespace: SnodeNamespacesGroup; } & RetrieveAlwaysNeeded & - WithMaxCountSize; + WithMaxCountSize & + WithSignature; }; export type RetrieveGroupSubAccountSubRequestType = WithRetrieveMethod & { params: { namespace: SnodeNamespacesGroup; - signature: string; subaccount: string; subaccount_sig: string; } & RetrieveAlwaysNeeded & WithMaxCountSize & - WithPubkeyAsGroupPubkey; + WithPubkeyAsGroupPubkey & + WithSignature; }; export type RetrieveSubRequestType = @@ -74,36 +86,219 @@ export type RetrieveSubRequestType = | UpdateExpiryOnNodeGroupSubRequest | RetrieveGroupSubAccountSubRequestType; -/** - * OXEND_REQUESTS - */ -export type OnsResolveSubRequest = { - method: 'oxend_request'; - params: { - endpoint: 'ons_resolve'; - params: { - type: 0; - name_hash: string; // base64EncodedNameHash +abstract class SnodeAPISubRequest { + public abstract method: string; +} + +export class OnsResolveSubRequest extends SnodeAPISubRequest { + public method: string = 'oxend_request'; + public readonly base64EncodedNameHash: string; + + constructor(base64EncodedNameHash: string) { + super(); + this.base64EncodedNameHash = base64EncodedNameHash; + } + + public build() { + return { + method: this.method, + params: { + endpoint: 'ons_resolve', + params: { + type: 0, + name_hash: this.base64EncodedNameHash, + }, + }, }; - }; -}; + } +} -export type GetServiceNodesSubRequest = { - method: 'oxend_request'; - params: { - endpoint: 'get_service_nodes'; - params: { - active_only: true; - fields: { - public_ip: true; - storage_port: true; - pubkey_x25519: true; - pubkey_ed25519: true; - }; +export class GetServiceNodesSubRequest extends SnodeAPISubRequest { + public method = 'oxend_request' as const; + + public build() { + return { + method: this.method, + params: { + endpoint: 'get_service_nodes' as const, + params: { + active_only: true, + fields: { + public_ip: true, + storage_port: true, + pubkey_x25519: true, + pubkey_ed25519: true, + }, + }, + }, }; - }; -}; + } +} + +export class SwarmForSubRequest extends SnodeAPISubRequest { + public method = 'get_swarm' as const; + public readonly pubkey; + + constructor(pubkey: PubkeyType | GroupPubkeyType) { + super(); + this.pubkey = pubkey; + } + + public build() { + return { + method: this.method, + params: { + pubkey: this.pubkey, + params: { + active_only: true, + fields: { + public_ip: true, + storage_port: true, + pubkey_x25519: true, + pubkey_ed25519: true, + }, + }, + }, + } as const; + } +} + +export class NetworkTimeSubRequest extends SnodeAPISubRequest { + public method = 'info' as const; + + public build() { + return { + method: this.method, + params: {}, + } as const; + } +} + +abstract class SubaccountRightsSubRequest extends SnodeAPISubRequest { + public readonly groupPk: GroupPubkeyType; + public readonly timestamp: number; + public readonly revokeTokenHex: Array; + + protected readonly secretKey: Uint8Array; + + constructor({ + groupPk, + timestamp, + revokeTokenHex, + secretKey, + }: WithGroupPubkey & WithTimestamp & WithSecretKey & { revokeTokenHex: Array }) { + super(); + this.groupPk = groupPk; + this.timestamp = timestamp; + this.revokeTokenHex = revokeTokenHex; + this.secretKey = secretKey; + } + + public async sign() { + if (!this.secretKey) { + throw new Error('we need an admin secretkey'); + } + const tokensBytes = from_hex(this.revokeTokenHex.join('')); + + const prefix = new Uint8Array(StringUtils.encode(`${this.method}${this.timestamp}`, 'utf8')); + const sigResult = await SnodeGroupSignature.signDataWithAdminSecret( + concatUInt8Array(prefix, tokensBytes), + { secretKey: this.secretKey } + ); + + return sigResult.signature; + } +} +export class SubaccountRevokeSubRequest extends SubaccountRightsSubRequest { + public method = 'revoke_subaccount' as const; + + public async buildAndSignParameters() { + const signature = await this.sign(); + return { + method: this.method, + params: { + pubkey: this.groupPk, + signature, + revoke: this.revokeTokenHex, + timestamp: this.timestamp, + }, + }; + } +} + +export class SubaccountUnrevokeSubRequest extends SubaccountRightsSubRequest { + public method = 'unrevoke_subaccount' as const; + + /** + * For Revoke/unrevoke, this needs an admin signature + */ + public async buildAndSignParameters() { + const signature = await this.sign(); + + return { + method: this.method, + params: { + pubkey: this.groupPk, + signature, + unrevoke: this.revokeTokenHex, + timestamp: this.timestamp, + }, + }; + } +} + +/** + * The getExpiriies request can currently only be used for our own pubkey as we use it to fetch + * the expiries updated by another of our devices. + */ +export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { + public method = 'get_expiries' as const; + pubkey: string; + messageHashes: Array; + + constructor(args: WithMessagesHashes) { + super(); + const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); + if (!ourPubKey) { + throw new Error('[GetExpiriesFromNodeSubRequest] No pubkey found'); + } + this.pubkey = ourPubKey; + this.messageHashes = args.messagesHashes; + } + /** + * For Revoke/unrevoke, this needs an admin signature + */ + public async buildAndSignParameters() { + const timestamp = GetNetworkTime.now(); + + const signResult = await SnodeSignature.generateGetExpiriesOurSignature({ + timestamp, + messageHashes: this.messageHashes, + }); + + if (!signResult) { + throw new Error( + `[GetExpiriesFromNodeSubRequest] SnodeSignature.generateUpdateExpirySignature returned an empty result ${this.messageHashes}` + ); + } + + return { + method: this.method, + params: { + pubkey: this.pubkey, + pubkey_ed25519: signResult.pubkey_ed25519.toUpperCase(), + signature: signResult.signature, + messages: this.messageHashes, + timestamp, + }, + }; + } +} + +/** + * STORE SUBREQUESTS + */ type StoreOnNodeNormalParams = { pubkey: string; ttl: number; @@ -118,13 +313,14 @@ type StoreOnNodeNormalParams = { type StoreOnNodeSubAccountParams = Pick< StoreOnNodeNormalParams, 'data' | 'namespace' | 'ttl' | 'timestamp' -> & { - pubkey: GroupPubkeyType; - subaccount: string; - subaccount_sig: string; - namespace: SnodeNamespaces.ClosedGroupMessages; // this can only be this one, subaccounts holder can not post to something else atm - signature: string; // signature is mandatory for subaccount -}; +> & + WithSignature & { + pubkey: GroupPubkeyType; + subaccount: string; + subaccount_sig: string; + namespace: SnodeNamespaces.ClosedGroupMessages; // this can only be this one, subaccounts holder can not post to something else atm + // signature is mandatory for subaccount + }; export type StoreOnNodeParams = StoreOnNodeNormalParams | StoreOnNodeSubAccountParams; @@ -133,16 +329,6 @@ export type StoreOnNodeParamsNoSig = Pick< 'pubkey' | 'ttl' | 'timestamp' | 'ttl' | 'namespace' > & { data64: string }; -export type DeleteFromNodeWithTimestampParams = { - timestamp: string | number; - namespace: number | null | 'all'; -} & (DeleteSigUserParameters | DeleteSigGroupParameters); - -export type DeleteByHashesFromNodeParams = { messages: Array } & ( - | DeleteSigUserParameters - | DeleteSigGroupParameters -); - type StoreOnNodeShared = { networkTimestamp: number; data: Uint8Array; @@ -173,17 +359,28 @@ export type StoreOnNodeSubRequest = { method: 'store'; params: StoreOnNodeParams | StoreOnNodeSubAccountParams; }; -export type NetworkTimeSubRequest = { method: 'info'; params: object }; -type DeleteSigUserParameters = { +/** + * DELETE SUBREQUESTS + */ + +type DeleteFromNodeWithTimestampParams = { + timestamp: string | number; + namespace: number | null | 'all'; +} & (DeleteSigUserParameters | DeleteSigGroupParameters); + +export type DeleteByHashesFromNodeParams = { messages: Array } & ( + | DeleteSigUserParameters + | DeleteSigGroupParameters +); + +type DeleteSigUserParameters = WithSignature & { pubkey: PubkeyType; pubkey_ed25519: string; - signature: string; }; -type DeleteSigGroupParameters = { +type DeleteSigGroupParameters = WithSignature & { pubkey: GroupPubkeyType; - signature: string; }; export type DeleteAllFromNodeSubRequest = { @@ -196,10 +393,9 @@ export type DeleteFromNodeSubRequest = { params: DeleteByHashesFromNodeParams; }; -type UpdateExpireAlwaysNeeded = { +type UpdateExpireAlwaysNeeded = WithSignature & { messages: Array; expiry: number; - signature: string; extend?: boolean; shorten?: boolean; }; @@ -225,66 +421,22 @@ type UpdateExpiryOnNodeSubRequest = | UpdateExpiryOnNodeUserSubRequest | UpdateExpiryOnNodeGroupSubRequest; -type SignedRevokeSubaccountShared = { - pubkey: GroupPubkeyType; - signature: string; - timestamp: number; -}; - -export type SignedRevokeSubaccountParams = SignedRevokeSubaccountShared & { - revoke: Array; // the subaccounts token to revoke in hex -}; - -export type SignedUnrevokeSubaccountParams = SignedRevokeSubaccountShared & { - unrevoke: Array; // the subaccounts token to unrevoke in hex -}; - -export type RevokeSubaccountParams = Omit; -export type UnrevokeSubaccountParams = Omit< - SignedUnrevokeSubaccountParams, - 'timestamp' | 'signature' ->; - -export type RevokeSubaccountSubRequest = { - method: 'revoke_subaccount'; - params: SignedRevokeSubaccountParams; -}; - -export type UnrevokeSubaccountSubRequest = { - method: 'unrevoke_subaccount'; - params: SignedUnrevokeSubaccountParams; -}; - -export type GetExpiriesNodeParams = { - pubkey: string; - pubkey_ed25519: string; - messages: Array; - timestamp: number; - signature: string; -}; - -export type GetExpiriesFromNodeSubRequest = { - method: 'get_expiries'; - params: GetExpiriesNodeParams; -}; - // Until the next storage server release is released, we need to have at least 2 hashes in the list for the `get_expiries` AND for the `update_expiries` export const fakeHash = '///////////////////////////////////////////'; -export type OxendSubRequest = OnsResolveSubRequest | GetServiceNodesSubRequest; - export type SnodeApiSubRequests = | RetrieveSubRequestType - | SwarmForSubRequest - | OxendSubRequest + | ReturnType + | ReturnType + | ReturnType | StoreOnNodeSubRequest - | NetworkTimeSubRequest + | ReturnType | DeleteFromNodeSubRequest | DeleteAllFromNodeSubRequest | UpdateExpiryOnNodeSubRequest - | RevokeSubaccountSubRequest - | UnrevokeSubaccountSubRequest - | GetExpiriesFromNodeSubRequest; + | Awaited> + | Awaited> + | Awaited>; // eslint-disable-next-line @typescript-eslint/array-type export type NonEmptyArray = [T, ...T[]]; @@ -296,28 +448,14 @@ export type BatchResultEntry = { export type NotEmptyArrayOfBatchResults = NonEmptyArray; -export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; - export const MAX_SUBREQUESTS_COUNT = 20; export type BatchStoreWithExtraParams = | StoreOnNodeParams | SignedGroupHashesParams | SignedHashesParams - | RevokeSubaccountSubRequest - | UnrevokeSubaccountSubRequest; - -export function isUnrevokeRequest( - request: BatchStoreWithExtraParams -): request is UnrevokeSubaccountSubRequest { - return !isEmpty((request as UnrevokeSubaccountSubRequest)?.params?.unrevoke); -} - -export function isRevokeRequest( - request: BatchStoreWithExtraParams -): request is RevokeSubaccountSubRequest { - return !isEmpty((request as RevokeSubaccountSubRequest)?.params?.revoke); -} + | SubaccountRevokeSubRequest + | SubaccountUnrevokeSubRequest; export function isDeleteByHashesParams( request: BatchStoreWithExtraParams diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index a6b6cf4dd7..3576430837 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -1,6 +1,5 @@ import { isArray } from 'lodash'; import { Snode } from '../../../data/data'; -import { SnodeNamespace } from './namespaces'; import { processOnionRequestErrorAtDestination, SnodeResponse } from './onions'; import { snodeRpc } from './sessionRpc'; import { @@ -9,12 +8,13 @@ import { SnodeApiSubRequests, } from './SnodeRequestTypes'; -function logSubRequests(requests: Array) { - return requests.map(m => - m.method === 'retrieve' || m.method === 'store' - ? `${m.method}-${SnodeNamespace.toRoles(m.params.namespace)}` - : m.method - ); +function logSubRequests(_requests: Array) { + return 'logSubRequests to do'; + // return requests.map(m => + // m.method === 'retrieve' || m.method === 'store' + // ? `${m.method}-${SnodeNamespace.toRoles(m.params.namespace)}` + // : m.method + // ); } /** @@ -83,6 +83,7 @@ function decodeBatchRequest(snodeResponse: SnodeResponse): NotEmptyArrayOfBatchR try { // console.error('decodeBatch: ', snodeResponse); if (snodeResponse.status !== 200) { + debugger; throw new Error(`decodeBatchRequest invalid status code: ${snodeResponse.status}`); } const parsed = JSON.parse(snodeResponse.body); diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index fb63ef3f3a..00d0580b2f 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -1,4 +1,5 @@ /* eslint-disable no-restricted-syntax */ +import { PubkeyType } from 'libsession_util_nodejs'; import { isFinite, isNil, isNumber, sample } from 'lodash'; import pRetry from 'p-retry'; import { Snode } from '../../../data/data'; @@ -7,10 +8,8 @@ import { EmptySwarmError } from '../../utils/errors'; import { SeedNodeAPI } from '../seed_node_api'; import { GetExpiriesFromNodeSubRequest, fakeHash } from './SnodeRequestTypes'; import { doSnodeBatchRequest } from './batchRequest'; -import { GetNetworkTime } from './getNetworkTime'; -import { SnodeSignature } from './signature/snodeSignatures'; import { getSwarmFor } from './snodePool'; -import { GetExpiriesResultsContent } from './types'; +import { GetExpiriesResultsContent, WithMessagesHashes } from './types'; export type GetExpiriesRequestResponseResults = Record; @@ -43,16 +42,13 @@ export async function processGetExpiriesRequestResponse( async function getExpiriesFromNodes( targetNode: Snode, - expireRequest: GetExpiriesFromNodeSubRequest + messageHashes: Array, + associatedWith: PubkeyType ) { try { - const result = await doSnodeBatchRequest( - [expireRequest], - targetNode, - 4000, - expireRequest.params.pubkey, - 'batch' - ); + const expireRequest = new GetExpiriesFromNodeSubRequest({ messagesHashes: messageHashes }); + const signed = await expireRequest.buildAndSignParameters(); + const result = await doSnodeBatchRequest([signed], targetNode, 4000, associatedWith, 'batch'); if (!result || result.length !== 1) { throw Error( @@ -74,14 +70,14 @@ async function getExpiriesFromNodes( const expirationResults = await processGetExpiriesRequestResponse( targetNode, firstResult.body.expiries as GetExpiriesResultsContent, - expireRequest.params.messages + expireRequest.messageHashes ); // Note: even if expirationResults is empty we need to process the results. // The status code is 200, so if the results is empty, it means all those messages already expired. // Note: a hash which already expired on the server is not going to be returned. So we force it's fetchedExpiry to be now() to make it expire asap - const expiriesWithForcedExpiried = expireRequest.params.messages.map(messageHash => ({ + const expiriesWithForcedExpiried = expireRequest.messageHashes.map(messageHash => ({ messageHash, fetchedExpiry: expirationResults?.[messageHash] || Date.now(), })); @@ -97,47 +93,6 @@ async function getExpiriesFromNodes( } } -export type GetExpiriesFromSnodeProps = { - messageHashes: Array; -}; - -export async function buildGetExpiriesRequest({ - messageHashes, -}: GetExpiriesFromSnodeProps): Promise { - const timestamp = GetNetworkTime.now(); - - const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); - if (!ourPubKey) { - window.log.error('[buildGetExpiriesRequest] No pubkey found', messageHashes); - return null; - } - - const signResult = await SnodeSignature.generateGetExpiriesOurSignature({ - timestamp, - messageHashes, - }); - - if (!signResult) { - window.log.error( - `[buildGetExpiriesRequest] SnodeSignature.generateUpdateExpirySignature returned an empty result ${messageHashes}` - ); - return null; - } - - const getExpiriesParams: GetExpiriesFromNodeSubRequest = { - method: 'get_expiries', - params: { - pubkey: ourPubKey, - pubkey_ed25519: signResult.pubkey_ed25519.toUpperCase(), - messages: messageHashes, - timestamp, - signature: signResult?.signature, - }, - }; - - return getExpiriesParams; -} - /** * Sends an 'get_expiries' request which retrieves the current expiry timestamps of the given messages. * @@ -146,26 +101,21 @@ export async function buildGetExpiriesRequest({ * @param timestamp the time (ms) the request was initiated, must be within ±60s of the current time so using the server time is recommended. * @returns an arrray of the expiry timestamps (TTL) for the given messages */ -export async function getExpiriesFromSnode({ messageHashes }: GetExpiriesFromSnodeProps) { +export async function getExpiriesFromSnode({ messagesHashes }: WithMessagesHashes) { // FIXME There is a bug in the snode code that requires at least 2 messages to be requested. Will be fixed in next storage server release - if (messageHashes.length === 1) { - messageHashes.push(fakeHash); + if (messagesHashes.length === 1) { + messagesHashes.push(fakeHash); } const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); if (!ourPubKey) { - window.log.error('[getExpiriesFromSnode] No pubkey found', messageHashes); + window.log.error('[getExpiriesFromSnode] No pubkey found', messagesHashes); return []; } let snode: Snode | undefined; try { - const expireRequestParams = await buildGetExpiriesRequest({ messageHashes }); - if (!expireRequestParams) { - throw new Error(`Failed to build get_expiries request ${JSON.stringify({ messageHashes })}`); - } - const fetchedExpiries = await pRetry( async () => { const swarm = await getSwarmFor(ourPubKey); @@ -173,7 +123,7 @@ export async function getExpiriesFromSnode({ messageHashes }: GetExpiriesFromSno if (!snode) { throw new EmptySwarmError(ourPubKey, 'Ran out of swarm nodes to query'); } - return getExpiriesFromNodes(snode, expireRequestParams); + return getExpiriesFromNodes(snode, messagesHashes, ourPubKey); }, { retries: 3, @@ -193,7 +143,7 @@ export async function getExpiriesFromSnode({ messageHashes }: GetExpiriesFromSno window?.log?.warn( `[getExpiriesFromSnode] ${e.code ? `${e.code} ` : ''}${ e.message || e - } by ${ourPubKey} for ${messageHashes} via snode:${snodeStr}` + } by ${ourPubKey} for ${messagesHashes} via snode:${snodeStr}` ); throw e; } diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index 819449a8e2..917e198acc 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -9,15 +9,10 @@ import { Snode } from '../../../data/data'; import { NetworkTimeSubRequest } from './SnodeRequestTypes'; import { doSnodeBatchRequest } from './batchRequest'; -function getNetworkTimeSubRequests(): Array { - const request: NetworkTimeSubRequest = { method: 'info', params: {} }; - - return [request]; -} - const getNetworkTime = async (snode: Snode): Promise => { - const subRequests = getNetworkTimeSubRequests(); - const result = await doSnodeBatchRequest(subRequests, snode, 4000, null); + const subrequest = new NetworkTimeSubRequest(); + + const result = await doSnodeBatchRequest([subrequest.build()], snode, 4000, null); if (!result || !result.length) { window?.log?.warn(`getNetworkTime on ${snode.ip}:${snode.port} returned falsish value`, result); throw new Error('getNetworkTime: Invalid result'); diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index 8f35d82888..2b791c96fb 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -1,29 +1,10 @@ -import _, { intersectionWith, sampleSize } from 'lodash'; +import { compact, intersectionWith, sampleSize } from 'lodash'; import { SnodePool } from '.'; import { Snode } from '../../../data/data'; +import { GetServiceNodesSubRequest } from './SnodeRequestTypes'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { minSnodePoolCount, requiredSnodesForAgreement } from './snodePool'; -import { GetServiceNodesSubRequest } from './SnodeRequestTypes'; - -function buildSnodeListRequests(): Array { - const request: GetServiceNodesSubRequest = { - method: 'oxend_request', - params: { - endpoint: 'get_service_nodes', - params: { - active_only: true, - fields: { - public_ip: true, - storage_port: true, - pubkey_x25519: true, - pubkey_ed25519: true, - }, - }, - }, - }; - return [request]; -} /** * Returns a list of unique snodes got from the specified targetNode. @@ -31,8 +12,9 @@ function buildSnodeListRequests(): Array { * This is exported for testing purpose only. */ async function getSnodePoolFromSnode(targetNode: Snode): Promise> { - const requests = buildSnodeListRequests(); - const results = await doSnodeBatchRequest(requests, targetNode, 4000, null); + const subrequest = new GetServiceNodesSubRequest(); + + const results = await doSnodeBatchRequest([subrequest.build()], targetNode, 4000, null); const firstResult = results[0]; @@ -60,7 +42,7 @@ async function getSnodePoolFromSnode(targetNode: Snode): Promise> { GetNetworkTime.handleTimestampOffsetFromNetwork('get_service_nodes', json.t); // we the return list by the snode is already made of uniq snodes - return _.compact(snodes); + return compact(snodes); } catch (e) { window?.log?.error('Invalid json response'); return []; diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index 3b881e5e75..f480ae94f9 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -1,14 +1,11 @@ import { isArray } from 'lodash'; import pRetry from 'p-retry'; import { Snode } from '../../../data/data'; +import { PubKey } from '../../types'; +import { SwarmForSubRequest } from './SnodeRequestTypes'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { getRandomSnode } from './snodePool'; -import { SwarmForSubRequest } from './SnodeRequestTypes'; - -function buildSwarmForSubRequests(pubkey: string): Array { - return [{ method: 'get_swarm', params: { pubkey } }]; -} /** * get snodes for pubkey from random snode. Uses an existing snode @@ -17,9 +14,12 @@ async function requestSnodesForPubkeyWithTargetNodeRetryable( pubkey: string, targetNode: Snode ): Promise> { - const subRequests = buildSwarmForSubRequests(pubkey); + if (!PubKey.is03Pubkey(pubkey) && !PubKey.is05Pubkey(pubkey)) { + throw new Error('invalid pubkey given for swarmFor'); + } + const subrequest = new SwarmForSubRequest(pubkey); - const result = await doSnodeBatchRequest(subRequests, targetNode, 4000, pubkey); + const result = await doSnodeBatchRequest([subrequest.build()], targetNode, 4000, pubkey); if (!result || !result.length) { window?.log?.warn( diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts index 767b75968a..1e2269315c 100644 --- a/ts/session/apis/snode_api/onsResolve.ts +++ b/ts/session/apis/snode_api/onsResolve.ts @@ -15,17 +15,6 @@ import { getRandomSnode } from './snodePool'; // do not define a regex but rather create it on the fly to avoid https://stackoverflow.com/questions/3891641/regex-test-only-works-every-other-time const onsNameRegex = '^\\w([\\w-]*[\\w])?$'; -function buildOnsResolveRequests(base64EncodedNameHash: string): Array { - const request: OnsResolveSubRequest = { - method: 'oxend_request', - params: { - endpoint: 'ons_resolve', - params: { type: 0, name_hash: base64EncodedNameHash }, - }, - }; - return [request]; -} - async function getSessionIDForOnsName(onsNameCase: string) { const validationCount = 3; @@ -34,14 +23,13 @@ async function getSessionIDForOnsName(onsNameCase: string) { const nameAsData = stringToUint8Array(onsNameLowerCase); const nameHash = sodium.crypto_generichash(sodium.crypto_generichash_BYTES, nameAsData); const base64EncodedNameHash = fromUInt8ArrayToBase64(nameHash); - - const onsResolveRequests = buildOnsResolveRequests(base64EncodedNameHash); + const subRequest = new OnsResolveSubRequest(base64EncodedNameHash); // we do this request with validationCount snodes const promises = range(0, validationCount).map(async () => { const targetNode = await getRandomSnode(); - const results = await doSnodeBatchRequest(onsResolveRequests, targetNode, 4000, null); + const results = await doSnodeBatchRequest([subRequest.build()], targetNode, 4000, null); const firstResult = results[0]; if (!firstResult || firstResult.code !== 200 || !firstResult.body) { throw new Error('ONSresolve:Failed to resolve ONS'); diff --git a/ts/session/apis/snode_api/revokeSubaccount.ts b/ts/session/apis/snode_api/revokeSubaccount.ts index 2f9f662a4f..2ca5ab6613 100644 --- a/ts/session/apis/snode_api/revokeSubaccount.ts +++ b/ts/session/apis/snode_api/revokeSubaccount.ts @@ -1,7 +1,8 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { PubKey } from '../../types'; -import { RevokeSubaccountParams, UnrevokeSubaccountParams } from './SnodeRequestTypes'; +import { SubaccountRevokeSubRequest, SubaccountUnrevokeSubRequest } from './SnodeRequestTypes'; +import { GetNetworkTime } from './getNetworkTime'; export type RevokeChanges = Array<{ action: 'revoke_subaccount' | 'unrevoke_subaccount'; @@ -10,6 +11,7 @@ export type RevokeChanges = Array<{ async function getRevokeSubaccountParams( groupPk: GroupPubkeyType, + secretKey: Uint8Array, { revokeChanges, unrevokeChanges, @@ -19,23 +21,26 @@ async function getRevokeSubaccountParams( throw new Error('revokeSubaccountForGroup: not a 03 group'); } - const revokeParams: RevokeSubaccountParams | null = revokeChanges.length - ? { - pubkey: groupPk, - revoke: revokeChanges.map(m => m.tokenToRevokeHex), - } + const revokeSubRequest = revokeChanges + ? new SubaccountRevokeSubRequest({ + groupPk, + revokeTokenHex: revokeChanges.map(m => m.tokenToRevokeHex), + timestamp: GetNetworkTime.now(), + secretKey, + }) : null; - - const unrevokeParams: UnrevokeSubaccountParams | null = unrevokeChanges.length - ? { - pubkey: groupPk, - unrevoke: unrevokeChanges.map(m => m.tokenToRevokeHex), - } + const unrevokeSubRequest = unrevokeChanges.length + ? new SubaccountUnrevokeSubRequest({ + groupPk, + revokeTokenHex: unrevokeChanges.map(m => m.tokenToRevokeHex), + timestamp: GetNetworkTime.now(), + secretKey, + }) : null; return { - revokeParams, - unrevokeParams, + revokeSubRequest, + unrevokeSubRequest, }; } diff --git a/ts/session/apis/snode_api/signature/snodeSignatures.ts b/ts/session/apis/snode_api/signature/snodeSignatures.ts index 456420ed52..5ee4b6ed14 100644 --- a/ts/session/apis/snode_api/signature/snodeSignatures.ts +++ b/ts/session/apis/snode_api/signature/snodeSignatures.ts @@ -16,14 +16,15 @@ import { SignedHashesParams, WithMessagesHashes, WithShortenOrExtend, + WithSignature, WithTimestamp, } from '../types'; -export type SnodeSignatureResult = WithTimestamp & { - signature: string; - pubkey_ed25519: string; - pubkey: string; // this is the x25519 key of the pubkey we are doing the request to (ourself for our swarm usually) -}; +export type SnodeSignatureResult = WithSignature & + WithTimestamp & { + pubkey_ed25519: string; + pubkey: string; // this is the x25519 key of the pubkey we are doing the request to (ourself for our swarm usually) + }; async function getSnodeSignatureByHashesParams({ messagesHashes, @@ -166,7 +167,7 @@ async function generateUpdateExpirySignature({ WithTimestamp & { ed25519Privkey: Uint8Array; // len 64 ed25519Pubkey: string; - }): Promise<{ signature: string; pubkey: string }> { + }): Promise { // "expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N] const verificationString = `expire${shortenOrExtend}${timestamp}${messagesHashes.join('')}`; const verificationData = StringUtils.encode(verificationString, 'utf8'); @@ -217,7 +218,7 @@ async function generateGetExpiriesOurSignature({ }: { timestamp: number; messageHashes: Array; -}): Promise<{ signature: string; pubkey_ed25519: string } | null> { +}): Promise<(WithSignature & { pubkey_ed25519: string }) | null> { const ourEd25519Key = await UserUtils.getUserED25519KeyPair(); if (!ourEd25519Key) { const err = diff --git a/ts/session/apis/snode_api/storeMessage.ts b/ts/session/apis/snode_api/storeMessage.ts index 2415f2eae0..a597bdf799 100644 --- a/ts/session/apis/snode_api/storeMessage.ts +++ b/ts/session/apis/snode_api/storeMessage.ts @@ -3,35 +3,41 @@ import { BatchStoreWithExtraParams, NotEmptyArrayOfBatchResults, SnodeApiSubRequests, + StoreOnNodeSubRequest, + SubaccountRevokeSubRequest, + SubaccountUnrevokeSubRequest, isDeleteByHashesParams, - isRevokeRequest, - isUnrevokeRequest, } from './SnodeRequestTypes'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; -function buildStoreRequests(params: Array): Array { - return params.map(p => { - if (isDeleteByHashesParams(p)) { - return { - method: 'delete' as const, +async function buildStoreRequests( + params: Array +): Promise> { + const storeRequests = await Promise.all( + params.map(p => { + if (isDeleteByHashesParams(p)) { + return { + method: 'delete' as const, + params: p, + }; + } + + // those requests are already fully contained. + if (p instanceof SubaccountRevokeSubRequest || p instanceof SubaccountUnrevokeSubRequest) { + return p.buildAndSignParameters(); + } + + const storeRequest: StoreOnNodeSubRequest = { + method: 'store', params: p, }; - } - if (isRevokeRequest(p)) { - return p; - } - - if (isUnrevokeRequest(p)) { - return p; - } + return storeRequest; + }) + ); - return { - method: 'store', - params: p, - }; - }); + return storeRequests; } /** @@ -44,10 +50,10 @@ async function batchStoreOnNode( method: 'batch' | 'sequence' ): Promise { try { - const subRequests = buildStoreRequests(params); + const subRequests = await buildStoreRequests(params); const asssociatedWith = (params[0] as any)?.pubkey as string | undefined; if (!asssociatedWith) { - // not ideal, + // not ideal throw new Error('batchStoreOnNode first subrequest pubkey needs to be set'); } const result = await doSnodeBatchRequest( diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index cb15e304ae..2f1e77288a 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -1,12 +1,8 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { PubKey } from '../../types'; -import { - RevokeSubaccountParams, - RevokeSubaccountSubRequest, - UnrevokeSubaccountParams, - UnrevokeSubaccountSubRequest, -} from './SnodeRequestTypes'; + import { SnodeNamespaces } from './namespaces'; +import { SubaccountRevokeSubRequest, SubaccountUnrevokeSubRequest } from './SnodeRequestTypes'; export type RetrieveMessageItem = { hash: string; @@ -46,15 +42,14 @@ export type DeleteMessageByHashesUserSubRequest = WithMessagesHashes & { export type RetrieveMessagesResultsBatched = Array; export type WithTimestamp = { timestamp: number }; +export type WithSignature = { signature: string }; +export type WithSecretKey = { secretKey: Uint8Array }; export type ShortenOrExtend = 'extend' | 'shorten' | ''; export type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; -export type WithSignedRevokeRequests = { - signedRevokeRequests: Array | null; -}; -export type WithRevokeParams = { - revokeParams: RevokeSubaccountParams | null; - unrevokeParams: UnrevokeSubaccountParams | null; +export type WithRevokeSubRequest = { + revokeSubRequest: SubaccountRevokeSubRequest | null; + unrevokeSubRequest: SubaccountUnrevokeSubRequest | null; }; export type WithMessagesToDeleteSubRequest = { messagesToDelete: @@ -63,15 +58,13 @@ export type WithMessagesToDeleteSubRequest = { | null; }; -export type SignedHashesParams = { - signature: string; +export type SignedHashesParams = WithSignature & { pubkey: PubkeyType; pubkey_ed25519: PubkeyType; messages: Array; }; -export type SignedGroupHashesParams = { - signature: string; +export type SignedGroupHashesParams = WithSignature & { pubkey: GroupPubkeyType; messages: Array; }; @@ -83,7 +76,7 @@ export function isDeleteByHashesGroup( } /** inherits from https://api.oxen.io/storage-rpc/#/recursive?id=recursive but we only care about these values */ -export type ExpireMessageResultItem = { +export type ExpireMessageResultItem = WithSignature & { /** the expiry timestamp that was applied (which might be different from the request expiry */ expiry: number; /** ( PUBKEY_HEX || EXPIRY || RMSGs... || UMSGs... || CMSG_EXPs... ) @@ -92,7 +85,6 @@ export type ExpireMessageResultItem = { CMSG_EXPs are (HASH || EXPIRY) values, ascii-sorted by hash, for the unchanged message hashes included in the "unchanged" field. The signature uses the node's ed25519 pubkey. */ - signature: string; /** Record of , but did not get updated due to "shorten"/"extend" in the request. This field is only included when "shorten /extend" is explicitly given. */ unchanged?: Record; /** ascii-sorted list of hashes that had their expiries changed (messages that were not found, and messages excluded by the shorten/extend options, are not included) */ diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 6931ba8b25..24f619aef3 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -3,7 +3,6 @@ import { AbortController } from 'abort-controller'; import ByteBuffer from 'bytebuffer'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import { from_hex } from 'libsodium-wrappers-sumo'; import { compact, isEmpty, isNumber, isString, sample } from 'lodash'; import pRetry from 'p-retry'; import { Data } from '../../data/data'; @@ -17,13 +16,9 @@ import { } from '../apis/open_group_api/sogsv3/sogsV3SendMessage'; import { NotEmptyArrayOfBatchResults, - RevokeSubaccountParams, - RevokeSubaccountSubRequest, StoreOnNodeData, StoreOnNodeParams, StoreOnNodeParamsNoSig, - UnrevokeSubaccountParams, - UnrevokeSubaccountSubRequest, } from '../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; @@ -35,10 +30,10 @@ import { import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/signature/snodeSignatures'; import { getSwarmFor } from '../apis/snode_api/snodePool'; import { SnodeAPIStore } from '../apis/snode_api/storeMessage'; -import { WithMessagesHashes, WithRevokeParams } from '../apis/snode_api/types'; +import { WithMessagesHashes, WithRevokeSubRequest } from '../apis/snode_api/types'; import { TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; -import { MessageEncrypter, concatUInt8Array } from '../crypto'; +import { MessageEncrypter } from '../crypto'; import { addMessagePadding } from '../crypto/BufferPadding'; import { ContentMessage } from '../messages/outgoing'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; @@ -47,7 +42,7 @@ import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/Ope import { ed25519Str } from '../onions/onionPath'; import { PubKey } from '../types'; import { OutgoingRawMessage } from '../types/RawMessage'; -import { StringUtils, UserUtils } from '../utils'; +import { UserUtils } from '../utils'; import { fromUInt8ArrayToBase64 } from '../utils/String'; import { EmptySwarmError } from '../utils/errors'; @@ -145,7 +140,7 @@ async function send({ }, ], destination, - { messagesHashes: [], revokeParams: null, unrevokeParams: null }, + { messagesHashes: [], revokeSubRequest: null, unrevokeSubRequest: null }, 'batch' ); @@ -265,78 +260,14 @@ async function signDeleteHashesRequest( return signedRequest || null; } -async function signedRevokeRequest({ - destination, - revokeParams, - unrevokeParams, -}: WithRevokeParams & { destination: PubkeyType | GroupPubkeyType }) { - let revokeSignedRequest: RevokeSubaccountSubRequest | null = null; - let unrevokeSignedRequest: UnrevokeSubaccountSubRequest | null = null; - - if (!PubKey.is03Pubkey(destination) || (isEmpty(revokeParams) && isEmpty(unrevokeParams))) { - return { revokeSignedRequest, unrevokeSignedRequest }; - } - - const group = await UserGroupsWrapperActions.getGroup(destination); - const secretKey = group?.secretKey; - if (!secretKey || isEmpty(secretKey)) { - throw new Error('tried to signedRevokeRequest but we do not have the admin secret key'); - } - - const timestamp = GetNetworkTime.now(); - - if (revokeParams) { - const method = 'revoke_subaccount' as const; - const tokensBytes = from_hex(revokeParams.revoke.join('')); - - const prefix = new Uint8Array(StringUtils.encode(`${method}${timestamp}`, 'utf8')); - const sigResult = await SnodeGroupSignature.signDataWithAdminSecret( - concatUInt8Array(prefix, tokensBytes), - { secretKey } - ); - - revokeSignedRequest = { - method, - params: { - revoke: revokeParams.revoke, - ...sigResult, - pubkey: destination, - timestamp, - }, - }; - } - if (unrevokeParams) { - const method = 'unrevoke_subaccount' as const; - const tokensBytes = from_hex(unrevokeParams.unrevoke.join('')); - - const prefix = new Uint8Array(StringUtils.encode(`${method}${timestamp}`, 'utf8')); - const sigResult = await SnodeGroupSignature.signDataWithAdminSecret( - concatUInt8Array(prefix, tokensBytes), - { secretKey } - ); - - unrevokeSignedRequest = { - method, - params: { - unrevoke: unrevokeParams.unrevoke, - ...sigResult, - pubkey: destination, - timestamp, - }, - }; - } - - return { revokeSignedRequest, unrevokeSignedRequest }; -} - async function sendMessagesDataToSnode( params: Array, destination: PubkeyType | GroupPubkeyType, { messagesHashes: messagesToDelete, - revokeParams, - unrevokeParams, - }: WithMessagesHashes & WithRevokeParams, + revokeSubRequest, + unrevokeSubRequest, + }: WithMessagesHashes & WithRevokeSubRequest, method: 'batch' | 'sequence' ): Promise { const rightDestination = params.filter(m => m.pubkey === destination); @@ -366,11 +297,6 @@ async function sendMessagesDataToSnode( } const signedDeleteHashesRequest = await signDeleteHashesRequest(destination, messagesToDelete); - const signedRevokeRequests = await signedRevokeRequest({ - destination, - revokeParams, - unrevokeParams, - }); try { // No pRetry here as if this is a bad path it will be handled and retried in lokiOnionFetch. @@ -379,8 +305,8 @@ async function sendMessagesDataToSnode( compact([ ...withSigWhenRequired, signedDeleteHashesRequest, - signedRevokeRequests?.revokeSignedRequest, - signedRevokeRequests?.unrevokeSignedRequest, + revokeSubRequest, + unrevokeSubRequest, ]), method @@ -541,14 +467,12 @@ async function sendEncryptedDataToSnode({ destination, encryptedData, messagesHashesToDelete, - revokeParams, - unrevokeParams, -}: { + revokeSubRequest, + unrevokeSubRequest, +}: WithRevokeSubRequest & { encryptedData: Array; destination: GroupPubkeyType | PubkeyType; messagesHashesToDelete: Set | null; - revokeParams: RevokeSubaccountParams | null; - unrevokeParams: UnrevokeSubaccountParams | null; }): Promise { try { const batchResults = await pRetry( @@ -562,7 +486,11 @@ async function sendEncryptedDataToSnode({ namespace: content.namespace, })), destination, - { messagesHashes: [...(messagesHashesToDelete || [])], revokeParams, unrevokeParams }, + { + messagesHashes: [...(messagesHashesToDelete || [])], + revokeSubRequest, + unrevokeSubRequest, + }, 'sequence' ); }, diff --git a/ts/session/utils/job_runners/jobs/FetchMsgExpirySwarmJob.ts b/ts/session/utils/job_runners/jobs/FetchMsgExpirySwarmJob.ts index 94c7124264..e6fa7aece2 100644 --- a/ts/session/utils/job_runners/jobs/FetchMsgExpirySwarmJob.ts +++ b/ts/session/utils/job_runners/jobs/FetchMsgExpirySwarmJob.ts @@ -48,14 +48,14 @@ class FetchMsgExpirySwarmJob extends PersistedJob m.getMessageHash())); + const messagesHashes = compact(msgModels.map(m => m.getMessageHash())); - if (isEmpty(msgModels) || isEmpty(messageHashes)) { + if (isEmpty(msgModels) || isEmpty(messagesHashes)) { return RunJobResult.Success; } const fetchedExpiries = await getExpiriesFromSnode({ - messageHashes, + messagesHashes, }); const updatedMsgModels: Array = []; diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index 8dfc57ca42..c4025f395a 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -9,7 +9,7 @@ import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/l import { StoreOnNodeData } from '../../../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; -import { WithRevokeParams } from '../../../apis/snode_api/types'; +import { WithRevokeSubRequest } from '../../../apis/snode_api/types'; import { TTL_DEFAULT } from '../../../constants'; import { ConvoHub } from '../../../conversations'; import { GroupUpdateInfoChangeMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; @@ -71,13 +71,13 @@ async function confirmPushedAndDump( } async function pushChangesToGroupSwarmIfNeeded({ - revokeParams, - unrevokeParams, + revokeSubRequest, + unrevokeSubRequest, updateMessages, groupPk, supplementKeys, }: WithGroupPubkey & - WithRevokeParams & { + WithRevokeSubRequest & { supplementKeys: Array; updateMessages: Array; }): Promise { @@ -147,16 +147,16 @@ async function pushChangesToGroupSwarmIfNeeded({ encryptedData: [...encryptedMessage, ...extraMessagesEncrypted], destination: groupPk, messagesHashesToDelete: allOldHashes, - revokeParams, - unrevokeParams, + revokeSubRequest, + unrevokeSubRequest, }); const expectedReplyLength = messages.length + // each of those messages are sent as a subrequest extraMessagesEncrypted.length + // each of those messages are sent as a subrequest (allOldHashes.size ? 1 : 0) + // we are sending all hashes changes as a single request - (revokeParams?.revoke.length ? 1 : 0) + // we are sending all revoke updates as a single request - (unrevokeParams?.unrevoke.length ? 1 : 0); // we are sending all revoke updates as a single request + (revokeSubRequest?.revokeTokenHex.length ? 1 : 0) + // we are sending all revoke updates as a single request + (unrevokeSubRequest?.revokeTokenHex.length ? 1 : 0); // we are sending all revoke updates as a single request // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { @@ -225,8 +225,8 @@ class GroupSyncJob extends PersistedJob { // return await so we catch exceptions in here return await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk: thisJobDestination, - revokeParams: null, - unrevokeParams: null, + revokeSubRequest: null, + unrevokeSubRequest: null, supplementKeys: [], updateMessages: [], }); diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index 57bceefadf..8475300380 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -100,8 +100,8 @@ async function pushChangesToUserSwarmIfNeeded() { encryptedData: msgs, destination: us, messagesHashesToDelete: changesToPush.allOldHashes, - revokeParams: null, - unrevokeParams: null, + revokeSubRequest: null, + unrevokeSubRequest: null, }); const expectedReplyLength = diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 02bb6cf983..ecc853a0c7 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -22,6 +22,7 @@ import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; import { RevokeChanges, SnodeAPIRevoke } from '../../session/apis/snode_api/revokeSubaccount'; import { SnodeGroupSignature } from '../../session/apis/snode_api/signature/groupSignature'; +import { WithSecretKey } from '../../session/apis/snode_api/types'; import { ConvoHub } from '../../session/conversations'; import { getSodiumRenderer } from '../../session/crypto'; import { DisappearingMessages } from '../../session/disappearing_messages'; @@ -182,8 +183,8 @@ const initNewGroupInWrapper = createAsyncThunk( const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - revokeParams: null, - unrevokeParams: null, + revokeSubRequest: null, + unrevokeSubRequest: null, supplementKeys: [], updateMessages: [], }); @@ -559,7 +560,12 @@ async function getPendingRevokeParams({ withHistory, removed, groupPk, -}: WithGroupPubkey & WithAddWithoutHistoryMembers & WithAddWithHistoryMembers & WithRemoveMembers) { + secretKey, +}: WithGroupPubkey & + WithSecretKey & + WithAddWithoutHistoryMembers & + WithAddWithHistoryMembers & + WithRemoveMembers) { const revokeChanges: RevokeChanges = []; const unrevokeChanges: RevokeChanges = []; @@ -579,7 +585,10 @@ async function getPendingRevokeParams({ revokeChanges.push({ action: 'revoke_subaccount', tokenToRevokeHex: token }); } - return SnodeAPIRevoke.getRevokeSubaccountParams(groupPk, { revokeChanges, unrevokeChanges }); + return SnodeAPIRevoke.getRevokeSubaccountParams(groupPk, secretKey, { + revokeChanges, + unrevokeChanges, + }); } function getConvoExpireDetailsForMsg(convo: ConversationModel) { @@ -703,6 +712,7 @@ async function handleMemberAddedFromUIOrNot({ withHistory, withoutHistory, removed: [], + secretKey: group.secretKey, }); // then, handle the addition with history of messages by generating supplement keys. @@ -814,6 +824,7 @@ async function handleMemberRemovedFromUIOrNot({ withHistory: [], withoutHistory: [], removed, + secretKey: group.secretKey, }); // Send the groupUpdateDeleteMessage that can still be decrypted by those removed members to namespace ClosedGroupRevokedRetrievableMessages. (not when handling a MEMBER_LEFT message) @@ -949,8 +960,8 @@ async function handleNameChangeFromUI({ const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementKeys: [], - revokeParams: null, - unrevokeParams: null, + revokeSubRequest: null, + unrevokeSubRequest: null, updateMessages, }); diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts index 300d2123c2..6cda25cf33 100644 --- a/ts/test/session/unit/crypto/SnodeSignatures_test.ts +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -7,6 +7,7 @@ import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTim import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { SnodeGroupSignature } from '../../../../session/apis/snode_api/signature/groupSignature'; import { SnodeSignature } from '../../../../session/apis/snode_api/signature/snodeSignatures'; +import { WithSignature } from '../../../../session/apis/snode_api/types'; import { concatUInt8Array } from '../../../../session/crypto'; import { UserUtils } from '../../../../session/utils'; import { fromBase64ToArray, fromHexToArray } from '../../../../session/utils/String'; @@ -27,7 +28,7 @@ const userEd25519Keypair = { const hardcodedTimestamp = 1234; -async function verifySig(ret: { pubkey: string; signature: string }, verificationData: string) { +async function verifySig(ret: WithSignature & { pubkey: string }, verificationData: string) { const without03 = ret.pubkey.startsWith('03') || ret.pubkey.startsWith('05') ? ret.pubkey.slice(2) : ret.pubkey; // const pk = HexString.fromHexString(without03); diff --git a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts index b0c4c01cd8..b4121972c5 100644 --- a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts +++ b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts @@ -7,13 +7,12 @@ import { fakeHash, } from '../../../../session/apis/snode_api/SnodeRequestTypes'; import { - GetExpiriesFromSnodeProps, GetExpiriesRequestResponseResults, - buildGetExpiriesRequest, processGetExpiriesRequestResponse, } from '../../../../session/apis/snode_api/getExpiriesRequest'; import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { SnodeSignature } from '../../../../session/apis/snode_api/signature/snodeSignatures'; +import { WithMessagesHashes } from '../../../../session/apis/snode_api/types'; import { UserUtils } from '../../../../session/utils'; import { isValidUnixTimestamp } from '../../../../session/utils/Timestamps'; import { TypedStub, generateFakeSnode, stubWindowLog } from '../../../test-utils/utils'; @@ -47,12 +46,13 @@ describe('GetExpiriesRequest', () => { }); describe('buildGetExpiriesRequest', () => { - const props: GetExpiriesFromSnodeProps = { - messageHashes: ['messageHash'], + const props: WithMessagesHashes = { + messagesHashes: ['messageHash'], }; it('builds a valid request given the messageHashes and valid timestamp for now', async () => { - const request: GetExpiriesFromNodeSubRequest | null = await buildGetExpiriesRequest(props); + const unsigned = new GetExpiriesFromNodeSubRequest(props); + const request = await unsigned.buildAndSignParameters(); expect(request, 'should not return null').to.not.be.null; expect(request, 'should not return undefined').to.not.be.undefined; @@ -63,7 +63,7 @@ describe('GetExpiriesRequest', () => { expect(request, "method should be 'get_expiries'").to.have.property('method', 'get_expiries'); expect(request.params.pubkey, 'should have a matching pubkey').to.equal(ourNumber); expect(request.params.messages, 'messageHashes should match our input').to.deep.equal( - props.messageHashes + props.messagesHashes ); expect( request.params.timestamp && isValidUnixTimestamp(request?.params.timestamp), @@ -74,16 +74,17 @@ describe('GetExpiriesRequest', () => { it('fails to build a request if our pubkey is missing', async () => { // Modify the stub behavior for this test only we need to return an unsupported type to simulate a missing pubkey (getOurPubKeyStrFromCacheStub as any).returns(undefined); - - const request: GetExpiriesFromNodeSubRequest | null = await buildGetExpiriesRequest(props); + const unsigned = new GetExpiriesFromNodeSubRequest(props); + const request = await unsigned.buildAndSignParameters(); expect(request, 'should return null').to.be.null; }); it('fails to build a request if our signature is missing', async () => { // Modify the stub behavior for this test only we need to return an unsupported type to simulate a missing pubkey Sinon.stub(SnodeSignature, 'generateGetExpiriesOurSignature').resolves(null); - // TODO audric this should throw - const request: GetExpiriesFromNodeSubRequest | null = await buildGetExpiriesRequest(props); + // TODO audric this should throw debugger + const unsigned = new GetExpiriesFromNodeSubRequest(props); + const request = await unsigned.buildAndSignParameters(); expect(request, 'should return null').to.be.null; }); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index c4dce5ae8d..9721adb516 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -273,8 +273,8 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { it('call savesDumpToDb even if no changes are required on the serverside', async () => { const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - revokeParams: null, - unrevokeParams: null, + revokeSubRequest: null, + unrevokeSubRequest: null, supplementKeys: [], updateMessages: [], }); @@ -298,8 +298,8 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - revokeParams: null, - unrevokeParams: null, + revokeSubRequest: null, + unrevokeSubRequest: null, supplementKeys: [], updateMessages: [], }); @@ -363,8 +363,8 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { ]); const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - revokeParams: null, - unrevokeParams: null, + revokeSubRequest: null, + unrevokeSubRequest: null, supplementKeys: [], updateMessages: [], }); From 5509dc74c5b988ffd257df85257ba02d12632fbc Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 31 Jan 2024 14:57:40 +1100 Subject: [PATCH 082/302] refactor: move subrequests to classes and fix updateMessages --- ts/data/data.ts | 16 +- ts/receiver/configMessage.ts | 6 +- ts/receiver/dataMessage.ts | 2 +- ts/receiver/groupv2/handleGroupV2Message.ts | 61 +- .../open_group_api/sogsv3/sogsV3BatchPoll.ts | 7 +- ts/session/apis/snode_api/SNodeAPI.ts | 22 +- .../apis/snode_api/SnodeRequestTypes.ts | 941 ++++++++++++++---- ts/session/apis/snode_api/batchRequest.ts | 31 +- ts/session/apis/snode_api/expireRequest.ts | 73 +- .../apis/snode_api/getExpiriesRequest.ts | 30 +- ts/session/apis/snode_api/getNetworkTime.ts | 4 +- .../apis/snode_api/getServiceNodesList.ts | 4 +- ts/session/apis/snode_api/getSwarmFor.ts | 4 +- ts/session/apis/snode_api/namespaces.ts | 12 +- ts/session/apis/snode_api/onsResolve.ts | 4 +- ts/session/apis/snode_api/retrieveRequest.ts | 153 ++- ts/session/apis/snode_api/revokeSubaccount.ts | 47 +- .../snode_api/signature/groupSignature.ts | 83 +- .../snode_api/signature/signatureShared.ts | 8 +- ts/session/apis/snode_api/snodePool.ts | 22 +- ts/session/apis/snode_api/storeMessage.ts | 91 -- ts/session/apis/snode_api/swarmPolling.ts | 19 +- ts/session/apis/snode_api/types.ts | 23 - ts/session/sending/MessageQueue.ts | 97 +- ts/session/sending/MessageSender.ts | 445 ++++++--- ts/session/sending/MessageSentHandler.ts | 52 +- ts/session/utils/calling/CallManager.ts | 6 +- .../utils/job_runners/jobs/GroupSyncJob.ts | 182 +++- .../utils/job_runners/jobs/UserSyncJob.ts | 20 +- .../utils/libsession/libsession_utils.ts | 6 +- ts/state/ducks/metaGroups.ts | 302 +++--- .../unit/crypto/SnodeSignatures_test.ts | 28 +- .../ExpireRequest_test.ts | 46 +- .../session/unit/sending/MessageQueue_test.ts | 6 +- .../unit/sending/MessageSender_test.ts | 14 +- .../group_sync_job/GroupSyncJob_test.ts | 3 - .../user_sync_job/UserSyncJob_test.ts | 4 +- ts/types/sqlSharedTypes.ts | 2 + 38 files changed, 1742 insertions(+), 1134 deletions(-) delete mode 100644 ts/session/apis/snode_api/storeMessage.ts diff --git a/ts/data/data.ts b/ts/data/data.ts index e5190e9970..fe58666d7d 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -42,12 +42,12 @@ export type GuardNode = { ed25519PubKey: string; }; -export interface Snode { +export type Snode = { ip: string; port: number; pubkey_x25519: string; pubkey_ed25519: string; -} +}; export type SwarmNode = Snode & { address: string; @@ -227,12 +227,12 @@ async function cleanLastHashes(): Promise { await channels.cleanLastHashes(); } -async function saveSeenMessageHashes( - data: Array<{ - expiresAt: number; - hash: string; - }> -): Promise { +export type SeenMessageHashes = { + expiresAt: number; + hash: string; +}; + +async function saveSeenMessageHashes(data: Array): Promise { await channels.saveSeenMessageHashes(cleanData(data)); } diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 6c69bb8779..b1414407ad 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -31,7 +31,7 @@ import { HexString } from '../node/hexStrings'; import { SnodeNamespace, SnodeNamespaces, - UserConfigNamespaces, + SnodeNamespacesUserConfig, } from '../session/apis/snode_api/namespaces'; import { RetrieveMessageItemWithNamespace } from '../session/apis/snode_api/types'; import { ClosedGroup, GroupInfo } from '../session/group/closed-group'; @@ -64,12 +64,12 @@ type IncomingUserResult = { needsDump: boolean; publicKey: string; latestEnvelopeTimestamp: number; - namespace: UserConfigNamespaces; + namespace: SnodeNamespacesUserConfig; }; function byUserNamespace(incomingConfigs: Array) { const groupedByVariant: Map< - UserConfigNamespaces, + SnodeNamespacesUserConfig, Array > = new Map(); diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index 51c4cf2499..b9174da23b 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -169,7 +169,7 @@ export async function handleSwarmDataMessage({ if (cleanDataMessage.groupUpdateMessage) { await GroupV2Receiver.handleGroupUpdateMessage({ - envelopeTimestamp: sentAtTimestamp, + signatureTimestamp: sentAtTimestamp, updateMessage: rawDataMessage.groupUpdateMessage as SignalService.GroupUpdateMessage, source: envelope.source, senderIdentity: envelope.senderIdentity, diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 7a6db1f06d..43bfc4957a 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -27,7 +27,7 @@ import { UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; -type WithEnvelopeTimestamp = { envelopeTimestamp: number }; +type WithSignatureTimestamp = { signatureTimestamp: number }; type WithAuthor = { author: PubkeyType }; type WithUncheckedSource = { source: string }; @@ -35,16 +35,16 @@ type WithUncheckedSenderIdentity = { senderIdentity: string }; type GroupInviteDetails = { inviteMessage: SignalService.GroupUpdateInviteMessage; -} & WithEnvelopeTimestamp & +} & WithSignatureTimestamp & WithAuthor; -type GroupUpdateGeneric = { change: Omit } & WithEnvelopeTimestamp & +type GroupUpdateGeneric = { change: Omit } & WithSignatureTimestamp & WithGroupPubkey & WithAuthor; type GroupUpdateDetails = { updateMessage: SignalService.GroupUpdateMessage; -} & WithEnvelopeTimestamp; +} & WithSignatureTimestamp; /** * Send the invite response to the group's swarm. An admin will handle it and update our invite pending state to not pending. @@ -68,7 +68,7 @@ async function sendInviteResponseToGroup({ groupPk }: { groupPk: GroupPubkeyType async function handleGroupInviteMessage({ inviteMessage, author, - envelopeTimestamp, + signatureTimestamp, }: GroupInviteDetails) { const groupPk = inviteMessage.groupSessionId; if (!PubKey.is03Pubkey(groupPk)) { @@ -89,7 +89,7 @@ async function handleGroupInviteMessage({ const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: inviteMessage.adminSignature, - data: stringToUint8Array(`INVITE${UserUtils.getOurPubKeyStrFromCache()}${envelopeTimestamp}`), + data: stringToUint8Array(`INVITE${UserUtils.getOurPubKeyStrFromCache()}${signatureTimestamp}`), }); if (!sigValid) { @@ -101,7 +101,7 @@ async function handleGroupInviteMessage({ const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); convo.set({ - active_at: envelopeTimestamp, + active_at: signatureTimestamp, didApproveMe: true, conversationIdOrigin: author, }); @@ -180,13 +180,13 @@ async function verifySig({ async function handleGroupInfoChangeMessage({ change, groupPk, - envelopeTimestamp, + signatureTimestamp, author, }: GroupUpdateGeneric) { const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, - data: stringToUint8Array(`INFO_CHANGE${change.type}${envelopeTimestamp}`), + data: stringToUint8Array(`INFO_CHANGE${change.type}${signatureTimestamp}`), }); if (!sigValid) { window.log.warn('received group info change with invalid signature. dropping'); @@ -203,7 +203,7 @@ async function handleGroupInfoChangeMessage({ convo, diff: { type: 'name', newName: change.updatedName }, sender: author, - sentAt: envelopeTimestamp, + sentAt: signatureTimestamp, expireUpdate: null, }); @@ -214,7 +214,7 @@ async function handleGroupInfoChangeMessage({ convo, diff: { type: 'avatarChange' }, sender: author, - sentAt: envelopeTimestamp, + sentAt: signatureTimestamp, expireUpdate: null, }); break; @@ -230,13 +230,13 @@ async function handleGroupInfoChangeMessage({ convo, diff: { type: 'name', newName: change.updatedName }, sender: author, - sentAt: envelopeTimestamp, + sentAt: signatureTimestamp, expireUpdate: null, }); await convo.updateExpireTimer({ providedExpireTimer: change.updatedExpiration, providedSource: author, - receivedAt: envelopeTimestamp, + receivedAt: signatureTimestamp, fromCurrentDevice: false, fromSync: false, fromConfigMessage: false, @@ -249,14 +249,14 @@ async function handleGroupInfoChangeMessage({ } convo.set({ - active_at: envelopeTimestamp, + active_at: signatureTimestamp, }); } async function handleGroupMemberChangeMessage({ change, groupPk, - envelopeTimestamp, + signatureTimestamp, author, }: GroupUpdateGeneric) { const convo = ConvoHub.use().get(groupPk); @@ -267,7 +267,7 @@ async function handleGroupMemberChangeMessage({ const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, - data: stringToUint8Array(`MEMBER_CHANGE${change.type}${envelopeTimestamp}`), + data: stringToUint8Array(`MEMBER_CHANGE${change.type}${signatureTimestamp}`), }); if (!sigValid) { window.log.warn('received group member change with invalid signature. dropping'); @@ -280,7 +280,12 @@ async function handleGroupMemberChangeMessage({ return; } - const sharedDetails = { convo, sender: author, sentAt: envelopeTimestamp, expireUpdate: null }; + const sharedDetails = { + convo, + sender: author, + sentAt: signatureTimestamp, + expireUpdate: null, + }; switch (change.type) { case SignalService.GroupUpdateMemberChangeMessage.Type.ADDED: { @@ -310,13 +315,13 @@ async function handleGroupMemberChangeMessage({ } convo.set({ - active_at: envelopeTimestamp, + active_at: signatureTimestamp, }); } async function handleGroupMemberLeftMessage({ groupPk, - envelopeTimestamp, + signatureTimestamp, author, }: GroupUpdateGeneric) { // No need to verify sig, the author is already verified with the libsession.decrypt() @@ -337,19 +342,19 @@ async function handleGroupMemberLeftMessage({ convo, diff: { type: 'left', left: [author] }, sender: author, - sentAt: envelopeTimestamp, + sentAt: signatureTimestamp, expireUpdate: null, }); convo.set({ - active_at: envelopeTimestamp, + active_at: signatureTimestamp, }); // debugger TODO We should process this message type even if the sender is blocked } async function handleGroupDeleteMemberContentMessage({ groupPk, - envelopeTimestamp, + signatureTimestamp, change, }: GroupUpdateGeneric) { const convo = ConvoHub.use().get(groupPk); @@ -361,7 +366,7 @@ async function handleGroupDeleteMemberContentMessage({ pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, data: stringToUint8Array( - `DELETE_CONTENT${envelopeTimestamp}${change.memberSessionIds.join()}${change.messageHashes.join()}` + `DELETE_CONTENT${signatureTimestamp}${change.memberSessionIds.join()}${change.messageHashes.join()}` ), }); @@ -372,14 +377,14 @@ async function handleGroupDeleteMemberContentMessage({ // TODO we should process this message type even if the sender is blocked convo.set({ - active_at: envelopeTimestamp, + active_at: signatureTimestamp, }); throw new Error('Not implemented'); } async function handleGroupUpdateDeleteMessage({ groupPk, - envelopeTimestamp, + signatureTimestamp, change, }: GroupUpdateGeneric) { // TODO verify sig? @@ -390,7 +395,7 @@ async function handleGroupUpdateDeleteMessage({ const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, - data: stringToUint8Array(`DELETE${envelopeTimestamp}${change.memberSessionIds.join()}`), + data: stringToUint8Array(`DELETE${signatureTimestamp}${change.memberSessionIds.join()}`), }); if (!sigValid) { @@ -398,7 +403,7 @@ async function handleGroupUpdateDeleteMessage({ return; } convo.set({ - active_at: envelopeTimestamp, + active_at: signatureTimestamp, }); throw new Error('Not implemented'); // TODO We should process this message type even if the sender is blocked @@ -408,7 +413,7 @@ async function handleGroupUpdateInviteResponseMessage({ groupPk, change, author, -}: Omit, 'envelopeTimestamp'>) { +}: Omit, 'signatureTimestamp'>) { // no sig verify for this type of message const convo = ConvoHub.use().get(groupPk); if (!convo) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts index 90cdf60675..047d20c112 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts @@ -5,6 +5,7 @@ import { OpenGroupData } from '../../../../data/opengroups'; import { assertUnreachable, roomHasBlindEnabled } from '../../../../types/sqlSharedTypes'; import { Reactions } from '../../../../util/reactions'; import { OnionSending, OnionV4JSONSnodeResponse } from '../../../onions/onionSend'; +import { MethodBatchType } from '../../snode_api/SnodeRequestTypes'; import { OpenGroupPollingUtils, OpenGroupRequestHeaders, @@ -55,7 +56,7 @@ export const sogsBatchSend = async ( roomInfos: Set, abortSignal: AbortSignal, batchRequestOptions: Array, - batchType: 'batch' | 'sequence' + batchType: MethodBatchType ): Promise => { // getting server pk for room const [roomId] = roomInfos; @@ -356,9 +357,9 @@ const getBatchRequest = async ( serverPublicKey: string, batchOptions: Array, requireBlinding: boolean, - batchType: 'batch' | 'sequence' + batchType: MethodBatchType ): Promise => { - const batchEndpoint = batchType === 'sequence' ? '/sequence' : '/batch'; + const batchEndpoint = `/${batchType}` as const; const batchMethod = 'POST'; if (!batchOptions || isEmpty(batchOptions)) { return undefined; diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 4f1acd3938..1a90d74b6c 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -1,19 +1,19 @@ /* eslint-disable no-prototype-builtins */ /* eslint-disable no-restricted-syntax */ -import { compact, sample } from 'lodash'; +import { compact } from 'lodash'; import pRetry from 'p-retry'; -import { Snode } from '../../../data/data'; import { getSodiumRenderer } from '../../crypto'; import { ed25519Str } from '../../onions/onionPath'; import { StringUtils, UserUtils } from '../../utils'; import { fromBase64ToArray, fromHexToArray } from '../../utils/String'; import { doSnodeBatchRequest } from './batchRequest'; import { SnodeSignature } from './signature/snodeSignatures'; -import { getSwarmFor } from './snodePool'; +import { getNodeFromSwarmOrThrow } from './snodePool'; export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.'; // TODOLATER we should merge those two functions together as they are almost exactly the same +// TODO make this function use doUnsignedBatchRequest but we need to merge the verify logic into it const forceNetworkDeletion = async (): Promise | null> => { const sodium = await getSodiumRenderer(); const usPk = UserUtils.getOurPubKeyStrFromCache(); @@ -30,13 +30,7 @@ const forceNetworkDeletion = async (): Promise | null> => { try { const maliciousSnodes = await pRetry( async () => { - const userSwarm = await getSwarmFor(usPk); - const snodeToMakeRequestTo: Snode | undefined = sample(userSwarm); - - if (!snodeToMakeRequestTo) { - window?.log?.warn('Cannot forceNetworkDeletion, without a valid swarm node.'); - return null; - } + const snodeToMakeRequestTo = await getNodeFromSwarmOrThrow(usPk); return pRetry( async () => { @@ -196,13 +190,7 @@ const networkDeleteMessages = async (hashes: Array): Promise { - const userSwarm = await getSwarmFor(userX25519PublicKey); - const snodeToMakeRequestTo: Snode | undefined = sample(userSwarm); - - if (!snodeToMakeRequestTo) { - window?.log?.warn('Cannot networkDeleteMessages, without a valid swarm node.'); - return null; - } + const snodeToMakeRequestTo = await getNodeFromSwarmOrThrow(userX25519PublicKey); return pRetry( async () => { diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 36199c3238..bdab7b2fcc 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1,97 +1,182 @@ +import ByteBuffer from 'bytebuffer'; import { GroupPubkeyType, PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; import { from_hex } from 'libsodium-wrappers-sumo'; import { isEmpty } from 'lodash'; +import { AwaitedReturn, assertUnreachable } from '../../../types/sqlSharedTypes'; +import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { concatUInt8Array } from '../../crypto'; +import { ed25519Str } from '../../onions/onionPath'; +import { PubKey } from '../../types'; import { StringUtils, UserUtils } from '../../utils'; import { GetNetworkTime } from './getNetworkTime'; import { + SnodeNamespace, SnodeNamespaces, SnodeNamespacesGroup, SnodeNamespacesGroupConfig, - UserConfigNamespaces, + SnodeNamespacesUser, + SnodeNamespacesUserConfig, } from './namespaces'; -import { SnodeGroupSignature } from './signature/groupSignature'; +import { GroupDetailsNeededForSignature, SnodeGroupSignature } from './signature/groupSignature'; import { SnodeSignature } from './signature/snodeSignatures'; import { - SignedGroupHashesParams, - SignedHashesParams, + ShortenOrExtend, WithMessagesHashes, WithSecretKey, WithSignature, WithTimestamp, } from './types'; -type WithRetrieveMethod = { method: 'retrieve' }; -type WithMaxCountSize = { max_count?: number; max_size?: number }; -type WithPubkeyAsString = { pubkey: string }; -type WithPubkeyAsGroupPubkey = { pubkey: GroupPubkeyType }; +type WithMaxSize = { max_size?: number }; export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; -type RetrieveAlwaysNeeded = { - namespace: number; - last_hash: string; - timestamp?: number; -}; +abstract class SnodeAPISubRequest { + public abstract method: string; + public abstract loggingId(): string; +} -export type RetrievePubkeySubRequestType = WithRetrieveMethod & { - params: { - pubkey_ed25519: string; - namespace: number; - } & RetrieveAlwaysNeeded & - WithMaxCountSize & - WithPubkeyAsString & - WithSignature; -}; +/** + * Retrieve for legacy was not authenticated + */ +export class RetrieveLegacyClosedGroupSubRequest extends SnodeAPISubRequest { + public method = 'retrieve' as const; + public readonly legacyGroupPk: PubkeyType; + public readonly last_hash: string; + public readonly max_size: number | undefined; + public readonly namespace = SnodeNamespaces.LegacyClosedGroup; -/** Those namespaces do not require to be authenticated for storing messages. - * -> 0 is used for our swarm, and anyone needs to be able to send message to us. - * -> -10 is used for legacy closed group and we do not have authentication for them yet (but we will with the new closed groups) - * -> others are currently unused - * + constructor({ + last_hash, + legacyGroupPk, + max_size, + }: WithMaxSize & { last_hash: string; legacyGroupPk: PubkeyType }) { + super(); + this.legacyGroupPk = legacyGroupPk; + this.last_hash = last_hash; + this.max_size = max_size; + } + + public build() { + return { + method: this.method, + params: { + namespace: this.namespace, // legacy closed groups retrieve are not authenticated because the clients do not have a shared key + pubkey: this.legacyGroupPk, + last_hash: this.last_hash, + max_size: this.max_size, + // if we give a timestamp, a signature will be requested by the snode so this request for legacy does not take a timestamp + }, + }; + } + + public loggingId(): string { + return `${this.method}-${SnodeNamespace.toRole(this.namespace)}`; + } +} + +export class RetrieveUserSubRequest extends SnodeAPISubRequest { + public method = 'retrieve' as const; + public readonly last_hash: string; + public readonly max_size: number | undefined; + public readonly namespace: SnodeNamespacesUser | SnodeNamespacesUserConfig; + + constructor({ + last_hash, + max_size, + namespace, + }: WithMaxSize & { + last_hash: string; + namespace: SnodeNamespacesUser | SnodeNamespacesUserConfig; + }) { + super(); + this.last_hash = last_hash; + this.max_size = max_size; + this.namespace = namespace; + } + + public async buildAndSignParameters() { + const { pubkey, pubkey_ed25519, signature, timestamp } = + await SnodeSignature.getSnodeSignatureParamsUs({ + method: this.method, + namespace: this.namespace, + }); + + return { + method: this.method, + params: { + namespace: this.namespace, + pubkey, + pubkey_ed25519, + signature, + timestamp, // we give a timestamp to force verification of the signature provided + last_hash: this.last_hash, + max_size: this.max_size, + }, + }; + } + + public loggingId(): string { + return `${this.method}-${SnodeNamespace.toRole(this.namespace)}`; + } +} + +/** + * Build and sign a request with either the admin key if we have it, or with our subaccount details */ -// type UnauthenticatedStoreNamespaces = -30 | -20 | -10 | 0 | 10 | 20 | 30; - -export type RetrieveLegacyClosedGroupSubRequestType = WithRetrieveMethod & { - params: { - namespace: SnodeNamespaces.LegacyClosedGroup; // legacy closed groups retrieve are not authenticated because the clients do not have a shared key - } & RetrieveAlwaysNeeded & - WithMaxCountSize & - WithPubkeyAsString; -}; +export class RetrieveGroupSubRequest extends SnodeAPISubRequest { + public method = 'retrieve' as const; + public readonly last_hash: string; + public readonly max_size: number | undefined; + public readonly namespace: SnodeNamespacesGroup; + public readonly groupDetailsNeededForSignature: GroupDetailsNeededForSignature | null; -export type RetrieveGroupAdminSubRequestType = WithRetrieveMethod & { - params: { + constructor({ + last_hash, + max_size, + namespace, + groupDetailsNeededForSignature, + }: WithMaxSize & { + last_hash: string; namespace: SnodeNamespacesGroup; - } & RetrieveAlwaysNeeded & - WithMaxCountSize & - WithSignature; -}; + groupDetailsNeededForSignature: GroupDetailsNeededForSignature | null; + }) { + super(); + this.last_hash = last_hash; + this.max_size = max_size; + this.namespace = namespace; + this.groupDetailsNeededForSignature = groupDetailsNeededForSignature; + } -export type RetrieveGroupSubAccountSubRequestType = WithRetrieveMethod & { - params: { - namespace: SnodeNamespacesGroup; - subaccount: string; - subaccount_sig: string; - } & RetrieveAlwaysNeeded & - WithMaxCountSize & - WithPubkeyAsGroupPubkey & - WithSignature; -}; + public async buildAndSignParameters() { + /** + * This will return the signature details we can use with the admin secretKey if we have it, + * or with the subaccount details if we don't. + * If there is no valid groupDetails, this throws + */ + const sigResult = await SnodeGroupSignature.getSnodeGroupSignature({ + method: this.method, + namespace: this.namespace, + group: this.groupDetailsNeededForSignature, + }); -export type RetrieveSubRequestType = - | RetrieveLegacyClosedGroupSubRequestType - | RetrievePubkeySubRequestType - | RetrieveGroupAdminSubRequestType - | UpdateExpiryOnNodeUserSubRequest - | UpdateExpiryOnNodeGroupSubRequest - | RetrieveGroupSubAccountSubRequestType; + return { + method: this.method, + params: { + namespace: this.namespace, + ...sigResult, + last_hash: this.last_hash, + max_size: this.max_size, + }, + }; + } -abstract class SnodeAPISubRequest { - public abstract method: string; + public loggingId(): string { + return `${this.method}-${SnodeNamespace.toRole(this.namespace)}`; + } } export class OnsResolveSubRequest extends SnodeAPISubRequest { - public method: string = 'oxend_request'; + public method = 'oxend_request' as const; public readonly base64EncodedNameHash: string; constructor(base64EncodedNameHash: string) { @@ -111,6 +196,10 @@ export class OnsResolveSubRequest extends SnodeAPISubRequest { }, }; } + + public loggingId(): string { + return `${this.method}`; + } } export class GetServiceNodesSubRequest extends SnodeAPISubRequest { @@ -133,6 +222,10 @@ export class GetServiceNodesSubRequest extends SnodeAPISubRequest { }, }; } + + public loggingId(): string { + return `${this.method}`; + } } export class SwarmForSubRequest extends SnodeAPISubRequest { @@ -161,6 +254,10 @@ export class SwarmForSubRequest extends SnodeAPISubRequest { }, } as const; } + + public loggingId(): string { + return `${this.method}`; + } } export class NetworkTimeSubRequest extends SnodeAPISubRequest { @@ -172,14 +269,18 @@ export class NetworkTimeSubRequest extends SnodeAPISubRequest { params: {}, } as const; } + + public loggingId(): string { + return `${this.method}`; + } } -abstract class SubaccountRightsSubRequest extends SnodeAPISubRequest { +abstract class AbstractRevokeSubRequest extends SnodeAPISubRequest { public readonly groupPk: GroupPubkeyType; public readonly timestamp: number; public readonly revokeTokenHex: Array; - protected readonly secretKey: Uint8Array; + protected readonly adminSecretKey: Uint8Array; constructor({ groupPk, @@ -191,11 +292,14 @@ abstract class SubaccountRightsSubRequest extends SnodeAPISubRequest { this.groupPk = groupPk; this.timestamp = timestamp; this.revokeTokenHex = revokeTokenHex; - this.secretKey = secretKey; + this.adminSecretKey = secretKey; + if (this.revokeTokenHex.length === 0) { + throw new Error('AbstractRevokeSubRequest needs at least one token to do a change'); + } } - public async sign() { - if (!this.secretKey) { + public async signWithAdminSecretKey() { + if (!this.adminSecretKey) { throw new Error('we need an admin secretkey'); } const tokensBytes = from_hex(this.revokeTokenHex.join('')); @@ -203,18 +307,22 @@ abstract class SubaccountRightsSubRequest extends SnodeAPISubRequest { const prefix = new Uint8Array(StringUtils.encode(`${this.method}${this.timestamp}`, 'utf8')); const sigResult = await SnodeGroupSignature.signDataWithAdminSecret( concatUInt8Array(prefix, tokensBytes), - { secretKey: this.secretKey } + { secretKey: this.adminSecretKey } ); return sigResult.signature; } + + public loggingId(): string { + return `${this.method}-${ed25519Str(this.groupPk)}`; + } } -export class SubaccountRevokeSubRequest extends SubaccountRightsSubRequest { +export class SubaccountRevokeSubRequest extends AbstractRevokeSubRequest { public method = 'revoke_subaccount' as const; public async buildAndSignParameters() { - const signature = await this.sign(); + const signature = await this.signWithAdminSecretKey(); return { method: this.method, params: { @@ -227,14 +335,14 @@ export class SubaccountRevokeSubRequest extends SubaccountRightsSubRequest { } } -export class SubaccountUnrevokeSubRequest extends SubaccountRightsSubRequest { +export class SubaccountUnrevokeSubRequest extends AbstractRevokeSubRequest { public method = 'unrevoke_subaccount' as const; /** * For Revoke/unrevoke, this needs an admin signature */ public async buildAndSignParameters() { - const signature = await this.sign(); + const signature = await this.signWithAdminSecretKey(); return { method: this.method, @@ -254,16 +362,10 @@ export class SubaccountUnrevokeSubRequest extends SubaccountRightsSubRequest { */ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { public method = 'get_expiries' as const; - pubkey: string; - messageHashes: Array; + public readonly messageHashes: Array; constructor(args: WithMessagesHashes) { super(); - const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); - if (!ourPubKey) { - throw new Error('[GetExpiriesFromNodeSubRequest] No pubkey found'); - } - this.pubkey = ourPubKey; this.messageHashes = args.messagesHashes; } /** @@ -272,6 +374,10 @@ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { public async buildAndSignParameters() { const timestamp = GetNetworkTime.now(); + const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); + if (!ourPubKey) { + throw new Error('[GetExpiriesFromNodeSubRequest] No pubkey found'); + } const signResult = await SnodeSignature.generateGetExpiriesOurSignature({ timestamp, messageHashes: this.messageHashes, @@ -286,7 +392,7 @@ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { return { method: this.method, params: { - pubkey: this.pubkey, + pubkey: ourPubKey, pubkey_ed25519: signResult.pubkey_ed25519.toUpperCase(), signature: signResult.signature, messages: this.messageHashes, @@ -294,8 +400,498 @@ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { }, }; } + + public loggingId(): string { + return `${this.method}-us`; + } +} + +// todo: to use where delete_all is currently manually called +export class DeleteAllFromUserNodeSubRequest extends SnodeAPISubRequest { + public method = 'delete_all' as const; + public readonly namespace = 'all'; // we can only delete_all for all namespaces currently, but the backend allows more + + public async buildAndSignParameters() { + const signResult = await SnodeSignature.getSnodeSignatureParamsUs({ + method: this.method, + namespace: this.namespace, + }); + + if (!signResult) { + throw new Error( + `[DeleteAllFromUserNodeSubRequest] SnodeSignature.getSnodeSignatureParamsUs returned an empty result` + ); + } + + return { + method: this.method, + params: { + pubkey: signResult.pubkey, + pubkey_ed25519: signResult.pubkey_ed25519.toUpperCase(), + signature: signResult.signature, + timestamp: signResult.timestamp, + namespace: this.namespace, + }, + }; + } + + public loggingId(): string { + return `${this.method}-${this.namespace}`; + } +} + +// We don't need that one yet +// export class DeleteAllFromGroupNodeSubRequest extends DeleteAllFromUserNodeSubRequest {} + +export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { + public method = 'delete' as const; + public readonly messageHashes: Array; + + constructor(args: WithMessagesHashes) { + super(); + this.messageHashes = args.messagesHashes; + } + + public async buildAndSignParameters() { + const signResult = await SnodeSignature.getSnodeSignatureByHashesParams({ + method: this.method, + messagesHashes: this.messageHashes, + pubkey: UserUtils.getOurPubKeyStrFromCache(), + }); + + if (!signResult) { + throw new Error( + `[DeleteHashesFromUserNodeSubRequest] SnodeSignature.getSnodeSignatureParamsUs returned an empty result` + ); + } + + return { + method: this.method, + params: { + pubkey: signResult.pubkey, + pubkey_ed25519: signResult.pubkey_ed25519, + signature: signResult.signature, + messages: signResult.messages, + // timestamp is not needed for this one as the hashes can be deleted only once + }, + }; + } + + public loggingId(): string { + return `${this.method}-us`; + } +} + +export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { + public method = 'delete' as const; + public readonly messageHashes: Array; + public readonly groupPk: GroupPubkeyType; + + constructor(args: WithMessagesHashes & WithGroupPubkey) { + super(); + this.messageHashes = args.messagesHashes; + this.groupPk = args.groupPk; + } + + public async buildAndSignParameters() { + const signResult = await SnodeGroupSignature.getGroupSignatureByHashesParams({ + method: this.method, + messagesHashes: this.messageHashes, + groupPk: this.groupPk, + }); + + if (!signResult) { + throw new Error( + `[DeleteAllFromUserNodeSubRequest] SnodeSignature.getSnodeSignatureParamsUs returned an empty result` + ); + } + + return { + method: this.method, + params: { + pubkey: signResult.pubkey, + signature: signResult.signature, + messages: signResult.messages, + // pubkey_ed25519 is forbidden when doing the request for a group + // timestamp is not needed for this one as the hashes can be deleted only once + }, + }; + } + + public loggingId(): string { + return `${this.method}-${ed25519Str(this.groupPk)}`; + } +} + +export class UpdateExpiryOnNodeUserSubRequest extends SnodeAPISubRequest { + public method = 'expire' as const; + public readonly messageHashes: Array; + public readonly expiryMs: number; + public readonly shortenOrExtend: ShortenOrExtend; + + constructor(args: WithMessagesHashes & WithShortenOrExtend & { expiryMs: number }) { + super(); + this.messageHashes = args.messagesHashes; + this.expiryMs = args.expiryMs; + this.shortenOrExtend = args.shortenOrExtend; + } + + public async buildAndSignParameters() { + const signResult = await SnodeSignature.generateUpdateExpiryOurSignature({ + shortenOrExtend: this.shortenOrExtend, + messagesHashes: this.messageHashes, + timestamp: this.expiryMs, + }); + + if (!signResult) { + throw new Error( + `[UpdateExpiryOnNodeUserSubRequest] SnodeSignature.getSnodeSignatureParamsUs returned an empty result` + ); + } + + const shortenOrExtend = + this.shortenOrExtend === 'extend' + ? { extend: true } + : this.shortenOrExtend === 'shorten' + ? { shorten: true } + : {}; + + return { + method: this.method, + params: { + pubkey: UserUtils.getOurPubKeyStrFromCache(), + pubkey_ed25519: signResult.pubkey, + signature: signResult.signature, + messages: this.messageHashes, + expiry: this.expiryMs, + ...shortenOrExtend, + }, + }; + } + + public loggingId(): string { + return `${this.method}-us`; + } +} + +export class UpdateExpiryOnNodeGroupSubRequest extends SnodeAPISubRequest { + public method = 'expire' as const; + public readonly messageHashes: Array; + public readonly expiryMs: number; + public readonly shortenOrExtend: ShortenOrExtend; + public readonly groupDetailsNeededForSignature: GroupDetailsNeededForSignature; + + constructor( + args: WithMessagesHashes & + WithShortenOrExtend & { + expiryMs: number; + groupDetailsNeededForSignature: GroupDetailsNeededForSignature; + } + ) { + super(); + this.messageHashes = args.messagesHashes; + this.expiryMs = args.expiryMs; + this.shortenOrExtend = args.shortenOrExtend; + this.groupDetailsNeededForSignature = args.groupDetailsNeededForSignature; + } + + public async buildAndSignParameters() { + const signResult = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ + shortenOrExtend: this.shortenOrExtend, + messagesHashes: this.messageHashes, + expiryMs: this.expiryMs, + group: this.groupDetailsNeededForSignature, + }); + + if (!signResult) { + throw new Error( + `[UpdateExpiryOnNodeUserSubRequest] SnodeSignature.getSnodeSignatureParamsUs returned an empty result` + ); + } + + const shortenOrExtend = + this.shortenOrExtend === 'extend' + ? { extends: true } + : this.shortenOrExtend === 'shorten' + ? { shorten: true } + : {}; + + return { + method: this.method, + params: { + messages: this.messageHashes, + ...shortenOrExtend, + ...signResult, + + // pubkey_ed25519 is forbidden for the group one + }, + }; + } + + public loggingId(): string { + return `${this.method}-${ed25519Str(this.groupDetailsNeededForSignature.pubkeyHex)}`; + } +} + +export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { + public method = 'store' as const; + public readonly namespace: SnodeNamespacesGroupConfig | SnodeNamespaces.ClosedGroupMessages; + public readonly destination: GroupPubkeyType; + public readonly ttlMs: number; + public readonly encryptedData: Uint8Array; + + public readonly dbMessageIdentifier: string | null; + + constructor( + args: WithGroupPubkey & { + namespace: SnodeNamespacesGroupConfig | SnodeNamespaces.ClosedGroupMessages; + ttlMs: number; + encryptedData: Uint8Array; + dbMessageIdentifier: string | null; + } + ) { + super(); + this.namespace = args.namespace; + this.destination = args.groupPk; + this.ttlMs = args.ttlMs; + this.encryptedData = args.encryptedData; + this.dbMessageIdentifier = args.dbMessageIdentifier; + + if (isEmpty(this.encryptedData)) { + throw new Error('this.encryptedData cannot be empty'); + } + if (!PubKey.is03Pubkey(this.destination)) { + throw new Error( + 'StoreGroupConfigOrMessageSubRequest: groupconfig namespace required a 03 pubkey' + ); + } + } + + public async buildAndSignParameters(): Promise<{ + method: 'store'; + params: StoreOnNodeNormalParams; + }> { + const encryptedDataBase64 = ByteBuffer.wrap(this.encryptedData).toString('base64'); + + const found = await UserGroupsWrapperActions.getGroup(this.destination); + if (SnodeNamespace.isGroupConfigNamespace(this.namespace) && isEmpty(found?.secretKey)) { + throw new Error( + `groupconfig namespace [${this.namespace}] require an adminSecretKey for signature but we found none` + ); + } + // this will either sign with our admin key or with the subaccount key if the admin one isn't there + const signDetails = await SnodeGroupSignature.getSnodeGroupSignature({ + method: this.method, + namespace: this.namespace, + group: found, + }); + + if (!signDetails) { + throw new Error(`[${this.loggingId()}] sign details is empty result`); + } + + return { + method: this.method, + params: { + namespace: this.namespace, + ttl: this.ttlMs, + data: encryptedDataBase64, + ...signDetails, + }, + }; + } + + public loggingId(): string { + return `${this.method}-${ed25519Str(this.destination)}-${SnodeNamespace.toRole( + this.namespace + )}`; + } +} + +export class StoreUserConfigSubRequest extends SnodeAPISubRequest { + public method = 'store' as const; + public readonly namespace: SnodeNamespacesUserConfig; + public readonly ttlMs: number; + public readonly encryptedData: Uint8Array; + public readonly destination: PubkeyType; + + constructor(args: { + namespace: SnodeNamespacesUserConfig; + ttlMs: number; + encryptedData: Uint8Array; + }) { + super(); + this.namespace = args.namespace; + this.ttlMs = args.ttlMs; + this.encryptedData = args.encryptedData; + this.destination = UserUtils.getOurPubKeyStrFromCache(); + + if (isEmpty(this.encryptedData)) { + throw new Error('this.encryptedData cannot be empty'); + } + + if (isEmpty(this.destination)) { + throw new Error('this.destination cannot be empty'); + } + } + + public async buildAndSignParameters(): Promise<{ + method: 'store'; + params: StoreOnNodeNormalParams; + }> { + const encryptedDataBase64 = ByteBuffer.wrap(this.encryptedData).toString('base64'); + const ourPrivKey = (await UserUtils.getUserED25519KeyPairBytes())?.privKeyBytes; + if (!ourPrivKey) { + throw new Error('getUserED25519KeyPairBytes is empty'); + } + + const signDetails = await SnodeSignature.getSnodeSignatureParamsUs({ + method: this.method, + namespace: this.namespace, + }); + + if (!signDetails) { + throw new Error(`[StoreUserConfigSubRequest] signing returned an empty result`); + } + + return { + method: this.method, + params: { + namespace: this.namespace, + ttl: this.ttlMs, + data: encryptedDataBase64, + ...signDetails, + }, + }; + } + + public loggingId(): string { + return `${this.method}-${ed25519Str(this.destination)}-${SnodeNamespace.toRole( + this.namespace + )}`; + } } +/** + * A request to send a message to the default namespace of another user (namespace 0 is not authenticated) + */ +export class StoreUserMessageSubRequest extends SnodeAPISubRequest { + public method = 'store' as const; + public readonly ttlMs: number; + public readonly encryptedData: Uint8Array; + public readonly namespace = SnodeNamespaces.Default; + public readonly destination: PubkeyType; + public readonly dbMessageIdentifier: string | null; + + constructor(args: { + ttlMs: number; + encryptedData: Uint8Array; + destination: PubkeyType; + dbMessageIdentifier: string | null; + }) { + super(); + this.ttlMs = args.ttlMs; + this.destination = args.destination; + this.encryptedData = args.encryptedData; + this.dbMessageIdentifier = args.dbMessageIdentifier; + + if (isEmpty(this.encryptedData)) { + throw new Error('this.encryptedData cannot be empty'); + } + } + + public async buildAndSignParameters(): Promise<{ + method: 'store'; + params: StoreOnNodeNormalParams; + }> { + const encryptedDataBase64 = ByteBuffer.wrap(this.encryptedData).toString('base64'); + + return { + method: this.method, + params: { + pubkey: this.destination, + timestamp: GetNetworkTime.now(), + namespace: this.namespace, + ttl: this.ttlMs, + data: encryptedDataBase64, + }, + }; + } + + public loggingId(): string { + return `${this.method}-${ed25519Str(this.destination)}-${SnodeNamespace.toRole( + this.namespace + )}`; + } +} + +/** + * A request to send a message to the default namespace of another user (namespace 0 is not authenticated) + * + * TODO: this is almost an exact match of `StoreUserMessageSubRequest` due to be removed once we get rid of legacy groups. + */ +export class StoreLegacyGroupMessageSubRequest extends SnodeAPISubRequest { + public method = 'store' as const; + public readonly ttlMs: number; + public readonly encryptedData: Uint8Array; + public readonly namespace = SnodeNamespaces.LegacyClosedGroup; + public readonly destination: PubkeyType; + public readonly dbMessageIdentifier: string | null; + + constructor(args: { + ttlMs: number; + encryptedData: Uint8Array; + destination: PubkeyType; + dbMessageIdentifier: string | null; + }) { + super(); + this.ttlMs = args.ttlMs; + this.destination = args.destination; + this.encryptedData = args.encryptedData; + this.dbMessageIdentifier = args.dbMessageIdentifier; + + if (isEmpty(this.encryptedData)) { + throw new Error('this.encryptedData cannot be empty'); + } + } + + public async buildAndSignParameters(): Promise<{ + method: 'store'; + params: StoreOnNodeNormalParams; + }> { + const encryptedDataBase64 = ByteBuffer.wrap(this.encryptedData).toString('base64'); + + return { + method: this.method, + params: { + // no signature required for a legacy group retrieve/store of message to namespace -10 + pubkey: this.destination, + timestamp: GetNetworkTime.now(), + namespace: this.namespace, + ttl: this.ttlMs, + data: encryptedDataBase64, + }, + }; + } + + public loggingId(): string { + return `${this.method}-${ed25519Str(this.destination)}-${SnodeNamespace.toRole( + this.namespace + )}`; + } +} + +/** + * When sending group libsession push(), we can also include extra messages to store (update messages, supplemental keys, etc) + */ +export type StoreGroupExtraData = { + networkTimestamp: number; + data: Uint8Array; + ttl: number; + pubkey: GroupPubkeyType; + dbMessageIdentifier: string | null; +} & { namespace: SnodeNamespacesGroupConfig | SnodeNamespaces.ClosedGroupMessages }; + /** * STORE SUBREQUESTS */ @@ -305,7 +901,6 @@ type StoreOnNodeNormalParams = { timestamp: number; data: string; namespace: number; - // sig_timestamp?: number; signature?: string; pubkey_ed25519?: string; }; @@ -322,121 +917,83 @@ type StoreOnNodeSubAccountParams = Pick< // signature is mandatory for subaccount }; -export type StoreOnNodeParams = StoreOnNodeNormalParams | StoreOnNodeSubAccountParams; - -export type StoreOnNodeParamsNoSig = Pick< - StoreOnNodeParams, - 'pubkey' | 'ttl' | 'timestamp' | 'ttl' | 'namespace' -> & { data64: string }; - -type StoreOnNodeShared = { - networkTimestamp: number; - data: Uint8Array; - ttl: number; -}; - -type StoreOnNodeGroupConfig = StoreOnNodeShared & { - pubkey: GroupPubkeyType; - namespace: SnodeNamespacesGroupConfig; -}; - -type StoreOnNodeGroupMessage = StoreOnNodeShared & { - pubkey: GroupPubkeyType; - namespace: SnodeNamespaces.ClosedGroupMessages; -}; - -type StoreOnNodeUserConfig = StoreOnNodeShared & { - pubkey: PubkeyType; - namespace: UserConfigNamespaces; -}; - -export type StoreOnNodeData = - | StoreOnNodeGroupConfig - | StoreOnNodeUserConfig - | StoreOnNodeGroupMessage; - -export type StoreOnNodeSubRequest = { - method: 'store'; - params: StoreOnNodeParams | StoreOnNodeSubAccountParams; -}; - -/** - * DELETE SUBREQUESTS - */ - -type DeleteFromNodeWithTimestampParams = { - timestamp: string | number; - namespace: number | null | 'all'; -} & (DeleteSigUserParameters | DeleteSigGroupParameters); - -export type DeleteByHashesFromNodeParams = { messages: Array } & ( - | DeleteSigUserParameters - | DeleteSigGroupParameters -); - -type DeleteSigUserParameters = WithSignature & { - pubkey: PubkeyType; - pubkey_ed25519: string; -}; - -type DeleteSigGroupParameters = WithSignature & { - pubkey: GroupPubkeyType; -}; - -export type DeleteAllFromNodeSubRequest = { - method: 'delete_all'; - params: DeleteFromNodeWithTimestampParams; -}; - -export type DeleteFromNodeSubRequest = { - method: 'delete'; - params: DeleteByHashesFromNodeParams; -}; - -type UpdateExpireAlwaysNeeded = WithSignature & { - messages: Array; - expiry: number; - extend?: boolean; - shorten?: boolean; -}; - -export type UpdateExpireNodeUserParams = WithPubkeyAsString & - UpdateExpireAlwaysNeeded & { - pubkey_ed25519: string; - }; - -export type UpdateExpireNodeGroupParams = WithPubkeyAsGroupPubkey & UpdateExpireAlwaysNeeded; - -export type UpdateExpiryOnNodeUserSubRequest = { - method: 'expire'; - params: UpdateExpireNodeUserParams; -}; - -export type UpdateExpiryOnNodeGroupSubRequest = { - method: 'expire'; - params: UpdateExpireNodeGroupParams; -}; +type StoreOnNodeParams = StoreOnNodeNormalParams | StoreOnNodeSubAccountParams; -type UpdateExpiryOnNodeSubRequest = - | UpdateExpiryOnNodeUserSubRequest - | UpdateExpiryOnNodeGroupSubRequest; +export type MethodBatchType = 'batch' | 'sequence'; // Until the next storage server release is released, we need to have at least 2 hashes in the list for the `get_expiries` AND for the `update_expiries` export const fakeHash = '///////////////////////////////////////////'; -export type SnodeApiSubRequests = - | RetrieveSubRequestType +export type RawSnodeSubRequests = + | RetrieveLegacyClosedGroupSubRequest + | RetrieveUserSubRequest + | RetrieveGroupSubRequest + | StoreGroupConfigOrMessageSubRequest + | StoreUserConfigSubRequest + | SwarmForSubRequest + | OnsResolveSubRequest + | GetServiceNodesSubRequest + | StoreUserMessageSubRequest + | StoreLegacyGroupMessageSubRequest + | NetworkTimeSubRequest + | DeleteHashesFromGroupNodeSubRequest + | DeleteHashesFromUserNodeSubRequest + | DeleteAllFromUserNodeSubRequest + | UpdateExpiryOnNodeUserSubRequest + | UpdateExpiryOnNodeGroupSubRequest + | SubaccountRevokeSubRequest + | SubaccountUnrevokeSubRequest + | GetExpiriesFromNodeSubRequest; + +export type BuiltSnodeSubRequests = + | ReturnType + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn | ReturnType | ReturnType | ReturnType - | StoreOnNodeSubRequest | ReturnType - | DeleteFromNodeSubRequest - | DeleteAllFromNodeSubRequest - | UpdateExpiryOnNodeSubRequest - | Awaited> - | Awaited> - | Awaited>; + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn; + +export function builtRequestToLoggingId(request: BuiltSnodeSubRequests): string { + const { method, params } = request; + switch (method) { + case 'info': + case 'oxend_request': + return `${method}`; + + case 'delete': + case 'delete_all': + case 'expire': + case 'get_expiries': + case 'get_swarm': + case 'revoke_subaccount': + case 'unrevoke_subaccount': { + const isUs = UserUtils.isUsFromCache(params.pubkey); + return `${method}-${isUs ? 'us' : ed25519Str(params.pubkey)}`; + } + + case 'retrieve': + case 'store': { + const isUs = UserUtils.isUsFromCache(params.pubkey); + return `${method}-${isUs ? 'us' : ed25519Str(params.pubkey)}-${SnodeNamespace.toRole( + params.namespace + )}`; + } + default: + assertUnreachable(method, 'should be unreachable case'); + throw new Error('should be unreachable case'); + } +} // eslint-disable-next-line @typescript-eslint/array-type export type NonEmptyArray = [T, ...T[]]; @@ -452,13 +1009,7 @@ export const MAX_SUBREQUESTS_COUNT = 20; export type BatchStoreWithExtraParams = | StoreOnNodeParams - | SignedGroupHashesParams - | SignedHashesParams + | DeleteHashesFromGroupNodeSubRequest + | DeleteHashesFromUserNodeSubRequest | SubaccountRevokeSubRequest | SubaccountUnrevokeSubRequest; - -export function isDeleteByHashesParams( - request: BatchStoreWithExtraParams -): request is SignedGroupHashesParams | SignedHashesParams { - return !isEmpty((request as SignedGroupHashesParams | SignedHashesParams)?.messages); -} diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 3576430837..9c714d74e5 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -1,20 +1,19 @@ import { isArray } from 'lodash'; import { Snode } from '../../../data/data'; +import { MessageSender } from '../../sending'; import { processOnionRequestErrorAtDestination, SnodeResponse } from './onions'; import { snodeRpc } from './sessionRpc'; import { + builtRequestToLoggingId, + BuiltSnodeSubRequests, MAX_SUBREQUESTS_COUNT, + MethodBatchType, NotEmptyArrayOfBatchResults, - SnodeApiSubRequests, + RawSnodeSubRequests, } from './SnodeRequestTypes'; -function logSubRequests(_requests: Array) { - return 'logSubRequests to do'; - // return requests.map(m => - // m.method === 'retrieve' || m.method === 'store' - // ? `${m.method}-${SnodeNamespace.toRoles(m.params.namespace)}` - // : m.method - // ); +function logSubRequests(requests: Array) { + return `[${requests.map(builtRequestToLoggingId).join(', ')}]`; } /** @@ -28,13 +27,14 @@ function logSubRequests(_requests: Array) { * @param method can be either batch or sequence. A batch call will run all calls even if one of them fails. A sequence call will stop as soon as the first one fails */ export async function doSnodeBatchRequest( - subRequests: Array, + subRequests: Array, targetNode: Snode, timeout: number, associatedWith: string | null, - method: 'batch' | 'sequence' = 'batch' + method: MethodBatchType = 'batch' ): Promise { window.log.debug(`doSnodeBatchRequest "${method}":`, JSON.stringify(logSubRequests(subRequests))); + if (subRequests.length > MAX_SUBREQUESTS_COUNT) { window.log.error( `batch subRequests count cannot be more than ${MAX_SUBREQUESTS_COUNT}. Got ${subRequests.length}` @@ -76,6 +76,17 @@ export async function doSnodeBatchRequest( return decoded; } +export async function doUnsignedSnodeBatchRequest( + unsignedSubRequests: Array, + targetNode: Snode, + timeout: number, + associatedWith: string | null, + method: MethodBatchType = 'batch' +): Promise { + const signedSubRequests = await MessageSender.signSubRequests(unsignedSubRequests); + return doSnodeBatchRequest(signedSubRequests, targetNode, timeout, associatedWith, method); +} + /** * Make sure the global batch status code is 200, parse the content as json and return it */ diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index c8b39feac6..126c0b32b4 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -1,21 +1,10 @@ /* eslint-disable no-restricted-syntax */ -import { - chunk, - compact, - difference, - flatten, - isArray, - isEmpty, - isNumber, - sample, - uniqBy, -} from 'lodash'; +import { chunk, compact, difference, flatten, isArray, isEmpty, isNumber, uniqBy } from 'lodash'; import pRetry from 'p-retry'; import { Snode } from '../../../data/data'; import { getSodiumRenderer } from '../../crypto'; import { StringUtils, UserUtils } from '../../utils'; import { fromBase64ToArray, fromHexToArray } from '../../utils/String'; -import { EmptySwarmError } from '../../utils/errors'; import { SeedNodeAPI } from '../seed_node_api'; import { MAX_SUBREQUESTS_COUNT, @@ -23,9 +12,8 @@ import { WithShortenOrExtend, fakeHash, } from './SnodeRequestTypes'; -import { doSnodeBatchRequest } from './batchRequest'; -import { SnodeSignature } from './signature/snodeSignatures'; -import { getSwarmFor } from './snodePool'; +import { doUnsignedSnodeBatchRequest } from './batchRequest'; +import { getNodeFromSwarmOrThrow } from './snodePool'; import { ExpireMessageResultItem, ExpireMessagesResultsContent } from './types'; export type verifyExpireMsgsResponseSignatureProps = ExpireMessageResultItem & { @@ -158,7 +146,13 @@ async function updateExpiryOnNodes( expireRequests: Array ): Promise> { try { - const result = await doSnodeBatchRequest(expireRequests, targetNode, 4000, ourPubKey, 'batch'); + const result = await doUnsignedSnodeBatchRequest( + expireRequests, + targetNode, + 4000, + ourPubKey, + 'batch' + ); if (!result || result.length !== expireRequests.length) { window.log.error( @@ -189,7 +183,7 @@ async function updateExpiryOnNodes( ourPubKey, targetNode, bodyIndex as ExpireMessagesResultsContent, - request.params.messages + request.messageHashes ); }) ); @@ -225,7 +219,7 @@ async function updateExpiryOnNodes( } const hashesRequestedButNotInResults = difference( - flatten(expireRequests.map(m => m.params.messages)), + flatten(expireRequests.map(m => m.messageHashes)), [...flatten(changesValid.map(c => c.messageHashes)), fakeHash] ); if (!isEmpty(hashesRequestedButNotInResults)) { @@ -300,30 +294,11 @@ export async function buildExpireRequestSingleExpiry( // NOTE for shortenOrExtend, '' means we want to hardcode the expiry to a TTL value, otherwise it's a shorten or extension of the TTL - const signResult = await SnodeSignature.generateUpdateExpiryOurSignature({ - shortenOrExtend, - timestamp: expiryMs, + return new UpdateExpiryOnNodeUserSubRequest({ + expiryMs, messagesHashes: messageHashes, + shortenOrExtend, }); - - if (!signResult) { - window.log.error( - `[buildExpireRequestSingleExpiry] SnodeSignature.generateUpdateExpirySignature returned an empty result` - ); - return null; - } - return { - method: 'expire' as const, - params: { - pubkey: ourPubKey, - pubkey_ed25519: signResult.pubkey.toUpperCase(), - messages: messageHashes, - expiry: expiryMs, - extend: shortenOrExtend === 'extend' || undefined, - shorten: shortenOrExtend === 'shorten' || undefined, - signature: signResult?.signature, - }, - }; } type GroupedBySameExpiry = Record>; @@ -402,8 +377,6 @@ export async function expireMessagesOnSnode( throw new Error('[expireMessagesOnSnode] No pubkey found'); } - let snode: Snode | undefined; - try { // key is a string even if it is really a number because Object.keys only knows strings... const groupedBySameExpiry = groupMsgByExpiry(expiringDetails); @@ -432,12 +405,9 @@ export async function expireMessagesOnSnode( expireRequestsParams.map(chunkRequest => pRetry( async () => { - const swarm = await getSwarmFor(ourPubKey); - snode = sample(swarm); - if (!snode) { - throw new EmptySwarmError(ourPubKey, 'Ran out of swarm nodes to query'); - } - return updateExpiryOnNodes(snode, ourPubKey, chunkRequest); + const targetNode = await getNodeFromSwarmOrThrow(ourPubKey); + + return updateExpiryOnNodes(targetNode, ourPubKey, chunkRequest); }, { retries: 3, @@ -455,12 +425,7 @@ export async function expireMessagesOnSnode( return flatten(compact(allSettled.map(m => (m.status === 'fulfilled' ? m.value : null)))); } catch (e) { - const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null'; - window?.log?.warn( - `[expireMessagesOnSnode] ${e.code || ''}${ - e.message || e - } by ${ourPubKey} via snode:${snodeStr}` - ); + window?.log?.warn(`[expireMessagesOnSnode] ${e.code || ''}${e.message || e} by ${ourPubKey}`); throw e; } } diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index 00d0580b2f..85b54d558d 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -1,14 +1,13 @@ /* eslint-disable no-restricted-syntax */ import { PubkeyType } from 'libsession_util_nodejs'; -import { isFinite, isNil, isNumber, sample } from 'lodash'; +import { isFinite, isNil, isNumber } from 'lodash'; import pRetry from 'p-retry'; import { Snode } from '../../../data/data'; import { UserUtils } from '../../utils'; -import { EmptySwarmError } from '../../utils/errors'; import { SeedNodeAPI } from '../seed_node_api'; import { GetExpiriesFromNodeSubRequest, fakeHash } from './SnodeRequestTypes'; -import { doSnodeBatchRequest } from './batchRequest'; -import { getSwarmFor } from './snodePool'; +import { doUnsignedSnodeBatchRequest } from './batchRequest'; +import { getNodeFromSwarmOrThrow } from './snodePool'; import { GetExpiriesResultsContent, WithMessagesHashes } from './types'; export type GetExpiriesRequestResponseResults = Record; @@ -47,8 +46,13 @@ async function getExpiriesFromNodes( ) { try { const expireRequest = new GetExpiriesFromNodeSubRequest({ messagesHashes: messageHashes }); - const signed = await expireRequest.buildAndSignParameters(); - const result = await doSnodeBatchRequest([signed], targetNode, 4000, associatedWith, 'batch'); + const result = await doUnsignedSnodeBatchRequest( + [expireRequest], + targetNode, + 4000, + associatedWith, + 'batch' + ); if (!result || result.length !== 1) { throw Error( @@ -113,17 +117,12 @@ export async function getExpiriesFromSnode({ messagesHashes }: WithMessagesHashe return []; } - let snode: Snode | undefined; - try { const fetchedExpiries = await pRetry( async () => { - const swarm = await getSwarmFor(ourPubKey); - snode = sample(swarm); - if (!snode) { - throw new EmptySwarmError(ourPubKey, 'Ran out of swarm nodes to query'); - } - return getExpiriesFromNodes(snode, messagesHashes, ourPubKey); + const targetNode = await getNodeFromSwarmOrThrow(ourPubKey); + + return getExpiriesFromNodes(targetNode, messagesHashes, ourPubKey); }, { retries: 3, @@ -139,11 +138,10 @@ export async function getExpiriesFromSnode({ messagesHashes }: WithMessagesHashe return fetchedExpiries; } catch (e) { - const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null'; window?.log?.warn( `[getExpiriesFromSnode] ${e.code ? `${e.code} ` : ''}${ e.message || e - } by ${ourPubKey} for ${messagesHashes} via snode:${snodeStr}` + } by ${ourPubKey} for ${messagesHashes}` ); throw e; } diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index 917e198acc..a35ba4ccd2 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -7,12 +7,12 @@ import { isNumber } from 'lodash'; import { Snode } from '../../../data/data'; import { NetworkTimeSubRequest } from './SnodeRequestTypes'; -import { doSnodeBatchRequest } from './batchRequest'; +import { doUnsignedSnodeBatchRequest } from './batchRequest'; const getNetworkTime = async (snode: Snode): Promise => { const subrequest = new NetworkTimeSubRequest(); - const result = await doSnodeBatchRequest([subrequest.build()], snode, 4000, null); + const result = await doUnsignedSnodeBatchRequest([subrequest], snode, 4000, null); if (!result || !result.length) { window?.log?.warn(`getNetworkTime on ${snode.ip}:${snode.port} returned falsish value`, result); throw new Error('getNetworkTime: Invalid result'); diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index 2b791c96fb..947c067874 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -2,7 +2,7 @@ import { compact, intersectionWith, sampleSize } from 'lodash'; import { SnodePool } from '.'; import { Snode } from '../../../data/data'; import { GetServiceNodesSubRequest } from './SnodeRequestTypes'; -import { doSnodeBatchRequest } from './batchRequest'; +import { doUnsignedSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { minSnodePoolCount, requiredSnodesForAgreement } from './snodePool'; @@ -14,7 +14,7 @@ import { minSnodePoolCount, requiredSnodesForAgreement } from './snodePool'; async function getSnodePoolFromSnode(targetNode: Snode): Promise> { const subrequest = new GetServiceNodesSubRequest(); - const results = await doSnodeBatchRequest([subrequest.build()], targetNode, 4000, null); + const results = await doUnsignedSnodeBatchRequest([subrequest], targetNode, 4000, null); const firstResult = results[0]; diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index f480ae94f9..d6646072c4 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -3,7 +3,7 @@ import pRetry from 'p-retry'; import { Snode } from '../../../data/data'; import { PubKey } from '../../types'; import { SwarmForSubRequest } from './SnodeRequestTypes'; -import { doSnodeBatchRequest } from './batchRequest'; +import { doUnsignedSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { getRandomSnode } from './snodePool'; @@ -19,7 +19,7 @@ async function requestSnodesForPubkeyWithTargetNodeRetryable( } const subrequest = new SwarmForSubRequest(pubkey); - const result = await doSnodeBatchRequest([subrequest.build()], targetNode, 4000, pubkey); + const result = await doUnsignedSnodeBatchRequest([subrequest], targetNode, 4000, pubkey); if (!result || !result.length) { window?.log?.warn( diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index 39936d5381..12466290a9 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -1,4 +1,4 @@ -import { isNumber, last, orderBy } from 'lodash'; +import { last, orderBy } from 'lodash'; import { PickEnum } from '../../../types/Enums'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; @@ -79,7 +79,7 @@ export type SnodeNamespacesGroup = export type SnodeNamespacesUser = PickEnum; -export type UserConfigNamespaces = PickEnum< +export type SnodeNamespacesUserConfig = PickEnum< SnodeNamespaces, | SnodeNamespaces.UserProfile | SnodeNamespaces.UserContacts @@ -91,7 +91,7 @@ export type UserConfigNamespaces = PickEnum< * Returns true if that namespace is associated with the config of a user (not his messages, only configs) */ // eslint-disable-next-line consistent-return -function isUserConfigNamespace(namespace: SnodeNamespaces): namespace is UserConfigNamespaces { +function isUserConfigNamespace(namespace: SnodeNamespaces): namespace is SnodeNamespacesUserConfig { switch (namespace) { case SnodeNamespaces.UserProfile: case SnodeNamespaces.UserContacts: @@ -262,10 +262,7 @@ function toRole(namespace: number) { } } -function toRoles(namespace: number | Array) { - if (isNumber(namespace)) { - return [namespace].map(toRole); - } +function toRoles(namespace: Array) { return namespace.map(toRole); } @@ -275,4 +272,5 @@ export const SnodeNamespace = { isGroupNamespace, maxSizeMap, toRoles, + toRole, }; diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts index 1e2269315c..c609bc8856 100644 --- a/ts/session/apis/snode_api/onsResolve.ts +++ b/ts/session/apis/snode_api/onsResolve.ts @@ -7,7 +7,7 @@ import { toHex, } from '../../utils/String'; import { OnsResolveSubRequest } from './SnodeRequestTypes'; -import { doSnodeBatchRequest } from './batchRequest'; +import { doUnsignedSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { getRandomSnode } from './snodePool'; @@ -29,7 +29,7 @@ async function getSessionIDForOnsName(onsNameCase: string) { const promises = range(0, validationCount).map(async () => { const targetNode = await getRandomSnode(); - const results = await doSnodeBatchRequest([subRequest.build()], targetNode, 4000, null); + const results = await doUnsignedSnodeBatchRequest([subRequest], targetNode, 4000, null); const firstResult = results[0]; if (!firstResult || firstResult.code !== 200 || !firstResult.body) { throw new Error('ONSresolve:Failed to resolve ONS'); diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index fb306ac386..ffa9ac9968 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -1,25 +1,21 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { omit } from 'lodash'; import { Snode } from '../../../data/data'; import { updateIsOnline } from '../../../state/ducks/onion'; -import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { SnodeNamespace, SnodeNamespaces, SnodeNamespacesGroup } from './namespaces'; import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { TTL_DEFAULT } from '../../constants'; +import { ed25519Str } from '../../onions/onionPath'; import { PubKey } from '../../types'; -import { UserUtils } from '../../utils'; import { - RetrieveGroupAdminSubRequestType, - RetrieveGroupSubAccountSubRequestType, - RetrieveLegacyClosedGroupSubRequestType, - RetrieveSubRequestType, + RetrieveGroupSubRequest, + RetrieveLegacyClosedGroupSubRequest, + RetrieveUserSubRequest, UpdateExpiryOnNodeGroupSubRequest, UpdateExpiryOnNodeUserSubRequest, } from './SnodeRequestTypes'; -import { SnodeGroupSignature } from './signature/groupSignature'; -import { SnodeSignature } from './signature/snodeSignatures'; +import { doUnsignedSnodeBatchRequest } from './batchRequest'; import { RetrieveMessagesResultsBatched, RetrieveMessagesResultsContent } from './types'; type RetrieveParams = { @@ -31,23 +27,19 @@ type RetrieveParams = { async function retrieveRequestForUs({ namespace, - ourPubkey, retrieveParam, }: { - ourPubkey: string; namespace: SnodeNamespaces; retrieveParam: RetrieveParams; }) { if (!SnodeNamespace.isUserConfigNamespace(namespace) && namespace !== SnodeNamespaces.Default) { throw new Error(`retrieveRequestForUs not a valid namespace to retrieve as us:${namespace}`); } - const signatureArgs = { ...retrieveParam, namespace, method: 'retrieve' as const, ourPubkey }; - const signatureBuilt = await SnodeSignature.getSnodeSignatureParamsUs(signatureArgs); - const retrieveForUS: RetrieveSubRequestType = { - method: 'retrieve', - params: { ...retrieveParam, namespace, ...signatureBuilt }, - }; - return retrieveForUS; + return new RetrieveUserSubRequest({ + last_hash: retrieveParam.last_hash, + max_size: retrieveParam.max_size, + namespace, + }); } /** @@ -64,7 +56,7 @@ function retrieveRequestForLegacyGroup({ ourPubkey: string; retrieveParam: RetrieveParams; }) { - if (pubkey === ourPubkey || !pubkey.startsWith('05')) { + if (pubkey === ourPubkey || !PubKey.is05Pubkey(pubkey)) { throw new Error( 'namespace -10 can only be used to retrieve messages from a legacy closed group (prefix 05)' ); @@ -72,16 +64,13 @@ function retrieveRequestForLegacyGroup({ if (namespace !== SnodeNamespaces.LegacyClosedGroup) { throw new Error(`retrieveRequestForLegacyGroup namespace can only be -10`); } - const retrieveLegacyClosedGroup = { - ...retrieveParam, - namespace, - }; - const retrieveParamsLegacy: RetrieveLegacyClosedGroupSubRequestType = { - method: 'retrieve', - params: omit(retrieveLegacyClosedGroup, 'timestamp'), // if we give a timestamp, a signature will be required by the service node, and we don't want to provide one as this is an unauthenticated namespace - }; - return retrieveParamsLegacy; + // if we give a timestamp, a signature will be required by the service node, and we don't want to provide one as this is an unauthenticated namespace + return new RetrieveLegacyClosedGroupSubRequest({ + last_hash: retrieveParam.last_hash, + max_size: retrieveParam.max_size, + legacyGroupPk: pubkey, + }); } /** @@ -104,34 +93,28 @@ async function retrieveRequestForGroup({ } const group = await UserGroupsWrapperActions.getGroup(groupPk); - const sigResult = await SnodeGroupSignature.getSnodeGroupSignature({ - method: 'retrieve', + return new RetrieveGroupSubRequest({ + last_hash: retrieveParam.last_hash, namespace, - group, + max_size: retrieveParam.max_size, + groupDetailsNeededForSignature: group, }); - - const retrieveParamsGroup: - | RetrieveGroupSubAccountSubRequestType - | RetrieveGroupAdminSubRequestType = { - method: 'retrieve', - params: { - ...retrieveParam, - ...sigResult, - - namespace, - }, - }; - - return retrieveParamsGroup; } +type RetrieveSubRequestType = + | RetrieveLegacyClosedGroupSubRequest + | RetrieveUserSubRequest + | RetrieveGroupSubRequest + | UpdateExpiryOnNodeUserSubRequest + | UpdateExpiryOnNodeGroupSubRequest; + async function buildRetrieveRequest( lastHashes: Array, pubkey: string, namespaces: Array, ourPubkey: string, configHashesToBump: Array | null -): Promise> { +) { const isUs = pubkey === ourPubkey; const maxSizeMap = SnodeNamespace.maxSizeMap(namespaces); const now = GetNetworkTime.now(); @@ -160,52 +143,42 @@ async function buildRetrieveRequest( // all legacy closed group retrieves are unauthenticated and run above. // if we get here, this can only be a retrieve for our own swarm, which must be authenticated - return retrieveRequestForUs({ namespace, ourPubkey, retrieveParam }); + return retrieveRequestForUs({ namespace, retrieveParam }); }) ); - if (configHashesToBump?.length) { - const expiry = GetNetworkTime.now() + TTL_DEFAULT.CONFIG_MESSAGE; - if (isUs) { - const signResult = await SnodeSignature.generateUpdateExpiryOurSignature({ - shortenOrExtend: '', - timestamp: expiry, - messagesHashes: configHashesToBump, - }); - - const expireParams: UpdateExpiryOnNodeUserSubRequest = { - method: 'expire', - params: { - messages: configHashesToBump, - pubkey: UserUtils.getOurPubKeyStrFromCache(), - expiry, - signature: signResult.signature, - pubkey_ed25519: signResult.pubkey, - }, - }; - retrieveRequestsParams.push(expireParams); - } else if (PubKey.is03Pubkey(pubkey)) { - const group = await UserGroupsWrapperActions.getGroup(pubkey); + const expiryMs = GetNetworkTime.now() + TTL_DEFAULT.CONFIG_MESSAGE; - const signResult = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ - shortenOrExtend: '', - timestamp: expiry, - messagesHashes: configHashesToBump, - group, - }); + if (configHashesToBump?.length && isUs) { + const request = new UpdateExpiryOnNodeUserSubRequest({ + expiryMs, + messagesHashes: configHashesToBump, + shortenOrExtend: '', + }); + retrieveRequestsParams.push(request); + return retrieveRequestsParams; + } - const expireParams: UpdateExpiryOnNodeGroupSubRequest = { - method: 'expire', - params: { - messages: configHashesToBump, - expiry, - ...omit(signResult, 'timestamp'), - pubkey, - }, - }; + if (configHashesToBump?.length && PubKey.is03Pubkey(pubkey)) { + const group = await UserGroupsWrapperActions.getGroup(pubkey); - retrieveRequestsParams.push(expireParams); + if (!group) { + window.log.warn( + `trying to retrieve fopr group ${ed25519Str( + pubkey + )} but we are missing the details in the usergroup wrapper` + ); + throw new Error('retrieve request is missing group details'); } + + retrieveRequestsParams.push( + new UpdateExpiryOnNodeGroupSubRequest({ + expiryMs, + messagesHashes: configHashesToBump, + shortenOrExtend: '', + groupDetailsNeededForSignature: group, + }) + ); } return retrieveRequestsParams; } @@ -222,22 +195,18 @@ async function retrieveNextMessages( throw new Error('namespaces and lasthashes does not match'); } - const retrieveRequestsParams = await buildRetrieveRequest( + const rawRequests = await buildRetrieveRequest( lastHashes, associatedWith, namespaces, ourPubkey, configHashesToBump ); + // let exceptions bubble up // no retry for this one as this a call we do every few seconds while polling for messages - const results = await doSnodeBatchRequest( - retrieveRequestsParams, - targetNode, - 4000, - associatedWith - ); + const results = await doUnsignedSnodeBatchRequest(rawRequests, targetNode, 4000, associatedWith); if (!results || !results.length) { window?.log?.warn( `_retrieveNextMessages - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}` diff --git a/ts/session/apis/snode_api/revokeSubaccount.ts b/ts/session/apis/snode_api/revokeSubaccount.ts index 2ca5ab6613..6f708530ec 100644 --- a/ts/session/apis/snode_api/revokeSubaccount.ts +++ b/ts/session/apis/snode_api/revokeSubaccount.ts @@ -1,8 +1,6 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { PubKey } from '../../types'; -import { SubaccountRevokeSubRequest, SubaccountUnrevokeSubRequest } from './SnodeRequestTypes'; -import { GetNetworkTime } from './getNetworkTime'; export type RevokeChanges = Array<{ action: 'revoke_subaccount' | 'unrevoke_subaccount'; @@ -11,36 +9,35 @@ export type RevokeChanges = Array<{ async function getRevokeSubaccountParams( groupPk: GroupPubkeyType, - secretKey: Uint8Array, - { - revokeChanges, - unrevokeChanges, - }: { revokeChanges: RevokeChanges; unrevokeChanges: RevokeChanges } + _secretKey: Uint8Array, + _opts: { revokeChanges: RevokeChanges; unrevokeChanges: RevokeChanges } ) { if (!PubKey.is03Pubkey(groupPk)) { throw new Error('revokeSubaccountForGroup: not a 03 group'); } - const revokeSubRequest = revokeChanges - ? new SubaccountRevokeSubRequest({ - groupPk, - revokeTokenHex: revokeChanges.map(m => m.tokenToRevokeHex), - timestamp: GetNetworkTime.now(), - secretKey, - }) - : null; - const unrevokeSubRequest = unrevokeChanges.length - ? new SubaccountUnrevokeSubRequest({ - groupPk, - revokeTokenHex: unrevokeChanges.map(m => m.tokenToRevokeHex), - timestamp: GetNetworkTime.now(), - secretKey, - }) - : null; + window.log.warn('getRevokeSubaccountParams to enable once multisig is done'); // TODO audric debugger + + // const revokeSubRequest = revokeChanges.length + // ? new SubaccountRevokeSubRequest({ + // groupPk, + // revokeTokenHex: revokeChanges.map(m => m.tokenToRevokeHex), + // timestamp: GetNetworkTime.now(), + // secretKey, + // }) + // : null; + // const unrevokeSubRequest = unrevokeChanges.length + // ? new SubaccountUnrevokeSubRequest({ + // groupPk, + // revokeTokenHex: unrevokeChanges.map(m => m.tokenToRevokeHex), + // timestamp: GetNetworkTime.now(), + // secretKey, + // }) + // : null; return { - revokeSubRequest, - unrevokeSubRequest, + revokeSubRequest: null, + unrevokeSubRequest: null, }; } diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 903c111ee8..73cd558362 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -4,6 +4,7 @@ import { Uint8ArrayLen100, Uint8ArrayLen64, UserGroupsGet, + WithGroupPubkey, } from 'libsession_util_nodejs'; import { isEmpty, isString } from 'lodash'; import { @@ -18,12 +19,7 @@ import { fromUInt8ArrayToBase64, stringToUint8Array } from '../../../utils/Strin import { PreConditionFailed } from '../../../utils/errors'; import { GetNetworkTime } from '../getNetworkTime'; import { SnodeNamespacesGroup } from '../namespaces'; -import { - SignedGroupHashesParams, - WithMessagesHashes, - WithShortenOrExtend, - WithTimestamp, -} from '../types'; +import { SignedGroupHashesParams, WithMessagesHashes, WithShortenOrExtend } from '../types'; import { SignatureShared } from './signatureShared'; import { SnodeSignatureResult } from './snodeSignatures'; @@ -112,25 +108,12 @@ export type SigResultSubAccount = SigResultAdmin & { subaccount_sig: string; }; -async function getSnodeGroupSignatureParams(params: SigParamsAdmin): Promise; -async function getSnodeGroupSignatureParams( - params: SigParamsSubaccount -): Promise; - -async function getSnodeGroupSignatureParams( - params: SigParamsAdmin | SigParamsSubaccount -): Promise { - if ('groupIdentityPrivKey' in params) { - return getSnodeGroupAdminSignatureParams(params); - } - return getSnodeGroupSubAccountSignatureParams(params); -} - async function getSnodeGroupSubAccountSignatureParams( params: SigParamsSubaccount ): Promise { const { signatureTimestamp, toSign } = SignatureShared.getVerificationDataForStoreRetrieve(params); + const sigResult = await MetaGroupWrapperActions.swarmSubaccountSign( params.groupPk, toSign, @@ -153,7 +136,10 @@ async function getSnodeGroupAdminSignatureParams(params: SigParamsAdmin): Promis return { ...sigData, pubkey: params.groupPk }; } -type GroupDetailsNeededForSignature = Pick; +export type GroupDetailsNeededForSignature = Pick< + UserGroupsGet, + 'pubkeyHex' | 'authData' | 'secretKey' +>; async function getSnodeGroupSignature({ group, @@ -163,7 +149,7 @@ async function getSnodeGroupSignature({ group: GroupDetailsNeededForSignature | null; method: 'store' | 'retrieve'; namespace: SnodeNamespacesGroup; -}) { +}): Promise { if (!group) { throw new Error(`getSnodeGroupSignature: did not find group in wrapper`); } @@ -173,7 +159,7 @@ async function getSnodeGroupSignature({ const groupAuthData = authData && !isEmpty(authData) ? authData : null; if (groupSecretKey) { - return getSnodeGroupSignatureParams({ + return getSnodeGroupAdminSignatureParams({ method, namespace, groupPk, @@ -181,7 +167,7 @@ async function getSnodeGroupSignature({ }); } if (groupAuthData) { - const subAccountSign = await getSnodeGroupSignatureParams({ + const subAccountSign = await getSnodeGroupSubAccountSignatureParams({ groupPk, method, namespace, @@ -220,20 +206,20 @@ async function signDataWithAdminSecret( // this is kind of duplicated with `generateUpdateExpirySignature`, but needs to use the authData when secretKey is not available async function generateUpdateExpiryGroupSignature({ shortenOrExtend, - timestamp, + expiryMs, messagesHashes, group, }: WithMessagesHashes & - WithShortenOrExtend & - WithTimestamp & { + WithShortenOrExtend & { group: GroupDetailsNeededForSignature | null; + expiryMs: number; }) { if (!group || isEmpty(group.pubkeyHex)) { throw new PreConditionFailed('generateUpdateExpiryGroupSignature groupPk is empty'); } // "expire" || ShortenOrExtend || expiry || messages[0] || ... || messages[N] - const verificationString = `expire${shortenOrExtend}${timestamp}${messagesHashes.join('')}`; + const verificationString = `expire${shortenOrExtend}${expiryMs}${messagesHashes.join('')}`; const verificationData = StringUtils.encode(verificationString, 'utf8'); const message = new Uint8Array(verificationData); @@ -249,7 +235,7 @@ async function generateUpdateExpiryGroupSignature({ } const sodium = await getSodiumRenderer(); - const shared = { timestamp, pubkey: groupPk }; + const shared = { expiry: expiryMs, pubkey: groupPk }; // expiry and the other fields come from what the expire endpoint expects if (groupSecretKey) { return { @@ -257,36 +243,37 @@ async function generateUpdateExpiryGroupSignature({ ...shared, }; } - - if (groupAuthData) { - const subaccountSign = await MetaGroupWrapperActions.swarmSubaccountSign( - groupPk, - message, - groupAuthData + if (!groupAuthData) { + // typescript should see this already but doesn't, so let's enforce it. + throw new Error( + `retrieveRequestForGroup: needs either groupSecretKey or authData but both are empty` ); - return { - ...subaccountSign, - ...shared, - }; } - - throw new Error(`generateUpdateExpiryGroupSignature: needs either groupSecretKey or authData`); + const subaccountSign = await MetaGroupWrapperActions.swarmSubaccountSign( + groupPk, + message, + groupAuthData + ); + return { + ...subaccountSign, + ...shared, + }; } async function getGroupSignatureByHashesParams({ messagesHashes, method, - pubkey, -}: WithMessagesHashes & { - pubkey: GroupPubkeyType; - method: 'delete'; -}): Promise { + groupPk, +}: WithMessagesHashes & + WithGroupPubkey & { + method: 'delete'; + }): Promise { const verificationData = StringUtils.encode(`${method}${messagesHashes.join('')}`, 'utf8'); const message = new Uint8Array(verificationData); const sodium = await getSodiumRenderer(); try { - const group = await UserGroupsWrapperActions.getGroup(pubkey); + const group = await UserGroupsWrapperActions.getGroup(groupPk); if (!group || !group.secretKey || isEmpty(group.secretKey)) { throw new Error('getSnodeGroupSignatureByHashesParams needs admin secretKey'); } @@ -295,7 +282,7 @@ async function getGroupSignatureByHashesParams({ return { signature: signatureBase64, - pubkey, + pubkey: groupPk, messages: messagesHashes, }; } catch (e) { diff --git a/ts/session/apis/snode_api/signature/signatureShared.ts b/ts/session/apis/snode_api/signature/signatureShared.ts index 85f17f5d3d..7f6cc2f705 100644 --- a/ts/session/apis/snode_api/signature/signatureShared.ts +++ b/ts/session/apis/snode_api/signature/signatureShared.ts @@ -28,10 +28,10 @@ export type SnodeSigParamsUs = SnodeSigParamsShared & { function getVerificationDataForStoreRetrieve(params: SnodeSigParamsShared) { const signatureTimestamp = GetNetworkTime.now(); - const verificationData = StringUtils.encode( - `${params.method}${params.namespace === 0 ? '' : params.namespace}${signatureTimestamp}`, - 'utf8' - ); + const verificationString = `${params.method}${ + params.namespace === 0 ? '' : params.namespace + }${signatureTimestamp}`; + const verificationData = StringUtils.encode(verificationString, 'utf8'); return { toSign: new Uint8Array(verificationData), signatureTimestamp, diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts index f13a27e218..4a8fbe70d5 100644 --- a/ts/session/apis/snode_api/snodePool.ts +++ b/ts/session/apis/snode_api/snodePool.ts @@ -1,14 +1,14 @@ -import _, { shuffle } from 'lodash'; +import _, { isEmpty, sample, shuffle } from 'lodash'; import pRetry from 'p-retry'; import { Data, Snode } from '../../../data/data'; -import { ed25519Str } from '../../onions/onionPath'; -import { OnionPaths } from '../../onions'; import { Onions, SnodePool } from '.'; +import { OnionPaths } from '../../onions'; +import { ed25519Str } from '../../onions/onionPath'; import { SeedNodeAPI } from '../seed_node_api'; -import { requestSnodesForPubkeyFromNetwork } from './getSwarmFor'; import { ServiceNodesList } from './getServiceNodesList'; +import { requestSnodesForPubkeyFromNetwork } from './getSwarmFor'; /** * If we get less than this snode in a swarm, we fetch new snodes for this pubkey @@ -316,6 +316,20 @@ export async function getSwarmFor(pubkey: string): Promise> { return getSwarmFromNetworkAndSave(pubkey); } +export async function getNodeFromSwarmOrThrow(pubkey: string): Promise { + const swarm = await getSwarmFor(pubkey); + if (!isEmpty(swarm)) { + const node = sample(swarm); + if (node) { + return node; + } + } + window.log.warn( + `getNodeFromSwarmOrThrow: could not get one random node for pk ${ed25519Str(pubkey)}` + ); + throw new Error(`getNodeFromSwarmOrThrow: could not get one random node`); +} + /** * Force a request to be made to the network to fetch the swarm of the specificied pubkey, and cache the result. * Note: should not be called directly unless you know what you are doing. Use the cached `getSwarmFor()` function instead diff --git a/ts/session/apis/snode_api/storeMessage.ts b/ts/session/apis/snode_api/storeMessage.ts deleted file mode 100644 index a597bdf799..0000000000 --- a/ts/session/apis/snode_api/storeMessage.ts +++ /dev/null @@ -1,91 +0,0 @@ -import { Snode } from '../../../data/data'; -import { - BatchStoreWithExtraParams, - NotEmptyArrayOfBatchResults, - SnodeApiSubRequests, - StoreOnNodeSubRequest, - SubaccountRevokeSubRequest, - SubaccountUnrevokeSubRequest, - isDeleteByHashesParams, -} from './SnodeRequestTypes'; -import { doSnodeBatchRequest } from './batchRequest'; -import { GetNetworkTime } from './getNetworkTime'; - -async function buildStoreRequests( - params: Array -): Promise> { - const storeRequests = await Promise.all( - params.map(p => { - if (isDeleteByHashesParams(p)) { - return { - method: 'delete' as const, - params: p, - }; - } - - // those requests are already fully contained. - if (p instanceof SubaccountRevokeSubRequest || p instanceof SubaccountUnrevokeSubRequest) { - return p.buildAndSignParameters(); - } - - const storeRequest: StoreOnNodeSubRequest = { - method: 'store', - params: p, - }; - - return storeRequest; - }) - ); - - return storeRequests; -} - -/** - * Send a 'store' request to the specified targetNode, using params as argument - * @returns the Array of stored hashes if it is a success, or null - */ -async function batchStoreOnNode( - targetNode: Snode, - params: Array, - method: 'batch' | 'sequence' -): Promise { - try { - const subRequests = await buildStoreRequests(params); - const asssociatedWith = (params[0] as any)?.pubkey as string | undefined; - if (!asssociatedWith) { - // not ideal - throw new Error('batchStoreOnNode first subrequest pubkey needs to be set'); - } - const result = await doSnodeBatchRequest( - subRequests, - targetNode, - 4000, - asssociatedWith, - method - ); - - if (!result || !result.length) { - window?.log?.warn( - `SessionSnodeAPI::requestSnodesForPubkeyWithTargetNodeRetryable - sessionRpc on ${targetNode.ip}:${targetNode.port} returned falsish value`, - result - ); - throw new Error('requestSnodesForPubkeyWithTargetNodeRetryable: Invalid result'); - } - - const firstResult = result[0]; - - if (firstResult.code !== 200) { - window?.log?.warn('first result status is not 200 for storeOnNode but: ', firstResult.code); - throw new Error('storeOnNode: Invalid status code'); - } - - GetNetworkTime.handleTimestampOffsetFromNetwork('store', firstResult.body.t); - - return result; - } catch (e) { - window?.log?.warn('store - send error:', e, `destination ${targetNode.ip}:${targetNode.port}`); - throw e; - } -} - -export const SnodeAPIStore = { batchStoreOnNode }; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index f0e283f006..9c63947109 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -26,6 +26,7 @@ import * as snodePool from './snodePool'; import { ConversationModel } from '../../../models/conversation'; import { ConversationTypeEnum } from '../../../models/conversationAttributes'; +import { EnvelopePlus } from '../../../receiver/types'; import { updateIsOnline } from '../../../state/ducks/onion'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { @@ -40,7 +41,7 @@ import { StringUtils, UserUtils } from '../../utils'; import { sleepFor } from '../../utils/Promise'; import { PreConditionFailed } from '../../utils/errors'; import { LibSessionUtil } from '../../utils/libsession/libsession_utils'; -import { SnodeNamespace, SnodeNamespaces, UserConfigNamespaces } from './namespaces'; +import { SnodeNamespace, SnodeNamespaces, SnodeNamespacesUserConfig } from './namespaces'; import { PollForGroup, PollForLegacy, PollForUs } from './pollingTypes'; import { SnodeAPIRetrieve } from './retrieveRequest'; import { SwarmPollingGroupConfig } from './swarm_polling_config/SwarmPollingGroupConfig'; @@ -596,11 +597,8 @@ export class SwarmPolling { const closedGroupsOnly = convos.filter( (c: ConversationModel) => - (c.isClosedGroupV2() && - !c.isBlocked() && - !c.isKickedFromGroup() && - c.isApproved()) || - (c.isClosedGroup() && !c.isBlocked() && !c.isKickedFromGroup() ) + (c.isClosedGroupV2() && !c.isBlocked() && !c.isKickedFromGroup() && c.isApproved()) || + (c.isClosedGroup() && !c.isBlocked() && !c.isKickedFromGroup()) ); closedGroupsOnly.forEach(c => { @@ -637,7 +635,7 @@ export class SwarmPolling { // eslint-disable-next-line consistent-return public getNamespacesToPollFrom(type: ConversationTypeEnum) { if (type === ConversationTypeEnum.PRIVATE) { - const toRet: Array = [ + const toRet: Array = [ SnodeNamespaces.Default, SnodeNamespaces.UserProfile, SnodeNamespaces.UserContacts, @@ -796,7 +794,10 @@ function filterMessagesPerTypeOfConvo( } } -async function decryptForGroupV2(retrieveResult: { groupPk: string; content: Uint8Array }) { +async function decryptForGroupV2(retrieveResult: { + groupPk: string; + content: Uint8Array; +}): Promise { window?.log?.info('received closed group message v2'); try { const groupPk = retrieveResult.groupPk; @@ -822,7 +823,6 @@ async function decryptForGroupV2(retrieveResult: { groupPk: string; content: Uin timestamp: parsedEnvelope.timestamp, }; } catch (e) { - debugger; window.log.warn('failed to decrypt message with error: ', e.message); return null; } @@ -844,6 +844,7 @@ async function handleMessagesForGroupV2( throw new Error('decryptForGroupV2 returned empty envelope'); } + console.warn('envelopePlus', envelopePlus); // this is the processing of the message itself, which can be long. // We allow 1 minute per message at most, which should be plenty await Receiver.handleSwarmContentDecryptedWithTimeout({ diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index 2f1e77288a..b87b241835 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -1,5 +1,4 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import { PubKey } from '../../types'; import { SnodeNamespaces } from './namespaces'; import { SubaccountRevokeSubRequest, SubaccountUnrevokeSubRequest } from './SnodeRequestTypes'; @@ -29,16 +28,6 @@ export type RetrieveRequestResult = { }; export type WithMessagesHashes = { messagesHashes: Array }; -export type DeleteMessageByHashesGroupSubRequest = WithMessagesHashes & { - pubkey: GroupPubkeyType; - method: 'delete'; -}; - -export type DeleteMessageByHashesUserSubRequest = WithMessagesHashes & { - pubkey: PubkeyType; - method: 'delete'; -}; - export type RetrieveMessagesResultsBatched = Array; export type WithTimestamp = { timestamp: number }; @@ -51,12 +40,6 @@ export type WithRevokeSubRequest = { revokeSubRequest: SubaccountRevokeSubRequest | null; unrevokeSubRequest: SubaccountUnrevokeSubRequest | null; }; -export type WithMessagesToDeleteSubRequest = { - messagesToDelete: - | DeleteMessageByHashesUserSubRequest - | DeleteMessageByHashesGroupSubRequest - | null; -}; export type SignedHashesParams = WithSignature & { pubkey: PubkeyType; @@ -69,12 +52,6 @@ export type SignedGroupHashesParams = WithSignature & { messages: Array; }; -export function isDeleteByHashesGroup( - request: DeleteMessageByHashesUserSubRequest | DeleteMessageByHashesGroupSubRequest -): request is DeleteMessageByHashesGroupSubRequest { - return PubKey.is03Pubkey(request.pubkey); -} - /** inherits from https://api.oxen.io/storage-rpc/#/recursive?id=recursive but we only care about these values */ export type ExpireMessageResultItem = WithSignature & { /** the expiry timestamp that was applied (which might be different from the request expiry */ diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 56dcdc852f..2c4d2983e8 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -43,16 +43,6 @@ import { GroupUpdateInviteMessage } from '../messages/outgoing/controlMessage/gr import { GroupUpdatePromoteMessage } from '../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; -type ClosedGroupMessageType = - | ClosedGroupVisibleMessage - | ClosedGroupAddedMembersMessage - | ClosedGroupRemovedMembersMessage - | ClosedGroupNameChangeMessage - | ClosedGroupMemberLeftMessage - | ExpirationTimerUpdateMessage - | ClosedGroupEncryptionPairMessage - | UnsendMessage; - // ClosedGroupEncryptionPairReplyMessage must be sent to a user pubkey. Not a group. export class MessageQueue { @@ -96,7 +86,7 @@ export class MessageQueue { blinded: boolean; filesToLink: Array; }) { - // Skipping the queue for Open Groups v2; the message is sent directly + // Skipping the MessageQueue for Open Groups v2; the message is sent directly try { // NOTE Reactions are handled separately @@ -132,7 +122,7 @@ export class MessageQueue { `Failed to send message to open group: ${roomInfos.serverUrl}:${roomInfos.roomId}:`, e ); - await MessageSentHandler.handleMessageSentFailure( + await MessageSentHandler.handlePublicMessageSentFailure( message, e || new Error('Failed to send message to open group.') ); @@ -172,7 +162,7 @@ export class MessageQueue { `Failed to send message to open group: ${roomInfos.serverUrl}:${roomInfos.roomId}:`, e.message ); - await MessageSentHandler.handleMessageSentFailure( + await MessageSentHandler.handlePublicMessageSentFailure( message, e || new Error('Failed to send message to open group.') ); @@ -189,7 +179,15 @@ export class MessageQueue { groupPubKey, sentCb, }: { - message: ClosedGroupMessageType; + message: + | ClosedGroupVisibleMessage + | ClosedGroupAddedMembersMessage + | ClosedGroupRemovedMembersMessage + | ClosedGroupNameChangeMessage + | ClosedGroupMemberLeftMessage + | ExpirationTimerUpdateMessage + | ClosedGroupEncryptionPairMessage + | UnsendMessage; namespace: SnodeNamespacesLegacyGroup; sentCb?: (message: OutgoingRawMessage) => Promise; groupPubKey?: PubKey; @@ -251,6 +249,7 @@ export class MessageQueue { message, namespace: message.namespace, pubkey: PubKey.cast(message.destination), + isSyncMessage: false, }); } @@ -271,6 +270,7 @@ export class MessageQueue { message, namespace, pubkey: PubKey.cast(destination), + isSyncMessage: false, }); } @@ -314,7 +314,7 @@ export class MessageQueue { | GroupUpdatePromoteMessage; namespace: SnodeNamespaces.Default; }): Promise { - return this.sendToPubKeyNonDurably({ message, namespace, pubkey }); + return this.sendToPubKeyNonDurably({ message, namespace, pubkey, isSyncMessage: false }); } /** @@ -326,30 +326,55 @@ export class MessageQueue { namespace, message, pubkey, + isSyncMessage, }: { pubkey: PubKey; message: ContentMessage; namespace: SnodeNamespaces; + isSyncMessage: boolean; }): Promise { - let rawMessage; + const rawMessage = await MessageUtils.toRawMessage(pubkey, message, namespace); + return this.sendSingleMessageAndHandleResult({ rawMessage, isSyncMessage }); + } + + private async sendSingleMessageAndHandleResult({ + rawMessage, + isSyncMessage, + }: { + rawMessage: OutgoingRawMessage; + isSyncMessage: boolean; + }) { try { - rawMessage = await MessageUtils.toRawMessage(pubkey, message, namespace); - const { wrappedEnvelope, effectiveTimestamp } = await MessageSender.send({ + const { wrappedEnvelope, effectiveTimestamp } = await MessageSender.sendSingleMessage({ message: rawMessage, - isSyncMessage: false, + isSyncMessage, }); - await MessageSentHandler.handleMessageSentSuccess( + + await MessageSentHandler.handleSwarmMessageSentSuccess( rawMessage, effectiveTimestamp, wrappedEnvelope ); + const cb = this.pendingMessageCache.callbacks.get(rawMessage.identifier); + + if (cb) { + await cb(rawMessage); + } + this.pendingMessageCache.callbacks.delete(rawMessage.identifier); + return effectiveTimestamp; } catch (error) { - window.log.error('failed to send message with: ', error.message); + window.log.error( + 'sendSingleMessageAndHandleResult: failed to send message with: ', + error.message + ); if (rawMessage) { - await MessageSentHandler.handleMessageSentFailure(rawMessage, error); + await MessageSentHandler.handleSwarmMessageSentFailure(rawMessage, error); } return null; + } finally { + // Remove from the cache because retrying is done in the sender + void this.pendingMessageCache.remove(rawMessage); } } @@ -368,30 +393,7 @@ export class MessageQueue { if (!jobQueue.has(messageId)) { // We put the event handling inside this job to avoid sending duplicate events const job = async () => { - try { - const { wrappedEnvelope, effectiveTimestamp } = await MessageSender.send({ - message, - isSyncMessage, - }); - - await MessageSentHandler.handleMessageSentSuccess( - message, - effectiveTimestamp, - wrappedEnvelope - ); - - const cb = this.pendingMessageCache.callbacks.get(message.identifier); - - if (cb) { - await cb(message); - } - this.pendingMessageCache.callbacks.delete(message.identifier); - } catch (error) { - void MessageSentHandler.handleMessageSentFailure(message, error); - } finally { - // Remove from the cache because retrying is done in the sender - void this.pendingMessageCache.remove(message); - } + await this.sendSingleMessageAndHandleResult({ rawMessage: message, isSyncMessage }); }; await jobQueue.addWithId(messageId, job); } @@ -420,9 +422,8 @@ export class MessageQueue { isGroup = false ): Promise { // Don't send to ourselves - const us = UserUtils.getOurPubKeyFromCache(); let isSyncMessage = false; - if (us && destinationPk.isEqual(us)) { + if (UserUtils.isUsFromCache(destinationPk)) { // We allow a message for ourselves only if it's a ClosedGroupNewMessage, // or a message with a syncTarget set. diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 24f619aef3..ce29174719 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -1,12 +1,12 @@ // REMOVE COMMENT AFTER: This can just export pure functions as it doesn't need state import { AbortController } from 'abort-controller'; -import ByteBuffer from 'bytebuffer'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import { compact, isEmpty, isNumber, isString, sample } from 'lodash'; +import { compact, isArray, isEmpty, isNumber, isString } from 'lodash'; import pRetry from 'p-retry'; -import { Data } from '../../data/data'; +import { Data, SeenMessageHashes } from '../../data/data'; import { SignalService } from '../../protobuf'; +import { assertUnreachable } from '../../types/sqlSharedTypes'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil'; import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2'; @@ -15,11 +15,31 @@ import { sendSogsMessageOnionV4, } from '../apis/open_group_api/sogsv3/sogsV3SendMessage'; import { + BuiltSnodeSubRequests, + DeleteAllFromUserNodeSubRequest, + DeleteHashesFromGroupNodeSubRequest, + DeleteHashesFromUserNodeSubRequest, + GetExpiriesFromNodeSubRequest, + GetServiceNodesSubRequest, + MethodBatchType, + NetworkTimeSubRequest, NotEmptyArrayOfBatchResults, - StoreOnNodeData, - StoreOnNodeParams, - StoreOnNodeParamsNoSig, + OnsResolveSubRequest, + RawSnodeSubRequests, + RetrieveGroupSubRequest, + RetrieveLegacyClosedGroupSubRequest, + RetrieveUserSubRequest, + StoreGroupConfigOrMessageSubRequest, + StoreLegacyGroupMessageSubRequest, + StoreUserConfigSubRequest, + StoreUserMessageSubRequest, + SubaccountRevokeSubRequest, + SubaccountUnrevokeSubRequest, + SwarmForSubRequest, + UpdateExpiryOnNodeGroupSubRequest, + UpdateExpiryOnNodeUserSubRequest, } from '../apis/snode_api/SnodeRequestTypes'; +import { doUnsignedSnodeBatchRequest } from '../apis/snode_api/batchRequest'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; import { @@ -28,8 +48,7 @@ import { SnodeGroupSignature, } from '../apis/snode_api/signature/groupSignature'; import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/signature/snodeSignatures'; -import { getSwarmFor } from '../apis/snode_api/snodePool'; -import { SnodeAPIStore } from '../apis/snode_api/storeMessage'; +import { getNodeFromSwarmOrThrow } from '../apis/snode_api/snodePool'; import { WithMessagesHashes, WithRevokeSubRequest } from '../apis/snode_api/types'; import { TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; @@ -44,7 +63,6 @@ import { PubKey } from '../types'; import { OutgoingRawMessage } from '../types/RawMessage'; import { UserUtils } from '../utils'; import { fromUInt8ArrayToBase64 } from '../utils/String'; -import { EmptySwarmError } from '../utils/errors'; // ================ SNODE STORE ================ @@ -70,7 +88,7 @@ function isContentSyncMessage(message: ContentMessage) { * @param attempts The amount of times to attempt sending. Minimum value is 1. */ -async function send({ +async function sendSingleMessage({ message, retryMinTimeout = 100, attempts = 3, @@ -111,9 +129,6 @@ async function send({ found.set({ sent_at: encryptedAndWrapped.networkTimestamp }); await found.commit(); } - let foundMessage = encryptedAndWrapped.identifier - ? await Data.getMessageById(encryptedAndWrapped.identifier) - : null; const isSyncedDeleteAfterReadMessage = found && @@ -129,63 +144,74 @@ async function send({ overridenTtl = asMs; } - const batchResult = await MessageSender.sendMessagesDataToSnode( - [ - { - pubkey: destination, - data64: encryptedAndWrapped.data64, - ttl: overridenTtl, - timestamp: encryptedAndWrapped.networkTimestamp, + const subRequests: Array = []; + if ( + SnodeNamespace.isUserConfigNamespace(encryptedAndWrapped.namespace) && + PubKey.is05Pubkey(destination) + ) { + subRequests.push( + new StoreUserConfigSubRequest({ + encryptedData: encryptedAndWrapped.encryptedAndWrappedData, namespace: encryptedAndWrapped.namespace, - }, - ], - destination, - { messagesHashes: [], revokeSubRequest: null, unrevokeSubRequest: null }, - 'batch' - ); + ttlMs: overridenTtl, + }) + ); + } else if ( + encryptedAndWrapped.namespace === SnodeNamespaces.Default && + PubKey.is05Pubkey(destination) + ) { + subRequests.push( + new StoreUserMessageSubRequest({ + encryptedData: encryptedAndWrapped.encryptedAndWrappedData, + dbMessageIdentifier: encryptedAndWrapped.identifier || null, + ttlMs: overridenTtl, + destination, + }) + ); + } else if ( + SnodeNamespace.isGroupConfigNamespace(encryptedAndWrapped.namespace) && + PubKey.is03Pubkey(destination) + ) { + subRequests.push( + new StoreGroupConfigOrMessageSubRequest({ + encryptedData: encryptedAndWrapped.encryptedAndWrappedData, + namespace: encryptedAndWrapped.namespace, + ttlMs: overridenTtl, + groupPk: destination, + dbMessageIdentifier: encryptedAndWrapped.identifier || null, + }) + ); + } else if ( + encryptedAndWrapped.namespace === SnodeNamespaces.ClosedGroupMessages && + PubKey.is03Pubkey(destination) + ) { + subRequests.push( + new StoreGroupConfigOrMessageSubRequest({ + encryptedData: encryptedAndWrapped.encryptedAndWrappedData, + namespace: encryptedAndWrapped.namespace, + ttlMs: overridenTtl, + groupPk: destination, + dbMessageIdentifier: encryptedAndWrapped.identifier || null, + }) + ); + } else { + window.log.error('unhandled sendSingleMessage case'); + throw new Error('unhandled sendSingleMessage case'); + } - const isDestinationClosedGroup = ConvoHub.use().get(recipient.key)?.isClosedGroup(); - const storedAt = batchResult?.[0]?.body?.t; - const storedHash = batchResult?.[0]?.body?.hash; + const targetNode = await getNodeFromSwarmOrThrow(destination); - if ( - batchResult && - !isEmpty(batchResult) && - batchResult[0].code === 200 && - !isEmpty(storedHash) && - isString(storedHash) && - isNumber(storedAt) - ) { - // TODO: the expiration is due to be returned by the storage server on "store" soon, we will then be able to use it instead of doing the storedAt + ttl logic below - // if we have a hash and a storedAt, mark it as seen so we don't reprocess it on the next retrieve - await Data.saveSeenMessageHashes([ - { - expiresAt: encryptedAndWrapped.networkTimestamp + TTL_DEFAULT.CONTENT_MESSAGE, // non config msg expire at TTL_MAX at most - hash: storedHash, - }, - ]); - // If message also has a sync message, save that hash. Otherwise save the hash from the regular message send i.e. only closed groups in this case. + const batchResult = await doUnsignedSnodeBatchRequest( + subRequests, + targetNode, + 6000, + destination + ); - if ( - encryptedAndWrapped.identifier && - (encryptedAndWrapped.isSyncMessage || isDestinationClosedGroup) - ) { - // get a fresh copy of the message from the DB - foundMessage = await Data.getMessageById(encryptedAndWrapped.identifier); - if (foundMessage) { - await foundMessage.updateMessageHash(storedHash); - await foundMessage.commit(); - window?.log?.info( - `updated message ${foundMessage.get('id')} with hash: ${foundMessage.get( - 'messageHash' - )}` - ); - } - } - } + await handleBatchResultWithSubRequests({ batchResult, subRequests, destination }); return { - wrappedEnvelope: encryptedAndWrapped.data, + wrappedEnvelope: encryptedAndWrapped.encryptedAndWrappedData, effectiveTimestamp: encryptedAndWrapped.networkTimestamp, }; }, @@ -198,11 +224,11 @@ async function send({ } async function getSignatureParamsFromNamespace( - item: StoreOnNodeParamsNoSig, + { namespace }: { namespace: SnodeNamespaces }, destination: string ): Promise { const store = 'store' as const; - if (SnodeNamespace.isUserConfigNamespace(item.namespace)) { + if (SnodeNamespace.isUserConfigNamespace(namespace)) { const ourPrivKey = (await UserUtils.getUserED25519KeyPairBytes())?.privKeyBytes; if (!ourPrivKey) { throw new Error( @@ -211,14 +237,14 @@ async function getSignatureParamsFromNamespace( } return SnodeSignature.getSnodeSignatureParamsUs({ method: store, - namespace: item.namespace, + namespace, }); } if ( - SnodeNamespace.isGroupConfigNamespace(item.namespace) || - item.namespace === SnodeNamespaces.ClosedGroupMessages || - item.namespace === SnodeNamespaces.ClosedGroupRevokedRetrievableMessages + SnodeNamespace.isGroupConfigNamespace(namespace) || + namespace === SnodeNamespaces.ClosedGroupMessages || + namespace === SnodeNamespaces.ClosedGroupRevokedRetrievableMessages ) { if (!PubKey.is03Pubkey(destination)) { throw new Error( @@ -228,7 +254,7 @@ async function getSignatureParamsFromNamespace( const found = await UserGroupsWrapperActions.getGroup(destination); return SnodeGroupSignature.getSnodeGroupSignature({ method: store, - namespace: item.namespace, + namespace, group: found, }); } @@ -236,97 +262,138 @@ async function getSignatureParamsFromNamespace( return {}; } -async function signDeleteHashesRequest( - destination: PubkeyType | GroupPubkeyType, - messagesHashes: Array -) { - if (isEmpty(messagesHashes)) { - return null; - } - const signedRequest = messagesHashes - ? PubKey.is03Pubkey(destination) - ? await SnodeGroupSignature.getGroupSignatureByHashesParams({ - messagesHashes, - pubkey: destination, - method: 'delete', - }) - : await SnodeSignature.getSnodeSignatureByHashesParams({ - messagesHashes, - pubkey: destination, - method: 'delete', - }) - : null; - - return signedRequest || null; +async function signSubRequests( + params: Array +): Promise> { + const signedRequests: Array = await Promise.all( + params.map(p => { + if ( + p instanceof SubaccountRevokeSubRequest || + p instanceof SubaccountUnrevokeSubRequest || + p instanceof DeleteHashesFromUserNodeSubRequest || + p instanceof DeleteHashesFromGroupNodeSubRequest || + p instanceof DeleteAllFromUserNodeSubRequest || + p instanceof StoreGroupConfigOrMessageSubRequest || + p instanceof StoreLegacyGroupMessageSubRequest || + p instanceof StoreUserConfigSubRequest || + p instanceof StoreUserMessageSubRequest || + p instanceof RetrieveUserSubRequest || + p instanceof RetrieveGroupSubRequest || + p instanceof UpdateExpiryOnNodeUserSubRequest || + p instanceof UpdateExpiryOnNodeGroupSubRequest || + p instanceof GetExpiriesFromNodeSubRequest + ) { + return p.buildAndSignParameters(); + } + + if ( + p instanceof RetrieveLegacyClosedGroupSubRequest || + p instanceof SwarmForSubRequest || + p instanceof OnsResolveSubRequest || + p instanceof GetServiceNodesSubRequest || + p instanceof NetworkTimeSubRequest + ) { + return p.build(); + } + + assertUnreachable( + p, + 'If you see this error, you need to add the handling of the rawRequest above' + ); + throw new Error( + 'If you see this error, you need to add the handling of the rawRequest above' + ); + }) + ); + + return signedRequests; } async function sendMessagesDataToSnode( - params: Array, - destination: PubkeyType | GroupPubkeyType, + storeRequests: Array< + | StoreGroupConfigOrMessageSubRequest + | StoreUserConfigSubRequest + | StoreUserMessageSubRequest + | StoreLegacyGroupMessageSubRequest + >, + asssociatedWith: PubkeyType | GroupPubkeyType, { messagesHashes: messagesToDelete, revokeSubRequest, unrevokeSubRequest, }: WithMessagesHashes & WithRevokeSubRequest, - method: 'batch' | 'sequence' + method: MethodBatchType ): Promise { - const rightDestination = params.filter(m => m.pubkey === destination); - - const swarm = await getSwarmFor(destination); - - const withSigWhenRequired: Array = await Promise.all( - rightDestination.map(async item => { - // some namespaces require a signature to be added - const signOpts = await getSignatureParamsFromNamespace(item, destination); - - const store: StoreOnNodeParams = { - data: item.data64, - namespace: item.namespace, - pubkey: item.pubkey, - timestamp: item.timestamp, // sig_timestamp is unused and uneeded - ttl: item.ttl, - ...signOpts, - }; - return store; - }) - ); + if (!asssociatedWith) { + throw new Error('sendMessagesDataToSnode first subrequest pubkey needs to be set'); + } - const snode = sample(swarm); - if (!snode) { - throw new EmptySwarmError(destination, 'Ran out of swarm nodes to query'); + const deleteHashesSubRequest = !messagesToDelete.length + ? null + : PubKey.is05Pubkey(asssociatedWith) + ? new DeleteHashesFromUserNodeSubRequest({ messagesHashes: messagesToDelete }) + : new DeleteHashesFromGroupNodeSubRequest({ + messagesHashes: messagesToDelete, + groupPk: asssociatedWith, + }); + + if (storeRequests.some(m => m.destination !== asssociatedWith)) { + throw new Error( + 'sendMessagesDataToSnode tried to send batchrequest containing subrequest not for the right destination' + ); } - const signedDeleteHashesRequest = await signDeleteHashesRequest(destination, messagesToDelete); + const rawRequests = compact([ + ...storeRequests, + deleteHashesSubRequest, + revokeSubRequest, + unrevokeSubRequest, + ]); - try { - // No pRetry here as if this is a bad path it will be handled and retried in lokiOnionFetch. - const storeResults = await SnodeAPIStore.batchStoreOnNode( - snode, - compact([ - ...withSigWhenRequired, - signedDeleteHashesRequest, - revokeSubRequest, - unrevokeSubRequest, - ]), + const targetNode = await getNodeFromSwarmOrThrow(asssociatedWith); + try { + const storeResults = await doUnsignedSnodeBatchRequest( + rawRequests, + targetNode, + 4000, + asssociatedWith, method ); + if (!storeResults || !storeResults.length) { + window?.log?.warn( + `SessionSnodeAPI::doSnodeBatchRequest on ${targetNode.ip}:${targetNode.port} returned falsish value`, + storeResults + ); + throw new Error('doSnodeBatchRequest: Invalid result'); + } + + const firstResult = storeResults[0]; + + if (firstResult.code !== 200) { + window?.log?.warn( + 'first result status is not 200 for sendMessagesDataToSnode but: ', + firstResult.code + ); + throw new Error('sendMessagesDataToSnode: Invalid status code'); + } + + GetNetworkTime.handleTimestampOffsetFromNetwork('store', firstResult.body.t); + if (!isEmpty(storeResults)) { window?.log?.info( - `sendMessagesDataToSnode - Successfully stored messages to ${ed25519Str(destination)} via ${ - snode.ip - }:${snode.port} on namespaces: ${SnodeNamespace.toRoles( - rightDestination.map(m => m.namespace) - ).join(',')}` + `sendMessagesDataToSnode - Successfully stored messages to ${ed25519Str( + asssociatedWith + )} via ${targetNode.ip}:${targetNode.port}` ); } return storeResults; } catch (e) { - const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null'; + const snodeStr = targetNode ? `${targetNode.ip}:${targetNode.port}` : 'null'; window?.log?.warn( - `sendMessagesDataToSnode - "${e.code}:${e.message}" to ${destination} via snode:${snodeStr}` + `sendMessagesDataToSnode - "${e.code}:${e.message}" to ${asssociatedWith} via snode:${snodeStr}` ); throw e; } @@ -353,9 +420,8 @@ type EncryptAndWrapMessage = { } & SharedEncryptAndWrap; type EncryptAndWrapMessageResults = { - data64: string; networkTimestamp: number; - data: Uint8Array; + encryptedAndWrappedData: Uint8Array; namespace: number; } & SharedEncryptAndWrap; @@ -374,7 +440,7 @@ async function encryptForGroupV2( networkTimestamp, } = params; - const envelope = await wrapContentIntoEnvelope( + const envelope = wrapContentIntoEnvelope( SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, destination, networkTimestamp, @@ -389,12 +455,9 @@ async function encryptForGroupV2( encryptionBasedOnConversation(recipient) ); - const data64 = ByteBuffer.wrap(cipherText).toString('base64'); - return { - data64, networkTimestamp, - data: cipherText, + encryptedAndWrappedData: cipherText, namespace, ttl, identifier, @@ -429,19 +492,17 @@ async function encryptMessageAndWrap( encryptionBasedOnConversation(recipient) ); - const envelope = await wrapContentIntoEnvelope( + const envelope = wrapContentIntoEnvelope( envelopeType, recipient.key, networkTimestamp, cipherText ); const data = wrapEnvelopeInWebSocketMessage(envelope); - const data64 = ByteBuffer.wrap(data).toString('base64'); return { - data64, + encryptedAndWrappedData: data, networkTimestamp, - data, namespace, ttl, identifier, @@ -457,7 +518,6 @@ async function encryptMessagesAndWrap( /** * Send an array of preencrypted data to the corresponding swarm. - * Used currently only for sending libsession GroupInfo, GroupMembers and groupKeys config updates. * * @param params the data to deposit * @param destination the pubkey we should deposit those message to @@ -465,12 +525,12 @@ async function encryptMessagesAndWrap( */ async function sendEncryptedDataToSnode({ destination, - encryptedData, + storeRequests, messagesHashesToDelete, revokeSubRequest, unrevokeSubRequest, }: WithRevokeSubRequest & { - encryptedData: Array; + storeRequests: Array; destination: GroupPubkeyType | PubkeyType; messagesHashesToDelete: Set | null; }): Promise { @@ -478,13 +538,7 @@ async function sendEncryptedDataToSnode({ const batchResults = await pRetry( async () => { return MessageSender.sendMessagesDataToSnode( - encryptedData.map(content => ({ - pubkey: destination, - data64: ByteBuffer.wrap(content.data).toString('base64'), - ttl: content.ttl, - timestamp: content.networkTimestamp, - namespace: content.namespace, - })), + storeRequests, destination, { messagesHashes: [...(messagesHashesToDelete || [])], @@ -513,12 +567,12 @@ async function sendEncryptedDataToSnode({ } } -async function wrapContentIntoEnvelope( +function wrapContentIntoEnvelope( type: SignalService.Envelope.Type, sskSource: string | undefined, timestamp: number, content: Uint8Array -): Promise { +): SignalService.Envelope { let source: string | undefined; if (type === SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE) { @@ -612,7 +666,76 @@ export const MessageSender = { sendEncryptedDataToSnode, getMinRetryTimeout, sendToOpenGroupV2, - send, + sendSingleMessage, isContentSyncMessage, wrapContentIntoEnvelope, + getSignatureParamsFromNamespace, + signSubRequests, }; + +async function handleBatchResultWithSubRequests({ + batchResult, + destination, + subRequests, +}: { + batchResult: NotEmptyArrayOfBatchResults; + subRequests: Array; + destination: string; +}) { + const isDestinationClosedGroup = ConvoHub.use().get(destination)?.isClosedGroup(); + if (!batchResult || !isArray(batchResult) || isEmpty(batchResult)) { + window.log.error('handleBatchResultWithSubRequests: invalid batch result '); + return; + } + const us = UserUtils.getOurPubKeyStrFromCache(); + + const seenHashes: Array = []; + for (let index = 0; index < subRequests.length; index++) { + const subRequest = subRequests[index]; + + // there are some stuff we need to do when storing a message (for a group/legacy group or user, but no config messages) + if ( + subRequest instanceof StoreGroupConfigOrMessageSubRequest || + subRequest instanceof StoreLegacyGroupMessageSubRequest || + subRequest instanceof StoreUserMessageSubRequest + ) { + const storedAt = batchResult?.[index]?.body?.t; + const storedHash = batchResult?.[index]?.body?.hash; + const subRequestStatusCode = batchResult?.[index]?.code; + + // TODO: the expiration is due to be returned by the storage server on "store" soon, we will then be able to use it instead of doing the storedAt + ttl logic below + // if we have a hash and a storedAt, mark it as seen so we don't reprocess it on the next retrieve + + if ( + subRequestStatusCode === 200 && + !isEmpty(storedHash) && + isString(storedHash) && + isNumber(storedAt) + ) { + seenHashes.push({ + expiresAt: GetNetworkTime.now() + TTL_DEFAULT.CONTENT_MESSAGE, // non config msg expire at CONTENT_MESSAGE at most + hash: storedHash, + }); + + // We need to store the hash of our synced message when for a 1o1. (as this is the one stored on our swarm) + // For groups, we can just store that hash directly as the group's swarm is hosting all of the group messages + + if ( + subRequest.dbMessageIdentifier && + (subRequest.destination === us || isDestinationClosedGroup) + ) { + // get a fresh copy of the message from the DB + /* eslint-disable no-await-in-loop */ + const foundMessage = await Data.getMessageById(subRequest.dbMessageIdentifier); + if (foundMessage) { + await foundMessage.updateMessageHash(storedHash); + await foundMessage.commit(); + window?.log?.info(`updated message ${foundMessage.get('id')} with hash: ${storedHash}`); + } + /* eslint-enable no-await-in-loop */ + } + } + } + } + await Data.saveSeenMessageHashes(seenHashes); +} diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts index 5601fab685..2683d1246b 100644 --- a/ts/session/sending/MessageSentHandler.ts +++ b/ts/session/sending/MessageSentHandler.ts @@ -1,4 +1,4 @@ -import _ from 'lodash'; +import { union } from 'lodash'; import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; import { PnServer } from '../apis/push_notification_api'; @@ -41,7 +41,27 @@ async function handlePublicMessageSentSuccess( } } -async function handleMessageSentSuccess( +async function handlePublicMessageSentFailure(sentMessage: OpenGroupVisibleMessage, error: any) { + const fetchedMessage = await fetchHandleMessageSentData(sentMessage.identifier); + if (!fetchedMessage) { + return; + } + + if (error instanceof Error) { + await fetchedMessage.saveErrors(error); + } + + // always mark the message as sent. + // the fact that we have errors on the sent is based on the saveErrors() + fetchedMessage.set({ + sent: true, + }); + + await fetchedMessage.commit(); + await fetchedMessage.getConversation()?.updateLastMessage(); +} + +async function handleSwarmMessageSentSuccess( sentMessage: OutgoingRawMessage, effectiveTimestamp: number, wrappedEnvelope?: Uint8Array @@ -86,16 +106,10 @@ async function handleMessageSentSuccess( const hasBodyOrAttachments = Boolean( dataMessage && (dataMessage.body || (dataMessage.attachments && dataMessage.attachments.length)) ); - const shouldNotifyPushServer = hasBodyOrAttachments && !isOurDevice; - - if (shouldNotifyPushServer) { - // notify the push notification server if needed - if (!wrappedEnvelope) { - window?.log?.warn('Should send PN notify but no wrapped envelope set.'); - } else { - // we do not really care about the result, neither of waiting for it - void PnServer.notifyPnServer(wrappedEnvelope, sentMessage.device); - } + + if (hasBodyOrAttachments && !isOurDevice && wrappedEnvelope) { + // we do not really care about the result, neither of waiting for it + void PnServer.notifyPnServer(wrappedEnvelope, sentMessage.device); } // Handle the sync logic here @@ -119,7 +133,7 @@ async function handleMessageSentSuccess( fetchedMessage.set({ synced: true }); } - sentTo = _.union(sentTo, [sentMessage.device]); + sentTo = union(sentTo, [sentMessage.device]); fetchedMessage.set({ sent_to: sentTo, @@ -133,10 +147,7 @@ async function handleMessageSentSuccess( fetchedMessage.getConversation()?.updateLastMessage(); } -async function handleMessageSentFailure( - sentMessage: OutgoingRawMessage | OpenGroupVisibleMessage, - error: any -) { +async function handleSwarmMessageSentFailure(sentMessage: OutgoingRawMessage, error: any) { const fetchedMessage = await fetchHandleMessageSentData(sentMessage.identifier); if (!fetchedMessage) { return; @@ -168,7 +179,7 @@ async function handleMessageSentFailure( expirationStartTimestamp: undefined, }); window.log.warn( - `[handleMessageSentFailure] Stopping a message from disppearing until we retry the send operation. messageId: ${fetchedMessage.get( + `[handleSwarmMessageSentFailure] Stopping a message from disppearing until we retry the send operation. messageId: ${fetchedMessage.get( 'id' )}` ); @@ -198,6 +209,7 @@ async function fetchHandleMessageSentData(messageIdentifier: string) { export const MessageSentHandler = { handlePublicMessageSentSuccess, - handleMessageSentSuccess, - handleMessageSentFailure, + handlePublicMessageSentFailure, + handleSwarmMessageSentFailure, + handleSwarmMessageSentSuccess, }; diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index ffef1105c1..b9ca6b3695 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -537,13 +537,13 @@ export async function USER_callRecipient(recipient: string) { // Note: we do the sending of the preoffer manually as the sendTo1o1NonDurably rely on having a message saved to the db for MessageSentSuccess // which is not the case for a pre offer message (the message only exists in memory) - const rawMessage = await MessageUtils.toRawMessage( + const rawPreOffer = await MessageUtils.toRawMessage( PubKey.cast(recipient), preOfferMsg, SnodeNamespaces.Default ); - const { wrappedEnvelope } = await MessageSender.send({ - message: rawMessage, + const { wrappedEnvelope } = await MessageSender.sendSingleMessage({ + message: rawPreOffer, isSyncMessage: false, }); void PnServer.notifyPnServer(wrappedEnvelope, recipient); diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index c4025f395a..9b91221d24 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -6,7 +6,10 @@ import { SignalService } from '../../../../protobuf'; import { assertUnreachable } from '../../../../types/sqlSharedTypes'; import { isSignInByLinking } from '../../../../util/storage'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { StoreOnNodeData } from '../../../apis/snode_api/SnodeRequestTypes'; +import { + StoreGroupConfigOrMessageSubRequest, + StoreGroupExtraData, +} from '../../../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; import { WithRevokeSubRequest } from '../../../apis/snode_api/types'; @@ -70,29 +73,100 @@ async function confirmPushedAndDump( return LibSessionUtil.saveDumpsToDb(groupPk); } +async function storeGroupUpdateMessages({ + updateMessages, + groupPk, +}: WithGroupPubkey & { + updateMessages: Array; +}) { + if (!updateMessages.length) { + return true; + } + + const updateMessagesToEncrypt: Array = updateMessages.map(updateMessage => { + const wrapped = MessageSender.wrapContentIntoEnvelope( + SignalService.Envelope.Type.SESSION_MESSAGE, + undefined, + updateMessage.createAtNetworkTimestamp, // message is signed with this timestmap + updateMessage.plainTextBuffer() + ); + + return { + namespace: SnodeNamespaces.ClosedGroupMessages, + pubkey: groupPk, + ttl: TTL_DEFAULT.CONTENT_MESSAGE, + networkTimestamp: updateMessage.createAtNetworkTimestamp, + data: SignalService.Envelope.encode(wrapped).finish(), + dbMessageIdentifier: updateMessage.identifier, + }; + }); + + const encryptedUpdate = updateMessagesToEncrypt + ? await MetaGroupWrapperActions.encryptMessages( + groupPk, + updateMessagesToEncrypt.map(m => m.data) + ) + : []; + + const updateMessagesEncrypted = updateMessagesToEncrypt.map((requestDetails, index) => ({ + ...requestDetails, + data: encryptedUpdate[index], + })); + + const updateMessagesRequests = updateMessagesEncrypted.map(m => { + return new StoreGroupConfigOrMessageSubRequest({ + encryptedData: m.data, + groupPk, + namespace: m.namespace, + ttlMs: m.ttl, + dbMessageIdentifier: m.dbMessageIdentifier, + }); + }); + + const result = await MessageSender.sendEncryptedDataToSnode({ + storeRequests: [...updateMessagesRequests], + destination: groupPk, + messagesHashesToDelete: null, + revokeSubRequest: null, + unrevokeSubRequest: null, + }); + + const expectedReplyLength = updateMessagesRequests.length; // each of those messages are sent as a subrequest + + // we do a sequence call here. If we do not have the right expected number of results, consider it a failure + if (!isArray(result) || result.length !== expectedReplyLength) { + window.log.info( + `GroupSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` + ); + + // this might be a 421 error (already handled) so let's retry this request a little bit later + return false; + } + return true; +} + async function pushChangesToGroupSwarmIfNeeded({ revokeSubRequest, unrevokeSubRequest, - updateMessages, groupPk, supplementKeys, }: WithGroupPubkey & WithRevokeSubRequest & { supplementKeys: Array; - updateMessages: Array; }): Promise { // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc await LibSessionUtil.saveDumpsToDb(groupPk); - const { allOldHashes, messages } = await LibSessionUtil.pendingChangesForGroup(groupPk); + const { allOldHashes, messages: pendingConfigData } = + await LibSessionUtil.pendingChangesForGroup(groupPk); // If there are no pending changes then the job can just complete (next time something // is updated we want to try and run immediately so don't schedule another run in this case) - if (isEmpty(messages) && !supplementKeys.length) { + if (isEmpty(pendingConfigData) && !supplementKeys.length) { return RunJobResult.Success; } const networkTimestamp = GetNetworkTime.now(); - const encryptedMessage: Array = messages.map(item => { + const pendingConfigMsgs = pendingConfigData.map(item => { return { namespace: item.namespace, pubkey: groupPk, @@ -102,49 +176,58 @@ async function pushChangesToGroupSwarmIfNeeded({ }; }); - const extraMessagesToEncrypt: Array = []; - - if (supplementKeys.length) { - supplementKeys.forEach(key => - extraMessagesToEncrypt.push({ - namespace: SnodeNamespaces.ClosedGroupKeys, - pubkey: groupPk, - ttl: TTL_DEFAULT.CONFIG_MESSAGE, - networkTimestamp, - data: key, - }) - ); - } - - for (let index = 0; index < updateMessages.length; index++) { - const updateMessage = updateMessages[index]; - const wrapped = await MessageSender.wrapContentIntoEnvelope( - SignalService.Envelope.Type.SESSION_MESSAGE, - undefined, - networkTimestamp, - updateMessage.plainTextBuffer() - ); - extraMessagesToEncrypt.push({ - namespace: SnodeNamespaces.ClosedGroupMessages, - pubkey: groupPk, - ttl: TTL_DEFAULT.CONTENT_MESSAGE, - networkTimestamp, - data: SignalService.Envelope.encode(wrapped).finish(), - }); - } + const keysMessagesToEncrypt: Array = supplementKeys.map(key => ({ + namespace: SnodeNamespaces.ClosedGroupKeys, + pubkey: groupPk, + ttl: TTL_DEFAULT.CONFIG_MESSAGE, + networkTimestamp, + data: key, + dbMessageIdentifier: null, + })); - const encryptedData = await MetaGroupWrapperActions.encryptMessages( - groupPk, - extraMessagesToEncrypt.map(m => m.data) - ); + const keysEncrypted = keysMessagesToEncrypt + ? await MetaGroupWrapperActions.encryptMessages( + groupPk, + keysMessagesToEncrypt.map(m => m.data) + ) + : []; - const extraMessagesEncrypted = extraMessagesToEncrypt.map((requestDetails, index) => ({ + const keysEncryptedmessage = keysMessagesToEncrypt.map((requestDetails, index) => ({ ...requestDetails, - data: encryptedData[index], + data: keysEncrypted[index], })); + const pendingConfigRequests = pendingConfigMsgs.map(m => { + return new StoreGroupConfigOrMessageSubRequest({ + encryptedData: m.data, + groupPk, + namespace: m.namespace, + ttlMs: m.ttl, + dbMessageIdentifier: null, // those are config messages only, they have no dbMessageIdentifier + }); + }); + + const keysEncryptedRequests = keysEncryptedmessage.map(m => { + return new StoreGroupConfigOrMessageSubRequest({ + encryptedData: m.data, + groupPk, + namespace: m.namespace, + ttlMs: m.ttl, + dbMessageIdentifier: null, // those are supplemental keys messages only, they have no dbMessageIdentifier + }); + }); + + if ( + revokeSubRequest?.revokeTokenHex.length === 0 || + unrevokeSubRequest?.revokeTokenHex.length === 0 + ) { + throw new Error( + 'revokeSubRequest and unrevoke request must be null when not doing token change' + ); + } + const result = await MessageSender.sendEncryptedDataToSnode({ - encryptedData: [...encryptedMessage, ...extraMessagesEncrypted], + storeRequests: [...pendingConfigRequests, ...keysEncryptedRequests], destination: groupPk, messagesHashesToDelete: allOldHashes, revokeSubRequest, @@ -152,11 +235,11 @@ async function pushChangesToGroupSwarmIfNeeded({ }); const expectedReplyLength = - messages.length + // each of those messages are sent as a subrequest - extraMessagesEncrypted.length + // each of those messages are sent as a subrequest + pendingConfigRequests.length + // each of those messages are sent as a subrequest + keysEncryptedRequests.length + // each of those messages are sent as a subrequest (allOldHashes.size ? 1 : 0) + // we are sending all hashes changes as a single request - (revokeSubRequest?.revokeTokenHex.length ? 1 : 0) + // we are sending all revoke updates as a single request - (unrevokeSubRequest?.revokeTokenHex.length ? 1 : 0); // we are sending all revoke updates as a single request + (revokeSubRequest ? 1 : 0) + // we are sending all revoke updates as a single request + (unrevokeSubRequest ? 1 : 0); // we are sending all revoke updates as a single request // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { @@ -170,8 +253,9 @@ async function pushChangesToGroupSwarmIfNeeded({ const changes = LibSessionUtil.batchResultsToGroupSuccessfulChange(result, { allOldHashes, - messages, + messages: pendingConfigData, }); + if (isEmpty(changes)) { return RunJobResult.RetryJobIfPossible; } @@ -228,7 +312,6 @@ class GroupSyncJob extends PersistedJob { revokeSubRequest: null, unrevokeSubRequest: null, supplementKeys: [], - updateMessages: [], }); // eslint-disable-next-line no-useless-catch @@ -306,6 +389,7 @@ async function queueNewJobIfNeeded(groupPk: GroupPubkeyType) { export const GroupSync = { GroupSyncJob, pushChangesToGroupSwarmIfNeeded, + storeGroupUpdateMessages, queueNewJobIfNeeded: (groupPk: GroupPubkeyType) => allowOnlyOneAtATime(`GroupSyncJob-oneAtAtTime-${groupPk}`, () => queueNewJobIfNeeded(groupPk)), }; diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index 8475300380..ec98a727c3 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -7,8 +7,7 @@ import { ConfigDumpData } from '../../../../data/configDump/configDump'; import { UserSyncJobDone } from '../../../../shims/events'; import { isSignInByLinking } from '../../../../util/storage'; import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { StoreOnNodeData } from '../../../apis/snode_api/SnodeRequestTypes'; -import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; +import { StoreUserConfigSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; import { TTL_DEFAULT } from '../../../constants'; import { ConvoHub } from '../../../conversations'; import { MessageSender } from '../../../sending/MessageSender'; @@ -86,18 +85,17 @@ async function pushChangesToUserSwarmIfNeeded() { triggerConfSyncJobDone(); return RunJobResult.Success; } - const msgs: Array = changesToPush.messages.map(item => { - return { - namespace: item.namespace, - pubkey: us, - networkTimestamp: GetNetworkTime.now(), - ttl: TTL_DEFAULT.CONFIG_MESSAGE, - data: item.ciphertext, - }; + + const storeRequests = changesToPush.messages.map(m => { + return new StoreUserConfigSubRequest({ + encryptedData: m.ciphertext, + namespace: m.namespace, + ttlMs: TTL_DEFAULT.CONFIG_MESSAGE, + }); }); const result = await MessageSender.sendEncryptedDataToSnode({ - encryptedData: msgs, + storeRequests, destination: us, messagesHashesToDelete: changesToPush.allOldHashes, revokeSubRequest: null, diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 06c86f9d77..23d34e6bf4 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -20,7 +20,7 @@ import { BatchResultEntry, NotEmptyArrayOfBatchResults, } from '../../apis/snode_api/SnodeRequestTypes'; -import { SnodeNamespaces, UserConfigNamespaces } from '../../apis/snode_api/namespaces'; +import { SnodeNamespaces, SnodeNamespacesUserConfig } from '../../apis/snode_api/namespaces'; import { ed25519Str } from '../../onions/onionPath'; import { PubKey } from '../../types'; import { UserSync } from '../job_runners/jobs/UserSyncJob'; @@ -105,7 +105,7 @@ type PendingChangesShared = { export type PendingChangesForUs = PendingChangesShared & { seqno: Long; - namespace: UserConfigNamespaces; + namespace: SnodeNamespacesUserConfig; }; type PendingChangesForGroupNonKey = PendingChangesShared & { @@ -232,7 +232,7 @@ async function pendingChangesForGroup(groupPk: GroupPubkeyType): Promise }; type WithAddWithHistoryMembers = { withHistory: Array }; type WithRemoveMembers = { removed: Array }; -type WithFromCurrentDevice = { fromCurrentDevice: boolean }; // there are some changes we want to do only when the current user do the change, and not when a network change triggers it. type WithFromMemberLeftMessage = { fromMemberLeftMessage: boolean }; // there are some changes we want to skip when doing changes triggered from a memberLeft message. export type GroupState = { @@ -186,7 +184,6 @@ const initNewGroupInWrapper = createAsyncThunk( revokeSubRequest: null, unrevokeSubRequest: null, supplementKeys: [], - updateMessages: [], }); if (result !== RunJobResult.Success) { window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); @@ -511,13 +508,9 @@ async function handleRemoveMembersAndRekey({ groupPk, removed, secretKey, - fromCurrentDevice, fromMemberLeftMessage, -}: WithGroupPubkey & - WithRemoveMembers & - WithFromCurrentDevice & - WithFromMemberLeftMessage & { secretKey: Uint8Array }) { - if (!fromCurrentDevice || !removed.length) { +}: WithGroupPubkey & WithRemoveMembers & WithFromMemberLeftMessage & { secretKey: Uint8Array }) { + if (!removed.length) { return; } const createAtNetworkTimestamp = GetNetworkTime.now(); @@ -609,91 +602,112 @@ function getConvoExpireDetailsForMsg(convo: ConversationModel) { * Those are not going to change the state, they are just here as a "notification". * i.e. "Alice was removed from the group" */ -async function getUpdateMessagesToPush({ +async function getRemovedControlMessage({ convo, - withHistory, - withoutHistory, - fromCurrentDevice, groupPk, removed, adminSecretKey, createAtNetworkTimestamp, fromMemberLeftMessage, -}: WithAddWithHistoryMembers & - WithAddWithoutHistoryMembers & - WithFromMemberLeftMessage & + dbMsgIdentifier, +}: WithFromMemberLeftMessage & WithRemoveMembers & - WithFromCurrentDevice & WithGroupPubkey & { convo: ConversationModel; adminSecretKey: Uint8ArrayLen64; createAtNetworkTimestamp: number; + dbMsgIdentifier: string; }) { const sodium = await getSodiumRenderer(); - const updateMessages: Array = []; - - if (!fromCurrentDevice || fromMemberLeftMessage) { - return updateMessages; + if (fromMemberLeftMessage || !removed.length) { + return null; } - if (withoutHistory.length) { - updateMessages.push( - new GroupUpdateMemberChangeMessage({ - identifier: v4(), - added: withoutHistory, - groupPk, - typeOfChange: 'added', - createAtNetworkTimestamp, - secretKey: adminSecretKey, - sodium, - ...getConvoExpireDetailsForMsg(convo), - }) - ); - } - if (withHistory.length) { - updateMessages.push( - new GroupUpdateMemberChangeMessage({ - identifier: v4(), - added: withHistory, - groupPk, - typeOfChange: 'addedWithHistory', - createAtNetworkTimestamp, - secretKey: adminSecretKey, - sodium, - ...getConvoExpireDetailsForMsg(convo), - }) - ); + return new GroupUpdateMemberChangeMessage({ + identifier: dbMsgIdentifier, + removed, + groupPk, + typeOfChange: 'removed', + createAtNetworkTimestamp, + secretKey: adminSecretKey, + sodium, + ...getConvoExpireDetailsForMsg(convo), + }); +} + +async function getWithoutHistoryControlMessage({ + convo, + withoutHistory, + groupPk, + adminSecretKey, + createAtNetworkTimestamp, + dbMsgIdentifier, +}: WithAddWithoutHistoryMembers & + WithGroupPubkey & { + dbMsgIdentifier: string; + convo: ConversationModel; + adminSecretKey: Uint8ArrayLen64; + createAtNetworkTimestamp: number; + }) { + const sodium = await getSodiumRenderer(); + + if (!withoutHistory.length) { + return null; } - if (removed.length) { - updateMessages.push( - new GroupUpdateMemberChangeMessage({ - identifier: v4(), - removed, - groupPk, - typeOfChange: 'removed', - createAtNetworkTimestamp, - secretKey: adminSecretKey, - sodium, - ...getConvoExpireDetailsForMsg(convo), - }) - ); + + return new GroupUpdateMemberChangeMessage({ + identifier: dbMsgIdentifier, + added: withoutHistory, + groupPk, + typeOfChange: 'added', + createAtNetworkTimestamp, + secretKey: adminSecretKey, + sodium, + ...getConvoExpireDetailsForMsg(convo), + }); +} + +async function getWithHistoryControlMessage({ + convo, + withHistory, + groupPk, + adminSecretKey, + createAtNetworkTimestamp, + dbMsgIdentifier, +}: WithAddWithHistoryMembers & + WithGroupPubkey & { + dbMsgIdentifier: string; + convo: ConversationModel; + adminSecretKey: Uint8ArrayLen64; + createAtNetworkTimestamp: number; + }) { + const sodium = await getSodiumRenderer(); + + if (!withHistory.length) { + return null; } - // TODO might need to add the promote case here - return updateMessages; + return new GroupUpdateMemberChangeMessage({ + identifier: dbMsgIdentifier, + added: withHistory, + groupPk, + typeOfChange: 'addedWithHistory', + createAtNetworkTimestamp, + secretKey: adminSecretKey, + sodium, + ...getConvoExpireDetailsForMsg(convo), + }); } -async function handleMemberAddedFromUIOrNot({ +async function handleMemberAddedFromUI({ addMembersWithHistory, addMembersWithoutHistory, groupPk, - fromCurrentDevice, -}: WithFromCurrentDevice & - WithGroupPubkey & { - addMembersWithHistory: Array; - addMembersWithoutHistory: Array; - }) { +}: WithGroupPubkey & { + addMembersWithHistory: Array; + addMembersWithoutHistory: Array; +}) { const group = await UserGroupsWrapperActions.getGroup(groupPk); if (!group || !group.secretKey || isEmpty(group.secretKey)) { throw new Error('tried to make change to group but we do not have the admin secret key'); @@ -724,25 +738,12 @@ async function handleMemberAddedFromUIOrNot({ await handleWithoutHistoryMembers({ groupPk, withoutHistory }); const createAtNetworkTimestamp = GetNetworkTime.now(); - const updateMessages = await getUpdateMessagesToPush({ - adminSecretKey: group.secretKey, - convo, - fromCurrentDevice, - groupPk, - removed: [], - withHistory, - withoutHistory, - createAtNetworkTimestamp, - fromMemberLeftMessage: false, - }); - await LibSessionUtil.saveDumpsToDb(groupPk); // push new members & key supplement in a single batch call const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementKeys, - updateMessages, ...revokeUnrevokeParams, }); if (sequenceResult !== RunJobResult.Success) { @@ -774,22 +775,46 @@ async function handleMemberAddedFromUIOrNot({ : null, }, }; - const additionsWithoutHistory = updateMessages.find(m => m.typeOfChange === 'added'); - const additionsWithHistory = updateMessages.find(m => m.typeOfChange === 'addedWithHistory'); - if (additionsWithoutHistory) { - await ClosedGroup.addUpdateMessage({ - diff: { type: 'add', added: additionsWithoutHistory.memberSessionIds, withHistory: false }, + + const updateMessagesToPush: Array = []; + if (withHistory.length) { + const msgModel = await ClosedGroup.addUpdateMessage({ + diff: { type: 'add', added: withHistory, withHistory: false }, ...shared, }); + const groupChange = await getWithHistoryControlMessage({ + adminSecretKey: group.secretKey, + convo, + groupPk, + withHistory, + createAtNetworkTimestamp, + dbMsgIdentifier: msgModel.id, + }); + if (groupChange) { + updateMessagesToPush.push(groupChange); + } } - if (additionsWithHistory) { - await ClosedGroup.addUpdateMessage({ - diff: { type: 'add', added: additionsWithHistory.memberSessionIds, withHistory: true }, + if (withoutHistory.length) { + const msgModel = await ClosedGroup.addUpdateMessage({ + diff: { type: 'add', added: withoutHistory, withHistory: true }, ...shared, }); + const groupChange = await getWithoutHistoryControlMessage({ + adminSecretKey: group.secretKey, + convo, + groupPk, + withoutHistory, + createAtNetworkTimestamp, + dbMsgIdentifier: msgModel.id, + }); + if (groupChange) { + updateMessagesToPush.push(groupChange); + } + console.warn(`diff: { type: ' should add case for addWithHistory here ?`); } await convo.commit(); + await GroupSync.storeGroupUpdateMessages({ groupPk, updateMessages: updateMessagesToPush }); } /** @@ -797,13 +822,11 @@ async function handleMemberAddedFromUIOrNot({ * - to udpate the state when kicking a member from the group from the UI * - to update the state when handling a MEMBER_LEFT message */ -async function handleMemberRemovedFromUIOrNot({ +async function handleMemberRemovedFromUI({ groupPk, removeMembers, - fromCurrentDevice, fromMemberLeftMessage, -}: WithFromCurrentDevice & - WithFromMemberLeftMessage & +}: WithFromMemberLeftMessage & WithGroupPubkey & { removeMembers: Array; }) { @@ -812,7 +835,11 @@ async function handleMemberRemovedFromUIOrNot({ throw new Error('tried to make change to group but we do not have the admin secret key'); } - await checkWeAreAdminOrThrow(groupPk, 'handleMemberRemovedFromUIOrNot'); + await checkWeAreAdminOrThrow(groupPk, 'handleMemberRemovedFromUI'); + + if (removeMembers.length === 0) { + return; + } const { removed, convo, us } = validateMemberRemoveChange({ groupPk, @@ -833,30 +860,16 @@ async function handleMemberRemovedFromUIOrNot({ groupPk, removed, secretKey: group.secretKey, - fromCurrentDevice, fromMemberLeftMessage, }); const createAtNetworkTimestamp = GetNetworkTime.now(); - const updateMessages = await getUpdateMessagesToPush({ - adminSecretKey: group.secretKey, - convo, - fromCurrentDevice, - groupPk, - removed, - withHistory: [], - withoutHistory: [], - createAtNetworkTimestamp, - fromMemberLeftMessage, - }); - await LibSessionUtil.saveDumpsToDb(groupPk); // revoked pubkeys, update messages, and libsession groups config in a single batchcall const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - updateMessages, supplementKeys: [], ...revokeUnrevokeParams, }); @@ -887,26 +900,37 @@ async function handleMemberRemovedFromUIOrNot({ : null, }, }; + await convo.commit(); - const removals = updateMessages.find(m => m.typeOfChange === 'removed'); - - if (removals) { - await ClosedGroup.addUpdateMessage({ + if (removed.length) { + const msgModel = await ClosedGroup.addUpdateMessage({ diff: { type: 'kicked', kicked: removed }, ...shared, }); + const removedControlMessage = await getRemovedControlMessage({ + adminSecretKey: group.secretKey, + convo, + groupPk, + removed, + createAtNetworkTimestamp, + fromMemberLeftMessage, + dbMsgIdentifier: msgModel.id, + }); + if (removedControlMessage) { + await GroupSync.storeGroupUpdateMessages({ + groupPk, + updateMessages: [removedControlMessage], + }); + } } - await convo.commit(); } async function handleNameChangeFromUI({ groupPk, newName: uncheckedName, - fromCurrentDevice, -}: WithFromCurrentDevice & - WithGroupPubkey & { - newName: string; - }) { +}: WithGroupPubkey & { + newName: string; +}) { const group = await UserGroupsWrapperActions.getGroup(groupPk); if (!group || !group.secretKey || isEmpty(group.secretKey)) { throw new Error('tried to make change to group but we do not have the admin secret key'); @@ -931,7 +955,6 @@ async function handleNameChangeFromUI({ await MetaGroupWrapperActions.infoSet(groupPk, infos); const createAtNetworkTimestamp = GetNetworkTime.now(); - const updateMessages: Array = []; // we want to add an update message even if the change was done remotely const msg = await ClosedGroup.addUpdateMessage({ convo, @@ -942,27 +965,22 @@ async function handleNameChangeFromUI({ }); // we want to send an update only if the change was made locally. - if (fromCurrentDevice) { - updateMessages.push( - new GroupUpdateInfoChangeMessage({ - groupPk, - typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.NAME, - updatedName: newName, - identifier: msg.id, - createAtNetworkTimestamp, - secretKey: group.secretKey, - sodium: await getSodiumRenderer(), - ...getConvoExpireDetailsForMsg(convo), - }) - ); - } + const nameChangeMsg = new GroupUpdateInfoChangeMessage({ + groupPk, + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.NAME, + updatedName: newName, + identifier: msg.id, + createAtNetworkTimestamp, + secretKey: group.secretKey, + sodium: await getSodiumRenderer(), + ...getConvoExpireDetailsForMsg(convo), + }); const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementKeys: [], revokeSubRequest: null, unrevokeSubRequest: null, - updateMessages, }); if (batchResult !== RunJobResult.Success) { @@ -972,6 +990,7 @@ async function handleNameChangeFromUI({ } await UserSync.queueNewJobIfNeeded(); + await GroupSync.storeGroupUpdateMessages({ groupPk, updateMessages: [nameChangeMsg] }); convo.set({ active_at: createAtNetworkTimestamp, @@ -1005,16 +1024,14 @@ const currentDeviceGroupMembersChange = createAsyncThunk( ); } - await handleMemberRemovedFromUIOrNot({ + await handleMemberRemovedFromUI({ groupPk, removeMembers: args.removeMembers, - fromCurrentDevice: true, fromMemberLeftMessage: false, }); - await handleMemberAddedFromUIOrNot({ + await handleMemberAddedFromUI({ groupPk, - fromCurrentDevice: true, addMembersWithHistory: args.addMembersWithHistory, addMembersWithoutHistory: args.addMembersWithoutHistory, }); @@ -1051,10 +1068,9 @@ const handleMemberLeftMessage = createAsyncThunk( ); } - await handleMemberRemovedFromUIOrNot({ + await handleMemberRemovedFromUI({ groupPk, removeMembers: [memberLeft], - fromCurrentDevice: true, fromMemberLeftMessage: true, }); @@ -1160,7 +1176,7 @@ const currentDeviceGroupNameChange = createAsyncThunk( } await checkWeAreAdminOrThrow(groupPk, 'currentDeviceGroupNameChange'); - await handleNameChangeFromUI({ groupPk, ...args, fromCurrentDevice: true }); + await handleNameChangeFromUI({ groupPk, ...args }); return { groupPk, diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts index 6cda25cf33..9ec8f462db 100644 --- a/ts/test/session/unit/crypto/SnodeSignatures_test.ts +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -261,7 +261,7 @@ describe('SnodeSignature', () => { group: { pubkeyHex: null as any, secretKey: privKeyUint, authData: null }, messagesHashes: ['[;p['], shortenOrExtend: '', - timestamp: hardcodedTimestamp, + expiryMs: hardcodedTimestamp, }); }; await expect(func()).to.be.rejectedWith( @@ -280,7 +280,7 @@ describe('SnodeSignature', () => { messagesHashes: ['[;p['], shortenOrExtend: '', - timestamp: hardcodedTimestamp, + expiryMs: hardcodedTimestamp, }); }; await expect(func()).to.be.rejectedWith( @@ -290,74 +290,74 @@ describe('SnodeSignature', () => { it('works with valid pubkey and privkey', async () => { const hashes = ['hash4321', 'hash4221']; - const timestamp = hardcodedTimestamp; + const expiryMs = hardcodedTimestamp; const shortenOrExtend = ''; const ret = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ group: { pubkeyHex: validGroupPk, secretKey: privKeyUint, authData: null }, messagesHashes: hashes, shortenOrExtend: '', - timestamp, + expiryMs, }); expect(ret.pubkey).to.be.eq(validGroupPk); - const verificationData = `expire${shortenOrExtend}${timestamp}${hashes.join('')}`; + const verificationData = `expire${shortenOrExtend}${expiryMs}${hashes.join('')}`; await verifySig(ret, verificationData); }); it('fails with invalid timestamp', async () => { const hashes = ['hash4321', 'hash4221']; - const timestamp = hardcodedTimestamp; + const expiryMs = hardcodedTimestamp; const shortenOrExtend = ''; const ret = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ group: { pubkeyHex: validGroupPk, secretKey: privKeyUint, authData: null }, messagesHashes: hashes, shortenOrExtend: '', - timestamp, + expiryMs, }); expect(ret.pubkey).to.be.eq(validGroupPk); - const verificationData = `expire${shortenOrExtend}${timestamp}1${hashes.join('')}`; + const verificationData = `expire${shortenOrExtend}${expiryMs}1${hashes.join('')}`; const func = async () => verifySig(ret, verificationData); await expect(func()).rejectedWith('sig failed to be verified'); }); it('fails with invalid hashes', async () => { const hashes = ['hash4321', 'hash4221']; - const timestamp = hardcodedTimestamp; + const expiryMs = hardcodedTimestamp; const shortenOrExtend = ''; const ret = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ group: { pubkeyHex: validGroupPk, secretKey: privKeyUint, authData: null }, messagesHashes: hashes, shortenOrExtend: '', - timestamp, + expiryMs, }); expect(ret.pubkey).to.be.eq(validGroupPk); const overridenHash = hashes.slice(); overridenHash[0] = '1111'; - const verificationData = `expire${shortenOrExtend}${timestamp}${overridenHash.join('')}`; + const verificationData = `expire${shortenOrExtend}${expiryMs}${overridenHash.join('')}`; const func = async () => verifySig(ret, verificationData); await expect(func()).rejectedWith('sig failed to be verified'); }); it('fails with invalid number of hashes', async () => { const hashes = ['hash4321', 'hash4221']; - const timestamp = hardcodedTimestamp; + const expiryMs = hardcodedTimestamp; const shortenOrExtend = ''; const ret = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ group: { pubkeyHex: validGroupPk, secretKey: privKeyUint, authData: null }, messagesHashes: hashes, shortenOrExtend: '', - timestamp, + expiryMs, }); expect(ret.pubkey).to.be.eq(validGroupPk); const overridenHash = [hashes[0]]; - const verificationData = `expire${shortenOrExtend}${timestamp}${overridenHash.join('')}`; + const verificationData = `expire${shortenOrExtend}${expiryMs}${overridenHash.join('')}`; const func = async () => verifySig(ret, verificationData); await expect(func()).rejectedWith('sig failed to be verified'); }); diff --git a/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts b/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts index 72e84f1074..f8f036fb24 100644 --- a/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts +++ b/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts @@ -55,18 +55,20 @@ describe('ExpireRequest', () => { throw Error('nothing was returned when building the request'); } - expect(request, "method should be 'expire'").to.have.property('method', 'expire'); - expect(request.params.pubkey, 'should have a matching pubkey').to.equal(ourNumber); - expect(request.params.messages, 'messageHash should be in messages array').to.deep.equal( + const signedReq = await request.buildAndSignParameters(); + + expect(signedReq, "method should be 'expire'").to.have.property('method', 'expire'); + expect(signedReq.params.pubkey, 'should have a matching pubkey').to.equal(ourNumber); + expect(signedReq.params.messages, 'messageHash should be in messages array').to.deep.equal( props.messageHashes ); expect( - request.params.expiry && isValidUnixTimestamp(request?.params.expiry), + signedReq.params.expiry && isValidUnixTimestamp(signedReq.params.expiry), 'expiry should be a valid unix timestamp' ).to.be.true; - expect(request.params.extend, 'extend should be undefined').to.be.undefined; - expect(request.params.shorten, 'shorten should be undefined').to.be.undefined; - expect(request.params.signature, 'signature should not be empty').to.not.be.empty; + expect(signedReq.params.extend, 'extend should be undefined').to.be.undefined; + expect(signedReq.params.shorten, 'shorten should be undefined').to.be.undefined; + expect(signedReq.params.signature, 'signature should not be empty').to.not.be.empty; }); it('builds a request with extend enabled', async () => { const request: UpdateExpiryOnNodeUserSubRequest | null = await buildExpireRequestSingleExpiry( @@ -81,19 +83,20 @@ describe('ExpireRequest', () => { if (!request) { throw Error('nothing was returned when building the request'); } + const signedReq = await request.buildAndSignParameters(); - expect(request, "method should be 'expire'").to.have.property('method', 'expire'); - expect(request.params.pubkey, 'should have a matching pubkey').to.equal(ourNumber); - expect(request.params.messages, 'messageHash should be in messages array').to.equal( + expect(signedReq, "method should be 'expire'").to.have.property('method', 'expire'); + expect(signedReq.params.pubkey, 'should have a matching pubkey').to.equal(ourNumber); + expect(signedReq.params.messages, 'messageHash should be in messages array').to.equal( props.messageHashes ); expect( - request.params.expiry && isValidUnixTimestamp(request?.params.expiry), + signedReq.params.expiry && isValidUnixTimestamp(signedReq?.params.expiry), 'expiry should be a valid unix timestamp' ).to.be.true; - expect(request.params.extend, 'extend should be true').to.be.true; - expect(request.params.shorten, 'shorten should be undefined').to.be.undefined; - expect(request.params.signature, 'signature should not be empty').to.not.be.empty; + expect(signedReq.params.extend, 'extend should be true').to.be.true; + expect(signedReq.params.shorten, 'shorten should be undefined').to.be.undefined; + expect(signedReq.params.signature, 'signature should not be empty').to.not.be.empty; }); it('builds a request with shorten enabled', async () => { const request: UpdateExpiryOnNodeUserSubRequest | null = await buildExpireRequestSingleExpiry( @@ -108,19 +111,20 @@ describe('ExpireRequest', () => { if (!request) { throw Error('nothing was returned when building the request'); } + const signedReq = await request.buildAndSignParameters(); - expect(request, "method should be 'expire'").to.have.property('method', 'expire'); - expect(request.params.pubkey, 'should have a matching pubkey').to.equal(ourNumber); - expect(request.params.messages, 'messageHash should be in messages array').to.equal( + expect(signedReq, "method should be 'expire'").to.have.property('method', 'expire'); + expect(signedReq.params.pubkey, 'should have a matching pubkey').to.equal(ourNumber); + expect(signedReq.params.messages, 'messageHash should be in messages array').to.equal( props.messageHashes ); expect( - request.params.expiry && isValidUnixTimestamp(request?.params.expiry), + signedReq.params.expiry && isValidUnixTimestamp(signedReq?.params.expiry), 'expiry should be a valid unix timestamp' ).to.be.true; - expect(request.params.extend, 'extend should be undefined').to.be.undefined; - expect(request.params.shorten, 'shorten should be true').to.be.true; - expect(request.params.signature, 'signature should not be empty').to.not.be.empty; + expect(signedReq.params.extend, 'extend should be undefined').to.be.undefined; + expect(signedReq.params.shorten, 'shorten should be true').to.be.true; + expect(signedReq.params.signature, 'signature should not be empty').to.not.be.empty; }); }); diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index b4151251fb..1bad7e5603 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -52,14 +52,14 @@ describe('MessageQueue', () => { Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); // Message Sender Stubs - sendStub = Sinon.stub(MessageSender, 'send'); + sendStub = Sinon.stub(MessageSender, 'sendSingleMessage'); messageSentHandlerFailedStub = Sinon.stub( MessageSentHandler, - 'handleMessageSentFailure' + 'handleSwarmMessageSentFailure' ).resolves(); messageSentHandlerSuccessStub = Sinon.stub( MessageSentHandler, - 'handleMessageSentSuccess' + 'handleSwarmMessageSentSuccess' ).resolves(); messageSentPublicHandlerSuccessStub = Sinon.stub( MessageSentHandler, diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index 60a990786f..e18dba2da2 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -69,7 +69,7 @@ describe('MessageSender', () => { it('should not retry if an error occurred during encryption', async () => { encryptStub.throws(new Error('Failed to encrypt.')); - const promise = MessageSender.send({ + const promise = MessageSender.sendSingleMessage({ message: rawMessage, attempts: 3, retryMinTimeout: 10, @@ -80,7 +80,7 @@ describe('MessageSender', () => { }); it('should only call lokiMessageAPI once if no errors occured', async () => { - await MessageSender.send({ + await MessageSender.sendSingleMessage({ message: rawMessage, attempts: 3, retryMinTimeout: 10, @@ -92,7 +92,7 @@ describe('MessageSender', () => { it('should only retry the specified amount of times before throwing', async () => { sessionMessageAPISendStub.throws(new Error('API error')); const attempts = 2; - const promise = MessageSender.send({ + const promise = MessageSender.sendSingleMessage({ message: rawMessage, attempts, retryMinTimeout: 10, @@ -104,7 +104,7 @@ describe('MessageSender', () => { it('should not throw error if successful send occurs within the retry limit', async () => { sessionMessageAPISendStub.onFirstCall().throws(new Error('API error')); - await MessageSender.send({ + await MessageSender.sendSingleMessage({ message: rawMessage, attempts: 3, retryMinTimeout: 10, @@ -135,7 +135,7 @@ describe('MessageSender', () => { SnodeNamespaces.Default ); - await MessageSender.send({ + await MessageSender.sendSingleMessage({ message: rawMessage, attempts: 3, retryMinTimeout: 10, @@ -166,7 +166,7 @@ describe('MessageSender', () => { ); const offset = 200000; Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(offset); - await MessageSender.send({ + await MessageSender.sendSingleMessage({ message: rawMessage, attempts: 3, retryMinTimeout: 10, @@ -225,7 +225,7 @@ describe('MessageSender', () => { visibleMessage, SnodeNamespaces.Default ); - await MessageSender.send({ + await MessageSender.sendSingleMessage({ message: rawMessage, attempts: 3, retryMinTimeout: 10, diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 9721adb516..e22ec50ddc 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -276,7 +276,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { revokeSubRequest: null, unrevokeSubRequest: null, supplementKeys: [], - updateMessages: [], }); pendingChangesForGroupStub.resolves(undefined); expect(result).to.be.eq(RunJobResult.Success); @@ -301,7 +300,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { revokeSubRequest: null, unrevokeSubRequest: null, supplementKeys: [], - updateMessages: [], }); sendStub.resolves(undefined); @@ -366,7 +364,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { revokeSubRequest: null, unrevokeSubRequest: null, supplementKeys: [], - updateMessages: [], }); expect(sendStub.callCount).to.be.eq(1); diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index 2acbc92148..281fce0e9b 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -8,7 +8,7 @@ import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snod import { GetNetworkTime } from '../../../../../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces, - UserConfigNamespaces, + SnodeNamespacesUserConfig, } from '../../../../../../session/apis/snode_api/namespaces'; import { TTL_DEFAULT } from '../../../../../../session/constants'; import { ConvoHub } from '../../../../../../session/conversations'; @@ -29,7 +29,7 @@ import { TypedStub, stubConfigDumpData } from '../../../../../test-utils/utils'; function userChange( sodium: LibSodiumWrappers, - namespace: UserConfigNamespaces, + namespace: SnodeNamespacesUserConfig, seqno: number ): PendingChangesForUs { return { diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 1b5b6e6f1c..1b37cf467b 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -24,6 +24,8 @@ export type AsyncWrapper any> = ( ...args: Parameters ) => Promise>; +export type AwaitedReturn any> = Awaited>; + /** * This type is used to build from an objectType filled with functions, a new object type where all the functions their async equivalent */ From fda6ca315cbf00cd2c4cc1853b365ab68f9f2493 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 1 Feb 2024 15:58:59 +1100 Subject: [PATCH 083/302] fix: allow contacts without didApproveMe to be invited to group --- ts/components/dialog/InviteContactsDialog.tsx | 6 +-- .../leftpane/overlay/OverlayClosedGroup.tsx | 8 ++-- ts/models/conversation.ts | 1 + ts/state/selectors/conversations.ts | 41 ++++++++++--------- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index 61f3c352c4..a3215881c1 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -3,7 +3,7 @@ import useKey from 'react-use/lib/useKey'; import { PubkeyType } from 'libsession_util_nodejs'; import _ from 'lodash'; -import { useDispatch, useSelector } from 'react-redux'; +import { useDispatch } from 'react-redux'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { VALIDATION } from '../../session/constants'; import { ConvoHub } from '../../session/conversations'; @@ -23,7 +23,7 @@ import { ClosedGroup } from '../../session/group/closed-group'; import { PubKey } from '../../session/types'; import { SessionUtilUserGroups } from '../../session/utils/libsession/libsession_utils_user_groups'; import { groupInfoActions } from '../../state/ducks/metaGroups'; -import { getPrivateContactsPubkeys } from '../../state/selectors/conversations'; +import { useContactsToInviteToGroup } from '../../state/selectors/conversations'; import { useMemberGroupChangePending } from '../../state/selectors/groups'; import { MemberListItem } from '../MemberListItem'; import { SessionWrapperModal } from '../SessionWrapperModal'; @@ -112,7 +112,7 @@ const InviteContactsDialogInner = (props: Props) => { const { conversationId } = props; const dispatch = useDispatch(); - const privateContactPubkeys = useSelector(getPrivateContactsPubkeys); + const privateContactPubkeys = useContactsToInviteToGroup(); let validContactsForInvite = _.clone(privateContactPubkeys) as Array; const isProcessingUIChange = useMemberGroupChangePending(); diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index 386932230e..1861c69d9b 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -17,7 +17,9 @@ import { createClosedGroup } from '../../../session/conversations/createClosedGr import { ToastUtils } from '../../../session/utils'; import { groupInfoActions } from '../../../state/ducks/metaGroups'; import { resetOverlayMode } from '../../../state/ducks/section'; -import { getPrivateContactsPubkeys } from '../../../state/selectors/conversations'; +import { + useContactsToInviteToGroup +} from '../../../state/selectors/conversations'; import { useIsCreatingGroupFromUIPending } from '../../../state/selectors/groups'; import { getSearchResultsContactOnly, isSearching } from '../../../state/selectors/search'; import { useOurPkStr } from '../../../state/selectors/user'; @@ -96,7 +98,7 @@ async function createClosedGroupWithToasts( export const OverlayClosedGroupV2 = () => { const dispatch = useDispatch(); const us = useOurPkStr(); - const privateContactsPubkeys = useSelector(getPrivateContactsPubkeys); + const privateContactsPubkeys = useContactsToInviteToGroup(); const isCreatingGroup = useIsCreatingGroupFromUIPending(); const [groupName, setGroupName] = useState(''); const { @@ -210,7 +212,7 @@ export const OverlayClosedGroupV2 = () => { export const OverlayLegacyClosedGroup = () => { const dispatch = useDispatch(); - const privateContactsPubkeys = useSelector(getPrivateContactsPubkeys); + const privateContactsPubkeys = useContactsToInviteToGroup(); const [groupName, setGroupName] = useState(''); const [loading, setLoading] = useState(false); const { diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 537f1cbb4b..73800b3ed0 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -129,6 +129,7 @@ import { import { DisappearingMessages } from '../session/disappearing_messages'; import { DisappearingMessageConversationModeType } from '../session/disappearing_messages/types'; +import { GroupUpdateInfoChangeMessage } from '../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { FetchMsgExpirySwarm } from '../session/utils/job_runners/jobs/FetchMsgExpirySwarmJob'; import { UpdateMsgExpirySwarm } from '../session/utils/job_runners/jobs/UpdateMsgExpirySwarmJob'; import { getLibGroupKickedOutsideRedux } from '../state/selectors/userGroups'; diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index d4d1d6af70..b8aa2a3d43 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -300,21 +300,6 @@ const _getLeftPaneConversationIds = ( .map(m => m.id); }; -const _getPrivateFriendsConversations = ( - sortedConversations: Array -): Array => { - return sortedConversations.filter(convo => { - return ( - convo.isPrivate && - !convo.isMe && - !convo.isBlocked && - convo.isApproved && - convo.didApproveMe && - convo.activeAt !== undefined - ); - }); -}; - const _getGlobalUnreadCount = (sortedConversations: Array): number => { let globalUnreadCount = 0; for (const conversation of sortedConversations) { @@ -449,11 +434,29 @@ export const getLeftPaneConversationIds = createSelector( _getLeftPaneConversationIds ); -const getDirectContacts = createSelector(getSortedConversations, _getPrivateFriendsConversations); +const getPrivateFriendsConversations = ( + sortedConversations: Array +): Array => { + return sortedConversations.filter(convo => { + return ( + convo.isPrivate && + !convo.isMe && + !convo.isBlocked && + convo.isApproved && + (window.sessionFeatureFlags.useClosedGroupV2 || convo.didApproveMe) && // with groupv2, we can invite contacts which did not approve us yet + convo.activeAt !== undefined + ); + }); +}; -export const getPrivateContactsPubkeys = createSelector(getDirectContacts, state => - state.map(m => m.id) -); +const getDirectContacts = createSelector(getSortedConversations, getPrivateFriendsConversations); + +const getPrivateContactsPubkeys = createSelector(getDirectContacts, state => state.map(m => m.id)); + +export const useContactsToInviteToGroup = () => { + const contacts = useSelector(getPrivateContactsPubkeys); + return contacts; +}; export const getDirectContactsCount = createSelector( getDirectContacts, From f6bffc8bb6a71850e1f5a7aaf11464b995a4d78b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 1 Feb 2024 16:00:03 +1100 Subject: [PATCH 084/302] feat: add suppport in groupv2 of disappear v2 messages --- ts/models/conversation.ts | 44 ++++-- ts/models/message.ts | 11 +- ts/receiver/closedGroups.ts | 2 +- ts/receiver/configMessage.ts | 6 +- ts/receiver/groupv2/handleGroupV2Message.ts | 21 ++- ts/receiver/queuedJob.ts | 2 +- ts/session/onions/onionPath.ts | 10 +- ts/session/sending/MessageSender.ts | 130 +++++++++++------- .../DisappearingMessage_test.ts | 2 +- 9 files changed, 139 insertions(+), 89 deletions(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 73800b3ed0..8c13df3363 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -846,7 +846,7 @@ export class ConversationModel extends Backbone.Model { * @param providedDisappearingMode * @param providedExpireTimer * @param providedSource the pubkey of the user who made the change - * @param receivedAt the timestamp of when the change was received + * @param sentAt the timestamp of when the change was sent (when receiving it) * @param fromSync if the change was made from a sync message * @param shouldCommitConvo if the conversation change should be committed to the DB * @param shouldCommitMessage if the timer update message change should be committed to the DB @@ -857,7 +857,7 @@ export class ConversationModel extends Backbone.Model { providedDisappearingMode, providedExpireTimer, providedSource, - receivedAt, // is set if it comes from outside + sentAt, // is set if it comes from outside fromSync, // if the update comes from sync message ONLY fromConfigMessage, // if the update comes from a libsession config message ONLY fromCurrentDevice, @@ -867,16 +867,14 @@ export class ConversationModel extends Backbone.Model { providedDisappearingMode?: DisappearingMessageConversationModeType; providedExpireTimer?: number; providedSource?: string; - receivedAt?: number; // is set if it comes from outside + sentAt?: number; // is set if it comes from outside fromSync: boolean; fromCurrentDevice: boolean; fromConfigMessage: boolean; shouldCommitConvo?: boolean; existingMessage?: MessageModel; }): Promise { - const isRemoteChange = Boolean( - (receivedAt || fromSync || fromConfigMessage) && !fromCurrentDevice - ); + const isRemoteChange = Boolean((sentAt || fromSync || fromConfigMessage) && !fromCurrentDevice); // we don't add an update message when this comes from a config message, as we already have the SyncedMessage itself with the right timestamp to display const shouldAddExpireUpdateMessage = !fromConfigMessage; @@ -895,7 +893,7 @@ export class ConversationModel extends Backbone.Model { // When we add a disappearing messages notification to the conversation, we want it // to be above the message that initiated that change, hence the subtraction. - const createAtNetworkTimestamp = (receivedAt || GetNetworkTime.now()) - 1; + const createAtNetworkTimestamp = (sentAt || GetNetworkTime.now()) - 1; // NOTE when we turn the disappearing setting to off, we don't want it to expire with the previous expiration anymore const isV2DisappearReleased = ReleasedFeatures.isDisappearMessageV2FeatureReleasedCached(); @@ -953,7 +951,7 @@ export class ConversationModel extends Backbone.Model { }; if (!message) { - if (!receivedAt) { + if (!sentAt) { // outgoing message message = await this.addSingleOutgoingMessage({ ...commonAttributes, @@ -993,7 +991,7 @@ export class ConversationModel extends Backbone.Model { // if change was made remotely, don't send it to the contact/group if (isRemoteChange) { window.log.debug( - `[updateExpireTimer] remote change, not sending message again. receivedAt: ${receivedAt} fromSync: ${fromSync} fromCurrentDevice: ${fromCurrentDevice} for ${ed25519Str( + `[updateExpireTimer] remote change, not sending message again. sentAt: ${sentAt} fromSync: ${fromSync} fromCurrentDevice: ${fromCurrentDevice} for ${ed25519Str( this.id )}` ); @@ -1029,7 +1027,7 @@ export class ConversationModel extends Backbone.Model { // We would have returned if that message sending part was not needed // const expireUpdate = { - identifier: message.id, + identifier: message.id as string, createAtNetworkTimestamp, expirationType, expireTimer, @@ -1054,11 +1052,33 @@ export class ConversationModel extends Backbone.Model { await getMessageQueue().sendToPubKey(pubkey, expirationTimerMessage, SnodeNamespaces.Default); return true; } - window?.log?.warn('TODO: Expiration update for closed groups are to be updated'); if (this.isClosedGroup()) { if (this.isAdmin(UserUtils.getOurPubKeyStrFromCache())) { - // NOTE: we agreed that outgoing ExpirationTimerUpdate **for groups** are not expiring, + if (this.isClosedGroupV2()) { + const group = await UserGroupsWrapperActions.getGroup(this.id); + if (!group || !group.secretKey) { + throw new Error( + 'trying to change timer for a group we do not have the secretKey is not possible' + ); + } + const v2groupMessage = new GroupUpdateInfoChangeMessage({ + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES, + ...expireUpdate, + groupPk: this.id, + identifier: message.get('id'), + sodium: await getSodiumRenderer(), + secretKey: group.secretKey, + updatedExpirationSeconds: expireUpdate.expireTimer, + }); + + await getMessageQueue().sendToGroupV2({ + message: v2groupMessage, + }); + return true; + } + + // NOTE: we agreed that outgoing ExpirationTimerUpdate **for legacy groups** are not expiring, // but they still need the content to be right(as this is what we use for the change itself) const expireUpdateForGroup = { diff --git a/ts/models/message.ts b/ts/models/message.ts index 65a2cb9370..5bd5196533 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -252,9 +252,8 @@ export class MessageModel extends Backbone.Model { let description = this.getDescription(); if (description) { // regex with a 'g' to ignore part groups - const regex = new RegExp(`@${PubKey.regexForPubkeys}`, 'g'); - const pubkeysInDesc = description.match(regex); - (pubkeysInDesc || []).forEach((pubkeyWithAt: string) => { + const regexWithAt = new RegExp(`@${PubKey.regexForPubkeys}`, 'g'); + (description.match(regexWithAt) || []).forEach((pubkeyWithAt: string) => { const pubkey = pubkeyWithAt.slice(1); const isUS = isUsAnySogsFromCache(pubkey); const displayName = ConvoHub.use().getContactProfileNameOrShortenedPubKey(pubkey); @@ -264,6 +263,12 @@ export class MessageModel extends Backbone.Model { description = description?.replace(pubkeyWithAt, `@${displayName}`); } }); + + const regexWithoutAt = new RegExp(`${PubKey.regexForPubkeys}`, 'g'); + + (description.match(regexWithoutAt) || []).forEach((pubkeyWithoutAt: string) => { + description = description?.replace(pubkeyWithoutAt, `${PubKey.shorten(pubkeyWithoutAt)}`); + }); return description; } if ((this.get('attachments') || []).length > 0) { diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 0ae1bd6d61..c48d273277 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -323,7 +323,7 @@ export async function handleNewClosedGroup( : 'legacy', providedExpireTimer: expireTimer, providedSource: sender, - receivedAt: GetNetworkTime.now(), + sentAt: GetNetworkTime.now(), fromSync: false, fromCurrentDevice: false, fromConfigMessage: false, diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index b1414407ad..0b3e03b4cc 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -264,7 +264,7 @@ async function handleUserProfileUpdate(result: IncomingUserResult): Promise= 0 + newTimerSeconds && + isNumber(newTimerSeconds) && + isFinite(newTimerSeconds) && + newTimerSeconds >= 0 ) { - await ClosedGroup.addUpdateMessage({ - convo, - diff: { type: 'name', newName: change.updatedName }, - sender: author, - sentAt: signatureTimestamp, - expireUpdate: null, - }); await convo.updateExpireTimer({ - providedExpireTimer: change.updatedExpiration, + providedExpireTimer: newTimerSeconds, providedSource: author, - receivedAt: signatureTimestamp, + providedDisappearingMode: newTimerSeconds > 0 ? 'deleteAfterSend' : 'off', + sentAt: signatureTimestamp, fromCurrentDevice: false, fromSync: false, fromConfigMessage: false, diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index fc128b4bbe..762f0892fa 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -465,7 +465,7 @@ export async function handleMessageJob( providedExpireTimer: expireTimerUpdate, providedSource: source, fromSync: source === UserUtils.getOurPubKeyStrFromCache(), - receivedAt: messageModel.get('received_at'), + sentAt: messageModel.get('received_at'), existingMessage: messageModel, shouldCommitConvo: false, fromCurrentDevice: false, diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index 47f5e55c17..7de7679f83 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -5,15 +5,15 @@ import pRetry from 'p-retry'; // eslint-disable-next-line import/no-named-default import { default as insecureNodeFetch } from 'node-fetch'; +import { OnionPaths } from '.'; import { Data, Snode } from '../../data/data'; +import { updateOnionPaths } from '../../state/ducks/onion'; +import { APPLICATION_JSON } from '../../types/MIME'; +import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI'; +import { Onions, snodeHttpsAgent } from '../apis/snode_api/onions'; import * as SnodePool from '../apis/snode_api/snodePool'; import { UserUtils } from '../utils'; -import { Onions, snodeHttpsAgent } from '../apis/snode_api/onions'; import { allowOnlyOneAtATime } from '../utils/Promise'; -import { updateOnionPaths } from '../../state/ducks/onion'; -import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI'; -import { OnionPaths } from '.'; -import { APPLICATION_JSON } from '../../types/MIME'; const desiredGuardCount = 3; const minimumGuardCount = 2; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index ce29174719..3d320973c3 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -145,58 +145,88 @@ async function sendSingleMessage({ } const subRequests: Array = []; - if ( - SnodeNamespace.isUserConfigNamespace(encryptedAndWrapped.namespace) && - PubKey.is05Pubkey(destination) - ) { - subRequests.push( - new StoreUserConfigSubRequest({ - encryptedData: encryptedAndWrapped.encryptedAndWrappedData, - namespace: encryptedAndWrapped.namespace, - ttlMs: overridenTtl, - }) - ); - } else if ( - encryptedAndWrapped.namespace === SnodeNamespaces.Default && - PubKey.is05Pubkey(destination) - ) { - subRequests.push( - new StoreUserMessageSubRequest({ - encryptedData: encryptedAndWrapped.encryptedAndWrappedData, - dbMessageIdentifier: encryptedAndWrapped.identifier || null, - ttlMs: overridenTtl, - destination, - }) - ); - } else if ( - SnodeNamespace.isGroupConfigNamespace(encryptedAndWrapped.namespace) && - PubKey.is03Pubkey(destination) - ) { - subRequests.push( - new StoreGroupConfigOrMessageSubRequest({ - encryptedData: encryptedAndWrapped.encryptedAndWrappedData, - namespace: encryptedAndWrapped.namespace, - ttlMs: overridenTtl, - groupPk: destination, - dbMessageIdentifier: encryptedAndWrapped.identifier || null, - }) + + if (PubKey.is05Pubkey(destination)) { + if (encryptedAndWrapped.namespace === SnodeNamespaces.Default) { + subRequests.push( + new StoreUserMessageSubRequest({ + encryptedData: encryptedAndWrapped.encryptedAndWrappedData, + dbMessageIdentifier: encryptedAndWrapped.identifier || null, + ttlMs: overridenTtl, + destination, + }) + ); + } else if (SnodeNamespace.isUserConfigNamespace(encryptedAndWrapped.namespace)) { + subRequests.push( + new StoreUserConfigSubRequest({ + encryptedData: encryptedAndWrapped.encryptedAndWrappedData, + namespace: encryptedAndWrapped.namespace, + ttlMs: overridenTtl, + }) + ); + } else if (encryptedAndWrapped.namespace === SnodeNamespaces.LegacyClosedGroup) { + subRequests.push( + new StoreUserMessageSubRequest({ + encryptedData: encryptedAndWrapped.encryptedAndWrappedData, + dbMessageIdentifier: encryptedAndWrapped.identifier || null, + ttlMs: overridenTtl, + destination, + }) + ); + } else { + window.log.error( + `unhandled sendSingleMessage case with details: ${ed25519Str(destination)},namespace: ${ + encryptedAndWrapped.namespace + }` + ); + throw new Error( + `unhandled sendSingleMessage case for 05 ${ed25519Str(destination)} and namespace ${ + encryptedAndWrapped.namespace + }` + ); + } + } else if (PubKey.is03Pubkey(destination)) { + if (SnodeNamespace.isGroupConfigNamespace(encryptedAndWrapped.namespace)) { + subRequests.push( + new StoreGroupConfigOrMessageSubRequest({ + encryptedData: encryptedAndWrapped.encryptedAndWrappedData, + namespace: encryptedAndWrapped.namespace, + ttlMs: overridenTtl, + groupPk: destination, + dbMessageIdentifier: encryptedAndWrapped.identifier || null, + }) + ); + } else if (encryptedAndWrapped.namespace === SnodeNamespaces.ClosedGroupMessages) { + subRequests.push( + new StoreGroupConfigOrMessageSubRequest({ + encryptedData: encryptedAndWrapped.encryptedAndWrappedData, + namespace: encryptedAndWrapped.namespace, + ttlMs: overridenTtl, + groupPk: destination, + dbMessageIdentifier: encryptedAndWrapped.identifier || null, + }) + ); + } else { + window.log.error( + `unhandled sendSingleMessage case with details: ${ed25519Str(destination)},namespace: ${ + encryptedAndWrapped.namespace + }` + ); + throw new Error( + `unhandled sendSingleMessage case for 03 ${ed25519Str(destination)} and namespace ${ + encryptedAndWrapped.namespace + }` + ); + } + } else { + window.log.error( + `unhandled sendSingleMessage case with details: ${ed25519Str(destination)},namespace: ${ + encryptedAndWrapped.namespace + }` ); - } else if ( - encryptedAndWrapped.namespace === SnodeNamespaces.ClosedGroupMessages && - PubKey.is03Pubkey(destination) - ) { - subRequests.push( - new StoreGroupConfigOrMessageSubRequest({ - encryptedData: encryptedAndWrapped.encryptedAndWrappedData, - namespace: encryptedAndWrapped.namespace, - ttlMs: overridenTtl, - groupPk: destination, - dbMessageIdentifier: encryptedAndWrapped.identifier || null, - }) + throw new Error( + `unhandled sendSingleMessage case unsupported destination ${ed25519Str(destination)}` ); - } else { - window.log.error('unhandled sendSingleMessage case'); - throw new Error('unhandled sendSingleMessage case'); } const targetNode = await getNodeFromSwarmOrThrow(destination); diff --git a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts index 1337cac0ca..3abbc24364 100644 --- a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts +++ b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts @@ -609,7 +609,7 @@ describe('DisappearingMessage', () => { providedDisappearingMode: 'deleteAfterSend', providedExpireTimer: 600, providedSource: testPubkey, - receivedAt: GetNetworkTime.now(), + sentAt: GetNetworkTime.now(), fromSync: true, shouldCommitConvo: false, existingMessage: undefined, From 5e3f968d22b0a817f1294935d91b5fcaff03f378 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 13 Feb 2024 12:15:25 +1100 Subject: [PATCH 085/302] fix: merge issues --- ts/components/SessionPasswordPrompt.tsx | 4 +-- .../header/ConversationHeaderTitle.tsx | 28 ------------------- .../overlay/OverlayRightPanelSettings.tsx | 22 +++++++-------- .../InteractionItem.tsx | 15 +++++----- ts/components/menu/Menu.tsx | 11 ++++---- ts/receiver/configMessage.ts | 1 + ts/state/ducks/metaGroups.ts | 4 +-- 7 files changed, 29 insertions(+), 56 deletions(-) diff --git a/ts/components/SessionPasswordPrompt.tsx b/ts/components/SessionPasswordPrompt.tsx index 929db35c8a..e9d55c5fd4 100644 --- a/ts/components/SessionPasswordPrompt.tsx +++ b/ts/components/SessionPasswordPrompt.tsx @@ -38,8 +38,8 @@ const StyledContent = styled.div` // 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, title: string, description?: string) { - toast.error(, { +function pushToastError(id: string, description: string) { + toast.error(, { toastId: id, updateId: id, }); diff --git a/ts/components/conversation/header/ConversationHeaderTitle.tsx b/ts/components/conversation/header/ConversationHeaderTitle.tsx index eab052d05d..85437e1f45 100644 --- a/ts/components/conversation/header/ConversationHeaderTitle.tsx +++ b/ts/components/conversation/header/ConversationHeaderTitle.tsx @@ -82,34 +82,6 @@ export const ConversationHeaderTitle = () => { return null; }, [i18n, isGroup, isKickedFromGroup, isPublic, selectedMembersCount, subscriberCount]); -<<<<<<< HEAD - // TODO legacy messages support will be removed in a future release - // NOTE If disappearing messages is defined we must show it first - const disappearingMessageSubtitle = useMemo(() => { - const disappearingMessageSettingText = - expirationMode === 'deleteAfterRead' - ? window.i18n('disappearingMessagesModeAfterRead') - : expirationMode === 'deleteAfterSend' - ? window.i18n('disappearingMessagesModeAfterSend') - : expirationMode === 'legacy' - ? isMe || (isGroup && !isPublic) - ? window.i18n('disappearingMessagesModeAfterSend') - : window.i18n('disappearingMessagesModeAfterRead') - : null; - - const abbreviatedExpireTime = isNumber(expireTimer) - ? TimerOptions.getAbbreviated(expireTimer) - : null; - - return expireTimer && disappearingMessageSettingText - ? `${disappearingMessageSettingText}${ - abbreviatedExpireTime ? ` - ${abbreviatedExpireTime}` : '' - }` - : null; - }, [expirationMode, expireTimer, isGroup, isMe, isPublic]); - -======= ->>>>>>> unstable const handleRightPanelToggle = () => { if (isRightPanelOn) { dispatch(closeRightPanel()); diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 1d1e16f52f..2a82716ba2 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -41,15 +41,13 @@ import { AttachmentTypeWithPath } from '../../../../types/Attachment'; import { getAbsoluteAttachmentPath } from '../../../../types/MessageAttachment'; import { Avatar, AvatarSize } from '../../../avatar/Avatar'; import { Flex } from '../../../basic/Flex'; -import { SpacerMD } from '../../../basic/Text'; +import { SpacerLG, SpacerMD, SpacerXL } from '../../../basic/Text'; import { PanelButtonGroup, PanelIconButton } from '../../../buttons'; import { MediaItemType } from '../../../lightbox/LightboxGallery'; import { MediaGallery } from '../../media-gallery/MediaGallery'; import { Header, StyledScrollContainer } from './components'; -async function getMediaGalleryProps( - conversationId: string -): Promise<{ +async function getMediaGalleryProps(conversationId: string): Promise<{ documents: Array; media: Array; }> { @@ -258,18 +256,18 @@ export const OverlayRightPanelSettings = () => { const leaveGroupString = isPublic ? window.i18n('leaveCommunity') : lastMessage?.interactionType === ConversationInteractionType.Leave && - lastMessage?.interactionStatus === ConversationInteractionStatus.Error - ? window.i18n('deleteConversation') - : isKickedFromGroup - ? window.i18n('youGotKickedFromGroup') - : window.i18n('leaveGroup'); + lastMessage?.interactionStatus === ConversationInteractionStatus.Error + ? window.i18n('deleteConversation') + : isKickedFromGroup + ? window.i18n('youGotKickedFromGroup') + : window.i18n('leaveGroup'); const showUpdateGroupNameButton = isGroup && weAreAdmin && !commonNoShow; // legacy groups non-admin cannot change groupname anymore const showAddRemoveModeratorsButton = weAreAdmin && !commonNoShow && isPublic; const showUpdateGroupMembersButton = !isPublic && isGroup && !commonNoShow; - const deleteConvoAction = async () => { - await showLeaveGroupByConvoId(selectedConvoKey, selectedUsername); + const deleteConvoAction = () => { + void showLeaveGroupByConvoId(selectedConvoKey, selectedUsername); }; return ( @@ -338,7 +336,7 @@ export const OverlayRightPanelSettings = () => { void deleteConvoAction()} color={'var(--danger-color)'} iconType={'delete'} diff --git a/ts/components/leftpane/conversation-list-item/InteractionItem.tsx b/ts/components/leftpane/conversation-list-item/InteractionItem.tsx index 0e7b0031f4..be887a046a 100644 --- a/ts/components/leftpane/conversation-list-item/InteractionItem.tsx +++ b/ts/components/leftpane/conversation-list-item/InteractionItem.tsx @@ -7,7 +7,8 @@ import { ConversationInteractionStatus, ConversationInteractionType, } from '../../../interactions/conversationInteractions'; -import { getConversationController } from '../../../session/conversations'; + +import { ConvoHub } from '../../../session/conversations'; import { LastMessageType } from '../../../state/ducks/conversations'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { MessageBody } from '../../conversation/message/message-content/MessageBody'; @@ -34,7 +35,7 @@ export const InteractionItem = (props: InteractionItemProps) => { // NOTE we want to reset the interaction state when the last message changes useEffect(() => { if (conversationId) { - const convo = getConversationController().get(conversationId); + const convo = ConvoHub.use().get(conversationId); if (storedLastMessageInteractionStatus !== convo.get('lastMessageInteractionStatus')) { setStoredLastMessageInteractionStatus(convo.get('lastMessageInteractionStatus')); @@ -64,15 +65,15 @@ export const InteractionItem = (props: InteractionItemProps) => { errorText = isCommunity ? window.i18n('leaveCommunityFailed') : isGroup - ? window.i18n('leaveGroupFailed') - : window.i18n('deleteConversationFailed'); + ? window.i18n('leaveGroupFailed') + : window.i18n('deleteConversationFailed'); text = interactionStatus === ConversationInteractionStatus.Error ? errorText : interactionStatus === ConversationInteractionStatus.Start || - interactionStatus === ConversationInteractionStatus.Loading - ? window.i18n('leaving') - : text; + interactionStatus === ConversationInteractionStatus.Loading + ? window.i18n('leaving') + : text; break; default: assertUnreachable( diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index d803f3cc3c..43d885cedd 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -126,6 +126,7 @@ export const DeletePrivateContactMenuItem = () => { await ConvoHub.use().delete1o1(convoId, { fromSyncMessage: false, justHidePrivate: false, + keepMessages: false, }); }, }) @@ -155,9 +156,9 @@ export const LeaveGroupOrCommunityMenuItem = () => { {isPublic ? window.i18n('leaveCommunity') : lastMessage?.interactionType === ConversationInteractionType.Leave && - lastMessage?.interactionStatus === ConversationInteractionStatus.Error - ? window.i18n('deleteConversation') - : window.i18n('leaveGroup')} + lastMessage?.interactionStatus === ConversationInteractionStatus.Error + ? window.i18n('deleteConversation') + : window.i18n('leaveGroup')} ); } @@ -542,8 +543,8 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => { n === 'all' || !n ? 'notificationForConvo_all' : n === 'disabled' - ? 'notificationForConvo_disabled' - : 'notificationForConvo_mentions_only'; + ? 'notificationForConvo_disabled' + : 'notificationForConvo_mentions_only'; return { value: n, name: window.i18n(keyToUse) }; }); diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 0b3e03b4cc..aa04970ab1 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -341,6 +341,7 @@ async function deleteContactsFromDB(contactsToRemove: Array) { await ConvoHub.use().delete1o1(contactToRemove, { fromSyncMessage: true, justHidePrivate: false, + keepMessages: false, }); } catch (e) { window.log.warn( diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 7c40dd2ee5..3f430d4a4c 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -49,7 +49,7 @@ import { } from '../../webworker/workers/browser/libsession_worker_interface'; import { StateType } from '../reducer'; import { openConversationWithMessages } from './conversations'; -import { resetOverlayMode } from './section'; +import { resetLeftOverlayMode } from './section'; type WithAddWithoutHistoryMembers = { withoutHistory: Array }; type WithAddWithHistoryMembers = { withHistory: Array }; @@ -195,7 +195,7 @@ const initNewGroupInWrapper = createAsyncThunk( convo.set({ active_at: Date.now() }); await convo.commit(); convo.updateLastMessage(); - dispatch(resetOverlayMode()); + dispatch(resetLeftOverlayMode()); // Everything is setup for this group, we now need to send the invites to each members, // privately and asynchronously, and gracefully handle errors with toasts. From 392e243b088ec432f99988c1c3106b80ba755132 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 13 Feb 2024 16:12:39 +1100 Subject: [PATCH 086/302] feat: add the sending state to invite&promote actions --- _locales/en/messages.json | 6 +- preload.js | 2 +- ts/components/MemberListItem.tsx | 30 +++++--- ts/receiver/queuedJob.ts | 6 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 8 ++ .../utils/job_runners/jobs/GroupPromoteJob.ts | 7 ++ ts/state/ducks/metaGroups.ts | 74 ++++++++++++++++--- ts/state/selectors/groups.ts | 42 +++++++++-- ts/types/LocalizerKeys.ts | 6 +- ts/util/releaseFeature.ts | 2 +- 10 files changed, 146 insertions(+), 37 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 504a7baac8..c7640133a7 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -306,9 +306,11 @@ "groupOthersPromoted": "$name$ and $count$ others were promoted to Admin.", "inviteFailed": "Invite Failed", - "invitePending": "Invite Pending", + "inviteSent": "Invite Sent", + "inviteSending": "Sending Invite", "promotionFailed": "Promotion Failed", - "promotionPending": "Promotion Pending", + "promotionSent": "Promotion Sent", + "promotionSending": "Sending Promotion", "groupInviteFailedOne": "Failed to invite $name$ to $groupname$", "groupInviteFailedTwo": "Failed to invite $first$ and $second$ to $groupname$", "groupInviteFailedOthers": "Failed to invite $first$ and $count$ others to $groupname$", diff --git a/preload.js b/preload.js index 7518bc7ab6..aab532116e 100644 --- a/preload.js +++ b/preload.js @@ -31,7 +31,7 @@ window.sessionFeatureFlags = { useOnionRequests: true, useTestNet: isTestNet(), integrationTestEnv: isTestIntegration(), - useClosedGroupV3: true, // TODO DO NOT MERGE Remove after QA + useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA debugger debug: { debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), debugLibsessionDumps: !_.isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS), diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 043ad60d0a..a24d015ccc 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -9,9 +9,11 @@ import { GroupInvite } from '../session/utils/job_runners/jobs/GroupInviteJob'; import { GroupPromote } from '../session/utils/job_runners/jobs/GroupPromoteJob'; import { useMemberInviteFailed, - useMemberInvitePending, + useMemberInviteSending, + useMemberInviteSent, + useMemberPromoteSending, useMemberPromotionFailed, - useMemberPromotionPending, + useMemberPromotionSent, } from '../state/selectors/groups'; import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar'; import { Flex } from './basic/Flex'; @@ -129,24 +131,32 @@ const StyledGroupStatusText = styled.span<{ isFailure: boolean }>` color: ${props => (props.isFailure ? 'var(--danger-color)' : 'var(--text-secondary-color)')}; font-size: var(--font-size-xs); margin-top: var(--margins-xs); + min-width: 100px; // min-width so that the dialog does not resize when the status change to sending + text-align: left; `; const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupPubkeyType }) => { const groupInviteFailed = useMemberInviteFailed(pubkey, groupPk); const groupPromotionFailed = useMemberPromotionFailed(pubkey, groupPk); + const groupPromotionSending = useMemberPromoteSending(groupPk, pubkey); - const groupInvitePending = useMemberInvitePending(pubkey, groupPk); - const groupPromotionPending = useMemberPromotionPending(pubkey, groupPk); + const groupInviteSent = useMemberInviteSent(pubkey, groupPk); + const groupPromotionSent = useMemberPromotionSent(pubkey, groupPk); + const groupInviteSending = useMemberInviteSending(groupPk, pubkey); const statusText = groupPromotionFailed ? window.i18n('promotionFailed') : groupInviteFailed ? window.i18n('inviteFailed') - : groupInvitePending - ? window.i18n('invitePending') - : groupPromotionPending - ? window.i18n('promotionPending') - : null; + : groupInviteSending + ? window.i18n('inviteSending') + : groupPromotionSending + ? window.i18n('promotionSending') + : groupInviteSent + ? window.i18n('inviteSent') + : groupPromotionSent + ? window.i18n('promotionSent') + : null; if (!statusText) { return null; @@ -208,7 +218,7 @@ const ResendPromoteButton = ({ buttonShape={SessionButtonShape.Square} buttonType={SessionButtonType.Solid} buttonColor={SessionButtonColor.Danger} - text="ReSEND PRomote" + text="PrOmOtE" onClick={() => { void GroupPromote.addJob({ groupPk, member: pubkey }); }} diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index 4e66370ee6..f383e42ff9 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -16,7 +16,7 @@ import { PubKey } from '../session/types'; import { UserUtils } from '../session/utils'; import { PropsForMessageWithoutConvoProps, lookupQuote } from '../state/ducks/conversations'; import { showMessageRequestBannerOutsideRedux } from '../state/ducks/userConfig'; -import { getMemberInvitePendingOutsideRedux } from '../state/selectors/groups'; +import { getMemberInviteSentOutsideRedux } from '../state/selectors/groups'; import { getHideMessageRequestBannerOutsideRedux } from '../state/selectors/userConfig'; import { GoogleChrome } from '../util'; import { LinkPreviews } from '../util/linkPreviews'; @@ -262,8 +262,8 @@ async function handleMessageFromPendingMember( return; } - const isMemberInvitePending = getMemberInvitePendingOutsideRedux(source, convoId); - if (!isMemberInvitePending) { + const isMemberInviteSent = getMemberInviteSentOutsideRedux(source, convoId); + if (!isMemberInviteSent) { return; // nothing else to do } // we are an admin and we received a message from a member whose invite is `pending`. Update that member state now and push a change. diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 2055e40541..1fdafd537a 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -2,6 +2,7 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { debounce, difference, isNumber } from 'lodash'; import { v4 } from 'uuid'; import { ToastUtils, UserUtils } from '../..'; +import { groupInfoActions } from '../../../../state/ducks/metaGroups'; import { MetaGroupWrapperActions, UserGroupsWrapperActions, @@ -51,6 +52,9 @@ async function addJob({ groupPk, member }: JobExtraArgs) { }); window.log.debug(`addGroupInviteJob: adding group invite for ${groupPk}:${member} `); await runners.groupInviteJobRunner.addJob(groupInviteJob); + window?.inboxStore?.dispatch( + groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: true }) + ); } } @@ -151,6 +155,10 @@ class GroupInviteJob extends PersistedJob { failed = false; } } finally { + window?.inboxStore?.dispatch( + groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: false }) + ); + updateFailedStateForMember(groupPk, member, failed); try { await MetaGroupWrapperActions.memberSetInvited(groupPk, member, failed); diff --git a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts index 587eab5bd2..0fb9fde3e3 100644 --- a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts @@ -2,6 +2,7 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { isNumber } from 'lodash'; import { v4 } from 'uuid'; import { UserUtils } from '../..'; +import { groupInfoActions } from '../../../../state/ducks/metaGroups'; import { MetaGroupWrapperActions, UserGroupsWrapperActions, @@ -43,6 +44,9 @@ async function addJob({ groupPk, member }: JobExtraArgs) { }); window.log.debug(`addGroupPromoteJob: adding group promote for ${groupPk}:${member} `); await runners.groupPromoteJobRunner.addJob(groupPromoteJob); + window?.inboxStore?.dispatch( + groupInfoActions.setPromotionPending({ groupPk, pubkey: member, sending: true }) + ); } } @@ -109,6 +113,9 @@ class GroupPromoteJob extends PersistedJob { failed = false; } } finally { + window?.inboxStore?.dispatch( + groupInfoActions.setPromotionPending({ groupPk, pubkey: member, sending: false }) + ); try { await MetaGroupWrapperActions.memberSetPromoted(groupPk, member, failed); } catch (e) { diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 3f430d4a4c..984eeeddfd 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -1,5 +1,5 @@ /* eslint-disable no-await-in-loop */ -import { createAsyncThunk, createSlice } from '@reduxjs/toolkit'; +import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit'; import { GroupInfoGet, GroupMemberGet, @@ -8,6 +8,7 @@ import { Uint8ArrayLen64, UserGroupsGet, WithGroupPubkey, + WithPubkey, } from 'libsession_util_nodejs'; import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo'; import { intersection, isEmpty, uniq } from 'lodash'; @@ -31,13 +32,13 @@ import { GroupUpdateMemberChangeMessage } from '../../session/messages/outgoing/ import { GroupUpdateDeleteMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage'; import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; -import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { PreConditionFailed } from '../../session/utils/errors'; -import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; import { GroupInvite } from '../../session/utils/job_runners/jobs/GroupInviteJob'; import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; +import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; +import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { getGroupPubkeyFromWrapperType, @@ -62,6 +63,8 @@ export type GroupState = { creationFromUIPending: boolean; memberChangesFromUIPending: boolean; nameChangesFromUIPending: boolean; + membersInviteSending: Record>; + membersPromoteSending: Record>; }; export const initialGroupState: GroupState = { @@ -70,6 +73,8 @@ export const initialGroupState: GroupState = { creationFromUIPending: false, memberChangesFromUIPending: false, nameChangesFromUIPending: false, + membersInviteSending: {}, + membersPromoteSending: {}, }; type GroupDetailsUpdate = { @@ -1186,13 +1191,64 @@ const currentDeviceGroupNameChange = createAsyncThunk( } ); +function deleteGroupPkEntriesFromState(state: GroupState, groupPk: GroupPubkeyType) { + delete state.infos[groupPk]; + delete state.members[groupPk]; + delete state.membersInviteSending[groupPk]; + delete state.membersPromoteSending[groupPk]; +} + +function applySendingStateChange({ + groupPk, + pubkey, + sending, + state, + changeType, +}: WithGroupPubkey & + WithPubkey & { sending: boolean; changeType: 'invite' | 'promote'; state: GroupState }) { + if (changeType === 'invite' && !state.membersInviteSending[groupPk]) { + state.membersInviteSending[groupPk] = []; + } else if (changeType === 'promote' && !state.membersPromoteSending[groupPk]) { + state.membersPromoteSending[groupPk] = []; + } + const arrRef = + changeType === 'invite' + ? state.membersInviteSending[groupPk] + : state.membersPromoteSending[groupPk]; + + const foundAt = arrRef.findIndex(p => p === pubkey); + + if (sending && foundAt === -1) { + arrRef.push(pubkey); + return state; + } + if (!sending && foundAt >= 0) { + arrRef.splice(foundAt, 1); + } + return state; +} + /** * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. */ const metaGroupSlice = createSlice({ name: 'metaGroup', initialState: initialGroupState, - reducers: {}, + reducers: { + setInvitePending( + state: GroupState, + { payload }: PayloadAction<{ sending: boolean } & WithGroupPubkey & WithPubkey> + ) { + return applySendingStateChange({ changeType: 'invite', ...payload, state }); + }, + + setPromotionPending( + state: GroupState, + { payload }: PayloadAction<{ pubkey: PubkeyType; groupPk: GroupPubkeyType; sending: boolean }> + ) { + return applySendingStateChange({ changeType: 'promote', ...payload, state }); + }, + }, extraReducers: builder => { builder.addCase(initNewGroupInWrapper.fulfilled, (state, action) => { const { groupPk, infos, members } = action.payload; @@ -1238,8 +1294,7 @@ const metaGroupSlice = createSlice({ `refreshGroupDetailsFromWrapper no details found, removing from slice: ${groupPk}}` ); - delete state.infos[groupPk]; - delete state.members[groupPk]; + deleteGroupPkEntriesFromState(state, groupPk); } return state; }); @@ -1249,8 +1304,7 @@ const metaGroupSlice = createSlice({ builder.addCase(destroyGroupDetails.fulfilled, (state, action) => { const { groupPk } = action.payload; // FIXME destroyGroupDetails marks the info as destroyed, but does not really remove the wrapper currently - delete state.infos[groupPk]; - delete state.members[groupPk]; + deleteGroupPkEntriesFromState(state, groupPk); }); builder.addCase(destroyGroupDetails.rejected, (_state, action) => { window.log.error('a destroyGroupDetails was rejected', action.error); @@ -1268,8 +1322,7 @@ const metaGroupSlice = createSlice({ `handleUserGroupUpdate no details found, removing from slice: ${groupPk}}` ); - delete state.infos[groupPk]; - delete state.members[groupPk]; + deleteGroupPkEntriesFromState(state, groupPk); } }); builder.addCase(handleUserGroupUpdate.rejected, (_state, action) => { @@ -1363,6 +1416,7 @@ export const groupInfoActions = { inviteResponseReceived, handleMemberLeftMessage, currentDeviceGroupNameChange, + ...metaGroupSlice.actions, }; export const groupReducer = metaGroupSlice.reducer; diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index 4cea26c4b3..340a88a2bd 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -5,6 +5,8 @@ import { GroupState } from '../ducks/metaGroups'; import { StateType } from '../reducer'; const getLibGroupsState = (state: StateType): GroupState => state.groups; +const getInviteSendingState = (state: StateType) => getLibGroupsState(state).membersInviteSending; +const getPromoteSendingState = (state: StateType) => getLibGroupsState(state).membersPromoteSending; function getMembersOfGroup(state: StateType, convo?: string): Array { if (!convo) { @@ -47,8 +49,9 @@ function getMemberInviteFailed(state: StateType, pubkey: PubkeyType, convo?: Gro return findMemberInMembers(members, pubkey)?.inviteFailed || false; } -function getMemberInvitePending(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { +function getMemberInviteSent(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.invitePending || false; } @@ -62,7 +65,7 @@ function getMemberPromotionFailed(state: StateType, pubkey: PubkeyType, convo?: return findMemberInMembers(members, pubkey)?.promotionFailed || false; } -function getMemberPromotionPending(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { +function getMemberPromotionSent(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); return findMemberInMembers(members, pubkey)?.promotionPending || false; } @@ -110,12 +113,12 @@ export function getLibGroupAdminsOutsideRedux(convoId: string): Array { return state ? getLibAdminsPubkeys(state, convoId) : []; } -export function getMemberInvitePendingOutsideRedux( +export function getMemberInviteSentOutsideRedux( member: PubkeyType, convoId: GroupPubkeyType ): boolean { const state = window.inboxStore?.getState(); - return state ? getMemberInvitePending(state, member, convoId) : false; + return state ? getMemberInviteSent(state, member, convoId) : false; } export function useIsCreatingGroupFromUIPending() { @@ -126,9 +129,10 @@ export function useMemberInviteFailed(member: PubkeyType, groupPk: GroupPubkeyTy return useSelector((state: StateType) => getMemberInviteFailed(state, member, groupPk)); } -export function useMemberInvitePending(member: PubkeyType, groupPk: GroupPubkeyType) { - return useSelector((state: StateType) => getMemberInvitePending(state, member, groupPk)); +export function useMemberInviteSent(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberInviteSent(state, member, groupPk)); } + export function useMemberIsPromoted(member: PubkeyType, groupPk: GroupPubkeyType) { return useSelector((state: StateType) => getMemberIsPromoted(state, member, groupPk)); } @@ -137,10 +141,32 @@ export function useMemberPromotionFailed(member: PubkeyType, groupPk: GroupPubke return useSelector((state: StateType) => getMemberPromotionFailed(state, member, groupPk)); } -export function useMemberPromotionPending(member: PubkeyType, groupPk: GroupPubkeyType) { - return useSelector((state: StateType) => getMemberPromotionPending(state, member, groupPk)); +export function useMemberPromotionSent(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberPromotionSent(state, member, groupPk)); } export function useMemberGroupChangePending() { return useSelector(getIsMemberGroupChangePendingFromUI); } + +/** + * The selectors above are all deriving data from libsession. + * There is also some data that we only need in memory, not part of libsession (and so unsaved). + * An example is the "sending invite" or "sending promote" state of a member in a group. + */ + +function useMembersInviteSending(groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getInviteSendingState(state)[groupPk] || []); +} + +export function useMemberInviteSending(groupPk: GroupPubkeyType, memberPk: PubkeyType) { + return useMembersInviteSending(groupPk).includes(memberPk); +} + +function useMembersPromoteSending(groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getPromoteSendingState(state)[groupPk] || []); +} + +export function useMemberPromoteSending(groupPk: GroupPubkeyType, memberPk: PubkeyType) { + return useMembersPromoteSending(groupPk).includes(memberPk); +} diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 7f232e95b4..9c3018492f 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -270,7 +270,8 @@ export type LocalizerKeys = | 'invalidSessionId' | 'inviteContacts' | 'inviteFailed' - | 'invitePending' + | 'inviteSending' + | 'inviteSent' | 'join' | 'joinACommunity' | 'joinOpenGroup' @@ -415,7 +416,8 @@ export type LocalizerKeys = | 'primaryColorYellow' | 'privacySettingsTitle' | 'promotionFailed' - | 'promotionPending' + | 'promotionSending' + | 'promotionSent' | 'pruneSettingDescription' | 'pruneSettingTitle' | 'publicChatExists' diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts index ccee5dbfec..ae8d3c387a 100644 --- a/ts/util/releaseFeature.ts +++ b/ts/util/releaseFeature.ts @@ -99,7 +99,7 @@ async function checkIsUserConfigFeatureReleased() { async function checkIsDisappearMessageV2FeatureReleased() { return true; // ((await checkIsFeatureReleased('disappearing_messages')) || - // !!process.env.MULTI?.toLocaleLowerCase().includes('disappear_v2') // FIXME to remove after QA + // !!process.env.MULTI?.toLocaleLowerCase().includes('disappear_v2') // FIXME to remove after QA debugger // ); } From 8d0bd84ef060478cc00666a9f8c0ff7562961fd4 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 13 Feb 2024 17:32:26 +1100 Subject: [PATCH 087/302] feat: add toggle to share history or not with invite group v2 --- .../conversation/SessionConversation.tsx | 6 +- .../message-content/MessageContent.tsx | 11 +- .../message-content/MessageReactBar.tsx | 4 +- .../message-item/ExpirableReadableMessage.tsx | 10 +- .../message-item/InteractionNotification.tsx | 4 +- .../OverlayDisappearingMessages.tsx | 12 +- ts/components/dialog/InviteContactsDialog.tsx | 19 +- ts/components/icon/Icons.tsx | 243 ++++++------------ ts/components/leftpane/ActionsPanel.tsx | 8 +- ts/hooks/useParamSelector.ts | 61 +++-- ts/interactions/conversationInteractions.ts | 8 +- ts/models/conversation.ts | 4 +- ts/models/message.ts | 38 ++- ts/session/apis/snode_api/batchRequest.ts | 1 - ts/session/apis/snode_api/namespaces.ts | 2 + ts/session/apis/snode_api/onions.ts | 16 +- ts/session/apis/snode_api/swarmPolling.ts | 21 +- ts/session/disappearing_messages/index.ts | 29 +-- ts/session/group/closed-group.ts | 6 +- ts/state/ducks/metaGroups.ts | 4 +- 20 files changed, 211 insertions(+), 296 deletions(-) diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index f87b840f0c..df5128e6ae 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -128,10 +128,8 @@ export class SessionConversation extends React.Component { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ public componentDidUpdate(prevProps: Props, _prevState: State) { - const { - selectedConversationKey: newConversationKey, - selectedConversation: newConversation, - } = this.props; + const { selectedConversationKey: newConversationKey, selectedConversation: newConversation } = + this.props; const { selectedConversationKey: oldConversationKey } = prevProps; // if the convo is valid, and it changed, register for drag events diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx index a28d499a8a..4b7551a65c 100644 --- a/ts/components/conversation/message/message-content/MessageContent.tsx +++ b/ts/components/conversation/message/message-content/MessageContent.tsx @@ -145,15 +145,8 @@ export const MessageContent = (props: Props) => { return null; } - const { - direction, - text, - timestamp, - serverTimestamp, - previews, - quote, - attachments, - } = contentProps; + const { direction, text, timestamp, serverTimestamp, previews, quote, attachments } = + contentProps; const hasContentBeforeAttachment = !isEmpty(previews) || !isEmpty(quote) || !isEmpty(text); diff --git a/ts/components/conversation/message/message-content/MessageReactBar.tsx b/ts/components/conversation/message/message-content/MessageReactBar.tsx index dbd5a2bd6c..63e24a7fa4 100644 --- a/ts/components/conversation/message/message-content/MessageReactBar.tsx +++ b/ts/components/conversation/message/message-content/MessageReactBar.tsx @@ -21,7 +21,9 @@ type Props = { const StyledMessageReactBar = styled.div` background-color: var(--emoji-reaction-bar-background-color); border-radius: 25px; - box-shadow: 0 2px 16px 0 rgba(0, 0, 0, 0.2), 0 0px 20px 0 rgba(0, 0, 0, 0.19); + box-shadow: + 0 2px 16px 0 rgba(0, 0, 0, 0.2), + 0 0px 20px 0 rgba(0, 0, 0, 0.19); padding: 4px 8px; white-space: nowrap; diff --git a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx index 213df0b403..e24a5c44e1 100644 --- a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx +++ b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx @@ -125,14 +125,8 @@ export const ExpirableReadableMessage = (props: ExpirableReadableMessageProps) = return null; } - const { - messageId, - direction, - receivedAt, - isUnread, - expirationDurationMs, - expirationTimestamp, - } = selected; + const { messageId, direction, receivedAt, isUnread, expirationDurationMs, expirationTimestamp } = + selected; // NOTE we want messages on the left in the message detail view regardless of direction const isIncoming = props.isDetailView ? true : direction === 'incoming'; diff --git a/ts/components/conversation/message/message-item/InteractionNotification.tsx b/ts/components/conversation/message/message-item/InteractionNotification.tsx index be06bee1d8..b4d30c6353 100644 --- a/ts/components/conversation/message/message-item/InteractionNotification.tsx +++ b/ts/components/conversation/message/message-item/InteractionNotification.tsx @@ -44,8 +44,8 @@ export const InteractionNotification = (props: PropsForInteractionNotification) text = isCommunity ? window.i18n('leaveCommunityFailedPleaseTryAgain') : isGroup - ? window.i18n('leaveGroupFailedPleaseTryAgain') - : window.i18n('deleteConversationFailedPleaseTryAgain'); + ? window.i18n('leaveGroupFailedPleaseTryAgain') + : window.i18n('deleteConversationFailedPleaseTryAgain'); break; default: assertUnreachable( diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx index d68f7d5449..088bae6404 100644 --- a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx +++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx @@ -172,8 +172,8 @@ export const OverlayDisappearingMessages = () => { {singleMode === 'deleteAfterRead' ? window.i18n('disappearingMessagesModeAfterReadSubtitle') : singleMode === 'deleteAfterSend' - ? window.i18n('disappearingMessagesModeAfterSendSubtitle') - : window.i18n('settingAppliesToYourMessages')} + ? window.i18n('disappearingMessagesModeAfterSendSubtitle') + : window.i18n('settingAppliesToYourMessages')} { singleMode ? disappearingModeOptions[singleMode] : modeSelected - ? disappearingModeOptions[modeSelected] - : undefined + ? disappearingModeOptions[modeSelected] + : undefined } /> @@ -217,8 +217,8 @@ export const OverlayDisappearingMessages = () => { singleMode ? disappearingModeOptions[singleMode] : modeSelected - ? disappearingModeOptions[modeSelected] - : undefined + ? disappearingModeOptions[modeSelected] + : undefined } dataTestId={'disappear-set-button'} > diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index a3215881c1..63a07ca657 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useState } from 'react'; import useKey from 'react-use/lib/useKey'; import { PubkeyType } from 'libsession_util_nodejs'; @@ -25,10 +25,12 @@ import { SessionUtilUserGroups } from '../../session/utils/libsession/libsession import { groupInfoActions } from '../../state/ducks/metaGroups'; import { useContactsToInviteToGroup } from '../../state/selectors/conversations'; import { useMemberGroupChangePending } from '../../state/selectors/groups'; +import { useSelectedIsGroupV2 } from '../../state/selectors/selectedConversation'; import { MemberListItem } from '../MemberListItem'; import { SessionWrapperModal } from '../SessionWrapperModal'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; import { SessionSpinner } from '../basic/SessionSpinner'; +import { SessionToggle } from '../basic/SessionToggle'; type Props = { conversationId: string; @@ -122,6 +124,8 @@ const InviteContactsDialogInner = (props: Props) => { const membersFromRedux = useSortedGroupMembers(conversationId); const zombiesFromRedux = useZombies(conversationId); const displayName = useConversationUsername(conversationId); + const isGroupV2 = useSelectedIsGroupV2(); + const [shareHistory, setShareHistory] = useState(false); const { uniqueValues: selectedContacts, addTo, removeFrom } = useSet(); @@ -149,9 +153,10 @@ const InviteContactsDialogInner = (props: Props) => { void submitForOpenGroup(conversationId, selectedContacts); } else { if (PubKey.is03Pubkey(conversationId)) { + const forcedAsPubkeys = selectedContacts as Array; const action = groupInfoActions.currentDeviceGroupMembersChange({ - addMembersWithoutHistory: selectedContacts as Array, - addMembersWithHistory: [], + addMembersWithoutHistory: shareHistory ? [] : forcedAsPubkeys, + addMembersWithHistory: shareHistory ? forcedAsPubkeys : [], removeMembers: [], groupPk: conversationId, }); @@ -184,7 +189,12 @@ const InviteContactsDialogInner = (props: Props) => { return ( - + {isGroupV2 && ( + + Share History?{' '} + setShareHistory(!shareHistory)} /> + + )}
{hasContacts ? ( validContactsForInvite.map((member: string) => ( @@ -208,7 +218,6 @@ const InviteContactsDialogInner = (props: Props) => { -
= { addUser: { - path: - 'M8.85,2.17c-1.73,0-3.12,1.4-3.12,3.12s1.4,3.12,3.12,3.12c1.73,0,3.13-1.4,3.13-3.12S10.58,2.17,8.85,2.17z M8.85,0.08c2.88,0,5.21,2.33,5.21,5.21s-2.33,5.21-5.21,5.21s-5.2-2.33-5.2-5.21C3.65,2.42,5.98,0.08,8.85,0.08z M20.83,5.29 c0.54,0,0.98,0.41,1.04,0.93l0.01,0.11v2.08h2.08c0.54,0,0.98,0.41,1.04,0.93v0.12c0,0.54-0.41,0.98-0.93,1.04l-0.11,0.01h-2.08 v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08h-2.08c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11 c0-0.54,0.41-0.98,0.93-1.04l0.11-0.01h2.08V6.34C19.79,5.76,20.26,5.29,20.83,5.29z M12.5,12.58c2.8,0,5.09,2.21,5.2,4.99v0.22 v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08c0-1.67-1.3-3.03-2.95-3.12h-0.18H5.21 c-1.67,0-3.03,1.3-3.12,2.95v0.18v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93L0,19.88V17.8 c0-2.8,2.21-5.09,4.99-5.2h0.22h7.29V12.58z', + path: 'M8.85,2.17c-1.73,0-3.12,1.4-3.12,3.12s1.4,3.12,3.12,3.12c1.73,0,3.13-1.4,3.13-3.12S10.58,2.17,8.85,2.17z M8.85,0.08c2.88,0,5.21,2.33,5.21,5.21s-2.33,5.21-5.21,5.21s-5.2-2.33-5.2-5.21C3.65,2.42,5.98,0.08,8.85,0.08z M20.83,5.29 c0.54,0,0.98,0.41,1.04,0.93l0.01,0.11v2.08h2.08c0.54,0,0.98,0.41,1.04,0.93v0.12c0,0.54-0.41,0.98-0.93,1.04l-0.11,0.01h-2.08 v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08h-2.08c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11 c0-0.54,0.41-0.98,0.93-1.04l0.11-0.01h2.08V6.34C19.79,5.76,20.26,5.29,20.83,5.29z M12.5,12.58c2.8,0,5.09,2.21,5.2,4.99v0.22 v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93l-0.01-0.11v-2.08c0-1.67-1.3-3.03-2.95-3.12h-0.18H5.21 c-1.67,0-3.03,1.3-3.12,2.95v0.18v2.08c0,0.58-0.47,1.04-1.04,1.04c-0.54,0-0.98-0.41-1.04-0.93L0,19.88V17.8 c0-2.8,2.21-5.09,4.99-5.2h0.22h7.29V12.58z', viewBox: '0 0 25 21', ratio: 1, }, addModerator: { - path: - 'M21.7.7H5.1c-1.2 0-2.2.5-3 1.3C1.3 2.8.9 3.8.9 5v10.5c0 1.1.4 2.2 1.2 3 .8.8 1.8 1.2 2.9 1.2h16.7c1.1 0 2.2-.5 2.9-1.2.8-.8 1.2-1.9 1.2-3V5c0-.6-.1-1.1-.3-1.6-.2-.5-.5-1-.9-1.4-.4-.4-.8-.7-1.4-.9-.4-.3-.9-.4-1.5-.4zm2.1 14.8c0 .6-.2 1.1-.6 1.5-.4.4-.9.6-1.5.6H5.1c-.6 0-1.1-.2-1.5-.6-.4-.4-.6-1-.6-1.5V5c0-.6.2-1.1.6-1.5.4-.4.9-.6 1.5-.6h16.7c.6 0 1.1.2 1.5.6.4.4.6.9.6 1.5-.1 0-.1 10.5-.1 10.5zM17.1 9.2h-2.7V6.5c0-.3-.1-.6-.3-.8-.4-.4-1.1-.4-1.5 0-.2.2-.3.5-.3.8v2.7H9.7c-.3 0-.5.1-.7.3-.4.4-.4 1.1 0 1.5.2.2.5.3.7.3h2.6V14c0 .3.1.6.3.8.2.2.5.3.7.3.3 0 .5-.1.7-.3.2-.2.3-.5.3-.8v-2.7H17c.3 0 .5-.1.7-.3.4-.4.4-1.1 0-1.5-.1-.2-.4-.3-.6-.3z', + path: 'M21.7.7H5.1c-1.2 0-2.2.5-3 1.3C1.3 2.8.9 3.8.9 5v10.5c0 1.1.4 2.2 1.2 3 .8.8 1.8 1.2 2.9 1.2h16.7c1.1 0 2.2-.5 2.9-1.2.8-.8 1.2-1.9 1.2-3V5c0-.6-.1-1.1-.3-1.6-.2-.5-.5-1-.9-1.4-.4-.4-.8-.7-1.4-.9-.4-.3-.9-.4-1.5-.4zm2.1 14.8c0 .6-.2 1.1-.6 1.5-.4.4-.9.6-1.5.6H5.1c-.6 0-1.1-.2-1.5-.6-.4-.4-.6-1-.6-1.5V5c0-.6.2-1.1.6-1.5.4-.4.9-.6 1.5-.6h16.7c.6 0 1.1.2 1.5.6.4.4.6.9.6 1.5-.1 0-.1 10.5-.1 10.5zM17.1 9.2h-2.7V6.5c0-.3-.1-.6-.3-.8-.4-.4-1.1-.4-1.5 0-.2.2-.3.5-.3.8v2.7H9.7c-.3 0-.5.1-.7.3-.4.4-.4 1.1 0 1.5.2.2.5.3.7.3h2.6V14c0 .3.1.6.3.8.2.2.5.3.7.3.3 0 .5-.1.7-.3.2-.2.3-.5.3-.8v-2.7H17c.3 0 .5-.1.7-.3.4-.4.4-1.1 0-1.5-.1-.2-.4-.3-.6-.3z', viewBox: '0 0 26 20', ratio: 1.18, }, arrow: { - path: - 'M33.187,12.438 L6.097,12.438 L16.113,2.608 C16.704,2.027 16.713,1.078 16.133,0.486 C15.551,-0.105 14.602,-0.113 14.011,0.466 L1.407,12.836 C1.121,13.117 0.959,13.5 0.957981241,13.9 C0.956,14.3 1.114,14.685 1.397,14.968 L14.022,27.593 C14.315,27.886 14.699,28.032 15.083,28.032 C15.466,28.032 15.85,27.886 16.143,27.593 C16.729,27.007 16.729,26.057 16.143,25.472 L6.109,15.438 L33.187,15.438 C34.015,15.438 34.687,14.766 34.687,13.938 C34.687,13.109 34.015,12.438 33.187,12.438', + path: 'M33.187,12.438 L6.097,12.438 L16.113,2.608 C16.704,2.027 16.713,1.078 16.133,0.486 C15.551,-0.105 14.602,-0.113 14.011,0.466 L1.407,12.836 C1.121,13.117 0.959,13.5 0.957981241,13.9 C0.956,14.3 1.114,14.685 1.397,14.968 L14.022,27.593 C14.315,27.886 14.699,28.032 15.083,28.032 C15.466,28.032 15.85,27.886 16.143,27.593 C16.729,27.007 16.729,26.057 16.143,25.472 L6.109,15.438 L33.187,15.438 C34.015,15.438 34.687,14.766 34.687,13.938 C34.687,13.109 34.015,12.438 33.187,12.438', viewBox: '0 -4 37 37', ratio: 1, }, bell: { - path: - 'M2.117 0a.396.396 0 00-.397.397v.18C.963.757.53 1.434.53 2.25v1.323l-.53.53v.264h4.233V4.1l-.529-.53v-.223h-.29c-.066 0-.132-.006-.197-.015v.546l-2.159-.042V2.249c0-.656.4-1.19 1.059-1.19l.064.003c.119-.181.278-.334.463-.448a1.608 1.608 0 00-.13-.036v-.18A.396.396 0 002.117 0zm-.53 4.63a.53.53 0 001.058 0z M3.355.578a1.267 1.267 0 000 2.534h.634v-.254h-.634c-.55 0-1.013-.464-1.013-1.013 0-.55.463-1.014 1.013-1.014.55 0 1.014.464 1.014 1.014v.18c0 .1-.09.2-.19.2s-.19-.1-.19-.2v-.18a.634.634 0 10-.185.447.47.47 0 00.375.186c.25 0 .443-.203.443-.452v-.181c0-.7-.567-1.267-1.267-1.267zm0 1.647a.38.38 0 110-.76.38.38 0 010 .76z', + path: 'M2.117 0a.396.396 0 00-.397.397v.18C.963.757.53 1.434.53 2.25v1.323l-.53.53v.264h4.233V4.1l-.529-.53v-.223h-.29c-.066 0-.132-.006-.197-.015v.546l-2.159-.042V2.249c0-.656.4-1.19 1.059-1.19l.064.003c.119-.181.278-.334.463-.448a1.608 1.608 0 00-.13-.036v-.18A.396.396 0 002.117 0zm-.53 4.63a.53.53 0 001.058 0z M3.355.578a1.267 1.267 0 000 2.534h.634v-.254h-.634c-.55 0-1.013-.464-1.013-1.013 0-.55.463-1.014 1.013-1.014.55 0 1.014.464 1.014 1.014v.18c0 .1-.09.2-.19.2s-.19-.1-.19-.2v-.18a.634.634 0 10-.185.447.47.47 0 00.375.186c.25 0 .443-.203.443-.452v-.181c0-.7-.567-1.267-1.267-1.267zm0 1.647a.38.38 0 110-.76.38.38 0 010 .76z', viewBox: '0 0 4.622 5.159', ratio: 1, }, brand: { - path: - 'm 216.456,315.282 c 36.104,0 66.415,-29.551 65.565,-65.646 -0.59,-25.135 -14.478,-48.161 -36.54,-60.386 l -83.435,-46.234 v 69.229 c 0,5.18855 -4.20645,9.39455 -9.395,9.394 H 67.847 c -26.603,0 -48.093,22.297 -46.765,49.183 1.242,25.15 22.941,44.46 48.123,44.46 h 147.251 m -75.437,-121.993 0.016,-69.217 c 0.002,-5.186 4.19,-9.391 9.376,-9.392 l 84.808,-0.014 c 26.602,0 48.092,-22.297 46.764,-49.181 C 280.74,40.334 259.041,21.023 233.858,21.023 H 86.608 c -36.103,0 -66.415,29.551 -65.565,65.646 0.591,25.136 14.479,48.161 36.541,60.386 z m 114.65,-22.427 c 29.233,16.2 47.395,47.023 47.395,80.448 0,46.865 -38.129,84.995 -84.995,84.995 H 67.847 C 30.437,336.305 0,305.867 0,268.459 0,231.051 30.437,200.616 67.847,200.616 h 43.026 L 47.396,165.445 C 18.162,149.243 0,118.42 0,84.995 0,38.131 38.13,0 84.995,0 h 150.224 c 37.408,0 67.845,30.438 67.845,67.846 0,37.409 -30.437,67.843 -67.845,67.843 h -43.028 l 63.478,35.173', + path: 'm 216.456,315.282 c 36.104,0 66.415,-29.551 65.565,-65.646 -0.59,-25.135 -14.478,-48.161 -36.54,-60.386 l -83.435,-46.234 v 69.229 c 0,5.18855 -4.20645,9.39455 -9.395,9.394 H 67.847 c -26.603,0 -48.093,22.297 -46.765,49.183 1.242,25.15 22.941,44.46 48.123,44.46 h 147.251 m -75.437,-121.993 0.016,-69.217 c 0.002,-5.186 4.19,-9.391 9.376,-9.392 l 84.808,-0.014 c 26.602,0 48.092,-22.297 46.764,-49.181 C 280.74,40.334 259.041,21.023 233.858,21.023 H 86.608 c -36.103,0 -66.415,29.551 -65.565,65.646 0.591,25.136 14.479,48.161 36.541,60.386 z m 114.65,-22.427 c 29.233,16.2 47.395,47.023 47.395,80.448 0,46.865 -38.129,84.995 -84.995,84.995 H 67.847 C 30.437,336.305 0,305.867 0,268.459 0,231.051 30.437,200.616 67.847,200.616 h 43.026 L 47.396,165.445 C 18.162,149.243 0,118.42 0,84.995 0,38.131 38.13,0 84.995,0 h 150.224 c 37.408,0 67.845,30.438 67.845,67.846 0,37.409 -30.437,67.843 -67.845,67.843 h -43.028 l 63.478,35.173', viewBox: '0 0 404.085 448.407', ratio: 1, }, callIncoming: { - path: - 'M14.414 7l3.293-3.293a1 1 0 00-1.414-1.414L13 5.586V4a1 1 0 10-2 0v4.003a.996.996 0 00.617.921A.997.997 0 0012 9h4a1 1 0 100-2h-1.586zM2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3z', + path: 'M14.414 7l3.293-3.293a1 1 0 00-1.414-1.414L13 5.586V4a1 1 0 10-2 0v4.003a.996.996 0 00.617.921A.997.997 0 0012 9h4a1 1 0 100-2h-1.586zM2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3z', viewBox: '0 0 20 20', ratio: 1, }, callOutgoing: { - path: - 'M17.924 2.617a.997.997 0 00-.215-.322l-.004-.004A.997.997 0 0017 2h-4a1 1 0 100 2h1.586l-3.293 3.293a1 1 0 001.414 1.414L16 5.414V7a1 1 0 102 0V3a.997.997 0 00-.076-.383zM2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3z', + path: 'M17.924 2.617a.997.997 0 00-.215-.322l-.004-.004A.997.997 0 0017 2h-4a1 1 0 100 2h1.586l-3.293 3.293a1 1 0 001.414 1.414L16 5.414V7a1 1 0 102 0V3a.997.997 0 00-.076-.383zM2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3z', viewBox: '0 0 20 20', ratio: 1, }, callMissed: { - path: - 'M2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3zM16.707 3.293a1 1 0 010 1.414L15.414 6l1.293 1.293a1 1 0 01-1.414 1.414L14 7.414l-1.293 1.293a1 1 0 11-1.414-1.414L12.586 6l-1.293-1.293a1 1 0 011.414-1.414L14 4.586l1.293-1.293a1 1 0 011.414 0z', + path: 'M2 3a1 1 0 011-1h2.153a1 1 0 01.986.836l.74 4.435a1 1 0 01-.54 1.06l-1.548.773a11.037 11.037 0 006.105 6.105l.774-1.548a1 1 0 011.059-.54l4.435.74a1 1 0 01.836.986V17a1 1 0 01-1 1h-2C7.82 18 2 12.18 2 5V3zM16.707 3.293a1 1 0 010 1.414L15.414 6l1.293 1.293a1 1 0 01-1.414 1.414L14 7.414l-1.293 1.293a1 1 0 11-1.414-1.414L12.586 6l-1.293-1.293a1 1 0 011.414-1.414L14 4.586l1.293-1.293a1 1 0 011.414 0z', viewBox: '0 0 20 20', ratio: 1, }, @@ -143,20 +135,17 @@ export const icons: Record { // Do this only if we created a new Session ID, or if we already received the initial configuration message const triggerSyncIfNeeded = async () => { const us = UserUtils.getOurPubKeyStrFromCache(); - await ConvoHub.use() - .get(us) - .setDidApproveMe(true, true); - await ConvoHub.use() - .get(us) - .setIsApproved(true, true); + await ConvoHub.use().get(us).setDidApproveMe(true, true); + await ConvoHub.use().get(us).setIsApproved(true, true); const didWeHandleAConfigurationMessageAlready = (await Data.getItemById(SettingsKey.hasSyncedInitialConfigurationItem))?.value || false; if (didWeHandleAConfigurationMessageAlready) { diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index b353634e17..48b23cfbe5 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -352,28 +352,29 @@ export function useIsTyping(conversationId?: string): boolean { return useConversationPropsById(conversationId)?.isTyping || false; } -const getMessageExpirationProps = createSelector(getMessagePropsByMessageId, (props): - | PropsForExpiringMessage - | undefined => { - if (!props || isEmpty(props)) { - return undefined; - } +const getMessageExpirationProps = createSelector( + getMessagePropsByMessageId, + (props): PropsForExpiringMessage | undefined => { + if (!props || isEmpty(props)) { + return undefined; + } - const msgProps: PropsForExpiringMessage = { - ...pick(props.propsForMessage, [ - 'convoId', - 'direction', - 'receivedAt', - 'isUnread', - 'expirationTimestamp', - 'expirationDurationMs', - 'isExpired', - ]), - messageId: props.propsForMessage.id, - }; - - return msgProps; -}); + const msgProps: PropsForExpiringMessage = { + ...pick(props.propsForMessage, [ + 'convoId', + 'direction', + 'receivedAt', + 'isUnread', + 'expirationTimestamp', + 'expirationDurationMs', + 'isExpired', + ]), + messageId: props.propsForMessage.id, + }; + + return msgProps; + } +); export function useMessageExpirationPropsById(messageId?: string) { return useSelector((state: StateType) => { @@ -430,9 +431,7 @@ export function useTimerOptionsByMode(disappearingMessageMode?: string, hasOnlyO }, [disappearingMessageMode, hasOnlyOneMode]); } -export function useQuoteAuthorName( - authorId?: string -): { +export function useQuoteAuthorName(authorId?: string): { authorName: string | undefined; isMe: boolean; } { @@ -442,8 +441,8 @@ export function useQuoteAuthorName( const authorName = isMe ? window.i18n('you') : convoProps?.nickname || convoProps?.isPrivate - ? convoProps?.displayNameInProfile - : undefined; + ? convoProps?.displayNameInProfile + : undefined; return { authorName, isMe }; } @@ -495,12 +494,12 @@ export function useDisappearingMessageSettingText({ expirationMode === 'deleteAfterRead' ? window.i18n('disappearingMessagesModeAfterRead') : expirationMode === 'deleteAfterSend' - ? window.i18n('disappearingMessagesModeAfterSend') - : expirationMode === 'legacy' - ? isMe || (isGroup && !isPublic) ? window.i18n('disappearingMessagesModeAfterSend') - : window.i18n('disappearingMessagesModeAfterRead') - : null; + : expirationMode === 'legacy' + ? isMe || (isGroup && !isPublic) + ? window.i18n('disappearingMessagesModeAfterSend') + : window.i18n('disappearingMessagesModeAfterRead') + : null; const expireTimerText = isNumber(expireTimer) ? abbreviate diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index e4440c32d7..02c7fd6876 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -206,9 +206,7 @@ export const declineConversationWithConfirm = ({ const okKey: LocalizerKeys = alsoBlock ? 'block' : 'delete'; const nameToBlock = alsoBlock && !!conversationIdOrigin - ? ConvoHub.use() - .get(conversationIdOrigin) - ?.getContactProfileNameOrShortenedPubKey() + ? ConvoHub.use().get(conversationIdOrigin)?.getContactProfileNameOrShortenedPubKey() : null; const messageKey: LocalizerKeys = isGroupV2 ? alsoBlock && nameToBlock @@ -621,9 +619,7 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) { } else { // this is a reupload. no need to generate a new profileKey const ourConvoProfileKey = - ConvoHub.use() - .get(UserUtils.getOurPubKeyStrFromCache()) - ?.getProfileKey() || null; + ConvoHub.use().get(UserUtils.getOurPubKeyStrFromCache())?.getProfileKey() || null; profileKey = ourConvoProfileKey ? fromHexToArray(ourConvoProfileKey) : null; if (!profileKey) { diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index d134a0b9e1..4c112e2b1b 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -2243,8 +2243,8 @@ export class ConversationModel extends Backbone.Model { const interactionNotification = lastMessageModel.getInteractionNotification(); const lastMessageInteractionType = interactionNotification?.interactionType; - const lastMessageInteractionStatus = lastMessageModel.getInteractionNotification() - ?.interactionStatus; + const lastMessageInteractionStatus = + lastMessageModel.getInteractionNotification()?.interactionStatus; const lastMessageStatus = lastMessageModel.getMessagePropStatus() || undefined; const lastMessageNotificationText = lastMessageModel.getNotificationText() || undefined; // we just want to set the `status` to `undefined` if there are no `lastMessageNotificationText` diff --git a/ts/models/message.ts b/ts/models/message.ts index 0887bd64ea..a0d72d5434 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -487,7 +487,7 @@ export class MessageModel extends Backbone.Model { if (groupUpdate.joinedWithHistory?.length) { const change: PropsForGroupUpdateAdd = { type: 'add', - added: groupUpdate.joined as Array, + added: groupUpdate.joinedWithHistory as Array, withHistory: true, }; return { change, ...sharedProps }; @@ -763,9 +763,8 @@ export class MessageModel extends Backbone.Model { const quoteWithData = await loadQuoteData(this.get('quote')); const previewWithData = await loadPreviewData(this.get('preview')); - const { hasAttachments, hasVisualMediaAttachments, hasFileAttachments } = getAttachmentMetadata( - this - ); + const { hasAttachments, hasVisualMediaAttachments, hasFileAttachments } = + getAttachmentMetadata(this); this.set({ hasAttachments, hasVisualMediaAttachments, hasFileAttachments }); await this.commit(); @@ -816,8 +815,9 @@ export class MessageModel extends Backbone.Model { } window.log.info( - `Upload of message data for message ${this.idForLogging()} is finished in ${Date.now() - - start}ms.` + `Upload of message data for message ${this.idForLogging()} is finished in ${ + Date.now() - start + }ms.` ); return { body, @@ -1266,24 +1266,34 @@ export class MessageModel extends Backbone.Model { const left: Array | undefined = Array.isArray(groupUpdate.left) ? groupUpdate.left : groupUpdate.left - ? [groupUpdate.left] - : undefined; + ? [groupUpdate.left] + : undefined; const kicked: Array | undefined = Array.isArray(groupUpdate.kicked) ? groupUpdate.kicked : groupUpdate.kicked - ? [groupUpdate.kicked] - : undefined; + ? [groupUpdate.kicked] + : undefined; const joined: Array | undefined = Array.isArray(groupUpdate.joined) ? groupUpdate.joined : groupUpdate.joined - ? [groupUpdate.joined] - : undefined; + ? [groupUpdate.joined] + : undefined; + const joinedWithHistory: Array | undefined = Array.isArray( + groupUpdate.joinedWithHistory + ) + ? groupUpdate.joinedWithHistory + : groupUpdate.joinedWithHistory + ? [groupUpdate.joinedWithHistory] + : undefined; const forcedArrayUpdate: MessageGroupUpdate = {}; if (left) { forcedArrayUpdate.left = left; } + if (joinedWithHistory) { + forcedArrayUpdate.joinedWithHistory = joinedWithHistory; + } if (joined) { forcedArrayUpdate.joined = joined; } @@ -1404,8 +1414,8 @@ export class MessageModel extends Backbone.Model { return isCommunity ? window.i18n('leaveCommunityFailed') : isGroup - ? window.i18n('leaveGroupFailed') - : window.i18n('deleteConversationFailed'); + ? window.i18n('leaveGroupFailed') + : window.i18n('deleteConversationFailed'); default: assertUnreachable( interactionType, diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 9c714d74e5..106512674f 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -94,7 +94,6 @@ function decodeBatchRequest(snodeResponse: SnodeResponse): NotEmptyArrayOfBatchR try { // console.error('decodeBatch: ', snodeResponse); if (snodeResponse.status !== 200) { - debugger; throw new Error(`decodeBatchRequest invalid status code: ${snodeResponse.status}`); } const parsed = JSON.parse(snodeResponse.body); diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index 12466290a9..377b706c55 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -257,6 +257,8 @@ function toRole(namespace: number) { return 'groupInfo'; case SnodeNamespaces.ClosedGroupMembers: return 'groupMembers'; + case SnodeNamespaces.ClosedGroupRevokedRetrievableMessages: + return 'groupRevoked'; default: return `${namespace}`; } diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index 6f5cbdd7bf..15289d3386 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -87,9 +87,11 @@ async function encryptOnionV4RequestForPubkey( ) { const plaintext = encodeV4Request(requestInfo); - return callUtilsWorker('encryptForPubkey', pubKeyX25519hex, plaintext) as Promise< - DestinationContext - >; + return callUtilsWorker( + 'encryptForPubkey', + pubKeyX25519hex, + plaintext + ) as Promise; } // Returns the actual ciphertext, symmetric key that will be used // for decryption, and an ephemeral_key to send to the next hop @@ -99,9 +101,11 @@ async function encryptForPubKey( ): Promise { const plaintext = new TextEncoder().encode(JSON.stringify(requestInfo)); - return callUtilsWorker('encryptForPubkey', pubKeyX25519hex, plaintext) as Promise< - DestinationContext - >; + return callUtilsWorker( + 'encryptForPubkey', + pubKeyX25519hex, + plaintext + ) as Promise; } export type DestinationRelayV2 = { diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 9c63947109..f191314f60 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -728,17 +728,16 @@ function retrieveItemWithNamespace( ): Array { return flatten( compact( - results.map( - result => - result.messages.messages?.map(r => { - // throws if the result is not expected - const parsedItem = retrieveItemSchema.parse(r); - return { - ...omit(parsedItem, 'timestamp'), - namespace: result.namespace, - storedAt: parsedItem.timestamp, - }; - }) + results.map(result => + result.messages.messages?.map(r => { + // throws if the result is not expected + const parsedItem = retrieveItemSchema.parse(r); + return { + ...omit(parsedItem, 'timestamp'), + namespace: result.namespace, + storedAt: parsedItem.timestamp, + }; + }) ) ) ); diff --git a/ts/session/disappearing_messages/index.ts b/ts/session/disappearing_messages/index.ts index a315473670..931eb85f98 100644 --- a/ts/session/disappearing_messages/index.ts +++ b/ts/session/disappearing_messages/index.ts @@ -59,9 +59,7 @@ export async function destroyMessagesAndUpdateRedux( // trigger a refresh the last message for all those uniq conversation conversationWithChanges.forEach(convoIdToUpdate => { - ConvoHub.use() - .get(convoIdToUpdate) - ?.updateLastMessage(); + ConvoHub.use().get(convoIdToUpdate)?.updateLastMessage(); }); } @@ -91,12 +89,8 @@ async function destroyExpiredMessages() { window.log.info('destroyExpiredMessages: convosToRefresh:', convosToRefresh); await Promise.all( convosToRefresh.map(async c => { - ConvoHub.use() - .get(c) - ?.updateLastMessage(); - return ConvoHub.use() - .get(c) - ?.refreshInMemoryDetails(); + ConvoHub.use().get(c)?.updateLastMessage(); + return ConvoHub.use().get(c)?.refreshInMemoryDetails(); }) ); } catch (error) { @@ -278,9 +272,7 @@ function changeToDisappearingMessageType( * This should only be used for DataExtractionNotification and CallMessages (the ones saved to the DB) currently. * Note: this can only be called for private conversations, excluding ourselves as it throws otherwise (this wouldn't be right) * */ -function forcedDeleteAfterReadMsgSetting( - convo: ConversationModel -): { +function forcedDeleteAfterReadMsgSetting(convo: ConversationModel): { expirationType: Exclude; expireTimer: number; } { @@ -307,9 +299,7 @@ function forcedDeleteAfterReadMsgSetting( * This should only be used for the outgoing CallMessages that we keep locally only (not synced, just the "you started a call" notification) * Note: this can only be called for private conversations, excluding ourselves as it throws otherwise (this wouldn't be right) * */ -function forcedDeleteAfterSendMsgSetting( - convo: ConversationModel -): { +function forcedDeleteAfterSendMsgSetting(convo: ConversationModel): { expirationType: Exclude; expireTimer: number; } { @@ -365,7 +355,8 @@ async function checkForExpireUpdateInContentMessage( ): Promise { const dataMessage = content.dataMessage as SignalService.DataMessage | undefined; // We will only support legacy disappearing messages for a short period before disappearing messages v2 is unlocked - const isDisappearingMessagesV2Released = await ReleasedFeatures.checkIsDisappearMessageV2FeatureReleased(); + const isDisappearingMessagesV2Released = + await ReleasedFeatures.checkIsDisappearMessageV2FeatureReleased(); const couldBeLegacyContentMessage = couldBeLegacyDisappearingMessageContent(content); const isLegacyDataMessage = @@ -565,9 +556,9 @@ function getMessageReadyToDisappear( if (msgExpirationWasAlreadyUpdated) { const expirationStartTimestamp = messageExpirationFromRetrieve - expireTimer * 1000; window.log.debug( - `incoming DaR message already read by another device, forcing readAt ${(Date.now() - - expirationStartTimestamp) / - 1000}s ago, so with ${(messageExpirationFromRetrieve - Date.now()) / 1000}s left` + `incoming DaR message already read by another device, forcing readAt ${ + (Date.now() - expirationStartTimestamp) / 1000 + }s ago, so with ${(messageExpirationFromRetrieve - Date.now()) / 1000}s left` ); messageModel.set({ expirationStartTimestamp, diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 0f72a232fd..f92ae9209f 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -166,7 +166,11 @@ export async function addUpdateMessage({ if (diff.type === 'name' && diff.newName) { groupUpdate.name = diff.newName; } else if (diff.type === 'add' && diff.added) { - groupUpdate.joined = diff.added; + if (diff.withHistory) { + groupUpdate.joinedWithHistory = diff.added; + } else { + groupUpdate.joined = diff.added; + } } else if (diff.type === 'left' && diff.left) { groupUpdate.left = diff.left; } else if (diff.type === 'kicked' && diff.kicked) { diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 984eeeddfd..2bf0776d20 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -784,7 +784,7 @@ async function handleMemberAddedFromUI({ const updateMessagesToPush: Array = []; if (withHistory.length) { const msgModel = await ClosedGroup.addUpdateMessage({ - diff: { type: 'add', added: withHistory, withHistory: false }, + diff: { type: 'add', added: withHistory, withHistory: true }, ...shared, }); const groupChange = await getWithHistoryControlMessage({ @@ -801,7 +801,7 @@ async function handleMemberAddedFromUI({ } if (withoutHistory.length) { const msgModel = await ClosedGroup.addUpdateMessage({ - diff: { type: 'add', added: withoutHistory, withHistory: true }, + diff: { type: 'add', added: withoutHistory, withHistory: false }, ...shared, }); const groupChange = await getWithoutHistoryControlMessage({ From 5d467fd20573088527f6a100ab094ef261b4531f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 19 Feb 2024 09:13:29 +1100 Subject: [PATCH 088/302] feat: add way to autoregister with env variables --- _locales/en/messages.json | 6 ++-- ts/components/MemberListItem.tsx | 2 +- ts/components/dialog/InviteContactsDialog.tsx | 23 +++++++------- .../registration/RegistrationUserDetails.tsx | 30 +++++++++++++++++-- ts/components/registration/SignUpTab.tsx | 19 +++++++++--- ts/interactions/conversationInteractions.ts | 6 +++- ts/shared/env_vars.ts | 6 ++++ 7 files changed, 68 insertions(+), 24 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index c7640133a7..09ab73dcf4 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -341,7 +341,7 @@ "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone", "leaveGroupConfirmation": "Are you sure you want to leave $name$?", "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?", - "leaveGroupConrirmationOnlyAdminLegacy": "Are you sure you want to leave $name$? This will deactivate the group for all members.", + "leaveGroupConrirmationOnlyAdminLegacy": "Because you are the creator of this group it will be deleted for everyone. This cannot be undone.", "leaveGroupConfirmationOnlyAdmin": "You are the only admin in $name$", "leaveGroupConfirmationOnlyAdminWarning": "Group settings and members cannot be changed without an admin", "leaveGroupFailed": "Failed to leave Group!", @@ -484,7 +484,7 @@ "closedGroupInviteSuccessMessage": "Successfully invited group members", "notificationForConvo": "Notifications", "notificationForConvo_all": "All", - "notificationForConvo_disabled": "Disabled", + "notificationForConvo_disabled": "Mute", "notificationForConvo_mentions_only": "Mentions only", "onionPathIndicatorTitle": "Path", "onionPathIndicatorDescription": "Session hides your IP by bouncing your messages through several Service Nodes in Session's decentralized network. These are the countries your connection is currently being bounced through:", @@ -582,7 +582,7 @@ "mustBeApproved": "This conversation must be accepted to use this feature", "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", - "clearAllConfirmationBody": "Are you sure you want to clear all message requests?", + "clearAllConfirmationBody": "Are you sure you want to clear all message and group requests?", "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index a24d015ccc..edebfc25ab 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -199,7 +199,7 @@ const ResendInviteButton = ({ buttonType={SessionButtonType.Solid} text={window.i18n('resend')} onClick={() => { - void GroupInvite.addJob({ groupPk, member: pubkey }); + void GroupInvite.addJob({ groupPk, member: pubkey }); // TODO audric: do we need to take care if that user was invited withHistory or not }} /> ); diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index 63a07ca657..e0b474d556 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import useKey from 'react-use/lib/useKey'; import { PubkeyType } from 'libsession_util_nodejs'; -import _ from 'lodash'; +import _, { difference, uniq } from 'lodash'; import { useDispatch } from 'react-redux'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { VALIDATION } from '../../session/constants'; @@ -114,15 +114,14 @@ const InviteContactsDialogInner = (props: Props) => { const { conversationId } = props; const dispatch = useDispatch(); - const privateContactPubkeys = useContactsToInviteToGroup(); - let validContactsForInvite = _.clone(privateContactPubkeys) as Array; + const privateContactPubkeys = useContactsToInviteToGroup() as Array; const isProcessingUIChange = useMemberGroupChangePending(); const isPrivate = useIsPrivate(conversationId); const isPublic = useIsPublic(conversationId); - const membersFromRedux = useSortedGroupMembers(conversationId); - const zombiesFromRedux = useZombies(conversationId); + const membersFromRedux = useSortedGroupMembers(conversationId) || []; + const zombiesFromRedux = useZombies(conversationId) || []; const displayName = useConversationUsername(conversationId); const isGroupV2 = useSelectedIsGroupV2(); const [shareHistory, setShareHistory] = useState(false); @@ -132,14 +131,12 @@ const InviteContactsDialogInner = (props: Props) => { if (isPrivate) { throw new Error('InviteContactsDialogInner must be a group'); } - if (!isPublic) { - // filter our zombies and current members from the list of contact we can add - const members = membersFromRedux || []; - const zombies = zombiesFromRedux || []; - validContactsForInvite = validContactsForInvite.filter( - d => !members.includes(d) && !zombies.includes(d) - ); - } + const zombiesAndMembers = uniq([...membersFromRedux, ...zombiesFromRedux]); + // filter our zombies and current members from the list of contact we can add + + const validContactsForInvite = isPublic + ? privateContactPubkeys + : difference(privateContactPubkeys, zombiesAndMembers); const chatName = displayName || window.i18n('unknown'); diff --git a/ts/components/registration/RegistrationUserDetails.tsx b/ts/components/registration/RegistrationUserDetails.tsx index ab17a76e02..2aee802bfc 100644 --- a/ts/components/registration/RegistrationUserDetails.tsx +++ b/ts/components/registration/RegistrationUserDetails.tsx @@ -1,14 +1,40 @@ import classNames from 'classnames'; import React from 'react'; +import useTimeoutFn from 'react-use/lib/useTimeoutFn'; import { MAX_USERNAME_BYTES } from '../../session/constants'; +import { isAutoLogin, isDevProd } from '../../shared/env_vars'; import { SessionInput } from '../basic/SessionInput'; -const DisplayNameInput = (props: { +type DisplayNameProps = { stealAutoFocus?: boolean; displayName: string; onDisplayNameChanged: (val: string) => any; handlePressEnter: () => any; -}) => { +}; + +/** + * Can only be used with yarn start-prod. Auto creates a user with the NODE_APP_INSTANCE as username + */ +function useAutoRegister(props: DisplayNameProps) { + useTimeoutFn(() => { + if (isDevProd() && isAutoLogin() && !props.displayName) { + if (!process.env.NODE_APP_INSTANCE) { + throw new Error('NODE_APP_INSTANCE empty but devprod is true'); + } + props.onDisplayNameChanged(process.env.NODE_APP_INSTANCE.replace('devprod', '')); + } + }, 100); + + useTimeoutFn(() => { + if (isDevProd() && props.displayName) { + props.handlePressEnter(); + } + }, 200); +} + +const DisplayNameInput = (props: DisplayNameProps) => { + useAutoRegister(props); + return ( return ; }; -const ContinueSignUpButton = ({ continueSignUp }: { continueSignUp: any }) => { - return ; +function useAutoContinue(props: { continueSignUp: () => void }) { + useTimeoutFn(() => { + if (isDevProd() && isAutoLogin()) { + props.continueSignUp(); + } + }, 100); +} + +const ContinueSignUpButton = (props: { continueSignUp: () => void }) => { + useAutoContinue(props); + return ; }; const SignUpDefault = (props: { createSessionID: Noop }) => { diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 02c7fd6876..55ec30d0fb 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -152,7 +152,11 @@ export async function declineConversationWithoutConfirm({ // Note: do not set the active_at undefined as this would make that conversation not synced with the libsession wrapper await conversationToDecline.setIsApproved(false, false); await conversationToDecline.setDidApproveMe(false, false); - await conversationToDecline.setOriginConversationID('', false); + + if (conversationToDecline.isClosedGroupV2()) { + // this can only be done for groupv2 convos + await conversationToDecline.setOriginConversationID('', false); + } // this will update the value in the wrapper if needed but not remove the entry if we want it gone. The remove is done below with removeContactFromWrapper await conversationToDecline.commit(); if (alsoBlock) { diff --git a/ts/shared/env_vars.ts b/ts/shared/env_vars.ts index 349277c429..0f7d570707 100644 --- a/ts/shared/env_vars.ts +++ b/ts/shared/env_vars.ts @@ -8,9 +8,15 @@ function envAppInstanceIncludes(prefix: string) { export function isDevProd() { return envAppInstanceIncludes('devprod'); } + +export function isAutoLogin() { + return !!process.env.SESSION_AUTO_REGISTER; +} + export function isTestNet() { return envAppInstanceIncludes('testnet'); } + export function isTestIntegration() { return envAppInstanceIncludes('test-integration'); } From 0a4e3041dea0a97217d915e3ca1f6a83d6328430 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 20 Feb 2024 09:59:30 +1100 Subject: [PATCH 089/302] fix: leave group v2 as only admin mark it as deleted and pushes to swarm before removing the wrapper data --- _locales/en/messages.json | 2 +- ts/interactions/conversationInteractions.ts | 10 ++-- ts/models/conversation.ts | 4 +- .../conversations/ConversationController.ts | 36 ++++++------- ts/state/ducks/metaGroups.ts | 50 ++++++++++++++----- ts/types/LocalizerKeys.ts | 2 +- 6 files changed, 62 insertions(+), 42 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 496f4f457f..cafa1c320b 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -342,7 +342,7 @@ "leaveAndRemoveForEveryone": "Leave Group and Remove for Everyone", "leaveGroupConfirmation": "Are you sure you want to leave $name$?", "leaveGroupConfirmationAdmin": "As you are the admin of this group, if you leave it it will be removed for every current members. Are you sure you want to leave this group?", - "leaveGroupConrirmationOnlyAdminLegacy": "Because you are the creator of this group it will be deleted for everyone. This cannot be undone.", + "leaveGroupConfirmationOnlyAdminLegacy": "Because you are the creator of this group it will be deleted for everyone. This cannot be undone.", "leaveGroupConfirmationOnlyAdmin": "You are the only admin in $name$", "leaveGroupConfirmationOnlyAdminWarning": "Group settings and members cannot be changed without an admin", "leaveGroupFailed": "Failed to leave Group!", diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 55ec30d0fb..59cfa1c201 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -397,9 +397,9 @@ export async function showLeaveGroupByConvoId(conversationId: string, name: stri const isClosedGroup = conversation.isClosedGroup() || false; const isPublic = conversation.isPublic() || false; - const admins = conversation.get('groupAdmins') || []; + const admins = conversation.getGroupAdmins(); const isAdmin = admins.includes(UserUtils.getOurPubKeyStrFromCache()); - const showOnlyGroupAdminWarning = isClosedGroup && isAdmin && admins.length === 1; + const showOnlyGroupAdminWarning = isClosedGroup && isAdmin; const lastMessageInteractionType = conversation.get('lastMessageInteractionType'); const lastMessageInteractionStatus = conversation.get('lastMessageInteractionStatus'); @@ -432,7 +432,9 @@ export async function showLeaveGroupByConvoId(conversationId: string, name: stri window?.inboxStore?.dispatch( updateConfirmModal({ title: window.i18n('leaveGroup'), - message: window.i18n('leaveGroupConrirmationOnlyAdminLegacy', name ? [name] : ['']), + message: window.i18n('leaveGroupConfirmationOnlyAdminLegacy', [ + name || window.i18n('unknown'), + ]), onClickOk, okText: window.i18n('leave'), okTheme: SessionButtonColor.Danger, @@ -440,7 +442,7 @@ export async function showLeaveGroupByConvoId(conversationId: string, name: stri conversationId, }) ); - // TODO Only to be used after the closed group rebuild + // TODO AUDRIC this is chunk3 stuff: Only to be used after the closed group rebuild chunk3 // const onClickOkLastAdmin = () => { // /* TODO */ // }; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index f05c7d034a..6acb8f7433 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1401,7 +1401,7 @@ export class ConversationModel extends Backbone.Model { if (!pubKey) { throw new Error('isAdmin() pubKey is falsy'); } - const groupAdmins = getLibGroupAdminsOutsideRedux(this.id) || this.getGroupAdmins(); + const groupAdmins = this.getGroupAdmins(); return Array.isArray(groupAdmins) && groupAdmins.includes(pubKey); } @@ -1956,7 +1956,7 @@ export class ConversationModel extends Backbone.Model { } public getGroupAdmins(): Array { - const groupAdmins = this.get('groupAdmins'); + const groupAdmins = getLibGroupAdminsOutsideRedux(this.id) || this.get('groupAdmins'); return groupAdmins && groupAdmins.length > 0 ? groupAdmins : []; } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 9c767ff0be..218951c9d1 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -224,15 +224,14 @@ class ConvoController { await leaveClosedGroup(groupId, fromSyncMessage); window.log.info(`deleteClosedGroup: ${groupId}, sendLeaveMessage?:${sendLeaveMessage}`); } - - // if we were kicked or sent our left message, we have nothing to do more with that group. - // Just delete everything related to it, not trying to add update message or send a left message. - await this.removeGroupOrCommunityFromDBAndRedux(groupId); if (PubKey.is03Pubkey(groupId)) { await remove03GroupFromWrappers(groupId); } else { await removeLegacyGroupFromWrappers(groupId); } + // if we were kicked or sent our left message, we have nothing to do more with that group. + // Just delete everything related to it, not trying to add update message or send a left message. + await this.removeGroupOrCommunityFromDBAndRedux(groupId); if (!fromSyncMessage) { await UserSync.queueNewJobIfNeeded(); @@ -456,6 +455,7 @@ class ConvoController { /** * You most likely don't want to call this function directly, but instead use the deleteLegacyGroup() from the ConversationController as it will take care of more cleaningup. + * This throws if a leaveMessage needs to be sent, but fails to be sent. * * Note: `fromSyncMessage` is used to know if we need to send a leave group message to the group first. * So if the user made the action on this device, fromSyncMessage should be false, but if it happened from a linked device polled update, set this to true. @@ -512,20 +512,17 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM // We might not be able to send our leaving messages (no encryption keypair, we were already removed, no network, etc). // If that happens, we should just remove everything from our current user. - try { - const wasSent = await getMessageQueue().sendToGroupV2NonDurably({ - message: ourLeavingMessage, - }); - if (!wasSent) { - throw new Error( - `Even with the retries, leaving message for group ${ed25519Str( - groupPk - )} failed to be sent... Still deleting everything` - ); - } - } catch (e) { - window.log.warn('leaving groupv2 error:', e.message); + const wasSent = await getMessageQueue().sendToGroupV2NonDurably({ + message: ourLeavingMessage, + }); + if (!wasSent) { + throw new Error( + `Even with the retries, leaving message for group ${ed25519Str( + groupPk + )} failed to be sent...` + ); } + // the rest of the cleaning of that conversation is done in the `deleteClosedGroup()` return; @@ -579,12 +576,7 @@ async function removeLegacyGroupFromWrappers(groupId: string) { } async function remove03GroupFromWrappers(groupPk: GroupPubkeyType) { - getSwarmPollingInstance().removePubkey(groupPk, 'remove03GroupFromWrappers'); - - await UserGroupsWrapperActions.eraseGroup(groupPk); - await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupPk); window?.inboxStore?.dispatch(groupInfoActions.destroyGroupDetails({ groupPk })); - window.log.info(`removed 03 from metagroup wrapper ${ed25519Str(groupPk)}`); } async function removeCommunityFromWrappers(conversationId: string) { diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 2bf0776d20..8b8b51de53 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -30,6 +30,7 @@ import { ClosedGroup } from '../../session/group/closed-group'; import { GroupUpdateInfoChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { GroupUpdateMemberChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; import { GroupUpdateDeleteMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage'; +import { ed25519Str } from '../../session/onions/onionPath'; import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { PreConditionFailed } from '../../session/utils/errors'; @@ -38,6 +39,7 @@ import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; +import { SessionUtilConvoInfoVolatile } from '../../session/utils/libsession/libsession_utils_convo_info_volatile'; import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { @@ -382,14 +384,36 @@ const refreshGroupDetailsFromWrapper = createAsyncThunk( const destroyGroupDetails = createAsyncThunk( 'group/destroyGroupDetails', async ({ groupPk }: { groupPk: GroupPubkeyType }) => { - try { - await UserGroupsWrapperActions.eraseGroup(groupPk); - await ConfigDumpData.deleteDumpFor(groupPk); + debugger; + const us = UserUtils.getOurPubKeyStrFromCache(); + const weAreAdmin = await checkWeAreAdmin(groupPk); + const allMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); + const otherAdminsCount = allMembers + .filter(m => m.admin || m.promoted) + .filter(m => m.pubkeyHex !== us).length; + + // we are the last admin promoted + if (weAreAdmin && otherAdminsCount === 0) { + // this marks the group info as deleted. We need to push those details await MetaGroupWrapperActions.infoDestroy(groupPk); - getSwarmPollingInstance().removePubkey(groupPk, 'destroyGroupDetails'); - } catch (e) { - window.log.warn(`destroyGroupDetails for ${groupPk} failed with ${e.message}`); + const lastPushResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + revokeSubRequest: null, + unrevokeSubRequest: null, + supplementKeys: [], + }); + if (lastPushResult !== RunJobResult.Success) { + throw new Error(`Failed to destroyGroupDetails for pk ${ed25519Str(groupPk)}`); + } } + + // this deletes the secretKey if we had it. If we need it for something, it has to be done before this call. + await UserGroupsWrapperActions.eraseGroup(groupPk); + await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupPk); + await ConfigDumpData.deleteDumpFor(groupPk); + + getSwarmPollingInstance().removePubkey(groupPk, 'destroyGroupDetails'); + return { groupPk }; } ); @@ -1073,11 +1097,13 @@ const handleMemberLeftMessage = createAsyncThunk( ); } - await handleMemberRemovedFromUI({ - groupPk, - removeMembers: [memberLeft], - fromMemberLeftMessage: true, - }); + if (await checkWeAreAdmin(groupPk)) { + await handleMemberRemovedFromUI({ + groupPk, + removeMembers: [memberLeft], + fromMemberLeftMessage: true, + }); + } return { groupPk, @@ -1303,7 +1329,7 @@ const metaGroupSlice = createSlice({ }); builder.addCase(destroyGroupDetails.fulfilled, (state, action) => { const { groupPk } = action.payload; - // FIXME destroyGroupDetails marks the info as destroyed, but does not really remove the wrapper currently + window.log.info(`removed 03 from metagroup wrapper ${ed25519Str(groupPk)}`); deleteGroupPkEntriesFromState(state, groupPk); }); builder.addCase(destroyGroupDetails.rejected, (_state, action) => { diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index c7bb011f48..458be881cc 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -291,7 +291,7 @@ export type LocalizerKeys = | 'leaveGroupConfirmationAdmin' | 'leaveGroupConfirmationOnlyAdmin' | 'leaveGroupConfirmationOnlyAdminWarning' - | 'leaveGroupConrirmationOnlyAdminLegacy' + | 'leaveGroupConfirmationOnlyAdminLegacy' | 'leaveGroupFailed' | 'leaveGroupFailedPleaseTryAgain' | 'leaving' From 5867c5af7f347e21b285e6017e761225f910a469 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 22 Feb 2024 16:36:12 +1100 Subject: [PATCH 090/302] fix: added type for all accessibility ids with react.d.ts --- stylesheets/_session.scss | 78 ------- ts/components/MemberListItem.tsx | 13 +- ts/components/avatar/Avatar.tsx | 19 +- ts/components/basic/Flex.tsx | 3 +- ts/components/basic/SessionButton.tsx | 4 +- ts/components/basic/SessionDropdown.tsx | 63 ------ ts/components/basic/SessionDropdownItem.tsx | 44 ---- ts/components/basic/SessionIdEditable.tsx | 4 +- ts/components/basic/SessionInput.tsx | 6 +- ts/components/basic/SessionRadio.tsx | 10 +- ts/components/basic/SessionRadioGroup.tsx | 11 +- ts/components/basic/SessionToggle.tsx | 2 +- ts/components/basic/Spinner.tsx | 4 +- ts/components/buttons/PanelButton.tsx | 4 +- ts/components/conversation/ContactName.tsx | 13 +- .../conversation/SubtleNotification.tsx | 4 +- .../MessageContentWithStatus.tsx | 4 +- .../message/message-content/MessageStatus.tsx | 4 +- .../message/message-item/ReadableMessage.tsx | 3 +- .../DisappearingModes.tsx | 15 +- .../disappearing-messages/TimeOptions.tsx | 2 +- ts/components/dialog/DeleteAccountModal.tsx | 25 ++- .../dialog/OnionStatusPathDialog.tsx | 6 +- ts/components/icon/SessionIcon.tsx | 6 +- ts/components/icon/SessionIconButton.tsx | 6 +- ts/components/leftpane/ActionsPanel.tsx | 1 + .../leftpane/LeftPaneSettingSection.tsx | 40 ++-- .../SessionNotificationGroupSettings.tsx | 41 ++-- .../settings/SessionSettingListItem.tsx | 6 +- ts/components/settings/SessionSettings.tsx | 53 +++-- .../settings/SessionSettingsHeader.tsx | 20 +- .../section/CategoryConversations.tsx | 10 +- .../conversations/unsendingInteractions.ts | 14 +- ts/react.d.ts | 202 ++++++++++++++++++ .../disappearing_messages/timerOptions.ts | 62 +++--- ts/session/utils/Toast.tsx | 3 +- ts/shared/data_test_id.ts | 8 + ts/state/ducks/metaGroups.ts | 1 - ts/state/ducks/section.tsx | 2 +- 39 files changed, 448 insertions(+), 368 deletions(-) delete mode 100644 ts/components/basic/SessionDropdown.tsx delete mode 100644 ts/components/basic/SessionDropdownItem.tsx create mode 100644 ts/react.d.ts create mode 100644 ts/shared/data_test_id.ts diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index b8278f858c..6a72184584 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -317,84 +317,6 @@ label { } } -.session-dropdown { - position: relative; - width: 100%; - - &__label { - cursor: pointer; - display: flex; - align-items: center; - justify-content: space-between; - height: 50px; - padding: 0px var(--margins-md); - font-size: var(--font-size-md); - - background-color: var(--right-panel-item-background-color); - color: var(--right-panel-item-text-color); - - &:hover { - background: var(--right-panel-item-background-hover-color); - } - } - - &__list-container { - z-index: 99; - display: block; - position: absolute; - top: 50px; - left: 0px; - right: 0px; - list-style: none; - padding: 0px; - margin: 0px; - max-height: 40vh; - overflow-y: auto; - } - - &__item { - cursor: pointer; - display: flex; - align-items: center; - justify-content: center; - height: 35px; - padding: 0 var(--margins-md); - background: var(--right-panel-item-background-color); - color: var(--right-panel-item-text-color); - - font-size: 0.8rem; - width: -webkit-fill-available; - transition: var(--default-duration); - - &:first-child { - border-top: 1px solid var(--border-color); - } - &:last-child { - border-top: 1px solid var(--border-color); - } - - .session-icon { - margin-inline-start: 6px; - } - .item-content { - margin-inline-start: 6px; - } - - &.active, - &:hover { - background: var(--right-panel-item-background-hover-color); - } - - &.danger { - color: var(--danger-color); - } - } - - &:hover { - background: var(--right-panel-item-background-hover-color); - } -} - .image-upload-section { display: flex; align-items: center; diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index edebfc25ab..aad823b9f8 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -95,7 +95,7 @@ type MemberListItemProps = { isAdmin?: boolean; // if true, we add a small crown on top of their avatar onSelect?: (pubkey: string) => void; onUnselect?: (pubkey: string) => void; - dataTestId?: string; + dataTestId?: React.SessionDataTestId; displayGroupStatus?: boolean; groupPk?: string; }; @@ -162,7 +162,10 @@ const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Gro return null; } return ( - + {statusText} ); @@ -194,7 +197,7 @@ const ResendInviteButton = ({ }) => { return ( { return ( - {memberName} + {memberName} void; - dataTestId?: string; + dataTestId?: SessionDataTestId; + imageDataTestId?: SessionDataTestId; }; const Identicon = (props: Pick) => { @@ -110,8 +111,16 @@ const AvatarImage = ( }; const AvatarInner = (props: Props) => { - const { base64Data, size, pubkey, forcedAvatarPath, forcedName, dataTestId, onAvatarClick } = - props; + const { + base64Data, + size, + pubkey, + forcedAvatarPath, + forcedName, + dataTestId, + imageDataTestId, + onAvatarClick, + } = props; const [imageBroken, setImageBroken] = useState(false); const isSelectingMessages = useSelector(isMessageSelectionMode); @@ -163,7 +172,7 @@ const AvatarInner = (props: Props) => { imageBroken={imageBroken} name={forcedName || name} handleImageError={handleImageError} - dataTestId={dataTestId ? `img-${dataTestId}` : undefined} + dataTestId={imageDataTestId} /> ) : ( { diff --git a/ts/components/basic/SessionDropdown.tsx b/ts/components/basic/SessionDropdown.tsx deleted file mode 100644 index eb00a1f42b..0000000000 --- a/ts/components/basic/SessionDropdown.tsx +++ /dev/null @@ -1,63 +0,0 @@ -import React, { useState } from 'react'; -import { SessionIcon, SessionIconType } from '../icon'; - -import { SessionDropdownItem, SessionDropDownItemType } from './SessionDropdownItem'; - -// THIS IS DROPDOWN ACCORDION STYLE OPTIONS SELECTOR ELEMENT, NOT A CONTEXTMENU - -type Props = { - label: string; - onClick?: any; - expanded?: boolean; - options: Array<{ - content: string; - id?: string; - icon?: SessionIconType | null; - type?: SessionDropDownItemType; - active?: boolean; - onClick?: any; - }>; - dataTestId?: string; -}; - -export const SessionDropdown = (props: Props) => { - const { label, options, dataTestId } = props; - const [expanded, setExpanded] = useState(!!props.expanded); - const chevronOrientation = expanded ? 180 : 0; - - return ( -
-
{ - setExpanded(!expanded); - }} - role="button" - > - {label} - -
- - {expanded && ( -
- {options.map((item: any) => { - return ( - { - setExpanded(false); - item.onClick(); - }} - /> - ); - })} -
- )} -
- ); -}; diff --git a/ts/components/basic/SessionDropdownItem.tsx b/ts/components/basic/SessionDropdownItem.tsx deleted file mode 100644 index c6588da410..0000000000 --- a/ts/components/basic/SessionDropdownItem.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import React from 'react'; -import classNames from 'classnames'; -import { SessionIcon, SessionIconType } from '../icon'; - -export enum SessionDropDownItemType { - Default = 'default', - Danger = 'danger', -} - -type Props = { - content: string; - type: SessionDropDownItemType; - icon: SessionIconType | null; - active: boolean; - onClick: any; - dataTestId?: string; -}; - -export const SessionDropdownItem = (props: Props) => { - const clickHandler = (e: any) => { - if (props.onClick) { - e.stopPropagation(); - props.onClick(); - } - }; - - const { content, type, icon, active, dataTestId } = props; - - return ( -
- {icon ? : ''} -
{content}
-
- ); -}; diff --git a/ts/components/basic/SessionIdEditable.tsx b/ts/components/basic/SessionIdEditable.tsx index bbac3fb8e3..2fd4ba3ba3 100644 --- a/ts/components/basic/SessionIdEditable.tsx +++ b/ts/components/basic/SessionIdEditable.tsx @@ -1,5 +1,5 @@ -import React, { ChangeEvent, KeyboardEvent, useRef } from 'react'; import classNames from 'classnames'; +import React, { ChangeEvent, KeyboardEvent, SessionDataTestId, useRef } from 'react'; import { useFocusMount } from '../../hooks/useFocusMount'; type Props = { @@ -11,7 +11,7 @@ type Props = { onPressEnter?: any; maxLength?: number; isGroup?: boolean; - dataTestId?: string; + dataTestId?: SessionDataTestId; }; export const SessionIdEditable = (props: Props) => { diff --git a/ts/components/basic/SessionInput.tsx b/ts/components/basic/SessionInput.tsx index 0c33a22b0a..2107153251 100644 --- a/ts/components/basic/SessionInput.tsx +++ b/ts/components/basic/SessionInput.tsx @@ -1,9 +1,9 @@ -import React, { useState } from 'react'; +import React, { SessionDataTestId, useState } from 'react'; import classNames from 'classnames'; -import { SessionIconButton } from '../icon'; import { Noop } from '../../types/Util'; import { useHTMLDirection } from '../../util/i18n'; +import { SessionIconButton } from '../icon'; type Props = { label?: string; @@ -17,7 +17,7 @@ type Props = { onEnterPressed?: any; autoFocus?: boolean; ref?: any; - inputDataTestId?: string; + inputDataTestId?: SessionDataTestId; }; const LabelItem = (props: { inputValue: string; label?: string }) => { diff --git a/ts/components/basic/SessionRadio.tsx b/ts/components/basic/SessionRadio.tsx index cef7908edc..14b8fc5170 100644 --- a/ts/components/basic/SessionRadio.tsx +++ b/ts/components/basic/SessionRadio.tsx @@ -1,4 +1,4 @@ -import React, { ChangeEvent } from 'react'; +import React, { ChangeEvent, SessionDataTestId } from 'react'; import styled, { CSSProperties } from 'styled-components'; import { Flex } from './Flex'; @@ -56,6 +56,8 @@ type SessionRadioProps = { disabled?: boolean; radioPosition?: 'left' | 'right'; style?: CSSProperties; + labelDatatestId?: SessionDataTestId; + inputDatatestId?: SessionDataTestId; }; export const SessionRadio = (props: SessionRadioProps) => { @@ -69,6 +71,8 @@ export const SessionRadio = (props: SessionRadioProps) => { disabled = false, radioPosition = 'left', style, + labelDatatestId, + inputDatatestId, } = props; const clickHandler = (e: ChangeEvent) => { @@ -99,7 +103,7 @@ export const SessionRadio = (props: SessionRadioProps) => { filledSize={filledSize * 2} outlineOffset={outlineOffset} disabled={disabled} - data-testid={`input-${value.replaceAll(' ', '-')}`} // data-testid cannot have spaces + data-testid={inputDatatestId} /> { beforeMargins={beforeMargins} aria-label={label} disabled={disabled} - data-testid={`label-${value}`} + data-testid={labelDatatestId} > {label} diff --git a/ts/components/basic/SessionRadioGroup.tsx b/ts/components/basic/SessionRadioGroup.tsx index b0867e3d70..6a07cabf79 100644 --- a/ts/components/basic/SessionRadioGroup.tsx +++ b/ts/components/basic/SessionRadioGroup.tsx @@ -1,10 +1,15 @@ -import React, { useState } from 'react'; +import React, { SessionDataTestId, useState } from 'react'; import useMount from 'react-use/lib/useMount'; import styled, { CSSProperties } from 'styled-components'; import { SessionRadio } from './SessionRadio'; -export type SessionRadioItems = Array<{ value: string; label: string }>; +export type SessionRadioItems = Array<{ + value: string; + label: string; + inputDatatestId: SessionDataTestId; + labelDatatestId: SessionDataTestId; +}>; interface Props { initialItem: string; @@ -50,6 +55,8 @@ export const SessionRadioGroup = (props: Props) => { label={item.label} active={itemIsActive} value={item.value} + inputDatatestId={item.inputDatatestId} + labelDatatestId={item.labelDatatestId} inputName={group} onClick={(value: string) => { setActiveItem(value); diff --git a/ts/components/basic/SessionToggle.tsx b/ts/components/basic/SessionToggle.tsx index 3f9ec0cb49..72fe8708a2 100644 --- a/ts/components/basic/SessionToggle.tsx +++ b/ts/components/basic/SessionToggle.tsx @@ -48,7 +48,7 @@ type Props = { active: boolean; onClick: () => void; confirmationDialogParams?: any | undefined; - dataTestId?: string; + dataTestId?: React.SessionDataTestId; }; export const SessionToggle = (props: Props) => { diff --git a/ts/components/basic/Spinner.tsx b/ts/components/basic/Spinner.tsx index 02e7b79b14..1b0d5f6d75 100644 --- a/ts/components/basic/Spinner.tsx +++ b/ts/components/basic/Spinner.tsx @@ -1,10 +1,10 @@ -import React from 'react'; +import React, { SessionDataTestId } from 'react'; import styled from 'styled-components'; type Props = { size: 'small' | 'normal'; direction?: string; - dataTestId?: string; + dataTestId?: SessionDataTestId; }; // Module: Spinner diff --git a/ts/components/buttons/PanelButton.tsx b/ts/components/buttons/PanelButton.tsx index 868bf9bbda..827c0838d9 100644 --- a/ts/components/buttons/PanelButton.tsx +++ b/ts/components/buttons/PanelButton.tsx @@ -1,4 +1,4 @@ -import React, { ReactNode } from 'react'; +import React, { ReactNode, SessionDataTestId } from 'react'; import styled, { CSSProperties } from 'styled-components'; import { Flex } from '../basic/Flex'; @@ -87,7 +87,7 @@ export type PanelButtonProps = { disabled?: boolean; children: ReactNode; onClick: (...args: Array) => void; - dataTestId: string; + dataTestId: SessionDataTestId; style?: CSSProperties; }; diff --git a/ts/components/conversation/ContactName.tsx b/ts/components/conversation/ContactName.tsx index 718467b78a..3af771ef1c 100644 --- a/ts/components/conversation/ContactName.tsx +++ b/ts/components/conversation/ContactName.tsx @@ -1,18 +1,21 @@ -import React from 'react'; import classNames from 'classnames'; +import React from 'react'; import { CSSProperties } from 'styled-components'; -import { Emojify } from './Emojify'; import { - useNicknameOrProfileNameOrShortenedPubkey, useIsPrivate, + useNicknameOrProfileNameOrShortenedPubkey, } from '../../hooks/useParamSelector'; +import { Emojify } from './Emojify'; type Props = { pubkey: string; name?: string | null; profileName?: string | null; - module?: string; + module?: + | 'module-conversation__user' + | 'module-message-search-result__header__name' + | 'module-message__author'; boldProfileName?: boolean; compact?: boolean; shouldShowPubkey: boolean; @@ -38,7 +41,7 @@ export const ContactName = (props: Props) => { {shouldShowProfile ? ( diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index ac0a34e350..f0202bb8bd 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { SessionDataTestId } from 'react'; import { useSelector } from 'react-redux'; import styled from 'styled-components'; import { @@ -42,7 +42,7 @@ const TextInner = styled.div` max-width: 390px; `; -function TextNotification({ html, dataTestId }: { html: string; dataTestId: string }) { +function TextNotification({ html, dataTestId }: { html: string; dataTestId: SessionDataTestId }) { return ( diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx index 9e4a23d637..e67ad675ac 100644 --- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx +++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx @@ -1,5 +1,5 @@ import classNames from 'classnames'; -import React, { useCallback, useState } from 'react'; +import React, { SessionDataTestId, useCallback, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import styled from 'styled-components'; import { replyToMessage } from '../../../../interactions/conversationInteractions'; @@ -30,7 +30,7 @@ type Props = { messageId: string; ctxMenuID: string; isDetailView?: boolean; - dataTestId: string; + dataTestId: SessionDataTestId; enableReactions: boolean; }; diff --git a/ts/components/conversation/message/message-content/MessageStatus.tsx b/ts/components/conversation/message/message-content/MessageStatus.tsx index d28a41ef70..0566ddfcc6 100644 --- a/ts/components/conversation/message/message-content/MessageStatus.tsx +++ b/ts/components/conversation/message/message-content/MessageStatus.tsx @@ -1,5 +1,5 @@ import { ipcRenderer } from 'electron'; -import React, { useCallback } from 'react'; +import React, { SessionDataTestId, useCallback } from 'react'; import { useSelector } from 'react-redux'; import styled from 'styled-components'; import { useMessageExpirationPropsById } from '../../../../hooks/useParamSelector'; @@ -14,7 +14,7 @@ import { ExpireTimer } from '../../ExpireTimer'; type Props = { isDetailView: boolean; messageId: string; - dataTestId?: string | undefined; + dataTestId: SessionDataTestId; }; /** diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx index e8c05660b1..938f62abec 100644 --- a/ts/components/conversation/message/message-item/ReadableMessage.tsx +++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx @@ -2,6 +2,7 @@ import { debounce, noop } from 'lodash'; import React, { AriaRole, MouseEventHandler, + SessionDataTestId, useCallback, useContext, useLayoutEffect, @@ -39,7 +40,7 @@ export type ReadableMessageProps = { onClick?: MouseEventHandler; onDoubleClickCapture?: MouseEventHandler; role?: AriaRole; - dataTestId: string; + dataTestId: SessionDataTestId; onContextMenu?: (e: React.MouseEvent) => void; isControlMessage?: boolean; }; diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx index 3683119cc9..7ecfbc9944 100644 --- a/ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx +++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx @@ -1,20 +1,19 @@ -import React from 'react'; +import React, { SessionDataTestId } from 'react'; import { DisappearingMessageConversationModeType } from '../../../../../session/disappearing_messages/types'; import { PanelButtonGroup, PanelLabel } from '../../../../buttons/PanelButton'; import { PanelRadioButton } from '../../../../buttons/PanelRadioButton'; -function loadDataTestId(mode: DisappearingMessageConversationModeType) { - const dataTestId = 'disappear-%-option'; +function toDataTestId(mode: DisappearingMessageConversationModeType): SessionDataTestId { switch (mode) { case 'legacy': - return dataTestId.replace('%', 'legacy'); + return 'disappear-legacy-option'; case 'deleteAfterRead': - return dataTestId.replace('%', 'after-read'); + return 'disappear-after-read-option'; case 'deleteAfterSend': - return dataTestId.replace('%', 'after-send'); + return 'disappear-after-send-option'; case 'off': default: - return dataTestId.replace('%', 'off'); + return 'disappear-off-option'; } } @@ -67,7 +66,7 @@ export const DisappearingModes = (props: DisappearingModesProps) => { setSelected(mode); }} disabled={options[mode]} - dataTestId={loadDataTestId(mode)} + dataTestId={toDataTestId(mode)} /> ); })} diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx index cb8273bbb8..ed2c0c9190 100644 --- a/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx +++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx @@ -34,7 +34,7 @@ export const TimeOptions = (props: TimerOptionsProps) => { setSelected(option.value); }} disabled={disabled} - dataTestId={`time-option-${option.name.replace(' ', '-')}`} // we want "time-option-1-minute", etc as accessibility id + dataTestId={`time-option-${option.value}`} // we want "time-option-3600", etc as accessibility id /> ); })} diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx index 9b886b97e2..5567afb5b6 100644 --- a/ts/components/dialog/DeleteAccountModal.tsx +++ b/ts/components/dialog/DeleteAccountModal.tsx @@ -154,8 +154,8 @@ async function deleteEverythingAndNetworkData() { } } -const DEVICE_ONLY = 'device_only'; -const DEVICE_AND_NETWORK = 'device_and_network'; +const DEVICE_ONLY = 'device_only' as const; +const DEVICE_AND_NETWORK = 'device_and_network' as const; type DeleteModes = typeof DEVICE_ONLY | typeof DEVICE_AND_NETWORK; const DescriptionBeforeAskingConfirmation = (props: { @@ -163,6 +163,22 @@ const DescriptionBeforeAskingConfirmation = (props: { setDeleteMode: (deleteMode: DeleteModes) => void; }) => { const { deleteMode, setDeleteMode } = props; + + const items = [ + { + label: window.i18n('deviceOnly'), + value: DEVICE_ONLY, + }, + { + label: window.i18n('entireAccount'), + value: DEVICE_AND_NETWORK, + }, + ].map(m => ({ + ...m, + inputDatatestId: `input-${m.value}` as const, + labelDatatestId: `label-${m.value}` as const, + })); + return ( <> {window.i18n('deleteAccountWarning')} @@ -179,10 +195,7 @@ const DescriptionBeforeAskingConfirmation = (props: { setDeleteMode(value); } }} - items={[ - { label: window.i18n('deviceOnly'), value: DEVICE_ONLY }, - { label: window.i18n('entireAccount'), value: 'device_and_network' }, - ]} + items={items} /> ); diff --git a/ts/components/dialog/OnionStatusPathDialog.tsx b/ts/components/dialog/OnionStatusPathDialog.tsx index 3d59179222..2ed74662d0 100644 --- a/ts/components/dialog/OnionStatusPathDialog.tsx +++ b/ts/components/dialog/OnionStatusPathDialog.tsx @@ -1,5 +1,5 @@ import { shell } from 'electron'; -import React from 'react'; +import React, { SessionDataTestId } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import useHover from 'react-use/lib/useHover'; @@ -25,7 +25,7 @@ export type StatusLightType = { glowStartDelay: number; glowDuration: number; color?: string; - dataTestId?: string; + dataTestId?: SessionDataTestId; }; const StyledCountry = styled.div` @@ -143,7 +143,7 @@ const OnionPathModalInner = () => { export type OnionNodeStatusLightType = { glowStartDelay: number; glowDuration: number; - dataTestId?: string; + dataTestId?: SessionDataTestId; }; /** diff --git a/ts/components/icon/SessionIcon.tsx b/ts/components/icon/SessionIcon.tsx index e190abf425..e5dab292f6 100644 --- a/ts/components/icon/SessionIcon.tsx +++ b/ts/components/icon/SessionIcon.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { SessionDataTestId } from 'react'; import styled, { css, keyframes } from 'styled-components'; import { icons, SessionIconSize, SessionIconType } from '.'; @@ -15,7 +15,7 @@ export type SessionIconProps = { glowStartDelay?: number; noScale?: boolean; backgroundColor?: string; - dataTestId?: string; + dataTestId?: SessionDataTestId; }; const getIconDimensionFromIconSize = (iconSize: SessionIconSize | number) => { @@ -146,7 +146,7 @@ const SessionSvg = (props: { borderRadius?: string; backgroundColor?: string; iconPadding?: string; - dataTestId?: string; + dataTestId?: SessionDataTestId; }) => { const colorSvg = props.iconColor ? props.iconColor : '--button-icon-stroke-color'; const pathArray = props.path instanceof Array ? props.path : [props.path]; diff --git a/ts/components/icon/SessionIconButton.tsx b/ts/components/icon/SessionIconButton.tsx index b572f66198..ef4b6981dc 100644 --- a/ts/components/icon/SessionIconButton.tsx +++ b/ts/components/icon/SessionIconButton.tsx @@ -1,6 +1,6 @@ -import React, { KeyboardEvent } from 'react'; import classNames from 'classnames'; import _ from 'lodash'; +import React, { KeyboardEvent, SessionDataTestId } from 'react'; import styled from 'styled-components'; import { SessionIcon, SessionIconProps } from '.'; @@ -12,8 +12,8 @@ interface SProps extends SessionIconProps { isSelected?: boolean; isHidden?: boolean; margin?: string; - dataTestId?: string; - dataTestIdIcon?: string; + dataTestId?: SessionDataTestId; + dataTestIdIcon?: SessionDataTestId; id?: string; style?: object; tabIndex?: number; diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index fdc0da8d56..19375cd476 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -91,6 +91,7 @@ const Section = (props: { type: SectionType }) => { onAvatarClick={handleClick} pubkey={ourNumber} dataTestId="leftpane-primary-avatar" + imageDataTestId={`img-leftpane-primary-avatar`} /> ); } diff --git a/ts/components/leftpane/LeftPaneSettingSection.tsx b/ts/components/leftpane/LeftPaneSettingSection.tsx index b2dd84315b..c1a721fa2e 100644 --- a/ts/components/leftpane/LeftPaneSettingSection.tsx +++ b/ts/components/leftpane/LeftPaneSettingSection.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { SessionDataTestId } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import styled from 'styled-components'; @@ -45,73 +45,75 @@ const StyledSettingsListItem = styled.div<{ active: boolean }>` const getCategories = () => { return [ { - id: SessionSettingCategory.Privacy, + id: 'privacy' as const, title: window.i18n('privacySettingsTitle'), }, { - id: SessionSettingCategory.Notifications, + id: 'notifications' as const, title: window.i18n('notificationsSettingsTitle'), }, { - id: SessionSettingCategory.Conversations, + id: 'conversations' as const, title: window.i18n('conversationsSettingsTitle'), }, { - id: SessionSettingCategory.MessageRequests, + id: 'messageRequests' as const, title: window.i18n('openMessageRequestInbox'), }, { - id: SessionSettingCategory.Appearance, + id: 'appearance' as const, title: window.i18n('appearanceSettingsTitle'), }, { - id: SessionSettingCategory.Permissions, + id: 'permissions' as const, title: window.i18n('permissionsSettingsTitle'), }, { - id: SessionSettingCategory.Help, + id: 'help' as const, title: window.i18n('helpSettingsTitle'), }, { - id: SessionSettingCategory.RecoveryPhrase, + id: 'recoveryPhrase' as const, title: window.i18n('recoveryPhrase'), }, { - id: SessionSettingCategory.ClearData, + id: 'ClearData' as const, title: window.i18n('clearDataSettingsTitle'), }, - ]; + ].map(m => ({ ...m, dataTestId: `${m.id}-settings-menu-item` as const })); }; const LeftPaneSettingsCategoryRow = (props: { - item: { id: SessionSettingCategory; title: string }; + item: { + id: SessionSettingCategory; + title: string; + dataTestId: SessionDataTestId; + }; }) => { const { item } = props; const { id, title } = item; const dispatch = useDispatch(); const focusedSettingsSection = useSelector(getFocusedSettingsSection); - const dataTestId = `${title.toLowerCase().replace(' ', '-')}-settings-menu-item`; - - const isClearData = id === SessionSettingCategory.ClearData; + const isClearData = id === 'ClearData'; return ( { switch (id) { - case SessionSettingCategory.MessageRequests: + case 'messageRequests': dispatch(showLeftPaneSection(SectionType.Message)); dispatch(setLeftOverlayMode('message-requests')); dispatch(resetConversationExternal()); break; - case SessionSettingCategory.RecoveryPhrase: + case 'recoveryPhrase': dispatch(recoveryPhraseModal({})); break; - case SessionSettingCategory.ClearData: + case 'ClearData': dispatch(updateDeleteAccountModal({})); break; default: diff --git a/ts/components/settings/SessionNotificationGroupSettings.tsx b/ts/components/settings/SessionNotificationGroupSettings.tsx index 1fd73d430c..54c1448154 100644 --- a/ts/components/settings/SessionNotificationGroupSettings.tsx +++ b/ts/components/settings/SessionNotificationGroupSettings.tsx @@ -7,16 +7,11 @@ import { SettingsKey } from '../../data/settings-key'; import { isAudioNotificationSupported } from '../../types/Settings'; import { Notifications } from '../../util/notifications'; import { SessionButton } from '../basic/SessionButton'; -import { SessionRadioGroup } from '../basic/SessionRadioGroup'; +import { SessionRadioGroup, SessionRadioItems } from '../basic/SessionRadioGroup'; import { SpacerLG } from '../basic/Text'; import { SessionSettingsItemWrapper, SessionToggleWithDescription } from './SessionSettingListItem'; -enum NOTIFICATION { - MESSAGE = 'message', - NAME = 'name', - COUNT = 'count', - OFF = 'off', -} +const NotificationType = { message: 'message', name: 'name', count: 'count', off: 'off' } as const; const StyledButtonContainer = styled.div` display: flex; @@ -33,28 +28,26 @@ export const SessionNotificationGroupSettings = (props: { hasPassword: boolean | } const initialNotificationEnabled = - window.getSettingValue(SettingsKey.settingsNotification) || NOTIFICATION.MESSAGE; + window.getSettingValue(SettingsKey.settingsNotification) || NotificationType.message; const initialAudioNotificationEnabled = window.getSettingValue(SettingsKey.settingsAudioNotification) || false; const notificationsAreEnabled = - initialNotificationEnabled && initialNotificationEnabled !== NOTIFICATION.OFF; + initialNotificationEnabled && initialNotificationEnabled !== NotificationType.off; - const items = [ - { - label: window.i18n('nameAndMessage'), - value: NOTIFICATION.MESSAGE, - }, - { - label: window.i18n('nameOnly'), - value: NOTIFICATION.NAME, - }, - { - label: window.i18n('noNameOrMessage'), - value: NOTIFICATION.COUNT, - }, - ]; + const options = [ + { label: window.i18n('nameAndMessage'), value: NotificationType.message }, + { label: window.i18n('nameOnly'), value: NotificationType.name }, + { label: window.i18n('noNameOrMessage'), value: NotificationType.count }, + ] as const; + + const items: SessionRadioItems = options.map(m => ({ + label: m.label, + value: m.value, + inputDatatestId: `input-${m.value}`, + labelDatatestId: `label-${m.value}`, + })); const onClickPreview = () => { if (!notificationsAreEnabled) { @@ -79,7 +72,7 @@ export const SessionNotificationGroupSettings = (props: { hasPassword: boolean | onClickToggle={async () => { await window.setSettingValue( SettingsKey.settingsNotification, - notificationsAreEnabled ? NOTIFICATION.OFF : NOTIFICATION.MESSAGE + notificationsAreEnabled ? 'off' : 'message' ); forceUpdate(); }} diff --git a/ts/components/settings/SessionSettingListItem.tsx b/ts/components/settings/SessionSettingListItem.tsx index 20311ff228..56e87e9fa1 100644 --- a/ts/components/settings/SessionSettingListItem.tsx +++ b/ts/components/settings/SessionSettingListItem.tsx @@ -1,6 +1,7 @@ import React from 'react'; import styled from 'styled-components'; +import { Noop } from '../../types/Util'; import { SessionButton, SessionButtonColor, @@ -10,7 +11,6 @@ import { import { SessionToggle } from '../basic/SessionToggle'; import { SessionConfirmDialogProps } from '../dialog/SessionConfirm'; import { SessionIconButton } from '../icon'; -import { Noop } from '../../types/Util'; type ButtonSettingsProps = { title?: string; @@ -19,7 +19,7 @@ type ButtonSettingsProps = { buttonType?: SessionButtonType; buttonShape?: SessionButtonShape; buttonText: string; - dataTestId?: string; + dataTestId?: React.SessionDataTestId; onClick: () => void; }; @@ -130,7 +130,7 @@ export const SessionToggleWithDescription = (props: { onClickToggle: () => void; confirmationDialogParams?: SessionConfirmDialogProps; childrenDescription?: React.ReactNode; // if set, those elements will be appended next to description field (only used for typing message settings as of now) - dataTestId?: string; + dataTestId?: React.SessionDataTestId; }) => { const { title, diff --git a/ts/components/settings/SessionSettings.tsx b/ts/components/settings/SessionSettings.tsx index b9226112fb..dbf3a467c4 100644 --- a/ts/components/settings/SessionSettings.tsx +++ b/ts/components/settings/SessionSettings.tsx @@ -1,6 +1,6 @@ +import autoBind from 'auto-bind'; import { shell } from 'electron'; import React from 'react'; -import autoBind from 'auto-bind'; import styled from 'styled-components'; import { SettingsHeader } from './SessionSettingsHeader'; @@ -9,15 +9,15 @@ import { SessionIconButton } from '../icon'; import { SessionNotificationGroupSettings } from './SessionNotificationGroupSettings'; -import { CategoryConversations } from './section/CategoryConversations'; -import { SettingsCategoryPrivacy } from './section/CategoryPrivacy'; -import { SettingsCategoryAppearance } from './section/CategoryAppearance'; import { Data } from '../../data/data'; -import { SettingsCategoryPermissions } from './section/CategoryPermissions'; -import { SettingsCategoryHelp } from './section/CategoryHelp'; import { sessionPassword } from '../../state/ducks/modalDialog'; -import { PasswordAction } from '../dialog/SessionPasswordDialog'; import { SectionType, showLeftPaneSection } from '../../state/ducks/section'; +import { PasswordAction } from '../dialog/SessionPasswordDialog'; +import { SettingsCategoryAppearance } from './section/CategoryAppearance'; +import { CategoryConversations } from './section/CategoryConversations'; +import { SettingsCategoryHelp } from './section/CategoryHelp'; +import { SettingsCategoryPermissions } from './section/CategoryPermissions'; +import { SettingsCategoryPrivacy } from './section/CategoryPrivacy'; export function displayPasswordModal( passwordAction: PasswordAction, @@ -41,17 +41,16 @@ export function getCallMediaPermissionsSettings() { return window.getSettingValue('call-media-permissions'); } -export enum SessionSettingCategory { - Privacy = 'privacy', - Notifications = 'notifications', - Conversations = 'conversations', - MessageRequests = 'messageRequests', - Appearance = 'appearance', - Permissions = 'permissions', - Help = 'help', - RecoveryPhrase = 'recoveryPhrase', - ClearData = 'ClearData', -} +export type SessionSettingCategory = + | 'privacy' + | 'notifications' + | 'conversations' + | 'messageRequests' + | 'appearance' + | 'permissions' + | 'help' + | 'recoveryPhrase' + | 'ClearData'; export interface SettingsViewProps { category: SessionSettingCategory; @@ -120,25 +119,25 @@ const SettingInCategory = (props: { } switch (category) { // special case for blocked user - case SessionSettingCategory.Conversations: + case 'conversations': return ; - case SessionSettingCategory.Appearance: + case 'appearance': return ; - case SessionSettingCategory.Notifications: + case 'notifications': return ; - case SessionSettingCategory.Privacy: + case 'privacy': return ( ); - case SessionSettingCategory.Help: + case 'help': return ; - case SessionSettingCategory.Permissions: + case 'permissions': return ; // these three down there have no options, they are just a button - case SessionSettingCategory.ClearData: - case SessionSettingCategory.MessageRequests: - case SessionSettingCategory.RecoveryPhrase: + case 'ClearData': + case 'messageRequests': + case 'recoveryPhrase': default: return null; } diff --git a/ts/components/settings/SessionSettingsHeader.tsx b/ts/components/settings/SessionSettingsHeader.tsx index 2f6f357726..91b0cefe5e 100644 --- a/ts/components/settings/SessionSettingsHeader.tsx +++ b/ts/components/settings/SessionSettingsHeader.tsx @@ -1,7 +1,7 @@ import React from 'react'; import styled from 'styled-components'; import { assertUnreachable } from '../../types/sqlSharedTypes'; -import { SessionSettingCategory, SettingsViewProps } from './SessionSettings'; +import { SettingsViewProps } from './SessionSettings'; type Props = Pick; @@ -26,27 +26,27 @@ export const SettingsHeader = (props: Props) => { let categoryTitle: string | null = null; switch (category) { - case SessionSettingCategory.Appearance: + case 'appearance': categoryTitle = window.i18n('appearanceSettingsTitle'); break; - case SessionSettingCategory.Conversations: + case 'conversations': categoryTitle = window.i18n('conversationsSettingsTitle'); break; - case SessionSettingCategory.Notifications: + case 'notifications': categoryTitle = window.i18n('notificationsSettingsTitle'); break; - case SessionSettingCategory.Help: + case 'help': categoryTitle = window.i18n('helpSettingsTitle'); break; - case SessionSettingCategory.Permissions: + case 'permissions': categoryTitle = window.i18n('permissionsSettingsTitle'); break; - case SessionSettingCategory.Privacy: + case 'privacy': categoryTitle = window.i18n('privacySettingsTitle'); break; - case SessionSettingCategory.ClearData: - case SessionSettingCategory.MessageRequests: - case SessionSettingCategory.RecoveryPhrase: + case 'ClearData': + case 'messageRequests': + case 'recoveryPhrase': throw new Error(`no header for should be tried to be rendered for "${category}"`); default: diff --git a/ts/components/settings/section/CategoryConversations.tsx b/ts/components/settings/section/CategoryConversations.tsx index 4fd0a20741..ac6d68d6ea 100644 --- a/ts/components/settings/section/CategoryConversations.tsx +++ b/ts/components/settings/section/CategoryConversations.tsx @@ -5,14 +5,14 @@ import useUpdate from 'react-use/lib/useUpdate'; import { SettingsKey } from '../../../data/settings-key'; import { ToastUtils } from '../../../session/utils'; import { toggleAudioAutoplay } from '../../../state/ducks/userConfig'; +import { useHasEnterSendEnabled } from '../../../state/selectors/settings'; import { getAudioAutoplay } from '../../../state/selectors/userConfig'; -import { SessionRadioGroup } from '../../basic/SessionRadioGroup'; +import { SessionRadioGroup, SessionRadioItems } from '../../basic/SessionRadioGroup'; import { BlockedContactsList } from '../BlockedList'; import { SessionSettingsItemWrapper, SessionToggleWithDescription, } from '../SessionSettingListItem'; -import { useHasEnterSendEnabled } from '../../../state/selectors/settings'; async function toggleCommunitiesPruning() { try { @@ -88,14 +88,18 @@ const EnterKeyFunctionSetting = () => { const initialSetting = useHasEnterSendEnabled(); const selectedWithSettingTrue = 'enterForNewLine'; - const items = [ + const items: SessionRadioItems = [ { label: window.i18n('enterSendNewMessageDescription'), value: 'enterForSend', + inputDatatestId: 'input-enterForSend', + labelDatatestId: 'label-enterForSend', }, { label: window.i18n('enterNewLineDescription'), value: selectedWithSettingTrue, + inputDatatestId: `input-${selectedWithSettingTrue}`, + labelDatatestId: `label-${selectedWithSettingTrue}`, }, ]; diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 006816ec5b..c9da1613bc 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -391,8 +391,18 @@ export async function deleteMessagesById(messageIds: Array, conversation : window.i18n('deleteMessageQuestion'), radioOptions: !isMe ? [ - { label: window.i18n('deleteJustForMe'), value: 'deleteJustForMe' }, - { label: window.i18n('deleteForEveryone'), value: 'deleteForEveryone' }, + { + label: window.i18n('deleteJustForMe'), + value: 'deleteJustForMe', + inputDatatestId: 'input-deleteJustForMe', + labelDatatestId: 'label-deleteJustForMe', + }, + { + label: window.i18n('deleteForEveryone'), + value: 'deleteForEveryone', + inputDatatestId: 'input-deleteForEveryone', + labelDatatestId: 'label-deleteForEveryone', + }, ] : undefined, okText: window.i18n('delete'), diff --git a/ts/react.d.ts b/ts/react.d.ts new file mode 100644 index 0000000000..9adacdf0ae --- /dev/null +++ b/ts/react.d.ts @@ -0,0 +1,202 @@ +import 'react'; + +/** + * WARNING: if you change something here, you will most likely break some integration tests. + * So be sure to check with QA first. + */ + +declare module 'react' { + type SessionDataTestId = + | 'group_member_status_text' + | 'group_member_name' + | 'loading-spinner' + | 'session-toast' + | 'loading-animation' + | 'your-session-id' + | 'chooser-new-community' + | 'chooser-new-group' + | 'chooser-new-conversation-button' + | 'new-conversation-button' + | 'module-conversation__user__profile-name' + | 'message-request-banner' + | 'leftpane-section-container' + | 'group-name-input' + | 'recovery-phrase-seed-modal' + | 'password-input-reconfirm' + | 'conversation-header-subtitle' + | 'password-input' + | 'nickname-input' + | 'image-upload-click' + | 'profile-name-input' + | 'your-profile-name' + | 'edit-profile-dialog' + | 'image-upload-section' + | 'right-panel-group-name' + | 'control-message' + | 'header-conversation-name' + | 'disappear-messages-type-and-time' + | 'message-input' + | 'messages-container' + | 'decline-and-block-message-request' + | 'session-dropdown' + | 'path-light-container' + | 'add-user-button' + | 'back-button-conversation-options' + | 'send-message-button' + | 'scroll-to-bottom-button' + | 'end-call' + | 'modal-close-button' + | 'end-voice-message' + | 'back-button-message-details' + | 'edit-profile-icon' + | 'microphone-button' + | 'call-button' + | 'attachments-button' + + // generic button types + | 'emoji-button' + | 'reveal-blocked-user-settings' + + // left pane section types + | 'theme-section' + | 'settings-section' + | 'message-section' + | 'privacy-section' + + // settings menu item types + | 'messageRequests-settings-menu-item' // needs to be tweaked + | 'recoveryPhrase-settings-menu-item' // needs to be tweaked + | 'privacy-settings-menu-item' // needs to be tweaked + | 'notifications-settings-menu-item' // needs to be tweaked + | 'conversations-settings-menu-item' // needs to be tweaked + | 'appearance-settings-menu-item' // needs to be tweaked + | 'help-settings-menu-item' // needs to be tweaked + | 'permissions-settings-menu-item' // needs to be tweaked + | 'ClearData-settings-menu-item' // TODO AUDRIC needs to be tweaked + + // timer options + | 'time-option-0' + | 'time-option-5' + | 'time-option-10' + | 'time-option-30' + | 'time-option-60' + | 'time-option-300' + | 'time-option-1800' + | 'time-option-3600' + | 'time-option-21600' + | 'time-option-43200' + | 'time-option-86400' + | 'time-option-604800' + | 'time-option-1209600' + + // generic readably message (not control message) + | 'message-content' + + // control message types + | 'message-request-response-message' + | 'interaction-notification' + | 'data-extraction-notification' + | 'group-update-message' + | 'disappear-control-message' + + // subtle control message types + | 'group-request-explanation' + | 'conversation-request-explanation' + | 'group-invite-control-message' + | 'empty-conversation-notification' + + // call notification types + | 'call-notification-missed-call' + | 'call-notification-started-call' + | 'call-notification-answered-a-call' + + // disappear options + | 'disappear-after-send-option' + | 'disappear-after-read-option' + | 'disappear-legacy-option' + | 'disappear-off-option' + + // settings toggle and buttons + | 'remove-password-settings-button' + | 'change-password-settings-button' + | 'enable-read-receipts' + | 'set-password-button' + | 'enable-read-receipts' + | 'enable-calls' + | 'enable-microphone' + | 'enable-follow-system-theme' + | 'unblock-button-settings-screen' + | 'save-attachment-from-details' + | 'resend-msg-from-details' + | 'reply-to-msg-from-details' + | 'leave-group-button' + | 'disappearing-messages' + | 'group-members' + | 'remove-moderators' + | 'add-moderators' + | 'edit-group-name' + + // SessionRadioGroup & SessionRadio + | 'password-input-confirm' + | 'msg-status' + | 'input-device_and_network' + | 'label-device_and_network' + | 'input-device_only' + | 'label-device_only' + | 'input-deleteForEveryone' + | 'label-deleteForEveryone' + | 'input-deleteJustForMe' + | 'label-deleteJustForMe' + | 'input-enterForSend' + | 'label-enterForSend' + | 'input-enterForNewLine' + | 'label-enterForNewLine' + | 'input-message' + | 'label-message' + | 'input-name' + | 'label-name' + | 'input-count' + | 'label-count' + + // to sort + | 'restore-using-recovery' + | 'link-device' + | 'continue-session-button' + | 'next-new-conversation-button' + | 'reveal-recovery-phrase' + | 'resend_invite_button' + | 'session-confirm-cancel-button' + | 'session-confirm-ok-button' + | 'confirm-nickname' + | 'path-light-svg' + | 'group_member_status_text' + | 'group_member_name' + | 'resend_promote_button' + | 'next-button' + | 'save-button-profile-update' + | 'save-button-profile-update' + | 'copy-button-profile-update' + | 'disappear-set-button' + | 'decline-message-request' + | 'accept-message-request' + | 'mentions-popup-row' + | 'session-id-signup' + | 'three-dot-loading-animation' + | 'recovery-phrase-input' + | 'display-name-input' + | 'new-session-conversation' + | 'new-closed-group-name' + | 'leftpane-primary-avatar' + | 'img-leftpane-primary-avatar' + | 'conversation-options-avatar' + // modules profile name + | 'module-conversation__user__profile-name' + | 'module-message-search-result__header__name__profile-name' + | 'module-message__author__profile-name' + | 'module-contact-name__profile-name' + | 'delete-from-details'; + + interface HTMLAttributes { + 'data-testid'?: SessionDataTestId; + } +} diff --git a/ts/session/disappearing_messages/timerOptions.ts b/ts/session/disappearing_messages/timerOptions.ts index 1dc1267f31..8c1f0af6c5 100644 --- a/ts/session/disappearing_messages/timerOptions.ts +++ b/ts/session/disappearing_messages/timerOptions.ts @@ -2,35 +2,43 @@ import moment from 'moment'; import { isDevProd } from '../../shared/env_vars'; import { LocalizerKeys } from '../../types/LocalizerKeys'; -type TimerOptionsEntry = { name: string; value: number }; +type TimerOptionsEntry = { name: string; value: TimerOptionSeconds }; export type TimerOptionsArray = Array; +type TimerOptionSeconds = + | 0 + | 5 + | 10 + | 30 + | 60 + | 300 + | 1800 + | 3600 + | 21600 + | 43200 + | 86400 + | 604800 + | 1209600; + const timerOptionsDurations: Array<{ time: number; unit: moment.DurationInputArg2; - seconds: number; + seconds: TimerOptionSeconds; }> = [ - { time: 0, unit: 'seconds' as moment.DurationInputArg2 }, - { time: 5, unit: 'seconds' as moment.DurationInputArg2 }, - { time: 10, unit: 'seconds' as moment.DurationInputArg2 }, - { time: 30, unit: 'seconds' as moment.DurationInputArg2 }, - { time: 1, unit: 'minute' as moment.DurationInputArg2 }, - { time: 5, unit: 'minutes' as moment.DurationInputArg2 }, - { time: 30, unit: 'minutes' as moment.DurationInputArg2 }, - { time: 1, unit: 'hour' as moment.DurationInputArg2 }, - { time: 6, unit: 'hours' as moment.DurationInputArg2 }, - { time: 12, unit: 'hours' as moment.DurationInputArg2 }, - { time: 1, unit: 'day' as moment.DurationInputArg2 }, - { time: 1, unit: 'week' as moment.DurationInputArg2 }, - { time: 2, unit: 'weeks' as moment.DurationInputArg2 }, -].map(o => { - const duration = moment.duration(o.time, o.unit); // 5, 'seconds' - return { - time: o.time, - unit: o.unit, - seconds: duration.asSeconds(), - }; -}); + { time: 0, unit: 'seconds' as moment.DurationInputArg2, seconds: 0 }, + { time: 5, unit: 'seconds' as moment.DurationInputArg2, seconds: 5 }, + { time: 10, unit: 'seconds' as moment.DurationInputArg2, seconds: 10 }, + { time: 30, unit: 'seconds' as moment.DurationInputArg2, seconds: 30 }, + { time: 1, unit: 'minute' as moment.DurationInputArg2, seconds: 60 }, + { time: 5, unit: 'minutes' as moment.DurationInputArg2, seconds: 300 }, + { time: 30, unit: 'minutes' as moment.DurationInputArg2, seconds: 1800 }, + { time: 1, unit: 'hour' as moment.DurationInputArg2, seconds: 3600 }, + { time: 6, unit: 'hours' as moment.DurationInputArg2, seconds: 21600 }, + { time: 12, unit: 'hours' as moment.DurationInputArg2, seconds: 43200 }, + { time: 1, unit: 'day' as moment.DurationInputArg2, seconds: 86400 }, + { time: 1, unit: 'week' as moment.DurationInputArg2, seconds: 604800 }, + { time: 2, unit: 'weeks' as moment.DurationInputArg2, seconds: 1209600 }, +]; function getTimerOptionName(time: number, unit: moment.DurationInputArg2) { return ( @@ -62,7 +70,7 @@ function getAbbreviated(seconds = 0) { return [seconds, 's'].join(''); } -const VALUES: Array = timerOptionsDurations.map(t => { +const VALUES = timerOptionsDurations.map(t => { return t.seconds; }); @@ -110,10 +118,10 @@ const DELETE_LEGACY = VALUES.filter(option => { }).filter(filterOutDebugValues); const DEFAULT_OPTIONS = { - DELETE_AFTER_READ: 43200, // 12 hours - DELETE_AFTER_SEND: 86400, // 1 day + DELETE_AFTER_READ: 43200 as TimerOptionSeconds, // 12 hours + DELETE_AFTER_SEND: 86400 as TimerOptionSeconds, // 1 day // TODO legacy messages support will be removed in a future release - LEGACY: 86400, // 1 day + LEGACY: 86400 as TimerOptionSeconds, // 1 day }; export const TimerOptions = { diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx index 748d79371d..d3f9169b80 100644 --- a/ts/session/utils/Toast.tsx +++ b/ts/session/utils/Toast.tsx @@ -2,7 +2,6 @@ import React from 'react'; import { toast } from 'react-toastify'; import { SessionToast, SessionToastType } from '../../components/basic/SessionToast'; import { SessionIconType } from '../../components/icon'; -import { SessionSettingCategory } from '../../components/settings/SessionSettings'; import { SectionType, showLeftPaneSection, showSettingsSection } from '../../state/ducks/section'; // if you push a toast manually with toast...() be sure to set the type attribute of the SessionToast component @@ -127,7 +126,7 @@ export function pushedMissedCall(conversationName: string) { const openPermissionsSettings = () => { window.inboxStore?.dispatch(showLeftPaneSection(SectionType.Settings)); - window.inboxStore?.dispatch(showSettingsSection(SessionSettingCategory.Permissions)); + window.inboxStore?.dispatch(showSettingsSection('permissions')); }; export function pushedMissedCallCauseOfPermission(conversationName: string) { diff --git a/ts/shared/data_test_id.ts b/ts/shared/data_test_id.ts new file mode 100644 index 0000000000..29222d4a11 --- /dev/null +++ b/ts/shared/data_test_id.ts @@ -0,0 +1,8 @@ +/** + * Returns a string with all spaces replaced to '-'. + * A datatestid cannot have spaces on desktop, so we use this to format them accross the app. + * + */ +export function strToDataTestId(input: string) { + return input.replaceAll(' ', '-'); +} diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 8b8b51de53..7f403f64ba 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -384,7 +384,6 @@ const refreshGroupDetailsFromWrapper = createAsyncThunk( const destroyGroupDetails = createAsyncThunk( 'group/destroyGroupDetails', async ({ groupPk }: { groupPk: GroupPubkeyType }) => { - debugger; const us = UserUtils.getOurPubKeyStrFromCache(); const weAreAdmin = await checkWeAreAdmin(groupPk); const allMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); diff --git a/ts/state/ducks/section.tsx b/ts/state/ducks/section.tsx index 5060af4cca..0475311fcf 100644 --- a/ts/state/ducks/section.tsx +++ b/ts/state/ducks/section.tsx @@ -173,7 +173,7 @@ export const reducer = ( return { ...state, focusedSection: payload, - focusedSettingsSection: SessionSettingCategory.Privacy, + focusedSettingsSection: 'privacy', }; case FOCUS_SETTINGS_SECTION: return { From b9da60af3b49ca3688e7cf522c6a4e96d8ff3417 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 26 Feb 2024 11:00:32 +1100 Subject: [PATCH 091/302] fix: send msg to group unapproved accepts and then sends message --- .../conversation/MessageRequestButtons.tsx | 38 +----------- .../menu/ConversationListItemContextMenu.tsx | 8 +-- ts/components/menu/Menu.tsx | 12 ++-- ts/interactions/conversationInteractions.ts | 62 +++++++++++++++---- ts/models/conversation.ts | 8 ++- ts/session/utils/calling/CallManager.ts | 10 +-- 6 files changed, 74 insertions(+), 64 deletions(-) diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index 9e684985ff..6b91f57284 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -2,14 +2,9 @@ import React from 'react'; import styled from 'styled-components'; import { useIsIncomingRequest } from '../../hooks/useParamSelector'; import { - approveConvoAndSendResponse, declineConversationWithConfirm, + handleAcceptConversationRequest, } from '../../interactions/conversationInteractions'; -import { GroupV2Receiver } from '../../receiver/groupv2/handleGroupV2Message'; -import { getSwarmPollingInstance } from '../../session/apis/snode_api/swarmPolling'; -import { ConvoHub } from '../../session/conversations'; -import { PubKey } from '../../session/types'; -import { sleepFor } from '../../session/utils/Promise'; import { useSelectedConversationIdOrigin, useSelectedConversationKey, @@ -17,7 +12,6 @@ import { useSelectedIsPrivateFriend, } from '../../state/selectors/selectedConversation'; import { useLibGroupInvitePending } from '../../state/selectors/userGroups'; -import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { SessionButton, SessionButtonColor } from '../basic/SessionButton'; import { InvitedToGroupControlMessage, MessageRequestExplanation } from './SubtleNotification'; @@ -77,34 +71,6 @@ const handleDeclineAndBlockConversationRequest = ( }); }; -const handleAcceptConversationRequest = async (convoId: string) => { - const convo = ConvoHub.use().get(convoId); - if (!convo) { - return; - } - await convo.setDidApproveMe(true, false); - await convo.setIsApproved(true, false); - await convo.commit(); - if (convo.isPrivate()) { - await convo.addOutgoingApprovalMessage(Date.now()); - await approveConvoAndSendResponse(convoId); - } else if (PubKey.is03Pubkey(convoId)) { - const found = await UserGroupsWrapperActions.getGroup(convoId); - if (!found) { - window.log.warn('cannot approve a non existing group in usergroup'); - return; - } - // this updates the wrapper and refresh the redux slice - await UserGroupsWrapperActions.setGroup({ ...found, invitePending: false }); - getSwarmPollingInstance().addGroupId(convoId, async () => { - // we need to do a first poll to fetch the keys etc before we can send our invite response - // this is pretty hacky, but also an admin seeing a message from that user in the group will mark it as not pending anymore - await sleepFor(2000); - await GroupV2Receiver.sendInviteResponseToGroup({ groupPk: convoId }); - }); - } -}; - export const ConversationMessageRequestButtons = () => { const selectedConvoId = useSelectedConversationKey(); const isIncomingRequest = useIsIncomingRequest(selectedConvoId); @@ -131,7 +97,7 @@ export const ConversationMessageRequestButtons = () => { { - await handleAcceptConversationRequest(selectedConvoId); + await handleAcceptConversationRequest({ convoId: selectedConvoId, sendResponse: true }); }} text={window.i18n('accept')} dataTestId="accept-message-request" diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx index 349562e57a..a5d2007def 100644 --- a/ts/components/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/menu/ConversationListItemContextMenu.tsx @@ -4,9 +4,10 @@ import { Item, Menu } from 'react-contexify'; import { useSelector } from 'react-redux'; import { useIsPinned, useIsPrivate, useIsPrivateAndFriend } from '../../hooks/useParamSelector'; import { ConvoHub } from '../../session/conversations'; +import { isSearching } from '../../state/selectors/search'; import { getIsMessageSection } from '../../state/selectors/section'; -import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext'; import { SessionContextMenuContainer } from '../SessionContextMenuContainer'; +import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext'; import { AcceptMsgRequestMenuItem, BanMenuItem, @@ -17,16 +18,15 @@ import { DeclineAndBlockMsgRequestMenuItem, DeclineMsgRequestMenuItem, DeleteMessagesMenuItem, + DeletePrivateConversationMenuItem, InviteContactMenuItem, LeaveGroupOrCommunityMenuItem, MarkAllReadMenuItem, MarkConversationUnreadMenuItem, + NotificationForConvoMenuItem, ShowUserDetailsMenuItem, UnbanMenuItem, - DeletePrivateConversationMenuItem, - NotificationForConvoMenuItem, } from './Menu'; -import { isSearching } from '../../state/selectors/search'; export type PropsContextConversationItem = { triggerId: string; diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index 43d885cedd..cc935600f4 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -23,12 +23,12 @@ import { import { ConversationInteractionStatus, ConversationInteractionType, - approveConvoAndSendResponse, blockConvoById, clearNickNameByConvoId, copyPublicKeyByConvoId, declineConversationWithConfirm, deleteAllMessagesByConvoIdWithConfirmation, + handleAcceptConversationRequest, markAllReadByConvoId, setNotificationForConvoId, showAddModeratorsByConvoId, @@ -441,17 +441,17 @@ export const DeletePrivateConversationMenuItem = () => { export const AcceptMsgRequestMenuItem = () => { const convoId = useConvoIdFromContext(); const isRequest = useIsIncomingRequest(convoId); - const convo = ConvoHub.use().get(convoId); const isPrivate = useIsPrivate(convoId); - if (isRequest && isPrivate) { + if (isRequest && (isPrivate || PubKey.is03Pubkey(convoId))) { return ( { - await convo.setDidApproveMe(true); - await convo.addOutgoingApprovalMessage(Date.now()); - await approveConvoAndSendResponse(convoId); + await handleAcceptConversationRequest({ + convoId, + sendResponse: true, + }); }} > {window.i18n('accept')} diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 59cfa1c201..e80a7124f0 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -10,15 +10,19 @@ import { SessionButtonColor } from '../components/basic/SessionButton'; import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings'; import { Data } from '../data/data'; import { SettingsKey } from '../data/settings-key'; +import { GroupV2Receiver } from '../receiver/groupv2/handleGroupV2Message'; import { uploadFileToFsWithOnionV4 } from '../session/apis/file_server_api/FileServerApi'; import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; +import { getSwarmPollingInstance } from '../session/apis/snode_api'; import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../session/conversations'; import { getSodiumRenderer } from '../session/crypto'; import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; import { DisappearingMessageConversationModeType } from '../session/disappearing_messages/types'; +import { ed25519Str } from '../session/onions/onionPath'; import { PubKey } from '../session/types'; import { perfEnd, perfStart } from '../session/utils/Performance'; +import { sleepFor } from '../session/utils/Promise'; import { fromHexToArray, toHex } from '../session/utils/String'; import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; @@ -109,21 +113,53 @@ export async function unblockConvoById(conversationId: string) { await conversation.commit(); } -/** - * marks the conversation's approval fields, sends messageRequestResponse - */ -export const approveConvoAndSendResponse = async (conversationId: string) => { - const convoToApprove = ConvoHub.use().get(conversationId); - - if (!convoToApprove) { - window?.log?.info('Conversation is already approved.'); - return; +export const handleAcceptConversationRequest = async ({ + convoId, + sendResponse, +}: { + convoId: string; + sendResponse: boolean; +}) => { + const convo = ConvoHub.use().get(convoId); + if (!convo) { + return null; } + await convo.setDidApproveMe(true, false); + await convo.setIsApproved(true, false); + await convo.commit(); - await convoToApprove.setIsApproved(true, false); - - await convoToApprove.commit(); - await convoToApprove.sendMessageRequestResponse(); + if (convo.isPrivate()) { + await convo.addOutgoingApprovalMessage(Date.now()); + if (sendResponse) { + await convo.sendMessageRequestResponse(); + } + return null; + } + if (PubKey.is03Pubkey(convoId)) { + const found = await UserGroupsWrapperActions.getGroup(convoId); + if (!found) { + window.log.warn('cannot approve a non existing group in usergroup'); + return null; + } + // this updates the wrapper and refresh the redux slice + await UserGroupsWrapperActions.setGroup({ ...found, invitePending: false }); + const acceptedPromise = new Promise(resolve => { + getSwarmPollingInstance().addGroupId(convoId, async () => { + // we need to do a first poll to fetch the keys etc before we can send our invite response + // this is pretty hacky, but also an admin seeing a message from that user in the group will mark it as not pending anymore + await sleepFor(2000); + if (sendResponse) { + await GroupV2Receiver.sendInviteResponseToGroup({ groupPk: convoId }); + } + window.log.info( + `handleAcceptConversationRequest: first poll for group ${ed25519Str(convoId)} happened, we should have encryption keys now` + ); + return resolve(true); + }); + }); + await acceptedPromise; + } + return null; }; export async function declineConversationWithoutConfirm({ diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 6acb8f7433..4db8bf55eb 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -127,6 +127,7 @@ import { getSubscriberCountOutsideRedux, } from '../state/selectors/sogsRoomInfo'; // decide it it makes sense to move this to a redux slice? +import { handleAcceptConversationRequest } from '../interactions/conversationInteractions'; import { DisappearingMessages } from '../session/disappearing_messages'; import { DisappearingMessageConversationModeType } from '../session/disappearing_messages/types'; import { GroupUpdateInfoChangeMessage } from '../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; @@ -2034,7 +2035,8 @@ export class ConversationModel extends Backbone.Model { lokiProfile: UserUtils.getOurProfile(), }; - const shouldApprove = !this.isApproved() && this.isPrivate(); + const shouldApprove = !this.isApproved() && (this.isPrivate() || this.isClosedGroupV2()); + const incomingMessageCount = await Data.getMessageCountByType( this.id, MessageDirection.incoming @@ -2048,6 +2050,10 @@ export class ConversationModel extends Backbone.Model { } if (shouldApprove) { + await handleAcceptConversationRequest({ + convoId: this.id, + sendResponse: !message, + }); await this.setIsApproved(true); if (hasIncomingMessages) { // have to manually add approval for local client here as DB conditional approval check in config msg handling will prevent this from running diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index b9ca6b3695..bccf2b1221 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -24,7 +24,7 @@ import { PubKey } from '../../types'; import { getMessageQueue } from '../..'; import { getCallMediaPermissionsSettings } from '../../../components/settings/SessionSettings'; import { Data } from '../../../data/data'; -import { approveConvoAndSendResponse } from '../../../interactions/conversationInteractions'; +import { handleAcceptConversationRequest } from '../../../interactions/conversationInteractions'; import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes'; import { PnServer } from '../../apis/push_notification_api'; import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime'; @@ -533,7 +533,7 @@ export async function USER_callRecipient(recipient: string) { weAreCallerOnCurrentCall = true; // initiating a call is analogous to sending a message request - await approveConvoAndSendResponse(recipient); + await handleAcceptConversationRequest({ convoId: recipient, sendResponse: false }); // Note: we do the sending of the preoffer manually as the sendTo1o1NonDurably rely on having a message saved to the db for MessageSentSuccess // which is not the case for a pre offer message (the message only exists in memory) @@ -932,8 +932,10 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) { await buildAnswerAndSendIt(fromSender, msgIdentifier); // consider the conversation completely approved - await callerConvo.setDidApproveMe(true); - await approveConvoAndSendResponse(fromSender); + await handleAcceptConversationRequest({ + convoId: fromSender, + sendResponse: true, + }); } export async function rejectCallAlreadyAnotherCall(fromSender: string, forcedUUID: string) { From a53299377a463e28d2f02c3733f36f3c800bb325 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 27 Feb 2024 17:18:07 +1100 Subject: [PATCH 092/302] chore: fix unit tests with group chunk2 --- ts/components/leftpane/ActionsPanel.tsx | 11 +- ts/session/apis/snode_api/SNodeAPI.ts | 12 +- ts/session/apis/snode_api/batchRequest.ts | 21 +++- ts/session/apis/snode_api/expireRequest.ts | 8 +- .../apis/snode_api/getExpiriesRequest.ts | 8 +- ts/session/apis/snode_api/getNetworkTime.ts | 4 +- .../apis/snode_api/getServiceNodesList.ts | 18 +-- ts/session/apis/snode_api/getSwarmFor.ts | 13 ++- ts/session/apis/snode_api/index.ts | 3 +- ts/session/apis/snode_api/onions.ts | 16 +-- ts/session/apis/snode_api/onsResolve.ts | 13 ++- ts/session/apis/snode_api/retrieveRequest.ts | 9 +- ts/session/apis/snode_api/sessionRpc.ts | 4 +- ts/session/apis/snode_api/snodePool.ts | 93 ++++++++++----- ts/session/apis/snode_api/swarmPolling.ts | 4 +- .../outgoing/controlMessage/TypingMessage.ts | 1 - .../ClosedGroupVisibleMessage.ts | 3 +- ts/session/onions/onionPath.ts | 2 +- ts/session/sending/MessageSender.ts | 15 +-- .../libsession_utils_user_groups.ts | 5 +- .../unit/crypto/SnodeSignatures_test.ts | 4 +- .../GetExpiriesRequest_test.ts | 32 +++-- .../libsession_wrapper_metagroup_test.ts | 27 ++++- .../libsession_wrapper_user_groups_test.ts | 17 +-- .../libsession_wrapper_usergroups_test.ts | 12 +- .../unit/messages/TypingMessage_test.ts | 13 --- .../ClosedGroupChatMessage_test.ts | 6 +- ts/test/session/unit/onion/GuardNodes_test.ts | 11 +- .../session/unit/onion/OnionErrors_test.ts | 23 ++-- .../session/unit/onion/SeedNodeAPI_test.ts | 11 +- .../unit/onion/SnodePoolUpdate_test.ts | 11 +- .../session/unit/sending/MessageQueue_test.ts | 31 ++++- .../unit/sending/MessageSender_test.ts | 110 +++++++++++------- .../unit/sending/PendingMessageCache_test.ts | 10 +- ...armPolling_getNamespacesToPollFrom_test.ts | 1 + .../SwarmPolling_pollForAllKeys_test.ts | 3 +- ts/test/session/unit/utils/Messages_test.ts | 4 +- .../group_sync_job/GroupSyncJob_test.ts | 33 ++++-- .../user_sync_job/UserSyncJob_test.ts | 25 ++-- ts/test/test-utils/utils/pubkey.ts | 20 +++- ts/test/test-utils/utils/stubbing.ts | 12 ++ 41 files changed, 424 insertions(+), 255 deletions(-) diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 19375cd476..5565fafeea 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -37,10 +37,7 @@ import { LeftPaneSectionContainer } from './LeftPaneSectionContainer'; import { SettingsKey } from '../../data/settings-key'; import { getLatestReleaseFromFileServer } from '../../session/apis/file_server_api/FileServerApi'; -import { - forceRefreshRandomSnodePool, - getFreshSwarmFor, -} from '../../session/apis/snode_api/snodePool'; +import { SnodePool } from '../../session/apis/snode_api/snodePool'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { forceSyncConfigurationNowIfNeeded } from '../../session/utils/sync/syncUtils'; import { isDarkTheme } from '../../state/selectors/theme'; @@ -210,7 +207,7 @@ const doAppStartUp = async () => { void triggerSyncIfNeeded(); void getSwarmPollingInstance().start(); void loadDefaultRooms(); - void getFreshSwarmFor(UserUtils.getOurPubKeyStrFromCache()); // refresh our swarm on start to speed up the first message fetching event + void SnodePool.getFreshSwarmFor(UserUtils.getOurPubKeyStrFromCache()); // refresh our swarm on start to speed up the first message fetching event // TODOLATER make this a job of the JobRunner debounce(triggerAvatarReUploadIfNeeded, 200); @@ -292,7 +289,7 @@ export const ActionsPanel = () => { } // trigger an updates from the snodes every hour - void forceRefreshRandomSnodePool(); + void SnodePool.forceRefreshRandomSnodePool(); }, DURATION.HOURS * 1); useTimeoutFn(() => { @@ -300,7 +297,7 @@ export const ActionsPanel = () => { return; } // trigger an updates from the snodes after 5 minutes, once - void forceRefreshRandomSnodePool(); + void SnodePool.forceRefreshRandomSnodePool(); }, DURATION.MINUTES * 5); useInterval(() => { diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 1a90d74b6c..a6650de268 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -6,9 +6,9 @@ import { getSodiumRenderer } from '../../crypto'; import { ed25519Str } from '../../onions/onionPath'; import { StringUtils, UserUtils } from '../../utils'; import { fromBase64ToArray, fromHexToArray } from '../../utils/String'; -import { doSnodeBatchRequest } from './batchRequest'; +import { BatchRequests } from './batchRequest'; import { SnodeSignature } from './signature/snodeSignatures'; -import { getNodeFromSwarmOrThrow } from './snodePool'; +import { SnodePool } from './snodePool'; export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.'; @@ -30,7 +30,7 @@ const forceNetworkDeletion = async (): Promise | null> => { try { const maliciousSnodes = await pRetry( async () => { - const snodeToMakeRequestTo = await getNodeFromSwarmOrThrow(usPk); + const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(usPk); return pRetry( async () => { @@ -39,7 +39,7 @@ const forceNetworkDeletion = async (): Promise | null> => { namespace, }); - const ret = await doSnodeBatchRequest( + const ret = await BatchRequests.doSnodeBatchRequest( [{ method, params: { ...signOpts, namespace, pubkey: usPk } }], snodeToMakeRequestTo, 10000, @@ -190,7 +190,7 @@ const networkDeleteMessages = async (hashes: Array): Promise { - const snodeToMakeRequestTo = await getNodeFromSwarmOrThrow(userX25519PublicKey); + const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(userX25519PublicKey); return pRetry( async () => { @@ -200,7 +200,7 @@ const networkDeleteMessages = async (hashes: Array): Promise) { * @param associatedWith used mostly for handling 421 errors, we need the pubkey the change is associated to * @param method can be either batch or sequence. A batch call will run all calls even if one of them fails. A sequence call will stop as soon as the first one fails */ -export async function doSnodeBatchRequest( +async function doSnodeBatchRequest( subRequests: Array, targetNode: Snode, timeout: number, @@ -43,7 +43,7 @@ export async function doSnodeBatchRequest( `batch subRequests count cannot be more than ${MAX_SUBREQUESTS_COUNT}. Got ${subRequests.length}` ); } - const result = await snodeRpc({ + const result = await SessionRpc.snodeRpc({ method, params: { requests: subRequests }, targetNode, @@ -76,7 +76,7 @@ export async function doSnodeBatchRequest( return decoded; } -export async function doUnsignedSnodeBatchRequest( +async function doUnsignedSnodeBatchRequest( unsignedSubRequests: Array, targetNode: Snode, timeout: number, @@ -84,7 +84,13 @@ export async function doUnsignedSnodeBatchRequest( method: MethodBatchType = 'batch' ): Promise { const signedSubRequests = await MessageSender.signSubRequests(unsignedSubRequests); - return doSnodeBatchRequest(signedSubRequests, targetNode, timeout, associatedWith, method); + return BatchRequests.doSnodeBatchRequest( + signedSubRequests, + targetNode, + timeout, + associatedWith, + method + ); } /** @@ -113,3 +119,8 @@ function decodeBatchRequest(snodeResponse: SnodeResponse): NotEmptyArrayOfBatchR } // "{"results":[{"body":"retrieve signature verification failed","code":401}]}" } + +export const BatchRequests = { + doSnodeBatchRequest, + doUnsignedSnodeBatchRequest, +}; diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index 126c0b32b4..6838fb91c6 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -12,8 +12,8 @@ import { WithShortenOrExtend, fakeHash, } from './SnodeRequestTypes'; -import { doUnsignedSnodeBatchRequest } from './batchRequest'; -import { getNodeFromSwarmOrThrow } from './snodePool'; +import { BatchRequests } from './batchRequest'; +import { SnodePool } from './snodePool'; import { ExpireMessageResultItem, ExpireMessagesResultsContent } from './types'; export type verifyExpireMsgsResponseSignatureProps = ExpireMessageResultItem & { @@ -146,7 +146,7 @@ async function updateExpiryOnNodes( expireRequests: Array ): Promise> { try { - const result = await doUnsignedSnodeBatchRequest( + const result = await BatchRequests.doUnsignedSnodeBatchRequest( expireRequests, targetNode, 4000, @@ -405,7 +405,7 @@ export async function expireMessagesOnSnode( expireRequestsParams.map(chunkRequest => pRetry( async () => { - const targetNode = await getNodeFromSwarmOrThrow(ourPubKey); + const targetNode = await SnodePool.getNodeFromSwarmOrThrow(ourPubKey); return updateExpiryOnNodes(targetNode, ourPubKey, chunkRequest); }, diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index 85b54d558d..480130b018 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -6,8 +6,8 @@ import { Snode } from '../../../data/data'; import { UserUtils } from '../../utils'; import { SeedNodeAPI } from '../seed_node_api'; import { GetExpiriesFromNodeSubRequest, fakeHash } from './SnodeRequestTypes'; -import { doUnsignedSnodeBatchRequest } from './batchRequest'; -import { getNodeFromSwarmOrThrow } from './snodePool'; +import { BatchRequests } from './batchRequest'; +import { SnodePool } from './snodePool'; import { GetExpiriesResultsContent, WithMessagesHashes } from './types'; export type GetExpiriesRequestResponseResults = Record; @@ -46,7 +46,7 @@ async function getExpiriesFromNodes( ) { try { const expireRequest = new GetExpiriesFromNodeSubRequest({ messagesHashes: messageHashes }); - const result = await doUnsignedSnodeBatchRequest( + const result = await BatchRequests.doUnsignedSnodeBatchRequest( [expireRequest], targetNode, 4000, @@ -120,7 +120,7 @@ export async function getExpiriesFromSnode({ messagesHashes }: WithMessagesHashe try { const fetchedExpiries = await pRetry( async () => { - const targetNode = await getNodeFromSwarmOrThrow(ourPubKey); + const targetNode = await SnodePool.getNodeFromSwarmOrThrow(ourPubKey); return getExpiriesFromNodes(targetNode, messagesHashes, ourPubKey); }, diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index a35ba4ccd2..c89d12095d 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -7,12 +7,12 @@ import { isNumber } from 'lodash'; import { Snode } from '../../../data/data'; import { NetworkTimeSubRequest } from './SnodeRequestTypes'; -import { doUnsignedSnodeBatchRequest } from './batchRequest'; +import { BatchRequests } from './batchRequest'; const getNetworkTime = async (snode: Snode): Promise => { const subrequest = new NetworkTimeSubRequest(); - const result = await doUnsignedSnodeBatchRequest([subrequest], snode, 4000, null); + const result = await BatchRequests.doUnsignedSnodeBatchRequest([subrequest], snode, 4000, null); if (!result || !result.length) { window?.log?.warn(`getNetworkTime on ${snode.ip}:${snode.port} returned falsish value`, result); throw new Error('getNetworkTime: Invalid result'); diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index 947c067874..9d2edac937 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -1,10 +1,9 @@ import { compact, intersectionWith, sampleSize } from 'lodash'; -import { SnodePool } from '.'; import { Snode } from '../../../data/data'; import { GetServiceNodesSubRequest } from './SnodeRequestTypes'; -import { doUnsignedSnodeBatchRequest } from './batchRequest'; +import { BatchRequests } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; -import { minSnodePoolCount, requiredSnodesForAgreement } from './snodePool'; +import { SnodePool } from './snodePool'; /** * Returns a list of unique snodes got from the specified targetNode. @@ -14,7 +13,12 @@ import { minSnodePoolCount, requiredSnodesForAgreement } from './snodePool'; async function getSnodePoolFromSnode(targetNode: Snode): Promise> { const subrequest = new GetServiceNodesSubRequest(); - const results = await doUnsignedSnodeBatchRequest([subrequest], targetNode, 4000, null); + const results = await BatchRequests.doUnsignedSnodeBatchRequest( + [subrequest], + targetNode, + 4000, + null + ); const firstResult = results[0]; @@ -58,7 +62,7 @@ async function getSnodePoolFromSnode(targetNode: Snode): Promise> { */ async function getSnodePoolFromSnodes() { const existingSnodePool = await SnodePool.getSnodePoolFromDBOrFetchFromSeed(); - if (existingSnodePool.length <= minSnodePoolCount) { + if (existingSnodePool.length <= SnodePool.minSnodePoolCount) { window?.log?.warn( 'getSnodePoolFromSnodes: Cannot get snodes list from snodes; not enough snodes', existingSnodePool.length @@ -95,9 +99,9 @@ async function getSnodePoolFromSnodes() { } ); // We want the snodes to agree on at least this many snodes - if (commonSnodes.length < requiredSnodesForAgreement) { + if (commonSnodes.length < SnodePool.requiredSnodesForAgreement) { throw new Error( - `Inconsistent snode pools. We did not get at least ${requiredSnodesForAgreement} in common` + `Inconsistent snode pools. We did not get at least ${SnodePool.requiredSnodesForAgreement} in common` ); } return commonSnodes; diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index d6646072c4..068d83f1eb 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -3,9 +3,9 @@ import pRetry from 'p-retry'; import { Snode } from '../../../data/data'; import { PubKey } from '../../types'; import { SwarmForSubRequest } from './SnodeRequestTypes'; -import { doUnsignedSnodeBatchRequest } from './batchRequest'; +import { BatchRequests } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; -import { getRandomSnode } from './snodePool'; +import { SnodePool } from './snodePool'; /** * get snodes for pubkey from random snode. Uses an existing snode @@ -19,7 +19,12 @@ async function requestSnodesForPubkeyWithTargetNodeRetryable( } const subrequest = new SwarmForSubRequest(pubkey); - const result = await doUnsignedSnodeBatchRequest([subrequest], targetNode, 4000, pubkey); + const result = await BatchRequests.doUnsignedSnodeBatchRequest( + [subrequest], + targetNode, + 4000, + pubkey + ); if (!result || !result.length) { window?.log?.warn( @@ -87,7 +92,7 @@ async function requestSnodesForPubkeyRetryable(pubKey: string): Promise { - const targetNode = await getRandomSnode(); + const targetNode = await SnodePool.getRandomSnode(); return requestSnodesForPubkeyWithTargetNode(pubKey, targetNode); }, diff --git a/ts/session/apis/snode_api/index.ts b/ts/session/apis/snode_api/index.ts index eb5e918308..fa2326d588 100644 --- a/ts/session/apis/snode_api/index.ts +++ b/ts/session/apis/snode_api/index.ts @@ -1,7 +1,6 @@ -import * as SnodePool from './snodePool'; import * as SNodeAPI from './SNodeAPI'; import * as Onions from './onions'; import { getSwarmPollingInstance } from './swarmPolling'; -export { SnodePool, SNodeAPI, Onions, getSwarmPollingInstance }; +export { Onions, SNodeAPI, getSwarmPollingInstance }; diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index 15289d3386..0653161583 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -9,7 +9,7 @@ import pRetry from 'p-retry'; // eslint-disable-next-line import/no-unresolved import { AbortSignal as AbortSignalNode } from 'node-fetch/externals'; -import { dropSnodeFromSnodePool, dropSnodeFromSwarmIfNeeded, updateSwarmFor } from './snodePool'; +import { SnodePool } from './snodePool'; import { OnionPaths } from '../../onions'; import { ed25519Str, incrementBadPathCountOrDrop } from '../../onions/onionPath'; @@ -343,10 +343,10 @@ async function handleNodeNotFound({ window?.log?.warn('Handling NODE NOT FOUND with: ', shortNodeNotFound); if (associatedWith) { - await dropSnodeFromSwarmIfNeeded(associatedWith, ed25519NotFound); + await SnodePool.dropSnodeFromSwarmIfNeeded(associatedWith, ed25519NotFound); } - await dropSnodeFromSnodePool(ed25519NotFound); + await SnodePool.dropSnodeFromSnodePool(ed25519NotFound); snodeFailureCount[ed25519NotFound] = 0; // try to remove the not found snode from any of the paths if it's there. // it may not be here, as the snode note found might be the target snode of the request. @@ -736,11 +736,11 @@ async function handle421InvalidSwarm({ parsedBody.snodes.map((s: any) => ed25519Str(s.pubkey_ed25519)) ); - await updateSwarmFor(associatedWith, parsedBody.snodes); + await SnodePool.updateSwarmFor(associatedWith, parsedBody.snodes); throw new pRetry.AbortError(ERROR_421_HANDLED_RETRY_REQUEST); } // remove this node from the swarm of this pubkey - await dropSnodeFromSwarmIfNeeded(associatedWith, destinationSnodeEd25519); + await SnodePool.dropSnodeFromSwarmIfNeeded(associatedWith, destinationSnodeEd25519); } catch (e) { if (e.message !== ERROR_421_HANDLED_RETRY_REQUEST) { window?.log?.warn( @@ -748,7 +748,7 @@ async function handle421InvalidSwarm({ e ); // could not parse result. Consider that this snode as invalid - await dropSnodeFromSwarmIfNeeded(associatedWith, destinationSnodeEd25519); + await SnodePool.dropSnodeFromSwarmIfNeeded(associatedWith, destinationSnodeEd25519); } } await Onions.incrementBadSnodeCountOrDrop({ @@ -789,9 +789,9 @@ async function incrementBadSnodeCountOrDrop({ ); if (associatedWith) { - await dropSnodeFromSwarmIfNeeded(associatedWith, snodeEd25519); + await SnodePool.dropSnodeFromSwarmIfNeeded(associatedWith, snodeEd25519); } - await dropSnodeFromSnodePool(snodeEd25519); + await SnodePool.dropSnodeFromSnodePool(snodeEd25519); snodeFailureCount[snodeEd25519] = 0; await OnionPaths.dropSnodeFromPath(snodeEd25519); diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts index c609bc8856..b571c05b3e 100644 --- a/ts/session/apis/snode_api/onsResolve.ts +++ b/ts/session/apis/snode_api/onsResolve.ts @@ -7,9 +7,9 @@ import { toHex, } from '../../utils/String'; import { OnsResolveSubRequest } from './SnodeRequestTypes'; -import { doUnsignedSnodeBatchRequest } from './batchRequest'; +import { BatchRequests } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; -import { getRandomSnode } from './snodePool'; +import { SnodePool } from './snodePool'; // ONS name can have [a-zA-Z0-9_-] except that - is not allowed as start or end // do not define a regex but rather create it on the fly to avoid https://stackoverflow.com/questions/3891641/regex-test-only-works-every-other-time @@ -27,9 +27,14 @@ async function getSessionIDForOnsName(onsNameCase: string) { // we do this request with validationCount snodes const promises = range(0, validationCount).map(async () => { - const targetNode = await getRandomSnode(); + const targetNode = await SnodePool.getRandomSnode(); - const results = await doUnsignedSnodeBatchRequest([subRequest], targetNode, 4000, null); + const results = await BatchRequests.doUnsignedSnodeBatchRequest( + [subRequest], + targetNode, + 4000, + null + ); const firstResult = results[0]; if (!firstResult || firstResult.code !== 200 || !firstResult.body) { throw new Error('ONSresolve:Failed to resolve ONS'); diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index ffa9ac9968..4d1b3703e9 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -15,7 +15,7 @@ import { UpdateExpiryOnNodeGroupSubRequest, UpdateExpiryOnNodeUserSubRequest, } from './SnodeRequestTypes'; -import { doUnsignedSnodeBatchRequest } from './batchRequest'; +import { BatchRequests } from './batchRequest'; import { RetrieveMessagesResultsBatched, RetrieveMessagesResultsContent } from './types'; type RetrieveParams = { @@ -206,7 +206,12 @@ async function retrieveNextMessages( // let exceptions bubble up // no retry for this one as this a call we do every few seconds while polling for messages - const results = await doUnsignedSnodeBatchRequest(rawRequests, targetNode, 4000, associatedWith); + const results = await BatchRequests.doUnsignedSnodeBatchRequest( + rawRequests, + targetNode, + 4000, + associatedWith + ); if (!results || !results.length) { window?.log?.warn( `_retrieveNextMessages - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}` diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index b5e4d61f56..133e4b77b2 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -109,7 +109,7 @@ async function doRequest({ * -> if the targetNode gets too many errors => we will need to try to do this request again with another target node * The */ -export async function snodeRpc( +async function snodeRpc( { method, params, @@ -147,3 +147,5 @@ export async function snodeRpc( timeout, }); } + +export const SessionRpc = { snodeRpc }; diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts index 4a8fbe70d5..bdc80f37c7 100644 --- a/ts/session/apis/snode_api/snodePool.ts +++ b/ts/session/apis/snode_api/snodePool.ts @@ -3,7 +3,7 @@ import pRetry from 'p-retry'; import { Data, Snode } from '../../../data/data'; -import { Onions, SnodePool } from '.'; +import { Onions } from '.'; import { OnionPaths } from '../../onions'; import { ed25519Str } from '../../onions/onionPath'; import { SeedNodeAPI } from '../seed_node_api'; @@ -19,12 +19,12 @@ const minSwarmSnodeCount = 3; * If we get less than minSnodePoolCount we consider that we need to fetch the new snode pool from a seed node * and not from those snodes. */ -export const minSnodePoolCount = 12; +const minSnodePoolCount = 12; /** * If we get less than this amount of snodes (24), lets try to get an updated list from those while we can */ -export const minSnodePoolCountBeforeRefreshFromSnodes = minSnodePoolCount * 2; +const minSnodePoolCountBeforeRefreshFromSnodes = minSnodePoolCount * 2; /** * If we do a request to fetch nodes from snodes and they don't return at least @@ -32,12 +32,12 @@ export const minSnodePoolCountBeforeRefreshFromSnodes = minSnodePoolCount * 2; * * Too many nodes are not shared for this call to be trustworthy */ -export const requiredSnodesForAgreement = 24; +const requiredSnodesForAgreement = 24; let randomSnodePool: Array = []; -export function TEST_resetState() { - randomSnodePool = []; +function TEST_resetState(snodePoolForTest: Array = []) { + randomSnodePool = snodePoolForTest; swarmCache.clear(); } @@ -49,7 +49,7 @@ const swarmCache: Map> = new Map(); * Use `dropSnodeFromSwarmIfNeeded` for that * @param snodeEd25519 the snode ed25519 to drop from the snode pool */ -export async function dropSnodeFromSnodePool(snodeEd25519: string) { +async function dropSnodeFromSnodePool(snodeEd25519: string) { const exists = _.some(randomSnodePool, x => x.pubkey_ed25519 === snodeEd25519); if (exists) { _.remove(randomSnodePool, x => x.pubkey_ed25519 === snodeEd25519); @@ -67,11 +67,11 @@ export async function dropSnodeFromSnodePool(snodeEd25519: string) { * excludingEd25519Snode can be used to exclude some nodes from the random list. * Useful to rebuild a path excluding existing node already in a path */ -export async function getRandomSnode(excludingEd25519Snode?: Array): Promise { +async function getRandomSnode(excludingEd25519Snode?: Array): Promise { // make sure we have a few snodes in the pool excluding the one passed as args - const requiredCount = minSnodePoolCount + (excludingEd25519Snode?.length || 0); + const requiredCount = SnodePool.minSnodePoolCount + (excludingEd25519Snode?.length || 0); if (randomSnodePool.length < requiredCount) { - await getSnodePoolFromDBOrFetchFromSeed(excludingEd25519Snode?.length); + await SnodePool.getSnodePoolFromDBOrFetchFromSeed(excludingEd25519Snode?.length); if (randomSnodePool.length < requiredCount) { window?.log?.warn( @@ -103,9 +103,9 @@ export async function getRandomSnode(excludingEd25519Snode?: Array): Pro * This function force the snode poll to be refreshed from a random seed node or snodes if we have enough of them. * This should be called once in a day or so for when the app it kept on. */ -export async function forceRefreshRandomSnodePool(): Promise> { +async function forceRefreshRandomSnodePool(): Promise> { try { - await getSnodePoolFromDBOrFetchFromSeed(); + await SnodePool.getSnodePoolFromDBOrFetchFromSeed(); window?.log?.info( `forceRefreshRandomSnodePool: enough snodes to fetch from them, so we try using them ${randomSnodePool.length}` @@ -113,7 +113,7 @@ export async function forceRefreshRandomSnodePool(): Promise> { // this function throws if it does not have enough snodes to do it await tryToGetConsensusWithSnodesWithRetries(); - if (randomSnodePool.length < minSnodePoolCountBeforeRefreshFromSnodes) { + if (randomSnodePool.length < SnodePool.minSnodePoolCountBeforeRefreshFromSnodes) { throw new Error('forceRefreshRandomSnodePool still too small after refetching from snodes'); } } catch (e) { @@ -140,15 +140,21 @@ export async function forceRefreshRandomSnodePool(): Promise> { * Fetches from DB if snode pool is not cached, and returns it if the length is >= 12. * If length is < 12, fetches from seed an updated list of snodes */ -export async function getSnodePoolFromDBOrFetchFromSeed( +async function getSnodePoolFromDBOrFetchFromSeed( countToAddToRequirement = 0 ): Promise> { - if (randomSnodePool && randomSnodePool.length > minSnodePoolCount + countToAddToRequirement) { + if ( + randomSnodePool && + randomSnodePool.length > SnodePool.minSnodePoolCount + countToAddToRequirement + ) { return randomSnodePool; } const fetchedFromDb = await Data.getSnodePoolFromDb(); - if (!fetchedFromDb || fetchedFromDb.length <= minSnodePoolCount + countToAddToRequirement) { + if ( + !fetchedFromDb || + fetchedFromDb.length <= SnodePool.minSnodePoolCount + countToAddToRequirement + ) { window?.log?.warn( `getSnodePoolFromDBOrFetchFromSeed: not enough snodes in db (${fetchedFromDb?.length}), Fetching from seed node instead... ` ); @@ -164,9 +170,9 @@ export async function getSnodePoolFromDBOrFetchFromSeed( return randomSnodePool; } -export async function getRandomSnodePool(): Promise> { - if (randomSnodePool.length <= minSnodePoolCount) { - await getSnodePoolFromDBOrFetchFromSeed(); +async function getRandomSnodePool(): Promise> { + if (randomSnodePool.length <= SnodePool.minSnodePoolCount) { + await SnodePool.getSnodePoolFromDBOrFetchFromSeed(); } return randomSnodePool; } @@ -178,7 +184,7 @@ export async function getRandomSnodePool(): Promise> { * This function does not throw. */ -export async function TEST_fetchFromSeedWithRetriesAndWriteToDb() { +async function TEST_fetchFromSeedWithRetriesAndWriteToDb() { const seedNodes = window.getSeedNodeList(); if (!seedNodes || !seedNodes.length) { @@ -217,7 +223,7 @@ async function tryToGetConsensusWithSnodesWithRetries() { async () => { const commonNodes = await ServiceNodesList.getSnodePoolFromSnodes(); - if (!commonNodes || commonNodes.length < requiredSnodesForAgreement) { + if (!commonNodes || commonNodes.length < SnodePool.requiredSnodesForAgreement) { // throwing makes trigger a retry if we have some left. window?.log?.info( `tryToGetConsensusWithSnodesWithRetries: Not enough common nodes ${commonNodes?.length}` @@ -252,7 +258,7 @@ async function tryToGetConsensusWithSnodesWithRetries() { * @param pubkey the associatedWith publicKey * @param snodeToDropEd25519 the snode pubkey to drop */ -export async function dropSnodeFromSwarmIfNeeded( +async function dropSnodeFromSwarmIfNeeded( pubkey: string, snodeToDropEd25519: string ): Promise { @@ -261,7 +267,7 @@ export async function dropSnodeFromSwarmIfNeeded( `Dropping ${ed25519Str(snodeToDropEd25519)} from swarm of ${ed25519Str(pubkey)}` ); - const existingSwarm = await getSwarmFromCacheOrDb(pubkey); + const existingSwarm = await SnodePool.getSwarmFromCacheOrDb(pubkey); if (!existingSwarm.includes(snodeToDropEd25519)) { return; @@ -271,7 +277,7 @@ export async function dropSnodeFromSwarmIfNeeded( await internalUpdateSwarmFor(pubkey, updatedSwarm); } -export async function updateSwarmFor(pubkey: string, snodes: Array): Promise { +async function updateSwarmFor(pubkey: string, snodes: Array): Promise { const edkeys = snodes.map((sn: Snode) => sn.pubkey_ed25519); await internalUpdateSwarmFor(pubkey, edkeys); } @@ -283,7 +289,7 @@ async function internalUpdateSwarmFor(pubkey: string, edkeys: Array) { await Data.updateSwarmNodesForPubkey(pubkey, edkeys); } -export async function getSwarmFromCacheOrDb(pubkey: string): Promise> { +async function getSwarmFromCacheOrDb(pubkey: string): Promise> { // NOTE: important that maybeNodes is not [] here const existingCache = swarmCache.get(pubkey); if (existingCache === undefined) { @@ -301,13 +307,12 @@ export async function getSwarmFromCacheOrDb(pubkey: string): Promise> { - const nodes = await getSwarmFromCacheOrDb(pubkey); +async function getSwarmFor(pubkey: string): Promise> { + const nodes = await SnodePool.getSwarmFromCacheOrDb(pubkey); // See how many are actually still reachable // the nodes still reachable are the one still present in the snode pool const goodNodes = randomSnodePool.filter((n: Snode) => nodes.indexOf(n.pubkey_ed25519) !== -1); - if (goodNodes.length >= minSwarmSnodeCount) { return goodNodes; } @@ -316,8 +321,8 @@ export async function getSwarmFor(pubkey: string): Promise> { return getSwarmFromNetworkAndSave(pubkey); } -export async function getNodeFromSwarmOrThrow(pubkey: string): Promise { - const swarm = await getSwarmFor(pubkey); +async function getNodeFromSwarmOrThrow(pubkey: string): Promise { + const swarm = await SnodePool.getSwarmFor(pubkey); if (!isEmpty(swarm)) { const node = sample(swarm); if (node) { @@ -336,7 +341,7 @@ export async function getNodeFromSwarmOrThrow(pubkey: string): Promise { * @param pubkey the pubkey to request the swarm for * @returns the fresh swarm, shuffled */ -export async function getFreshSwarmFor(pubkey: string): Promise> { +async function getFreshSwarmFor(pubkey: string): Promise> { return getSwarmFromNetworkAndSave(pubkey); } @@ -350,3 +355,29 @@ async function getSwarmFromNetworkAndSave(pubkey: string) { return shuffledSwarm; } + +export const SnodePool = { + // consts + minSnodePoolCount, + minSnodePoolCountBeforeRefreshFromSnodes, + requiredSnodesForAgreement, + + // snode pool mgmt + dropSnodeFromSnodePool, + forceRefreshRandomSnodePool, + getRandomSnode, + getRandomSnodePool, + getSnodePoolFromDBOrFetchFromSeed, + + // swarm mgmt + dropSnodeFromSwarmIfNeeded, + updateSwarmFor, + getSwarmFromCacheOrDb, + getSwarmFor, + getNodeFromSwarmOrThrow, + getFreshSwarmFor, + + // tests + TEST_resetState, + TEST_fetchFromSeedWithRetriesAndWriteToDb, +}; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index f191314f60..070b6e5ec9 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -22,7 +22,6 @@ import { SignalService } from '../../../protobuf'; import * as Receiver from '../../../receiver/receiver'; import { PubKey } from '../../types'; import { ERROR_CODE_NO_CONNECT } from './SNodeAPI'; -import * as snodePool from './snodePool'; import { ConversationModel } from '../../../models/conversation'; import { ConversationTypeEnum } from '../../../models/conversationAttributes'; @@ -44,6 +43,7 @@ import { LibSessionUtil } from '../../utils/libsession/libsession_utils'; import { SnodeNamespace, SnodeNamespaces, SnodeNamespacesUserConfig } from './namespaces'; import { PollForGroup, PollForLegacy, PollForUs } from './pollingTypes'; import { SnodeAPIRetrieve } from './retrieveRequest'; +import { SnodePool } from './snodePool'; import { SwarmPollingGroupConfig } from './swarm_polling_config/SwarmPollingGroupConfig'; import { SwarmPollingUserConfig } from './swarm_polling_config/SwarmPollingUserConfig'; import { @@ -339,7 +339,7 @@ export class SwarmPolling { */ public async pollOnceForKey([pubkey, type]: PollForUs | PollForLegacy | PollForGroup) { const namespaces = this.getNamespacesToPollFrom(type); - const swarmSnodes = await snodePool.getSwarmFor(pubkey); + const swarmSnodes = await SnodePool.getSwarmFor(pubkey); // Select nodes for which we already have lastHashes const alreadyPolled = swarmSnodes.filter((n: Snode) => this.lastHashes[n.pubkey_ed25519]); diff --git a/ts/session/messages/outgoing/controlMessage/TypingMessage.ts b/ts/session/messages/outgoing/controlMessage/TypingMessage.ts index 827138569f..8b8132b510 100644 --- a/ts/session/messages/outgoing/controlMessage/TypingMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/TypingMessage.ts @@ -5,7 +5,6 @@ import { MessageParams } from '../Message'; interface TypingMessageParams extends MessageParams { isTyping: boolean; - typingTimestamp?: number; } export class TypingMessage extends ContentMessage { diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index ab3bebc613..ef35da7ae8 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -34,7 +34,8 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage { this.chatMessage = params.chatMessage; if ( this.chatMessage.expirationType !== 'deleteAfterSend' && - this.chatMessage.expirationType !== 'unknown' + this.chatMessage.expirationType !== 'unknown' && + this.chatMessage.expirationType !== null ) { throw new Error('group visible msg only support DaS and off Disappearing options'); } diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index 7de7679f83..d50107b3dd 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -11,7 +11,7 @@ import { updateOnionPaths } from '../../state/ducks/onion'; import { APPLICATION_JSON } from '../../types/MIME'; import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI'; import { Onions, snodeHttpsAgent } from '../apis/snode_api/onions'; -import * as SnodePool from '../apis/snode_api/snodePool'; +import { SnodePool } from '../apis/snode_api/snodePool'; import { UserUtils } from '../utils'; import { allowOnlyOneAtATime } from '../utils/Promise'; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 3d320973c3..0593863e99 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -39,7 +39,7 @@ import { UpdateExpiryOnNodeGroupSubRequest, UpdateExpiryOnNodeUserSubRequest, } from '../apis/snode_api/SnodeRequestTypes'; -import { doUnsignedSnodeBatchRequest } from '../apis/snode_api/batchRequest'; +import { BatchRequests } from '../apis/snode_api/batchRequest'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; import { @@ -48,7 +48,7 @@ import { SnodeGroupSignature, } from '../apis/snode_api/signature/groupSignature'; import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/signature/snodeSignatures'; -import { getNodeFromSwarmOrThrow } from '../apis/snode_api/snodePool'; +import { SnodePool } from '../apis/snode_api/snodePool'; import { WithMessagesHashes, WithRevokeSubRequest } from '../apis/snode_api/types'; import { TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; @@ -129,7 +129,6 @@ async function sendSingleMessage({ found.set({ sent_at: encryptedAndWrapped.networkTimestamp }); await found.commit(); } - const isSyncedDeleteAfterReadMessage = found && UserUtils.isUsFromCache(recipient.key) && @@ -145,7 +144,6 @@ async function sendSingleMessage({ } const subRequests: Array = []; - if (PubKey.is05Pubkey(destination)) { if (encryptedAndWrapped.namespace === SnodeNamespaces.Default) { subRequests.push( @@ -229,9 +227,8 @@ async function sendSingleMessage({ ); } - const targetNode = await getNodeFromSwarmOrThrow(destination); - - const batchResult = await doUnsignedSnodeBatchRequest( + const targetNode = await SnodePool.getNodeFromSwarmOrThrow(destination); + const batchResult = await BatchRequests.doUnsignedSnodeBatchRequest( subRequests, targetNode, 6000, @@ -380,10 +377,10 @@ async function sendMessagesDataToSnode( unrevokeSubRequest, ]); - const targetNode = await getNodeFromSwarmOrThrow(asssociatedWith); + const targetNode = await SnodePool.getNodeFromSwarmOrThrow(asssociatedWith); try { - const storeResults = await doUnsignedSnodeBatchRequest( + const storeResults = await BatchRequests.doUnsignedSnodeBatchRequest( rawRequests, targetNode, 4000, diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts index 99ad058931..a8bd2f108f 100644 --- a/ts/session/utils/libsession/libsession_utils_user_groups.ts +++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts @@ -31,10 +31,9 @@ function isCommunityToStoreInWrapper(convo: ConversationModel): boolean { function isLegacyGroupToStoreInWrapper(convo: ConversationModel): boolean { return ( convo.isGroup() && - !convo.isPublic() && - convo.id.startsWith('05') && // new closed groups won't start with 05 + PubKey.is05Pubkey(convo.id) && // we only check legacy group here convo.isActive() && - !convo.isKickedFromGroup() + !convo.isKickedFromGroup() // we cannot have a left group anymore. We remove it when we leave it. ); } diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts index 9ec8f462db..45af372f47 100644 --- a/ts/test/session/unit/crypto/SnodeSignatures_test.ts +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -265,7 +265,7 @@ describe('SnodeSignature', () => { }); }; await expect(func()).to.be.rejectedWith( - 'generateUpdateExpiryGroupSignature groupPrivKey or groupPk is empty' + 'generateUpdateExpiryGroupSignature groupPk is empty' ); }); @@ -284,7 +284,7 @@ describe('SnodeSignature', () => { }); }; await expect(func()).to.be.rejectedWith( - 'generateUpdateExpiryGroupSignature groupPrivKey or groupPk is empty' + 'retrieveRequestForGroup: needs either groupSecretKey or authData' ); }); diff --git a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts index b4121972c5..fc4e131d1c 100644 --- a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts +++ b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts @@ -71,22 +71,38 @@ describe('GetExpiriesRequest', () => { ).to.be.true; expect(request.params.signature, 'signature should not be empty').to.not.be.empty; }); - it('fails to build a request if our pubkey is missing', async () => { + it('fails to build a request if our pubkey is missing, and throws', async () => { // Modify the stub behavior for this test only we need to return an unsupported type to simulate a missing pubkey (getOurPubKeyStrFromCacheStub as any).returns(undefined); - const unsigned = new GetExpiriesFromNodeSubRequest(props); - const request = await unsigned.buildAndSignParameters(); + let errorStr = 'fakeerror'; + try { + const unsigned = new GetExpiriesFromNodeSubRequest(props); + const request = await unsigned.buildAndSignParameters(); + if (request) { + throw new Error('we should not have been able to build a request'); + } + } catch (e) { + errorStr = e.message; + } - expect(request, 'should return null').to.be.null; + expect(errorStr).to.be.eq('[GetExpiriesFromNodeSubRequest] No pubkey found'); }); it('fails to build a request if our signature is missing', async () => { // Modify the stub behavior for this test only we need to return an unsupported type to simulate a missing pubkey Sinon.stub(SnodeSignature, 'generateGetExpiriesOurSignature').resolves(null); - // TODO audric this should throw debugger - const unsigned = new GetExpiriesFromNodeSubRequest(props); - const request = await unsigned.buildAndSignParameters(); - expect(request, 'should return null').to.be.null; + const unsigned = new GetExpiriesFromNodeSubRequest(props); + try { + const request = await unsigned.buildAndSignParameters(); + if (request) { + throw new Error('should not be able to build the request'); + } + throw new Error('fake error'); + } catch (e) { + expect(e.message).to.be.eq( + '[GetExpiriesFromNodeSubRequest] SnodeSignature.generateUpdateExpirySignature returned an empty result messageHash' + ); + } }); }); diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 21e4bae15f..cfb53dc66a 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -156,19 +156,22 @@ describe('libsession_metagroup', () => { describe('members', () => { it('all fields are accounted for', () => { const memberCreated = metaGroupWrapper.memberGetOrConstruct(member); + console.info('Object.keys(memberCreated) ', JSON.stringify(Object.keys(memberCreated))); expect(Object.keys(memberCreated).length).to.be.eq( - 8, // if you change this value, also make sure you add a test, testing that new field, below + 9, // if you change this value, also make sure you add a test, testing that new field, below 'this test is designed to fail if you need to add tests to test a new field of libsession' ); }); - it('can add member by setting its promoted state', () => { + it('can add member by setting its promoted state, both ok and nok', () => { metaGroupWrapper.memberSetPromoted(member, false); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ ...emptyMember(member), promoted: true, promotionPending: true, + promotionFailed: false, + admin: false, }); metaGroupWrapper.memberSetPromoted(member2, true); @@ -179,15 +182,19 @@ describe('libsession_metagroup', () => { promoted: true, promotionFailed: true, promotionPending: true, + admin: false, }); + + // we test the admin: true case below }); - it('can add member by setting its invited state', () => { + it('can add member by setting its invited state, both ok and nok', () => { metaGroupWrapper.memberSetInvited(member, false); // with invite success expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ ...emptyMember(member), invitePending: true, + inviteFailed: false, }); metaGroupWrapper.memberSetInvited(member2, true); // with invite failed @@ -252,6 +259,20 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); }); + + it('can add via admin set', () => { + metaGroupWrapper.memberSetAdmin(member); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + const expected: GroupMemberGet = { + ...emptyMember(member), + admin: true, + promoted: true, + promotionFailed: false, + promotionPending: false, + }; + + expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); + }); }); describe('keys', () => { diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts index 78f6e7020a..cc20ee2ade 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts @@ -12,6 +12,7 @@ import { import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../../../../session/conversations'; import { UserUtils } from '../../../../session/utils'; +import { toHex } from '../../../../session/utils/String'; import { SessionUtilUserGroups } from '../../../../session/utils/libsession/libsession_utils_user_groups'; import { TestUtils } from '../../../test-utils'; import { generateFakeECKeyPair, stubWindowLog } from '../../../test-utils/utils'; @@ -64,7 +65,7 @@ describe('libsession_user_groups', () => { const validLegacyGroupArgs = { ...validArgs, type: ConversationTypeEnum.GROUP, - id: '05123456564', + id: TestUtils.generateFakePubKeyStr(), } as ConversationAttributes; it('includes legacy group', () => { @@ -78,14 +79,7 @@ describe('libsession_user_groups', () => { }); it('exclude legacy group left', () => { - expect( - SessionUtilUserGroups.isUserGroupToStoreInWrapper( - new ConversationModel({ - ...validLegacyGroupArgs, - left: true, - }) - ) - ).to.be.eq(false); + // we cannot have a left group anymore. It's removed entirely when we leave it }); it('exclude legacy group kicked', () => { expect( @@ -168,12 +162,13 @@ describe('libsession_user_groups', () => { describe('LegacyGroups', () => { describe('insertGroupsFromDBIntoWrapperAndRefresh', () => { + const asHex = toHex(groupECKeyPair.publicKeyData); const groupArgs = { - id: groupECKeyPair.publicKeyData.toString(), + id: asHex, displayNameInProfile: 'Test Group', expirationMode: 'off', expireTimer: 0, - members: [groupECKeyPair.publicKeyData.toString()], + members: [asHex], } as ConversationAttributes; it('returns wrapper values that match with the inputted group', async () => { diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts index e36d19610d..db7e7d1365 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_usergroups_test.ts @@ -8,6 +8,7 @@ import { } from '../../../../models/conversationAttributes'; import { UserUtils } from '../../../../session/utils'; import { SessionUtilUserGroups } from '../../../../session/utils/libsession/libsession_utils_user_groups'; +import { TestUtils } from '../../../test-utils'; describe('libsession_groups', () => { describe('filter user groups for wrapper', () => { @@ -46,7 +47,7 @@ describe('libsession_groups', () => { const validLegacyGroupArgs = { ...validArgs, type: ConversationTypeEnum.GROUP, - id: '05123456564', + id: TestUtils.generateFakePubKeyStr(), } as any; it('includes legacy group', () => { @@ -60,14 +61,7 @@ describe('libsession_groups', () => { }); it('exclude legacy group left', () => { - expect( - SessionUtilUserGroups.isUserGroupToStoreInWrapper( - new ConversationModel({ - ...validLegacyGroupArgs, - left: true, - }) - ) - ).to.be.eq(false); + // we cannot have a left group anymore. It's removed entirely when we leave it }); it('exclude legacy group kicked', () => { expect( diff --git a/ts/test/session/unit/messages/TypingMessage_test.ts b/ts/test/session/unit/messages/TypingMessage_test.ts index f95d8d2bc7..10828398f0 100644 --- a/ts/test/session/unit/messages/TypingMessage_test.ts +++ b/ts/test/session/unit/messages/TypingMessage_test.ts @@ -1,6 +1,5 @@ import { expect } from 'chai'; -import { toNumber } from 'lodash'; import Long from 'long'; import { SignalService } from '../../../../protobuf'; import { Constants } from '../../../../session'; @@ -33,18 +32,6 @@ describe('TypingMessage', () => { ); }); - it('has typingTimestamp set if value passed', () => { - const message = new TypingMessage({ - createAtNetworkTimestamp: Date.now(), - isTyping: true, - typingTimestamp: 111111111, - }); - const plainText = message.plainTextBuffer(); - const decoded = SignalService.Content.decode(plainText); - const decodedtimestamp = toNumber(decoded.typingMessage?.timestamp); - expect(decodedtimestamp).to.be.equal(111111111); - }); - it('has typingTimestamp set with Date.now() if value not passed', () => { const message = new TypingMessage({ createAtNetworkTimestamp: Date.now(), diff --git a/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts index 13933f5a01..309cf4b212 100644 --- a/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts +++ b/ts/test/session/unit/messages/closed_groups/ClosedGroupChatMessage_test.ts @@ -40,7 +40,9 @@ describe('ClosedGroupVisibleMessage', () => { expect(decoded.dataMessage).to.have.deep.property('body', 'body'); // we use the timestamp of the chatMessage as parent timestamp - expect(message).to.have.property('timestamp').to.be.equal(chatMessage.createAtNetworkTimestamp); + expect(message) + .to.have.property('createAtNetworkTimestamp') + .to.be.equal(chatMessage.createAtNetworkTimestamp); }); it('correct ttl', () => { @@ -75,7 +77,7 @@ describe('ClosedGroupVisibleMessage', () => { const chatMessage = new VisibleMessage({ createAtNetworkTimestamp, body: 'body', - identifier: 'chatMessage', + identifier: 'closedGroupMessage', expirationType: null, expireTimer: null, }); diff --git a/ts/test/session/unit/onion/GuardNodes_test.ts b/ts/test/session/unit/onion/GuardNodes_test.ts index 9c731074dc..060078b015 100644 --- a/ts/test/session/unit/onion/GuardNodes_test.ts +++ b/ts/test/session/unit/onion/GuardNodes_test.ts @@ -1,19 +1,20 @@ import chai from 'chai'; -import Sinon, * as sinon from 'sinon'; -import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; +import { describe } from 'mocha'; +import Sinon, * as sinon from 'sinon'; -import { TestUtils } from '../../../test-utils'; -import { Onions, SnodePool } from '../../../../session/apis/snode_api'; import { Snode } from '../../../../data/data'; +import { Onions } from '../../../../session/apis/snode_api'; +import { TestUtils } from '../../../test-utils'; +import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; +import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; import * as OnionPaths from '../../../../session/onions/onionPath'; import { generateFakeSnodes, generateFakeSnodeWithEdKey, stubData, } from '../../../test-utils/utils'; -import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; chai.use(chaiAsPromised as any); chai.should(); diff --git a/ts/test/session/unit/onion/OnionErrors_test.ts b/ts/test/session/unit/onion/OnionErrors_test.ts index 38fd3553be..2e56817da4 100644 --- a/ts/test/session/unit/onion/OnionErrors_test.ts +++ b/ts/test/session/unit/onion/OnionErrors_test.ts @@ -1,24 +1,25 @@ +import AbortController from 'abort-controller'; import chai from 'chai'; -import Sinon, * as sinon from 'sinon'; -import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; -import AbortController from 'abort-controller'; +import { describe } from 'mocha'; +import Sinon, * as sinon from 'sinon'; -import { TestUtils } from '../../../test-utils'; import * as SnodeAPI from '../../../../session/apis/snode_api'; +import { TestUtils } from '../../../test-utils'; -import { OnionPaths } from '../../../../session/onions'; +import { Snode } from '../../../../data/data'; +import { SNODE_POOL_ITEM_ID } from '../../../../data/settings-key'; +import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; +import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList'; import { NEXT_NODE_NOT_FOUND_PREFIX, Onions, OXEN_SERVER_ERROR, } from '../../../../session/apis/snode_api/onions'; -import { Snode } from '../../../../data/data'; +import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; +import { OnionPaths } from '../../../../session/onions'; import { pathFailureCount } from '../../../../session/onions/onionPath'; -import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; import { generateFakeSnodeWithEdKey, stubData } from '../../../test-utils/utils'; -import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList'; -import { SNODE_POOL_ITEM_ID } from '../../../../data/settings-key'; chai.use(chaiAsPromised as any); chai.should(); @@ -97,8 +98,8 @@ describe('OnionPathsErrors', () => { updateSwarmSpy = stubData('updateSwarmNodesForPubkey').resolves(); stubData('getItemById').resolves({ id: SNODE_POOL_ITEM_ID, value: '' }); stubData('createOrUpdateItem').resolves(); - dropSnodeFromSnodePool = Sinon.spy(SnodeAPI.SnodePool, 'dropSnodeFromSnodePool'); - dropSnodeFromSwarmIfNeededSpy = Sinon.spy(SnodeAPI.SnodePool, 'dropSnodeFromSwarmIfNeeded'); + dropSnodeFromSnodePool = Sinon.spy(SnodePool, 'dropSnodeFromSnodePool'); + dropSnodeFromSwarmIfNeededSpy = Sinon.spy(SnodePool, 'dropSnodeFromSwarmIfNeeded'); dropSnodeFromPathSpy = Sinon.spy(OnionPaths, 'dropSnodeFromPath'); incrementBadPathCountOrDropSpy = Sinon.spy(OnionPaths, 'incrementBadPathCountOrDrop'); incrementBadSnodeCountOrDropSpy = Sinon.spy(Onions, 'incrementBadSnodeCountOrDrop'); diff --git a/ts/test/session/unit/onion/SeedNodeAPI_test.ts b/ts/test/session/unit/onion/SeedNodeAPI_test.ts index 4d2d335c82..7499e3b380 100644 --- a/ts/test/session/unit/onion/SeedNodeAPI_test.ts +++ b/ts/test/session/unit/onion/SeedNodeAPI_test.ts @@ -1,16 +1,17 @@ import chai from 'chai'; -import Sinon from 'sinon'; import chaiAsPromised from 'chai-as-promised'; import { describe } from 'mocha'; +import Sinon from 'sinon'; +import { Onions } from '../../../../session/apis/snode_api'; import { TestUtils } from '../../../test-utils'; -import { Onions, SnodePool } from '../../../../session/apis/snode_api'; -import * as OnionPaths from '../../../../session/onions/onionPath'; -import { generateFakeSnodes, generateFakeSnodeWithEdKey } from '../../../test-utils/utils'; +import { Snode } from '../../../../data/data'; import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; import { SnodeFromSeed } from '../../../../session/apis/seed_node_api/SeedNodeAPI'; -import { Snode } from '../../../../data/data'; +import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; +import * as OnionPaths from '../../../../session/onions/onionPath'; +import { generateFakeSnodes, generateFakeSnodeWithEdKey } from '../../../test-utils/utils'; chai.use(chaiAsPromised as any); chai.should(); diff --git a/ts/test/session/unit/onion/SnodePoolUpdate_test.ts b/ts/test/session/unit/onion/SnodePoolUpdate_test.ts index f3d9f950a8..66c6d2f524 100644 --- a/ts/test/session/unit/onion/SnodePoolUpdate_test.ts +++ b/ts/test/session/unit/onion/SnodePoolUpdate_test.ts @@ -1,19 +1,20 @@ import chai from 'chai'; -import Sinon, * as sinon from 'sinon'; -import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; +import { describe } from 'mocha'; +import Sinon, * as sinon from 'sinon'; -import { TestUtils } from '../../../test-utils'; -import { Onions, SnodePool } from '../../../../session/apis/snode_api'; import { Snode } from '../../../../data/data'; +import { Onions } from '../../../../session/apis/snode_api'; +import { TestUtils } from '../../../test-utils'; +import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; +import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; import * as OnionPaths from '../../../../session/onions/onionPath'; import { generateFakeSnodes, generateFakeSnodeWithEdKey, stubData, } from '../../../test-utils/utils'; -import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; chai.use(chaiAsPromised as any); chai.should(); diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index 1bad7e5603..0e4cc6d334 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -25,7 +25,7 @@ import { PendingMessageCacheStub } from '../../../test-utils/stubs'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { MessageSentHandler } from '../../../../session/sending/MessageSentHandler'; -import { stubData } from '../../../test-utils/utils'; +import { TypedStub, stubData } from '../../../test-utils/utils'; chai.use(chaiAsPromised as any); chai.should(); @@ -39,9 +39,23 @@ describe('MessageQueue', () => { // Initialize new stubbed queue let pendingMessageCache: PendingMessageCacheStub; - let messageSentHandlerFailedStub: sinon.SinonStub; - let messageSentHandlerSuccessStub: sinon.SinonStub; - let messageSentPublicHandlerSuccessStub: sinon.SinonStub; + let messageSentHandlerFailedStub: TypedStub< + typeof MessageSentHandler, + 'handleSwarmMessageSentFailure' + >; + let messageSentHandlerSuccessStub: TypedStub< + typeof MessageSentHandler, + 'handleSwarmMessageSentSuccess' + >; + let messageSentPublicHandlerSuccessStub: TypedStub< + typeof MessageSentHandler, + 'handlePublicMessageSentSuccess' + >; + let handlePublicMessageSentFailureStub: TypedStub< + typeof MessageSentHandler, + 'handlePublicMessageSentFailure' + >; + let messageQueueStub: MessageQueue; // Message Sender Stubs @@ -65,6 +79,10 @@ describe('MessageQueue', () => { MessageSentHandler, 'handlePublicMessageSentSuccess' ).resolves(); + handlePublicMessageSentFailureStub = Sinon.stub( + MessageSentHandler, + 'handlePublicMessageSentFailure' + ).resolves(); // Init Queue pendingMessageCache = new PendingMessageCacheStub(); @@ -267,6 +285,7 @@ describe('MessageQueue', () => { it('should emit a fail event if something went wrong', async () => { sendToOpenGroupV2Stub.resolves({ serverId: -1, serverTimestamp: -1 }); + stubData('getMessageById').resolves(); const message = TestUtils.generateOpenGroupVisibleMessage(); const roomInfos = TestUtils.generateOpenGroupV2RoomInfos(); @@ -276,8 +295,8 @@ describe('MessageQueue', () => { blinded: false, filesToLink: [], }); - expect(messageSentHandlerFailedStub.callCount).to.equal(1); - expect(messageSentHandlerFailedStub.lastCall.args[0].identifier).to.equal( + expect(handlePublicMessageSentFailureStub.callCount).to.equal(1); + expect(handlePublicMessageSentFailureStub.lastCall.args[0].identifier).to.equal( message.identifier ); }); diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index e18dba2da2..74de19ff21 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -7,6 +7,7 @@ import { SignalService } from '../../../../protobuf'; import { OpenGroupMessageV2 } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupMessageV2'; import { OpenGroupPollingUtils } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils'; import { SogsBlinding } from '../../../../session/apis/open_group_api/sogsv3/sogsBlinding'; +import { BatchRequests } from '../../../../session/apis/snode_api/batchRequest'; import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { Onions } from '../../../../session/apis/snode_api/onions'; @@ -19,7 +20,14 @@ import { OutgoingRawMessage, PubKey } from '../../../../session/types'; import { MessageUtils, UserUtils } from '../../../../session/utils'; import { fromBase64ToArrayBuffer } from '../../../../session/utils/String'; import { TestUtils } from '../../../test-utils'; -import { stubCreateObjectUrl, stubData, stubUtilWorker } from '../../../test-utils/utils'; +import { + TypedStub, + expectAsyncToThrow, + stubCreateObjectUrl, + stubData, + stubUtilWorker, + stubValidSnodeSwarm, +} from '../../../test-utils/utils'; import { TEST_identityKeyPair } from '../crypto/MessageEncrypter_test'; describe('MessageSender', () => { @@ -40,12 +48,13 @@ describe('MessageSender', () => { describe('send', () => { const ourNumber = TestUtils.generateFakePubKeyStr(); - let sessionMessageAPISendStub: sinon.SinonStub; + let sessionMessageAPISendStub: TypedStub; + let doSnodeBatchRequestStub: TypedStub; let encryptStub: sinon.SinonStub<[PubKey, Uint8Array, SignalService.Envelope.Type]>; beforeEach(() => { sessionMessageAPISendStub = Sinon.stub(MessageSender, 'sendMessagesDataToSnode').resolves(); - + doSnodeBatchRequestStub = Sinon.stub(BatchRequests, 'doSnodeBatchRequest').resolves(); stubData('getMessageById').resolves(); encryptStub = Sinon.stub(MessageEncrypter, 'encrypt').resolves({ @@ -68,29 +77,34 @@ describe('MessageSender', () => { }); it('should not retry if an error occurred during encryption', async () => { - encryptStub.throws(new Error('Failed to encrypt.')); - const promise = MessageSender.sendSingleMessage({ - message: rawMessage, - attempts: 3, - retryMinTimeout: 10, - isSyncMessage: false, - }); - await expect(promise).is.rejectedWith('Failed to encrypt.'); + encryptStub.throws(new Error('Failed to encrypt')); + + const promise = () => + MessageSender.sendSingleMessage({ + message: rawMessage, + attempts: 3, + retryMinTimeout: 10, + isSyncMessage: false, + }); + await expectAsyncToThrow(promise, 'Failed to encrypt'); expect(sessionMessageAPISendStub.callCount).to.equal(0); }); it('should only call lokiMessageAPI once if no errors occured', async () => { + stubValidSnodeSwarm(); await MessageSender.sendSingleMessage({ message: rawMessage, attempts: 3, retryMinTimeout: 10, isSyncMessage: false, }); - expect(sessionMessageAPISendStub.callCount).to.equal(1); + expect(doSnodeBatchRequestStub.callCount).to.equal(1); }); it('should only retry the specified amount of times before throwing', async () => { - sessionMessageAPISendStub.throws(new Error('API error')); + stubValidSnodeSwarm(); + + doSnodeBatchRequestStub.throws(new Error('API error')); const attempts = 2; const promise = MessageSender.sendSingleMessage({ message: rawMessage, @@ -99,18 +113,19 @@ describe('MessageSender', () => { isSyncMessage: false, }); await expect(promise).is.rejectedWith('API error'); - expect(sessionMessageAPISendStub.callCount).to.equal(attempts); + expect(doSnodeBatchRequestStub.callCount).to.equal(attempts); }); it('should not throw error if successful send occurs within the retry limit', async () => { - sessionMessageAPISendStub.onFirstCall().throws(new Error('API error')); + stubValidSnodeSwarm(); + doSnodeBatchRequestStub.onFirstCall().throws(new Error('API error')); await MessageSender.sendSingleMessage({ message: rawMessage, attempts: 3, retryMinTimeout: 10, isSyncMessage: false, }); - expect(sessionMessageAPISendStub.callCount).to.equal(2); + expect(doSnodeBatchRequestStub.callCount).to.equal(2); }); }); @@ -125,6 +140,8 @@ describe('MessageSender', () => { }); it('should pass the correct values to lokiMessageAPI', async () => { + TestUtils.setupTestWithSending(); + const device = TestUtils.generateFakePubKey(); const visibleMessage = TestUtils.generateVisibleMessage(); Sinon.stub(ConvoHub.use(), 'get').returns(undefined as any); @@ -142,17 +159,27 @@ describe('MessageSender', () => { isSyncMessage: false, }); - const args = sessionMessageAPISendStub.getCall(0).args; - expect(args[1]).to.equal(device.key); + const args = doSnodeBatchRequestStub.getCall(0).args; + + expect(args[3]).to.equal(device.key); const firstArg = args[0]; expect(firstArg.length).to.equal(1); + + if (firstArg[0].method !== 'store') { + throw new Error('expected a store request with data'); + } + // expect(args[3]).to.equal(visibleMessage.timestamp); the timestamp is overwritten on sending by the network clock offset - expect(firstArg[0].ttl).to.equal(visibleMessage.ttl()); - expect(firstArg[0].pubkey).to.equal(device.key); - expect(firstArg[0].namespace).to.equal(SnodeNamespaces.Default); + expect(firstArg[0].params.ttl).to.equal(visibleMessage.ttl()); + expect(firstArg[0].params.pubkey).to.equal(device.key); + expect(firstArg[0].params.namespace).to.equal(SnodeNamespaces.Default); + // the request timestamp is always used fresh with the offset as the request will be denied with a 406 otherwise (clock out of sync) + expect(firstArg[0].params.timestamp).to.be.above(Date.now() - 10); + expect(firstArg[0].params.timestamp).to.be.below(Date.now() + 10); }); - it('should correctly build the envelope and override the timestamp', async () => { + it('should correctly build the envelope and override the request timestamp but not the msg one', async () => { + TestUtils.setupTestWithSending(); messageEncyrptReturnEnvelopeType = SignalService.Envelope.Type.SESSION_MESSAGE; // This test assumes the encryption stub returns the plainText passed into it. @@ -173,9 +200,12 @@ describe('MessageSender', () => { isSyncMessage: false, }); - const firstArg = sessionMessageAPISendStub.getCall(0).args[0]; - const { data64 } = firstArg[0]; - const data = fromBase64ToArrayBuffer(data64); + const firstArg = doSnodeBatchRequestStub.getCall(0).args[0]; + + if (firstArg[0].method !== 'store') { + throw new Error('expected a store request with data'); + } + const data = fromBase64ToArrayBuffer(firstArg[0].params.data); const webSocketMessage = SignalService.WebSocketMessage.decode(new Uint8Array(data)); expect(webSocketMessage.request?.body).to.not.equal( undefined, @@ -192,33 +222,22 @@ describe('MessageSender', () => { expect(envelope.type).to.equal(SignalService.Envelope.Type.SESSION_MESSAGE); expect(envelope.source).to.equal(''); - // the timestamp is overridden on sending with the network offset - const expectedTimestamp = Date.now() - offset; + // the timestamp in the message is not overridden on sending as it should be set with the network offset when created. + // we need that timestamp to not be overriden as the signature of the message depends on it. const decodedTimestampFromSending = _.toNumber(envelope.timestamp); - expect(decodedTimestampFromSending).to.be.above(expectedTimestamp - 10); - expect(decodedTimestampFromSending).to.be.below(expectedTimestamp + 10); + expect(decodedTimestampFromSending).to.be.eq(visibleMessage.createAtNetworkTimestamp); - // then make sure the plaintextBuffer was overridden too - const visibleMessageExpected = TestUtils.generateVisibleMessage({ - timestamp: decodedTimestampFromSending, - }); - const rawMessageExpected = await MessageUtils.toRawMessage( - device, - visibleMessageExpected, - 0 - ); - - expect(envelope.content).to.deep.equal(rawMessageExpected.plainTextBuffer); + // then, make sure that }); describe('SESSION_MESSAGE', () => { it('should set the envelope source to be empty', async () => { + TestUtils.setupTestWithSending(); messageEncyrptReturnEnvelopeType = SignalService.Envelope.Type.SESSION_MESSAGE; Sinon.stub(ConvoHub.use(), 'get').returns(undefined as any); // This test assumes the encryption stub returns the plainText passed into it. const device = TestUtils.generateFakePubKey(); - const visibleMessage = TestUtils.generateVisibleMessage(); const rawMessage = await MessageUtils.toRawMessage( device, @@ -232,9 +251,12 @@ describe('MessageSender', () => { isSyncMessage: false, }); - const firstArg = sessionMessageAPISendStub.getCall(0).args[0]; - const { data64 } = firstArg[0]; - const data = fromBase64ToArrayBuffer(data64); + const firstArg = doSnodeBatchRequestStub.getCall(0).args[0]; + + if (firstArg[0].method !== 'store') { + throw new Error('expected a store request with data'); + } + const data = fromBase64ToArrayBuffer(firstArg[0].params.data); const webSocketMessage = SignalService.WebSocketMessage.decode(new Uint8Array(data)); expect(webSocketMessage.request?.body).to.not.equal( undefined, diff --git a/ts/test/session/unit/sending/PendingMessageCache_test.ts b/ts/test/session/unit/sending/PendingMessageCache_test.ts index cacd65a3a0..4ade1eaa3b 100644 --- a/ts/test/session/unit/sending/PendingMessageCache_test.ts +++ b/ts/test/session/unit/sending/PendingMessageCache_test.ts @@ -2,12 +2,12 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable no-restricted-syntax */ import { expect } from 'chai'; -import Sinon from 'sinon'; import * as _ from 'lodash'; +import Sinon from 'sinon'; +import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; +import { PendingMessageCache } from '../../../../session/sending/PendingMessageCache'; import { MessageUtils } from '../../../../session/utils'; import { TestUtils } from '../../../test-utils'; -import { PendingMessageCache } from '../../../../session/sending/PendingMessageCache'; -import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; // Equivalent to Data.StorageItem interface StorageItem { @@ -300,8 +300,8 @@ describe('PendingMessageCache', () => { expect(buffersCompare).to.equal(true, 'buffers were not loaded properly from database'); // Compare all other valures - const trimmedAdded = _.omit(addedMessage, ['plainTextBuffer']); - const trimmedRebuilt = _.omit(message, ['plainTextBuffer']); + const trimmedAdded = _.omit(addedMessage, ['plainTextBuffer', 'plainTextBufferHex']); + const trimmedRebuilt = _.omit(message, ['plainTextBuffer', 'plainTextBufferHex']); expect(_.isEqual(trimmedAdded, trimmedRebuilt)).to.equal( true, diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts index 5c3b37507b..61b0fc0fe3 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_getNamespacesToPollFrom_test.ts @@ -32,6 +32,7 @@ describe('SwarmPolling:getNamespacesToPollFrom', () => { it('for group v2 (03 prefix) ', () => { expect(swarmPolling.getNamespacesToPollFrom(ConversationTypeEnum.GROUPV2)).to.deep.equal([ + SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, SnodeNamespaces.ClosedGroupMessages, SnodeNamespaces.ClosedGroupInfo, SnodeNamespaces.ClosedGroupMembers, diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts index 6582b49fac..2a5d45eed0 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts @@ -10,9 +10,10 @@ import { } from 'libsession_util_nodejs'; import { ConversationModel, Convo } from '../../../../models/conversation'; import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; -import { SnodePool, getSwarmPollingInstance } from '../../../../session/apis/snode_api'; +import { getSwarmPollingInstance } from '../../../../session/apis/snode_api'; import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling'; import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest'; +import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; import { SwarmPolling } from '../../../../session/apis/snode_api/swarmPolling'; import { ConvoHub } from '../../../../session/conversations'; import { PubKey } from '../../../../session/types'; diff --git a/ts/test/session/unit/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts index 2c76fa9977..79e7eb00d5 100644 --- a/ts/test/session/unit/utils/Messages_test.ts +++ b/ts/test/session/unit/utils/Messages_test.ts @@ -42,7 +42,7 @@ describe('Message Utils', () => { SnodeNamespaces.UserContacts ); - expect(Object.keys(rawMessage)).to.have.length(6); + expect(Object.keys(rawMessage)).to.have.length(7); expect(rawMessage.identifier).to.exist; expect(rawMessage.namespace).to.exist; @@ -50,12 +50,14 @@ describe('Message Utils', () => { expect(rawMessage.encryption).to.exist; expect(rawMessage.plainTextBuffer).to.exist; expect(rawMessage.ttl).to.exist; + expect(rawMessage.networkTimestampCreated).to.exist; expect(rawMessage.identifier).to.equal(message.identifier); expect(rawMessage.device).to.equal(device.key); expect(rawMessage.plainTextBuffer).to.deep.equal(message.plainTextBuffer()); expect(rawMessage.ttl).to.equal(message.ttl()); expect(rawMessage.namespace).to.equal(3); + expect(rawMessage.networkTimestampCreated).to.eq(message.createAtNetworkTimestamp); }); it('should generate valid plainTextBuffer', async () => { diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index e22ec50ddc..d4297e4629 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -271,13 +271,14 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); it('call savesDumpToDb even if no changes are required on the serverside', async () => { + pendingChangesForGroupStub.resolves({ allOldHashes: new Set(), messages: [] }); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, revokeSubRequest: null, unrevokeSubRequest: null, supplementKeys: [], }); - pendingChangesForGroupStub.resolves(undefined); expect(result).to.be.eq(RunJobResult.Success); expect(sendStub.callCount).to.be.eq(0); expect(pendingChangesForGroupStub.callCount).to.be.eq(1); @@ -286,6 +287,8 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); it('calls sendEncryptedDataToSnode with the right data and retry if network returned nothing', async () => { + TestUtils.stubLibSessionWorker(undefined); + const info = validInfo(sodium); const member = validMembers(sodium); const networkTimestamp = 4444; @@ -311,24 +314,34 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { function expected(details: any) { return { + dbMessageIdentifier: null, namespace: details.namespace, - data: details.ciphertext, - ttl, - networkTimestamp, - pubkey: groupPk, + encryptedData: details.ciphertext, + ttlMs: ttl, + destination: groupPk, + method: 'store', }; } const expectedInfo = expected(info); const expectedMember = expected(member); - expect(sendStub.firstCall.args).to.be.deep.eq([ - [expectedInfo, expectedMember], - groupPk, - new Set('123'), - ]); + + const callArgs = sendStub.firstCall.args[0]; + // we don't want to check the content of the request in this unit test, just the structure/count of them + // callArgs.storeRequests = callArgs.storeRequests.map(_m => null) as any; + const expectedArgs = { + storeRequests: [expectedInfo, expectedMember], + destination: groupPk, + messagesHashesToDelete: new Set('123'), + unrevokeSubRequest: null, + revokeSubRequest: null, + }; + expect(callArgs).to.be.deep.eq(expectedArgs); }); it('calls sendEncryptedDataToSnode with the right data (and keys) and retry if network returned nothing', async () => { + TestUtils.stubLibSessionWorker(undefined); + const info = validInfo(sodium); const member = validMembers(sodium); const keys = validKeys(sodium); diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index 281fce0e9b..d04f02456f 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -299,20 +299,27 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { function expected(details: any) { return { namespace: details.namespace, - data: details.ciphertext, - ttl, - networkTimestamp, - pubkey: sessionId, + encryptedData: details.ciphertext, + ttlMs: ttl, + destination: sessionId, + method: 'store', }; } const expectedProfile = expected(profile); const expectedContact = expected(contact); - expect(sendStub.firstCall.args).to.be.deep.eq([ - [expectedProfile, expectedContact], - sessionId, - new Set('123'), - ]); + + const callArgs = sendStub.firstCall.args[0]; + // we don't want to check the content of the request in this unit test, just the structure/count of them + const expectedArgs = { + storeRequests: [expectedProfile, expectedContact], + destination: sessionId, + messagesHashesToDelete: new Set('123'), + unrevokeSubRequest: null, + revokeSubRequest: null, + }; + // callArgs.storeRequests = callArgs.storeRequests.map(_m => null) as any; + expect(callArgs).to.be.deep.eq(expectedArgs); }); it('calls sendEncryptedDataToSnode with the right data x3 and retry if network returned nothing then success', async () => { diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index 46c500fb42..8cc55e044f 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -5,8 +5,10 @@ import _ from 'lodash'; import { Snode } from '../../../data/data'; import { getSodiumNode } from '../../../node/sodiumNode'; import { ECKeyPair } from '../../../receiver/keypairs'; +import { SnodePool } from '../../../session/apis/snode_api/snodePool'; import { PubKey } from '../../../session/types'; import { ByteKeyPair } from '../../../session/utils/User'; +import { stubData } from './stubbing'; export function generateFakePubKey(): PubKey { // Generates a mock pubkey for testing @@ -91,9 +93,13 @@ export function generateFakePubKeys(amount: number): Array { return new Array(numPubKeys).fill(0).map(() => generateFakePubKey()); } +export function generateFakeSwarmFor(): Array { + return generateFakePubKeys(6).map(m => m.key); +} + export function generateFakeSnode(): Snode { return { - ip: `136.243.${Math.random() * 255}.${Math.random() * 255}`, + ip: `136.243.${Math.floor(Math.random() * 255)}.${Math.floor(Math.random() * 255)}`, port: 22116, pubkey_x25519: generateFakePubKeyStr(), pubkey_ed25519: generateFakePubKeyStr(), @@ -113,3 +119,15 @@ export function generateFakeSnodes(amount: number): Array { const ar: Array = _.times(amount, generateFakeSnode); return ar; } + +/** + * this function can be used to setup unit test which relies on fetching a snodepool + */ +export function setupTestWithSending() { + const snodes = generateFakeSnodes(20); + const swarm = snodes.slice(0, 6); + SnodePool.TEST_resetState(snodes); + + stubData('getSwarmNodesForPubkey').resolves(swarm.map(m => m.pubkey_ed25519)); + return { snodes, swarm }; +} diff --git a/ts/test/test-utils/utils/stubbing.ts b/ts/test/test-utils/utils/stubbing.ts index 9bc799ef52..552bf2245f 100644 --- a/ts/test/test-utils/utils/stubbing.ts +++ b/ts/test/test-utils/utils/stubbing.ts @@ -6,6 +6,8 @@ import { ConfigDumpData } from '../../../data/configDump/configDump'; import { Data } from '../../../data/data'; import { OpenGroupData } from '../../../data/opengroups'; +import { TestUtils } from '..'; +import { SnodePool } from '../../../session/apis/snode_api/snodePool'; import { BlockedNumberController } from '../../../util'; import * as libsessionWorker from '../../../webworker/workers/browser/libsession_worker_interface'; import * as utilWorker from '../../../webworker/workers/browser/util_worker_interface'; @@ -122,3 +124,13 @@ export type TypedStub, K extends keyof T> = T[ ) => any ? Sinon.SinonStub, ReturnType> : never; + +export function stubValidSnodeSwarm() { + const snodes = TestUtils.generateFakeSnodes(20); + SnodePool.TEST_resetState(snodes); + const swarm = snodes.slice(0, 6); + + Sinon.stub(SnodePool, 'getSwarmFor').resolves(swarm); + + return { snodes, swarm }; +} From 665f6df57e9eb5cbc748b676e20ccd1f1b6eb1a4 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 28 Feb 2024 14:33:48 +1100 Subject: [PATCH 093/302] test: add test ofr SnodeAPI.buildRetrieveRequests --- ts/session/apis/snode_api/retrieveRequest.ts | 41 +- ts/session/apis/snode_api/swarmPolling.ts | 12 +- .../snode_api/retrieveNextMessages_test.ts | 442 ++++++++++++++++++ 3 files changed, 473 insertions(+), 22 deletions(-) create mode 100644 ts/test/session/unit/snode_api/retrieveNextMessages_test.ts diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 4d1b3703e9..316aa97ca8 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -42,6 +42,8 @@ async function retrieveRequestForUs({ }); } +type NamespaceAndLastHash = { lastHash: string | null; namespace: SnodeNamespaces }; + /** * Retrieve for legacy groups are not authenticated so no need to sign the request */ @@ -108,23 +110,31 @@ type RetrieveSubRequestType = | UpdateExpiryOnNodeUserSubRequest | UpdateExpiryOnNodeGroupSubRequest; +/** + * build the Array of retrieveRequests to do on the next poll, given the specified namespaces, lastHash, pubkey and hashes to bump (expiry) + * Note: exported only for testing purposes + * @param namespacesAndLastHashes + * @param pubkey + * @param ourPubkey + * @param configHashesToBump + * @returns + */ async function buildRetrieveRequest( - lastHashes: Array, + namespacesAndLastHashes: Array, pubkey: string, - namespaces: Array, ourPubkey: string, configHashesToBump: Array | null ) { const isUs = pubkey === ourPubkey; - const maxSizeMap = SnodeNamespace.maxSizeMap(namespaces); + const maxSizeMap = SnodeNamespace.maxSizeMap(namespacesAndLastHashes.map(m => m.namespace)); const now = GetNetworkTime.now(); const retrieveRequestsParams: Array = await Promise.all( - namespaces.map(async (namespace, index) => { + namespacesAndLastHashes.map(async ({ lastHash, namespace }) => { const foundMaxSize = maxSizeMap.find(m => m.namespace === namespace)?.maxSize; const retrieveParam = { pubkey, - last_hash: lastHashes.at(index) || '', + last_hash: lastHash || '', timestamp: now, max_size: foundMaxSize, }; @@ -185,20 +195,14 @@ async function buildRetrieveRequest( async function retrieveNextMessages( targetNode: Snode, - lastHashes: Array, associatedWith: string, - namespaces: Array, + namespacesAndLastHashes: Array, ourPubkey: string, configHashesToBump: Array | null ): Promise { - if (namespaces.length !== lastHashes.length) { - throw new Error('namespaces and lasthashes does not match'); - } - const rawRequests = await buildRetrieveRequest( - lastHashes, + namespacesAndLastHashes, associatedWith, - namespaces, ourPubkey, configHashesToBump ); @@ -222,9 +226,12 @@ async function retrieveNextMessages( } // the +1 is to take care of the extra `expire` method added once user config is released - if (results.length !== namespaces.length && results.length !== namespaces.length + 1) { + if ( + results.length !== namespacesAndLastHashes.length && + results.length !== namespacesAndLastHashes.length + 1 + ) { throw new Error( - `We asked for updates about ${namespaces.length} messages but got results of length ${results.length}` + `We asked for updates about ${namespacesAndLastHashes.length} messages but got results of length ${results.length}` ); } @@ -250,7 +257,7 @@ async function retrieveNextMessages( return results.map((result, index) => ({ code: result.code, messages: result.body as RetrieveMessagesResultsContent, - namespace: namespaces[index], + namespace: namespacesAndLastHashes[index].namespace, })); } catch (e) { window?.log?.warn('exception while parsing json of nextMessage:', e); @@ -261,4 +268,4 @@ async function retrieveNextMessages( } } -export const SnodeAPIRetrieve = { retrieveNextMessages }; +export const SnodeAPIRetrieve = { retrieveNextMessages, buildRetrieveRequest }; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 070b6e5ec9..7aa52f4b58 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -511,16 +511,18 @@ export class SwarmPolling { const snodeEdkey = node.pubkey_ed25519; try { - const prevHashes = await Promise.all( - namespaces.map(namespace => this.getLastHash(snodeEdkey, pubkey, namespace)) - ); const configHashesToBump = await this.getHashesToBump(type, pubkey); + const namespacesAndLastHashes = await Promise.all( + namespaces.map(async namespace => { + const lastHash = await this.getLastHash(snodeEdkey, pubkey, namespace); + return { namespace, lastHash }; + }) + ); let results = await SnodeAPIRetrieve.retrieveNextMessages( node, - prevHashes, pubkey, - namespaces, + namespacesAndLastHashes, UserUtils.getOurPubKeyStrFromCache(), configHashesToBump ); diff --git a/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts b/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts new file mode 100644 index 0000000000..8eaba3f551 --- /dev/null +++ b/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts @@ -0,0 +1,442 @@ +import chai from 'chai'; +import { beforeEach, describe } from 'mocha'; +import Sinon from 'sinon'; + +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { + RetrieveGroupSubRequest, + RetrieveLegacyClosedGroupSubRequest, + RetrieveUserSubRequest, + UpdateExpiryOnNodeGroupSubRequest, + UpdateExpiryOnNodeUserSubRequest, +} from '../../../../session/apis/snode_api/SnodeRequestTypes'; +import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; +import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; +import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest'; +import { WithShortenOrExtend } from '../../../../session/apis/snode_api/types'; +import { TestUtils } from '../../../test-utils'; +import { expectAsyncToThrow, stubLibSessionWorker } from '../../../test-utils/utils'; + +const { expect } = chai; + +function expectRetrieveWith({ + request, + namespace, + lastHash, + maxSize, +}: { + request: RetrieveLegacyClosedGroupSubRequest | RetrieveUserSubRequest | RetrieveGroupSubRequest; + namespace: SnodeNamespaces; + lastHash: string | null; + maxSize: number; +}) { + expect(request.namespace).to.be.eq(namespace); + expect(request.last_hash).to.be.eq(lastHash); + expect(request.max_size).to.be.eq(maxSize); +} + +function expectExpireWith({ + request, + hashes, + shortenOrExtend, +}: { + request: UpdateExpiryOnNodeUserSubRequest | UpdateExpiryOnNodeGroupSubRequest; + hashes: Array; +} & WithShortenOrExtend) { + expect(request.messageHashes).to.be.deep.eq(hashes); + expect(request.shortenOrExtend).to.be.eq(shortenOrExtend); + expect(request.expiryMs).to.be.above(GetNetworkTime.now() + 14 * 24 * 3600 * 1000 - 100); + expect(request.expiryMs).to.be.above(GetNetworkTime.now() + 14 * 24 * 3600 * 1000 + 100); +} + +describe('SnodeAPI:buildRetrieveRequest', () => { + let us: PubkeyType; + beforeEach(async () => { + TestUtils.stubWindowLog(); + us = TestUtils.generateFakePubKeyStr(); + }); + + afterEach(() => { + Sinon.restore(); + }); + + describe('us', () => { + it('with single namespace and lasthash, no hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest( + [{ lastHash: 'lasthash', namespace: SnodeNamespaces.Default }], + us, + us, + null + ); + + expect(requests.length).to.be.eq(1); + const req = requests[0]; + if (req.method !== 'retrieve') { + throw new Error('expected retrieve method'); + } + expectRetrieveWith({ + request: req, + lastHash: 'lasthash', + maxSize: -1, + namespace: SnodeNamespaces.Default, + }); + }); + + it('with two namespace and lasthashes, no hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest( + [ + { lastHash: 'lasthash1', namespace: SnodeNamespaces.Default }, + { lastHash: 'lasthash2', namespace: SnodeNamespaces.UserContacts }, + ], + us, + us, + null + ); + + expect(requests.length).to.be.eq(2); + const req1 = requests[0]; + const req2 = requests[1]; + if (req1.method !== 'retrieve' || req2.method !== 'retrieve') { + throw new Error('expected retrieve method'); + } + + expectRetrieveWith({ + request: req1, + lastHash: 'lasthash1', + maxSize: -2, + namespace: SnodeNamespaces.Default, + }); + + expectRetrieveWith({ + request: req2, + lastHash: 'lasthash2', + maxSize: -2, + namespace: SnodeNamespaces.UserContacts, + }); + }); + + it('with two namespace and lasthashes, 2 hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest( + [ + { lastHash: 'lasthash1', namespace: SnodeNamespaces.Default }, + { lastHash: 'lasthash2', namespace: SnodeNamespaces.UserContacts }, + ], + us, + us, + ['hashbump1', 'hashbump2'] + ); + + expect(requests.length).to.be.eq(3); + const req1 = requests[0]; + const req2 = requests[1]; + const req3 = requests[2]; + if (req1.method !== 'retrieve' || req2.method !== 'retrieve') { + throw new Error('expected retrieve method'); + } + if (req3.method !== 'expire') { + throw new Error('expected expire method'); + } + + expectRetrieveWith({ + request: req1, + lastHash: 'lasthash1', + maxSize: -2, + namespace: SnodeNamespaces.Default, + }); + + expectRetrieveWith({ + request: req2, + lastHash: 'lasthash2', + maxSize: -2, + namespace: SnodeNamespaces.UserContacts, + }); + + expectExpireWith({ + request: req3, + hashes: ['hashbump1', 'hashbump2'], + shortenOrExtend: '', + }); + }); + + it('with 0 namespaces, 2 hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest([], us, us, [ + 'hashbump1', + 'hashbump2', + ]); + + expect(requests.length).to.be.eq(1); + const req1 = requests[0]; + if (req1.method !== 'expire') { + throw new Error('expected expire method'); + } + + expectExpireWith({ + request: req1, + hashes: ['hashbump1', 'hashbump2'], + shortenOrExtend: '', + }); + }); + + it('with 0 namespaces, 0 hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest([], us, us, []); + expect(requests.length).to.be.eq(0); + }); + it('with 0 namespaces, null hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest([], us, us, null); + expect(requests.length).to.be.eq(0); + }); + + it('throws if given an invalid user namespace to retrieve from ', async () => { + const pr = async () => + SnodeAPIRetrieve.buildRetrieveRequest( + [ + { lastHash: 'lasthash1', namespace: SnodeNamespaces.ClosedGroupKeys }, + { lastHash: 'lasthash2', namespace: SnodeNamespaces.UserContacts }, + ], + us, + us, + ['hashbump1', 'hashbump2'] + ); + + await expectAsyncToThrow( + pr, + `retrieveRequestForUs not a valid namespace to retrieve as us:${SnodeNamespaces.ClosedGroupKeys}` + ); + }); + }); + + describe('legacy group', () => { + let groupPk: PubkeyType; + beforeEach(() => { + groupPk = TestUtils.generateFakePubKeyStr(); + }); + it('with single namespace and lasthash, no hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest( + [{ lastHash: 'lasthash', namespace: SnodeNamespaces.LegacyClosedGroup }], + groupPk, + us, + null + ); + + expect(requests.length).to.be.eq(1); + const req = requests[0]; + if (req.method !== 'retrieve') { + throw new Error('expected retrieve method'); + } + expectRetrieveWith({ + request: req, + lastHash: 'lasthash', + maxSize: -1, + namespace: SnodeNamespaces.LegacyClosedGroup, + }); + }); + + it('with 1 namespace and lasthashes, 2 hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest( + [{ lastHash: 'lasthash1', namespace: SnodeNamespaces.LegacyClosedGroup }], + groupPk, + us, + ['hashbump1', 'hashbump2'] // legacy groups have not the possibility to bump the expire of messages + ); + + expect(requests.length).to.be.eq(1); + const req1 = requests[0]; + if (req1.method !== 'retrieve') { + throw new Error('expected retrieve/expire method'); + } + + expectRetrieveWith({ + request: req1, + lastHash: 'lasthash1', + maxSize: -1, + namespace: SnodeNamespaces.LegacyClosedGroup, + }); + }); + + it('with 0 namespaces, 2 hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest([], groupPk, us, [ + 'hashbump1', + 'hashbump2', + ]); + + expect(requests.length).to.be.eq(0); // legacy groups have not possibility to bump expire of messages + }); + + it('with 0 namespaces, 0 hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest([], groupPk, us, []); + expect(requests.length).to.be.eq(0); + }); + it('with 0 namespaces, null hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest([], groupPk, us, null); + expect(requests.length).to.be.eq(0); + }); + + it('throws if given an invalid legacy group namespace to retrieve from ', async () => { + const pr = async () => + SnodeAPIRetrieve.buildRetrieveRequest( + [ + { lastHash: 'lasthash1', namespace: SnodeNamespaces.ClosedGroupKeys }, + { lastHash: 'lasthash2', namespace: SnodeNamespaces.UserContacts }, + ], + groupPk, + us, + ['hashbump1', 'hashbump2'] + ); + + await expectAsyncToThrow( + pr, + `retrieveRequestForUs not a valid namespace to retrieve as us:${SnodeNamespaces.ClosedGroupKeys}` + ); + }); + }); + + describe('group v2', () => { + let groupPk: GroupPubkeyType; + beforeEach(() => { + groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); + stubLibSessionWorker({}); + }); + it('with single namespace and lasthash, no hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest( + [{ lastHash: 'lasthash', namespace: SnodeNamespaces.ClosedGroupInfo }], + groupPk, + us, + null + ); + + expect(requests.length).to.be.eq(1); + const req = requests[0]; + if (req.method !== 'retrieve') { + throw new Error('expected retrieve method'); + } + expectRetrieveWith({ + request: req, + lastHash: 'lasthash', + maxSize: -1, + namespace: SnodeNamespaces.ClosedGroupInfo, + }); + }); + + it('with two namespace and lasthashes, no hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest( + [ + { lastHash: 'lasthash1', namespace: SnodeNamespaces.ClosedGroupInfo }, + { lastHash: 'lasthash2', namespace: SnodeNamespaces.ClosedGroupMessages }, + ], + groupPk, + us, + null + ); + + expect(requests.length).to.be.eq(2); + const req1 = requests[0]; + const req2 = requests[1]; + if (req1.method !== 'retrieve' || req2.method !== 'retrieve') { + throw new Error('expected retrieve method'); + } + + expectRetrieveWith({ + request: req1, + lastHash: 'lasthash1', + maxSize: -2, + namespace: SnodeNamespaces.ClosedGroupInfo, + }); + + expectRetrieveWith({ + request: req2, + lastHash: 'lasthash2', + maxSize: -2, + namespace: SnodeNamespaces.ClosedGroupMessages, + }); + }); + + it('with two namespace and lasthashes, 2 hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest( + [ + { lastHash: 'lasthash1', namespace: SnodeNamespaces.ClosedGroupInfo }, + { lastHash: 'lasthash2', namespace: SnodeNamespaces.ClosedGroupKeys }, + ], + groupPk, + us, + ['hashbump1', 'hashbump2'] + ); + + expect(requests.length).to.be.eq(3); + const req1 = requests[0]; + const req2 = requests[1]; + const req3 = requests[2]; + if (req1.method !== 'retrieve' || req2.method !== 'retrieve') { + throw new Error('expected retrieve method'); + } + if (req3.method !== 'expire') { + throw new Error('expected expire method'); + } + + expectRetrieveWith({ + request: req1, + lastHash: 'lasthash1', + maxSize: -2, + namespace: SnodeNamespaces.ClosedGroupInfo, + }); + + expectRetrieveWith({ + request: req2, + lastHash: 'lasthash2', + maxSize: -2, + namespace: SnodeNamespaces.ClosedGroupKeys, + }); + + expectExpireWith({ + request: req3, + hashes: ['hashbump1', 'hashbump2'], + shortenOrExtend: '', + }); + }); + + it('with 0 namespaces, 2 hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest([], groupPk, us, [ + 'hashbump1', + 'hashbump2', + ]); + + expect(requests.length).to.be.eq(1); + const req1 = requests[0]; + if (req1.method !== 'expire') { + throw new Error('expected expire method'); + } + + expectExpireWith({ + request: req1, + hashes: ['hashbump1', 'hashbump2'], + shortenOrExtend: '', + }); + }); + + it('with 0 namespaces, 0 hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest([], groupPk, us, []); + expect(requests.length).to.be.eq(0); + }); + it('with 0 namespaces, null hashesToBump ', async () => { + const requests = await SnodeAPIRetrieve.buildRetrieveRequest([], groupPk, us, null); + expect(requests.length).to.be.eq(0); + }); + + it('throws if given an invalid group namespace to retrieve from ', async () => { + const pr = async () => + SnodeAPIRetrieve.buildRetrieveRequest( + [ + { lastHash: 'lasthash1', namespace: SnodeNamespaces.ClosedGroupKeys }, + { lastHash: 'lasthash2', namespace: SnodeNamespaces.UserContacts }, + ], + groupPk, + us, + ['hashbump1', 'hashbump2'] + ); + + await expectAsyncToThrow( + pr, + `tried to poll from a non 03 group namespace ${SnodeNamespaces.UserContacts}` + ); + }); + }); +}); From a83e44e18393967a979a5474d3dc041460717f94 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 28 Feb 2024 17:20:30 +1100 Subject: [PATCH 094/302] chore: rename onion requests not having retries --- ts/session/apis/snode_api/SNodeAPI.ts | 4 +-- ts/session/apis/snode_api/batchRequest.ts | 35 ++++++++++++++----- ts/session/apis/snode_api/expireRequest.ts | 6 ++-- .../apis/snode_api/getExpiriesRequest.ts | 8 ++--- ts/session/apis/snode_api/getNetworkTime.ts | 7 +++- .../apis/snode_api/getServiceNodesList.ts | 2 +- ts/session/apis/snode_api/getSwarmFor.ts | 2 +- ts/session/apis/snode_api/onions.ts | 20 +++++------ ts/session/apis/snode_api/onsResolve.ts | 2 +- ts/session/apis/snode_api/retrieveRequest.ts | 9 +++-- ts/session/apis/snode_api/sessionRpc.ts | 13 +++---- ts/session/apis/snode_api/swarmPolling.ts | 2 +- ts/session/onions/onionSend.ts | 4 +-- ts/session/sending/MessageSender.ts | 8 ++--- .../unit/sending/MessageSender_test.ts | 13 ++++--- .../SwarmPolling_pollForAllKeys_test.ts | 2 +- 16 files changed, 81 insertions(+), 56 deletions(-) diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index a6650de268..c87dce4e34 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -39,7 +39,7 @@ const forceNetworkDeletion = async (): Promise | null> => { namespace, }); - const ret = await BatchRequests.doSnodeBatchRequest( + const ret = await BatchRequests.doSnodeBatchRequestNoRetries( [{ method, params: { ...signOpts, namespace, pubkey: usPk } }], snodeToMakeRequestTo, 10000, @@ -200,7 +200,7 @@ const networkDeleteMessages = async (hashes: Array): Promise) { * This is the equivalent to the batch send on sogs. The target node runs each sub request and returns a list of all the sub status and bodies. * If the global status code is not 200, an exception is thrown. * The body is already parsed from json and is enforced to be an Array of at least one element + * Note: This function does not retry by itself. + * * @param subRequests the list of requests to do * @param targetNode the node to do the request to, once all the onion routing is done * @param timeout the timeout at which we should cancel this request. * @param associatedWith used mostly for handling 421 errors, we need the pubkey the change is associated to * @param method can be either batch or sequence. A batch call will run all calls even if one of them fails. A sequence call will stop as soon as the first one fails */ -async function doSnodeBatchRequest( +async function doSnodeBatchRequestNoRetries( subRequests: Array, targetNode: Snode, timeout: number, associatedWith: string | null, method: MethodBatchType = 'batch' ): Promise { - window.log.debug(`doSnodeBatchRequest "${method}":`, JSON.stringify(logSubRequests(subRequests))); + window.log.debug( + `doSnodeBatchRequestNoRetries "${method}":`, + JSON.stringify(logSubRequests(subRequests)) + ); if (subRequests.length > MAX_SUBREQUESTS_COUNT) { window.log.error( @@ -43,7 +48,7 @@ async function doSnodeBatchRequest( `batch subRequests count cannot be more than ${MAX_SUBREQUESTS_COUNT}. Got ${subRequests.length}` ); } - const result = await SessionRpc.snodeRpc({ + const result = await SessionRpc.snodeRpcNoRetries({ method, params: { requests: subRequests }, targetNode, @@ -52,10 +57,10 @@ async function doSnodeBatchRequest( }); if (!result) { window?.log?.warn( - `doSnodeBatchRequest - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}` + `doSnodeBatchRequestNoRetries - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}` ); throw new Error( - `doSnodeBatchRequest - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}` + `doSnodeBatchRequestNoRetries - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}` ); } const decoded = decodeBatchRequest(result); @@ -76,7 +81,19 @@ async function doSnodeBatchRequest( return decoded; } -async function doUnsignedSnodeBatchRequest( +/** + * This function can be called to make the sign the subrequests and then call doSnodeBatchRequestNoRetries with the signed requests. + * + * Note: this function does not retry. + * + * @param unsignedSubRequests the unsigned sub requests to make + * @param targetNode the snode to make the request to + * @param timeout the max timeout to wait for a reply + * @param associatedWith the pubkey associated with this request (used to remove snode failing to reply from that users' swarm) + * @param method the type of request to make batch or sequence + * @returns + */ +async function doUnsignedSnodeBatchRequestNoRetries( unsignedSubRequests: Array, targetNode: Snode, timeout: number, @@ -84,7 +101,7 @@ async function doUnsignedSnodeBatchRequest( method: MethodBatchType = 'batch' ): Promise { const signedSubRequests = await MessageSender.signSubRequests(unsignedSubRequests); - return BatchRequests.doSnodeBatchRequest( + return BatchRequests.doSnodeBatchRequestNoRetries( signedSubRequests, targetNode, timeout, @@ -121,6 +138,6 @@ function decodeBatchRequest(snodeResponse: SnodeResponse): NotEmptyArrayOfBatchR } export const BatchRequests = { - doSnodeBatchRequest, - doUnsignedSnodeBatchRequest, + doSnodeBatchRequestNoRetries, + doUnsignedSnodeBatchRequestNoRetries, }; diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index 6838fb91c6..04c570d842 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -140,13 +140,13 @@ export async function processExpireRequestResponse( type UpdatedExpiryWithHashes = { messageHashes: Array; updatedExpiryMs: number }; type UpdatedExpiryWithHash = { messageHash: string; updatedExpiryMs: number }; -async function updateExpiryOnNodes( +async function updateExpiryOnNodesNoRetries( targetNode: Snode, ourPubKey: string, expireRequests: Array ): Promise> { try { - const result = await BatchRequests.doUnsignedSnodeBatchRequest( + const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( expireRequests, targetNode, 4000, @@ -407,7 +407,7 @@ export async function expireMessagesOnSnode( async () => { const targetNode = await SnodePool.getNodeFromSwarmOrThrow(ourPubKey); - return updateExpiryOnNodes(targetNode, ourPubKey, chunkRequest); + return updateExpiryOnNodesNoRetries(targetNode, ourPubKey, chunkRequest); }, { retries: 3, diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index 480130b018..7e2fdaa3e7 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -39,14 +39,14 @@ export async function processGetExpiriesRequestResponse( return results; } -async function getExpiriesFromNodes( +async function getExpiriesFromNodesNoRetries( targetNode: Snode, messageHashes: Array, associatedWith: PubkeyType ) { try { const expireRequest = new GetExpiriesFromNodeSubRequest({ messagesHashes: messageHashes }); - const result = await BatchRequests.doUnsignedSnodeBatchRequest( + const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [expireRequest], targetNode, 4000, @@ -67,7 +67,7 @@ async function getExpiriesFromNodes( const firstResult = result[0]; if (firstResult.code !== 200) { - throw Error(`getExpiriesFromNodes result is not 200 but ${firstResult.code}`); + throw Error(`getExpiriesFromNodesNoRetries result is not 200 but ${firstResult.code}`); } // expirationResults is a record of {messageHash: currentExpiry} @@ -122,7 +122,7 @@ export async function getExpiriesFromSnode({ messagesHashes }: WithMessagesHashe async () => { const targetNode = await SnodePool.getNodeFromSwarmOrThrow(ourPubKey); - return getExpiriesFromNodes(targetNode, messagesHashes, ourPubKey); + return getExpiriesFromNodesNoRetries(targetNode, messagesHashes, ourPubKey); }, { retries: 3, diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index c89d12095d..d135a1c0fa 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -12,7 +12,12 @@ import { BatchRequests } from './batchRequest'; const getNetworkTime = async (snode: Snode): Promise => { const subrequest = new NetworkTimeSubRequest(); - const result = await BatchRequests.doUnsignedSnodeBatchRequest([subrequest], snode, 4000, null); + const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( + [subrequest], + snode, + 4000, + null + ); if (!result || !result.length) { window?.log?.warn(`getNetworkTime on ${snode.ip}:${snode.port} returned falsish value`, result); throw new Error('getNetworkTime: Invalid result'); diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index 9d2edac937..ba0dc50ac7 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -13,7 +13,7 @@ import { SnodePool } from './snodePool'; async function getSnodePoolFromSnode(targetNode: Snode): Promise> { const subrequest = new GetServiceNodesSubRequest(); - const results = await BatchRequests.doUnsignedSnodeBatchRequest( + const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [subrequest], targetNode, 4000, diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index 068d83f1eb..2a2c652592 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -19,7 +19,7 @@ async function requestSnodesForPubkeyWithTargetNodeRetryable( } const subrequest = new SwarmForSubRequest(pubkey); - const result = await BatchRequests.doUnsignedSnodeBatchRequest( + const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [subrequest], targetNode, 4000, diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index 0653161583..ff3998a34a 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -808,7 +808,7 @@ async function incrementBadSnodeCountOrDrop({ * This call tries to send the request via onion. If we get a bad path, it handles the snode removing of the swarm and snode pool. * But the caller needs to handle the retry (and rebuild the path on his side if needed) */ -async function sendOnionRequestHandlingSnodeEject({ +async function sendOnionRequestHandlingSnodeEjectNoRetries({ destSnodeX25519, finalDestOptions, nodePath, @@ -828,7 +828,7 @@ async function sendOnionRequestHandlingSnodeEject({ throwErrors: boolean; }): Promise { // this sendOnionRequestNoRetries() call has to be the only one like this. - // If you need to call it, call it through sendOnionRequestHandlingSnodeEject because this is the one handling path rebuilding and known errors + // If you need to call it, call it through sendOnionRequestHandlingSnodeEjectNoRetries because this is the one handling path rebuilding and known errors let response; let decodingSymmetricKey; try { @@ -844,7 +844,7 @@ async function sendOnionRequestHandlingSnodeEject({ if (window.sessionFeatureFlags?.debug.debugOnionRequests) { window.log.info( - `sendOnionRequestHandlingSnodeEject: sendOnionRequestNoRetries: useV4:${useV4} destSnodeX25519:${destSnodeX25519}; \nfinalDestOptions:${JSON.stringify( + `sendOnionRequestHandlingSnodeEjectNoRetries: sendOnionRequestNoRetries: useV4:${useV4} destSnodeX25519:${destSnodeX25519}; \nfinalDestOptions:${JSON.stringify( finalDestOptions )}; \nfinalRelayOptions:${JSON.stringify(finalRelayOptions)}\n\n result: ${JSON.stringify( result @@ -1098,14 +1098,14 @@ const sendOnionRequestNoRetries = async ({ return { response, decodingSymmetricKey: destCtx.symmetricKey }; }; -async function sendOnionRequestSnodeDest( +async function sendOnionRequestSnodeDestNoRetries( onionPath: Array, targetNode: Snode, headers: Record, plaintext: string | null, associatedWith?: string ) { - return Onions.sendOnionRequestHandlingSnodeEject({ + return Onions.sendOnionRequestHandlingSnodeEjectNoRetries({ nodePath: onionPath, destSnodeX25519: targetNode.pubkey_x25519, finalDestOptions: { @@ -1126,7 +1126,7 @@ function getPathString(pathObjArr: Array<{ ip: string; port: number }>): string /** * If the fetch throws a retryable error we retry this call with a new path at most 3 times. If another error happens, we return it. If we have a result we just return it. */ -async function lokiOnionFetch({ +async function lokiOnionFetchWithRetries({ targetNode, associatedWith, body, @@ -1142,7 +1142,7 @@ async function lokiOnionFetch({ async () => { // Get a path excluding `targetNode`: const path = await OnionPaths.getOnionPath({ toExclude: targetNode }); - const result = await sendOnionRequestSnodeDest( + const result = await sendOnionRequestSnodeDestNoRetries( path, targetNode, headers, @@ -1179,12 +1179,12 @@ async function lokiOnionFetch({ } export const Onions = { - sendOnionRequestHandlingSnodeEject, + sendOnionRequestHandlingSnodeEjectNoRetries, incrementBadSnodeCountOrDrop, decodeOnionResult, - lokiOnionFetch, + lokiOnionFetchWithRetries, getPathString, - sendOnionRequestSnodeDest, + sendOnionRequestSnodeDestNoRetries, processOnionResponse, processOnionResponseV4, isFinalDestinationSnode, diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts index b571c05b3e..46d9732216 100644 --- a/ts/session/apis/snode_api/onsResolve.ts +++ b/ts/session/apis/snode_api/onsResolve.ts @@ -29,7 +29,7 @@ async function getSessionIDForOnsName(onsNameCase: string) { const promises = range(0, validationCount).map(async () => { const targetNode = await SnodePool.getRandomSnode(); - const results = await BatchRequests.doUnsignedSnodeBatchRequest( + const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [subRequest], targetNode, 4000, diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 316aa97ca8..39a9fcafec 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -193,7 +193,7 @@ async function buildRetrieveRequest( return retrieveRequestsParams; } -async function retrieveNextMessages( +async function retrieveNextMessagesNoRetries( targetNode: Snode, associatedWith: string, namespacesAndLastHashes: Array, @@ -209,8 +209,7 @@ async function retrieveNextMessages( // let exceptions bubble up // no retry for this one as this a call we do every few seconds while polling for messages - - const results = await BatchRequests.doUnsignedSnodeBatchRequest( + const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( rawRequests, targetNode, 4000, @@ -239,7 +238,7 @@ async function retrieveNextMessages( const firstResult = results[0]; if (firstResult.code !== 200) { - window?.log?.warn(`retrieveNextMessages result is not 200 but ${firstResult.code}`); + window?.log?.warn(`retrieveNextMessagesNoRetries result is not 200 but ${firstResult.code}`); throw new Error( `_retrieveNextMessages - retrieve result is not 200 with ${targetNode.ip}:${targetNode.port} but ${firstResult.code}` ); @@ -268,4 +267,4 @@ async function retrieveNextMessages( } } -export const SnodeAPIRetrieve = { retrieveNextMessages, buildRetrieveRequest }; +export const SnodeAPIRetrieve = { retrieveNextMessagesNoRetries, buildRetrieveRequest }; diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index 133e4b77b2..14f5695f69 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -20,9 +20,10 @@ export interface LokiFetchOptions { /** * A small wrapper around node-fetch which deserializes response - * returns insecureNodeFetch response or false + * returned by insecureNodeFetch or false. + * Does not do any retries, nor eject snodes if needed */ -async function doRequest({ +async function doRequestNoRetries({ options, url, associatedWith, @@ -51,7 +52,7 @@ async function doRequest({ ? true : window.sessionFeatureFlags?.useOnionRequests; if (useOnionRequests && targetNode) { - const fetchResult = await Onions.lokiOnionFetch({ + const fetchResult = await Onions.lokiOnionFetchWithRetries({ targetNode, body: fetchOptions.body, headers: fetchOptions.headers, @@ -109,7 +110,7 @@ async function doRequest({ * -> if the targetNode gets too many errors => we will need to try to do this request again with another target node * The */ -async function snodeRpc( +async function snodeRpcNoRetries( { method, params, @@ -139,7 +140,7 @@ async function snodeRpc( agent: null, }; - return doRequest({ + return doRequestNoRetries({ url, options: fetchOptions, targetNode, @@ -148,4 +149,4 @@ async function snodeRpc( }); } -export const SessionRpc = { snodeRpc }; +export const SessionRpc = { snodeRpcNoRetries }; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 7aa52f4b58..469272bfe8 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -519,7 +519,7 @@ export class SwarmPolling { }) ); - let results = await SnodeAPIRetrieve.retrieveNextMessages( + let results = await SnodeAPIRetrieve.retrieveNextMessagesNoRetries( node, pubkey, namespacesAndLastHashes, diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts index c2f8271123..300933e751 100644 --- a/ts/session/onions/onionSend.ts +++ b/ts/session/onions/onionSend.ts @@ -159,7 +159,7 @@ const sendViaOnionV4ToNonSnodeWithRetries = async ( * call above will call us again with the same params but a different path. * If the error is not recoverable, it throws a pRetry.AbortError. */ - const onionV4Response = await Onions.sendOnionRequestHandlingSnodeEject({ + const onionV4Response = await Onions.sendOnionRequestHandlingSnodeEjectNoRetries({ nodePath: pathNodes, destSnodeX25519: destinationX25519Key, finalDestOptions: payloadObj, @@ -171,7 +171,7 @@ const sendViaOnionV4ToNonSnodeWithRetries = async ( if (window.sessionFeatureFlags?.debug.debugNonSnodeRequests) { window.log.info( - 'sendViaOnionV4ToNonSnodeWithRetries: sendOnionRequestHandlingSnodeEject returned: ', + 'sendViaOnionV4ToNonSnodeWithRetries: sendOnionRequestHandlingSnodeEjectNoRetries returned: ', JSON.stringify(onionV4Response) ); } diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 0593863e99..2c71c1df90 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -228,7 +228,7 @@ async function sendSingleMessage({ } const targetNode = await SnodePool.getNodeFromSwarmOrThrow(destination); - const batchResult = await BatchRequests.doUnsignedSnodeBatchRequest( + const batchResult = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( subRequests, targetNode, 6000, @@ -380,7 +380,7 @@ async function sendMessagesDataToSnode( const targetNode = await SnodePool.getNodeFromSwarmOrThrow(asssociatedWith); try { - const storeResults = await BatchRequests.doUnsignedSnodeBatchRequest( + const storeResults = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( rawRequests, targetNode, 4000, @@ -390,10 +390,10 @@ async function sendMessagesDataToSnode( if (!storeResults || !storeResults.length) { window?.log?.warn( - `SessionSnodeAPI::doSnodeBatchRequest on ${targetNode.ip}:${targetNode.port} returned falsish value`, + `SessionSnodeAPI::doUnsignedSnodeBatchRequestNoRetries on ${targetNode.ip}:${targetNode.port} returned falsish value`, storeResults ); - throw new Error('doSnodeBatchRequest: Invalid result'); + throw new Error('doUnsignedSnodeBatchRequestNoRetries: Invalid result'); } const firstResult = storeResults[0]; diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index 74de19ff21..92d46c6c65 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -49,12 +49,15 @@ describe('MessageSender', () => { describe('send', () => { const ourNumber = TestUtils.generateFakePubKeyStr(); let sessionMessageAPISendStub: TypedStub; - let doSnodeBatchRequestStub: TypedStub; + let doSnodeBatchRequestStub: TypedStub; let encryptStub: sinon.SinonStub<[PubKey, Uint8Array, SignalService.Envelope.Type]>; beforeEach(() => { sessionMessageAPISendStub = Sinon.stub(MessageSender, 'sendMessagesDataToSnode').resolves(); - doSnodeBatchRequestStub = Sinon.stub(BatchRequests, 'doSnodeBatchRequest').resolves(); + doSnodeBatchRequestStub = Sinon.stub( + BatchRequests, + 'doSnodeBatchRequestNoRetries' + ).resolves(); stubData('getMessageById').resolves(); encryptStub = Sinon.stub(MessageEncrypter, 'encrypt').resolves({ @@ -317,7 +320,7 @@ describe('MessageSender', () => { it('should call sendOnionRequestHandlingSnodeEjectStub', async () => { const sendOnionRequestHandlingSnodeEjectStub = Sinon.stub( Onions, - 'sendOnionRequestHandlingSnodeEject' + 'sendOnionRequestHandlingSnodeEjectNoRetries' ).resolves({} as any); Sinon.stub(OnionV4, 'decodeV4Response').returns({ metadata: { code: 200 }, @@ -336,7 +339,7 @@ describe('MessageSender', () => { it('should retry sendOnionRequestHandlingSnodeEjectStub ', async () => { const message = TestUtils.generateOpenGroupVisibleMessage(); const roomInfos = TestUtils.generateOpenGroupV2RoomInfos(); - Sinon.stub(Onions, 'sendOnionRequestHandlingSnodeEject').resolves({} as any); + Sinon.stub(Onions, 'sendOnionRequestHandlingSnodeEjectNoRetries').resolves({} as any); Sinon.stub(OnionSending, 'getMinTimeoutForSogs').returns(5); @@ -356,7 +359,7 @@ describe('MessageSender', () => { it('should not retry more than 3 sendOnionRequestHandlingSnodeEjectStub ', async () => { const message = TestUtils.generateOpenGroupVisibleMessage(); const roomInfos = TestUtils.generateOpenGroupV2RoomInfos(); - Sinon.stub(Onions, 'sendOnionRequestHandlingSnodeEject').resolves({} as any); + Sinon.stub(Onions, 'sendOnionRequestHandlingSnodeEjectNoRetries').resolves({} as any); Sinon.stub(OnionSending, 'getMinTimeoutForSogs').returns(5); const decodev4responseStub = Sinon.stub(OnionV4, 'decodeV4Response'); diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts index 2a5d45eed0..4fea21649f 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts @@ -74,7 +74,7 @@ describe('SwarmPolling:pollForAllKeys', () => { TestUtils.stubLibSessionWorker(undefined); Sinon.stub(SnodePool, 'getSwarmFor').resolves(generateFakeSnodes(5)); - Sinon.stub(SnodeAPIRetrieve, 'retrieveNextMessages').resolves([]); + Sinon.stub(SnodeAPIRetrieve, 'retrieveNextMessagesNoRetries').resolves([]); TestUtils.stubWindow('inboxStore', undefined); TestUtils.stubWindow('getGlobalOnlineStatus', () => true); From d6d9bec5bae0704388004d15e6253a3ff7e2d8f7 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 12 Mar 2024 10:52:41 +1100 Subject: [PATCH 095/302] fix: fixed a bunch of groupv2 chunk2 issues --- ts/components/MemberListItem.tsx | 8 +- .../conversation/MessageRequestButtons.tsx | 4 +- .../message-item/GroupUpdateMessage.tsx | 16 +- .../overlay/OverlayRightPanelSettings.tsx | 9 +- .../dialog/UpdateGroupMembersDialog.tsx | 2 + .../overlay/OverlayMessageRequest.tsx | 23 ++- ts/components/menu/Menu.tsx | 1 - ts/hooks/useParamSelector.ts | 3 + ts/interactions/conversationInteractions.ts | 44 ++++-- ts/models/conversation.ts | 139 ++++++++---------- ts/models/message.ts | 24 ++- ts/react.d.ts | 11 +- ts/receiver/contentMessage.ts | 34 +++-- ts/session/apis/snode_api/retrieveRequest.ts | 8 +- ts/session/apis/snode_api/swarmPolling.ts | 8 +- .../GroupUpdateMemberChangeMessage.ts | 4 + ts/session/profile_manager/ProfileManager.ts | 5 +- ts/session/sending/MessageQueue.ts | 8 +- ts/session/sending/MessageSender.ts | 29 +++- ts/session/sending/MessageSentHandler.ts | 19 +-- ts/session/utils/calling/CallManager.ts | 3 +- ts/state/ducks/metaGroups.ts | 35 ++++- 22 files changed, 263 insertions(+), 174 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index aad823b9f8..4cc5e1d59b 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -163,7 +163,7 @@ const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Gro } return ( {statusText} @@ -197,7 +197,7 @@ const ResendInviteButton = ({ }) => { return ( { return ( - {memberName} + {memberName} { { - await handleAcceptConversationRequest({ convoId: selectedConvoId, sendResponse: true }); + onClick={() => { + void handleAcceptConversationRequest({ convoId: selectedConvoId }); }} text={window.i18n('accept')} dataTestId="accept-message-request" diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx index 507ae6a75f..d6c25980af 100644 --- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx +++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { PubkeyType } from 'libsession_util_nodejs'; +import { cloneDeep } from 'lodash'; import { useConversationsUsernameWithQuoteOrShortPk } from '../../../../hooks/useParamSelector'; import { arrayContainsUsOnly } from '../../../../models/message'; import { PreConditionFailed } from '../../../../session/utils/errors'; @@ -49,7 +50,10 @@ function moveUsToStart( if (!usItem) { throw new PreConditionFailed('"we" should have been there'); } - return { sortedWithUsFirst: [usItem, ...changed.slice(usAt, 1)] }; + // deepClone because splice mutates the array + const changedCopy = cloneDeep(changed); + changedCopy.splice(usAt, 1); + return { sortedWithUsFirst: [usItem, ...changedCopy] }; } function changeOfMembersV2({ @@ -84,10 +88,12 @@ function changeOfMembersV2({ : ('Removed' as const); const key = `group${subject}${action}` as const; - return window.i18n( - key, - sortedWithUsFirst.map(m => m.name) - ); + const sortedWithUsOrCount = + subject === 'Others' + ? [sortedWithUsFirst[0].name, (sortedWithUsFirst.length - 1).toString()] + : sortedWithUsFirst.map(m => m.name); + + return window.i18n(key, sortedWithUsOrCount); } // TODO those lookups might need to be memoized diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 3c1076dbcd..e6e68abb70 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -31,6 +31,7 @@ import { useSelectedIsActive, useSelectedIsBlocked, useSelectedIsGroupOrCommunity, + useSelectedIsGroupV2, useSelectedIsKickedFromGroup, useSelectedIsPublic, useSelectedLastMessage, @@ -125,13 +126,19 @@ const HeaderItem = () => { const isBlocked = useSelectedIsBlocked(); const isKickedFromGroup = useSelectedIsKickedFromGroup(); const isGroup = useSelectedIsGroupOrCommunity(); + const isGroupV2 = useSelectedIsGroupV2(); + const isPublic = useSelectedIsPublic(); const subscriberCount = useSelectedSubscriberCount(); + const weAreAdmin = useSelectedWeAreAdmin(); if (!selectedConvoKey) { return null; } - const showInviteContacts = isGroup && !isKickedFromGroup && !isBlocked; + const showInviteLegacyGroup = + !isPublic && !isGroupV2 && isGroup && !isKickedFromGroup && !isBlocked; + const showInviteGroupV2 = isGroupV2 && !isKickedFromGroup && !isBlocked && weAreAdmin; + const showInviteContacts = isPublic || showInviteLegacyGroup || showInviteGroupV2; const showMemberCount = !!(subscriberCount && subscriberCount > 0); return ( diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 6e88916ef4..4181105f44 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -293,6 +293,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { onClick={onClickOK} buttonType={SessionButtonType.Simple} disabled={isProcessingUIChange} + dataTestId="session-confirm-ok-button" /> )} { buttonType={SessionButtonType.Simple} onClick={closeDialog} disabled={isProcessingUIChange} + dataTestId="session-confirm-cancel-button" />
diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx index 0da5a616e9..2a724afcc8 100644 --- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx +++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx @@ -4,6 +4,7 @@ import { useDispatch, useSelector } from 'react-redux'; import useKey from 'react-use/lib/useKey'; import styled from 'styled-components'; import { declineConversationWithoutConfirm } from '../../../interactions/conversationInteractions'; +import { ed25519Str } from '../../../session/onions/onionPath'; import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils'; import { updateConfirmModal } from '../../../state/ducks/modalDialog'; import { resetLeftOverlayMode } from '../../../state/ducks/section'; @@ -76,14 +77,20 @@ export const OverlayMessageRequest = () => { for (let index = 0; index < messageRequests.length; index++) { const convoId = messageRequests[index]; - // eslint-disable-next-line no-await-in-loop - await declineConversationWithoutConfirm({ - alsoBlock: false, - conversationId: convoId, - currentlySelectedConvo, - syncToDevices: false, - conversationIdOrigin: null, // block is false, no need for conversationIdOrigin - }); + try { + // eslint-disable-next-line no-await-in-loop + await declineConversationWithoutConfirm({ + alsoBlock: false, + conversationId: convoId, + currentlySelectedConvo, + syncToDevices: false, + conversationIdOrigin: null, // block is false, no need for conversationIdOrigin + }); + } catch (e) { + window.log.warn( + `failed to decline msg request ${ed25519Str(convoId)} with error: ${e.message}` + ); + } } await forceSyncConfigurationNowIfNeeded(); diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index cc935600f4..c37feee4fe 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -450,7 +450,6 @@ export const AcceptMsgRequestMenuItem = () => { onClick={async () => { await handleAcceptConversationRequest({ convoId, - sendResponse: true, }); }} > diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 48b23cfbe5..6b69848767 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -47,6 +47,9 @@ export function useConversationUsername(convoId?: string) { // So let's keep falling back to convoProps?.displayNameInProfile if groupName is not set yet (it comes later through the groupInfos namespace) return groupName; } + if (convoId && (PubKey.is03Pubkey(convoId) || PubKey.is05Pubkey(convoId))) { + return convoProps?.nickname || convoProps?.displayNameInProfile || PubKey.shorten(convoId); + } return convoProps?.nickname || convoProps?.displayNameInProfile || convoId; } diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index e80a7124f0..6482373e6e 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -4,7 +4,7 @@ import { ConversationTypeEnum, READ_MESSAGE_STATE, } from '../models/conversationAttributes'; -import { CallManager, SyncUtils, ToastUtils, UserUtils } from '../session/utils'; +import { CallManager, PromiseUtils, SyncUtils, ToastUtils, UserUtils } from '../session/utils'; import { SessionButtonColor } from '../components/basic/SessionButton'; import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings'; @@ -113,26 +113,25 @@ export async function unblockConvoById(conversationId: string) { await conversation.commit(); } -export const handleAcceptConversationRequest = async ({ - convoId, - sendResponse, -}: { - convoId: string; - sendResponse: boolean; -}) => { +export const handleAcceptConversationRequest = async ({ convoId }: { convoId: string }) => { const convo = ConvoHub.use().get(convoId); - if (!convo) { + if (!convo || (!convo.isPrivate() && !convo.isClosedGroupV2())) { return null; } - await convo.setDidApproveMe(true, false); + const previousIsApproved = convo.isApproved(); + const previousDidApprovedMe = convo.didApproveMe(); + // Note: we don't mark as approvedMe = true, as we do not know if they did send us a message yet. await convo.setIsApproved(true, false); await convo.commit(); + void forceSyncConfigurationNowIfNeeded(); if (convo.isPrivate()) { - await convo.addOutgoingApprovalMessage(Date.now()); - if (sendResponse) { + // we only need the approval message (and sending a reply) when we are accepting a message request. i.e. someone sent us a message already and we didn't accept it yet. + if (!previousIsApproved && previousDidApprovedMe) { + await convo.addOutgoingApprovalMessage(Date.now()); await convo.sendMessageRequestResponse(); } + return null; } if (PubKey.is03Pubkey(convoId)) { @@ -143,12 +142,17 @@ export const handleAcceptConversationRequest = async ({ } // this updates the wrapper and refresh the redux slice await UserGroupsWrapperActions.setGroup({ ...found, invitePending: false }); - const acceptedPromise = new Promise(resolve => { + + // nothing else to do (and especially not wait for first poll) when the convo was already approved + if (previousIsApproved) { + return null; + } + const pollAndSendResponsePromise = new Promise(resolve => { getSwarmPollingInstance().addGroupId(convoId, async () => { // we need to do a first poll to fetch the keys etc before we can send our invite response // this is pretty hacky, but also an admin seeing a message from that user in the group will mark it as not pending anymore await sleepFor(2000); - if (sendResponse) { + if (!previousIsApproved) { await GroupV2Receiver.sendInviteResponseToGroup({ groupPk: convoId }); } window.log.info( @@ -157,7 +161,17 @@ export const handleAcceptConversationRequest = async ({ return resolve(true); }); }); - await acceptedPromise; + + // try at most 10s for the keys, and everything to come before continuing processing. + // Note: this is important as otherwise the polling just hangs when sending a message to a group (as the cb in addGroupId() is never called back) + const timeout = 10000; + try { + await PromiseUtils.timeout(pollAndSendResponsePromise, timeout); + } catch (e) { + window.log.warn( + `handleAcceptConversationRequest: waited ${timeout}ms for first poll of group ${ed25519Str(convoId)} to happen, but timedout with: ${e.message}` + ); + } } return null; }; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 4db8bf55eb..1ba4cdfae0 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -17,6 +17,7 @@ import { xor, } from 'lodash'; +import { DisappearingMessageConversationModeType } from 'libsession_util_nodejs'; import { v4 } from 'uuid'; import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; @@ -29,7 +30,7 @@ import { PubKey } from '../session/types'; import { ToastUtils, UserUtils } from '../session/utils'; import { BlockedNumberController } from '../util'; import { MessageModel } from './message'; -import { MessageAttributesOptionals, MessageDirection } from './messageType'; +import { MessageAttributesOptionals } from './messageType'; import { Data } from '../data/data'; import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil'; @@ -81,7 +82,6 @@ import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile'; import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups'; -import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils'; import { getOurProfile } from '../session/utils/User'; import { deleteExternalFilesOfConversation, @@ -129,7 +129,6 @@ import { import { handleAcceptConversationRequest } from '../interactions/conversationInteractions'; import { DisappearingMessages } from '../session/disappearing_messages'; -import { DisappearingMessageConversationModeType } from '../session/disappearing_messages/types'; import { GroupUpdateInfoChangeMessage } from '../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { FetchMsgExpirySwarm } from '../session/utils/job_runners/jobs/FetchMsgExpirySwarmJob'; import { UpdateMsgExpirySwarm } from '../session/utils/job_runners/jobs/UpdateMsgExpirySwarmJob'; @@ -150,7 +149,7 @@ type InMemoryConvoInfos = { const inMemoryConvoInfos: Map = new Map(); export class ConversationModel extends Backbone.Model { - public updateLastMessage: () => unknown; // unknown because it is a Promise that we do not wait to await + public updateLastMessage: () => unknown; // unknown because it is a Promise that we do not want to await public throttledBumpTyping: () => void; public throttledNotify: (message: MessageModel) => void; public markConversationRead: (opts: { @@ -237,7 +236,7 @@ export class ConversationModel extends Backbone.Model { public isClosedGroup(): boolean { return Boolean( - (this.get('type') === ConversationTypeEnum.GROUP && this.id.startsWith('05')) || + (this.get('type') === ConversationTypeEnum.GROUP && PubKey.is05Pubkey(this.id)) || this.isClosedGroupV2() ); } @@ -254,7 +253,9 @@ export class ConversationModel extends Backbone.Model { return this.isPrivate() && PubKey.isBlinded(this.id); } - // returns true if this is a closed/medium or open group + /** + * @returns true if this is a legacy, closed or community + */ public isGroup() { return isOpenOrClosedGroup(this.get('type')); } @@ -298,6 +299,14 @@ export class ConversationModel extends Backbone.Model { } public getPriority() { + if (PubKey.is05Pubkey(this.id) && this.isPrivate()) { + // TODO once we have a libsession state, we can make this used accross the app without repeating as much + // if a private chat, trust the value from the Libsession wrapper cached first + const contact = SessionUtilContact.getContactCached(this.id); + if (contact) { + return contact.priority; + } + } return this.get('priority') || CONVERSATION_PRIORITIES.default; } @@ -325,8 +334,8 @@ export class ConversationModel extends Backbone.Model { toRet.priority = priorityFromDb; } - if (this.get('markedAsUnread')) { - toRet.isMarkedUnread = !!this.get('markedAsUnread'); + if (this.isMarkedUnread()) { + toRet.isMarkedUnread = this.isMarkedUnread(); } const blocksSogsMsgReqsTimestamp = this.get('blocksSogsMsgReqsTimestamp'); @@ -380,17 +389,17 @@ export class ConversationModel extends Backbone.Model { if (this.getRealSessionUsername()) { toRet.displayNameInProfile = this.getRealSessionUsername(); } - if (this.get('nickname')) { - toRet.nickname = this.get('nickname'); + if (this.getNickname()) { + toRet.nickname = this.getNickname(); } if (BlockedNumberController.isBlocked(this.id)) { toRet.isBlocked = true; } - if (this.get('didApproveMe')) { - toRet.didApproveMe = this.get('didApproveMe'); + if (this.didApproveMe()) { + toRet.didApproveMe = this.didApproveMe(); } - if (this.get('isApproved')) { - toRet.isApproved = this.get('isApproved'); + if (this.isApproved()) { + toRet.isApproved = this.isApproved(); } if (this.getExpireTimer()) { toRet.expireTimer = this.getExpireTimer(); @@ -601,32 +610,16 @@ export class ConversationModel extends Backbone.Model { expireTimer, }; - const shouldApprove = !this.isApproved() && this.isPrivate(); - const incomingMessageCount = await Data.getMessageCountByType( - this.id, - MessageDirection.incoming - ); - const hasIncomingMessages = incomingMessageCount > 0; - if (PubKey.isBlinded(this.id)) { window.log.info('Sending a blinded message react to this user: ', this.id); await this.sendBlindedMessageRequest(chatMessageParams); return; } - if (shouldApprove) { - await this.setIsApproved(true); - if (hasIncomingMessages) { - // have to manually add approval for local client here as DB conditional approval check in config msg handling will prevent this from running - await this.addOutgoingApprovalMessage(Date.now()); - if (!this.didApproveMe()) { - await this.setDidApproveMe(true); - } - // should only send once - await this.sendMessageRequestResponse(); - void forceSyncConfigurationNowIfNeeded(); - } - } + // handleAcceptConversationRequest will take care of sending response depending on the type of conversation, if needed + await handleAcceptConversationRequest({ + convoId: this.id, + }); if (this.isOpenGroupV2()) { // communities have no expiration timer support, so enforce it here. @@ -739,7 +732,7 @@ export class ConversationModel extends Backbone.Model { /** * When you have accepted another users message request - * @param timestamp for determining the order for this message to appear like a regular message + * Note: you shouldn't need to use this directly. Instead use `handleAcceptConversationRequest()` */ public async addOutgoingApprovalMessage(timestamp: number) { await this.addSingleOutgoingMessage({ @@ -772,8 +765,9 @@ export class ConversationModel extends Backbone.Model { } /** - * Sends an accepted message request response. + * Sends an accepted message request response to a private chat * Currently, we never send anything for denied message requests. + * Note: you souldn't to use this directly. Instead use `handleAcceptConversationRequest()` */ public async sendMessageRequestResponse() { if (!this.isPrivate()) { @@ -1547,7 +1541,7 @@ export class ConversationModel extends Backbone.Model { public async setIsApproved(value: boolean, shouldCommit: boolean = true) { const valueForced = Boolean(value); - if (!this.isPrivate()) { + if (!this.isPrivate() && !this.isClosedGroupV2()) { return; } @@ -1752,11 +1746,20 @@ export class ConversationModel extends Backbone.Model { } public didApproveMe() { - return Boolean(this.get('didApproveMe')); + if (PubKey.is05Pubkey(this.id) && this.isPrivate()) { + // if a private chat, trust the value from the Libsession wrapper cached first + // TODO once we have a libsession state, we can make this used accross the app without repeating as much + return SessionUtilContact.getContactCached(this.id)?.approvedMe ?? !!this.get('didApproveMe'); + } + return !!this.get('didApproveMe'); } public isApproved() { - return Boolean(this.get('isApproved')); + if (PubKey.is05Pubkey(this.id) && this.isPrivate()) { + // if a private chat, trust the value from the Libsession wrapper cached first + return SessionUtilContact.getContactCached(this.id)?.approved ?? !!this.get('isApproved'); + } + return !!this.get('isApproved'); } /** @@ -2035,37 +2038,16 @@ export class ConversationModel extends Backbone.Model { lokiProfile: UserUtils.getOurProfile(), }; - const shouldApprove = !this.isApproved() && (this.isPrivate() || this.isClosedGroupV2()); - - const incomingMessageCount = await Data.getMessageCountByType( - this.id, - MessageDirection.incoming - ); - const hasIncomingMessages = incomingMessageCount > 0; - if (PubKey.isBlinded(this.id)) { window.log.info('Sending a blinded message to this user: ', this.id); await this.sendBlindedMessageRequest(chatMessageParams); return; } - if (shouldApprove) { - await handleAcceptConversationRequest({ - convoId: this.id, - sendResponse: !message, - }); - await this.setIsApproved(true); - if (hasIncomingMessages) { - // have to manually add approval for local client here as DB conditional approval check in config msg handling will prevent this from running - await this.addOutgoingApprovalMessage(Date.now()); - if (!this.didApproveMe()) { - await this.setDidApproveMe(true); - } - // should only send once - await this.sendMessageRequestResponse(); - void forceSyncConfigurationNowIfNeeded(); - } - } + // handleAcceptConversationRequest will take care of sending response depending on the type of conversation + await handleAcceptConversationRequest({ + convoId: this.id, + }); if (this.isOpenGroupV2()) { const chatMessageOpenGroupV2 = new OpenGroupVisibleMessage(chatMessageParams); @@ -2262,20 +2244,19 @@ export class ConversationModel extends Backbone.Model { const lastMessageStatus = lastMessageModel.getMessagePropStatus() || undefined; const lastMessageNotificationText = lastMessageModel.getNotificationText() || undefined; // we just want to set the `status` to `undefined` if there are no `lastMessageNotificationText` - const lastMessageUpdate = - !!lastMessageNotificationText && !isEmpty(lastMessageNotificationText) - ? { - lastMessage: lastMessageNotificationText || '', - lastMessageStatus, - lastMessageInteractionType, - lastMessageInteractionStatus, - } - : { - lastMessage: '', - lastMessageStatus: undefined, - lastMessageInteractionType: undefined, - lastMessageInteractionStatus: undefined, - }; + const lastMessageUpdate = !isEmpty(lastMessageNotificationText) + ? { + lastMessage: lastMessageNotificationText || '', + lastMessageStatus, + lastMessageInteractionType, + lastMessageInteractionStatus, + } + : { + lastMessage: '', + lastMessageStatus: undefined, + lastMessageInteractionType: undefined, + lastMessageInteractionStatus: undefined, + }; const existingLastMessageInteractionType = this.get('lastMessageInteractionType'); const existingLastMessageInteractionStatus = this.get('lastMessageInteractionStatus'); @@ -2444,7 +2425,7 @@ export class ConversationModel extends Backbone.Model { ) { return false; } - return Boolean(this.get('isApproved')); + return this.isApproved(); } private async bumpTyping() { diff --git a/ts/models/message.ts b/ts/models/message.ts index a0d72d5434..27845722e1 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -120,6 +120,18 @@ export function arrayContainsOneItemOnly(arrayToCheck: Array | undefined return arrayToCheck && arrayToCheck.length === 1; } +function formatJoined(joined: Array) { + const names = joined.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey); + const messages = []; + + if (names.length > 1) { + messages.push(window.i18n('multipleJoinedTheGroup', [names.join(', ')])); + } else { + messages.push(window.i18n('joinedTheGroup', names)); + } + return messages.join(' '); +} + export class MessageModel extends Backbone.Model { constructor(attributes: MessageAttributesOptionals & { skipTimerInit?: boolean }) { const filledAttrs = fillMessageAttributesWithDefaults(attributes); @@ -1328,15 +1340,11 @@ export class MessageModel extends Backbone.Model { } if (groupUpdate.joined && groupUpdate.joined.length) { - const names = groupUpdate.joined.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey); - const messages = []; + return formatJoined(groupUpdate.joined); + } - if (names.length > 1) { - messages.push(window.i18n('multipleJoinedTheGroup', [names.join(', ')])); - } else { - messages.push(window.i18n('joinedTheGroup', names)); - } - return messages.join(' '); + if (groupUpdate.joinedWithHistory && groupUpdate.joinedWithHistory.length) { + return formatJoined(groupUpdate.joinedWithHistory); } if (groupUpdate.kicked && groupUpdate.kicked.length) { diff --git a/ts/react.d.ts b/ts/react.d.ts index 9adacdf0ae..9bac24028b 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -7,8 +7,7 @@ import 'react'; declare module 'react' { type SessionDataTestId = - | 'group_member_status_text' - | 'group_member_name' + | 'group-member-status-text' | 'loading-spinner' | 'session-toast' | 'loading-animation' @@ -17,7 +16,6 @@ declare module 'react' { | 'chooser-new-group' | 'chooser-new-conversation-button' | 'new-conversation-button' - | 'module-conversation__user__profile-name' | 'message-request-banner' | 'leftpane-section-container' | 'group-name-input' @@ -164,14 +162,13 @@ declare module 'react' { | 'continue-session-button' | 'next-new-conversation-button' | 'reveal-recovery-phrase' - | 'resend_invite_button' + | 'resend-invite-button' | 'session-confirm-cancel-button' | 'session-confirm-ok-button' | 'confirm-nickname' | 'path-light-svg' - | 'group_member_status_text' - | 'group_member_name' - | 'resend_promote_button' + | 'group-member-name' + | 'resend-promote-button' | 'next-button' | 'save-button-profile-update' | 'save-button-profile-update' diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index e538c59e76..e520ed68cd 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -20,6 +20,7 @@ import { concatUInt8Array, getSodiumRenderer } from '../session/crypto'; import { removeMessagePadding } from '../session/crypto/BufferPadding'; import { DisappearingMessages } from '../session/disappearing_messages'; import { ReadyToDisappearMsgUpdate } from '../session/disappearing_messages/types'; +import { ed25519Str } from '../session/onions/onionPath'; import { ProfileManager } from '../session/profile_manager/ProfileManager'; import { GroupUtils, UserUtils } from '../session/utils'; import { perfEnd, perfStart } from '../session/utils/Performance'; @@ -722,12 +723,7 @@ async function handleMessageRequestResponse( envelope: EnvelopePlus, messageRequestResponse: SignalService.MessageRequestResponse ) { - const { isApproved } = messageRequestResponse; - if (!isApproved) { - await IncomingMessageCache.removeFromCache(envelope); - return; - } - if (!messageRequestResponse) { + if (!messageRequestResponse || !messageRequestResponse.isApproved) { window?.log?.error('handleMessageRequestResponse: Invalid parameters -- dropping message.'); await IncomingMessageCache.removeFromCache(envelope); return; @@ -738,6 +734,14 @@ async function handleMessageRequestResponse( const convosToMerge = findCachedBlindedMatchOrLookupOnAllServers(envelope.source, sodium); const unblindedConvoId = envelope.source; + if (!PubKey.is05Pubkey(unblindedConvoId)) { + window?.log?.warn( + 'handleMessageRequestResponse: Invalid unblindedConvoId -- dropping message.' + ); + await IncomingMessageCache.removeFromCache(envelope); + return; + } + const conversationToApprove = await ConvoHub.use().getOrCreateAndWait( unblindedConvoId, ConversationTypeEnum.PRIVATE @@ -747,12 +751,14 @@ async function handleMessageRequestResponse( mostRecentActiveAt = toNumber(envelope.timestamp); } + const previousApprovedMe = conversationToApprove.didApproveMe(); + await conversationToApprove.setDidApproveMe(true, false); + conversationToApprove.set({ active_at: mostRecentActiveAt, - isApproved: true, - didApproveMe: true, }); await conversationToApprove.unhideIfNeeded(false); + await conversationToApprove.commit(); if (convosToMerge.length) { // merge fields we care by hand @@ -809,23 +815,21 @@ async function handleMessageRequestResponse( ); } - if (!conversationToApprove || conversationToApprove.didApproveMe()) { - await conversationToApprove?.commit(); - window?.log?.info( - 'Conversation already contains the correct value for the didApproveMe field.' + if (previousApprovedMe) { + await conversationToApprove.commit(); + + window.log.inf( + `convo ${ed25519Str(conversationToApprove.id)} previousApprovedMe is already true. Nothing to do ` ); await IncomingMessageCache.removeFromCache(envelope); - return; } - await conversationToApprove.setDidApproveMe(true, true); // Conversation was not approved before so a sync is needed await conversationToApprove.addIncomingApprovalMessage( toNumber(envelope.timestamp), unblindedConvoId ); - await IncomingMessageCache.removeFromCache(envelope); } diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 39a9fcafec..6ff1dca0ac 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -253,10 +253,10 @@ async function retrieveNextMessagesNoRetries( GetNetworkTime.handleTimestampOffsetFromNetwork('retrieve', bodyFirstResult.t); // merge results with their corresponding namespaces - return results.map((result, index) => ({ - code: result.code, - messages: result.body as RetrieveMessagesResultsContent, - namespace: namespacesAndLastHashes[index].namespace, + return namespacesAndLastHashes.map((n, index) => ({ + code: results[index].code, + messages: results[index].body as RetrieveMessagesResultsContent, + namespace: n.namespace, })); } catch (e) { window?.log?.warn('exception while parsing json of nextMessage:', e); diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 469272bfe8..f8ad0ab56a 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -144,6 +144,11 @@ export class SwarmPolling { if (this.groupPolling.findIndex(m => m.pubkey.key === pk.key) === -1) { window?.log?.info('Swarm addGroupId: adding pubkey to polling', pk.key); this.groupPolling.push({ pubkey: pk, lastPolledTimestamp: 0, callbackFirstPoll }); + } else if (callbackFirstPoll) { + // group is already polled. Hopefully we already have keys for it to decrypt messages? + void sleepFor(2000).then(() => { + void callbackFirstPoll(); + }); } } @@ -547,7 +552,7 @@ export class SwarmPolling { } results = results.slice(0, results.length - 1); } - console.warn('results what when we get kicked out?: ', results); + // console.warn('results what when we get kicked out?: ', results); // debugger const lastMessages = results.map(r => { return last(r.messages.messages); }); @@ -845,7 +850,6 @@ async function handleMessagesForGroupV2( throw new Error('decryptForGroupV2 returned empty envelope'); } - console.warn('envelopePlus', envelopePlus); // this is the processing of the message itself, which can be long. // We allow 1 minute per message at most, which should be plenty await Receiver.handleSwarmContentDecryptedWithTimeout({ diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts index f3d6692c49..0292898f1c 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts @@ -111,6 +111,10 @@ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { ), }); + if (type === Type.ADDED && this.typeOfChange === 'addedWithHistory') { + memberChangeMessage.historyShared = true; + } + return new SignalService.DataMessage({ groupUpdateMessage: { memberChangeMessage } }); } diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts index cfe3c778ed..15dfc86156 100644 --- a/ts/session/profile_manager/ProfileManager.ts +++ b/ts/session/profile_manager/ProfileManager.ts @@ -23,9 +23,8 @@ async function updateOurProfileSync({ displayName, profileUrl, profileKey, prior } await updateProfileOfContact(us, displayName, profileUrl, profileKey); - if (priority !== null && ourConvo.getPriority() !== priority) { - ourConvo.set('priority', priority); - await ourConvo.commit(); + if (priority !== null) { + await ourConvo.setPriorityFromWrapper(priority, true); } } diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 2c4d2983e8..8df9411a26 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -368,9 +368,11 @@ export class MessageQueue { 'sendSingleMessageAndHandleResult: failed to send message with: ', error.message ); - if (rawMessage) { - await MessageSentHandler.handleSwarmMessageSentFailure(rawMessage, error); - } + await MessageSentHandler.handleSwarmMessageSentFailure( + { device: rawMessage.device, identifier: rawMessage.identifier }, + error + ); + return null; } finally { // Remove from the cache because retrying is done in the sender diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 2c71c1df90..731c9742b4 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -376,14 +376,13 @@ async function sendMessagesDataToSnode( revokeSubRequest, unrevokeSubRequest, ]); - const targetNode = await SnodePool.getNodeFromSwarmOrThrow(asssociatedWith); try { const storeResults = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( rawRequests, targetNode, - 4000, + 6000, asssociatedWith, method ); @@ -395,6 +394,11 @@ async function sendMessagesDataToSnode( ); throw new Error('doUnsignedSnodeBatchRequestNoRetries: Invalid result'); } + await handleBatchResultWithSubRequests({ + batchResult: storeResults, + subRequests: rawRequests, + destination: asssociatedWith, + }); const firstResult = storeResults[0]; @@ -545,6 +549,9 @@ async function encryptMessagesAndWrap( /** * Send an array of preencrypted data to the corresponding swarm. + * Warning: + * This does not handle result of messages and marking messages as read, syncing them currently. + * For this, use the `MessageQueue.sendSingleMessage()` for now. * * @param params the data to deposit * @param destination the pubkey we should deposit those message to @@ -700,6 +707,10 @@ export const MessageSender = { signSubRequests, }; +/** + * Note: this function does not handle the syncing logic of messages yet. + * Use it to push message to group, to note to self, or with user messages which do not require a syncing logic + */ async function handleBatchResultWithSubRequests({ batchResult, destination, @@ -756,7 +767,21 @@ async function handleBatchResultWithSubRequests({ const foundMessage = await Data.getMessageById(subRequest.dbMessageIdentifier); if (foundMessage) { await foundMessage.updateMessageHash(storedHash); + // - a message pushed to a group is always synced + // - a message sent to ourself when it was a marked as sentSync is a synced message to ourself + if ( + isDestinationClosedGroup || + (subRequest.destination === us && foundMessage.get('sentSync')) + ) { + foundMessage.set({ synced: true }); + } + foundMessage.set({ + sent_to: [subRequest.destination], + sent: true, + sent_at: storedAt, + }); await foundMessage.commit(); + await foundMessage.getConversation()?.updateLastMessage(); window?.log?.info(`updated message ${foundMessage.get('id')} with hash: ${storedHash}`); } /* eslint-enable no-await-in-loop */ diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts index 2683d1246b..7bd3aa415a 100644 --- a/ts/session/sending/MessageSentHandler.ts +++ b/ts/session/sending/MessageSentHandler.ts @@ -147,7 +147,10 @@ async function handleSwarmMessageSentSuccess( fetchedMessage.getConversation()?.updateLastMessage(); } -async function handleSwarmMessageSentFailure(sentMessage: OutgoingRawMessage, error: any) { +async function handleSwarmMessageSentFailure( + sentMessage: Pick, + error: any +) { const fetchedMessage = await fetchHandleMessageSentData(sentMessage.identifier); if (!fetchedMessage) { return; @@ -157,14 +160,12 @@ async function handleSwarmMessageSentFailure(sentMessage: OutgoingRawMessage, er await fetchedMessage.saveErrors(error); } - if (!(sentMessage instanceof OpenGroupVisibleMessage)) { - const isOurDevice = UserUtils.isUsFromCache(sentMessage.device); - // if this message was for ourself, and it was not already synced, - // it means that we failed to sync it. - // so just remove the flag saying that we are currently sending the sync message - if (isOurDevice && !fetchedMessage.get('sync')) { - fetchedMessage.set({ sentSync: false }); - } + const isOurDevice = UserUtils.isUsFromCache(sentMessage.device); + // if this message was for ourself, and it was not already synced, + // it means that we failed to sync it. + // so just remove the flag saying that we are currently sending the sync message + if (isOurDevice && !fetchedMessage.get('sync')) { + fetchedMessage.set({ sentSync: false }); } // always mark the message as sent. diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index bccf2b1221..936dc2052a 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -533,7 +533,7 @@ export async function USER_callRecipient(recipient: string) { weAreCallerOnCurrentCall = true; // initiating a call is analogous to sending a message request - await handleAcceptConversationRequest({ convoId: recipient, sendResponse: false }); + await handleAcceptConversationRequest({ convoId: recipient }); // Note: we do the sending of the preoffer manually as the sendTo1o1NonDurably rely on having a message saved to the db for MessageSentSuccess // which is not the case for a pre offer message (the message only exists in memory) @@ -934,7 +934,6 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) { // consider the conversation completely approved await handleAcceptConversationRequest({ convoId: fromSender, - sendResponse: true, }); } diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 7f403f64ba..04f184dee6 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -136,7 +136,6 @@ const initNewGroupInWrapper = createAsyncThunk( throw new Error('groupSecretKey was empty just after creation.'); } newGroup.name = groupName; // this will be used by the linked devices until they fetch the info from the groups swarm - // the `GroupSync` below will need the secretKey of the group to be saved in the wrapper. So save it! await UserGroupsWrapperActions.setGroup(newGroup); const ourEd25519KeypairBytes = await UserUtils.getUserED25519KeyPairBytes(); @@ -183,8 +182,7 @@ const initNewGroupInWrapper = createAsyncThunk( const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); await convo.setIsApproved(true, false); - - console.warn('updateMessages for new group might need an update message?'); + await convo.commit(); // commit here too, as the poll needs it to be approved const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, @@ -196,6 +194,36 @@ const initNewGroupInWrapper = createAsyncThunk( window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); throw new Error('failed to pushChangesToGroupSwarmIfNeeded'); } + + // push one group change message were initial members are added to the group + if (membersFromWrapper.length) { + const membersHex = uniq(membersFromWrapper.map(m => m.pubkeyHex)); + const sentAt = GetNetworkTime.now(); + const msgModel = await ClosedGroup.addUpdateMessage({ + diff: { type: 'add', added: membersHex, withHistory: false }, + expireUpdate: null, + sender: us, + sentAt, + convo, + }); + const groupChange = await getWithoutHistoryControlMessage({ + adminSecretKey: groupSecretKey, + convo, + groupPk, + withoutHistory: membersHex, + createAtNetworkTimestamp: sentAt, + dbMsgIdentifier: msgModel.id, + }); + if (groupChange) { + await GroupSync.storeGroupUpdateMessages({ + groupPk, + updateMessages: [groupChange], + }); + } + } + + await convo.commit(); + getSwarmPollingInstance().addGroupId(new PubKey(groupPk)); await convo.unhideIfNeeded(); @@ -838,7 +866,6 @@ async function handleMemberAddedFromUI({ if (groupChange) { updateMessagesToPush.push(groupChange); } - console.warn(`diff: { type: ' should add case for addWithHistory here ?`); } await convo.commit(); From 1c58899558bbbbe94f1c55c58d16b013d1c3efb0 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 14 Mar 2024 11:59:40 +1100 Subject: [PATCH 096/302] fix: rekey explicitely when creating a group --- ts/components/dialog/SessionSeedModal.tsx | 11 ++++++++--- .../registration/RegistrationUserDetails.tsx | 11 ++++++++++- ts/components/registration/SignUpTab.tsx | 4 ++-- ts/receiver/contentMessage.ts | 4 ++-- .../swarm_polling_config/SwarmPollingGroupConfig.ts | 1 + ts/session/utils/job_runners/jobs/GroupSyncJob.ts | 7 +++++-- .../libsession_utils_convo_info_volatile.ts | 6 +++--- ts/state/selectors/groups.ts | 1 - .../workers/browser/libsession_worker_interface.ts | 4 ++++ 9 files changed, 35 insertions(+), 14 deletions(-) diff --git a/ts/components/dialog/SessionSeedModal.tsx b/ts/components/dialog/SessionSeedModal.tsx index ba6eba3a08..659e28f2f7 100644 --- a/ts/components/dialog/SessionSeedModal.tsx +++ b/ts/components/dialog/SessionSeedModal.tsx @@ -12,6 +12,7 @@ import { mnDecode } from '../../session/crypto/mnemonic'; import { recoveryPhraseModal } from '../../state/ducks/modalDialog'; import { SpacerSM } from '../basic/Text'; +import { isAutoLogin } from '../../shared/env_vars'; import { saveQRCode } from '../../util/saveQRCode'; import { getCurrentRecoveryPhrase } from '../../util/storage'; import { SessionWrapperModal } from '../SessionWrapperModal'; @@ -131,6 +132,12 @@ const Seed = (props: SeedProps) => { dispatch(recoveryPhraseModal(null)); }; + useMount(() => { + if (isAutoLogin()) { + copyRecoveryPhrase(recoveryPhrase); + } + }); + return ( <>
@@ -186,7 +193,7 @@ interface ModalInnerProps { onClickOk?: () => any; } -const SessionSeedModalInner = (props: ModalInnerProps) => { +export const SessionSeedModal = (props: ModalInnerProps) => { const { onClickOk } = props; const [loadingPassword, setLoadingPassword] = useState(true); const [loadingSeed, setLoadingSeed] = useState(true); @@ -247,5 +254,3 @@ const SessionSeedModalInner = (props: ModalInnerProps) => { ); }; - -export const SessionSeedModal = SessionSeedModalInner; diff --git a/ts/components/registration/RegistrationUserDetails.tsx b/ts/components/registration/RegistrationUserDetails.tsx index 2aee802bfc..063ea8c80d 100644 --- a/ts/components/registration/RegistrationUserDetails.tsx +++ b/ts/components/registration/RegistrationUserDetails.tsx @@ -1,5 +1,6 @@ import classNames from 'classnames'; import React from 'react'; +import useMount from 'react-use/lib/useMount'; import useTimeoutFn from 'react-use/lib/useTimeoutFn'; import { MAX_USERNAME_BYTES } from '../../session/constants'; import { isAutoLogin, isDevProd } from '../../shared/env_vars'; @@ -26,7 +27,7 @@ function useAutoRegister(props: DisplayNameProps) { }, 100); useTimeoutFn(() => { - if (isDevProd() && props.displayName) { + if (isAutoLogin() && props.displayName) { props.handlePressEnter(); } }, 200); @@ -56,6 +57,14 @@ const RecoveryPhraseInput = (props: { handlePressEnter: () => any; stealAutoFocus?: boolean; }) => { + useMount(() => { + if (isAutoLogin()) { + const seed = window.clipboard.readText() as string | undefined; + if (seed?.split(' ').length === 13) { + props.onSeedChanged(seed); + } + } + }); return ( function useAutoContinue(props: { continueSignUp: () => void }) { useTimeoutFn(() => { - if (isDevProd() && isAutoLogin()) { + if (isAutoLogin()) { props.continueSignUp(); } }, 100); diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index e520ed68cd..515a8c79a3 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -475,7 +475,7 @@ export async function innerHandleSwarmContentMessage({ * For a private conversation message, this is just the conversation with that user */ if (!isPrivateConversationMessage) { - console.warn('conversationModelForUIUpdate might need to be checked for groupv2 case'); + console.info('conversationModelForUIUpdate might need to be checked for groupv2 case'); // debugger // this is a closed group message, we have a second conversation to make sure exists conversationModelForUIUpdate = await ConvoHub.use().getOrCreateAndWait( envelope.source, @@ -818,7 +818,7 @@ async function handleMessageRequestResponse( if (previousApprovedMe) { await conversationToApprove.commit(); - window.log.inf( + window.log.info( `convo ${ed25519Str(conversationToApprove.id)} previousApprovedMe is already true. Nothing to do ` ); await IncomingMessageCache.removeFromCache(envelope); diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index f3c9d618d8..52a8874224 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -53,6 +53,7 @@ async function handleGroupSharedConfigMessages( ); // do the merge with our current state await MetaGroupWrapperActions.metaMerge(groupPk, toMerge); + // save updated dumps to the DB right away await LibSessionUtil.saveDumpsToDb(groupPk); diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index 9b91221d24..e560a66f64 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -17,6 +17,7 @@ import { TTL_DEFAULT } from '../../../constants'; import { ConvoHub } from '../../../conversations'; import { GroupUpdateInfoChangeMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { GroupUpdateMemberChangeMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; +import { ed25519Str } from '../../../onions/onionPath'; import { MessageSender } from '../../../sending/MessageSender'; import { PubKey } from '../../../types'; import { allowOnlyOneAtATime } from '../../Promise'; @@ -288,9 +289,9 @@ class GroupSyncJob extends PersistedJob { public async run(): Promise { const start = Date.now(); + const thisJobDestination = this.persistedData.identifier; try { - const thisJobDestination = this.persistedData.identifier; if (!PubKey.is03Pubkey(thisJobDestination)) { return RunJobResult.PermanentFailure; } @@ -318,7 +319,9 @@ class GroupSyncJob extends PersistedJob { } catch (e) { throw e; } finally { - window.log.debug(`UserSyncJob run() took ${Date.now() - start}ms`); + window.log.debug( + `GroupSyncJob ${ed25519Str(thisJobDestination)} run() took ${Date.now() - start}ms` + ); // this is a simple way to make sure whatever happens here, we update the lastest timestamp. // (a finally statement is always executed (no matter if exception or returns in other try/catch block) diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts index 02d7142af6..a903e2eec7 100644 --- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts +++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts @@ -86,9 +86,9 @@ async function insertConvoFromDBIntoWrapperAndRefresh(convoId: string): Promise< ? timestampFromDbMs : 0; - window.log.debug( - `inserting into convoVolatile wrapper: ${convoId} lastMessageReadTimestamp:${lastReadMessageTimestamp} forcedUnread:${isForcedUnread}...` - ); + // window.log.debug( + // `inserting into convoVolatile wrapper: ${convoId} lastMessageReadTimestamp:${lastReadMessageTimestamp} forcedUnread:${isForcedUnread}...` + // ); const convoType = getConvoType(foundConvo); switch (convoType) { diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index 340a88a2bd..b94f5af499 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -40,7 +40,6 @@ function getIsMemberGroupChangePendingFromUI(state: StateType): boolean { export function getLibAdminsPubkeys(state: StateType, convo?: string): Array { const members = getMembersOfGroup(state, convo); - return members.filter(m => m.promoted).map(m => m.pubkeyHex); } diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index f7c875b7ef..91620a5562 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -565,6 +565,10 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'keysNeedsRekey']) as Promise< ReturnType >, + keyGetAll: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'keyGetAll']) as Promise< + ReturnType + >, currentHashes: async (groupPk: GroupPubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'currentHashes']) as Promise< ReturnType From 74f36c8f561f9104b4a8bd58f89e978cfde804a2 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 14 Mar 2024 15:21:19 +1100 Subject: [PATCH 097/302] test: fix unit test with rekey explicit needed --- ts/state/ducks/metaGroups.ts | 23 +++++++++++++++++++ .../DisappearingMessage_test.ts | 10 ++++---- .../libsession_wrapper_metagroup_test.ts | 1 + 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 04f184dee6..5beecedaf8 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -1280,6 +1280,20 @@ function applySendingStateChange({ return state; } +function refreshConvosModelProps(convoIds: Array) { + /** + * + * This is not ideal, but some fields stored in this slice are ALSO stored in the conversation slice. Things like admins,members, groupName, kicked, etc... + * So, anytime a change is made in this metaGroup slice, we need to make sure the conversation slice is updated too. + * The way to update the conversation slice is to call `triggerUIRefresh` on the corresponding conversation object. + * Eventually, we will have a centralized state with libsession used accross the app, and those slices will only expose data from the libsession state. + * + */ + setTimeout(() => { + convoIds.map(id => ConvoHub.use().get(id)).map(c => c?.triggerUIRefresh()); + }, 1000); +} + /** * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. */ @@ -1307,6 +1321,7 @@ const metaGroupSlice = createSlice({ state.infos[groupPk] = infos; state.members[groupPk] = members; state.creationFromUIPending = false; + refreshConvosModelProps([groupPk]); return state; }); builder.addCase(initNewGroupInWrapper.rejected, (state, action) => { @@ -1327,6 +1342,7 @@ const metaGroupSlice = createSlice({ state.infos[element.groupPk] = element.infos; state.members[element.groupPk] = element.members; }); + refreshConvosModelProps(loaded.map(m => m.groupPk)); return state; }); builder.addCase(loadMetaDumpsFromDB.rejected, (state, action) => { @@ -1341,6 +1357,7 @@ const metaGroupSlice = createSlice({ // window.log.debug(`groupInfo after merge: ${stringify(infos)}`); // window.log.debug(`groupMembers after merge: ${stringify(members)}`); + refreshConvosModelProps([groupPk]); } else { window.log.debug( `refreshGroupDetailsFromWrapper no details found, removing from slice: ${groupPk}}` @@ -1366,6 +1383,7 @@ const metaGroupSlice = createSlice({ if (infos && members) { state.infos[groupPk] = infos; state.members[groupPk] = members; + refreshConvosModelProps([groupPk]); window.log.debug(`groupInfo after handleUserGroupUpdate: ${stringify(infos)}`); window.log.debug(`groupMembers after handleUserGroupUpdate: ${stringify(members)}`); @@ -1386,6 +1404,7 @@ const metaGroupSlice = createSlice({ const { infos, members, groupPk } = action.payload; state.infos[groupPk] = infos; state.members[groupPk] = members; + refreshConvosModelProps([groupPk]); window.log.debug(`groupInfo after currentDeviceGroupMembersChange: ${stringify(infos)}`); window.log.debug(`groupMembers after currentDeviceGroupMembersChange: ${stringify(members)}`); @@ -1405,6 +1424,7 @@ const metaGroupSlice = createSlice({ const { infos, members, groupPk } = action.payload; state.infos[groupPk] = infos; state.members[groupPk] = members; + refreshConvosModelProps([groupPk]); window.log.debug(`groupInfo after currentDeviceGroupNameChange: ${stringify(infos)}`); window.log.debug(`groupMembers after currentDeviceGroupNameChange: ${stringify(members)}`); @@ -1422,6 +1442,7 @@ const metaGroupSlice = createSlice({ const { infos, members, groupPk } = action.payload; state.infos[groupPk] = infos; state.members[groupPk] = members; + refreshConvosModelProps([groupPk]); window.log.debug(`groupInfo after handleMemberLeftMessage: ${stringify(infos)}`); window.log.debug(`groupMembers after handleMemberLeftMessage: ${stringify(members)}`); @@ -1435,6 +1456,7 @@ const metaGroupSlice = createSlice({ const { infos, members, groupPk } = action.payload; state.infos[groupPk] = infos; state.members[groupPk] = members; + refreshConvosModelProps([groupPk]); window.log.debug(`groupInfo after markUsAsAdmin: ${stringify(infos)}`); window.log.debug(`groupMembers after markUsAsAdmin: ${stringify(members)}`); @@ -1447,6 +1469,7 @@ const metaGroupSlice = createSlice({ const { infos, members, groupPk } = action.payload; state.infos[groupPk] = infos; state.members[groupPk] = members; + refreshConvosModelProps([groupPk]); window.log.debug(`groupInfo after inviteResponseReceived: ${stringify(infos)}`); window.log.debug(`groupMembers after inviteResponseReceived: ${stringify(members)}`); diff --git a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts index 3abbc24364..ca7ebb6378 100644 --- a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts +++ b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts @@ -176,9 +176,8 @@ describe('DisappearingMessage', () => { it("if it's a Group Conversation and expireTimer > 0 then the message's expirationType is always deleteAfterSend", async () => { const ourConversation = new ConversationModel({ ...conversationArgs, - type: ConversationTypeEnum.GROUP, - // TODO update to 03 prefix when we release new groups - id: '05123456564', + type: ConversationTypeEnum.GROUPV2, + id: TestUtils.generateFakeClosedGroupV2PkStr(), }); const expireTimer = 60; // seconds const expirationMode = 'deleteAfterRead'; // not correct @@ -238,9 +237,8 @@ describe('DisappearingMessage', () => { it("if it's a Group Conversation and expireTimer > 0 then the conversation mode is always deleteAfterSend", async () => { const ourConversation = new ConversationModel({ ...conversationArgs, - type: ConversationTypeEnum.GROUP, - // TODO update to 03 prefix when we release new groups - id: '05123456564', + type: ConversationTypeEnum.GROUPV2, + id: TestUtils.generateFakeClosedGroupV2PkStr(), }); const expirationType = 'deleteAfterRead'; // not correct const expireTimer = 60; // seconds diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index cfb53dc66a..7e358ec238 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -54,6 +54,7 @@ describe('libsession_metagroup', () => { metaDumped: null, userEd25519Secretkey: toFixedUint8ArrayOfLength(us.ed25519KeyPair.privateKey, 64).buffer, }); + metaGroupWrapper.keyRekey(); member = TestUtils.generateFakePubKeyStr(); member2 = TestUtils.generateFakePubKeyStr(); }); From 5185769af0d11037a7385af62bfc86c8fea17336 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 14 Mar 2024 16:28:41 +1100 Subject: [PATCH 098/302] chore: update to libsession-util-nodejs 0.4.2 --- package.json | 4 +-- yarn.lock | 76 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index 960100063b..1da96fe8c6 100644 --- a/package.json +++ b/package.json @@ -93,10 +93,10 @@ "filesize": "3.6.1", "firstline": "1.2.1", "fs-extra": "9.0.0", - "glob": "7.1.2", + "glob": "10.3.10", "image-type": "^4.1.0", "ip2country": "1.0.1", - "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.2/libsession_util_nodejs-v0.4.2.tar.gz", + "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.3/libsession_util_nodejs-v0.4.3.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index fe3253dd71..155bcb29d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1816,12 +1816,12 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -axios@^1.3.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" - integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A== +axios@^1.6.5: + version "1.6.7" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7" + integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA== dependencies: - follow-redirects "^1.15.0" + follow-redirects "^1.15.4" form-data "^4.0.0" proxy-from-env "^1.1.0" @@ -2324,23 +2324,23 @@ clsx@^1.0.4, clsx@^1.1.1, clsx@^1.2.1: integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== cmake-js@^7.2.1: - version "7.2.1" - resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.2.1.tgz#757c0d39994121b084bab96290baf115ee7712cd" - integrity sha512-AdPSz9cSIJWdKvm0aJgVu3X8i0U3mNTswJkSHzZISqmYVjZk7Td4oDFg0mCBA383wO+9pG5Ix7pEP1CZH9x2BA== + version "7.3.0" + resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.3.0.tgz#6fd6234b7aeec4545c1c806f9e3f7ffacd9798b2" + integrity sha512-dXs2zq9WxrV87bpJ+WbnGKv8WUBXDw8blNiwNHoRe/it+ptscxhQHKB1SJXa1w+kocLMeP28Tk4/eTCezg4o+w== dependencies: - axios "^1.3.2" + axios "^1.6.5" debug "^4" - fs-extra "^10.1.0" + fs-extra "^11.2.0" lodash.isplainobject "^4.0.6" memory-stream "^1.0.0" - node-api-headers "^0.0.2" + node-api-headers "^1.1.0" npmlog "^6.0.2" rc "^1.2.7" - semver "^7.3.8" - tar "^6.1.11" + semver "^7.5.4" + tar "^6.2.0" url-join "^4.0.1" which "^2.0.2" - yargs "^17.6.0" + yargs "^17.7.2" color-convert@^1.9.0: version "1.9.3" @@ -3663,10 +3663,10 @@ flatted@^3.2.7: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== -follow-redirects@^1.15.0: - version "1.15.3" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" - integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== +follow-redirects@^1.15.4: + version "1.15.5" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020" + integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw== for-each@^0.3.3: version "0.3.3" @@ -3721,6 +3721,15 @@ fs-extra@^11.0.0: jsonfile "^6.0.1" universalify "^2.0.0" +fs-extra@^11.2.0: + version "11.2.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" + integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -4901,9 +4910,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.3.1/libsession_util_nodejs-v0.3.1.tar.gz": - version "0.3.1" - resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.1/libsession_util_nodejs-v0.3.1.tar.gz#d2c94bfaae6e3ef594609abb08cf8be485fa5d39" +"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.3/libsession_util_nodejs-v0.4.3.tar.gz": + version "0.4.3" + resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.3/libsession_util_nodejs-v0.4.3.tar.gz#f5b6b11e5df5ba7268ffa196a1eea3d7b583944d" dependencies: cmake-js "^7.2.1" node-addon-api "^6.1.0" @@ -5484,10 +5493,10 @@ node-addon-api@^6.1.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76" integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA== -node-api-headers@^0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-0.0.2.tgz#31f4c6c2750b63e598128e76a60aefca6d76ac5d" - integrity sha512-YsjmaKGPDkmhoNKIpkChtCsPVaRE0a274IdERKnuc/E8K1UJdBZ4/mvI006OijlQZHCfpRNOH3dfHQs92se8gg== +node-api-headers@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-1.1.0.tgz#3f9dd7bb10b29e1c3e3db675979605a308b2373c" + integrity sha512-ucQW+SbYCUPfprvmzBsnjT034IGRB2XK8rRc78BgjNKhTdFKgAwAmgW704bKIBmcYW48it0Gkjpkd39Azrwquw== node-fetch@^2.6.7: version "2.7.0" @@ -5972,10 +5981,10 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prettier@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.0.tgz#3bec4489d5eebcd52b95ddd2c22467b5c852fde1" - integrity sha512-GlAIjk6DjkNT6u/Bw5QCWrbzh9YlLKwwmJT//1YiCR3WDpZDnyss64aXHQZgF8VKeGlWnX6+tGsKSVxsZT/gtA== +prettier@^3.0.3: + version "3.2.5" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368" + integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A== progress@^2.0.3: version "2.0.3" @@ -7186,7 +7195,7 @@ tapable@^2.1.1, tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -tar@^6.1.0, tar@^6.1.11: +tar@^6.1.0, tar@^6.1.11, tar@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== @@ -7963,7 +7972,7 @@ yargs@16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^17.0.0, yargs@^17.0.1, yargs@^17.6.0: +yargs@^17.0.0, yargs@^17.0.1, yargs@^17.7.2: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== @@ -7993,3 +8002,8 @@ yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + +zod@^3.22.4: + version "3.22.4" + resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff" + integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg== From 8be63b12b3fc2f65a98267e9afce7e09bf3d0b02 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 15 Mar 2024 11:27:47 +1100 Subject: [PATCH 099/302] chore: remove pify package barely used --- package.json | 2 - preload.js | 1 - ts/mains/main_node.ts | 11 ++- ts/node/attachment_channel.ts | 12 ++-- yarn.lock | 127 ++++++++++++++++++++++------------ 5 files changed, 91 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index ac6772a0e7..9103254597 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,6 @@ "node-fetch": "^2.6.7", "os-locale": "5.0.0", "p-retry": "^4.2.0", - "pify": "3.0.0", "protobufjs": "^7.2.4", "rc-slider": "^10.2.1", "react": "^17.0.2", @@ -158,7 +157,6 @@ "@types/lodash": "^4.14.194", "@types/mocha": "5.0.0", "@types/node-fetch": "^2.5.7", - "@types/pify": "3.0.2", "@types/react": "^17.0.2", "@types/react-dom": "^17.0.2", "@types/react-redux": "^7.1.24", diff --git a/preload.js b/preload.js index aab532116e..3b42129b3e 100644 --- a/preload.js +++ b/preload.js @@ -30,7 +30,6 @@ window.getNodeVersion = () => configAny.node_version; window.sessionFeatureFlags = { useOnionRequests: true, useTestNet: isTestNet(), - integrationTestEnv: isTestIntegration(), useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA debugger debug: { debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts index 8d37b28e53..b936d66e6f 100644 --- a/ts/mains/main_node.ts +++ b/ts/mains/main_node.ts @@ -26,7 +26,6 @@ import url from 'url'; import Logger from 'bunyan'; import _, { isEmpty } from 'lodash'; -import pify from 'pify'; import { setupGlobalErrorHandler } from '../node/global_errors'; // checked - only node import { setup as setupSpellChecker } from '../node/spell_check'; // checked - only node @@ -36,7 +35,7 @@ import packageJson from '../../package.json'; // checked - only node setupGlobalErrorHandler(); -const getRealPath = pify(fs.realpath); +const getRealPath = (p: string) => fs.realpathSync(p); // Hardcoding appId to prevent build failures on release. // const appUserModelId = packageJson.build.appId; @@ -730,8 +729,8 @@ async function saveDebugLog(_event: any, logText: any) { // Some APIs can only be used after this event occurs. let ready = false; app.on('ready', async () => { - const userDataPath = await getRealPath(app.getPath('userData')); - const installPath = await getRealPath(join(app.getAppPath(), '..', '..')); + const userDataPath = getRealPath(app.getPath('userData')); + const installPath = getRealPath(join(app.getAppPath(), '..', '..')); installFileHandler({ protocol: electronProtocol, @@ -783,7 +782,7 @@ function getDefaultSQLKey() { async function removeDB() { // this don't remove attachments and stuff like that... - const userDir = await getRealPath(app.getPath('userData')); + const userDir = getRealPath(app.getPath('userData')); sqlNode.removeDB(userDir); try { @@ -797,7 +796,7 @@ async function removeDB() { } async function showMainWindow(sqlKey: string, passwordAttempt = false) { - const userDataPath = await getRealPath(app.getPath('userData')); + const userDataPath = getRealPath(app.getPath('userData')); await sqlNode.initializeSql({ configDir: userDataPath, diff --git a/ts/node/attachment_channel.ts b/ts/node/attachment_channel.ts index f53984dbb4..c835036f93 100644 --- a/ts/node/attachment_channel.ts +++ b/ts/node/attachment_channel.ts @@ -1,14 +1,12 @@ -import path from 'path'; import { ipcMain } from 'electron'; +import fse from 'fs-extra'; +import { glob } from 'glob'; import { isString, map } from 'lodash'; +import path from 'path'; import rimraf from 'rimraf'; -import fse from 'fs-extra'; -import pify from 'pify'; -// eslint-disable-next-line import/no-named-default -import { default as glob } from 'glob'; -import { sqlNode } from './sql'; // checked - only node import { createDeleter, getAttachmentsPath } from '../shared/attachments/shared_attachments'; +import { sqlNode } from './sql'; // checked - only node let initialized = false; @@ -45,7 +43,7 @@ const getAllAttachments = async (userDataPath: string) => { const dir = getAttachmentsPath(userDataPath); const pattern = path.join(dir, '**', '*'); - const files = await pify(glob)(pattern, { nodir: true }); + const files = await glob(pattern, { nodir: true }); return map(files, file => path.relative(dir, file)); }; diff --git a/yarn.lock b/yarn.lock index a2dcc934c0..5f990d9040 100644 --- a/yarn.lock +++ b/yarn.lock @@ -466,6 +466,18 @@ resolved "https://registry.yarnpkg.com/@iconify/react/-/react-3.2.2.tgz#ab5241dc01562076bae3b0c22238aff7e5f029cc" integrity sha512-z3+Jno3VcJzgNHsN5mEvYMsgCkOZkydqdIwOxjXh45+i2Vs9RGH68Y52vt39izwFSfuYUXhaW+1u7m7+IhCn/g== +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" + "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.3" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" @@ -559,6 +571,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" @@ -989,11 +1006,6 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== -"@types/pify@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/pify/-/pify-3.0.2.tgz#1bc75dac43e31dba981c37e0a08edddc1b49cd39" - integrity sha512-a5AKF1/9pCU3HGMkesgY6LsBdXHUY3WU+I2qgpU0J+I8XuJA1aFr59eS84/HP0+dxsyBSNbt+4yGI2adUpHwSg== - "@types/plist@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" @@ -1865,12 +1877,6 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -<<<<<<< HEAD -axios@^1.6.5: - version "1.6.7" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7" - integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA== -======= available-typed-arrays@^1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" @@ -1878,11 +1884,10 @@ available-typed-arrays@^1.0.6: dependencies: possible-typed-array-names "^1.0.0" -axios@^1.3.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" - integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A== ->>>>>>> upstream/unstable +axios@^1.6.5: + version "1.6.7" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7" + integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA== dependencies: follow-redirects "^1.15.4" form-data "^4.0.0" @@ -3848,6 +3853,14 @@ for-each@^0.3.3: dependencies: is-callable "^1.1.3" +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + form-data@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" @@ -4073,17 +4086,16 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== +glob@10.3.10: + version "10.3.10" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" + foreground-child "^3.1.0" + jackspeak "^2.3.5" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" glob@7.2.0: version "7.2.0" @@ -4903,6 +4915,15 @@ iterator.prototype@^1.1.0: has-symbols "^1.0.3" reflect.getprototypeof "^1.0.3" +jackspeak@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jake@^10.8.5: version "10.8.7" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" @@ -5394,6 +5415,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +"lru-cache@^9.1.1 || ^10.0.0": + version "10.2.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" + integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== + make-dir@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -5568,7 +5594,7 @@ mini-css-extract-plugin@^2.7.5: dependencies: schema-utils "^4.0.0" -"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@9.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1: +"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@9.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1, minimatch@^9.0.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -5601,6 +5627,11 @@ minipass@^5.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== + minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -6124,6 +6155,14 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== +path-scurry@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== + dependencies: + lru-cache "^9.1.1 || ^10.0.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-to-regexp@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" @@ -6161,11 +6200,6 @@ pidtree@0.6.0: resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c" integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== -pify@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== - pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -6252,11 +6286,7 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -<<<<<<< HEAD -prettier@^3.0.3: -======= prettier@3.2.5: ->>>>>>> upstream/unstable version "3.2.5" resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368" integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A== @@ -7170,6 +7200,11 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + sinon@9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d" @@ -7320,7 +7355,7 @@ string-argv@0.3.2: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -7329,7 +7364,7 @@ string-argv@0.3.2: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^5.0.0, string-width@^5.0.1: +string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== @@ -7404,6 +7439,13 @@ string_decoder@^1.1.1: dependencies: safe-buffer "~5.2.0" +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -7411,13 +7453,6 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -8215,7 +8250,7 @@ workerpool@6.2.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== From bd6f5e6e0d060bddea2755ebfdf1d284c5019ba2 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 15 Mar 2024 11:45:21 +1100 Subject: [PATCH 100/302] feat: refacto GroupUpdateName to be functional component --- .../dialog/UpdateGroupNameDialog.tsx | 339 ++++++++---------- ts/components/leftpane/ActionsPanel.tsx | 1 + ts/mains/main_renderer.tsx | 3 - ts/node/sql.ts | 2 +- ts/session/group/closed-group.ts | 13 +- ts/state/ducks/metaGroups.ts | 2 +- ts/state/selectors/groups.ts | 8 + ts/types/attachments/VisualAttachment.ts | 3 +- ts/window.d.ts | 1 - 9 files changed, 169 insertions(+), 203 deletions(-) diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx index 2a047899d2..83cf07c1ef 100644 --- a/ts/components/dialog/UpdateGroupNameDialog.tsx +++ b/ts/components/dialog/UpdateGroupNameDialog.tsx @@ -1,240 +1,199 @@ /* eslint-disable @typescript-eslint/no-misused-promises */ -import autoBind from 'auto-bind'; import classNames from 'classnames'; -import React from 'react'; +import React, { useState } from 'react'; -import { clone } from 'lodash'; -import { ConversationModel } from '../../models/conversation'; +import { useDispatch } from 'react-redux'; +import useKey from 'react-use/lib/useKey'; +import { useIsClosedGroup, useIsPublic } from '../../hooks/useParamSelector'; import { ConvoHub } from '../../session/conversations'; import { ClosedGroup } from '../../session/group/closed-group'; import { initiateOpenGroupUpdate } from '../../session/group/open-group'; import { PubKey } from '../../session/types'; import { groupInfoActions } from '../../state/ducks/metaGroups'; import { updateGroupNameModal } from '../../state/ducks/modalDialog'; -import { getLibGroupNameOutsideRedux } from '../../state/selectors/groups'; +import { useGroupNameChangeFromUIPending } from '../../state/selectors/groups'; import { pickFileForAvatar } from '../../types/attachments/VisualAttachment'; import { SessionWrapperModal } from '../SessionWrapperModal'; import { Avatar, AvatarSize } from '../avatar/Avatar'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; +import { SessionSpinner } from '../basic/SessionSpinner'; import { SpacerMD } from '../basic/Text'; -type Props = { +function GroupAvatar({ + isPublic, + conversationId, + fireInputEvent, + newAvatarObjecturl, + oldAvatarPath, +}: { + isPublic: boolean; conversationId: string; -}; - -interface State { - groupName: string | undefined; - originalGroupName: string; - errorDisplayed: boolean; - errorMessage: string; - oldAvatarPath: string | null; newAvatarObjecturl: string | null; -} - -// TODO break those last class bases components into functional ones (search for `extends React`) -export class UpdateGroupNameDialog extends React.Component { - private readonly convo: ConversationModel; + oldAvatarPath: string | null; + fireInputEvent: () => Promise; +}) { + if (!isPublic) { + return null; + } - constructor(props: Props) { - super(props); + return ( +
+
+ +
+
+
+ ); +} - autoBind(this); - this.convo = ConvoHub.use().get(props.conversationId); +export function UpdateGroupNameDialog(props: { conversationId: string }) { + const dispatch = useDispatch(); + const { conversationId } = props; + const [errorMsg, setErrorMsg] = useState(''); + const [newAvatarObjecturl, setNewAvatarObjecturl] = useState(null); + const isCommunity = useIsPublic(conversationId); + const isClosedGroup = useIsClosedGroup(conversationId); + const convo = ConvoHub.use().get(conversationId); + const isNameChangePending = useGroupNameChangeFromUIPending(); + + if (!convo) { + throw new Error('UpdateGroupNameDialog corresponding convo not found'); + } - const libGroupName = getLibGroupNameOutsideRedux(props.conversationId); - const groupNameFromConvo = this.convo.getRealSessionUsername(); - const groupName = libGroupName || groupNameFromConvo; + const oldAvatarPath = convo?.getAvatarPath() || null; + const originalGroupName = convo?.getRealSessionUsername(); + const [newGroupName, setNewGroupName] = useState(originalGroupName); - this.state = { - groupName: clone(groupName), - originalGroupName: clone(groupName) || '', - errorDisplayed: false, - errorMessage: 'placeholder', - oldAvatarPath: this.convo.getAvatarPath(), - newAvatarObjecturl: null, - }; + function closeDialog() { + dispatch(updateGroupNameModal(null)); } - public componentDidMount() { - window.addEventListener('keyup', this.onKeyUp); + function onShowError(msg: string) { + if (errorMsg === msg) { + return; + } + setErrorMsg(msg); } - public componentWillUnmount() { - window.removeEventListener('keyup', this.onKeyUp); + async function fireInputEvent() { + const scaledObjectUrl = await pickFileForAvatar(); + if (scaledObjectUrl) { + setNewAvatarObjecturl(scaledObjectUrl); + } } - public onClickOK() { - const { groupName, newAvatarObjecturl, oldAvatarPath } = this.state; - const trimmedGroupName = groupName?.trim(); + function onClickOK() { + if (isNameChangePending) { + return; + } + const trimmedGroupName = newGroupName?.trim(); if (!trimmedGroupName) { - this.onShowError(window.i18n('emptyGroupNameError')); + onShowError(window.i18n('emptyGroupNameError')); return; } + onShowError(''); - if (trimmedGroupName !== this.state.originalGroupName || newAvatarObjecturl !== oldAvatarPath) { - if (this.convo.isPublic()) { - void initiateOpenGroupUpdate(this.convo.id, trimmedGroupName, { + if (trimmedGroupName !== originalGroupName || newAvatarObjecturl !== oldAvatarPath) { + if (isCommunity) { + void initiateOpenGroupUpdate(conversationId, trimmedGroupName, { objectUrl: newAvatarObjecturl, }); - this.closeDialog(); + closeDialog(); } else { - const groupPk = this.convo.id; - if (PubKey.is03Pubkey(groupPk)) { - const groupv2Action = groupInfoActions.currentDeviceGroupNameChange({ - groupPk, + if (PubKey.is03Pubkey(conversationId)) { + const updateNameAction = groupInfoActions.currentDeviceGroupNameChange({ + groupPk: conversationId, newName: trimmedGroupName, }); - window.inboxStore.dispatch(groupv2Action as any); + dispatch(updateNameAction as any); return; // keeping the dialog open until the async thunk is done } - const members = this.convo.getGroupMembers() || []; - void ClosedGroup.initiateClosedGroupUpdate(this.convo.id, trimmedGroupName, members); - this.closeDialog(); + void ClosedGroup.initiateClosedGroupUpdate(conversationId, trimmedGroupName, null); + closeDialog(); } } } - public render() { - const okText = window.i18n('ok'); - const cancelText = window.i18n('cancel'); - const titleText = window.i18n('updateGroupDialogTitle', [ - this.convo.getRealSessionUsername() || window.i18n('unknown'), - ]); - - const errorMsg = this.state.errorMessage; - const errorMessageClasses = classNames( - 'error-message', - this.state.errorDisplayed ? 'error-shown' : 'error-faded' - ); - - const isAdmin = !this.convo.isPublic(); - - return ( - this.closeDialog()} - additionalClassName="update-group-dialog" - > - {this.state.errorDisplayed ? ( - <> - -

{errorMsg}

- - - ) : null} - - {this.renderAvatar()} - - - {isAdmin ? ( - - ) : null} - -
- - -
- - ); - } - - private onShowError(msg: string) { - if (this.state.errorDisplayed) { - return; - } + useKey('Escape', closeDialog); + useKey('Esc', closeDialog); + useKey('Enter', onClickOK); - this.setState({ - errorDisplayed: true, - errorMessage: msg, - }); - - setTimeout(() => { - this.setState({ - errorDisplayed: false, - }); - }, 3000); - } - - private onKeyUp(event: any) { - switch (event.key) { - case 'Enter': - this.onClickOK(); - break; - case 'Esc': - case 'Escape': - this.closeDialog(); - break; - default: - } - } - - private closeDialog() { - window.removeEventListener('keyup', this.onKeyUp); - - window.inboxStore?.dispatch(updateGroupNameModal(null)); + if (!isClosedGroup && !isCommunity) { + throw new Error('groupNameUpdate dialog only works for communities and closed groups'); } - private onGroupNameChanged(event: any) { - const groupName = event.target.value; - this.setState(state => { - return { - ...state, - groupName, - }; - }); - } - - private renderAvatar() { - const isPublic = this.convo.isPublic(); - const pubkey = this.convo.id; - - const { newAvatarObjecturl, oldAvatarPath } = this.state; - - if (!isPublic) { - return undefined; - } - - return ( -
-
- -
-
+ const okText = window.i18n('ok'); + const cancelText = window.i18n('cancel'); + const titleText = window.i18n('updateGroupDialogTitle', [ + originalGroupName || window.i18n('unknown'), + ]); + + const errorMessageClasses = classNames('error-message', errorMsg ? 'error-shown' : 'error-faded'); + + const isAdmin = !isCommunity; + // return null; + + return ( + closeDialog()} + additionalClassName="update-group-dialog" + > + {errorMsg ? ( + <> + +

{errorMsg}

+ + + ) : null} + + + + + {isAdmin ? ( + setNewGroupName(e.target.value)} + tabIndex={0} + required={true} + aria-required={true} + autoFocus={true} + data-testid="group-name-input" + /> + ) : null} + + + +
+ +
- ); - } - - private async fireInputEvent() { - const scaledObjectUrl = await pickFileForAvatar(); - if (scaledObjectUrl) { - this.setState({ newAvatarObjecturl: scaledObjectUrl }); - } - } + + ); } diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 5565fafeea..9ea9c8d51d 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -208,6 +208,7 @@ const doAppStartUp = async () => { void getSwarmPollingInstance().start(); void loadDefaultRooms(); void SnodePool.getFreshSwarmFor(UserUtils.getOurPubKeyStrFromCache()); // refresh our swarm on start to speed up the first message fetching event + void Data.cleanupOrphanedAttachments(); // TODOLATER make this a job of the JobRunner debounce(triggerAvatarReUploadIfNeeded, 200); diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx index 6149b240e4..1215857a18 100644 --- a/ts/mains/main_renderer.tsx +++ b/ts/mains/main_renderer.tsx @@ -201,9 +201,6 @@ Storage.onready(async () => { if (newVersion) { window.log.info(`New version detected: ${currentVersion}; previous: ${lastVersion}`); - - await Data.cleanupOrphanedAttachments(); - await deleteAllLogs(); } diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 65adc4bdf3..0941e38e19 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -230,7 +230,7 @@ async function initializeSql({ return true; } -function removeDB(configDir = null) { +function removeDB(configDir: string | null = null) { if (isInstanceInitialized()) { throw new Error('removeDB: Cannot erase database when it is open!'); } diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index f92ae9209f..551ee4ae31 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -56,7 +56,7 @@ export type GroupDiff = PropsForGroupUpdateType; async function initiateClosedGroupUpdate( groupId: string, groupName: string, - members: Array + members: Array | null ) { const isGroupV2 = PubKey.is03Pubkey(groupId); if (isGroupV2) { @@ -76,14 +76,16 @@ async function initiateClosedGroupUpdate( throw new Error(`Groups cannot be deleteAfterRead`); } + const updatedMembers = members === null ? convo.getGroupMembers() : members; + // do not give an admins field here. We don't want to be able to update admins and // updateOrCreateClosedGroup() will update them if given the choice. const groupDetails: GroupInfo = { id: groupId, name: groupName, - members, + members: updatedMembers, // remove from the zombies list the zombies not which are not in the group anymore - zombies: convo.getGroupZombies()?.filter(z => members.includes(z)), + zombies: convo.getGroupZombies()?.filter(z => updatedMembers.includes(z)), activeAt: Date.now(), expirationType, expireTimer, @@ -102,7 +104,7 @@ async function initiateClosedGroupUpdate( const updateObj: GroupInfo = { id: groupId, name: groupName, - members, + members: updatedMembers, admins: convo.getGroupAdmins(), expireTimer: convo.get('expireTimer'), }; @@ -142,8 +144,7 @@ async function initiateClosedGroupUpdate( diff: leavingOnlyDiff, ...sharedDetails, }); - const stillMembers = members; - await sendRemovedMembers(convo, diff.kicked, stillMembers, dbMessageLeaving.id as string); + await sendRemovedMembers(convo, diff.kicked, updatedMembers, dbMessageLeaving.id as string); } await convo.commit(); } diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 5beecedaf8..fcca693b56 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -1430,7 +1430,7 @@ const metaGroupSlice = createSlice({ window.log.debug(`groupMembers after currentDeviceGroupNameChange: ${stringify(members)}`); }); builder.addCase(currentDeviceGroupNameChange.rejected, (state, action) => { - window.log.error('a currentDeviceGroupNameChange was rejected', action.error); + window.log.error(`a ${currentDeviceGroupNameChange.name} was rejected`, action.error); state.nameChangesFromUIPending = false; }); builder.addCase(currentDeviceGroupNameChange.pending, state => { diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index b94f5af499..049361a830 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -38,6 +38,10 @@ function getIsMemberGroupChangePendingFromUI(state: StateType): boolean { return getLibGroupsState(state).memberChangesFromUIPending; } +function getGroupNameChangeFromUIPending(state: StateType): boolean { + return getLibGroupsState(state).nameChangesFromUIPending; +} + export function getLibAdminsPubkeys(state: StateType, convo?: string): Array { const members = getMembersOfGroup(state, convo); return members.filter(m => m.promoted).map(m => m.pubkeyHex); @@ -148,6 +152,10 @@ export function useMemberGroupChangePending() { return useSelector(getIsMemberGroupChangePendingFromUI); } +export function useGroupNameChangeFromUIPending() { + return useSelector(getGroupNameChangeFromUIPending); +} + /** * The selectors above are all deriving data from libsession. * There is also some data that we only need in memory, not part of libsession (and so unsaved). diff --git a/ts/types/attachments/VisualAttachment.ts b/ts/types/attachments/VisualAttachment.ts index dea63f707e..a17f3422f1 100644 --- a/ts/types/attachments/VisualAttachment.ts +++ b/ts/types/attachments/VisualAttachment.ts @@ -10,6 +10,7 @@ import { getDecryptedMediaUrl, } from '../../session/crypto/DecryptedAttachmentsManager'; import { ToastUtils } from '../../session/utils'; +import { isTestIntegration } from '../../shared/env_vars'; import { GoogleChrome } from '../../util'; import { autoScaleForAvatar, autoScaleForThumbnail } from '../../util/attachmentsUtil'; import { isAudio } from '../MIME'; @@ -205,7 +206,7 @@ export async function autoScaleAvatarBlob(file: File) { * Shows the system file picker for images, scale the image down for avatar/opengroup measurements and return the blob objectURL on success */ export async function pickFileForAvatar(): Promise { - if (window.sessionFeatureFlags.integrationTestEnv) { + if (isTestIntegration()) { window.log.info( 'shorting pickFileForAvatar as it does not work in playwright/notsending the filechooser event' ); diff --git a/ts/window.d.ts b/ts/window.d.ts index de2c41d440..6d10341433 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -30,7 +30,6 @@ declare global { useOnionRequests: boolean; useTestNet: boolean; useClosedGroupV2: boolean; - integrationTestEnv: boolean; debug: { debugLogging: boolean; debugLibsessionDumps: boolean; From ba7fc42a3ac794d7cdf35f8e720c8f127ea67200 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 15 Mar 2024 11:45:42 +1100 Subject: [PATCH 101/302] fix: groupAdmins for communities taken into account --- ts/models/conversation.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index a796442326..c075da9b12 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1968,7 +1968,10 @@ export class ConversationModel extends Backbone.Model { } public getGroupAdmins(): Array { - const groupAdmins = getLibGroupAdminsOutsideRedux(this.id) || this.get('groupAdmins'); + if (this.isClosedGroupV2()) { + return getLibGroupAdminsOutsideRedux(this.id); + } + const groupAdmins = this.get('groupAdmins'); return groupAdmins && groupAdmins.length > 0 ? groupAdmins : []; } @@ -2553,7 +2556,7 @@ export class ConversationModel extends Backbone.Model { switch (type) { case 'admins': - return this.updateGroupAdmins(replacedWithOurRealSessionId, false); + return this.updateGroupAdmins(replacedWithOurRealSessionId, true); case 'mods': ReduxSogsRoomInfos.setModeratorsOutsideRedux(this.id, replacedWithOurRealSessionId); return false; From 2b53d109ed3be14bfb40f648b77e95134573beb9 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 15 Mar 2024 13:34:40 +1100 Subject: [PATCH 102/302] fix: cleaned up UpdateGroupNameDialog css --- stylesheets/_modal.scss | 22 ------------------- .../dialog/UpdateGroupNameDialog.tsx | 15 ++++++++----- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/stylesheets/_modal.scss b/stylesheets/_modal.scss index 8446da1a30..78bf60a05a 100644 --- a/stylesheets/_modal.scss +++ b/stylesheets/_modal.scss @@ -78,28 +78,6 @@ } } -.add-moderators-dialog, -.remove-moderators-dialog, -.edit-profile-dialog { - .error-message { - text-align: center; - color: var(--danger-color); - display: block; - user-select: none; - } - - .error-faded { - opacity: 0; - margin-top: -5px; - transition: all 100ms linear; - } - - .error-shown { - opacity: 1; - transition: all 250ms linear; - } -} - .loki-dialog { display: flex; align-items: center; diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx index 83cf07c1ef..7a45b93cdb 100644 --- a/ts/components/dialog/UpdateGroupNameDialog.tsx +++ b/ts/components/dialog/UpdateGroupNameDialog.tsx @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-misused-promises */ -import classNames from 'classnames'; import React, { useState } from 'react'; import { useDispatch } from 'react-redux'; import useKey from 'react-use/lib/useKey'; +import styled from 'styled-components'; import { useIsClosedGroup, useIsPublic } from '../../hooks/useParamSelector'; import { ConvoHub } from '../../session/conversations'; import { ClosedGroup } from '../../session/group/closed-group'; @@ -50,6 +50,13 @@ function GroupAvatar({ ); } +const StyledError = styled.p` + text-align: center; + color: var(--danger-color); + display: block; + user-select: none; +`; + export function UpdateGroupNameDialog(props: { conversationId: string }) { const dispatch = useDispatch(); const { conversationId } = props; @@ -112,7 +119,7 @@ export function UpdateGroupNameDialog(props: { conversationId: string }) { }); dispatch(updateNameAction as any); - return; // keeping the dialog open until the async thunk is done + return; // keeping the dialog open until the async thunk is done (via isNameChangePending) } void ClosedGroup.initiateClosedGroupUpdate(conversationId, trimmedGroupName, null); @@ -135,8 +142,6 @@ export function UpdateGroupNameDialog(props: { conversationId: string }) { originalGroupName || window.i18n('unknown'), ]); - const errorMessageClasses = classNames('error-message', errorMsg ? 'error-shown' : 'error-faded'); - const isAdmin = !isCommunity; // return null; @@ -149,7 +154,7 @@ export function UpdateGroupNameDialog(props: { conversationId: string }) { {errorMsg ? ( <> -

{errorMsg}

+ {errorMsg} ) : null} From df586d6e153709053ab529c6fc68265c3c49a41d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 15 Mar 2024 14:12:08 +1100 Subject: [PATCH 103/302] fix: mark a synced groupUpdate as sent --- ts/components/SessionInboxView.tsx | 1 + ts/receiver/closedGroups.ts | 4 ++++ ts/receiver/groupv2/handleGroupV2Message.ts | 4 ++++ ts/session/group/closed-group.ts | 25 ++++++++++++++++----- ts/state/ducks/metaGroups.ts | 4 ++++ ts/window.d.ts | 1 + 6 files changed, 33 insertions(+), 6 deletions(-) diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index 95f7b4c1e1..bc69090b2f 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -104,6 +104,7 @@ async function setupLeftPane(forceUpdateInboxComponent: () => void) { window.inboxStore.dispatch(updateAllOnStorageReady()); window.inboxStore.dispatch(groupInfoActions.loadMetaDumpsFromDB()); // this loads the dumps from DB and fills the 03-groups slice with the corresponding details forceUpdateInboxComponent(); + window.getState = window.inboxStore.getState; } const SomeDeviceOutdatedSyncingNotice = () => { diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index c48d273277..fedef5201d 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -634,6 +634,7 @@ async function handleClosedGroupNameChanged( sender: envelope.senderIdentity, sentAt: toNumber(envelope.timestamp), expireUpdate, + markAlreadySent: false, // legacy groups support will be removed eventually }); if (!shouldOnlyAddUpdateMessage) { convo.set({ displayNameInProfile: newName }); @@ -697,6 +698,7 @@ async function handleClosedGroupMembersAdded( sender: envelope.senderIdentity, sentAt: toNumber(envelope.timestamp), expireUpdate, + markAlreadySent: false, // legacy groups support will be removed eventually }); if (!shouldOnlyAddUpdateMessage) { @@ -787,6 +789,7 @@ async function handleClosedGroupMembersRemoved( sender: envelope.senderIdentity, sentAt: toNumber(envelope.timestamp), expireUpdate, + markAlreadySent: false, // legacy groups support will be removed eventually }); convo.updateLastMessage(); } @@ -919,6 +922,7 @@ async function handleClosedGroupMemberLeft( sender: envelope.senderIdentity, sentAt: toNumber(envelope.timestamp), expireUpdate, + markAlreadySent: false, // legacy groups support will be removed eventually }); convo.updateLastMessage(); // if a user just left and we are the admin, we remove him right away for everyone by sending a MEMBERS_REMOVED message so no need to add him as a zombie diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index d687c21d46..16ad8d0fa8 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -205,6 +205,7 @@ async function handleGroupInfoChangeMessage({ sender: author, sentAt: signatureTimestamp, expireUpdate: null, + markAlreadySent: true, }); break; @@ -216,6 +217,7 @@ async function handleGroupInfoChangeMessage({ sender: author, sentAt: signatureTimestamp, expireUpdate: null, + markAlreadySent: true, }); break; } @@ -280,6 +282,7 @@ async function handleGroupMemberChangeMessage({ sender: author, sentAt: signatureTimestamp, expireUpdate: null, + markAlreadySent: true, }; switch (change.type) { @@ -339,6 +342,7 @@ async function handleGroupMemberLeftMessage({ sender: author, sentAt: signatureTimestamp, expireUpdate: null, + markAlreadySent: true, }); convo.set({ diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index 551ee4ae31..f2ab73d14f 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -115,6 +115,7 @@ async function initiateClosedGroupUpdate( // Note: we agreed that legacy group control messages do not expire expireUpdate: null, convo, + markAlreadySent: false, }; if (diff.type === 'name' && diff.newName?.length) { @@ -155,12 +156,14 @@ export async function addUpdateMessage({ sender, sentAt, expireUpdate, + markAlreadySent, }: { convo: ConversationModel; diff: GroupDiff; sender: string; sentAt: number; expireUpdate: DisappearingMessageUpdate | null; + markAlreadySent: boolean; }): Promise { const groupUpdate: MessageGroupUpdate = {}; @@ -185,7 +188,7 @@ export async function addUpdateMessage({ } const isUs = UserUtils.isUsFromCache(sender); - const msgModel: MessageAttributesOptionals = { + const msgAttrs: MessageAttributesOptionals = { sent_at: sentAt, group_update: groupUpdate, source: sender, @@ -193,16 +196,26 @@ export async function addUpdateMessage({ type: isUs ? 'outgoing' : 'incoming', }; + /** + * When we receive an update from our linked device, it is an outgoing message + * but which was obviously already synced (as we got it). + * When that's the case we need to makr the message as sent right away, + * so the MessageStatus 'sending' state is not shown for the last message in the left pane. + */ + if (msgAttrs.type === 'outgoing' && markAlreadySent) { + msgAttrs.sent = true; + } + if (convo && expireUpdate && expireUpdate.expirationType && expireUpdate.expirationTimer > 0) { const { expirationTimer, expirationType, isLegacyDataMessage } = expireUpdate; - msgModel.expirationType = expirationType === 'deleteAfterSend' ? 'deleteAfterSend' : 'unknown'; - msgModel.expireTimer = msgModel.expirationType === 'deleteAfterSend' ? expirationTimer : 0; + msgAttrs.expirationType = expirationType === 'deleteAfterSend' ? 'deleteAfterSend' : 'unknown'; + msgAttrs.expireTimer = msgAttrs.expirationType === 'deleteAfterSend' ? expirationTimer : 0; // NOTE Triggers disappearing for an incoming groupUpdate message // TODO legacy messages support will be removed in a future release if (isLegacyDataMessage || expirationType === 'deleteAfterSend') { - msgModel.expirationStartTimestamp = DisappearingMessages.setExpirationStartTimestamp( + msgAttrs.expirationStartTimestamp = DisappearingMessages.setExpirationStartTimestamp( isLegacyDataMessage ? 'legacy' : expirationType === 'unknown' ? 'off' : expirationType, sentAt, 'addUpdateMessage' @@ -211,9 +224,9 @@ export async function addUpdateMessage({ } return isUs - ? convo.addSingleOutgoingMessage(msgModel) + ? convo.addSingleOutgoingMessage(msgAttrs) : convo.addSingleIncomingMessage({ - ...msgModel, + ...msgAttrs, source: sender, }); } diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index fcca693b56..f51a764f4e 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -205,6 +205,7 @@ const initNewGroupInWrapper = createAsyncThunk( sender: us, sentAt, convo, + markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier }); const groupChange = await getWithoutHistoryControlMessage({ adminSecretKey: groupSecretKey, @@ -830,6 +831,7 @@ async function handleMemberAddedFromUI({ ? createAtNetworkTimestamp + expiringDetails.expireTimer : null, }, + markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier }; const updateMessagesToPush: Array = []; @@ -961,6 +963,7 @@ async function handleMemberRemovedFromUI({ const msgModel = await ClosedGroup.addUpdateMessage({ diff: { type: 'kicked', kicked: removed }, ...shared, + markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier }); const removedControlMessage = await getRemovedControlMessage({ adminSecretKey: group.secretKey, @@ -1017,6 +1020,7 @@ async function handleNameChangeFromUI({ sender: us, sentAt: createAtNetworkTimestamp, expireUpdate: null, + markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier }); // we want to send an update only if the change was made locally. diff --git a/ts/window.d.ts b/ts/window.d.ts index 6d10341433..1958719401 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -78,6 +78,7 @@ declare global { setMenuBarVisibility: (val: boolean) => void; contextMenuShown: boolean; inboxStore?: Store; + getState: () => unknown; openConversationWithMessages: (args: { conversationKey: string; messageId: string | null; From cbccc8c76c17b2bf1d32231195a32491e83f63b2 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 18 Mar 2024 13:08:42 +1100 Subject: [PATCH 104/302] fix: notification text based on msg content --- .../message-item/GroupUpdateMessage.tsx | 101 +------ .../overlay/OverlayRightPanelSettings.tsx | 14 + .../conversation-list-item/MessageItem.tsx | 8 +- ts/hooks/useParamSelector.ts | 7 + ts/interactions/conversationInteractions.ts | 41 ++- ts/models/conversation.ts | 29 +- ts/models/message.ts | 253 +++++------------ ts/models/messageType.ts | 12 +- ts/notifications/formatNotifications.ts | 264 ++++++++++++++++++ ts/receiver/groupv2/handleGroupV2Message.ts | 7 +- 10 files changed, 431 insertions(+), 305 deletions(-) create mode 100644 ts/notifications/formatNotifications.ts diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx index d6c25980af..6a6a9c989e 100644 --- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx +++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx @@ -1,9 +1,8 @@ import React from 'react'; import { PubkeyType } from 'libsession_util_nodejs'; -import { cloneDeep } from 'lodash'; import { useConversationsUsernameWithQuoteOrShortPk } from '../../../../hooks/useParamSelector'; -import { arrayContainsUsOnly } from '../../../../models/message'; +import { FormatNotifications } from '../../../../notifications/formatNotifications'; import { PreConditionFailed } from '../../../../session/utils/errors'; import { PropsForGroupUpdate, @@ -15,87 +14,6 @@ import { assertUnreachable } from '../../../../types/sqlSharedTypes'; import { ExpirableReadableMessage } from './ExpirableReadableMessage'; import { NotificationBubble } from './notification-bubble/NotificationBubble'; -type IdWithName = { sessionId: PubkeyType; name: string }; - -function mapIdsWithNames(changed: Array, names: Array): Array { - if (!changed.length || !names.length) { - throw new PreConditionFailed('mapIdsWithNames needs a change'); - } - if (changed.length !== names.length) { - throw new PreConditionFailed('mapIdsWithNames needs a the same length to map them together'); - } - return changed.map((sessionId, index) => { - return { sessionId, name: names[index] }; - }); -} - -/** - * When we are part of a change, we display the You first, and then others. - * This function is used to check if we are part of the list. - * - if yes: returns {weArePart: true, others: changedWithoutUs} - * - if yes: returns {weArePart: false, others: changed} - */ -function moveUsToStart( - changed: Array, - us: PubkeyType -): { - sortedWithUsFirst: Array; -} { - const usAt = changed.findIndex(m => m.sessionId === us); - if (usAt <= -1) { - // we are not in it - return { sortedWithUsFirst: changed }; - } - const usItem = changed.at(usAt); - if (!usItem) { - throw new PreConditionFailed('"we" should have been there'); - } - // deepClone because splice mutates the array - const changedCopy = cloneDeep(changed); - changedCopy.splice(usAt, 1); - return { sortedWithUsFirst: [usItem, ...changedCopy] }; -} - -function changeOfMembersV2({ - changedWithNames, - type, - us, -}: { - type: 'added' | 'addedWithHistory' | 'promoted' | 'removed'; - changedWithNames: Array; - us: PubkeyType; -}): string { - const { sortedWithUsFirst } = moveUsToStart(changedWithNames, us); - if (changedWithNames.length === 0) { - throw new PreConditionFailed('change must always have an associated change'); - } - const subject = - sortedWithUsFirst.length === 1 && sortedWithUsFirst[0].sessionId === us - ? 'You' - : sortedWithUsFirst.length === 1 - ? 'One' - : sortedWithUsFirst.length === 2 - ? 'Two' - : 'Others'; - - const action = - type === 'addedWithHistory' - ? 'JoinedWithHistory' - : type === 'added' - ? 'Joined' - : type === 'promoted' - ? 'Promoted' - : ('Removed' as const); - const key = `group${subject}${action}` as const; - - const sortedWithUsOrCount = - subject === 'Others' - ? [sortedWithUsFirst[0].name, (sortedWithUsFirst.length - 1).toString()] - : sortedWithUsFirst.map(m => m.name); - - return window.i18n(key, sortedWithUsOrCount); -} - // TODO those lookups might need to be memoized const ChangeItemJoined = (added: Array, withHistory: boolean): string => { if (!added.length) { @@ -105,8 +23,8 @@ const ChangeItemJoined = (added: Array, withHistory: boolean): strin const isGroupV2 = useSelectedIsGroupV2(); const us = useOurPkStr(); if (isGroupV2) { - return changeOfMembersV2({ - changedWithNames: mapIdsWithNames(added, names), + return FormatNotifications.changeOfMembersV2({ + changedWithNames: FormatNotifications.mapIdsWithNames(added, names), type: withHistory ? 'addedWithHistory' : 'added', us, }); @@ -123,14 +41,15 @@ const ChangeItemKicked = (removed: Array): string => { const isGroupV2 = useSelectedIsGroupV2(); const us = useOurPkStr(); if (isGroupV2) { - return changeOfMembersV2({ - changedWithNames: mapIdsWithNames(removed, names), + return FormatNotifications.changeOfMembersV2({ + changedWithNames: FormatNotifications.mapIdsWithNames(removed, names), type: 'removed', us, }); } - if (arrayContainsUsOnly(removed)) { + // legacy groups + if (FormatNotifications.arrayContainsUsOnly(removed)) { return window.i18n('youGotKickedFromGroup'); } @@ -146,8 +65,8 @@ const ChangeItemPromoted = (promoted: Array): string => { const isGroupV2 = useSelectedIsGroupV2(); const us = useOurPkStr(); if (isGroupV2) { - return changeOfMembersV2({ - changedWithNames: mapIdsWithNames(promoted, names), + return FormatNotifications.changeOfMembersV2({ + changedWithNames: FormatNotifications.mapIdsWithNames(promoted, names), type: 'promoted', us, }); @@ -170,7 +89,7 @@ const ChangeItemLeft = (left: Array): string => { const names = useConversationsUsernameWithQuoteOrShortPk(left); - if (arrayContainsUsOnly(left)) { + if (FormatNotifications.arrayContainsUsOnly(left)) { return window.i18n('youLeftTheGroup'); } diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index e6e68abb70..78980902c6 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -21,8 +21,10 @@ import { showRemoveModeratorsByConvoId, showUpdateGroupMembersByConvoId, showUpdateGroupNameByConvoId, + triggerFakeAvatarUpdate, } from '../../../../interactions/conversationInteractions'; import { Constants } from '../../../../session'; +import { isDevProd } from '../../../../shared/env_vars'; import { closeRightPanel } from '../../../../state/ducks/conversations'; import { resetRightOverlayMode, setRightOverlayMode } from '../../../../state/ducks/section'; import { @@ -204,6 +206,7 @@ export const OverlayRightPanelSettings = () => { const isBlocked = useSelectedIsBlocked(); const isKickedFromGroup = useSelectedIsKickedFromGroup(); const isGroup = useSelectedIsGroupOrCommunity(); + const isGroupV2 = useSelectedIsGroupV2(); const isPublic = useSelectedIsPublic(); const weAreAdmin = useSelectedWeAreAdmin(); const disappearingMessagesSubtitle = useDisappearingMessageSettingText({ @@ -293,6 +296,17 @@ export const OverlayRightPanelSettings = () => { /> )} + {isDevProd() && isGroupV2 ? ( + { + void triggerFakeAvatarUpdate(selectedConvoKey); + }} + dataTestId="edit-group-name" + /> + ) : null} + {showAddRemoveModeratorsButton && ( <> { if (isEmpty(text)) { return null; } + const withoutHtmlTags = text.replaceAll(/(<([^>]+)>)/gi, ''); return (
@@ -54,7 +55,12 @@ export const MessageItem = () => { {isConvoTyping ? ( ) : ( - + )}
{!isSearchingMode && lastMessage && lastMessage.status && !isMessageRequest ? ( diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 6b69848767..3f7e61b8f3 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -93,6 +93,13 @@ function usernameForQuoteOrFullPk(pubkey: string, state: StateType) { return nameGot?.length ? nameGot : null; } +export function usernameForQuoteOrFullPkOutsideRedux(pubkey: string) { + if (window?.inboxStore?.getState()) { + return usernameForQuoteOrFullPk(pubkey, window.inboxStore.getState()) || PubKey.shorten(pubkey); + } + return PubKey.shorten(pubkey); +} + /** * Returns either the nickname, the profileName, in '"' or the full pubkeys given */ diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 6482373e6e..00baaf519f 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -1,4 +1,4 @@ -import { isNil } from 'lodash'; +import { isEmpty, isNil } from 'lodash'; import { ConversationNotificationSettingType, ConversationTypeEnum, @@ -10,6 +10,7 @@ import { SessionButtonColor } from '../components/basic/SessionButton'; import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings'; import { Data } from '../data/data'; import { SettingsKey } from '../data/settings-key'; +import { SignalService } from '../protobuf'; import { GroupV2Receiver } from '../receiver/groupv2/handleGroupV2Message'; import { uploadFileToFsWithOnionV4 } from '../session/apis/file_server_api/FileServerApi'; import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; @@ -19,11 +20,13 @@ import { ConvoHub } from '../session/conversations'; import { getSodiumRenderer } from '../session/crypto'; import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; import { DisappearingMessageConversationModeType } from '../session/disappearing_messages/types'; +import { GroupUpdateInfoChangeMessage } from '../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { ed25519Str } from '../session/onions/onionPath'; import { PubKey } from '../session/types'; import { perfEnd, perfStart } from '../session/utils/Performance'; import { sleepFor } from '../session/utils/Promise'; import { fromHexToArray, toHex } from '../session/utils/String'; +import { GroupSync } from '../session/utils/job_runners/jobs/GroupSyncJob'; import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils'; @@ -322,6 +325,42 @@ export async function showUpdateGroupNameByConvoId(conversationId: string) { window.inboxStore?.dispatch(updateGroupNameModal({ conversationId })); } +export async function triggerFakeAvatarUpdate(conversationId: string) { + if (!PubKey.is03Pubkey(conversationId)) { + throw new Error('triggerAvatarUpdate only works for groupv2'); + } + const convo = ConvoHub.use().get(conversationId); + const group = await UserGroupsWrapperActions.getGroup(conversationId); + if (!convo || !group || !group.secretKey || isEmpty(group.secretKey)) { + throw new Error( + 'triggerFakeAvatarUpdate: tried to make change to group but we do not have the admin secret key' + ); + } + + const createdAt = GetNetworkTime.now(); + + const msgModel = await convo.addSingleOutgoingMessage({ + group_update: { avatarChange: true }, + sent_at: createdAt, + // the store below will mark the message as sent based on msgModel.id + }); + await msgModel.commit(); + const updateMsg = new GroupUpdateInfoChangeMessage({ + createAtNetworkTimestamp: createdAt, + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR, + expirationType: 'unknown', + expireTimer: 0, + groupPk: conversationId, + identifier: msgModel.id, + secretKey: group.secretKey, + sodium: await getSodiumRenderer(), + }); + await GroupSync.storeGroupUpdateMessages({ + groupPk: conversationId, + updateMessages: [updateMsg], + }); +} + export async function showUpdateGroupMembersByConvoId(conversationId: string) { const conversation = ConvoHub.use().get(conversationId); if (conversation.isClosedGroup()) { diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index c075da9b12..899443e6eb 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -131,6 +131,7 @@ import { handleAcceptConversationRequest } from '../interactions/conversationInt import { DisappearingMessages } from '../session/disappearing_messages'; import { GroupUpdateInfoChangeMessage } from '../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { FetchMsgExpirySwarm } from '../session/utils/job_runners/jobs/FetchMsgExpirySwarmJob'; +import { GroupSync } from '../session/utils/job_runners/jobs/GroupSyncJob'; import { UpdateMsgExpirySwarm } from '../session/utils/job_runners/jobs/UpdateMsgExpirySwarmJob'; import { getLibGroupKickedOutsideRedux } from '../state/selectors/userGroups'; import { ReleasedFeatures } from '../util/releaseFeature'; @@ -896,8 +897,10 @@ export class ConversationModel extends Backbone.Model { // we don't add an update message when this comes from a config message, as we already have the SyncedMessage itself with the right timestamp to display - if (this.isPublic()) { - throw new Error("updateExpireTimer() Disappearing messages aren't supported in communities"); + if (!this.isClosedGroup() && !this.isPrivate()) { + throw new Error( + 'updateExpireTimer() Disappearing messages are only supported int groups and private chats' + ); } let expirationMode = providedDisappearingMode; let expireTimer = providedExpireTimer; @@ -916,14 +919,18 @@ export class ConversationModel extends Backbone.Model { * - effectively changes the setting * - ignores a off setting for a legacy group (as we can get a setting from restored from configMessage, and a newgroup can still be in the swarm when linking a device */ - const shouldAddExpireUpdateMsgGroup = + const shouldAddExpireUpdateMsgLegacyGroup = isLegacyGroup && !fromConfigMessage && (expirationMode !== this.get('expirationMode') || expireTimer !== this.get('expireTimer')) && expirationMode !== 'off'; + const shouldAddExpireUpdateMsgGroupV2 = this.isClosedGroupV2() && !fromConfigMessage; + const shouldAddExpireUpdateMessage = - shouldAddExpireUpdateMsgPrivate || shouldAddExpireUpdateMsgGroup; + shouldAddExpireUpdateMsgPrivate || + shouldAddExpireUpdateMsgLegacyGroup || + shouldAddExpireUpdateMsgGroupV2; // When we add a disappearing messages notification to the conversation, we want it // to be above the message that initiated that change, hence the subtraction. @@ -1106,8 +1113,9 @@ export class ConversationModel extends Backbone.Model { updatedExpirationSeconds: expireUpdate.expireTimer, }); - await getMessageQueue().sendToGroupV2({ - message: v2groupMessage, + await GroupSync.storeGroupUpdateMessages({ + groupPk: this.id, + updateMessages: [v2groupMessage], }); return true; } @@ -2094,13 +2102,14 @@ export class ConversationModel extends Backbone.Model { return; } - if (message.get('groupInvitation')) { - const groupInvitation = message.get('groupInvitation'); + const communityInvitation = message.getCommunityInvitation(); + + if (communityInvitation && communityInvitation.url) { const groupInviteMessage = new GroupInvitationMessage({ identifier: id, createAtNetworkTimestamp: networkTimestamp, - name: groupInvitation.name, - url: groupInvitation.url, + name: communityInvitation.name, + url: communityInvitation.url, expirationType: chatMessageParams.expirationType, expireTimer: chatMessageParams.expireTimer, }); diff --git a/ts/models/message.ts b/ts/models/message.ts index 27845722e1..8362c9aeaa 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -3,16 +3,7 @@ import Backbone from 'backbone'; import autoBind from 'auto-bind'; import filesize from 'filesize'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import { - cloneDeep, - debounce, - isEmpty, - size as lodashSize, - map, - partition, - pick, - uniq, -} from 'lodash'; +import { cloneDeep, debounce, isEmpty, size as lodashSize, partition, pick, uniq } from 'lodash'; import { SignalService } from '../protobuf'; import { getMessageQueue } from '../session'; import { ConvoHub } from '../session/conversations'; @@ -29,7 +20,6 @@ import { uploadQuoteThumbnailsToFileServer, } from '../session/utils'; import { - DataExtractionNotificationMsg, MessageAttributes, MessageAttributesOptionals, MessageGroupUpdate, @@ -42,10 +32,7 @@ import { import { Data } from '../data/data'; import { OpenGroupData } from '../data/opengroups'; import { SettingsKey } from '../data/settings-key'; -import { - ConversationInteractionStatus, - ConversationInteractionType, -} from '../interactions/conversationInteractions'; +import { FormatNotifications } from '../notifications/formatNotifications'; import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../session/apis/snode_api/namespaces'; @@ -96,7 +83,7 @@ import { } from '../types/MessageAttachment'; import { ReactionList } from '../types/Reaction'; import { getAttachmentMetadata } from '../types/message/initializeAttachmentMetadata'; -import { assertUnreachable, roomHasBlindEnabled } from '../types/sqlSharedTypes'; +import { roomHasBlindEnabled } from '../types/sqlSharedTypes'; import { LinkPreviews } from '../util/linkPreviews'; import { Notifications } from '../util/notifications'; import { Storage } from '../util/storage'; @@ -104,34 +91,6 @@ import { ConversationModel } from './conversation'; import { READ_MESSAGE_STATE } from './conversationAttributes'; // tslint:disable: cyclomatic-complexity -/** - * @returns true if the array contains only a single item being 'You', 'you' or our device pubkey - */ -export function arrayContainsUsOnly(arrayToCheck: Array | undefined) { - return ( - arrayToCheck && - arrayToCheck.length === 1 && - (arrayToCheck[0] === UserUtils.getOurPubKeyStrFromCache() || - arrayToCheck[0].toLowerCase() === 'you') - ); -} - -export function arrayContainsOneItemOnly(arrayToCheck: Array | undefined) { - return arrayToCheck && arrayToCheck.length === 1; -} - -function formatJoined(joined: Array) { - const names = joined.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey); - const messages = []; - - if (names.length > 1) { - messages.push(window.i18n('multipleJoinedTheGroup', [names.join(', ')])); - } else { - messages.push(window.i18n('joinedTheGroup', names)); - } - return messages.join(' '); -} - export class MessageModel extends Backbone.Model { constructor(attributes: MessageAttributesOptionals & { skipTimerInit?: boolean }) { const filledAttrs = fillMessageAttributesWithDefaults(attributes); @@ -258,8 +217,11 @@ export class MessageModel extends Backbone.Model { this.set(attributes); } - public isGroupInvitation() { - return !!this.get('groupInvitation'); + public isCommunityInvitation() { + return !!this.getCommunityInvitation(); + } + public getCommunityInvitation() { + return this.get('groupInvitation'); } public isMessageRequestResponse() { @@ -267,15 +229,22 @@ export class MessageModel extends Backbone.Model { } public isDataExtractionNotification() { - return !!this.get('dataExtractionNotification'); + return !!this.getDataExtractionNotification(); + } + public getDataExtractionNotification() { + return this.get('dataExtractionNotification'); } + public isCallNotification() { - return !!this.get('callNotificationType'); + return !!this.getCallNotification(); + } + public getCallNotification() { + return this.get('callNotificationType'); } + public isInteractionNotification() { return !!this.getInteractionNotification(); } - public getInteractionNotification() { return this.get('interactionNotification'); } @@ -406,10 +375,10 @@ export class MessageModel extends Backbone.Model { } public getPropsForGroupInvitation(): PropsForGroupInvitation | null { - if (!this.isGroupInvitation()) { + const invitation = this.getCommunityInvitation(); + if (!invitation || !invitation.url) { return null; } - const invitation = this.get('groupInvitation'); let serverAddress = ''; try { @@ -433,7 +402,7 @@ export class MessageModel extends Backbone.Model { if (!this.isDataExtractionNotification()) { return null; } - const dataExtractionNotification = this.get('dataExtractionNotification'); + const dataExtractionNotification = this.getDataExtractionNotification(); if (!dataExtractionNotification) { window.log.warn('dataExtractionNotification should not happen'); @@ -477,7 +446,6 @@ export class MessageModel extends Backbone.Model { public getPropsForGroupUpdateMessage(): PropsForGroupUpdate | null { const groupUpdate = this.getGroupUpdateAsArray(); - if (!groupUpdate || isEmpty(groupUpdate)) { return null; } @@ -1267,179 +1235,84 @@ export class MessageModel extends Backbone.Model { } /** - * Before, group_update attributes could be just the string 'You' and not an array. - * Using this method to get the group update makes sure than the joined, kicked, or left are always an array of string, or undefined + * A long time ago, group_update attributes could be just the string 'You' and not an array of pubkeys. + * Using this method to get the group update makes sure than the joined, kicked, or left are always an array of string, or undefined. + * This is legacy code, our joined, kicked, left, etc should have been saved as an Array for a long time now. */ private getGroupUpdateAsArray() { const groupUpdate = this.get('group_update'); if (!groupUpdate || isEmpty(groupUpdate)) { return undefined; } - const left: Array | undefined = Array.isArray(groupUpdate.left) - ? groupUpdate.left - : groupUpdate.left - ? [groupUpdate.left] - : undefined; - const kicked: Array | undefined = Array.isArray(groupUpdate.kicked) - ? groupUpdate.kicked - : groupUpdate.kicked - ? [groupUpdate.kicked] - : undefined; - const joined: Array | undefined = Array.isArray(groupUpdate.joined) + const forcedArrayUpdate: MessageGroupUpdate = {}; + + forcedArrayUpdate.joined = Array.isArray(groupUpdate.joined) ? groupUpdate.joined : groupUpdate.joined ? [groupUpdate.joined] : undefined; - const joinedWithHistory: Array | undefined = Array.isArray( - groupUpdate.joinedWithHistory - ) + + forcedArrayUpdate.joinedWithHistory = Array.isArray(groupUpdate.joinedWithHistory) ? groupUpdate.joinedWithHistory : groupUpdate.joinedWithHistory ? [groupUpdate.joinedWithHistory] : undefined; - const forcedArrayUpdate: MessageGroupUpdate = {}; + forcedArrayUpdate.kicked = Array.isArray(groupUpdate.kicked) + ? groupUpdate.kicked + : groupUpdate.kicked + ? [groupUpdate.kicked] + : undefined; + + forcedArrayUpdate.left = Array.isArray(groupUpdate.left) + ? groupUpdate.left + : groupUpdate.left + ? [groupUpdate.left] + : undefined; + + forcedArrayUpdate.name = groupUpdate.name; + forcedArrayUpdate.avatarChange = groupUpdate.avatarChange; - if (left) { - forcedArrayUpdate.left = left; - } - if (joinedWithHistory) { - forcedArrayUpdate.joinedWithHistory = joinedWithHistory; - } - if (joined) { - forcedArrayUpdate.joined = joined; - } - if (kicked) { - forcedArrayUpdate.kicked = kicked; - } - if (groupUpdate.name) { - forcedArrayUpdate.name = groupUpdate.name; - } return forcedArrayUpdate; } private getDescription() { const groupUpdate = this.getGroupUpdateAsArray(); - if (groupUpdate) { - if (arrayContainsUsOnly(groupUpdate.kicked)) { - return window.i18n('youGotKickedFromGroup'); - } - - if (arrayContainsUsOnly(groupUpdate.left)) { - return window.i18n('youLeftTheGroup'); - } - - if (groupUpdate.left && groupUpdate.left.length === 1) { - return window.i18n('leftTheGroup', [ - ConvoHub.use().getContactProfileNameOrShortenedPubKey(groupUpdate.left[0]), - ]); - } - - if (groupUpdate.name) { - return window.i18n('titleIsNow', [groupUpdate.name]); - } - - if (groupUpdate.joined && groupUpdate.joined.length) { - return formatJoined(groupUpdate.joined); - } - - if (groupUpdate.joinedWithHistory && groupUpdate.joinedWithHistory.length) { - return formatJoined(groupUpdate.joinedWithHistory); - } - - if (groupUpdate.kicked && groupUpdate.kicked.length) { - const names = map( - groupUpdate.kicked, - ConvoHub.use().getContactProfileNameOrShortenedPubKey - ); - const messages = []; - - if (names.length > 1) { - messages.push(window.i18n('multipleKickedFromTheGroup', [names.join(', ')])); - } else { - messages.push(window.i18n('kickedFromTheGroup', names)); - } - return messages.join(' '); - } - return null; - } - - if (this.isIncoming() && this.hasErrors()) { - return window.i18n('incomingError'); + if (!isEmpty(groupUpdate)) { + return FormatNotifications.formatGroupUpdateNotification(groupUpdate); } - if (this.isGroupInvitation()) { + const communityInvitation = this.getCommunityInvitation(); + if (communityInvitation) { return `😎 ${window.i18n('openGroupInvitation')}`; } - if (this.isDataExtractionNotification()) { - const dataExtraction = this.get( - 'dataExtractionNotification' - ) as DataExtractionNotificationMsg; - if (dataExtraction.type === SignalService.DataExtractionNotification.Type.SCREENSHOT) { - return window.i18n('tookAScreenshot', [ - ConvoHub.use().getContactProfileNameOrShortenedPubKey(dataExtraction.source), - ]); - } - - return window.i18n('savedTheFile', [ - ConvoHub.use().getContactProfileNameOrShortenedPubKey(dataExtraction.source), - ]); + const dataExtractionNotification = this.getDataExtractionNotification(); + if (dataExtractionNotification) { + return FormatNotifications.formatDataExtractionNotification(dataExtractionNotification); } - if (this.isCallNotification()) { - const displayName = ConvoHub.use().getContactProfileNameOrShortenedPubKey( + + const callNotification = this.getCallNotification(); + if (callNotification) { + return FormatNotifications.formatCallNotification( + callNotification, this.get('conversationId') ); - const callNotificationType = this.get('callNotificationType'); - if (callNotificationType === 'missed-call') { - return window.i18n('callMissed', [displayName]); - } - if (callNotificationType === 'started-call') { - return window.i18n('startedACall', [displayName]); - } - if (callNotificationType === 'answered-a-call') { - return window.i18n('answeredACall', [displayName]); - } } const interactionNotification = this.getInteractionNotification(); if (interactionNotification) { - const { interactionType, interactionStatus } = interactionNotification; - - // NOTE For now we only show interaction errors in the message history - if (interactionStatus === ConversationInteractionStatus.Error) { - const convo = ConvoHub.use().get(this.get('conversationId')); - - if (convo) { - const isGroup = !convo.isPrivate(); - const isCommunity = convo.isPublic(); - - switch (interactionType) { - case ConversationInteractionType.Hide: - // there is no text for hiding changes - return ''; - case ConversationInteractionType.Leave: - return isCommunity - ? window.i18n('leaveCommunityFailed') - : isGroup - ? window.i18n('leaveGroupFailed') - : window.i18n('deleteConversationFailed'); - default: - assertUnreachable( - interactionType, - `Message.getDescription: Missing case error "${interactionType}"` - ); - } - } - } + return FormatNotifications.formatInteractionNotification( + interactionNotification, + this.get('conversationId') + ); } - if (this.get('reaction')) { - const reaction = this.get('reaction'); - if (reaction && reaction.emoji && reaction.emoji !== '') { - return window.i18n('reactionNotification', [reaction.emoji]); - } + const reaction = this.get('reaction'); + if (reaction && reaction.emoji && reaction.emoji !== '') { + return window.i18n('reactionNotification', [reaction.emoji]); } + return this.get('body'); } diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts index bcaeea3aca..8070dda76f 100644 --- a/ts/models/messageType.ts +++ b/ts/models/messageType.ts @@ -40,7 +40,7 @@ export interface MessageAttributes { read_by: Array; // we actually only care about the length of this. values are not used for anything type: MessageModelType; group_update?: MessageGroupUpdate; - groupInvitation?: any; + groupInvitation?: { url: string | undefined; name: string } | undefined; attachments?: any; conversationId: string; errors?: any; @@ -160,10 +160,10 @@ export type PropsForMessageRequestResponse = MessageRequestResponseMsg & { }; export type MessageGroupUpdate = { - left?: Array; - joined?: Array; - joinedWithHistory?: Array; - kicked?: Array; + left?: Array; + joined?: Array; + joinedWithHistory?: Array; + kicked?: Array; promoted?: Array; name?: string; avatarChange?: boolean; @@ -188,7 +188,7 @@ export interface MessageAttributesOptionals { read_by?: Array; // we actually only care about the length of this. values are not used for anything type: MessageModelType; group_update?: MessageGroupUpdate; - groupInvitation?: any; + groupInvitation?: { url: string | undefined; name: string } | undefined; attachments?: any; conversationId: string; errors?: any; diff --git a/ts/notifications/formatNotifications.ts b/ts/notifications/formatNotifications.ts new file mode 100644 index 0000000000..2ffa67bf73 --- /dev/null +++ b/ts/notifications/formatNotifications.ts @@ -0,0 +1,264 @@ +import { PubkeyType } from 'libsession_util_nodejs'; +import { cloneDeep } from 'lodash'; +import { usernameForQuoteOrFullPkOutsideRedux } from '../hooks/useParamSelector'; +import { + ConversationInteractionStatus, + ConversationInteractionType, +} from '../interactions/conversationInteractions'; +import { DataExtractionNotificationMsg, MessageGroupUpdate } from '../models/messageType'; +import { SignalService } from '../protobuf'; +import { ConvoHub } from '../session/conversations'; +import { UserUtils } from '../session/utils'; +import { PreConditionFailed } from '../session/utils/errors'; +import { CallNotificationType, InteractionNotificationType } from '../state/ducks/conversations'; +import { assertUnreachable } from '../types/sqlSharedTypes'; + +/** + * @returns true if the array contains only a single item being 'You', 'you' or our device pubkey + */ +export function arrayContainsUsOnly(arrayToCheck: Array | undefined) { + return ( + arrayToCheck && + arrayToCheck.length === 1 && + (arrayToCheck[0] === UserUtils.getOurPubKeyStrFromCache() || + arrayToCheck[0].toLowerCase() === 'you') + ); +} + +function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { + const us = UserUtils.getOurPubKeyStrFromCache(); + if (groupUpdate.name) { + return window.i18n('titleIsNow', [groupUpdate.name]); + } + if (groupUpdate.avatarChange) { + return window.i18n('groupAvatarChange'); + } + if (groupUpdate.left) { + if (groupUpdate.left.length !== 1) { + return null; + } + if (arrayContainsUsOnly(groupUpdate.left)) { + return window.i18n('youLeftTheGroup'); + } + // no more than one can send a leave message at a time + return window.i18n('leftTheGroup', [ + ConvoHub.use().getContactProfileNameOrShortenedPubKey(groupUpdate.left[0]), + ]); + } + + if (groupUpdate.joined) { + if (!groupUpdate.joined.length) { + return null; + } + return changeOfMembersV2({ + type: 'added', + us, + changedWithNames: mapIdsWithNames( + groupUpdate.joined, + groupUpdate.joined.map(usernameForQuoteOrFullPkOutsideRedux) + ), + }); + } + if (groupUpdate.joinedWithHistory) { + if (!groupUpdate.joinedWithHistory.length) { + return null; + } + return changeOfMembersV2({ + type: 'addedWithHistory', + us, + changedWithNames: mapIdsWithNames( + groupUpdate.joinedWithHistory, + groupUpdate.joinedWithHistory.map(usernameForQuoteOrFullPkOutsideRedux) + ), + }); + } + if (groupUpdate.kicked) { + if (!groupUpdate.kicked.length) { + return null; + } + if (arrayContainsUsOnly(groupUpdate.kicked)) { + return window.i18n('youGotKickedFromGroup'); + } + return changeOfMembersV2({ + type: 'removed', + us, + changedWithNames: mapIdsWithNames( + groupUpdate.kicked, + groupUpdate.kicked.map(usernameForQuoteOrFullPkOutsideRedux) + ), + }); + } + if (groupUpdate.promoted) { + if (!groupUpdate.promoted.length) { + return null; + } + return changeOfMembersV2({ + type: 'promoted', + us, + changedWithNames: mapIdsWithNames( + groupUpdate.promoted, + groupUpdate.promoted.map(usernameForQuoteOrFullPkOutsideRedux) + ), + }); + } + throw new Error('group_update getDescription() case not taken care of'); +} + +function formatDataExtractionNotification( + dataExtractionNotification: DataExtractionNotificationMsg +) { + const { Type } = SignalService.DataExtractionNotification; + + const isScreenshot = dataExtractionNotification.type === Type.SCREENSHOT; + + return window.i18n(isScreenshot ? 'tookAScreenshot' : 'savedTheFile', [ + ConvoHub.use().getContactProfileNameOrShortenedPubKey(dataExtractionNotification.source), + ]); +} + +function formatInteractionNotification( + interactionNotification: InteractionNotificationType, + conversationId: string +) { + const { interactionType, interactionStatus } = interactionNotification; + + // NOTE For now we only show interaction errors in the message history + if (interactionStatus === ConversationInteractionStatus.Error) { + const convo = ConvoHub.use().get(conversationId); + + if (convo) { + const isGroup = !convo.isPrivate(); + const isCommunity = convo.isPublic(); + + switch (interactionType) { + case ConversationInteractionType.Hide: + // there is no text for hiding changes + return ''; + case ConversationInteractionType.Leave: + return isCommunity + ? window.i18n('leaveCommunityFailed') + : isGroup + ? window.i18n('leaveGroupFailed') + : window.i18n('deleteConversationFailed'); + default: + assertUnreachable( + interactionType, + `Message.getDescription: Missing case error "${interactionType}"` + ); + } + } + } + + window.log.error('formatInteractionNotification: Unsupported case'); + return null; +} + +function formatCallNotification( + callNotificationType: CallNotificationType, + conversationId: string +) { + const displayName = ConvoHub.use().getContactProfileNameOrShortenedPubKey(conversationId); + + if (callNotificationType === 'missed-call') { + return window.i18n('callMissed', [displayName]); + } + if (callNotificationType === 'started-call') { + return window.i18n('startedACall', [displayName]); + } + if (callNotificationType === 'answered-a-call') { + return window.i18n('answeredACall', [displayName]); + } + window.log.error('formatCallNotification: Unsupported notification type'); + return null; +} + +export type IdWithName = { sessionId: PubkeyType; name: string }; + +/** + * When we are part of a change, we display the You first, and then others. + * This function is used to check if we are part of the list. + * - if yes: returns {weArePart: true, others: changedWithoutUs} + * - if yes: returns {weArePart: false, others: changed} + */ +function moveUsToStart( + changed: Array, + us: PubkeyType +): { + sortedWithUsFirst: Array; +} { + const usAt = changed.findIndex(m => m.sessionId === us); + if (usAt <= -1) { + // we are not in it + return { sortedWithUsFirst: changed }; + } + const usItem = changed.at(usAt); + if (!usItem) { + throw new PreConditionFailed('"we" should have been there'); + } + // deepClone because splice mutates the array + const changedCopy = cloneDeep(changed); + changedCopy.splice(usAt, 1); + return { sortedWithUsFirst: [usItem, ...changedCopy] }; +} + +function changeOfMembersV2({ + changedWithNames, + type, + us, +}: { + type: 'added' | 'addedWithHistory' | 'promoted' | 'removed'; + changedWithNames: Array; + us: PubkeyType; +}): string { + const { sortedWithUsFirst } = moveUsToStart(changedWithNames, us); + if (changedWithNames.length === 0) { + throw new PreConditionFailed('change must always have an associated change'); + } + const subject = + sortedWithUsFirst.length === 1 && sortedWithUsFirst[0].sessionId === us + ? 'You' + : sortedWithUsFirst.length === 1 + ? 'One' + : sortedWithUsFirst.length === 2 + ? 'Two' + : 'Others'; + + const action = + type === 'addedWithHistory' + ? 'JoinedWithHistory' + : type === 'added' + ? 'Joined' + : type === 'promoted' + ? 'Promoted' + : ('Removed' as const); + const key = `group${subject}${action}` as const; + + const sortedWithUsOrCount = + subject === 'Others' + ? [sortedWithUsFirst[0].name, (sortedWithUsFirst.length - 1).toString()] + : sortedWithUsFirst.map(m => m.name); + + return window.i18n(key, sortedWithUsOrCount); +} + +function mapIdsWithNames(changed: Array, names: Array): Array { + if (!changed.length || !names.length) { + throw new PreConditionFailed('mapIdsWithNames needs a change'); + } + if (changed.length !== names.length) { + throw new PreConditionFailed('mapIdsWithNames needs a the same length to map them together'); + } + return changed.map((sessionId, index) => { + return { sessionId, name: names[index] }; + }); +} + +export const FormatNotifications = { + arrayContainsUsOnly, + formatCallNotification, + formatInteractionNotification, + formatDataExtractionNotification, + formatGroupUpdateNotification, + changeOfMembersV2, + mapIdsWithNames, +}; diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 16ad8d0fa8..78ceffddb1 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -223,12 +223,7 @@ async function handleGroupInfoChangeMessage({ } case SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES: { const newTimerSeconds = change.updatedExpiration; - if ( - newTimerSeconds && - isNumber(newTimerSeconds) && - isFinite(newTimerSeconds) && - newTimerSeconds >= 0 - ) { + if (isNumber(newTimerSeconds) && isFinite(newTimerSeconds) && newTimerSeconds >= 0) { await convo.updateExpireTimer({ providedExpireTimer: newTimerSeconds, providedSource: author, From c180e4572df03cc7664a3bb92443d9c6d97f138d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 18 Mar 2024 17:09:53 +1100 Subject: [PATCH 105/302] fix: add handling of deleteMsgs and deleteAttachmentsBefore for groups --- .github/workflows/pull-request.yml | 1 - ts/data/data.ts | 17 ++++ ts/data/dataInit.ts | 2 + ts/node/attachment_channel.ts | 22 +---- ts/node/sql.ts | 82 ++++++++++++++++++- ts/node/sql_channel.ts | 9 +- .../SwarmPollingGroupConfig.ts | 35 ++++++++ 7 files changed, 141 insertions(+), 27 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 4109fb7a59..dcf13114f0 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -6,7 +6,6 @@ on: branches: - clearnet - unstable - - unstable1 concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/ts/data/data.ts b/ts/data/data.ts index fe58666d7d..e2fea1e85a 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -1,5 +1,6 @@ // eslint:disable: no-require-imports no-var-requires one-variable-per-declaration no-void-expression function-name +import { GroupPubkeyType } from 'libsession_util_nodejs'; import _, { isEmpty } from 'lodash'; import { MessageResultProps } from '../components/search/MessageSearchResults'; import { ConversationModel } from '../models/conversation'; @@ -284,6 +285,20 @@ async function removeMessagesByIds(ids: Array): Promise { await channels.removeMessagesByIds(ids); } +async function removeAllMessagesInConversationSentBefore(args: { + deleteBeforeSeconds: number; + conversationId: GroupPubkeyType; +}): Promise> { + return channels.removeAllMessagesInConversationSentBefore(args); +} + +async function removeAllAttachmentsInConversationSentBefore(args: { + deleteAttachBeforeSeconds: number; + conversationId: GroupPubkeyType; +}): Promise> { + return channels.removeAllAttachmentsInConversationSentBefore(args); +} + async function getMessageIdsFromServerIds( serverIds: Array | Array, conversationId: string @@ -823,6 +838,8 @@ export const Data = { saveMessages, removeMessage, removeMessagesByIds, + removeAllMessagesInConversationSentBefore, + removeAllAttachmentsInConversationSentBefore, cleanUpExpirationTimerUpdateHistory, getMessageIdsFromServerIds, getMessageById, diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts index abf1c3f43e..9194af5535 100644 --- a/ts/data/dataInit.ts +++ b/ts/data/dataInit.ts @@ -41,6 +41,8 @@ const channelsToMake = new Set([ 'saveMessages', 'removeMessage', 'removeMessagesByIds', + 'removeAllAttachmentsInConversationSentBefore', + 'removeAllMessagesInConversationSentBefore', 'cleanUpExpirationTimerUpdateHistory', 'getUnreadByConversation', 'getUnreadDisappearingByConversation', diff --git a/ts/node/attachment_channel.ts b/ts/node/attachment_channel.ts index c835036f93..fe7d068082 100644 --- a/ts/node/attachment_channel.ts +++ b/ts/node/attachment_channel.ts @@ -5,7 +5,7 @@ import { isString, map } from 'lodash'; import path from 'path'; import rimraf from 'rimraf'; -import { createDeleter, getAttachmentsPath } from '../shared/attachments/shared_attachments'; +import { getAttachmentsPath } from '../shared/attachments/shared_attachments'; import { sqlNode } from './sql'; // checked - only node let initialized = false; @@ -21,24 +21,6 @@ const ensureDirectory = async (userDataPath: string) => { await fse.ensureDir(getAttachmentsPath(userDataPath)); }; -const deleteAll = async ({ - userDataPath, - attachments, -}: { - userDataPath: string; - attachments: any; -}) => { - const deleteFromDisk = createDeleter(getAttachmentsPath(userDataPath)); - - for (let index = 0, max = attachments.length; index < max; index += 1) { - const file = attachments[index]; - // eslint-disable-next-line no-await-in-loop - await deleteFromDisk(file); - } - - console.log(`deleteAll: deleted ${attachments.length} files`); -}; - const getAllAttachments = async (userDataPath: string) => { const dir = getAttachmentsPath(userDataPath); const pattern = path.join(dir, '**', '*'); @@ -50,7 +32,7 @@ const getAllAttachments = async (userDataPath: string) => { async function cleanupOrphanedAttachments(userDataPath: string) { const allAttachments = await getAllAttachments(userDataPath); const orphanedAttachments = sqlNode.removeKnownAttachments(allAttachments); - await deleteAll({ + await sqlNode.deleteAll({ userDataPath, attachments: orphanedAttachments, }); diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 0941e38e19..fef4d20a71 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -24,6 +24,7 @@ import { uniq, } from 'lodash'; +import { GroupPubkeyType } from 'libsession_util_nodejs'; import { ConversationAttributes } from '../models/conversationAttributes'; import { PubKey } from '../session/types/PubKey'; // checked - only node import { redactAll } from '../util/privacy'; // checked - only node @@ -66,6 +67,7 @@ import { MessageAttributes } from '../models/messageType'; import { SignalService } from '../protobuf'; import { Quote } from '../receiver/types'; import { DURATION } from '../session/constants'; +import { createDeleter, getAttachmentsPath } from '../shared/attachments/shared_attachments'; import { getSQLCipherIntegrityCheck, openAndMigrateDatabase, @@ -990,6 +992,62 @@ function removeMessagesByIds(ids: Array, instance?: BetterSqlite3.Databa console.log(`removeMessagesByIds of length ${ids.length} took ${Date.now() - start}ms`); } +function removeAllMessagesInConversationSentBefore( + { + deleteBeforeSeconds, + conversationId, + }: { deleteBeforeSeconds: number; conversationId: GroupPubkeyType }, + instance?: BetterSqlite3.Database +) { + const msgIds = assertGlobalInstanceOrInstance(instance) + .prepare( + `SELECT id FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId AND sent_at <= $beforeMs;` + ) + .all({ conversationId, beforeMs: deleteBeforeSeconds * 1000 }) as Array; + + assertGlobalInstanceOrInstance(instance) + .prepare( + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId AND sent_at <= $beforeMs;` + ) + .run({ conversationId, beforeMs: deleteBeforeSeconds * 1000 }); + console.info('removeAllMessagesInConversationSentBefore deleted msgIds:', JSON.stringify(msgIds)); + return msgIds; +} + +async function removeAllAttachmentsInConversationSentBefore( + { + deleteAttachBeforeSeconds, + conversationId, + }: { deleteAttachBeforeSeconds: number; conversationId: GroupPubkeyType }, + instance?: BetterSqlite3.Database +) { + const rows = assertGlobalInstanceOrInstance(instance) + .prepare( + `SELECT json FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId AND sent_at <= $beforeMs` + ) + .all({ conversationId, beforeMs: deleteAttachBeforeSeconds * 1000 }); + const messages = map(rows, row => jsonToObject(row.json)); + + const externalFiles: Array = []; + const msgIdsWithChanges: Array = []; + forEach(messages, message => { + const externalFilesMsg = getExternalFilesForMessage(message); + if (externalFilesMsg.length) { + externalFiles.push(...externalFilesMsg); + msgIdsWithChanges.push(); + } + }); + const uniqPathsToRemove = uniq(externalFiles); + console.info('removeAllAttachmentsInConversationSentBefore removing attachments:', externalFiles); + console.info( + 'removeAllAttachmentsInConversationSentBefore impacted msgIds:', + JSON.stringify(msgIdsWithChanges) + ); + + const userDataPath = app.getPath('userData'); + await deleteAll({ userDataPath, attachments: uniqPathsToRemove }); +} + function removeAllMessagesInConversation( conversationId: string, instance?: BetterSqlite3.Database @@ -1890,7 +1948,7 @@ function getMessagesWithFileAttachments(conversationId: string, limit: number) { function getExternalFilesForMessage(message: any) { const { attachments, quote, preview } = message; - const files: Array = []; + const files: Array = []; forEach(attachments, attachment => { const { path: file, thumbnail, screenshot } = attachment; @@ -1954,6 +2012,24 @@ function getExternalFilesForConversation( return files; } +async function deleteAll({ + userDataPath, + attachments, +}: { + userDataPath: string; + attachments: Array; +}) { + const deleteFromDisk = createDeleter(getAttachmentsPath(userDataPath)); + + for (let index = 0, max = attachments.length; index < max; index += 1) { + const file = attachments[index]; + // eslint-disable-next-line no-await-in-loop + await deleteFromDisk(file); + } + + console.log(`deleteAll: deleted ${attachments.length} files`); +} + function removeKnownAttachments(allAttachments: Array) { const lookup = fromPairs(map(allAttachments, file => [file, true])); const chunkSize = 50; @@ -2476,6 +2552,8 @@ export const sqlNode = { saveMessages, removeMessage, removeMessagesByIds, + removeAllMessagesInConversationSentBefore, + removeAllAttachmentsInConversationSentBefore, cleanUpExpirationTimerUpdateHistory, removeAllMessagesInConversation, getUnreadByConversation, @@ -2513,7 +2591,7 @@ export const sqlNode = { removeAttachmentDownloadJob, removeAllAttachmentDownloadJobs, removeKnownAttachments, - + deleteAll, removeAll, getMessagesWithVisualMediaAttachments, diff --git a/ts/node/sql_channel.ts b/ts/node/sql_channel.ts index 1573be71bd..fb464c7721 100644 --- a/ts/node/sql_channel.ts +++ b/ts/node/sql_channel.ts @@ -1,7 +1,7 @@ import { app, ipcMain } from 'electron'; -import { sqlNode } from './sql'; // checked - only node -import { userConfig } from './config/user_config'; // checked - only node import { ephemeralConfig } from './config/ephemeral_config'; // checked - only node +import { userConfig } from './config/user_config'; // checked - only node +import { sqlNode } from './sql'; // checked - only node let initialized = false; @@ -13,14 +13,15 @@ export function initializeSqlChannel() { throw new Error('sqlChannels: already initialized!'); } - ipcMain.on(SQL_CHANNEL_KEY, (event, jobId, callName, ...args) => { + // eslint-disable-next-line @typescript-eslint/no-misused-promises + ipcMain.on(SQL_CHANNEL_KEY, async (event, jobId, callName, ...args) => { try { const fn = (sqlNode as any)[callName]; if (!fn) { throw new Error(`sql channel: ${callName} is not an available function`); } - const result = fn(...args); + const result = await fn(...args); event.sender.send(`${SQL_CHANNEL_KEY}-done`, jobId, null, result); } catch (error) { diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 52a8874224..487e9a48c6 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -1,4 +1,6 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { isFinite, isNumber } from 'lodash'; +import { Data } from '../../../../data/data'; import { groupInfoActions } from '../../../../state/ducks/metaGroups'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { ed25519Str } from '../../../onions/onionPath'; @@ -7,6 +9,37 @@ import { LibSessionUtil } from '../../../utils/libsession/libsession_utils'; import { SnodeNamespaces } from '../namespaces'; import { RetrieveMessageItemWithNamespace } from '../types'; +async function handleMetaMergeResults(groupPk: GroupPubkeyType) { + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + if ( + infos && + isNumber(infos.deleteBeforeSeconds) && + isFinite(infos.deleteBeforeSeconds) && + infos.deleteBeforeSeconds > 0 + ) { + // delete any messages in this conversation sent before that timestamp (in seconds) + const deletedMsgIds = await Data.removeAllMessagesInConversationSentBefore({ + deleteBeforeSeconds: infos.deleteBeforeSeconds, + conversationId: groupPk, + }); + console.warn('deletedMsgIds', deletedMsgIds); + } + + if ( + infos && + isNumber(infos.deleteAttachBeforeSeconds) && + isFinite(infos.deleteAttachBeforeSeconds) && + infos.deleteAttachBeforeSeconds > 0 + ) { + // delete any attachments in this conversation sent before that timestamp (in seconds) + const impactedMsgids = await Data.removeAllAttachmentsInConversationSentBefore({ + deleteAttachBeforeSeconds: infos.deleteAttachBeforeSeconds, + conversationId: groupPk, + }); + console.warn('impactedMsgids', impactedMsgids); + } +} + async function handleGroupSharedConfigMessages( groupConfigMessages: Array, groupPk: GroupPubkeyType @@ -54,6 +87,8 @@ async function handleGroupSharedConfigMessages( // do the merge with our current state await MetaGroupWrapperActions.metaMerge(groupPk, toMerge); + await handleMetaMergeResults(groupPk); + // save updated dumps to the DB right away await LibSessionUtil.saveDumpsToDb(groupPk); From 72396cfca3e2d96bd28924057aee8e47c0844283 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 19 Mar 2024 10:30:08 +1100 Subject: [PATCH 106/302] feat: fix message attachment cleanup and handle group attach+msg delete --- ts/data/data.ts | 10 +-- ts/data/dataInit.ts | 2 +- ts/models/message.ts | 9 ++- ts/node/sql.ts | 31 +++------ .../SwarmPollingGroupConfig.ts | 24 ++++++- ts/types/MessageAttachment.ts | 34 ++++++++-- ts/types/attachments/migrations.ts | 67 +++++++++---------- 7 files changed, 102 insertions(+), 75 deletions(-) diff --git a/ts/data/data.ts b/ts/data/data.ts index e2fea1e85a..403b9c72e8 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -292,11 +292,13 @@ async function removeAllMessagesInConversationSentBefore(args: { return channels.removeAllMessagesInConversationSentBefore(args); } -async function removeAllAttachmentsInConversationSentBefore(args: { +async function getAllMessagesWithAttachmentsInConversationSentBefore(args: { deleteAttachBeforeSeconds: number; conversationId: GroupPubkeyType; -}): Promise> { - return channels.removeAllAttachmentsInConversationSentBefore(args); +}): Promise> { + const msgAttrs = await channels.getAllMessagesWithAttachmentsInConversationSentBefore(args); + + return msgAttrs.map((msg: any) => new MessageModel(msg)); } async function getMessageIdsFromServerIds( @@ -839,7 +841,7 @@ export const Data = { removeMessage, removeMessagesByIds, removeAllMessagesInConversationSentBefore, - removeAllAttachmentsInConversationSentBefore, + getAllMessagesWithAttachmentsInConversationSentBefore, cleanUpExpirationTimerUpdateHistory, getMessageIdsFromServerIds, getMessageById, diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts index 9194af5535..8e14cf548d 100644 --- a/ts/data/dataInit.ts +++ b/ts/data/dataInit.ts @@ -41,7 +41,7 @@ const channelsToMake = new Set([ 'saveMessages', 'removeMessage', 'removeMessagesByIds', - 'removeAllAttachmentsInConversationSentBefore', + 'getAllMessagesWithAttachmentsInConversationSentBefore', 'removeAllMessagesInConversationSentBefore', 'cleanUpExpirationTimerUpdateHistory', 'getUnreadByConversation', diff --git a/ts/models/message.ts b/ts/models/message.ts index 8362c9aeaa..af565014b2 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -301,12 +301,11 @@ export class MessageModel extends Backbone.Model { return ''; } - public onDestroy() { - void this.cleanup(); - } - public async cleanup() { - await deleteExternalMessageFiles(this.attributes); + const changed = await deleteExternalMessageFiles(this.attributes); + if (changed) { + await this.commit(); + } } public getPropsForExpiringMessage(): PropsForExpiringMessage { diff --git a/ts/node/sql.ts b/ts/node/sql.ts index fef4d20a71..51b8c74ccd 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1003,7 +1003,7 @@ function removeAllMessagesInConversationSentBefore( .prepare( `SELECT id FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId AND sent_at <= $beforeMs;` ) - .all({ conversationId, beforeMs: deleteBeforeSeconds * 1000 }) as Array; + .all({ conversationId, beforeMs: deleteBeforeSeconds * 1000 }); assertGlobalInstanceOrInstance(instance) .prepare( @@ -1011,10 +1011,10 @@ function removeAllMessagesInConversationSentBefore( ) .run({ conversationId, beforeMs: deleteBeforeSeconds * 1000 }); console.info('removeAllMessagesInConversationSentBefore deleted msgIds:', JSON.stringify(msgIds)); - return msgIds; + return msgIds.map(m => m.id); } -async function removeAllAttachmentsInConversationSentBefore( +async function getAllMessagesWithAttachmentsInConversationSentBefore( { deleteAttachBeforeSeconds, conversationId, @@ -1023,29 +1023,14 @@ async function removeAllAttachmentsInConversationSentBefore( ) { const rows = assertGlobalInstanceOrInstance(instance) .prepare( - `SELECT json FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId AND sent_at <= $beforeMs` + `SELECT json FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId AND sent_at <= $beforeMs;` ) .all({ conversationId, beforeMs: deleteAttachBeforeSeconds * 1000 }); const messages = map(rows, row => jsonToObject(row.json)); - - const externalFiles: Array = []; - const msgIdsWithChanges: Array = []; - forEach(messages, message => { - const externalFilesMsg = getExternalFilesForMessage(message); - if (externalFilesMsg.length) { - externalFiles.push(...externalFilesMsg); - msgIdsWithChanges.push(); - } + const messagesWithAttachments = messages.filter(m => { + return getExternalFilesForMessage(m).some(a => !isEmpty(a) && isString(a)); // when we remove an attachment, we set the path to '' so it should be excluded here }); - const uniqPathsToRemove = uniq(externalFiles); - console.info('removeAllAttachmentsInConversationSentBefore removing attachments:', externalFiles); - console.info( - 'removeAllAttachmentsInConversationSentBefore impacted msgIds:', - JSON.stringify(msgIdsWithChanges) - ); - - const userDataPath = app.getPath('userData'); - await deleteAll({ userDataPath, attachments: uniqPathsToRemove }); + return messagesWithAttachments; } function removeAllMessagesInConversation( @@ -2553,7 +2538,7 @@ export const sqlNode = { removeMessage, removeMessagesByIds, removeAllMessagesInConversationSentBefore, - removeAllAttachmentsInConversationSentBefore, + getAllMessagesWithAttachmentsInConversationSentBefore, cleanUpExpirationTimerUpdateHistory, removeAllMessagesInConversation, getUnreadByConversation, diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 487e9a48c6..f3fb572dbe 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -1,6 +1,7 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { isFinite, isNumber } from 'lodash'; import { Data } from '../../../../data/data'; +import { messagesExpired } from '../../../../state/ducks/conversations'; import { groupInfoActions } from '../../../../state/ducks/metaGroups'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { ed25519Str } from '../../../onions/onionPath'; @@ -22,7 +23,13 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { deleteBeforeSeconds: infos.deleteBeforeSeconds, conversationId: groupPk, }); - console.warn('deletedMsgIds', deletedMsgIds); + window.log.info( + `removeAllMessagesInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteBeforeSeconds}: `, + deletedMsgIds + ); + await window.inboxStore.dispatch( + messagesExpired(deletedMsgIds.map(messageId => ({ conversationKey: groupPk, messageId }))) + ); } if ( @@ -32,11 +39,22 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { infos.deleteAttachBeforeSeconds > 0 ) { // delete any attachments in this conversation sent before that timestamp (in seconds) - const impactedMsgids = await Data.removeAllAttachmentsInConversationSentBefore({ + const impactedMsgModels = await Data.getAllMessagesWithAttachmentsInConversationSentBefore({ deleteAttachBeforeSeconds: infos.deleteAttachBeforeSeconds, conversationId: groupPk, }); - console.warn('impactedMsgids', impactedMsgids); + window.log.info( + `getAllMessagesWithAttachmentsInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteAttachBeforeSeconds}: impactedMsgModelsIds `, + impactedMsgModels.map(m => m.id) + ); + + for (let index = 0; index < impactedMsgModels.length; index++) { + const msg = impactedMsgModels[index]; + + // eslint-disable-next-line no-await-in-loop + // eslint-disable-next-line no-await-in-loop + await msg?.cleanup(); + } } } diff --git a/ts/types/MessageAttachment.ts b/ts/types/MessageAttachment.ts index bff81b474b..3b2e2cf5c7 100644 --- a/ts/types/MessageAttachment.ts +++ b/ts/types/MessageAttachment.ts @@ -11,20 +11,39 @@ import { autoOrientJPEGAttachment, captureDimensionsAndScreenshot, deleteData, + deleteDataSuccessful, loadData, replaceUnicodeV2, } from './attachments/migrations'; // NOTE I think this is only used on the renderer side, but how?! -export const deleteExternalMessageFiles = async (message: { - attachments: any; - quote: any; - preview: any; +export const deleteExternalMessageFiles = async (messageAttributes: { + attachments: Array | undefined; + quote: { attachments: Array | undefined }; + preview: Array | undefined; }) => { - const { attachments, quote, preview } = message; + let anyChanges = false; + const { attachments, quote, preview } = messageAttributes; if (attachments && attachments.length) { await Promise.all(attachments.map(deleteData)); + anyChanges = true; + + // test that the files were deleted successfully + try { + let results = await Promise.allSettled(attachments.map(deleteDataSuccessful)); + results = results.filter(result => result.status === 'rejected'); + + if (results.length) { + throw Error; + } + } catch (err) { + // eslint-disable-next-line no-console + console.warn( + '[deleteExternalMessageFiles]: Failed to delete attachments for', + messageAttributes + ); + } } if (quote && quote.attachments && quote.attachments.length) { @@ -41,6 +60,8 @@ export const deleteExternalMessageFiles = async (message: { } attachment.thumbnail = undefined; + anyChanges = true; + return attachment; }) ); @@ -57,10 +78,13 @@ export const deleteExternalMessageFiles = async (message: { } item.image = undefined; + anyChanges = true; + return image; }) ); } + return anyChanges; }; let attachmentsPath: string | undefined; diff --git a/ts/types/attachments/migrations.ts b/ts/types/attachments/migrations.ts index c42ec185dd..d35bcf6899 100644 --- a/ts/types/attachments/migrations.ts +++ b/ts/types/attachments/migrations.ts @@ -1,8 +1,8 @@ +/* eslint-disable no-param-reassign */ import { arrayBufferToBlob, blobToArrayBuffer } from 'blob-util'; -import { pathExists } from 'fs-extra'; +import fse from 'fs-extra'; import { isString } from 'lodash'; - import * as GoogleChrome from '../../util/GoogleChrome'; import * as MIME from '../MIME'; import { toLogFormat } from './Errors'; @@ -145,26 +145,6 @@ export const loadData = async (attachment: any) => { return { ...attachment, data }; }; -const handleDiskDeletion = async (path: string) => { - await deleteOnDisk(path); - try { - const exists = await pathExists(path); - - // NOTE we want to confirm the path no longer exists - if (exists) { - throw Error('Error: File path still exists.'); - } - - window.log.debug(`deleteDataSuccessful: Deletion succeeded for attachment ${path}`); - return undefined; - } catch (err) { - window.log.warn( - `deleteDataSuccessful: Deletion failed for attachment ${path} ${err.message || err}` - ); - return path; - } -}; - // deleteData :: (RelativePath -> IO Unit) // Attachment -> // IO Unit @@ -177,24 +157,43 @@ export const deleteData = async (attachment: { throw new TypeError('deleteData: attachment is not valid'); } - let { path, thumbnail, screenshot } = attachment; - - if (path && isString(path)) { - const pathAfterDelete = await handleDiskDeletion(path); - path = isString(pathAfterDelete) ? pathAfterDelete : undefined; + const { path, thumbnail, screenshot } = attachment; + if (isString(path)) { + await deleteOnDisk(path); + attachment.path = ''; } - if (thumbnail && isString(thumbnail.path)) { - const pathAfterDelete = await handleDiskDeletion(thumbnail.path); - thumbnail = isString(pathAfterDelete) ? pathAfterDelete : undefined; + await deleteOnDisk(thumbnail.path); + attachment.thumbnail = undefined; } - if (screenshot && isString(screenshot.path)) { - const pathAfterDelete = await handleDiskDeletion(screenshot.path); - screenshot = isString(pathAfterDelete) ? pathAfterDelete : undefined; + await deleteOnDisk(screenshot.path); + attachment.screenshot = undefined; } - return { path, thumbnail, screenshot }; + return attachment; +}; + +export const deleteDataSuccessful = async (attachment: { + path: string; + thumbnail: any; + screenshot: any; +}) => { + const errorMessage = `deleteDataSuccessful: Deletion failed for attachment ${attachment.path}`; + // eslint-disable-next-line @typescript-eslint/no-misused-promises + return fse.pathExists(attachment.path, (err, exists) => { + if (err) { + return Promise.reject(new Error(`${errorMessage} ${err}`)); + } + + // Note we want to confirm the path no longer exists + if (exists) { + return Promise.reject(errorMessage); + } + + window.log.debug(`deleteDataSuccessful: Deletion succeeded for attachment ${attachment.path}`); + return true; + }); }; type CaptureDimensionType = { contentType: string; path: string }; From 05215d8c6165822e4a33c1a02e7c6fc9e41f0e47 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 19 Mar 2024 11:47:48 +1100 Subject: [PATCH 107/302] fix: drop incoming msg if deleteBefore says so --- ts/receiver/contentMessage.ts | 41 ++++++++++++++++- .../SwarmPollingGroupConfig.ts | 23 ++++++++-- ts/session/utils/AttachmentsDownload.ts | 45 ++++++++++++++++++- 3 files changed, 103 insertions(+), 6 deletions(-) diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 515a8c79a3..32dc355405 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -30,7 +30,10 @@ import { assertUnreachable } from '../types/sqlSharedTypes'; import { BlockedNumberController } from '../util'; import { ReadReceipts } from '../util/readReceipts'; import { Storage } from '../util/storage'; -import { ContactsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; +import { + ContactsWrapperActions, + MetaGroupWrapperActions, +} from '../webworker/workers/browser/libsession_worker_interface'; import { handleCallMessage } from './callMessage'; import { getAllCachedECKeyPair, sentAtMoreRecentThanWrapper } from './closedGroups'; import { ECKeyPair } from './keypairs'; @@ -401,6 +404,37 @@ function shouldDropBlockedUserMessage( return !isControlDataMessageOnly; } +async function dropIncomingGroupMessage(envelope: EnvelopePlus, sentAtTimestamp: number) { + try { + if (PubKey.is03Pubkey(envelope.source)) { + const infos = await MetaGroupWrapperActions.infoGet(envelope.source); + + if (!infos) { + return false; + } + + if ( + sentAtTimestamp && + ((infos.deleteAttachBeforeSeconds && + sentAtTimestamp <= infos.deleteAttachBeforeSeconds * 1000) || + (infos.deleteBeforeSeconds && sentAtTimestamp <= infos.deleteBeforeSeconds * 1000)) + ) { + window?.log?.info( + `Incoming message sent before the group ${ed25519Str(envelope.source)} deleteBeforeSeconds or deleteAttachBeforeSeconds. Dropping it.` + ); + await IncomingMessageCache.removeFromCache(envelope); + return true; + } + } + } catch (e) { + window?.log?.warn( + `dropIncomingGroupMessage failed for group ${ed25519Str(envelope.source)} with `, + e.message + ); + } + return false; +} + export async function innerHandleSwarmContentMessage({ contentDecrypted, envelope, @@ -439,6 +473,11 @@ export async function innerHandleSwarmContentMessage({ window?.log?.info('Allowing group-control message only from blocked user'); } + if (await dropIncomingGroupMessage(envelope, sentAtTimestamp)) { + // message removed from cache in `dropIncomingGroupMessage` already + return; + } + // if this is a direct message, envelope.senderIdentity is undefined // if this is a closed group message, envelope.senderIdentity is the sender's pubkey and envelope.source is the closed group's pubkey const isPrivateConversationMessage = !envelope.senderIdentity; diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index f3fb572dbe..bf68a451c6 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -10,13 +10,26 @@ import { LibSessionUtil } from '../../../utils/libsession/libsession_utils'; import { SnodeNamespaces } from '../namespaces'; import { RetrieveMessageItemWithNamespace } from '../types'; +/** + * This is a basic optimization to avoid running the logic when the `deleteBeforeSeconds` + * and the `deleteAttachBeforeSeconds` does not change between each polls. + * Essentially, when the `deleteBeforeSeconds` is set in the group info config, + * - on start that map will be empty so we will run the logic to delete any messages sent before that. + * - after each poll, we will only rerun the logic if the new `deleteBeforeSeconds` is higher than the current setting. + * + */ +const lastAppliedRemoveMsgSentBeforeSeconds = new Map(); +const lastAppliedRemoveAttachmentSentBeforeSeconds = new Map(); + async function handleMetaMergeResults(groupPk: GroupPubkeyType) { const infos = await MetaGroupWrapperActions.infoGet(groupPk); if ( infos && isNumber(infos.deleteBeforeSeconds) && isFinite(infos.deleteBeforeSeconds) && - infos.deleteBeforeSeconds > 0 + infos.deleteBeforeSeconds > 0 && + (lastAppliedRemoveMsgSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > + infos.deleteBeforeSeconds ) { // delete any messages in this conversation sent before that timestamp (in seconds) const deletedMsgIds = await Data.removeAllMessagesInConversationSentBefore({ @@ -27,16 +40,19 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { `removeAllMessagesInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteBeforeSeconds}: `, deletedMsgIds ); - await window.inboxStore.dispatch( + window.inboxStore.dispatch( messagesExpired(deletedMsgIds.map(messageId => ({ conversationKey: groupPk, messageId }))) ); + lastAppliedRemoveMsgSentBeforeSeconds.set(groupPk, infos.deleteBeforeSeconds); } if ( infos && isNumber(infos.deleteAttachBeforeSeconds) && isFinite(infos.deleteAttachBeforeSeconds) && - infos.deleteAttachBeforeSeconds > 0 + infos.deleteAttachBeforeSeconds > 0 && + (lastAppliedRemoveAttachmentSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > + infos.deleteAttachBeforeSeconds ) { // delete any attachments in this conversation sent before that timestamp (in seconds) const impactedMsgModels = await Data.getAllMessagesWithAttachmentsInConversationSentBefore({ @@ -55,6 +71,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { // eslint-disable-next-line no-await-in-loop await msg?.cleanup(); } + lastAppliedRemoveAttachmentSentBeforeSeconds.set(groupPk, infos.deleteAttachBeforeSeconds); } } diff --git a/ts/session/utils/AttachmentsDownload.ts b/ts/session/utils/AttachmentsDownload.ts index d9d54a2acd..82d017f7ee 100644 --- a/ts/session/utils/AttachmentsDownload.ts +++ b/ts/session/utils/AttachmentsDownload.ts @@ -2,14 +2,16 @@ import { filter, isNumber, omit } from 'lodash'; import { v4 as uuidv4 } from 'uuid'; -import * as Constants from '../constants'; import { Data } from '../../data/data'; import { MessageModel } from '../../models/message'; import { downloadAttachment, downloadAttachmentSogsV3 } from '../../receiver/attachments'; import { initializeAttachmentLogic, processNewAttachment } from '../../types/MessageAttachment'; import { getAttachmentMetadata } from '../../types/message/initializeAttachmentMetadata'; -import { was404Error } from '../apis/snode_api/onions'; import { AttachmentDownloadMessageDetails } from '../../types/sqlSharedTypes'; +import { MetaGroupWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; +import { was404Error } from '../apis/snode_api/onions'; +import * as Constants from '../constants'; +import { PubKey } from '../types'; // this may cause issues if we increment that value to > 1, but only having one job will block the whole queue while one attachment is downloading const MAX_ATTACHMENT_JOB_PARALLELISM = 3; @@ -137,6 +139,34 @@ async function _maybeStartJob() { } } +async function shouldSkipGroupAttachmentDownload({ + groupPk, + messageModel, +}: { + groupPk: string; + messageModel: MessageModel; +}) { + if (!PubKey.is03Pubkey(groupPk)) { + return false; + } + try { + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + const sentAt = messageModel.get('sent_at'); + if (!sentAt) { + return false; + } + if ( + (infos.deleteAttachBeforeSeconds && sentAt <= infos.deleteAttachBeforeSeconds * 1000) || + (infos.deleteBeforeSeconds && sentAt <= infos.deleteBeforeSeconds * 1000) + ) { + return true; + } + } catch (e) { + window.log.warn('shouldSkipGroupAttachmentDownload failed with ', e.message); + } + return false; // try to download it +} + async function _runJob(job: any) { const { id, messageId, attachment, type, index, attempts, isOpenGroupV2, openGroupV2Details } = job || {}; @@ -152,6 +182,17 @@ async function _runJob(job: any) { await _finishJob(null, id); return; } + const shouldSkipJobForGroup = await shouldSkipGroupAttachmentDownload({ + groupPk: found.get('conversationId'), + messageModel: found, + }); + + if (shouldSkipJobForGroup) { + logger.info('_runJob: shouldSkipGroupAttachmentDownload is true, deleting job'); + await _finishJob(null, id); + return; + } + const isTrusted = found.isTrustedForAttachmentDownload(); if (!isTrusted) { From d4f3c7fdc103344fc0a5d31bd4c698437fe405eb Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 21 Mar 2024 13:42:57 +1100 Subject: [PATCH 108/302] feat: add ability to unsend messages in groupv2 --- ts/components/search/MessageSearchResults.tsx | 10 +- ts/data/data.ts | 27 ++++ ts/data/dataInit.ts | 3 + ts/data/sharedDataTypes.ts | 24 +++ .../conversations/unsendingInteractions.ts | 144 ++++++++++++++---- ts/models/conversation.ts | 8 +- ts/node/migration/sessionMigrations.ts | 33 ++++ ts/node/migration/signalMigrations.ts | 2 +- ts/node/sql.ts | 68 ++++++++- ts/receiver/groupv2/handleGroupV2Message.ts | 57 ++++++- .../GroupUpdateDeleteMemberContentMessage.ts | 55 +++++-- ts/session/utils/AttachmentsDownload.ts | 40 ----- .../SwarmPolling_pollForAllKeys_test.ts | 2 +- 13 files changed, 374 insertions(+), 99 deletions(-) create mode 100644 ts/data/sharedDataTypes.ts diff --git a/ts/components/search/MessageSearchResults.tsx b/ts/components/search/MessageSearchResults.tsx index 13ac830988..07c62522d4 100644 --- a/ts/components/search/MessageSearchResults.tsx +++ b/ts/components/search/MessageSearchResults.tsx @@ -1,15 +1,15 @@ import React from 'react'; import styled, { CSSProperties } from 'styled-components'; +import { useConversationUsername, useIsPrivate } from '../../hooks/useParamSelector'; +import { MessageAttributes } from '../../models/messageType'; +import { UserUtils } from '../../session/utils'; import { getOurPubKeyStrFromCache } from '../../session/utils/User'; import { openConversationToSpecificMessage } from '../../state/ducks/conversations'; -import { ContactName } from '../conversation/ContactName'; import { Avatar, AvatarSize } from '../avatar/Avatar'; -import { Timestamp } from '../conversation/Timestamp'; import { MessageBodyHighlight } from '../basic/MessageBodyHighlight'; -import { MessageAttributes } from '../../models/messageType'; -import { useConversationUsername, useIsPrivate } from '../../hooks/useParamSelector'; -import { UserUtils } from '../../session/utils'; +import { ContactName } from '../conversation/ContactName'; +import { Timestamp } from '../conversation/Timestamp'; export type MessageResultProps = MessageAttributes & { snippet: string }; diff --git a/ts/data/data.ts b/ts/data/data.ts index 403b9c72e8..4ddca7312c 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -26,6 +26,12 @@ import { channels } from './channels'; import * as dataInit from './dataInit'; import { cleanData } from './dataUtils'; import { SNODE_POOL_ITEM_ID } from './settings-key'; +import { + DataCallArgs, + DeleteAllMessageFromSendersInConversationType, + DeleteAllMessageHashesInConversationMatchingAuthorType, + DeleteAllMessageHashesInConversationType, +} from './sharedDataTypes'; const ERASE_SQL_KEY = 'erase-sql-key'; const ERASE_ATTACHMENTS_KEY = 'erase-attachments'; @@ -586,6 +592,24 @@ async function removeAllMessagesInConversation(conversationId: string): Promise< ); } +async function deleteAllMessageFromSendersInConversation( + args: DataCallArgs +): ReturnType { + return channels.deleteAllMessageFromSendersInConversation(args); +} + +async function deleteAllMessageHashesInConversation( + args: DataCallArgs +): ReturnType { + return channels.deleteAllMessageHashesInConversation(args); +} + +async function deleteAllMessageHashesInConversationMatchingAuthor( + args: DataCallArgs +): ReturnType { + return channels.deleteAllMessageHashesInConversationMatchingAuthor(args); +} + async function getMessagesBySentAt(sentAt: number): Promise { const messages = await channels.getMessagesBySentAt(sentAt); return new MessageCollection(messages); @@ -866,6 +890,9 @@ export const Data = { getLastHashBySnode, getSeenMessagesByHashList, removeAllMessagesInConversation, + deleteAllMessageFromSendersInConversation, + deleteAllMessageHashesInConversation, + deleteAllMessageHashesInConversationMatchingAuthor, getMessagesBySentAt, getExpiredMessages, getOutgoingWithoutExpiresAt, diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts index 8e14cf548d..9c2f7ca95d 100644 --- a/ts/data/dataInit.ts +++ b/ts/data/dataInit.ts @@ -50,6 +50,9 @@ const channelsToMake = new Set([ 'getUnreadCountByConversation', 'getMessageCountByType', 'removeAllMessagesInConversation', + 'deleteAllMessageFromSendersInConversation', + 'deleteAllMessageHashesInConversation', + 'deleteAllMessageHashesInConversationMatchingAuthor', 'getMessageCount', 'filterAlreadyFetchedOpengroupMessage', 'getMessagesBySenderAndSentAt', diff --git a/ts/data/sharedDataTypes.ts b/ts/data/sharedDataTypes.ts new file mode 100644 index 0000000000..d74153aebc --- /dev/null +++ b/ts/data/sharedDataTypes.ts @@ -0,0 +1,24 @@ +import { PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; + +type PrArrayMsgIds = Promise>; + +export type DataCallArgs any> = Parameters[0]; + +export type DeleteAllMessageFromSendersInConversationType = ( + args: WithGroupPubkey & { + toRemove: Array; + } +) => PrArrayMsgIds; + +export type DeleteAllMessageHashesInConversationType = ( + args: WithGroupPubkey & { + messageHashes: Array; + } +) => PrArrayMsgIds; + +export type DeleteAllMessageHashesInConversationMatchingAuthorType = ( + args: WithGroupPubkey & { + messageHashes: Array; + author: PubkeyType; + } +) => PrArrayMsgIds; diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index c9da1613bc..36d757edd4 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -1,4 +1,5 @@ -import { compact } from 'lodash'; +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { compact, isEmpty } from 'lodash'; import { SessionButtonColor } from '../../components/basic/SessionButton'; import { Data } from '../../data/data'; import { ConversationModel } from '../../models/conversation'; @@ -6,41 +7,37 @@ import { MessageModel } from '../../models/message'; import { getMessageQueue } from '../../session'; import { deleteSogsMessageByServerIds } from '../../session/apis/open_group_api/sogsv3/sogsV3DeleteMessages'; import { SnodeAPI } from '../../session/apis/snode_api/SNodeAPI'; +import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces'; import { ConvoHub } from '../../session/conversations'; +import { getSodiumRenderer } from '../../session/crypto'; import { UnsendMessage } from '../../session/messages/outgoing/controlMessage/UnsendMessage'; +import { GroupUpdateDeleteMemberContentMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage'; import { ed25519Str } from '../../session/onions/onionPath'; import { PubKey } from '../../session/types'; import { ToastUtils, UserUtils } from '../../session/utils'; import { closeRightPanel, resetSelectedMessageIds } from '../../state/ducks/conversations'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { resetRightOverlayMode } from '../../state/ducks/section'; +import { MetaGroupWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; -/** - * Deletes messages for everyone in a 1-1 or everyone in a closed group conversation. - */ -async function unsendMessagesForEveryone( +async function unsendMessagesForEveryone1o1AndLegacy( conversation: ConversationModel, + destination: PubkeyType, msgsToDelete: Array ) { - window?.log?.info('Deleting messages for all users in this conversation'); - const destinationId = conversation.id; - if (!destinationId) { - return; - } - if (conversation.isOpenGroupV2()) { - throw new Error( - 'Cannot unsend a message for an opengroup v2. This has to be a deleteMessage api call' - ); + const unsendMsgObjects = getUnsendMessagesObjects1o1OrLegacyGroups(msgsToDelete); + + if (conversation.isClosedGroupV2()) { + throw new Error('unsendMessagesForEveryone1o1AndLegacy not compatible with group v2'); } - const unsendMsgObjects = getUnsendMessagesObjects(msgsToDelete); if (conversation.isPrivate()) { // sending to recipient all the messages separately for now await Promise.all( unsendMsgObjects.map(unsendObject => getMessageQueue() - .sendToPubKey(new PubKey(destinationId), unsendObject, SnodeNamespaces.Default) + .sendToPubKey(new PubKey(destination), unsendObject, SnodeNamespaces.Default) .catch(window?.log?.error) ) ); @@ -51,7 +48,9 @@ async function unsendMessagesForEveryone( .catch(window?.log?.error) ) ); - } else if (conversation.isClosedGroup()) { + return; + } + if (conversation.isClosedGroup()) { // sending to recipient all the messages separately for now await Promise.all( unsendMsgObjects.map(unsendObject => { @@ -59,19 +58,84 @@ async function unsendMessagesForEveryone( .sendToGroup({ message: unsendObject, namespace: SnodeNamespaces.LegacyClosedGroup, - groupPubKey: new PubKey(destinationId), + groupPubKey: new PubKey(destination), }) .catch(window?.log?.error); }) ); } +} + +async function unsendMessagesForEveryoneGroupV2( + conversation: ConversationModel, + groupPk: GroupPubkeyType, + msgsToDelete: Array +) { + const messageHashesToUnsend = await getMessageHashes(msgsToDelete); + const group = await MetaGroupWrapperActions.infoGet(groupPk); + + if (!messageHashesToUnsend.length) { + window.log.info('unsendMessagesForEveryoneGroupV2: no hashes to remove'); + return; + } + + if (!conversation.isClosedGroupV2()) { + throw new Error('unsendMessagesForEveryoneGroupV2 needs a group v2'); + } + + await getMessageQueue().sendToGroupV2NonDurably({ + message: new GroupUpdateDeleteMemberContentMessage({ + createAtNetworkTimestamp: GetNetworkTime.now(), + expirationType: 'unknown', + expireTimer: 0, + groupPk, + memberSessionIds: [], + messageHashes: messageHashesToUnsend, + sodium: await getSodiumRenderer(), + secretKey: group.secretKey, + }), + }); +} + +/** + * Deletes messages for everyone in a 1-1 or everyone in a closed group conversation. + */ +async function unsendMessagesForEveryone( + conversation: ConversationModel, + msgsToDelete: Array +) { + window?.log?.info('Deleting messages for all users in this conversation'); + const destinationId = conversation.id as string; + if (!destinationId) { + return; + } + if (conversation.isOpenGroupV2()) { + throw new Error( + 'Cannot unsend a message for an opengroup v2. This has to be a deleteMessage api call' + ); + } + + if ( + conversation.isPrivate() || + (conversation.isClosedGroup() && !conversation.isClosedGroupV2()) + ) { + if (!PubKey.is05Pubkey(conversation.id)) { + throw new Error('unsendMessagesForEveryone1o1AndLegacy requires a 05 key'); + } + await unsendMessagesForEveryone1o1AndLegacy(conversation, conversation.id, msgsToDelete); + } else if (conversation.isClosedGroupV2()) { + if (!PubKey.is03Pubkey(destinationId)) { + throw new Error('invalid conversation id (03) for unsendMessageForEveryone'); + } + await unsendMessagesForEveryoneGroupV2(conversation, destinationId, msgsToDelete); + } await deleteMessagesFromSwarmAndCompletelyLocally(conversation, msgsToDelete); window.inboxStore?.dispatch(resetSelectedMessageIds()); ToastUtils.pushDeleted(msgsToDelete.length); } -function getUnsendMessagesObjects(messages: Array) { +function getUnsendMessagesObjects1o1OrLegacyGroups(messages: Array) { // #region building request return compact( messages.map(message => { @@ -95,6 +159,14 @@ function getUnsendMessagesObjects(messages: Array) { // #endregion } +async function getMessageHashes(messages: Array) { + return compact( + messages.map(message => { + return message.get('messageHash'); + }) + ); +} + /** * Do a single request to the swarm with all the message hashes to delete from the swarm. * @@ -221,7 +293,7 @@ async function unsendMessageJustForThisUser( ) { window?.log?.warn('Deleting messages just for this user'); - const unsendMsgObjects = getUnsendMessagesObjects(msgsToDelete); + const unsendMsgObjects = getUnsendMessagesObjects1o1OrLegacyGroups(msgsToDelete); // sending to our other devices all the messages separately for now await Promise.all( @@ -302,15 +374,37 @@ const doDeleteSelectedMessages = async ({ return; } - const areAllOurs = selectedMessages.every(message => ourDevicePubkey === message.getSource()); + const areAllOurs = selectedMessages.every(message => message.getSource() === ourDevicePubkey); if (conversation.isPublic()) { await doDeleteSelectedMessagesInSOGS(selectedMessages, conversation, areAllOurs); return; } - // #region deletion for 1-1 and closed groups + /** + * Note: groupv2 support deleteForEveryone only. + * For groupv2, a user can delete only his messages, but an admin can delete the messages of anyone. + * */ + if (deleteForEveryone || conversation.isClosedGroupV2()) { + if (conversation.isClosedGroupV2()) { + const convoId = conversation.id; + if (!PubKey.is03Pubkey(convoId)) { + throw new Error('unsend request for groupv2 but not a 03 key is impossible possible'); + } + // only lookup adminKey if we need to + if (!areAllOurs) { + const group = await MetaGroupWrapperActions.infoGet(convoId); + const weAreAdmin = !isEmpty(group.secretKey); + if (!weAreAdmin) { + ToastUtils.pushMessageDeleteForbidden(); + window.inboxStore?.dispatch(resetSelectedMessageIds()); + return; + } + } + // if they are all ours, of not but we are an admin, we can move forward + await unsendMessagesForEveryone(conversation, selectedMessages); + return; + } - if (deleteForEveryone) { if (!areAllOurs) { ToastUtils.pushMessageDeleteForbidden(); window.inboxStore?.dispatch(resetSelectedMessageIds()); @@ -320,7 +414,7 @@ const doDeleteSelectedMessages = async ({ return; } - // delete just for me in a closed group only means delete locally + // delete just for me in a legacy closed group only means delete locally if (conversation.isClosedGroup()) { await deleteMessagesFromSwarmAndCompletelyLocally(conversation, selectedMessages); @@ -331,8 +425,6 @@ const doDeleteSelectedMessages = async ({ } // otherwise, delete that message locally, from our swarm and from our other devices await unsendMessageJustForThisUser(conversation, selectedMessages); - - // #endregion }; export async function deleteMessagesByIdForEveryone( diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 899443e6eb..31be431921 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -242,7 +242,7 @@ export class ConversationModel extends Backbone.Model { ); } - public isClosedGroupV2(): boolean { + public isClosedGroupV2() { return Boolean(this.get('type') === ConversationTypeEnum.GROUPV2 && PubKey.is03Pubkey(this.id)); } @@ -1097,6 +1097,9 @@ export class ConversationModel extends Backbone.Model { if (this.isClosedGroup()) { if (this.isAdmin(UserUtils.getOurPubKeyStrFromCache())) { if (this.isClosedGroupV2()) { + if (!PubKey.is03Pubkey(this.id)) { + throw new Error('updateExpireTimer v2 group requires a 03 key'); + } const group = await UserGroupsWrapperActions.getGroup(this.id); if (!group || !group.secretKey) { throw new Error( @@ -2162,6 +2165,9 @@ export class ConversationModel extends Backbone.Model { } private async sendMessageToGroupV2(chatMessageParams: VisibleMessageParams) { + if (!PubKey.is03Pubkey(this.id)) { + throw new Error('sendMessageToGroupV2 needs a 03 key'); + } const visibleMessage = new VisibleMessage(chatMessageParams); const groupVisibleMessage = new ClosedGroupV2VisibleMessage({ chatMessage: visibleMessage, diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts index 46cef9b81e..a06b963fb5 100644 --- a/ts/node/migration/sessionMigrations.ts +++ b/ts/node/migration/sessionMigrations.ts @@ -105,6 +105,7 @@ const LOKI_SCHEMA_VERSIONS = [ updateToSessionSchemaVersion34, updateToSessionSchemaVersion35, updateToSessionSchemaVersion36, + updateToSessionSchemaVersion37, ]; function updateToSessionSchemaVersion1(currentVersion: number, db: BetterSqlite3.Database) { @@ -1952,6 +1953,38 @@ function updateToSessionSchemaVersion36(currentVersion: number, db: BetterSqlite console.log(`updateToSessionSchemaVersion${targetVersion}: success!`); } +function updateToSessionSchemaVersion37(currentVersion: number, db: BetterSqlite3.Database) { + const targetVersion = 37; + if (currentVersion >= targetVersion) { + return; + } + + console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`); + + db.transaction(() => { + db.exec(`ALTER TABLE ${MESSAGES_TABLE} ADD COLUMN messageHash TEXT; + UPDATE ${MESSAGES_TABLE} SET + messageHash = json_extract(json, '$.messageHash'); + `); + + db.exec(`CREATE INDEX messages_t_messageHash ON ${MESSAGES_TABLE} ( + messageHash + );`); + db.exec(`CREATE INDEX messages_t_messageHash_author ON ${MESSAGES_TABLE} ( + messageHash, + source + );`); + db.exec(`CREATE INDEX messages_t_messageHash_author_convoId ON ${MESSAGES_TABLE} ( + messageHash, + source, + conversationId + );`); + writeSessionSchemaVersion(targetVersion, db); + })(); + + console.log(`updateToSessionSchemaVersion${targetVersion}: success!`); +} + export function printTableColumns(table: string, db: BetterSqlite3.Database) { console.info(db.pragma(`table_info('${table}');`)); } diff --git a/ts/node/migration/signalMigrations.ts b/ts/node/migration/signalMigrations.ts index 1dc919e466..6d7bddcd70 100644 --- a/ts/node/migration/signalMigrations.ts +++ b/ts/node/migration/signalMigrations.ts @@ -1,6 +1,6 @@ -import path from 'path'; import * as BetterSqlite3 from '@signalapp/better-sqlite3'; import { isNumber } from 'lodash'; +import path from 'path'; import { ATTACHMENT_DOWNLOADS_TABLE, diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 51b8c74ccd..fea3a6f859 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -53,6 +53,7 @@ import { StorageItem } from './storage_item'; // checked - only node import { OpenGroupV2Room } from '../data/opengroups'; import { + AwaitedReturn, CONFIG_DUMP_TABLE, MsgDuplicateSearchOpenGroup, roomHasBlindEnabled, @@ -63,6 +64,12 @@ import { } from '../types/sqlSharedTypes'; import { KNOWN_BLINDED_KEYS_ITEM, SettingsKey } from '../data/settings-key'; +import { + DataCallArgs, + DeleteAllMessageFromSendersInConversationType, + DeleteAllMessageHashesInConversationMatchingAuthorType, + DeleteAllMessageHashesInConversationType, +} from '../data/sharedDataTypes'; import { MessageAttributes } from '../models/messageType'; import { SignalService } from '../protobuf'; import { Quote } from '../receiver/types'; @@ -804,6 +811,7 @@ function saveMessage(data: MessageAttributes) { expireTimer, expirationStartTimestamp, flags, + messageHash, } = data; if (!id) { @@ -836,6 +844,7 @@ function saveMessage(data: MessageAttributes) { type: type || '', unread, flags: flags ?? 0, + messageHash, }; assertGlobalInstance() @@ -860,7 +869,8 @@ function saveMessage(data: MessageAttributes) { source, type, unread, - flags + flags, + messageHash ) values ( $id, $json, @@ -881,7 +891,8 @@ function saveMessage(data: MessageAttributes) { $source, $type, $unread, - $flags + $flags, + $messageHash );` ) .run(payload); @@ -1047,6 +1058,56 @@ function removeAllMessagesInConversation( .run({ conversationId }); } +function deleteAllMessageFromSendersInConversation( + { groupPk, toRemove }: DataCallArgs, + instance?: BetterSqlite3.Database +): AwaitedReturn { + if (!groupPk || !toRemove.length) { + return []; + } + return assertGlobalInstanceOrInstance(instance) + .prepare( + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId AND source IN ( ${toRemove.map(() => '?').join(', ')} ) RETURNING id` + ) + .all(groupPk, toRemove) + .map(m => m.id); +} + +function deleteAllMessageHashesInConversation( + { groupPk, messageHashes }: DataCallArgs, + instance?: BetterSqlite3.Database +): AwaitedReturn { + if (!groupPk || !messageHashes.length) { + return []; + } + return assertGlobalInstanceOrInstance(instance) + .prepare( + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING id` + ) + .all(groupPk, ...messageHashes) + .map(m => m.id); +} + +function deleteAllMessageHashesInConversationMatchingAuthor( + { + author, + groupPk, + messageHashes, + }: DataCallArgs, + instance?: BetterSqlite3.Database +): AwaitedReturn { + if (!groupPk || !author || !messageHashes.length) { + return []; + } + console.warn('messageHashes', messageHashes); + return assertGlobalInstanceOrInstance(instance) + .prepare( + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND source = ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING id` + ) + .all(groupPk, author, ...messageHashes) + .map(m => m.id); +} + function cleanUpExpirationTimerUpdateHistory( conversationId: string, isPrivate: boolean, @@ -2541,6 +2602,9 @@ export const sqlNode = { getAllMessagesWithAttachmentsInConversationSentBefore, cleanUpExpirationTimerUpdateHistory, removeAllMessagesInConversation, + deleteAllMessageFromSendersInConversation, + deleteAllMessageHashesInConversation, + deleteAllMessageHashesInConversationMatchingAuthor, getUnreadByConversation, getUnreadDisappearingByConversation, markAllAsReadByConversationNoExpiration, diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 78ceffddb1..dcd8eed5fa 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -1,5 +1,6 @@ import { GroupPubkeyType, PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; import { isEmpty, isFinite, isNumber } from 'lodash'; +import { Data } from '../../data/data'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; @@ -19,6 +20,7 @@ import { PreConditionFailed } from '../../session/utils/errors'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; import { SessionUtilConvoInfoVolatile } from '../../session/utils/libsession/libsession_utils_convo_info_volatile'; +import { messagesExpired } from '../../state/ducks/conversations'; import { groupInfoActions } from '../../state/ducks/metaGroups'; import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { BlockedNumberController } from '../../util'; @@ -343,24 +345,49 @@ async function handleGroupMemberLeftMessage({ convo.set({ active_at: signatureTimestamp, }); - // debugger TODO We should process this message type even if the sender is blocked + // TODO We should process this message type even if the sender is blocked } async function handleGroupDeleteMemberContentMessage({ groupPk, signatureTimestamp, change, + author, }: GroupUpdateGeneric) { const convo = ConvoHub.use().get(groupPk); if (!convo) { return; } + /** + * When handling a GroupUpdateDeleteMemberContentMessage we need to do a few things. + * When `adminSignature` is empty, + * 1. we only delete the messageHashes which are in the change.messageHashes AND sent by that same author. + * When `adminSignature` is not empty and valid, + * 2. we delete all the messages in the group sent by any of change.memberSessionIds AND + * 3. we delete all the messageHashes in the conversation matching the change.messageHashes (even if not from the right sender) + */ + + if (isEmpty(change.adminSignature)) { + // this is step 1. + const msgsDeleted = await Data.deleteAllMessageHashesInConversationMatchingAuthor({ + author, + groupPk, + messageHashes: change.messageHashes, + }); + + window.inboxStore.dispatch( + messagesExpired(msgsDeleted.map(m => ({ conversationKey: groupPk, messageId: m }))) + ); + convo.updateLastMessage(); + return; + } + const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, data: stringToUint8Array( - `DELETE_CONTENT${signatureTimestamp}${change.memberSessionIds.join()}${change.messageHashes.join()}` + `DELETE_CONTENT${signatureTimestamp}${change.memberSessionIds.join('')}${change.messageHashes.join('')}` ), }); @@ -369,11 +396,27 @@ async function handleGroupDeleteMemberContentMessage({ return; } + const toRemove = change.memberSessionIds.filter(PubKey.is05Pubkey); + + const deletedBySenders = await Data.deleteAllMessageFromSendersInConversation({ + groupPk, + toRemove, + }); // this is step 2. + const deletedByHashes = await Data.deleteAllMessageHashesInConversation({ + groupPk, + messageHashes: change.messageHashes, + }); // this is step 3. + + window.inboxStore.dispatch( + messagesExpired( + [...deletedByHashes, ...deletedBySenders].map(m => ({ + conversationKey: groupPk, + messageId: m, + })) + ) + ); + convo.updateLastMessage(); // TODO we should process this message type even if the sender is blocked - convo.set({ - active_at: signatureTimestamp, - }); - throw new Error('Not implemented'); } async function handleGroupUpdateDeleteMessage({ @@ -389,7 +432,7 @@ async function handleGroupUpdateDeleteMessage({ const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, - data: stringToUint8Array(`DELETE${signatureTimestamp}${change.memberSessionIds.join()}`), + data: stringToUint8Array(`DELETE${signatureTimestamp}${change.memberSessionIds.join('')}`), }); if (!sigValid) { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts index cfebd4e606..a757094ec8 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts @@ -2,36 +2,47 @@ import { PubkeyType } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; import { SignalService } from '../../../../../../protobuf'; import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; +import { stringToUint8Array } from '../../../../../utils/String'; import { Preconditions } from '../../../preconditions'; -import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; +import { + AdminSigDetails, + GroupUpdateMessage, + GroupUpdateMessageParams, +} from '../GroupUpdateMessage'; -type Params = GroupUpdateMessageParams & { - memberSessionIds: Array; - adminSignature: Uint8Array; // this is a signature of `"DELETE_CONTENT" || timestamp || sessionId[0] || ... || sessionId[N]` -}; +// Note: `Partial` because that message can also be sent as a non-admin and we always give sodium but not always the secretKey +type Params = GroupUpdateMessageParams & + Partial> & + Omit & { + memberSessionIds: Array; + messageHashes: Array; + }; /** * GroupUpdateDeleteMemberContentMessage is sent as a message to group's swarm. */ export class GroupUpdateDeleteMemberContentMessage extends GroupUpdateMessage { + public readonly createAtNetworkTimestamp: Params['createAtNetworkTimestamp']; public readonly memberSessionIds: Params['memberSessionIds']; - public readonly adminSignature: Params['adminSignature']; + public readonly messageHashes: Params['messageHashes']; + public readonly secretKey: Params['secretKey']; + public readonly sodium: Params['sodium']; public readonly namespace = SnodeNamespaces.ClosedGroupMessages; constructor(params: Params) { super(params); - this.adminSignature = params.adminSignature; this.memberSessionIds = params.memberSessionIds; - if (isEmpty(this.memberSessionIds)) { - throw new Error('GroupUpdateDeleteMemberContentMessage needs members in list'); + this.messageHashes = params.messageHashes; + this.secretKey = params.secretKey; + this.createAtNetworkTimestamp = params.createAtNetworkTimestamp; + this.sodium = params.sodium; + + if (isEmpty(this.memberSessionIds) && isEmpty(this.messageHashes)) { + throw new Error( + 'GroupUpdateDeleteMemberContentMessage needs members or messageHashes to be filled' + ); } - Preconditions.checkUin8tArrayOrThrow({ - data: this.adminSignature, - expectedLength: 64, - varName: 'adminSignature', - context: this.constructor.toString(), - }); Preconditions.checkArrayHaveOnly05Pubkeys({ arr: this.memberSessionIds, @@ -41,9 +52,21 @@ export class GroupUpdateDeleteMemberContentMessage extends GroupUpdateMessage { } public dataProto(): SignalService.DataMessage { + // If we have the secretKey, we can delete it for anyone `"DELETE_CONTENT" || timestamp || sessionId[0] || ... || messageHashes[0] || ...` + + let adminSignature = new Uint8Array(); + if (this.secretKey && this.sodium) { + adminSignature = this.sodium.crypto_sign_detached( + stringToUint8Array( + `DELETE_CONTENT${this.createAtNetworkTimestamp}${this.memberSessionIds.join('')}${this.messageHashes.join('')}` + ), + this.secretKey + ); + } const deleteMemberContent = new SignalService.GroupUpdateDeleteMemberContentMessage({ - adminSignature: this.adminSignature, + adminSignature, memberSessionIds: this.memberSessionIds, + messageHashes: this.messageHashes, }); return new SignalService.DataMessage({ groupUpdateMessage: { deleteMemberContent } }); diff --git a/ts/session/utils/AttachmentsDownload.ts b/ts/session/utils/AttachmentsDownload.ts index 82d017f7ee..3dc61d7c52 100644 --- a/ts/session/utils/AttachmentsDownload.ts +++ b/ts/session/utils/AttachmentsDownload.ts @@ -8,10 +8,8 @@ import { downloadAttachment, downloadAttachmentSogsV3 } from '../../receiver/att import { initializeAttachmentLogic, processNewAttachment } from '../../types/MessageAttachment'; import { getAttachmentMetadata } from '../../types/message/initializeAttachmentMetadata'; import { AttachmentDownloadMessageDetails } from '../../types/sqlSharedTypes'; -import { MetaGroupWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { was404Error } from '../apis/snode_api/onions'; import * as Constants from '../constants'; -import { PubKey } from '../types'; // this may cause issues if we increment that value to > 1, but only having one job will block the whole queue while one attachment is downloading const MAX_ATTACHMENT_JOB_PARALLELISM = 3; @@ -139,34 +137,6 @@ async function _maybeStartJob() { } } -async function shouldSkipGroupAttachmentDownload({ - groupPk, - messageModel, -}: { - groupPk: string; - messageModel: MessageModel; -}) { - if (!PubKey.is03Pubkey(groupPk)) { - return false; - } - try { - const infos = await MetaGroupWrapperActions.infoGet(groupPk); - const sentAt = messageModel.get('sent_at'); - if (!sentAt) { - return false; - } - if ( - (infos.deleteAttachBeforeSeconds && sentAt <= infos.deleteAttachBeforeSeconds * 1000) || - (infos.deleteBeforeSeconds && sentAt <= infos.deleteBeforeSeconds * 1000) - ) { - return true; - } - } catch (e) { - window.log.warn('shouldSkipGroupAttachmentDownload failed with ', e.message); - } - return false; // try to download it -} - async function _runJob(job: any) { const { id, messageId, attachment, type, index, attempts, isOpenGroupV2, openGroupV2Details } = job || {}; @@ -182,16 +152,6 @@ async function _runJob(job: any) { await _finishJob(null, id); return; } - const shouldSkipJobForGroup = await shouldSkipGroupAttachmentDownload({ - groupPk: found.get('conversationId'), - messageModel: found, - }); - - if (shouldSkipJobForGroup) { - logger.info('_runJob: shouldSkipGroupAttachmentDownload is true, deleting job'); - await _finishJob(null, id); - return; - } const isTrusted = found.isTrustedForAttachmentDownload(); diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts index 4fea21649f..53d1440ac8 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts @@ -498,7 +498,7 @@ describe('SwarmPolling:pollForAllKeys', () => { ); stubWithLegacyGroups([]); - stubWithGroups([convo.id]); + stubWithGroups([convo.id as GroupPubkeyType]); convo.set('active_at', Date.now()); groupConvoPubkey = PubKey.cast(convo.id as string); From d282875ac0bb5c0d3fa8700dbc7a6591d46c9ed9 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 21 Mar 2024 16:16:46 +1100 Subject: [PATCH 109/302] fix: make the delete by author/hashes with adminSig work --- .../conversations/unsendingInteractions.ts | 41 ++++++++++++------- ts/node/sql.ts | 4 +- .../GroupUpdateDeleteMemberContentMessage.ts | 4 +- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 36d757edd4..6e7a372ba6 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -19,7 +19,7 @@ import { ToastUtils, UserUtils } from '../../session/utils'; import { closeRightPanel, resetSelectedMessageIds } from '../../state/ducks/conversations'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { resetRightOverlayMode } from '../../state/ducks/section'; -import { MetaGroupWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; +import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; async function unsendMessagesForEveryone1o1AndLegacy( conversation: ConversationModel, @@ -66,16 +66,22 @@ async function unsendMessagesForEveryone1o1AndLegacy( } } -async function unsendMessagesForEveryoneGroupV2( - conversation: ConversationModel, - groupPk: GroupPubkeyType, - msgsToDelete: Array -) { +async function unsendMessagesForEveryoneGroupV2({ + allMessagesFrom, + conversation, + groupPk, + msgsToDelete, +}: { + conversation: ConversationModel; + groupPk: GroupPubkeyType; + msgsToDelete: Array; + allMessagesFrom: Array; +}) { const messageHashesToUnsend = await getMessageHashes(msgsToDelete); - const group = await MetaGroupWrapperActions.infoGet(groupPk); + const group = await UserGroupsWrapperActions.getGroup(groupPk); - if (!messageHashesToUnsend.length) { - window.log.info('unsendMessagesForEveryoneGroupV2: no hashes to remove'); + if (!messageHashesToUnsend.length && !allMessagesFrom.length) { + window.log.info('unsendMessagesForEveryoneGroupV2: no hashes nor author to remove'); return; } @@ -89,10 +95,10 @@ async function unsendMessagesForEveryoneGroupV2( expirationType: 'unknown', expireTimer: 0, groupPk, - memberSessionIds: [], + memberSessionIds: allMessagesFrom, messageHashes: messageHashesToUnsend, sodium: await getSodiumRenderer(), - secretKey: group.secretKey, + secretKey: group?.secretKey || undefined, }), }); } @@ -127,7 +133,12 @@ async function unsendMessagesForEveryone( if (!PubKey.is03Pubkey(destinationId)) { throw new Error('invalid conversation id (03) for unsendMessageForEveryone'); } - await unsendMessagesForEveryoneGroupV2(conversation, destinationId, msgsToDelete); + await unsendMessagesForEveryoneGroupV2({ + conversation, + groupPk: destinationId, + msgsToDelete, + allMessagesFrom: [], // currently we cannot remove all the messages from a specific pubkey + }); } await deleteMessagesFromSwarmAndCompletelyLocally(conversation, msgsToDelete); @@ -392,9 +403,9 @@ const doDeleteSelectedMessages = async ({ } // only lookup adminKey if we need to if (!areAllOurs) { - const group = await MetaGroupWrapperActions.infoGet(convoId); - const weAreAdmin = !isEmpty(group.secretKey); - if (!weAreAdmin) { + const group = await UserGroupsWrapperActions.getGroup(convoId); + const weHaveAdminKey = !isEmpty(group?.secretKey); + if (!weHaveAdminKey) { ToastUtils.pushMessageDeleteForbidden(); window.inboxStore?.dispatch(resetSelectedMessageIds()); return; diff --git a/ts/node/sql.ts b/ts/node/sql.ts index fea3a6f859..3cae2d1926 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1067,9 +1067,9 @@ function deleteAllMessageFromSendersInConversation( } return assertGlobalInstanceOrInstance(instance) .prepare( - `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = $conversationId AND source IN ( ${toRemove.map(() => '?').join(', ')} ) RETURNING id` + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND source IN ( ${toRemove.map(() => '?').join(', ')} ) RETURNING id` ) - .all(groupPk, toRemove) + .all(groupPk, ...toRemove) .map(m => m.id); } diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts index a757094ec8..91ac703065 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage.ts @@ -1,5 +1,5 @@ import { PubkeyType } from 'libsession_util_nodejs'; -import { isEmpty } from 'lodash'; +import _, { isEmpty } from 'lodash'; import { SignalService } from '../../../../../../protobuf'; import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; import { stringToUint8Array } from '../../../../../utils/String'; @@ -55,7 +55,7 @@ export class GroupUpdateDeleteMemberContentMessage extends GroupUpdateMessage { // If we have the secretKey, we can delete it for anyone `"DELETE_CONTENT" || timestamp || sessionId[0] || ... || messageHashes[0] || ...` let adminSignature = new Uint8Array(); - if (this.secretKey && this.sodium) { + if (this.secretKey && !_.isEmpty(this.secretKey) && this.sodium) { adminSignature = this.sodium.crypto_sign_detached( stringToUint8Array( `DELETE_CONTENT${this.createAtNetworkTimestamp}${this.memberSessionIds.join('')}${this.messageHashes.join('')}` From 23a0fd6b3aebeb8f687afde19b367dcb78ee1d2b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 21 Mar 2024 16:17:06 +1100 Subject: [PATCH 110/302] chore: force type of backbone models id:string --- patches/@types+backbone+1.4.2.patch | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 patches/@types+backbone+1.4.2.patch diff --git a/patches/@types+backbone+1.4.2.patch b/patches/@types+backbone+1.4.2.patch new file mode 100644 index 0000000000..6491b4554e --- /dev/null +++ b/patches/@types+backbone+1.4.2.patch @@ -0,0 +1,35 @@ +diff --git a/node_modules/@types/backbone/README.md b/node_modules/@types/backbone/README.md +deleted file mode 100644 +index b353b41..0000000 +--- a/node_modules/@types/backbone/README.md ++++ /dev/null +@@ -1,16 +0,0 @@ +-# Installation +-> `npm install --save @types/backbone` +- +-# Summary +-This package contains type definitions for Backbone (http://backbonejs.org/). +- +-# Details +-Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/backbone. +- +-### Additional Details +- * Last updated: Thu, 30 Apr 2020 23:00:14 GMT +- * Dependencies: [@types/underscore](https://npmjs.com/package/@types/underscore), [@types/jquery](https://npmjs.com/package/@types/jquery) +- * Global values: `Backbone` +- +-# Credits +-These definitions were written by [Boris Yankov](https://github.com/borisyankov), [Natan Vivo](https://github.com/nvivo), [kenjiru](https://github.com/kenjiru), [jjoekoullas](https://github.com/jjoekoullas), [Julian Gonggrijp](https://github.com/jgonggrijp), [Kyle Scully](https://github.com/zieka), and [Robert Kesterson](https://github.com/rkesters). +diff --git a/node_modules/@types/backbone/index.d.ts b/node_modules/@types/backbone/index.d.ts +index da53a62..4db8b56 100644 +--- a/node_modules/@types/backbone/index.d.ts ++++ b/node_modules/@types/backbone/index.d.ts +@@ -225,7 +225,7 @@ declare namespace Backbone { + * That works only if you set it in the constructor or the initialize method. + **/ + defaults(): ObjectHash; +- id: any; ++ id: string; + idAttribute: string; + validationError: any; + From 626e2a368c69a2363d3b6e63871c8da0912f96fb Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 22 Mar 2024 11:01:39 +1100 Subject: [PATCH 111/302] fix: unsend in group: only apply change for msg sent before sig_ts --- ts/data/sharedDataTypes.ts | 3 +++ .../conversations/unsendingInteractions.ts | 2 +- ts/node/sql.ts | 26 ++++++++++++------- ts/receiver/groupv2/handleGroupV2Message.ts | 3 +++ 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ts/data/sharedDataTypes.ts b/ts/data/sharedDataTypes.ts index d74153aebc..b7ba12572a 100644 --- a/ts/data/sharedDataTypes.ts +++ b/ts/data/sharedDataTypes.ts @@ -7,12 +7,14 @@ export type DataCallArgs any> = Parameters[0]; export type DeleteAllMessageFromSendersInConversationType = ( args: WithGroupPubkey & { toRemove: Array; + signatureTimestamp: number; } ) => PrArrayMsgIds; export type DeleteAllMessageHashesInConversationType = ( args: WithGroupPubkey & { messageHashes: Array; + signatureTimestamp: number; } ) => PrArrayMsgIds; @@ -20,5 +22,6 @@ export type DeleteAllMessageHashesInConversationMatchingAuthorType = ( args: WithGroupPubkey & { messageHashes: Array; author: PubkeyType; + signatureTimestamp: number; } ) => PrArrayMsgIds; diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 6e7a372ba6..b1c97ef8d3 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -137,7 +137,7 @@ async function unsendMessagesForEveryone( conversation, groupPk: destinationId, msgsToDelete, - allMessagesFrom: [], // currently we cannot remove all the messages from a specific pubkey + allMessagesFrom: [], // currently we cannot remove all the messages from a specific pubkey but we do already handle them on the receiving side }); } await deleteMessagesFromSwarmAndCompletelyLocally(conversation, msgsToDelete); diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 3cae2d1926..de7473cdeb 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1059,7 +1059,11 @@ function removeAllMessagesInConversation( } function deleteAllMessageFromSendersInConversation( - { groupPk, toRemove }: DataCallArgs, + { + groupPk, + toRemove, + signatureTimestamp, + }: DataCallArgs, instance?: BetterSqlite3.Database ): AwaitedReturn { if (!groupPk || !toRemove.length) { @@ -1067,14 +1071,18 @@ function deleteAllMessageFromSendersInConversation( } return assertGlobalInstanceOrInstance(instance) .prepare( - `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND source IN ( ${toRemove.map(() => '?').join(', ')} ) RETURNING id` + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND sent_at <= ? AND source IN ( ${toRemove.map(() => '?').join(', ')} ) RETURNING id` ) - .all(groupPk, ...toRemove) + .all(groupPk, signatureTimestamp, ...toRemove) .map(m => m.id); } function deleteAllMessageHashesInConversation( - { groupPk, messageHashes }: DataCallArgs, + { + groupPk, + messageHashes, + signatureTimestamp, + }: DataCallArgs, instance?: BetterSqlite3.Database ): AwaitedReturn { if (!groupPk || !messageHashes.length) { @@ -1082,9 +1090,9 @@ function deleteAllMessageHashesInConversation( } return assertGlobalInstanceOrInstance(instance) .prepare( - `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING id` + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND sent_at <= ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING id` ) - .all(groupPk, ...messageHashes) + .all(groupPk, signatureTimestamp, ...messageHashes) .map(m => m.id); } @@ -1093,18 +1101,18 @@ function deleteAllMessageHashesInConversationMatchingAuthor( author, groupPk, messageHashes, + signatureTimestamp, }: DataCallArgs, instance?: BetterSqlite3.Database ): AwaitedReturn { if (!groupPk || !author || !messageHashes.length) { return []; } - console.warn('messageHashes', messageHashes); return assertGlobalInstanceOrInstance(instance) .prepare( - `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND source = ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING id` + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND source = ? AND sent_at <= ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING id` ) - .all(groupPk, author, ...messageHashes) + .all(groupPk, author, signatureTimestamp, ...messageHashes) .map(m => m.id); } diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index dcd8eed5fa..a66a6050c6 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -374,6 +374,7 @@ async function handleGroupDeleteMemberContentMessage({ author, groupPk, messageHashes: change.messageHashes, + signatureTimestamp, }); window.inboxStore.dispatch( @@ -401,10 +402,12 @@ async function handleGroupDeleteMemberContentMessage({ const deletedBySenders = await Data.deleteAllMessageFromSendersInConversation({ groupPk, toRemove, + signatureTimestamp, }); // this is step 2. const deletedByHashes = await Data.deleteAllMessageHashesInConversation({ groupPk, messageHashes: change.messageHashes, + signatureTimestamp, }); // this is step 3. window.inboxStore.dispatch( From 3b8fd82d17bddbec9eeeb28e424f27f4de5da903 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 26 Mar 2024 09:22:19 +1100 Subject: [PATCH 112/302] feat: add multiencrypt/decrypt unit test --- ts/components/leftpane/ActionsPanel.tsx | 2 + ts/mains/main_node.ts | 1 - ts/receiver/configMessage.ts | 4 ++ .../libsession_multi_encrypt_test.ts | 57 +++++++++++++++++++ ts/types/sqlSharedTypes.ts | 6 +- .../browser/libsession_worker_functions.ts | 19 ++++++- .../browser/libsession_worker_interface.ts | 16 ++++++ .../node/libsession/libsession.worker.ts | 18 +++++- 8 files changed, 118 insertions(+), 5 deletions(-) create mode 100644 ts/test/session/unit/libsession_wrapper/libsession_multi_encrypt_test.ts diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 9ea9c8d51d..6526072178 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -46,6 +46,7 @@ import { switchThemeTo } from '../../themes/switchTheme'; import { getOppositeTheme } from '../../util/theme'; import { ReleasedFeatures } from '../../util/releaseFeature'; +import { MultiEncryptWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; const Section = (props: { type: SectionType }) => { const ourNumber = useSelector(getOurNumber); @@ -82,6 +83,7 @@ const Section = (props: { type: SectionType }) => { }; if (type === SectionType.Profile) { + void MultiEncryptWrapperActions.multiEncrypt({}); return ( { + // let us: TestUserKeyPairs; + // let groupX25519SecretKey: Uint8Array; + + beforeEach(async () => { + // us = await TestUtils.generateUserKeyPairs(); + // const group = await TestUtils.generateGroupV2(us.ed25519KeyPair.privKeyBytes); + // if (!group.secretKey) { + // throw new Error('failed to create grou[p'); + // } + // groupX25519SecretKey = group.secretKey; + }); + afterEach(() => { + Sinon.restore(); + }); + + describe('encrypt/decrypt multi encrypt/decrypt message', () => { + it('can encrypt/decrypt message one message to one recipient', async () => { + const toEncrypt = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + const plaintext = new Uint8Array(toEncrypt); + const domain = 'domain'; + + const us = await TestUtils.generateUserKeyPairs(); + const userXPk = us.x25519KeyPair.pubKey.slice(1); // remove 05 prefix + const userSk = us.ed25519KeyPair.privKeyBytes; + + const groupWrapper = new UserGroupsWrapperNode(us.ed25519KeyPair.privKeyBytes, null); + const group = await groupWrapper.createGroup(); + if (!group.secretKey) { + throw new Error('failed to create group'); + } + const groupEd25519SecretKey = group.secretKey; + const groupEd25519Pubkey = fromHexToArray(group.pubkeyHex).slice(1); // remove 03 prefix + + const encrypted = MultiEncryptWrapperNode.multiEncrypt({ + messages: [plaintext], + recipients: [userXPk], + ed25519SecretKey: groupEd25519SecretKey, + domain, + }); + const decrypted = MultiEncryptWrapperNode.multiDecryptEd25519({ + domain, + encoded: encrypted, + ed25519SecretKey: userSk, + senderEd25519Pubkey: groupEd25519Pubkey, + }); + console.warn('decrypted', decrypted); + expect(decrypted).to.be.deep.eq(Buffer.from(toEncrypt)); + }); + }); +}); diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 1b37cf467b..4d9dc61815 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -364,6 +364,10 @@ export function toFixedUint8ArrayOfLength( export function stringify(obj: unknown) { return JSON.stringify(obj, (_key, value) => { - return value instanceof Uint8Array ? `Uint8Array(${value.length}): ${toHex(value)}` : value; + return value instanceof Uint8Array + ? `Uint8Array(${value.length}): ${toHex(value)}` + : value.type === 'Buffer' && value.data + ? `Buffer: ${toHex(value.data)}` + : value; }); } diff --git a/ts/webworker/workers/browser/libsession_worker_functions.ts b/ts/webworker/workers/browser/libsession_worker_functions.ts index ab1346cc9f..53e0d4deba 100644 --- a/ts/webworker/workers/browser/libsession_worker_functions.ts +++ b/ts/webworker/workers/browser/libsession_worker_functions.ts @@ -4,6 +4,7 @@ import { ConvoInfoVolatileConfigActionsType, GroupPubkeyType, MetaGroupActionsType, + MultiEncryptActionsType, UserConfigActionsType, UserGroupsConfigActionsType, } from 'libsession_util_nodejs'; @@ -15,8 +16,10 @@ export type UserGroupsConfig = 'UserGroupsConfig'; export type ConvoInfoVolatileConfig = 'ConvoInfoVolatileConfig'; export const MetaGroupConfigValue = 'MetaGroupConfig-'; +export const MultiEncryptConfigValue = 'MultiEncrypt'; type MetaGroupConfigType = typeof MetaGroupConfigValue; export type MetaGroupConfig = `${MetaGroupConfigType}${GroupPubkeyType}`; +export type MultiEncryptConfig = typeof MultiEncryptConfigValue; export type ConfigWrapperUser = | UserConfig @@ -26,7 +29,10 @@ export type ConfigWrapperUser = export type ConfigWrapperGroup = MetaGroupConfig; -export type ConfigWrapperObjectTypesMeta = ConfigWrapperUser | ConfigWrapperGroup; +export type ConfigWrapperObjectTypesMeta = + | ConfigWrapperUser + | ConfigWrapperGroup + | MultiEncryptConfig; export type ConfigWrapperGroupDetailed = 'GroupInfo' | 'GroupMember' | 'GroupKeys'; @@ -48,12 +54,15 @@ type ConvoInfoVolatileConfigFunctions = // Group-related calls type MetaGroupFunctions = [MetaGroupConfig, ...MetaGroupActionsType]; +type MultiEncryptFunctions = [MultiEncryptConfig, ...MultiEncryptActionsType]; + export type LibSessionWorkerFunctions = | UserConfigFunctions | ContactsConfigFunctions | UserGroupsConfigFunctions | ConvoInfoVolatileConfigFunctions - | MetaGroupFunctions; + | MetaGroupFunctions + | MultiEncryptFunctions; export function isUserConfigWrapperType( config: ConfigWrapperObjectTypesMeta @@ -70,6 +79,12 @@ export function isMetaWrapperType(config: ConfigWrapperObjectTypesMeta): config return config.startsWith(MetaGroupConfigValue); } +export function isMultiEncryptWrapperType( + config: ConfigWrapperObjectTypesMeta +): config is MultiEncryptConfig { + return config === 'MultiEncrypt'; +} + export function getGroupPubkeyFromWrapperType(type: ConfigWrapperGroup): GroupPubkeyType { if (!type.startsWith(`${MetaGroupConfigValue}03`)) { throw new Error(`not a metagroup variant: ${type}`); diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 91620a5562..ad82f1ec25 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -11,6 +11,7 @@ import { LegacyGroupInfo, MergeSingle, MetaGroupWrapperActionsCalls, + MultiEncryptActionsCalls, ProfilePicture, PubkeyType, Uint8ArrayLen100, @@ -638,6 +639,21 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { }, }; +export const MultiEncryptWrapperActions: MultiEncryptActionsCalls = { + /* Reuse the GenericWrapperActions with the UserConfig argument */ + ...createBaseActionsFor('UserConfig'), + + /** UserConfig wrapper specific actions */ + multiEncrypt: async args => + callLibSessionWorker(['MultiEncrypt', 'multiEncrypt', args]) as Promise< + ReturnType + >, + multiDecryptEd25519: async args => + callLibSessionWorker(['MultiEncrypt', 'multiDecryptEd25519', args]) as Promise< + ReturnType + >, +}; + export const callLibSessionWorker = async ( callToMake: LibSessionWorkerFunctions ): Promise => { diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index 214b3d4ced..b6e1d03903 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -7,6 +7,7 @@ import { GroupPubkeyType, GroupWrapperConstructor, MetaGroupWrapperNode, + MultiEncryptWrapperNode, UserConfigWrapperNode, UserGroupsWrapperNode, } from 'libsession_util_nodejs'; @@ -17,7 +18,9 @@ import { ConfigWrapperObjectTypesMeta, ConfigWrapperUser, MetaGroupConfig, + MultiEncryptConfig, isMetaWrapperType, + isMultiEncryptWrapperType, isUserConfigWrapperType, } from '../../browser/libsession_worker_functions'; @@ -112,6 +115,13 @@ function getCorrespondingGroupWrapper(wrapperType: MetaGroupConfig): MetaGroupWr ); } +function getMultiEncryptWrapper(wrapperType: MultiEncryptConfig): MultiEncryptWrapperNode { + if (isMultiEncryptWrapperType(wrapperType)) { + return MultiEncryptWrapperNode; + } + assertUnreachable(wrapperType, `getMultiEncrypt missing global handling for "${wrapperType}"`); +} + function isUInt8Array(value: any) { return value.constructor === Uint8Array; } @@ -227,11 +237,17 @@ onmessage = async (e: { data: [number, ConfigWrapperObjectTypesMeta, string, ... throw new Error(`Unhandled init wrapper type: ${config}`); } + if (action === 'multiEncrypt') { + await MultiEncryptWrapperNode.multiEncrypt(args[0]); + } + const wrapper = isUserConfigWrapperType(config) ? getCorrespondingUserWrapper(config) : isMetaWrapperType(config) ? getCorrespondingGroupWrapper(config) - : undefined; + : isMultiEncryptWrapperType(config) + ? getMultiEncryptWrapper(config) + : undefined; if (!wrapper) { throw new Error(`did not find an already built wrapper for config: "${config}"`); } From 1796e82bcb199d1206211145ebdd36ec1fa2ae90 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 21 May 2024 17:01:07 +1000 Subject: [PATCH 113/302] fix: add handling of revoked namespace messages --- .gitignore | 2 + .yarnrc | 1 - .yarnrc.yml | 2 + package.json | 11 +- protos/SignalService.proto | 18 +- .../message/message-item/ReadableMessage.tsx | 3 +- ts/components/dialog/InviteContactsDialog.tsx | 1 + .../dialog/UpdateGroupMembersDialog.tsx | 1 + ts/components/leftpane/ActionsPanel.tsx | 9 +- .../menu/ConversationListItemContextMenu.tsx | 8 +- ts/components/menu/Menu.tsx | 31 +- ts/hooks/useEncryptedFileFetch.ts | 13 +- ts/interactions/conversationInteractions.ts | 15 +- .../conversations/unsendingInteractions.ts | 93 +- ts/models/conversation.ts | 9 +- ts/react.d.ts | 1 + ts/receiver/closedGroups.ts | 3 + ts/receiver/configMessage.ts | 2 + ts/receiver/groupv2/handleGroupV2Message.ts | 47 +- .../libsession/handleLibSessionMessage.ts | 84 + ts/session/apis/seed_node_api/SeedNodeAPI.ts | 13 +- ts/session/apis/snode_api/SNodeAPI.ts | 120 +- .../apis/snode_api/SnodeRequestTypes.ts | 39 +- ts/session/apis/snode_api/batchRequest.ts | 5 + ts/session/apis/snode_api/expireRequest.ts | 3 +- .../apis/snode_api/getExpiriesRequest.ts | 3 +- ts/session/apis/snode_api/getNetworkTime.ts | 5 +- .../apis/snode_api/getServiceNodesList.ts | 5 +- ts/session/apis/snode_api/getSwarmFor.ts | 7 +- ts/session/apis/snode_api/onions.ts | 17 +- ts/session/apis/snode_api/onsResolve.ts | 5 +- ts/session/apis/snode_api/retrieveRequest.ts | 8 +- ts/session/apis/snode_api/revokeSubaccount.ts | 45 +- ts/session/apis/snode_api/sessionRpc.ts | 6 + .../snode_api/signature/groupSignature.ts | 74 +- ts/session/apis/snode_api/swarmPolling.ts | 75 +- .../SwarmPollingGroupConfig.ts | 6 + ts/session/apis/snode_api/types.ts | 9 +- .../conversations/ConversationController.ts | 52 +- .../crypto/DecryptedAttachmentsManager.ts | 42 +- ts/session/crypto/MessageEncrypter.ts | 13 +- ts/session/crypto/index.ts | 5 - ts/session/group/closed-group.ts | 7 +- .../to_user/GroupUpdateDeleteMessage.ts | 49 - .../to_user/GroupUpdatePromoteMessage.ts | 2 +- ts/session/onions/onionSend.ts | 1 + ts/session/sending/MessageQueue.ts | 4 +- ts/session/sending/MessageSender.ts | 6 +- ts/session/types/PubKey.ts | 6 +- ts/session/types/with.ts | 5 + ts/session/utils/errors.ts | 2 + ts/session/utils/job_runners/JobRunner.ts | 7 + ts/session/utils/job_runners/PersistedJob.ts | 9 +- .../jobs/GroupPendingRemovalsJob.ts | 236 + .../utils/job_runners/jobs/JobRunnerType.ts | 3 +- .../libsession_utils_convo_info_volatile.ts | 1 - .../libsession_utils_multi_encrypt.ts | 42 + ts/state/ducks/metaGroups.ts | 183 +- .../unit/crypto/MessageEncrypter_test.ts | 3 +- .../unit/crypto/SnodeSignatures_test.ts | 176 +- .../decryptedAttachmentsManager_test.ts | 2 +- .../DisappearingMessage_test.ts | 6 +- .../libsession_multi_encrypt_test.ts | 95 +- .../libsession_wrapper_metagroup_test.ts | 25 +- .../session/unit/onion/OnionErrors_test.ts | 16 + .../unit/sending/MessageSender_test.ts | 2 +- ts/types/attachments/VisualAttachment.ts | 25 +- ts/types/sqlSharedTypes.ts | 2 +- ts/util/attachmentsUtil.ts | 8 +- .../browser/libsession_worker_interface.ts | 30 +- .../node/libsession/libsession.worker.ts | 12 +- yarn.lock | 20196 +++++++++------- 72 files changed, 13052 insertions(+), 9020 deletions(-) delete mode 100644 .yarnrc create mode 100644 .yarnrc.yml create mode 100644 ts/receiver/libsession/handleLibSessionMessage.ts delete mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts create mode 100644 ts/session/types/with.ts create mode 100644 ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts create mode 100644 ts/session/utils/libsession/libsession_utils_multi_encrypt.ts diff --git a/.gitignore b/.gitignore index 29385777f0..b5dda5b6bc 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,5 @@ stylesheets/dist/ *.LICENSE.txt ts/webworker/workers/node/**/*.node + +.yarn/ diff --git a/.yarnrc b/.yarnrc deleted file mode 100644 index b162bd8bc9..0000000000 --- a/.yarnrc +++ /dev/null @@ -1 +0,0 @@ ---install.frozen-lockfile true diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 0000000000..ea85a0d0f5 --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1,2 @@ +nodeLinker: node-modules +patchFolder: patches \ No newline at end of file diff --git a/package.json b/package.json index 9103254597..151263997d 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,8 @@ "loader-utils": "^2.0.4", "http-cache-semantics": "^4.1.1", "terser": "^5.14.2", - "minimatch": "^3.0.5" + "minimatch": "^3.0.5", + "libsession_util_nodejs": "portal:/home/audric/pro/contribs/libsession-util-nodejs" }, "scripts": { "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .", @@ -43,7 +44,7 @@ "protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/compiled.js protos/*.proto && pbts --out ts/protobuf/compiled.d.ts ts/protobuf/compiled.js --force-long", "sass": "rimraf 'stylesheets/dist/' && webpack --config=./sass.config.js", "clean": "rimraf 'ts/**/*.js' 'ts/*.js' 'ts/*.js.map' 'ts/**/*.js.map' && rimraf tsconfig.tsbuildinfo;", - "lint-full": "yarn format-full && eslint .", + "lint-full": "yarn format-full --cache && eslint --cache .", "format-full": "prettier --list-different --write \"*.{css,js,json,scss,ts,tsx}\" \"./**/*.{css,js,json,scss,ts,tsx}\"", "start-prod-test": "cross-env NODE_ENV=production NODE_APP_INSTANCE=$MULTI electron .", "test": "mocha", @@ -259,7 +260,11 @@ "StartupWMClass": "Session" }, "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries", - "target": ["deb", "rpm", "freebsd"], + "target": [ + "deb", + "rpm", + "freebsd" + ], "icon": "build/icon-linux.icns" }, "asarUnpack": [ diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 06da607614..e90f16605f 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -85,11 +85,6 @@ message GroupUpdateInviteMessage { required bytes adminSignature = 4; } -message GroupUpdateDeleteMessage { - repeated string memberSessionIds = 1; - required bytes adminSignature = 2; -} - message GroupUpdateInfoChangeMessage { enum Type { NAME = 1; @@ -139,13 +134,12 @@ message GroupUpdateDeleteMemberContentMessage { message GroupUpdateMessage { optional GroupUpdateInviteMessage inviteMessage = 1; - optional GroupUpdateDeleteMessage deleteMessage = 2; - optional GroupUpdateInfoChangeMessage infoChangeMessage = 3; - optional GroupUpdateMemberChangeMessage memberChangeMessage = 4; - optional GroupUpdatePromoteMessage promoteMessage = 5; - optional GroupUpdateMemberLeftMessage memberLeftMessage = 6; - optional GroupUpdateInviteResponseMessage inviteResponse = 7; - optional GroupUpdateDeleteMemberContentMessage deleteMemberContent = 8; + optional GroupUpdateInfoChangeMessage infoChangeMessage = 2; + optional GroupUpdateMemberChangeMessage memberChangeMessage = 3; + optional GroupUpdatePromoteMessage promoteMessage = 4; + optional GroupUpdateMemberLeftMessage memberLeftMessage = 5; + optional GroupUpdateInviteResponseMessage inviteResponse = 6; + optional GroupUpdateDeleteMemberContentMessage deleteMemberContent = 7; } diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx index 938f62abec..4c1dbb59c0 100644 --- a/ts/components/conversation/message/message-item/ReadableMessage.tsx +++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx @@ -1,6 +1,5 @@ import { debounce, noop } from 'lodash'; import React, { - AriaRole, MouseEventHandler, SessionDataTestId, useCallback, @@ -39,7 +38,7 @@ export type ReadableMessageProps = { isUnread: boolean; onClick?: MouseEventHandler; onDoubleClickCapture?: MouseEventHandler; - role?: AriaRole; + role?: string; dataTestId: SessionDataTestId; onContextMenu?: (e: React.MouseEvent) => void; isControlMessage?: boolean; diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index e0b474d556..86bfd0ad3e 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -156,6 +156,7 @@ const InviteContactsDialogInner = (props: Props) => { addMembersWithHistory: shareHistory ? forcedAsPubkeys : [], removeMembers: [], groupPk: conversationId, + alsoRemoveMessages: false, }); dispatch(action as any); return; diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 4181105f44..ef135d8614 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -217,6 +217,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { addMembersWithHistory: [], addMembersWithoutHistory: [], removeMembers: difference(existingMembers, membersToKeepWithUpdate) as Array, + alsoRemoveMessages: false, // FIXME audric debugger we need this to be a toggle for QA }); dispatch(groupv2Action as any); diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 6526072178..d5a851ffbd 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -19,7 +19,7 @@ import { import { getFocusedSection } from '../../state/selectors/section'; import { getOurNumber } from '../../state/selectors/user'; -import { cleanUpOldDecryptedMedias } from '../../session/crypto/DecryptedAttachmentsManager'; +import { DecryptedAttachmentsManager } from '../../session/crypto/DecryptedAttachmentsManager'; import { DURATION } from '../../session/constants'; @@ -46,7 +46,6 @@ import { switchThemeTo } from '../../themes/switchTheme'; import { getOppositeTheme } from '../../util/theme'; import { ReleasedFeatures } from '../../util/releaseFeature'; -import { MultiEncryptWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; const Section = (props: { type: SectionType }) => { const ourNumber = useSelector(getOurNumber); @@ -83,7 +82,6 @@ const Section = (props: { type: SectionType }) => { }; if (type === SectionType.Profile) { - void MultiEncryptWrapperActions.multiEncrypt({}); return ( { return () => clearTimeout(timeout); }, []); - useInterval(cleanUpOldDecryptedMedias, startCleanUpMedia ? cleanUpMediasInterval : null); + useInterval( + DecryptedAttachmentsManager.cleanUpOldDecryptedMedias, + startCleanUpMedia ? cleanUpMediasInterval : null + ); useInterval(() => { if (!ourPrimaryConversation) { diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx index a5d2007def..14f1851d74 100644 --- a/ts/components/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/menu/ConversationListItemContextMenu.tsx @@ -5,7 +5,10 @@ import { useSelector } from 'react-redux'; import { useIsPinned, useIsPrivate, useIsPrivateAndFriend } from '../../hooks/useParamSelector'; import { ConvoHub } from '../../session/conversations'; import { isSearching } from '../../state/selectors/search'; -import { getIsMessageSection } from '../../state/selectors/section'; +import { + getIsMessageRequestOverlayShown, + getIsMessageSection, +} from '../../state/selectors/section'; import { SessionContextMenuContainer } from '../SessionContextMenuContainer'; import { useConvoIdFromContext } from '../leftpane/conversation-list-item/ConvoIdContext'; import { @@ -80,8 +83,9 @@ export const PinConversationMenuItem = (): JSX.Element | null => { const isPrivateAndFriend = useIsPrivateAndFriend(conversationId); const isPrivate = useIsPrivate(conversationId); const isPinned = useIsPinned(conversationId); + const isMessageRequest = useSelector(getIsMessageRequestOverlayShown); - if (isMessagesSection && (!isPrivate || (isPrivate && isPrivateAndFriend))) { + if (isMessagesSection && !isMessageRequest && (!isPrivate || (isPrivate && isPrivateAndFriend))) { const conversation = ConvoHub.use().get(conversationId); const togglePinConversation = () => { diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index c37feee4fe..6a4ee1733b 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -53,7 +53,10 @@ import { updateUserDetailsModal, } from '../../state/ducks/modalDialog'; import { useConversationIdOrigin } from '../../state/selectors/conversations'; -import { getIsMessageSection } from '../../state/selectors/section'; +import { + getIsMessageRequestOverlayShown, + getIsMessageSection, +} from '../../state/selectors/section'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { LocalizerKeys } from '../../types/LocalizerKeys'; import { SessionButtonColor } from '../basic/SessionButton'; @@ -84,8 +87,13 @@ export const MarkConversationUnreadMenuItem = (): JSX.Element | null => { const isMessagesSection = useSelector(getIsMessageSection); const isPrivate = useIsPrivate(conversationId); const isPrivateAndFriend = useIsPrivateAndFriend(conversationId); + const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); - if (isMessagesSection && (!isPrivate || (isPrivate && isPrivateAndFriend))) { + if ( + isMessagesSection && + !isMessageRequestShown && + (!isPrivate || (isPrivate && isPrivateAndFriend)) + ) { const conversation = ConvoHub.use().get(conversationId); const markUnread = () => { @@ -141,12 +149,12 @@ export const DeletePrivateContactMenuItem = () => { export const LeaveGroupOrCommunityMenuItem = () => { const convoId = useConvoIdFromContext(); const username = useConversationUsername(convoId) || convoId; - const isKickedFromGroup = useIsKickedFromGroup(convoId); const isPrivate = useIsPrivate(convoId); const isPublic = useIsPublic(convoId); const lastMessage = useLastMessage(convoId); + const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); - if (!isKickedFromGroup && !isPrivate) { + if (!isPrivate && !isMessageRequestShown) { return ( { @@ -396,8 +404,9 @@ export const ChangeNicknameMenuItem = () => { */ export const DeleteMessagesMenuItem = () => { const convoId = useConvoIdFromContext(); + const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); - if (!convoId) { + if (!convoId || isMessageRequestShown) { return null; } return ( @@ -526,8 +535,16 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => { const isKickedFromGroup = useIsKickedFromGroup(convoId); const isFriend = useIsPrivateAndFriend(convoId); const isPrivate = useIsPrivate(convoId); - - if (!convoId || isKickedFromGroup || isBlocked || !isActive || (isPrivate && !isFriend)) { + const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + + if ( + !convoId || + isMessageRequestShown || + isKickedFromGroup || + isBlocked || + !isActive || + (isPrivate && !isFriend) + ) { return null; } diff --git a/ts/hooks/useEncryptedFileFetch.ts b/ts/hooks/useEncryptedFileFetch.ts index 8274e8d4d7..bfa8eac3e5 100644 --- a/ts/hooks/useEncryptedFileFetch.ts +++ b/ts/hooks/useEncryptedFileFetch.ts @@ -1,9 +1,6 @@ import { useEffect, useRef, useState } from 'react'; -import { - getAlreadyDecryptedMediaUrl, - getDecryptedMediaUrl, -} from '../session/crypto/DecryptedAttachmentsManager'; +import { DecryptedAttachmentsManager } from '../session/crypto/DecryptedAttachmentsManager'; import { perfEnd, perfStart } from '../session/utils/Performance'; export const useEncryptedFileFetch = (url: string, contentType: string, isAvatar: boolean) => { @@ -12,12 +9,16 @@ export const useEncryptedFileFetch = (url: string, contentType: string, isAvatar const mountedRef = useRef(true); - const alreadyDecrypted = getAlreadyDecryptedMediaUrl(url); + const alreadyDecrypted = DecryptedAttachmentsManager.getAlreadyDecryptedMediaUrl(url); useEffect(() => { async function fetchUrl() { perfStart(`getDecryptedMediaUrl-${url}`); - const decryptedUrl = await getDecryptedMediaUrl(url, contentType, isAvatar); + const decryptedUrl = await DecryptedAttachmentsManager.getDecryptedMediaUrl( + url, + contentType, + isAvatar + ); perfEnd(`getDecryptedMediaUrl-${url}`, `getDecryptedMediaUrl-${url}`); if (mountedRef.current) { diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 00baaf519f..2b77d2f638 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -18,7 +18,7 @@ import { getSwarmPollingInstance } from '../session/apis/snode_api'; import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../session/conversations'; import { getSodiumRenderer } from '../session/crypto'; -import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; +import { DecryptedAttachmentsManager } from '../session/crypto/DecryptedAttachmentsManager'; import { DisappearingMessageConversationModeType } from '../session/disappearing_messages/types'; import { GroupUpdateInfoChangeMessage } from '../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { ed25519Str } from '../session/onions/onionPath'; @@ -458,14 +458,11 @@ async function leaveGroupOrCommunityByConvoId({ type: ConversationInteractionType.Leave, status: ConversationInteractionStatus.Start, }); - console.warn('leaveGroupOrCommunityByConvoId: ', { - conversationId, - sendLeaveMessage, - isPublic, - }); + await ConvoHub.use().deleteClosedGroup(conversationId, { fromSyncMessage: false, sendLeaveMessage, + emptyGroupButKeepAsKicked: false, }); await clearConversationInteractionState({ conversationId }); } catch (err) { @@ -728,7 +725,11 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) { return null; } - const decryptedAvatarUrl = await getDecryptedMediaUrl(currentAttachmentPath, IMAGE_JPEG, true); + const decryptedAvatarUrl = await DecryptedAttachmentsManager.getDecryptedMediaUrl( + currentAttachmentPath, + IMAGE_JPEG, + true + ); if (!decryptedAvatarUrl) { window.log.warn('Could not decrypt avatar stored locally..'); diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index b1c97ef8d3..dd3a23c3e3 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -66,18 +66,16 @@ async function unsendMessagesForEveryone1o1AndLegacy( } } -async function unsendMessagesForEveryoneGroupV2({ +export async function unsendMessagesForEveryoneGroupV2({ allMessagesFrom, - conversation, groupPk, msgsToDelete, }: { - conversation: ConversationModel; groupPk: GroupPubkeyType; msgsToDelete: Array; allMessagesFrom: Array; }) { - const messageHashesToUnsend = await getMessageHashes(msgsToDelete); + const messageHashesToUnsend = getMessageHashes(msgsToDelete); const group = await UserGroupsWrapperActions.getGroup(groupPk); if (!messageHashesToUnsend.length && !allMessagesFrom.length) { @@ -85,10 +83,6 @@ async function unsendMessagesForEveryoneGroupV2({ return; } - if (!conversation.isClosedGroupV2()) { - throw new Error('unsendMessagesForEveryoneGroupV2 needs a group v2'); - } - await getMessageQueue().sendToGroupV2NonDurably({ message: new GroupUpdateDeleteMemberContentMessage({ createAtNetworkTimestamp: GetNetworkTime.now(), @@ -134,7 +128,6 @@ async function unsendMessagesForEveryone( throw new Error('invalid conversation id (03) for unsendMessageForEveryone'); } await unsendMessagesForEveryoneGroupV2({ - conversation, groupPk: destinationId, msgsToDelete, allMessagesFrom: [], // currently we cannot remove all the messages from a specific pubkey but we do already handle them on the receiving side @@ -170,7 +163,7 @@ function getUnsendMessagesObjects1o1OrLegacyGroups(messages: Array // #endregion } -async function getMessageHashes(messages: Array) { +function getMessageHashes(messages: Array) { return compact( messages.map(message => { return message.get('messageHash'); @@ -178,6 +171,10 @@ async function getMessageHashes(messages: Array) { ); } +function isStringArray(value: unknown): value is Array { + return Array.isArray(value) && value.every(val => typeof val === 'string'); +} + /** * Do a single request to the swarm with all the message hashes to delete from the swarm. * @@ -185,19 +182,32 @@ async function getMessageHashes(messages: Array) { * * Returns true if no errors happened, false in an error happened */ -export async function deleteMessagesFromSwarmOnly(messages: Array) { +export async function deleteMessagesFromSwarmOnly( + messages: Array | Array, + pubkey: PubkeyType | GroupPubkeyType +) { + const deletionMessageHashes = isStringArray(messages) ? messages : getMessageHashes(messages); try { - const deletionMessageHashes = compact(messages.map(m => m.get('messageHash'))); - if (deletionMessageHashes.length > 0) { - const errorOnSnode = await SnodeAPI.networkDeleteMessages(deletionMessageHashes); - return errorOnSnode === null || errorOnSnode.length === 0; + if (messages.length === 0) { + return false; } - window.log?.warn( - 'deleteMessagesFromSwarmOnly: We do not have hashes for some of those messages' + + if (!deletionMessageHashes.length) { + window.log?.warn( + 'deleteMessagesFromSwarmOnly: We do not have hashes for some of those messages' + ); + return false; + } + const errorOnAtLeastOneSnode = await SnodeAPI.networkDeleteMessages( + deletionMessageHashes, + pubkey ); - return false; + return errorOnAtLeastOneSnode; } catch (e) { - window.log?.error('deleteMessagesFromSwarmOnly: Error deleting message from swarm', e); + window.log?.error( + `deleteMessagesFromSwarmOnly: Error deleting message from swarm of ${ed25519Str(pubkey)}, hashes: ${deletionMessageHashes}`, + e + ); return false; } } @@ -210,7 +220,17 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally( conversation: ConversationModel, messages: Array ) { - if (conversation.isClosedGroup()) { + const pubkey = conversation.id; + if (!PubKey.is03Pubkey(pubkey) && !PubKey.is05Pubkey(pubkey)) { + throw new Error('deleteMessagesFromSwarmAndCompletelyLocally needs a 03 or 05 pk'); + } + if (PubKey.is05Pubkey(pubkey) && pubkey !== UserUtils.getOurPubKeyStrFromCache()) { + throw new Error( + 'deleteMessagesFromSwarmAndCompletelyLocally with 05 pk can only delete for ourself' + ); + } + // LEGACY GROUPS -- we cannot delete on the swarm (just unsend which is done separately) + if (conversation.isClosedGroup() && PubKey.is05Pubkey(pubkey)) { window.log.info('Cannot delete message from a closed group swarm, so we just complete delete.'); await Promise.all( messages.map(async message => { @@ -219,13 +239,13 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally( ); return; } - window.log.warn( + window.log.info( 'Deleting from swarm of ', - ed25519Str(conversation.id), + ed25519Str(pubkey), ' hashes: ', messages.map(m => m.get('messageHash')) ); - const deletedFromSwarm = await deleteMessagesFromSwarmOnly(messages); + const deletedFromSwarm = await deleteMessagesFromSwarmOnly(messages, pubkey); if (!deletedFromSwarm) { window.log.warn( 'deleteMessagesFromSwarmAndCompletelyLocally: some messages failed to be deleted. Maybe they were already deleted?' @@ -246,8 +266,22 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( conversation: ConversationModel, messages: Array ) { - if (conversation.isClosedGroup()) { - window.log.info('Cannot delete messages from a closed group swarm, so we just markDeleted.'); + // legacy groups cannot delete messages on the swarm (just "unsend") + if (conversation.isClosedGroup() && PubKey.is05Pubkey(conversation.id)) { + window.log.info( + 'Cannot delete messages from a legacy closed group swarm, so we just markDeleted.' + ); + await Promise.all( + messages.map(async message => { + return deleteMessageLocallyOnly({ conversation, message, deletionType: 'markDeleted' }); + }) + ); + return; + } + if (conversation.isClosedGroupV2() && PubKey.is03Pubkey(conversation.id)) { + window.log.info( + 'Cannot delete messages from a legacy closed group swarm, so we just markDeleted.' + ); await Promise.all( messages.map(async message => { return deleteMessageLocallyOnly({ conversation, message, deletionType: 'markDeleted' }); @@ -255,7 +289,14 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( ); return; } - const deletedFromSwarm = await deleteMessagesFromSwarmOnly(messages); + + // we can only delete messages on the swarm when they are on our own swarm, or it is a groupv2 that we are the admin off + const pubkeyToDeleteFrom = PubKey.is03Pubkey(conversation.id) + ? conversation.id + : UserUtils.getOurPubKeyStrFromCache(); + + // if this is a groupv2 and we don't have the admin key, it will fail and return false. + const deletedFromSwarm = await deleteMessagesFromSwarmOnly(messages, pubkeyToDeleteFrom); if (!deletedFromSwarm) { window.log.warn( 'deleteMessagesFromSwarmAndMarkAsDeletedLocally: some messages failed to be deleted but still removing the messages content... ' diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 31be431921..fd5b9deb7d 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -72,7 +72,7 @@ import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../session/apis/snode_api/namespaces'; import { getSodiumRenderer } from '../session/crypto'; import { addMessagePadding } from '../session/crypto/BufferPadding'; -import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; +import { DecryptedAttachmentsManager } from '../session/crypto/DecryptedAttachmentsManager'; import { MessageRequestResponse, MessageRequestResponseParams, @@ -896,7 +896,6 @@ export class ConversationModel extends Backbone.Model { const isRemoteChange = Boolean((sentAt || fromSync || fromConfigMessage) && !fromCurrentDevice); // we don't add an update message when this comes from a config message, as we already have the SyncedMessage itself with the right timestamp to display - if (!this.isClosedGroup() && !this.isPrivate()) { throw new Error( 'updateExpireTimer() Disappearing messages are only supported int groups and private chats' @@ -1824,7 +1823,11 @@ export class ConversationModel extends Backbone.Model { if (!avatarUrl) { return noIconUrl; } - const decryptedAvatarUrl = await getDecryptedMediaUrl(avatarUrl, IMAGE_JPEG, true); + const decryptedAvatarUrl = await DecryptedAttachmentsManager.getDecryptedMediaUrl( + avatarUrl, + IMAGE_JPEG, + true + ); if (!decryptedAvatarUrl) { window.log.warn('Could not decrypt avatar stored locally for getNotificationIcon..'); diff --git a/ts/react.d.ts b/ts/react.d.ts index 9bac24028b..ba47a8b343 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -34,6 +34,7 @@ declare module 'react' { | 'header-conversation-name' | 'disappear-messages-type-and-time' | 'message-input' + | 'message-input-text-area' | 'messages-container' | 'decline-and-block-message-request' | 'session-dropdown' diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index fedef5201d..50d99b60b0 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -772,6 +772,7 @@ async function handleClosedGroupMembersRemoved( await ConvoHub.use().deleteClosedGroup(groupPubKey, { fromSyncMessage: false, sendLeaveMessage: false, + emptyGroupButKeepAsKicked: false, // legacy group case only here }); } else { // Note: we don't want to send a new encryption keypair when we get a member removed. @@ -857,6 +858,7 @@ async function handleClosedGroupAdminMemberLeft(groupPublicKey: string, envelope await ConvoHub.use().deleteClosedGroup(groupPublicKey, { fromSyncMessage: false, sendLeaveMessage: false, + emptyGroupButKeepAsKicked: false, }); await IncomingMessageCache.removeFromCache(envelope); } @@ -866,6 +868,7 @@ async function handleClosedGroupLeftOurself(groupId: string, envelope: EnvelopeP await ConvoHub.use().deleteClosedGroup(groupId, { fromSyncMessage: false, sendLeaveMessage: false, + emptyGroupButKeepAsKicked: false, }); await IncomingMessageCache.removeFromCache(envelope); } diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 46cf31fe3f..cffadf6938 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -586,6 +586,7 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { await ConvoHub.use().deleteClosedGroup(toLeaveFromDb.id, { fromSyncMessage: true, sendLeaveMessage: false, // this comes from the wrapper, so we must have left/got kicked from that group already and our device already handled it. + emptyGroupButKeepAsKicked: false, }); } @@ -740,6 +741,7 @@ async function handleSingleGroupUpdateToLeave(toLeave: GroupPubkeyType) { await ConvoHub.use().deleteClosedGroup(toLeave, { fromSyncMessage: true, sendLeaveMessage: false, + emptyGroupButKeepAsKicked: false, }); } catch (e) { window.log.info('Failed to deleteClosedGroup with: ', e.message); diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index a66a6050c6..c3f622b124 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -87,6 +87,9 @@ async function handleGroupInviteMessage({ } const authorIsApproved = ConvoHub.use().get(author)?.isApproved() || false; + window.log.info( + `handleGroupInviteMessage for ${ed25519Str(groupPk)}, authorIsApproved:${authorIsApproved}` + ); const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), @@ -190,6 +193,8 @@ async function handleGroupInfoChangeMessage({ signature: change.adminSignature, data: stringToUint8Array(`INFO_CHANGE${change.type}${signatureTimestamp}`), }); + window.log.info(`handleGroupInfoChangeMessage for ${ed25519Str(groupPk)}`); + if (!sigValid) { window.log.warn('received group info change with invalid signature. dropping'); return; @@ -257,6 +262,7 @@ async function handleGroupMemberChangeMessage({ if (!convo) { return; } + window.log.info(`handleGroupMemberChangeMessage for ${ed25519Str(groupPk)}`); const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), @@ -324,6 +330,7 @@ async function handleGroupMemberLeftMessage({ if (!convo || !PubKey.is05Pubkey(author)) { return; } + window.log.info(`handleGroupMemberLeftMessage for ${ed25519Str(groupPk)}`); // this does nothing if we are not an admin window.inboxStore.dispatch( @@ -358,6 +365,7 @@ async function handleGroupDeleteMemberContentMessage({ if (!convo) { return; } + window.log.info(`handleGroupDeleteMemberContentMessage for ${ed25519Str(groupPk)}`); /** * When handling a GroupUpdateDeleteMemberContentMessage we need to do a few things. @@ -422,33 +430,6 @@ async function handleGroupDeleteMemberContentMessage({ // TODO we should process this message type even if the sender is blocked } -async function handleGroupUpdateDeleteMessage({ - groupPk, - signatureTimestamp, - change, -}: GroupUpdateGeneric) { - // TODO verify sig? - const convo = ConvoHub.use().get(groupPk); - if (!convo) { - return; - } - const sigValid = await verifySig({ - pubKey: HexString.fromHexStringNoPrefix(groupPk), - signature: change.adminSignature, - data: stringToUint8Array(`DELETE${signatureTimestamp}${change.memberSessionIds.join('')}`), - }); - - if (!sigValid) { - window.log.warn('received group delete message with invalid signature. dropping'); - return; - } - convo.set({ - active_at: signatureTimestamp, - }); - throw new Error('Not implemented'); - // TODO We should process this message type even if the sender is blocked -} - async function handleGroupUpdateInviteResponseMessage({ groupPk, change, @@ -459,6 +440,8 @@ async function handleGroupUpdateInviteResponseMessage({ if (!convo) { return; } + window.log.info(`handleGroupUpdateInviteResponseMessage for ${ed25519Str(groupPk)}`); + if (!change.isApproved) { window.log.info('got inviteResponse but isApproved is false. Dropping'); return; @@ -482,6 +465,8 @@ async function handleGroupUpdatePromoteMessage({ if (!convo) { return; } + window.log.info(`handleGroupUpdatePromoteMessage for ${ed25519Str(groupPk)}`); + // no group update message here, another message is sent to the group's swarm for the update message. // this message is just about the keys that we need to save, and accepting the promotion. @@ -589,13 +574,7 @@ async function handleGroupUpdateMessage( }); return; } - if (details.updateMessage.deleteMessage) { - await handleGroupUpdateDeleteMessage({ - change: details.updateMessage.deleteMessage as SignalService.GroupUpdateDeleteMessage, - ...detailsWithContext, - }); - return; - } + if (details.updateMessage.inviteResponse) { await handleGroupUpdateInviteResponseMessage({ change: details.updateMessage diff --git a/ts/receiver/libsession/handleLibSessionMessage.ts b/ts/receiver/libsession/handleLibSessionMessage.ts new file mode 100644 index 0000000000..2ed0db7932 --- /dev/null +++ b/ts/receiver/libsession/handleLibSessionMessage.ts @@ -0,0 +1,84 @@ +import { EncryptionDomain, GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { isNumber, toNumber } from 'lodash'; +import { LibSodiumWrappers } from '../../session/crypto'; +import { PubKey } from '../../session/types'; +import { DecryptionFailed, InvalidMessage } from '../../session/utils/errors'; +import { assertUnreachable } from '../../types/sqlSharedTypes'; +import { WithLibSodiuMWrappers } from '../../session/types/with'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../../webworker/workers/browser/libsession_worker_interface'; +import { ConvoHub } from '../../session/conversations'; + +/** + * Logic for handling the `groupKicked` `LibSessionMessage`, this message should only be processed if it was + * sent after the user joined the group (while unlikely, it's possible to receive this message when re-joining a group after + * previously being kicked in which case we don't want to delete the data). + */ +async function handleLibSessionKickedMessage({ + decrypted, + sodium, + ourPk, + groupPk, +}: { + decrypted: Uint8Array; + sodium: LibSodiumWrappers; + ourPk: PubkeyType; + groupPk: GroupPubkeyType; +}) { + const pubkeyBytesCount = PubKey.PUBKEY_BYTE_COUNT_NO_PREFIX; + if (decrypted.length <= pubkeyBytesCount) { + throw new DecryptionFailed('DecryptionFailed for handleLibSessionKickedMessage'); + } + // pubkey without prefix should be at the start, and current_gen as a string the rest of the content. + const pubkeyEmbedded = decrypted.slice(0, pubkeyBytesCount); + const currentGenStr = sodium.to_string(decrypted.slice(pubkeyBytesCount)); + const currentGenEmbedded = toNumber(currentGenStr); + + if (!isNumber(currentGenEmbedded)) { + throw new InvalidMessage('currentGenEmbedded not a number'); + } + const pubkeyEmbeddedHex = sodium.to_hex(pubkeyEmbedded); + if (ourPk.slice(2) !== pubkeyEmbeddedHex) { + throw new InvalidMessage('embedded pubkey does not match current user pubkey'); + } + + const currentGenFromWrapper = await MetaGroupWrapperActions.keyGetCurrentGen(groupPk); + if (currentGenEmbedded < currentGenFromWrapper) { + throw new InvalidMessage('currentgen in wrapper is higher than the one in the message '); + } + const inviteWasPending = + (await UserGroupsWrapperActions.getGroup(groupPk))?.invitePending || false; + await ConvoHub.use().deleteClosedGroup(groupPk, { + sendLeaveMessage: false, + fromSyncMessage: false, + emptyGroupButKeepAsKicked: !inviteWasPending, + }); +} + +async function handleLibSessionMessage( + opts: { + decrypted: Uint8Array; + domain: EncryptionDomain; + ourPk: PubkeyType; + groupPk: GroupPubkeyType; + } & WithLibSodiuMWrappers +) { + switch (opts.domain) { + case 'SessionGroupKickedMessage': + await handleLibSessionKickedMessage(opts); + return; + + default: + assertUnreachable( + opts.domain, + `handleLibSessionMessage unhandled case for domain: ${opts.domain}` + ); + break; + } +} + +export const LibsessionMessageHandler = { + handleLibSessionMessage, +}; diff --git a/ts/session/apis/seed_node_api/SeedNodeAPI.ts b/ts/session/apis/seed_node_api/SeedNodeAPI.ts index 3a31aedff2..765ce043d5 100644 --- a/ts/session/apis/seed_node_api/SeedNodeAPI.ts +++ b/ts/session/apis/seed_node_api/SeedNodeAPI.ts @@ -1,17 +1,18 @@ -import tls from 'tls'; import https from 'https'; +import tls from 'tls'; + +import _ from 'lodash'; // eslint-disable-next-line import/no-named-default import { default as insecureNodeFetch } from 'node-fetch'; -import _ from 'lodash'; import pRetry from 'p-retry'; -import { sha256 } from '../../crypto'; -import { Constants } from '../..'; import { SeedNodeAPI } from '.'; -import { allowOnlyOneAtATime } from '../../utils/Promise'; -import { APPLICATION_JSON } from '../../../types/MIME'; +import { Constants } from '../..'; import { isLinux } from '../../../OS'; import { Snode } from '../../../data/data'; +import { APPLICATION_JSON } from '../../../types/MIME'; +import { sha256 } from '../../crypto'; +import { allowOnlyOneAtATime } from '../../utils/Promise'; /** * Fetch all snodes from seed nodes. diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index c87dce4e34..94dc6cc3b6 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -1,54 +1,48 @@ /* eslint-disable no-prototype-builtins */ /* eslint-disable no-restricted-syntax */ -import { compact } from 'lodash'; +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { compact, isEmpty } from 'lodash'; import pRetry from 'p-retry'; import { getSodiumRenderer } from '../../crypto'; import { ed25519Str } from '../../onions/onionPath'; +import { PubKey } from '../../types'; import { StringUtils, UserUtils } from '../../utils'; import { fromBase64ToArray, fromHexToArray } from '../../utils/String'; +import { + DeleteAllFromUserNodeSubRequest, + DeleteHashesFromGroupNodeSubRequest, + DeleteHashesFromUserNodeSubRequest, +} from './SnodeRequestTypes'; import { BatchRequests } from './batchRequest'; -import { SnodeSignature } from './signature/snodeSignatures'; import { SnodePool } from './snodePool'; export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.'; // TODOLATER we should merge those two functions together as they are almost exactly the same -// TODO make this function use doUnsignedBatchRequest but we need to merge the verify logic into it const forceNetworkDeletion = async (): Promise | null> => { const sodium = await getSodiumRenderer(); const usPk = UserUtils.getOurPubKeyStrFromCache(); - const usED25519KeyPair = await UserUtils.getUserED25519KeyPairBytes(); - - if (!usED25519KeyPair) { - window?.log?.warn('Cannot forceNetworkDeletion, did not find user ed25519 key.'); - return null; - } - const method = 'delete_all' as const; - const namespace = 'all' as const; + const request = new DeleteAllFromUserNodeSubRequest(); try { const maliciousSnodes = await pRetry( async () => { const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(usPk); - + const builtRequest = await request.buildAndSignParameters(); // we need the timestamp to verify the signature below return pRetry( async () => { - const signOpts = await SnodeSignature.getSnodeSignatureParamsUs({ - method, - namespace, - }); - const ret = await BatchRequests.doSnodeBatchRequestNoRetries( - [{ method, params: { ...signOpts, namespace, pubkey: usPk } }], + [builtRequest], snodeToMakeRequestTo, 10000, - usPk + usPk, + false ); if (!ret || !ret?.[0].body || ret[0].code !== 200) { throw new Error( - `Empty response got for ${method} on snode ${ed25519Str( + `Empty response got for ${request.method} on snode ${ed25519Str( snodeToMakeRequestTo.pubkey_ed25519 )}` ); @@ -60,7 +54,7 @@ const forceNetworkDeletion = async (): Promise | null> => { if (!swarm) { throw new Error( - `Invalid JSON swarm response got for ${method} on snode ${ed25519Str( + `Invalid JSON swarm response got for ${request.method} on snode ${ed25519Str( snodeToMakeRequestTo.pubkey_ed25519 )}, ${firstResultParsedBody}` ); @@ -68,7 +62,7 @@ const forceNetworkDeletion = async (): Promise | null> => { const swarmAsArray = Object.entries(swarm) as Array>; if (!swarmAsArray.length) { throw new Error( - `Invalid JSON swarmAsArray response got for ${method} on snode ${ed25519Str( + `Invalid JSON swarmAsArray response got for ${request.method} on snode ${ed25519Str( snodeToMakeRequestTo.pubkey_ed25519 )}, ${firstResultParsedBody}` ); @@ -86,19 +80,19 @@ const forceNetworkDeletion = async (): Promise | null> => { const statusCode = snodeJson.code; if (reason && statusCode) { window?.log?.warn( - `Could not ${method} from ${ed25519Str( + `Could not ${request.method} from ${ed25519Str( snodeToMakeRequestTo.pubkey_ed25519 )} due to error: ${reason}: ${statusCode}` ); // if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to. if (statusCode === 421) { throw new pRetry.AbortError( - `421 error on network ${method}. Retrying with a new snode` + `421 error on network ${request.method}. Retrying with a new snode` ); } } else { window?.log?.warn( - `Could not ${method} from ${ed25519Str( + `Could not ${request.method} from ${ed25519Str( snodeToMakeRequestTo.pubkey_ed25519 )}` ); @@ -117,7 +111,7 @@ const forceNetworkDeletion = async (): Promise | null> => { const sortedHashes = hashes.sort(); const signatureSnode = snodeJson.signature as string; // The signature format is (with sortedHashes accross all namespaces) ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] ) - const dataToVerify = `${usPk}${signOpts.timestamp}${sortedHashes.join('')}`; + const dataToVerify = `${usPk}${builtRequest.params.timestamp}${sortedHashes.join('')}`; const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8'); const isValid = sodium.crypto_sign_verify_detached( @@ -135,7 +129,7 @@ const forceNetworkDeletion = async (): Promise | null> => { return results; } catch (e) { throw new Error( - `Invalid JSON response got for ${method} on snode ${ed25519Str( + `Invalid JSON response got for ${request.method} on snode ${ed25519Str( snodeToMakeRequestTo.pubkey_ed25519 )}, ${ret}` ); @@ -146,7 +140,7 @@ const forceNetworkDeletion = async (): Promise | null> => { minTimeout: SnodeAPI.TEST_getMinTimeout(), onFailedAttempt: e => { window?.log?.warn( - `${method} INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...` + `${request.method} INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...` ); }, } @@ -157,7 +151,7 @@ const forceNetworkDeletion = async (): Promise | null> => { minTimeout: SnodeAPI.TEST_getMinTimeout(), onFailedAttempt: e => { window?.log?.warn( - `${method} OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}` + `${request.method} OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}` ); }, } @@ -165,7 +159,7 @@ const forceNetworkDeletion = async (): Promise | null> => { return maliciousSnodes; } catch (e) { - window?.log?.warn(`failed to ${method} everything on network:`, e); + window?.log?.warn(`failed to ${request.method} everything on network:`, e); return null; } }; @@ -175,43 +169,39 @@ const TEST_getMinTimeout = () => 500; /** * Locally deletes message and deletes message on the network (all nodes that contain the message) */ -const networkDeleteMessages = async (hashes: Array): Promise | null> => { +const networkDeleteMessages = async ( + messagesHashes: Array, + pubkey: PubkeyType | GroupPubkeyType +): Promise => { const sodium = await getSodiumRenderer(); - const userX25519PublicKey = UserUtils.getOurPubKeyStrFromCache(); - - const userED25519KeyPair = await UserUtils.getUserED25519KeyPair(); - - if (!userED25519KeyPair) { - window?.log?.warn('Cannot networkDeleteMessages, did not find user ed25519 key.'); - return null; + if (PubKey.is05Pubkey(pubkey) && pubkey !== UserUtils.getOurPubKeyStrFromCache()) { + throw new Error('networkDeleteMessages with 05 pk can only delete for ourself'); } - const method = 'delete' as const; + const request = PubKey.is03Pubkey(pubkey) + ? new DeleteHashesFromGroupNodeSubRequest({ messagesHashes, groupPk: pubkey }) + : new DeleteHashesFromUserNodeSubRequest({ messagesHashes }); try { - const maliciousSnodes = await pRetry( + const success = await pRetry( async () => { - const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(userX25519PublicKey); + const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.pubkey); return pRetry( async () => { - const signOpts = await SnodeSignature.getSnodeSignatureByHashesParams({ - messagesHashes: hashes, - method, - pubkey: userX25519PublicKey, - }); - - const ret = await BatchRequests.doSnodeBatchRequestNoRetries( - [{ method, params: signOpts }], + const ret = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( + [request], snodeToMakeRequestTo, 10000, - userX25519PublicKey + request.pubkey, + false ); + debugger; if (!ret || !ret?.[0].body || ret[0].code !== 200) { throw new Error( - `Empty response got for ${method} on snode ${ed25519Str( + `Empty response got for ${request.method} on snode ${ed25519Str( snodeToMakeRequestTo.pubkey_ed25519 - )}` + )} about pk: ${ed25519Str(request.pubkey)}` ); } @@ -221,7 +211,7 @@ const networkDeleteMessages = async (hashes: Array): Promise): Promise>; if (!swarmAsArray.length) { throw new Error( - `Invalid JSON swarmAsArray response got for ${method} on snode ${ed25519Str( + `Invalid JSON swarmAsArray response got for ${request.method} on snode ${ed25519Str( snodeToMakeRequestTo.pubkey_ed25519 )}, ${firstResultParsedBody}` ); @@ -247,19 +237,19 @@ const networkDeleteMessages = async (hashes: Array): Promise): Promise; const signatureSnode = snodeJson.signature as string; // The signature looks like ( PUBKEY_HEX || RMSG[0] || ... || RMSG[N] || DMSG[0] || ... || DMSG[M] ) - const dataToVerify = `${userX25519PublicKey}${hashes.join( + const dataToVerify = `${request.pubkey}${messagesHashes.join( '' )}${responseHashes.join('')}`; const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8'); @@ -286,10 +276,10 @@ const networkDeleteMessages = async (hashes: Array): Promise): Promise { window?.log?.warn( - `${method} INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...` + `${request.method} INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...` ); }, } @@ -311,16 +301,16 @@ const networkDeleteMessages = async (hashes: Array): Promise { window?.log?.warn( - `${method} OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}` + `${request.method} OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}` ); }, } ); - return maliciousSnodes; + return success; } catch (e) { - window?.log?.warn(`failed to ${method} message on network:`, e); - return null; + window?.log?.warn(`failed to ${request.method} message on network:`, e); + return false; } }; diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index bdab7b2fcc..5bd2f2712b 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -446,17 +446,19 @@ export class DeleteAllFromUserNodeSubRequest extends SnodeAPISubRequest { export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { public method = 'delete' as const; public readonly messageHashes: Array; + public readonly pubkey: PubkeyType; constructor(args: WithMessagesHashes) { super(); this.messageHashes = args.messagesHashes; + this.pubkey = UserUtils.getOurPubKeyStrFromCache(); } public async buildAndSignParameters() { const signResult = await SnodeSignature.getSnodeSignatureByHashesParams({ method: this.method, messagesHashes: this.messageHashes, - pubkey: UserUtils.getOurPubKeyStrFromCache(), + pubkey: this.pubkey, }); if (!signResult) { @@ -485,33 +487,32 @@ export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { public method = 'delete' as const; public readonly messageHashes: Array; - public readonly groupPk: GroupPubkeyType; + public readonly pubkey: GroupPubkeyType; constructor(args: WithMessagesHashes & WithGroupPubkey) { super(); this.messageHashes = args.messagesHashes; - this.groupPk = args.groupPk; + this.pubkey = args.groupPk; } public async buildAndSignParameters() { + const group = await UserGroupsWrapperActions.getGroup(this.pubkey); + if (!group) { + throw new Error('DeleteHashesFromGroupNodeSubRequest no such group found'); + } + // This will try to use the adminSecretKey if we have it, or the authData if we have it. + // Otherwise, it will throw const signResult = await SnodeGroupSignature.getGroupSignatureByHashesParams({ method: this.method, messagesHashes: this.messageHashes, - groupPk: this.groupPk, + groupPk: this.pubkey, + group, }); - if (!signResult) { - throw new Error( - `[DeleteAllFromUserNodeSubRequest] SnodeSignature.getSnodeSignatureParamsUs returned an empty result` - ); - } - return { method: this.method, params: { - pubkey: signResult.pubkey, - signature: signResult.signature, - messages: signResult.messages, + ...signResult, // pubkey_ed25519 is forbidden when doing the request for a group // timestamp is not needed for this one as the hashes can be deleted only once }, @@ -519,7 +520,7 @@ export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { } public loggingId(): string { - return `${this.method}-${ed25519Str(this.groupPk)}`; + return `${this.method}-${ed25519Str(this.pubkey)}`; } } @@ -635,7 +636,10 @@ export class UpdateExpiryOnNodeGroupSubRequest extends SnodeAPISubRequest { export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { public method = 'store' as const; - public readonly namespace: SnodeNamespacesGroupConfig | SnodeNamespaces.ClosedGroupMessages; + public readonly namespace: + | SnodeNamespacesGroupConfig + | SnodeNamespaces.ClosedGroupMessages + | SnodeNamespaces.ClosedGroupRevokedRetrievableMessages; public readonly destination: GroupPubkeyType; public readonly ttlMs: number; public readonly encryptedData: Uint8Array; @@ -644,7 +648,10 @@ export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { constructor( args: WithGroupPubkey & { - namespace: SnodeNamespacesGroupConfig | SnodeNamespaces.ClosedGroupMessages; + namespace: + | SnodeNamespacesGroupConfig + | SnodeNamespaces.ClosedGroupMessages + | SnodeNamespaces.ClosedGroupRevokedRetrievableMessages; ttlMs: number; encryptedData: Uint8Array; dbMessageIdentifier: string | null; diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index a533139c84..8ac4b9b5ec 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -33,6 +33,7 @@ async function doSnodeBatchRequestNoRetries( targetNode: Snode, timeout: number, associatedWith: string | null, + allow401s: boolean, method: MethodBatchType = 'batch' ): Promise { window.log.debug( @@ -53,6 +54,7 @@ async function doSnodeBatchRequestNoRetries( params: { requests: subRequests }, targetNode, associatedWith, + allow401s, timeout, }); if (!result) { @@ -74,6 +76,7 @@ async function doSnodeBatchRequestNoRetries( body: JSON.stringify(resultRow.body), associatedWith: associatedWith || undefined, destinationSnodeEd25519: targetNode.pubkey_ed25519, + allow401s, }); } } @@ -98,6 +101,7 @@ async function doUnsignedSnodeBatchRequestNoRetries( targetNode: Snode, timeout: number, associatedWith: string | null, + allow401s: boolean, method: MethodBatchType = 'batch' ): Promise { const signedSubRequests = await MessageSender.signSubRequests(unsignedSubRequests); @@ -106,6 +110,7 @@ async function doUnsignedSnodeBatchRequestNoRetries( targetNode, timeout, associatedWith, + allow401s, method ); } diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index 04c570d842..c3f65c2902 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -149,8 +149,9 @@ async function updateExpiryOnNodesNoRetries( const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( expireRequests, targetNode, - 4000, + 10000, ourPubKey, + false, 'batch' ); diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index 7e2fdaa3e7..28103f7ba7 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -49,8 +49,9 @@ async function getExpiriesFromNodesNoRetries( const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [expireRequest], targetNode, - 4000, + 10000, associatedWith, + false, 'batch' ); diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index d135a1c0fa..0d671d5263 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -15,8 +15,9 @@ const getNetworkTime = async (snode: Snode): Promise => { const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [subrequest], snode, - 4000, - null + 10000, + null, + false ); if (!result || !result.length) { window?.log?.warn(`getNetworkTime on ${snode.ip}:${snode.port} returned falsish value`, result); diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index ba0dc50ac7..430a8f6cc1 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -16,8 +16,9 @@ async function getSnodePoolFromSnode(targetNode: Snode): Promise> { const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [subrequest], targetNode, - 4000, - null + 10000, + null, + false ); const firstResult = results[0]; diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index 2a2c652592..5de768c5c2 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -22,8 +22,9 @@ async function requestSnodesForPubkeyWithTargetNodeRetryable( const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [subrequest], targetNode, - 4000, - pubkey + 10000, + pubkey, + false ); if (!result || !result.length) { @@ -100,7 +101,7 @@ async function requestSnodesForPubkeyRetryable(pubKey: string): Promise { window?.log?.warn( `requestSnodesForPubkeyRetryable attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...` diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index ff3998a34a..99b6c4b53e 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -306,11 +306,13 @@ export async function processOnionRequestErrorAtDestination({ body, destinationSnodeEd25519, associatedWith, + allow401s, }: { statusCode: number; body: string; destinationSnodeEd25519?: string; associatedWith?: string; + allow401s: boolean; }) { if (statusCode === 200) { return; @@ -319,7 +321,9 @@ export async function processOnionRequestErrorAtDestination({ `processOnionRequestErrorAtDestination. statusCode nok: ${statusCode}: associatedWith:${associatedWith} destinationSnodeEd25519:${destinationSnodeEd25519}` ); process406Or425Error(statusCode); - process401Error(statusCode); + if (!allow401s) { + process401Error(statusCode); + } processOxenServerError(statusCode, body); await process421Error(statusCode, body, associatedWith, destinationSnodeEd25519); if (destinationSnodeEd25519) { @@ -518,6 +522,7 @@ async function processOnionResponse({ abortSignal, associatedWith, destinationSnodeEd25519, + allow401s, }: { response?: { text: () => Promise; status: number }; symmetricKey?: ArrayBuffer; @@ -525,6 +530,7 @@ async function processOnionResponse({ destinationSnodeEd25519?: string; abortSignal?: AbortSignal; associatedWith?: string; + allow401s: boolean; }): Promise { let ciphertext = ''; @@ -598,6 +604,7 @@ async function processOnionResponse({ body: jsonRes?.body, // this is really important. the `.body`. the .body should be a string. for instance for nodeNotFound but is most likely a dict (Record)) destinationSnodeEd25519, associatedWith, + allow401s, }); return jsonRes as SnodeResponse; @@ -817,6 +824,7 @@ async function sendOnionRequestHandlingSnodeEjectNoRetries({ finalRelayOptions, useV4, throwErrors, + allow401s, }: { nodePath: Array; destSnodeX25519: string; @@ -826,6 +834,7 @@ async function sendOnionRequestHandlingSnodeEjectNoRetries({ associatedWith?: string; useV4: boolean; throwErrors: boolean; + allow401s: boolean; }): Promise { // this sendOnionRequestNoRetries() call has to be the only one like this. // If you need to call it, call it through sendOnionRequestHandlingSnodeEjectNoRetries because this is the one handling path rebuilding and known errors @@ -894,6 +903,7 @@ async function sendOnionRequestHandlingSnodeEjectNoRetries({ destinationSnodeEd25519, abortSignal, associatedWith, + allow401s, }); } @@ -1103,6 +1113,7 @@ async function sendOnionRequestSnodeDestNoRetries( targetNode: Snode, headers: Record, plaintext: string | null, + allow401s: boolean, associatedWith?: string ) { return Onions.sendOnionRequestHandlingSnodeEjectNoRetries({ @@ -1116,6 +1127,7 @@ async function sendOnionRequestSnodeDestNoRetries( associatedWith, useV4: false, // sadly, request to snode do not support v4 yet throwErrors: false, + allow401s, }); } @@ -1131,11 +1143,13 @@ async function lokiOnionFetchWithRetries({ associatedWith, body, headers, + allow401s, }: { targetNode: Snode; headers: Record; body: string | null; associatedWith?: string; + allow401s: boolean; }): Promise { try { const retriedResult = await pRetry( @@ -1147,6 +1161,7 @@ async function lokiOnionFetchWithRetries({ targetNode, headers, body, + allow401s, associatedWith ); return result; diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts index ce5641381e..cae0c84ccd 100644 --- a/ts/session/apis/snode_api/onsResolve.ts +++ b/ts/session/apis/snode_api/onsResolve.ts @@ -36,8 +36,9 @@ async function getSessionIDForOnsName(onsNameCase: string) { const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [subRequest], targetNode, - 4000, - null + 10000, + null, + false ); const firstResult = results[0]; if (!firstResult || firstResult.code !== 200 || !firstResult.body) { diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 6ff1dca0ac..6ad0fa63da 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -198,7 +198,8 @@ async function retrieveNextMessagesNoRetries( associatedWith: string, namespacesAndLastHashes: Array, ourPubkey: string, - configHashesToBump: Array | null + configHashesToBump: Array | null, + allow401s: boolean ): Promise { const rawRequests = await buildRetrieveRequest( namespacesAndLastHashes, @@ -212,8 +213,9 @@ async function retrieveNextMessagesNoRetries( const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( rawRequests, targetNode, - 4000, - associatedWith + 10000, + associatedWith, + allow401s ); if (!results || !results.length) { window?.log?.warn( diff --git a/ts/session/apis/snode_api/revokeSubaccount.ts b/ts/session/apis/snode_api/revokeSubaccount.ts index 6f708530ec..aae7c65519 100644 --- a/ts/session/apis/snode_api/revokeSubaccount.ts +++ b/ts/session/apis/snode_api/revokeSubaccount.ts @@ -1,6 +1,8 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { PubKey } from '../../types'; +import { SubaccountRevokeSubRequest, SubaccountUnrevokeSubRequest } from './SnodeRequestTypes'; +import { GetNetworkTime } from './getNetworkTime'; export type RevokeChanges = Array<{ action: 'revoke_subaccount' | 'unrevoke_subaccount'; @@ -9,8 +11,11 @@ export type RevokeChanges = Array<{ async function getRevokeSubaccountParams( groupPk: GroupPubkeyType, - _secretKey: Uint8Array, - _opts: { revokeChanges: RevokeChanges; unrevokeChanges: RevokeChanges } + secretKey: Uint8Array, + { + revokeChanges, + unrevokeChanges, + }: { revokeChanges: RevokeChanges; unrevokeChanges: RevokeChanges } ) { if (!PubKey.is03Pubkey(groupPk)) { throw new Error('revokeSubaccountForGroup: not a 03 group'); @@ -18,26 +23,26 @@ async function getRevokeSubaccountParams( window.log.warn('getRevokeSubaccountParams to enable once multisig is done'); // TODO audric debugger - // const revokeSubRequest = revokeChanges.length - // ? new SubaccountRevokeSubRequest({ - // groupPk, - // revokeTokenHex: revokeChanges.map(m => m.tokenToRevokeHex), - // timestamp: GetNetworkTime.now(), - // secretKey, - // }) - // : null; - // const unrevokeSubRequest = unrevokeChanges.length - // ? new SubaccountUnrevokeSubRequest({ - // groupPk, - // revokeTokenHex: unrevokeChanges.map(m => m.tokenToRevokeHex), - // timestamp: GetNetworkTime.now(), - // secretKey, - // }) - // : null; + const revokeSubRequest = revokeChanges.length + ? new SubaccountRevokeSubRequest({ + groupPk, + revokeTokenHex: revokeChanges.map(m => m.tokenToRevokeHex), + timestamp: GetNetworkTime.now(), + secretKey, + }) + : null; + const unrevokeSubRequest = unrevokeChanges.length + ? new SubaccountUnrevokeSubRequest({ + groupPk, + revokeTokenHex: unrevokeChanges.map(m => m.tokenToRevokeHex), + timestamp: GetNetworkTime.now(), + secretKey, + }) + : null; return { - revokeSubRequest: null, - unrevokeSubRequest: null, + revokeSubRequest, + unrevokeSubRequest, }; } diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index 14f5695f69..82c6818b87 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -29,12 +29,14 @@ async function doRequestNoRetries({ associatedWith, targetNode, timeout, + allow401s, }: { url: string; options: LokiFetchOptions; targetNode?: Snode; associatedWith: string | null; timeout: number; + allow401s: boolean; }): Promise { const method = options.method || 'GET'; @@ -57,6 +59,7 @@ async function doRequestNoRetries({ body: fetchOptions.body, headers: fetchOptions.headers, associatedWith: associatedWith || undefined, + allow401s, }); if (!fetchResult) { return undefined; @@ -116,6 +119,7 @@ async function snodeRpcNoRetries( params, targetNode, associatedWith, + allow401s, timeout = 10000, }: { method: string; @@ -123,6 +127,7 @@ async function snodeRpcNoRetries( targetNode: Snode; associatedWith: string | null; timeout?: number; + allow401s: boolean; } // the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance ): Promise { const url = `https://${targetNode.ip}:${targetNode.port}/storage_rpc/v1`; @@ -146,6 +151,7 @@ async function snodeRpcNoRetries( targetNode, associatedWith, timeout, + allow401s, }); } diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 73cd558362..49d8239993 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -7,11 +7,7 @@ import { WithGroupPubkey, } from 'libsession_util_nodejs'; import { isEmpty, isString } from 'lodash'; -import { - MetaGroupWrapperActions, - UserGroupsWrapperActions, -} from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { getSodiumRenderer } from '../../../crypto/MessageEncrypter'; +import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { GroupUpdateInviteMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; import { GroupUpdatePromoteMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage'; import { StringUtils, UserUtils } from '../../../utils'; @@ -22,6 +18,7 @@ import { SnodeNamespacesGroup } from '../namespaces'; import { SignedGroupHashesParams, WithMessagesHashes, WithShortenOrExtend } from '../types'; import { SignatureShared } from './signatureShared'; import { SnodeSignatureResult } from './snodeSignatures'; +import { getSodiumRenderer } from '../../../crypto'; async function getGroupInviteMessage({ groupName, @@ -141,15 +138,15 @@ export type GroupDetailsNeededForSignature = Pick< 'pubkeyHex' | 'authData' | 'secretKey' >; +type StoreOrRetrieve = { method: 'store' | 'retrieve'; namespace: SnodeNamespacesGroup }; +type DeleteHashes = { method: 'delete'; hashes: Array }; + async function getSnodeGroupSignature({ group, - method, - namespace, + ...args }: { group: GroupDetailsNeededForSignature | null; - method: 'store' | 'retrieve'; - namespace: SnodeNamespacesGroup; -}): Promise { +} & (StoreOrRetrieve | DeleteHashes)): Promise { if (!group) { throw new Error(`getSnodeGroupSignature: did not find group in wrapper`); } @@ -159,21 +156,36 @@ async function getSnodeGroupSignature({ const groupAuthData = authData && !isEmpty(authData) ? authData : null; if (groupSecretKey) { + if (args.method === 'delete') { + return getGroupSignatureByHashesParams({ + groupPk, + method: args.method, + messagesHashes: args.hashes, + group, + }); + } return getSnodeGroupAdminSignatureParams({ - method, - namespace, + method: args.method, + namespace: args.namespace, groupPk, groupIdentityPrivKey: groupSecretKey, }); } if (groupAuthData) { - const subAccountSign = await getSnodeGroupSubAccountSignatureParams({ + if (args.method === 'delete') { + return getGroupSignatureByHashesParams({ + groupPk, + method: args.method, + messagesHashes: args.hashes, + group, + }); + } + return getSnodeGroupSubAccountSignatureParams({ groupPk, - method, - namespace, + method: args.method, + namespace: args.namespace, authData: groupAuthData, }); - return subAccountSign; } throw new Error(`getSnodeGroupSignature: needs either groupSecretKey or authData`); } @@ -263,28 +275,32 @@ async function generateUpdateExpiryGroupSignature({ async function getGroupSignatureByHashesParams({ messagesHashes, method, - groupPk, + group, }: WithMessagesHashes & WithGroupPubkey & { method: 'delete'; + group: GroupDetailsNeededForSignature; }): Promise { - const verificationData = StringUtils.encode(`${method}${messagesHashes.join('')}`, 'utf8'); - const message = new Uint8Array(verificationData); + const verificationString = `${method}${messagesHashes.join('')}`; + const message = new Uint8Array(StringUtils.encode(verificationString, 'utf8')); + const signatureTimestamp = GetNetworkTime.now(); const sodium = await getSodiumRenderer(); + // N try { - const group = await UserGroupsWrapperActions.getGroup(groupPk); - if (!group || !group.secretKey || isEmpty(group.secretKey)) { - throw new Error('getSnodeGroupSignatureByHashesParams needs admin secretKey'); + if (group.secretKey && !isEmpty(group.secretKey)) { + const signature = sodium.crypto_sign_detached(message, group.secretKey); + const signatureBase64 = fromUInt8ArrayToBase64(signature); + + return { + signature: signatureBase64, + pubkey: group.pubkeyHex, + messages: messagesHashes, + timestamp: signatureTimestamp, // TODO audric is this causing backend signature issues? + }; } - const signature = sodium.crypto_sign_detached(message, group.secretKey); - const signatureBase64 = fromUInt8ArrayToBase64(signature); - return { - signature: signatureBase64, - pubkey: groupPk, - messages: messagesHashes, - }; + throw new Error('getSnodeGroupSignatureByHashesParams needs admin secretKey set'); } catch (e) { window.log.warn('getSnodeGroupSignatureByHashesParams failed with: ', e.message); throw e; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index f8ad0ab56a..0e08b16222 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -10,6 +10,7 @@ import { difference, flatten, isArray, + isEmpty, last, omit, sample, @@ -25,6 +26,7 @@ import { ERROR_CODE_NO_CONNECT } from './SNodeAPI'; import { ConversationModel } from '../../../models/conversation'; import { ConversationTypeEnum } from '../../../models/conversationAttributes'; +import { LibsessionMessageHandler } from '../../../receiver/libsession/handleLibSessionMessage'; import { EnvelopePlus } from '../../../receiver/types'; import { updateIsOnline } from '../../../state/ducks/onion'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; @@ -35,11 +37,14 @@ import { } from '../../../webworker/workers/browser/libsession_worker_interface'; import { DURATION, SWARM_POLLING_TIMEOUT } from '../../constants'; import { ConvoHub } from '../../conversations'; +import { getSodiumRenderer } from '../../crypto'; import { ed25519Str } from '../../onions/onionPath'; import { StringUtils, UserUtils } from '../../utils'; import { sleepFor } from '../../utils/Promise'; +import { fromBase64ToArray, fromHexToArray } from '../../utils/String'; import { PreConditionFailed } from '../../utils/errors'; import { LibSessionUtil } from '../../utils/libsession/libsession_utils'; +import { MultiEncryptUtils } from '../../utils/libsession/libsession_utils_multi_encrypt'; import { SnodeNamespace, SnodeNamespaces, SnodeNamespacesUserConfig } from './namespaces'; import { PollForGroup, PollForLegacy, PollForUs } from './pollingTypes'; import { SnodeAPIRetrieve } from './retrieveRequest'; @@ -339,6 +344,48 @@ export class SwarmPolling { } } + public async handleRevokedMessages({ + revokedMessages, + groupPk, + type, + }: { + type: ConversationTypeEnum; + groupPk: string; + revokedMessages: Array | null; + }) { + if (!revokedMessages || isEmpty(revokedMessages)) { + return; + } + const sodium = await getSodiumRenderer(); + const userEd25519SecretKey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes; + const ourPk = UserUtils.getOurPubKeyStrFromCache(); + const senderEd25519Pubkey = fromHexToArray(groupPk.slice(2)); + + if (type === ConversationTypeEnum.GROUPV2 && PubKey.is03Pubkey(groupPk)) { + for (let index = 0; index < revokedMessages.length; index++) { + const revokedMessage = revokedMessages[index]; + const successWith = await MultiEncryptUtils.multiDecryptAnyEncryptionDomain({ + encoded: fromBase64ToArray(revokedMessage.data), + userEd25519SecretKey, + senderEd25519Pubkey, + }); + if (successWith && successWith.decrypted && !isEmpty(successWith.decrypted)) { + try { + await LibsessionMessageHandler.handleLibSessionMessage({ + decrypted: successWith.decrypted, + domain: successWith.domain, + groupPk, + ourPk, + sodium, + }); + } catch (e) { + window.log.warn('handleLibSessionMessage failed with:', e.message); + } + } + } + } + } + /** * Only exposed as public for testing */ @@ -376,12 +423,13 @@ export class SwarmPolling { }); return; } - const { confMessages, otherMessages } = filterMessagesPerTypeOfConvo( + const { confMessages, otherMessages, revokedMessages } = filterMessagesPerTypeOfConvo( type, resultsFromAllNamespaces ); // We always handle the config messages first (for groups 03 or our own messages) await this.handleUserOrGroupConfMessages({ confMessages, pubkey, type }); + await this.handleRevokedMessages({ revokedMessages, groupPk: pubkey, type }); // Merge results into one list of unique messages const uniqOtherMsgs = uniqBy(otherMessages, x => x.hash); @@ -524,12 +572,14 @@ export class SwarmPolling { }) ); + const allow401s = type === ConversationTypeEnum.GROUPV2; let results = await SnodeAPIRetrieve.retrieveNextMessagesNoRetries( node, pubkey, namespacesAndLastHashes, UserUtils.getOurPubKeyStrFromCache(), - configHashesToBump + configHashesToBump, + allow401s ); if (!results.length) { @@ -596,6 +646,7 @@ export class SwarmPolling { await ConvoHub.use().deleteClosedGroup(pubkey, { fromSyncMessage: true, sendLeaveMessage: false, + emptyGroupButKeepAsKicked: false, }); } @@ -755,6 +806,7 @@ function filterMessagesPerTypeOfConvo( retrieveResults: RetrieveMessagesResultsBatched ): { confMessages: Array | null; + revokedMessages: Array | null; otherMessages: Array; } { switch (type) { @@ -769,34 +821,45 @@ function filterMessagesPerTypeOfConvo( const confMessages = retrieveItemWithNamespace(userConfs); const otherMessages = retrieveItemWithNamespace(userOthers); - return { confMessages, otherMessages: uniqBy(otherMessages, x => x.hash) }; + return { + confMessages, + revokedMessages: null, + otherMessages: uniqBy(otherMessages, x => x.hash), + }; } case ConversationTypeEnum.GROUP: return { confMessages: null, otherMessages: retrieveItemWithNamespace(retrieveResults), + revokedMessages: null, }; case ConversationTypeEnum.GROUPV2: { const groupConfs = retrieveResults.filter(m => SnodeNamespace.isGroupConfigNamespace(m.namespace) ); + const groupRevoked = retrieveResults.filter( + m => m.namespace === SnodeNamespaces.ClosedGroupRevokedRetrievableMessages + ); const groupOthers = retrieveResults.filter( - m => !SnodeNamespace.isGroupConfigNamespace(m.namespace) + m => + !SnodeNamespace.isGroupConfigNamespace(m.namespace) && + m.namespace !== SnodeNamespaces.ClosedGroupRevokedRetrievableMessages ); const groupConfMessages = retrieveItemWithNamespace(groupConfs); const groupOtherMessages = retrieveItemWithNamespace(groupOthers); - + const revokedMessages = retrieveItemWithNamespace(groupRevoked); return { confMessages: groupConfMessages, otherMessages: uniqBy(groupOtherMessages, x => x.hash), + revokedMessages, }; } default: - return { confMessages: null, otherMessages: [] }; + return { confMessages: null, otherMessages: [], revokedMessages: null }; } } diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index bf68a451c6..e3f905707d 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -6,6 +6,7 @@ import { groupInfoActions } from '../../../../state/ducks/metaGroups'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { ed25519Str } from '../../../onions/onionPath'; import { fromBase64ToArray } from '../../../utils/String'; +import { GroupPendingRemovals } from '../../../utils/job_runners/jobs/GroupPendingRemovalsJob'; import { LibSessionUtil } from '../../../utils/libsession/libsession_utils'; import { SnodeNamespaces } from '../namespaces'; import { RetrieveMessageItemWithNamespace } from '../types'; @@ -73,6 +74,11 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { } lastAppliedRemoveAttachmentSentBeforeSeconds.set(groupPk, infos.deleteAttachBeforeSeconds); } + const membersWithPendingRemovals = + await MetaGroupWrapperActions.memberGetAllPendingRemovals(groupPk); + if (membersWithPendingRemovals.length) { + await GroupPendingRemovals.addJob({ groupPk }); + } } async function handleGroupSharedConfigMessages( diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index b87b241835..f569863a2f 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -47,10 +47,11 @@ export type SignedHashesParams = WithSignature & { messages: Array; }; -export type SignedGroupHashesParams = WithSignature & { - pubkey: GroupPubkeyType; - messages: Array; -}; +export type SignedGroupHashesParams = WithTimestamp & + WithSignature & { + pubkey: GroupPubkeyType; + messages: Array; + }; /** inherits from https://api.oxen.io/storage-rpc/#/recursive?id=recursive but we only care about these values */ export type ExpireMessageResultItem = WithSignature & { diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 218951c9d1..a3a413f861 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -206,32 +206,52 @@ class ConvoController { } public async deleteClosedGroup( - groupId: string, - { sendLeaveMessage, fromSyncMessage }: DeleteOptions & { sendLeaveMessage: boolean } + groupPk: string, + { + sendLeaveMessage, + fromSyncMessage, + emptyGroupButKeepAsKicked, + }: DeleteOptions & { sendLeaveMessage: boolean; emptyGroupButKeepAsKicked: boolean } ) { - if (!PubKey.is03Pubkey(groupId) && !PubKey.is05Pubkey(groupId)) { + if (!PubKey.is03Pubkey(groupPk) && !PubKey.is05Pubkey(groupPk)) { return; } - const typeOfDelete: ConvoVolatileType = PubKey.is03Pubkey(groupId) ? 'Group' : 'LegacyGroup'; - const conversation = await this.deleteConvoInitialChecks(groupId, typeOfDelete, false); + + const typeOfDelete: ConvoVolatileType = PubKey.is03Pubkey(groupPk) ? 'Group' : 'LegacyGroup'; + window.log.info( + `deleteClosedGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, emptyGroupButKeepAsKicked:${emptyGroupButKeepAsKicked}` + ); + + // this deletes all messages in the conversation + const conversation = await this.deleteConvoInitialChecks(groupPk, typeOfDelete, false); if (!conversation || !conversation.isClosedGroup()) { return; } - getSwarmPollingInstance().removePubkey(groupId, 'deleteClosedGroup'); // we don't need to keep polling anymore. - // send the leave message before we delete everything for this group (including the key!) + // we don't need to keep polling anymore. + getSwarmPollingInstance().removePubkey(groupPk, 'deleteClosedGroup'); + // send the leave message before we delete everything for this group (including the key!) if (sendLeaveMessage) { - await leaveClosedGroup(groupId, fromSyncMessage); - window.log.info(`deleteClosedGroup: ${groupId}, sendLeaveMessage?:${sendLeaveMessage}`); - } - if (PubKey.is03Pubkey(groupId)) { - await remove03GroupFromWrappers(groupId); + await leaveClosedGroup(groupPk, fromSyncMessage); + } + if (PubKey.is03Pubkey(groupPk)) { + // a group 03 can be removed fully or kept empty as kicked. + // when it was pendingInvite, we delete it fully, + // when it was not, we empty the group but keep it with the "you have been kicked" message + // Note: the pendingInvite=true case cannot really happen as we wouldn't be polling from that group (and so, not get the message kicking us ) + if (emptyGroupButKeepAsKicked) { + window?.inboxStore?.dispatch(groupInfoActions.emptyGroupButKeepAsKicked({ groupPk })); + } else { + window?.inboxStore?.dispatch(groupInfoActions.destroyGroupDetails({ groupPk })); + } } else { - await removeLegacyGroupFromWrappers(groupId); + await removeLegacyGroupFromWrappers(groupPk); } // if we were kicked or sent our left message, we have nothing to do more with that group. // Just delete everything related to it, not trying to add update message or send a left message. - await this.removeGroupOrCommunityFromDBAndRedux(groupId); + if (!emptyGroupButKeepAsKicked) { + await this.removeGroupOrCommunityFromDBAndRedux(groupPk); + } if (!fromSyncMessage) { await UserSync.queueNewJobIfNeeded(); @@ -575,10 +595,6 @@ async function removeLegacyGroupFromWrappers(groupId: string) { await removeAllClosedGroupEncryptionKeyPairs(groupId); } -async function remove03GroupFromWrappers(groupPk: GroupPubkeyType) { - window?.inboxStore?.dispatch(groupInfoActions.destroyGroupDetails({ groupPk })); -} - async function removeCommunityFromWrappers(conversationId: string) { if (!conversationId || !OpenGroupUtils.isOpenGroupV2(conversationId)) { return; diff --git a/ts/session/crypto/DecryptedAttachmentsManager.ts b/ts/session/crypto/DecryptedAttachmentsManager.ts index 57b0ad57fb..97ba0c93b8 100644 --- a/ts/session/crypto/DecryptedAttachmentsManager.ts +++ b/ts/session/crypto/DecryptedAttachmentsManager.ts @@ -22,13 +22,13 @@ import { } from '../../types/MessageAttachment'; import { decryptAttachmentBufferRenderer } from '../../util/local_attachments_encrypter'; -export const urlToDecryptedBlobMap = new Map< +const urlToDecryptedBlobMap = new Map< string, { decrypted: string; lastAccessTimestamp: number; forceRetain: boolean } >(); -export const urlToDecryptingPromise = new Map>(); +const urlToDecryptingPromise = new Map>(); -export const cleanUpOldDecryptedMedias = () => { +const cleanUpOldDecryptedMedias = () => { const currentTimestamp = Date.now(); let countCleaned = 0; let countKept = 0; @@ -57,19 +57,19 @@ export const cleanUpOldDecryptedMedias = () => { ); }; -export const getLocalAttachmentPath = () => { +const getLocalAttachmentPath = () => { return getAttachmentPath(); }; -export const getAbsoluteAttachmentPath = (url: string) => { +const getAbsoluteAttachmentPath = (url: string) => { return msgGetAbsoluteAttachmentPath(url); }; -export const readFileContent = async (url: string) => { +const readFileContent = async (url: string) => { return fse.readFile(url); }; -export const getDecryptedMediaUrl = async ( +const getDecryptedMediaUrl = async ( url: string, contentType: string, isAvatar: boolean @@ -85,9 +85,9 @@ export const getDecryptedMediaUrl = async ( if ( (isAbsolute && - exports.getLocalAttachmentPath && - url.startsWith(exports.getLocalAttachmentPath())) || - fse.pathExistsSync(exports.getAbsoluteAttachmentPath(url)) + DecryptedAttachmentsManager.getLocalAttachmentPath && + url.startsWith(DecryptedAttachmentsManager.getLocalAttachmentPath())) || + fse.pathExistsSync(DecryptedAttachmentsManager.getAbsoluteAttachmentPath(url)) ) { // this is a file encoded by session on our current attachments path. // we consider the file is encrypted. @@ -160,14 +160,17 @@ export const getDecryptedMediaUrl = async ( * * Returns the already decrypted URL or null */ -export const getAlreadyDecryptedMediaUrl = (url: string): string | null => { +const getAlreadyDecryptedMediaUrl = (url: string): string | null => { if (!url) { return null; } if (url.startsWith('blob:')) { return url; } - if (exports.getLocalAttachmentPath() && url.startsWith(exports.getLocalAttachmentPath())) { + if ( + DecryptedAttachmentsManager.getLocalAttachmentPath() && + url.startsWith(DecryptedAttachmentsManager.getLocalAttachmentPath()) + ) { if (urlToDecryptedBlobMap.has(url)) { const existing = urlToDecryptedBlobMap.get(url); @@ -183,7 +186,7 @@ export const getAlreadyDecryptedMediaUrl = (url: string): string | null => { return null; }; -export const getDecryptedBlob = async (url: string, contentType: string): Promise => { +const getDecryptedBlob = async (url: string, contentType: string): Promise => { const decryptedUrl = await getDecryptedMediaUrl(url, contentType, false); return urlToBlob(decryptedUrl); }; @@ -191,7 +194,18 @@ export const getDecryptedBlob = async (url: string, contentType: string): Promis /** * This function should only be used for testing purpose */ -export const resetDecryptedUrlForTesting = () => { +const resetDecryptedUrlForTesting = () => { urlToDecryptedBlobMap.clear(); urlToDecryptingPromise.clear(); }; + +export const DecryptedAttachmentsManager = { + resetDecryptedUrlForTesting, + getDecryptedBlob, + getAlreadyDecryptedMediaUrl, + getLocalAttachmentPath, + getAbsoluteAttachmentPath, + cleanUpOldDecryptedMedias, + getDecryptedMediaUrl, + readFileContent, +}; diff --git a/ts/session/crypto/MessageEncrypter.ts b/ts/session/crypto/MessageEncrypter.ts index ceab29754b..98a53a4d6d 100644 --- a/ts/session/crypto/MessageEncrypter.ts +++ b/ts/session/crypto/MessageEncrypter.ts @@ -1,6 +1,6 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; -import { MessageEncrypter, concatUInt8Array, getSodiumRenderer } from '.'; +import { concatUInt8Array, getSodiumRenderer } from '.'; import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; import { assertUnreachable } from '../../types/sqlSharedTypes'; @@ -11,8 +11,6 @@ import { fromHexToArray } from '../utils/String'; import { SigningFailed } from '../utils/errors'; import { addMessagePadding } from './BufferPadding'; -export { concatUInt8Array, getSodiumRenderer }; - type EncryptResult = { envelopeType: SignalService.Envelope.Type; cipherText: Uint8Array; @@ -56,7 +54,7 @@ async function encryptForLegacyGroup(destination: PubKey, plainText: Uint8Array) * @returns The envelope type and the base64 encoded cipher text */ // eslint-disable-next-line consistent-return -export async function encrypt( +async function encrypt( destination: PubKey, plainTextBuffer: Uint8Array, encryptionType: SignalService.Envelope.Type @@ -89,7 +87,7 @@ export async function encrypt( } } -export async function encryptUsingSessionProtocol( +async function encryptUsingSessionProtocol( destinationX25519Pk: PubKey, plaintext: Uint8Array ): Promise { @@ -129,3 +127,8 @@ export async function encryptUsingSessionProtocol( } return ciphertext; } + +export const MessageEncrypter = { + encryptUsingSessionProtocol, + encrypt, +}; diff --git a/ts/session/crypto/index.ts b/ts/session/crypto/index.ts index 85513100c1..287d630dbe 100644 --- a/ts/session/crypto/index.ts +++ b/ts/session/crypto/index.ts @@ -1,14 +1,9 @@ import crypto from 'crypto'; import libsodiumwrappers from 'libsodium-wrappers-sumo'; -import * as DecryptedAttachmentsManager from './DecryptedAttachmentsManager'; -import * as MessageEncrypter from './MessageEncrypter'; - import { ECKeyPair } from '../../receiver/keypairs'; import { toHex } from '../utils/String'; -export { DecryptedAttachmentsManager, MessageEncrypter }; - export type LibSodiumWrappers = typeof libsodiumwrappers; export async function getSodiumRenderer(): Promise { diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index f2ab73d14f..efd3f63927 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -18,7 +18,7 @@ import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { ConvoHub } from '../conversations'; import { generateCurve25519KeyPairWithoutPrefix } from '../crypto'; -import { encryptUsingSessionProtocol } from '../crypto/MessageEncrypter'; +import { MessageEncrypter } from '../crypto/MessageEncrypter'; import { DisappearingMessages } from '../disappearing_messages'; import { DisappearAfterSendOnly, DisappearingMessageUpdate } from '../disappearing_messages/types'; import { ClosedGroupAddedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage'; @@ -521,7 +521,10 @@ async function buildEncryptionKeyPairWrappers( const wrappers = await Promise.all( targetMembers.map(async pubkey => { - const ciphertext = await encryptUsingSessionProtocol(PubKey.cast(pubkey), plaintext); + const ciphertext = await MessageEncrypter.encryptUsingSessionProtocol( + PubKey.cast(pubkey), + plaintext + ); return new SignalService.DataMessage.ClosedGroupControlMessage.KeyPairWrapper({ encryptedKeyPair: ciphertext, publicKey: fromHexToArray(pubkey), diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts deleted file mode 100644 index 9652a8d05a..0000000000 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { PubkeyType } from 'libsession_util_nodejs'; -import { SignalService } from '../../../../../../protobuf'; -import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; -import { Preconditions } from '../../../preconditions'; -import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMessage'; - -interface Params extends GroupUpdateMessageParams { - adminSignature: Uint8Array; // this is a signature of `"DELETE" || sessionId || timestamp` - memberSessionIds: Array; -} - -/** - * GroupUpdateDeleteMessage is sent to the group's swarm on the `revokedRetrievableGroupMessages` namespace - */ -export class GroupUpdateDeleteMessage extends GroupUpdateMessage { - public readonly namespace = SnodeNamespaces.ClosedGroupRevokedRetrievableMessages; - public readonly adminSignature: Params['adminSignature']; - public readonly memberSessionIds: Params['memberSessionIds']; - - constructor(params: Params) { - super(params); - - this.adminSignature = params.adminSignature; - this.memberSessionIds = params.memberSessionIds; - - Preconditions.checkUin8tArrayOrThrow({ - data: this.adminSignature, - expectedLength: 64, - varName: 'adminSignature', - context: this.constructor.toString(), - }); - } - - public dataProto(): SignalService.DataMessage { - const deleteMessage = new SignalService.GroupUpdateDeleteMessage({ - adminSignature: this.adminSignature, - memberSessionIds: this.memberSessionIds, - }); - - return new SignalService.DataMessage({ groupUpdateMessage: { deleteMessage } }); - } - - public isForGroupSwarm(): boolean { - return false; - } - public isFor1o1Swarm(): boolean { - return true; - } -} diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts index b41fec3638..84782223da 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts @@ -8,7 +8,7 @@ interface Params extends GroupUpdateMessageParams { } /** - * GroupUpdateDeleteMessage is sent as a 1o1 message to the recipient, not through the group's swarm. + * GroupUpdatePromoteMessage is sent as a 1o1 message to the recipient, not through the group's swarm. */ export class GroupUpdatePromoteMessage extends GroupUpdateMessage { public readonly groupIdentitySeed: Params['groupIdentitySeed']; diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts index 300933e751..ccef16b06b 100644 --- a/ts/session/onions/onionSend.ts +++ b/ts/session/onions/onionSend.ts @@ -167,6 +167,7 @@ const sendViaOnionV4ToNonSnodeWithRetries = async ( abortSignal, useV4: true, throwErrors, + allow401s: false, }); if (window.sessionFeatureFlags?.debug.debugNonSnodeRequests) { diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 8df9411a26..d16f859e1f 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -38,7 +38,6 @@ import { GroupUpdateDeleteMemberContentMessage } from '../messages/outgoing/cont import { GroupUpdateInfoChangeMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { GroupUpdateMemberChangeMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; import { GroupUpdateMemberLeftMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage'; -import { GroupUpdateDeleteMessage } from '../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage'; import { GroupUpdateInviteMessage } from '../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateInviteMessage'; import { GroupUpdatePromoteMessage } from '../messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; @@ -238,8 +237,7 @@ export class MessageQueue { | GroupUpdateMemberChangeMessage | GroupUpdateInfoChangeMessage | GroupUpdateDeleteMemberContentMessage - | GroupUpdateMemberLeftMessage - | GroupUpdateDeleteMessage; + | GroupUpdateMemberLeftMessage; }) { if (!message.destination || !PubKey.is03Pubkey(message.destination)) { throw new Error('Invalid group message passed in sendToGroupV2NonDurably.'); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 731c9742b4..aa2efd586d 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -52,7 +52,7 @@ import { SnodePool } from '../apis/snode_api/snodePool'; import { WithMessagesHashes, WithRevokeSubRequest } from '../apis/snode_api/types'; import { TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; -import { MessageEncrypter } from '../crypto'; +import { MessageEncrypter } from '../crypto/MessageEncrypter'; import { addMessagePadding } from '../crypto/BufferPadding'; import { ContentMessage } from '../messages/outgoing'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; @@ -232,7 +232,8 @@ async function sendSingleMessage({ subRequests, targetNode, 6000, - destination + destination, + false ); await handleBatchResultWithSubRequests({ batchResult, subRequests, destination }); @@ -384,6 +385,7 @@ async function sendMessagesDataToSnode( targetNode, 6000, asssociatedWith, + false, method ); diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index 3128c4148c..e04c95a16d 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -31,6 +31,8 @@ export enum KeyPrefixType { export class PubKey { public static readonly PUBKEY_LEN = 66; public static readonly PUBKEY_LEN_NO_PREFIX = PubKey.PUBKEY_LEN - 2; + public static readonly PUBKEY_BYTE_COUNT = PubKey.PUBKEY_LEN / 2; + public static readonly PUBKEY_BYTE_COUNT_NO_PREFIX = PubKey.PUBKEY_BYTE_COUNT - 1; public static readonly HEX = '[0-9a-fA-F]'; // This is a temporary fix to allow groupPubkeys created from mobile to be handled correctly @@ -41,7 +43,7 @@ export class PubKey { public static readonly PREFIX_GROUP_TEXTSECURE = '__textsecure_group__!'; // prettier-ignore private static readonly regex: RegExp = new RegExp( - `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(${KeyPrefixType.standard}|${KeyPrefixType.blinded15}|${KeyPrefixType.blinded25}|${KeyPrefixType.unblinded}|${KeyPrefixType.groupV2})?(${PubKey.HEX}{64}|${PubKey.HEX}{32})$` + `^(${PubKey.PREFIX_GROUP_TEXTSECURE})?(${KeyPrefixType.standard}|${KeyPrefixType.blinded15}|${KeyPrefixType.blinded25}|${KeyPrefixType.unblinded}|${KeyPrefixType.groupV2})?(${PubKey.HEX}{64}|${PubKey.HEX}{${PubKey.PUBKEY_BYTE_COUNT_NO_PREFIX}})$` ); /** * If you want to update this regex. Be sure that those are matches ; @@ -140,7 +142,7 @@ export class PubKey { const len = pubkey.length; // we do not support blinded prefix, see Note above - const isProdOrDevValid = len === 33 * 2 && /^05/.test(pubkey); // prod pubkey can have only 66 chars and the 05 only. + const isProdOrDevValid = len === PubKey.PUBKEY_LEN && /^05/.test(pubkey); // prod pubkey can have only 66 chars and the 05 only. // dev pubkey on testnet are now 66 chars too with the prefix, so every sessionID needs 66 chars and the prefix to be valid if (!isProdOrDevValid) { diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts new file mode 100644 index 0000000000..2b17bb54cd --- /dev/null +++ b/ts/session/types/with.ts @@ -0,0 +1,5 @@ +import { LibSodiumWrappers } from '../crypto'; + +export type WithLibSodiuMWrappers = { + sodium: LibSodiumWrappers; +}; diff --git a/ts/session/utils/errors.ts b/ts/session/utils/errors.ts index f2bb10fc2e..009637a48f 100644 --- a/ts/session/utils/errors.ts +++ b/ts/session/utils/errors.ts @@ -78,3 +78,5 @@ export class SigningFailed extends BaseError {} export class InvalidSigningType extends BaseError {} export class GroupV2SigningFailed extends SigningFailed {} export class PreConditionFailed extends BaseError {} +export class DecryptionFailed extends BaseError {} +export class InvalidMessage extends BaseError {} diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts index 5a13dafd7f..cc9879a9f5 100644 --- a/ts/session/utils/job_runners/JobRunner.ts +++ b/ts/session/utils/job_runners/JobRunner.ts @@ -7,6 +7,7 @@ import { AvatarDownloadPersistedData, FetchMsgExpirySwarmPersistedData, GroupInvitePersistedData, + GroupPendingRemovalsPersistedData, GroupPromotePersistedData, GroupSyncPersistedData, PersistedJob, @@ -373,6 +374,11 @@ const groupPromoteJobRunner = new PersistedJobRunner( null ); +const groupPendingRemovalJobRunner = new PersistedJobRunner( + 'GroupPendingRemovalJob', + null +); + const updateMsgExpiryRunner = new PersistedJobRunner( 'UpdateMsgExpirySwarmJob', null @@ -391,4 +397,5 @@ export const runners = { avatarDownloadRunner, groupInviteJobRunner, groupPromoteJobRunner, + groupPendingRemovalJobRunner, }; diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts index 441b956141..d805578842 100644 --- a/ts/session/utils/job_runners/PersistedJob.ts +++ b/ts/session/utils/job_runners/PersistedJob.ts @@ -7,6 +7,7 @@ export type PersistedJobType = | 'AvatarDownloadJobType' | 'GroupInviteJobType' | 'GroupPromoteJobType' + | 'GroupPendingRemovalJobType' | 'FetchMsgExpirySwarmJobType' | 'UpdateMsgExpirySwarmJobType' | 'FakeSleepForJobType' @@ -49,6 +50,11 @@ export interface GroupPromotePersistedData extends PersistedJobData { member: PubkeyType; } +export interface GroupPendingRemovalsPersistedData extends PersistedJobData { + jobType: 'GroupPendingRemovalJobType'; + groupPk: GroupPubkeyType; +} + export interface UserSyncPersistedData extends PersistedJobData { jobType: 'UserSyncJobType'; } @@ -76,7 +82,8 @@ export type TypeOfPersistedData = | FakeSleepForMultiJobData | GroupSyncPersistedData | GroupInvitePersistedData - | GroupPromotePersistedData; + | GroupPromotePersistedData + | GroupPendingRemovalsPersistedData; export type AddJobCheckReturn = 'skipAddSameJobPresent' | null; diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts new file mode 100644 index 0000000000..75e70bce2d --- /dev/null +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -0,0 +1,236 @@ +/* eslint-disable no-await-in-loop */ +import { PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; +import { isEmpty, isNumber } from 'lodash'; +import { v4 } from 'uuid'; +import { StringUtils } from '../..'; +import { Data } from '../../../../data/data'; +import { + deleteMessagesFromSwarmOnly, + unsendMessagesForEveryoneGroupV2, +} from '../../../../interactions/conversations/unsendingInteractions'; +import { + MetaGroupWrapperActions, + MultiEncryptWrapperActions, + UserGroupsWrapperActions, +} from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { StoreGroupConfigOrMessageSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; +import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; +import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; +import { RevokeChanges, SnodeAPIRevoke } from '../../../apis/snode_api/revokeSubaccount'; +import { WithSecretKey } from '../../../apis/snode_api/types'; +import { TTL_DEFAULT } from '../../../constants'; +import { concatUInt8Array } from '../../../crypto'; +import { MessageSender } from '../../../sending'; +import { fromHexToArray } from '../../String'; +import { runners } from '../JobRunner'; +import { + AddJobCheckReturn, + GroupPendingRemovalsPersistedData, + PersistedJob, + RunJobResult, +} from '../PersistedJob'; +import { GroupSync } from './GroupSyncJob'; + +export type WithAddWithoutHistoryMembers = { withoutHistory: Array }; +export type WithAddWithHistoryMembers = { withHistory: Array }; +export type WithRemoveMembers = { removed: Array }; + +const defaultMsBetweenRetries = 10000; +const defaultMaxAttemps = 1; + +type JobExtraArgs = Pick; + +async function addJob({ groupPk }: JobExtraArgs) { + const pendingRemovalJob = new GroupPendingRemovalsJob({ + groupPk, + nextAttemptTimestamp: Date.now(), + }); + window.log.debug(`addGroupPendingRemovalJob: adding group pending removal for ${groupPk} `); + await runners.groupPendingRemovalJobRunner.addJob(pendingRemovalJob); +} + +async function getPendingRevokeParams({ + withoutHistory, + withHistory, + removed, + groupPk, + secretKey, +}: WithGroupPubkey & + WithSecretKey & + WithAddWithoutHistoryMembers & + WithAddWithHistoryMembers & + WithRemoveMembers) { + const revokeChanges: RevokeChanges = []; + const unrevokeChanges: RevokeChanges = []; + + for (let index = 0; index < withoutHistory.length; index++) { + const m = withoutHistory[index]; + const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); + unrevokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); + } + for (let index = 0; index < withHistory.length; index++) { + const m = withHistory[index]; + const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); + unrevokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); + } + for (let index = 0; index < removed.length; index++) { + const m = removed[index]; + const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); + revokeChanges.push({ action: 'revoke_subaccount', tokenToRevokeHex: token }); + } + + return SnodeAPIRevoke.getRevokeSubaccountParams(groupPk, secretKey, { + revokeChanges, + unrevokeChanges, + }); +} + +class GroupPendingRemovalsJob extends PersistedJob { + constructor({ + groupPk, + nextAttemptTimestamp, + maxAttempts, + currentRetry, + identifier, + }: Pick & + Partial< + Pick< + GroupPendingRemovalsPersistedData, + | 'nextAttemptTimestamp' + | 'identifier' + | 'maxAttempts' + | 'delayBetweenRetries' + | 'currentRetry' + > + >) { + super({ + jobType: 'GroupPendingRemovalJobType', + identifier: identifier || v4(), + groupPk, + delayBetweenRetries: defaultMsBetweenRetries, + maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttemps, + nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries, + currentRetry: isNumber(currentRetry) ? currentRetry : 0, + }); + } + + public async run() { + const { groupPk, jobType, identifier } = this.persistedData; + + window.log.info(`running job ${jobType} with groupPk:"${groupPk}" id:"${identifier}" `); + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (!group || !group.secretKey || isEmpty(group.secretKey)) { + window.log.warn( + `GroupPendingRemovalsJob: Did not find group in wrapper or no valid info in wrapper` + ); + return RunJobResult.PermanentFailure; + } + + try { + const pendingRemovals = await MetaGroupWrapperActions.memberGetAllPendingRemovals(groupPk); + + if (!pendingRemovals.length) { + return RunJobResult.Success; + } + const sessionIdsHex = pendingRemovals.map(m => m.pubkeyHex); + const sessionIds = sessionIdsHex.map(m => fromHexToArray(m).slice(1)); + const currentGen = await MetaGroupWrapperActions.keyGetCurrentGen(groupPk); + const dataToEncrypt = sessionIds.map(s => { + return concatUInt8Array(s, StringUtils.stringToUint8Array(`${currentGen}`)); + }); + + debugger; + const multiEncryptedMessage = await MultiEncryptWrapperActions.multiEncrypt({ + messages: dataToEncrypt, + recipients: sessionIds, + ed25519SecretKey: group.secretKey, + domain: 'SessionGroupKickedMessage', + }); + // first, get revoke requests that need to be pushed for leaving member + const revokeUnrevokeParams = await getPendingRevokeParams({ + groupPk, + withHistory: [], + withoutHistory: [], + removed: sessionIdsHex, + secretKey: group.secretKey, + }); + + const multiEncryptRequest = new StoreGroupConfigOrMessageSubRequest({ + encryptedData: multiEncryptedMessage, + groupPk, + dbMessageIdentifier: null, + namespace: SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, + ttlMs: TTL_DEFAULT.CONTENT_MESSAGE, + }); + + const result = await MessageSender.sendEncryptedDataToSnode({ + storeRequests: [multiEncryptRequest], + destination: groupPk, + messagesHashesToDelete: null, + ...revokeUnrevokeParams, + }); + console.warn('result', result); + if (result?.length === 2 && result[0].code === 200 && result[1].code === 200) { + // both requests success, remove the members from the group member entirely and sync + await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, sessionIdsHex); + await GroupSync.queueNewJobIfNeeded(groupPk); + const deleteMessagesOf = pendingRemovals + .filter(m => m.removedStatus === 2) + .map(m => m.pubkeyHex); + if (deleteMessagesOf.length) { + const msgHashesToDeleteOnGroupSwarm = + await Data.deleteAllMessageFromSendersInConversation({ + groupPk, + toRemove: sessionIdsHex, + signatureTimestamp: GetNetworkTime.now(), + }); + console.warn('deleteMessagesOf', deleteMessagesOf); + console.warn('msgHashesToDeleteOnGroupSwarm', msgHashesToDeleteOnGroupSwarm); + await unsendMessagesForEveryoneGroupV2({ + allMessagesFrom: deleteMessagesOf, + groupPk, + msgsToDelete: [], + }); + if (msgHashesToDeleteOnGroupSwarm.length) { + await deleteMessagesFromSwarmOnly(msgHashesToDeleteOnGroupSwarm, groupPk); + } + } + } + } catch (e) { + window.log.warn('PendingRemovalJob failed with', e.message); + return RunJobResult.RetryJobIfPossible; + } + // return true so this job is marked as a success and we don't need to retry it + return RunJobResult.Success; + } + + public serializeJob() { + return super.serializeBase(); + } + + public nonRunningJobsToRemove(_jobs: Array) { + return []; + } + + public addJobCheck(jobs: Array): AddJobCheckReturn { + // avoid adding the same job if the exact same one is already planned + const hasSameJob = jobs.some(j => { + return j.groupPk === this.persistedData.groupPk; + }); + + if (hasSameJob) { + return 'skipAddSameJobPresent'; + } + + return null; + } + + public getJobTimeoutMs(): number { + return 15000; + } +} + +export const GroupPendingRemovals = { + addJob, + getPendingRevokeParams, +}; diff --git a/ts/session/utils/job_runners/jobs/JobRunnerType.ts b/ts/session/utils/job_runners/jobs/JobRunnerType.ts index 9bf70bcace..7179856eac 100644 --- a/ts/session/utils/job_runners/jobs/JobRunnerType.ts +++ b/ts/session/utils/job_runners/jobs/JobRunnerType.ts @@ -7,4 +7,5 @@ export type JobRunnerType = | 'FakeSleepForMultiJob' | 'AvatarDownloadJob' | 'GroupInviteJob' - | 'GroupPromoteJob'; + | 'GroupPromoteJob' + | 'GroupPendingRemovalJob'; diff --git a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts index a903e2eec7..8a562ca49d 100644 --- a/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts +++ b/ts/session/utils/libsession/libsession_utils_convo_info_volatile.ts @@ -283,7 +283,6 @@ async function removeGroupFromWrapper(groupPk: GroupPubkeyType) { } catch (e) { window.log.warn('removeGroupFromWrapper failed with ', e.message); } - window.log.warn('removeGroupFromWrapper TODO'); mappedGroupWrapperValues.delete(groupPk); } diff --git a/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts b/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts new file mode 100644 index 0000000000..efdf6b810c --- /dev/null +++ b/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts @@ -0,0 +1,42 @@ +import { EncryptionDomain } from 'libsession_util_nodejs'; +import { MultiEncryptWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; + +const allKnownEncryptionDomains: Array = ['SessionGroupKickedMessage']; + +/** + * Try to decrypt the content with any type of encryption domains we know. + * Does not throw, will return null if we couldn't decrypt it successfuly. + */ +async function multiDecryptAnyEncryptionDomain({ + encoded, + senderEd25519Pubkey, + userEd25519SecretKey, +}: { + encoded: Uint8Array; + senderEd25519Pubkey: Uint8Array; + userEd25519SecretKey: Uint8Array; +}) { + for (let index = 0; index < allKnownEncryptionDomains.length; index++) { + const domain = allKnownEncryptionDomains[index]; + try { + // eslint-disable-next-line no-await-in-loop + const decrypted = await MultiEncryptWrapperActions.multiDecryptEd25519({ + encoded, + senderEd25519Pubkey, + userEd25519SecretKey, + domain, + }); + return { decrypted, domain }; + } catch (e) { + window.log.info( + `multiDecryptAnyEncryptionDomain: failed to decrypt message with encryption domain: ${domain}` + ); + } + } + window.log.info(`multiDecryptAnyEncryptionDomain: failed to decrypt message entirely`); + return null; +} + +export const MultiEncryptUtils = { + multiDecryptAnyEncryptionDomain, +}; diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index f51a764f4e..eac5d2a73b 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -10,31 +10,31 @@ import { WithGroupPubkey, WithPubkey, } from 'libsession_util_nodejs'; -import { base64_variants, from_base64 } from 'libsodium-wrappers-sumo'; import { intersection, isEmpty, uniq } from 'lodash'; import { ConfigDumpData } from '../../data/configDump/configDump'; import { ConversationModel } from '../../models/conversation'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; -import { getMessageQueue } from '../../session'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; -import { RevokeChanges, SnodeAPIRevoke } from '../../session/apis/snode_api/revokeSubaccount'; -import { SnodeGroupSignature } from '../../session/apis/snode_api/signature/groupSignature'; -import { WithSecretKey } from '../../session/apis/snode_api/types'; import { ConvoHub } from '../../session/conversations'; import { getSodiumRenderer } from '../../session/crypto'; import { DisappearingMessages } from '../../session/disappearing_messages'; import { ClosedGroup } from '../../session/group/closed-group'; import { GroupUpdateInfoChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { GroupUpdateMemberChangeMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; -import { GroupUpdateDeleteMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdateDeleteMessage'; import { ed25519Str } from '../../session/onions/onionPath'; import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { PreConditionFailed } from '../../session/utils/errors'; import { GroupInvite } from '../../session/utils/job_runners/jobs/GroupInviteJob'; +import { + GroupPendingRemovals, + WithAddWithHistoryMembers, + WithAddWithoutHistoryMembers, + WithRemoveMembers, +} from '../../session/utils/job_runners/jobs/GroupPendingRemovalsJob'; import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; @@ -54,10 +54,6 @@ import { StateType } from '../reducer'; import { openConversationWithMessages } from './conversations'; import { resetLeftOverlayMode } from './section'; -type WithAddWithoutHistoryMembers = { withoutHistory: Array }; -type WithAddWithHistoryMembers = { withHistory: Array }; -type WithRemoveMembers = { removed: Array }; - type WithFromMemberLeftMessage = { fromMemberLeftMessage: boolean }; // there are some changes we want to skip when doing changes triggered from a memberLeft message. export type GroupState = { infos: Record; @@ -254,6 +250,7 @@ const initNewGroupInWrapper = createAsyncThunk( await ConvoHub.use().deleteClosedGroup(groupPk, { fromSyncMessage: false, sendLeaveMessage: false, + emptyGroupButKeepAsKicked: false, }); } throw e; @@ -302,13 +299,21 @@ const handleUserGroupUpdate = createAsyncThunk( const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); - await convo.setIsApproved(true, false); + // a group is approved when its invitePending is false, and false otherwise + await convo.setIsApproved(!userGroup.invitePending, false); await convo.setPriorityFromWrapper(userGroup.priority, false); + + if (!convo.isActive()) { + convo.set({ + active_at: Date.now(), + }); + } + convo.set({ - active_at: Date.now(), displayNameInProfile: userGroup.name || undefined, }); + await convo.commit(); return { @@ -437,6 +442,7 @@ const destroyGroupDetails = createAsyncThunk( // this deletes the secretKey if we had it. If we need it for something, it has to be done before this call. await UserGroupsWrapperActions.eraseGroup(groupPk); + await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupPk); await ConfigDumpData.deleteDumpFor(groupPk); @@ -446,6 +452,32 @@ const destroyGroupDetails = createAsyncThunk( } ); +const emptyGroupButKeepAsKicked = createAsyncThunk( + 'group/emptyGroupButKeepAsKicked', + async ({ groupPk }: { groupPk: GroupPubkeyType }) => { + window.log.info(`emptyGroupButKeepAsKicked for ${ed25519Str(groupPk)}`); + getSwarmPollingInstance().removePubkey(groupPk, 'emptyGroupButKeepAsKicked'); + + // this deletes the secretKey if we had it. If we need it for something, it has to be done before this call. + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (group) { + group.authData = null; + group.secretKey = null; + group.disappearingTimerSeconds = undefined; + group.kicked = true; + + await UserGroupsWrapperActions.setGroup(group); + } + await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupPk); + // release the memory (and the current meta-dumps in memory for that group) + await MetaGroupWrapperActions.free(groupPk); + // this deletes the dumps from the metagroup state only, not the details in the UserGroups wrapper itself. + await ConfigDumpData.deleteDumpFor(groupPk); + + return { groupPk }; + } +); + function validateMemberAddChange({ groupPk, withHistory: addMembersWithHistory, @@ -554,93 +586,6 @@ async function handleWithoutHistoryMembers({ } } -/** - * Send the GroupUpdateDeleteMessage encrypted with an encryption keypair that the removed members should have. - * Then, send that message to the namespace ClosedGroupRevokedRetrievableMessages. - * If that worked, remove the member from the metagroup wrapper, and rekey it. - * Any new messages encrypted with that wrapper won't be readable by the removed members, so we **have** to send it before we rekey(). - * - */ -async function handleRemoveMembersAndRekey({ - groupPk, - removed, - secretKey, - fromMemberLeftMessage, -}: WithGroupPubkey & WithRemoveMembers & WithFromMemberLeftMessage & { secretKey: Uint8Array }) { - if (!removed.length) { - return; - } - const createAtNetworkTimestamp = GetNetworkTime.now(); - const sortedRemoved = removed.sort(); - - // TODO implement the GroupUpdateDeleteMessage multi_encrypt_simple on chunk3 debugger - if (!fromMemberLeftMessage && false) { - // We need to sign that message with the current admin key - const adminSignature = await SnodeGroupSignature.signDataWithAdminSecret( - `DELETE${createAtNetworkTimestamp}${sortedRemoved.join('')}`, - { secretKey } - ); - - // We need to encrypt this message with the the current encryptionKey, before we call rekey() - const removedMemberMessage = new GroupUpdateDeleteMessage({ - groupPk, - createAtNetworkTimestamp, - adminSignature: from_base64(adminSignature.signature, base64_variants.ORIGINAL), - expirationType: null, // that message is not stored in DB and so don't have to disappear at all. - expireTimer: null, - memberSessionIds: sortedRemoved, - }); - - const result = await getMessageQueue().sendToGroupV2NonDurably({ - message: removedMemberMessage, - }); - if (!result) { - throw new Error( - 'Failed to send GroupUpdateDeleteMessage to ClosedGroupRevokedRetrievableMessages namespace' - ); - } - } - // Note: we need to rekey only once the GroupUpdateDeleteMessage is sent because - // otherwise removed members won't be able to decrypt it (as rekey is called after erase) - await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, sortedRemoved); -} - -async function getPendingRevokeParams({ - withoutHistory, - withHistory, - removed, - groupPk, - secretKey, -}: WithGroupPubkey & - WithSecretKey & - WithAddWithoutHistoryMembers & - WithAddWithHistoryMembers & - WithRemoveMembers) { - const revokeChanges: RevokeChanges = []; - const unrevokeChanges: RevokeChanges = []; - - for (let index = 0; index < withoutHistory.length; index++) { - const m = withoutHistory[index]; - const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); - unrevokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); - } - for (let index = 0; index < withHistory.length; index++) { - const m = withHistory[index]; - const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); - unrevokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); - } - for (let index = 0; index < removed.length; index++) { - const m = removed[index]; - const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); - revokeChanges.push({ action: 'revoke_subaccount', tokenToRevokeHex: token }); - } - - return SnodeAPIRevoke.getRevokeSubaccountParams(groupPk, secretKey, { - revokeChanges, - unrevokeChanges, - }); -} - function getConvoExpireDetailsForMsg(convo: ConversationModel) { const expireTimer = convo.getExpireTimer(); const expireDetails = { @@ -778,7 +723,7 @@ async function handleMemberAddedFromUI({ groupPk, }); // first, get the unrevoke requests for people who are added - const revokeUnrevokeParams = await getPendingRevokeParams({ + const revokeUnrevokeParams = await GroupPendingRemovals.getPendingRevokeParams({ groupPk, withHistory, withoutHistory, @@ -883,9 +828,11 @@ async function handleMemberRemovedFromUI({ groupPk, removeMembers, fromMemberLeftMessage, + alsoRemoveMessages, }: WithFromMemberLeftMessage & WithGroupPubkey & { removeMembers: Array; + alsoRemoveMessages: boolean; }) { const group = await UserGroupsWrapperActions.getGroup(groupPk); if (!group || !group.secretKey || isEmpty(group.secretKey)) { @@ -902,33 +849,25 @@ async function handleMemberRemovedFromUI({ groupPk, removed: removeMembers, }); - // first, get revoke requests that need to be pushed for leaving member - const revokeUnrevokeParams = await getPendingRevokeParams({ - groupPk, - withHistory: [], - withoutHistory: [], - removed, - secretKey: group.secretKey, - }); + + // Note: We don't revoke members from here, instead we schedule a GroupPendingRemovals which will deal with the revokes of all of them together // Send the groupUpdateDeleteMessage that can still be decrypted by those removed members to namespace ClosedGroupRevokedRetrievableMessages. (not when handling a MEMBER_LEFT message) // Then, rekey the wrapper, but don't push the changes yet, we want to batch all of the requests to be made together in the `pushChangesToGroupSwarmIfNeeded` below. - await handleRemoveMembersAndRekey({ - groupPk, - removed, - secretKey: group.secretKey, - fromMemberLeftMessage, - }); + if (removed.length && !fromMemberLeftMessage) { + await MetaGroupWrapperActions.membersMarkPendingRemoval(groupPk, removed, alsoRemoveMessages); + } + await GroupPendingRemovals.addJob({ groupPk }); const createAtNetworkTimestamp = GetNetworkTime.now(); - await LibSessionUtil.saveDumpsToDb(groupPk); // revoked pubkeys, update messages, and libsession groups config in a single batchcall const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementKeys: [], - ...revokeUnrevokeParams, + revokeSubRequest: null, + unrevokeSubRequest: null, }); if (sequenceResult !== RunJobResult.Success) { throw new Error( @@ -1073,6 +1012,7 @@ const currentDeviceGroupMembersChange = createAsyncThunk( addMembersWithHistory: Array; addMembersWithoutHistory: Array; removeMembers: Array; + alsoRemoveMessages: boolean; }, payloadCreator ): Promise => { @@ -1087,6 +1027,7 @@ const currentDeviceGroupMembersChange = createAsyncThunk( groupPk, removeMembers: args.removeMembers, fromMemberLeftMessage: false, + alsoRemoveMessages: args.alsoRemoveMessages, }); await handleMemberAddedFromUI({ @@ -1132,6 +1073,7 @@ const handleMemberLeftMessage = createAsyncThunk( groupPk, removeMembers: [memberLeft], fromMemberLeftMessage: true, + alsoRemoveMessages: false, }); } @@ -1382,6 +1324,14 @@ const metaGroupSlice = createSlice({ builder.addCase(destroyGroupDetails.rejected, (_state, action) => { window.log.error('a destroyGroupDetails was rejected', action.error); }); + builder.addCase(emptyGroupButKeepAsKicked.fulfilled, (state, action) => { + const { groupPk } = action.payload; + window.log.info(`markedAsKicked 03 from metagroup wrapper ${ed25519Str(groupPk)}`); + deleteGroupPkEntriesFromState(state, groupPk); + }); + builder.addCase(emptyGroupButKeepAsKicked.rejected, (_state, action) => { + window.log.error('a emptyGroupButKeepAsKicked was rejected', action.error); + }); builder.addCase(handleUserGroupUpdate.fulfilled, (state, action) => { const { infos, members, groupPk } = action.payload; if (infos && members) { @@ -1488,6 +1438,7 @@ export const groupInfoActions = { initNewGroupInWrapper, loadMetaDumpsFromDB, destroyGroupDetails, + emptyGroupButKeepAsKicked, refreshGroupDetailsFromWrapper, handleUserGroupUpdate, currentDeviceGroupMembersChange, diff --git a/ts/test/session/unit/crypto/MessageEncrypter_test.ts b/ts/test/session/unit/crypto/MessageEncrypter_test.ts index 272fa5881e..6ebd17608a 100644 --- a/ts/test/session/unit/crypto/MessageEncrypter_test.ts +++ b/ts/test/session/unit/crypto/MessageEncrypter_test.ts @@ -5,7 +5,7 @@ import * as crypto from 'crypto'; import Sinon, * as sinon from 'sinon'; import { SignalService } from '../../../../protobuf'; -import { concatUInt8Array, getSodiumRenderer, MessageEncrypter } from '../../../../session/crypto'; +import { concatUInt8Array, getSodiumRenderer } from '../../../../session/crypto'; import { TestUtils } from '../../../test-utils'; import { StringUtils, UserUtils } from '../../../../session/utils'; @@ -14,6 +14,7 @@ import { SessionKeyPair } from '../../../../receiver/keypairs'; import { addMessagePadding } from '../../../../session/crypto/BufferPadding'; import { PubKey } from '../../../../session/types'; import { fromHex, toHex } from '../../../../session/utils/String'; +import { MessageEncrypter } from '../../../../session/crypto/MessageEncrypter'; export const TEST_identityKeyPair: SessionKeyPair = { pubKey: new Uint8Array([ diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts index 45af372f47..dbfa8a7bea 100644 --- a/ts/test/session/unit/crypto/SnodeSignatures_test.ts +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -1,5 +1,6 @@ import { expect, use } from 'chai'; import chaiAsPromised from 'chai-as-promised'; +import { UserGroupsGet } from 'libsession_util_nodejs'; import Sinon from 'sinon'; import { HexString } from '../../../../node/hexStrings'; import { getSodiumNode } from '../../../../node/sodiumNode'; @@ -14,23 +15,42 @@ import { fromBase64ToArray, fromHexToArray } from '../../../../session/utils/Str use(chaiAsPromised); -const validGroupPk = '03eef710fcaaa73fd50c4311333f5c496e0fdbbe9e8a70fdfa95e7ec62d5032f5c'; +const validGroupPk = '030442ca9b758eefe0c42370696688b28f48f44bf44941fae4f3d5b41f6358c41d'; const privKeyUint = concatUInt8Array( - fromHexToArray('cd8488c39bf9972739046d627e7796b2bc0e38e2fa99fc4edd59205c28f2cdb1'), + fromHexToArray('4db38882cf0a0fffcbb971eb2b1420c92bc836c6946cd97bdc0c2787b806549d'), fromHexToArray(validGroupPk.slice(2)) ); // len 64 const userEd25519Keypair = { - pubKey: '37e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309', + pubKey: 'bdd5eaf00eaf965ca63b7e8b119d8122d4647ffd5bb58daa1f78dfc54dd53989', privKey: - 'be1d11154ff9b6de77873f0b6b0bcc460000000000000000000000000000000037e1631b002de498caf7c5c1712718bde7f257c6dadeed0c21abf5e939e6c309', + 'b0e12943e22e8f71774c2c4205fed59800000000000000000000000000000000bdd5eaf00eaf965ca63b7e8b119d8122d4647ffd5bb58daa1f78dfc54dd53989', }; +// Keep the line below as we might need it for tests, and it is linked to the values above +// const _currentUserSubAccountAuthData = fromHexToArray( +// eslint-disable-next-line max-len +// '03030000cdbc07f46c4b322767675240d5945e902c75f0d3c46f36735b93773577d69e037c5d75d378a8e7183f9012b39bc27de7f81afe9c7000aa924fbcad8a7e6f12fec809adae65a1c427feb9c4b1ad453df403079f62203aa0563533b2b114f31b07' +// ); + +function getEmptyUserGroup() { + return { + secretKey: null, + authData: null, + invitePending: false, + joinedAtSeconds: 1234, + kicked: false, + name: '1243', + priority: 0, + pubkeyHex: validGroupPk, + } as UserGroupsGet; +} + const hardcodedTimestamp = 1234; async function verifySig(ret: WithSignature & { pubkey: string }, verificationData: string) { const without03 = - ret.pubkey.startsWith('03') || ret.pubkey.startsWith('05') ? ret.pubkey.slice(2) : ret.pubkey; // + ret.pubkey.startsWith('03') || ret.pubkey.startsWith('05') ? ret.pubkey.slice(2) : ret.pubkey; const pk = HexString.fromHexString(without03); const sodium = await getSodiumNode(); const verified = sodium.crypto_sign_verify_detached( @@ -161,98 +181,60 @@ describe('SnodeSignature', () => { }); }); - // describe('getSnodeGroupSubAccountSignatureParams', () => { - // beforeEach(() => { - // Sinon.stub(GetNetworkTime, 'now').returns(hardcodedTimestamp); - // }); - - // describe('retrieve', () => { - // it('retrieve namespace ClosedGroupInfo', async () => { - // const ret = await SnodeSignature.getSnodeGroupSignatureParams({ - // method: 'retrieve', - // namespace: SnodeNamespaces.ClosedGroupInfo, - // groupPk: validGroupPk, - // groupIdentityPrivKey: privKeyUint, - // }); - // expect(ret.pubkey).to.be.eq(validGroupPk); - - // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); - // const verificationData = `retrieve${SnodeNamespaces.ClosedGroupInfo}${hardcodedTimestamp}`; - // await verifySig(ret, verificationData); - // }); - - // it('retrieve namespace ClosedGroupKeys', async () => { - // const ret = await SnodeSignature.getSnodeGroupSignatureParams({ - // method: 'retrieve', - // namespace: SnodeNamespaces.ClosedGroupKeys, - // groupIdentityPrivKey: privKeyUint, - // groupPk: validGroupPk, - // }); - // expect(ret.pubkey).to.be.eq(validGroupPk); - - // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); - // const verificationData = `retrieve${SnodeNamespaces.ClosedGroupKeys}${hardcodedTimestamp}`; - - // await verifySig(ret, verificationData); - // }); - - // it('retrieve namespace ClosedGroupMessages', async () => { - // const ret = await SnodeSignature.getSnodeGroupSignatureParams({ - // method: 'retrieve', - // namespace: SnodeNamespaces.ClosedGroupMessages, - // groupIdentityPrivKey: privKeyUint, - // groupPk: validGroupPk, - // }); - // expect(ret.pubkey).to.be.eq(validGroupPk); - - // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); - // const verificationData = `retrieve${SnodeNamespaces.ClosedGroupMessages}${hardcodedTimestamp}`; - // await verifySig(ret, verificationData); - // }); - // }); - - // describe('store', () => { - // it('store namespace ClosedGroupInfo', async () => { - // const ret = await SnodeSignature.getSnodeGroupSignatureParams({ - // method: 'store', - // namespace: SnodeNamespaces.ClosedGroupInfo, - // groupIdentityPrivKey: privKeyUint, - // groupPk: validGroupPk, - // }); - // expect(ret.pubkey).to.be.eq(validGroupPk); - // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); - - // const verificationData = `store${SnodeNamespaces.ClosedGroupInfo}${hardcodedTimestamp}`; - // await verifySig(ret, verificationData); - // }); - - // it('store namespace ClosedGroupKeys', async () => { - // const ret = await SnodeSignature.getSnodeGroupSubAccountSignatureParams({ - // method: 'store', - // namespace: SnodeNamespaces.ClosedGroupKeys, - // groupIdentityPrivKey: privKeyUint, - // groupPk: validGroupPk, - // }); - // expect(ret.pubkey).to.be.eq(validGroupPk); - - // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); - // const verificationData = `store${SnodeNamespaces.ClosedGroupKeys}${hardcodedTimestamp}`; - // await verifySig(ret, verificationData); - // }); - - // it('store namespace ClosedGroupMessages', async () => { - // const ret = await SnodeSignature.getSnodeGroupSubAccountSignatureParams({ - // method: 'store', - // namespace: SnodeNamespaces.ClosedGroupMessages, - // groupPk: validGroupPk, - // }); - // expect(ret.groupPk).to.be.eq(validGroupPk); - // expect(ret.timestamp).to.be.eq(hardcodedTimestamp); - // const verificationData = `store${SnodeNamespaces.ClosedGroupMessages}${hardcodedTimestamp}`; - // await verifySig(ret, verificationData); - // }); - // }); - // }); + describe('getGroupSignatureByHashesParams', () => { + beforeEach(() => { + Sinon.stub(GetNetworkTime, 'now').returns(hardcodedTimestamp); + }); + + describe('delete', () => { + it('can sign a delete with admin secretkey', async () => { + const hashes = ['hash4321', 'hash4221']; + const group = getEmptyUserGroup(); + + const ret = await SnodeGroupSignature.getGroupSignatureByHashesParams({ + method: 'delete', + groupPk: validGroupPk, + messagesHashes: hashes, + group: { ...group, secretKey: privKeyUint }, + }); + expect(ret.pubkey).to.be.eq(validGroupPk); + expect(ret.messages).to.be.deep.eq(hashes); + + const verificationData = `delete${hashes.join('')}`; + await verifySig(ret, verificationData); + }); + + it.skip('can sign a delete with authData if adminSecretKey is empty', async () => { + // we can't really test this atm. We'd need the full env of wrapper setup as we need need for the subaccountSign itself, part of the wrapper + // const hashes = ['hash4321', 'hash4221']; + // const group = getEmptyUserGroup(); + // const ret = await SnodeGroupSignature.getGroupSignatureByHashesParams({ + // method: 'delete', + // groupPk: validGroupPk, + // messagesHashes: hashes, + // group: { ...group, authData: currentUserSubAccountAuthData }, + // }); + // expect(ret.pubkey).to.be.eq(validGroupPk); + // expect(ret.messages).to.be.deep.eq(hashes); + // const verificationData = `delete${hashes.join('')}`; + // await verifySig(ret, verificationData); + }); + + it('throws if none are set', async () => { + const hashes = ['hash4321', 'hash4221']; + + const group = getEmptyUserGroup(); + const fn = async () => + SnodeGroupSignature.getGroupSignatureByHashesParams({ + method: 'delete', + groupPk: validGroupPk, + messagesHashes: hashes, + group, + }); + expect(fn).to.throw; + }); + }); + }); describe('generateUpdateExpiryGroupSignature', () => { it('throws if groupPk not given', async () => { diff --git a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts index 9c6a3af170..a923eeda70 100644 --- a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts +++ b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { beforeEach } from 'mocha'; import Sinon from 'sinon'; -import * as DecryptedAttachmentsManager from '../../../../session/crypto/DecryptedAttachmentsManager'; import { TestUtils } from '../../../test-utils'; +import { DecryptedAttachmentsManager } from '../../../../session/crypto/DecryptedAttachmentsManager'; describe('DecryptedAttachmentsManager', () => { beforeEach(() => { diff --git a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts index ca7ebb6378..d2a483e1e6 100644 --- a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts +++ b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts @@ -547,10 +547,10 @@ describe('DisappearingMessage', () => { it('if the conversation is public it should throw', async () => { const conversation = new ConversationModel({ ...conversationArgs, + id: 'https://example.org', + type: ConversationTypeEnum.GROUP, }); - Sinon.stub(conversation, 'isPublic').returns(true); - const promise = conversation.updateExpireTimer({ providedDisappearingMode: 'deleteAfterSend', providedExpireTimer: 600, @@ -561,7 +561,7 @@ describe('DisappearingMessage', () => { fromConfigMessage: false, }); await expect(promise).is.rejectedWith( - "updateExpireTimer() Disappearing messages aren't supported in communities" + 'updateExpireTimer() Disappearing messages are only supported int groups and private chats' ); }); diff --git a/ts/test/session/unit/libsession_wrapper/libsession_multi_encrypt_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_multi_encrypt_test.ts index 7b96afda83..64c5b50c76 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_multi_encrypt_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_multi_encrypt_test.ts @@ -24,14 +24,14 @@ describe('libsession_multi_encrypt', () => { it('can encrypt/decrypt message one message to one recipient', async () => { const toEncrypt = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; const plaintext = new Uint8Array(toEncrypt); - const domain = 'domain'; + const domain = 'SessionGroupKickedMessage'; const us = await TestUtils.generateUserKeyPairs(); const userXPk = us.x25519KeyPair.pubKey.slice(1); // remove 05 prefix const userSk = us.ed25519KeyPair.privKeyBytes; const groupWrapper = new UserGroupsWrapperNode(us.ed25519KeyPair.privKeyBytes, null); - const group = await groupWrapper.createGroup(); + const group = groupWrapper.createGroup(); if (!group.secretKey) { throw new Error('failed to create group'); } @@ -47,11 +47,98 @@ describe('libsession_multi_encrypt', () => { const decrypted = MultiEncryptWrapperNode.multiDecryptEd25519({ domain, encoded: encrypted, - ed25519SecretKey: userSk, + userEd25519SecretKey: userSk, senderEd25519Pubkey: groupEd25519Pubkey, }); - console.warn('decrypted', decrypted); expect(decrypted).to.be.deep.eq(Buffer.from(toEncrypt)); }); + + it('can encrypt/decrypt message multiple messages to multiple recipients', async () => { + const toEncrypt1 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + const toEncrypt2 = [1, 2, 2, 3, 4, 5, 6, 7, 8, 9]; + const plaintext1 = new Uint8Array(toEncrypt1); + const plaintext2 = new Uint8Array(toEncrypt2); + const domain = 'SessionGroupKickedMessage'; + + const user1 = await TestUtils.generateUserKeyPairs(); + const user1XPk = user1.x25519KeyPair.pubKey.slice(1); // remove 05 prefix + const user1Sk = user1.ed25519KeyPair.privKeyBytes; + const user2 = await TestUtils.generateUserKeyPairs(); + const user2XPk = user2.x25519KeyPair.pubKey.slice(1); // remove 05 prefix + const user2Sk = user2.ed25519KeyPair.privKeyBytes; + + const groupWrapper = new UserGroupsWrapperNode(user1.ed25519KeyPair.privKeyBytes, null); + const group = groupWrapper.createGroup(); + if (!group.secretKey) { + throw new Error('failed to create group'); + } + const groupEd25519SecretKey = group.secretKey; + const groupEd25519Pubkey = fromHexToArray(group.pubkeyHex).slice(1); // remove 03 prefix + + const encrypted = MultiEncryptWrapperNode.multiEncrypt({ + messages: [plaintext1, plaintext2], + recipients: [user1XPk, user2XPk], + ed25519SecretKey: groupEd25519SecretKey, + domain, + }); + const decrypted1 = MultiEncryptWrapperNode.multiDecryptEd25519({ + domain, + encoded: encrypted, + userEd25519SecretKey: user1Sk, + senderEd25519Pubkey: groupEd25519Pubkey, + }); + + const decrypted2 = MultiEncryptWrapperNode.multiDecryptEd25519({ + domain, + encoded: encrypted, + userEd25519SecretKey: user2Sk, + senderEd25519Pubkey: groupEd25519Pubkey, + }); + expect(decrypted1).to.be.deep.eq(Buffer.from(toEncrypt1)); + expect(decrypted2).to.be.deep.eq(Buffer.from(toEncrypt2)); + }); + + it('can encrypt/decrypt one message to multiple recipients', async () => { + const toEncrypt1 = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; + const plaintext1 = new Uint8Array(toEncrypt1); + const domain = 'SessionGroupKickedMessage'; + + const user1 = await TestUtils.generateUserKeyPairs(); + const user1XPk = user1.x25519KeyPair.pubKey.slice(1); // remove 05 prefix + const user1Sk = user1.ed25519KeyPair.privKeyBytes; + const user2 = await TestUtils.generateUserKeyPairs(); + const user2XPk = user2.x25519KeyPair.pubKey.slice(1); // remove 05 prefix + const user2Sk = user2.ed25519KeyPair.privKeyBytes; + + const groupWrapper = new UserGroupsWrapperNode(user1.ed25519KeyPair.privKeyBytes, null); + const group = groupWrapper.createGroup(); + if (!group.secretKey) { + throw new Error('failed to create group'); + } + const groupEd25519SecretKey = group.secretKey; + const groupEd25519Pubkey = fromHexToArray(group.pubkeyHex).slice(1); // remove 03 prefix + + const encrypted = MultiEncryptWrapperNode.multiEncrypt({ + messages: [plaintext1], + recipients: [user1XPk, user2XPk], + ed25519SecretKey: groupEd25519SecretKey, + domain, + }); + const decrypted1 = MultiEncryptWrapperNode.multiDecryptEd25519({ + domain, + encoded: encrypted, + userEd25519SecretKey: user1Sk, + senderEd25519Pubkey: groupEd25519Pubkey, + }); + + const decrypted2 = MultiEncryptWrapperNode.multiDecryptEd25519({ + domain, + encoded: encrypted, + userEd25519SecretKey: user2Sk, + senderEd25519Pubkey: groupEd25519Pubkey, + }); + expect(decrypted1).to.be.deep.eq(Buffer.from(toEncrypt1)); + expect(decrypted2).to.be.deep.eq(Buffer.from(toEncrypt1)); + }); }); }); diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 7e358ec238..52bab12b28 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -29,6 +29,7 @@ function emptyMember(pubkeyHex: PubkeyType): GroupMemberGet { promotionFailed: false, promotionPending: false, admin: false, + removedStatus: 0, pubkeyHex, }; } @@ -159,7 +160,7 @@ describe('libsession_metagroup', () => { const memberCreated = metaGroupWrapper.memberGetOrConstruct(member); console.info('Object.keys(memberCreated) ', JSON.stringify(Object.keys(memberCreated))); expect(Object.keys(memberCreated).length).to.be.eq( - 9, // if you change this value, also make sure you add a test, testing that new field, below + 10, // if you change this value, also make sure you add a test, testing that new field, below 'this test is designed to fail if you need to add tests to test a new field of libsession' ); }); @@ -274,6 +275,28 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); }); + + it('can mark as removed with messages', () => { + metaGroupWrapper.membersMarkPendingRemoval([member], true); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + const expected: GroupMemberGet = { + ...emptyMember(member), + removedStatus: 2, + }; + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); + }); + + it('can mark as removed without messages', () => { + metaGroupWrapper.membersMarkPendingRemoval([member], false); + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + const expected: GroupMemberGet = { + ...emptyMember(member), + removedStatus: 1, + }; + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); + expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); + }); }); describe('keys', () => { diff --git a/ts/test/session/unit/onion/OnionErrors_test.ts b/ts/test/session/unit/onion/OnionErrors_test.ts index 2e56817da4..09931b284e 100644 --- a/ts/test/session/unit/onion/OnionErrors_test.ts +++ b/ts/test/session/unit/onion/OnionErrors_test.ts @@ -134,6 +134,7 @@ describe('OnionPathsErrors', () => { symmetricKey: new Uint8Array(), guardNode: guardSnode1, abortSignal: abortController.signal, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -149,6 +150,7 @@ describe('OnionPathsErrors', () => { response: getFakeResponseOnDestination(200), symmetricKey: new Uint8Array(), guardNode: guardSnode1, + allow401s: false, }); throw new Error('Did not throw'); } catch (e) { @@ -167,6 +169,7 @@ describe('OnionPathsErrors', () => { response: getFakeResponseOnDestination(), symmetricKey: new Uint8Array(), guardNode: guardSnode1, + allow401s: false, }); throw new Error('Did not throw'); } catch (e) { @@ -186,6 +189,7 @@ describe('OnionPathsErrors', () => { response: getFakeResponseOnPath(406), symmetricKey: new Uint8Array(), guardNode: guardSnode1, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -207,6 +211,7 @@ describe('OnionPathsErrors', () => { response: getFakeResponseOnDestination(406), symmetricKey: new Uint8Array(), guardNode: guardSnode1, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -231,6 +236,7 @@ describe('OnionPathsErrors', () => { response: getFakeResponseOnPath(425), symmetricKey: new Uint8Array(), guardNode: guardSnode1, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -252,6 +258,7 @@ describe('OnionPathsErrors', () => { response: getFakeResponseOnDestination(425), symmetricKey: new Uint8Array(), guardNode: guardSnode1, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -282,6 +289,7 @@ describe('OnionPathsErrors', () => { destinationSnodeEd25519: targetNode, associatedWith, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -330,6 +338,7 @@ describe('OnionPathsErrors', () => { guardNode: guardSnode1, destinationSnodeEd25519: targetNode, associatedWith, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -365,6 +374,7 @@ describe('OnionPathsErrors', () => { destinationSnodeEd25519: targetNode, associatedWith, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -402,6 +412,7 @@ describe('OnionPathsErrors', () => { guardNode: guardSnode1, destinationSnodeEd25519: targetNode, associatedWith, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -449,6 +460,7 @@ describe('OnionPathsErrors', () => { destinationSnodeEd25519: targetNode, associatedWith, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -485,6 +497,7 @@ describe('OnionPathsErrors', () => { guardNode: guardSnode1, destinationSnodeEd25519: targetNode, associatedWith, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -526,6 +539,7 @@ describe('OnionPathsErrors', () => { guardNode: guardSnode1, destinationSnodeEd25519: targetNode, associatedWith, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -566,6 +580,7 @@ describe('OnionPathsErrors', () => { guardNode: guardSnode1, destinationSnodeEd25519: targetNode, associatedWith, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { @@ -608,6 +623,7 @@ describe('OnionPathsErrors', () => { guardNode, destinationSnodeEd25519: targetNode, associatedWith, + allow401s: false, }); throw new Error('Error expected'); } catch (e) { diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index 92d46c6c65..7eb5d8aa2c 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -12,7 +12,6 @@ import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTim import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { Onions } from '../../../../session/apis/snode_api/onions'; import { ConvoHub } from '../../../../session/conversations/ConversationController'; -import { MessageEncrypter } from '../../../../session/crypto'; import { OnionSending } from '../../../../session/onions/onionSend'; import { OnionV4 } from '../../../../session/onions/onionv4'; import { MessageSender } from '../../../../session/sending'; @@ -29,6 +28,7 @@ import { stubValidSnodeSwarm, } from '../../../test-utils/utils'; import { TEST_identityKeyPair } from '../crypto/MessageEncrypter_test'; +import { MessageEncrypter } from '../../../../session/crypto/MessageEncrypter'; describe('MessageSender', () => { afterEach(() => { diff --git a/ts/types/attachments/VisualAttachment.ts b/ts/types/attachments/VisualAttachment.ts index a17f3422f1..4966216419 100644 --- a/ts/types/attachments/VisualAttachment.ts +++ b/ts/types/attachments/VisualAttachment.ts @@ -5,10 +5,7 @@ import { blobToArrayBuffer, dataURLToBlob } from 'blob-util'; import moment from 'moment'; import { toLogFormat } from './Errors'; -import { - getDecryptedBlob, - getDecryptedMediaUrl, -} from '../../session/crypto/DecryptedAttachmentsManager'; +import { DecryptedAttachmentsManager } from '../../session/crypto/DecryptedAttachmentsManager'; import { ToastUtils } from '../../session/utils'; import { isTestIntegration } from '../../shared/env_vars'; import { GoogleChrome } from '../../util'; @@ -42,7 +39,7 @@ export const getImageDimensions = async ({ reject(error); }); // image/jpg is hard coded here but does not look to cause any issues - void getDecryptedMediaUrl(objectUrl, 'image/jpg', false) + void DecryptedAttachmentsManager.getDecryptedMediaUrl(objectUrl, 'image/jpg', false) .then(decryptedUrl => { image.src = decryptedUrl; }) @@ -62,7 +59,7 @@ export const makeImageThumbnailBuffer = async ({ 'makeImageThumbnailBuffer can only be called with what GoogleChrome image type supports' ); } - const decryptedBlob = await getDecryptedBlob(objectUrl, contentType); + const decryptedBlob = await DecryptedAttachmentsManager.getDecryptedBlob(objectUrl, contentType); const scaled = await autoScaleForThumbnail({ contentType, blob: decryptedBlob }); return blobToArrayBuffer(scaled.blob); @@ -102,11 +99,13 @@ export const makeVideoScreenshot = async ({ reject(error); }); - void getDecryptedMediaUrl(objectUrl, contentType, false).then(decryptedUrl => { - video.src = decryptedUrl; - video.muted = true; - void video.play(); // for some reason, this is to be started, otherwise the generated thumbnail will be empty - }); + void DecryptedAttachmentsManager.getDecryptedMediaUrl(objectUrl, contentType, false).then( + decryptedUrl => { + video.src = decryptedUrl; + video.muted = true; + void video.play(); // for some reason, this is to be started, otherwise the generated thumbnail will be empty + } + ); }); export async function getVideoDuration({ @@ -129,7 +128,7 @@ export async function getVideoDuration({ reject(error); }); - void getDecryptedMediaUrl(objectUrl, contentType, false) + void DecryptedAttachmentsManager.getDecryptedMediaUrl(objectUrl, contentType, false) .then(decryptedUrl => { video.src = decryptedUrl; }) @@ -163,7 +162,7 @@ export async function getAudioDuration({ reject(error); }); - void getDecryptedMediaUrl(objectUrl, contentType, false) + void DecryptedAttachmentsManager.getDecryptedMediaUrl(objectUrl, contentType, false) .then(decryptedUrl => { audio.src = decryptedUrl; }) diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 4d9dc61815..1257dd71e2 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -366,7 +366,7 @@ export function stringify(obj: unknown) { return JSON.stringify(obj, (_key, value) => { return value instanceof Uint8Array ? `Uint8Array(${value.length}): ${toHex(value)}` - : value.type === 'Buffer' && value.data + : value?.type === 'Buffer' && value?.data ? `Buffer: ${toHex(value.data)}` : value; }); diff --git a/ts/util/attachmentsUtil.ts b/ts/util/attachmentsUtil.ts index ffe0c2a1b1..674d8dccb5 100644 --- a/ts/util/attachmentsUtil.ts +++ b/ts/util/attachmentsUtil.ts @@ -5,7 +5,7 @@ import { arrayBufferToBlob } from 'blob-util'; import loadImage, { LoadImageOptions } from 'blueimp-load-image'; import { StagedAttachmentType } from '../components/conversation/composition/CompositionBox'; import { SignalService } from '../protobuf'; -import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager'; +import { DecryptedAttachmentsManager } from '../session/crypto/DecryptedAttachmentsManager'; import { sendDataExtractionNotification } from '../session/messages/outgoing/controlMessage/DataExtractionNotificationMessage'; import { AttachmentType, save } from '../types/Attachment'; import { IMAGE_GIF, IMAGE_JPEG, IMAGE_PNG, IMAGE_TIFF, IMAGE_UNKNOWN } from '../types/MIME'; @@ -395,7 +395,11 @@ export const saveAttachmentToDisk = async ({ conversationId: string; index: number; }) => { - const decryptedUrl = await getDecryptedMediaUrl(attachment.url, attachment.contentType, false); + const decryptedUrl = await DecryptedAttachmentsManager.getDecryptedMediaUrl( + attachment.url, + attachment.contentType, + false + ); save({ attachment: { ...attachment, url: decryptedUrl }, document, diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index ad82f1ec25..349dc41ab4 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -130,6 +130,7 @@ function createBaseActionsFor(wrapperType: ConfigWrapperUser) { currentHashes: async () => GenericWrapperActions.currentHashes(wrapperType), merge: async (toMerge: Array) => GenericWrapperActions.merge(wrapperType, toMerge), storageNamespace: async () => GenericWrapperActions.storageNamespace(wrapperType), + free: async () => {}, }; } @@ -447,6 +448,12 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'init', options]) as Promise< ReturnType >, + + free: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'free']) as Promise< + ReturnType + >, + needsPush: async (groupPk: GroupPubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'needsPush']) as Promise< ReturnType @@ -511,10 +518,25 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberGetAll']) as Promise< ReturnType >, + memberGetAllPendingRemovals: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberGetAllPendingRemovals']) as Promise< + ReturnType + >, memberEraseAndRekey: async (groupPk: GroupPubkeyType, members: Array) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberEraseAndRekey', members]) as Promise< ReturnType >, + membersMarkPendingRemoval: async ( + groupPk: GroupPubkeyType, + members: Array, + withMessages: boolean + ) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'membersMarkPendingRemoval', + members, + withMessages, + ]) as Promise>, memberSetAccepted: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberSetAccepted', pubkeyHex]) as Promise< ReturnType @@ -588,6 +610,10 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { data, timestampMs, ]) as Promise>, + keyGetCurrentGen: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'keyGetCurrentGen']) as Promise< + ReturnType + >, encryptMessages: async (groupPk: GroupPubkeyType, plaintexts: Array) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'encryptMessages', plaintexts]) as Promise< ReturnType @@ -648,12 +674,14 @@ export const MultiEncryptWrapperActions: MultiEncryptActionsCalls = { callLibSessionWorker(['MultiEncrypt', 'multiEncrypt', args]) as Promise< ReturnType >, - multiDecryptEd25519: async args => + multiDecryptEd25519: async args => callLibSessionWorker(['MultiEncrypt', 'multiDecryptEd25519', args]) as Promise< ReturnType >, }; +export const EncryptionDomains = ['SessionGroupKickedMessage'] as const; + export const callLibSessionWorker = async ( callToMake: LibSessionWorkerFunctions ): Promise => { diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index b6e1d03903..ef6398579e 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -236,9 +236,15 @@ onmessage = async (e: { data: [number, ConfigWrapperObjectTypesMeta, string, ... } throw new Error(`Unhandled init wrapper type: ${config}`); } - - if (action === 'multiEncrypt') { - await MultiEncryptWrapperNode.multiEncrypt(args[0]); + if (action === 'free') { + if (isMetaWrapperType(config)) { + const pk = getGroupPubkeyFromWrapperType(config); + metaGroupWrappers.delete(pk); + postMessage([jobId, null, null]); + return; + } + // We will need to merge onboarding's code to handle the other type of wrappers + throw new Error(`Unhandled init wrapper type: ${config}`); } const wrapper = isUserConfigWrapperType(config) diff --git a/yarn.lock b/yarn.lock index 5f990d9040..65c05d78cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1,8408 +1,11796 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"7zip-bin@~5.1.1": - version "5.1.1" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" - integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== - -"@aashutoshrathi/word-wrap@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" - integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== - -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13": - version "7.22.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" - integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== - dependencies: - "@babel/highlight" "^7.22.13" - chalk "^2.4.2" - -"@babel/generator@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339" - integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA== - dependencies: - "@babel/types" "^7.22.15" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - -"@babel/helper-annotate-as-pure@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" - integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-environment-visitor@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98" - integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q== - -"@babel/helper-function-name@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be" - integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ== - dependencies: - "@babel/template" "^7.22.5" - "@babel/types" "^7.22.5" - -"@babel/helper-hoist-variables@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" - integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" - integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== - dependencies: - "@babel/types" "^7.22.15" - -"@babel/helper-plugin-utils@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" - integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== - -"@babel/helper-split-export-declaration@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" - integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-string-parser@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" - integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== - -"@babel/helper-validator-identifier@^7.22.15", "@babel/helper-validator-identifier@^7.22.5": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz#601fa28e4cc06786c18912dca138cec73b882044" - integrity sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ== - -"@babel/highlight@^7.22.13": - version "7.22.13" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16" - integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ== - dependencies: - "@babel/helper-validator-identifier" "^7.22.5" - chalk "^2.4.2" - js-tokens "^4.0.0" - -"@babel/parser@^7.20.15", "@babel/parser@^7.22.15": - version "7.22.16" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95" - integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA== - -"@babel/plugin-syntax-jsx@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918" - integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg== - dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - -"@babel/runtime@7.4.5": - version "7.4.5" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12" - integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ== - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.15.tgz#38f46494ccf6cf020bd4eed7124b425e83e523b8" - integrity sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA== - dependencies: - regenerator-runtime "^0.14.0" - -"@babel/template@^7.22.5": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" - integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== - dependencies: - "@babel/code-frame" "^7.22.13" - "@babel/parser" "^7.22.15" - "@babel/types" "^7.22.15" - -"@babel/traverse@^7.4.5": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.15.tgz#75be4d2d6e216e880e93017f4e2389aeb77ef2d9" - integrity sha512-DdHPwvJY0sEeN4xJU5uRLmZjgMMDIvMPniLuYzUVXj/GGzysPl0/fwt44JBkyUIzGJPV8QgHMcQdQ34XFuKTYQ== - dependencies: - "@babel/code-frame" "^7.22.13" - "@babel/generator" "^7.22.15" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.22.15" - "@babel/types" "^7.22.15" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.22.15", "@babel/types@^7.22.5": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.15.tgz#266cb21d2c5fd0b3931e7a91b6dd72d2f617d282" - integrity sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA== - dependencies: - "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.15" - to-fast-properties "^2.0.0" - -"@commitlint/cli@^17.7.1": - version "17.7.1" - resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.7.1.tgz#f3ab35bd38d82fcd4ab03ec5a1e9db26d57fe1b0" - integrity sha512-BCm/AT06SNCQtvFv921iNhudOHuY16LswT0R3OeolVGLk8oP+Rk9TfQfgjH7QPMjhvp76bNqGFEcpKojxUNW1g== - dependencies: - "@commitlint/format" "^17.4.4" - "@commitlint/lint" "^17.7.0" - "@commitlint/load" "^17.7.1" - "@commitlint/read" "^17.5.1" - "@commitlint/types" "^17.4.4" - execa "^5.0.0" - lodash.isfunction "^3.0.9" - resolve-from "5.0.0" - resolve-global "1.0.0" - yargs "^17.0.0" - -"@commitlint/config-conventional@^17.7.0": - version "17.7.0" - resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-17.7.0.tgz#1bbf2bce7851db63c1a8aa8d924277ad4938247e" - integrity sha512-iicqh2o6et+9kWaqsQiEYZzfLbtoWv9uZl8kbI8EGfnc0HeGafQBF7AJ0ylN9D/2kj6txltsdyQs8+2fTMwWEw== - dependencies: - conventional-changelog-conventionalcommits "^6.1.0" - -"@commitlint/config-validator@^17.6.7": - version "17.6.7" - resolved "https://registry.yarnpkg.com/@commitlint/config-validator/-/config-validator-17.6.7.tgz#c664d42a1ecf5040a3bb0843845150f55734df41" - integrity sha512-vJSncmnzwMvpr3lIcm0I8YVVDJTzyjy7NZAeXbTXy+MPUdAr9pKyyg7Tx/ebOQ9kqzE6O9WT6jg2164br5UdsQ== - dependencies: - "@commitlint/types" "^17.4.4" - ajv "^8.11.0" - -"@commitlint/ensure@^17.6.7": - version "17.6.7" - resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-17.6.7.tgz#77a77a0c05e6a1c34589f59e82e6cb937101fc4b" - integrity sha512-mfDJOd1/O/eIb/h4qwXzUxkmskXDL9vNPnZ4AKYKiZALz4vHzwMxBSYtyL2mUIDeU9DRSpEUins8SeKtFkYHSw== - dependencies: - "@commitlint/types" "^17.4.4" - lodash.camelcase "^4.3.0" - lodash.kebabcase "^4.1.1" - lodash.snakecase "^4.1.1" - lodash.startcase "^4.4.0" - lodash.upperfirst "^4.3.1" - -"@commitlint/execute-rule@^17.4.0": - version "17.4.0" - resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-17.4.0.tgz#4518e77958893d0a5835babe65bf87e2638f6939" - integrity sha512-LIgYXuCSO5Gvtc0t9bebAMSwd68ewzmqLypqI2Kke1rqOqqDbMpYcYfoPfFlv9eyLIh4jocHWwCK5FS7z9icUA== - -"@commitlint/format@^17.4.4": - version "17.4.4" - resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-17.4.4.tgz#0f6e1b4d7a301c7b1dfd4b6334edd97fc050b9f5" - integrity sha512-+IS7vpC4Gd/x+uyQPTAt3hXs5NxnkqAZ3aqrHd5Bx/R9skyCAWusNlNbw3InDbAK6j166D9asQM8fnmYIa+CXQ== - dependencies: - "@commitlint/types" "^17.4.4" - chalk "^4.1.0" - -"@commitlint/is-ignored@^17.7.0": - version "17.7.0" - resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.7.0.tgz#df9b284420bdb1aed5fdb2be44f4e98cc4826014" - integrity sha512-043rA7m45tyEfW7Zv2vZHF++176MLHH9h70fnPoYlB1slKBeKl8BwNIlnPg4xBdRBVNPaCqvXxWswx2GR4c9Hw== - dependencies: - "@commitlint/types" "^17.4.4" - semver "7.5.4" - -"@commitlint/lint@^17.7.0": - version "17.7.0" - resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.7.0.tgz#33f831298dc43679e4de6b088aea63d1f884c7e7" - integrity sha512-TCQihm7/uszA5z1Ux1vw+Nf3yHTgicus/+9HiUQk+kRSQawByxZNESeQoX9ujfVd3r4Sa+3fn0JQAguG4xvvbA== - dependencies: - "@commitlint/is-ignored" "^17.7.0" - "@commitlint/parse" "^17.7.0" - "@commitlint/rules" "^17.7.0" - "@commitlint/types" "^17.4.4" - -"@commitlint/load@^17.7.1": - version "17.7.1" - resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.7.1.tgz#0723b11723a20043a304a74960602dead89b5cdd" - integrity sha512-S/QSOjE1ztdogYj61p6n3UbkUvweR17FQ0zDbNtoTLc+Hz7vvfS7ehoTMQ27hPSjVBpp7SzEcOQu081RLjKHJQ== - dependencies: - "@commitlint/config-validator" "^17.6.7" - "@commitlint/execute-rule" "^17.4.0" - "@commitlint/resolve-extends" "^17.6.7" - "@commitlint/types" "^17.4.4" - "@types/node" "20.4.7" - chalk "^4.1.0" - cosmiconfig "^8.0.0" - cosmiconfig-typescript-loader "^4.0.0" - lodash.isplainobject "^4.0.6" - lodash.merge "^4.6.2" - lodash.uniq "^4.5.0" - resolve-from "^5.0.0" - ts-node "^10.8.1" - typescript "^4.6.4 || ^5.0.0" - -"@commitlint/message@^17.4.2": - version "17.4.2" - resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-17.4.2.tgz#f4753a79701ad6db6db21f69076e34de6580e22c" - integrity sha512-3XMNbzB+3bhKA1hSAWPCQA3lNxR4zaeQAQcHj0Hx5sVdO6ryXtgUBGGv+1ZCLMgAPRixuc6en+iNAzZ4NzAa8Q== - -"@commitlint/parse@^17.7.0": - version "17.7.0" - resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-17.7.0.tgz#aacb2d189e50ab8454154b1df150aaf20478ae47" - integrity sha512-dIvFNUMCUHqq5Abv80mIEjLVfw8QNuA4DS7OWip4pcK/3h5wggmjVnlwGCDvDChkw2TjK1K6O+tAEV78oxjxag== - dependencies: - "@commitlint/types" "^17.4.4" - conventional-changelog-angular "^6.0.0" - conventional-commits-parser "^4.0.0" - -"@commitlint/read@^17.5.1": - version "17.5.1" - resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-17.5.1.tgz#fec903b766e2c41e3cefa80630040fcaba4f786c" - integrity sha512-7IhfvEvB//p9aYW09YVclHbdf1u7g7QhxeYW9ZHSO8Huzp8Rz7m05aCO1mFG7G8M+7yfFnXB5xOmG18brqQIBg== - dependencies: - "@commitlint/top-level" "^17.4.0" - "@commitlint/types" "^17.4.4" - fs-extra "^11.0.0" - git-raw-commits "^2.0.11" - minimist "^1.2.6" - -"@commitlint/resolve-extends@^17.6.7": - version "17.6.7" - resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-17.6.7.tgz#9c53a4601c96ab2dd20b90fb35c988639307735d" - integrity sha512-PfeoAwLHtbOaC9bGn/FADN156CqkFz6ZKiVDMjuC2N5N0740Ke56rKU7Wxdwya8R8xzLK9vZzHgNbuGhaOVKIg== - dependencies: - "@commitlint/config-validator" "^17.6.7" - "@commitlint/types" "^17.4.4" - import-fresh "^3.0.0" - lodash.mergewith "^4.6.2" - resolve-from "^5.0.0" - resolve-global "^1.0.0" - -"@commitlint/rules@^17.7.0": - version "17.7.0" - resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.7.0.tgz#b97a4933c5cba11a659a19ee467f6f000f31533e" - integrity sha512-J3qTh0+ilUE5folSaoK91ByOb8XeQjiGcdIdiB/8UT1/Rd1itKo0ju/eQVGyFzgTMYt8HrDJnGTmNWwcMR1rmA== - dependencies: - "@commitlint/ensure" "^17.6.7" - "@commitlint/message" "^17.4.2" - "@commitlint/to-lines" "^17.4.0" - "@commitlint/types" "^17.4.4" - execa "^5.0.0" - -"@commitlint/to-lines@^17.4.0": - version "17.4.0" - resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-17.4.0.tgz#9bd02e911e7d4eab3fb4a50376c4c6d331e10d8d" - integrity sha512-LcIy/6ZZolsfwDUWfN1mJ+co09soSuNASfKEU5sCmgFCvX5iHwRYLiIuoqXzOVDYOy7E7IcHilr/KS0e5T+0Hg== - -"@commitlint/top-level@^17.4.0": - version "17.4.0" - resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-17.4.0.tgz#540cac8290044cf846fbdd99f5cc51e8ac5f27d6" - integrity sha512-/1loE/g+dTTQgHnjoCy0AexKAEFyHsR2zRB4NWrZ6lZSMIxAhBJnmCqwao7b4H8888PsfoTBCLBYIw8vGnej8g== - dependencies: - find-up "^5.0.0" - -"@commitlint/types@^17.4.4": - version "17.4.4" - resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-17.4.4.tgz#1416df936e9aad0d6a7bbc979ecc31e55dade662" - integrity sha512-amRN8tRLYOsxRr6mTnGGGvB5EmW/4DDjLMgiwK3CCVEmN6Sr/6xePGEpWaspKkckILuUORCwe6VfDBw6uj4axQ== - dependencies: - chalk "^4.1.0" - -"@cspotcode/source-map-support@^0.8.0": - version "0.8.1" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" - integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== - dependencies: - "@jridgewell/trace-mapping" "0.3.9" - -"@develar/schema-utils@~2.6.5": - version "2.6.5" - resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" - integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig== - dependencies: - ajv "^6.12.0" - ajv-keywords "^3.4.1" - -"@discoveryjs/json-ext@^0.5.0": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" - integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== - -"@electron/get@^2.0.0": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.3.tgz#fba552683d387aebd9f3fcadbcafc8e12ee4f960" - integrity sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ== - dependencies: - debug "^4.1.1" - env-paths "^2.2.0" - fs-extra "^8.1.0" - got "^11.8.5" - progress "^2.0.3" - semver "^6.2.0" - sumchecker "^3.0.1" - optionalDependencies: - global-agent "^3.0.0" - -"@electron/notarize@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.1.0.tgz#76aaec10c8687225e8d0a427cc9df67611c46ff3" - integrity sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA== - dependencies: - debug "^4.1.1" - fs-extra "^9.0.1" - promise-retry "^2.0.1" - -"@electron/universal@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339" - integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== - dependencies: - "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.1.0" - debug "^4.3.1" - dir-compare "^2.4.0" - fs-extra "^9.0.1" - minimatch "^3.0.4" - plist "^3.0.4" - -"@emoji-mart/data@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.1.2.tgz#777c976f8f143df47cbb23a7077c9ca9fe5fc513" - integrity sha512-1HP8BxD2azjqWJvxIaWAMyTySeZY0Osr83ukYjltPVkNXeJvTz7yDrPLBtnrD5uqJ3tg4CcLuuBW09wahqL/fg== - -"@emoji-mart/react@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@emoji-mart/react/-/react-1.1.1.tgz#ddad52f93a25baf31c5383c3e7e4c6e05554312a" - integrity sha512-NMlFNeWgv1//uPsvLxvGQoIerPuVdXwK/EUek8OOkJ6wVOWPUizRBJU0hDqWZCOROVpfBgCemaC3m6jDOXi03g== - -"@emotion/is-prop-valid@^0.8.8": - version "0.8.8" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" - integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== - dependencies: - "@emotion/memoize" "0.7.4" - -"@emotion/memoize@0.7.4": - version "0.7.4" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" - integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== - -"@emotion/stylis@^0.8.4": - version "0.8.5" - resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" - integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== - -"@emotion/unitless@^0.7.4": - version "0.7.5" - resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" - integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== - -"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" - integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== - dependencies: - eslint-visitor-keys "^3.3.0" - -"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.0.tgz#11195513186f68d42fbf449f9a7136b2c0c92005" - integrity sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg== - -"@eslint/eslintrc@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" - integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== - dependencies: - ajv "^6.12.4" - debug "^4.3.2" - espree "^9.6.0" - globals "^13.19.0" - ignore "^5.2.0" - import-fresh "^3.2.1" - js-yaml "^4.1.0" - minimatch "^3.1.2" - strip-json-comments "^3.1.1" - -"@eslint/js@8.57.0": - version "8.57.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" - integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== - -"@humanwhocodes/config-array@^0.11.14": - version "0.11.14" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" - integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== - dependencies: - "@humanwhocodes/object-schema" "^2.0.2" - debug "^4.3.1" - minimatch "^3.0.5" - -"@humanwhocodes/module-importer@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" - integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== - -"@humanwhocodes/object-schema@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917" - integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw== - -"@iconify/icons-mdi@~1.1.0": - version "1.1.47" - resolved "https://registry.yarnpkg.com/@iconify/icons-mdi/-/icons-mdi-1.1.47.tgz#4bbe1e5d126de7acde05a66addd869c66bd97ca0" - integrity sha512-6AZfvWru20Rl9pXULStkVvTWnua6VG56zOIKdkCzLh25XVeTDEp6f1dL7iX9w+way5+1hI0BBuqTQd61qYaKdg== - -"@iconify/react@^3.1.3": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@iconify/react/-/react-3.2.2.tgz#ab5241dc01562076bae3b0c22238aff7e5f029cc" - integrity sha512-z3+Jno3VcJzgNHsN5mEvYMsgCkOZkydqdIwOxjXh45+i2Vs9RGH68Y52vt39izwFSfuYUXhaW+1u7m7+IhCn/g== - -"@isaacs/cliui@^8.0.2": - version "8.0.2" - resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" - integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== - dependencies: - string-width "^5.1.2" - string-width-cjs "npm:string-width@^4.2.0" - strip-ansi "^7.0.1" - strip-ansi-cjs "npm:strip-ansi@^6.0.1" - wrap-ansi "^8.1.0" - wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" - -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" - integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== - -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/source-map@^0.3.3": - version "0.3.5" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91" - integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": - version "1.4.15" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" - integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== - -"@jridgewell/trace-mapping@0.3.9": - version "0.3.9" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" - integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.19" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811" - integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw== - dependencies: - "@jridgewell/resolve-uri" "^3.1.0" - "@jridgewell/sourcemap-codec" "^1.4.14" - -"@jsdoc/salty@^0.2.1": - version "0.2.5" - resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.5.tgz#1b2fa5bb8c66485b536d86eee877c263d322f692" - integrity sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw== - dependencies: - lodash "^4.17.21" - -"@malept/cross-spawn-promise@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" - integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== - dependencies: - cross-spawn "^7.0.1" - -"@malept/flatpak-bundler@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" - integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== - dependencies: - debug "^4.1.1" - fs-extra "^9.0.0" - lodash "^4.17.15" - tmp-promise "^3.0.2" - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@pkgjs/parseargs@^0.11.0": - version "0.11.0" - resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" - integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== - -"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" - integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ== - -"@protobufjs/base64@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" - integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== - -"@protobufjs/codegen@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" - integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== - -"@protobufjs/eventemitter@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" - integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q== - -"@protobufjs/fetch@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" - integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ== - dependencies: - "@protobufjs/aspromise" "^1.1.1" - "@protobufjs/inquire" "^1.1.0" - -"@protobufjs/float@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" - integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ== - -"@protobufjs/inquire@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" - integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q== - -"@protobufjs/path@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" - integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA== - -"@protobufjs/pool@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" - integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw== - -"@protobufjs/utf8@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" - integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== - -"@reduxjs/toolkit@1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.8.5.tgz#c14bece03ee08be88467f22dc0ecf9cf875527cd" - integrity sha512-f4D5EXO7A7Xq35T0zRbWq5kJQyXzzscnHKmjnu2+37B3rwHU6mX9PYlbfXdnxcY6P/7zfmjhgan0Z+yuOfeBmA== - dependencies: - immer "^9.0.7" - redux "^4.1.2" - redux-thunk "^2.4.1" - reselect "^4.1.5" - -"@signalapp/better-sqlite3@^8.4.3": - version "8.5.2" - resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.5.2.tgz#910669f44e76a46d06df45fabefcd3ac2e7c4cce" - integrity sha512-t7XalDxuRP115EratM6i1kbvIXJvzETcl8wqnt3NlWZdzil7kelS/RYz+PE1G+z8ZwtFyn/ViAFMt76AsArifw== - dependencies: - bindings "^1.5.0" - tar "^6.1.0" - -"@sindresorhus/is@^4.0.0": - version "4.6.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" - integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== - -"@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2": - version "1.8.6" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9" - integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ== - dependencies: - type-detect "4.0.8" - -"@sinonjs/fake-timers@^6.0.0", "@sinonjs/fake-timers@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" - integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== - dependencies: - "@sinonjs/commons" "^1.7.0" - -"@sinonjs/formatio@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz#f13e713cb3313b1ab965901b01b0828ea6b77089" - integrity sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ== - dependencies: - "@sinonjs/commons" "^1" - "@sinonjs/samsam" "^5.0.2" - -"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.0.3": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz#375a45fe6ed4e92fca2fb920e007c48232a6507f" - integrity sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg== - dependencies: - "@sinonjs/commons" "^1.6.0" - lodash.get "^4.4.2" - type-detect "^4.0.8" - -"@sinonjs/text-encoding@^0.7.1": - version "0.7.2" - resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918" - integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ== - -"@szmarczak/http-timer@^4.0.5": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" - integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== - dependencies: - defer-to-connect "^2.0.0" - -"@tootallnate/once@2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" - integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== - -"@tsconfig/node10@^1.0.7": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" - integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== - -"@tsconfig/node12@^1.0.7": - version "1.0.11" - resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" - integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== - -"@tsconfig/node14@^1.0.0": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" - integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== - -"@tsconfig/node16@^1.0.2": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" - integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== - -"@types/backbone@1.4.2": - version "1.4.2" - resolved "https://registry.yarnpkg.com/@types/backbone/-/backbone-1.4.2.tgz#2af5ca6536d4cd510842eea6eeea11a42fa704b9" - integrity sha512-+yfi5cLeIPU3JuCrFP4Bodpv8oLrE5sbiqQIMPvHIKaVCz0JCBt9GEQKZsz2haibrTV4Axks6ovoHc2yUbpWzg== - dependencies: - "@types/jquery" "*" - "@types/underscore" "*" - -"@types/blueimp-load-image@5.14.4": - version "5.14.4" - resolved "https://registry.yarnpkg.com/@types/blueimp-load-image/-/blueimp-load-image-5.14.4.tgz#14a438e88b814b4ede9c79e3b2e68324bd591327" - integrity sha512-IoT8BXBuuWWscQnscGtAYH4dGEOr3uQ85MJdE9LAfperio8FQwyFaigHITPJSy+NSS4w9UHKhzmtQXt5A+544g== - -"@types/buffer-crc32@^0.2.0": - version "0.2.2" - resolved "https://registry.yarnpkg.com/@types/buffer-crc32/-/buffer-crc32-0.2.2.tgz#e115de47913ce34cc2662be43d708d8bef874ab7" - integrity sha512-UpJyUKgG33LVehYtv9k2x4HUEY5ThV62YNGFBbQNBgtoky/0tQCceh8BPI9r3XL5hQ1tGmq34jGWNRBKf2P1UQ== - dependencies: - "@types/node" "*" - -"@types/bunyan@^1.8.8": - version "1.8.8" - resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.8.tgz#8d6d33f090f37c07e2a80af30ae728450a101008" - integrity sha512-Cblq+Yydg3u+sGiz2mjHjC5MPmdjY+No4qvHrF+BUhblsmSfMvsHLbOG62tPbonsqBj6sbWv1LHcsoe5Jw+/Ow== - dependencies: - "@types/node" "*" - -"@types/bytebuffer@^5.0.41": - version "5.0.44" - resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.44.tgz#553015fb34db1fc3eb3f7b232bff91c006c251a1" - integrity sha512-k1qonHga/SfQT02NF633i+7tIfKd+cfC/8pjnedcfuXJNMWooss/FkCgRMSnLf2WorLjbuH4bfgAZEbtyHBDoQ== - dependencies: - "@types/long" "^3.0.0" - "@types/node" "*" - -"@types/cacheable-request@^6.0.1": - version "6.0.3" - resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" - integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== - dependencies: - "@types/http-cache-semantics" "*" - "@types/keyv" "^3.1.4" - "@types/node" "*" - "@types/responselike" "^1.0.0" - -"@types/chai-as-promised@^7.1.2": - version "7.1.6" - resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.6.tgz#3b08cbe1e7206567a480dc6538bade374b19e4e1" - integrity sha512-cQLhk8fFarRVZAXUQV1xEnZgMoPxqKojBvRkqPCKPQCzEhpbbSKl1Uu75kDng7k5Ln6LQLUmNBjLlFthCgm1NA== - dependencies: - "@types/chai" "*" - -"@types/chai@*": - version "4.3.6" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.6.tgz#7b489e8baf393d5dd1266fb203ddd4ea941259e6" - integrity sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw== - -"@types/chai@4.2.18": - version "4.2.18" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.18.tgz#0c8e298dbff8205e2266606c1ea5fbdba29b46e4" - integrity sha512-rS27+EkB/RE1Iz3u0XtVL5q36MGDWbgYe7zWiodyKNUnthxY0rukK5V36eiUCtCisB7NN8zKYH6DO2M37qxFEQ== - -"@types/classnames@2.2.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5" - integrity sha512-x15/Io+JdzrkM9gnX6SWUs/EmqQzd65TD9tcZIAQ1VIdb93XErNuYmB7Yho8JUCE189ipUSESsWvGvYXRRIvYA== - -"@types/config@0.0.34": - version "0.0.34" - resolved "https://registry.yarnpkg.com/@types/config/-/config-0.0.34.tgz#123f91bdb5afdd702294b9de9ca04d9ea11137b0" - integrity sha512-jWi9DXx77hnzN4kHCNEvP/kab+nchRLTg9yjXYxjTcMBkuc5iBb3QuwJ4sPrb+nzy1GQjrfyfMqZOdR4i7opRQ== - -"@types/debug@^4.1.6": - version "4.1.8" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.8.tgz#cef723a5d0a90990313faec2d1e22aee5eecb317" - integrity sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ== - dependencies: - "@types/ms" "*" - -"@types/dompurify@^2.0.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9" - integrity sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg== - dependencies: - "@types/trusted-types" "*" - -"@types/electron-localshortcut@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@types/electron-localshortcut/-/electron-localshortcut-3.1.0.tgz#eb3c270bb47f1e0b583749c7e988f5c5c1e7e4a1" - integrity sha512-upKSXMxBPRdz5kmcXfdfn+hWH9PCAvwhyVozDXTIwwHQ1lUJcdSgGUfxOC1QBlnAPKPqcW/r4icWfMosKz8ibg== - dependencies: - electron "*" - -"@types/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.44.2" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.2.tgz#0d21c505f98a89b8dd4d37fa162b09da6089199a" - integrity sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*", "@types/estree@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" - integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== - -"@types/filesize@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@types/filesize/-/filesize-3.6.0.tgz#5f1a25c7b4e3d5ee2bc63133d374d096b7008c8d" - integrity sha512-rOWxCKMjt2DBuwddUnl5GOpf/jAkkqteB+XldncpVxVX+HPTmK2c5ACMOVEbp9gaH81IlhTdC3TwvRa5nopasw== - -"@types/firstline@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@types/firstline/-/firstline-2.0.2.tgz#b7b051c235a667f25f205eaedbfaeeb6c92b8488" - integrity sha512-/Qjs+MO7PwS7EI2k6Iwcc7jHLqf7AlIMDyEmPGB7LrIUFqQWZtbk6UsQxqlPMpOM10f0XiSc6RMsEIKbEGOrGw== - dependencies: - "@types/node" "*" - -"@types/fs-extra@5.0.5": - version "5.0.5" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.5.tgz#080d90a792f3fa2c5559eb44bd8ef840aae9104b" - integrity sha512-w7iqhDH9mN8eLClQOYTkhdYUOSpp25eXxfc6VbFOGtzxW34JcvctH2bKjj4jD4++z4R5iO5D+pg48W2e03I65A== - dependencies: - "@types/node" "*" - -"@types/fs-extra@^9.0.11": - version "9.0.13" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" - integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== - dependencies: - "@types/node" "*" - -"@types/glob@*": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc" - integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w== - dependencies: - "@types/minimatch" "^5.1.2" - "@types/node" "*" - -"@types/glob@^7.1.1": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" - integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - -"@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1": - version "3.3.1" - resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" - integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== - dependencies: - "@types/react" "*" - hoist-non-react-statics "^3.3.0" - -"@types/http-cache-semantics@*": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" - integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== - -"@types/jquery@*": - version "3.5.18" - resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.18.tgz#2a4979866954e601361ddc62ea304c9e46311b77" - integrity sha512-sNm7O6LECFhHmF+3KYo6QIl2fIbjlPYa0PDgDQwfOaEJzwpK20Eub9Ke7VKkGsSJ2K0HUR50S266qYzRX4GlSw== - dependencies: - "@types/sizzle" "*" - -"@types/js-cookie@^2.2.6": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.7.tgz#226a9e31680835a6188e887f3988e60c04d3f6a3" - integrity sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA== - -"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.12" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" - integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== - -"@types/keyv@^3.1.4": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" - integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== - dependencies: - "@types/node" "*" - -"@types/libsodium-wrappers-sumo@^0.7.5": - version "0.7.6" - resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.6.tgz#3ebaf627ddb4957fd6417dd1823490cc2633f01d" - integrity sha512-86R2bYU/DKVWw3q2btxTUlFO3lYKLyodbCsxxSybNQonPzPxmQkNtKCYmkV0dWQ9ZQsGIOzNNPU9RjJUALjoEg== - dependencies: - "@types/libsodium-wrappers" "*" - -"@types/libsodium-wrappers@*": - version "0.7.11" - resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz#4ac53b8a16a4c80d062e32b3849e9d5b8c2f92ed" - integrity sha512-8avZYJny690B6lFZQEDz4PEdCgC8D8qmGE/mhJBzCwzZvsqne61tCRbtJOhxsjYMItEZd3k4SoR4xKKLnI9Ztg== - -"@types/linkify-it@*", "@types/linkify-it@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.3.tgz#15a0712296c5041733c79efe233ba17ae5a7587b" - integrity sha512-pTjcqY9E4nOI55Wgpz7eiI8+LzdYnw3qxXCfHyBDdPbYvbyLgWLJGh8EdPvqawwMK1Uo1794AUkkR38Fr0g+2g== - -"@types/lodash@^4.14.194": - version "4.14.198" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.198.tgz#4d27465257011aedc741a809f1269941fa2c5d4c" - integrity sha512-trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg== - -"@types/long@^3.0.0": - version "3.0.32" - resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69" - integrity sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA== - -"@types/markdown-it@^12.2.3": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51" - integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ== - dependencies: - "@types/linkify-it" "*" - "@types/mdurl" "*" - -"@types/mdurl@*": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9" - integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== - -"@types/minimatch@*", "@types/minimatch@^5.1.2": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" - integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== - -"@types/minimist@^1.2.0": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" - integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== - -"@types/mocha@5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.0.0.tgz#a3014921991066193f6c8e47290d4d598dfd19e6" - integrity sha512-ZS0vBV7Jn5Z/Q4T3VXauEKMDCV8nWOtJJg90OsDylkYJiQwcWtKuLzohWzrthBkerUF7DLMmJcwOPEP0i/AOXw== - -"@types/ms@*": - version "0.7.31" - resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" - integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== - -"@types/node-fetch@^2.5.7": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660" - integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg== - dependencies: - "@types/node" "*" - form-data "^3.0.0" - -"@types/node@*", "@types/node@>=13.7.0": - version "20.5.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.9.tgz#a70ec9d8fa0180a314c3ede0e20ea56ff71aed9a" - integrity sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ== - -"@types/node@20.4.7": - version "20.4.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.7.tgz#74d323a93f1391a63477b27b9aec56669c98b2ab" - integrity sha512-bUBrPjEry2QUTsnuEjzjbS7voGWCc30W0qzgMf90GPeDGFRakvrz47ju+oqDAKCXLUCe39u57/ORMl/O/04/9g== - -"@types/node@^18.11.18": - version "18.17.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.14.tgz#a621ad26e7eb076d6846dd3d39557ddf9d89f04b" - integrity sha512-ZE/5aB73CyGqgQULkLG87N9GnyGe5TcQjv34pwS8tfBs1IkCh0ASM69mydb2znqd6v0eX+9Ytvk6oQRqu8T1Vw== - -"@types/normalize-package-data@^2.4.0": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" - integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== - -"@types/plist@^3.0.1": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" - integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw== - dependencies: - "@types/node" "*" - xmlbuilder ">=11.0.1" - -"@types/prop-types@*": - version "15.7.5" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" - integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== - -"@types/react-dom@^17.0.2": - version "17.0.20" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.20.tgz#e0c8901469d732b36d8473b40b679ad899da1b53" - integrity sha512-4pzIjSxDueZZ90F52mU3aPoogkHIoSIDG+oQ+wQK7Cy2B9S+MvOqY0uEA/qawKz381qrEDkvpwyt8Bm31I8sbA== - dependencies: - "@types/react" "^17" - -"@types/react-mentions@^4.1.8": - version "4.1.8" - resolved "https://registry.yarnpkg.com/@types/react-mentions/-/react-mentions-4.1.8.tgz#4bebe54c5c74181d8eedf1e613a208d03b4a8d7e" - integrity sha512-Go86ozdnh0FTNbiGiDPAcNqYqtab9iGzLOgZPYUKrnhI4539jGzfJtP6rFHcXgi9Koe58yhkeyKYib6Ucul/sQ== - dependencies: - "@types/react" "*" - -"@types/react-redux@^7.1.24": - version "7.1.26" - resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.26.tgz#84149f5614e40274bb70fcbe8f7cae6267d548b1" - integrity sha512-UKPo7Cm7rswYU6PH6CmTNCRv5NYF3HrgKuHEYTK8g/3czYLrUux50gQ2pkxc9c7ZpQZi+PNhgmI8oNIRoiVIxg== - dependencies: - "@types/hoist-non-react-statics" "^3.3.0" - "@types/react" "*" - hoist-non-react-statics "^3.3.0" - redux "^4.0.0" - -"@types/react-virtualized@9.18.12": - version "9.18.12" - resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.12.tgz#541e65c5e0b4629d6a1c6f339171c7943e016ecb" - integrity sha512-Msdpt9zvYlb5Ul4PA339QUkJ0/z2O+gaFxed1rG+2rZjbe6XdYo7jWfJe206KBnjj84DwPPIbPFQCtoGuNwNTQ== - dependencies: - "@types/prop-types" "*" - "@types/react" "*" - -"@types/react@*", "@types/react@17.0.2", "@types/react@^17": - version "17.0.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" - integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== - dependencies: - "@types/prop-types" "*" - csstype "^3.0.2" - -"@types/react@^17.0.2": - version "17.0.65" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.65.tgz#95f6a2ab61145ffb69129d07982d047f9e0870cd" - integrity sha512-oxur785xZYHvnI7TRS61dXbkIhDPnGfsXKv0cNXR/0ml4SipRIFpSMzA7HMEfOywFwJ5AOnPrXYTEiTRUQeGlQ== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/redux-logger@3.0.7": - version "3.0.7" - resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0" - integrity sha512-oV9qiCuowhVR/ehqUobWWkXJjohontbDGLV88Be/7T4bqMQ3kjXwkFNL7doIIqlbg3X2PC5WPziZ8/j/QHNQ4A== - dependencies: - redux "^3.6.0" - -"@types/responselike@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" - integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== - dependencies: - "@types/node" "*" - -"@types/retry@0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" - integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== - -"@types/rimraf@2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e" - integrity sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ== - dependencies: - "@types/glob" "*" - "@types/node" "*" - -"@types/scheduler@*": - version "0.16.3" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5" - integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ== - -"@types/semver@5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" - integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== - -"@types/semver@^7.3.6", "@types/semver@^7.5.0": - version "7.5.1" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.1.tgz#0480eeb7221eb9bc398ad7432c9d7e14b1a5a367" - integrity sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg== - -"@types/sinon@9.0.4": - version "9.0.4" - resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.4.tgz#e934f904606632287a6e7f7ab0ce3f08a0dad4b1" - integrity sha512-sJmb32asJZY6Z2u09bl0G2wglSxDlROlAejCjsnor+LzBMz17gu8IU7vKC/vWDnv9zEq2wqADHVXFjf4eE8Gdw== - dependencies: - "@types/sinonjs__fake-timers" "*" - -"@types/sinonjs__fake-timers@*": - version "8.1.2" - resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz#bf2e02a3dbd4aecaf95942ecd99b7402e03fad5e" - integrity sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA== - -"@types/sizzle@*": - version "2.3.3" - resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef" - integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ== - -"@types/styled-components@^5.1.4": - version "5.1.26" - resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.26.tgz#5627e6812ee96d755028a98dae61d28e57c233af" - integrity sha512-KuKJ9Z6xb93uJiIyxo/+ksS7yLjS1KzG6iv5i78dhVg/X3u5t1H7juRWqVmodIdz6wGVaIApo1u01kmFRdJHVw== - dependencies: - "@types/hoist-non-react-statics" "*" - "@types/react" "*" - csstype "^3.0.2" - -"@types/trusted-types@*": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.3.tgz#a136f83b0758698df454e328759dbd3d44555311" - integrity sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g== - -"@types/underscore@*": - version "1.11.9" - resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.9.tgz#76a071d27e544e422dbf00f956818b1057f377b2" - integrity sha512-M63wKUdsjDFUfyFt1TCUZHGFk9KDAa5JP0adNUErbm0U45Lr06HtANdYRP+GyleEopEoZ4UyBcdAC5TnW4Uz2w== - -"@types/use-sync-external-store@^0.0.3": - version "0.0.3" - resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43" - integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA== - -"@types/uuid@8.3.4": - version "8.3.4" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" - integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== - -"@types/verror@^1.10.3": - version "1.10.6" - resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" - integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ== - -"@types/yargs-parser@*": - version "21.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" - integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== - -"@types/yargs@^17.0.1": - version "17.0.24" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902" - integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw== - dependencies: - "@types/yargs-parser" "*" - -"@types/yauzl@^2.9.1": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" - integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== - dependencies: - "@types/node" "*" - -"@typescript-eslint/eslint-plugin@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.0.tgz#22bb999a8d59893c0ea07923e8a21f9d985ad740" - integrity sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w== - dependencies: - "@eslint-community/regexpp" "^4.5.1" - "@typescript-eslint/scope-manager" "7.1.0" - "@typescript-eslint/type-utils" "7.1.0" - "@typescript-eslint/utils" "7.1.0" - "@typescript-eslint/visitor-keys" "7.1.0" - debug "^4.3.4" - graphemer "^1.4.0" - ignore "^5.2.4" - natural-compare "^1.4.0" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/parser@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.1.0.tgz#b89dab90840f7d2a926bf4c23b519576e8c31970" - integrity sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w== - dependencies: - "@typescript-eslint/scope-manager" "7.1.0" - "@typescript-eslint/types" "7.1.0" - "@typescript-eslint/typescript-estree" "7.1.0" - "@typescript-eslint/visitor-keys" "7.1.0" - debug "^4.3.4" - -"@typescript-eslint/scope-manager@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.1.0.tgz#e4babaa39a3d612eff0e3559f3e99c720a2b4a54" - integrity sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A== - dependencies: - "@typescript-eslint/types" "7.1.0" - "@typescript-eslint/visitor-keys" "7.1.0" - -"@typescript-eslint/type-utils@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.1.0.tgz#372dfa470df181bcee0072db464dc778b75ed722" - integrity sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew== - dependencies: - "@typescript-eslint/typescript-estree" "7.1.0" - "@typescript-eslint/utils" "7.1.0" - debug "^4.3.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/types@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.1.0.tgz#52a86d6236fda646e7e5fe61154991dc0dc433ef" - integrity sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA== - -"@typescript-eslint/typescript-estree@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.0.tgz#419b1310f061feee6df676c5bed460537310c593" - integrity sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ== - dependencies: - "@typescript-eslint/types" "7.1.0" - "@typescript-eslint/visitor-keys" "7.1.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - minimatch "9.0.3" - semver "^7.5.4" - ts-api-utils "^1.0.1" - -"@typescript-eslint/utils@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.1.0.tgz#710ecda62aff4a3c8140edabf3c5292d31111ddd" - integrity sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw== - dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@types/json-schema" "^7.0.12" - "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "7.1.0" - "@typescript-eslint/types" "7.1.0" - "@typescript-eslint/typescript-estree" "7.1.0" - semver "^7.5.4" - -"@typescript-eslint/visitor-keys@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.0.tgz#576c4ad462ca1378135a55e2857d7aced96ce0a0" - integrity sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA== - dependencies: - "@typescript-eslint/types" "7.1.0" - eslint-visitor-keys "^3.4.1" - -"@ungap/promise-all-settled@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" - integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== - -"@ungap/structured-clone@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" - integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== - -"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" - integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - -"@webassemblyjs/floating-point-hex-parser@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" - integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== - -"@webassemblyjs/helper-api-error@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" - integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== - -"@webassemblyjs/helper-buffer@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" - integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== - -"@webassemblyjs/helper-numbers@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" - integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.6" - "@webassemblyjs/helper-api-error" "1.11.6" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" - integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== - -"@webassemblyjs/helper-wasm-section@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" - integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - -"@webassemblyjs/ieee754@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" - integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" - integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" - integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== - -"@webassemblyjs/wasm-edit@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" - integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/helper-wasm-section" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - "@webassemblyjs/wasm-opt" "1.11.6" - "@webassemblyjs/wasm-parser" "1.11.6" - "@webassemblyjs/wast-printer" "1.11.6" - -"@webassemblyjs/wasm-gen@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" - integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/ieee754" "1.11.6" - "@webassemblyjs/leb128" "1.11.6" - "@webassemblyjs/utf8" "1.11.6" - -"@webassemblyjs/wasm-opt@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" - integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - "@webassemblyjs/wasm-parser" "1.11.6" - -"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" - integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-api-error" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/ieee754" "1.11.6" - "@webassemblyjs/leb128" "1.11.6" - "@webassemblyjs/utf8" "1.11.6" - -"@webassemblyjs/wast-printer@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" - integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== - dependencies: - "@webassemblyjs/ast" "1.11.6" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" - integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== - -"@webpack-cli/info@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" - integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== - -"@webpack-cli/serve@^2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" - integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== - -"@xmldom/xmldom@^0.8.8": - version "0.8.10" - resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" - integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== - -"@xobotyi/scrollbar-width@^1.9.5": - version "1.9.5" - resolved "https://registry.yarnpkg.com/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d" - integrity sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ== - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -"@yarnpkg/lockfile@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" - integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== - -JSONStream@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - -abab@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - -abort-controller@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" - integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== - dependencies: - event-target-shim "^5.0.0" - -acorn-import-assertions@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" - integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== - -acorn-jsx@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn-walk@^8.1.1: - version "8.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" - integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== - -acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" - integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== - -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== - dependencies: - ajv "^8.0.0" - -ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv-keywords@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" - integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== - dependencies: - fast-deep-equal "^3.1.3" - -ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^8.0.0, ajv@^8.11.0, ajv@^8.9.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" - integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== - dependencies: - string-width "^4.1.0" - -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-escapes@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6" - integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA== - dependencies: - type-fest "^1.0.2" - -ansi-regex@^2.0.0, ansi-regex@^4.1.1, ansi-regex@^5.0.1, ansi-regex@^6.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" - integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi-styles@^6.0.0, ansi-styles@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" - integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== - -anymatch@~3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" - integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -app-builder-bin@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" - integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== - -app-builder-lib@23.0.8: - version "23.0.8" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.8.tgz#06750dac27b564333f4026db813f4987cabd41b1" - integrity sha512-IObTdRc/0TQsfGn9IvaEXULE/QacgyFgpz3+vmlpZgHHjQ6V1c/T4pKlzNTsNHGjJBuEg2FvTvYi9ZVFfhyWow== - dependencies: - "7zip-bin" "~5.1.1" - "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.2.1" - "@malept/flatpak-bundler" "^0.4.0" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.9" - builder-util "23.0.8" - builder-util-runtime "9.0.2" - chromium-pickle-js "^0.2.0" - debug "^4.3.4" - ejs "^3.1.7" - electron-osx-sign "^0.6.0" - electron-publish "23.0.8" - form-data "^4.0.0" - fs-extra "^10.1.0" - hosted-git-info "^4.1.0" - is-ci "^3.0.0" - isbinaryfile "^4.0.10" - js-yaml "^4.1.0" - lazy-val "^1.0.5" - minimatch "^3.1.2" - read-config-file "6.2.0" - sanitize-filename "^1.6.3" - semver "^7.3.7" - tar "^6.1.11" - temp-file "^3.4.0" - -app-builder-lib@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" - integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== - dependencies: - "7zip-bin" "~5.1.1" - "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.2.1" - "@malept/flatpak-bundler" "^0.4.0" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.9" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chromium-pickle-js "^0.2.0" - debug "^4.3.4" - ejs "^3.1.7" - electron-osx-sign "^0.6.0" - electron-publish "23.6.0" - form-data "^4.0.0" - fs-extra "^10.1.0" - hosted-git-info "^4.1.0" - is-ci "^3.0.0" - isbinaryfile "^4.0.10" - js-yaml "^4.1.0" - lazy-val "^1.0.5" - minimatch "^3.1.2" - read-config-file "6.2.0" - sanitize-filename "^1.6.3" - semver "^7.3.7" - tar "^6.1.11" - temp-file "^3.4.0" - -"aproba@^1.0.3 || ^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" - integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== - -are-we-there-yet@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" - integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== - dependencies: - delegates "^1.0.0" - readable-stream "^3.6.0" - -arg@^4.1.0: - version "4.1.3" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" - integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -array-buffer-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" - integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== - dependencies: - call-bind "^1.0.2" - is-array-buffer "^3.0.1" - -array-buffer-byte-length@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" - integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== - dependencies: - call-bind "^1.0.5" - is-array-buffer "^3.0.4" - -array-ify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" - integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng== - -array-includes@^3.1.6, array-includes@^3.1.7: - version "3.1.7" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda" - integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - is-string "^1.0.7" - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -array.prototype.filter@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz#423771edeb417ff5914111fff4277ea0624c0d0e" - integrity sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-array-method-boxes-properly "^1.0.0" - is-string "^1.0.7" - -array.prototype.findlastindex@^1.2.3: - version "1.2.4" - resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz#d1c50f0b3a9da191981ff8942a0aedd82794404f" - integrity sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ== - dependencies: - call-bind "^1.0.5" - define-properties "^1.2.1" - es-abstract "^1.22.3" - es-errors "^1.3.0" - es-shim-unscopables "^1.0.2" - -array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18" - integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" - -array.prototype.flatmap@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" - integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - -array.prototype.flatmap@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527" - integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" - -array.prototype.tosorted@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532" - integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - get-intrinsic "^1.1.3" - -arraybuffer.prototype.slice@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" - integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw== - dependencies: - array-buffer-byte-length "^1.0.0" - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - is-array-buffer "^3.0.2" - is-shared-array-buffer "^1.0.2" - -arraybuffer.prototype.slice@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" - integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== - dependencies: - array-buffer-byte-length "^1.0.1" - call-bind "^1.0.5" - define-properties "^1.2.1" - es-abstract "^1.22.3" - es-errors "^1.2.1" - get-intrinsic "^1.2.3" - is-array-buffer "^3.0.4" - is-shared-array-buffer "^1.0.2" - -arrify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== - -asar@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221" - integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" - -asbycountry@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/asbycountry/-/asbycountry-1.4.2.tgz#26bf0e090225b93f7d1fc5a177899c900b5c8258" - integrity sha512-NnIJ1lUYJ/M0XmoOA1T5uLQWbD81MDz5MpwufSHymw8j3DauFyTDki7ixxG8nMeUo5GBkFT1U/USOcz0mJnrNQ== - dependencies: - chalk "^1.1.3" - fetch "^1.1.0" - -assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== - -assertion-error@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" - integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== - -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== - -async-exit-hook@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" - integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== - -async@^2.6.4, async@^3.2.3: - version "2.6.4" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" - integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== - dependencies: - lodash "^4.17.14" - -asynciterator.prototype@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62" - integrity sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg== - dependencies: - has-symbols "^1.0.3" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== - -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - -auto-bind@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb" - integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ== - -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== - -available-typed-arrays@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" - integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== - dependencies: - possible-typed-array-names "^1.0.0" - -axios@^1.6.5: - version "1.6.7" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7" - integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA== - dependencies: - follow-redirects "^1.15.4" - form-data "^4.0.0" - proxy-from-env "^1.1.0" - -"babel-plugin-styled-components@>= 1": - version "2.1.4" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz#9a1f37c7f32ef927b4b008b529feb4a2c82b1092" - integrity sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-module-imports" "^7.22.5" - "@babel/plugin-syntax-jsx" "^7.22.5" - lodash "^4.17.21" - picomatch "^2.3.1" - -backbone@1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999" - integrity sha512-aK+k3TiU4tQDUrRCymDDE7XDFnMVuyE6zbZ4JX7mb4pJbQTVOH997/kyBzb8wB2s5Y/Oh7EUfj+sZhwRPxWwow== - dependencies: - underscore ">=1.8.3" - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64-js@^1.3.1, base64-js@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -bindings@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" - integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== - dependencies: - file-uri-to-path "1.0.0" - -biskviit@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/biskviit/-/biskviit-1.0.1.tgz#037a0cd4b71b9e331fd90a1122de17dc49e420a7" - integrity sha512-VGCXdHbdbpEkFgtjkeoBN8vRlbj1ZRX2/mxhE8asCCRalUx2nBzOomLJv8Aw/nRt5+ccDb+tPKidg4XxcfGW4w== - dependencies: - psl "^1.1.7" - -blob-util@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb" - integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ== - -bluebird-lst@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" - integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== - dependencies: - bluebird "^3.5.5" - -bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -blueimp-load-image@5.14.0: - version "5.14.0" - resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-5.14.0.tgz#e8086415e580df802c33ff0da6b37a8d20205cc6" - integrity sha512-g5l+4dCOESBG8HkPLdGnBx8dhEwpQHaOZ0en623sl54o3bGhGMLYGc54L5cWfGmPvfKUjbsY7LOAmcW/xlkBSA== - -boolean@^3.0.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" - integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== - -boxen@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== - dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.2" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - -browserslist@^4.14.5: - version "4.21.10" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0" - integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ== - dependencies: - caniuse-lite "^1.0.30001517" - electron-to-chromium "^1.4.477" - node-releases "^2.0.13" - update-browserslist-db "^1.0.11" - -buffer-alloc-unsafe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" - integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== - -buffer-alloc@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" - integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== - dependencies: - buffer-alloc-unsafe "^1.1.0" - buffer-fill "^1.0.0" - -buffer-crc32@0.2.13, buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== - -buffer-equal@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== - -buffer-fill@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" - integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -buffer@^5.1.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -builder-util-runtime@8.9.2: - version "8.9.2" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28" - integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A== - dependencies: - debug "^4.3.2" - sax "^1.2.4" - -builder-util-runtime@9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.2.tgz#dc54f8581bbcf1e0428da4483fa46d09524be857" - integrity sha512-xF55W/8mgfT6+sMbX0TeiJkTusA5GMOzckM4rajN4KirFcUIuLTH8oEaTYmM86YwVCZaTwa/7GyFhauXaEICwA== - dependencies: - debug "^4.3.4" - sax "^1.2.4" - -builder-util-runtime@9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" - integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== - dependencies: - debug "^4.3.4" - sax "^1.2.4" - -builder-util@23.0.8: - version "23.0.8" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.8.tgz#b59af2248f23270ed669cffc4a442418df83a303" - integrity sha512-xPpnoLLAEPx5oxxzRFINRnxmLNQDn+FddU7QRvCJDQi0jvUJ7UjdoGoM+UPy9yh+p9O82/nC7MHGuUptJkOXyQ== - dependencies: - "7zip-bin" "~5.1.1" - "@types/debug" "^4.1.6" - "@types/fs-extra" "^9.0.11" - app-builder-bin "4.0.0" - bluebird-lst "^1.0.9" - builder-util-runtime "9.0.2" - chalk "^4.1.1" - cross-spawn "^7.0.3" - debug "^4.3.4" - fs-extra "^10.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - is-ci "^3.0.0" - js-yaml "^4.1.0" - source-map-support "^0.5.19" - stat-mode "^1.0.0" - temp-file "^3.4.0" - -builder-util@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" - integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== - dependencies: - "7zip-bin" "~5.1.1" - "@types/debug" "^4.1.6" - "@types/fs-extra" "^9.0.11" - app-builder-bin "4.0.0" - bluebird-lst "^1.0.9" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - cross-spawn "^7.0.3" - debug "^4.3.4" - fs-extra "^10.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - is-ci "^3.0.0" - js-yaml "^4.1.0" - source-map-support "^0.5.19" - stat-mode "^1.0.0" - temp-file "^3.4.0" +# This file is generated by running "yarn install" inside your project. +# Manual changes might be lost - proceed with caution! + +__metadata: + version: 8 + cacheKey: 10c0 + +"7zip-bin@npm:~5.1.1": + version: 5.1.1 + resolution: "7zip-bin@npm:5.1.1" + checksum: 10c0/528db0d93d8a1de62e12624570f49c733e707606602a48be211b2186b6453903b61c659bcc919bfbb021029157af06f43d5017b628fff2a1e66d0190b26eea0e + languageName: node + linkType: hard + +"@aashutoshrathi/word-wrap@npm:^1.2.3": + version: 1.2.6 + resolution: "@aashutoshrathi/word-wrap@npm:1.2.6" + checksum: 10c0/53c2b231a61a46792b39a0d43bc4f4f776bb4542aa57ee04930676802e5501282c2fc8aac14e4cd1f1120ff8b52616b6ff5ab539ad30aa2277d726444b71619f + languageName: node + linkType: hard + +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.22.13": + version: 7.22.13 + resolution: "@babel/code-frame@npm:7.22.13" + dependencies: + "@babel/highlight": "npm:^7.22.13" + chalk: "npm:^2.4.2" + checksum: 10c0/f4cc8ae1000265677daf4845083b72f88d00d311adb1a93c94eb4b07bf0ed6828a81ae4ac43ee7d476775000b93a28a9cddec18fbdc5796212d8dcccd5de72bd + languageName: node + linkType: hard + +"@babel/generator@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/generator@npm:7.22.15" + dependencies: + "@babel/types": "npm:^7.22.15" + "@jridgewell/gen-mapping": "npm:^0.3.2" + "@jridgewell/trace-mapping": "npm:^0.3.17" + jsesc: "npm:^2.5.1" + checksum: 10c0/d5e559584fa43490555eb3aef3480d5bb75069aa045ace638fc86111ff2a53df50d303eeaa5ef4c96e8241896807a77699ec2ff8874ed99f7d31b711660658e7 + languageName: node + linkType: hard + +"@babel/helper-annotate-as-pure@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-annotate-as-pure@npm:7.22.5" + dependencies: + "@babel/types": "npm:^7.22.5" + checksum: 10c0/5a80dc364ddda26b334bbbc0f6426cab647381555ef7d0cd32eb284e35b867c012ce6ce7d52a64672ed71383099c99d32765b3d260626527bb0e3470b0f58e45 + languageName: node + linkType: hard + +"@babel/helper-environment-visitor@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-environment-visitor@npm:7.22.5" + checksum: 10c0/c9377464c1839741a0a77bbad56de94c896f4313eb034c988fc2ab01293e7c4027244c93b4256606c5f4e34c68cf599a7d31a548d537577c7da836bbca40551b + languageName: node + linkType: hard + +"@babel/helper-function-name@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-function-name@npm:7.22.5" + dependencies: + "@babel/template": "npm:^7.22.5" + "@babel/types": "npm:^7.22.5" + checksum: 10c0/3ce2e87967fe54aa463d279150ddda0dae3b5bc3f8c2773b90670b553b61e8fe62da7edcd7b1e1891c5b25af4924a6700dad2e9d8249b910a5bf7caa2eaf4c13 + languageName: node + linkType: hard + +"@babel/helper-hoist-variables@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-hoist-variables@npm:7.22.5" + dependencies: + "@babel/types": "npm:^7.22.5" + checksum: 10c0/60a3077f756a1cd9f14eb89f0037f487d81ede2b7cfe652ea6869cd4ec4c782b0fb1de01b8494b9a2d2050e3d154d7d5ad3be24806790acfb8cbe2073bf1e208 + languageName: node + linkType: hard + +"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.22.5": + version: 7.22.15 + resolution: "@babel/helper-module-imports@npm:7.22.15" + dependencies: + "@babel/types": "npm:^7.22.15" + checksum: 10c0/4e0d7fc36d02c1b8c8b3006dfbfeedf7a367d3334a04934255de5128115ea0bafdeb3e5736a2559917f0653e4e437400d54542da0468e08d3cbc86d3bbfa8f30 + languageName: node + linkType: hard + +"@babel/helper-plugin-utils@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-plugin-utils@npm:7.22.5" + checksum: 10c0/d2c4bfe2fa91058bcdee4f4e57a3f4933aed7af843acfd169cd6179fab8d13c1d636474ecabb2af107dc77462c7e893199aa26632bac1c6d7e025a17cbb9d20d + languageName: node + linkType: hard + +"@babel/helper-split-export-declaration@npm:^7.22.6": + version: 7.22.6 + resolution: "@babel/helper-split-export-declaration@npm:7.22.6" + dependencies: + "@babel/types": "npm:^7.22.5" + checksum: 10c0/d83e4b623eaa9622c267d3c83583b72f3aac567dc393dda18e559d79187961cb29ae9c57b2664137fc3d19508370b12ec6a81d28af73a50e0846819cb21c6e44 + languageName: node + linkType: hard + +"@babel/helper-string-parser@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-string-parser@npm:7.22.5" + checksum: 10c0/6b0ff8af724377ec41e5587fffa7605198da74cb8e7d8d48a36826df0c0ba210eb9fedb3d9bef4d541156e0bd11040f021945a6cbb731ccec4aefb4affa17aa4 + languageName: node + linkType: hard + +"@babel/helper-string-parser@npm:^7.24.1": + version: 7.24.1 + resolution: "@babel/helper-string-parser@npm:7.24.1" + checksum: 10c0/2f9bfcf8d2f9f083785df0501dbab92770111ece2f90d120352fda6dd2a7d47db11b807d111e6f32aa1ba6d763fe2dc6603d153068d672a5d0ad33ca802632b2 + languageName: node + linkType: hard + +"@babel/helper-validator-identifier@npm:^7.22.15, @babel/helper-validator-identifier@npm:^7.22.5": + version: 7.22.15 + resolution: "@babel/helper-validator-identifier@npm:7.22.15" + checksum: 10c0/0473ccfd123cf872206eb916ec506f8963f75db50413560d4d1674aed4cd5d9354826c2514474d6cd40637d3bdc515ba87e8035b4bed683ba62cb607e0081aaf + languageName: node + linkType: hard + +"@babel/helper-validator-identifier@npm:^7.24.5": + version: 7.24.5 + resolution: "@babel/helper-validator-identifier@npm:7.24.5" + checksum: 10c0/05f957229d89ce95a137d04e27f7d0680d84ae48b6ad830e399db0779341f7d30290f863a93351b4b3bde2166737f73a286ea42856bb07c8ddaa95600d38645c + languageName: node + linkType: hard + +"@babel/highlight@npm:^7.22.13": + version: 7.22.13 + resolution: "@babel/highlight@npm:7.22.13" + dependencies: + "@babel/helper-validator-identifier": "npm:^7.22.5" + chalk: "npm:^2.4.2" + js-tokens: "npm:^4.0.0" + checksum: 10c0/65f20132c7ada5d82d343dc23ca61bcd040980f7bd59e480532bcd7f7895aa7abe58470ae8a4f851fd244b71b42a7ad915f7c515fef8f1c2e003777721ebdbe6 + languageName: node + linkType: hard + +"@babel/parser@npm:^7.20.15, @babel/parser@npm:^7.22.15": + version: 7.22.16 + resolution: "@babel/parser@npm:7.22.16" + bin: + parser: ./bin/babel-parser.js + checksum: 10c0/e7b6a7d65e27a08a8be361021c332aa72b989b845c4124e0e2c3ec5810956f8c96baf0f54657d1e1200ee5ec6298b895392d2ff73f9de61418e56c0d2d6f574c + languageName: node + linkType: hard + +"@babel/plugin-syntax-jsx@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/plugin-syntax-jsx@npm:7.22.5" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.22.5" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 10c0/b56ceaa9c6adc17fadfb48e1c801d07797195df2a581489e33c8034950e12e7778de6e1e70d6bcf7c5c7ada6222fe6bad5746187ab280df435f5a2799c8dd0d8 + languageName: node + linkType: hard + +"@babel/runtime@npm:7.4.5": + version: 7.4.5 + resolution: "@babel/runtime@npm:7.4.5" + dependencies: + regenerator-runtime: "npm:^0.13.2" + checksum: 10c0/17d80f109e70e125c9cf7f484ebf02e2d9f1ca2b62297a682ad5fa3935290d48584e100d6b6ad1f6be356764e31405560e677893e0f1802183582166011731fd + languageName: node + linkType: hard + +"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.3.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": + version: 7.22.15 + resolution: "@babel/runtime@npm:7.22.15" + dependencies: + regenerator-runtime: "npm:^0.14.0" + checksum: 10c0/96b74adfd1db812d06ed56d9db12acecfc844d252b93994ce4901433957bd28affba725622a4dc9e7f76384c4cb6cadc3d620d07817c8be9156eaedba5eea059 + languageName: node + linkType: hard + +"@babel/template@npm:^7.22.5": + version: 7.22.15 + resolution: "@babel/template@npm:7.22.15" + dependencies: + "@babel/code-frame": "npm:^7.22.13" + "@babel/parser": "npm:^7.22.15" + "@babel/types": "npm:^7.22.15" + checksum: 10c0/9312edd37cf1311d738907003f2aa321a88a42ba223c69209abe4d7111db019d321805504f606c7fd75f21c6cf9d24d0a8223104cd21ebd207e241b6c551f454 + languageName: node + linkType: hard + +"@babel/traverse@npm:^7.4.5": + version: 7.22.15 + resolution: "@babel/traverse@npm:7.22.15" + dependencies: + "@babel/code-frame": "npm:^7.22.13" + "@babel/generator": "npm:^7.22.15" + "@babel/helper-environment-visitor": "npm:^7.22.5" + "@babel/helper-function-name": "npm:^7.22.5" + "@babel/helper-hoist-variables": "npm:^7.22.5" + "@babel/helper-split-export-declaration": "npm:^7.22.6" + "@babel/parser": "npm:^7.22.15" + "@babel/types": "npm:^7.22.15" + debug: "npm:^4.1.0" + globals: "npm:^11.1.0" + checksum: 10c0/427e52e7393628c447a4a7bd5ede45c47c7cfa0ef8bc4c861fee8957fb98e2ab2b86299919056377e49a511d85672798f186b18520ee74d4a79a6ba772984e4f + languageName: node + linkType: hard + +"@babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5": + version: 7.22.15 + resolution: "@babel/types@npm:7.22.15" + dependencies: + "@babel/helper-string-parser": "npm:^7.22.5" + "@babel/helper-validator-identifier": "npm:^7.22.15" + to-fast-properties: "npm:^2.0.0" + checksum: 10c0/9324743c1586c59737b7590bbc44acc0b46317b66971fd98867ef4cfa1252ecdab2237a1a62437f579af8a2b41d998aa3efb9e8f0939d7de5f0781e91c7ac1ae + languageName: node + linkType: hard + +"@babel/types@npm:^7.8.3": + version: 7.24.5 + resolution: "@babel/types@npm:7.24.5" + dependencies: + "@babel/helper-string-parser": "npm:^7.24.1" + "@babel/helper-validator-identifier": "npm:^7.24.5" + to-fast-properties: "npm:^2.0.0" + checksum: 10c0/e1284eb046c5e0451b80220d1200e2327e0a8544a2fe45bb62c952e5fdef7099c603d2336b17b6eac3cc046b7a69bfbce67fe56e1c0ea48cd37c65cb88638f2a + languageName: node + linkType: hard + +"@commitlint/cli@npm:^17.7.1": + version: 17.7.1 + resolution: "@commitlint/cli@npm:17.7.1" + dependencies: + "@commitlint/format": "npm:^17.4.4" + "@commitlint/lint": "npm:^17.7.0" + "@commitlint/load": "npm:^17.7.1" + "@commitlint/read": "npm:^17.5.1" + "@commitlint/types": "npm:^17.4.4" + execa: "npm:^5.0.0" + lodash.isfunction: "npm:^3.0.9" + resolve-from: "npm:5.0.0" + resolve-global: "npm:1.0.0" + yargs: "npm:^17.0.0" + bin: + commitlint: cli.js + checksum: 10c0/d2d184c446289d9abf065a5925c6976237ce0a4e10ab890d439143d128532701da6140cae9497320a4072b50c2087473b2a9176bac2c86f67a5367269b08718c + languageName: node + linkType: hard + +"@commitlint/config-conventional@npm:^17.7.0": + version: 17.7.0 + resolution: "@commitlint/config-conventional@npm:17.7.0" + dependencies: + conventional-changelog-conventionalcommits: "npm:^6.1.0" + checksum: 10c0/582a087464a8e6f96deefe53da4761c75101eb657cc987fb2bfc50c4eeb7a5d9359b48c8084b67bdedaa2234f641f90aae38a4e8afb21a0f345005f2eee0f3cd + languageName: node + linkType: hard + +"@commitlint/config-validator@npm:^17.6.7": + version: 17.6.7 + resolution: "@commitlint/config-validator@npm:17.6.7" + dependencies: + "@commitlint/types": "npm:^17.4.4" + ajv: "npm:^8.11.0" + checksum: 10c0/42873d8ef71b911e1c06f3422479a41e92bdb573336a34ed2defc26a635097b07ef4bf3ec0b2eb2474eef851350f8a138341cec1573b52957d2bb91482efb1e0 + languageName: node + linkType: hard + +"@commitlint/ensure@npm:^17.6.7": + version: 17.6.7 + resolution: "@commitlint/ensure@npm:17.6.7" + dependencies: + "@commitlint/types": "npm:^17.4.4" + lodash.camelcase: "npm:^4.3.0" + lodash.kebabcase: "npm:^4.1.1" + lodash.snakecase: "npm:^4.1.1" + lodash.startcase: "npm:^4.4.0" + lodash.upperfirst: "npm:^4.3.1" + checksum: 10c0/9148bb9a38dd4262b2a4cfe4a7a4898cb0420a8ad63a0c46eac1d25a208dd6207906ef50dbd2f12b9dbb890c0ca49e9f92f4a1418cdd59fe7de95badfb5a9072 + languageName: node + linkType: hard + +"@commitlint/execute-rule@npm:^17.4.0": + version: 17.4.0 + resolution: "@commitlint/execute-rule@npm:17.4.0" + checksum: 10c0/832870273d6414663799ae3339317aeab629be01e3a5c0e6382628f5b84ab417c64475dcd63dfc55d55388d00d5cfdf97f72173b3553f33a6daf7ab9982c37db + languageName: node + linkType: hard + +"@commitlint/format@npm:^17.4.4": + version: 17.4.4 + resolution: "@commitlint/format@npm:17.4.4" + dependencies: + "@commitlint/types": "npm:^17.4.4" + chalk: "npm:^4.1.0" + checksum: 10c0/6b3e84c4dd9d8331505de6039f1cbfb37e129567a30fff12beb17c27f1e52b5dd8ca68ed7a8e9b66378ae29817cbe0d4bf24c42f151dee24582c8c1d6cdfb306 + languageName: node + linkType: hard + +"@commitlint/is-ignored@npm:^17.7.0": + version: 17.7.0 + resolution: "@commitlint/is-ignored@npm:17.7.0" + dependencies: + "@commitlint/types": "npm:^17.4.4" + semver: "npm:7.5.4" + checksum: 10c0/f1374feb0c39f3d2b612a883d91d40295ed0b1491ec27a54444b0364ea677a7975825653ba222f07985bc9fafe03d5f9045130a46a4cdd0fd678f1d6552c45a9 + languageName: node + linkType: hard + +"@commitlint/lint@npm:^17.7.0": + version: 17.7.0 + resolution: "@commitlint/lint@npm:17.7.0" + dependencies: + "@commitlint/is-ignored": "npm:^17.7.0" + "@commitlint/parse": "npm:^17.7.0" + "@commitlint/rules": "npm:^17.7.0" + "@commitlint/types": "npm:^17.4.4" + checksum: 10c0/1a14c123d172af249b7fa64442af5185d5a421656fa35ab0c3a5f97625e2152ef44b0fbefb551d3eb9d23d8d77f77c06ca1554cfd5cdab81d94fd290c045e883 + languageName: node + linkType: hard + +"@commitlint/load@npm:^17.7.1": + version: 17.7.1 + resolution: "@commitlint/load@npm:17.7.1" + dependencies: + "@commitlint/config-validator": "npm:^17.6.7" + "@commitlint/execute-rule": "npm:^17.4.0" + "@commitlint/resolve-extends": "npm:^17.6.7" + "@commitlint/types": "npm:^17.4.4" + "@types/node": "npm:20.4.7" + chalk: "npm:^4.1.0" + cosmiconfig: "npm:^8.0.0" + cosmiconfig-typescript-loader: "npm:^4.0.0" + lodash.isplainobject: "npm:^4.0.6" + lodash.merge: "npm:^4.6.2" + lodash.uniq: "npm:^4.5.0" + resolve-from: "npm:^5.0.0" + ts-node: "npm:^10.8.1" + typescript: "npm:^4.6.4 || ^5.0.0" + checksum: 10c0/5861f72acf08cf5c18e83545b344cd76a4c1111ed149e9c3afe9084d9035ddb9b35100272291c2bd99736a5ed56032c8a3614ae5574ab862b7dcd920549b7721 + languageName: node + linkType: hard + +"@commitlint/message@npm:^17.4.2": + version: 17.4.2 + resolution: "@commitlint/message@npm:17.4.2" + checksum: 10c0/9ff0339852babf4c3f7af3ce43762a640a7e2664ccd86cc7b623efca079f13a9efe1567eb2d0cfed30e9d410bbd74e6ceb884d9d139e6761fdaabd81e0d1db51 + languageName: node + linkType: hard + +"@commitlint/parse@npm:^17.7.0": + version: 17.7.0 + resolution: "@commitlint/parse@npm:17.7.0" + dependencies: + "@commitlint/types": "npm:^17.4.4" + conventional-changelog-angular: "npm:^6.0.0" + conventional-commits-parser: "npm:^4.0.0" + checksum: 10c0/d1872386e5435ffb702c121febaad4fb1d8449c1d605b19d433b17d9959928f39f2ac7a6cce6938038955a69bc9b86a064b9436f99c0a88cd6958014b8b48c48 + languageName: node + linkType: hard + +"@commitlint/read@npm:^17.5.1": + version: 17.5.1 + resolution: "@commitlint/read@npm:17.5.1" + dependencies: + "@commitlint/top-level": "npm:^17.4.0" + "@commitlint/types": "npm:^17.4.4" + fs-extra: "npm:^11.0.0" + git-raw-commits: "npm:^2.0.11" + minimist: "npm:^1.2.6" + checksum: 10c0/60c4351eb8c8bdafa331f690486bfc338ddb3c2341e6cd168ea38748116a75ad96711f08825e2faeb90d85b43d07ced221b2f69c6f228001b57372a39bdafefe + languageName: node + linkType: hard + +"@commitlint/resolve-extends@npm:^17.6.7": + version: 17.6.7 + resolution: "@commitlint/resolve-extends@npm:17.6.7" + dependencies: + "@commitlint/config-validator": "npm:^17.6.7" + "@commitlint/types": "npm:^17.4.4" + import-fresh: "npm:^3.0.0" + lodash.mergewith: "npm:^4.6.2" + resolve-from: "npm:^5.0.0" + resolve-global: "npm:^1.0.0" + checksum: 10c0/cc5ac764662bebda63084c1fa8bf17692145abf3621dc60e735163bd06e90458a69f6e14c60854a792b51386f485f73930b290bc4d05c110639b27e89be0b7d5 + languageName: node + linkType: hard + +"@commitlint/rules@npm:^17.7.0": + version: 17.7.0 + resolution: "@commitlint/rules@npm:17.7.0" + dependencies: + "@commitlint/ensure": "npm:^17.6.7" + "@commitlint/message": "npm:^17.4.2" + "@commitlint/to-lines": "npm:^17.4.0" + "@commitlint/types": "npm:^17.4.4" + execa: "npm:^5.0.0" + checksum: 10c0/0d406abf63d8ffb11574a724d7c063208969d7dee109e0a51a0f2250ff82e708baaed10244c7c71ed78ba63dcf6f0541cdd139d88ae13ff9177e572b5667eb18 + languageName: node + linkType: hard + +"@commitlint/to-lines@npm:^17.4.0": + version: 17.4.0 + resolution: "@commitlint/to-lines@npm:17.4.0" + checksum: 10c0/6d02a4e731820168ce6fca7150587170a291786a7edc93438d4ec09997675d322ea38b7533d5c32de50ca0092d89d111bf8118a78d6025603dee6587a3fa68da + languageName: node + linkType: hard + +"@commitlint/top-level@npm:^17.4.0": + version: 17.4.0 + resolution: "@commitlint/top-level@npm:17.4.0" + dependencies: + find-up: "npm:^5.0.0" + checksum: 10c0/67677d11b55b27826cb7fb70556cd237435336280e0e65b622eca778f5761aa1011d99e78101a23726b3d6649338967369d3ccb0371b60a21f7f9c65ff565f2d + languageName: node + linkType: hard + +"@commitlint/types@npm:^17.4.4": + version: 17.4.4 + resolution: "@commitlint/types@npm:17.4.4" + dependencies: + chalk: "npm:^4.1.0" + checksum: 10c0/d6419001d8044954f68ec077a54b21ad73f36901287abf496cf31ccf4d66ea7b816adf7143290d0f382f2ef625416b1d2fa99ad8b80876e1d5772a8c7165cd26 + languageName: node + linkType: hard + +"@cspotcode/source-map-support@npm:^0.8.0": + version: 0.8.1 + resolution: "@cspotcode/source-map-support@npm:0.8.1" + dependencies: + "@jridgewell/trace-mapping": "npm:0.3.9" + checksum: 10c0/05c5368c13b662ee4c122c7bfbe5dc0b613416672a829f3e78bc49a357a197e0218d6e74e7c66cfcd04e15a179acab080bd3c69658c9fbefd0e1ccd950a07fc6 + languageName: node + linkType: hard + +"@develar/schema-utils@npm:~2.6.5": + version: 2.6.5 + resolution: "@develar/schema-utils@npm:2.6.5" + dependencies: + ajv: "npm:^6.12.0" + ajv-keywords: "npm:^3.4.1" + checksum: 10c0/7c6075ce6742dd5c89b3cebf81351ec1d73dafc7c3409748860e4f8262fb26ffe6d998c5baab4eca579cd436e7c6c12c615fe89819c19484a22d25b3e6825cb5 + languageName: node + linkType: hard + +"@discoveryjs/json-ext@npm:^0.5.0": + version: 0.5.7 + resolution: "@discoveryjs/json-ext@npm:0.5.7" + checksum: 10c0/e10f1b02b78e4812646ddf289b7d9f2cb567d336c363b266bd50cd223cf3de7c2c74018d91cd2613041568397ef3a4a2b500aba588c6e5bd78c38374ba68f38c + languageName: node + linkType: hard + +"@electron/get@npm:^2.0.0": + version: 2.0.3 + resolution: "@electron/get@npm:2.0.3" + dependencies: + debug: "npm:^4.1.1" + env-paths: "npm:^2.2.0" + fs-extra: "npm:^8.1.0" + global-agent: "npm:^3.0.0" + got: "npm:^11.8.5" + progress: "npm:^2.0.3" + semver: "npm:^6.2.0" + sumchecker: "npm:^3.0.1" + dependenciesMeta: + global-agent: + optional: true + checksum: 10c0/148957d531bac50c29541515f2483c3e5c9c6ba9f0269a5d536540d2b8d849188a89588f18901f3a84c2b4fd376d1e0c5ea2159eb2d17bda68558f57df19015e + languageName: node + linkType: hard + +"@electron/notarize@npm:^2.1.0": + version: 2.1.0 + resolution: "@electron/notarize@npm:2.1.0" + dependencies: + debug: "npm:^4.1.1" + fs-extra: "npm:^9.0.1" + promise-retry: "npm:^2.0.1" + checksum: 10c0/fa51f657c2bba43c2828073fa5d50313d93dfc177f8402ee1ef27ecabe363efaa98f3b53e5b71b0324451228cdc51c31392487bc2d36c427a9918e6bc68ca7ac + languageName: node + linkType: hard + +"@electron/universal@npm:1.2.1": + version: 1.2.1 + resolution: "@electron/universal@npm:1.2.1" + dependencies: + "@malept/cross-spawn-promise": "npm:^1.1.0" + asar: "npm:^3.1.0" + debug: "npm:^4.3.1" + dir-compare: "npm:^2.4.0" + fs-extra: "npm:^9.0.1" + minimatch: "npm:^3.0.4" + plist: "npm:^3.0.4" + checksum: 10c0/b6e2c5948db24944d23fb16621154af93fdee56ee87dcbe18534d44d2d519f50572fe784310640cd6a3be3ebe4b0f393fbc20e7aa57c410afff6834344f6bb05 + languageName: node + linkType: hard + +"@emoji-mart/data@npm:^1.1.2": + version: 1.1.2 + resolution: "@emoji-mart/data@npm:1.1.2" + checksum: 10c0/595032fbbd7b646a75490729488f654085b1a80dfb52aa4ec355ec1be304f3fbb3fa7d2b9d6da7b4b609fbf1bcd34df5d9031d9db294d7bf651108df96c0ecd2 + languageName: node + linkType: hard + +"@emoji-mart/react@npm:^1.1.1": + version: 1.1.1 + resolution: "@emoji-mart/react@npm:1.1.1" + peerDependencies: + emoji-mart: ^5.2 + react: ^16.8 || ^17 || ^18 + checksum: 10c0/88a9c8c24bbc5695f0ed2458734c9982c965a16db1999bc731c7cce77f9bf228f1871e899744f9a3f9fdd36a11db7ad6c0e049d710cb91c66c69a2cd4d2ee40a + languageName: node + linkType: hard + +"@emotion/is-prop-valid@npm:^0.8.8": + version: 0.8.8 + resolution: "@emotion/is-prop-valid@npm:0.8.8" + dependencies: + "@emotion/memoize": "npm:0.7.4" + checksum: 10c0/f6be625f067c7fa56a12a4edaf090715616dc4fc7803c87212831f38c969350107b9709b1be54100e53153b18d9fa068eb4bf4f9ac66a37a8edf1bac9b64e279 + languageName: node + linkType: hard + +"@emotion/memoize@npm:0.7.4": + version: 0.7.4 + resolution: "@emotion/memoize@npm:0.7.4" + checksum: 10c0/b2376548fc147b43afd1ff005a80a1a025bd7eb4fb759fdb23e96e5ff290ee8ba16628a332848d600fb91c3cdc319eee5395fa33d8875e5d5a8c4ce18cddc18e + languageName: node + linkType: hard + +"@emotion/stylis@npm:^0.8.4": + version: 0.8.5 + resolution: "@emotion/stylis@npm:0.8.5" + checksum: 10c0/f109e3f11cb0d48e8658aaa23578c5bcfe35e297819cfb089a3de6ba8dc0f89b0960474922690c6028df5d2e1895b4967f2fb280642c030054c312f1e137ce26 + languageName: node + linkType: hard + +"@emotion/unitless@npm:^0.7.4": + version: 0.7.5 + resolution: "@emotion/unitless@npm:0.7.5" + checksum: 10c0/4d0d94f53cb97b4481bbfa394953e1899a0b877644642ba9dd7247c27eb8c48e14e22aeb11411d7d9874685ad85dd5fb5b50eb78c6d8840eb56a84b92dcef2f4 + languageName: node + linkType: hard + +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": + version: 4.4.0 + resolution: "@eslint-community/eslint-utils@npm:4.4.0" + dependencies: + eslint-visitor-keys: "npm:^3.3.0" + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + checksum: 10c0/7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e + languageName: node + linkType: hard + +"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1": + version: 4.8.0 + resolution: "@eslint-community/regexpp@npm:4.8.0" + checksum: 10c0/77252aecfea8a2eb02bb076803f78c1529963e9a7f1cb1be5305126f5582a0cbd1cb6ab38a8ac952633cfd5659c101e8b8b494c69376a2481ddd9bd156419fdd + languageName: node + linkType: hard + +"@eslint/eslintrc@npm:^2.1.4": + version: 2.1.4 + resolution: "@eslint/eslintrc@npm:2.1.4" + dependencies: + ajv: "npm:^6.12.4" + debug: "npm:^4.3.2" + espree: "npm:^9.6.0" + globals: "npm:^13.19.0" + ignore: "npm:^5.2.0" + import-fresh: "npm:^3.2.1" + js-yaml: "npm:^4.1.0" + minimatch: "npm:^3.1.2" + strip-json-comments: "npm:^3.1.1" + checksum: 10c0/32f67052b81768ae876c84569ffd562491ec5a5091b0c1e1ca1e0f3c24fb42f804952fdd0a137873bc64303ba368a71ba079a6f691cee25beee9722d94cc8573 + languageName: node + linkType: hard + +"@eslint/js@npm:8.57.0": + version: 8.57.0 + resolution: "@eslint/js@npm:8.57.0" + checksum: 10c0/9a518bb8625ba3350613903a6d8c622352ab0c6557a59fe6ff6178bf882bf57123f9d92aa826ee8ac3ee74b9c6203fe630e9ee00efb03d753962dcf65ee4bd94 + languageName: node + linkType: hard + +"@humanwhocodes/config-array@npm:^0.11.14": + version: 0.11.14 + resolution: "@humanwhocodes/config-array@npm:0.11.14" + dependencies: + "@humanwhocodes/object-schema": "npm:^2.0.2" + debug: "npm:^4.3.1" + minimatch: "npm:^3.0.5" + checksum: 10c0/66f725b4ee5fdd8322c737cb5013e19fac72d4d69c8bf4b7feb192fcb83442b035b92186f8e9497c220e58b2d51a080f28a73f7899bc1ab288c3be172c467541 + languageName: node + linkType: hard + +"@humanwhocodes/module-importer@npm:^1.0.1": + version: 1.0.1 + resolution: "@humanwhocodes/module-importer@npm:1.0.1" + checksum: 10c0/909b69c3b86d482c26b3359db16e46a32e0fb30bd306a3c176b8313b9e7313dba0f37f519de6aa8b0a1921349e505f259d19475e123182416a506d7f87e7f529 + languageName: node + linkType: hard + +"@humanwhocodes/object-schema@npm:^2.0.2": + version: 2.0.2 + resolution: "@humanwhocodes/object-schema@npm:2.0.2" + checksum: 10c0/6fd83dc320231d71c4541d0244051df61f301817e9f9da9fd4cb7e44ec8aacbde5958c1665b0c419401ab935114fdf532a6ad5d4e7294b1af2f347dd91a6983f + languageName: node + linkType: hard + +"@iconify/icons-mdi@npm:~1.1.0": + version: 1.1.47 + resolution: "@iconify/icons-mdi@npm:1.1.47" + checksum: 10c0/552c5750254b2504389eae2724ea2dfc090e7df938cc836936bdca1ef684d42e1bb416e1527ebc4ab94e2812ce69ac3a949b561d96004b97249526115265ff8e + languageName: node + linkType: hard + +"@iconify/react@npm:^3.1.3": + version: 3.2.2 + resolution: "@iconify/react@npm:3.2.2" + peerDependencies: + react: ">=16" + checksum: 10c0/7e1dc3c13ea4fb6363ce8caf22b66ad65d3eef92a30768d2d73dfd418bd8fae4ec98e718f1f66be3e258d5560ce2103938e8add086d1fa616f3b807e9f46c30d + languageName: node + linkType: hard + +"@isaacs/cliui@npm:^8.0.2": + version: 8.0.2 + resolution: "@isaacs/cliui@npm:8.0.2" + dependencies: + string-width: "npm:^5.1.2" + string-width-cjs: "npm:string-width@^4.2.0" + strip-ansi: "npm:^7.0.1" + strip-ansi-cjs: "npm:strip-ansi@^6.0.1" + wrap-ansi: "npm:^8.1.0" + wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0" + checksum: 10c0/b1bf42535d49f11dc137f18d5e4e63a28c5569de438a221c369483731e9dac9fb797af554e8bf02b6192d1e5eba6e6402cf93900c3d0ac86391d00d04876789e + languageName: node + linkType: hard + +"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2": + version: 0.3.3 + resolution: "@jridgewell/gen-mapping@npm:0.3.3" + dependencies: + "@jridgewell/set-array": "npm:^1.0.1" + "@jridgewell/sourcemap-codec": "npm:^1.4.10" + "@jridgewell/trace-mapping": "npm:^0.3.9" + checksum: 10c0/376fc11cf5a967318ba3ddd9d8e91be528eab6af66810a713c49b0c3f8dc67e9949452c51c38ab1b19aa618fb5e8594da5a249977e26b1e7fea1ee5a1fcacc74 + languageName: node + linkType: hard + +"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0": + version: 3.1.1 + resolution: "@jridgewell/resolve-uri@npm:3.1.1" + checksum: 10c0/0dbc9e29bc640bbbdc5b9876d2859c69042bfcf1423c1e6421bcca53e826660bff4e41c7d4bcb8dbea696404231a6f902f76ba41835d049e20f2dd6cffb713bf + languageName: node + linkType: hard + +"@jridgewell/set-array@npm:^1.0.1": + version: 1.1.2 + resolution: "@jridgewell/set-array@npm:1.1.2" + checksum: 10c0/bc7ab4c4c00470de4e7562ecac3c0c84f53e7ee8a711e546d67c47da7febe7c45cd67d4d84ee3c9b2c05ae8e872656cdded8a707a283d30bd54fbc65aef821ab + languageName: node + linkType: hard + +"@jridgewell/source-map@npm:^0.3.3": + version: 0.3.5 + resolution: "@jridgewell/source-map@npm:0.3.5" + dependencies: + "@jridgewell/gen-mapping": "npm:^0.3.0" + "@jridgewell/trace-mapping": "npm:^0.3.9" + checksum: 10c0/b985d9ebd833a21a6e9ace820c8a76f60345a34d9e28d98497c16b6e93ce1f131bff0abd45f8585f14aa382cce678ed680d628c631b40a9616a19cfbc2049b68 + languageName: node + linkType: hard + +"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14": + version: 1.4.15 + resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" + checksum: 10c0/0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5 + languageName: node + linkType: hard + +"@jridgewell/trace-mapping@npm:0.3.9": + version: 0.3.9 + resolution: "@jridgewell/trace-mapping@npm:0.3.9" + dependencies: + "@jridgewell/resolve-uri": "npm:^3.0.3" + "@jridgewell/sourcemap-codec": "npm:^1.4.10" + checksum: 10c0/fa425b606d7c7ee5bfa6a31a7b050dd5814b4082f318e0e4190f991902181b4330f43f4805db1dd4f2433fd0ed9cc7a7b9c2683f1deeab1df1b0a98b1e24055b + languageName: node + linkType: hard + +"@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": + version: 0.3.19 + resolution: "@jridgewell/trace-mapping@npm:0.3.19" + dependencies: + "@jridgewell/resolve-uri": "npm:^3.1.0" + "@jridgewell/sourcemap-codec": "npm:^1.4.14" + checksum: 10c0/845e6c6efca621b2b85e4d13fd25c319b6e4ab1ea78d4385ff6c0f78322ea0fcdfec8ac763aa4b56e8378c96d7bef101a2638c7a1a076f7d62f6376230c940a7 + languageName: node + linkType: hard + +"@jsdoc/salty@npm:^0.2.1": + version: 0.2.5 + resolution: "@jsdoc/salty@npm:0.2.5" + dependencies: + lodash: "npm:^4.17.21" + checksum: 10c0/ae2441ea2f11c19cfc8a65a0c25ac0ca2699813732d0b95571f646100a535507a8c5c68f5105e215b331a4445d3287da451fdfff65f8e8d4740c260aaa416b65 + languageName: node + linkType: hard + +"@malept/cross-spawn-promise@npm:^1.1.0": + version: 1.1.1 + resolution: "@malept/cross-spawn-promise@npm:1.1.1" + dependencies: + cross-spawn: "npm:^7.0.1" + checksum: 10c0/74c427a152ffff0f19b74af6479d05bef1e996d5e081cfc3b8c47477b9240bd1c42a930884cbcd0c89ee3835201a3bd88d0b0bfd754c0cbb56fc84a28996a8e7 + languageName: node + linkType: hard + +"@malept/flatpak-bundler@npm:^0.4.0": + version: 0.4.0 + resolution: "@malept/flatpak-bundler@npm:0.4.0" + dependencies: + debug: "npm:^4.1.1" + fs-extra: "npm:^9.0.0" + lodash: "npm:^4.17.15" + tmp-promise: "npm:^3.0.2" + checksum: 10c0/b3c87f6482b1956411af1118c771afb39cd9a0568fbb5e86015547ff6d68d2e73a7f0d74b75a57f0a156391c347c8d0adc1037e75172b92da72b96e0a05a2f4f + languageName: node + linkType: hard + +"@nodelib/fs.scandir@npm:2.1.5": + version: 2.1.5 + resolution: "@nodelib/fs.scandir@npm:2.1.5" + dependencies: + "@nodelib/fs.stat": "npm:2.0.5" + run-parallel: "npm:^1.1.9" + checksum: 10c0/732c3b6d1b1e967440e65f284bd06e5821fedf10a1bea9ed2bb75956ea1f30e08c44d3def9d6a230666574edbaf136f8cfd319c14fd1f87c66e6a44449afb2eb + languageName: node + linkType: hard + +"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2": + version: 2.0.5 + resolution: "@nodelib/fs.stat@npm:2.0.5" + checksum: 10c0/88dafe5e3e29a388b07264680dc996c17f4bda48d163a9d4f5c1112979f0ce8ec72aa7116122c350b4e7976bc5566dc3ddb579be1ceaacc727872eb4ed93926d + languageName: node + linkType: hard + +"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8": + version: 1.2.8 + resolution: "@nodelib/fs.walk@npm:1.2.8" + dependencies: + "@nodelib/fs.scandir": "npm:2.1.5" + fastq: "npm:^1.6.0" + checksum: 10c0/db9de047c3bb9b51f9335a7bb46f4fcfb6829fb628318c12115fbaf7d369bfce71c15b103d1fc3b464812d936220ee9bc1c8f762d032c9f6be9acc99249095b1 + languageName: node + linkType: hard + +"@npmcli/agent@npm:^2.0.0": + version: 2.2.2 + resolution: "@npmcli/agent@npm:2.2.2" + dependencies: + agent-base: "npm:^7.1.0" + http-proxy-agent: "npm:^7.0.0" + https-proxy-agent: "npm:^7.0.1" + lru-cache: "npm:^10.0.1" + socks-proxy-agent: "npm:^8.0.3" + checksum: 10c0/325e0db7b287d4154ecd164c0815c08007abfb07653cc57bceded17bb7fd240998a3cbdbe87d700e30bef494885eccc725ab73b668020811d56623d145b524ae + languageName: node + linkType: hard + +"@npmcli/fs@npm:^3.1.0": + version: 3.1.1 + resolution: "@npmcli/fs@npm:3.1.1" + dependencies: + semver: "npm:^7.3.5" + checksum: 10c0/c37a5b4842bfdece3d14dfdb054f73fe15ed2d3da61b34ff76629fb5b1731647c49166fd2a8bf8b56fcfa51200382385ea8909a3cbecdad612310c114d3f6c99 + languageName: node + linkType: hard + +"@pkgjs/parseargs@npm:^0.11.0": + version: 0.11.0 + resolution: "@pkgjs/parseargs@npm:0.11.0" + checksum: 10c0/5bd7576bb1b38a47a7fc7b51ac9f38748e772beebc56200450c4a817d712232b8f1d3ef70532c80840243c657d491cf6a6be1e3a214cff907645819fdc34aadd + languageName: node + linkType: hard + +"@protobufjs/aspromise@npm:^1.1.1, @protobufjs/aspromise@npm:^1.1.2": + version: 1.1.2 + resolution: "@protobufjs/aspromise@npm:1.1.2" + checksum: 10c0/a83343a468ff5b5ec6bff36fd788a64c839e48a07ff9f4f813564f58caf44d011cd6504ed2147bf34835bd7a7dd2107052af755961c6b098fd8902b4f6500d0f + languageName: node + linkType: hard + +"@protobufjs/base64@npm:^1.1.2": + version: 1.1.2 + resolution: "@protobufjs/base64@npm:1.1.2" + checksum: 10c0/eec925e681081af190b8ee231f9bad3101e189abbc182ff279da6b531e7dbd2a56f1f306f37a80b1be9e00aa2d271690d08dcc5f326f71c9eed8546675c8caf6 + languageName: node + linkType: hard + +"@protobufjs/codegen@npm:^2.0.4": + version: 2.0.4 + resolution: "@protobufjs/codegen@npm:2.0.4" + checksum: 10c0/26ae337c5659e41f091606d16465bbcc1df1f37cc1ed462438b1f67be0c1e28dfb2ca9f294f39100c52161aef82edf758c95d6d75650a1ddf31f7ddee1440b43 + languageName: node + linkType: hard + +"@protobufjs/eventemitter@npm:^1.1.0": + version: 1.1.0 + resolution: "@protobufjs/eventemitter@npm:1.1.0" + checksum: 10c0/1eb0a75180e5206d1033e4138212a8c7089a3d418c6dfa5a6ce42e593a4ae2e5892c4ef7421f38092badba4040ea6a45f0928869989411001d8c1018ea9a6e70 + languageName: node + linkType: hard + +"@protobufjs/fetch@npm:^1.1.0": + version: 1.1.0 + resolution: "@protobufjs/fetch@npm:1.1.0" + dependencies: + "@protobufjs/aspromise": "npm:^1.1.1" + "@protobufjs/inquire": "npm:^1.1.0" + checksum: 10c0/cda6a3dc2d50a182c5865b160f72077aac197046600091dbb005dd0a66db9cce3c5eaed6d470ac8ed49d7bcbeef6ee5f0bc288db5ff9a70cbd003e5909065233 + languageName: node + linkType: hard + +"@protobufjs/float@npm:^1.0.2": + version: 1.0.2 + resolution: "@protobufjs/float@npm:1.0.2" + checksum: 10c0/18f2bdede76ffcf0170708af15c9c9db6259b771e6b84c51b06df34a9c339dbbeec267d14ce0bddd20acc142b1d980d983d31434398df7f98eb0c94a0eb79069 + languageName: node + linkType: hard + +"@protobufjs/inquire@npm:^1.1.0": + version: 1.1.0 + resolution: "@protobufjs/inquire@npm:1.1.0" + checksum: 10c0/64372482efcba1fb4d166a2664a6395fa978b557803857c9c03500e0ac1013eb4b1aacc9ed851dd5fc22f81583670b4f4431bae186f3373fedcfde863ef5921a + languageName: node + linkType: hard + +"@protobufjs/path@npm:^1.1.2": + version: 1.1.2 + resolution: "@protobufjs/path@npm:1.1.2" + checksum: 10c0/cece0a938e7f5dfd2fa03f8c14f2f1cf8b0d6e13ac7326ff4c96ea311effd5fb7ae0bba754fbf505312af2e38500250c90e68506b97c02360a43793d88a0d8b4 + languageName: node + linkType: hard + +"@protobufjs/pool@npm:^1.1.0": + version: 1.1.0 + resolution: "@protobufjs/pool@npm:1.1.0" + checksum: 10c0/eda2718b7f222ac6e6ad36f758a92ef90d26526026a19f4f17f668f45e0306a5bd734def3f48f51f8134ae0978b6262a5c517c08b115a551756d1a3aadfcf038 + languageName: node + linkType: hard + +"@protobufjs/utf8@npm:^1.1.0": + version: 1.1.0 + resolution: "@protobufjs/utf8@npm:1.1.0" + checksum: 10c0/a3fe31fe3fa29aa3349e2e04ee13dc170cc6af7c23d92ad49e3eeaf79b9766264544d3da824dba93b7855bd6a2982fb40032ef40693da98a136d835752beb487 + languageName: node + linkType: hard + +"@reduxjs/toolkit@npm:1.8.5": + version: 1.8.5 + resolution: "@reduxjs/toolkit@npm:1.8.5" + dependencies: + immer: "npm:^9.0.7" + redux: "npm:^4.1.2" + redux-thunk: "npm:^2.4.1" + reselect: "npm:^4.1.5" + peerDependencies: + react: ^16.9.0 || ^17.0.0 || ^18 + react-redux: ^7.2.1 || ^8.0.2 + peerDependenciesMeta: + react: + optional: true + react-redux: + optional: true + checksum: 10c0/fef5f7cd1ee84191bfebd02c097720f64a8fb106c741d4a9f3af52636907326a69ecf1db98a6da3849127c557d7585698c261849f20c9208680a673f0d06f31a + languageName: node + linkType: hard + +"@signalapp/better-sqlite3@npm:^8.4.3": + version: 8.5.2 + resolution: "@signalapp/better-sqlite3@npm:8.5.2" + dependencies: + bindings: "npm:^1.5.0" + node-gyp: "npm:latest" + tar: "npm:^6.1.0" + checksum: 10c0/d9f057a76987e6ab345ddeec4b17bb0db7007745c41e755eeede8bb8509da85ccef0117a3db4139cf8512725b74f0142706f376681a6c2aa3cce4bd5951cc378 + languageName: node + linkType: hard + +"@sindresorhus/is@npm:^4.0.0": + version: 4.6.0 + resolution: "@sindresorhus/is@npm:4.6.0" + checksum: 10c0/33b6fb1d0834ec8dd7689ddc0e2781c2bfd8b9c4e4bacbcb14111e0ae00621f2c264b8a7d36541799d74888b5dccdf422a891a5cb5a709ace26325eedc81e22e + languageName: node + linkType: hard + +"@sinonjs/commons@npm:^1, @sinonjs/commons@npm:^1.6.0, @sinonjs/commons@npm:^1.7.0, @sinonjs/commons@npm:^1.7.2": + version: 1.8.6 + resolution: "@sinonjs/commons@npm:1.8.6" + dependencies: + type-detect: "npm:4.0.8" + checksum: 10c0/93b4d4e27e93652b83467869c2fe09cbd8f37cd5582327f0e081fbf9b93899e2d267db7b668c96810c63dc229867614ced825e5512b47db96ca6f87cb3ec0f61 + languageName: node + linkType: hard + +"@sinonjs/fake-timers@npm:^6.0.0, @sinonjs/fake-timers@npm:^6.0.1": + version: 6.0.1 + resolution: "@sinonjs/fake-timers@npm:6.0.1" + dependencies: + "@sinonjs/commons": "npm:^1.7.0" + checksum: 10c0/a77bead4d71b40d6f7f9a3ad66a00269aa2c078260f43f594b8aed4676c6c4e7c2b642d4b8e34df314e1c971589455f7b4267ab831bf44ffdccc0bda599850ad + languageName: node + linkType: hard + +"@sinonjs/formatio@npm:^5.0.1": + version: 5.0.1 + resolution: "@sinonjs/formatio@npm:5.0.1" + dependencies: + "@sinonjs/commons": "npm:^1" + "@sinonjs/samsam": "npm:^5.0.2" + checksum: 10c0/b24323cda8531f170c87a07975075e42e5981679a82561df07cf6879e76d76bb071693e1c0681e59d92b5d2ae6983432084916b3297eee883011bb3485f4c8c8 + languageName: node + linkType: hard + +"@sinonjs/samsam@npm:^5.0.2, @sinonjs/samsam@npm:^5.0.3": + version: 5.3.1 + resolution: "@sinonjs/samsam@npm:5.3.1" + dependencies: + "@sinonjs/commons": "npm:^1.6.0" + lodash.get: "npm:^4.4.2" + type-detect: "npm:^4.0.8" + checksum: 10c0/bc6a95b55517da35322b0287e2aae62f5a340b8dce86ae239a9952c80fa4044339a4644d387a47bfded13e0a21066d4a70aee07e8294abc5b89c49d0bcfd7d9a + languageName: node + linkType: hard + +"@sinonjs/text-encoding@npm:^0.7.1": + version: 0.7.2 + resolution: "@sinonjs/text-encoding@npm:0.7.2" + checksum: 10c0/583a45bf3643169e313ff9d4395aff28b0c4f330d3697e252c3effc13d4303ee30f83df542732c1a68617720e4ea6fc08d48a3d9151c9b354a7fc356a8e9b162 + languageName: node + linkType: hard + +"@szmarczak/http-timer@npm:^4.0.5": + version: 4.0.6 + resolution: "@szmarczak/http-timer@npm:4.0.6" + dependencies: + defer-to-connect: "npm:^2.0.0" + checksum: 10c0/73946918c025339db68b09abd91fa3001e87fc749c619d2e9c2003a663039d4c3cb89836c98a96598b3d47dec2481284ba85355392644911f5ecd2336536697f + languageName: node + linkType: hard + +"@tootallnate/once@npm:2": + version: 2.0.0 + resolution: "@tootallnate/once@npm:2.0.0" + checksum: 10c0/073bfa548026b1ebaf1659eb8961e526be22fa77139b10d60e712f46d2f0f05f4e6c8bec62a087d41088ee9e29faa7f54838568e475ab2f776171003c3920858 + languageName: node + linkType: hard + +"@tsconfig/node10@npm:^1.0.7": + version: 1.0.9 + resolution: "@tsconfig/node10@npm:1.0.9" + checksum: 10c0/c176a2c1e1b16be120c328300ea910df15fb9a5277010116d26818272341a11483c5a80059389d04edacf6fd2d03d4687ad3660870fdd1cc0b7109e160adb220 + languageName: node + linkType: hard + +"@tsconfig/node12@npm:^1.0.7": + version: 1.0.11 + resolution: "@tsconfig/node12@npm:1.0.11" + checksum: 10c0/dddca2b553e2bee1308a056705103fc8304e42bb2d2cbd797b84403a223b25c78f2c683ec3e24a095e82cd435387c877239bffcb15a590ba817cd3f6b9a99fd9 + languageName: node + linkType: hard + +"@tsconfig/node14@npm:^1.0.0": + version: 1.0.3 + resolution: "@tsconfig/node14@npm:1.0.3" + checksum: 10c0/67c1316d065fdaa32525bc9449ff82c197c4c19092b9663b23213c8cbbf8d88b6ed6a17898e0cbc2711950fbfaf40388938c1c748a2ee89f7234fc9e7fe2bf44 + languageName: node + linkType: hard + +"@tsconfig/node16@npm:^1.0.2": + version: 1.0.4 + resolution: "@tsconfig/node16@npm:1.0.4" + checksum: 10c0/05f8f2734e266fb1839eb1d57290df1664fe2aa3b0fdd685a9035806daa635f7519bf6d5d9b33f6e69dd545b8c46bd6e2b5c79acb2b1f146e885f7f11a42a5bb + languageName: node + linkType: hard + +"@types/backbone@npm:1.4.2": + version: 1.4.2 + resolution: "@types/backbone@npm:1.4.2" + dependencies: + "@types/jquery": "npm:*" + "@types/underscore": "npm:*" + checksum: 10c0/54a43c2cc98503914b96873b2544a01038385506264493acd2dc623116bbeb59dc3b458ba7be5270f77b6297f4fece560a74854f67d3498f8b0048390a7a8372 + languageName: node + linkType: hard + +"@types/blueimp-load-image@npm:5.14.4": + version: 5.14.4 + resolution: "@types/blueimp-load-image@npm:5.14.4" + checksum: 10c0/774cdcd4d8b51c5a4f6a92179f15ec921dada0c90f048096f6dc9f07849646548c6f1265b51c2e72d8a75600425fa3e53ec180cad677e05aeaca1c8cbaaa0b55 + languageName: node + linkType: hard + +"@types/buffer-crc32@npm:^0.2.0": + version: 0.2.2 + resolution: "@types/buffer-crc32@npm:0.2.2" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/d8f6bb4fd3436ff3765cf8df58dbbda97584f398a1397967c4d111c6016ea640d75c77967f0e64950ae59e5f8798e36537647c502dae15deab5f526bc2c52795 + languageName: node + linkType: hard + +"@types/bunyan@npm:^1.8.8": + version: 1.8.8 + resolution: "@types/bunyan@npm:1.8.8" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/5953ffc9a482fcc4f4975e601ac29c34ed060617fa31eaff8cc3241a7eca0f8e61a881e792fea7b8941f64d47ce3deea14fe4da0619bf0c33e9cd8242fb94aa1 + languageName: node + linkType: hard + +"@types/bytebuffer@npm:^5.0.41": + version: 5.0.44 + resolution: "@types/bytebuffer@npm:5.0.44" + dependencies: + "@types/long": "npm:^3.0.0" + "@types/node": "npm:*" + checksum: 10c0/0430dfdde1bd2454edc92f0c8ba4e1794886ec2901845b6ef0b1056fddb7410f444764a2ddf2fa90ae4f7bbeb94d248b9b4d5951468d5d959761482d43e9bd20 + languageName: node + linkType: hard + +"@types/cacheable-request@npm:^6.0.1": + version: 6.0.3 + resolution: "@types/cacheable-request@npm:6.0.3" + dependencies: + "@types/http-cache-semantics": "npm:*" + "@types/keyv": "npm:^3.1.4" + "@types/node": "npm:*" + "@types/responselike": "npm:^1.0.0" + checksum: 10c0/10816a88e4e5b144d43c1d15a81003f86d649776c7f410c9b5e6579d0ad9d4ca71c541962fb403077388b446e41af7ae38d313e46692144985f006ac5e11fa03 + languageName: node + linkType: hard + +"@types/chai-as-promised@npm:^7.1.2": + version: 7.1.6 + resolution: "@types/chai-as-promised@npm:7.1.6" + dependencies: + "@types/chai": "npm:*" + checksum: 10c0/42357f0ace8c67f632d8415c5ea2b7d064b0587e599919a1ce125c73fecb4486cd33ef40c68181dfc84a900486969c42855e58754ab351da0dfd391ca8612b34 + languageName: node + linkType: hard + +"@types/chai@npm:*": + version: 4.3.6 + resolution: "@types/chai@npm:4.3.6" + checksum: 10c0/388af382b11453a69808800479dcaff0323a0d1e15df1619175ebd55b294d716d560058f560ed55434e8846af46f017d7d78544822571f6322d3fac6d5f8a29d + languageName: node + linkType: hard + +"@types/chai@npm:4.2.18": + version: 4.2.18 + resolution: "@types/chai@npm:4.2.18" + checksum: 10c0/14a74da97b714100f12b2d711483b18613666e1aa64a478dc75f8f97bf6c00544dee159c5bed3846fc375988248e88a648fa4a0d9db76b11056053a366fcc124 + languageName: node + linkType: hard + +"@types/classnames@npm:2.2.3": + version: 2.2.3 + resolution: "@types/classnames@npm:2.2.3" + checksum: 10c0/6ba3dfc8251567e703e5255c2367f2ec7b9ee6fec29f0b89ad89ec0383671e7dfcb88c76201070607be6a706fdfeae758029bd8e64a1d72cd68f37623ac78b74 + languageName: node + linkType: hard + +"@types/config@npm:0.0.34": + version: 0.0.34 + resolution: "@types/config@npm:0.0.34" + checksum: 10c0/7a8ca781f224112fa6c9af1ed317f09a6b64dc6740e8c90ffd9f80ad348b853cb29f8a4fc7325d6c0652da37900055004a213892eef7324beb039acb7152a22a + languageName: node + linkType: hard + +"@types/debug@npm:^4.1.6": + version: 4.1.8 + resolution: "@types/debug@npm:4.1.8" + dependencies: + "@types/ms": "npm:*" + checksum: 10c0/913aea60b8c94cd0009bbdd531d8a3594ec3275ca0e8d1cbcf783417884252b3c53113f6665fd2fb0076b8ce628ee12cd083d2af107ed26c0f2e75852d8bc074 + languageName: node + linkType: hard + +"@types/dompurify@npm:^2.0.0": + version: 2.4.0 + resolution: "@types/dompurify@npm:2.4.0" + dependencies: + "@types/trusted-types": "npm:*" + checksum: 10c0/a20c4288a067811e097f0b92a0cae927a9c49c0d5de36fea66b85fcc5c8db63a22ac47df37f324e426a01e8ab99ae28ea04260301350bda194850617a26931d6 + languageName: node + linkType: hard + +"@types/electron-localshortcut@npm:^3.1.0": + version: 3.1.0 + resolution: "@types/electron-localshortcut@npm:3.1.0" + dependencies: + electron: "npm:*" + checksum: 10c0/97a4f8e2cf1a123a8269c9c4b810ffd161acc0894bb9aebfc8bcea3e402f74edd3c56574a8ef864a07271cda1a64714a9972c1e35adf9896f452232406ba3748 + languageName: node + linkType: hard + +"@types/eslint-scope@npm:^3.7.3": + version: 3.7.4 + resolution: "@types/eslint-scope@npm:3.7.4" + dependencies: + "@types/eslint": "npm:*" + "@types/estree": "npm:*" + checksum: 10c0/f8a19cddf9d402f079bcc261958fff5ff2616465e4fb4cd423aa966a6a32bf5d3c65ca3ca0fbe824776b48c5cd525efbaf927b98b8eeef093aa68a1a2ba19359 + languageName: node + linkType: hard + +"@types/eslint@npm:*": + version: 8.44.2 + resolution: "@types/eslint@npm:8.44.2" + dependencies: + "@types/estree": "npm:*" + "@types/json-schema": "npm:*" + checksum: 10c0/3c402215f7f495f9267a51fecd6a6d056eb8b3b031a1c472286b7d23a397257327eb03712befa7da60614dd63d31235d27dbc5c586b6a408798dafb8ee0c5eb2 + languageName: node + linkType: hard + +"@types/estree@npm:*, @types/estree@npm:^1.0.0": + version: 1.0.1 + resolution: "@types/estree@npm:1.0.1" + checksum: 10c0/b4022067f834d86766f23074a1a7ac6c460e823b00cd8fe94c997bc491e7794615facd3e1520a934c42bd8c0689dbff81e5c643b01f1dee143fc758cac19669e + languageName: node + linkType: hard + +"@types/filesize@npm:3.6.0": + version: 3.6.0 + resolution: "@types/filesize@npm:3.6.0" + checksum: 10c0/c544c86e78a0e5b9477f23279562471478ee61134b00e6048a0c86db78604dd2c3ce4a84f0afb0e321efa7b6853030fca071a03e54cb30989f79c8bc10d34319 + languageName: node + linkType: hard + +"@types/firstline@npm:^2.0.2": + version: 2.0.2 + resolution: "@types/firstline@npm:2.0.2" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/8ff0a6a6f5e839e472bffcb8ffef643d5d1fa154a7098a18fc66b406d48c49fd73889941ca4d4ccd6d7f3459fc4e8ea1863cade696210009f34bfdaadeae4265 + languageName: node + linkType: hard + +"@types/fs-extra@npm:5.0.5": + version: 5.0.5 + resolution: "@types/fs-extra@npm:5.0.5" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/06ad0461753542e212cbbd46f858234d491f0dabaa2d142ac580b320d794165196b00f0f34e2e6b03a469e9622b2092b878365969df3119cc9728f2c962a8d1d + languageName: node + linkType: hard + +"@types/fs-extra@npm:^9.0.11": + version: 9.0.13 + resolution: "@types/fs-extra@npm:9.0.13" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/576d4e9d382393316ed815c593f7f5c157408ec5e184521d077fcb15d514b5a985245f153ef52142b9b976cb9bd8f801850d51238153ebd0dc9e96b7a7548588 + languageName: node + linkType: hard + +"@types/glob@npm:*": + version: 8.1.0 + resolution: "@types/glob@npm:8.1.0" + dependencies: + "@types/minimatch": "npm:^5.1.2" + "@types/node": "npm:*" + checksum: 10c0/ded07aa0d7a1caf3c47b85e262be82989ccd7933b4a14712b79c82fd45a239249811d9fc3a135b3e9457afa163e74a297033d7245b0dc63cd3d032f3906b053f + languageName: node + linkType: hard + +"@types/glob@npm:^7.1.1": + version: 7.2.0 + resolution: "@types/glob@npm:7.2.0" + dependencies: + "@types/minimatch": "npm:*" + "@types/node": "npm:*" + checksum: 10c0/a8eb5d5cb5c48fc58c7ca3ff1e1ddf771ee07ca5043da6e4871e6757b4472e2e73b4cfef2644c38983174a4bc728c73f8da02845c28a1212f98cabd293ecae98 + languageName: node + linkType: hard + +"@types/hoist-non-react-statics@npm:*, @types/hoist-non-react-statics@npm:^3.3.0, @types/hoist-non-react-statics@npm:^3.3.1": + version: 3.3.1 + resolution: "@types/hoist-non-react-statics@npm:3.3.1" + dependencies: + "@types/react": "npm:*" + hoist-non-react-statics: "npm:^3.3.0" + checksum: 10c0/5ed808e5fbf0979fe07acd631147420c30319383f4388a57e0fb811c6ff30abef286e937a84c7b00f4647ca7f1ab390cc42af0bfc7547a87d2e59e0e7072d92b + languageName: node + linkType: hard + +"@types/http-cache-semantics@npm:*": + version: 4.0.1 + resolution: "@types/http-cache-semantics@npm:4.0.1" + checksum: 10c0/6d6068110a04cac213bdc0fff9c7bac028b5a2da390492204328987d8ddc500adc10d9cf5747a6333dab261712655dcfe120ea1d5527c205d012a39cdccc2a7b + languageName: node + linkType: hard + +"@types/jquery@npm:*": + version: 3.5.18 + resolution: "@types/jquery@npm:3.5.18" + dependencies: + "@types/sizzle": "npm:*" + checksum: 10c0/1284e05c5ceefae2060902ea7a3337d8bf9e0e2a56884fbb619610de4d9aa5e000e92e4ca98dd1cb6437add446da4c773969a7b4af93bf60381364f978f9d58b + languageName: node + linkType: hard + +"@types/js-cookie@npm:^2.2.6": + version: 2.2.7 + resolution: "@types/js-cookie@npm:2.2.7" + checksum: 10c0/29196c6829982b5efa79117122a7d62cf4bc2f6397ce8eac1539319ff5dce3b44b2d86f2ac064f2ed3488fb24439358f24af6914fde5c5c4bab9a85728a13a6f + languageName: node + linkType: hard + +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": + version: 7.0.12 + resolution: "@types/json-schema@npm:7.0.12" + checksum: 10c0/2c39946ae321fe42d085c61a85872a81bbee70f9b2054ad344e8811dfc478fdbaf1ebf5f2989bb87c895ba2dfc3b1dcba85db11e467bbcdc023708814207791c + languageName: node + linkType: hard + +"@types/json5@npm:^0.0.29": + version: 0.0.29 + resolution: "@types/json5@npm:0.0.29" + checksum: 10c0/6bf5337bc447b706bb5b4431d37686aa2ea6d07cfd6f79cc31de80170d6ff9b1c7384a9c0ccbc45b3f512bae9e9f75c2e12109806a15331dc94e8a8db6dbb4ac + languageName: node + linkType: hard + +"@types/keyv@npm:^3.1.4": + version: 3.1.4 + resolution: "@types/keyv@npm:3.1.4" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/ff8f54fc49621210291f815fe5b15d809fd7d032941b3180743440bd507ecdf08b9e844625fa346af568c84bf34114eb378dcdc3e921a08ba1e2a08d7e3c809c + languageName: node + linkType: hard + +"@types/libsodium-wrappers-sumo@npm:^0.7.5": + version: 0.7.6 + resolution: "@types/libsodium-wrappers-sumo@npm:0.7.6" + dependencies: + "@types/libsodium-wrappers": "npm:*" + checksum: 10c0/e0fbcecc2de5c2798c951b0c75cd4ce1ce8e46e7d99eb9bad11eb1ddc48753934297ad2c5171ceac5aad0d6cdf140db917dd9e58cd68caaacbfcc63cd2466126 + languageName: node + linkType: hard + +"@types/libsodium-wrappers@npm:*": + version: 0.7.11 + resolution: "@types/libsodium-wrappers@npm:0.7.11" + checksum: 10c0/d2cf19c8155f78b891f1bd642c5236f28c921da024c9a99b15a62afea57bb71ae945b5cc689771fac471e82400f653f26b9f3cafad22878ea641449f72f91b4f + languageName: node + linkType: hard + +"@types/linkify-it@npm:*, @types/linkify-it@npm:^3.0.2": + version: 3.0.3 + resolution: "@types/linkify-it@npm:3.0.3" + checksum: 10c0/77e776f945115065e99ddb184e4ab9fa518db7f22643affb5312637aa7ab747b1e01e5062a7171dfb0a6fd85c25de048dd4078e5d47b8d6d40ea97cb85031ae8 + languageName: node + linkType: hard + +"@types/lodash@npm:^4.14.194": + version: 4.14.198 + resolution: "@types/lodash@npm:4.14.198" + checksum: 10c0/9523efda6eb78dc06bcc536c13396892695bc05147fef9f8e60db130d7be693a7a2eb48682b1dd30c0afa58617d5c79333d4bbe527a1c2474e4360282678c9cc + languageName: node + linkType: hard + +"@types/long@npm:^3.0.0": + version: 3.0.32 + resolution: "@types/long@npm:3.0.32" + checksum: 10c0/996d0efc4fd6e7c0a61cf675f2e92c4a6c7bf15a72acaa1ebe16b8e9486d8a30cbf2072d2bde950f98ed5a23808e828a9aeddfe9807fd8e53764edfe2aba0f9d + languageName: node + linkType: hard + +"@types/markdown-it@npm:^12.2.3": + version: 12.2.3 + resolution: "@types/markdown-it@npm:12.2.3" + dependencies: + "@types/linkify-it": "npm:*" + "@types/mdurl": "npm:*" + checksum: 10c0/f72e08f69d76be2e30cd367fd6e5302c6878aa44e5b1a952fe7e41280044502bcb9bac8459ad94f6bb5e4f9c4cb52803950609ad66786f0fddc3a8bd533f777d + languageName: node + linkType: hard + +"@types/mdurl@npm:*": + version: 1.0.2 + resolution: "@types/mdurl@npm:1.0.2" + checksum: 10c0/38d18f0d63af68d0480b821b3d884e144b669c0617010da4c13a444498384b4833aff17f84768afeeca7ef3e6cfcd8bb7c462ffbc39a81ff549f17ae5c3ffb8e + languageName: node + linkType: hard + +"@types/minimatch@npm:*, @types/minimatch@npm:^5.1.2": + version: 5.1.2 + resolution: "@types/minimatch@npm:5.1.2" + checksum: 10c0/83cf1c11748891b714e129de0585af4c55dd4c2cafb1f1d5233d79246e5e1e19d1b5ad9e8db449667b3ffa2b6c80125c429dbee1054e9efb45758dbc4e118562 + languageName: node + linkType: hard + +"@types/minimist@npm:^1.2.0": + version: 1.2.2 + resolution: "@types/minimist@npm:1.2.2" + checksum: 10c0/f220f57f682bbc3793dab4518f8e2180faa79d8e2589c79614fd777d7182be203ba399020c3a056a115064f5d57a065004a32b522b2737246407621681b24137 + languageName: node + linkType: hard + +"@types/mocha@npm:5.0.0": + version: 5.0.0 + resolution: "@types/mocha@npm:5.0.0" + checksum: 10c0/d9a721774b13385b6801cb5dda03136742a018fd43fb0abd92d36c67a0dfc6e22adf9ea206bac22d10da28347fa6427155527bb573684d3255d6a33f397910fa + languageName: node + linkType: hard + +"@types/ms@npm:*": + version: 0.7.31 + resolution: "@types/ms@npm:0.7.31" + checksum: 10c0/19fae4f587651e8761c76a0c72ba8af1700d37054476878d164b758edcc926f4420ed06037a1a7fdddc1dbea25265895d743c8b2ea44f3f3f7ac06c449b9221e + languageName: node + linkType: hard + +"@types/node-fetch@npm:^2.5.7": + version: 2.6.4 + resolution: "@types/node-fetch@npm:2.6.4" + dependencies: + "@types/node": "npm:*" + form-data: "npm:^3.0.0" + checksum: 10c0/e43e4670ed8b7693dbf660ac1450b14fcfcdd8efca1eb0f501b6ad95af2d1fa06f8541db03e9511e82a5fee510a238fe0913330c9a58f8ac6892b985f6dd993e + languageName: node + linkType: hard + +"@types/node@npm:*, @types/node@npm:>=13.7.0": + version: 20.5.9 + resolution: "@types/node@npm:20.5.9" + checksum: 10c0/a071a19019b4045ba65cbacb3a24fcdf1ef41474fd15fb160a082a4c7aba7643b69c5d681637d2b0ce081f2127ce4332ea4d8bf007595efe8e82ba795872c7d0 + languageName: node + linkType: hard + +"@types/node@npm:20.4.7": + version: 20.4.7 + resolution: "@types/node@npm:20.4.7" + checksum: 10c0/95c0179ca0c1e3c96f3613276f98c7f620ee035f5d871e3045bc39e76fb77f4330b03b79335d8d254e88c8deb1143fcaa2fb4ad576d857c31f389282fe56a0f1 + languageName: node + linkType: hard + +"@types/node@npm:^18.11.18": + version: 18.17.14 + resolution: "@types/node@npm:18.17.14" + checksum: 10c0/dec3cebb12b16344d91e6e8eae32a64b6dd2754e2ba9fd06ab823d2968f19bfe6c7d27e622cfa65cb5c0738ef33a203e9d1d530bfad91bb716a33e6ab533fa47 + languageName: node + linkType: hard + +"@types/normalize-package-data@npm:^2.4.0": + version: 2.4.1 + resolution: "@types/normalize-package-data@npm:2.4.1" + checksum: 10c0/c90b163741f27a1a4c3b1869d7d5c272adbd355eb50d5f060f9ce122ce4342cf35f5b0005f55ef780596cacfeb69b7eee54cd3c2e02d37f75e664945b6e75fc6 + languageName: node + linkType: hard + +"@types/plist@npm:^3.0.1": + version: 3.0.2 + resolution: "@types/plist@npm:3.0.2" + dependencies: + "@types/node": "npm:*" + xmlbuilder: "npm:>=11.0.1" + checksum: 10c0/5b98520a0ba442d9b4de2ee6c7593ff4dce4aa86c6764d791af0458af679476533482ae8f691a31a03a67d1c9503c5ec369649cb2cf6ebf0b2c3eb6fcc7b6f21 + languageName: node + linkType: hard + +"@types/prop-types@npm:*": + version: 15.7.5 + resolution: "@types/prop-types@npm:15.7.5" + checksum: 10c0/648aae41423821c61c83823ae36116c8d0f68258f8b609bdbc257752dcd616438d6343d554262aa9a7edaee5a19aca2e028a74fa2d0f40fffaf2816bc7056857 + languageName: node + linkType: hard + +"@types/react-dom@npm:^17.0.2": + version: 17.0.20 + resolution: "@types/react-dom@npm:17.0.20" + dependencies: + "@types/react": "npm:^17" + checksum: 10c0/1389bfd96ec5f0c580bb1c237c8af137203de912cf403b4116cdfb026762bf31b4206cc1de0a5c20d0df2e07b0ba1b1b72ac51995d5ef45889d5d878321b7418 + languageName: node + linkType: hard + +"@types/react-mentions@npm:^4.1.8": + version: 4.1.8 + resolution: "@types/react-mentions@npm:4.1.8" + dependencies: + "@types/react": "npm:*" + checksum: 10c0/8ba816e9315c9af8b0e7af1c111d0827c42fadc2737d45bdde119ae5508e5b826b78453688cea82fabce4624f85d4e6fadcc8359c900521a276af69888e65063 + languageName: node + linkType: hard + +"@types/react-redux@npm:^7.1.24": + version: 7.1.26 + resolution: "@types/react-redux@npm:7.1.26" + dependencies: + "@types/hoist-non-react-statics": "npm:^3.3.0" + "@types/react": "npm:*" + hoist-non-react-statics: "npm:^3.3.0" + redux: "npm:^4.0.0" + checksum: 10c0/f08839dcc383c9c0dc86a14d3c9617e07d26e7131362f36f72612947aa60dc13d07b31e88952f44e105c1e7195550a844ef8509dc161b61f4dfd36c620913602 + languageName: node + linkType: hard + +"@types/react-virtualized@npm:9.18.12": + version: 9.18.12 + resolution: "@types/react-virtualized@npm:9.18.12" + dependencies: + "@types/prop-types": "npm:*" + "@types/react": "npm:*" + checksum: 10c0/9759df5c3b6766270b5d5484def3b47800ddfff0f1ec27a6414292c3ef1c57db20cef2afdc8684a2b8d62638e0d089caefaa27bb5178d4e3e0e323e0693183b5 + languageName: node + linkType: hard + +"@types/react@npm:17.0.2": + version: 17.0.2 + resolution: "@types/react@npm:17.0.2" + dependencies: + "@types/prop-types": "npm:*" + csstype: "npm:^3.0.2" + checksum: 10c0/6b48673db526015c45a0dc036394cdc7d5fd48388b3f05f8f433e74c08fb4c80e5acfc66baa2c7cc8a091d0d8524bcb00397bc7c6286fcefad4bf4cef959d764 + languageName: node + linkType: hard + +"@types/redux-logger@npm:3.0.7": + version: 3.0.7 + resolution: "@types/redux-logger@npm:3.0.7" + dependencies: + redux: "npm:^3.6.0" + checksum: 10c0/22eed8c0735ef59a0fd93079572234339d26df74aadf19e0e74ca998af85ba74af4b4d54c259289b23c49c7e039dde7a5a6c1232e5a74a490c5b2fe39e3052a5 + languageName: node + linkType: hard + +"@types/responselike@npm:^1.0.0": + version: 1.0.0 + resolution: "@types/responselike@npm:1.0.0" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/474ac2402e6d43c007eee25f50d01eb1f67255ca83dd8e036877292bbe8dd5d2d1e50b54b408e233b50a8c38e681ff3ebeaf22f18b478056eddb65536abb003a + languageName: node + linkType: hard + +"@types/retry@npm:0.12.0": + version: 0.12.0 + resolution: "@types/retry@npm:0.12.0" + checksum: 10c0/7c5c9086369826f569b83a4683661557cab1361bac0897a1cefa1a915ff739acd10ca0d62b01071046fe3f5a3f7f2aec80785fe283b75602dc6726781ea3e328 + languageName: node + linkType: hard + +"@types/rimraf@npm:2.0.2": + version: 2.0.2 + resolution: "@types/rimraf@npm:2.0.2" + dependencies: + "@types/glob": "npm:*" + "@types/node": "npm:*" + checksum: 10c0/794e8d311307bf10400ba8172cba2bb25ee9f985bd31df56295599f226c86a9a252cc5cc8944ca048e6d9d97a173e435dfe90000baf39545c6bbbd440c862cbd + languageName: node + linkType: hard + +"@types/semver@npm:5.5.0": + version: 5.5.0 + resolution: "@types/semver@npm:5.5.0" + checksum: 10c0/eea2e17ea9dadde0fb8f053b445d7567288d9f00f4e0971e39ed9541705c324c5453681ef6ab098c244f402757adc0ddde0f9b4887edaa088134bcf56d09352a + languageName: node + linkType: hard + +"@types/semver@npm:^7.3.6, @types/semver@npm:^7.5.0": + version: 7.5.1 + resolution: "@types/semver@npm:7.5.1" + checksum: 10c0/10746bd8c6b5ba4da8c5b8e246e0ce2ccde7df0e782cbb2b376bc8c6c25ae0aca39a3c82b762912c6eab801cd64ffd8582369c4b96f0d4e7898118b68717c93b + languageName: node + linkType: hard + +"@types/sinon@npm:9.0.4": + version: 9.0.4 + resolution: "@types/sinon@npm:9.0.4" + dependencies: + "@types/sinonjs__fake-timers": "npm:*" + checksum: 10c0/86b64eebd165823a1bcd3fa1989794b544776223c0316a79153dc8cb21221fba1f3eeb36ceb933dc1a61087806600f1d39e28bfa844766ef227627abdfd5f8d4 + languageName: node + linkType: hard + +"@types/sinonjs__fake-timers@npm:*": + version: 8.1.2 + resolution: "@types/sinonjs__fake-timers@npm:8.1.2" + checksum: 10c0/631c55f3ac4caacc7f7a1c84b4597fdf7e162492cc5fc50e9440917efb9b506b0706ad8591e41e83487d9c3688163ef13720767b9821408fb4be6f525f829be7 + languageName: node + linkType: hard + +"@types/sizzle@npm:*": + version: 2.3.3 + resolution: "@types/sizzle@npm:2.3.3" + checksum: 10c0/a19de697d2d444c0a3e3cdbfb303b337aeef9dc54b8bdb4a2f15b1fbd7ab1f7b7bf85065b17b5d2da48ea80d38d659fa213ae706880787ff92323e9fce76d841 + languageName: node + linkType: hard + +"@types/styled-components@npm:^5.1.4": + version: 5.1.26 + resolution: "@types/styled-components@npm:5.1.26" + dependencies: + "@types/hoist-non-react-statics": "npm:*" + "@types/react": "npm:*" + csstype: "npm:^3.0.2" + checksum: 10c0/61c53b035d82bbf6071d3f15348f2e9a43af8c28c630ab472d153277082a578aa60116ddc67bcfea1340d93577d5758c359f0a4d4d1291a419cebb3f8677b63e + languageName: node + linkType: hard + +"@types/trusted-types@npm:*": + version: 2.0.3 + resolution: "@types/trusted-types@npm:2.0.3" + checksum: 10c0/25eae736a8a6d24353c3e0108138935250f79d1d239f6fd6f3eb52d88476456ba946f8cb8f3130c6841d40534cafc2dd2326358d86966327c3c4a3d3eecaf585 + languageName: node + linkType: hard + +"@types/underscore@npm:*": + version: 1.11.9 + resolution: "@types/underscore@npm:1.11.9" + checksum: 10c0/9ef180af425c21ff5d8b97e94625d56c7db2592caf5b1f35e61b051069658b4179c98501456f792b654bea765475909004c4b87a891706c0ab3538cd22f45259 + languageName: node + linkType: hard + +"@types/use-sync-external-store@npm:^0.0.3": + version: 0.0.3 + resolution: "@types/use-sync-external-store@npm:0.0.3" + checksum: 10c0/82824c1051ba40a00e3d47964cdf4546a224e95f172e15a9c62aa3f118acee1c7518b627a34f3aa87298a2039f982e8509f92bfcc18bea7c255c189c293ba547 + languageName: node + linkType: hard + +"@types/uuid@npm:8.3.4": + version: 8.3.4 + resolution: "@types/uuid@npm:8.3.4" + checksum: 10c0/b9ac98f82fcf35962317ef7dc44d9ac9e0f6fdb68121d384c88fe12ea318487d5585d3480fa003cf28be86a3bbe213ca688ba786601dce4a97724765eb5b1cf2 + languageName: node + linkType: hard + +"@types/verror@npm:^1.10.3": + version: 1.10.6 + resolution: "@types/verror@npm:1.10.6" + checksum: 10c0/0817a42e80a0c20db3cf161e2814ab779cf52560b5440fd7871c6393cf9d2371d938a78ced1b62d27799ec0184a319e909183fc1c3bb36edef7a9aefe8e35e88 + languageName: node + linkType: hard + +"@types/yargs-parser@npm:*": + version: 21.0.0 + resolution: "@types/yargs-parser@npm:21.0.0" + checksum: 10c0/cb89f3bb2e8002f1479a65a934e825be4cc18c50b350bbc656405d41cf90b8a299b105e7da497d7eb1aa460472a07d1e5a389f3af0862f1d1252279cfcdd017c + languageName: node + linkType: hard + +"@types/yargs@npm:^17.0.1": + version: 17.0.24 + resolution: "@types/yargs@npm:17.0.24" + dependencies: + "@types/yargs-parser": "npm:*" + checksum: 10c0/fbebf57e1d04199e5e7eb0c67a402566fa27177ee21140664e63da826408793d203d262b48f8f41d4a7665126393d2e952a463e960e761226def247d9bbcdbd0 + languageName: node + linkType: hard + +"@types/yauzl@npm:^2.9.1": + version: 2.10.0 + resolution: "@types/yauzl@npm:2.10.0" + dependencies: + "@types/node": "npm:*" + checksum: 10c0/e917cf11c78e9ca7d037d0e6e0d6d5d99443d9d7201f8f1a556f02a2bc57ae457487e9bfec89dfa848d16979b35de6e5b34840d4d0bb9e5f33849d077ac15154 + languageName: node + linkType: hard + +"@typescript-eslint/eslint-plugin@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/eslint-plugin@npm:7.1.0" + dependencies: + "@eslint-community/regexpp": "npm:^4.5.1" + "@typescript-eslint/scope-manager": "npm:7.1.0" + "@typescript-eslint/type-utils": "npm:7.1.0" + "@typescript-eslint/utils": "npm:7.1.0" + "@typescript-eslint/visitor-keys": "npm:7.1.0" + debug: "npm:^4.3.4" + graphemer: "npm:^1.4.0" + ignore: "npm:^5.2.4" + natural-compare: "npm:^1.4.0" + semver: "npm:^7.5.4" + ts-api-utils: "npm:^1.0.1" + peerDependencies: + "@typescript-eslint/parser": ^7.0.0 + eslint: ^8.56.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/e5644a987969cbb614bbf766b6bf51341e123c774953690548610147eae0041d70e48ef42be97b68a6e2f5ed9aae37fe040e8054d35bb0568c14194ba564b2d8 + languageName: node + linkType: hard + +"@typescript-eslint/parser@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/parser@npm:7.1.0" + dependencies: + "@typescript-eslint/scope-manager": "npm:7.1.0" + "@typescript-eslint/types": "npm:7.1.0" + "@typescript-eslint/typescript-estree": "npm:7.1.0" + "@typescript-eslint/visitor-keys": "npm:7.1.0" + debug: "npm:^4.3.4" + peerDependencies: + eslint: ^8.56.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/8fcbfc8c0c86abb750173096e7ca09e1cd44aba3f6115bdb94ffb6b409b86ee23526e9d5a44935b69a6be2385893e66d8e55d92063206028dc48f70d379afcab + languageName: node + linkType: hard + +"@typescript-eslint/scope-manager@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/scope-manager@npm:7.1.0" + dependencies: + "@typescript-eslint/types": "npm:7.1.0" + "@typescript-eslint/visitor-keys": "npm:7.1.0" + checksum: 10c0/2fd167730bbe984343ab94739b00bd82e8cdeea9e63674b099cc5c89b420b28dbf79f40dab48022dc717db8d14ae6ee2739e0fcbdcc0321bc9da5f2602b55788 + languageName: node + linkType: hard + +"@typescript-eslint/type-utils@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/type-utils@npm:7.1.0" + dependencies: + "@typescript-eslint/typescript-estree": "npm:7.1.0" + "@typescript-eslint/utils": "npm:7.1.0" + debug: "npm:^4.3.4" + ts-api-utils: "npm:^1.0.1" + peerDependencies: + eslint: ^8.56.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/3e3eea6c03692a643bf4ed11646b0679c6ff13baf1647d97e793f3d8c3adb83061e27a17c2a1470166a3c6c444b974bebc8096d36e0b4b3c36c289ff38bcfc9b + languageName: node + linkType: hard + +"@typescript-eslint/types@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/types@npm:7.1.0" + checksum: 10c0/095cde3e773b7605c5e0c86642002768ced09e94def7f3c6f49a67863f47d7c8ae15413a4ab1a2407f779d1b5ede5fb3000bc98b1cf9ed7ec938acc38cac89e7 + languageName: node + linkType: hard + +"@typescript-eslint/typescript-estree@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.1.0" + dependencies: + "@typescript-eslint/types": "npm:7.1.0" + "@typescript-eslint/visitor-keys": "npm:7.1.0" + debug: "npm:^4.3.4" + globby: "npm:^11.1.0" + is-glob: "npm:^4.0.3" + minimatch: "npm:9.0.3" + semver: "npm:^7.5.4" + ts-api-utils: "npm:^1.0.1" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/063845dc8526dfda722d1b00960443a5158d1bce2bc39bf49bd353f33f42aa30116105a87b55a04df3eaef99c0d1c13fb987c53848dff43de6152c66dd3ba41c + languageName: node + linkType: hard + +"@typescript-eslint/utils@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/utils@npm:7.1.0" + dependencies: + "@eslint-community/eslint-utils": "npm:^4.4.0" + "@types/json-schema": "npm:^7.0.12" + "@types/semver": "npm:^7.5.0" + "@typescript-eslint/scope-manager": "npm:7.1.0" + "@typescript-eslint/types": "npm:7.1.0" + "@typescript-eslint/typescript-estree": "npm:7.1.0" + semver: "npm:^7.5.4" + peerDependencies: + eslint: ^8.56.0 + checksum: 10c0/3fefd51307d0e294462106c57c4b12cd610bfe1bdcc5ca0142bfac6a5d0d37c18d14be5ec89740eb85515f5512f45219a6048df0efccd457e96f9d0612af4abf + languageName: node + linkType: hard + +"@typescript-eslint/visitor-keys@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.1.0" + dependencies: + "@typescript-eslint/types": "npm:7.1.0" + eslint-visitor-keys: "npm:^3.4.1" + checksum: 10c0/9015a10e6ee2a99fc99e0f7a3f274496a813c2c239e868f29e7c0da919c825fe192fe21d3410c43d8a801e8186b51f08ef06523d2c3010570d893a1486ac293d + languageName: node + linkType: hard + +"@ungap/promise-all-settled@npm:1.1.2": + version: 1.1.2 + resolution: "@ungap/promise-all-settled@npm:1.1.2" + checksum: 10c0/7f9862bae3b6ce30675783428933be1738dca278901a6bcb55c29b8f54c08863ec8e6a7c884119877d90336501c33b7cfda36355ec7af4d703f65f54cb768913 + languageName: node + linkType: hard + +"@ungap/structured-clone@npm:^1.2.0": + version: 1.2.0 + resolution: "@ungap/structured-clone@npm:1.2.0" + checksum: 10c0/8209c937cb39119f44eb63cf90c0b73e7c754209a6411c707be08e50e29ee81356dca1a848a405c8bdeebfe2f5e4f831ad310ae1689eeef65e7445c090c6657d + languageName: node + linkType: hard + +"@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5": + version: 1.11.6 + resolution: "@webassemblyjs/ast@npm:1.11.6" + dependencies: + "@webassemblyjs/helper-numbers": "npm:1.11.6" + "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" + checksum: 10c0/e28476a183c8a1787adcf0e5df1d36ec4589467ab712c674fe4f6769c7fb19d1217bfb5856b3edd0f3e0a148ebae9e4bbb84110cee96664966dfef204d9c31fb + languageName: node + linkType: hard + +"@webassemblyjs/floating-point-hex-parser@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6" + checksum: 10c0/37fe26f89e18e4ca0e7d89cfe3b9f17cfa327d7daf906ae01400416dbb2e33c8a125b4dc55ad7ff405e5fcfb6cf0d764074c9bc532b9a31a71e762be57d2ea0a + languageName: node + linkType: hard + +"@webassemblyjs/helper-api-error@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/helper-api-error@npm:1.11.6" + checksum: 10c0/a681ed51863e4ff18cf38d223429f414894e5f7496856854d9a886eeddcee32d7c9f66290f2919c9bb6d2fc2b2fae3f989b6a1e02a81e829359738ea0c4d371a + languageName: node + linkType: hard + +"@webassemblyjs/helper-buffer@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/helper-buffer@npm:1.11.6" + checksum: 10c0/55b5d67db95369cdb2a505ae7ebdf47194d49dfc1aecb0f5403277dcc899c7d3e1f07e8d279646adf8eafd89959272db62ca66fbe803321661ab184176ddfd3a + languageName: node + linkType: hard + +"@webassemblyjs/helper-numbers@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/helper-numbers@npm:1.11.6" + dependencies: + "@webassemblyjs/floating-point-hex-parser": "npm:1.11.6" + "@webassemblyjs/helper-api-error": "npm:1.11.6" + "@xtuc/long": "npm:4.2.2" + checksum: 10c0/c7d5afc0ff3bd748339b466d8d2f27b908208bf3ff26b2e8e72c39814479d486e0dca6f3d4d776fd9027c1efe05b5c0716c57a23041eb34473892b2731c33af3 + languageName: node + linkType: hard + +"@webassemblyjs/helper-wasm-bytecode@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6" + checksum: 10c0/79d2bebdd11383d142745efa32781249745213af8e022651847382685ca76709f83e1d97adc5f0d3c2b8546bf02864f8b43a531fdf5ca0748cb9e4e0ef2acaa5 + languageName: node + linkType: hard + +"@webassemblyjs/helper-wasm-section@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": "npm:1.11.6" + "@webassemblyjs/helper-buffer": "npm:1.11.6" + "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" + "@webassemblyjs/wasm-gen": "npm:1.11.6" + checksum: 10c0/b79b19a63181f32e5ee0e786fa8264535ea5360276033911fae597d2de15e1776f028091d08c5a813a3901fd2228e74cd8c7e958fded064df734f00546bef8ce + languageName: node + linkType: hard + +"@webassemblyjs/ieee754@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/ieee754@npm:1.11.6" + dependencies: + "@xtuc/ieee754": "npm:^1.2.0" + checksum: 10c0/59de0365da450322c958deadade5ec2d300c70f75e17ae55de3c9ce564deff5b429e757d107c7ec69bd0ba169c6b6cc2ff66293ab7264a7053c829b50ffa732f + languageName: node + linkType: hard + +"@webassemblyjs/leb128@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/leb128@npm:1.11.6" + dependencies: + "@xtuc/long": "npm:4.2.2" + checksum: 10c0/cb344fc04f1968209804de4da018679c5d4708a03b472a33e0fa75657bb024978f570d3ccf9263b7f341f77ecaa75d0e051b9cd4b7bb17a339032cfd1c37f96e + languageName: node + linkType: hard + +"@webassemblyjs/utf8@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/utf8@npm:1.11.6" + checksum: 10c0/14d6c24751a89ad9d801180b0d770f30a853c39f035a15fbc96266d6ac46355227abd27a3fd2eeaa97b4294ced2440a6b012750ae17bafe1a7633029a87b6bee + languageName: node + linkType: hard + +"@webassemblyjs/wasm-edit@npm:^1.11.5": + version: 1.11.6 + resolution: "@webassemblyjs/wasm-edit@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": "npm:1.11.6" + "@webassemblyjs/helper-buffer": "npm:1.11.6" + "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" + "@webassemblyjs/helper-wasm-section": "npm:1.11.6" + "@webassemblyjs/wasm-gen": "npm:1.11.6" + "@webassemblyjs/wasm-opt": "npm:1.11.6" + "@webassemblyjs/wasm-parser": "npm:1.11.6" + "@webassemblyjs/wast-printer": "npm:1.11.6" + checksum: 10c0/9a56b6bf635cf7aa5d6e926eaddf44c12fba050170e452a8e17ab4e1b937708678c03f5817120fb9de1e27167667ce693d16ce718d41e5a16393996a6017ab73 + languageName: node + linkType: hard + +"@webassemblyjs/wasm-gen@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/wasm-gen@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": "npm:1.11.6" + "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" + "@webassemblyjs/ieee754": "npm:1.11.6" + "@webassemblyjs/leb128": "npm:1.11.6" + "@webassemblyjs/utf8": "npm:1.11.6" + checksum: 10c0/ce9a39d3dab2eb4a5df991bc9f3609960daa4671d25d700f4617152f9f79da768547359f817bee10cd88532c3e0a8a1714d383438e0a54217eba53cb822bd5ad + languageName: node + linkType: hard + +"@webassemblyjs/wasm-opt@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/wasm-opt@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": "npm:1.11.6" + "@webassemblyjs/helper-buffer": "npm:1.11.6" + "@webassemblyjs/wasm-gen": "npm:1.11.6" + "@webassemblyjs/wasm-parser": "npm:1.11.6" + checksum: 10c0/82788408054171688e9f12883b693777219366d6867003e34dccc21b4a0950ef53edc9d2b4d54cabdb6ee869cf37c8718401b4baa4f70a7f7dd3867c75637298 + languageName: node + linkType: hard + +"@webassemblyjs/wasm-parser@npm:1.11.6, @webassemblyjs/wasm-parser@npm:^1.11.5": + version: 1.11.6 + resolution: "@webassemblyjs/wasm-parser@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": "npm:1.11.6" + "@webassemblyjs/helper-api-error": "npm:1.11.6" + "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" + "@webassemblyjs/ieee754": "npm:1.11.6" + "@webassemblyjs/leb128": "npm:1.11.6" + "@webassemblyjs/utf8": "npm:1.11.6" + checksum: 10c0/7a97a5f34f98bdcfd812157845a06d53f3d3f67dbd4ae5d6bf66e234e17dc4a76b2b5e74e5dd70b4cab9778fc130194d50bbd6f9a1d23e15ed1ed666233d6f5f + languageName: node + linkType: hard + +"@webassemblyjs/wast-printer@npm:1.11.6": + version: 1.11.6 + resolution: "@webassemblyjs/wast-printer@npm:1.11.6" + dependencies: + "@webassemblyjs/ast": "npm:1.11.6" + "@xtuc/long": "npm:4.2.2" + checksum: 10c0/916b90fa3a8aadd95ca41c21d4316d0a7582cf6d0dcf6d9db86ab0de823914df513919fba60ac1edd227ff00e93a66b927b15cbddd36b69d8a34c8815752633c + languageName: node + linkType: hard + +"@webpack-cli/configtest@npm:^2.1.1": + version: 2.1.1 + resolution: "@webpack-cli/configtest@npm:2.1.1" + peerDependencies: + webpack: 5.x.x + webpack-cli: 5.x.x + checksum: 10c0/a8da1f15702cb289807da99235ed95326ed7dabeb1a36ca59bd3a5dbe6adcc946a9a2767936050fc4d5ed14efab0e5b5a641dfe8e3d862c36caa5791ac12759d + languageName: node + linkType: hard + +"@webpack-cli/info@npm:^2.0.2": + version: 2.0.2 + resolution: "@webpack-cli/info@npm:2.0.2" + peerDependencies: + webpack: 5.x.x + webpack-cli: 5.x.x + checksum: 10c0/ca88a35604dc9aedac7c26e8f6793c5039dc1eea2b12a85fbfd669a5f21ecf9cf169d7fd157ea366a62666e3fa05b776306a96742ac61a9868f44fdce6b40f7d + languageName: node + linkType: hard + +"@webpack-cli/serve@npm:^2.0.5": + version: 2.0.5 + resolution: "@webpack-cli/serve@npm:2.0.5" + peerDependencies: + webpack: 5.x.x + webpack-cli: 5.x.x + peerDependenciesMeta: + webpack-dev-server: + optional: true + checksum: 10c0/36079d34971ff99a58b66b13f4184dcdd8617853c48cccdbc3f9ab7ea9e5d4fcf504e873c298ea7aa15e0b51ad2c4aee4d7a70bd7d9364e60f57b0eb93ca15fc + languageName: node + linkType: hard + +"@xmldom/xmldom@npm:^0.8.8": + version: 0.8.10 + resolution: "@xmldom/xmldom@npm:0.8.10" + checksum: 10c0/c7647c442502720182b0d65b17d45d2d95317c1c8c497626fe524bda79b4fb768a9aa4fae2da919f308e7abcff7d67c058b102a9d641097e9a57f0b80187851f + languageName: node + linkType: hard + +"@xobotyi/scrollbar-width@npm:^1.9.5": + version: 1.9.5 + resolution: "@xobotyi/scrollbar-width@npm:1.9.5" + checksum: 10c0/4ebc79e4f798e2a5e89a5122f8fc4a086f08a92a44ac020599c4fe20d105b7d76ba06c094260b5f386a75e7ce6f6c518d9fc295228b651296b99c4477f986ac4 + languageName: node + linkType: hard + +"@xtuc/ieee754@npm:^1.2.0": + version: 1.2.0 + resolution: "@xtuc/ieee754@npm:1.2.0" + checksum: 10c0/a8565d29d135039bd99ae4b2220d3e167d22cf53f867e491ed479b3f84f895742d0097f935b19aab90265a23d5d46711e4204f14c479ae3637fbf06c4666882f + languageName: node + linkType: hard + +"@xtuc/long@npm:4.2.2": + version: 4.2.2 + resolution: "@xtuc/long@npm:4.2.2" + checksum: 10c0/8582cbc69c79ad2d31568c412129bf23d2b1210a1dfb60c82d5a1df93334da4ee51f3057051658569e2c196d8dc33bc05ae6b974a711d0d16e801e1d0647ccd1 + languageName: node + linkType: hard + +"@yarnpkg/lockfile@npm:^1.1.0": + version: 1.1.0 + resolution: "@yarnpkg/lockfile@npm:1.1.0" + checksum: 10c0/0bfa50a3d756623d1f3409bc23f225a1d069424dbc77c6fd2f14fb377390cd57ec703dc70286e081c564be9051ead9ba85d81d66a3e68eeb6eb506d4e0c0fbda + languageName: node + linkType: hard + +"JSONStream@npm:^1.3.5": + version: 1.3.5 + resolution: "JSONStream@npm:1.3.5" + dependencies: + jsonparse: "npm:^1.2.0" + through: "npm:>=2.2.7 <3" + bin: + JSONStream: ./bin.js + checksum: 10c0/0f54694da32224d57b715385d4a6b668d2117379d1f3223dc758459246cca58fdc4c628b83e8a8883334e454a0a30aa198ede77c788b55537c1844f686a751f2 + languageName: node + linkType: hard + +"abab@npm:^2.0.6": + version: 2.0.6 + resolution: "abab@npm:2.0.6" + checksum: 10c0/0b245c3c3ea2598fe0025abf7cc7bb507b06949d51e8edae5d12c1b847a0a0c09639abcb94788332b4e2044ac4491c1e8f571b51c7826fd4b0bda1685ad4a278 + languageName: node + linkType: hard + +"abbrev@npm:^2.0.0": + version: 2.0.0 + resolution: "abbrev@npm:2.0.0" + checksum: 10c0/f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372 + languageName: node + linkType: hard + +"abort-controller@npm:3.0.0": + version: 3.0.0 + resolution: "abort-controller@npm:3.0.0" + dependencies: + event-target-shim: "npm:^5.0.0" + checksum: 10c0/90ccc50f010250152509a344eb2e71977fbf8db0ab8f1061197e3275ddf6c61a41a6edfd7b9409c664513131dd96e962065415325ef23efa5db931b382d24ca5 + languageName: node + linkType: hard + +"acorn-import-assertions@npm:^1.9.0": + version: 1.9.0 + resolution: "acorn-import-assertions@npm:1.9.0" + peerDependencies: + acorn: ^8 + checksum: 10c0/3b4a194e128efdc9b86c2b1544f623aba4c1aa70d638f8ab7dc3971a5b4aa4c57bd62f99af6e5325bb5973c55863b4112e708a6f408bad7a138647ca72283afe + languageName: node + linkType: hard + +"acorn-jsx@npm:^5.3.2": + version: 5.3.2 + resolution: "acorn-jsx@npm:5.3.2" + peerDependencies: + acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + checksum: 10c0/4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1 + languageName: node + linkType: hard + +"acorn-walk@npm:^8.1.1": + version: 8.2.0 + resolution: "acorn-walk@npm:8.2.0" + checksum: 10c0/dbe92f5b2452c93e960c5594e666dd1fae141b965ff2cb4a1e1d0381e3e4db4274c5ce4ffa3d681a86ca2a8d4e29d5efc0670a08e23fd2800051ea387df56ca2 + languageName: node + linkType: hard + +"acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": + version: 8.10.0 + resolution: "acorn@npm:8.10.0" + bin: + acorn: bin/acorn + checksum: 10c0/deaeebfbea6e40f6c0e1070e9b0e16e76ba484de54cbd735914d1d41d19169a450de8630b7a3a0c4e271a3b0c0b075a3427ad1a40d8a69f8747c0e8cb02ee3e2 + languageName: node + linkType: hard + +"agent-base@npm:6": + version: 6.0.2 + resolution: "agent-base@npm:6.0.2" + dependencies: + debug: "npm:4" + checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261 + languageName: node + linkType: hard + +"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1": + version: 7.1.1 + resolution: "agent-base@npm:7.1.1" + dependencies: + debug: "npm:^4.3.4" + checksum: 10c0/e59ce7bed9c63bf071a30cc471f2933862044c97fd9958967bfe22521d7a0f601ce4ed5a8c011799d0c726ca70312142ae193bbebb60f576b52be19d4a363b50 + languageName: node + linkType: hard + +"aggregate-error@npm:^3.0.0": + version: 3.1.0 + resolution: "aggregate-error@npm:3.1.0" + dependencies: + clean-stack: "npm:^2.0.0" + indent-string: "npm:^4.0.0" + checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039 + languageName: node + linkType: hard + +"ajv-formats@npm:^2.1.1": + version: 2.1.1 + resolution: "ajv-formats@npm:2.1.1" + dependencies: + ajv: "npm:^8.0.0" + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + checksum: 10c0/e43ba22e91b6a48d96224b83d260d3a3a561b42d391f8d3c6d2c1559f9aa5b253bfb306bc94bbeca1d967c014e15a6efe9a207309e95b3eaae07fcbcdc2af662 + languageName: node + linkType: hard + +"ajv-keywords@npm:^3.4.1, ajv-keywords@npm:^3.5.2": + version: 3.5.2 + resolution: "ajv-keywords@npm:3.5.2" + peerDependencies: + ajv: ^6.9.1 + checksum: 10c0/0c57a47cbd656e8cdfd99d7c2264de5868918ffa207c8d7a72a7f63379d4333254b2ba03d69e3c035e996a3fd3eb6d5725d7a1597cca10694296e32510546360 + languageName: node + linkType: hard + +"ajv-keywords@npm:^5.1.0": + version: 5.1.0 + resolution: "ajv-keywords@npm:5.1.0" + dependencies: + fast-deep-equal: "npm:^3.1.3" + peerDependencies: + ajv: ^8.8.2 + checksum: 10c0/18bec51f0171b83123ba1d8883c126e60c6f420cef885250898bf77a8d3e65e3bfb9e8564f497e30bdbe762a83e0d144a36931328616a973ee669dc74d4a9590 + languageName: node + linkType: hard + +"ajv@npm:^6.10.0, ajv@npm:^6.12.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5": + version: 6.12.6 + resolution: "ajv@npm:6.12.6" + dependencies: + fast-deep-equal: "npm:^3.1.1" + fast-json-stable-stringify: "npm:^2.0.0" + json-schema-traverse: "npm:^0.4.1" + uri-js: "npm:^4.2.2" + checksum: 10c0/41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71 + languageName: node + linkType: hard + +"ajv@npm:^8.0.0, ajv@npm:^8.11.0, ajv@npm:^8.9.0": + version: 8.12.0 + resolution: "ajv@npm:8.12.0" + dependencies: + fast-deep-equal: "npm:^3.1.1" + json-schema-traverse: "npm:^1.0.0" + require-from-string: "npm:^2.0.2" + uri-js: "npm:^4.2.2" + checksum: 10c0/ac4f72adf727ee425e049bc9d8b31d4a57e1c90da8d28bcd23d60781b12fcd6fc3d68db5df16994c57b78b94eed7988f5a6b482fd376dc5b084125e20a0a622e + languageName: node + linkType: hard + +"ansi-align@npm:^3.0.0": + version: 3.0.1 + resolution: "ansi-align@npm:3.0.1" + dependencies: + string-width: "npm:^4.1.0" + checksum: 10c0/ad8b755a253a1bc8234eb341e0cec68a857ab18bf97ba2bda529e86f6e30460416523e0ec58c32e5c21f0ca470d779503244892873a5895dbd0c39c788e82467 + languageName: node + linkType: hard + +"ansi-colors@npm:4.1.1": + version: 4.1.1 + resolution: "ansi-colors@npm:4.1.1" + checksum: 10c0/6086ade4336b4250b6b25e144b83e5623bcaf654d3df0c3546ce09c9c5ff999cb6a6f00c87e802d05cf98aef79d92dc76ade2670a2493b8dcb80220bec457838 + languageName: node + linkType: hard + +"ansi-escapes@npm:^5.0.0": + version: 5.0.0 + resolution: "ansi-escapes@npm:5.0.0" + dependencies: + type-fest: "npm:^1.0.2" + checksum: 10c0/f705cc7fbabb981ddf51562cd950792807bccd7260cc3d9478a619dda62bff6634c87ca100f2545ac7aade9b72652c4edad8c7f0d31a0b949b5fa58f33eaf0d0 + languageName: node + linkType: hard + +"ansi-regex@npm:^4.1.1": + version: 4.1.1 + resolution: "ansi-regex@npm:4.1.1" + checksum: 10c0/d36d34234d077e8770169d980fed7b2f3724bfa2a01da150ccd75ef9707c80e883d27cdf7a0eac2f145ac1d10a785a8a855cffd05b85f778629a0db62e7033da + languageName: node + linkType: hard + +"ansi-styles@npm:^2.2.1": + version: 2.2.1 + resolution: "ansi-styles@npm:2.2.1" + checksum: 10c0/7c68aed4f1857389e7a12f85537ea5b40d832656babbf511cc7ecd9efc52889b9c3e5653a71a6aade783c3c5e0aa223ad4ff8e83c27ac8a666514e6c79068cab + languageName: node + linkType: hard + +"ansi-styles@npm:^3.2.1": + version: 3.2.1 + resolution: "ansi-styles@npm:3.2.1" + dependencies: + color-convert: "npm:^1.9.0" + checksum: 10c0/ece5a8ef069fcc5298f67e3f4771a663129abd174ea2dfa87923a2be2abf6cd367ef72ac87942da00ce85bd1d651d4cd8595aebdb1b385889b89b205860e977b + languageName: node + linkType: hard + +"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0": + version: 4.3.0 + resolution: "ansi-styles@npm:4.3.0" + dependencies: + color-convert: "npm:^2.0.1" + checksum: 10c0/895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041 + languageName: node + linkType: hard + +"ansi-styles@npm:^6.0.0, ansi-styles@npm:^6.1.0": + version: 6.2.1 + resolution: "ansi-styles@npm:6.2.1" + checksum: 10c0/5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c + languageName: node + linkType: hard + +"anymatch@npm:~3.1.2": + version: 3.1.3 + resolution: "anymatch@npm:3.1.3" + dependencies: + normalize-path: "npm:^3.0.0" + picomatch: "npm:^2.0.4" + checksum: 10c0/57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac + languageName: node + linkType: hard + +"app-builder-bin@npm:4.0.0": + version: 4.0.0 + resolution: "app-builder-bin@npm:4.0.0" + checksum: 10c0/9df57b2460aa058971c8619132c4ab5b7b4572449c8f5b562e44c9d6c1c73ec7284f4d1e170549c42eef53cd9e0b7579409fb49fba862ab4d3050433579ef14c + languageName: node + linkType: hard + +"app-builder-lib@npm:23.0.8": + version: 23.0.8 + resolution: "app-builder-lib@npm:23.0.8" + dependencies: + 7zip-bin: "npm:~5.1.1" + "@develar/schema-utils": "npm:~2.6.5" + "@electron/universal": "npm:1.2.1" + "@malept/flatpak-bundler": "npm:^0.4.0" + async-exit-hook: "npm:^2.0.1" + bluebird-lst: "npm:^1.0.9" + builder-util: "npm:23.0.8" + builder-util-runtime: "npm:9.0.2" + chromium-pickle-js: "npm:^0.2.0" + debug: "npm:^4.3.4" + ejs: "npm:^3.1.7" + electron-osx-sign: "npm:^0.6.0" + electron-publish: "npm:23.0.8" + form-data: "npm:^4.0.0" + fs-extra: "npm:^10.1.0" + hosted-git-info: "npm:^4.1.0" + is-ci: "npm:^3.0.0" + isbinaryfile: "npm:^4.0.10" + js-yaml: "npm:^4.1.0" + lazy-val: "npm:^1.0.5" + minimatch: "npm:^3.1.2" + read-config-file: "npm:6.2.0" + sanitize-filename: "npm:^1.6.3" + semver: "npm:^7.3.7" + tar: "npm:^6.1.11" + temp-file: "npm:^3.4.0" + checksum: 10c0/9d832a9caa0b32ead71aee3ecb8b16d776a7c590f237345852087847f71ad8cf70c00b0db7e00891e24541c24097d97299042816a8f7615590b3e408af84e6b8 + languageName: node + linkType: hard + +"app-builder-lib@npm:23.6.0": + version: 23.6.0 + resolution: "app-builder-lib@npm:23.6.0" + dependencies: + 7zip-bin: "npm:~5.1.1" + "@develar/schema-utils": "npm:~2.6.5" + "@electron/universal": "npm:1.2.1" + "@malept/flatpak-bundler": "npm:^0.4.0" + async-exit-hook: "npm:^2.0.1" + bluebird-lst: "npm:^1.0.9" + builder-util: "npm:23.6.0" + builder-util-runtime: "npm:9.1.1" + chromium-pickle-js: "npm:^0.2.0" + debug: "npm:^4.3.4" + ejs: "npm:^3.1.7" + electron-osx-sign: "npm:^0.6.0" + electron-publish: "npm:23.6.0" + form-data: "npm:^4.0.0" + fs-extra: "npm:^10.1.0" + hosted-git-info: "npm:^4.1.0" + is-ci: "npm:^3.0.0" + isbinaryfile: "npm:^4.0.10" + js-yaml: "npm:^4.1.0" + lazy-val: "npm:^1.0.5" + minimatch: "npm:^3.1.2" + read-config-file: "npm:6.2.0" + sanitize-filename: "npm:^1.6.3" + semver: "npm:^7.3.7" + tar: "npm:^6.1.11" + temp-file: "npm:^3.4.0" + checksum: 10c0/a4878df17dc24e7ac3cc9e4536fedff921bae8b6b953d708fff8a37bf4d533a23a112d3b904aec3a901b81222ef1fbe08b63e172ec94ae466d871d289b64b8fa + languageName: node + linkType: hard + +"aproba@npm:^1.0.3 || ^2.0.0": + version: 2.0.0 + resolution: "aproba@npm:2.0.0" + checksum: 10c0/d06e26384a8f6245d8c8896e138c0388824e259a329e0c9f196b4fa533c82502a6fd449586e3604950a0c42921832a458bb3aa0aa9f0ba449cfd4f50fd0d09b5 + languageName: node + linkType: hard + +"are-we-there-yet@npm:^3.0.0": + version: 3.0.1 + resolution: "are-we-there-yet@npm:3.0.1" + dependencies: + delegates: "npm:^1.0.0" + readable-stream: "npm:^3.6.0" + checksum: 10c0/8373f289ba42e4b5ec713bb585acdac14b5702c75f2a458dc985b9e4fa5762bc5b46b40a21b72418a3ed0cfb5e35bdc317ef1ae132f3035f633d581dd03168c3 + languageName: node + linkType: hard + +"arg@npm:^4.1.0": + version: 4.1.3 + resolution: "arg@npm:4.1.3" + checksum: 10c0/070ff801a9d236a6caa647507bdcc7034530604844d64408149a26b9e87c2f97650055c0f049abd1efc024b334635c01f29e0b632b371ac3f26130f4cf65997a + languageName: node + linkType: hard + +"argparse@npm:^2.0.1": + version: 2.0.1 + resolution: "argparse@npm:2.0.1" + checksum: 10c0/c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e + languageName: node + linkType: hard + +"array-buffer-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "array-buffer-byte-length@npm:1.0.0" + dependencies: + call-bind: "npm:^1.0.2" + is-array-buffer: "npm:^3.0.1" + checksum: 10c0/12f84f6418b57a954caa41654e5e63e019142a4bbb2c6829ba86d1ba65d31ccfaf1461d1743556fd32b091fac34ff44d9dfbdb001402361c45c373b2c86f5c20 + languageName: node + linkType: hard + +"array-buffer-byte-length@npm:^1.0.1": + version: 1.0.1 + resolution: "array-buffer-byte-length@npm:1.0.1" + dependencies: + call-bind: "npm:^1.0.5" + is-array-buffer: "npm:^3.0.4" + checksum: 10c0/f5cdf54527cd18a3d2852ddf73df79efec03829e7373a8322ef5df2b4ef546fb365c19c71d6b42d641cb6bfe0f1a2f19bc0ece5b533295f86d7c3d522f228917 + languageName: node + linkType: hard + +"array-ify@npm:^1.0.0": + version: 1.0.0 + resolution: "array-ify@npm:1.0.0" + checksum: 10c0/75c9c072faac47bd61779c0c595e912fe660d338504ac70d10e39e1b8a4a0c9c87658703d619b9d1b70d324177ae29dc8d07dda0d0a15d005597bc4c5a59c70c + languageName: node + linkType: hard + +"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7": + version: 3.1.7 + resolution: "array-includes@npm:3.1.7" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + get-intrinsic: "npm:^1.2.1" + is-string: "npm:^1.0.7" + checksum: 10c0/692907bd7f19d06dc58ccb761f34b58f5dc0b437d2b47a8fe42a1501849a5cf5c27aed3d521a9702667827c2c85a7e75df00a402c438094d87fc43f39ebf9b2b + languageName: node + linkType: hard + +"array-union@npm:^2.1.0": + version: 2.1.0 + resolution: "array-union@npm:2.1.0" + checksum: 10c0/429897e68110374f39b771ec47a7161fc6a8fc33e196857c0a396dc75df0b5f65e4d046674db764330b6bb66b39ef48dd7c53b6a2ee75cfb0681e0c1a7033962 + languageName: node + linkType: hard + +"array.prototype.filter@npm:^1.0.3": + version: 1.0.3 + resolution: "array.prototype.filter@npm:1.0.3" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + es-array-method-boxes-properly: "npm:^1.0.0" + is-string: "npm:^1.0.7" + checksum: 10c0/8b70b5f866df5d90fa27aa5bfa30f5fefc44cbea94b0513699d761713658077c2a24cbf06aac5179eabddb6c93adc467af4c288b7a839c5bc5a769ee5a2d48ad + languageName: node + linkType: hard + +"array.prototype.findlastindex@npm:^1.2.3": + version: 1.2.4 + resolution: "array.prototype.findlastindex@npm:1.2.4" + dependencies: + call-bind: "npm:^1.0.5" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.22.3" + es-errors: "npm:^1.3.0" + es-shim-unscopables: "npm:^1.0.2" + checksum: 10c0/b23ae35cf7621c82c20981ee110626090734a264798e781b052e534e3d61d576f03d125d92cf2e3672062bb5cc5907e02e69f2d80196a55f3cdb0197b4aa8c64 + languageName: node + linkType: hard + +"array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.2": + version: 1.3.2 + resolution: "array.prototype.flat@npm:1.3.2" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + es-shim-unscopables: "npm:^1.0.0" + checksum: 10c0/a578ed836a786efbb6c2db0899ae80781b476200617f65a44846cb1ed8bd8b24c8821b83703375d8af639c689497b7b07277060024b9919db94ac3e10dc8a49b + languageName: node + linkType: hard + +"array.prototype.flatmap@npm:^1.3.1": + version: 1.3.1 + resolution: "array.prototype.flatmap@npm:1.3.1" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.4" + es-abstract: "npm:^1.20.4" + es-shim-unscopables: "npm:^1.0.0" + checksum: 10c0/2bd58a0e79d5d90cb4f5ef0e287edf8b28e87c65428f54025ac6b7b4c204224b92811c266f296c53a2dbc93872117c0fcea2e51d3c9e8cecfd5024d4a4a57db4 + languageName: node + linkType: hard + +"array.prototype.flatmap@npm:^1.3.2": + version: 1.3.2 + resolution: "array.prototype.flatmap@npm:1.3.2" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + es-shim-unscopables: "npm:^1.0.0" + checksum: 10c0/67b3f1d602bb73713265145853128b1ad77cc0f9b833c7e1e056b323fbeac41a4ff1c9c99c7b9445903caea924d9ca2450578d9011913191aa88cc3c3a4b54f4 + languageName: node + linkType: hard + +"array.prototype.tosorted@npm:^1.1.1": + version: 1.1.1 + resolution: "array.prototype.tosorted@npm:1.1.1" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.4" + es-abstract: "npm:^1.20.4" + es-shim-unscopables: "npm:^1.0.0" + get-intrinsic: "npm:^1.1.3" + checksum: 10c0/fd5f57aca3c7ddcd1bb83965457b625f3a67d8f334f5cbdb8ac8ef33d5b0d38281524114db2936f8c08048115d5158af216c94e6ae1eb966241b9b6f4ab8a7e8 + languageName: node + linkType: hard + +"arraybuffer.prototype.slice@npm:^1.0.1": + version: 1.0.2 + resolution: "arraybuffer.prototype.slice@npm:1.0.2" + dependencies: + array-buffer-byte-length: "npm:^1.0.0" + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + get-intrinsic: "npm:^1.2.1" + is-array-buffer: "npm:^3.0.2" + is-shared-array-buffer: "npm:^1.0.2" + checksum: 10c0/96b6e40e439678ffb7fa266398510074d33c3980fbb475490b69980cca60adec3b0777047ef377068a29862157f83edef42efc64ce48ce38977d04d68de5b7fb + languageName: node + linkType: hard + +"arraybuffer.prototype.slice@npm:^1.0.3": + version: 1.0.3 + resolution: "arraybuffer.prototype.slice@npm:1.0.3" + dependencies: + array-buffer-byte-length: "npm:^1.0.1" + call-bind: "npm:^1.0.5" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.22.3" + es-errors: "npm:^1.2.1" + get-intrinsic: "npm:^1.2.3" + is-array-buffer: "npm:^3.0.4" + is-shared-array-buffer: "npm:^1.0.2" + checksum: 10c0/d32754045bcb2294ade881d45140a5e52bda2321b9e98fa514797b7f0d252c4c5ab0d1edb34112652c62fa6a9398def568da63a4d7544672229afea283358c36 + languageName: node + linkType: hard + +"arrify@npm:^1.0.1": + version: 1.0.1 + resolution: "arrify@npm:1.0.1" + checksum: 10c0/c35c8d1a81bcd5474c0c57fe3f4bad1a4d46a5fa353cedcff7a54da315df60db71829e69104b859dff96c5d68af46bd2be259fe5e50dc6aa9df3b36bea0383ab + languageName: node + linkType: hard + +"asar@npm:^3.1.0": + version: 3.2.0 + resolution: "asar@npm:3.2.0" + dependencies: + "@types/glob": "npm:^7.1.1" + chromium-pickle-js: "npm:^0.2.0" + commander: "npm:^5.0.0" + glob: "npm:^7.1.6" + minimatch: "npm:^3.0.4" + dependenciesMeta: + "@types/glob": + optional: true + bin: + asar: bin/asar.js + checksum: 10c0/1eea9686e3df8102251b911951d374c4bb758ce2881471c94c3999f7c473c96be6036ac09aafbd9453ba43b901e96ad0082d7e1bafc12f6768571353297c516f + languageName: node + linkType: hard + +"asbycountry@npm:^1.4.2": + version: 1.4.2 + resolution: "asbycountry@npm:1.4.2" + dependencies: + chalk: "npm:^1.1.3" + fetch: "npm:^1.1.0" + checksum: 10c0/7d3a6cfa9fe9bd8cd06a1b7ff251cfad692bdcb4bbbe2179d02f9b0ced3cc3b61980588f0a7528b5cc693a6191b0599db5fa02f51ed96cf573ec207a7f32f437 + languageName: node + linkType: hard + +"assert-plus@npm:^1.0.0": + version: 1.0.0 + resolution: "assert-plus@npm:1.0.0" + checksum: 10c0/b194b9d50c3a8f872ee85ab110784911e696a4d49f7ee6fc5fb63216dedbefd2c55999c70cb2eaeb4cf4a0e0338b44e9ace3627117b5bf0d42460e9132f21b91 + languageName: node + linkType: hard + +"assertion-error@npm:^1.1.0": + version: 1.1.0 + resolution: "assertion-error@npm:1.1.0" + checksum: 10c0/25456b2aa333250f01143968e02e4884a34588a8538fbbf65c91a637f1dbfb8069249133cd2f4e530f10f624d206a664e7df30207830b659e9f5298b00a4099b + languageName: node + linkType: hard + +"astral-regex@npm:^2.0.0": + version: 2.0.0 + resolution: "astral-regex@npm:2.0.0" + checksum: 10c0/f63d439cc383db1b9c5c6080d1e240bd14dae745f15d11ec5da863e182bbeca70df6c8191cffef5deba0b566ef98834610a68be79ac6379c95eeb26e1b310e25 + languageName: node + linkType: hard + +"async-exit-hook@npm:^2.0.1": + version: 2.0.1 + resolution: "async-exit-hook@npm:2.0.1" + checksum: 10c0/81407a440ef0aab328df2369f1a9d957ee53e9a5a43e3b3dcb2be05151a68de0e4ff5e927f4718c88abf85800731f5b3f69a47a6642ce135f5e7d43ca0fce41d + languageName: node + linkType: hard + +"async@npm:^2.6.4": + version: 2.6.4 + resolution: "async@npm:2.6.4" + dependencies: + lodash: "npm:^4.17.14" + checksum: 10c0/0ebb3273ef96513389520adc88e0d3c45e523d03653cc9b66f5c46f4239444294899bfd13d2b569e7dbfde7da2235c35cf5fd3ece9524f935d41bbe4efccdad0 + languageName: node + linkType: hard + +"asynciterator.prototype@npm:^1.0.0": + version: 1.0.0 + resolution: "asynciterator.prototype@npm:1.0.0" + dependencies: + has-symbols: "npm:^1.0.3" + checksum: 10c0/fb76850e57d931ff59fd16b6cddb79b0d34fe45f400b2c3480d38892e72cd089787401687dbdb7cdb14ece402c275d3e02a648760d1489cd493527129c4c6204 + languageName: node + linkType: hard + +"asynckit@npm:^0.4.0": + version: 0.4.0 + resolution: "asynckit@npm:0.4.0" + checksum: 10c0/d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d + languageName: node + linkType: hard + +"at-least-node@npm:^1.0.0": + version: 1.0.0 + resolution: "at-least-node@npm:1.0.0" + checksum: 10c0/4c058baf6df1bc5a1697cf182e2029c58cd99975288a13f9e70068ef5d6f4e1f1fd7c4d2c3c4912eae44797d1725be9700995736deca441b39f3e66d8dee97ef + languageName: node + linkType: hard + +"auto-bind@npm:^4.0.0": + version: 4.0.0 + resolution: "auto-bind@npm:4.0.0" + checksum: 10c0/12f70745d081ba990dca028ecfa70de25d4baa9a8b74a5bef3ab293da56cba32ff8276c3ff8e5fe6d9f370547bf3fa71486befbfefe272af7e722c21d0c25530 + languageName: node + linkType: hard + +"available-typed-arrays@npm:^1.0.5": + version: 1.0.5 + resolution: "available-typed-arrays@npm:1.0.5" + checksum: 10c0/c4df567ca72d2754a6cbad20088f5f98b1065b3360178169fa9b44ea101af62c0f423fc3854fa820fd6895b6b9171b8386e71558203103ff8fc2ad503fdcc660 + languageName: node + linkType: hard + +"available-typed-arrays@npm:^1.0.6": + version: 1.0.7 + resolution: "available-typed-arrays@npm:1.0.7" + dependencies: + possible-typed-array-names: "npm:^1.0.0" + checksum: 10c0/d07226ef4f87daa01bd0fe80f8f310982e345f372926da2e5296aecc25c41cab440916bbaa4c5e1034b453af3392f67df5961124e4b586df1e99793a1374bdb2 + languageName: node + linkType: hard + +"axios@npm:^1.3.2": + version: 1.6.8 + resolution: "axios@npm:1.6.8" + dependencies: + follow-redirects: "npm:^1.15.6" + form-data: "npm:^4.0.0" + proxy-from-env: "npm:^1.1.0" + checksum: 10c0/0f22da6f490335479a89878bc7d5a1419484fbb437b564a80c34888fc36759ae4f56ea28d55a191695e5ed327f0bad56e7ff60fb6770c14d1be6501505d47ab9 + languageName: node + linkType: hard + +"babel-plugin-styled-components@npm:>= 1": + version: 2.1.4 + resolution: "babel-plugin-styled-components@npm:2.1.4" + dependencies: + "@babel/helper-annotate-as-pure": "npm:^7.22.5" + "@babel/helper-module-imports": "npm:^7.22.5" + "@babel/plugin-syntax-jsx": "npm:^7.22.5" + lodash: "npm:^4.17.21" + picomatch: "npm:^2.3.1" + peerDependencies: + styled-components: ">= 2" + checksum: 10c0/553f35f5feb4b51fda9c9aeef8a31c1b66f430687ab17830b7cdacfe7e93f912aef55bf59e402f4e0a1fa7ad039768ab3626512bbb9bf1f76fcc67ba47e7a56e + languageName: node + linkType: hard + +"backbone@npm:1.3.3": + version: 1.3.3 + resolution: "backbone@npm:1.3.3" + dependencies: + underscore: "npm:>=1.8.3" + checksum: 10c0/49e1255a232b6b4b8f36045f6e4560e8b8242c925e8ba16f99dbd8fa8d11b6baf39c4d5f0637eb4d7c2bec66aeafc63a17e16ab43abc99dc9b3c142968c3101f + languageName: node + linkType: hard + +"balanced-match@npm:^1.0.0": + version: 1.0.2 + resolution: "balanced-match@npm:1.0.2" + checksum: 10c0/9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee + languageName: node + linkType: hard + +"base64-js@npm:^1.3.1, base64-js@npm:^1.5.1": + version: 1.5.1 + resolution: "base64-js@npm:1.5.1" + checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf + languageName: node + linkType: hard + +"big.js@npm:^5.2.2": + version: 5.2.2 + resolution: "big.js@npm:5.2.2" + checksum: 10c0/230520f1ff920b2d2ce3e372d77a33faa4fa60d802fe01ca4ffbc321ee06023fe9a741ac02793ee778040a16b7e497f7d60c504d1c402b8fdab6f03bb785a25f + languageName: node + linkType: hard + +"binary-extensions@npm:^2.0.0": + version: 2.2.0 + resolution: "binary-extensions@npm:2.2.0" + checksum: 10c0/d73d8b897238a2d3ffa5f59c0241870043aa7471335e89ea5e1ff48edb7c2d0bb471517a3e4c5c3f4c043615caa2717b5f80a5e61e07503d51dc85cb848e665d + languageName: node + linkType: hard + +"bindings@npm:^1.5.0": + version: 1.5.0 + resolution: "bindings@npm:1.5.0" + dependencies: + file-uri-to-path: "npm:1.0.0" + checksum: 10c0/3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba + languageName: node + linkType: hard + +"biskviit@npm:1.0.1": + version: 1.0.1 + resolution: "biskviit@npm:1.0.1" + dependencies: + psl: "npm:^1.1.7" + checksum: 10c0/25325ddeb1f7bacf34f33266a84a89dd370e082b63252be11827b1ccc4e371e55f45c13939719b5715dc4e4fb79f63795935f7f4532365c8de8940c46f29f863 + languageName: node + linkType: hard + +"blob-util@npm:2.0.2": + version: 2.0.2 + resolution: "blob-util@npm:2.0.2" + checksum: 10c0/ed82d587827e5c86be122301a7c250f8364963e9582f72a826255bfbd32f8d69cc10169413d666667bb1c4fc8061329ae89d176ffe46fee8f32080af944ccddc + languageName: node + linkType: hard + +"bluebird-lst@npm:^1.0.9": + version: 1.0.9 + resolution: "bluebird-lst@npm:1.0.9" + dependencies: + bluebird: "npm:^3.5.5" + checksum: 10c0/701eef18f37a53277adeacb21281a70fc4536e521fe0deb665a284f4d8480056c6932988c3dfa6a0c46b4d55f4599f716a15873f30ed5fc2470928093438f87e + languageName: node + linkType: hard + +"bluebird@npm:^3.5.0, bluebird@npm:^3.5.5, bluebird@npm:^3.7.2": + version: 3.7.2 + resolution: "bluebird@npm:3.7.2" + checksum: 10c0/680de03adc54ff925eaa6c7bb9a47a0690e8b5de60f4792604aae8ed618c65e6b63a7893b57ca924beaf53eee69c5af4f8314148c08124c550fe1df1add897d2 + languageName: node + linkType: hard + +"blueimp-load-image@npm:5.14.0": + version: 5.14.0 + resolution: "blueimp-load-image@npm:5.14.0" + checksum: 10c0/f5b8468ef3a92d341f4dff9cbf1362a5ac1bcb8dd37b18f7c4b5e7139ac48e4e21856625ebf92f348f7f681e1d482c7d4f5ffc66188c30c8c8c05aeb39987a4e + languageName: node + linkType: hard + +"boolean@npm:^3.0.1": + version: 3.2.0 + resolution: "boolean@npm:3.2.0" + checksum: 10c0/6a0dc9668f6f3dda42a53c181fcbdad223169c8d87b6c4011b87a8b14a21770efb2934a778f063d7ece17280f8c06d313c87f7b834bb1dd526a867ffcd00febf + languageName: node + linkType: hard + +"boxen@npm:^5.0.0": + version: 5.1.2 + resolution: "boxen@npm:5.1.2" + dependencies: + ansi-align: "npm:^3.0.0" + camelcase: "npm:^6.2.0" + chalk: "npm:^4.1.0" + cli-boxes: "npm:^2.2.1" + string-width: "npm:^4.2.2" + type-fest: "npm:^0.20.2" + widest-line: "npm:^3.1.0" + wrap-ansi: "npm:^7.0.0" + checksum: 10c0/71f31c2eb3dcacd5fce524ae509e0cc90421752e0bfbd0281fd3352871d106c462a0f810c85f2fdb02f3a9fab2d7a84e9718b4999384d651b76104ebe5d2c024 + languageName: node + linkType: hard + +"brace-expansion@npm:^1.1.7": + version: 1.1.11 + resolution: "brace-expansion@npm:1.1.11" + dependencies: + balanced-match: "npm:^1.0.0" + concat-map: "npm:0.0.1" + checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668 + languageName: node + linkType: hard + +"braces@npm:^3.0.2, braces@npm:~3.0.2": + version: 3.0.2 + resolution: "braces@npm:3.0.2" + dependencies: + fill-range: "npm:^7.0.1" + checksum: 10c0/321b4d675791479293264019156ca322163f02dc06e3c4cab33bb15cd43d80b51efef69b0930cfde3acd63d126ebca24cd0544fa6f261e093a0fb41ab9dda381 + languageName: node + linkType: hard + +"browser-stdout@npm:1.3.1": + version: 1.3.1 + resolution: "browser-stdout@npm:1.3.1" + checksum: 10c0/c40e482fd82be872b6ea7b9f7591beafbf6f5ba522fe3dade98ba1573a1c29a11101564993e4eb44e5488be8f44510af072df9a9637c739217eb155ceb639205 + languageName: node + linkType: hard + +"browserslist@npm:^4.14.5": + version: 4.21.10 + resolution: "browserslist@npm:4.21.10" + dependencies: + caniuse-lite: "npm:^1.0.30001517" + electron-to-chromium: "npm:^1.4.477" + node-releases: "npm:^2.0.13" + update-browserslist-db: "npm:^1.0.11" + bin: + browserslist: cli.js + checksum: 10c0/e8c98496e5f2a5128d0e2f1f186dc0416bfc49c811e568b19c9e07a56cccc1f7f415fa4f532488e6a13dfacbe3332a9b55b152082ff125402696a11a158a0894 + languageName: node + linkType: hard + +"buffer-alloc-unsafe@npm:^1.1.0": + version: 1.1.0 + resolution: "buffer-alloc-unsafe@npm:1.1.0" + checksum: 10c0/06b9298c9369621a830227c3797ceb3ff5535e323946d7b39a7398fed8b3243798259b3c85e287608c5aad35ccc551cec1a0a5190cc8f39652e8eee25697fc9c + languageName: node + linkType: hard + +"buffer-alloc@npm:^1.2.0": + version: 1.2.0 + resolution: "buffer-alloc@npm:1.2.0" + dependencies: + buffer-alloc-unsafe: "npm:^1.1.0" + buffer-fill: "npm:^1.0.0" + checksum: 10c0/09d87dd53996342ccfbeb2871257d8cdb25ce9ee2259adc95c6490200cd6e528c5fbae8f30bcc323fe8d8efb0fe541e4ac3bbe9ee3f81c6b7c4b27434cc02ab4 + languageName: node + linkType: hard + +"buffer-crc32@npm:0.2.13, buffer-crc32@npm:~0.2.3": + version: 0.2.13 + resolution: "buffer-crc32@npm:0.2.13" + checksum: 10c0/cb0a8ddf5cf4f766466db63279e47761eb825693eeba6a5a95ee4ec8cb8f81ede70aa7f9d8aeec083e781d47154290eb5d4d26b3f7a465ec57fb9e7d59c47150 + languageName: node + linkType: hard + +"buffer-equal@npm:1.0.0": + version: 1.0.0 + resolution: "buffer-equal@npm:1.0.0" + checksum: 10c0/2459f0b6a50dec18571c56dc2a2a0603d2078e79cb0cad2a6eabd093c9fc6e40e7c0a42170fa982324e8defb5d7fe7318e3a91458bc26a00ada1adef87849aaf + languageName: node + linkType: hard + +"buffer-fill@npm:^1.0.0": + version: 1.0.0 + resolution: "buffer-fill@npm:1.0.0" + checksum: 10c0/55b5654fbbf2d7ceb4991bb537f5e5b5b5b9debca583fee416a74fcec47c16d9e7a90c15acd27577da7bd750b7fa6396e77e7c221e7af138b6d26242381c6e4d + languageName: node + linkType: hard + +"buffer-from@npm:^1.0.0": + version: 1.1.2 + resolution: "buffer-from@npm:1.1.2" + checksum: 10c0/124fff9d66d691a86d3b062eff4663fe437a9d9ee4b47b1b9e97f5a5d14f6d5399345db80f796827be7c95e70a8e765dd404b7c3ff3b3324f98e9b0c8826cc34 + languageName: node + linkType: hard + +"buffer@npm:^5.1.0": + version: 5.7.1 + resolution: "buffer@npm:5.7.1" + dependencies: + base64-js: "npm:^1.3.1" + ieee754: "npm:^1.1.13" + checksum: 10c0/27cac81cff434ed2876058d72e7c4789d11ff1120ef32c9de48f59eab58179b66710c488987d295ae89a228f835fc66d088652dffeb8e3ba8659f80eb091d55e + languageName: node + linkType: hard + +"builder-util-runtime@npm:8.9.2": + version: 8.9.2 + resolution: "builder-util-runtime@npm:8.9.2" + dependencies: + debug: "npm:^4.3.2" + sax: "npm:^1.2.4" + checksum: 10c0/0afc2c9025c0bb1ad66749fb4d47b3ca87df7194aab29df1377017adaea3bfd84afeadba8ecbda23071ee93267cb933d855237cf56299d5c021b8d0e62ed89ef + languageName: node + linkType: hard + +"builder-util-runtime@npm:9.0.2": + version: 9.0.2 + resolution: "builder-util-runtime@npm:9.0.2" + dependencies: + debug: "npm:^4.3.4" + sax: "npm:^1.2.4" + checksum: 10c0/cfd9073f01ef49b9c6faf631e1030ac8e6084746ad38c2c989df4b7a2c26147b535991de8739aa4ea3d1bcb1b64b61694ad6955466b30eab8c15463c9ac79689 + languageName: node + linkType: hard + +"builder-util-runtime@npm:9.1.1": + version: 9.1.1 + resolution: "builder-util-runtime@npm:9.1.1" + dependencies: + debug: "npm:^4.3.4" + sax: "npm:^1.2.4" + checksum: 10c0/6f0eadd6c600db982bb00a9e9b58f00e1c3b67c5dd6bbb940c0caab46b680cf666983a1469efb09861084d85a6a3779887990189f436387fb3057706c063165e + languageName: node + linkType: hard + +"builder-util@npm:23.0.8": + version: 23.0.8 + resolution: "builder-util@npm:23.0.8" + dependencies: + 7zip-bin: "npm:~5.1.1" + "@types/debug": "npm:^4.1.6" + "@types/fs-extra": "npm:^9.0.11" + app-builder-bin: "npm:4.0.0" + bluebird-lst: "npm:^1.0.9" + builder-util-runtime: "npm:9.0.2" + chalk: "npm:^4.1.1" + cross-spawn: "npm:^7.0.3" + debug: "npm:^4.3.4" + fs-extra: "npm:^10.0.0" + http-proxy-agent: "npm:^5.0.0" + https-proxy-agent: "npm:^5.0.0" + is-ci: "npm:^3.0.0" + js-yaml: "npm:^4.1.0" + source-map-support: "npm:^0.5.19" + stat-mode: "npm:^1.0.0" + temp-file: "npm:^3.4.0" + checksum: 10c0/f2aff5de3a0efa7c7b366cba79d42ee6e9e870edafc1c9125f52db5c75e706ef96fdbbb2bb5cb2347a8c79f0a87c3605f69541da27e37f8846778288c364ac65 + languageName: node + linkType: hard + +"builder-util@npm:23.6.0": + version: 23.6.0 + resolution: "builder-util@npm:23.6.0" + dependencies: + 7zip-bin: "npm:~5.1.1" + "@types/debug": "npm:^4.1.6" + "@types/fs-extra": "npm:^9.0.11" + app-builder-bin: "npm:4.0.0" + bluebird-lst: "npm:^1.0.9" + builder-util-runtime: "npm:9.1.1" + chalk: "npm:^4.1.1" + cross-spawn: "npm:^7.0.3" + debug: "npm:^4.3.4" + fs-extra: "npm:^10.0.0" + http-proxy-agent: "npm:^5.0.0" + https-proxy-agent: "npm:^5.0.0" + is-ci: "npm:^3.0.0" + js-yaml: "npm:^4.1.0" + source-map-support: "npm:^0.5.19" + stat-mode: "npm:^1.0.0" + temp-file: "npm:^3.4.0" + checksum: 10c0/1e8b5c865813c9fcd4d0a209be6f86493c650883dab5788be8cf58f45004fba029061a42e4f15d307d312fc08936281de538f0688692dfb037eb2bbdc3d77052 + languageName: node + linkType: hard "bunyan@https://github.com/Bilb/node-bunyan": - version "2.0.5" - resolved "https://github.com/Bilb/node-bunyan#1f69cb340cd25485c508e65197d05ae534b212e2" - dependencies: - exeunt "1.1.0" - optionalDependencies: - moment "^2.19.3" - mv "~2" - safe-json-stringify "~1" - -bytebuffer@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" - integrity sha512-IuzSdmADppkZ6DlpycMkm8l9zeEq16fWtLvunEwFiYciR/BHo4E8/xs5piFquG+Za8OWmMqHF8zuRviz2LHvRQ== - dependencies: - long "~3" - -cacheable-lookup@^5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" - integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== - -cacheable-request@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817" - integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^4.0.0" - lowercase-keys "^2.0.0" - normalize-url "^6.0.1" - responselike "^2.0.0" - -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" - integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== - dependencies: - es-define-property "^1.0.0" - es-errors "^1.3.0" - function-bind "^1.1.2" - get-intrinsic "^1.2.4" - set-function-length "^1.2.1" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camelcase-keys@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" - integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== - dependencies: - camelcase "^5.3.1" - map-obj "^4.0.0" - quick-lru "^4.0.1" - -camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -camelcase@^6.0.0, camelcase@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -camelize@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3" - integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ== - -caniuse-lite@^1.0.30001517: - version "1.0.30001527" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001527.tgz#813826554828245ccee776c850566dce12bdeaba" - integrity sha512-YkJi7RwPgWtXVSgK4lG9AHH57nSzvvOp9MesgXmw4Q7n0C3H04L0foHqfxcmSAm5AcWb8dW9AYj2tR7/5GnddQ== - -catharsis@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121" - integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A== - dependencies: - lodash "^4.17.15" - -chai-as-promised@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0" - integrity sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA== - dependencies: - check-error "^1.0.2" - -chai-bytes@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/chai-bytes/-/chai-bytes-0.1.2.tgz#c297e81d47eb3106af0676ded5bb5e0c9f981db3" - integrity sha512-0ol6oJS0y1ozj6AZK8n1pyv1/G+l44nqUJygAkK1UrYl+IOGie5vcrEdrAlwmLYGIA9NVvtHWosPYwWWIXf/XA== - -chai@^4.3.4: - version "4.3.8" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.8.tgz#40c59718ad6928da6629c70496fe990b2bb5b17c" - integrity sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ== - dependencies: - assertion-error "^1.1.0" - check-error "^1.0.2" - deep-eql "^4.1.2" - get-func-name "^2.0.0" - loupe "^2.3.1" - pathval "^1.1.1" - type-detect "^4.0.5" - -chalk@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" - integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -check-error@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" - integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA== - -chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0": - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -chromium-pickle-js@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" - integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== - -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - -ci-info@^3.2.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" - integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== - -classnames@2.2.5: - version "2.2.5" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d" - integrity sha512-DTt3GhOUDKhh4ONwIJW4lmhyotQmV2LjNlGK/J2hkwUcqcbKkCLAdJPtxQnxnlc7SR3f1CEXCyMmc7WLUsWbNA== - -classnames@^2.2.5: - version "2.3.2" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" - integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== - -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== - -cli-cursor@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea" - integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg== - dependencies: - restore-cursor "^4.0.0" - -cli-truncate@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" - integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== - dependencies: - slice-ansi "^3.0.0" - string-width "^4.2.0" - -cli-truncate@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389" - integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA== - dependencies: - slice-ansi "^5.0.0" - string-width "^5.0.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - -clone-response@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" - integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== - dependencies: - mimic-response "^1.0.0" - -clsx@^1.0.4, clsx@^1.1.1, clsx@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" - integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== - -cmake-js@^7.2.1: - version "7.3.0" - resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.3.0.tgz#6fd6234b7aeec4545c1c806f9e3f7ffacd9798b2" - integrity sha512-dXs2zq9WxrV87bpJ+WbnGKv8WUBXDw8blNiwNHoRe/it+ptscxhQHKB1SJXa1w+kocLMeP28Tk4/eTCezg4o+w== - dependencies: - axios "^1.6.5" - debug "^4" - fs-extra "^11.2.0" - lodash.isplainobject "^4.0.6" - memory-stream "^1.0.0" - node-api-headers "^1.1.0" - npmlog "^6.0.2" - rc "^1.2.7" - semver "^7.5.4" - tar "^6.2.0" - url-join "^4.0.1" - which "^2.0.2" - yargs "^17.7.2" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -color-support@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" - integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== - -colorette@^2.0.14, colorette@^2.0.20: - version "2.0.20" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" - integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== - -colors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== - -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67" - integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ== - -commander@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A== - dependencies: - graceful-readlink ">= 1.0.0" - -commander@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" - integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== - -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== - -compare-func@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3" - integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA== - dependencies: - array-ify "^1.0.0" - dot-prop "^5.1.0" - -compare-version@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" - integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -config@1.28.1: - version "1.28.1" - resolved "https://registry.yarnpkg.com/config/-/config-1.28.1.tgz#7625d2a1e4c90f131d8a73347982d93c3873282d" - integrity sha512-NT2hna+ec7G1hLB+Jimu6tuzQQqAG81YJM2P4x31hM9qffcOeaMlue6tc/TTEEfRcyzVTJFzBzweRQf0FBHghQ== - dependencies: - json5 "0.4.0" - os-homedir "1.0.2" - -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== - dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" - -confusing-browser-globals@^1.0.10: - version "1.0.11" - resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" - integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA== - -console-control-strings@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== - -conventional-changelog-angular@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-6.0.0.tgz#a9a9494c28b7165889144fd5b91573c4aa9ca541" - integrity sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg== - dependencies: - compare-func "^2.0.0" - -conventional-changelog-conventionalcommits@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-6.1.0.tgz#3bad05f4eea64e423d3d90fc50c17d2c8cf17652" - integrity sha512-3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw== - dependencies: - compare-func "^2.0.0" - -conventional-commits-parser@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz#02ae1178a381304839bce7cea9da5f1b549ae505" - integrity sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg== - dependencies: - JSONStream "^1.3.5" - is-text-path "^1.0.1" - meow "^8.1.2" - split2 "^3.2.2" - -copy-to-clipboard@^3.3.1: - version "3.3.3" - resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0" - integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA== - dependencies: - toggle-selection "^1.0.6" - -core-util-is@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== - -cosmiconfig-typescript-loader@^4.0.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.4.0.tgz#f3feae459ea090f131df5474ce4b1222912319f9" - integrity sha512-BabizFdC3wBHhbI4kJh0VkQP9GkBfoHPydD0COMce1nJ1kJAB3F2TmJ/I7diULBKtmEWSwEbuN/KDtgnmUUVmw== - -cosmiconfig@^8.0.0: - version "8.3.4" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.4.tgz#ee1356e7f24e248a6bb34ec5d438c3dcebeb410c" - integrity sha512-SF+2P8+o/PTV05rgsAjDzL4OFdVXAulSfC/L19VaeVT7+tpOOSscCt2QLxDZ+CLxF2WOiq6y1K5asvs8qUJT/Q== - dependencies: - import-fresh "^3.3.0" - js-yaml "^4.1.0" - parse-json "^5.2.0" - path-type "^4.0.0" - -country-code-lookup@^0.0.19: - version "0.0.19" - resolved "https://registry.yarnpkg.com/country-code-lookup/-/country-code-lookup-0.0.19.tgz#3fbf0192758ecf0d5eee0efbc220d62706c50fd6" - integrity sha512-lpvgdPyj8RuP0CSZhACNf5ueKlLbv/IQUAQfg7yr/qJbFrdcWV7Y+aDN9K/u/bx3MXRfcsjuW+TdIc0AEj7kDw== - -crc@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" - integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== - dependencies: - buffer "^5.1.0" - -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - -cross-env@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941" - integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag== - dependencies: - cross-spawn "^7.0.0" - -cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== - -css-color-keywords@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" - integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg== - -css-in-js-utils@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz#640ae6a33646d401fc720c54fc61c42cd76ae2bb" - integrity sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A== - dependencies: - hyphenate-style-name "^1.0.3" - -css-loader@^6.7.2: - version "6.8.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.8.1.tgz#0f8f52699f60f5e679eab4ec0fcd68b8e8a50a88" - integrity sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g== - dependencies: - icss-utils "^5.1.0" - postcss "^8.4.21" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.3" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.2.0" - semver "^7.3.8" - -css-to-react-native@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32" - integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ== - dependencies: - camelize "^1.0.0" - css-color-keywords "^1.0.0" - postcss-value-parser "^4.0.2" - -css-tree@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== - dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" - -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== - -cssstyle@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a" - integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg== - dependencies: - rrweb-cssom "^0.6.0" - -csstype@^3.0.2, csstype@^3.0.6: - version "3.1.2" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" - integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== + version: 2.0.5 + resolution: "bunyan@https://github.com/Bilb/node-bunyan.git#commit=1f69cb340cd25485c508e65197d05ae534b212e2" + dependencies: + exeunt: "npm:1.1.0" + moment: "npm:^2.19.3" + mv: "npm:~2" + safe-json-stringify: "npm:~1" + dependenciesMeta: + moment: + optional: true + mv: + optional: true + safe-json-stringify: + optional: true + bin: + bunyan: ./bin/bunyan + checksum: 10c0/37f821f240daf3a809415aaa3ecdf2fe7b129d831ff3d8aa5543c17eda30de6b8535553b8876c3fab12969cfc298aeda90ced2710b318ca542aaf9f9de25b09e + languageName: node + linkType: hard + +"bytebuffer@npm:^5.0.1": + version: 5.0.1 + resolution: "bytebuffer@npm:5.0.1" + dependencies: + long: "npm:~3" + checksum: 10c0/d2f1342ac50a047e50ebaea7c3b73751c113aec84baddda0849e7cf2beb9feb52c93fd67425630976bdb7d801f048f47003a07f83dcda59f1c49ec6eb4e106bb + languageName: node + linkType: hard + +"cacache@npm:^18.0.0": + version: 18.0.3 + resolution: "cacache@npm:18.0.3" + dependencies: + "@npmcli/fs": "npm:^3.1.0" + fs-minipass: "npm:^3.0.0" + glob: "npm:^10.2.2" + lru-cache: "npm:^10.0.1" + minipass: "npm:^7.0.3" + minipass-collect: "npm:^2.0.1" + minipass-flush: "npm:^1.0.5" + minipass-pipeline: "npm:^1.2.4" + p-map: "npm:^4.0.0" + ssri: "npm:^10.0.0" + tar: "npm:^6.1.11" + unique-filename: "npm:^3.0.0" + checksum: 10c0/dfda92840bb371fb66b88c087c61a74544363b37a265023223a99965b16a16bbb87661fe4948718d79df6e0cc04e85e62784fbcf1832b2a5e54ff4c46fbb45b7 + languageName: node + linkType: hard + +"cacheable-lookup@npm:^5.0.3": + version: 5.0.4 + resolution: "cacheable-lookup@npm:5.0.4" + checksum: 10c0/a6547fb4954b318aa831cbdd2f7b376824bc784fb1fa67610e4147099e3074726072d9af89f12efb69121415a0e1f2918a8ddd4aafcbcf4e91fbeef4a59cd42c + languageName: node + linkType: hard + +"cacheable-request@npm:^7.0.2": + version: 7.0.4 + resolution: "cacheable-request@npm:7.0.4" + dependencies: + clone-response: "npm:^1.0.2" + get-stream: "npm:^5.1.0" + http-cache-semantics: "npm:^4.0.0" + keyv: "npm:^4.0.0" + lowercase-keys: "npm:^2.0.0" + normalize-url: "npm:^6.0.1" + responselike: "npm:^2.0.0" + checksum: 10c0/0834a7d17ae71a177bc34eab06de112a43f9b5ad05ebe929bec983d890a7d9f2bc5f1aa8bb67ea2b65e07a3bc74bea35fa62dd36dbac52876afe36fdcf83da41 + languageName: node + linkType: hard + +"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2": + version: 1.0.2 + resolution: "call-bind@npm:1.0.2" + dependencies: + function-bind: "npm:^1.1.1" + get-intrinsic: "npm:^1.0.2" + checksum: 10c0/74ba3f31e715456e22e451d8d098779b861eba3c7cac0d9b510049aced70d75c231ba05071f97e1812c98e34e2bee734c0c6126653e0088c2d9819ca047f4073 + languageName: node + linkType: hard + +"call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7": + version: 1.0.7 + resolution: "call-bind@npm:1.0.7" + dependencies: + es-define-property: "npm:^1.0.0" + es-errors: "npm:^1.3.0" + function-bind: "npm:^1.1.2" + get-intrinsic: "npm:^1.2.4" + set-function-length: "npm:^1.2.1" + checksum: 10c0/a3ded2e423b8e2a265983dba81c27e125b48eefb2655e7dfab6be597088da3d47c47976c24bc51b8fd9af1061f8f87b4ab78a314f3c77784b2ae2ba535ad8b8d + languageName: node + linkType: hard + +"callsites@npm:^3.0.0": + version: 3.1.0 + resolution: "callsites@npm:3.1.0" + checksum: 10c0/fff92277400eb06c3079f9e74f3af120db9f8ea03bad0e84d9aede54bbe2d44a56cccb5f6cf12211f93f52306df87077ecec5b712794c5a9b5dac6d615a3f301 + languageName: node + linkType: hard + +"camelcase-keys@npm:^6.2.2": + version: 6.2.2 + resolution: "camelcase-keys@npm:6.2.2" + dependencies: + camelcase: "npm:^5.3.1" + map-obj: "npm:^4.0.0" + quick-lru: "npm:^4.0.1" + checksum: 10c0/bf1a28348c0f285c6c6f68fb98a9d088d3c0269fed0cdff3ea680d5a42df8a067b4de374e7a33e619eb9d5266a448fe66c2dd1f8e0c9209ebc348632882a3526 + languageName: node + linkType: hard + +"camelcase@npm:^5.3.1": + version: 5.3.1 + resolution: "camelcase@npm:5.3.1" + checksum: 10c0/92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23 + languageName: node + linkType: hard + +"camelcase@npm:^6.0.0, camelcase@npm:^6.2.0": + version: 6.3.0 + resolution: "camelcase@npm:6.3.0" + checksum: 10c0/0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710 + languageName: node + linkType: hard + +"camelize@npm:^1.0.0": + version: 1.0.1 + resolution: "camelize@npm:1.0.1" + checksum: 10c0/4c9ac55efd356d37ac483bad3093758236ab686192751d1c9daa43188cc5a07b09bd431eb7458a4efd9ca22424bba23253e7b353feb35d7c749ba040de2385fb + languageName: node + linkType: hard + +"caniuse-lite@npm:^1.0.30001517": + version: 1.0.30001527 + resolution: "caniuse-lite@npm:1.0.30001527" + checksum: 10c0/244312b3342cf27c08bea5a8b362d498a29985e37414b766017c6c2c9186bd01e264be739105cdeeb5e9bdcde1320ecdb12eade7622443647af9f88d03509774 + languageName: node + linkType: hard + +"catharsis@npm:^0.9.0": + version: 0.9.0 + resolution: "catharsis@npm:0.9.0" + dependencies: + lodash: "npm:^4.17.15" + checksum: 10c0/9ac03ca48154ac63cfdb6c1645481d9d04f3c3e0dea131debf3116a0c12aa47e8864be7dcf770932c46d75bdd844a99f0c116c234e57232ad1f427751498e7ed + languageName: node + linkType: hard + +"chai-as-promised@npm:^7.1.1": + version: 7.1.1 + resolution: "chai-as-promised@npm:7.1.1" + dependencies: + check-error: "npm:^1.0.2" + peerDependencies: + chai: ">= 2.1.2 < 5" + checksum: 10c0/e25a602c3a8cd0b97ce6b0c7ddaaf4bd8517941da9f44dc65262c5268ea463f634dc495cdef6a21eaeffdb5022b6f4c3781027b8308273b7fff089c605abf6aa + languageName: node + linkType: hard + +"chai-bytes@npm:^0.1.2": + version: 0.1.2 + resolution: "chai-bytes@npm:0.1.2" + peerDependencies: + chai: ">=2 <5" + checksum: 10c0/09f46dbc77d9101fb4a491b998edd197c73072ee8c0b94da2ba36440019a6845868fc35ba3c2d92155aef54308d262f50858629f7ef5e3e8c5eab479ea0291b1 + languageName: node + linkType: hard + +"chai@npm:^4.3.4": + version: 4.3.8 + resolution: "chai@npm:4.3.8" + dependencies: + assertion-error: "npm:^1.1.0" + check-error: "npm:^1.0.2" + deep-eql: "npm:^4.1.2" + get-func-name: "npm:^2.0.0" + loupe: "npm:^2.3.1" + pathval: "npm:^1.1.1" + type-detect: "npm:^4.0.5" + checksum: 10c0/5aa714fbbd4b3a1506f4fc9094851bf9109f184d601c1278bcd4eb98d5ee05cc75d7e84f46d072d656502c55544b38c748a1c669468d138e41e5c9d175beffc5 + languageName: node + linkType: hard + +"chalk@npm:5.3.0": + version: 5.3.0 + resolution: "chalk@npm:5.3.0" + checksum: 10c0/8297d436b2c0f95801103ff2ef67268d362021b8210daf8ddbe349695333eb3610a71122172ff3b0272f1ef2cf7cc2c41fdaa4715f52e49ffe04c56340feed09 + languageName: node + linkType: hard + +"chalk@npm:^1.1.3": + version: 1.1.3 + resolution: "chalk@npm:1.1.3" + dependencies: + ansi-styles: "npm:^2.2.1" + escape-string-regexp: "npm:^1.0.2" + has-ansi: "npm:^2.0.0" + strip-ansi: "npm:^3.0.0" + supports-color: "npm:^2.0.0" + checksum: 10c0/28c3e399ec286bb3a7111fd4225ebedb0d7b813aef38a37bca7c498d032459c265ef43404201d5fbb8d888d29090899c95335b4c0cda13e8b126ff15c541cef8 + languageName: node + linkType: hard + +"chalk@npm:^2.4.2": + version: 2.4.2 + resolution: "chalk@npm:2.4.2" + dependencies: + ansi-styles: "npm:^3.2.1" + escape-string-regexp: "npm:^1.0.5" + supports-color: "npm:^5.3.0" + checksum: 10c0/e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073 + languageName: node + linkType: hard + +"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2": + version: 4.1.2 + resolution: "chalk@npm:4.1.2" + dependencies: + ansi-styles: "npm:^4.1.0" + supports-color: "npm:^7.1.0" + checksum: 10c0/4a3fef5cc34975c898ffe77141450f679721df9dde00f6c304353fa9c8b571929123b26a0e4617bde5018977eb655b31970c297b91b63ee83bb82aeb04666880 + languageName: node + linkType: hard + +"check-error@npm:^1.0.2": + version: 1.0.2 + resolution: "check-error@npm:1.0.2" + checksum: 10c0/c58ac4d6a92203209a61d025568198c073f101691eb6247f999266e1d1e3ab3af2bbe0a41af5008c1f1b95446ec7831e6ba91f03816177f2da852f316ad7921d + languageName: node + linkType: hard + +"chokidar@npm:3.5.3, chokidar@npm:>=3.0.0 <4.0.0": + version: 3.5.3 + resolution: "chokidar@npm:3.5.3" + dependencies: + anymatch: "npm:~3.1.2" + braces: "npm:~3.0.2" + fsevents: "npm:~2.3.2" + glob-parent: "npm:~5.1.2" + is-binary-path: "npm:~2.1.0" + is-glob: "npm:~4.0.1" + normalize-path: "npm:~3.0.0" + readdirp: "npm:~3.6.0" + dependenciesMeta: + fsevents: + optional: true + checksum: 10c0/1076953093e0707c882a92c66c0f56ba6187831aa51bb4de878c1fec59ae611a3bf02898f190efec8e77a086b8df61c2b2a3ea324642a0558bdf8ee6c5dc9ca1 + languageName: node + linkType: hard + +"chownr@npm:^2.0.0": + version: 2.0.0 + resolution: "chownr@npm:2.0.0" + checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6 + languageName: node + linkType: hard + +"chrome-trace-event@npm:^1.0.2": + version: 1.0.3 + resolution: "chrome-trace-event@npm:1.0.3" + checksum: 10c0/080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c + languageName: node + linkType: hard + +"chromium-pickle-js@npm:^0.2.0": + version: 0.2.0 + resolution: "chromium-pickle-js@npm:0.2.0" + checksum: 10c0/0a95bd280acdf05b0e08fa1a0e1db58c815dd24e92d639add8f494d23a8a49c26e4829721224d68f2f0e57a69047714db29bcff6deb5d029332321223416cb29 + languageName: node + linkType: hard + +"ci-info@npm:^2.0.0": + version: 2.0.0 + resolution: "ci-info@npm:2.0.0" + checksum: 10c0/8c5fa3830a2bcee2b53c2e5018226f0141db9ec9f7b1e27a5c57db5512332cde8a0beb769bcbaf0d8775a78afbf2bb841928feca4ea6219638a5b088f9884b46 + languageName: node + linkType: hard + +"ci-info@npm:^3.2.0": + version: 3.8.0 + resolution: "ci-info@npm:3.8.0" + checksum: 10c0/0d3052193b58356372b34ab40d2668c3e62f1006d5ca33726d1d3c423853b19a85508eadde7f5908496fb41448f465263bf61c1ee58b7832cb6a924537e3863a + languageName: node + linkType: hard + +"classnames@npm:2.2.5": + version: 2.2.5 + resolution: "classnames@npm:2.2.5" + checksum: 10c0/f1feafe7773f72ac0d788591782d25af1c3deabb8feb44a5a1c1d9cb687d5ef52dbd65088626135b1bfc36777dee5ece4571a25c28d497e0a75f1dba062f805b + languageName: node + linkType: hard + +"classnames@npm:^2.2.5": + version: 2.3.2 + resolution: "classnames@npm:2.3.2" + checksum: 10c0/cd50ead57b4f97436aaa9f9885c6926323efc7c2bea8e3d4eb10e4e972aa6a1cfca1c7a0e06f8a199ca7498d4339e30bb6002e589e61c9f21248cbf3e8b0b18d + languageName: node + linkType: hard + +"clean-stack@npm:^2.0.0": + version: 2.2.0 + resolution: "clean-stack@npm:2.2.0" + checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1 + languageName: node + linkType: hard + +"cli-boxes@npm:^2.2.1": + version: 2.2.1 + resolution: "cli-boxes@npm:2.2.1" + checksum: 10c0/6111352edbb2f62dbc7bfd58f2d534de507afed7f189f13fa894ce5a48badd94b2aa502fda28f1d7dd5f1eb456e7d4033d09a76660013ef50c7f66e7a034f050 + languageName: node + linkType: hard + +"cli-cursor@npm:^4.0.0": + version: 4.0.0 + resolution: "cli-cursor@npm:4.0.0" + dependencies: + restore-cursor: "npm:^4.0.0" + checksum: 10c0/e776e8c3c6727300d0539b0d25160b2bb56aed1a63942753ba1826b012f337a6f4b7ace3548402e4f2f13b5e16bfd751be672c44b203205e7eca8be94afec42c + languageName: node + linkType: hard + +"cli-truncate@npm:^2.1.0": + version: 2.1.0 + resolution: "cli-truncate@npm:2.1.0" + dependencies: + slice-ansi: "npm:^3.0.0" + string-width: "npm:^4.2.0" + checksum: 10c0/dfaa3df675bcef7a3254773de768712b590250420345a4c7ac151f041a4bacb4c25864b1377bee54a39b5925a030c00eabf014e312e3a4ac130952ed3b3879e9 + languageName: node + linkType: hard + +"cli-truncate@npm:^3.1.0": + version: 3.1.0 + resolution: "cli-truncate@npm:3.1.0" + dependencies: + slice-ansi: "npm:^5.0.0" + string-width: "npm:^5.0.0" + checksum: 10c0/a19088878409ec0e5dc2659a5166929629d93cfba6d68afc9cde2282fd4c751af5b555bf197047e31c87c574396348d011b7aa806fec29c4139ea4f7f00b324c + languageName: node + linkType: hard + +"cliui@npm:^7.0.2": + version: 7.0.4 + resolution: "cliui@npm:7.0.4" + dependencies: + string-width: "npm:^4.2.0" + strip-ansi: "npm:^6.0.0" + wrap-ansi: "npm:^7.0.0" + checksum: 10c0/6035f5daf7383470cef82b3d3db00bec70afb3423538c50394386ffbbab135e26c3689c41791f911fa71b62d13d3863c712fdd70f0fbdffd938a1e6fd09aac00 + languageName: node + linkType: hard + +"cliui@npm:^8.0.1": + version: 8.0.1 + resolution: "cliui@npm:8.0.1" + dependencies: + string-width: "npm:^4.2.0" + strip-ansi: "npm:^6.0.1" + wrap-ansi: "npm:^7.0.0" + checksum: 10c0/4bda0f09c340cbb6dfdc1ed508b3ca080f12992c18d68c6be4d9cf51756033d5266e61ec57529e610dacbf4da1c634423b0c1b11037709cc6b09045cbd815df5 + languageName: node + linkType: hard + +"clone-deep@npm:^4.0.1": + version: 4.0.1 + resolution: "clone-deep@npm:4.0.1" + dependencies: + is-plain-object: "npm:^2.0.4" + kind-of: "npm:^6.0.2" + shallow-clone: "npm:^3.0.0" + checksum: 10c0/637753615aa24adf0f2d505947a1bb75e63964309034a1cf56ba4b1f30af155201edd38d26ffe26911adaae267a3c138b344a4947d39f5fc1b6d6108125aa758 + languageName: node + linkType: hard + +"clone-response@npm:^1.0.2": + version: 1.0.3 + resolution: "clone-response@npm:1.0.3" + dependencies: + mimic-response: "npm:^1.0.0" + checksum: 10c0/06a2b611824efb128810708baee3bd169ec9a1bf5976a5258cd7eb3f7db25f00166c6eee5961f075c7e38e194f373d4fdf86b8166ad5b9c7e82bbd2e333a6087 + languageName: node + linkType: hard + +"clsx@npm:^1.0.4, clsx@npm:^1.1.1, clsx@npm:^1.2.1": + version: 1.2.1 + resolution: "clsx@npm:1.2.1" + checksum: 10c0/34dead8bee24f5e96f6e7937d711978380647e936a22e76380290e35486afd8634966ce300fc4b74a32f3762c7d4c0303f442c3e259f4ce02374eb0c82834f27 + languageName: node + linkType: hard + +"cmake-js@npm:7.2.1": + version: 7.2.1 + resolution: "cmake-js@npm:7.2.1" + dependencies: + axios: "npm:^1.3.2" + debug: "npm:^4" + fs-extra: "npm:^10.1.0" + lodash.isplainobject: "npm:^4.0.6" + memory-stream: "npm:^1.0.0" + node-api-headers: "npm:^0.0.2" + npmlog: "npm:^6.0.2" + rc: "npm:^1.2.7" + semver: "npm:^7.3.8" + tar: "npm:^6.1.11" + url-join: "npm:^4.0.1" + which: "npm:^2.0.2" + yargs: "npm:^17.6.0" + bin: + cmake-js: bin/cmake-js + checksum: 10c0/dab2fa2c04c31af90d58bdce8ad629cc35a15aac40908ab1680c0e23e752196cfdd9b0a68fc8b2f06b6fbbe7d853f4fe75d6e9b9084e26992e0270d4107e1332 + languageName: node + linkType: hard + +"color-convert@npm:^1.9.0": + version: 1.9.3 + resolution: "color-convert@npm:1.9.3" + dependencies: + color-name: "npm:1.1.3" + checksum: 10c0/5ad3c534949a8c68fca8fbc6f09068f435f0ad290ab8b2f76841b9e6af7e0bb57b98cb05b0e19fe33f5d91e5a8611ad457e5f69e0a484caad1f7487fd0e8253c + languageName: node + linkType: hard + +"color-convert@npm:^2.0.1": + version: 2.0.1 + resolution: "color-convert@npm:2.0.1" + dependencies: + color-name: "npm:~1.1.4" + checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7 + languageName: node + linkType: hard + +"color-name@npm:1.1.3": + version: 1.1.3 + resolution: "color-name@npm:1.1.3" + checksum: 10c0/566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6 + languageName: node + linkType: hard + +"color-name@npm:~1.1.4": + version: 1.1.4 + resolution: "color-name@npm:1.1.4" + checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95 + languageName: node + linkType: hard + +"color-support@npm:^1.1.3": + version: 1.1.3 + resolution: "color-support@npm:1.1.3" + bin: + color-support: bin.js + checksum: 10c0/8ffeaa270a784dc382f62d9be0a98581db43e11eee301af14734a6d089bd456478b1a8b3e7db7ca7dc5b18a75f828f775c44074020b51c05fc00e6d0992b1cc6 + languageName: node + linkType: hard + +"colorette@npm:^2.0.14, colorette@npm:^2.0.20": + version: 2.0.20 + resolution: "colorette@npm:2.0.20" + checksum: 10c0/e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40 + languageName: node + linkType: hard + +"colors@npm:1.0.3": + version: 1.0.3 + resolution: "colors@npm:1.0.3" + checksum: 10c0/f9e40dd8b3e1a65378a7ced3fced15ddfd60aaf38e99a7521a7fdb25056b15e092f651cd0f5aa1e9b04fa8ce3616d094e07fc6c2bb261e24098db1ddd3d09a1d + languageName: node + linkType: hard + +"combined-stream@npm:^1.0.8": + version: 1.0.8 + resolution: "combined-stream@npm:1.0.8" + dependencies: + delayed-stream: "npm:~1.0.0" + checksum: 10c0/0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5 + languageName: node + linkType: hard + +"commander@npm:11.0.0": + version: 11.0.0 + resolution: "commander@npm:11.0.0" + checksum: 10c0/471c44cd2d31dee556753df6ceb5ef52ccded0ba6308d3ba7a76251aa0edeedf5ac66ca86cb6096cc8fe20997064233c476983d346265f85180e86312724de0c + languageName: node + linkType: hard + +"commander@npm:2.9.0": + version: 2.9.0 + resolution: "commander@npm:2.9.0" + dependencies: + graceful-readlink: "npm:>= 1.0.0" + checksum: 10c0/56bcda1e47f453016ed25d9f300bed9e622842a5515802658adb62792fa2ff9af6ee3f9ff16e058d7b20aacc78fb3baa3e02f982414bae1fb5f198c7cb41d5ad + languageName: node + linkType: hard + +"commander@npm:^10.0.1": + version: 10.0.1 + resolution: "commander@npm:10.0.1" + checksum: 10c0/53f33d8927758a911094adadda4b2cbac111a5b377d8706700587650fd8f45b0bbe336de4b5c3fe47fd61f420a3d9bd452b6e0e6e5600a7e74d7bf0174f6efe3 + languageName: node + linkType: hard + +"commander@npm:^2.20.0": + version: 2.20.3 + resolution: "commander@npm:2.20.3" + checksum: 10c0/74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288 + languageName: node + linkType: hard + +"commander@npm:^5.0.0": + version: 5.1.0 + resolution: "commander@npm:5.1.0" + checksum: 10c0/da9d71dbe4ce039faf1fe9eac3771dca8c11d66963341f62602f7b66e36d2a3f8883407af4f9a37b1db1a55c59c0c1325f186425764c2e963dc1d67aec2a4b6d + languageName: node + linkType: hard + +"compare-func@npm:^2.0.0": + version: 2.0.0 + resolution: "compare-func@npm:2.0.0" + dependencies: + array-ify: "npm:^1.0.0" + dot-prop: "npm:^5.1.0" + checksum: 10c0/78bd4dd4ed311a79bd264c9e13c36ed564cde657f1390e699e0f04b8eee1fc06ffb8698ce2dfb5fbe7342d509579c82d4e248f08915b708f77f7b72234086cc3 + languageName: node + linkType: hard + +"compare-version@npm:^0.1.2": + version: 0.1.2 + resolution: "compare-version@npm:0.1.2" + checksum: 10c0/f38b853cf0d244c0af5f444409abde3d2198cd97312efa1dbc4ab41b520009327c2a63db59bbaf2d69288eff6167ef22be9788dc5476157d073ecdff1a8eeb2d + languageName: node + linkType: hard + +"concat-map@npm:0.0.1": + version: 0.0.1 + resolution: "concat-map@npm:0.0.1" + checksum: 10c0/c996b1cfdf95b6c90fee4dae37e332c8b6eb7d106430c17d538034c0ad9a1630cb194d2ab37293b1bdd4d779494beee7786d586a50bd9376fd6f7bcc2bd4c98f + languageName: node + linkType: hard + +"config@npm:1.28.1": + version: 1.28.1 + resolution: "config@npm:1.28.1" + dependencies: + json5: "npm:0.4.0" + os-homedir: "npm:1.0.2" + checksum: 10c0/9e424337fe7d1026e48e5a2e63bf0fca0f83121cbf13e2ca25bb526239f272caa5aa19125bc835d69106402241d568ad03643427fe52ff2df42a2018eeb7ba6d + languageName: node + linkType: hard + +"configstore@npm:^5.0.1": + version: 5.0.1 + resolution: "configstore@npm:5.0.1" + dependencies: + dot-prop: "npm:^5.2.0" + graceful-fs: "npm:^4.1.2" + make-dir: "npm:^3.0.0" + unique-string: "npm:^2.0.0" + write-file-atomic: "npm:^3.0.0" + xdg-basedir: "npm:^4.0.0" + checksum: 10c0/5af23830e78bdc56cbe92a2f81e87f1d3a39e96e51a0ab2a8bc79bbbc5d4440a48d92833b3fd9c6d34b4a9c4c5853c8487b8e6e68593e7ecbc7434822f7aced3 + languageName: node + linkType: hard + +"confusing-browser-globals@npm:^1.0.10": + version: 1.0.11 + resolution: "confusing-browser-globals@npm:1.0.11" + checksum: 10c0/475d0a284fa964a5182b519af5738b5b64bf7e413cfd703c1b3496bf6f4df9f827893a9b221c0ea5873c1476835beb1e0df569ba643eff0734010c1eb780589e + languageName: node + linkType: hard + +"console-control-strings@npm:^1.1.0": + version: 1.1.0 + resolution: "console-control-strings@npm:1.1.0" + checksum: 10c0/7ab51d30b52d461412cd467721bb82afe695da78fff8f29fe6f6b9cbaac9a2328e27a22a966014df9532100f6dd85370460be8130b9c677891ba36d96a343f50 + languageName: node + linkType: hard + +"conventional-changelog-angular@npm:^6.0.0": + version: 6.0.0 + resolution: "conventional-changelog-angular@npm:6.0.0" + dependencies: + compare-func: "npm:^2.0.0" + checksum: 10c0/a661ff7b79d4b829ccf8f424ef1bb210e777c1152a1ba5b2ba0a8639529c315755b82a6f84684f1b552c4e8ed6696bfe57317c5f7b868274e9a72b2bf13081ba + languageName: node + linkType: hard + +"conventional-changelog-conventionalcommits@npm:^6.1.0": + version: 6.1.0 + resolution: "conventional-changelog-conventionalcommits@npm:6.1.0" + dependencies: + compare-func: "npm:^2.0.0" + checksum: 10c0/b313f5c0160d109f58d976566e1331ede3a25ab19fbf43f86763b280659195de00a68551f7f3930bf1cbf39a5e707d94f2a25b79996e59043fa9ee0bed68a79f + languageName: node + linkType: hard + +"conventional-commits-parser@npm:^4.0.0": + version: 4.0.0 + resolution: "conventional-commits-parser@npm:4.0.0" + dependencies: + JSONStream: "npm:^1.3.5" + is-text-path: "npm:^1.0.1" + meow: "npm:^8.1.2" + split2: "npm:^3.2.2" + bin: + conventional-commits-parser: cli.js + checksum: 10c0/12e390cc80ad8a825c5775a329b95e11cf47a6df7b8a3875d375e28b8cb27c4f32955842ea73e4e357cff9757a6be99fdffe4fda87a23e9d8e73f983425537a0 + languageName: node + linkType: hard + +"copy-to-clipboard@npm:^3.3.1": + version: 3.3.3 + resolution: "copy-to-clipboard@npm:3.3.3" + dependencies: + toggle-selection: "npm:^1.0.6" + checksum: 10c0/3ebf5e8ee00601f8c440b83ec08d838e8eabb068c1fae94a9cda6b42f288f7e1b552f3463635f419af44bf7675afc8d0390d30876cf5c2d5d35f86d9c56a3e5f + languageName: node + linkType: hard + +"core-util-is@npm:1.0.2": + version: 1.0.2 + resolution: "core-util-is@npm:1.0.2" + checksum: 10c0/980a37a93956d0de8a828ce508f9b9e3317039d68922ca79995421944146700e4aaf490a6dbfebcb1c5292a7184600c7710b957d724be1e37b8254c6bc0fe246 + languageName: node + linkType: hard + +"cosmiconfig-typescript-loader@npm:^4.0.0": + version: 4.4.0 + resolution: "cosmiconfig-typescript-loader@npm:4.4.0" + peerDependencies: + "@types/node": "*" + cosmiconfig: ">=7" + ts-node: ">=10" + typescript: ">=4" + checksum: 10c0/a204eb354943f84ab0434d108fdf593db84c477f107f3ccb586e2d659c1d87f03071d8983c96d4ce2a59cc524ec845697f0432876339e4c28bde84b665cd92a6 + languageName: node + linkType: hard + +"cosmiconfig@npm:^8.0.0": + version: 8.3.4 + resolution: "cosmiconfig@npm:8.3.4" + dependencies: + import-fresh: "npm:^3.3.0" + js-yaml: "npm:^4.1.0" + parse-json: "npm:^5.2.0" + path-type: "npm:^4.0.0" + peerDependencies: + typescript: ">=4.9.5" + peerDependenciesMeta: + typescript: + optional: true + checksum: 10c0/fd5079a281726be00ae09852685af155bbb58206984951c8d19e8448a132277e3420e4d36429937f5e358b7194e9eba53fbd90fd1f0b34609ff59ccf4fc948f9 + languageName: node + linkType: hard + +"country-code-lookup@npm:^0.0.19": + version: 0.0.19 + resolution: "country-code-lookup@npm:0.0.19" + checksum: 10c0/37c5b3ae012c58af0261444217d33aa926e1fbc26b62673465c3569ccb0581bf4df4b732b40a97f631c8f207e52c88ab6676de5e104823f758a064643d5b6752 + languageName: node + linkType: hard + +"crc@npm:^3.8.0": + version: 3.8.0 + resolution: "crc@npm:3.8.0" + dependencies: + buffer: "npm:^5.1.0" + checksum: 10c0/1a0da36e5f95b19cd2a7b2eab5306a08f1c47bdd22da6f761ab764e2222e8e90a877398907cea94108bd5e41a6d311ea84d7914eaca67da2baa4050bd6384b3d + languageName: node + linkType: hard + +"create-require@npm:^1.1.0": + version: 1.1.1 + resolution: "create-require@npm:1.1.1" + checksum: 10c0/157cbc59b2430ae9a90034a5f3a1b398b6738bf510f713edc4d4e45e169bc514d3d99dd34d8d01ca7ae7830b5b8b537e46ae8f3c8f932371b0875c0151d7ec91 + languageName: node + linkType: hard + +"cross-env@npm:^6.0.3": + version: 6.0.3 + resolution: "cross-env@npm:6.0.3" + dependencies: + cross-spawn: "npm:^7.0.0" + bin: + cross-env: src/bin/cross-env.js + cross-env-shell: src/bin/cross-env-shell.js + checksum: 10c0/0d176b91c730abb08589431970a59771148f8fbf338959f5e3aa71b866d38ba390fc67f5330306d0a37d7cb74675224d0f23086f291661b944abbf5a00bd7080 + languageName: node + linkType: hard + +"cross-spawn@npm:^6.0.5": + version: 6.0.5 + resolution: "cross-spawn@npm:6.0.5" + dependencies: + nice-try: "npm:^1.0.4" + path-key: "npm:^2.0.1" + semver: "npm:^5.5.0" + shebang-command: "npm:^1.2.0" + which: "npm:^1.2.9" + checksum: 10c0/e05544722e9d7189b4292c66e42b7abeb21db0d07c91b785f4ae5fefceb1f89e626da2703744657b287e86dcd4af57b54567cef75159957ff7a8a761d9055012 + languageName: node + linkType: hard + +"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": + version: 7.0.3 + resolution: "cross-spawn@npm:7.0.3" + dependencies: + path-key: "npm:^3.1.0" + shebang-command: "npm:^2.0.0" + which: "npm:^2.0.1" + checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750 + languageName: node + linkType: hard + +"crypto-random-string@npm:^2.0.0": + version: 2.0.0 + resolution: "crypto-random-string@npm:2.0.0" + checksum: 10c0/288589b2484fe787f9e146f56c4be90b940018f17af1b152e4dde12309042ff5a2bf69e949aab8b8ac253948381529cc6f3e5a2427b73643a71ff177fa122b37 + languageName: node + linkType: hard + +"css-color-keywords@npm:^1.0.0": + version: 1.0.0 + resolution: "css-color-keywords@npm:1.0.0" + checksum: 10c0/af205a86c68e0051846ed91eb3e30b4517e1904aac040013ff1d742019b3f9369ba5658ba40901dbbc121186fc4bf0e75a814321cc3e3182fbb2feb81c6d9cb7 + languageName: node + linkType: hard + +"css-in-js-utils@npm:^3.1.0": + version: 3.1.0 + resolution: "css-in-js-utils@npm:3.1.0" + dependencies: + hyphenate-style-name: "npm:^1.0.3" + checksum: 10c0/8bb042e8f7701a7edadc3cce5ce2d5cf41189631d7e2aed194d5a7059b25776dded2a0466cb9da1d1f3fc6c99dcecb51e45671148d073b8a2a71e34755152e52 + languageName: node + linkType: hard + +"css-loader@npm:^6.7.2": + version: 6.8.1 + resolution: "css-loader@npm:6.8.1" + dependencies: + icss-utils: "npm:^5.1.0" + postcss: "npm:^8.4.21" + postcss-modules-extract-imports: "npm:^3.0.0" + postcss-modules-local-by-default: "npm:^4.0.3" + postcss-modules-scope: "npm:^3.0.0" + postcss-modules-values: "npm:^4.0.0" + postcss-value-parser: "npm:^4.2.0" + semver: "npm:^7.3.8" + peerDependencies: + webpack: ^5.0.0 + checksum: 10c0/a6e23de4ec1d2832f10b8ca3cfec6b6097a97ca3c73f64338ae5cd110ac270f1b218ff0273d39f677a7a561f1a9d9b0d332274664d0991bcfafaae162c2669c4 + languageName: node + linkType: hard + +"css-to-react-native@npm:^3.0.0": + version: 3.2.0 + resolution: "css-to-react-native@npm:3.2.0" + dependencies: + camelize: "npm:^1.0.0" + css-color-keywords: "npm:^1.0.0" + postcss-value-parser: "npm:^4.0.2" + checksum: 10c0/fde850a511d5d3d7c55a1e9b8ed26b69a8ad4868b3487e36ebfbfc0b96fc34bc977d9cd1d61a289d0c74d3f9a662d8cee297da53d4433bf2e27d6acdff8e1003 + languageName: node + linkType: hard + +"css-tree@npm:^1.1.2": + version: 1.1.3 + resolution: "css-tree@npm:1.1.3" + dependencies: + mdn-data: "npm:2.0.14" + source-map: "npm:^0.6.1" + checksum: 10c0/499a507bfa39b8b2128f49736882c0dd636b0cd3370f2c69f4558ec86d269113286b7df469afc955de6a68b0dba00bc533e40022a73698081d600072d5d83c1c + languageName: node + linkType: hard + +"cssesc@npm:^3.0.0": + version: 3.0.0 + resolution: "cssesc@npm:3.0.0" + bin: + cssesc: bin/cssesc + checksum: 10c0/6bcfd898662671be15ae7827120472c5667afb3d7429f1f917737f3bf84c4176003228131b643ae74543f17a394446247df090c597bb9a728cce298606ed0aa7 + languageName: node + linkType: hard + +"cssstyle@npm:^3.0.0": + version: 3.0.0 + resolution: "cssstyle@npm:3.0.0" + dependencies: + rrweb-cssom: "npm:^0.6.0" + checksum: 10c0/23acee092c1cec670fb7b8110e48abd740dc4e574d3b74848743067cb3377a86a1f64cf02606aabd7bb153785e68c2c1e09ce53295ddf7a4b470b3c7c55ec807 + languageName: node + linkType: hard + +"csstype@npm:^3.0.2, csstype@npm:^3.0.6": + version: 3.1.2 + resolution: "csstype@npm:3.1.2" + checksum: 10c0/32c038af259897c807ac738d9eab16b3d86747c72b09d5c740978e06f067f9b7b1737e1b75e407c7ab1fe1543dc95f20e202b4786aeb1b8d3bdf5d5ce655e6c6 + languageName: node + linkType: hard "curve25519-js@https://github.com/oxen-io/curve25519-js": - version "0.0.4" - resolved "https://github.com/oxen-io/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6" - -dargs@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" - integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg== - -data-urls@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4" - integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g== - dependencies: - abab "^2.0.6" - whatwg-mimetype "^3.0.0" - whatwg-url "^12.0.0" - -date-fns@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.3.1.tgz#7581daca0892d139736697717a168afbb908cfed" - integrity sha512-y8e109LYGgoQDveiEBD3DYXKba1jWf5BA8YU1FL5Tvm0BTdEfy54WLCwnuYWZNnzzvALy/QQ4Hov+Q9RVRv+Zw== - -debug@4, debug@4.3.4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^2.6.8: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -decamelize-keys@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" - integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg== - dependencies: - decamelize "^1.1.0" - map-obj "^1.0.0" - -decamelize@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== - -decamelize@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" - integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== - -decimal.js@^10.4.3: - version "10.4.3" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" - integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== - -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - -deep-diff@^0.3.5: - version "0.3.8" - resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" - integrity sha512-yVn6RZmHiGnxRKR9sJb3iVV2XTF1Ghh2DiWRZ3dMnGc43yUdWWF/kX6lQyk3+P84iprfWKU/8zFTrlkvtFm1ug== - -deep-eql@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d" - integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw== - dependencies: - type-detect "^4.0.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -deep-is@^0.1.3, deep-is@~0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - -defer-to-connect@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" - integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== - -define-data-property@^1.0.1, define-data-property@^1.1.2, define-data-property@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" - integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== - dependencies: - es-define-property "^1.0.0" - es-errors "^1.3.0" - gopd "^1.0.1" - -define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" - integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== - dependencies: - has-property-descriptors "^1.0.0" - object-keys "^1.1.1" - -define-properties@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" - integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== - dependencies: - define-data-property "^1.0.1" - has-property-descriptors "^1.0.0" - object-keys "^1.1.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== - -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== - -diff@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - -diff@^4.0.1, diff@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - -dir-compare@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" - integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== - dependencies: - buffer-equal "1.0.0" - colors "1.0.3" - commander "2.9.0" - minimatch "3.0.4" - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - -dmg-builder@23.0.8: - version "23.0.8" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.8.tgz#c68d9811da8d1891e6121c1e0807635519856800" - integrity sha512-dXguxjekxY70hzgAW+0NPCI7bagQ2ZrLDwYf1bvHSwlVfVizyJ/EC+e71U/NUgiWlXU5nogbWcGC3H74mFu0iw== - dependencies: - app-builder-lib "23.0.8" - builder-util "23.0.8" - builder-util-runtime "9.0.2" - fs-extra "^10.0.0" - iconv-lite "^0.6.2" - js-yaml "^4.1.0" - optionalDependencies: - dmg-license "^1.0.11" - -dmg-builder@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" - integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== - dependencies: - app-builder-lib "23.6.0" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - fs-extra "^10.0.0" - iconv-lite "^0.6.2" - js-yaml "^4.1.0" - optionalDependencies: - dmg-license "^1.0.11" - -dmg-license@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" - integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== - dependencies: - "@types/plist" "^3.0.1" - "@types/verror" "^1.10.3" - ajv "^6.10.0" - crc "^3.8.0" - iconv-corefoundation "^1.1.7" - plist "^3.0.4" - smart-buffer "^4.0.2" - verror "^1.10.0" - -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== - dependencies: - esutils "^2.0.2" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" - integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== - dependencies: - esutils "^2.0.2" - -dom-helpers@^5.0.1, dom-helpers@^5.1.3: - version "5.2.1" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902" - integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA== - dependencies: - "@babel/runtime" "^7.8.7" - csstype "^3.0.2" - -domexception@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" - integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== - dependencies: - webidl-conversions "^7.0.0" - -dompurify@^2.0.7: - version "2.4.7" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.7.tgz#277adeb40a2c84be2d42a8bcd45f582bfa4d0cfc" - integrity sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ== - -dot-prop@^5.1.0, dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== - dependencies: - is-obj "^2.0.0" - -dotenv-expand@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" - integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== - -dotenv@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" - integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== - -eastasianwidth@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" - integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== - -ejs@^3.1.7: - version "3.1.9" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" - integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== - dependencies: - jake "^10.8.5" - -electron-builder@23.0.8: - version "23.0.8" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.8.tgz#7379b91905aa73d4757234550d76dbce3fd17433" - integrity sha512-7WxdR4+l+VL4QN/K6NdqRQg7+cbIka4By1+4eN8odMPySSTI5d6nrV8R+SSRt9MXeWVdWlW8RCX5Pk6L0oaRug== - dependencies: - "@types/yargs" "^17.0.1" - app-builder-lib "23.0.8" - builder-util "23.0.8" - builder-util-runtime "9.0.2" - chalk "^4.1.1" - dmg-builder "23.0.8" - fs-extra "^10.0.0" - is-ci "^3.0.0" - lazy-val "^1.0.5" - read-config-file "6.2.0" - update-notifier "^5.1.0" - yargs "^17.0.1" - -electron-is-accelerator@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b" - integrity sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA== - -electron-localshortcut@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz#cfc83a3eff5e28faf98ddcc87f80a2ce4f623cd3" - integrity sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q== - dependencies: - debug "^4.0.1" - electron-is-accelerator "^0.1.0" - keyboardevent-from-electron-accelerator "^2.0.0" - keyboardevents-areequal "^0.2.1" - -electron-osx-sign@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" - integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== - dependencies: - bluebird "^3.5.0" - compare-version "^0.1.2" - debug "^2.6.8" - isbinaryfile "^3.0.2" - minimist "^1.2.0" - plist "^3.0.1" - -electron-publish@23.0.8: - version "23.0.8" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.8.tgz#a55b0c4a9ceec1eadb9b1b19194b9d9f2ae4ec33" - integrity sha512-GnqJH7Wh8LnapN4npl1Xs2Er/486/qxE3dV42WxXHX2VeoKAJTOuCzOVWCxpajaR3Msji4SkS0p81R018uK6Mg== - dependencies: - "@types/fs-extra" "^9.0.11" - builder-util "23.0.8" - builder-util-runtime "9.0.2" - chalk "^4.1.1" - fs-extra "^10.0.0" - lazy-val "^1.0.5" - mime "^2.5.2" - -electron-publish@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" - integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== - dependencies: - "@types/fs-extra" "^9.0.11" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - fs-extra "^10.0.0" - lazy-val "^1.0.5" - mime "^2.5.2" - -electron-to-chromium@^1.4.477: - version "1.4.509" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.509.tgz#9e276f8fcd70e1dfac541390da56a1ed7eea43d1" - integrity sha512-G5KlSWY0zzhANtX15tkikHl4WB7zil2Y65oT52EZUL194abjUXBZym12Ht7Bhuwm/G3LJFEqMADyv2Cks56dmg== - -electron-updater@^4.2.2: - version "4.6.5" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.5.tgz#e9a75458bbfd6bb41a58a829839e150ad2eb2d3d" - integrity sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA== - dependencies: - "@types/semver" "^7.3.6" - builder-util-runtime "8.9.2" - fs-extra "^10.0.0" - js-yaml "^4.1.0" - lazy-val "^1.0.5" - lodash.escaperegexp "^4.1.2" - lodash.isequal "^4.5.0" - semver "^7.3.5" - -electron@*: - version "26.1.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-26.1.0.tgz#d26fefba5a5c68069b07a117d87aee1c4e5d172d" - integrity sha512-qEh19H09Pysn3ibms5nZ0haIh5pFoOd7/5Ww7gzmAwDQOulRi8Sa2naeueOyIb1GKpf+6L4ix3iceYRAuA5r5Q== - dependencies: - "@electron/get" "^2.0.0" - "@types/node" "^18.11.18" - extract-zip "^2.0.1" - -electron@^25.8.4: - version "25.8.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.4.tgz#b50877aac7d96323920437baf309ad86382cb455" - integrity sha512-hUYS3RGdaa6E1UWnzeGnsdsBYOggwMMg4WGxNGvAoWtmRrr6J1BsjFW/yRq4WsJHJce2HdzQXtz4OGXV6yUCLg== - dependencies: - "@electron/get" "^2.0.0" - "@types/node" "^18.11.18" - extract-zip "^2.0.1" - -emoji-mart@^5.5.2: - version "5.5.2" - resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.5.2.tgz#3ddbaf053139cf4aa217650078bc1c50ca8381af" - integrity sha512-Sqc/nso4cjxhOwWJsp9xkVm8OF5c+mJLZJFoFfzRuKO+yWiN7K8c96xmtughYb0d/fZ8UC6cLIQ/p4BR6Pv3/A== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emoji-regex@^9.2.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" - integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== - -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== - -encoding@0.1.12: - version "0.1.12" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" - integrity sha512-bl1LAgiQc4ZWr++pNYUdRe/alecaHFeHxIJ/pNciqGdKXghaTCOwKkbKp6ye7pKZGu/GcaSXFk8PBVhgs+dJdA== - dependencies: - iconv-lite "~0.4.13" - -end-of-stream@^1.1.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -enhanced-resolve@^5.0.0, enhanced-resolve@^5.12.0, enhanced-resolve@^5.15.0: - version "5.15.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" - integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - -entities@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" - integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== - -entities@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" - integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== - -env-paths@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" - integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== - -envinfo@^7.7.3: - version "7.10.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.10.0.tgz#55146e3909cc5fe63c22da63fb15b05aeac35b13" - integrity sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw== - -err-code@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" - integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -error-stack-parser@^2.0.6: - version "2.1.4" - resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" - integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== - dependencies: - stackframe "^1.3.4" - -es-abstract@^1.20.4, es-abstract@^1.22.1: - version "1.22.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc" - integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw== - dependencies: - array-buffer-byte-length "^1.0.0" - arraybuffer.prototype.slice "^1.0.1" - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-set-tostringtag "^2.0.1" - es-to-primitive "^1.2.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.2.1" - get-symbol-description "^1.0.0" - globalthis "^1.0.3" - gopd "^1.0.1" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" - has-symbols "^1.0.3" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" - is-callable "^1.2.7" - is-negative-zero "^2.0.2" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - is-string "^1.0.7" - is-typed-array "^1.1.10" - is-weakref "^1.0.2" - object-inspect "^1.12.3" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.5.0" - safe-array-concat "^1.0.0" - safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.7" - string.prototype.trimend "^1.0.6" - string.prototype.trimstart "^1.0.6" - typed-array-buffer "^1.0.0" - typed-array-byte-length "^1.0.0" - typed-array-byte-offset "^1.0.0" - typed-array-length "^1.0.4" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.10" - -es-abstract@^1.22.3: - version "1.22.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.4.tgz#26eb2e7538c3271141f5754d31aabfdb215f27bf" - integrity sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg== - dependencies: - array-buffer-byte-length "^1.0.1" - arraybuffer.prototype.slice "^1.0.3" - available-typed-arrays "^1.0.6" - call-bind "^1.0.7" - es-define-property "^1.0.0" - es-errors "^1.3.0" - es-set-tostringtag "^2.0.2" - es-to-primitive "^1.2.1" - function.prototype.name "^1.1.6" - get-intrinsic "^1.2.4" - get-symbol-description "^1.0.2" - globalthis "^1.0.3" - gopd "^1.0.1" - has-property-descriptors "^1.0.2" - has-proto "^1.0.1" - has-symbols "^1.0.3" - hasown "^2.0.1" - internal-slot "^1.0.7" - is-array-buffer "^3.0.4" - is-callable "^1.2.7" - is-negative-zero "^2.0.2" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - is-string "^1.0.7" - is-typed-array "^1.1.13" - is-weakref "^1.0.2" - object-inspect "^1.13.1" - object-keys "^1.1.1" - object.assign "^4.1.5" - regexp.prototype.flags "^1.5.2" - safe-array-concat "^1.1.0" - safe-regex-test "^1.0.3" - string.prototype.trim "^1.2.8" - string.prototype.trimend "^1.0.7" - string.prototype.trimstart "^1.0.7" - typed-array-buffer "^1.0.1" - typed-array-byte-length "^1.0.0" - typed-array-byte-offset "^1.0.0" - typed-array-length "^1.0.4" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.14" - -es-array-method-boxes-properly@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" - integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== - -es-define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" - integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== - dependencies: - get-intrinsic "^1.2.4" - -es-errors@^1.0.0, es-errors@^1.2.1, es-errors@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" - integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== - -es-iterator-helpers@^1.0.12: - version "1.0.14" - resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.14.tgz#19cd7903697d97e21198f3293b55e8985791c365" - integrity sha512-JgtVnwiuoRuzLvqelrvN3Xu7H9bu2ap/kQ2CrM62iidP8SKuD99rWU3CJy++s7IVL2qb/AjXPGR/E7i9ngd/Cw== - dependencies: - asynciterator.prototype "^1.0.0" - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-set-tostringtag "^2.0.1" - function-bind "^1.1.1" - get-intrinsic "^1.2.1" - globalthis "^1.0.3" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" - has-symbols "^1.0.3" - internal-slot "^1.0.5" - iterator.prototype "^1.1.0" - safe-array-concat "^1.0.0" - -es-module-lexer@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f" - integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA== - -es-set-tostringtag@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" - integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== - dependencies: - get-intrinsic "^1.1.3" - has "^1.0.3" - has-tostringtag "^1.0.0" - -es-set-tostringtag@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" - integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== - dependencies: - get-intrinsic "^1.2.4" - has-tostringtag "^1.0.2" - hasown "^2.0.1" - -es-shim-unscopables@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" - integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== - dependencies: - has "^1.0.3" - -es-shim-unscopables@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" - integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== - dependencies: - hasown "^2.0.0" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -es6-error@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" - integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - -escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -escape-string-regexp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" - integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== - -escodegen@^1.13.0: - version "1.14.3" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" - integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== - dependencies: - esprima "^4.0.1" - estraverse "^4.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - -eslint-config-airbnb-base@^15.0.0: - version "15.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236" - integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig== - dependencies: - confusing-browser-globals "^1.0.10" - object.assign "^4.1.2" - object.entries "^1.1.5" - semver "^6.3.0" - -eslint-config-prettier@9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f" - integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw== - -eslint-import-resolver-node@^0.3.9: - version "0.3.9" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac" - integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g== - dependencies: - debug "^3.2.7" - is-core-module "^2.13.0" - resolve "^1.22.4" - -eslint-import-resolver-typescript@3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz#7b983680edd3f1c5bce1a5829ae0bc2d57fe9efa" - integrity sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg== - dependencies: - debug "^4.3.4" - enhanced-resolve "^5.12.0" - eslint-module-utils "^2.7.4" - fast-glob "^3.3.1" - get-tsconfig "^4.5.0" - is-core-module "^2.11.0" - is-glob "^4.0.3" - -eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" - integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== - dependencies: - debug "^3.2.7" - -eslint-plugin-import@2.29.1: - version "2.29.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643" - integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw== - dependencies: - array-includes "^3.1.7" - array.prototype.findlastindex "^1.2.3" - array.prototype.flat "^1.3.2" - array.prototype.flatmap "^1.3.2" - debug "^3.2.7" - doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.9" - eslint-module-utils "^2.8.0" - hasown "^2.0.0" - is-core-module "^2.13.1" - is-glob "^4.0.3" - minimatch "^3.1.2" - object.fromentries "^2.0.7" - object.groupby "^1.0.1" - object.values "^1.1.7" - semver "^6.3.1" - tsconfig-paths "^3.15.0" - -eslint-plugin-mocha@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.1.0.tgz#69325414f875be87fb2cb00b2ef33168d4eb7c8d" - integrity sha512-xLqqWUF17llsogVOC+8C6/jvQ+4IoOREbN7ZCHuOHuD6cT5cDD4h7f2LgsZuzMAiwswWE21tO7ExaknHVDrSkw== - dependencies: - eslint-utils "^3.0.0" - rambda "^7.1.0" - -eslint-plugin-more@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-more/-/eslint-plugin-more-1.0.5.tgz#667bffc2a64bde2d48b98c8faa111e213b2f873f" - integrity sha512-zjDza5jeNBHWf8ZezyW2Llk99abndcGlSz9GIKgVOGwISx0m+f4QoZAapjSmUjKSxHvmOa7Lt68Pk8XbRzWb7w== - -eslint-plugin-react-hooks@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" - integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== - -eslint-plugin-react@7.33.2: - version "7.33.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608" - integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw== - dependencies: - array-includes "^3.1.6" - array.prototype.flatmap "^1.3.1" - array.prototype.tosorted "^1.1.1" - doctrine "^2.1.0" - es-iterator-helpers "^1.0.12" - estraverse "^5.3.0" - jsx-ast-utils "^2.4.1 || ^3.0.0" - minimatch "^3.1.2" - object.entries "^1.1.6" - object.fromentries "^2.0.6" - object.hasown "^1.1.2" - object.values "^1.1.6" - prop-types "^15.8.1" - resolve "^2.0.0-next.4" - semver "^6.3.1" - string.prototype.matchall "^4.0.8" - -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -eslint-scope@^7.2.2: - version "7.2.2" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" - integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== - dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" - -eslint-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" - integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== - dependencies: - eslint-visitor-keys "^2.0.0" - -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: - version "3.4.3" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" - integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== - -eslint@8.57.0: - version "8.57.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" - integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== - dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.57.0" - "@humanwhocodes/config-array" "^0.11.14" - "@humanwhocodes/module-importer" "^1.0.1" - "@nodelib/fs.walk" "^1.2.8" - "@ungap/structured-clone" "^1.2.0" - ajv "^6.12.4" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.3.2" - doctrine "^3.0.0" - escape-string-regexp "^4.0.0" - eslint-scope "^7.2.2" - eslint-visitor-keys "^3.4.3" - espree "^9.6.1" - esquery "^1.4.2" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - find-up "^5.0.0" - glob-parent "^6.0.2" - globals "^13.19.0" - graphemer "^1.4.0" - ignore "^5.2.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - is-path-inside "^3.0.3" - js-yaml "^4.1.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.1.2" - natural-compare "^1.4.0" - optionator "^0.9.3" - strip-ansi "^6.0.1" - text-table "^0.2.0" - -espree@^9.0.0, espree@^9.6.0, espree@^9.6.1: - version "9.6.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" - integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== - dependencies: - acorn "^8.9.0" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.4.1" - -esprima@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -esquery@^1.4.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" - integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== - dependencies: - estraverse "^5.1.0" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1, estraverse@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -event-target-shim@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" - integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== - -eventemitter3@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" - integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== - -events@^3.2.0, events@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -execa@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9" - integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.1" - human-signals "^4.3.0" - is-stream "^3.0.0" - merge-stream "^2.0.0" - npm-run-path "^5.1.0" - onetime "^6.0.0" - signal-exit "^3.0.7" - strip-final-newline "^3.0.0" - -execa@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" - integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -exeunt@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/exeunt/-/exeunt-1.1.0.tgz#af72db6f94b3cb75e921aee375d513049843d284" - integrity sha512-dd++Yn/0Fp+gtJ04YHov7MeAii+LFivJc6KqnJNfplzLVUkUDrfKoQDTLlCgzcW15vY5hKlHasWeIsQJ8agHsw== - -extract-zip@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" - integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - -extsprintf@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" - integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-glob@^3.2.9, fast-glob@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" - integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== - -fast-loops@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fast-loops/-/fast-loops-1.1.3.tgz#ce96adb86d07e7bf9b4822ab9c6fac9964981f75" - integrity sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g== - -fast-shallow-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz#d4dcaf6472440dcefa6f88b98e3251e27f25628b" - integrity sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw== - -fastest-levenshtein@^1.0.12: - version "1.0.16" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" - integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== - -fastest-stable-stringify@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz#3757a6774f6ec8de40c4e86ec28ea02417214c76" - integrity sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q== - -fastq@^1.6.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" - integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== - dependencies: - reusify "^1.0.4" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== - dependencies: - pend "~1.2.0" - -fetch@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fetch/-/fetch-1.1.0.tgz#0a8279f06be37f9f0ebb567560a30a480da59a2e" - integrity sha512-5O8TwrGzoNblBG/jtK4NFuZwNCkZX6s5GfRNOaGtm+QGJEuNakSC/i2RW0R93KX6E0jVjNXm6O3CRN4Ql3K+yA== - dependencies: - biskviit "1.0.1" - encoding "0.1.12" - -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== - dependencies: - flat-cache "^3.0.4" - -file-type@^10.10.0: - version "10.11.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890" - integrity sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw== - -file-uri-to-path@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" - integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== - -filelist@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" - integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== - dependencies: - minimatch "^5.0.1" - -filesize@3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" - integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -find-up@5.0.0, find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -find-up@^4.0.0, find-up@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -find-yarn-workspace-root@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" - integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== - dependencies: - micromatch "^4.0.2" - -firstline@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/firstline/-/firstline-1.2.1.tgz#b88673c42009f8821fac2926e99720acee924fae" - integrity sha512-6eMQNJtDzyXSC1yeCBWspqA6LeV5la2XHGTXQq4O0xkglAutpyny/sB+zVdXTZ9nzcDW9ZGLxwXXkB+ZEtJuPw== - -flat-cache@^3.0.4: - version "3.1.0" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.0.tgz#0e54ab4a1a60fe87e2946b6b00657f1c99e1af3f" - integrity sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew== - dependencies: - flatted "^3.2.7" - keyv "^4.5.3" - rimraf "^3.0.2" - -flat@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" - integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== - -flatted@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" - integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== - -follow-redirects@^1.15.4: - version "1.15.5" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020" - integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw== - -for-each@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" - integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== - dependencies: - is-callable "^1.1.3" - -foreground-child@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" - integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== - dependencies: - cross-spawn "^7.0.0" - signal-exit "^4.0.1" - -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -fs-extra@9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3" - integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^1.0.0" - -fs-extra@^10.0.0, fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-extra@^11.0.0: - version "11.1.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" - integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-extra@^11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" - integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^9.0.0, fs-extra@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-minipass@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -fsevents@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" - integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -function-bind@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" - integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== - -function.prototype.name@^1.1.5, function.prototype.name@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" - integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - functions-have-names "^1.2.3" - -functions-have-names@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" - integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== - -gauge@^4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" - integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.3" - console-control-strings "^1.1.0" - has-unicode "^2.0.1" - signal-exit "^3.0.7" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.5" - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig== - -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" - integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-proto "^1.0.1" - has-symbols "^1.0.3" - -get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" - integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== - dependencies: - es-errors "^1.3.0" - function-bind "^1.1.2" - has-proto "^1.0.1" - has-symbols "^1.0.3" - hasown "^2.0.0" - -get-stream@^5.0.0, get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - -get-stream@^6.0.0, get-stream@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - -get-symbol-description@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" - integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== - dependencies: - call-bind "^1.0.5" - es-errors "^1.3.0" - get-intrinsic "^1.2.4" - -get-tsconfig@^4.5.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.0.tgz#06ce112a1463e93196aa90320c35df5039147e34" - integrity sha512-pmjiZ7xtB8URYm74PlGJozDNyhvsVLUcpBa8DZBG3bWHwaHa9bPiRpiSfovw+fjhwONSCWKRyk+JQHEGZmMrzw== - dependencies: - resolve-pkg-maps "^1.0.0" - -getobject@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.1.1.tgz#29f7858609fee7ef1c58d062f1b2335e425bdb45" - integrity sha512-Rftr+NsUMxFcCmFopFmyCCfsJPaqUmf7TW61CtKMu0aE93ir62I6VjXt2koiCQgcunGgVog/U6g24tBPq67rlg== - -git-raw-commits@^2.0.11: - version "2.0.11" - resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723" - integrity sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A== - dependencies: - dargs "^7.0.0" - lodash "^4.17.15" - meow "^8.0.0" - split2 "^3.0.0" - through2 "^4.0.0" - -glob-parent@^5.1.2, glob-parent@^6.0.1, glob-parent@^6.0.2, glob-parent@~5.1.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== - dependencies: - is-glob "^4.0.3" - -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - -glob@10.3.10: - version "10.3.10" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" - integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== - dependencies: - foreground-child "^3.1.0" - jackspeak "^2.3.5" - minimatch "^9.0.1" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry "^1.10.1" - -glob@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^6.0.1: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - integrity sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A== - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.0.5, glob@^7.1.3, glob@^7.1.6: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" - integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - -global-agent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" - integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== - dependencies: - boolean "^3.0.1" - es6-error "^4.1.1" - matcher "^3.0.0" - roarr "^2.15.3" - semver "^7.3.2" - serialize-error "^7.0.1" - -global-dirs@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" - integrity sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg== - dependencies: - ini "^1.3.4" - -global-dirs@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485" - integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA== - dependencies: - ini "2.0.0" - -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - -globals@^13.19.0: - version "13.21.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571" - integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg== - dependencies: - type-fest "^0.20.2" - -globalthis@^1.0.1, globalthis@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== - dependencies: - define-properties "^1.1.3" - -globby@^11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.2.9" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^3.0.0" - -gopd@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" - integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== - dependencies: - get-intrinsic "^1.1.3" - -got@^11.8.5, got@^9.6.0: - version "11.8.6" - resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" - integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== - dependencies: - "@sindresorhus/is" "^4.0.0" - "@szmarczak/http-timer" "^4.0.5" - "@types/cacheable-request" "^6.0.1" - "@types/responselike" "^1.0.0" - cacheable-lookup "^5.0.3" - cacheable-request "^7.0.2" - decompress-response "^6.0.0" - http2-wrapper "^1.0.0-beta.5.2" - lowercase-keys "^2.0.0" - p-cancelable "^2.0.0" - responselike "^2.0.0" - -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9: - version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" - integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== - -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w== - -graphemer@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" - integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== - -hard-rejection@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" - integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg== - dependencies: - ansi-regex "^2.0.0" - -has-bigints@^1.0.1, has-bigints@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" - integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-property-descriptors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" - integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== - dependencies: - get-intrinsic "^1.1.1" - -has-property-descriptors@^1.0.1, has-property-descriptors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" - integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== - dependencies: - es-define-property "^1.0.0" - -has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== - -has-symbols@^1.0.2, has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - -has-tostringtag@^1.0.1, has-tostringtag@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" - integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== - dependencies: - has-symbols "^1.0.3" - -has-unicode@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== - -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -hasown@^2.0.0, hasown@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" - integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== - dependencies: - function-bind "^1.1.2" - -he@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" - integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== - dependencies: - react-is "^16.7.0" - -hosted-git-info@^2.1.4: - version "2.8.9" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" - integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== - -hosted-git-info@^4.0.1, hosted-git-info@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" - integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== - dependencies: - lru-cache "^6.0.0" - -html-encoding-sniffer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" - integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== - dependencies: - whatwg-encoding "^2.0.0" - -http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" - integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== - -http-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" - integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== - dependencies: - "@tootallnate/once" "2" - agent-base "6" - debug "4" - -http2-wrapper@^1.0.0-beta.5.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" - integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== - dependencies: - quick-lru "^5.1.1" - resolve-alpn "^1.0.0" - -https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -human-signals@^4.3.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" - integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== - -husky@^8.0.0: - version "8.0.3" - resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" - integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg== - -hyphenate-style-name@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" - integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== - -iconv-corefoundation@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" - integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== - dependencies: - cli-truncate "^2.1.0" - node-addon-api "^1.6.3" - -iconv-lite@0.6.3, iconv-lite@^0.6.2: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -iconv-lite@~0.4.13: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -icss-utils@^5.0.0, icss-utils@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -ignore@^5.2.0, ignore@^5.2.4: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== - -image-type@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/image-type/-/image-type-4.1.0.tgz#72a88d64ff5021371ed67b9a466442100be57cd1" - integrity sha512-CFJMJ8QK8lJvRlTCEgarL4ro6hfDQKif2HjSvYCdQZESaIPV4v9imrf7BQHK+sQeTeNeMpWciR9hyC/g8ybXEg== - dependencies: - file-type "^10.10.0" - -immer@^9.0.7: - version "9.0.21" - resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176" - integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA== - -immutable@^4.0.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f" - integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA== - -import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== - -import-local@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" - integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ini@2.0.0, ini@^1.3.4, ini@^1.3.6, ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -inline-style-prefixer@^6.0.0: - version "6.0.4" - resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-6.0.4.tgz#4290ed453ab0e4441583284ad86e41ad88384f44" - integrity sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg== - dependencies: - css-in-js-utils "^3.1.0" - fast-loops "^1.1.3" - -internal-slot@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" - integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== - dependencies: - get-intrinsic "^1.2.0" - has "^1.0.3" - side-channel "^1.0.4" - -internal-slot@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" - integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== - dependencies: - es-errors "^1.3.0" - hasown "^2.0.0" - side-channel "^1.0.4" - -interpret@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" - integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== - -invariant@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== - dependencies: - loose-envify "^1.0.0" - -invert-kv@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-3.0.1.tgz#a93c7a3d4386a1dc8325b97da9bb1620c0282523" - integrity sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw== - -ip2country@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ip2country/-/ip2country-1.0.1.tgz#e2ab284b774b65c89509679fcb82552afcff9804" - integrity sha512-wYhIyQzcP85tKo17HwitnHB7F3vbN+gA7DqZzeE5K1NLfr4XnKZQ1RNsMGm3bNhf1eA3bz9QFjSXo4q6VKRqCw== - dependencies: - asbycountry "^1.4.2" - -is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" - integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.0" - is-typed-array "^1.1.10" - -is-array-buffer@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" - integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== - -is-async-function@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" - integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== - dependencies: - has-tostringtag "^1.0.0" - -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== - dependencies: - has-bigints "^1.0.1" - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" - integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== - -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" - -is-ci@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" - integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== - dependencies: - ci-info "^3.2.0" - -is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.5.0, is-core-module@^2.9.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" - integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== - dependencies: - has "^1.0.3" - -is-core-module@^2.13.1: - version "2.13.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" - integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== - dependencies: - hasown "^2.0.0" - -is-date-object@^1.0.1, is-date-object@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - -is-docker@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -is-finalizationregistry@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6" - integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw== - dependencies: - call-bind "^1.0.2" - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-fullwidth-code-point@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" - integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== - -is-generator-function@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" - integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== - dependencies: - has-tostringtag "^1.0.0" - -is-glob@^4.0.0, is-glob@^4.0.3, is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-installed-globally@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== - dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" - -is-map@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" - integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== - -is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== - -is-npm@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" - integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== - -is-number-object@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" - integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== - dependencies: - has-tostringtag "^1.0.0" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -is-path-inside@^3.0.2, is-path-inside@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - -is-plain-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== - -is-plain-obj@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-potential-custom-element-name@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" - integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== - -is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-set@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" - integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== - -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== - dependencies: - call-bind "^1.0.2" - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" - integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== - -is-string@^1.0.5, is-string@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== - dependencies: - has-symbols "^1.0.2" - -is-text-path@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e" - integrity sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w== - dependencies: - text-extensions "^1.0.0" - -is-typed-array@^1.1.10, is-typed-array@^1.1.9: - version "1.1.12" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" - integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== - dependencies: - which-typed-array "^1.1.11" - -is-typed-array@^1.1.13: - version "1.1.13" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" - integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== - dependencies: - which-typed-array "^1.1.14" - -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== - -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== - -is-weakref@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" - integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== - dependencies: - call-bind "^1.0.2" - -is-weakset@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" - integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - -is-wsl@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== - -isarray@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" - integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== - -isbinaryfile@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" - integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== - dependencies: - buffer-alloc "^1.2.0" - -isbinaryfile@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" - integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== - -iterator.prototype@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.1.tgz#ab5b790e23ec00658f5974e032a2b05188bd3a5c" - integrity sha512-9E+nePc8C9cnQldmNl6bgpTY6zI4OPRZd97fhJ/iVZ1GifIUDVV5F6x1nEDqpe8KaMEZGT4xgrwKQDxXnjOIZQ== - dependencies: - define-properties "^1.2.0" - get-intrinsic "^1.2.1" - has-symbols "^1.0.3" - reflect.getprototypeof "^1.0.3" - -jackspeak@^2.3.5: - version "2.3.6" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" - integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== - dependencies: - "@isaacs/cliui" "^8.0.2" - optionalDependencies: - "@pkgjs/parseargs" "^0.11.0" - -jake@^10.8.5: - version "10.8.7" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" - integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w== - dependencies: - async "^3.2.3" - chalk "^4.0.2" - filelist "^1.0.4" - minimatch "^3.1.2" - -jest-worker@^27.4.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - -jpeg-js@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa" - integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg== - -js-cookie@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" - integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== - -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@4.1.0, js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -js2xmlparser@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a" - integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA== - dependencies: - xmlcreate "^2.0.4" - -jsdoc@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e" - integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg== - dependencies: - "@babel/parser" "^7.20.15" - "@jsdoc/salty" "^0.2.1" - "@types/markdown-it" "^12.2.3" - bluebird "^3.7.2" - catharsis "^0.9.0" - escape-string-regexp "^2.0.0" - js2xmlparser "^4.0.2" - klaw "^3.0.0" - markdown-it "^12.3.2" - markdown-it-anchor "^8.4.1" - marked "^4.0.10" - mkdirp "^1.0.4" - requizzle "^0.2.3" - strip-json-comments "^3.1.0" - underscore "~1.13.2" - -jsdom-global@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9" - integrity sha512-t1KMcBkz/pT5JrvcJbpUR2u/w1kO9jXctaaGJ0vZDzwFnIvGWw9IDSRciT83kIs8Bnw4qpOl8bQK08V01YgMPg== - -jsdom@^22.1.0: - version "22.1.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8" - integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw== - dependencies: - abab "^2.0.6" - cssstyle "^3.0.0" - data-urls "^4.0.0" - decimal.js "^10.4.3" - domexception "^4.0.0" - form-data "^4.0.0" - html-encoding-sniffer "^3.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.1" - is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.4" - parse5 "^7.1.2" - rrweb-cssom "^0.6.0" - saxes "^6.0.0" - symbol-tree "^3.2.4" - tough-cookie "^4.1.2" - w3c-xmlserializer "^4.0.0" - webidl-conversions "^7.0.0" - whatwg-encoding "^2.0.0" - whatwg-mimetype "^3.0.0" - whatwg-url "^12.0.1" - ws "^8.13.0" - xml-name-validator "^4.0.0" - -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -json-buffer@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" - integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== - -json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== - -json-stringify-safe@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== - -json5@0.4.0, json5@^1.0.2, json5@^2.1.2, json5@^2.2.0, json5@^2.2.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" - integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== - optionalDependencies: - graceful-fs "^4.1.6" - -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== - dependencies: - universalify "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.6" - -jsonparse@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" - integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== - -"jsx-ast-utils@^2.4.1 || ^3.0.0": - version "3.3.5" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" - integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ== - dependencies: - array-includes "^3.1.6" - array.prototype.flat "^1.3.1" - object.assign "^4.1.4" - object.values "^1.1.6" - -just-extend@^4.0.2: - version "4.2.1" - resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744" - integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg== - -keyboardevent-from-electron-accelerator@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz#ace21b1aa4e47148815d160057f9edb66567c50c" - integrity sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA== - -keyboardevents-areequal@^0.2.1: - version "0.2.2" - resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194" - integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw== - -keyv@^4.0.0, keyv@^4.5.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25" - integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug== - dependencies: - json-buffer "3.0.1" - -kind-of@^6.0.2, kind-of@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -klaw-sync@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" - integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== - dependencies: - graceful-fs "^4.1.11" - -klaw@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146" - integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g== - dependencies: - graceful-fs "^4.1.9" - -lamejs@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.1.tgz#0f92d38729213f106d4a19ded20821da7e89c8e4" - integrity sha512-s7bxvjvYthw6oPLCm5pFxvA84wUROODB8jEO2+CE1adhKgrIvVOlmMgY8zyugxGrvRaDHNJanOiS21/emty6dQ== - dependencies: - use-strict "1.0.1" - -latest-version@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== - dependencies: - package-json "^6.3.0" - -lazy-val@^1.0.4, lazy-val@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" - integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== - -lcid@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-3.1.1.tgz#9030ec479a058fc36b5e8243ebaac8b6ac582fd0" - integrity sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg== - dependencies: - invert-kv "^3.0.0" - -levn@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" - integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== - dependencies: - prelude-ls "^1.2.1" - type-check "~0.4.0" - -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - -"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.3/libsession_util_nodejs-v0.4.3.tar.gz": - version "0.4.3" - resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.3/libsession_util_nodejs-v0.4.3.tar.gz#f5b6b11e5df5ba7268ffa196a1eea3d7b583944d" - dependencies: - cmake-js "^7.2.1" - node-addon-api "^6.1.0" - -libsodium-sumo@^0.7.11: - version "0.7.11" - resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.11.tgz#ab0389e2424fca5c1dc8c4fd394906190da88a11" - integrity sha512-bY+7ph7xpk51Ez2GbE10lXAQ5sJma6NghcIDaSPbM/G9elfrjLa0COHl/7P6Wb/JizQzl5UQontOOP1z0VwbLA== - -libsodium-wrappers-sumo@^0.7.9: - version "0.7.11" - resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.11.tgz#d96329ee3c0e7ec7f5fcf4cdde16cc3a1ae91d82" - integrity sha512-DGypHOmJbB1nZn89KIfGOAkDgfv5N6SBGC3Qvmy/On0P0WD1JQvNRS/e3UL3aFF+xC0m+MYz5M+MnRnK2HMrKQ== - dependencies: - libsodium-sumo "^0.7.11" - -lilconfig@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" - integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== - -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== - -linkify-it@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e" - integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ== - dependencies: - uc.micro "^1.0.1" - -linkify-it@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec" - integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw== - dependencies: - uc.micro "^1.0.1" - -lint-staged@^14.0.1: - version "14.0.1" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-14.0.1.tgz#57dfa3013a3d60762d9af5d9c83bdb51291a6232" - integrity sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw== - dependencies: - chalk "5.3.0" - commander "11.0.0" - debug "4.3.4" - execa "7.2.0" - lilconfig "2.1.0" - listr2 "6.6.1" - micromatch "4.0.5" - pidtree "0.6.0" - string-argv "0.3.2" - yaml "2.3.1" - -listr2@6.6.1: - version "6.6.1" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-6.6.1.tgz#08b2329e7e8ba6298481464937099f4a2cd7f95d" - integrity sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg== - dependencies: - cli-truncate "^3.1.0" - colorette "^2.0.20" - eventemitter3 "^5.0.1" - log-update "^5.0.1" - rfdc "^1.3.0" - wrap-ansi "^8.1.0" - -loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== - -loader-utils@^2.0.0, loader-utils@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" - integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash-es@^4.2.1: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" - integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== - -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== - -lodash.escaperegexp@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347" - integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw== - -lodash.get@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== - -lodash.isequal@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== - -lodash.isfunction@^3.0.9: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" - integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw== - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== - -lodash.kebabcase@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" - integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g== - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash.mergewith@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" - integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ== - -lodash.snakecase@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" - integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw== - -lodash.startcase@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8" - integrity sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg== - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== - -lodash.upperfirst@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" - integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== - -lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -log-update@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09" - integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw== - dependencies: - ansi-escapes "^5.0.0" - cli-cursor "^4.0.0" - slice-ansi "^5.0.0" - strip-ansi "^7.0.1" - wrap-ansi "^8.0.1" - -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - -long@^5.0.0: - version "5.2.3" - resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" - integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== - -long@~3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" - integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg== - -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - -loupe@^2.3.1: - version "2.3.6" - resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53" - integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA== - dependencies: - get-func-name "^2.0.0" - -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -"lru-cache@^9.1.1 || ^10.0.0": - version "10.2.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" - integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== - -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -make-error@^1.1.1: - version "1.3.6" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - -map-age-cleaner@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - -map-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== - -map-obj@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" - integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== - -markdown-it-anchor@^8.4.1: - version "8.6.7" - resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634" - integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA== - -markdown-it@^12.3.2: - version "12.3.2" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90" - integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== - dependencies: - argparse "^2.0.1" - entities "~2.1.0" - linkify-it "^3.0.1" - mdurl "^1.0.1" - uc.micro "^1.0.5" - -marked@^4.0.10: - version "4.3.0" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" - integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== - -matcher@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" - integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== - dependencies: - escape-string-regexp "^4.0.0" - -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== - -mdurl@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" - integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g== - -mem@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/mem/-/mem-5.1.1.tgz#7059b67bf9ac2c924c9f1cff7155a064394adfb3" - integrity sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw== - dependencies: - map-age-cleaner "^0.1.3" - mimic-fn "^2.1.0" - p-is-promise "^2.1.0" - -memory-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-1.0.0.tgz#481dfd259ccdf57b03ec2c9632960044180e73c2" - integrity sha512-Wm13VcsPIMdG96dzILfij09PvuS3APtcKNh7M28FsCA/w6+1mjR7hhPmfFNoilX9xU7wTdhsH5lJAm6XNzdtww== - dependencies: - readable-stream "^3.4.0" - -meow@^8.0.0, meow@^8.1.2: - version "8.1.2" - resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" - integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q== - dependencies: - "@types/minimist" "^1.2.0" - camelcase-keys "^6.2.2" - decamelize-keys "^1.1.0" - hard-rejection "^2.1.0" - minimist-options "4.1.0" - normalize-package-data "^3.0.0" - read-pkg-up "^7.0.1" - redent "^3.0.0" - trim-newlines "^3.0.0" - type-fest "^0.18.0" - yargs-parser "^20.2.3" - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -merge2@^1.3.0, merge2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -mic-recorder-to-mp3@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/mic-recorder-to-mp3/-/mic-recorder-to-mp3-2.2.2.tgz#32e767d1196fb81d10e279f31c304350c9501d01" - integrity sha512-xDkOaHbojW3bdKOGn9CI5dT+Mc0RrfczsX/Y1zGJp3FUB4zei5ZKFnNm7Nguc9v910wkd7T3csnCTq5EtCF3Zw== - dependencies: - lamejs "^1.2.0" - -micromatch@4.0.5, micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.12, mime-types@^2.1.27: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mime@^2.5.2: - version "2.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" - integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-fn@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" - integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== - -mimic-response@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== - -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - -min-indent@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" - integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== - -mini-css-extract-plugin@^2.7.5: - version "2.7.6" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz#282a3d38863fddcd2e0c220aaed5b90bc156564d" - integrity sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw== - dependencies: - schema-utils "^4.0.0" - -"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@9.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1, minimatch@^9.0.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimist-options@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" - integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== - dependencies: - arrify "^1.0.1" - is-plain-obj "^1.1.0" - kind-of "^6.0.3" - -minimist@^1.2.0, minimist@^1.2.6: - version "1.2.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" - integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== - -minipass@^3.0.0: - version "3.3.6" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" - integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== - dependencies: - yallist "^4.0.0" - -minipass@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" - integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== - -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": - version "7.0.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" - integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== - -minizlib@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -mkdirp@^1.0.3, mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -mkdirp@~0.5.1: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" - -mocha@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9" - integrity sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA== - dependencies: - "@ungap/promise-all-settled" "1.1.2" - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.4" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.2.0" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "5.0.1" - ms "2.1.3" - nanoid "3.3.3" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - workerpool "6.2.1" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -moment@^2.19.3, moment@^2.29.4: - version "2.29.4" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" - integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -mv@~2: - version "2.1.1" - resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2" - integrity sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg== - dependencies: - mkdirp "~0.5.1" - ncp "~2.0.0" - rimraf "~2.4.0" - -nano-css@^5.3.1: - version "5.3.5" - resolved "https://registry.yarnpkg.com/nano-css/-/nano-css-5.3.5.tgz#3075ea29ffdeb0c7cb6d25edb21d8f7fa8e8fe8e" - integrity sha512-vSB9X12bbNu4ALBu7nigJgRViZ6ja3OU7CeuiV1zMIbXOdmkLahgtPmh3GBOlDxbKY0CitqlPdOReGlBLSp+yg== - dependencies: - css-tree "^1.1.2" - csstype "^3.0.6" - fastest-stable-stringify "^2.0.2" - inline-style-prefixer "^6.0.0" - rtl-css-js "^1.14.0" - sourcemap-codec "^1.4.8" - stacktrace-js "^2.0.2" - stylis "^4.0.6" - -nanoid@3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" - integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== - -nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== - -ncp@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" - integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA== - -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - -nise@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/nise/-/nise-4.1.0.tgz#8fb75a26e90b99202fa1e63f448f58efbcdedaf6" - integrity sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA== - dependencies: - "@sinonjs/commons" "^1.7.0" - "@sinonjs/fake-timers" "^6.0.0" - "@sinonjs/text-encoding" "^0.7.1" - just-extend "^4.0.2" - path-to-regexp "^1.7.0" - -node-addon-api@^1.6.3: - version "1.7.2" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" - integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== - -node-addon-api@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76" - integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA== - -node-api-headers@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-1.1.0.tgz#3f9dd7bb10b29e1c3e3db675979605a308b2373c" - integrity sha512-ucQW+SbYCUPfprvmzBsnjT034IGRB2XK8rRc78BgjNKhTdFKgAwAmgW704bKIBmcYW48it0Gkjpkd39Azrwquw== - -node-fetch@^2.6.7: - version "2.7.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" - integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== - dependencies: - whatwg-url "^5.0.0" - -node-loader@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562" - integrity sha512-I5VN34NO4/5UYJaUBtkrODPWxbobrE4hgDqPrjB25yPkonFhCmZ146vTH+Zg417E9Iwoh1l/MbRs1apc5J295Q== - dependencies: - loader-utils "^2.0.0" - -node-releases@^2.0.13: - version "2.0.13" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" - integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== - -normalize-package-data@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-package-data@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" - integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== - dependencies: - hosted-git-info "^4.0.1" - is-core-module "^2.5.0" - semver "^7.3.4" - validate-npm-package-license "^3.0.1" - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== - -npm-run-path@^4.0.0, npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -npm-run-path@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00" - integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q== - dependencies: - path-key "^4.0.0" - -npmlog@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" - integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== - dependencies: - are-we-there-yet "^3.0.0" - console-control-strings "^1.1.0" - gauge "^4.0.3" - set-blocking "^2.0.0" - -nwsapi@^2.2.4: - version "2.2.7" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30" - integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ== - -object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== - -object-inspect@^1.12.3, object-inspect@^1.9.0: - version "1.12.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" - integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== - -object-inspect@^1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" - integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== - -object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object.assign@^4.1.2, object.assign@^4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" - integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - has-symbols "^1.0.3" - object-keys "^1.1.1" - -object.assign@^4.1.5: - version "4.1.5" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" - integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== - dependencies: - call-bind "^1.0.5" - define-properties "^1.2.1" - has-symbols "^1.0.3" - object-keys "^1.1.1" - -object.entries@^1.1.5, object.entries@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131" - integrity sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - -object.fromentries@^2.0.6, object.fromentries@^2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" - integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - -object.groupby@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.2.tgz#494800ff5bab78fd0eff2835ec859066e00192ec" - integrity sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw== - dependencies: - array.prototype.filter "^1.0.3" - call-bind "^1.0.5" - define-properties "^1.2.1" - es-abstract "^1.22.3" - es-errors "^1.0.0" - -object.hasown@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.3.tgz#6a5f2897bb4d3668b8e79364f98ccf971bda55ae" - integrity sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA== - dependencies: - define-properties "^1.2.0" - es-abstract "^1.22.1" - -object.values@^1.1.6, object.values@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a" - integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -onetime@^5.1.0, onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -onetime@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" - integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ== - dependencies: - mimic-fn "^4.0.0" - -open@^7.4.2: - version "7.4.2" - resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" - integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== - dependencies: - is-docker "^2.0.0" - is-wsl "^2.1.1" - -optionator@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - -optionator@^0.9.3: - version "0.9.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" - integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== - dependencies: - "@aashutoshrathi/word-wrap" "^1.2.3" - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - -os-homedir@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== - -os-locale@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-5.0.0.tgz#6d26c1d95b6597c5d5317bf5fba37eccec3672e0" - integrity sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA== - dependencies: - execa "^4.0.0" - lcid "^3.0.0" - mem "^5.0.0" - -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== - -p-cancelable@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" - integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== - -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw== - -p-is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" - integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-retry@^4.2.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" - integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== - dependencies: - "@types/retry" "0.12.0" - retry "^0.13.1" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== - dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-json@^5.0.0, parse-json@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-even-better-errors "^2.3.0" - lines-and-columns "^1.1.6" - -parse5@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" - integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== - dependencies: - entities "^4.4.0" - -patch-package@^6.4.7: - version "6.5.1" - resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.5.1.tgz#3e5d00c16997e6160291fee06a521c42ac99b621" - integrity sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA== - dependencies: - "@yarnpkg/lockfile" "^1.1.0" - chalk "^4.1.2" - cross-spawn "^6.0.5" - find-yarn-workspace-root "^2.0.0" - fs-extra "^9.0.0" - is-ci "^2.0.0" - klaw-sync "^6.0.0" - minimist "^1.2.6" - open "^7.4.2" - rimraf "^2.6.3" - semver "^5.6.0" - slash "^2.0.0" - tmp "^0.0.33" - yaml "^1.10.2" - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-key@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" - integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-scurry@^1.10.1: - version "1.10.1" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" - integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== - dependencies: - lru-cache "^9.1.1 || ^10.0.0" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - -path-to-regexp@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" - integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== - dependencies: - isarray "0.0.1" - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -pathval@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" - integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== - -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pidtree@0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c" - integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -plist@^3.0.1, plist@^3.0.4: - version "3.1.0" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" - integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ== - dependencies: - "@xmldom/xmldom" "^0.8.8" - base64-js "^1.5.1" - xmlbuilder "^15.1.1" - -possible-typed-array-names@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" - integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== - -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== - -postcss-modules-local-by-default@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524" - integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA== - dependencies: - icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" - -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== - dependencies: - postcss-selector-parser "^6.0.4" - -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== - dependencies: - icss-utils "^5.0.0" - -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.13" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b" - integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" - integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== - -postcss@^8.4.21: - version "8.4.29" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.29.tgz#33bc121cf3b3688d4ddef50be869b2a54185a1dd" - integrity sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw== - dependencies: - nanoid "^3.3.6" - picocolors "^1.0.0" - source-map-js "^1.0.2" - -postinstall-prepare@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/postinstall-prepare/-/postinstall-prepare-1.0.1.tgz#dac9b5d91b054389141b13c0192eb68a0aa002b5" - integrity sha512-4zxO4DjrV0XfD+ABUFEP0MiQmhKOGBnov5LfLsra/XVOUcQ5gMLLMcV3b8K8wJUfNDv1ozleGblYb06gPbjVUQ== - -prelude-ls@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" - integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== - -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== - -prettier@3.2.5: - version "3.2.5" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368" - integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A== - -progress@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -promise-retry@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" - integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== - dependencies: - err-code "^2.0.2" - retry "^0.12.0" - -prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: - version "15.8.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" - integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.13.1" - -protobufjs-cli@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.2.tgz#b32a7dc6aa3866cc103278539561bb4758249c8b" - integrity sha512-8ivXWxT39gZN4mm4ArQyJrRgnIwZqffBWoLDsE21TmMcKI3XwJMV4lEF2WU02C4JAtgYYc2SfJIltelD8to35g== - dependencies: - chalk "^4.0.0" - escodegen "^1.13.0" - espree "^9.0.0" - estraverse "^5.1.0" - glob "^8.0.0" - jsdoc "^4.0.0" - minimist "^1.2.0" - semver "^7.1.2" - tmp "^0.2.1" - uglify-js "^3.7.7" - -protobufjs@^7.2.4: - version "7.2.5" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.2.5.tgz#45d5c57387a6d29a17aab6846dcc283f9b8e7f2d" - integrity sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/node" ">=13.7.0" - long "^5.0.0" - -proxy-from-env@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - -psl@^1.1.33, psl@^1.1.7: - version "1.9.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" - integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" - integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== - -pupa@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" - integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== - dependencies: - escape-goat "^2.0.0" - -qr.js@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f" - integrity sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ== - -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" - integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -quick-lru@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" - integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== - -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - -rambda@^7.1.0: - version "7.5.0" - resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.5.0.tgz#1865044c59bc0b16f63026c6e5a97e4b1bbe98fe" - integrity sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA== - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -rc-slider@^10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.2.1.tgz#9b571d19f740adcacdde271f44901a47717fd8da" - integrity sha512-l355C/65iV4UFp7mXq5xBTNX2/tF2g74VWiTVlTpNp+6vjE/xaHHNiQq5Af+Uu28uUiqCuH/QXs5HfADL9KJ/A== - dependencies: - "@babel/runtime" "^7.10.1" - classnames "^2.2.5" - rc-util "^5.27.0" - -rc-util@^5.27.0: - version "5.37.0" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.37.0.tgz#6df9a55cb469b41b6995530a45b5f3dd3219a4ea" - integrity sha512-cPMV8DzaHI1KDaS7XPRXAf4J7mtBqjvjikLpQieaeOO7+cEbqY2j7Kso/T0R0OiEZTNcLS/8Zl9YrlXiO9UbjQ== - dependencies: - "@babel/runtime" "^7.18.3" - react-is "^16.12.0" - -rc@1.2.8, rc@^1.2.7, rc@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -react-contexify@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/react-contexify/-/react-contexify-6.0.0.tgz#52959bb507d6a31224fe870ae147e211e359abe1" - integrity sha512-jMhz6yZI81Jv3UDj7TXqCkhdkCFEEmvwGCPXsQuA2ZUC8EbCuVQ6Cy8FzKMXa0y454XTDClBN2YFvvmoFlrFkg== - dependencies: - clsx "^1.2.1" - -react-dom@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" - integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler "^0.20.2" - -react-draggable@^4.4.4: - version "4.4.5" - resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.5.tgz#9e37fe7ce1a4cf843030f521a0a4cc41886d7e7c" - integrity sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g== - dependencies: - clsx "^1.1.1" - prop-types "^15.8.1" - -react-h5-audio-player@^3.2.0: - version "3.8.6" - resolved "https://registry.yarnpkg.com/react-h5-audio-player/-/react-h5-audio-player-3.8.6.tgz#e7ee69ba6c0a82d317d4f987d83bb18b356a4415" - integrity sha512-eyViI47jRRybCcCkGdoAMd6yfhg3UMyXp39mqOWCbNQfAYI8U6zC0+0DLZjhrB7//DJtHhZx8h1q99HMxYkMWQ== - dependencies: - "@babel/runtime" "^7.10.2" - "@iconify/icons-mdi" "~1.1.0" - "@iconify/react" "^3.1.3" - -react-intersection-observer@^9.7.0: - version "9.7.0" - resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-9.7.0.tgz#da65834ace0852e04b73cb97f0c48bdaa5b13589" - integrity sha512-euleEjBVaMRwSOMNVcMX5WGn74GfZ9I78nx9SUb5a0eXd0IhegjJcUliSO9Jd+xiaZ5rgFvbGoVln66lpMyUUg== - -react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - -react-is@^18.0.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== - -react-lifecycles-compat@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" - integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== - -react-mentions@^4.4.9: - version "4.4.10" - resolved "https://registry.yarnpkg.com/react-mentions/-/react-mentions-4.4.10.tgz#ae6c1e310a405597e83ce786f12c5bfb93b097ce" - integrity sha512-JHiQlgF1oSZR7VYPjq32wy97z1w1oE4x10EuhKjPr4WUKhVzG1uFQhQjKqjQkbVqJrmahf+ldgBTv36NrkpKpA== - dependencies: - "@babel/runtime" "7.4.5" - invariant "^2.2.4" - prop-types "^15.5.8" - substyle "^9.1.0" - -react-qr-svg@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/react-qr-svg/-/react-qr-svg-2.4.0.tgz#c703d95907b9713192730a5bbeffb57e4aa782bd" - integrity sha512-3Q/LyjBi+eWjJ0WyZvBzyY3rCMlUBZyRnbTcKbXQ39J1bd0/vgqYhXoYai7XlDTS42Ro50BBY4TmeUVyIZh+nA== - dependencies: - prop-types "^15.5.8" - qr.js "0.0.0" - -react-redux@8.0.4: - version "8.0.4" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.0.4.tgz#80c31dffa8af9526967c4267022ae1525ff0e36a" - integrity sha512-yMfQ7mX6bWuicz2fids6cR1YT59VTuT8MKyyE310wJQlINKENCeT1UcPdEiX6znI5tF8zXyJ/VYvDgeGuaaNwQ== - dependencies: - "@babel/runtime" "^7.12.1" - "@types/hoist-non-react-statics" "^3.3.1" - "@types/use-sync-external-store" "^0.0.3" - hoist-non-react-statics "^3.3.2" - react-is "^18.0.0" - use-sync-external-store "^1.0.0" - -react-toastify@^6.0.9: - version "6.2.0" - resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-6.2.0.tgz#f2d76747c70b9de91f71f253d9feae6b53dc836c" - integrity sha512-XpjFrcBhQ0/nBOL4syqgP/TywFnOyxmstYLWgSQWcj39qpp+WU4vPt3C/ayIDx7RFyxRWfzWTdR2qOcDGo7G0w== - dependencies: - clsx "^1.1.1" - prop-types "^15.7.2" - react-transition-group "^4.4.1" - -react-transition-group@^4.4.1: - version "4.4.5" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1" - integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== - dependencies: - "@babel/runtime" "^7.5.5" - dom-helpers "^5.0.1" - loose-envify "^1.4.0" - prop-types "^15.6.2" - -react-universal-interface@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b" - integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw== - -react-use@^17.4.0: - version "17.4.0" - resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.4.0.tgz#cefef258b0a6c534a5c8021c2528ac6e1a4cdc6d" - integrity sha512-TgbNTCA33Wl7xzIJegn1HndB4qTS9u03QUwyNycUnXaweZkE4Kq2SB+Yoxx8qbshkZGYBDvUXbXWRUmQDcZZ/Q== - dependencies: - "@types/js-cookie" "^2.2.6" - "@xobotyi/scrollbar-width" "^1.9.5" - copy-to-clipboard "^3.3.1" - fast-deep-equal "^3.1.3" - fast-shallow-equal "^1.0.0" - js-cookie "^2.2.1" - nano-css "^5.3.1" - react-universal-interface "^0.6.2" - resize-observer-polyfill "^1.5.1" - screenfull "^5.1.0" - set-harmonic-interval "^1.0.1" - throttle-debounce "^3.0.1" - ts-easing "^0.2.0" - tslib "^2.1.0" - -react-virtualized@^9.22.4: - version "9.22.5" - resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.5.tgz#bfb96fed519de378b50d8c0064b92994b3b91620" - integrity sha512-YqQMRzlVANBv1L/7r63OHa2b0ZsAaDp1UhVNEdUaXI8A5u6hTpA5NYtUueLH2rFuY/27mTGIBl7ZhqFKzw18YQ== - dependencies: - "@babel/runtime" "^7.7.2" - clsx "^1.0.4" - dom-helpers "^5.1.3" - loose-envify "^1.4.0" - prop-types "^15.7.2" - react-lifecycles-compat "^3.0.4" - -react@17.0.2, react@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" - integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - -read-config-file@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" - integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== - dependencies: - dotenv "^9.0.2" - dotenv-expand "^5.1.0" - js-yaml "^4.1.0" - json5 "^2.2.0" - lazy-val "^1.0.4" - -read-last-lines-ts@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/read-last-lines-ts/-/read-last-lines-ts-1.2.1.tgz#99e46288c5373c06e16e90e666a46b595dad80a1" - integrity sha512-1VcCrAU38DILYiF4sbNY13zdrMGwrFqjGQnXJy28G1zLJItvnWtgCbqoAJlnZZSiEICMKdM4Ol7LYvVMEoKrAg== - -read-pkg-up@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" - integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== - dependencies: - find-up "^4.1.0" - read-pkg "^5.2.0" - type-fest "^0.8.1" - -read-pkg@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" - integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== - dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^2.5.0" - parse-json "^5.0.0" - type-fest "^0.6.0" - -readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" - integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -rechoir@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" - integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== - dependencies: - resolve "^1.20.0" - -redent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" - integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== - dependencies: - indent-string "^4.0.0" - strip-indent "^3.0.0" - -redux-logger@3.0.6: - version "3.0.6" - resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf" - integrity sha512-JoCIok7bg/XpqA1JqCqXFypuqBbQzGQySrhFzewB7ThcnysTO30l4VCst86AuB9T9tuT03MAA56Jw2PNhRSNCg== - dependencies: - deep-diff "^0.3.5" - -redux-persist@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8" - integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ== - -redux-promise-middleware@^6.1.2: - version "6.1.3" - resolved "https://registry.yarnpkg.com/redux-promise-middleware/-/redux-promise-middleware-6.1.3.tgz#315f6a9fcabe1f02a9c2f30fa615f838d7b01b66" - integrity sha512-B/Hi5Ct5d9y5d/KG0f6MZUXKA0nrQh5583mHCx13HY3Avte8KfpoRH/TB5QT6k/FcjT6JCxjv7jedymidy2A1A== - -redux-thunk@^2.4.1: - version "2.4.2" - resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b" - integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q== - -redux@4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13" - integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA== - dependencies: - "@babel/runtime" "^7.9.2" - -redux@^3.6.0: - version "3.7.2" - resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" - integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A== - dependencies: - lodash "^4.2.1" - lodash-es "^4.2.1" - loose-envify "^1.1.0" - symbol-observable "^1.0.3" - -redux@^4.0.0, redux@^4.1.2: - version "4.2.1" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197" - integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w== - dependencies: - "@babel/runtime" "^7.9.2" - -reflect.getprototypeof@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz#aaccbf41aca3821b87bb71d9dcbc7ad0ba50a3f3" - integrity sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - globalthis "^1.0.3" - which-builtin-type "^1.1.3" - -regenerator-runtime@^0.13.2: - version "0.13.11" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" - integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== - -regenerator-runtime@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45" - integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA== - -regexp.prototype.flags@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" - integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - functions-have-names "^1.2.3" - -regexp.prototype.flags@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" - integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== - dependencies: - call-bind "^1.0.6" - define-properties "^1.2.1" - es-errors "^1.3.0" - set-function-name "^2.0.1" - -registry-auth-token@^4.0.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" - integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== - dependencies: - rc "1.2.8" - -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== - dependencies: - rc "^1.2.8" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== - -requizzle@^0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c" - integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw== - dependencies: - lodash "^4.17.21" - -reselect@^4.1.5: - version "4.1.8" - resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524" - integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ== - -resize-observer-polyfill@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" - integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== - -resolve-alpn@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" - integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - -resolve-from@5.0.0, resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve-global@1.0.0, resolve-global@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255" - integrity sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw== - dependencies: - global-dirs "^0.1.1" - -resolve-pkg-maps@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" - integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== - -resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.4: - version "1.22.4" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34" - integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg== - dependencies: - is-core-module "^2.13.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -resolve@^2.0.0-next.4: - version "2.0.0-next.4" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660" - integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ== - dependencies: - is-core-module "^2.9.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -responselike@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" - integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== - dependencies: - lowercase-keys "^2.0.0" - -restore-cursor@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9" - integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -retry@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== - -retry@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" - integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rfdc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" - integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== - -rimraf@2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w== - dependencies: - glob "^7.0.5" - -rimraf@^2.6.3: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.0, rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -rimraf@~2.4.0: - version "2.4.5" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" - integrity sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ== - dependencies: - glob "^6.0.1" - -roarr@^2.15.3: - version "2.15.4" - resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" - integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== - dependencies: - boolean "^3.0.1" - detect-node "^2.0.4" - globalthis "^1.0.1" - json-stringify-safe "^5.0.1" - semver-compare "^1.0.0" - sprintf-js "^1.1.2" - -rrweb-cssom@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1" - integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw== - -rtl-css-js@^1.14.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.16.1.tgz#4b48b4354b0ff917a30488d95100fbf7219a3e80" - integrity sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg== - dependencies: - "@babel/runtime" "^7.1.2" - -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -run-script-os@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347" - integrity sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw== - -safe-array-concat@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c" - integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" - has-symbols "^1.0.3" - isarray "^2.0.5" - -safe-array-concat@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.0.tgz#8d0cae9cb806d6d1c06e08ab13d847293ebe0692" - integrity sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg== - dependencies: - call-bind "^1.0.5" - get-intrinsic "^1.2.2" - has-symbols "^1.0.3" - isarray "^2.0.5" - -safe-buffer@^5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-json-stringify@~1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" - integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg== - -safe-regex-test@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" - integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" - is-regex "^1.1.4" - -safe-regex-test@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" - integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== - dependencies: - call-bind "^1.0.6" - es-errors "^1.3.0" - is-regex "^1.1.4" - -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sanitize-filename@^1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" - integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== - dependencies: - truncate-utf8-bytes "^1.0.0" - -sanitize.css@^12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-12.0.1.tgz#f20369357557ba2b41d7278eeb3ea691a3bee514" - integrity sha512-QbusSBnWHaRBZeTxsJyknwI0q+q6m1NtLBmB76JfW/rdVN7Ws6Zz70w65+430/ouVcdNVT3qwrDgrM6PaYyRtw== - -sass-loader@^13.2.2: - version "13.3.2" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.2.tgz#460022de27aec772480f03de17f5ba88fa7e18c6" - integrity sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg== - dependencies: - neo-async "^2.6.2" - -sass@^1.60.0: - version "1.66.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.66.1.tgz#04b51c4671e4650aa393740e66a4e58b44d055b1" - integrity sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA== - dependencies: - chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" - source-map-js ">=0.6.2 <2.0.0" - -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - -saxes@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" - integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== - dependencies: - xmlchars "^2.2.0" - -scheduler@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" - integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - -schema-utils@^3.1.1, schema-utils@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" - integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -schema-utils@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" - integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== - dependencies: - "@types/json-schema" "^7.0.9" - ajv "^8.9.0" - ajv-formats "^2.1.1" - ajv-keywords "^5.1.0" - -screenfull@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba" - integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA== - -sdp@^2.1.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/sdp/-/sdp-2.12.0.tgz#338a106af7560c86e4523f858349680350d53b22" - integrity sha512-jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw== - -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== - -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== - dependencies: - semver "^6.3.0" - -"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0: - version "5.7.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" - integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== - -semver@7.5.4, semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1: - version "6.3.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - -serialize-error@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" - integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== - dependencies: - type-fest "^0.13.1" - -serialize-javascript@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - -serialize-javascript@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== - dependencies: - randombytes "^2.1.0" - -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== - -set-function-length@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425" - integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g== - dependencies: - define-data-property "^1.1.2" - es-errors "^1.3.0" - function-bind "^1.1.2" - get-intrinsic "^1.2.3" - gopd "^1.0.1" - has-property-descriptors "^1.0.1" - -set-function-name@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" - integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== - dependencies: - define-data-property "^1.1.4" - es-errors "^1.3.0" - functions-have-names "^1.2.3" - has-property-descriptors "^1.0.2" - -set-harmonic-interval@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249" - integrity sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g== - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - -shallowequal@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" - integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== - dependencies: - shebang-regex "^1.0.0" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -signal-exit@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" - integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== - -sinon@9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d" - integrity sha512-0uF8Q/QHkizNUmbK3LRFqx5cpTttEVXudywY9Uwzy8bTfZUhljZ7ARzSxnRHWYWtVTeh4Cw+tTb3iU21FQVO9A== - dependencies: - "@sinonjs/commons" "^1.7.2" - "@sinonjs/fake-timers" "^6.0.1" - "@sinonjs/formatio" "^5.0.1" - "@sinonjs/samsam" "^5.0.3" - diff "^4.0.2" - nise "^4.0.1" - supports-color "^7.1.0" - -slash@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" - integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -slice-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" - integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -slice-ansi@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" - integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== - dependencies: - ansi-styles "^6.0.0" - is-fullwidth-code-point "^4.0.0" - -smart-buffer@^4.0.2: - version "4.2.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" - integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== - -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - -source-map-support@^0.5.19, source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@0.5.6: - version "0.5.6" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" - integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA== - -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -sourcemap-codec@^1.4.8: - version "1.4.8" - resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" - integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== - -spdx-correct@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" - integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.13" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5" - integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w== - -split2@^3.0.0, split2@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" - integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== - dependencies: - readable-stream "^3.0.0" - -sprintf-js@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== - -stack-generator@^2.0.5: - version "2.0.10" - resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.10.tgz#8ae171e985ed62287d4f1ed55a1633b3fb53bb4d" - integrity sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ== - dependencies: - stackframe "^1.3.4" - -stackframe@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" - integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== - -stacktrace-gps@^3.0.4: - version "3.1.2" - resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz#0c40b24a9b119b20da4525c398795338966a2fb0" - integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ== - dependencies: - source-map "0.5.6" - stackframe "^1.3.4" - -stacktrace-js@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stacktrace-js/-/stacktrace-js-2.0.2.tgz#4ca93ea9f494752d55709a081d400fdaebee897b" - integrity sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg== - dependencies: - error-stack-parser "^2.0.6" - stack-generator "^2.0.5" - stacktrace-gps "^3.0.4" - -stat-mode@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" - integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== - -string-argv@0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" - integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== - -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" - integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== - dependencies: - eastasianwidth "^0.2.0" - emoji-regex "^9.2.2" - strip-ansi "^7.0.1" - -string.prototype.matchall@^4.0.8: - version "4.0.9" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.9.tgz#148779de0f75d36b13b15885fec5cadde994520d" - integrity sha512-6i5hL3MqG/K2G43mWXWgP+qizFW/QH/7kCNN13JrJS5q48FN5IKksLDscexKP3dnmB6cdm9jlNgAsWNLpSykmA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - has-symbols "^1.0.3" - internal-slot "^1.0.5" - regexp.prototype.flags "^1.5.0" - side-channel "^1.0.4" - -string.prototype.trim@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" - integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - -string.prototype.trim@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" - integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - -string.prototype.trimend@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" - integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - -string.prototype.trimend@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e" - integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - -string.prototype.trimstart@^1.0.6, string.prototype.trimstart@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" - integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^7.0.1: - version "7.1.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" - integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== - dependencies: - ansi-regex "^6.0.1" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -strip-final-newline@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" - integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== - -strip-indent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" - integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== - dependencies: - min-indent "^1.0.0" - -strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== - -styled-components@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d" - integrity sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/traverse" "^7.4.5" - "@emotion/is-prop-valid" "^0.8.8" - "@emotion/stylis" "^0.8.4" - "@emotion/unitless" "^0.7.4" - babel-plugin-styled-components ">= 1" - css-to-react-native "^3.0.0" - hoist-non-react-statics "^3.0.0" - shallowequal "^1.1.0" - supports-color "^5.5.0" - -stylis@^4.0.6: - version "4.3.0" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.0.tgz#abe305a669fc3d8777e10eefcfc73ad861c5588c" - integrity sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ== - -substyle@^9.1.0: - version "9.4.1" - resolved "https://registry.yarnpkg.com/substyle/-/substyle-9.4.1.tgz#6a4647f363bc14fecc51aac371d4dbeda082aa50" - integrity sha512-VOngeq/W1/UkxiGzeqVvDbGDPM8XgUyJVWjrqeh+GgKqspEPiLYndK+XRcsKUHM5Muz/++1ctJ1QCF/OqRiKWA== - dependencies: - "@babel/runtime" "^7.3.4" - invariant "^2.2.4" - -sumchecker@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" - integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== - dependencies: - debug "^4.1.0" - -supports-color@8.1.1, supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== - -supports-color@^5.3.0, supports-color@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -symbol-observable@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" - integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== - -symbol-tree@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" - integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== - -tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - -tar@^6.1.0, tar@^6.1.11, tar@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" - integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^5.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -temp-file@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" - integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== - dependencies: - async-exit-hook "^2.0.1" - fs-extra "^10.0.0" - -terser-webpack-plugin@^5.3.7: - version "5.3.9" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" - integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== - dependencies: - "@jridgewell/trace-mapping" "^0.3.17" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.1" - terser "^5.16.8" - -terser@^5.14.2, terser@^5.16.8: - version "5.19.4" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.4.tgz#941426fa482bf9b40a0308ab2b3cd0cf7c775ebd" - integrity sha512-6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g== - dependencies: - "@jridgewell/source-map" "^0.3.3" - acorn "^8.8.2" - commander "^2.20.0" - source-map-support "~0.5.20" - -text-extensions@^1.0.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" - integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ== - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== - -throttle-debounce@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb" - integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg== - -through2@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" - integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw== - dependencies: - readable-stream "3" - -"through@>=2.2.7 <3": - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - -tmp-promise@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" - integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== - dependencies: - tmp "^0.2.0" - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - -tmp@^0.2.0, tmp@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -toggle-selection@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" - integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ== - -tough-cookie@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" - integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw== - dependencies: - psl "^1.1.33" - punycode "^2.1.1" - universalify "^0.2.0" - url-parse "^1.5.3" - -tr46@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469" - integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw== - dependencies: - punycode "^2.3.0" - -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== - -trim-newlines@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" - integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== - -truncate-utf8-bytes@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" - integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== - dependencies: - utf8-byte-length "^1.0.1" - -ts-api-utils@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.2.tgz#7c094f753b6705ee4faee25c3c684ade52d66d99" - integrity sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ== - -ts-easing@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/ts-easing/-/ts-easing-0.2.0.tgz#c8a8a35025105566588d87dbda05dd7fbfa5a4ec" - integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ== - -ts-loader@^9.4.2: - version "9.4.4" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.4.tgz#6ceaf4d58dcc6979f84125335904920884b7cee4" - integrity sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w== - dependencies: - chalk "^4.1.0" - enhanced-resolve "^5.0.0" - micromatch "^4.0.0" - semver "^7.3.4" - -ts-node@^10.8.1: - version "10.9.1" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" - integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== - dependencies: - "@cspotcode/source-map-support" "^0.8.0" - "@tsconfig/node10" "^1.0.7" - "@tsconfig/node12" "^1.0.7" - "@tsconfig/node14" "^1.0.0" - "@tsconfig/node16" "^1.0.2" - acorn "^8.4.1" - acorn-walk "^8.1.1" - arg "^4.1.0" - create-require "^1.1.0" - diff "^4.0.1" - make-error "^1.1.1" - v8-compile-cache-lib "^3.0.1" - yn "3.1.1" - -tsconfig-paths@^3.15.0: - version "3.15.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" - integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg== - dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.2" - minimist "^1.2.6" - strip-bom "^3.0.0" - -tslib@^2.1.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" - integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== - -type-check@^0.4.0, type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== - dependencies: - prelude-ls "~1.1.2" - -type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5, type-detect@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type-fest@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" - integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== - -type-fest@^0.18.0: - version "0.18.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" - integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== - -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -type-fest@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" - integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -type-fest@^1.0.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" - integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== - -typed-array-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" - integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" - is-typed-array "^1.1.10" - -typed-array-buffer@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" - integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== - dependencies: - call-bind "^1.0.7" - es-errors "^1.3.0" - is-typed-array "^1.1.13" - -typed-array-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" - integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== - dependencies: - call-bind "^1.0.2" - for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" - -typed-array-byte-offset@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" - integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" - -typed-array-length@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" - integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== - dependencies: - call-bind "^1.0.2" - for-each "^0.3.3" - is-typed-array "^1.1.9" - -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - -"typescript@^4.6.4 || ^5.0.0", typescript@^5.1.6: - version "5.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" - integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== - -uc.micro@^1.0.1, uc.micro@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" - integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== - -uglify-js@^3.7.7: - version "3.17.4" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" - integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== - -unbox-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" - integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== - dependencies: - call-bind "^1.0.2" - has-bigints "^1.0.2" - has-symbols "^1.0.3" - which-boxed-primitive "^1.0.2" - -underscore@>=1.8.3, underscore@~1.13.2: - version "1.13.6" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" - integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== - -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== - dependencies: - crypto-random-string "^2.0.0" - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -universalify@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" - integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== - -universalify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" - integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== - -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== - -update-browserslist-db@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" - integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - -update-notifier@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" - integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== - dependencies: - boxen "^5.0.0" - chalk "^4.1.0" - configstore "^5.0.1" - has-yarn "^2.1.0" - import-lazy "^2.1.0" - is-ci "^2.0.0" - is-installed-globally "^0.4.0" - is-npm "^5.0.0" - is-yarn-global "^0.3.0" - latest-version "^5.1.0" - pupa "^2.1.1" - semver "^7.3.4" - semver-diff "^3.1.1" - xdg-basedir "^4.0.0" - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -url-join@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" - integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== - -url-parse@^1.5.3: - version "1.5.10" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" - integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - -use-strict@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0" - integrity sha512-IeiWvvEXfW5ltKVMkxq6FvNf2LojMKvB2OCeja6+ct24S1XOmQw2dGr2JyndwACWAGJva9B7yPHwAmeA9QCqAQ== - -use-sync-external-store@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" - integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== - -utf8-byte-length@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" - integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== - -util-deprecate@^1.0.1, util-deprecate@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -uuid@8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -v8-compile-cache-lib@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" - integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -verror@^1.10.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" - integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -w3c-xmlserializer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" - integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== - dependencies: - xml-name-validator "^4.0.0" - -watchpack@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== - -webidl-conversions@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" - integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== - -webpack-cli@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" - integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== - dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^2.1.1" - "@webpack-cli/info" "^2.0.2" - "@webpack-cli/serve" "^2.0.5" - colorette "^2.0.14" - commander "^10.0.1" - cross-spawn "^7.0.3" - envinfo "^7.7.3" - fastest-levenshtein "^1.0.12" - import-local "^3.0.2" - interpret "^3.1.1" - rechoir "^0.8.0" - webpack-merge "^5.7.3" - -webpack-merge@^5.7.3: - version "5.9.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826" - integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg== - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== - -webpack@^5.76.3: - version "5.88.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e" - integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^1.0.0" - "@webassemblyjs/ast" "^1.11.5" - "@webassemblyjs/wasm-edit" "^1.11.5" - "@webassemblyjs/wasm-parser" "^1.11.5" - acorn "^8.7.1" - acorn-import-assertions "^1.9.0" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.15.0" - es-module-lexer "^1.2.1" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.2.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.3.7" - watchpack "^2.4.0" - webpack-sources "^3.2.3" - -webrtc-adapter@^4.1.1: - version "4.2.2" - resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-4.2.2.tgz#17896c047084fd4c567958a0cd4321e17f32773c" - integrity sha512-JV2mqgwd8K+n0YrwohZgpZceojJRmC+1CsSTNOTdjDOKwCpffeY49d/0lks7dzw+nMtz8XQs9yaUafXh4iCINg== - dependencies: - sdp "^2.1.0" - -whatwg-encoding@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" - integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== - dependencies: - iconv-lite "0.6.3" - -whatwg-mimetype@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" - integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== - -whatwg-url@^12.0.0, whatwg-url@^12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c" - integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ== - dependencies: - tr46 "^4.1.1" - webidl-conversions "^7.0.0" - -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - -which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - dependencies: - is-bigint "^1.0.1" - is-boolean-object "^1.1.0" - is-number-object "^1.0.4" - is-string "^1.0.5" - is-symbol "^1.0.3" - -which-builtin-type@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b" - integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw== - dependencies: - function.prototype.name "^1.1.5" - has-tostringtag "^1.0.0" - is-async-function "^2.0.0" - is-date-object "^1.0.5" - is-finalizationregistry "^1.0.2" - is-generator-function "^1.0.10" - is-regex "^1.1.4" - is-weakref "^1.0.2" - isarray "^2.0.5" - which-boxed-primitive "^1.0.2" - which-collection "^1.0.1" - which-typed-array "^1.1.9" - -which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== - dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" - -which-typed-array@^1.1.10, which-typed-array@^1.1.11, which-typed-array@^1.1.9: - version "1.1.11" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a" - integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" - -which-typed-array@^1.1.14: - version "1.1.14" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.14.tgz#1f78a111aee1e131ca66164d8bdc3ab062c95a06" - integrity sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg== - dependencies: - available-typed-arrays "^1.0.6" - call-bind "^1.0.5" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.1" - -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1, which@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" - integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== - dependencies: - string-width "^1.0.2 || 2 || 3 || 4" - -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== - dependencies: - string-width "^4.0.0" - -wildcard@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" - integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== - -word-wrap@~1.2.3: - version "1.2.5" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" - integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== - -workerpool@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" - integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== - -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" - integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== - dependencies: - ansi-styles "^6.1.0" - string-width "^5.0.1" - strip-ansi "^7.0.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - -ws@^8.13.0: - version "8.14.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.0.tgz#6c5792c5316dc9266ba8e780433fc45e6680aecd" - integrity sha512-WR0RJE9Ehsio6U4TuM+LmunEsjQ5ncHlw4sn9ihD6RoJKZrVyH9FWV3dmnwu8B2aNib1OvG2X6adUCyFpQyWcg== - -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== - -xml-name-validator@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" - integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== - -xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" - integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== - -xmlchars@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" - integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== - -xmlcreate@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be" - integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" - integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== - -yaml@^1.10.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-parser@^20.2.2, yargs-parser@^20.2.3: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs-unparser@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" - integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== - dependencies: - camelcase "^6.0.0" - decamelize "^4.0.0" - flat "^5.0.2" - is-plain-obj "^2.1.0" - -yargs@16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yargs@^17.0.0, yargs@^17.0.1, yargs@^17.7.2: - version "17.7.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" - integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - -yn@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== - -zod@^3.22.4: - version "3.22.4" - resolved "https://registry.yarnpkg.com/zod/-/zod-3.22.4.tgz#f31c3a9386f61b1f228af56faa9255e845cf3fff" - integrity sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg== + version: 0.0.4 + resolution: "curve25519-js@https://github.com/oxen-io/curve25519-js.git#commit=102f8c0a31b5c58bad8606979036cf763be9f4f6" + checksum: 10c0/ed0860ae225d81dcacd5d95ec4bf4e1fd4a3785be9cf4cb440fdbb49d0be0fb740ef118f4b4883fb83e60c4a48f7cae3fb3c0bb7f55428af8a7bab7124fd5c23 + languageName: node + linkType: hard + +"dargs@npm:^7.0.0": + version: 7.0.0 + resolution: "dargs@npm:7.0.0" + checksum: 10c0/ec7f6a8315a8fa2f8b12d39207615bdf62b4d01f631b96fbe536c8ad5469ab9ed710d55811e564d0d5c1d548fc8cb6cc70bf0939f2415790159f5a75e0f96c92 + languageName: node + linkType: hard + +"data-urls@npm:^4.0.0": + version: 4.0.0 + resolution: "data-urls@npm:4.0.0" + dependencies: + abab: "npm:^2.0.6" + whatwg-mimetype: "npm:^3.0.0" + whatwg-url: "npm:^12.0.0" + checksum: 10c0/928d9a21db31d3dcee125d514fddfeb88067c348b1225e9d2c6ca55db16e1cbe49bf58c092cae7163de958f415fd5c612c2aef2eef87896e097656fce205d766 + languageName: node + linkType: hard + +"date-fns@npm:^3.3.1": + version: 3.3.1 + resolution: "date-fns@npm:3.3.1" + checksum: 10c0/e04ff79244010e03b912d791cd3250af5f18866ce868604958d76bd87e5fb0b79f0a810b8e7066248452b41779b288c4fd21de1cac2cd4b6d384e9dd931c9674 + languageName: node + linkType: hard + +"debug@npm:4, debug@npm:4.3.4, debug@npm:^4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4": + version: 4.3.4 + resolution: "debug@npm:4.3.4" + dependencies: + ms: "npm:2.1.2" + peerDependenciesMeta: + supports-color: + optional: true + checksum: 10c0/cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736 + languageName: node + linkType: hard + +"debug@npm:^2.6.8": + version: 2.6.9 + resolution: "debug@npm:2.6.9" + dependencies: + ms: "npm:2.0.0" + checksum: 10c0/121908fb839f7801180b69a7e218a40b5a0b718813b886b7d6bdb82001b931c938e2941d1e4450f33a1b1df1da653f5f7a0440c197f29fbf8a6e9d45ff6ef589 + languageName: node + linkType: hard + +"debug@npm:^3.2.7": + version: 3.2.7 + resolution: "debug@npm:3.2.7" + dependencies: + ms: "npm:^2.1.1" + checksum: 10c0/37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a + languageName: node + linkType: hard + +"decamelize-keys@npm:^1.1.0": + version: 1.1.1 + resolution: "decamelize-keys@npm:1.1.1" + dependencies: + decamelize: "npm:^1.1.0" + map-obj: "npm:^1.0.0" + checksum: 10c0/4ca385933127437658338c65fb9aead5f21b28d3dd3ccd7956eb29aab0953b5d3c047fbc207111672220c71ecf7a4d34f36c92851b7bbde6fca1a02c541bdd7d + languageName: node + linkType: hard + +"decamelize@npm:^1.1.0": + version: 1.2.0 + resolution: "decamelize@npm:1.2.0" + checksum: 10c0/85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2 + languageName: node + linkType: hard + +"decamelize@npm:^4.0.0": + version: 4.0.0 + resolution: "decamelize@npm:4.0.0" + checksum: 10c0/e06da03fc05333e8cd2778c1487da67ffbea5b84e03ca80449519b8fa61f888714bbc6f459ea963d5641b4aa98832130eb5cd193d90ae9f0a27eee14be8e278d + languageName: node + linkType: hard + +"decimal.js@npm:^10.4.3": + version: 10.4.3 + resolution: "decimal.js@npm:10.4.3" + checksum: 10c0/6d60206689ff0911f0ce968d40f163304a6c1bc739927758e6efc7921cfa630130388966f16bf6ef6b838cb33679fbe8e7a78a2f3c478afce841fd55ac8fb8ee + languageName: node + linkType: hard + +"decompress-response@npm:^6.0.0": + version: 6.0.0 + resolution: "decompress-response@npm:6.0.0" + dependencies: + mimic-response: "npm:^3.1.0" + checksum: 10c0/bd89d23141b96d80577e70c54fb226b2f40e74a6817652b80a116d7befb8758261ad073a8895648a29cc0a5947021ab66705cb542fa9c143c82022b27c5b175e + languageName: node + linkType: hard + +"deep-diff@npm:^0.3.5": + version: 0.3.8 + resolution: "deep-diff@npm:0.3.8" + checksum: 10c0/dbb10937ccff21b1ad1ee5e64ad926643a7000cb9837bc2165bacfddf569788c78b8bfd74401c32121af3fb1cb1092b7447319d9f01900676473a1b840c08ade + languageName: node + linkType: hard + +"deep-eql@npm:^4.1.2": + version: 4.1.3 + resolution: "deep-eql@npm:4.1.3" + dependencies: + type-detect: "npm:^4.0.0" + checksum: 10c0/ff34e8605d8253e1bf9fe48056e02c6f347b81d9b5df1c6650a1b0f6f847b4a86453b16dc226b34f853ef14b626e85d04e081b022e20b00cd7d54f079ce9bbdd + languageName: node + linkType: hard + +"deep-extend@npm:^0.6.0": + version: 0.6.0 + resolution: "deep-extend@npm:0.6.0" + checksum: 10c0/1c6b0abcdb901e13a44c7d699116d3d4279fdb261983122a3783e7273844d5f2537dc2e1c454a23fcf645917f93fbf8d07101c1d03c015a87faa662755212566 + languageName: node + linkType: hard + +"deep-is@npm:^0.1.3, deep-is@npm:~0.1.3": + version: 0.1.4 + resolution: "deep-is@npm:0.1.4" + checksum: 10c0/7f0ee496e0dff14a573dc6127f14c95061b448b87b995fc96c017ce0a1e66af1675e73f1d6064407975bc4ea6ab679497a29fff7b5b9c4e99cb10797c1ad0b4c + languageName: node + linkType: hard + +"defer-to-connect@npm:^2.0.0": + version: 2.0.1 + resolution: "defer-to-connect@npm:2.0.1" + checksum: 10c0/625ce28e1b5ad10cf77057b9a6a727bf84780c17660f6644dab61dd34c23de3001f03cedc401f7d30a4ed9965c2e8a7336e220a329146f2cf85d4eddea429782 + languageName: node + linkType: hard + +"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.2, define-data-property@npm:^1.1.4": + version: 1.1.4 + resolution: "define-data-property@npm:1.1.4" + dependencies: + es-define-property: "npm:^1.0.0" + es-errors: "npm:^1.3.0" + gopd: "npm:^1.0.1" + checksum: 10c0/dea0606d1483eb9db8d930d4eac62ca0fa16738b0b3e07046cddfacf7d8c868bbe13fa0cb263eb91c7d0d527960dc3f2f2471a69ed7816210307f6744fe62e37 + languageName: node + linkType: hard + +"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0": + version: 1.2.0 + resolution: "define-properties@npm:1.2.0" + dependencies: + has-property-descriptors: "npm:^1.0.0" + object-keys: "npm:^1.1.1" + checksum: 10c0/34b58cae4651936a3c8c720310ce393a3227f5123640ab5402e7d6e59bb44f8295b789cb5d74e7513682b2e60ff20586d6f52b726d964d617abffa3da76344e0 + languageName: node + linkType: hard + +"define-properties@npm:^1.2.1": + version: 1.2.1 + resolution: "define-properties@npm:1.2.1" + dependencies: + define-data-property: "npm:^1.0.1" + has-property-descriptors: "npm:^1.0.0" + object-keys: "npm:^1.1.1" + checksum: 10c0/88a152319ffe1396ccc6ded510a3896e77efac7a1bfbaa174a7b00414a1747377e0bb525d303794a47cf30e805c2ec84e575758512c6e44a993076d29fd4e6c3 + languageName: node + linkType: hard + +"delayed-stream@npm:~1.0.0": + version: 1.0.0 + resolution: "delayed-stream@npm:1.0.0" + checksum: 10c0/d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19 + languageName: node + linkType: hard + +"delegates@npm:^1.0.0": + version: 1.0.0 + resolution: "delegates@npm:1.0.0" + checksum: 10c0/ba05874b91148e1db4bf254750c042bf2215febd23a6d3cda2e64896aef79745fbd4b9996488bd3cafb39ce19dbce0fd6e3b6665275638befffe1c9b312b91b5 + languageName: node + linkType: hard + +"detect-node@npm:^2.0.4": + version: 2.1.0 + resolution: "detect-node@npm:2.1.0" + checksum: 10c0/f039f601790f2e9d4654e499913259a798b1f5246ae24f86ab5e8bd4aaf3bce50484234c494f11fb00aecb0c6e2733aa7b1cf3f530865640b65fbbd65b2c4e09 + languageName: node + linkType: hard + +"diff@npm:5.0.0": + version: 5.0.0 + resolution: "diff@npm:5.0.0" + checksum: 10c0/08c5904779bbababcd31f1707657b1ad57f8a9b65e6f88d3fb501d09a965d5f8d73066898a7d3f35981f9e4101892c61d99175d421f3b759533213c253d91134 + languageName: node + linkType: hard + +"diff@npm:^4.0.1, diff@npm:^4.0.2": + version: 4.0.2 + resolution: "diff@npm:4.0.2" + checksum: 10c0/81b91f9d39c4eaca068eb0c1eb0e4afbdc5bb2941d197f513dd596b820b956fef43485876226d65d497bebc15666aa2aa82c679e84f65d5f2bfbf14ee46e32c1 + languageName: node + linkType: hard + +"dir-compare@npm:^2.4.0": + version: 2.4.0 + resolution: "dir-compare@npm:2.4.0" + dependencies: + buffer-equal: "npm:1.0.0" + colors: "npm:1.0.3" + commander: "npm:2.9.0" + minimatch: "npm:3.0.4" + bin: + dircompare: src/cli/dircompare.js + checksum: 10c0/f1bf30faeeb2829f5d209ed72d94b3c4973c02765d2defc206e84963b3ce31fd0f5b0e86e9cf075dff917402846e7bb6efffd7836ea35c0ee46adcaad8ca345f + languageName: node + linkType: hard + +"dir-glob@npm:^3.0.1": + version: 3.0.1 + resolution: "dir-glob@npm:3.0.1" + dependencies: + path-type: "npm:^4.0.0" + checksum: 10c0/dcac00920a4d503e38bb64001acb19df4efc14536ada475725e12f52c16777afdee4db827f55f13a908ee7efc0cb282e2e3dbaeeb98c0993dd93d1802d3bf00c + languageName: node + linkType: hard + +"dmg-builder@npm:23.0.8": + version: 23.0.8 + resolution: "dmg-builder@npm:23.0.8" + dependencies: + app-builder-lib: "npm:23.0.8" + builder-util: "npm:23.0.8" + builder-util-runtime: "npm:9.0.2" + dmg-license: "npm:^1.0.11" + fs-extra: "npm:^10.0.0" + iconv-lite: "npm:^0.6.2" + js-yaml: "npm:^4.1.0" + dependenciesMeta: + dmg-license: + optional: true + checksum: 10c0/2c64b9c597a09cd3c9a42ddbca3571074e26645d172fa3fb21b5bbec392a6d90236056bca50d5792042cde701013d1347edbf4264fe20a654a63dcdbc8882edf + languageName: node + linkType: hard + +"dmg-builder@npm:23.6.0": + version: 23.6.0 + resolution: "dmg-builder@npm:23.6.0" + dependencies: + app-builder-lib: "npm:23.6.0" + builder-util: "npm:23.6.0" + builder-util-runtime: "npm:9.1.1" + dmg-license: "npm:^1.0.11" + fs-extra: "npm:^10.0.0" + iconv-lite: "npm:^0.6.2" + js-yaml: "npm:^4.1.0" + dependenciesMeta: + dmg-license: + optional: true + checksum: 10c0/3710e00e0b92305f3f744c8cf8dfcf54439785d724831b28e9e6944f9c63b510059d341212e059e0934bdc5243b30a6801153b490a9ad2bc1b9a1f07f690fa02 + languageName: node + linkType: hard + +"dmg-license@npm:^1.0.11": + version: 1.0.11 + resolution: "dmg-license@npm:1.0.11" + dependencies: + "@types/plist": "npm:^3.0.1" + "@types/verror": "npm:^1.10.3" + ajv: "npm:^6.10.0" + crc: "npm:^3.8.0" + iconv-corefoundation: "npm:^1.1.7" + plist: "npm:^3.0.4" + smart-buffer: "npm:^4.0.2" + verror: "npm:^1.10.0" + bin: + dmg-license: bin/dmg-license.js + conditions: os=darwin + languageName: node + linkType: hard + +"doctrine@npm:^2.1.0": + version: 2.1.0 + resolution: "doctrine@npm:2.1.0" + dependencies: + esutils: "npm:^2.0.2" + checksum: 10c0/b6416aaff1f380bf56c3b552f31fdf7a69b45689368deca72d28636f41c16bb28ec3ebc40ace97db4c1afc0ceeb8120e8492fe0046841c94c2933b2e30a7d5ac + languageName: node + linkType: hard + +"doctrine@npm:^3.0.0": + version: 3.0.0 + resolution: "doctrine@npm:3.0.0" + dependencies: + esutils: "npm:^2.0.2" + checksum: 10c0/c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520 + languageName: node + linkType: hard + +"dom-helpers@npm:^5.0.1, dom-helpers@npm:^5.1.3": + version: 5.2.1 + resolution: "dom-helpers@npm:5.2.1" + dependencies: + "@babel/runtime": "npm:^7.8.7" + csstype: "npm:^3.0.2" + checksum: 10c0/f735074d66dd759b36b158fa26e9d00c9388ee0e8c9b16af941c38f014a37fc80782de83afefd621681b19ac0501034b4f1c4a3bff5caa1b8667f0212b5e124c + languageName: node + linkType: hard + +"domexception@npm:^4.0.0": + version: 4.0.0 + resolution: "domexception@npm:4.0.0" + dependencies: + webidl-conversions: "npm:^7.0.0" + checksum: 10c0/774277cd9d4df033f852196e3c0077a34dbd15a96baa4d166e0e47138a80f4c0bdf0d94e4703e6ff5883cec56bb821a6fff84402d8a498e31de7c87eb932a294 + languageName: node + linkType: hard + +"dompurify@npm:^2.0.7": + version: 2.4.7 + resolution: "dompurify@npm:2.4.7" + checksum: 10c0/c04fa6a7c7276d0bc80e6330f697cfecd96ec1d3964b17de916f26cb0b5b2c9a98ba343d84e759f2b8339e577e619ef3749f3d128ef18ddb8230b09bd2ff3f29 + languageName: node + linkType: hard + +"dot-prop@npm:^5.1.0, dot-prop@npm:^5.2.0": + version: 5.3.0 + resolution: "dot-prop@npm:5.3.0" + dependencies: + is-obj: "npm:^2.0.0" + checksum: 10c0/93f0d343ef87fe8869320e62f2459f7e70f49c6098d948cc47e060f4a3f827d0ad61e83cb82f2bd90cd5b9571b8d334289978a43c0f98fea4f0e99ee8faa0599 + languageName: node + linkType: hard + +"dotenv-expand@npm:^5.1.0": + version: 5.1.0 + resolution: "dotenv-expand@npm:5.1.0" + checksum: 10c0/24ac633de853ef474d0421cc639328b7134109c8dc2baaa5e3afb7495af5e9237136d7e6971e55668e4dce915487eb140967cdd2b3e99aa439e0f6bf8b56faeb + languageName: node + linkType: hard + +"dotenv@npm:^9.0.2": + version: 9.0.2 + resolution: "dotenv@npm:9.0.2" + checksum: 10c0/535f04d59e0bf58fe0c7966886eff42fb5e0227e2f7bfa38d37439bbf6b3c25d1b085bd235c9b98e7e9a032b1cd310904366e5588b320c29335d359660fab0d4 + languageName: node + linkType: hard + +"eastasianwidth@npm:^0.2.0": + version: 0.2.0 + resolution: "eastasianwidth@npm:0.2.0" + checksum: 10c0/26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39 + languageName: node + linkType: hard + +"ejs@npm:^3.1.7": + version: 3.1.9 + resolution: "ejs@npm:3.1.9" + dependencies: + jake: "npm:^10.8.5" + bin: + ejs: bin/cli.js + checksum: 10c0/f0e249c79128810f5f6d5cbf347fc906d86bb9384263db0b2a9004aea649f2bc2d112736de5716c509c80afb4721c47281bd5b57c757d3b63f1bf5ac5f885893 + languageName: node + linkType: hard + +"electron-builder@npm:23.0.8": + version: 23.0.8 + resolution: "electron-builder@npm:23.0.8" + dependencies: + "@types/yargs": "npm:^17.0.1" + app-builder-lib: "npm:23.0.8" + builder-util: "npm:23.0.8" + builder-util-runtime: "npm:9.0.2" + chalk: "npm:^4.1.1" + dmg-builder: "npm:23.0.8" + fs-extra: "npm:^10.0.0" + is-ci: "npm:^3.0.0" + lazy-val: "npm:^1.0.5" + read-config-file: "npm:6.2.0" + update-notifier: "npm:^5.1.0" + yargs: "npm:^17.0.1" + bin: + electron-builder: cli.js + install-app-deps: install-app-deps.js + checksum: 10c0/041fd75d52ac9ab2fecb880b2a1264833e3475a749de608c3cb08cbee845587784796f7ca2c963f4cd81672591b2366a1bdb9b125d1c517f292463279a4869e3 + languageName: node + linkType: hard + +"electron-is-accelerator@npm:^0.1.0": + version: 0.1.2 + resolution: "electron-is-accelerator@npm:0.1.2" + checksum: 10c0/120da55c3b581cbca5eccdd80c9099574a7aa0a8ea8b9fd4e5dcd906dcf83308c94587ad771b066cdd073e45e68dbe4c06256602998f16ccafbcfe1cab968718 + languageName: node + linkType: hard + +"electron-localshortcut@npm:^3.2.1": + version: 3.2.1 + resolution: "electron-localshortcut@npm:3.2.1" + dependencies: + debug: "npm:^4.0.1" + electron-is-accelerator: "npm:^0.1.0" + keyboardevent-from-electron-accelerator: "npm:^2.0.0" + keyboardevents-areequal: "npm:^0.2.1" + checksum: 10c0/6490a1dd0155926d5664500d45a5acb4771ba96e3ad4a878367e24ab96096c8824197cf3e2890a4f51b0307665afe680fe5f22dae2e4ba781cf32ddab9dcc335 + languageName: node + linkType: hard + +"electron-osx-sign@npm:^0.6.0": + version: 0.6.0 + resolution: "electron-osx-sign@npm:0.6.0" + dependencies: + bluebird: "npm:^3.5.0" + compare-version: "npm:^0.1.2" + debug: "npm:^2.6.8" + isbinaryfile: "npm:^3.0.2" + minimist: "npm:^1.2.0" + plist: "npm:^3.0.1" + bin: + electron-osx-flat: bin/electron-osx-flat.js + electron-osx-sign: bin/electron-osx-sign.js + checksum: 10c0/57ff8a90b59ad976de7c1cfc9c3813c24b1d2f56fd117a753f717b6157f244184e5696cb6e024b4491f0c9b2e0856b82cc983bf66fc2b21735175246d37aab6b + languageName: node + linkType: hard + +"electron-publish@npm:23.0.8": + version: 23.0.8 + resolution: "electron-publish@npm:23.0.8" + dependencies: + "@types/fs-extra": "npm:^9.0.11" + builder-util: "npm:23.0.8" + builder-util-runtime: "npm:9.0.2" + chalk: "npm:^4.1.1" + fs-extra: "npm:^10.0.0" + lazy-val: "npm:^1.0.5" + mime: "npm:^2.5.2" + checksum: 10c0/cdd1b11254cca9c46d0374098ba30944a5a42ebc13430fc01ff39ad54c2681051cab7db15a783c43d56d9e465b8ed6535e422e1479665776a750c8d5a7bb6a21 + languageName: node + linkType: hard + +"electron-publish@npm:23.6.0": + version: 23.6.0 + resolution: "electron-publish@npm:23.6.0" + dependencies: + "@types/fs-extra": "npm:^9.0.11" + builder-util: "npm:23.6.0" + builder-util-runtime: "npm:9.1.1" + chalk: "npm:^4.1.1" + fs-extra: "npm:^10.0.0" + lazy-val: "npm:^1.0.5" + mime: "npm:^2.5.2" + checksum: 10c0/89e9378894ef4582cbfc56a173cefb301b39a59e8fe8a8ac9e9f54d416acff809c1187bd9ee933ac7629c37a66d2768402f55fcd3bc5119da95665bfd788ce87 + languageName: node + linkType: hard + +"electron-to-chromium@npm:^1.4.477": + version: 1.4.509 + resolution: "electron-to-chromium@npm:1.4.509" + checksum: 10c0/d9a1a9472b731b1c94ed3e9bc9c06f364ba7ad187b9ae7ed7a60faac423c08b2526f19b89c37855afeccee9e60ca7049255a590943968c506d79d07c0a6c4760 + languageName: node + linkType: hard + +"electron-updater@npm:^4.2.2": + version: 4.6.5 + resolution: "electron-updater@npm:4.6.5" + dependencies: + "@types/semver": "npm:^7.3.6" + builder-util-runtime: "npm:8.9.2" + fs-extra: "npm:^10.0.0" + js-yaml: "npm:^4.1.0" + lazy-val: "npm:^1.0.5" + lodash.escaperegexp: "npm:^4.1.2" + lodash.isequal: "npm:^4.5.0" + semver: "npm:^7.3.5" + checksum: 10c0/a1db9e796d51545165bba4d200d753e91fb71b2b33c08de4ebbc692ec56a7439a3f6135e8cee95cc934cd34a6f43d25fd252e792f8a77530d3c00ea9b2586640 + languageName: node + linkType: hard + +"electron@npm:*": + version: 26.1.0 + resolution: "electron@npm:26.1.0" + dependencies: + "@electron/get": "npm:^2.0.0" + "@types/node": "npm:^18.11.18" + extract-zip: "npm:^2.0.1" + bin: + electron: cli.js + checksum: 10c0/290c153f8796211bca50499cebaf46811428c58776898e9156b6c0ba9bf6ffaf660ff6fd640b671018cee20551f5bb64389fed89b449cec71d8a6ca2bf75335a + languageName: node + linkType: hard + +"electron@npm:^25.8.4": + version: 25.8.4 + resolution: "electron@npm:25.8.4" + dependencies: + "@electron/get": "npm:^2.0.0" + "@types/node": "npm:^18.11.18" + extract-zip: "npm:^2.0.1" + bin: + electron: cli.js + checksum: 10c0/edeafc3c001df180178ba568e7ffef0e3fbe78b28fed7e21004857b5b7cda11726f021e77bb2c4d326dcfc6599003ef109b0853c94434ce9b133178fd8c6d39f + languageName: node + linkType: hard + +"emoji-mart@npm:^5.5.2": + version: 5.5.2 + resolution: "emoji-mart@npm:5.5.2" + checksum: 10c0/398a7d7f27930d39487648beb0c79d1e1424223bbd5985b0159188dadb90c2188022a3fa06afdf7ae9fb293b8cf7cbe3b46e60426b1edc7cf0f7ddf3b33cb01e + languageName: node + linkType: hard + +"emoji-regex@npm:^8.0.0": + version: 8.0.0 + resolution: "emoji-regex@npm:8.0.0" + checksum: 10c0/b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010 + languageName: node + linkType: hard + +"emoji-regex@npm:^9.2.2": + version: 9.2.2 + resolution: "emoji-regex@npm:9.2.2" + checksum: 10c0/af014e759a72064cf66e6e694a7fc6b0ed3d8db680427b021a89727689671cefe9d04151b2cad51dbaf85d5ba790d061cd167f1cf32eb7b281f6368b3c181639 + languageName: node + linkType: hard + +"emojis-list@npm:^3.0.0": + version: 3.0.0 + resolution: "emojis-list@npm:3.0.0" + checksum: 10c0/7dc4394b7b910444910ad64b812392159a21e1a7ecc637c775a440227dcb4f80eff7fe61f4453a7d7603fa23d23d30cc93fe9e4b5ed985b88d6441cd4a35117b + languageName: node + linkType: hard + +"encoding@npm:0.1.12": + version: 0.1.12 + resolution: "encoding@npm:0.1.12" + dependencies: + iconv-lite: "npm:~0.4.13" + checksum: 10c0/1d0daefb259fb0c97b90baa7f98ea9bb3916a1aef39e21c2888a1602fb616fcd422db6e6281839dc7ff32c1db7448bcd258954d37d4f0e5f1503357db0793ee6 + languageName: node + linkType: hard + +"encoding@npm:^0.1.13": + version: 0.1.13 + resolution: "encoding@npm:0.1.13" + dependencies: + iconv-lite: "npm:^0.6.2" + checksum: 10c0/36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039 + languageName: node + linkType: hard + +"end-of-stream@npm:^1.1.0": + version: 1.4.4 + resolution: "end-of-stream@npm:1.4.4" + dependencies: + once: "npm:^1.4.0" + checksum: 10c0/870b423afb2d54bb8d243c63e07c170409d41e20b47eeef0727547aea5740bd6717aca45597a9f2745525667a6b804c1e7bede41f856818faee5806dd9ff3975 + languageName: node + linkType: hard + +"enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.12.0, enhanced-resolve@npm:^5.15.0": + version: 5.15.0 + resolution: "enhanced-resolve@npm:5.15.0" + dependencies: + graceful-fs: "npm:^4.2.4" + tapable: "npm:^2.2.0" + checksum: 10c0/69984a7990913948b4150855aed26a84afb4cb1c5a94fb8e3a65bd00729a73fc2eaff6871fb8e345377f294831afe349615c93560f2f54d61b43cdfdf668f19a + languageName: node + linkType: hard + +"entities@npm:^4.4.0": + version: 4.5.0 + resolution: "entities@npm:4.5.0" + checksum: 10c0/5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250 + languageName: node + linkType: hard + +"entities@npm:~2.1.0": + version: 2.1.0 + resolution: "entities@npm:2.1.0" + checksum: 10c0/dd96ed95f7e017b7fbbcdd39bd6dc3dea6638f747c00610b53f23ea461ac409af87670f313805d85854bfce04f96e17d83575f75b3b2920365d78678ccd2a405 + languageName: node + linkType: hard + +"env-paths@npm:^2.2.0": + version: 2.2.1 + resolution: "env-paths@npm:2.2.1" + checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4 + languageName: node + linkType: hard + +"envinfo@npm:^7.7.3": + version: 7.10.0 + resolution: "envinfo@npm:7.10.0" + bin: + envinfo: dist/cli.js + checksum: 10c0/ebc7792fbedca72bc829913abe0c2a3384b883903012f97b56085afd4e83d26f7dd0652403fedd99cd3e1c93d4fb0706f5d2c3dc06ac6a1eda348280a06a9dcf + languageName: node + linkType: hard + +"err-code@npm:^2.0.2": + version: 2.0.3 + resolution: "err-code@npm:2.0.3" + checksum: 10c0/b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66 + languageName: node + linkType: hard + +"error-ex@npm:^1.3.1": + version: 1.3.2 + resolution: "error-ex@npm:1.3.2" + dependencies: + is-arrayish: "npm:^0.2.1" + checksum: 10c0/ba827f89369b4c93382cfca5a264d059dfefdaa56ecc5e338ffa58a6471f5ed93b71a20add1d52290a4873d92381174382658c885ac1a2305f7baca363ce9cce + languageName: node + linkType: hard + +"error-stack-parser@npm:^2.0.6": + version: 2.1.4 + resolution: "error-stack-parser@npm:2.1.4" + dependencies: + stackframe: "npm:^1.3.4" + checksum: 10c0/7679b780043c98b01fc546725484e0cfd3071bf5c906bbe358722972f04abf4fc3f0a77988017665bab367f6ef3fc2d0185f7528f45966b83e7c99c02d5509b9 + languageName: node + linkType: hard + +"es-abstract@npm:^1.20.4, es-abstract@npm:^1.22.1": + version: 1.22.1 + resolution: "es-abstract@npm:1.22.1" + dependencies: + array-buffer-byte-length: "npm:^1.0.0" + arraybuffer.prototype.slice: "npm:^1.0.1" + available-typed-arrays: "npm:^1.0.5" + call-bind: "npm:^1.0.2" + es-set-tostringtag: "npm:^2.0.1" + es-to-primitive: "npm:^1.2.1" + function.prototype.name: "npm:^1.1.5" + get-intrinsic: "npm:^1.2.1" + get-symbol-description: "npm:^1.0.0" + globalthis: "npm:^1.0.3" + gopd: "npm:^1.0.1" + has: "npm:^1.0.3" + has-property-descriptors: "npm:^1.0.0" + has-proto: "npm:^1.0.1" + has-symbols: "npm:^1.0.3" + internal-slot: "npm:^1.0.5" + is-array-buffer: "npm:^3.0.2" + is-callable: "npm:^1.2.7" + is-negative-zero: "npm:^2.0.2" + is-regex: "npm:^1.1.4" + is-shared-array-buffer: "npm:^1.0.2" + is-string: "npm:^1.0.7" + is-typed-array: "npm:^1.1.10" + is-weakref: "npm:^1.0.2" + object-inspect: "npm:^1.12.3" + object-keys: "npm:^1.1.1" + object.assign: "npm:^4.1.4" + regexp.prototype.flags: "npm:^1.5.0" + safe-array-concat: "npm:^1.0.0" + safe-regex-test: "npm:^1.0.0" + string.prototype.trim: "npm:^1.2.7" + string.prototype.trimend: "npm:^1.0.6" + string.prototype.trimstart: "npm:^1.0.6" + typed-array-buffer: "npm:^1.0.0" + typed-array-byte-length: "npm:^1.0.0" + typed-array-byte-offset: "npm:^1.0.0" + typed-array-length: "npm:^1.0.4" + unbox-primitive: "npm:^1.0.2" + which-typed-array: "npm:^1.1.10" + checksum: 10c0/36abed2b7efa8dd337d938e50d0b97d070c0ef45b2257eec0ae8c3edc5c7e8f3e2906530afda5c0b8a4f44299391d078237fd5ea454ac4e9adb6f8343bf84980 + languageName: node + linkType: hard + +"es-abstract@npm:^1.22.3": + version: 1.22.4 + resolution: "es-abstract@npm:1.22.4" + dependencies: + array-buffer-byte-length: "npm:^1.0.1" + arraybuffer.prototype.slice: "npm:^1.0.3" + available-typed-arrays: "npm:^1.0.6" + call-bind: "npm:^1.0.7" + es-define-property: "npm:^1.0.0" + es-errors: "npm:^1.3.0" + es-set-tostringtag: "npm:^2.0.2" + es-to-primitive: "npm:^1.2.1" + function.prototype.name: "npm:^1.1.6" + get-intrinsic: "npm:^1.2.4" + get-symbol-description: "npm:^1.0.2" + globalthis: "npm:^1.0.3" + gopd: "npm:^1.0.1" + has-property-descriptors: "npm:^1.0.2" + has-proto: "npm:^1.0.1" + has-symbols: "npm:^1.0.3" + hasown: "npm:^2.0.1" + internal-slot: "npm:^1.0.7" + is-array-buffer: "npm:^3.0.4" + is-callable: "npm:^1.2.7" + is-negative-zero: "npm:^2.0.2" + is-regex: "npm:^1.1.4" + is-shared-array-buffer: "npm:^1.0.2" + is-string: "npm:^1.0.7" + is-typed-array: "npm:^1.1.13" + is-weakref: "npm:^1.0.2" + object-inspect: "npm:^1.13.1" + object-keys: "npm:^1.1.1" + object.assign: "npm:^4.1.5" + regexp.prototype.flags: "npm:^1.5.2" + safe-array-concat: "npm:^1.1.0" + safe-regex-test: "npm:^1.0.3" + string.prototype.trim: "npm:^1.2.8" + string.prototype.trimend: "npm:^1.0.7" + string.prototype.trimstart: "npm:^1.0.7" + typed-array-buffer: "npm:^1.0.1" + typed-array-byte-length: "npm:^1.0.0" + typed-array-byte-offset: "npm:^1.0.0" + typed-array-length: "npm:^1.0.4" + unbox-primitive: "npm:^1.0.2" + which-typed-array: "npm:^1.1.14" + checksum: 10c0/dc332c3a010c5e7b77b7ea8a4532ac455fa02e7bcabf996a47447165bafa72d0d99967407d0cf5dbbb5fbbf87f53cd8b706608ec70953523b8cd2b831b9a9d64 + languageName: node + linkType: hard + +"es-array-method-boxes-properly@npm:^1.0.0": + version: 1.0.0 + resolution: "es-array-method-boxes-properly@npm:1.0.0" + checksum: 10c0/4b7617d3fbd460d6f051f684ceca6cf7e88e6724671d9480388d3ecdd72119ddaa46ca31f2c69c5426a82e4b3091c1e81867c71dcdc453565cd90005ff2c382d + languageName: node + linkType: hard + +"es-define-property@npm:^1.0.0": + version: 1.0.0 + resolution: "es-define-property@npm:1.0.0" + dependencies: + get-intrinsic: "npm:^1.2.4" + checksum: 10c0/6bf3191feb7ea2ebda48b577f69bdfac7a2b3c9bcf97307f55fd6ef1bbca0b49f0c219a935aca506c993d8c5d8bddd937766cb760cd5e5a1071351f2df9f9aa4 + languageName: node + linkType: hard + +"es-errors@npm:^1.0.0, es-errors@npm:^1.2.1, es-errors@npm:^1.3.0": + version: 1.3.0 + resolution: "es-errors@npm:1.3.0" + checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85 + languageName: node + linkType: hard + +"es-iterator-helpers@npm:^1.0.12": + version: 1.0.14 + resolution: "es-iterator-helpers@npm:1.0.14" + dependencies: + asynciterator.prototype: "npm:^1.0.0" + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + es-set-tostringtag: "npm:^2.0.1" + function-bind: "npm:^1.1.1" + get-intrinsic: "npm:^1.2.1" + globalthis: "npm:^1.0.3" + has-property-descriptors: "npm:^1.0.0" + has-proto: "npm:^1.0.1" + has-symbols: "npm:^1.0.3" + internal-slot: "npm:^1.0.5" + iterator.prototype: "npm:^1.1.0" + safe-array-concat: "npm:^1.0.0" + checksum: 10c0/47d59ccbcf2fe32d9e5ac4fff65d613210851bbf14ba32726e5eb771194173b66aa233d7e4049b2cb24251545787ac1ea3242f91aa343aaaa7ce699e20d12e1c + languageName: node + linkType: hard + +"es-module-lexer@npm:^1.2.1": + version: 1.3.0 + resolution: "es-module-lexer@npm:1.3.0" + checksum: 10c0/cbd9bdc65458d4c4bd0d22a1c792926bfdf7bb6a96a9ed04da7d31f317159bd4945d2dbeb318717f9214f9695ee85a8fae64a5d25bf360baa82b58079032fc7a + languageName: node + linkType: hard + +"es-set-tostringtag@npm:^2.0.1": + version: 2.0.1 + resolution: "es-set-tostringtag@npm:2.0.1" + dependencies: + get-intrinsic: "npm:^1.1.3" + has: "npm:^1.0.3" + has-tostringtag: "npm:^1.0.0" + checksum: 10c0/9af096365e3861bb29755cc5f76f15f66a7eab0e83befca396129090c1d9737e54090278b8e5357e97b5f0a5b0459fca07c40c6740884c2659cbf90ef8e508cc + languageName: node + linkType: hard + +"es-set-tostringtag@npm:^2.0.2": + version: 2.0.3 + resolution: "es-set-tostringtag@npm:2.0.3" + dependencies: + get-intrinsic: "npm:^1.2.4" + has-tostringtag: "npm:^1.0.2" + hasown: "npm:^2.0.1" + checksum: 10c0/f22aff1585eb33569c326323f0b0d175844a1f11618b86e193b386f8be0ea9474cfbe46df39c45d959f7aa8f6c06985dc51dd6bce5401645ec5a74c4ceaa836a + languageName: node + linkType: hard + +"es-shim-unscopables@npm:^1.0.0": + version: 1.0.0 + resolution: "es-shim-unscopables@npm:1.0.0" + dependencies: + has: "npm:^1.0.3" + checksum: 10c0/d54a66239fbd19535b3e50333913260394f14d2d7adb136a95396a13ca584bab400cf9cb2ffd9232f3fe2f0362540bd3a708240c493e46e13fe0b90cfcfedc3d + languageName: node + linkType: hard + +"es-shim-unscopables@npm:^1.0.2": + version: 1.0.2 + resolution: "es-shim-unscopables@npm:1.0.2" + dependencies: + hasown: "npm:^2.0.0" + checksum: 10c0/f495af7b4b7601a4c0cfb893581c352636e5c08654d129590386a33a0432cf13a7bdc7b6493801cadd990d838e2839b9013d1de3b880440cb537825e834fe783 + languageName: node + linkType: hard + +"es-to-primitive@npm:^1.2.1": + version: 1.2.1 + resolution: "es-to-primitive@npm:1.2.1" + dependencies: + is-callable: "npm:^1.1.4" + is-date-object: "npm:^1.0.1" + is-symbol: "npm:^1.0.2" + checksum: 10c0/0886572b8dc075cb10e50c0af62a03d03a68e1e69c388bd4f10c0649ee41b1fbb24840a1b7e590b393011b5cdbe0144b776da316762653685432df37d6de60f1 + languageName: node + linkType: hard + +"es6-error@npm:^4.1.1": + version: 4.1.1 + resolution: "es6-error@npm:4.1.1" + checksum: 10c0/357663fb1e845c047d548c3d30f86e005db71e122678f4184ced0693f634688c3f3ef2d7de7d4af732f734de01f528b05954e270f06aa7d133679fb9fe6600ef + languageName: node + linkType: hard + +"escalade@npm:^3.1.1": + version: 3.1.1 + resolution: "escalade@npm:3.1.1" + checksum: 10c0/afd02e6ca91ffa813e1108b5e7756566173d6bc0d1eb951cb44d6b21702ec17c1cf116cfe75d4a2b02e05acb0b808a7a9387d0d1ca5cf9c04ad03a8445c3e46d + languageName: node + linkType: hard + +"escape-goat@npm:^2.0.0": + version: 2.1.1 + resolution: "escape-goat@npm:2.1.1" + checksum: 10c0/fc0ad656f89c05e86a9641a21bdc5ea37b258714c057430b68a834854fa3e5770cda7d41756108863fc68b1e36a0946463017b7553ac39eaaf64815be07816fc + languageName: node + linkType: hard + +"escape-string-regexp@npm:4.0.0, escape-string-regexp@npm:^4.0.0": + version: 4.0.0 + resolution: "escape-string-regexp@npm:4.0.0" + checksum: 10c0/9497d4dd307d845bd7f75180d8188bb17ea8c151c1edbf6b6717c100e104d629dc2dfb687686181b0f4b7d732c7dfdc4d5e7a8ff72de1b0ca283a75bbb3a9cd9 + languageName: node + linkType: hard + +"escape-string-regexp@npm:^1.0.2, escape-string-regexp@npm:^1.0.5": + version: 1.0.5 + resolution: "escape-string-regexp@npm:1.0.5" + checksum: 10c0/a968ad453dd0c2724e14a4f20e177aaf32bb384ab41b674a8454afe9a41c5e6fe8903323e0a1052f56289d04bd600f81278edf140b0fcc02f5cac98d0f5b5371 + languageName: node + linkType: hard + +"escape-string-regexp@npm:^2.0.0": + version: 2.0.0 + resolution: "escape-string-regexp@npm:2.0.0" + checksum: 10c0/2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507 + languageName: node + linkType: hard + +"escodegen@npm:^1.13.0": + version: 1.14.3 + resolution: "escodegen@npm:1.14.3" + dependencies: + esprima: "npm:^4.0.1" + estraverse: "npm:^4.2.0" + esutils: "npm:^2.0.2" + optionator: "npm:^0.8.1" + source-map: "npm:~0.6.1" + dependenciesMeta: + source-map: + optional: true + bin: + escodegen: bin/escodegen.js + esgenerate: bin/esgenerate.js + checksum: 10c0/30d337803e8f44308c90267bf6192399e4b44792497c77a7506b68ab802ba6a48ebbe1ce77b219aba13dfd2de5f5e1c267e35be1ed87b2a9c3315e8b283e302a + languageName: node + linkType: hard + +"eslint-config-airbnb-base@npm:^15.0.0": + version: 15.0.0 + resolution: "eslint-config-airbnb-base@npm:15.0.0" + dependencies: + confusing-browser-globals: "npm:^1.0.10" + object.assign: "npm:^4.1.2" + object.entries: "npm:^1.1.5" + semver: "npm:^6.3.0" + peerDependencies: + eslint: ^7.32.0 || ^8.2.0 + eslint-plugin-import: ^2.25.2 + checksum: 10c0/93639d991654414756f82ad7860aac30b0dc6797277b7904ddb53ed88a32c470598696bbc6c503e066414024d305221974d3769e6642de65043bedf29cbbd30f + languageName: node + linkType: hard + +"eslint-config-prettier@npm:9.1.0": + version: 9.1.0 + resolution: "eslint-config-prettier@npm:9.1.0" + peerDependencies: + eslint: ">=7.0.0" + bin: + eslint-config-prettier: bin/cli.js + checksum: 10c0/6d332694b36bc9ac6fdb18d3ca2f6ac42afa2ad61f0493e89226950a7091e38981b66bac2b47ba39d15b73fff2cd32c78b850a9cf9eed9ca9a96bfb2f3a2f10d + languageName: node + linkType: hard + +"eslint-import-resolver-node@npm:^0.3.9": + version: 0.3.9 + resolution: "eslint-import-resolver-node@npm:0.3.9" + dependencies: + debug: "npm:^3.2.7" + is-core-module: "npm:^2.13.0" + resolve: "npm:^1.22.4" + checksum: 10c0/0ea8a24a72328a51fd95aa8f660dcca74c1429806737cf10261ab90cfcaaf62fd1eff664b76a44270868e0a932711a81b250053942595bcd00a93b1c1575dd61 + languageName: node + linkType: hard + +"eslint-import-resolver-typescript@npm:3.6.1": + version: 3.6.1 + resolution: "eslint-import-resolver-typescript@npm:3.6.1" + dependencies: + debug: "npm:^4.3.4" + enhanced-resolve: "npm:^5.12.0" + eslint-module-utils: "npm:^2.7.4" + fast-glob: "npm:^3.3.1" + get-tsconfig: "npm:^4.5.0" + is-core-module: "npm:^2.11.0" + is-glob: "npm:^4.0.3" + peerDependencies: + eslint: "*" + eslint-plugin-import: "*" + checksum: 10c0/cb1cb4389916fe78bf8c8567aae2f69243dbfe624bfe21078c56ad46fa1ebf0634fa7239dd3b2055ab5c27359e4b4c28b69b11fcb3a5df8a9e6f7add8e034d86 + languageName: node + linkType: hard + +"eslint-module-utils@npm:^2.7.4, eslint-module-utils@npm:^2.8.0": + version: 2.8.0 + resolution: "eslint-module-utils@npm:2.8.0" + dependencies: + debug: "npm:^3.2.7" + peerDependenciesMeta: + eslint: + optional: true + checksum: 10c0/c7a8d1a58d76ec8217a8fea49271ec8132d1b9390965a75f6a4ecbc9e5983d742195b46d2e4378231d2186801439fe1aa5700714b0bfd4eb17aac6e1b65309df + languageName: node + linkType: hard + +"eslint-plugin-import@npm:2.29.1": + version: 2.29.1 + resolution: "eslint-plugin-import@npm:2.29.1" + dependencies: + array-includes: "npm:^3.1.7" + array.prototype.findlastindex: "npm:^1.2.3" + array.prototype.flat: "npm:^1.3.2" + array.prototype.flatmap: "npm:^1.3.2" + debug: "npm:^3.2.7" + doctrine: "npm:^2.1.0" + eslint-import-resolver-node: "npm:^0.3.9" + eslint-module-utils: "npm:^2.8.0" + hasown: "npm:^2.0.0" + is-core-module: "npm:^2.13.1" + is-glob: "npm:^4.0.3" + minimatch: "npm:^3.1.2" + object.fromentries: "npm:^2.0.7" + object.groupby: "npm:^1.0.1" + object.values: "npm:^1.1.7" + semver: "npm:^6.3.1" + tsconfig-paths: "npm:^3.15.0" + peerDependencies: + eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 + checksum: 10c0/5f35dfbf4e8e67f741f396987de9504ad125c49f4144508a93282b4ea0127e052bde65ab6def1f31b6ace6d5d430be698333f75bdd7dca3bc14226c92a083196 + languageName: node + linkType: hard + +"eslint-plugin-mocha@npm:^10.1.0": + version: 10.1.0 + resolution: "eslint-plugin-mocha@npm:10.1.0" + dependencies: + eslint-utils: "npm:^3.0.0" + rambda: "npm:^7.1.0" + peerDependencies: + eslint: ">=7.0.0" + checksum: 10c0/0912bf04d7e61ce2e61ef8a3dc52bd05672b2e2e131cd42c60a08d33045891f89773ddb2344c7e115ebc34f2546a24b3bffb2a20a8b52ca3cee3f7bc3ecb4757 + languageName: node + linkType: hard + +"eslint-plugin-more@npm:^1.0.5": + version: 1.0.5 + resolution: "eslint-plugin-more@npm:1.0.5" + peerDependencies: + eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 + checksum: 10c0/ad7d39c43d49724f0d690558392170f4e4a1fd48f166f63713ae14627d40a3dc98c0333f608694a71f48c08b38f866ece5591cc5b6ad5d51cf5eb36aea55ff00 + languageName: node + linkType: hard + +"eslint-plugin-react-hooks@npm:^4.6.0": + version: 4.6.0 + resolution: "eslint-plugin-react-hooks@npm:4.6.0" + peerDependencies: + eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 + checksum: 10c0/58c7e10ea5792c33346fcf5cb4024e14837035ce412ff99c2dcb7c4f903dc9b17939078f80bfef826301ce326582c396c00e8e0ac9d10ac2cde2b42d33763c65 + languageName: node + linkType: hard + +"eslint-plugin-react@npm:7.33.2": + version: 7.33.2 + resolution: "eslint-plugin-react@npm:7.33.2" + dependencies: + array-includes: "npm:^3.1.6" + array.prototype.flatmap: "npm:^1.3.1" + array.prototype.tosorted: "npm:^1.1.1" + doctrine: "npm:^2.1.0" + es-iterator-helpers: "npm:^1.0.12" + estraverse: "npm:^5.3.0" + jsx-ast-utils: "npm:^2.4.1 || ^3.0.0" + minimatch: "npm:^3.1.2" + object.entries: "npm:^1.1.6" + object.fromentries: "npm:^2.0.6" + object.hasown: "npm:^1.1.2" + object.values: "npm:^1.1.6" + prop-types: "npm:^15.8.1" + resolve: "npm:^2.0.0-next.4" + semver: "npm:^6.3.1" + string.prototype.matchall: "npm:^4.0.8" + peerDependencies: + eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 + checksum: 10c0/f9b247861024bafc396c4bd3c9ac946604b3b23077251c98f23602aa22027a0c33a69157fd49564e4ff7f17b3678e5dc366a46c7ec42a09454d7cbce786d5001 + languageName: node + linkType: hard + +"eslint-scope@npm:5.1.1": + version: 5.1.1 + resolution: "eslint-scope@npm:5.1.1" + dependencies: + esrecurse: "npm:^4.3.0" + estraverse: "npm:^4.1.1" + checksum: 10c0/d30ef9dc1c1cbdece34db1539a4933fe3f9b14e1ffb27ecc85987902ee663ad7c9473bbd49a9a03195a373741e62e2f807c4938992e019b511993d163450e70a + languageName: node + linkType: hard + +"eslint-scope@npm:^7.2.2": + version: 7.2.2 + resolution: "eslint-scope@npm:7.2.2" + dependencies: + esrecurse: "npm:^4.3.0" + estraverse: "npm:^5.2.0" + checksum: 10c0/613c267aea34b5a6d6c00514e8545ef1f1433108097e857225fed40d397dd6b1809dffd11c2fde23b37ca53d7bf935fe04d2a18e6fc932b31837b6ad67e1c116 + languageName: node + linkType: hard + +"eslint-utils@npm:^3.0.0": + version: 3.0.0 + resolution: "eslint-utils@npm:3.0.0" + dependencies: + eslint-visitor-keys: "npm:^2.0.0" + peerDependencies: + eslint: ">=5" + checksum: 10c0/45aa2b63667a8d9b474c98c28af908d0a592bed1a4568f3145cd49fb5d9510f545327ec95561625290313fe126e6d7bdfe3fdbdb6f432689fab6b9497d3bfb52 + languageName: node + linkType: hard + +"eslint-visitor-keys@npm:^2.0.0": + version: 2.1.0 + resolution: "eslint-visitor-keys@npm:2.1.0" + checksum: 10c0/9f0e3a2db751d84067d15977ac4b4472efd6b303e369e6ff241a99feac04da758f46d5add022c33d06b53596038dbae4b4aceb27c7e68b8dfc1055b35e495787 + languageName: node + linkType: hard + +"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3": + version: 3.4.3 + resolution: "eslint-visitor-keys@npm:3.4.3" + checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820 + languageName: node + linkType: hard + +"eslint@npm:8.57.0": + version: 8.57.0 + resolution: "eslint@npm:8.57.0" + dependencies: + "@eslint-community/eslint-utils": "npm:^4.2.0" + "@eslint-community/regexpp": "npm:^4.6.1" + "@eslint/eslintrc": "npm:^2.1.4" + "@eslint/js": "npm:8.57.0" + "@humanwhocodes/config-array": "npm:^0.11.14" + "@humanwhocodes/module-importer": "npm:^1.0.1" + "@nodelib/fs.walk": "npm:^1.2.8" + "@ungap/structured-clone": "npm:^1.2.0" + ajv: "npm:^6.12.4" + chalk: "npm:^4.0.0" + cross-spawn: "npm:^7.0.2" + debug: "npm:^4.3.2" + doctrine: "npm:^3.0.0" + escape-string-regexp: "npm:^4.0.0" + eslint-scope: "npm:^7.2.2" + eslint-visitor-keys: "npm:^3.4.3" + espree: "npm:^9.6.1" + esquery: "npm:^1.4.2" + esutils: "npm:^2.0.2" + fast-deep-equal: "npm:^3.1.3" + file-entry-cache: "npm:^6.0.1" + find-up: "npm:^5.0.0" + glob-parent: "npm:^6.0.2" + globals: "npm:^13.19.0" + graphemer: "npm:^1.4.0" + ignore: "npm:^5.2.0" + imurmurhash: "npm:^0.1.4" + is-glob: "npm:^4.0.0" + is-path-inside: "npm:^3.0.3" + js-yaml: "npm:^4.1.0" + json-stable-stringify-without-jsonify: "npm:^1.0.1" + levn: "npm:^0.4.1" + lodash.merge: "npm:^4.6.2" + minimatch: "npm:^3.1.2" + natural-compare: "npm:^1.4.0" + optionator: "npm:^0.9.3" + strip-ansi: "npm:^6.0.1" + text-table: "npm:^0.2.0" + bin: + eslint: bin/eslint.js + checksum: 10c0/00bb96fd2471039a312435a6776fe1fd557c056755eaa2b96093ef3a8508c92c8775d5f754768be6b1dddd09fdd3379ddb231eeb9b6c579ee17ea7d68000a529 + languageName: node + linkType: hard + +"espree@npm:^9.0.0, espree@npm:^9.6.0, espree@npm:^9.6.1": + version: 9.6.1 + resolution: "espree@npm:9.6.1" + dependencies: + acorn: "npm:^8.9.0" + acorn-jsx: "npm:^5.3.2" + eslint-visitor-keys: "npm:^3.4.1" + checksum: 10c0/1a2e9b4699b715347f62330bcc76aee224390c28bb02b31a3752e9d07549c473f5f986720483c6469cf3cfb3c9d05df612ffc69eb1ee94b54b739e67de9bb460 + languageName: node + linkType: hard + +"esprima@npm:^4.0.1": + version: 4.0.1 + resolution: "esprima@npm:4.0.1" + bin: + esparse: ./bin/esparse.js + esvalidate: ./bin/esvalidate.js + checksum: 10c0/ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3 + languageName: node + linkType: hard + +"esquery@npm:^1.4.2": + version: 1.5.0 + resolution: "esquery@npm:1.5.0" + dependencies: + estraverse: "npm:^5.1.0" + checksum: 10c0/a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213 + languageName: node + linkType: hard + +"esrecurse@npm:^4.3.0": + version: 4.3.0 + resolution: "esrecurse@npm:4.3.0" + dependencies: + estraverse: "npm:^5.2.0" + checksum: 10c0/81a37116d1408ded88ada45b9fb16dbd26fba3aadc369ce50fcaf82a0bac12772ebd7b24cd7b91fc66786bf2c1ac7b5f196bc990a473efff972f5cb338877cf5 + languageName: node + linkType: hard + +"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0": + version: 4.3.0 + resolution: "estraverse@npm:4.3.0" + checksum: 10c0/9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d + languageName: node + linkType: hard + +"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0": + version: 5.3.0 + resolution: "estraverse@npm:5.3.0" + checksum: 10c0/1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107 + languageName: node + linkType: hard + +"esutils@npm:^2.0.2": + version: 2.0.3 + resolution: "esutils@npm:2.0.3" + checksum: 10c0/9a2fe69a41bfdade834ba7c42de4723c97ec776e40656919c62cbd13607c45e127a003f05f724a1ea55e5029a4cf2de444b13009f2af71271e42d93a637137c7 + languageName: node + linkType: hard + +"event-target-shim@npm:^5.0.0": + version: 5.0.1 + resolution: "event-target-shim@npm:5.0.1" + checksum: 10c0/0255d9f936215fd206156fd4caa9e8d35e62075d720dc7d847e89b417e5e62cf1ce6c9b4e0a1633a9256de0efefaf9f8d26924b1f3c8620cffb9db78e7d3076b + languageName: node + linkType: hard + +"eventemitter3@npm:^5.0.1": + version: 5.0.1 + resolution: "eventemitter3@npm:5.0.1" + checksum: 10c0/4ba5c00c506e6c786b4d6262cfbce90ddc14c10d4667e5c83ae993c9de88aa856033994dd2b35b83e8dc1170e224e66a319fa80adc4c32adcd2379bbc75da814 + languageName: node + linkType: hard + +"events@npm:^3.2.0, events@npm:^3.3.0": + version: 3.3.0 + resolution: "events@npm:3.3.0" + checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6 + languageName: node + linkType: hard + +"execa@npm:7.2.0": + version: 7.2.0 + resolution: "execa@npm:7.2.0" + dependencies: + cross-spawn: "npm:^7.0.3" + get-stream: "npm:^6.0.1" + human-signals: "npm:^4.3.0" + is-stream: "npm:^3.0.0" + merge-stream: "npm:^2.0.0" + npm-run-path: "npm:^5.1.0" + onetime: "npm:^6.0.0" + signal-exit: "npm:^3.0.7" + strip-final-newline: "npm:^3.0.0" + checksum: 10c0/098cd6a1bc26d509e5402c43f4971736450b84d058391820c6f237aeec6436963e006fd8423c9722f148c53da86aa50045929c7278b5522197dff802d10f9885 + languageName: node + linkType: hard + +"execa@npm:^4.0.0": + version: 4.1.0 + resolution: "execa@npm:4.1.0" + dependencies: + cross-spawn: "npm:^7.0.0" + get-stream: "npm:^5.0.0" + human-signals: "npm:^1.1.1" + is-stream: "npm:^2.0.0" + merge-stream: "npm:^2.0.0" + npm-run-path: "npm:^4.0.0" + onetime: "npm:^5.1.0" + signal-exit: "npm:^3.0.2" + strip-final-newline: "npm:^2.0.0" + checksum: 10c0/02211601bb1c52710260edcc68fb84c3c030dc68bafc697c90ada3c52cc31375337de8c24826015b8382a58d63569ffd203b79c94fef217d65503e3e8d2c52ba + languageName: node + linkType: hard + +"execa@npm:^5.0.0": + version: 5.1.1 + resolution: "execa@npm:5.1.1" + dependencies: + cross-spawn: "npm:^7.0.3" + get-stream: "npm:^6.0.0" + human-signals: "npm:^2.1.0" + is-stream: "npm:^2.0.0" + merge-stream: "npm:^2.0.0" + npm-run-path: "npm:^4.0.1" + onetime: "npm:^5.1.2" + signal-exit: "npm:^3.0.3" + strip-final-newline: "npm:^2.0.0" + checksum: 10c0/c8e615235e8de4c5addf2fa4c3da3e3aa59ce975a3e83533b4f6a71750fb816a2e79610dc5f1799b6e28976c9ae86747a36a606655bf8cb414a74d8d507b304f + languageName: node + linkType: hard + +"exeunt@npm:1.1.0": + version: 1.1.0 + resolution: "exeunt@npm:1.1.0" + checksum: 10c0/dc2012d9016c01ec321e4d642d2f165ce7dc4a4d141c523a818416035bcfe11bd1d9abc142f6f608d6a7719824295131a1b8c89006eb308aafd3aba385bf40d2 + languageName: node + linkType: hard + +"exponential-backoff@npm:^3.1.1": + version: 3.1.1 + resolution: "exponential-backoff@npm:3.1.1" + checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579 + languageName: node + linkType: hard + +"extract-zip@npm:^2.0.1": + version: 2.0.1 + resolution: "extract-zip@npm:2.0.1" + dependencies: + "@types/yauzl": "npm:^2.9.1" + debug: "npm:^4.1.1" + get-stream: "npm:^5.1.0" + yauzl: "npm:^2.10.0" + dependenciesMeta: + "@types/yauzl": + optional: true + bin: + extract-zip: cli.js + checksum: 10c0/9afbd46854aa15a857ae0341a63a92743a7b89c8779102c3b4ffc207516b2019337353962309f85c66ee3d9092202a83cdc26dbf449a11981272038443974aee + languageName: node + linkType: hard + +"extsprintf@npm:^1.2.0": + version: 1.4.1 + resolution: "extsprintf@npm:1.4.1" + checksum: 10c0/e10e2769985d0e9b6c7199b053a9957589d02e84de42832c295798cb422a025e6d4a92e0259c1fb4d07090f5bfde6b55fd9f880ac5855bd61d775f8ab75a7ab0 + languageName: node + linkType: hard + +"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": + version: 3.1.3 + resolution: "fast-deep-equal@npm:3.1.3" + checksum: 10c0/40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0 + languageName: node + linkType: hard + +"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.1": + version: 3.3.1 + resolution: "fast-glob@npm:3.3.1" + dependencies: + "@nodelib/fs.stat": "npm:^2.0.2" + "@nodelib/fs.walk": "npm:^1.2.3" + glob-parent: "npm:^5.1.2" + merge2: "npm:^1.3.0" + micromatch: "npm:^4.0.4" + checksum: 10c0/b68431128fb6ce4b804c5f9622628426d990b66c75b21c0d16e3d80e2d1398bf33f7e1724e66a2e3f299285dcf5b8d745b122d0304e7dd66f5231081f33ec67c + languageName: node + linkType: hard + +"fast-json-stable-stringify@npm:^2.0.0": + version: 2.1.0 + resolution: "fast-json-stable-stringify@npm:2.1.0" + checksum: 10c0/7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b + languageName: node + linkType: hard + +"fast-levenshtein@npm:^2.0.6, fast-levenshtein@npm:~2.0.6": + version: 2.0.6 + resolution: "fast-levenshtein@npm:2.0.6" + checksum: 10c0/111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4 + languageName: node + linkType: hard + +"fast-loops@npm:^1.1.3": + version: 1.1.3 + resolution: "fast-loops@npm:1.1.3" + checksum: 10c0/ba71c001704c44a617053ed34b1a8c0d2ed9723022eb7b93c98299d9862f93213609b32c9daec7d606625ab318769d11da8bb06e9ddd9c28e3bda1249fb6e36d + languageName: node + linkType: hard + +"fast-shallow-equal@npm:^1.0.0": + version: 1.0.0 + resolution: "fast-shallow-equal@npm:1.0.0" + checksum: 10c0/526c393c011ab5a0ca5a36c5ea25c9730acd027503ccbec6c7825397ab9375f51f67f14c8829b4c4b1ccccede695391dd14863a15e40a37fc4af08c1440a1b66 + languageName: node + linkType: hard + +"fastest-levenshtein@npm:^1.0.12": + version: 1.0.16 + resolution: "fastest-levenshtein@npm:1.0.16" + checksum: 10c0/7e3d8ae812a7f4fdf8cad18e9cde436a39addf266a5986f653ea0d81e0de0900f50c0f27c6d5aff3f686bcb48acbd45be115ae2216f36a6a13a7dbbf5cad878b + languageName: node + linkType: hard + +"fastest-stable-stringify@npm:^2.0.2": + version: 2.0.2 + resolution: "fastest-stable-stringify@npm:2.0.2" + checksum: 10c0/abbe5ff48f13f5819e7312dbb38bae5d9960694cffd315b464df9adcd02a8fa7e9eec32c314655674c7134905c544b7a0c14b05bfbe30b3f678609bebc9fecb9 + languageName: node + linkType: hard + +"fastq@npm:^1.6.0": + version: 1.15.0 + resolution: "fastq@npm:1.15.0" + dependencies: + reusify: "npm:^1.0.4" + checksum: 10c0/5ce4f83afa5f88c9379e67906b4d31bc7694a30826d6cc8d0f0473c966929017fda65c2174b0ec89f064ede6ace6c67f8a4fe04cef42119b6a55b0d465554c24 + languageName: node + linkType: hard + +"fd-slicer@npm:~1.1.0": + version: 1.1.0 + resolution: "fd-slicer@npm:1.1.0" + dependencies: + pend: "npm:~1.2.0" + checksum: 10c0/304dd70270298e3ffe3bcc05e6f7ade2511acc278bc52d025f8918b48b6aa3b77f10361bddfadfe2a28163f7af7adbdce96f4d22c31b2f648ba2901f0c5fc20e + languageName: node + linkType: hard + +"fetch@npm:^1.1.0": + version: 1.1.0 + resolution: "fetch@npm:1.1.0" + dependencies: + biskviit: "npm:1.0.1" + encoding: "npm:0.1.12" + checksum: 10c0/52689b6eb1dd5e8f6b8554a57dfb6e061fc0326d312c8a1296265bb8e7a8c022bc497e7d3e58f223ed36448a11b55f085156afb193e2b1da6231f328c26a8b3a + languageName: node + linkType: hard + +"file-entry-cache@npm:^6.0.1": + version: 6.0.1 + resolution: "file-entry-cache@npm:6.0.1" + dependencies: + flat-cache: "npm:^3.0.4" + checksum: 10c0/58473e8a82794d01b38e5e435f6feaf648e3f36fdb3a56e98f417f4efae71ad1c0d4ebd8a9a7c50c3ad085820a93fc7494ad721e0e4ebc1da3573f4e1c3c7cdd + languageName: node + linkType: hard + +"file-type@npm:^10.10.0": + version: 10.11.0 + resolution: "file-type@npm:10.11.0" + checksum: 10c0/2d6280d84f2499878ebdf8236a6e83b3c747f08b91d84cf99785afe3c9ac52775e52dcec15a4141cc24eb3006f274eb46dc7d13395920a1763d936c6d6e8afde + languageName: node + linkType: hard + +"file-uri-to-path@npm:1.0.0": + version: 1.0.0 + resolution: "file-uri-to-path@npm:1.0.0" + checksum: 10c0/3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519 + languageName: node + linkType: hard + +"filelist@npm:^1.0.4": + version: 1.0.4 + resolution: "filelist@npm:1.0.4" + dependencies: + minimatch: "npm:^5.0.1" + checksum: 10c0/426b1de3944a3d153b053f1c0ebfd02dccd0308a4f9e832ad220707a6d1f1b3c9784d6cadf6b2f68f09a57565f63ebc7bcdc913ccf8012d834f472c46e596f41 + languageName: node + linkType: hard + +"filesize@npm:3.6.1": + version: 3.6.1 + resolution: "filesize@npm:3.6.1" + checksum: 10c0/7b900b488c914d4b9146ddaf2865c410687977cf62c627760ff3c47dce4a00a53523658f40c9023bba8894d2e4841bc913af280472c2bb5aec29bc342eb33b6f + languageName: node + linkType: hard + +"fill-range@npm:^7.0.1": + version: 7.0.1 + resolution: "fill-range@npm:7.0.1" + dependencies: + to-regex-range: "npm:^5.0.1" + checksum: 10c0/7cdad7d426ffbaadf45aeb5d15ec675bbd77f7597ad5399e3d2766987ed20bda24d5fac64b3ee79d93276f5865608bb22344a26b9b1ae6c4d00bd94bf611623f + languageName: node + linkType: hard + +"find-up@npm:5.0.0, find-up@npm:^5.0.0": + version: 5.0.0 + resolution: "find-up@npm:5.0.0" + dependencies: + locate-path: "npm:^6.0.0" + path-exists: "npm:^4.0.0" + checksum: 10c0/062c5a83a9c02f53cdd6d175a37ecf8f87ea5bbff1fdfb828f04bfa021441bc7583e8ebc0872a4c1baab96221fb8a8a275a19809fb93fbc40bd69ec35634069a + languageName: node + linkType: hard + +"find-up@npm:^4.0.0, find-up@npm:^4.1.0": + version: 4.1.0 + resolution: "find-up@npm:4.1.0" + dependencies: + locate-path: "npm:^5.0.0" + path-exists: "npm:^4.0.0" + checksum: 10c0/0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1 + languageName: node + linkType: hard + +"find-yarn-workspace-root@npm:^2.0.0": + version: 2.0.0 + resolution: "find-yarn-workspace-root@npm:2.0.0" + dependencies: + micromatch: "npm:^4.0.2" + checksum: 10c0/b0d3843013fbdaf4e57140e0165889d09fa61745c9e85da2af86e54974f4cc9f1967e40f0d8fc36a79d53091f0829c651d06607d552582e53976f3cd8f4e5689 + languageName: node + linkType: hard + +"firstline@npm:1.2.1": + version: 1.2.1 + resolution: "firstline@npm:1.2.1" + checksum: 10c0/cb6cb3b13852c7363dc216a0e1a0e10bb80842fb3a186d0caa8645c2772d03dcbf02ed33e6ce09b005ad61cf18d8f9707c644a12866b9fddfe7f01bcc28293df + languageName: node + linkType: hard + +"flat-cache@npm:^3.0.4": + version: 3.1.0 + resolution: "flat-cache@npm:3.1.0" + dependencies: + flatted: "npm:^3.2.7" + keyv: "npm:^4.5.3" + rimraf: "npm:^3.0.2" + checksum: 10c0/fcbf70a2a7d8664ef8f94e25d8b4a05d0594aee8ba0b53b5b7f6287877e8e5080ae893fc4a71fb3d803c7659aeaf801d49f12183b954e21ecd98a1d74012167e + languageName: node + linkType: hard + +"flat@npm:^5.0.2": + version: 5.0.2 + resolution: "flat@npm:5.0.2" + bin: + flat: cli.js + checksum: 10c0/f178b13482f0cd80c7fede05f4d10585b1f2fdebf26e12edc138e32d3150c6ea6482b7f12813a1091143bad52bb6d3596bca51a162257a21163c0ff438baa5fe + languageName: node + linkType: hard + +"flatted@npm:^3.2.7": + version: 3.2.7 + resolution: "flatted@npm:3.2.7" + checksum: 10c0/207a87c7abfc1ea6928ea16bac84f9eaa6d44d365620ece419e5c41cf44a5e9902b4c1f59c9605771b10e4565a0cb46e99d78e0464e8aabb42c97de880642257 + languageName: node + linkType: hard + +"follow-redirects@npm:^1.15.6": + version: 1.15.6 + resolution: "follow-redirects@npm:1.15.6" + peerDependenciesMeta: + debug: + optional: true + checksum: 10c0/9ff767f0d7be6aa6870c82ac79cf0368cd73e01bbc00e9eb1c2a16fbb198ec105e3c9b6628bb98e9f3ac66fe29a957b9645bcb9a490bb7aa0d35f908b6b85071 + languageName: node + linkType: hard + +"for-each@npm:^0.3.3": + version: 0.3.3 + resolution: "for-each@npm:0.3.3" + dependencies: + is-callable: "npm:^1.1.3" + checksum: 10c0/22330d8a2db728dbf003ec9182c2d421fbcd2969b02b4f97ec288721cda63eb28f2c08585ddccd0f77cb2930af8d958005c9e72f47141dc51816127a118f39aa + languageName: node + linkType: hard + +"foreground-child@npm:^3.1.0": + version: 3.1.1 + resolution: "foreground-child@npm:3.1.1" + dependencies: + cross-spawn: "npm:^7.0.0" + signal-exit: "npm:^4.0.1" + checksum: 10c0/9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0 + languageName: node + linkType: hard + +"form-data@npm:^3.0.0": + version: 3.0.1 + resolution: "form-data@npm:3.0.1" + dependencies: + asynckit: "npm:^0.4.0" + combined-stream: "npm:^1.0.8" + mime-types: "npm:^2.1.12" + checksum: 10c0/1ccc3ae064a080a799923f754d49fcebdd90515a8924f0f54de557540b50e7f1fe48ba5f2bd0435a5664aa2d49729107e6aaf2155a9abf52339474c5638b4485 + languageName: node + linkType: hard + +"form-data@npm:^4.0.0": + version: 4.0.0 + resolution: "form-data@npm:4.0.0" + dependencies: + asynckit: "npm:^0.4.0" + combined-stream: "npm:^1.0.8" + mime-types: "npm:^2.1.12" + checksum: 10c0/cb6f3ac49180be03ff07ba3ff125f9eba2ff0b277fb33c7fc47569fc5e616882c5b1c69b9904c4c4187e97dd0419dd03b134174756f296dec62041e6527e2c6e + languageName: node + linkType: hard + +"fs-extra@npm:9.0.0": + version: 9.0.0 + resolution: "fs-extra@npm:9.0.0" + dependencies: + at-least-node: "npm:^1.0.0" + graceful-fs: "npm:^4.2.0" + jsonfile: "npm:^6.0.1" + universalify: "npm:^1.0.0" + checksum: 10c0/c7f8903b5939a585d16c064142929a9ad12d63084009a198da37bd2c49095b938c8f9a88f8378235dafd5312354b6e872c0181f97f820095fb3539c9d5fe6cd0 + languageName: node + linkType: hard + +"fs-extra@npm:^10.0.0, fs-extra@npm:^10.1.0": + version: 10.1.0 + resolution: "fs-extra@npm:10.1.0" + dependencies: + graceful-fs: "npm:^4.2.0" + jsonfile: "npm:^6.0.1" + universalify: "npm:^2.0.0" + checksum: 10c0/5f579466e7109719d162a9249abbeffe7f426eb133ea486e020b89bc6d67a741134076bf439983f2eb79276ceaf6bd7b7c1e43c3fd67fe889863e69072fb0a5e + languageName: node + linkType: hard + +"fs-extra@npm:^11.0.0": + version: 11.1.1 + resolution: "fs-extra@npm:11.1.1" + dependencies: + graceful-fs: "npm:^4.2.0" + jsonfile: "npm:^6.0.1" + universalify: "npm:^2.0.0" + checksum: 10c0/a2480243d7dcfa7d723c5f5b24cf4eba02a6ccece208f1524a2fbde1c629492cfb9a59e4b6d04faff6fbdf71db9fdc8ef7f396417a02884195a625f5d8dc9427 + languageName: node + linkType: hard + +"fs-extra@npm:^8.1.0": + version: 8.1.0 + resolution: "fs-extra@npm:8.1.0" + dependencies: + graceful-fs: "npm:^4.2.0" + jsonfile: "npm:^4.0.0" + universalify: "npm:^0.1.0" + checksum: 10c0/259f7b814d9e50d686899550c4f9ded85c46c643f7fe19be69504888e007fcbc08f306fae8ec495b8b998635e997c9e3e175ff2eeed230524ef1c1684cc96423 + languageName: node + linkType: hard + +"fs-extra@npm:^9.0.0, fs-extra@npm:^9.0.1": + version: 9.1.0 + resolution: "fs-extra@npm:9.1.0" + dependencies: + at-least-node: "npm:^1.0.0" + graceful-fs: "npm:^4.2.0" + jsonfile: "npm:^6.0.1" + universalify: "npm:^2.0.0" + checksum: 10c0/9b808bd884beff5cb940773018179a6b94a966381d005479f00adda6b44e5e3d4abf765135773d849cc27efe68c349e4a7b86acd7d3306d5932c14f3a4b17a92 + languageName: node + linkType: hard + +"fs-minipass@npm:^2.0.0": + version: 2.1.0 + resolution: "fs-minipass@npm:2.1.0" + dependencies: + minipass: "npm:^3.0.0" + checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004 + languageName: node + linkType: hard + +"fs-minipass@npm:^3.0.0": + version: 3.0.3 + resolution: "fs-minipass@npm:3.0.3" + dependencies: + minipass: "npm:^7.0.3" + checksum: 10c0/63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94 + languageName: node + linkType: hard + +"fs.realpath@npm:^1.0.0": + version: 1.0.0 + resolution: "fs.realpath@npm:1.0.0" + checksum: 10c0/444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948 + languageName: node + linkType: hard + +"fsevents@npm:~2.3.2": + version: 2.3.3 + resolution: "fsevents@npm:2.3.3" + dependencies: + node-gyp: "npm:latest" + checksum: 10c0/a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60 + conditions: os=darwin + languageName: node + linkType: hard + +"fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": + version: 2.3.3 + resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" + dependencies: + node-gyp: "npm:latest" + conditions: os=darwin + languageName: node + linkType: hard + +"function-bind@npm:^1.1.1": + version: 1.1.1 + resolution: "function-bind@npm:1.1.1" + checksum: 10c0/60b74b2407e1942e1ed7f8c284f8ef714d0689dcfce5319985a5b7da3fc727f40b4a59ec72dc55aa83365ad7b8fa4fac3a30d93c850a2b452f29ae03dbc10a1e + languageName: node + linkType: hard + +"function-bind@npm:^1.1.2": + version: 1.1.2 + resolution: "function-bind@npm:1.1.2" + checksum: 10c0/d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5 + languageName: node + linkType: hard + +"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6": + version: 1.1.6 + resolution: "function.prototype.name@npm:1.1.6" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + functions-have-names: "npm:^1.2.3" + checksum: 10c0/9eae11294905b62cb16874adb4fc687927cda3162285e0ad9612e6a1d04934005d46907362ea9cdb7428edce05a2f2c3dabc3b2d21e9fd343e9bb278230ad94b + languageName: node + linkType: hard + +"functions-have-names@npm:^1.2.3": + version: 1.2.3 + resolution: "functions-have-names@npm:1.2.3" + checksum: 10c0/33e77fd29bddc2d9bb78ab3eb854c165909201f88c75faa8272e35899e2d35a8a642a15e7420ef945e1f64a9670d6aa3ec744106b2aa42be68ca5114025954ca + languageName: node + linkType: hard + +"gauge@npm:^4.0.3": + version: 4.0.4 + resolution: "gauge@npm:4.0.4" + dependencies: + aproba: "npm:^1.0.3 || ^2.0.0" + color-support: "npm:^1.1.3" + console-control-strings: "npm:^1.1.0" + has-unicode: "npm:^2.0.1" + signal-exit: "npm:^3.0.7" + string-width: "npm:^4.2.3" + strip-ansi: "npm:^6.0.1" + wide-align: "npm:^1.1.5" + checksum: 10c0/ef10d7981113d69225135f994c9f8c4369d945e64a8fc721d655a3a38421b738c9fe899951721d1b47b73c41fdb5404ac87cc8903b2ecbed95d2800363e7e58c + languageName: node + linkType: hard + +"get-caller-file@npm:^2.0.5": + version: 2.0.5 + resolution: "get-caller-file@npm:2.0.5" + checksum: 10c0/c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde + languageName: node + linkType: hard + +"get-func-name@npm:^2.0.0": + version: 2.0.0 + resolution: "get-func-name@npm:2.0.0" + checksum: 10c0/ed8791f7ba92cfd747259dff7ec8b6cc42734cebd031fb58c99a6e71d24d3532d84b46ad7806cafad6ad21784dd04ae1808a002d2b21001425e21f5f394c34e7 + languageName: node + linkType: hard + +"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1": + version: 1.2.1 + resolution: "get-intrinsic@npm:1.2.1" + dependencies: + function-bind: "npm:^1.1.1" + has: "npm:^1.0.3" + has-proto: "npm:^1.0.1" + has-symbols: "npm:^1.0.3" + checksum: 10c0/49eab47f9de8f1a4f9b458b8b74ee5199fb2614414a91973eb175e07db56b52b6df49b255cc7ff704cb0786490fb93bfe8f2ad138b590a8de09b47116a366bc9 + languageName: node + linkType: hard + +"get-intrinsic@npm:^1.2.2, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4": + version: 1.2.4 + resolution: "get-intrinsic@npm:1.2.4" + dependencies: + es-errors: "npm:^1.3.0" + function-bind: "npm:^1.1.2" + has-proto: "npm:^1.0.1" + has-symbols: "npm:^1.0.3" + hasown: "npm:^2.0.0" + checksum: 10c0/0a9b82c16696ed6da5e39b1267104475c47e3a9bdbe8b509dfe1710946e38a87be70d759f4bb3cda042d76a41ef47fe769660f3b7c0d1f68750299344ffb15b7 + languageName: node + linkType: hard + +"get-stream@npm:^5.0.0, get-stream@npm:^5.1.0": + version: 5.2.0 + resolution: "get-stream@npm:5.2.0" + dependencies: + pump: "npm:^3.0.0" + checksum: 10c0/43797ffd815fbb26685bf188c8cfebecb8af87b3925091dd7b9a9c915993293d78e3c9e1bce125928ff92f2d0796f3889b92b5ec6d58d1041b574682132e0a80 + languageName: node + linkType: hard + +"get-stream@npm:^6.0.0, get-stream@npm:^6.0.1": + version: 6.0.1 + resolution: "get-stream@npm:6.0.1" + checksum: 10c0/49825d57d3fd6964228e6200a58169464b8e8970489b3acdc24906c782fb7f01f9f56f8e6653c4a50713771d6658f7cfe051e5eb8c12e334138c9c918b296341 + languageName: node + linkType: hard + +"get-symbol-description@npm:^1.0.0": + version: 1.0.0 + resolution: "get-symbol-description@npm:1.0.0" + dependencies: + call-bind: "npm:^1.0.2" + get-intrinsic: "npm:^1.1.1" + checksum: 10c0/23bc3b44c221cdf7669a88230c62f4b9e30393b61eb21ba4400cb3e346801bd8f95fe4330ee78dbae37aecd874646d53e3e76a17a654d0c84c77f6690526d6bb + languageName: node + linkType: hard + +"get-symbol-description@npm:^1.0.2": + version: 1.0.2 + resolution: "get-symbol-description@npm:1.0.2" + dependencies: + call-bind: "npm:^1.0.5" + es-errors: "npm:^1.3.0" + get-intrinsic: "npm:^1.2.4" + checksum: 10c0/867be6d63f5e0eb026cb3b0ef695ec9ecf9310febb041072d2e142f260bd91ced9eeb426b3af98791d1064e324e653424afa6fd1af17dee373bea48ae03162bc + languageName: node + linkType: hard + +"get-tsconfig@npm:^4.5.0": + version: 4.7.0 + resolution: "get-tsconfig@npm:4.7.0" + dependencies: + resolve-pkg-maps: "npm:^1.0.0" + checksum: 10c0/5844d18a705535808cf535010d9443b47b462c6e91ed00d94500602f220ecb8e518325d5b1f9e0c515c67025819c3df193194144a456e1d8f1cd70b5d48b52aa + languageName: node + linkType: hard + +"git-raw-commits@npm:^2.0.11": + version: 2.0.11 + resolution: "git-raw-commits@npm:2.0.11" + dependencies: + dargs: "npm:^7.0.0" + lodash: "npm:^4.17.15" + meow: "npm:^8.0.0" + split2: "npm:^3.0.0" + through2: "npm:^4.0.0" + bin: + git-raw-commits: cli.js + checksum: 10c0/c9cee7ce11a6703098f028d7e47986d5d3e4147d66640086734d6ee2472296b8711f91b40ad458e95acac1bc33cf2898059f1dc890f91220ff89c5fcc609ab64 + languageName: node + linkType: hard + +"glob-parent@npm:^6.0.1": + version: 6.0.2 + resolution: "glob-parent@npm:6.0.2" + dependencies: + is-glob: "npm:^4.0.3" + checksum: 10c0/317034d88654730230b3f43bb7ad4f7c90257a426e872ea0bf157473ac61c99bf5d205fad8f0185f989be8d2fa6d3c7dce1645d99d545b6ea9089c39f838e7f8 + languageName: node + linkType: hard + +"glob-to-regexp@npm:^0.4.1": + version: 0.4.1 + resolution: "glob-to-regexp@npm:0.4.1" + checksum: 10c0/0486925072d7a916f052842772b61c3e86247f0a80cc0deb9b5a3e8a1a9faad5b04fb6f58986a09f34d3e96cd2a22a24b7e9882fb1cf904c31e9a310de96c429 + languageName: node + linkType: hard + +"glob@npm:10.3.10": + version: 10.3.10 + resolution: "glob@npm:10.3.10" + dependencies: + foreground-child: "npm:^3.1.0" + jackspeak: "npm:^2.3.5" + minimatch: "npm:^9.0.1" + minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry: "npm:^1.10.1" + bin: + glob: dist/esm/bin.mjs + checksum: 10c0/13d8a1feb7eac7945f8c8480e11cd4a44b24d26503d99a8d8ac8d5aefbf3e9802a2b6087318a829fad04cb4e829f25c5f4f1110c68966c498720dd261c7e344d + languageName: node + linkType: hard + +"glob@npm:7.2.0": + version: 7.2.0 + resolution: "glob@npm:7.2.0" + dependencies: + fs.realpath: "npm:^1.0.0" + inflight: "npm:^1.0.4" + inherits: "npm:2" + minimatch: "npm:^3.0.4" + once: "npm:^1.3.0" + path-is-absolute: "npm:^1.0.0" + checksum: 10c0/478b40e38be5a3d514e64950e1e07e0ac120585add6a37c98d0ed24d72d9127d734d2a125786073c8deb687096e84ae82b641c441a869ada3a9cc91b68978632 + languageName: node + linkType: hard + +"glob@npm:^10.2.2, glob@npm:^10.3.10": + version: 10.3.15 + resolution: "glob@npm:10.3.15" + dependencies: + foreground-child: "npm:^3.1.0" + jackspeak: "npm:^2.3.6" + minimatch: "npm:^9.0.1" + minipass: "npm:^7.0.4" + path-scurry: "npm:^1.11.0" + bin: + glob: dist/esm/bin.mjs + checksum: 10c0/cda748ddc181b31b3df9548c0991800406d5cc3b3f8110e37a8751ec1e39f37cdae7d7782d5422d7df92775121cdf00599992dff22f7ff1260344843af227c2b + languageName: node + linkType: hard + +"glob@npm:^6.0.1": + version: 6.0.4 + resolution: "glob@npm:6.0.4" + dependencies: + inflight: "npm:^1.0.4" + inherits: "npm:2" + minimatch: "npm:2 || 3" + once: "npm:^1.3.0" + path-is-absolute: "npm:^1.0.0" + checksum: 10c0/520146ebce0f4594b8357338f86281b38ee14214debce398a2902176a28f18e0f98911ea48516d85022de64fbbaa57f074aa13715d1daa5d70e21b82cea22183 + languageName: node + linkType: hard + +"glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.6": + version: 7.2.3 + resolution: "glob@npm:7.2.3" + dependencies: + fs.realpath: "npm:^1.0.0" + inflight: "npm:^1.0.4" + inherits: "npm:2" + minimatch: "npm:^3.1.1" + once: "npm:^1.3.0" + path-is-absolute: "npm:^1.0.0" + checksum: 10c0/65676153e2b0c9095100fe7f25a778bf45608eeb32c6048cf307f579649bcc30353277b3b898a3792602c65764e5baa4f643714dfbdfd64ea271d210c7a425fe + languageName: node + linkType: hard + +"glob@npm:^8.0.0": + version: 8.1.0 + resolution: "glob@npm:8.1.0" + dependencies: + fs.realpath: "npm:^1.0.0" + inflight: "npm:^1.0.4" + inherits: "npm:2" + minimatch: "npm:^5.0.1" + once: "npm:^1.3.0" + checksum: 10c0/cb0b5cab17a59c57299376abe5646c7070f8acb89df5595b492dba3bfb43d301a46c01e5695f01154e6553168207cb60d4eaf07d3be4bc3eb9b0457c5c561d0f + languageName: node + linkType: hard + +"global-agent@npm:^3.0.0": + version: 3.0.0 + resolution: "global-agent@npm:3.0.0" + dependencies: + boolean: "npm:^3.0.1" + es6-error: "npm:^4.1.1" + matcher: "npm:^3.0.0" + roarr: "npm:^2.15.3" + semver: "npm:^7.3.2" + serialize-error: "npm:^7.0.1" + checksum: 10c0/bb8750d026b25da437072762fd739098bad92ff72f66483c3929db4579e072f5523960f7e7fd70ee0d75db48898067b5dc1c9c1d17888128cff008fcc34d1bd3 + languageName: node + linkType: hard + +"global-dirs@npm:^0.1.1": + version: 0.1.1 + resolution: "global-dirs@npm:0.1.1" + dependencies: + ini: "npm:^1.3.4" + checksum: 10c0/3608072e58962396c124ad5a1cfb3f99ee76c998654a3432d82977b3c3eeb09dc8a5a2a9849b2b8113906c8d0aad89ce362c22e97cec5fe34405bbf4f3cdbe7a + languageName: node + linkType: hard + +"global-dirs@npm:^3.0.0": + version: 3.0.1 + resolution: "global-dirs@npm:3.0.1" + dependencies: + ini: "npm:2.0.0" + checksum: 10c0/ef65e2241a47ff978f7006a641302bc7f4c03dfb98783d42bf7224c136e3a06df046e70ee3a010cf30214114755e46c9eb5eb1513838812fbbe0d92b14c25080 + languageName: node + linkType: hard + +"globals@npm:^11.1.0": + version: 11.12.0 + resolution: "globals@npm:11.12.0" + checksum: 10c0/758f9f258e7b19226bd8d4af5d3b0dcf7038780fb23d82e6f98932c44e239f884847f1766e8fa9cc5635ccb3204f7fa7314d4408dd4002a5e8ea827b4018f0a1 + languageName: node + linkType: hard + +"globals@npm:^13.19.0": + version: 13.21.0 + resolution: "globals@npm:13.21.0" + dependencies: + type-fest: "npm:^0.20.2" + checksum: 10c0/90573e825401adbe0ef25db1b52e8f74afe4a1087049edd972f1ace77b391753fc3fe51eba9b6962c62e2282645f0a27ce20251662cdc247631c4861f32d56eb + languageName: node + linkType: hard + +"globalthis@npm:^1.0.1, globalthis@npm:^1.0.3": + version: 1.0.3 + resolution: "globalthis@npm:1.0.3" + dependencies: + define-properties: "npm:^1.1.3" + checksum: 10c0/0db6e9af102a5254630351557ac15e6909bc7459d3e3f6b001e59fe784c96d31108818f032d9095739355a88467459e6488ff16584ee6250cd8c27dec05af4b0 + languageName: node + linkType: hard + +"globby@npm:^11.1.0": + version: 11.1.0 + resolution: "globby@npm:11.1.0" + dependencies: + array-union: "npm:^2.1.0" + dir-glob: "npm:^3.0.1" + fast-glob: "npm:^3.2.9" + ignore: "npm:^5.2.0" + merge2: "npm:^1.4.1" + slash: "npm:^3.0.0" + checksum: 10c0/b39511b4afe4bd8a7aead3a27c4ade2b9968649abab0a6c28b1a90141b96ca68ca5db1302f7c7bd29eab66bf51e13916b8e0a3d0ac08f75e1e84a39b35691189 + languageName: node + linkType: hard + +"gopd@npm:^1.0.1": + version: 1.0.1 + resolution: "gopd@npm:1.0.1" + dependencies: + get-intrinsic: "npm:^1.1.3" + checksum: 10c0/505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63 + languageName: node + linkType: hard + +"got@npm:^11.8.5": + version: 11.8.6 + resolution: "got@npm:11.8.6" + dependencies: + "@sindresorhus/is": "npm:^4.0.0" + "@szmarczak/http-timer": "npm:^4.0.5" + "@types/cacheable-request": "npm:^6.0.1" + "@types/responselike": "npm:^1.0.0" + cacheable-lookup: "npm:^5.0.3" + cacheable-request: "npm:^7.0.2" + decompress-response: "npm:^6.0.0" + http2-wrapper: "npm:^1.0.0-beta.5.2" + lowercase-keys: "npm:^2.0.0" + p-cancelable: "npm:^2.0.0" + responselike: "npm:^2.0.0" + checksum: 10c0/754dd44877e5cf6183f1e989ff01c648d9a4719e357457bd4c78943911168881f1cfb7b2cb15d885e2105b3ad313adb8f017a67265dd7ade771afdb261ee8cb1 + languageName: node + linkType: hard + +"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": + version: 4.2.11 + resolution: "graceful-fs@npm:4.2.11" + checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 + languageName: node + linkType: hard + +"graceful-readlink@npm:>= 1.0.0": + version: 1.0.1 + resolution: "graceful-readlink@npm:1.0.1" + checksum: 10c0/c53e703257e77f8a4495ff0d476c09aa413251acd26684f4544771b15e0ad361d1075b8f6d27b52af6942ea58155a9bbdb8125d717c70df27117460fee295a54 + languageName: node + linkType: hard + +"graphemer@npm:^1.4.0": + version: 1.4.0 + resolution: "graphemer@npm:1.4.0" + checksum: 10c0/e951259d8cd2e0d196c72ec711add7115d42eb9a8146c8eeda5b8d3ac91e5dd816b9cd68920726d9fd4490368e7ed86e9c423f40db87e2d8dfafa00fa17c3a31 + languageName: node + linkType: hard + +"hard-rejection@npm:^2.1.0": + version: 2.1.0 + resolution: "hard-rejection@npm:2.1.0" + checksum: 10c0/febc3343a1ad575aedcc112580835b44a89a89e01f400b4eda6e8110869edfdab0b00cd1bd4c3bfec9475a57e79e0b355aecd5be46454b6a62b9a359af60e564 + languageName: node + linkType: hard + +"has-ansi@npm:^2.0.0": + version: 2.0.0 + resolution: "has-ansi@npm:2.0.0" + dependencies: + ansi-regex: "npm:^2.0.0" + checksum: 10c0/f54e4887b9f8f3c4bfefd649c48825b3c093987c92c27880ee9898539e6f01aed261e82e73153c3f920fde0db5bf6ebd58deb498ed1debabcb4bc40113ccdf05 + languageName: node + linkType: hard + +"has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2": + version: 1.0.2 + resolution: "has-bigints@npm:1.0.2" + checksum: 10c0/724eb1485bfa3cdff6f18d95130aa190561f00b3fcf9f19dc640baf8176b5917c143b81ec2123f8cddb6c05164a198c94b13e1377c497705ccc8e1a80306e83b + languageName: node + linkType: hard + +"has-flag@npm:^3.0.0": + version: 3.0.0 + resolution: "has-flag@npm:3.0.0" + checksum: 10c0/1c6c83b14b8b1b3c25b0727b8ba3e3b647f99e9e6e13eb7322107261de07a4c1be56fc0d45678fc376e09772a3a1642ccdaf8fc69bdf123b6c086598397ce473 + languageName: node + linkType: hard + +"has-flag@npm:^4.0.0": + version: 4.0.0 + resolution: "has-flag@npm:4.0.0" + checksum: 10c0/2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1 + languageName: node + linkType: hard + +"has-property-descriptors@npm:^1.0.0": + version: 1.0.0 + resolution: "has-property-descriptors@npm:1.0.0" + dependencies: + get-intrinsic: "npm:^1.1.1" + checksum: 10c0/d4ca882b6960d6257bd28baa3ddfa21f068d260411004a093b30ca357c740e11e985771c85216a6d1eef4161e862657f48c4758ec8ab515223b3895200ad164b + languageName: node + linkType: hard + +"has-property-descriptors@npm:^1.0.1, has-property-descriptors@npm:^1.0.2": + version: 1.0.2 + resolution: "has-property-descriptors@npm:1.0.2" + dependencies: + es-define-property: "npm:^1.0.0" + checksum: 10c0/253c1f59e80bb476cf0dde8ff5284505d90c3bdb762983c3514d36414290475fe3fd6f574929d84de2a8eec00d35cf07cb6776205ff32efd7c50719125f00236 + languageName: node + linkType: hard + +"has-proto@npm:^1.0.1": + version: 1.0.1 + resolution: "has-proto@npm:1.0.1" + checksum: 10c0/c8a8fe411f810b23a564bd5546a8f3f0fff6f1b692740eb7a2fdc9df716ef870040806891e2f23ff4653f1083e3895bf12088703dd1a0eac3d9202d3a4768cd0 + languageName: node + linkType: hard + +"has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": + version: 1.0.3 + resolution: "has-symbols@npm:1.0.3" + checksum: 10c0/e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3 + languageName: node + linkType: hard + +"has-tostringtag@npm:^1.0.0": + version: 1.0.0 + resolution: "has-tostringtag@npm:1.0.0" + dependencies: + has-symbols: "npm:^1.0.2" + checksum: 10c0/1cdba76b7d13f65198a92b8ca1560ba40edfa09e85d182bf436d928f3588a9ebd260451d569f0ed1b849c4bf54f49c862aa0d0a77f9552b1855bb6deb526c011 + languageName: node + linkType: hard + +"has-tostringtag@npm:^1.0.1, has-tostringtag@npm:^1.0.2": + version: 1.0.2 + resolution: "has-tostringtag@npm:1.0.2" + dependencies: + has-symbols: "npm:^1.0.3" + checksum: 10c0/a8b166462192bafe3d9b6e420a1d581d93dd867adb61be223a17a8d6dad147aa77a8be32c961bb2f27b3ef893cae8d36f564ab651f5e9b7938ae86f74027c48c + languageName: node + linkType: hard + +"has-unicode@npm:^2.0.1": + version: 2.0.1 + resolution: "has-unicode@npm:2.0.1" + checksum: 10c0/ebdb2f4895c26bb08a8a100b62d362e49b2190bcfd84b76bc4be1a3bd4d254ec52d0dd9f2fbcc093fc5eb878b20c52146f9dfd33e2686ed28982187be593b47c + languageName: node + linkType: hard + +"has-yarn@npm:^2.1.0": + version: 2.1.0 + resolution: "has-yarn@npm:2.1.0" + checksum: 10c0/b5cab61b4129c2fc0474045b59705371b7f5ddf2aab8ba8725011e52269f017e06f75059a2c8a1d8011e9779c2885ad987263cfc6d1280f611c396b45fd5d74a + languageName: node + linkType: hard + +"has@npm:^1.0.3": + version: 1.0.3 + resolution: "has@npm:1.0.3" + dependencies: + function-bind: "npm:^1.1.1" + checksum: 10c0/e1da0d2bd109f116b632f27782cf23182b42f14972ca9540e4c5aa7e52647407a0a4a76937334fddcb56befe94a3494825ec22b19b51f5e5507c3153fd1a5e1b + languageName: node + linkType: hard + +"hasown@npm:^2.0.0, hasown@npm:^2.0.1": + version: 2.0.1 + resolution: "hasown@npm:2.0.1" + dependencies: + function-bind: "npm:^1.1.2" + checksum: 10c0/9e27e70e8e4204f4124c8f99950d1ba2b1f5174864fd39ff26da190f9ea6488c1b3927dcc64981c26d1f637a971783c9489d62c829d393ea509e6f1ba20370bb + languageName: node + linkType: hard + +"he@npm:1.2.0": + version: 1.2.0 + resolution: "he@npm:1.2.0" + bin: + he: bin/he + checksum: 10c0/a27d478befe3c8192f006cdd0639a66798979dfa6e2125c6ac582a19a5ebfec62ad83e8382e6036170d873f46e4536a7e795bf8b95bf7c247f4cc0825ccc8c17 + languageName: node + linkType: hard + +"hoist-non-react-statics@npm:^3.0.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.2": + version: 3.3.2 + resolution: "hoist-non-react-statics@npm:3.3.2" + dependencies: + react-is: "npm:^16.7.0" + checksum: 10c0/fe0889169e845d738b59b64badf5e55fa3cf20454f9203d1eb088df322d49d4318df774828e789898dcb280e8a5521bb59b3203385662ca5e9218a6ca5820e74 + languageName: node + linkType: hard + +"hosted-git-info@npm:^2.1.4": + version: 2.8.9 + resolution: "hosted-git-info@npm:2.8.9" + checksum: 10c0/317cbc6b1bbbe23c2a40ae23f3dafe9fa349ce42a89a36f930e3f9c0530c179a3882d2ef1e4141a4c3674d6faaea862138ec55b43ad6f75e387fda2483a13c70 + languageName: node + linkType: hard + +"hosted-git-info@npm:^4.0.1, hosted-git-info@npm:^4.1.0": + version: 4.1.0 + resolution: "hosted-git-info@npm:4.1.0" + dependencies: + lru-cache: "npm:^6.0.0" + checksum: 10c0/150fbcb001600336d17fdbae803264abed013548eea7946c2264c49ebe2ebd8c4441ba71dd23dd8e18c65de79d637f98b22d4760ba5fb2e0b15d62543d0fff07 + languageName: node + linkType: hard + +"html-encoding-sniffer@npm:^3.0.0": + version: 3.0.0 + resolution: "html-encoding-sniffer@npm:3.0.0" + dependencies: + whatwg-encoding: "npm:^2.0.0" + checksum: 10c0/b17b3b0fb5d061d8eb15121c3b0b536376c3e295ecaf09ba48dd69c6b6c957839db124fe1e2b3f11329753a4ee01aa7dedf63b7677999e86da17fbbdd82c5386 + languageName: node + linkType: hard + +"http-cache-semantics@npm:^4.1.1": + version: 4.1.1 + resolution: "http-cache-semantics@npm:4.1.1" + checksum: 10c0/ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc + languageName: node + linkType: hard + +"http-proxy-agent@npm:^5.0.0": + version: 5.0.0 + resolution: "http-proxy-agent@npm:5.0.0" + dependencies: + "@tootallnate/once": "npm:2" + agent-base: "npm:6" + debug: "npm:4" + checksum: 10c0/32a05e413430b2c1e542e5c74b38a9f14865301dd69dff2e53ddb684989440e3d2ce0c4b64d25eb63cf6283e6265ff979a61cf93e3ca3d23047ddfdc8df34a32 + languageName: node + linkType: hard + +"http-proxy-agent@npm:^7.0.0": + version: 7.0.2 + resolution: "http-proxy-agent@npm:7.0.2" + dependencies: + agent-base: "npm:^7.1.0" + debug: "npm:^4.3.4" + checksum: 10c0/4207b06a4580fb85dd6dff521f0abf6db517489e70863dca1a0291daa7f2d3d2d6015a57bd702af068ea5cf9f1f6ff72314f5f5b4228d299c0904135d2aef921 + languageName: node + linkType: hard + +"http2-wrapper@npm:^1.0.0-beta.5.2": + version: 1.0.3 + resolution: "http2-wrapper@npm:1.0.3" + dependencies: + quick-lru: "npm:^5.1.1" + resolve-alpn: "npm:^1.0.0" + checksum: 10c0/6a9b72a033e9812e1476b9d776ce2f387bc94bc46c88aea0d5dab6bd47d0a539b8178830e77054dd26d1142c866d515a28a4dc7c3ff4232c88ff2ebe4f5d12d1 + languageName: node + linkType: hard + +"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1": + version: 5.0.1 + resolution: "https-proxy-agent@npm:5.0.1" + dependencies: + agent-base: "npm:6" + debug: "npm:4" + checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1 + languageName: node + linkType: hard + +"https-proxy-agent@npm:^7.0.1": + version: 7.0.4 + resolution: "https-proxy-agent@npm:7.0.4" + dependencies: + agent-base: "npm:^7.0.2" + debug: "npm:4" + checksum: 10c0/bc4f7c38da32a5fc622450b6cb49a24ff596f9bd48dcedb52d2da3fa1c1a80e100fb506bd59b326c012f21c863c69b275c23de1a01d0b84db396822fdf25e52b + languageName: node + linkType: hard + +"human-signals@npm:^1.1.1": + version: 1.1.1 + resolution: "human-signals@npm:1.1.1" + checksum: 10c0/18810ed239a7a5e23fb6c32d0fd4be75d7cd337a07ad59b8dbf0794cb0761e6e628349ee04c409e605fe55344716eab5d0a47a62ba2a2d0d367c89a2b4247b1e + languageName: node + linkType: hard + +"human-signals@npm:^2.1.0": + version: 2.1.0 + resolution: "human-signals@npm:2.1.0" + checksum: 10c0/695edb3edfcfe9c8b52a76926cd31b36978782062c0ed9b1192b36bebc75c4c87c82e178dfcb0ed0fc27ca59d434198aac0bd0be18f5781ded775604db22304a + languageName: node + linkType: hard + +"human-signals@npm:^4.3.0": + version: 4.3.1 + resolution: "human-signals@npm:4.3.1" + checksum: 10c0/40498b33fe139f5cc4ef5d2f95eb1803d6318ac1b1c63eaf14eeed5484d26332c828de4a5a05676b6c83d7b9e57727c59addb4b1dea19cb8d71e83689e5b336c + languageName: node + linkType: hard + +"husky@npm:^8.0.0": + version: 8.0.3 + resolution: "husky@npm:8.0.3" + bin: + husky: lib/bin.js + checksum: 10c0/6722591771c657b91a1abb082e07f6547eca79144d678e586828ae806499d90dce2a6aee08b66183fd8b085f19d20e0990a2ad396961746b4c8bd5bdb619d668 + languageName: node + linkType: hard + +"hyphenate-style-name@npm:^1.0.3": + version: 1.0.4 + resolution: "hyphenate-style-name@npm:1.0.4" + checksum: 10c0/b19c3e2cd1dc426f6f893752fec08140abf79058a1b6238422e45373ed81389f02e1a2ba2ef4e9b2430d4e900a0f5ba12307de82320604e81ac1b722abd2ee62 + languageName: node + linkType: hard + +"iconv-corefoundation@npm:^1.1.7": + version: 1.1.7 + resolution: "iconv-corefoundation@npm:1.1.7" + dependencies: + cli-truncate: "npm:^2.1.0" + node-addon-api: "npm:^1.6.3" + conditions: os=darwin + languageName: node + linkType: hard + +"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2": + version: 0.6.3 + resolution: "iconv-lite@npm:0.6.3" + dependencies: + safer-buffer: "npm:>= 2.1.2 < 3.0.0" + checksum: 10c0/98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1 + languageName: node + linkType: hard + +"iconv-lite@npm:~0.4.13": + version: 0.4.24 + resolution: "iconv-lite@npm:0.4.24" + dependencies: + safer-buffer: "npm:>= 2.1.2 < 3" + checksum: 10c0/c6886a24cc00f2a059767440ec1bc00d334a89f250db8e0f7feb4961c8727118457e27c495ba94d082e51d3baca378726cd110aaf7ded8b9bbfd6a44760cf1d4 + languageName: node + linkType: hard + +"icss-utils@npm:^5.0.0, icss-utils@npm:^5.1.0": + version: 5.1.0 + resolution: "icss-utils@npm:5.1.0" + peerDependencies: + postcss: ^8.1.0 + checksum: 10c0/39c92936fabd23169c8611d2b5cc39e39d10b19b0d223352f20a7579f75b39d5f786114a6b8fc62bee8c5fed59ba9e0d38f7219a4db383e324fb3061664b043d + languageName: node + linkType: hard + +"ieee754@npm:^1.1.13": + version: 1.2.1 + resolution: "ieee754@npm:1.2.1" + checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb + languageName: node + linkType: hard + +"ignore@npm:^5.2.0, ignore@npm:^5.2.4": + version: 5.2.4 + resolution: "ignore@npm:5.2.4" + checksum: 10c0/7c7cd90edd9fea6e037f9b9da4b01bf0a86b198ce78345f9bbd983929d68ff14830be31111edc5d70c264921f4962404d75b7262b4d9cc3bc12381eccbd03096 + languageName: node + linkType: hard + +"image-type@npm:^4.1.0": + version: 4.1.0 + resolution: "image-type@npm:4.1.0" + dependencies: + file-type: "npm:^10.10.0" + checksum: 10c0/896d6560d5306276eb3426ad0af12519a5c7dc85f8e5ec8d2e9b91535411cea85b814574fd186f312ee49d3176c38a6524389ff153e81d1003bed71bf4c1f15b + languageName: node + linkType: hard + +"immer@npm:^9.0.7": + version: 9.0.21 + resolution: "immer@npm:9.0.21" + checksum: 10c0/03ea3ed5d4d72e8bd428df4a38ad7e483ea8308e9a113d3b42e0ea2cc0cc38340eb0a6aca69592abbbf047c685dbda04e3d34bf2ff438ab57339ed0a34cc0a05 + languageName: node + linkType: hard + +"immutable@npm:^4.0.0": + version: 4.3.4 + resolution: "immutable@npm:4.3.4" + checksum: 10c0/c15b9f0fa7b3c9315725cb00704fddad59f0e668a7379c39b9a528a8386140ee9effb015ae51a5b423e05c59d15fc0b38c970db6964ad6b3e05d0761db68441f + languageName: node + linkType: hard + +"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0": + version: 3.3.0 + resolution: "import-fresh@npm:3.3.0" + dependencies: + parent-module: "npm:^1.0.0" + resolve-from: "npm:^4.0.0" + checksum: 10c0/7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3 + languageName: node + linkType: hard + +"import-lazy@npm:^2.1.0": + version: 2.1.0 + resolution: "import-lazy@npm:2.1.0" + checksum: 10c0/c5e5f507d26ee23c5b2ed64577155810361ac37863b322cae0c17f16b6a8cdd15adf370288384ddd95ef9de05602fb8d87bf76ff835190eb037333c84db8062c + languageName: node + linkType: hard + +"import-local@npm:^3.0.2": + version: 3.1.0 + resolution: "import-local@npm:3.1.0" + dependencies: + pkg-dir: "npm:^4.2.0" + resolve-cwd: "npm:^3.0.0" + bin: + import-local-fixture: fixtures/cli.js + checksum: 10c0/c67ecea72f775fe8684ca3d057e54bdb2ae28c14bf261d2607c269c18ea0da7b730924c06262eca9aed4b8ab31e31d65bc60b50e7296c85908a56e2f7d41ecd2 + languageName: node + linkType: hard + +"imurmurhash@npm:^0.1.4": + version: 0.1.4 + resolution: "imurmurhash@npm:0.1.4" + checksum: 10c0/8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6 + languageName: node + linkType: hard + +"indent-string@npm:^4.0.0": + version: 4.0.0 + resolution: "indent-string@npm:4.0.0" + checksum: 10c0/1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f + languageName: node + linkType: hard + +"inflight@npm:^1.0.4": + version: 1.0.6 + resolution: "inflight@npm:1.0.6" + dependencies: + once: "npm:^1.3.0" + wrappy: "npm:1" + checksum: 10c0/7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2 + languageName: node + linkType: hard + +"inherits@npm:2, inherits@npm:^2.0.3": + version: 2.0.4 + resolution: "inherits@npm:2.0.4" + checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2 + languageName: node + linkType: hard + +"ini@npm:^1.3.6": + version: 1.3.8 + resolution: "ini@npm:1.3.8" + checksum: 10c0/ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a + languageName: node + linkType: hard + +"inline-style-prefixer@npm:^6.0.0": + version: 6.0.4 + resolution: "inline-style-prefixer@npm:6.0.4" + dependencies: + css-in-js-utils: "npm:^3.1.0" + fast-loops: "npm:^1.1.3" + checksum: 10c0/d3d42bf0c48d621ea4bcfb077b5d370b106995422300a3a472674f96c9b489d96b4aac6f29dea3bb26ff2dfd7293e4752098bc2b53407769eafdb66c6c4c1764 + languageName: node + linkType: hard + +"internal-slot@npm:^1.0.5": + version: 1.0.5 + resolution: "internal-slot@npm:1.0.5" + dependencies: + get-intrinsic: "npm:^1.2.0" + has: "npm:^1.0.3" + side-channel: "npm:^1.0.4" + checksum: 10c0/66d8a66b4b5310c042e8ad00ce895dc55cb25165a3a7da0d7862ca18d69d3b1ba86511b4bf3baf4273d744d3f6e9154574af45189ef11135a444945309e39e4a + languageName: node + linkType: hard + +"internal-slot@npm:^1.0.7": + version: 1.0.7 + resolution: "internal-slot@npm:1.0.7" + dependencies: + es-errors: "npm:^1.3.0" + hasown: "npm:^2.0.0" + side-channel: "npm:^1.0.4" + checksum: 10c0/f8b294a4e6ea3855fc59551bbf35f2b832cf01fd5e6e2a97f5c201a071cc09b49048f856e484b67a6c721da5e55736c5b6ddafaf19e2dbeb4a3ff1821680de6c + languageName: node + linkType: hard + +"interpret@npm:^3.1.1": + version: 3.1.1 + resolution: "interpret@npm:3.1.1" + checksum: 10c0/6f3c4d0aa6ec1b43a8862375588a249e3c917739895cbe67fe12f0a76260ea632af51e8e2431b50fbcd0145356dc28ca147be08dbe6a523739fd55c0f91dc2a5 + languageName: node + linkType: hard + +"invariant@npm:^2.2.4": + version: 2.2.4 + resolution: "invariant@npm:2.2.4" + dependencies: + loose-envify: "npm:^1.0.0" + checksum: 10c0/5af133a917c0bcf65e84e7f23e779e7abc1cd49cb7fdc62d00d1de74b0d8c1b5ee74ac7766099fb3be1b05b26dfc67bab76a17030d2fe7ea2eef867434362dfc + languageName: node + linkType: hard + +"invert-kv@npm:^3.0.0": + version: 3.0.1 + resolution: "invert-kv@npm:3.0.1" + checksum: 10c0/a3d90951a635e35dea9c9a5fd749e981e9c54e8a362ad80b2253dad03b9257314b7c4e4d250d61bcd79698ccd5f4c6b0c750cd991bb5ce16352bf830e77ea64b + languageName: node + linkType: hard + +"ip-address@npm:^9.0.5": + version: 9.0.5 + resolution: "ip-address@npm:9.0.5" + dependencies: + jsbn: "npm:1.1.0" + sprintf-js: "npm:^1.1.3" + checksum: 10c0/331cd07fafcb3b24100613e4b53e1a2b4feab11e671e655d46dc09ee233da5011284d09ca40c4ecbdfe1d0004f462958675c224a804259f2f78d2465a87824bc + languageName: node + linkType: hard + +"ip2country@npm:1.0.1": + version: 1.0.1 + resolution: "ip2country@npm:1.0.1" + dependencies: + asbycountry: "npm:^1.4.2" + checksum: 10c0/16f207f20968a9482e20676c6c1aad07eca0312509b13803d185f28c7e934bc1bb8805b0d9ea8a5dd5c5e6628460cf23ae6e57da28eb376c86812fb5d6b56ee0 + languageName: node + linkType: hard + +"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2": + version: 3.0.2 + resolution: "is-array-buffer@npm:3.0.2" + dependencies: + call-bind: "npm:^1.0.2" + get-intrinsic: "npm:^1.2.0" + is-typed-array: "npm:^1.1.10" + checksum: 10c0/40ed13a5f5746ac3ae2f2e463687d9b5a3f5fd0086f970fb4898f0253c2a5ec2e3caea2d664dd8f54761b1c1948609702416921a22faebe160c7640a9217c80e + languageName: node + linkType: hard + +"is-array-buffer@npm:^3.0.4": + version: 3.0.4 + resolution: "is-array-buffer@npm:3.0.4" + dependencies: + call-bind: "npm:^1.0.2" + get-intrinsic: "npm:^1.2.1" + checksum: 10c0/42a49d006cc6130bc5424eae113e948c146f31f9d24460fc0958f855d9d810e6fd2e4519bf19aab75179af9c298ea6092459d8cafdec523cd19e529b26eab860 + languageName: node + linkType: hard + +"is-arrayish@npm:^0.2.1": + version: 0.2.1 + resolution: "is-arrayish@npm:0.2.1" + checksum: 10c0/e7fb686a739068bb70f860b39b67afc62acc62e36bb61c5f965768abce1873b379c563e61dd2adad96ebb7edf6651111b385e490cf508378959b0ed4cac4e729 + languageName: node + linkType: hard + +"is-async-function@npm:^2.0.0": + version: 2.0.0 + resolution: "is-async-function@npm:2.0.0" + dependencies: + has-tostringtag: "npm:^1.0.0" + checksum: 10c0/787bc931576aad525d751fc5ce211960fe91e49ac84a5c22d6ae0bc9541945fbc3f686dc590c3175722ce4f6d7b798a93f6f8ff4847fdb2199aea6f4baf5d668 + languageName: node + linkType: hard + +"is-bigint@npm:^1.0.1": + version: 1.0.4 + resolution: "is-bigint@npm:1.0.4" + dependencies: + has-bigints: "npm:^1.0.1" + checksum: 10c0/eb9c88e418a0d195ca545aff2b715c9903d9b0a5033bc5922fec600eb0c3d7b1ee7f882dbf2e0d5a6e694e42391be3683e4368737bd3c4a77f8ac293e7773696 + languageName: node + linkType: hard + +"is-binary-path@npm:~2.1.0": + version: 2.1.0 + resolution: "is-binary-path@npm:2.1.0" + dependencies: + binary-extensions: "npm:^2.0.0" + checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38 + languageName: node + linkType: hard + +"is-boolean-object@npm:^1.1.0": + version: 1.1.2 + resolution: "is-boolean-object@npm:1.1.2" + dependencies: + call-bind: "npm:^1.0.2" + has-tostringtag: "npm:^1.0.0" + checksum: 10c0/6090587f8a8a8534c0f816da868bc94f32810f08807aa72fa7e79f7e11c466d281486ffe7a788178809c2aa71fe3e700b167fe80dd96dad68026bfff8ebf39f7 + languageName: node + linkType: hard + +"is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": + version: 1.2.7 + resolution: "is-callable@npm:1.2.7" + checksum: 10c0/ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f + languageName: node + linkType: hard + +"is-ci@npm:^2.0.0": + version: 2.0.0 + resolution: "is-ci@npm:2.0.0" + dependencies: + ci-info: "npm:^2.0.0" + bin: + is-ci: bin.js + checksum: 10c0/17de4e2cd8f993c56c86472dd53dd9e2c7f126d0ee55afe610557046cdd64de0e8feadbad476edc9eeff63b060523b8673d9094ed2ab294b59efb5a66dd05a9a + languageName: node + linkType: hard + +"is-ci@npm:^3.0.0": + version: 3.0.1 + resolution: "is-ci@npm:3.0.1" + dependencies: + ci-info: "npm:^3.2.0" + bin: + is-ci: bin.js + checksum: 10c0/0e81caa62f4520d4088a5bef6d6337d773828a88610346c4b1119fb50c842587ed8bef1e5d9a656835a599e7209405b5761ddf2339668f2d0f4e889a92fe6051 + languageName: node + linkType: hard + +"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.9.0": + version: 2.13.0 + resolution: "is-core-module@npm:2.13.0" + dependencies: + has: "npm:^1.0.3" + checksum: 10c0/a8e7f46f8cefd7c9f6f5d54f3dbf1c40bf79467b6612d6023421ec6ea7e8e4c22593b3963ff7a3f770db07bc19fccbe7987a550a8bc1a4d6ec4115db5e4c5dca + languageName: node + linkType: hard + +"is-core-module@npm:^2.13.1": + version: 2.13.1 + resolution: "is-core-module@npm:2.13.1" + dependencies: + hasown: "npm:^2.0.0" + checksum: 10c0/2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518 + languageName: node + linkType: hard + +"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5": + version: 1.0.5 + resolution: "is-date-object@npm:1.0.5" + dependencies: + has-tostringtag: "npm:^1.0.0" + checksum: 10c0/eed21e5dcc619c48ccef804dfc83a739dbb2abee6ca202838ee1bd5f760fe8d8a93444f0d49012ad19bb7c006186e2884a1b92f6e1c056da7fd23d0a9ad5992e + languageName: node + linkType: hard + +"is-docker@npm:^2.0.0": + version: 2.2.1 + resolution: "is-docker@npm:2.2.1" + bin: + is-docker: cli.js + checksum: 10c0/e828365958d155f90c409cdbe958f64051d99e8aedc2c8c4cd7c89dcf35329daed42f7b99346f7828df013e27deb8f721cf9408ba878c76eb9e8290235fbcdcc + languageName: node + linkType: hard + +"is-extglob@npm:^2.1.1": + version: 2.1.1 + resolution: "is-extglob@npm:2.1.1" + checksum: 10c0/5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912 + languageName: node + linkType: hard + +"is-finalizationregistry@npm:^1.0.2": + version: 1.0.2 + resolution: "is-finalizationregistry@npm:1.0.2" + dependencies: + call-bind: "npm:^1.0.2" + checksum: 10c0/81caecc984d27b1a35c68741156fc651fb1fa5e3e6710d21410abc527eb226d400c0943a167922b2e920f6b3e58b0dede9aa795882b038b85f50b3a4b877db86 + languageName: node + linkType: hard + +"is-fullwidth-code-point@npm:^3.0.0": + version: 3.0.0 + resolution: "is-fullwidth-code-point@npm:3.0.0" + checksum: 10c0/bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc + languageName: node + linkType: hard + +"is-fullwidth-code-point@npm:^4.0.0": + version: 4.0.0 + resolution: "is-fullwidth-code-point@npm:4.0.0" + checksum: 10c0/df2a717e813567db0f659c306d61f2f804d480752526886954a2a3e2246c7745fd07a52b5fecf2b68caf0a6c79dcdace6166fdf29cc76ed9975cc334f0a018b8 + languageName: node + linkType: hard + +"is-generator-function@npm:^1.0.10": + version: 1.0.10 + resolution: "is-generator-function@npm:1.0.10" + dependencies: + has-tostringtag: "npm:^1.0.0" + checksum: 10c0/df03514df01a6098945b5a0cfa1abff715807c8e72f57c49a0686ad54b3b74d394e2d8714e6f709a71eb00c9630d48e73ca1796c1ccc84ac95092c1fecc0d98b + languageName: node + linkType: hard + +"is-glob@npm:^4.0.0, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1": + version: 4.0.3 + resolution: "is-glob@npm:4.0.3" + dependencies: + is-extglob: "npm:^2.1.1" + checksum: 10c0/17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a + languageName: node + linkType: hard + +"is-installed-globally@npm:^0.4.0": + version: 0.4.0 + resolution: "is-installed-globally@npm:0.4.0" + dependencies: + global-dirs: "npm:^3.0.0" + is-path-inside: "npm:^3.0.2" + checksum: 10c0/f3e6220ee5824b845c9ed0d4b42c24272701f1f9926936e30c0e676254ca5b34d1b92c6205cae11b283776f9529212c0cdabb20ec280a6451677d6493ca9c22d + languageName: node + linkType: hard + +"is-lambda@npm:^1.0.1": + version: 1.0.1 + resolution: "is-lambda@npm:1.0.1" + checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d + languageName: node + linkType: hard + +"is-map@npm:^2.0.1": + version: 2.0.2 + resolution: "is-map@npm:2.0.2" + checksum: 10c0/119ff9137a37fd131a72fab3f4ab8c9d6a24b0a1ee26b4eff14dc625900d8675a97785eea5f4174265e2006ed076cc24e89f6e57ebd080a48338d914ec9168a5 + languageName: node + linkType: hard + +"is-negative-zero@npm:^2.0.2": + version: 2.0.2 + resolution: "is-negative-zero@npm:2.0.2" + checksum: 10c0/eda024c158f70f2017f3415e471b818d314da5ef5be68f801b16314d4a4b6304a74cbed778acf9e2f955bb9c1c5f2935c1be0c7c99e1ad12286f45366217b6a3 + languageName: node + linkType: hard + +"is-npm@npm:^5.0.0": + version: 5.0.0 + resolution: "is-npm@npm:5.0.0" + checksum: 10c0/8ded3ae1119bbbda22395fe1c64d2d79d3b3baeb2635c90f9a9dca4b8ce19a67b55fda178269b63421b257b361892fd545807fb5ac212f06776f544d9fcc3ab0 + languageName: node + linkType: hard + +"is-number-object@npm:^1.0.4": + version: 1.0.7 + resolution: "is-number-object@npm:1.0.7" + dependencies: + has-tostringtag: "npm:^1.0.0" + checksum: 10c0/aad266da1e530f1804a2b7bd2e874b4869f71c98590b3964f9d06cc9869b18f8d1f4778f838ecd2a11011bce20aeecb53cb269ba916209b79c24580416b74b1b + languageName: node + linkType: hard + +"is-number@npm:^7.0.0": + version: 7.0.0 + resolution: "is-number@npm:7.0.0" + checksum: 10c0/b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811 + languageName: node + linkType: hard + +"is-obj@npm:^2.0.0": + version: 2.0.0 + resolution: "is-obj@npm:2.0.0" + checksum: 10c0/85044ed7ba8bd169e2c2af3a178cacb92a97aa75de9569d02efef7f443a824b5e153eba72b9ae3aca6f8ce81955271aa2dc7da67a8b720575d3e38104208cb4e + languageName: node + linkType: hard + +"is-path-inside@npm:^3.0.2, is-path-inside@npm:^3.0.3": + version: 3.0.3 + resolution: "is-path-inside@npm:3.0.3" + checksum: 10c0/cf7d4ac35fb96bab6a1d2c3598fe5ebb29aafb52c0aaa482b5a3ed9d8ba3edc11631e3ec2637660c44b3ce0e61a08d54946e8af30dec0b60a7c27296c68ffd05 + languageName: node + linkType: hard + +"is-plain-obj@npm:^1.1.0": + version: 1.1.0 + resolution: "is-plain-obj@npm:1.1.0" + checksum: 10c0/daaee1805add26f781b413fdf192fc91d52409583be30ace35c82607d440da63cc4cac0ac55136716688d6c0a2c6ef3edb2254fecbd1fe06056d6bd15975ee8c + languageName: node + linkType: hard + +"is-plain-obj@npm:^2.1.0": + version: 2.1.0 + resolution: "is-plain-obj@npm:2.1.0" + checksum: 10c0/e5c9814cdaa627a9ad0a0964ded0e0491bfd9ace405c49a5d63c88b30a162f1512c069d5b80997893c4d0181eadc3fed02b4ab4b81059aba5620bfcdfdeb9c53 + languageName: node + linkType: hard + +"is-plain-object@npm:^2.0.4": + version: 2.0.4 + resolution: "is-plain-object@npm:2.0.4" + dependencies: + isobject: "npm:^3.0.1" + checksum: 10c0/f050fdd5203d9c81e8c4df1b3ff461c4bc64e8b5ca383bcdde46131361d0a678e80bcf00b5257646f6c636197629644d53bd8e2375aea633de09a82d57e942f4 + languageName: node + linkType: hard + +"is-potential-custom-element-name@npm:^1.0.1": + version: 1.0.1 + resolution: "is-potential-custom-element-name@npm:1.0.1" + checksum: 10c0/b73e2f22bc863b0939941d369486d308b43d7aef1f9439705e3582bfccaa4516406865e32c968a35f97a99396dac84e2624e67b0a16b0a15086a785e16ce7db9 + languageName: node + linkType: hard + +"is-regex@npm:^1.1.4": + version: 1.1.4 + resolution: "is-regex@npm:1.1.4" + dependencies: + call-bind: "npm:^1.0.2" + has-tostringtag: "npm:^1.0.0" + checksum: 10c0/bb72aae604a69eafd4a82a93002058c416ace8cde95873589a97fc5dac96a6c6c78a9977d487b7b95426a8f5073969124dd228f043f9f604f041f32fcc465fc1 + languageName: node + linkType: hard + +"is-set@npm:^2.0.1": + version: 2.0.2 + resolution: "is-set@npm:2.0.2" + checksum: 10c0/5f8bd1880df8c0004ce694e315e6e1e47a3452014be792880bb274a3b2cdb952fdb60789636ca6e084c7947ca8b7ae03ccaf54c93a7fcfed228af810559e5432 + languageName: node + linkType: hard + +"is-shared-array-buffer@npm:^1.0.2": + version: 1.0.2 + resolution: "is-shared-array-buffer@npm:1.0.2" + dependencies: + call-bind: "npm:^1.0.2" + checksum: 10c0/cfeee6f171f1b13e6cbc6f3b6cc44e192b93df39f3fcb31aa66ffb1d2df3b91e05664311659f9701baba62f5e98c83b0673c628e7adc30f55071c4874fcdccec + languageName: node + linkType: hard + +"is-stream@npm:^2.0.0": + version: 2.0.1 + resolution: "is-stream@npm:2.0.1" + checksum: 10c0/7c284241313fc6efc329b8d7f08e16c0efeb6baab1b4cd0ba579eb78e5af1aa5da11e68559896a2067cd6c526bd29241dda4eb1225e627d5aa1a89a76d4635a5 + languageName: node + linkType: hard + +"is-stream@npm:^3.0.0": + version: 3.0.0 + resolution: "is-stream@npm:3.0.0" + checksum: 10c0/eb2f7127af02ee9aa2a0237b730e47ac2de0d4e76a4a905a50a11557f2339df5765eaea4ceb8029f1efa978586abe776908720bfcb1900c20c6ec5145f6f29d8 + languageName: node + linkType: hard + +"is-string@npm:^1.0.5, is-string@npm:^1.0.7": + version: 1.0.7 + resolution: "is-string@npm:1.0.7" + dependencies: + has-tostringtag: "npm:^1.0.0" + checksum: 10c0/905f805cbc6eedfa678aaa103ab7f626aac9ebbdc8737abb5243acaa61d9820f8edc5819106b8fcd1839e33db21de9f0116ae20de380c8382d16dc2a601921f6 + languageName: node + linkType: hard + +"is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3": + version: 1.0.4 + resolution: "is-symbol@npm:1.0.4" + dependencies: + has-symbols: "npm:^1.0.2" + checksum: 10c0/9381dd015f7c8906154dbcbf93fad769de16b4b961edc94f88d26eb8c555935caa23af88bda0c93a18e65560f6d7cca0fd5a3f8a8e1df6f1abbb9bead4502ef7 + languageName: node + linkType: hard + +"is-text-path@npm:^1.0.1": + version: 1.0.1 + resolution: "is-text-path@npm:1.0.1" + dependencies: + text-extensions: "npm:^1.0.0" + checksum: 10c0/61c8650c29548febb6bf69e9541fc11abbbb087a0568df7bc471ba264e95fb254def4e610631cbab4ddb0a1a07949d06416f4ebeaf37875023fb184cdb87ee84 + languageName: node + linkType: hard + +"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.9": + version: 1.1.12 + resolution: "is-typed-array@npm:1.1.12" + dependencies: + which-typed-array: "npm:^1.1.11" + checksum: 10c0/9863e9cc7223c6fc1c462a2c3898a7beff6b41b1ee0fabb03b7d278ae7de670b5bcbc8627db56bb66ed60902fa37d53fe5cce0fd2f7d73ac64fe5da6f409b6ae + languageName: node + linkType: hard + +"is-typed-array@npm:^1.1.13": + version: 1.1.13 + resolution: "is-typed-array@npm:1.1.13" + dependencies: + which-typed-array: "npm:^1.1.14" + checksum: 10c0/fa5cb97d4a80e52c2cc8ed3778e39f175a1a2ae4ddf3adae3187d69586a1fd57cfa0b095db31f66aa90331e9e3da79184cea9c6abdcd1abc722dc3c3edd51cca + languageName: node + linkType: hard + +"is-typedarray@npm:^1.0.0": + version: 1.0.0 + resolution: "is-typedarray@npm:1.0.0" + checksum: 10c0/4c096275ba041a17a13cca33ac21c16bc4fd2d7d7eb94525e7cd2c2f2c1a3ab956e37622290642501ff4310601e413b675cf399ad6db49855527d2163b3eeeec + languageName: node + linkType: hard + +"is-unicode-supported@npm:^0.1.0": + version: 0.1.0 + resolution: "is-unicode-supported@npm:0.1.0" + checksum: 10c0/00cbe3455c3756be68d2542c416cab888aebd5012781d6819749fefb15162ff23e38501fe681b3d751c73e8ff561ac09a5293eba6f58fdf0178462ce6dcb3453 + languageName: node + linkType: hard + +"is-weakmap@npm:^2.0.1": + version: 2.0.1 + resolution: "is-weakmap@npm:2.0.1" + checksum: 10c0/9c9fec9efa7bf5030a4a927f33fff2a6976b93646259f92b517d3646c073cc5b98283a162ce75c412b060a46de07032444b530f0a4c9b6e012ef8f1741c3a987 + languageName: node + linkType: hard + +"is-weakref@npm:^1.0.2": + version: 1.0.2 + resolution: "is-weakref@npm:1.0.2" + dependencies: + call-bind: "npm:^1.0.2" + checksum: 10c0/1545c5d172cb690c392f2136c23eec07d8d78a7f57d0e41f10078aa4f5daf5d7f57b6513a67514ab4f073275ad00c9822fc8935e00229d0a2089e1c02685d4b1 + languageName: node + linkType: hard + +"is-weakset@npm:^2.0.1": + version: 2.0.2 + resolution: "is-weakset@npm:2.0.2" + dependencies: + call-bind: "npm:^1.0.2" + get-intrinsic: "npm:^1.1.1" + checksum: 10c0/ef5136bd446ae4603229b897f73efd0720c6ab3ec6cc05c8d5c4b51aa9f95164713c4cad0a22ff1fedf04865ff86cae4648bc1d5eead4b6388e1150525af1cc1 + languageName: node + linkType: hard + +"is-wsl@npm:^2.1.1": + version: 2.2.0 + resolution: "is-wsl@npm:2.2.0" + dependencies: + is-docker: "npm:^2.0.0" + checksum: 10c0/a6fa2d370d21be487c0165c7a440d567274fbba1a817f2f0bfa41cc5e3af25041d84267baa22df66696956038a43973e72fca117918c91431920bdef490fa25e + languageName: node + linkType: hard + +"is-yarn-global@npm:^0.3.0": + version: 0.3.0 + resolution: "is-yarn-global@npm:0.3.0" + checksum: 10c0/9f1ab6f28e6e7961c4b97e564791d1decf2886a0dbe9b92b2176d76156adbb42b4c06c0f33d7107b270c207cbcfe0b2293b7cc4a0ec6774ac6d37af9503d51e1 + languageName: node + linkType: hard + +"isarray@npm:0.0.1": + version: 0.0.1 + resolution: "isarray@npm:0.0.1" + checksum: 10c0/ed1e62da617f71fe348907c71743b5ed550448b455f8d269f89a7c7ddb8ae6e962de3dab6a74a237b06f5eb7f6ece7a45ada8ce96d87fe972926530f91ae3311 + languageName: node + linkType: hard + +"isarray@npm:^2.0.5": + version: 2.0.5 + resolution: "isarray@npm:2.0.5" + checksum: 10c0/4199f14a7a13da2177c66c31080008b7124331956f47bca57dd0b6ea9f11687aa25e565a2c7a2b519bc86988d10398e3049a1f5df13c9f6b7664154690ae79fd + languageName: node + linkType: hard + +"isbinaryfile@npm:^3.0.2": + version: 3.0.3 + resolution: "isbinaryfile@npm:3.0.3" + dependencies: + buffer-alloc: "npm:^1.2.0" + checksum: 10c0/9f726a0fa083d28b568b0f137f214fa5b94e9497d0a2bcdf6370d0167333bba61e4e89f0f1841768706715bcc1c92d02d8123050503c5cc6621f89e65fb1cbed + languageName: node + linkType: hard + +"isbinaryfile@npm:^4.0.10": + version: 4.0.10 + resolution: "isbinaryfile@npm:4.0.10" + checksum: 10c0/0703d8cfeb69ed79e6d173120f327450011a066755150a6bbf97ffecec1069a5f2092777868315b21359098c84b54984871cad1abce877ad9141fb2caf3dcabf + languageName: node + linkType: hard + +"isexe@npm:^2.0.0": + version: 2.0.0 + resolution: "isexe@npm:2.0.0" + checksum: 10c0/228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d + languageName: node + linkType: hard + +"isexe@npm:^3.1.1": + version: 3.1.1 + resolution: "isexe@npm:3.1.1" + checksum: 10c0/9ec257654093443eb0a528a9c8cbba9c0ca7616ccb40abd6dde7202734d96bb86e4ac0d764f0f8cd965856aacbff2f4ce23e730dc19dfb41e3b0d865ca6fdcc7 + languageName: node + linkType: hard + +"isobject@npm:^3.0.1": + version: 3.0.1 + resolution: "isobject@npm:3.0.1" + checksum: 10c0/03344f5064a82f099a0cd1a8a407f4c0d20b7b8485e8e816c39f249e9416b06c322e8dec5b842b6bb8a06de0af9cb48e7bc1b5352f0fadc2f0abac033db3d4db + languageName: node + linkType: hard + +"iterator.prototype@npm:^1.1.0": + version: 1.1.1 + resolution: "iterator.prototype@npm:1.1.1" + dependencies: + define-properties: "npm:^1.2.0" + get-intrinsic: "npm:^1.2.1" + has-symbols: "npm:^1.0.3" + reflect.getprototypeof: "npm:^1.0.3" + checksum: 10c0/c11d53e4b5723c3c77272cb87f730a71e1a9aa0c5b1ac6f325113a988cfe0bb2da414e84044a2fc364968515095330efc8d49694939b01f283faa4541b997d57 + languageName: node + linkType: hard + +"jackspeak@npm:^2.3.5, jackspeak@npm:^2.3.6": + version: 2.3.6 + resolution: "jackspeak@npm:2.3.6" + dependencies: + "@isaacs/cliui": "npm:^8.0.2" + "@pkgjs/parseargs": "npm:^0.11.0" + dependenciesMeta: + "@pkgjs/parseargs": + optional: true + checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111 + languageName: node + linkType: hard + +"jake@npm:^10.8.5": + version: 10.8.7 + resolution: "jake@npm:10.8.7" + dependencies: + async: "npm:^3.2.3" + chalk: "npm:^4.0.2" + filelist: "npm:^1.0.4" + minimatch: "npm:^3.1.2" + bin: + jake: bin/cli.js + checksum: 10c0/89326d01a8bc110d02d973729a66394c79a34b34461116f5c530a2a2dbc30265683fe6737928f75df9178e9d369ff1442f5753fb983d525e740eefdadc56a103 + languageName: node + linkType: hard + +"jest-worker@npm:^27.4.5": + version: 27.5.1 + resolution: "jest-worker@npm:27.5.1" + dependencies: + "@types/node": "npm:*" + merge-stream: "npm:^2.0.0" + supports-color: "npm:^8.0.0" + checksum: 10c0/8c4737ffd03887b3c6768e4cc3ca0269c0336c1e4b1b120943958ddb035ed2a0fc6acab6dc99631720a3720af4e708ff84fb45382ad1e83c27946adf3623969b + languageName: node + linkType: hard + +"js-cookie@npm:^2.2.1": + version: 2.2.1 + resolution: "js-cookie@npm:2.2.1" + checksum: 10c0/ee67fc0f8495d0800b851910b5eb5bf49d3033adff6493d55b5c097ca6da46f7fe666b10e2ecb13cfcaf5b88d71c205ce00a7e646de791689bfd053bbb36a376 + languageName: node + linkType: hard + +"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0": + version: 4.0.0 + resolution: "js-tokens@npm:4.0.0" + checksum: 10c0/e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed + languageName: node + linkType: hard + +"js-yaml@npm:4.1.0, js-yaml@npm:^4.1.0": + version: 4.1.0 + resolution: "js-yaml@npm:4.1.0" + dependencies: + argparse: "npm:^2.0.1" + bin: + js-yaml: bin/js-yaml.js + checksum: 10c0/184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f + languageName: node + linkType: hard + +"js2xmlparser@npm:^4.0.2": + version: 4.0.2 + resolution: "js2xmlparser@npm:4.0.2" + dependencies: + xmlcreate: "npm:^2.0.4" + checksum: 10c0/b00de9351649d67d225e21734a08f456a4ecb3c29cafcd3bbecb36a8ab61ec841fad7f425bed50e21936fe387f472e49cfe75ce71d0beaacb0475b077c88ed39 + languageName: node + linkType: hard + +"jsbn@npm:1.1.0": + version: 1.1.0 + resolution: "jsbn@npm:1.1.0" + checksum: 10c0/4f907fb78d7b712e11dea8c165fe0921f81a657d3443dde75359ed52eb2b5d33ce6773d97985a089f09a65edd80b11cb75c767b57ba47391fee4c969f7215c96 + languageName: node + linkType: hard + +"jsdoc@npm:^4.0.0": + version: 4.0.2 + resolution: "jsdoc@npm:4.0.2" + dependencies: + "@babel/parser": "npm:^7.20.15" + "@jsdoc/salty": "npm:^0.2.1" + "@types/markdown-it": "npm:^12.2.3" + bluebird: "npm:^3.7.2" + catharsis: "npm:^0.9.0" + escape-string-regexp: "npm:^2.0.0" + js2xmlparser: "npm:^4.0.2" + klaw: "npm:^3.0.0" + markdown-it: "npm:^12.3.2" + markdown-it-anchor: "npm:^8.4.1" + marked: "npm:^4.0.10" + mkdirp: "npm:^1.0.4" + requizzle: "npm:^0.2.3" + strip-json-comments: "npm:^3.1.0" + underscore: "npm:~1.13.2" + bin: + jsdoc: jsdoc.js + checksum: 10c0/1320a49ea576e60cfe38e5912e0b6aab22e3861a76c1795afde2e02896b29e343abee4da0de6b82f1edb6ef6b6c4fc8e2ef41d0fe65a3522138b28b74b01e5c2 + languageName: node + linkType: hard + +"jsdom-global@npm:^3.0.2": + version: 3.0.2 + resolution: "jsdom-global@npm:3.0.2" + peerDependencies: + jsdom: ">=10.0.0" + checksum: 10c0/cf6417b351732a2d4e97fbe8e2703f5dc28e30b212aef832d7bc9bea50570c6e20a8a49db370f05b9ae3b8ebe55a5efbedb00540f11c5d216569821f64d7c58f + languageName: node + linkType: hard + +"jsdom@npm:^22.1.0": + version: 22.1.0 + resolution: "jsdom@npm:22.1.0" + dependencies: + abab: "npm:^2.0.6" + cssstyle: "npm:^3.0.0" + data-urls: "npm:^4.0.0" + decimal.js: "npm:^10.4.3" + domexception: "npm:^4.0.0" + form-data: "npm:^4.0.0" + html-encoding-sniffer: "npm:^3.0.0" + http-proxy-agent: "npm:^5.0.0" + https-proxy-agent: "npm:^5.0.1" + is-potential-custom-element-name: "npm:^1.0.1" + nwsapi: "npm:^2.2.4" + parse5: "npm:^7.1.2" + rrweb-cssom: "npm:^0.6.0" + saxes: "npm:^6.0.0" + symbol-tree: "npm:^3.2.4" + tough-cookie: "npm:^4.1.2" + w3c-xmlserializer: "npm:^4.0.0" + webidl-conversions: "npm:^7.0.0" + whatwg-encoding: "npm:^2.0.0" + whatwg-mimetype: "npm:^3.0.0" + whatwg-url: "npm:^12.0.1" + ws: "npm:^8.13.0" + xml-name-validator: "npm:^4.0.0" + peerDependencies: + canvas: ^2.5.0 + peerDependenciesMeta: + canvas: + optional: true + checksum: 10c0/a1c1501c611d1fe833e0a28796a234325aa09d4c597a9d8ccf6970004a9d946d261469502eadb555bdd7a55f5a2fbf3ce60c727cd99acb0d63f257fb9afcd33d + languageName: node + linkType: hard + +"jsesc@npm:^2.5.1": + version: 2.5.2 + resolution: "jsesc@npm:2.5.2" + bin: + jsesc: bin/jsesc + checksum: 10c0/dbf59312e0ebf2b4405ef413ec2b25abb5f8f4d9bc5fb8d9f90381622ebca5f2af6a6aa9a8578f65903f9e33990a6dc798edd0ce5586894bf0e9e31803a1de88 + languageName: node + linkType: hard + +"json-buffer@npm:3.0.1": + version: 3.0.1 + resolution: "json-buffer@npm:3.0.1" + checksum: 10c0/0d1c91569d9588e7eef2b49b59851f297f3ab93c7b35c7c221e288099322be6b562767d11e4821da500f3219542b9afd2e54c5dc573107c1126ed1080f8e96d7 + languageName: node + linkType: hard + +"json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1": + version: 2.3.1 + resolution: "json-parse-even-better-errors@npm:2.3.1" + checksum: 10c0/140932564c8f0b88455432e0f33c4cb4086b8868e37524e07e723f4eaedb9425bdc2bafd71bd1d9765bd15fd1e2d126972bc83990f55c467168c228c24d665f3 + languageName: node + linkType: hard + +"json-schema-traverse@npm:^0.4.1": + version: 0.4.1 + resolution: "json-schema-traverse@npm:0.4.1" + checksum: 10c0/108fa90d4cc6f08243aedc6da16c408daf81793bf903e9fd5ab21983cda433d5d2da49e40711da016289465ec2e62e0324dcdfbc06275a607fe3233fde4942ce + languageName: node + linkType: hard + +"json-schema-traverse@npm:^1.0.0": + version: 1.0.0 + resolution: "json-schema-traverse@npm:1.0.0" + checksum: 10c0/71e30015d7f3d6dc1c316d6298047c8ef98a06d31ad064919976583eb61e1018a60a0067338f0f79cabc00d84af3fcc489bd48ce8a46ea165d9541ba17fb30c6 + languageName: node + linkType: hard + +"json-stable-stringify-without-jsonify@npm:^1.0.1": + version: 1.0.1 + resolution: "json-stable-stringify-without-jsonify@npm:1.0.1" + checksum: 10c0/cb168b61fd4de83e58d09aaa6425ef71001bae30d260e2c57e7d09a5fd82223e2f22a042dedaab8db23b7d9ae46854b08bb1f91675a8be11c5cffebef5fb66a5 + languageName: node + linkType: hard + +"json-stringify-safe@npm:^5.0.1": + version: 5.0.1 + resolution: "json-stringify-safe@npm:5.0.1" + checksum: 10c0/7dbf35cd0411d1d648dceb6d59ce5857ec939e52e4afc37601aa3da611f0987d5cee5b38d58329ceddf3ed48bd7215229c8d52059ab01f2444a338bf24ed0f37 + languageName: node + linkType: hard + +"json5@npm:^2.2.2": + version: 2.2.3 + resolution: "json5@npm:2.2.3" + bin: + json5: lib/cli.js + checksum: 10c0/5a04eed94810fa55c5ea138b2f7a5c12b97c3750bc63d11e511dcecbfef758003861522a070c2272764ee0f4e3e323862f386945aeb5b85b87ee43f084ba586c + languageName: node + linkType: hard + +"jsonfile@npm:^4.0.0": + version: 4.0.0 + resolution: "jsonfile@npm:4.0.0" + dependencies: + graceful-fs: "npm:^4.1.6" + dependenciesMeta: + graceful-fs: + optional: true + checksum: 10c0/7dc94b628d57a66b71fb1b79510d460d662eb975b5f876d723f81549c2e9cd316d58a2ddf742b2b93a4fa6b17b2accaf1a738a0e2ea114bdfb13a32e5377e480 + languageName: node + linkType: hard + +"jsonfile@npm:^6.0.1": + version: 6.1.0 + resolution: "jsonfile@npm:6.1.0" + dependencies: + graceful-fs: "npm:^4.1.6" + universalify: "npm:^2.0.0" + dependenciesMeta: + graceful-fs: + optional: true + checksum: 10c0/4f95b5e8a5622b1e9e8f33c96b7ef3158122f595998114d1e7f03985649ea99cb3cd99ce1ed1831ae94c8c8543ab45ebd044207612f31a56fd08462140e46865 + languageName: node + linkType: hard + +"jsonparse@npm:^1.2.0": + version: 1.3.1 + resolution: "jsonparse@npm:1.3.1" + checksum: 10c0/89bc68080cd0a0e276d4b5ab1b79cacd68f562467008d176dc23e16e97d4efec9e21741d92ba5087a8433526a45a7e6a9d5ef25408696c402ca1cfbc01a90bf0 + languageName: node + linkType: hard + +"jsx-ast-utils@npm:^2.4.1 || ^3.0.0": + version: 3.3.5 + resolution: "jsx-ast-utils@npm:3.3.5" + dependencies: + array-includes: "npm:^3.1.6" + array.prototype.flat: "npm:^1.3.1" + object.assign: "npm:^4.1.4" + object.values: "npm:^1.1.6" + checksum: 10c0/a32679e9cb55469cb6d8bbc863f7d631b2c98b7fc7bf172629261751a6e7bc8da6ae374ddb74d5fbd8b06cf0eb4572287b259813d92b36e384024ed35e4c13e1 + languageName: node + linkType: hard + +"just-extend@npm:^4.0.2": + version: 4.2.1 + resolution: "just-extend@npm:4.2.1" + checksum: 10c0/ab01b807ae064eee016001df7e958fab9d878a6e2e32119f5f5a94e986daca9d940aa6176889f04c2658e6e3edd75000d7bab1a2376d473ccb20ae571f4b8cbc + languageName: node + linkType: hard + +"keyboardevent-from-electron-accelerator@npm:^2.0.0": + version: 2.0.0 + resolution: "keyboardevent-from-electron-accelerator@npm:2.0.0" + checksum: 10c0/94bd9da6eb80145b36f336adb3f0a55cc8fdf0138f0df3028feb30d790d0727f8de27f040278805a499cc61dba816c8fab012e7f76c2495033d2fd7c2762f309 + languageName: node + linkType: hard + +"keyboardevents-areequal@npm:^0.2.1": + version: 0.2.2 + resolution: "keyboardevents-areequal@npm:0.2.2" + checksum: 10c0/1612c2aa52001163b2517ef6c0ea9abf20117e206e6796ba15eb99c0ae331a8826ab60a18e7ddb8ed0e15272af64d3b14383d2ae832beaa2f68548c1c53e4fa6 + languageName: node + linkType: hard + +"keyv@npm:^4.0.0, keyv@npm:^4.5.3": + version: 4.5.3 + resolution: "keyv@npm:4.5.3" + dependencies: + json-buffer: "npm:3.0.1" + checksum: 10c0/7d3fc0469962bdff75ce92402b216a23d146e0caad011424947b32b95ffc4b91df12b1206026e6e945e7f80b3729a3109c0c3984f23038d738d355491179dd79 + languageName: node + linkType: hard + +"kind-of@npm:^6.0.2, kind-of@npm:^6.0.3": + version: 6.0.3 + resolution: "kind-of@npm:6.0.3" + checksum: 10c0/61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4 + languageName: node + linkType: hard + +"klaw-sync@npm:^6.0.0": + version: 6.0.0 + resolution: "klaw-sync@npm:6.0.0" + dependencies: + graceful-fs: "npm:^4.1.11" + checksum: 10c0/00d8e4c48d0d699b743b3b028e807295ea0b225caf6179f51029e19783a93ad8bb9bccde617d169659fbe99559d73fb35f796214de031d0023c26b906cecd70a + languageName: node + linkType: hard + +"klaw@npm:^3.0.0": + version: 3.0.0 + resolution: "klaw@npm:3.0.0" + dependencies: + graceful-fs: "npm:^4.1.9" + checksum: 10c0/8391cf6df6337dce02e44628b620b39412d007eff162d907d37063c23986041d9b5c3558851d473c2fae92c1ccb0fde8864e36f9c55ac339fc469b517a2caa1b + languageName: node + linkType: hard + +"lamejs@npm:^1.2.0": + version: 1.2.1 + resolution: "lamejs@npm:1.2.1" + dependencies: + use-strict: "npm:1.0.1" + checksum: 10c0/9396e3233f1d5f718f0f09e1c6936dea3332ab64f4d00f2cbdf93226b762faba390fc4b10311d97c92c8cdb666571b5032bd9ede90499a708a26448ead2e5c4a + languageName: node + linkType: hard + +"latest-version@npm:^5.1.0": + version: 5.1.0 + resolution: "latest-version@npm:5.1.0" + dependencies: + package-json: "npm:^6.3.0" + checksum: 10c0/6219631d8651467c54c58ef1b5d5c5c53e146f5ae2b0ecbb78b202da3eaad55b05b043db2d2d6f1d4230ee071b2ae8c2f85089e01377e4338bad97fa76a963b7 + languageName: node + linkType: hard + +"lazy-val@npm:^1.0.4, lazy-val@npm:^1.0.5": + version: 1.0.5 + resolution: "lazy-val@npm:1.0.5" + checksum: 10c0/28ba7a0e704895a444eed47d110274090f485b991f2ea6fff2ab0878c529c53f60f2eb2d944cbbd68b91408e7455eabc62861c48289d4757fa9c818b97454f24 + languageName: node + linkType: hard + +"lcid@npm:^3.0.0": + version: 3.1.1 + resolution: "lcid@npm:3.1.1" + dependencies: + invert-kv: "npm:^3.0.0" + checksum: 10c0/43a39c39d92d756b9671691bb36ac2667c44c4a7e30f55403dc9c98ca4e7bba8c2b35599e8d7967163d65c1697e0d136596e9a9b9bccbd2292caf915c77416a4 + languageName: node + linkType: hard + +"levn@npm:^0.4.1": + version: 0.4.1 + resolution: "levn@npm:0.4.1" + dependencies: + prelude-ls: "npm:^1.2.1" + type-check: "npm:~0.4.0" + checksum: 10c0/effb03cad7c89dfa5bd4f6989364bfc79994c2042ec5966cb9b95990e2edee5cd8969ddf42616a0373ac49fac1403437deaf6e9050fbbaa3546093a59b9ac94e + languageName: node + linkType: hard + +"levn@npm:~0.3.0": + version: 0.3.0 + resolution: "levn@npm:0.3.0" + dependencies: + prelude-ls: "npm:~1.1.2" + type-check: "npm:~0.3.2" + checksum: 10c0/e440df9de4233da0b389cd55bd61f0f6aaff766400bebbccd1231b81801f6dbc1d816c676ebe8d70566394b749fa624b1ed1c68070e9c94999f0bdecc64cb676 + languageName: node + linkType: hard + +"libsession_util_nodejs@portal:/home/audric/pro/contribs/libsession-util-nodejs::locator=session-desktop%40workspace%3A.": + version: 0.0.0-use.local + resolution: "libsession_util_nodejs@portal:/home/audric/pro/contribs/libsession-util-nodejs::locator=session-desktop%40workspace%3A." + dependencies: + cmake-js: "npm:7.2.1" + node-addon-api: "npm:^6.1.0" + languageName: node + linkType: soft + +"libsodium-sumo@npm:^0.7.11": + version: 0.7.11 + resolution: "libsodium-sumo@npm:0.7.11" + checksum: 10c0/f7518d178148d17c04d716898ea8aa5c5ebc302920ff67258a1fbe52e9d4605bb4a9912541db06bce7c16bde9a3af86110b749c869846d087a1b64a921007db8 + languageName: node + linkType: hard + +"libsodium-wrappers-sumo@npm:^0.7.9": + version: 0.7.11 + resolution: "libsodium-wrappers-sumo@npm:0.7.11" + dependencies: + libsodium-sumo: "npm:^0.7.11" + checksum: 10c0/81270738b3e7c50910c34e161aa34d84ab6fbfe9e5256561fc279498b594cb3b090c58ec19d40ada67dc24e7f1f7e018d9fd68d2ae367196116164795b6d2896 + languageName: node + linkType: hard + +"lilconfig@npm:2.1.0": + version: 2.1.0 + resolution: "lilconfig@npm:2.1.0" + checksum: 10c0/64645641aa8d274c99338e130554abd6a0190533c0d9eb2ce7ebfaf2e05c7d9961f3ffe2bfa39efd3b60c521ba3dd24fa236fe2775fc38501bf82bf49d4678b8 + languageName: node + linkType: hard + +"lines-and-columns@npm:^1.1.6": + version: 1.2.4 + resolution: "lines-and-columns@npm:1.2.4" + checksum: 10c0/3da6ee62d4cd9f03f5dc90b4df2540fb85b352081bee77fe4bbcd12c9000ead7f35e0a38b8d09a9bb99b13223446dd8689ff3c4959807620726d788701a83d2d + languageName: node + linkType: hard + +"linkify-it@npm:^3.0.1": + version: 3.0.3 + resolution: "linkify-it@npm:3.0.3" + dependencies: + uc.micro: "npm:^1.0.1" + checksum: 10c0/468cb4954f85cdfc16e169db89a42d65287e3f121a9448b29c3c00d64c6f5a8f4367bea3978ba9109a0e3a10b19d50632b983639f91b9be9f20d1f63a5ff5bc1 + languageName: node + linkType: hard + +"linkify-it@npm:^4.0.1": + version: 4.0.1 + resolution: "linkify-it@npm:4.0.1" + dependencies: + uc.micro: "npm:^1.0.1" + checksum: 10c0/f1949ee2c7c2979c4f80c8c08f507d813f50775ebc5adfdb7ee662f28e0ee53dbd4a329d5231be67414405fc60d4e99b37536d6949702d311fe509a6bcbcf4a6 + languageName: node + linkType: hard + +"lint-staged@npm:^14.0.1": + version: 14.0.1 + resolution: "lint-staged@npm:14.0.1" + dependencies: + chalk: "npm:5.3.0" + commander: "npm:11.0.0" + debug: "npm:4.3.4" + execa: "npm:7.2.0" + lilconfig: "npm:2.1.0" + listr2: "npm:6.6.1" + micromatch: "npm:4.0.5" + pidtree: "npm:0.6.0" + string-argv: "npm:0.3.2" + yaml: "npm:2.3.1" + bin: + lint-staged: bin/lint-staged.js + checksum: 10c0/57291d036123168998cb248ca70974b835edb231dbe0dc395cef44a4073a2c2404215e9cae8657ce562a559fc30cdaa4c20775dff6e8d2aa519243cc8bc294f4 + languageName: node + linkType: hard + +"listr2@npm:6.6.1": + version: 6.6.1 + resolution: "listr2@npm:6.6.1" + dependencies: + cli-truncate: "npm:^3.1.0" + colorette: "npm:^2.0.20" + eventemitter3: "npm:^5.0.1" + log-update: "npm:^5.0.1" + rfdc: "npm:^1.3.0" + wrap-ansi: "npm:^8.1.0" + peerDependencies: + enquirer: ">= 2.3.0 < 3" + peerDependenciesMeta: + enquirer: + optional: true + checksum: 10c0/2abfcd4346b8208e8d406cfe7a058cd10e3238f60de1ee53fa108a507b45b853ceb87e0d1d4ff229bbf6dd6e896262352e0c7a8895b8511cd55fe94304d3921e + languageName: node + linkType: hard + +"loader-runner@npm:^4.2.0": + version: 4.3.0 + resolution: "loader-runner@npm:4.3.0" + checksum: 10c0/a44d78aae0907a72f73966fe8b82d1439c8c485238bd5a864b1b9a2a3257832effa858790241e6b37876b5446a78889adf2fcc8dd897ce54c089ecc0a0ce0bf0 + languageName: node + linkType: hard + +"loader-utils@npm:^2.0.4": + version: 2.0.4 + resolution: "loader-utils@npm:2.0.4" + dependencies: + big.js: "npm:^5.2.2" + emojis-list: "npm:^3.0.0" + json5: "npm:^2.1.2" + checksum: 10c0/d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100 + languageName: node + linkType: hard + +"locate-path@npm:^5.0.0": + version: 5.0.0 + resolution: "locate-path@npm:5.0.0" + dependencies: + p-locate: "npm:^4.1.0" + checksum: 10c0/33a1c5247e87e022f9713e6213a744557a3e9ec32c5d0b5efb10aa3a38177615bf90221a5592674857039c1a0fd2063b82f285702d37b792d973e9e72ace6c59 + languageName: node + linkType: hard + +"locate-path@npm:^6.0.0": + version: 6.0.0 + resolution: "locate-path@npm:6.0.0" + dependencies: + p-locate: "npm:^5.0.0" + checksum: 10c0/d3972ab70dfe58ce620e64265f90162d247e87159b6126b01314dd67be43d50e96a50b517bce2d9452a79409c7614054c277b5232377de50416564a77ac7aad3 + languageName: node + linkType: hard + +"lodash-es@npm:^4.2.1": + version: 4.17.21 + resolution: "lodash-es@npm:4.17.21" + checksum: 10c0/fb407355f7e6cd523a9383e76e6b455321f0f153a6c9625e21a8827d10c54c2a2341bd2ae8d034358b60e07325e1330c14c224ff582d04612a46a4f0479ff2f2 + languageName: node + linkType: hard + +"lodash.camelcase@npm:^4.3.0": + version: 4.3.0 + resolution: "lodash.camelcase@npm:4.3.0" + checksum: 10c0/fcba15d21a458076dd309fce6b1b4bf611d84a0ec252cb92447c948c533ac250b95d2e00955801ebc367e5af5ed288b996d75d37d2035260a937008e14eaf432 + languageName: node + linkType: hard + +"lodash.escaperegexp@npm:^4.1.2": + version: 4.1.2 + resolution: "lodash.escaperegexp@npm:4.1.2" + checksum: 10c0/484ad4067fa9119bb0f7c19a36ab143d0173a081314993fe977bd00cf2a3c6a487ce417a10f6bac598d968364f992153315f0dbe25c9e38e3eb7581dd333e087 + languageName: node + linkType: hard + +"lodash.get@npm:^4.4.2": + version: 4.4.2 + resolution: "lodash.get@npm:4.4.2" + checksum: 10c0/48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e + languageName: node + linkType: hard + +"lodash.isequal@npm:^4.5.0": + version: 4.5.0 + resolution: "lodash.isequal@npm:4.5.0" + checksum: 10c0/dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f + languageName: node + linkType: hard + +"lodash.isfunction@npm:^3.0.9": + version: 3.0.9 + resolution: "lodash.isfunction@npm:3.0.9" + checksum: 10c0/e88620922f5f104819496884779ca85bfc542efb2946df661ab3e2cd38da5c8375434c6adbedfc76dd3c2b04075d2ba8ec215cfdedf08ddd2e3c3467e8a26ccd + languageName: node + linkType: hard + +"lodash.isplainobject@npm:^4.0.6": + version: 4.0.6 + resolution: "lodash.isplainobject@npm:4.0.6" + checksum: 10c0/afd70b5c450d1e09f32a737bed06ff85b873ecd3d3d3400458725283e3f2e0bb6bf48e67dbe7a309eb371a822b16a26cca4a63c8c52db3fc7dc9d5f9dd324cbb + languageName: node + linkType: hard + +"lodash.kebabcase@npm:^4.1.1": + version: 4.1.1 + resolution: "lodash.kebabcase@npm:4.1.1" + checksum: 10c0/da5d8f41dbb5bc723d4bf9203d5096ca8da804d6aec3d2b56457156ba6c8d999ff448d347ebd97490da853cb36696ea4da09a431499f1ee8deb17b094ecf4e33 + languageName: node + linkType: hard + +"lodash.merge@npm:^4.6.2": + version: 4.6.2 + resolution: "lodash.merge@npm:4.6.2" + checksum: 10c0/402fa16a1edd7538de5b5903a90228aa48eb5533986ba7fa26606a49db2572bf414ff73a2c9f5d5fd36b31c46a5d5c7e1527749c07cbcf965ccff5fbdf32c506 + languageName: node + linkType: hard + +"lodash.mergewith@npm:^4.6.2": + version: 4.6.2 + resolution: "lodash.mergewith@npm:4.6.2" + checksum: 10c0/4adbed65ff96fd65b0b3861f6899f98304f90fd71e7f1eb36c1270e05d500ee7f5ec44c02ef979b5ddbf75c0a0b9b99c35f0ad58f4011934c4d4e99e5200b3b5 + languageName: node + linkType: hard + +"lodash.snakecase@npm:^4.1.1": + version: 4.1.1 + resolution: "lodash.snakecase@npm:4.1.1" + checksum: 10c0/f0b3f2497eb20eea1a1cfc22d645ecaeb78ac14593eb0a40057977606d2f35f7aaff0913a06553c783b535aafc55b718f523f9eb78f8d5293f492af41002eaf9 + languageName: node + linkType: hard + +"lodash.startcase@npm:^4.4.0": + version: 4.4.0 + resolution: "lodash.startcase@npm:4.4.0" + checksum: 10c0/bd82aa87a45de8080e1c5ee61128c7aee77bf7f1d86f4ff94f4a6d7438fc9e15e5f03374b947be577a93804c8ad6241f0251beaf1452bf716064eeb657b3a9f0 + languageName: node + linkType: hard + +"lodash.uniq@npm:^4.5.0": + version: 4.5.0 + resolution: "lodash.uniq@npm:4.5.0" + checksum: 10c0/262d400bb0952f112162a320cc4a75dea4f66078b9e7e3075ffbc9c6aa30b3e9df3cf20e7da7d566105e1ccf7804e4fbd7d804eee0b53de05d83f16ffbf41c5e + languageName: node + linkType: hard + +"lodash.upperfirst@npm:^4.3.1": + version: 4.3.1 + resolution: "lodash.upperfirst@npm:4.3.1" + checksum: 10c0/435625da4b3ee74e7a1367a780d9107ab0b13ef4359fc074b2a1a40458eb8d91b655af62f6795b7138d493303a98c0285340160341561d6896e4947e077fa975 + languageName: node + linkType: hard + +"lodash@npm:^4.17.20": + version: 4.17.21 + resolution: "lodash@npm:4.17.21" + checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c + languageName: node + linkType: hard + +"log-symbols@npm:4.1.0": + version: 4.1.0 + resolution: "log-symbols@npm:4.1.0" + dependencies: + chalk: "npm:^4.1.0" + is-unicode-supported: "npm:^0.1.0" + checksum: 10c0/67f445a9ffa76db1989d0fa98586e5bc2fd5247260dafb8ad93d9f0ccd5896d53fb830b0e54dade5ad838b9de2006c826831a3c528913093af20dff8bd24aca6 + languageName: node + linkType: hard + +"log-update@npm:^5.0.1": + version: 5.0.1 + resolution: "log-update@npm:5.0.1" + dependencies: + ansi-escapes: "npm:^5.0.0" + cli-cursor: "npm:^4.0.0" + slice-ansi: "npm:^5.0.0" + strip-ansi: "npm:^7.0.1" + wrap-ansi: "npm:^8.0.1" + checksum: 10c0/1050ea2027e80f32e132aace909987cb00c2719368c78b82ffca681a5b3f4020eeb5f4b4e310c47c35c6c36aff258c1d1bc51485ac44d6fdac9eb0a4275c539f + languageName: node + linkType: hard + +"long@npm:^4.0.0": + version: 4.0.0 + resolution: "long@npm:4.0.0" + checksum: 10c0/50a6417d15b06104dbe4e3d4a667c39b137f130a9108ea8752b352a4cfae047531a3ac351c181792f3f8768fe17cca6b0f406674a541a86fb638aaac560d83ed + languageName: node + linkType: hard + +"long@npm:^5.0.0": + version: 5.2.3 + resolution: "long@npm:5.2.3" + checksum: 10c0/6a0da658f5ef683b90330b1af76f06790c623e148222da9d75b60e266bbf88f803232dd21464575681638894a84091616e7f89557aa087fd14116c0f4e0e43d9 + languageName: node + linkType: hard + +"long@npm:~3": + version: 3.2.0 + resolution: "long@npm:3.2.0" + checksum: 10c0/03884ad097403bda356228899c8397d7e4e2cd26489983034faa8e52ab9f18df4539de548571ad2f574ecf78454fc377bbcd2ba8ba76d567bf973345aefcbdb2 + languageName: node + linkType: hard + +"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0": + version: 1.4.0 + resolution: "loose-envify@npm:1.4.0" + dependencies: + js-tokens: "npm:^3.0.0 || ^4.0.0" + bin: + loose-envify: cli.js + checksum: 10c0/655d110220983c1a4b9c0c679a2e8016d4b67f6e9c7b5435ff5979ecdb20d0813f4dec0a08674fcbdd4846a3f07edbb50a36811fd37930b94aaa0d9daceb017e + languageName: node + linkType: hard + +"loupe@npm:^2.3.1": + version: 2.3.6 + resolution: "loupe@npm:2.3.6" + dependencies: + get-func-name: "npm:^2.0.0" + checksum: 10c0/a974841ce94ef2a35aac7144e7f9e789e3887f82286cd9ffe7ff00f2ac9d117481989948657465e2b0b102f23136d89ae0a18fd4a32d9015012cd64464453289 + languageName: node + linkType: hard + +"lowercase-keys@npm:^2.0.0": + version: 2.0.0 + resolution: "lowercase-keys@npm:2.0.0" + checksum: 10c0/f82a2b3568910509da4b7906362efa40f5b54ea14c2584778ddb313226f9cbf21020a5db35f9b9a0e95847a9b781d548601f31793d736b22a2b8ae8eb9ab1082 + languageName: node + linkType: hard + +"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0": + version: 10.2.2 + resolution: "lru-cache@npm:10.2.2" + checksum: 10c0/402d31094335851220d0b00985084288136136992979d0e015f0f1697e15d1c86052d7d53ae86b614e5b058425606efffc6969a31a091085d7a2b80a8a1e26d6 + languageName: node + linkType: hard + +"lru-cache@npm:^6.0.0": + version: 6.0.0 + resolution: "lru-cache@npm:6.0.0" + dependencies: + yallist: "npm:^4.0.0" + checksum: 10c0/cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9 + languageName: node + linkType: hard + +"lru-cache@npm:^9.1.1 || ^10.0.0": + version: 10.2.0 + resolution: "lru-cache@npm:10.2.0" + checksum: 10c0/c9847612aa2daaef102d30542a8d6d9b2c2bb36581c1bf0dc3ebf5e5f3352c772a749e604afae2e46873b930a9e9523743faac4e5b937c576ab29196774712ee + languageName: node + linkType: hard + +"make-dir@npm:^3.0.0": + version: 3.1.0 + resolution: "make-dir@npm:3.1.0" + dependencies: + semver: "npm:^6.0.0" + checksum: 10c0/56aaafefc49c2dfef02c5c95f9b196c4eb6988040cf2c712185c7fe5c99b4091591a7fc4d4eafaaefa70ff763a26f6ab8c3ff60b9e75ea19876f49b18667ecaa + languageName: node + linkType: hard + +"make-error@npm:^1.1.1": + version: 1.3.6 + resolution: "make-error@npm:1.3.6" + checksum: 10c0/171e458d86854c6b3fc46610cfacf0b45149ba043782558c6875d9f42f222124384ad0b468c92e996d815a8a2003817a710c0a160e49c1c394626f76fa45396f + languageName: node + linkType: hard + +"make-fetch-happen@npm:^13.0.0": + version: 13.0.1 + resolution: "make-fetch-happen@npm:13.0.1" + dependencies: + "@npmcli/agent": "npm:^2.0.0" + cacache: "npm:^18.0.0" + http-cache-semantics: "npm:^4.1.1" + is-lambda: "npm:^1.0.1" + minipass: "npm:^7.0.2" + minipass-fetch: "npm:^3.0.0" + minipass-flush: "npm:^1.0.5" + minipass-pipeline: "npm:^1.2.4" + negotiator: "npm:^0.6.3" + proc-log: "npm:^4.2.0" + promise-retry: "npm:^2.0.1" + ssri: "npm:^10.0.0" + checksum: 10c0/df5f4dbb6d98153b751bccf4dc4cc500de85a96a9331db9805596c46aa9f99d9555983954e6c1266d9f981ae37a9e4647f42b9a4bb5466f867f4012e582c9e7e + languageName: node + linkType: hard + +"map-age-cleaner@npm:^0.1.3": + version: 0.1.3 + resolution: "map-age-cleaner@npm:0.1.3" + dependencies: + p-defer: "npm:^1.0.0" + checksum: 10c0/7495236c7b0950956c144fd8b4bc6399d4e78072a8840a4232fe1c4faccbb5eb5d842e5c0a56a60afc36d723f315c1c672325ca03c1b328650f7fcc478f385fd + languageName: node + linkType: hard + +"map-obj@npm:^1.0.0": + version: 1.0.1 + resolution: "map-obj@npm:1.0.1" + checksum: 10c0/ccca88395e7d38671ed9f5652ecf471ecd546924be2fb900836b9da35e068a96687d96a5f93dcdfa94d9a27d649d2f10a84595590f89a347fb4dda47629dcc52 + languageName: node + linkType: hard + +"map-obj@npm:^4.0.0": + version: 4.3.0 + resolution: "map-obj@npm:4.3.0" + checksum: 10c0/1c19e1c88513c8abdab25c316367154c6a0a6a0f77e3e8c391bb7c0e093aefed293f539d026dc013d86219e5e4c25f23b0003ea588be2101ccd757bacc12d43b + languageName: node + linkType: hard + +"markdown-it-anchor@npm:^8.4.1": + version: 8.6.7 + resolution: "markdown-it-anchor@npm:8.6.7" + peerDependencies: + "@types/markdown-it": "*" + markdown-it: "*" + checksum: 10c0/f117866488013b7e4085a6b59d12bf62879181aef65ea2851f01ed1b763b8c052580c2c27fa8bd009421886220c6beeb373a65af9e885ce63a36ee9f8dcd0e89 + languageName: node + linkType: hard + +"markdown-it@npm:^12.3.2": + version: 12.3.2 + resolution: "markdown-it@npm:12.3.2" + dependencies: + argparse: "npm:^2.0.1" + entities: "npm:~2.1.0" + linkify-it: "npm:^3.0.1" + mdurl: "npm:^1.0.1" + uc.micro: "npm:^1.0.5" + bin: + markdown-it: bin/markdown-it.js + checksum: 10c0/7f97b924e6f90e2c5ccdfb486a19bd7885b938f568a86b527bf6f916a16b01a298e6739f86a99e77acb5e7c020f6c8b34bd726364179b3f820e48b2971a6450c + languageName: node + linkType: hard + +"marked@npm:^4.0.10": + version: 4.3.0 + resolution: "marked@npm:4.3.0" + bin: + marked: bin/marked.js + checksum: 10c0/0013463855e31b9c88d8bb2891a611d10ef1dc79f2e3cbff1bf71ba389e04c5971298c886af0be799d7fa9aa4593b086a136062d59f1210b0480b026a8c5dc47 + languageName: node + linkType: hard + +"matcher@npm:^3.0.0": + version: 3.0.0 + resolution: "matcher@npm:3.0.0" + dependencies: + escape-string-regexp: "npm:^4.0.0" + checksum: 10c0/2edf24194a2879690bcdb29985fc6bc0d003df44e04df21ebcac721fa6ce2f6201c579866bb92f9380bffe946f11ecd8cd31f34117fb67ebf8aca604918e127e + languageName: node + linkType: hard + +"mdn-data@npm:2.0.14": + version: 2.0.14 + resolution: "mdn-data@npm:2.0.14" + checksum: 10c0/67241f8708c1e665a061d2b042d2d243366e93e5bf1f917693007f6d55111588b952dcbfd3ea9c2d0969fb754aad81b30fdcfdcc24546495fc3b24336b28d4bd + languageName: node + linkType: hard + +"mdurl@npm:^1.0.1": + version: 1.0.1 + resolution: "mdurl@npm:1.0.1" + checksum: 10c0/ea8534341eb002aaa532a722daef6074cd8ca66202e10a2b4cda46722c1ebdb1da92197ac300bc953d3ef1bf41cd6561ef2cc69d82d5d0237dae00d4a61a4eee + languageName: node + linkType: hard + +"mem@npm:^5.0.0": + version: 5.1.1 + resolution: "mem@npm:5.1.1" + dependencies: + map-age-cleaner: "npm:^0.1.3" + mimic-fn: "npm:^2.1.0" + p-is-promise: "npm:^2.1.0" + checksum: 10c0/2fa86d04793d95665379d5f45b5aede2d1b88b9ec845db3274956c75bb9e88834a78605b683344d0ca03d45432124774589ca4bd0c83d481b80c2f2cd97914b3 + languageName: node + linkType: hard + +"memory-stream@npm:^1.0.0": + version: 1.0.0 + resolution: "memory-stream@npm:1.0.0" + dependencies: + readable-stream: "npm:^3.4.0" + checksum: 10c0/a2d9abd35845b228055ce5424dbdd8478711ba41325d02e6c8ef9baeba557287d4493a6e74d3db5c9849c58ea13fdc1dd445c96f469cbd02f47d22cfba930306 + languageName: node + linkType: hard + +"meow@npm:^8.0.0, meow@npm:^8.1.2": + version: 8.1.2 + resolution: "meow@npm:8.1.2" + dependencies: + "@types/minimist": "npm:^1.2.0" + camelcase-keys: "npm:^6.2.2" + decamelize-keys: "npm:^1.1.0" + hard-rejection: "npm:^2.1.0" + minimist-options: "npm:4.1.0" + normalize-package-data: "npm:^3.0.0" + read-pkg-up: "npm:^7.0.1" + redent: "npm:^3.0.0" + trim-newlines: "npm:^3.0.0" + type-fest: "npm:^0.18.0" + yargs-parser: "npm:^20.2.3" + checksum: 10c0/9a8d90e616f783650728a90f4ea1e5f763c1c5260369e6596b52430f877f4af8ecbaa8c9d952c93bbefd6d5bda4caed6a96a20ba7d27b511d2971909b01922a2 + languageName: node + linkType: hard + +"merge-stream@npm:^2.0.0": + version: 2.0.0 + resolution: "merge-stream@npm:2.0.0" + checksum: 10c0/867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5 + languageName: node + linkType: hard + +"merge2@npm:^1.3.0, merge2@npm:^1.4.1": + version: 1.4.1 + resolution: "merge2@npm:1.4.1" + checksum: 10c0/254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb + languageName: node + linkType: hard + +"mic-recorder-to-mp3@npm:^2.2.2": + version: 2.2.2 + resolution: "mic-recorder-to-mp3@npm:2.2.2" + dependencies: + lamejs: "npm:^1.2.0" + peerDependencies: + webrtc-adapter: ">=4.1.1" + checksum: 10c0/639bc1ac5885563f64424eda913a7ab6ae3d6c88ea49143d0a6ef409a9b0e9dc4f86573f61578fd3179e4baf8395f765ef36d344054ab669a166497f0f016abb + languageName: node + linkType: hard + +"micromatch@npm:4.0.5, micromatch@npm:^4.0.0, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4": + version: 4.0.5 + resolution: "micromatch@npm:4.0.5" + dependencies: + braces: "npm:^3.0.2" + picomatch: "npm:^2.3.1" + checksum: 10c0/3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff + languageName: node + linkType: hard + +"mime-db@npm:1.52.0": + version: 1.52.0 + resolution: "mime-db@npm:1.52.0" + checksum: 10c0/0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa + languageName: node + linkType: hard + +"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27": + version: 2.1.35 + resolution: "mime-types@npm:2.1.35" + dependencies: + mime-db: "npm:1.52.0" + checksum: 10c0/82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2 + languageName: node + linkType: hard + +"mime@npm:^2.5.2": + version: 2.6.0 + resolution: "mime@npm:2.6.0" + bin: + mime: cli.js + checksum: 10c0/a7f2589900d9c16e3bdf7672d16a6274df903da958c1643c9c45771f0478f3846dcb1097f31eb9178452570271361e2149310931ec705c037210fc69639c8e6c + languageName: node + linkType: hard + +"mimic-fn@npm:^2.1.0": + version: 2.1.0 + resolution: "mimic-fn@npm:2.1.0" + checksum: 10c0/b26f5479d7ec6cc2bce275a08f146cf78f5e7b661b18114e2506dd91ec7ec47e7a25bf4360e5438094db0560bcc868079fb3b1fb3892b833c1ecbf63f80c95a4 + languageName: node + linkType: hard + +"mimic-fn@npm:^4.0.0": + version: 4.0.0 + resolution: "mimic-fn@npm:4.0.0" + checksum: 10c0/de9cc32be9996fd941e512248338e43407f63f6d497abe8441fa33447d922e927de54d4cc3c1a3c6d652857acd770389d5a3823f311a744132760ce2be15ccbf + languageName: node + linkType: hard + +"mimic-response@npm:^1.0.0": + version: 1.0.1 + resolution: "mimic-response@npm:1.0.1" + checksum: 10c0/c5381a5eae997f1c3b5e90ca7f209ed58c3615caeee850e85329c598f0c000ae7bec40196580eef1781c60c709f47258131dab237cad8786f8f56750594f27fa + languageName: node + linkType: hard + +"mimic-response@npm:^3.1.0": + version: 3.1.0 + resolution: "mimic-response@npm:3.1.0" + checksum: 10c0/0d6f07ce6e03e9e4445bee655202153bdb8a98d67ee8dc965ac140900d7a2688343e6b4c9a72cfc9ef2f7944dfd76eef4ab2482eb7b293a68b84916bac735362 + languageName: node + linkType: hard + +"min-indent@npm:^1.0.0": + version: 1.0.1 + resolution: "min-indent@npm:1.0.1" + checksum: 10c0/7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c + languageName: node + linkType: hard + +"mini-css-extract-plugin@npm:^2.7.5": + version: 2.7.6 + resolution: "mini-css-extract-plugin@npm:2.7.6" + dependencies: + schema-utils: "npm:^4.0.0" + peerDependencies: + webpack: ^5.0.0 + checksum: 10c0/4862da928f52c18b37daa52d548c9f2a1ac65c900a48b63f7faa3354d8cfcd21618c049696559e73e2e27fc12d46748e6a490e0b885e54276429607d0d08c156 + languageName: node + linkType: hard + +"minimatch@npm:^3.0.5": + version: 3.1.2 + resolution: "minimatch@npm:3.1.2" + dependencies: + brace-expansion: "npm:^1.1.7" + checksum: 10c0/0262810a8fc2e72cca45d6fd86bd349eee435eb95ac6aa45c9ea2180e7ee875ef44c32b55b5973ceabe95ea12682f6e3725cbb63d7a2d1da3ae1163c8b210311 + languageName: node + linkType: hard + +"minimist-options@npm:4.1.0": + version: 4.1.0 + resolution: "minimist-options@npm:4.1.0" + dependencies: + arrify: "npm:^1.0.1" + is-plain-obj: "npm:^1.1.0" + kind-of: "npm:^6.0.3" + checksum: 10c0/7871f9cdd15d1e7374e5b013e2ceda3d327a06a8c7b38ae16d9ef941e07d985e952c589e57213f7aa90a8744c60aed9524c0d85e501f5478382d9181f2763f54 + languageName: node + linkType: hard + +"minimist@npm:^1.2.6": + version: 1.2.8 + resolution: "minimist@npm:1.2.8" + checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6 + languageName: node + linkType: hard + +"minipass-collect@npm:^2.0.1": + version: 2.0.1 + resolution: "minipass-collect@npm:2.0.1" + dependencies: + minipass: "npm:^7.0.3" + checksum: 10c0/5167e73f62bb74cc5019594709c77e6a742051a647fe9499abf03c71dca75515b7959d67a764bdc4f8b361cf897fbf25e2d9869ee039203ed45240f48b9aa06e + languageName: node + linkType: hard + +"minipass-fetch@npm:^3.0.0": + version: 3.0.5 + resolution: "minipass-fetch@npm:3.0.5" + dependencies: + encoding: "npm:^0.1.13" + minipass: "npm:^7.0.3" + minipass-sized: "npm:^1.0.3" + minizlib: "npm:^2.1.2" + dependenciesMeta: + encoding: + optional: true + checksum: 10c0/9d702d57f556274286fdd97e406fc38a2f5c8d15e158b498d7393b1105974b21249289ec571fa2b51e038a4872bfc82710111cf75fae98c662f3d6f95e72152b + languageName: node + linkType: hard + +"minipass-flush@npm:^1.0.5": + version: 1.0.5 + resolution: "minipass-flush@npm:1.0.5" + dependencies: + minipass: "npm:^3.0.0" + checksum: 10c0/2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd + languageName: node + linkType: hard + +"minipass-pipeline@npm:^1.2.4": + version: 1.2.4 + resolution: "minipass-pipeline@npm:1.2.4" + dependencies: + minipass: "npm:^3.0.0" + checksum: 10c0/cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2 + languageName: node + linkType: hard + +"minipass-sized@npm:^1.0.3": + version: 1.0.3 + resolution: "minipass-sized@npm:1.0.3" + dependencies: + minipass: "npm:^3.0.0" + checksum: 10c0/298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb + languageName: node + linkType: hard + +"minipass@npm:^3.0.0": + version: 3.3.6 + resolution: "minipass@npm:3.3.6" + dependencies: + yallist: "npm:^4.0.0" + checksum: 10c0/a114746943afa1dbbca8249e706d1d38b85ed1298b530f5808ce51f8e9e941962e2a5ad2e00eae7dd21d8a4aae6586a66d4216d1a259385e9d0358f0c1eba16c + languageName: node + linkType: hard + +"minipass@npm:^5.0.0": + version: 5.0.0 + resolution: "minipass@npm:5.0.0" + checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462 + languageName: node + linkType: hard + +"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0": + version: 7.0.4 + resolution: "minipass@npm:7.0.4" + checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5 + languageName: node + linkType: hard + +"minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4": + version: 7.1.1 + resolution: "minipass@npm:7.1.1" + checksum: 10c0/fdccc2f99c31083f45f881fd1e6971d798e333e078ab3c8988fb818c470fbd5e935388ad9adb286397eba50baebf46ef8ff487c8d3f455a69c6f3efc327bdff9 + languageName: node + linkType: hard + +"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": + version: 2.1.2 + resolution: "minizlib@npm:2.1.2" + dependencies: + minipass: "npm:^3.0.0" + yallist: "npm:^4.0.0" + checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78 + languageName: node + linkType: hard + +"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": + version: 1.0.4 + resolution: "mkdirp@npm:1.0.4" + bin: + mkdirp: bin/cmd.js + checksum: 10c0/46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf + languageName: node + linkType: hard + +"mkdirp@npm:~0.5.1": + version: 0.5.6 + resolution: "mkdirp@npm:0.5.6" + dependencies: + minimist: "npm:^1.2.6" + bin: + mkdirp: bin/cmd.js + checksum: 10c0/e2e2be789218807b58abced04e7b49851d9e46e88a2f9539242cc8a92c9b5c3a0b9bab360bd3014e02a140fc4fbc58e31176c408b493f8a2a6f4986bd7527b01 + languageName: node + linkType: hard + +"mocha@npm:10.0.0": + version: 10.0.0 + resolution: "mocha@npm:10.0.0" + dependencies: + "@ungap/promise-all-settled": "npm:1.1.2" + ansi-colors: "npm:4.1.1" + browser-stdout: "npm:1.3.1" + chokidar: "npm:3.5.3" + debug: "npm:4.3.4" + diff: "npm:5.0.0" + escape-string-regexp: "npm:4.0.0" + find-up: "npm:5.0.0" + glob: "npm:7.2.0" + he: "npm:1.2.0" + js-yaml: "npm:4.1.0" + log-symbols: "npm:4.1.0" + minimatch: "npm:5.0.1" + ms: "npm:2.1.3" + nanoid: "npm:3.3.3" + serialize-javascript: "npm:6.0.0" + strip-json-comments: "npm:3.1.1" + supports-color: "npm:8.1.1" + workerpool: "npm:6.2.1" + yargs: "npm:16.2.0" + yargs-parser: "npm:20.2.4" + yargs-unparser: "npm:2.0.0" + bin: + _mocha: bin/_mocha + mocha: bin/mocha.js + checksum: 10c0/45728af7cd5a640bd964e4c1d1c9e5318499e9ba3494493a4bd05b3f03ca55bc51397323e160baab29407a56e7a7223cbb23f03e95a69317b44660099521038f + languageName: node + linkType: hard + +"moment@npm:^2.29.4": + version: 2.29.4 + resolution: "moment@npm:2.29.4" + checksum: 10c0/844c6f3ce42862ac9467c8ca4f5e48a00750078682cc5bda1bc0e50cc7ca88e2115a0f932d65a06e4a90e26cb78892be9b3ca3dd6546ca2c4d994cebb787fc2b + languageName: node + linkType: hard + +"ms@npm:2.0.0": + version: 2.0.0 + resolution: "ms@npm:2.0.0" + checksum: 10c0/f8fda810b39fd7255bbdc451c46286e549794fcc700dc9cd1d25658bbc4dc2563a5de6fe7c60f798a16a60c6ceb53f033cb353f493f0cf63e5199b702943159d + languageName: node + linkType: hard + +"ms@npm:2.1.2": + version: 2.1.2 + resolution: "ms@npm:2.1.2" + checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc + languageName: node + linkType: hard + +"ms@npm:2.1.3, ms@npm:^2.1.1": + version: 2.1.3 + resolution: "ms@npm:2.1.3" + checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48 + languageName: node + linkType: hard + +"mv@npm:~2": + version: 2.1.1 + resolution: "mv@npm:2.1.1" + dependencies: + mkdirp: "npm:~0.5.1" + ncp: "npm:~2.0.0" + rimraf: "npm:~2.4.0" + checksum: 10c0/5da59a9f4ec16da0867289b5018c81c25c59b06bb9da717bc7bd0b40363d6653dc88d6da32a9434fd7416bfc3f67184c306ea44d3856ff97f3214cc96960efcd + languageName: node + linkType: hard + +"nano-css@npm:^5.3.1": + version: 5.3.5 + resolution: "nano-css@npm:5.3.5" + dependencies: + css-tree: "npm:^1.1.2" + csstype: "npm:^3.0.6" + fastest-stable-stringify: "npm:^2.0.2" + inline-style-prefixer: "npm:^6.0.0" + rtl-css-js: "npm:^1.14.0" + sourcemap-codec: "npm:^1.4.8" + stacktrace-js: "npm:^2.0.2" + stylis: "npm:^4.0.6" + peerDependencies: + react: "*" + react-dom: "*" + checksum: 10c0/6f9f3b0cd68758514ac2a61ad7d846c2ba57da49a076cbaf2a4871f4c5f0f1f1bbd87ea557de4440a8ee67f1dc6314e3f0ed26805984f2f2eb819856f87a8c7c + languageName: node + linkType: hard + +"nanoid@npm:3.3.3": + version: 3.3.3 + resolution: "nanoid@npm:3.3.3" + bin: + nanoid: bin/nanoid.cjs + checksum: 10c0/d7ab68893cdb92dd2152d505e56571d571c65b71a9815f9dfb3c9a8cbf943fe43c9777d9a95a3b81ef01e442fec8409a84375c08f90a5753610a9f22672d953a + languageName: node + linkType: hard + +"nanoid@npm:^3.3.6": + version: 3.3.6 + resolution: "nanoid@npm:3.3.6" + bin: + nanoid: bin/nanoid.cjs + checksum: 10c0/606b355960d0fcbe3d27924c4c52ef7d47d3b57208808ece73279420d91469b01ec1dce10fae512b6d4a8c5a5432b352b228336a8b2202a6ea68e67fa348e2ee + languageName: node + linkType: hard + +"natural-compare@npm:^1.4.0": + version: 1.4.0 + resolution: "natural-compare@npm:1.4.0" + checksum: 10c0/f5f9a7974bfb28a91afafa254b197f0f22c684d4a1731763dda960d2c8e375b36c7d690e0d9dc8fba774c537af14a7e979129bca23d88d052fbeb9466955e447 + languageName: node + linkType: hard + +"ncp@npm:~2.0.0": + version: 2.0.0 + resolution: "ncp@npm:2.0.0" + bin: + ncp: ./bin/ncp + checksum: 10c0/d515babf9d3205ab9252e7d640af7c3e1a880317016d41f2fce2e6b9c8f60eb8bb6afde30e8c4f8e1e3fa551465f094433c3f364b25a85d6a28ec52c1ad6e067 + languageName: node + linkType: hard + +"negotiator@npm:^0.6.3": + version: 0.6.3 + resolution: "negotiator@npm:0.6.3" + checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2 + languageName: node + linkType: hard + +"neo-async@npm:^2.6.2": + version: 2.6.2 + resolution: "neo-async@npm:2.6.2" + checksum: 10c0/c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d + languageName: node + linkType: hard + +"nice-try@npm:^1.0.4": + version: 1.0.5 + resolution: "nice-try@npm:1.0.5" + checksum: 10c0/95568c1b73e1d0d4069a3e3061a2102d854513d37bcfda73300015b7ba4868d3b27c198d1dbbd8ebdef4112fc2ed9e895d4a0f2e1cce0bd334f2a1346dc9205f + languageName: node + linkType: hard + +"nise@npm:^4.0.1": + version: 4.1.0 + resolution: "nise@npm:4.1.0" + dependencies: + "@sinonjs/commons": "npm:^1.7.0" + "@sinonjs/fake-timers": "npm:^6.0.0" + "@sinonjs/text-encoding": "npm:^0.7.1" + just-extend: "npm:^4.0.2" + path-to-regexp: "npm:^1.7.0" + checksum: 10c0/63ddcb88bb979f7fccbb8094af9ffc8e12753665eae34367fc31bbbbf5f2c7694146a1379e89043a3ac8d30be77653ce1abbaa5f7aaeaab95d9578b714817e00 + languageName: node + linkType: hard + +"node-addon-api@npm:^1.6.3": + version: 1.7.2 + resolution: "node-addon-api@npm:1.7.2" + dependencies: + node-gyp: "npm:latest" + checksum: 10c0/bcf526f2ce788182730d3c3df5206585873d1e837a6e1378ff84abccf2f19cf3f93a8274f9c1245af0de63a0dbd1bb95ca2f767ecf5c678d6930326aaf396c4e + languageName: node + linkType: hard + +"node-addon-api@npm:^6.1.0": + version: 6.1.0 + resolution: "node-addon-api@npm:6.1.0" + dependencies: + node-gyp: "npm:latest" + checksum: 10c0/d2699c4ad15740fd31482a3b6fca789af7723ab9d393adc6ac45250faaee72edad8f0b10b2b9d087df0de93f1bdc16d97afdd179b26b9ebc9ed68b569faa4bac + languageName: node + linkType: hard + +"node-api-headers@npm:^0.0.2": + version: 0.0.2 + resolution: "node-api-headers@npm:0.0.2" + checksum: 10c0/0b1ea35d66b2be61427df8a94a0468a2979b32263fd6f4203d1e249738a89a7b6a803bd12fbe81ac731e4dab5f385968937ed4462811685700cc5b48ae316b59 + languageName: node + linkType: hard + +"node-fetch@npm:^2.6.7": + version: 2.7.0 + resolution: "node-fetch@npm:2.7.0" + dependencies: + whatwg-url: "npm:^5.0.0" + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + checksum: 10c0/b55786b6028208e6fbe594ccccc213cab67a72899c9234eb59dba51062a299ea853210fcf526998eaa2867b0963ad72338824450905679ff0fa304b8c5093ae8 + languageName: node + linkType: hard + +"node-gyp@npm:latest": + version: 10.1.0 + resolution: "node-gyp@npm:10.1.0" + dependencies: + env-paths: "npm:^2.2.0" + exponential-backoff: "npm:^3.1.1" + glob: "npm:^10.3.10" + graceful-fs: "npm:^4.2.6" + make-fetch-happen: "npm:^13.0.0" + nopt: "npm:^7.0.0" + proc-log: "npm:^3.0.0" + semver: "npm:^7.3.5" + tar: "npm:^6.1.2" + which: "npm:^4.0.0" + bin: + node-gyp: bin/node-gyp.js + checksum: 10c0/9cc821111ca244a01fb7f054db7523ab0a0cd837f665267eb962eb87695d71fb1e681f9e21464cc2fd7c05530dc4c81b810bca1a88f7d7186909b74477491a3c + languageName: node + linkType: hard + +"node-loader@npm:^2.0.0": + version: 2.0.0 + resolution: "node-loader@npm:2.0.0" + dependencies: + loader-utils: "npm:^2.0.0" + peerDependencies: + webpack: ^5.0.0 + checksum: 10c0/ceacf34ccb05c5efe7fbed2224dfa42ec9dd8e5bd70e9dc90bb618ee6372cc1ff54edc60d1d71f4ff52c4b4db0ac410caa6ae74d90bbc68b88a70bba5f75c727 + languageName: node + linkType: hard + +"node-releases@npm:^2.0.13": + version: 2.0.13 + resolution: "node-releases@npm:2.0.13" + checksum: 10c0/2fb44bf70fc949d27f3a48a7fd1a9d1d603ddad4ccd091f26b3fb8b1da976605d919330d7388ccd55ca2ade0dc8b2e12841ba19ef249c8bb29bf82532d401af7 + languageName: node + linkType: hard + +"nopt@npm:^7.0.0": + version: 7.2.1 + resolution: "nopt@npm:7.2.1" + dependencies: + abbrev: "npm:^2.0.0" + bin: + nopt: bin/nopt.js + checksum: 10c0/a069c7c736767121242037a22a788863accfa932ab285a1eb569eb8cd534b09d17206f68c37f096ae785647435e0c5a5a0a67b42ec743e481a455e5ae6a6df81 + languageName: node + linkType: hard + +"normalize-package-data@npm:^2.5.0": + version: 2.5.0 + resolution: "normalize-package-data@npm:2.5.0" + dependencies: + hosted-git-info: "npm:^2.1.4" + resolve: "npm:^1.10.0" + semver: "npm:2 || 3 || 4 || 5" + validate-npm-package-license: "npm:^3.0.1" + checksum: 10c0/357cb1646deb42f8eb4c7d42c4edf0eec312f3628c2ef98501963cc4bbe7277021b2b1d977f982b2edce78f5a1014613ce9cf38085c3df2d76730481357ca504 + languageName: node + linkType: hard + +"normalize-package-data@npm:^3.0.0": + version: 3.0.3 + resolution: "normalize-package-data@npm:3.0.3" + dependencies: + hosted-git-info: "npm:^4.0.1" + is-core-module: "npm:^2.5.0" + semver: "npm:^7.3.4" + validate-npm-package-license: "npm:^3.0.1" + checksum: 10c0/e5d0f739ba2c465d41f77c9d950e291ea4af78f8816ddb91c5da62257c40b76d8c83278b0d08ffbcd0f187636ebddad20e181e924873916d03e6e5ea2ef026be + languageName: node + linkType: hard + +"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": + version: 3.0.0 + resolution: "normalize-path@npm:3.0.0" + checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046 + languageName: node + linkType: hard + +"normalize-url@npm:^6.0.1": + version: 6.1.0 + resolution: "normalize-url@npm:6.1.0" + checksum: 10c0/95d948f9bdd2cfde91aa786d1816ae40f8262946e13700bf6628105994fe0ff361662c20af3961161c38a119dc977adeb41fc0b41b1745eb77edaaf9cb22db23 + languageName: node + linkType: hard + +"npm-run-path@npm:^4.0.0, npm-run-path@npm:^4.0.1": + version: 4.0.1 + resolution: "npm-run-path@npm:4.0.1" + dependencies: + path-key: "npm:^3.0.0" + checksum: 10c0/6f9353a95288f8455cf64cbeb707b28826a7f29690244c1e4bb61ec573256e021b6ad6651b394eb1ccfd00d6ec50147253aba2c5fe58a57ceb111fad62c519ac + languageName: node + linkType: hard + +"npm-run-path@npm:^5.1.0": + version: 5.1.0 + resolution: "npm-run-path@npm:5.1.0" + dependencies: + path-key: "npm:^4.0.0" + checksum: 10c0/ff6d77514489f47fa1c3b1311d09cd4b6d09a874cc1866260f9dea12cbaabda0436ed7f8c2ee44d147bf99a3af29307c6f63b0f83d242b0b6b0ab25dff2629e3 + languageName: node + linkType: hard + +"npmlog@npm:^6.0.2": + version: 6.0.2 + resolution: "npmlog@npm:6.0.2" + dependencies: + are-we-there-yet: "npm:^3.0.0" + console-control-strings: "npm:^1.1.0" + gauge: "npm:^4.0.3" + set-blocking: "npm:^2.0.0" + checksum: 10c0/0cacedfbc2f6139c746d9cd4a85f62718435ad0ca4a2d6459cd331dd33ae58206e91a0742c1558634efcde3f33f8e8e7fd3adf1bfe7978310cf00bd55cccf890 + languageName: node + linkType: hard + +"nwsapi@npm:^2.2.4": + version: 2.2.7 + resolution: "nwsapi@npm:2.2.7" + checksum: 10c0/44be198adae99208487a1c886c0a3712264f7bbafa44368ad96c003512fed2753d4e22890ca1e6edb2690c3456a169f2a3c33bfacde1905cf3bf01c7722464db + languageName: node + linkType: hard + +"object-assign@npm:^4.1.1": + version: 4.1.1 + resolution: "object-assign@npm:4.1.1" + checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414 + languageName: node + linkType: hard + +"object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0": + version: 1.12.3 + resolution: "object-inspect@npm:1.12.3" + checksum: 10c0/752bb5f4dc595e214157ea8f442adb77bdb850ace762b078d151d8b6486331ab12364997a89ee6509be1023b15adf2b3774437a7105f8a5043dfda11ed622411 + languageName: node + linkType: hard + +"object-inspect@npm:^1.13.1": + version: 1.13.1 + resolution: "object-inspect@npm:1.13.1" + checksum: 10c0/fad603f408e345c82e946abdf4bfd774260a5ed3e5997a0b057c44153ac32c7271ff19e3a5ae39c858da683ba045ccac2f65245c12763ce4e8594f818f4a648d + languageName: node + linkType: hard + +"object-keys@npm:^1.1.1": + version: 1.1.1 + resolution: "object-keys@npm:1.1.1" + checksum: 10c0/b11f7ccdbc6d406d1f186cdadb9d54738e347b2692a14439ca5ac70c225fa6db46db809711b78589866d47b25fc3e8dee0b4c722ac751e11180f9380e3d8601d + languageName: node + linkType: hard + +"object.assign@npm:^4.1.2, object.assign@npm:^4.1.4": + version: 4.1.4 + resolution: "object.assign@npm:4.1.4" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.4" + has-symbols: "npm:^1.0.3" + object-keys: "npm:^1.1.1" + checksum: 10c0/2f286118c023e557757620e647b02e7c88d3d417e0c568fca0820de8ec9cca68928304854d5b03e99763eddad6e78a6716e2930f7e6372e4b9b843f3fd3056f3 + languageName: node + linkType: hard + +"object.assign@npm:^4.1.5": + version: 4.1.5 + resolution: "object.assign@npm:4.1.5" + dependencies: + call-bind: "npm:^1.0.5" + define-properties: "npm:^1.2.1" + has-symbols: "npm:^1.0.3" + object-keys: "npm:^1.1.1" + checksum: 10c0/60108e1fa2706f22554a4648299b0955236c62b3685c52abf4988d14fffb0e7731e00aa8c6448397e3eb63d087dcc124a9f21e1980f36d0b2667f3c18bacd469 + languageName: node + linkType: hard + +"object.entries@npm:^1.1.5, object.entries@npm:^1.1.6": + version: 1.1.7 + resolution: "object.entries@npm:1.1.7" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + checksum: 10c0/3ad1899cc7bf14546bf28f4a9b363ae8690b90948fcfbcac4c808395435d760f26193d9cae95337ce0e3c1e5c1f4fa45f7b46b31b68d389e9e117fce38775d86 + languageName: node + linkType: hard + +"object.fromentries@npm:^2.0.6, object.fromentries@npm:^2.0.7": + version: 2.0.7 + resolution: "object.fromentries@npm:2.0.7" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + checksum: 10c0/071745c21f6fc9e6c914691f2532c1fb60ad967e5ddc52801d09958b5de926566299d07ae14466452a7efd29015f9145d6c09c573d93a0dc6f1683ee0ec2b93b + languageName: node + linkType: hard + +"object.groupby@npm:^1.0.1": + version: 1.0.2 + resolution: "object.groupby@npm:1.0.2" + dependencies: + array.prototype.filter: "npm:^1.0.3" + call-bind: "npm:^1.0.5" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.22.3" + es-errors: "npm:^1.0.0" + checksum: 10c0/b6266b1cfec7eb784b8bbe0bca5dc4b371cf9dd3e601b0897d72fa97a5934273d8fb05b3fc5222204104dbec32b50e25ba27e05ad681f71fb739cc1c7e9b81b1 + languageName: node + linkType: hard + +"object.hasown@npm:^1.1.2": + version: 1.1.3 + resolution: "object.hasown@npm:1.1.3" + dependencies: + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + checksum: 10c0/8a41ba4fb1208a85c2275e9b5098071beacc24345b9a71ab98ef0a1c61b34dc74c6b460ff1e1884c33843d8f2553df64a10eec2b74b3ed009e3b2710c826bd2c + languageName: node + linkType: hard + +"object.values@npm:^1.1.6, object.values@npm:^1.1.7": + version: 1.1.7 + resolution: "object.values@npm:1.1.7" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + checksum: 10c0/e869d6a37fb7afdd0054dea49036d6ccebb84854a8848a093bbd1bc516f53e690bba88f0bc3e83fdfa74c601469ee6989c9b13359cda9604144c6e732fad3b6b + languageName: node + linkType: hard + +"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": + version: 1.4.0 + resolution: "once@npm:1.4.0" + dependencies: + wrappy: "npm:1" + checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0 + languageName: node + linkType: hard + +"onetime@npm:^5.1.0, onetime@npm:^5.1.2": + version: 5.1.2 + resolution: "onetime@npm:5.1.2" + dependencies: + mimic-fn: "npm:^2.1.0" + checksum: 10c0/ffcef6fbb2692c3c40749f31ea2e22677a876daea92959b8a80b521d95cca7a668c884d8b2045d1d8ee7d56796aa405c405462af112a1477594cc63531baeb8f + languageName: node + linkType: hard + +"onetime@npm:^6.0.0": + version: 6.0.0 + resolution: "onetime@npm:6.0.0" + dependencies: + mimic-fn: "npm:^4.0.0" + checksum: 10c0/4eef7c6abfef697dd4479345a4100c382d73c149d2d56170a54a07418c50816937ad09500e1ed1e79d235989d073a9bade8557122aee24f0576ecde0f392bb6c + languageName: node + linkType: hard + +"open@npm:^7.4.2": + version: 7.4.2 + resolution: "open@npm:7.4.2" + dependencies: + is-docker: "npm:^2.0.0" + is-wsl: "npm:^2.1.1" + checksum: 10c0/77573a6a68f7364f3a19a4c80492712720746b63680ee304555112605ead196afe91052bd3c3d165efdf4e9d04d255e87de0d0a77acec11ef47fd5261251813f + languageName: node + linkType: hard + +"optionator@npm:^0.8.1": + version: 0.8.3 + resolution: "optionator@npm:0.8.3" + dependencies: + deep-is: "npm:~0.1.3" + fast-levenshtein: "npm:~2.0.6" + levn: "npm:~0.3.0" + prelude-ls: "npm:~1.1.2" + type-check: "npm:~0.3.2" + word-wrap: "npm:~1.2.3" + checksum: 10c0/ad7000ea661792b3ec5f8f86aac28895850988926f483b5f308f59f4607dfbe24c05df2d049532ee227c040081f39401a268cf7bbf3301512f74c4d760dc6dd8 + languageName: node + linkType: hard + +"optionator@npm:^0.9.3": + version: 0.9.3 + resolution: "optionator@npm:0.9.3" + dependencies: + "@aashutoshrathi/word-wrap": "npm:^1.2.3" + deep-is: "npm:^0.1.3" + fast-levenshtein: "npm:^2.0.6" + levn: "npm:^0.4.1" + prelude-ls: "npm:^1.2.1" + type-check: "npm:^0.4.0" + checksum: 10c0/66fba794d425b5be51353035cf3167ce6cfa049059cbb93229b819167687e0f48d2bc4603fcb21b091c99acb516aae1083624675b15c4765b2e4693a085e959c + languageName: node + linkType: hard + +"os-homedir@npm:1.0.2": + version: 1.0.2 + resolution: "os-homedir@npm:1.0.2" + checksum: 10c0/6be4aa67317ee247b8d46142e243fb4ef1d2d65d3067f54bfc5079257a2f4d4d76b2da78cba7af3cb3f56dbb2e4202e0c47f26171d11ca1ed4008d842c90363f + languageName: node + linkType: hard + +"os-locale@npm:5.0.0": + version: 5.0.0 + resolution: "os-locale@npm:5.0.0" + dependencies: + execa: "npm:^4.0.0" + lcid: "npm:^3.0.0" + mem: "npm:^5.0.0" + checksum: 10c0/f86237f8e6110651e5b10462ec45bbc7b9940fe2b65cba1fd0e07e2790762881f1835fd71316065326c528b0fb54301e85a1fa2f8ab144bfa587fffa04c735d6 + languageName: node + linkType: hard + +"os-tmpdir@npm:~1.0.2": + version: 1.0.2 + resolution: "os-tmpdir@npm:1.0.2" + checksum: 10c0/f438450224f8e2687605a8dd318f0db694b6293c5d835ae509a69e97c8de38b6994645337e5577f5001115470414638978cc49da1cdcc25106dad8738dc69990 + languageName: node + linkType: hard + +"p-cancelable@npm:^2.0.0": + version: 2.1.1 + resolution: "p-cancelable@npm:2.1.1" + checksum: 10c0/8c6dc1f8dd4154fd8b96a10e55a3a832684c4365fb9108056d89e79fbf21a2465027c04a59d0d797b5ffe10b54a61a32043af287d5c4860f1e996cbdbc847f01 + languageName: node + linkType: hard + +"p-defer@npm:^1.0.0": + version: 1.0.0 + resolution: "p-defer@npm:1.0.0" + checksum: 10c0/ed603c3790e74b061ac2cb07eb6e65802cf58dce0fbee646c113a7b71edb711101329ad38f99e462bd2e343a74f6e9366b496a35f1d766c187084d3109900487 + languageName: node + linkType: hard + +"p-is-promise@npm:^2.1.0": + version: 2.1.0 + resolution: "p-is-promise@npm:2.1.0" + checksum: 10c0/115c50960739c26e9b3e8a3bd453341a3b02a2e5ba41109b904ff53deb0b941ef81b196e106dc11f71698f591b23055c82d81188b7b670e9d5e28bc544b0674d + languageName: node + linkType: hard + +"p-limit@npm:^2.2.0": + version: 2.3.0 + resolution: "p-limit@npm:2.3.0" + dependencies: + p-try: "npm:^2.0.0" + checksum: 10c0/8da01ac53efe6a627080fafc127c873da40c18d87b3f5d5492d465bb85ec7207e153948df6b9cbaeb130be70152f874229b8242ee2be84c0794082510af97f12 + languageName: node + linkType: hard + +"p-limit@npm:^3.0.2": + version: 3.1.0 + resolution: "p-limit@npm:3.1.0" + dependencies: + yocto-queue: "npm:^0.1.0" + checksum: 10c0/9db675949dbdc9c3763c89e748d0ef8bdad0afbb24d49ceaf4c46c02c77d30db4e0652ed36d0a0a7a95154335fab810d95c86153105bb73b3a90448e2bb14e1a + languageName: node + linkType: hard + +"p-locate@npm:^4.1.0": + version: 4.1.0 + resolution: "p-locate@npm:4.1.0" + dependencies: + p-limit: "npm:^2.2.0" + checksum: 10c0/1b476ad69ad7f6059744f343b26d51ce091508935c1dbb80c4e0a2f397ffce0ca3a1f9f5cd3c7ce19d7929a09719d5c65fe70d8ee289c3f267cd36f2881813e9 + languageName: node + linkType: hard + +"p-locate@npm:^5.0.0": + version: 5.0.0 + resolution: "p-locate@npm:5.0.0" + dependencies: + p-limit: "npm:^3.0.2" + checksum: 10c0/2290d627ab7903b8b70d11d384fee714b797f6040d9278932754a6860845c4d3190603a0772a663c8cb5a7b21d1b16acb3a6487ebcafa9773094edc3dfe6009a + languageName: node + linkType: hard + +"p-map@npm:^4.0.0": + version: 4.0.0 + resolution: "p-map@npm:4.0.0" + dependencies: + aggregate-error: "npm:^3.0.0" + checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75 + languageName: node + linkType: hard + +"p-retry@npm:^4.2.0": + version: 4.6.2 + resolution: "p-retry@npm:4.6.2" + dependencies: + "@types/retry": "npm:0.12.0" + retry: "npm:^0.13.1" + checksum: 10c0/d58512f120f1590cfedb4c2e0c42cb3fa66f3cea8a4646632fcb834c56055bb7a6f138aa57b20cc236fb207c9d694e362e0b5c2b14d9b062f67e8925580c73b0 + languageName: node + linkType: hard + +"p-try@npm:^2.0.0": + version: 2.2.0 + resolution: "p-try@npm:2.2.0" + checksum: 10c0/c36c19907734c904b16994e6535b02c36c2224d433e01a2f1ab777237f4d86e6289fd5fd464850491e940379d4606ed850c03e0f9ab600b0ebddb511312e177f + languageName: node + linkType: hard + +"package-json@npm:^6.3.0": + version: 6.5.0 + resolution: "package-json@npm:6.5.0" + dependencies: + got: "npm:^9.6.0" + registry-auth-token: "npm:^4.0.0" + registry-url: "npm:^5.0.0" + semver: "npm:^6.2.0" + checksum: 10c0/60c29fe357af43f96c92c334aa0160cebde44e8e65c1e5f9b065efb3f501af812f268ec967a07757b56447834ef7f71458ebbab94425a9f09c271f348f9b764f + languageName: node + linkType: hard + +"parent-module@npm:^1.0.0": + version: 1.0.1 + resolution: "parent-module@npm:1.0.1" + dependencies: + callsites: "npm:^3.0.0" + checksum: 10c0/c63d6e80000d4babd11978e0d3fee386ca7752a02b035fd2435960ffaa7219dc42146f07069fb65e6e8bf1caef89daf9af7535a39bddf354d78bf50d8294f556 + languageName: node + linkType: hard + +"parse-json@npm:^5.0.0, parse-json@npm:^5.2.0": + version: 5.2.0 + resolution: "parse-json@npm:5.2.0" + dependencies: + "@babel/code-frame": "npm:^7.0.0" + error-ex: "npm:^1.3.1" + json-parse-even-better-errors: "npm:^2.3.0" + lines-and-columns: "npm:^1.1.6" + checksum: 10c0/77947f2253005be7a12d858aedbafa09c9ae39eb4863adf330f7b416ca4f4a08132e453e08de2db46459256fb66afaac5ee758b44fe6541b7cdaf9d252e59585 + languageName: node + linkType: hard + +"parse5@npm:^7.1.2": + version: 7.1.2 + resolution: "parse5@npm:7.1.2" + dependencies: + entities: "npm:^4.4.0" + checksum: 10c0/297d7af8224f4b5cb7f6617ecdae98eeaed7f8cbd78956c42785e230505d5a4f07cef352af10d3006fa5c1544b76b57784d3a22d861ae071bbc460c649482bf4 + languageName: node + linkType: hard + +"patch-package@npm:^6.4.7": + version: 6.5.1 + resolution: "patch-package@npm:6.5.1" + dependencies: + "@yarnpkg/lockfile": "npm:^1.1.0" + chalk: "npm:^4.1.2" + cross-spawn: "npm:^6.0.5" + find-yarn-workspace-root: "npm:^2.0.0" + fs-extra: "npm:^9.0.0" + is-ci: "npm:^2.0.0" + klaw-sync: "npm:^6.0.0" + minimist: "npm:^1.2.6" + open: "npm:^7.4.2" + rimraf: "npm:^2.6.3" + semver: "npm:^5.6.0" + slash: "npm:^2.0.0" + tmp: "npm:^0.0.33" + yaml: "npm:^1.10.2" + bin: + patch-package: index.js + checksum: 10c0/0f74d6099b05431c88a60308bd9ec0b1f9d3ae436026f488cfe99476ae74e7a464be4a16a7c83c7b89c23764502c79d37227cf27b17c30b9b2e4d577f8aecedb + languageName: node + linkType: hard + +"path-exists@npm:^4.0.0": + version: 4.0.0 + resolution: "path-exists@npm:4.0.0" + checksum: 10c0/8c0bd3f5238188197dc78dced15207a4716c51cc4e3624c44fc97acf69558f5ebb9a2afff486fe1b4ee148e0c133e96c5e11a9aa5c48a3006e3467da070e5e1b + languageName: node + linkType: hard + +"path-is-absolute@npm:^1.0.0": + version: 1.0.1 + resolution: "path-is-absolute@npm:1.0.1" + checksum: 10c0/127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078 + languageName: node + linkType: hard + +"path-key@npm:^2.0.1": + version: 2.0.1 + resolution: "path-key@npm:2.0.1" + checksum: 10c0/dd2044f029a8e58ac31d2bf34c34b93c3095c1481942960e84dd2faa95bbb71b9b762a106aead0646695330936414b31ca0bd862bf488a937ad17c8c5d73b32b + languageName: node + linkType: hard + +"path-key@npm:^3.0.0, path-key@npm:^3.1.0": + version: 3.1.1 + resolution: "path-key@npm:3.1.1" + checksum: 10c0/748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c + languageName: node + linkType: hard + +"path-key@npm:^4.0.0": + version: 4.0.0 + resolution: "path-key@npm:4.0.0" + checksum: 10c0/794efeef32863a65ac312f3c0b0a99f921f3e827ff63afa5cb09a377e202c262b671f7b3832a4e64731003fa94af0263713962d317b9887bd1e0c48a342efba3 + languageName: node + linkType: hard + +"path-parse@npm:^1.0.7": + version: 1.0.7 + resolution: "path-parse@npm:1.0.7" + checksum: 10c0/11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1 + languageName: node + linkType: hard + +"path-scurry@npm:^1.10.1": + version: 1.10.1 + resolution: "path-scurry@npm:1.10.1" + dependencies: + lru-cache: "npm:^9.1.1 || ^10.0.0" + minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" + checksum: 10c0/e5dc78a7348d25eec61ab166317e9e9c7b46818aa2c2b9006c507a6ff48c672d011292d9662527213e558f5652ce0afcc788663a061d8b59ab495681840c0c1e + languageName: node + linkType: hard + +"path-scurry@npm:^1.11.0": + version: 1.11.1 + resolution: "path-scurry@npm:1.11.1" + dependencies: + lru-cache: "npm:^10.2.0" + minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" + checksum: 10c0/32a13711a2a505616ae1cc1b5076801e453e7aae6ac40ab55b388bb91b9d0547a52f5aaceff710ea400205f18691120d4431e520afbe4266b836fadede15872d + languageName: node + linkType: hard + +"path-to-regexp@npm:^1.7.0": + version: 1.8.0 + resolution: "path-to-regexp@npm:1.8.0" + dependencies: + isarray: "npm:0.0.1" + checksum: 10c0/7b25d6f27a8de03f49406d16195450f5ced694398adea1510b0f949d9660600d1769c5c6c83668583b7e6b503f3caf1ede8ffc08135dbe3e982f034f356fbb5c + languageName: node + linkType: hard + +"path-type@npm:^4.0.0": + version: 4.0.0 + resolution: "path-type@npm:4.0.0" + checksum: 10c0/666f6973f332f27581371efaf303fd6c272cc43c2057b37aa99e3643158c7e4b2626549555d88626e99ea9e046f82f32e41bbde5f1508547e9a11b149b52387c + languageName: node + linkType: hard + +"pathval@npm:^1.1.1": + version: 1.1.1 + resolution: "pathval@npm:1.1.1" + checksum: 10c0/f63e1bc1b33593cdf094ed6ff5c49c1c0dc5dc20a646ca9725cc7fe7cd9995002d51d5685b9b2ec6814342935748b711bafa840f84c0bb04e38ff40a335c94dc + languageName: node + linkType: hard + +"pend@npm:~1.2.0": + version: 1.2.0 + resolution: "pend@npm:1.2.0" + checksum: 10c0/8a87e63f7a4afcfb0f9f77b39bb92374afc723418b9cb716ee4257689224171002e07768eeade4ecd0e86f1fa3d8f022994219fb45634f2dbd78c6803e452458 + languageName: node + linkType: hard + +"picocolors@npm:^1.0.0": + version: 1.0.0 + resolution: "picocolors@npm:1.0.0" + checksum: 10c0/20a5b249e331c14479d94ec6817a182fd7a5680debae82705747b2db7ec50009a5f6648d0621c561b0572703f84dbef0858abcbd5856d3c5511426afcb1961f7 + languageName: node + linkType: hard + +"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.3.1": + version: 2.3.1 + resolution: "picomatch@npm:2.3.1" + checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be + languageName: node + linkType: hard + +"pidtree@npm:0.6.0": + version: 0.6.0 + resolution: "pidtree@npm:0.6.0" + bin: + pidtree: bin/pidtree.js + checksum: 10c0/0829ec4e9209e230f74ebf4265f5ccc9ebfb488334b525cb13f86ff801dca44b362c41252cd43ae4d7653a10a5c6ab3be39d2c79064d6895e0d78dc50a5ed6e9 + languageName: node + linkType: hard + +"pkg-dir@npm:^4.2.0": + version: 4.2.0 + resolution: "pkg-dir@npm:4.2.0" + dependencies: + find-up: "npm:^4.0.0" + checksum: 10c0/c56bda7769e04907a88423feb320babaed0711af8c436ce3e56763ab1021ba107c7b0cafb11cde7529f669cfc22bffcaebffb573645cbd63842ea9fb17cd7728 + languageName: node + linkType: hard + +"plist@npm:^3.0.1, plist@npm:^3.0.4": + version: 3.1.0 + resolution: "plist@npm:3.1.0" + dependencies: + "@xmldom/xmldom": "npm:^0.8.8" + base64-js: "npm:^1.5.1" + xmlbuilder: "npm:^15.1.1" + checksum: 10c0/db19ba50faafc4103df8e79bcd6b08004a56db2a9dd30b3e5c8b0ef30398ef44344a674e594d012c8fc39e539a2b72cb58c60a76b4b4401cbbc7c8f6b028d93d + languageName: node + linkType: hard + +"possible-typed-array-names@npm:^1.0.0": + version: 1.0.0 + resolution: "possible-typed-array-names@npm:1.0.0" + checksum: 10c0/d9aa22d31f4f7680e20269db76791b41c3a32c01a373e25f8a4813b4d45f7456bfc2b6d68f752dc4aab0e0bb0721cb3d76fb678c9101cb7a16316664bc2c73fd + languageName: node + linkType: hard + +"postcss-modules-extract-imports@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-modules-extract-imports@npm:3.0.0" + peerDependencies: + postcss: ^8.1.0 + checksum: 10c0/f8879d66d8162fb7a3fcd916d37574006c584ea509107b1cfb798a5e090175ef9470f601e46f0a305070d8ff2500e07489a5c1ac381c29a1dc1120e827ca7943 + languageName: node + linkType: hard + +"postcss-modules-local-by-default@npm:^4.0.3": + version: 4.0.3 + resolution: "postcss-modules-local-by-default@npm:4.0.3" + dependencies: + icss-utils: "npm:^5.0.0" + postcss-selector-parser: "npm:^6.0.2" + postcss-value-parser: "npm:^4.1.0" + peerDependencies: + postcss: ^8.1.0 + checksum: 10c0/be49b86efbfb921f42287e227584aac91af9826fc1083db04958ae283dfe215ca539421bfba71f9da0f0b10651f28e95a64b5faca7166f578a1933b8646051f7 + languageName: node + linkType: hard + +"postcss-modules-scope@npm:^3.0.0": + version: 3.0.0 + resolution: "postcss-modules-scope@npm:3.0.0" + dependencies: + postcss-selector-parser: "npm:^6.0.4" + peerDependencies: + postcss: ^8.1.0 + checksum: 10c0/60af503910363689568c2c3701cb019a61b58b3d739391145185eec211bea5d50ccb6ecbe6955b39d856088072fd50ea002e40a52b50e33b181ff5c41da0308a + languageName: node + linkType: hard + +"postcss-modules-values@npm:^4.0.0": + version: 4.0.0 + resolution: "postcss-modules-values@npm:4.0.0" + dependencies: + icss-utils: "npm:^5.0.0" + peerDependencies: + postcss: ^8.1.0 + checksum: 10c0/dd18d7631b5619fb9921b198c86847a2a075f32e0c162e0428d2647685e318c487a2566cc8cc669fc2077ef38115cde7a068e321f46fb38be3ad49646b639dbc + languageName: node + linkType: hard + +"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": + version: 6.0.13 + resolution: "postcss-selector-parser@npm:6.0.13" + dependencies: + cssesc: "npm:^3.0.0" + util-deprecate: "npm:^1.0.2" + checksum: 10c0/51f099b27f7c7198ea1826470ef0adfa58b3bd3f59b390fda123baa0134880a5fa9720137b6009c4c1373357b144f700b0edac73335d0067422063129371444e + languageName: node + linkType: hard + +"postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0": + version: 4.2.0 + resolution: "postcss-value-parser@npm:4.2.0" + checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161 + languageName: node + linkType: hard + +"postcss@npm:^8.4.21": + version: 8.4.29 + resolution: "postcss@npm:8.4.29" + dependencies: + nanoid: "npm:^3.3.6" + picocolors: "npm:^1.0.0" + source-map-js: "npm:^1.0.2" + checksum: 10c0/b50b7ad4ac6c9ba029eda4381863570b7aed2672ffae2566ef109e556bae01823a51180409877ff2cce1fe186025751c7191c301eafc07b0d90c630ab5e0365c + languageName: node + linkType: hard + +"postinstall-prepare@npm:^1.0.1": + version: 1.0.1 + resolution: "postinstall-prepare@npm:1.0.1" + checksum: 10c0/04593ce21bda898e6cfd245d35d312e1e4a03b6e316ac552408b479eb9093038c5c8b685147b658f6881ee5e0d5fce20a5a45cf22c9f9d346342e93a7defcbad + languageName: node + linkType: hard + +"prelude-ls@npm:^1.2.1": + version: 1.2.1 + resolution: "prelude-ls@npm:1.2.1" + checksum: 10c0/b00d617431e7886c520a6f498a2e14c75ec58f6d93ba48c3b639cf241b54232d90daa05d83a9e9b9fef6baa63cb7e1e4602c2372fea5bc169668401eb127d0cd + languageName: node + linkType: hard + +"prelude-ls@npm:~1.1.2": + version: 1.1.2 + resolution: "prelude-ls@npm:1.1.2" + checksum: 10c0/7284270064f74e0bb7f04eb9bff7be677e4146417e599ccc9c1200f0f640f8b11e592d94eb1b18f7aa9518031913bb42bea9c86af07ba69902864e61005d6f18 + languageName: node + linkType: hard + +"prettier@npm:3.2.5": + version: 3.2.5 + resolution: "prettier@npm:3.2.5" + bin: + prettier: bin/prettier.cjs + checksum: 10c0/ea327f37a7d46f2324a34ad35292af2ad4c4c3c3355da07313339d7e554320f66f65f91e856add8530157a733c6c4a897dc41b577056be5c24c40f739f5ee8c6 + languageName: node + linkType: hard + +"proc-log@npm:^3.0.0": + version: 3.0.0 + resolution: "proc-log@npm:3.0.0" + checksum: 10c0/f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc + languageName: node + linkType: hard + +"proc-log@npm:^4.2.0": + version: 4.2.0 + resolution: "proc-log@npm:4.2.0" + checksum: 10c0/17db4757c2a5c44c1e545170e6c70a26f7de58feb985091fb1763f5081cab3d01b181fb2dd240c9f4a4255a1d9227d163d5771b7e69c9e49a561692db865efb9 + languageName: node + linkType: hard + +"progress@npm:^2.0.3": + version: 2.0.3 + resolution: "progress@npm:2.0.3" + checksum: 10c0/1697e07cb1068055dbe9fe858d242368ff5d2073639e652b75a7eb1f2a1a8d4afd404d719de23c7b48481a6aa0040686310e2dac2f53d776daa2176d3f96369c + languageName: node + linkType: hard + +"promise-retry@npm:^2.0.1": + version: 2.0.1 + resolution: "promise-retry@npm:2.0.1" + dependencies: + err-code: "npm:^2.0.2" + retry: "npm:^0.12.0" + checksum: 10c0/9c7045a1a2928094b5b9b15336dcd2a7b1c052f674550df63cc3f36cd44028e5080448175b6f6ca32b642de81150f5e7b1a98b728f15cb069f2dd60ac2616b96 + languageName: node + linkType: hard + +"prop-types@npm:^15.5.8, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": + version: 15.8.1 + resolution: "prop-types@npm:15.8.1" + dependencies: + loose-envify: "npm:^1.4.0" + object-assign: "npm:^4.1.1" + react-is: "npm:^16.13.1" + checksum: 10c0/59ece7ca2fb9838031d73a48d4becb9a7cc1ed10e610517c7d8f19a1e02fa47f7c27d557d8a5702bec3cfeccddc853579832b43f449e54635803f277b1c78077 + languageName: node + linkType: hard + +"protobufjs-cli@npm:^1.1.1": + version: 1.1.2 + resolution: "protobufjs-cli@npm:1.1.2" + dependencies: + chalk: "npm:^4.0.0" + escodegen: "npm:^1.13.0" + espree: "npm:^9.0.0" + estraverse: "npm:^5.1.0" + glob: "npm:^8.0.0" + jsdoc: "npm:^4.0.0" + minimist: "npm:^1.2.0" + semver: "npm:^7.1.2" + tmp: "npm:^0.2.1" + uglify-js: "npm:^3.7.7" + peerDependencies: + protobufjs: ^7.0.0 + bin: + pbjs: bin/pbjs + pbts: bin/pbts + checksum: 10c0/931ff25204329d4c39ad3d6ae48b46349357de49a7061bd02ad3746ac4d9acd498c05f4d39eac8444ec8d39cae5c3f7e5738d45a461be2a0eb18d13c4bc0d549 + languageName: node + linkType: hard + +"protobufjs@npm:^7.2.4": + version: 7.2.5 + resolution: "protobufjs@npm:7.2.5" + dependencies: + "@protobufjs/aspromise": "npm:^1.1.2" + "@protobufjs/base64": "npm:^1.1.2" + "@protobufjs/codegen": "npm:^2.0.4" + "@protobufjs/eventemitter": "npm:^1.1.0" + "@protobufjs/fetch": "npm:^1.1.0" + "@protobufjs/float": "npm:^1.0.2" + "@protobufjs/inquire": "npm:^1.1.0" + "@protobufjs/path": "npm:^1.1.2" + "@protobufjs/pool": "npm:^1.1.0" + "@protobufjs/utf8": "npm:^1.1.0" + "@types/node": "npm:>=13.7.0" + long: "npm:^5.0.0" + checksum: 10c0/12bb88965a2291ec717daddb1b7153c0e567586076da7d138c8f04558d3d0a9cad6445a3558f16c1a61f5cd9dec1a107712590daccb71763429d9b1e10d164d3 + languageName: node + linkType: hard + +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: 10c0/fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b + languageName: node + linkType: hard + +"psl@npm:^1.1.33, psl@npm:^1.1.7": + version: 1.9.0 + resolution: "psl@npm:1.9.0" + checksum: 10c0/6a3f805fdab9442f44de4ba23880c4eba26b20c8e8e0830eff1cb31007f6825dace61d17203c58bfe36946842140c97a1ba7f67bc63ca2d88a7ee052b65d97ab + languageName: node + linkType: hard + +"pump@npm:^3.0.0": + version: 3.0.0 + resolution: "pump@npm:3.0.0" + dependencies: + end-of-stream: "npm:^1.1.0" + once: "npm:^1.3.1" + checksum: 10c0/bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478 + languageName: node + linkType: hard + +"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0": + version: 2.3.0 + resolution: "punycode@npm:2.3.0" + checksum: 10c0/8e6f7abdd3a6635820049e3731c623bbef3fedbf63bbc696b0d7237fdba4cefa069bc1fa62f2938b0fbae057550df7b5318f4a6bcece27f1907fc75c54160bee + languageName: node + linkType: hard + +"pupa@npm:^2.1.1": + version: 2.1.1 + resolution: "pupa@npm:2.1.1" + dependencies: + escape-goat: "npm:^2.0.0" + checksum: 10c0/d2346324780ebae4be847cad052b830e004d816851dd4750fc73faa6cd360f443e358f6b1c83641fd4c904c6055dcb545807f55259a20a52ad86d9477746c724 + languageName: node + linkType: hard + +"qr.js@npm:0.0.0": + version: 0.0.0 + resolution: "qr.js@npm:0.0.0" + checksum: 10c0/1c6a4c7a58d04e52ec2fee99e39b680fdc5b2a510a981df42c36b716a8eac6634d130fc4d65af8f030f2a07dbf5fa046b97cdfa7456c250ebb50a73916efdcb5 + languageName: node + linkType: hard + +"querystringify@npm:^2.1.1": + version: 2.2.0 + resolution: "querystringify@npm:2.2.0" + checksum: 10c0/3258bc3dbdf322ff2663619afe5947c7926a6ef5fb78ad7d384602974c467fadfc8272af44f5eb8cddd0d011aae8fabf3a929a8eee4b86edcc0a21e6bd10f9aa + languageName: node + linkType: hard + +"queue-microtask@npm:^1.2.2": + version: 1.2.3 + resolution: "queue-microtask@npm:1.2.3" + checksum: 10c0/900a93d3cdae3acd7d16f642c29a642aea32c2026446151f0778c62ac089d4b8e6c986811076e1ae180a694cedf077d453a11b58ff0a865629a4f82ab558e102 + languageName: node + linkType: hard + +"quick-lru@npm:^4.0.1": + version: 4.0.1 + resolution: "quick-lru@npm:4.0.1" + checksum: 10c0/f9b1596fa7595a35c2f9d913ac312fede13d37dc8a747a51557ab36e11ce113bbe88ef4c0154968845559a7709cb6a7e7cbe75f7972182451cd45e7f057a334d + languageName: node + linkType: hard + +"quick-lru@npm:^5.1.1": + version: 5.1.1 + resolution: "quick-lru@npm:5.1.1" + checksum: 10c0/a24cba5da8cec30d70d2484be37622580f64765fb6390a928b17f60cd69e8dbd32a954b3ff9176fa1b86d86ff2ba05252fae55dc4d40d0291c60412b0ad096da + languageName: node + linkType: hard + +"rambda@npm:^7.1.0": + version: 7.5.0 + resolution: "rambda@npm:7.5.0" + checksum: 10c0/7285b60cfc0737394dda6d467ef65a97221f9e208041d212378d78264d17acd372e09070f570af821314a9243b4edf465cbb5e15297ad44e484eac10535b8920 + languageName: node + linkType: hard + +"randombytes@npm:^2.1.0": + version: 2.1.0 + resolution: "randombytes@npm:2.1.0" + dependencies: + safe-buffer: "npm:^5.1.0" + checksum: 10c0/50395efda7a8c94f5dffab564f9ff89736064d32addf0cc7e8bf5e4166f09f8ded7a0849ca6c2d2a59478f7d90f78f20d8048bca3cdf8be09d8e8a10790388f3 + languageName: node + linkType: hard + +"rc-slider@npm:^10.2.1": + version: 10.2.1 + resolution: "rc-slider@npm:10.2.1" + dependencies: + "@babel/runtime": "npm:^7.10.1" + classnames: "npm:^2.2.5" + rc-util: "npm:^5.27.0" + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/c32e988969079853d37dff961a607b171ea4ecfb8ebb9f6111e69d1d03f74fbc05656aac25c4543f5c532824525c3f0c317d30c93f5464c81f602691553b5583 + languageName: node + linkType: hard + +"rc-util@npm:^5.27.0": + version: 5.37.0 + resolution: "rc-util@npm:5.37.0" + dependencies: + "@babel/runtime": "npm:^7.18.3" + react-is: "npm:^16.12.0" + peerDependencies: + react: ">=16.9.0" + react-dom: ">=16.9.0" + checksum: 10c0/987a05eeb0849f7c49a072f8602c1ea5f5f00018ee0ebdbbcf3dae6a28bff000ccd7a19c46fc8adf325f33dddf45753087e256714f3669ae22cd36cc1360ebd3 + languageName: node + linkType: hard + +"rc@npm:1.2.8, rc@npm:^1.2.7, rc@npm:^1.2.8": + version: 1.2.8 + resolution: "rc@npm:1.2.8" + dependencies: + deep-extend: "npm:^0.6.0" + ini: "npm:~1.3.0" + minimist: "npm:^1.2.0" + strip-json-comments: "npm:~2.0.1" + bin: + rc: ./cli.js + checksum: 10c0/24a07653150f0d9ac7168e52943cc3cb4b7a22c0e43c7dff3219977c2fdca5a2760a304a029c20811a0e79d351f57d46c9bde216193a0f73978496afc2b85b15 + languageName: node + linkType: hard + +"react-contexify@npm:^6.0.0": + version: 6.0.0 + resolution: "react-contexify@npm:6.0.0" + dependencies: + clsx: "npm:^1.2.1" + peerDependencies: + react: ">=16" + react-dom: ">=16" + checksum: 10c0/f43ece394e0d398941bdc46930759582a447372b48fac06a382acfb447ca6f359d8c882f8bfd25d38d951966dcb19a566d9bd00d157e81a32a15f77a771ef45d + languageName: node + linkType: hard + +"react-dom@npm:^17.0.2": + version: 17.0.2 + resolution: "react-dom@npm:17.0.2" + dependencies: + loose-envify: "npm:^1.1.0" + object-assign: "npm:^4.1.1" + scheduler: "npm:^0.20.2" + peerDependencies: + react: 17.0.2 + checksum: 10c0/51abbcb72450fe527ebf978c3bc989ba266630faaa53f47a2fae5392369729e8de62b2e4683598cbe651ea7873cd34ec7d5127e2f50bf4bfe6bd0c3ad9bddcb0 + languageName: node + linkType: hard + +"react-draggable@npm:^4.4.4": + version: 4.4.5 + resolution: "react-draggable@npm:4.4.5" + dependencies: + clsx: "npm:^1.1.1" + prop-types: "npm:^15.8.1" + peerDependencies: + react: ">= 16.3.0" + react-dom: ">= 16.3.0" + checksum: 10c0/d950e25b41092ffd689e9882c287f7f49dbd8eb7e8a220af6e08c0dc06f1ae778871b0f414e30bd2891a96c6be1f673c3a698c0e642903542ff5ab5b0cbaf805 + languageName: node + linkType: hard + +"react-h5-audio-player@npm:^3.2.0": + version: 3.8.6 + resolution: "react-h5-audio-player@npm:3.8.6" + dependencies: + "@babel/runtime": "npm:^7.10.2" + "@iconify/icons-mdi": "npm:~1.1.0" + "@iconify/react": "npm:^3.1.3" + peerDependencies: + react: ^16.3.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.3.0 || ^17.0.0 || ^18.0.0 + checksum: 10c0/0c35993da616df6bf0fc9a52aa3ab4da18403641cfb757e16945bbdbd713de9d49803b2303a417c199d1b8c3bf5777cf6d8b4fbb3167d5c690daca2a9f43fc52 + languageName: node + linkType: hard + +"react-intersection-observer@npm:^9.7.0": + version: 9.7.0 + resolution: "react-intersection-observer@npm:9.7.0" + peerDependencies: + react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 + react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react-dom: + optional: true + checksum: 10c0/cfc5b7e4ca6987ece322928f9862efda6333a2254de85d6053d3536744c83d0aa72472ad4d8f1dafac3731c67d12310b922afdb7a21aad3180f87f65a45addac + languageName: node + linkType: hard + +"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.7.0": + version: 16.13.1 + resolution: "react-is@npm:16.13.1" + checksum: 10c0/33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1 + languageName: node + linkType: hard + +"react-is@npm:^18.0.0": + version: 18.2.0 + resolution: "react-is@npm:18.2.0" + checksum: 10c0/6eb5e4b28028c23e2bfcf73371e72cd4162e4ac7ab445ddae2afe24e347a37d6dc22fae6e1748632cd43c6d4f9b8f86dcf26bf9275e1874f436d129952528ae0 + languageName: node + linkType: hard + +"react-lifecycles-compat@npm:^3.0.4": + version: 3.0.4 + resolution: "react-lifecycles-compat@npm:3.0.4" + checksum: 10c0/1d0df3c85af79df720524780f00c064d53a9dd1899d785eddb7264b378026979acbddb58a4b7e06e7d0d12aa1494fd5754562ee55d32907b15601068dae82c27 + languageName: node + linkType: hard + +"react-mentions@npm:^4.4.9": + version: 4.4.10 + resolution: "react-mentions@npm:4.4.10" + dependencies: + "@babel/runtime": "npm:7.4.5" + invariant: "npm:^2.2.4" + prop-types: "npm:^15.5.8" + substyle: "npm:^9.1.0" + peerDependencies: + react: ">=16.8.3" + react-dom: ">=16.8.3" + checksum: 10c0/25683158de4b4be47a3e2ec9120aa3661f4b60458f6334a89c69815da9d5b989a79ccd912186b006003e8f779595de8e556682d71e49bb41b6bba129ba1b5c17 + languageName: node + linkType: hard + +"react-qr-svg@npm:^2.2.1": + version: 2.4.0 + resolution: "react-qr-svg@npm:2.4.0" + dependencies: + prop-types: "npm:^15.5.8" + qr.js: "npm:0.0.0" + peerDependencies: + react: ">= 0.11.2 < 18.0.0" + checksum: 10c0/b85de7ec5e086fd66e0ea8d2290aa132209ea049b079af1a19bdcb3aaa20261e7a1f1f3a7f7e51548b817a2c621f0ca8258bff78d700c6da60588b95b6bfa13c + languageName: node + linkType: hard + +"react-redux@npm:8.0.4": + version: 8.0.4 + resolution: "react-redux@npm:8.0.4" + dependencies: + "@babel/runtime": "npm:^7.12.1" + "@types/hoist-non-react-statics": "npm:^3.3.1" + "@types/use-sync-external-store": "npm:^0.0.3" + hoist-non-react-statics: "npm:^3.3.2" + react-is: "npm:^18.0.0" + use-sync-external-store: "npm:^1.0.0" + peerDependencies: + "@types/react": ^16.8 || ^17.0 || ^18.0 + "@types/react-dom": ^16.8 || ^17.0 || ^18.0 + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + react-native: ">=0.59" + redux: ^4 + peerDependenciesMeta: + "@types/react": + optional: true + "@types/react-dom": + optional: true + react-dom: + optional: true + react-native: + optional: true + redux: + optional: true + checksum: 10c0/c1468dc2e40895e740282fd378cd736eec8f574e794ec629133a26ce6b808de15577f62ebe73cc74c59d3fa7e9c276313b8b618018f0159dc198f28328039a51 + languageName: node + linkType: hard + +"react-toastify@npm:^6.0.9": + version: 6.2.0 + resolution: "react-toastify@npm:6.2.0" + dependencies: + clsx: "npm:^1.1.1" + prop-types: "npm:^15.7.2" + react-transition-group: "npm:^4.4.1" + peerDependencies: + react: ">=16" + checksum: 10c0/81813421818314bf5f5befff4ada3fee4f607cd51bf70f6def6b00399fe5c821dea2fb8533d16092281d336dafa0edffc619bf272301d668126e45c133befe80 + languageName: node + linkType: hard + +"react-transition-group@npm:^4.4.1": + version: 4.4.5 + resolution: "react-transition-group@npm:4.4.5" + dependencies: + "@babel/runtime": "npm:^7.5.5" + dom-helpers: "npm:^5.0.1" + loose-envify: "npm:^1.4.0" + prop-types: "npm:^15.6.2" + peerDependencies: + react: ">=16.6.0" + react-dom: ">=16.6.0" + checksum: 10c0/2ba754ba748faefa15f87c96dfa700d5525054a0141de8c75763aae6734af0740e77e11261a1e8f4ffc08fd9ab78510122e05c21c2d79066c38bb6861a886c82 + languageName: node + linkType: hard + +"react-universal-interface@npm:^0.6.2": + version: 0.6.2 + resolution: "react-universal-interface@npm:0.6.2" + peerDependencies: + react: "*" + tslib: "*" + checksum: 10c0/97c32ecb7a425c3bcaa92dcf84c46146b49610d928efde9e9ee5518c475a0db942f01634dd490e4f42fcd95cc2f49657c1b96dcef96423c06f077147fe1968ab + languageName: node + linkType: hard + +"react-use@npm:^17.4.0": + version: 17.4.0 + resolution: "react-use@npm:17.4.0" + dependencies: + "@types/js-cookie": "npm:^2.2.6" + "@xobotyi/scrollbar-width": "npm:^1.9.5" + copy-to-clipboard: "npm:^3.3.1" + fast-deep-equal: "npm:^3.1.3" + fast-shallow-equal: "npm:^1.0.0" + js-cookie: "npm:^2.2.1" + nano-css: "npm:^5.3.1" + react-universal-interface: "npm:^0.6.2" + resize-observer-polyfill: "npm:^1.5.1" + screenfull: "npm:^5.1.0" + set-harmonic-interval: "npm:^1.0.1" + throttle-debounce: "npm:^3.0.1" + ts-easing: "npm:^0.2.0" + tslib: "npm:^2.1.0" + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + checksum: 10c0/9f9a56a5dbeb707186d470882a17d22e4d0845e7d77b576f4f23f07e7bc60600c7ca14bef33d62d0607f0a7ce18b465807cc9a120bdb75486985afc57d45da19 + languageName: node + linkType: hard + +"react-virtualized@npm:^9.22.4": + version: 9.22.5 + resolution: "react-virtualized@npm:9.22.5" + dependencies: + "@babel/runtime": "npm:^7.7.2" + clsx: "npm:^1.0.4" + dom-helpers: "npm:^5.1.3" + loose-envify: "npm:^1.4.0" + prop-types: "npm:^15.7.2" + react-lifecycles-compat: "npm:^3.0.4" + peerDependencies: + react: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 + react-dom: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 + checksum: 10c0/b0444b472f317dce61119c07426c5e9ebfe5125d049996678da922717715a1aa83df755aa36877f4b1718aa2e181d22f15ebb807ee356418c56f922f865628c1 + languageName: node + linkType: hard + +"react@npm:17.0.2": + version: 17.0.2 + resolution: "react@npm:17.0.2" + dependencies: + loose-envify: "npm:^1.1.0" + object-assign: "npm:^4.1.1" + checksum: 10c0/07ae8959acf1596f0550685102fd6097d461a54a4fd46a50f88a0cd7daaa97fdd6415de1dcb4bfe0da6aa43221a6746ce380410fa848acc60f8ac41f6649c148 + languageName: node + linkType: hard + +"read-config-file@npm:6.2.0": + version: 6.2.0 + resolution: "read-config-file@npm:6.2.0" + dependencies: + dotenv: "npm:^9.0.2" + dotenv-expand: "npm:^5.1.0" + js-yaml: "npm:^4.1.0" + json5: "npm:^2.2.0" + lazy-val: "npm:^1.0.4" + checksum: 10c0/ea1ffc9dcbd44fcbcfa972f3deb9625725c5eb112ecc1da2fb05e8fc89ef8d21fae10539f4c312b9ed599d1d20ec3a85c66b71701fbd1a126562d8249ecd8f3a + languageName: node + linkType: hard + +"read-last-lines-ts@npm:^1.2.1": + version: 1.2.1 + resolution: "read-last-lines-ts@npm:1.2.1" + checksum: 10c0/c1b1295373c318be020662230493bcb58a8c90a861f231286729457c4a76c034318c80a9e9276d2e2bba23da3f2ceef716320be225946102d693b2099ae6e0f2 + languageName: node + linkType: hard + +"read-pkg-up@npm:^7.0.1": + version: 7.0.1 + resolution: "read-pkg-up@npm:7.0.1" + dependencies: + find-up: "npm:^4.1.0" + read-pkg: "npm:^5.2.0" + type-fest: "npm:^0.8.1" + checksum: 10c0/82b3ac9fd7c6ca1bdc1d7253eb1091a98ff3d195ee0a45386582ce3e69f90266163c34121e6a0a02f1630073a6c0585f7880b3865efcae9c452fa667f02ca385 + languageName: node + linkType: hard + +"read-pkg@npm:^5.2.0": + version: 5.2.0 + resolution: "read-pkg@npm:5.2.0" + dependencies: + "@types/normalize-package-data": "npm:^2.4.0" + normalize-package-data: "npm:^2.5.0" + parse-json: "npm:^5.0.0" + type-fest: "npm:^0.6.0" + checksum: 10c0/b51a17d4b51418e777029e3a7694c9bd6c578a5ab99db544764a0b0f2c7c0f58f8a6bc101f86a6fceb8ba6d237d67c89acf6170f6b98695d0420ddc86cf109fb + languageName: node + linkType: hard + +"readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": + version: 3.6.2 + resolution: "readable-stream@npm:3.6.2" + dependencies: + inherits: "npm:^2.0.3" + string_decoder: "npm:^1.1.1" + util-deprecate: "npm:^1.0.1" + checksum: 10c0/e37be5c79c376fdd088a45fa31ea2e423e5d48854be7a22a58869b4e84d25047b193f6acb54f1012331e1bcd667ffb569c01b99d36b0bd59658fb33f513511b7 + languageName: node + linkType: hard + +"readdirp@npm:~3.6.0": + version: 3.6.0 + resolution: "readdirp@npm:3.6.0" + dependencies: + picomatch: "npm:^2.2.1" + checksum: 10c0/6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b + languageName: node + linkType: hard + +"rechoir@npm:^0.8.0": + version: 0.8.0 + resolution: "rechoir@npm:0.8.0" + dependencies: + resolve: "npm:^1.20.0" + checksum: 10c0/1a30074124a22abbd5d44d802dac26407fa72a0a95f162aa5504ba8246bc5452f8b1a027b154d9bdbabcd8764920ff9333d934c46a8f17479c8912e92332f3ff + languageName: node + linkType: hard + +"redent@npm:^3.0.0": + version: 3.0.0 + resolution: "redent@npm:3.0.0" + dependencies: + indent-string: "npm:^4.0.0" + strip-indent: "npm:^3.0.0" + checksum: 10c0/d64a6b5c0b50eb3ddce3ab770f866658a2b9998c678f797919ceb1b586bab9259b311407280bd80b804e2a7c7539b19238ae6a2a20c843f1a7fcff21d48c2eae + languageName: node + linkType: hard + +"redux-logger@npm:3.0.6": + version: 3.0.6 + resolution: "redux-logger@npm:3.0.6" + dependencies: + deep-diff: "npm:^0.3.5" + checksum: 10c0/65eb71a1c72d9636368672a684bde62c746e64c19c8b92e3f00bdf5cf240ea1695eccb95a0fa3d5044f6a86cbf11fd35dc5150fd3351fa53c72721c336e9098f + languageName: node + linkType: hard + +"redux-persist@npm:^6.0.0": + version: 6.0.0 + resolution: "redux-persist@npm:6.0.0" + peerDependencies: + redux: ">4.0.0" + checksum: 10c0/8242d265ab8d28bbc95cf2dc2a05b869eb67aa309b1ed08163c926f3af56dd8eb1ea62118286083461b8ef2024d3b349fd264e5a62a70eb2e74d068c832d5bf2 + languageName: node + linkType: hard + +"redux-promise-middleware@npm:^6.1.2": + version: 6.1.3 + resolution: "redux-promise-middleware@npm:6.1.3" + peerDependencies: + redux: ^2.0.0 || ^3.0.0 || ^4.0.0 + checksum: 10c0/4f0b7d77530acd7b5d85725ece114942e596be1d22a52153f62d9f51435f178552ae9a9995bcf94457faa739ffb926ebac1bd0724162db5679bba17c41a9314b + languageName: node + linkType: hard + +"redux-thunk@npm:^2.4.1": + version: 2.4.2 + resolution: "redux-thunk@npm:2.4.2" + peerDependencies: + redux: ^4 + checksum: 10c0/e202d6ef7dfa7df08ed24cb221aa89d6c84dbaa7d65fe90dbd8e826d0c10d801f48388f9a7598a4fd970ecbc93d335014570a61ca7bc8bf569eab5de77b31a3c + languageName: node + linkType: hard + +"redux@npm:4.2.0": + version: 4.2.0 + resolution: "redux@npm:4.2.0" + dependencies: + "@babel/runtime": "npm:^7.9.2" + checksum: 10c0/6b8b543499c9b8aa6afa01ef68950f4b2ea68d803381ac65797b1a5a7e39ba88ee3650c2a5a1dd500c78ad022de45cd5ed4a5f41fe7d51db8b07d12fbe84d146 + languageName: node + linkType: hard + +"redux@npm:^3.6.0": + version: 3.7.2 + resolution: "redux@npm:3.7.2" + dependencies: + lodash: "npm:^4.2.1" + lodash-es: "npm:^4.2.1" + loose-envify: "npm:^1.1.0" + symbol-observable: "npm:^1.0.3" + checksum: 10c0/544456f95734de33326637b370894addb57d9de2524edf36a20e4a326d0a36a0e223979d027545c5aa8a8d7a2859363981f63d1146401b72df0d16f373dd09cb + languageName: node + linkType: hard + +"redux@npm:^4.0.0, redux@npm:^4.1.2": + version: 4.2.1 + resolution: "redux@npm:4.2.1" + dependencies: + "@babel/runtime": "npm:^7.9.2" + checksum: 10c0/136d98b3d5dbed1cd6279c8c18a6a74c416db98b8a432a46836bdd668475de6279a2d4fd9d1363f63904e00f0678a8a3e7fa532c897163340baf1e71bb42c742 + languageName: node + linkType: hard + +"reflect.getprototypeof@npm:^1.0.3": + version: 1.0.4 + resolution: "reflect.getprototypeof@npm:1.0.4" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + get-intrinsic: "npm:^1.2.1" + globalthis: "npm:^1.0.3" + which-builtin-type: "npm:^1.1.3" + checksum: 10c0/02104cdd22658b637efe6b1df73658edab539268347327c8250a72d0cb273dcdf280c284e2d94155d22601d022d16be1a816a8616d679e447cbcbde9860d15cb + languageName: node + linkType: hard + +"regenerator-runtime@npm:^0.13.2": + version: 0.13.11 + resolution: "regenerator-runtime@npm:0.13.11" + checksum: 10c0/12b069dc774001fbb0014f6a28f11c09ebfe3c0d984d88c9bced77fdb6fedbacbca434d24da9ae9371bfbf23f754869307fb51a4c98a8b8b18e5ef748677ca24 + languageName: node + linkType: hard + +"regenerator-runtime@npm:^0.14.0": + version: 0.14.0 + resolution: "regenerator-runtime@npm:0.14.0" + checksum: 10c0/e25f062c1a183f81c99681691a342760e65c55e8d3a4d4fe347ebe72433b123754b942b70b622959894e11f8a9131dc549bd3c9a5234677db06a4af42add8d12 + languageName: node + linkType: hard + +"regexp.prototype.flags@npm:^1.5.0": + version: 1.5.0 + resolution: "regexp.prototype.flags@npm:1.5.0" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + functions-have-names: "npm:^1.2.3" + checksum: 10c0/312b7966c5cd2e6837da4073e0e6450191e3c6e8f07276cbed35e170ea5606f91487b435eb3290593f8aed39b1191c44f5340e6e5392650feaf2b34a98378464 + languageName: node + linkType: hard + +"regexp.prototype.flags@npm:^1.5.2": + version: 1.5.2 + resolution: "regexp.prototype.flags@npm:1.5.2" + dependencies: + call-bind: "npm:^1.0.6" + define-properties: "npm:^1.2.1" + es-errors: "npm:^1.3.0" + set-function-name: "npm:^2.0.1" + checksum: 10c0/0f3fc4f580d9c349f8b560b012725eb9c002f36daa0041b3fbf6f4238cb05932191a4d7d5db3b5e2caa336d5150ad0402ed2be81f711f9308fe7e1a9bf9bd552 + languageName: node + linkType: hard + +"registry-auth-token@npm:^4.0.0": + version: 4.2.2 + resolution: "registry-auth-token@npm:4.2.2" + dependencies: + rc: "npm:1.2.8" + checksum: 10c0/1d0000b8b65e7141a4cc4594926e2551607f48596e01326e7aa2ba2bc688aea86b2aa0471c5cb5de7acc9a59808a3a1ddde9084f974da79bfc67ab67aa48e003 + languageName: node + linkType: hard + +"registry-url@npm:^5.0.0": + version: 5.1.0 + resolution: "registry-url@npm:5.1.0" + dependencies: + rc: "npm:^1.2.8" + checksum: 10c0/c2c455342b5836cbed5162092eba075c7a02c087d9ce0fde8aeb4dc87a8f4a34a542e58bf4d8ec2d4cb73f04408cb3148ceb1f76647f76b978cfec22047dc6d6 + languageName: node + linkType: hard + +"require-directory@npm:^2.1.1": + version: 2.1.1 + resolution: "require-directory@npm:2.1.1" + checksum: 10c0/83aa76a7bc1531f68d92c75a2ca2f54f1b01463cb566cf3fbc787d0de8be30c9dbc211d1d46be3497dac5785fe296f2dd11d531945ac29730643357978966e99 + languageName: node + linkType: hard + +"require-from-string@npm:^2.0.2": + version: 2.0.2 + resolution: "require-from-string@npm:2.0.2" + checksum: 10c0/aaa267e0c5b022fc5fd4eef49d8285086b15f2a1c54b28240fdf03599cbd9c26049fee3eab894f2e1f6ca65e513b030a7c264201e3f005601e80c49fb2937ce2 + languageName: node + linkType: hard + +"requires-port@npm:^1.0.0": + version: 1.0.0 + resolution: "requires-port@npm:1.0.0" + checksum: 10c0/b2bfdd09db16c082c4326e573a82c0771daaf7b53b9ce8ad60ea46aa6e30aaf475fe9b164800b89f93b748d2c234d8abff945d2551ba47bf5698e04cd7713267 + languageName: node + linkType: hard + +"requizzle@npm:^0.2.3": + version: 0.2.4 + resolution: "requizzle@npm:0.2.4" + dependencies: + lodash: "npm:^4.17.21" + checksum: 10c0/ad138f987943aeda5f96cd1ccba9752c96352a729a7e3c3e2545568703f7fc9b978d9b46715803408ef178b0d61d36a4b1b506b367b7e78fe6d041fa5bfa5e06 + languageName: node + linkType: hard + +"reselect@npm:^4.1.5": + version: 4.1.8 + resolution: "reselect@npm:4.1.8" + checksum: 10c0/06a305a504affcbb67dd0561ddc8306b35796199c7e15b38934c80606938a021eadcf68cfd58e7bb5e17786601c37602a3362a4665c7bf0a96c1041ceee9d0b7 + languageName: node + linkType: hard + +"resize-observer-polyfill@npm:^1.5.1": + version: 1.5.1 + resolution: "resize-observer-polyfill@npm:1.5.1" + checksum: 10c0/5e882475067f0b97dc07e0f37c3e335ac5bc3520d463f777cec7e894bb273eddbfecb857ae668e6fb6881fd6f6bb7148246967172139302da50fa12ea3a15d95 + languageName: node + linkType: hard + +"resolve-alpn@npm:^1.0.0": + version: 1.2.1 + resolution: "resolve-alpn@npm:1.2.1" + checksum: 10c0/b70b29c1843bc39781ef946c8cd4482e6d425976599c0f9c138cec8209e4e0736161bf39319b01676a847000085dfdaf63583c6fb4427bf751a10635bd2aa0c4 + languageName: node + linkType: hard + +"resolve-cwd@npm:^3.0.0": + version: 3.0.0 + resolution: "resolve-cwd@npm:3.0.0" + dependencies: + resolve-from: "npm:^5.0.0" + checksum: 10c0/e608a3ebd15356264653c32d7ecbc8fd702f94c6703ea4ac2fb81d9c359180cba0ae2e6b71faa446631ed6145454d5a56b227efc33a2d40638ac13f8beb20ee4 + languageName: node + linkType: hard + +"resolve-from@npm:5.0.0, resolve-from@npm:^5.0.0": + version: 5.0.0 + resolution: "resolve-from@npm:5.0.0" + checksum: 10c0/b21cb7f1fb746de8107b9febab60095187781137fd803e6a59a76d421444b1531b641bba5857f5dc011974d8a5c635d61cec49e6bd3b7fc20e01f0fafc4efbf2 + languageName: node + linkType: hard + +"resolve-from@npm:^4.0.0": + version: 4.0.0 + resolution: "resolve-from@npm:4.0.0" + checksum: 10c0/8408eec31a3112ef96e3746c37be7d64020cda07c03a920f5024e77290a218ea758b26ca9529fd7b1ad283947f34b2291c1c0f6aa0ed34acfdda9c6014c8d190 + languageName: node + linkType: hard + +"resolve-global@npm:1.0.0, resolve-global@npm:^1.0.0": + version: 1.0.0 + resolution: "resolve-global@npm:1.0.0" + dependencies: + global-dirs: "npm:^0.1.1" + checksum: 10c0/fda6ba81a07a0124756ce956dd871ca83763973326d8617143dab38d9c9afc666926604bfe8f0bfd046a9a285347568f32ceb3d4c55a1cb9de5614cca001a21c + languageName: node + linkType: hard + +"resolve-pkg-maps@npm:^1.0.0": + version: 1.0.0 + resolution: "resolve-pkg-maps@npm:1.0.0" + checksum: 10c0/fb8f7bbe2ca281a73b7ef423a1cbc786fb244bd7a95cbe5c3fba25b27d327150beca8ba02f622baea65919a57e061eb5005204daa5f93ed590d9b77463a567ab + languageName: node + linkType: hard + +"resolve@npm:^1.10.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4": + version: 1.22.4 + resolution: "resolve@npm:1.22.4" + dependencies: + is-core-module: "npm:^2.13.0" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10c0/b1adb7885a05e31fc2be19e85e338b8d48d9e442b568d91e9c925990ed1c3bff66683ccea03b9e9893b857ec25dee0f7951a0d0630be49e4e1f5c1150ddc35dc + languageName: node + linkType: hard + +"resolve@npm:^2.0.0-next.4": + version: 2.0.0-next.4 + resolution: "resolve@npm:2.0.0-next.4" + dependencies: + is-core-module: "npm:^2.9.0" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10c0/1de92669e7c46cfe125294c66d5405e13288bb87b97e9bdab71693ceebbcc0255c789bde30e2834265257d330d8ff57414d7d88e3097d8f69951f3ce978bf045 + languageName: node + linkType: hard + +"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin": + version: 1.22.4 + resolution: "resolve@patch:resolve@npm%3A1.22.4#optional!builtin::version=1.22.4&hash=c3c19d" + dependencies: + is-core-module: "npm:^2.13.0" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10c0/60ca179599acf8b1bb17b850280a7081781b457d235d48197dc893b82d75741f191c5fe2d93e5729292234d0b0d88e9add273df4b9e04755eeed4fd7d23f1c79 + languageName: node + linkType: hard + +"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin": + version: 2.0.0-next.4 + resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#optional!builtin::version=2.0.0-next.4&hash=c3c19d" + dependencies: + is-core-module: "npm:^2.9.0" + path-parse: "npm:^1.0.7" + supports-preserve-symlinks-flag: "npm:^1.0.0" + bin: + resolve: bin/resolve + checksum: 10c0/ed2bb51d616b9cd30fe85cf49f7a2240094d9fa01a221d361918462be81f683d1855b7f192391d2ab5325245b42464ca59690db5bd5dad0a326fc0de5974dd10 + languageName: node + linkType: hard + +"responselike@npm:^2.0.0": + version: 2.0.1 + resolution: "responselike@npm:2.0.1" + dependencies: + lowercase-keys: "npm:^2.0.0" + checksum: 10c0/360b6deb5f101a9f8a4174f7837c523c3ec78b7ca8a7c1d45a1062b303659308a23757e318b1e91ed8684ad1205721142dd664d94771cd63499353fd4ee732b5 + languageName: node + linkType: hard + +"restore-cursor@npm:^4.0.0": + version: 4.0.0 + resolution: "restore-cursor@npm:4.0.0" + dependencies: + onetime: "npm:^5.1.0" + signal-exit: "npm:^3.0.2" + checksum: 10c0/6f7da8c5e422ac26aa38354870b1afac09963572cf2879443540449068cb43476e9cbccf6f8de3e0171e0d6f7f533c2bc1a0a008003c9a525bbc098e89041318 + languageName: node + linkType: hard + +"retry@npm:^0.12.0": + version: 0.12.0 + resolution: "retry@npm:0.12.0" + checksum: 10c0/59933e8501727ba13ad73ef4a04d5280b3717fd650408460c987392efe9d7be2040778ed8ebe933c5cbd63da3dcc37919c141ef8af0a54a6e4fca5a2af177bfe + languageName: node + linkType: hard + +"retry@npm:^0.13.1": + version: 0.13.1 + resolution: "retry@npm:0.13.1" + checksum: 10c0/9ae822ee19db2163497e074ea919780b1efa00431d197c7afdb950e42bf109196774b92a49fc9821f0b8b328a98eea6017410bfc5e8a0fc19c85c6d11adb3772 + languageName: node + linkType: hard + +"reusify@npm:^1.0.4": + version: 1.0.4 + resolution: "reusify@npm:1.0.4" + checksum: 10c0/c19ef26e4e188f408922c46f7ff480d38e8dfc55d448310dfb518736b23ed2c4f547fb64a6ed5bdba92cd7e7ddc889d36ff78f794816d5e71498d645ef476107 + languageName: node + linkType: hard + +"rfdc@npm:^1.3.0": + version: 1.3.0 + resolution: "rfdc@npm:1.3.0" + checksum: 10c0/a17fd7b81f42c7ae4cb932abd7b2f677b04cc462a03619fb46945ae1ccae17c3bc87c020ffdde1751cbfa8549860a2883486fdcabc9b9de3f3108af32b69a667 + languageName: node + linkType: hard + +"rimraf@npm:2.6.2": + version: 2.6.2 + resolution: "rimraf@npm:2.6.2" + dependencies: + glob: "npm:^7.0.5" + bin: + rimraf: ./bin.js + checksum: 10c0/8caac0e6c36dad94556ec0ca97125d148a813b3f661f3fa9f4bcd6d60ed8e145d94258e102a05557f428086ab9d8de5c714cb2748b2020495056d6730a9ecc72 + languageName: node + linkType: hard + +"rimraf@npm:^2.6.3": + version: 2.7.1 + resolution: "rimraf@npm:2.7.1" + dependencies: + glob: "npm:^7.1.3" + bin: + rimraf: ./bin.js + checksum: 10c0/4eef73d406c6940927479a3a9dee551e14a54faf54b31ef861250ac815172bade86cc6f7d64a4dc5e98b65e4b18a2e1c9ff3b68d296be0c748413f092bb0dd40 + languageName: node + linkType: hard + +"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2": + version: 3.0.2 + resolution: "rimraf@npm:3.0.2" + dependencies: + glob: "npm:^7.1.3" + bin: + rimraf: bin.js + checksum: 10c0/9cb7757acb489bd83757ba1a274ab545eafd75598a9d817e0c3f8b164238dd90eba50d6b848bd4dcc5f3040912e882dc7ba71653e35af660d77b25c381d402e8 + languageName: node + linkType: hard + +"rimraf@npm:~2.4.0": + version: 2.4.5 + resolution: "rimraf@npm:2.4.5" + dependencies: + glob: "npm:^6.0.1" + bin: + rimraf: ./bin.js + checksum: 10c0/5251a36053165d23248efec5077f9addc13ad7f742a02dcd9ac7adda9e208cbf7523901e96a9ca6c33059bd0b573b97eab3334cf1d9976cc5ddc8b3c24d9ddd7 + languageName: node + linkType: hard + +"roarr@npm:^2.15.3": + version: 2.15.4 + resolution: "roarr@npm:2.15.4" + dependencies: + boolean: "npm:^3.0.1" + detect-node: "npm:^2.0.4" + globalthis: "npm:^1.0.1" + json-stringify-safe: "npm:^5.0.1" + semver-compare: "npm:^1.0.0" + sprintf-js: "npm:^1.1.2" + checksum: 10c0/7d01d4c14513c461778dd673a8f9e53255221f8d04173aafeb8e11b23d8b659bb83f1c90cfe81af7f9c213b8084b404b918108fd792bda76678f555340cc64ec + languageName: node + linkType: hard + +"rrweb-cssom@npm:^0.6.0": + version: 0.6.0 + resolution: "rrweb-cssom@npm:0.6.0" + checksum: 10c0/3d9d90d53c2349ea9c8509c2690df5a4ef930c9cf8242aeb9425d4046f09d712bb01047e00da0e1c1dab5db35740b3d78fd45c3e7272f75d3724a563f27c30a3 + languageName: node + linkType: hard + +"rtl-css-js@npm:^1.14.0": + version: 1.16.1 + resolution: "rtl-css-js@npm:1.16.1" + dependencies: + "@babel/runtime": "npm:^7.1.2" + checksum: 10c0/4b81ef50e50c97455d61c9bb576e2892651c79bac5d0c52b4123ebb9d6a2c5144590a79c9db0a3212a81b4eb83bf317e03637220f20b387a37b96cbac324d3d2 + languageName: node + linkType: hard + +"run-parallel@npm:^1.1.9": + version: 1.2.0 + resolution: "run-parallel@npm:1.2.0" + dependencies: + queue-microtask: "npm:^1.2.2" + checksum: 10c0/200b5ab25b5b8b7113f9901bfe3afc347e19bb7475b267d55ad0eb86a62a46d77510cb0f232507c9e5d497ebda569a08a9867d0d14f57a82ad5564d991588b39 + languageName: node + linkType: hard + +"run-script-os@npm:^1.1.6": + version: 1.1.6 + resolution: "run-script-os@npm:1.1.6" + bin: + run-os: index.js + run-script-os: index.js + checksum: 10c0/620e240a650c666bb8e3f5437680d88c522366e6c68d4867300caf6cad010c85ff36a016de2c71010debaf10e968966b2c6aaa8816bab8298381e5620d41d8aa + languageName: node + linkType: hard + +"safe-array-concat@npm:^1.0.0": + version: 1.0.1 + resolution: "safe-array-concat@npm:1.0.1" + dependencies: + call-bind: "npm:^1.0.2" + get-intrinsic: "npm:^1.2.1" + has-symbols: "npm:^1.0.3" + isarray: "npm:^2.0.5" + checksum: 10c0/4b15ce5fce5ce4d7e744a63592cded88d2f27806ed229eadb2e42629cbcd40e770f7478608e75f455e7fe341acd8c0a01bdcd7146b10645ea7411c5e3c1d1dd8 + languageName: node + linkType: hard + +"safe-array-concat@npm:^1.1.0": + version: 1.1.0 + resolution: "safe-array-concat@npm:1.1.0" + dependencies: + call-bind: "npm:^1.0.5" + get-intrinsic: "npm:^1.2.2" + has-symbols: "npm:^1.0.3" + isarray: "npm:^2.0.5" + checksum: 10c0/833d3d950fc7507a60075f9bfaf41ec6dac7c50c7a9d62b1e6b071ecc162185881f92e594ff95c1a18301c881352dd6fd236d56999d5819559db7b92da9c28af + languageName: node + linkType: hard + +"safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": + version: 5.2.1 + resolution: "safe-buffer@npm:5.2.1" + checksum: 10c0/6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3 + languageName: node + linkType: hard + +"safe-json-stringify@npm:~1": + version: 1.2.0 + resolution: "safe-json-stringify@npm:1.2.0" + checksum: 10c0/9c21c7b63a35a9e52d248eea2ad7bc9e790dde5aa418f0d4eed3c0b4c866e15337425b0d973173d30dd70a9e422271619f17e13574e0c8371d0c240cf72b871f + languageName: node + linkType: hard + +"safe-regex-test@npm:^1.0.0": + version: 1.0.0 + resolution: "safe-regex-test@npm:1.0.0" + dependencies: + call-bind: "npm:^1.0.2" + get-intrinsic: "npm:^1.1.3" + is-regex: "npm:^1.1.4" + checksum: 10c0/14a81a7e683f97b2d6e9c8be61fddcf8ed7a02f4e64a825515f96bb1738eb007145359313741d2704d28b55b703a0f6300c749dde7c1dbc13952a2b85048ede2 + languageName: node + linkType: hard + +"safe-regex-test@npm:^1.0.3": + version: 1.0.3 + resolution: "safe-regex-test@npm:1.0.3" + dependencies: + call-bind: "npm:^1.0.6" + es-errors: "npm:^1.3.0" + is-regex: "npm:^1.1.4" + checksum: 10c0/900bf7c98dc58f08d8523b7012b468e4eb757afa624f198902c0643d7008ba777b0bdc35810ba0b758671ce887617295fb742b3f3968991b178ceca54cb07603 + languageName: node + linkType: hard + +"safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0": + version: 2.1.2 + resolution: "safer-buffer@npm:2.1.2" + checksum: 10c0/7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4 + languageName: node + linkType: hard + +"sanitize-filename@npm:^1.6.3": + version: 1.6.3 + resolution: "sanitize-filename@npm:1.6.3" + dependencies: + truncate-utf8-bytes: "npm:^1.0.0" + checksum: 10c0/16ff47556a6e54e228c28db096bedd303da67b030d4bea4925fd71324932d6b02c7b0446f00ad33987b25b6414f24ae968e01a1a1679ce599542e82c4b07eb1f + languageName: node + linkType: hard + +"sanitize.css@npm:^12.0.1": + version: 12.0.1 + resolution: "sanitize.css@npm:12.0.1" + checksum: 10c0/84f392e80376c7fb3e793d58daa97c79b7025dc29f5255e4fa02c6c368d2513ed651c2dc394887fcfed83bb068fcec0a6ec2ec0a8206c4456cbb9f7e5105903a + languageName: node + linkType: hard + +"sass-loader@npm:^13.2.2": + version: 13.3.2 + resolution: "sass-loader@npm:13.3.2" + dependencies: + neo-async: "npm:^2.6.2" + peerDependencies: + fibers: ">= 3.1.0" + node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 + sass: ^1.3.0 + sass-embedded: "*" + webpack: ^5.0.0 + peerDependenciesMeta: + fibers: + optional: true + node-sass: + optional: true + sass: + optional: true + sass-embedded: + optional: true + checksum: 10c0/7db8132101ed663f3cf936ce765b9b960a48b14f13f17d367a4e0c2ae259e91b6c401e33ab0f27ee88c98c8b5893c778848fc8366f1f387ac788ebef244e000a + languageName: node + linkType: hard + +"sass@npm:^1.60.0": + version: 1.66.1 + resolution: "sass@npm:1.66.1" + dependencies: + chokidar: "npm:>=3.0.0 <4.0.0" + immutable: "npm:^4.0.0" + source-map-js: "npm:>=0.6.2 <2.0.0" + bin: + sass: sass.js + checksum: 10c0/2fd9510088c8754010479132b9708b2c7178fe158bba1cb84aba4f22d333919d5e9561b5aa33fee3e635ae2d33e3835d6aad132705200d66e5773ce50842c8a1 + languageName: node + linkType: hard + +"sax@npm:^1.2.4": + version: 1.2.4 + resolution: "sax@npm:1.2.4" + checksum: 10c0/6e9b05ff443ee5e5096ce92d31c0740a20d33002fad714ebcb8fc7a664d9ee159103ebe8f7aef0a1f7c5ecacdd01f177f510dff95611c589399baf76437d3fe3 + languageName: node + linkType: hard + +"saxes@npm:^6.0.0": + version: 6.0.0 + resolution: "saxes@npm:6.0.0" + dependencies: + xmlchars: "npm:^2.2.0" + checksum: 10c0/3847b839f060ef3476eb8623d099aa502ad658f5c40fd60c105ebce86d244389b0d76fcae30f4d0c728d7705ceb2f7e9b34bb54717b6a7dbedaf5dad2d9a4b74 + languageName: node + linkType: hard + +"scheduler@npm:^0.20.2": + version: 0.20.2 + resolution: "scheduler@npm:0.20.2" + dependencies: + loose-envify: "npm:^1.1.0" + object-assign: "npm:^4.1.1" + checksum: 10c0/b0982e4b0f34f4ffa4f2f486161c0fd9ce9b88680b045dccbf250eb1aa4fd27413570645455187a83535e2370f5c667a251045547765408492bd883cbe95fcdb + languageName: node + linkType: hard + +"schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0": + version: 3.3.0 + resolution: "schema-utils@npm:3.3.0" + dependencies: + "@types/json-schema": "npm:^7.0.8" + ajv: "npm:^6.12.5" + ajv-keywords: "npm:^3.5.2" + checksum: 10c0/fafdbde91ad8aa1316bc543d4b61e65ea86970aebbfb750bfb6d8a6c287a23e415e0e926c2498696b242f63af1aab8e585252637fabe811fd37b604351da6500 + languageName: node + linkType: hard + +"schema-utils@npm:^4.0.0": + version: 4.2.0 + resolution: "schema-utils@npm:4.2.0" + dependencies: + "@types/json-schema": "npm:^7.0.9" + ajv: "npm:^8.9.0" + ajv-formats: "npm:^2.1.1" + ajv-keywords: "npm:^5.1.0" + checksum: 10c0/8dab7e7800316387fd8569870b4b668cfcecf95ac551e369ea799bbcbfb63fb0365366d4b59f64822c9f7904d8c5afcfaf5a6124a4b08783e558cd25f299a6b4 + languageName: node + linkType: hard + +"screenfull@npm:^5.1.0": + version: 5.2.0 + resolution: "screenfull@npm:5.2.0" + checksum: 10c0/86fd49983e2edc153ee2e674a570c711cb0961a9cacca659309f79636ccc8ca8a0b830ea4dacdae7403a8bb7ba6affd5bcdce053aa97782961247a49bfd2ba68 + languageName: node + linkType: hard + +"sdp@npm:^2.1.0": + version: 2.12.0 + resolution: "sdp@npm:2.12.0" + checksum: 10c0/1a2ffdc20d79711175f89e87a6ce8db9b4757e694bed9760e5f919eed5925c9fb43ea63c5fd38f428a3edd45baae826318153fdc1db590a504eed7a809a23e32 + languageName: node + linkType: hard + +"semver-compare@npm:^1.0.0": + version: 1.0.0 + resolution: "semver-compare@npm:1.0.0" + checksum: 10c0/9ef4d8b81847556f0865f46ddc4d276bace118c7cb46811867af82e837b7fc473911981d5a0abc561fa2db487065572217e5b06e18701c4281bcdd2a1affaff1 + languageName: node + linkType: hard + +"semver-diff@npm:^3.1.1": + version: 3.1.1 + resolution: "semver-diff@npm:3.1.1" + dependencies: + semver: "npm:^6.3.0" + checksum: 10c0/7d350f1450b9577d538ef866a9bc4cd97bfbf1f1d92070291495a31d0ec3aa808e826c223e5454ea9877cc06eaa886ffd71bb3a1f331b44bc210f9ff525c68d2 + languageName: node + linkType: hard + +"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.6.0": + version: 5.7.2 + resolution: "semver@npm:5.7.2" + bin: + semver: bin/semver + checksum: 10c0/e4cf10f86f168db772ae95d86ba65b3fd6c5967c94d97c708ccb463b778c2ee53b914cd7167620950fc07faf5a564e6efe903836639e512a1aa15fbc9667fa25 + languageName: node + linkType: hard + +"semver@npm:7.5.4, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.4": + version: 7.5.4 + resolution: "semver@npm:7.5.4" + dependencies: + lru-cache: "npm:^6.0.0" + bin: + semver: bin/semver.js + checksum: 10c0/5160b06975a38b11c1ab55950cb5b8a23db78df88275d3d8a42ccf1f29e55112ac995b3a26a522c36e3b5f76b0445f1eef70d696b8c7862a2b4303d7b0e7609e + languageName: node + linkType: hard + +"semver@npm:^6.0.0, semver@npm:^6.2.0, semver@npm:^6.3.0, semver@npm:^6.3.1": + version: 6.3.1 + resolution: "semver@npm:6.3.1" + bin: + semver: bin/semver.js + checksum: 10c0/e3d79b609071caa78bcb6ce2ad81c7966a46a7431d9d58b8800cfa9cb6a63699b3899a0e4bcce36167a284578212d9ae6942b6929ba4aa5015c079a67751d42d + languageName: node + linkType: hard + +"serialize-error@npm:^7.0.1": + version: 7.0.1 + resolution: "serialize-error@npm:7.0.1" + dependencies: + type-fest: "npm:^0.13.1" + checksum: 10c0/7982937d578cd901276c8ab3e2c6ed8a4c174137730f1fb0402d005af209a0e84d04acc874e317c936724c7b5b26c7a96ff7e4b8d11a469f4924a4b0ea814c05 + languageName: node + linkType: hard + +"serialize-javascript@npm:6.0.0": + version: 6.0.0 + resolution: "serialize-javascript@npm:6.0.0" + dependencies: + randombytes: "npm:^2.1.0" + checksum: 10c0/73104922ef0a919064346eea21caab99de1a019a1f5fb54a7daa7fcabc39e83b387a2a363e52a889598c3b1bcf507c4b2a7b26df76e991a310657af20eea2e7c + languageName: node + linkType: hard + +"serialize-javascript@npm:^6.0.1": + version: 6.0.1 + resolution: "serialize-javascript@npm:6.0.1" + dependencies: + randombytes: "npm:^2.1.0" + checksum: 10c0/1af427f4fee3fee051f54ffe15f77068cff78a3c96d20f5c1178d20630d3ab122d8350e639d5e13cde8111ef9db9439b871305ffb185e24be0a2149cec230988 + languageName: node + linkType: hard + +"session-desktop@workspace:.": + version: 0.0.0-use.local + resolution: "session-desktop@workspace:." + dependencies: + "@commitlint/cli": "npm:^17.7.1" + "@commitlint/config-conventional": "npm:^17.7.0" + "@commitlint/types": "npm:^17.4.4" + "@electron/notarize": "npm:^2.1.0" + "@emoji-mart/data": "npm:^1.1.2" + "@emoji-mart/react": "npm:^1.1.1" + "@reduxjs/toolkit": "npm:1.8.5" + "@signalapp/better-sqlite3": "npm:^8.4.3" + "@types/backbone": "npm:1.4.2" + "@types/blueimp-load-image": "npm:5.14.4" + "@types/buffer-crc32": "npm:^0.2.0" + "@types/bunyan": "npm:^1.8.8" + "@types/bytebuffer": "npm:^5.0.41" + "@types/chai": "npm:4.2.18" + "@types/chai-as-promised": "npm:^7.1.2" + "@types/classnames": "npm:2.2.3" + "@types/config": "npm:0.0.34" + "@types/dompurify": "npm:^2.0.0" + "@types/electron-localshortcut": "npm:^3.1.0" + "@types/filesize": "npm:3.6.0" + "@types/firstline": "npm:^2.0.2" + "@types/fs-extra": "npm:5.0.5" + "@types/libsodium-wrappers-sumo": "npm:^0.7.5" + "@types/linkify-it": "npm:^3.0.2" + "@types/lodash": "npm:^4.14.194" + "@types/mocha": "npm:5.0.0" + "@types/node-fetch": "npm:^2.5.7" + "@types/react": "npm:^17.0.2" + "@types/react-dom": "npm:^17.0.2" + "@types/react-mentions": "npm:^4.1.8" + "@types/react-redux": "npm:^7.1.24" + "@types/react-virtualized": "npm:9.18.12" + "@types/redux-logger": "npm:3.0.7" + "@types/rimraf": "npm:2.0.2" + "@types/semver": "npm:5.5.0" + "@types/sinon": "npm:9.0.4" + "@types/styled-components": "npm:^5.1.4" + "@types/uuid": "npm:8.3.4" + "@typescript-eslint/eslint-plugin": "npm:7.1.0" + "@typescript-eslint/parser": "npm:7.1.0" + abort-controller: "npm:3.0.0" + auto-bind: "npm:^4.0.0" + backbone: "npm:1.3.3" + blob-util: "npm:2.0.2" + blueimp-load-image: "npm:5.14.0" + buffer-crc32: "npm:0.2.13" + bunyan: "https://github.com/Bilb/node-bunyan" + bytebuffer: "npm:^5.0.1" + chai: "npm:^4.3.4" + chai-as-promised: "npm:^7.1.1" + chai-bytes: "npm:^0.1.2" + classnames: "npm:2.2.5" + config: "npm:1.28.1" + country-code-lookup: "npm:^0.0.19" + cross-env: "npm:^6.0.3" + css-loader: "npm:^6.7.2" + curve25519-js: "https://github.com/oxen-io/curve25519-js" + date-fns: "npm:^3.3.1" + dmg-builder: "npm:23.6.0" + dompurify: "npm:^2.0.7" + electron: "npm:^25.8.4" + electron-builder: "npm:23.0.8" + electron-localshortcut: "npm:^3.2.1" + electron-updater: "npm:^4.2.2" + emoji-mart: "npm:^5.5.2" + eslint: "npm:8.57.0" + eslint-config-airbnb-base: "npm:^15.0.0" + eslint-config-prettier: "npm:9.1.0" + eslint-import-resolver-typescript: "npm:3.6.1" + eslint-plugin-import: "npm:2.29.1" + eslint-plugin-mocha: "npm:^10.1.0" + eslint-plugin-more: "npm:^1.0.5" + eslint-plugin-react: "npm:7.33.2" + eslint-plugin-react-hooks: "npm:^4.6.0" + events: "npm:^3.3.0" + filesize: "npm:3.6.1" + firstline: "npm:1.2.1" + fs-extra: "npm:9.0.0" + glob: "npm:10.3.10" + husky: "npm:^8.0.0" + image-type: "npm:^4.1.0" + ip2country: "npm:1.0.1" + jsdom: "npm:^22.1.0" + jsdom-global: "npm:^3.0.2" + libsession_util_nodejs: "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.3/libsession_util_nodejs-v0.4.3.tar.gz" + libsodium-wrappers-sumo: "npm:^0.7.9" + linkify-it: "npm:^4.0.1" + lint-staged: "npm:^14.0.1" + lodash: "npm:^4.17.21" + long: "npm:^4.0.0" + mic-recorder-to-mp3: "npm:^2.2.2" + mini-css-extract-plugin: "npm:^2.7.5" + mocha: "npm:10.0.0" + moment: "npm:^2.29.4" + node-fetch: "npm:^2.6.7" + node-loader: "npm:^2.0.0" + os-locale: "npm:5.0.0" + p-retry: "npm:^4.2.0" + patch-package: "npm:^6.4.7" + postinstall-prepare: "npm:^1.0.1" + prettier: "npm:3.2.5" + protobufjs: "npm:^7.2.4" + protobufjs-cli: "npm:^1.1.1" + rc-slider: "npm:^10.2.1" + react: "npm:^17.0.2" + react-contexify: "npm:^6.0.0" + react-dom: "npm:^17.0.2" + react-draggable: "npm:^4.4.4" + react-h5-audio-player: "npm:^3.2.0" + react-intersection-observer: "npm:^9.7.0" + react-mentions: "npm:^4.4.9" + react-qr-svg: "npm:^2.2.1" + react-redux: "npm:8.0.4" + react-toastify: "npm:^6.0.9" + react-use: "npm:^17.4.0" + react-virtualized: "npm:^9.22.4" + read-last-lines-ts: "npm:^1.2.1" + redux: "npm:4.2.0" + redux-logger: "npm:3.0.6" + redux-persist: "npm:^6.0.0" + redux-promise-middleware: "npm:^6.1.2" + rimraf: "npm:2.6.2" + run-script-os: "npm:^1.1.6" + sanitize.css: "npm:^12.0.1" + sass: "npm:^1.60.0" + sass-loader: "npm:^13.2.2" + semver: "npm:^7.5.4" + sinon: "npm:9.0.2" + styled-components: "npm:5.1.1" + ts-loader: "npm:^9.4.2" + typescript: "npm:^5.1.6" + uuid: "npm:8.3.2" + webpack: "npm:^5.76.3" + webpack-cli: "npm:^5.1.4" + webrtc-adapter: "npm:^4.1.1" + zod: "npm:^3.22.4" + languageName: unknown + linkType: soft + +"set-blocking@npm:^2.0.0": + version: 2.0.0 + resolution: "set-blocking@npm:2.0.0" + checksum: 10c0/9f8c1b2d800800d0b589de1477c753492de5c1548d4ade52f57f1d1f5e04af5481554d75ce5e5c43d4004b80a3eb714398d6907027dc0534177b7539119f4454 + languageName: node + linkType: hard + +"set-function-length@npm:^1.2.1": + version: 1.2.1 + resolution: "set-function-length@npm:1.2.1" + dependencies: + define-data-property: "npm:^1.1.2" + es-errors: "npm:^1.3.0" + function-bind: "npm:^1.1.2" + get-intrinsic: "npm:^1.2.3" + gopd: "npm:^1.0.1" + has-property-descriptors: "npm:^1.0.1" + checksum: 10c0/1927e296599f2c04d210c1911f1600430a5e49e04a6d8bb03dca5487b95a574da9968813a2ced9a774bd3e188d4a6208352c8f64b8d4674cdb021dca21e190ca + languageName: node + linkType: hard + +"set-function-name@npm:^2.0.1": + version: 2.0.2 + resolution: "set-function-name@npm:2.0.2" + dependencies: + define-data-property: "npm:^1.1.4" + es-errors: "npm:^1.3.0" + functions-have-names: "npm:^1.2.3" + has-property-descriptors: "npm:^1.0.2" + checksum: 10c0/fce59f90696c450a8523e754abb305e2b8c73586452619c2bad5f7bf38c7b6b4651895c9db895679c5bef9554339cf3ef1c329b66ece3eda7255785fbe299316 + languageName: node + linkType: hard + +"set-harmonic-interval@npm:^1.0.1": + version: 1.0.1 + resolution: "set-harmonic-interval@npm:1.0.1" + checksum: 10c0/49014d928a62c8418507bf66ffef7066783e8fb19f76e955318bbae5a8c4b56e1a7176b370f9040ef9de51531aa522a3f96fa5c47b1534635aa577ff7c12f9c6 + languageName: node + linkType: hard + +"shallow-clone@npm:^3.0.0": + version: 3.0.1 + resolution: "shallow-clone@npm:3.0.1" + dependencies: + kind-of: "npm:^6.0.2" + checksum: 10c0/7bab09613a1b9f480c85a9823aebec533015579fa055ba6634aa56ba1f984380670eaf33b8217502931872aa1401c9fcadaa15f9f604d631536df475b05bcf1e + languageName: node + linkType: hard + +"shallowequal@npm:^1.1.0": + version: 1.1.0 + resolution: "shallowequal@npm:1.1.0" + checksum: 10c0/b926efb51cd0f47aa9bc061add788a4a650550bbe50647962113a4579b60af2abe7b62f9b02314acc6f97151d4cf87033a2b15fc20852fae306d1a095215396c + languageName: node + linkType: hard + +"shebang-command@npm:^1.2.0": + version: 1.2.0 + resolution: "shebang-command@npm:1.2.0" + dependencies: + shebang-regex: "npm:^1.0.0" + checksum: 10c0/7b20dbf04112c456b7fc258622dafd566553184ac9b6938dd30b943b065b21dabd3776460df534cc02480db5e1b6aec44700d985153a3da46e7db7f9bd21326d + languageName: node + linkType: hard + +"shebang-command@npm:^2.0.0": + version: 2.0.0 + resolution: "shebang-command@npm:2.0.0" + dependencies: + shebang-regex: "npm:^3.0.0" + checksum: 10c0/a41692e7d89a553ef21d324a5cceb5f686d1f3c040759c50aab69688634688c5c327f26f3ecf7001ebfd78c01f3c7c0a11a7c8bfd0a8bc9f6240d4f40b224e4e + languageName: node + linkType: hard + +"shebang-regex@npm:^1.0.0": + version: 1.0.0 + resolution: "shebang-regex@npm:1.0.0" + checksum: 10c0/9abc45dee35f554ae9453098a13fdc2f1730e525a5eb33c51f096cc31f6f10a4b38074c1ebf354ae7bffa7229506083844008dfc3bb7818228568c0b2dc1fff2 + languageName: node + linkType: hard + +"shebang-regex@npm:^3.0.0": + version: 3.0.0 + resolution: "shebang-regex@npm:3.0.0" + checksum: 10c0/1dbed0726dd0e1152a92696c76c7f06084eb32a90f0528d11acd764043aacf76994b2fb30aa1291a21bd019d6699164d048286309a278855ee7bec06cf6fb690 + languageName: node + linkType: hard + +"side-channel@npm:^1.0.4": + version: 1.0.4 + resolution: "side-channel@npm:1.0.4" + dependencies: + call-bind: "npm:^1.0.0" + get-intrinsic: "npm:^1.0.2" + object-inspect: "npm:^1.9.0" + checksum: 10c0/054a5d23ee35054b2c4609b9fd2a0587760737782b5d765a9c7852264710cc39c6dcb56a9bbd6c12cd84071648aea3edb2359d2f6e560677eedadce511ac1da5 + languageName: node + linkType: hard + +"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": + version: 3.0.7 + resolution: "signal-exit@npm:3.0.7" + checksum: 10c0/25d272fa73e146048565e08f3309d5b942c1979a6f4a58a8c59d5fa299728e9c2fcd1a759ec870863b1fd38653670240cd420dad2ad9330c71f36608a6a1c912 + languageName: node + linkType: hard + +"signal-exit@npm:^4.0.1": + version: 4.1.0 + resolution: "signal-exit@npm:4.1.0" + checksum: 10c0/41602dce540e46d599edba9d9860193398d135f7ff72cab629db5171516cfae628d21e7bfccde1bbfdf11c48726bc2a6d1a8fb8701125852fbfda7cf19c6aa83 + languageName: node + linkType: hard + +"sinon@npm:9.0.2": + version: 9.0.2 + resolution: "sinon@npm:9.0.2" + dependencies: + "@sinonjs/commons": "npm:^1.7.2" + "@sinonjs/fake-timers": "npm:^6.0.1" + "@sinonjs/formatio": "npm:^5.0.1" + "@sinonjs/samsam": "npm:^5.0.3" + diff: "npm:^4.0.2" + nise: "npm:^4.0.1" + supports-color: "npm:^7.1.0" + checksum: 10c0/2f683f0833e824f651bf71f9f31047747eb2a20800c904b9f9c74e37cab59d7ad2e0dee12f20db9eff821cda0e18c413834efbd68fdc99ade28f1b104469023d + languageName: node + linkType: hard + +"slash@npm:^2.0.0": + version: 2.0.0 + resolution: "slash@npm:2.0.0" + checksum: 10c0/f83dbd3cb62c41bb8fcbbc6bf5473f3234b97fa1d008f571710a9d3757a28c7169e1811cad1554ccb1cc531460b3d221c9a7b37f549398d9a30707f0a5af9193 + languageName: node + linkType: hard + +"slash@npm:^3.0.0": + version: 3.0.0 + resolution: "slash@npm:3.0.0" + checksum: 10c0/e18488c6a42bdfd4ac5be85b2ced3ccd0224773baae6ad42cfbb9ec74fc07f9fa8396bd35ee638084ead7a2a0818eb5e7151111544d4731ce843019dab4be47b + languageName: node + linkType: hard + +"slice-ansi@npm:^3.0.0": + version: 3.0.0 + resolution: "slice-ansi@npm:3.0.0" + dependencies: + ansi-styles: "npm:^4.0.0" + astral-regex: "npm:^2.0.0" + is-fullwidth-code-point: "npm:^3.0.0" + checksum: 10c0/88083c9d0ca67d09f8b4c78f68833d69cabbb7236b74df5d741ad572bbf022deaf243fa54009cd434350622a1174ab267710fcc80a214ecc7689797fe00cb27c + languageName: node + linkType: hard + +"slice-ansi@npm:^5.0.0": + version: 5.0.0 + resolution: "slice-ansi@npm:5.0.0" + dependencies: + ansi-styles: "npm:^6.0.0" + is-fullwidth-code-point: "npm:^4.0.0" + checksum: 10c0/2d4d40b2a9d5cf4e8caae3f698fe24ae31a4d778701724f578e984dcb485ec8c49f0c04dab59c401821e80fcdfe89cace9c66693b0244e40ec485d72e543914f + languageName: node + linkType: hard + +"smart-buffer@npm:^4.0.2, smart-buffer@npm:^4.2.0": + version: 4.2.0 + resolution: "smart-buffer@npm:4.2.0" + checksum: 10c0/a16775323e1404dd43fabafe7460be13a471e021637bc7889468eb45ce6a6b207261f454e4e530a19500cc962c4cc5348583520843b363f4193cee5c00e1e539 + languageName: node + linkType: hard + +"socks-proxy-agent@npm:^8.0.3": + version: 8.0.3 + resolution: "socks-proxy-agent@npm:8.0.3" + dependencies: + agent-base: "npm:^7.1.1" + debug: "npm:^4.3.4" + socks: "npm:^2.7.1" + checksum: 10c0/4950529affd8ccd6951575e21c1b7be8531b24d924aa4df3ee32df506af34b618c4e50d261f4cc603f1bfd8d426915b7d629966c8ce45b05fb5ad8c8b9a6459d + languageName: node + linkType: hard + +"socks@npm:^2.7.1": + version: 2.8.3 + resolution: "socks@npm:2.8.3" + dependencies: + ip-address: "npm:^9.0.5" + smart-buffer: "npm:^4.2.0" + checksum: 10c0/d54a52bf9325165770b674a67241143a3d8b4e4c8884560c4e0e078aace2a728dffc7f70150660f51b85797c4e1a3b82f9b7aa25e0a0ceae1a243365da5c51a7 + languageName: node + linkType: hard + +"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.2": + version: 1.0.2 + resolution: "source-map-js@npm:1.0.2" + checksum: 10c0/32f2dfd1e9b7168f9a9715eb1b4e21905850f3b50cf02cf476e47e4eebe8e6b762b63a64357896aa29b37e24922b4282df0f492e0d2ace572b43d15525976ff8 + languageName: node + linkType: hard + +"source-map-support@npm:^0.5.19, source-map-support@npm:~0.5.20": + version: 0.5.21 + resolution: "source-map-support@npm:0.5.21" + dependencies: + buffer-from: "npm:^1.0.0" + source-map: "npm:^0.6.0" + checksum: 10c0/9ee09942f415e0f721d6daad3917ec1516af746a8120bba7bb56278707a37f1eb8642bde456e98454b8a885023af81a16e646869975f06afc1a711fb90484e7d + languageName: node + linkType: hard + +"source-map@npm:0.5.6": + version: 0.5.6 + resolution: "source-map@npm:0.5.6" + checksum: 10c0/beb2c5974bb58954d75e86249953d47ae16f7df1a8531abb9fcae0cd262d9fa09c2db3a134e20e99358b1adba42b6b054a32c8e16b571b3efcf6af644c329f0d + languageName: node + linkType: hard + +"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.1": + version: 0.6.1 + resolution: "source-map@npm:0.6.1" + checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011 + languageName: node + linkType: hard + +"sourcemap-codec@npm:^1.4.8": + version: 1.4.8 + resolution: "sourcemap-codec@npm:1.4.8" + checksum: 10c0/f099279fdaae070ff156df7414bbe39aad69cdd615454947ed3e19136bfdfcb4544952685ee73f56e17038f4578091e12b17b283ed8ac013882916594d95b9e6 + languageName: node + linkType: hard + +"spdx-correct@npm:^3.0.0": + version: 3.2.0 + resolution: "spdx-correct@npm:3.2.0" + dependencies: + spdx-expression-parse: "npm:^3.0.0" + spdx-license-ids: "npm:^3.0.0" + checksum: 10c0/49208f008618b9119208b0dadc9208a3a55053f4fd6a0ae8116861bd22696fc50f4142a35ebfdb389e05ccf2de8ad142573fefc9e26f670522d899f7b2fe7386 + languageName: node + linkType: hard + +"spdx-exceptions@npm:^2.1.0": + version: 2.3.0 + resolution: "spdx-exceptions@npm:2.3.0" + checksum: 10c0/83089e77d2a91cb6805a5c910a2bedb9e50799da091f532c2ba4150efdef6e53f121523d3e2dc2573a340dc0189e648b03157097f65465b3a0c06da1f18d7e8a + languageName: node + linkType: hard + +"spdx-expression-parse@npm:^3.0.0": + version: 3.0.1 + resolution: "spdx-expression-parse@npm:3.0.1" + dependencies: + spdx-exceptions: "npm:^2.1.0" + spdx-license-ids: "npm:^3.0.0" + checksum: 10c0/6f8a41c87759fa184a58713b86c6a8b028250f158159f1d03ed9d1b6ee4d9eefdc74181c8ddc581a341aa971c3e7b79e30b59c23b05d2436d5de1c30bdef7171 + languageName: node + linkType: hard + +"spdx-license-ids@npm:^3.0.0": + version: 3.0.13 + resolution: "spdx-license-ids@npm:3.0.13" + checksum: 10c0/a5cb77ea7be86d574c8876970920e34d9b37f2fb6e361e6b732b61267afbc63dd37831160b731f85c1478f5ba95ae00369742555920e3c694f047f7068d33318 + languageName: node + linkType: hard + +"split2@npm:^3.0.0, split2@npm:^3.2.2": + version: 3.2.2 + resolution: "split2@npm:3.2.2" + dependencies: + readable-stream: "npm:^3.0.0" + checksum: 10c0/2dad5603c52b353939befa3e2f108f6e3aff42b204ad0f5f16dd12fd7c2beab48d117184ce6f7c8854f9ee5ffec6faae70d243711dd7d143a9f635b4a285de4e + languageName: node + linkType: hard + +"sprintf-js@npm:^1.1.2": + version: 1.1.2 + resolution: "sprintf-js@npm:1.1.2" + checksum: 10c0/6cc8382f746348bd64b31bc5c99d8ebda7efff716025c41bf501e0e8be4f6744a9fa507e18513554753553d0bcb57fd5fc8dc8c42f94f8008127a52a2c544d21 + languageName: node + linkType: hard + +"sprintf-js@npm:^1.1.3": + version: 1.1.3 + resolution: "sprintf-js@npm:1.1.3" + checksum: 10c0/09270dc4f30d479e666aee820eacd9e464215cdff53848b443964202bf4051490538e5dd1b42e1a65cf7296916ca17640aebf63dae9812749c7542ee5f288dec + languageName: node + linkType: hard + +"ssri@npm:^10.0.0": + version: 10.0.6 + resolution: "ssri@npm:10.0.6" + dependencies: + minipass: "npm:^7.0.3" + checksum: 10c0/e5a1e23a4057a86a97971465418f22ea89bd439ac36ade88812dd920e4e61873e8abd6a9b72a03a67ef50faa00a2daf1ab745c5a15b46d03e0544a0296354227 + languageName: node + linkType: hard + +"stack-generator@npm:^2.0.5": + version: 2.0.10 + resolution: "stack-generator@npm:2.0.10" + dependencies: + stackframe: "npm:^1.3.4" + checksum: 10c0/c3f6f6c580488e65c0fee806a57f6ae4b79e6435f144be471c1f20328a8d9d8492d4f3beed31840f6dae03e2633325e2764fd3aca5c3126a0639e7c9ddfa45ce + languageName: node + linkType: hard + +"stackframe@npm:^1.3.4": + version: 1.3.4 + resolution: "stackframe@npm:1.3.4" + checksum: 10c0/18410f7a1e0c5d211a4effa83bdbf24adbe8faa8c34db52e1cd3e89837518c592be60b60d8b7270ac53eeeb8b807cd11b399a41667f6c9abb41059c3ccc8a989 + languageName: node + linkType: hard + +"stacktrace-gps@npm:^3.0.4": + version: 3.1.2 + resolution: "stacktrace-gps@npm:3.1.2" + dependencies: + source-map: "npm:0.5.6" + stackframe: "npm:^1.3.4" + checksum: 10c0/0dcc1aa46e364a2b4d1eabce4777fecf337576a11ee3cfc92f07b9ec79ccb76810752431eeb9771289d250d0bb58dbe19a178b96bf7b2e9f773334d03aa96bb9 + languageName: node + linkType: hard + +"stacktrace-js@npm:^2.0.2": + version: 2.0.2 + resolution: "stacktrace-js@npm:2.0.2" + dependencies: + error-stack-parser: "npm:^2.0.6" + stack-generator: "npm:^2.0.5" + stacktrace-gps: "npm:^3.0.4" + checksum: 10c0/9a10c222524ca03690bcb27437b39039885223e39320367f2be36e6f750c2d198ae99189869a22c255bf60072631eb609d47e8e33661e95133686904e01121ec + languageName: node + linkType: hard + +"stat-mode@npm:^1.0.0": + version: 1.0.0 + resolution: "stat-mode@npm:1.0.0" + checksum: 10c0/89b66a538dbfd45038fefdaf5b2104dc6e911605af1c201793e9629592ed9fdc7bdd1bca42806d0d4167c6d9cacac1f3fda41ddfe334a5c1f898113da38fae74 + languageName: node + linkType: hard + +"string-argv@npm:0.3.2": + version: 0.3.2 + resolution: "string-argv@npm:0.3.2" + checksum: 10c0/75c02a83759ad1722e040b86823909d9a2fc75d15dd71ec4b537c3560746e33b5f5a07f7332d1e3f88319909f82190843aa2f0a0d8c8d591ec08e93d5b8dec82 + languageName: node + linkType: hard + +"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": + version: 4.2.3 + resolution: "string-width@npm:4.2.3" + dependencies: + emoji-regex: "npm:^8.0.0" + is-fullwidth-code-point: "npm:^3.0.0" + strip-ansi: "npm:^6.0.1" + checksum: 10c0/1e525e92e5eae0afd7454086eed9c818ee84374bb80328fc41217ae72ff5f065ef1c9d7f72da41de40c75fa8bb3dee63d92373fd492c84260a552c636392a47b + languageName: node + linkType: hard + +"string-width@npm:^5.0.0, string-width@npm:^5.0.1, string-width@npm:^5.1.2": + version: 5.1.2 + resolution: "string-width@npm:5.1.2" + dependencies: + eastasianwidth: "npm:^0.2.0" + emoji-regex: "npm:^9.2.2" + strip-ansi: "npm:^7.0.1" + checksum: 10c0/ab9c4264443d35b8b923cbdd513a089a60de339216d3b0ed3be3ba57d6880e1a192b70ae17225f764d7adbf5994e9bb8df253a944736c15a0240eff553c678ca + languageName: node + linkType: hard + +"string.prototype.matchall@npm:^4.0.8": + version: 4.0.9 + resolution: "string.prototype.matchall@npm:4.0.9" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + get-intrinsic: "npm:^1.2.1" + has-symbols: "npm:^1.0.3" + internal-slot: "npm:^1.0.5" + regexp.prototype.flags: "npm:^1.5.0" + side-channel: "npm:^1.0.4" + checksum: 10c0/bcd2e34f467b9c474df88cebc1a3ed208f02d0b1452ef8907e74d332b2358f9cf03695693ab7620664b21a0df0c2b4917b631b1fe3c26a3b8c1feded80912ff7 + languageName: node + linkType: hard + +"string.prototype.trim@npm:^1.2.7": + version: 1.2.7 + resolution: "string.prototype.trim@npm:1.2.7" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.4" + es-abstract: "npm:^1.20.4" + checksum: 10c0/31698f6d718794e422db6fcfa6685dcd9243097273b3b2a8b7948b5d45a183cd336378893ff0d4a7b2531b604c32bb5c45193dd6da3d2f5504df5cd222372c09 + languageName: node + linkType: hard + +"string.prototype.trim@npm:^1.2.8": + version: 1.2.8 + resolution: "string.prototype.trim@npm:1.2.8" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + checksum: 10c0/4f76c583908bcde9a71208ddff38f67f24c9ec8093631601666a0df8b52fad44dad2368c78895ce83eb2ae8e7068294cc96a02fc971ab234e4d5c9bb61ea4e34 + languageName: node + linkType: hard + +"string.prototype.trimend@npm:^1.0.6": + version: 1.0.6 + resolution: "string.prototype.trimend@npm:1.0.6" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.1.4" + es-abstract: "npm:^1.20.4" + checksum: 10c0/51b663e3195a74b58620a250b3fc4efb58951000f6e7d572a9f671c038f2f37f24a2b8c6994500a882aeab2f1c383fac1e8c023c01eb0c8b4e52d2f13b6c4513 + languageName: node + linkType: hard + +"string.prototype.trimend@npm:^1.0.7": + version: 1.0.7 + resolution: "string.prototype.trimend@npm:1.0.7" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + checksum: 10c0/53c24911c7c4d8d65f5ef5322de23a3d5b6b4db73273e05871d5ab4571ae5638f38f7f19d71d09116578fb060e5a145cc6a208af2d248c8baf7a34f44d32ce57 + languageName: node + linkType: hard + +"string.prototype.trimstart@npm:^1.0.6, string.prototype.trimstart@npm:^1.0.7": + version: 1.0.7 + resolution: "string.prototype.trimstart@npm:1.0.7" + dependencies: + call-bind: "npm:^1.0.2" + define-properties: "npm:^1.2.0" + es-abstract: "npm:^1.22.1" + checksum: 10c0/0bcf391b41ea16d4fda9c9953d0a7075171fe090d33b4cf64849af94944c50862995672ac03e0c5dba2940a213ad7f53515a668dac859ce22a0276289ae5cf4f + languageName: node + linkType: hard + +"string_decoder@npm:^1.1.1": + version: 1.3.0 + resolution: "string_decoder@npm:1.3.0" + dependencies: + safe-buffer: "npm:~5.2.0" + checksum: 10c0/810614ddb030e271cd591935dcd5956b2410dd079d64ff92a1844d6b7588bf992b3e1b69b0f4d34a3e06e0bd73046ac646b5264c1987b20d0601f81ef35d731d + languageName: node + linkType: hard + +"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": + version: 6.0.1 + resolution: "strip-ansi@npm:6.0.1" + dependencies: + ansi-regex: "npm:^5.0.1" + checksum: 10c0/1ae5f212a126fe5b167707f716942490e3933085a5ff6c008ab97ab2f272c8025d3aa218b7bd6ab25729ca20cc81cddb252102f8751e13482a5199e873680952 + languageName: node + linkType: hard + +"strip-ansi@npm:^3.0.0": + version: 3.0.1 + resolution: "strip-ansi@npm:3.0.1" + dependencies: + ansi-regex: "npm:^2.0.0" + checksum: 10c0/f6e7fbe8e700105dccf7102eae20e4f03477537c74b286fd22cfc970f139002ed6f0d9c10d0e21aa9ed9245e0fa3c9275930e8795c5b947da136e4ecb644a70f + languageName: node + linkType: hard + +"strip-ansi@npm:^7.0.1": + version: 7.1.0 + resolution: "strip-ansi@npm:7.1.0" + dependencies: + ansi-regex: "npm:^6.0.1" + checksum: 10c0/a198c3762e8832505328cbf9e8c8381de14a4fa50a4f9b2160138158ea88c0f5549fb50cb13c651c3088f47e63a108b34622ec18c0499b6c8c3a5ddf6b305ac4 + languageName: node + linkType: hard + +"strip-bom@npm:^3.0.0": + version: 3.0.0 + resolution: "strip-bom@npm:3.0.0" + checksum: 10c0/51201f50e021ef16672593d7434ca239441b7b760e905d9f33df6e4f3954ff54ec0e0a06f100d028af0982d6f25c35cd5cda2ce34eaebccd0250b8befb90d8f1 + languageName: node + linkType: hard + +"strip-final-newline@npm:^2.0.0": + version: 2.0.0 + resolution: "strip-final-newline@npm:2.0.0" + checksum: 10c0/bddf8ccd47acd85c0e09ad7375409d81653f645fda13227a9d459642277c253d877b68f2e5e4d819fe75733b0e626bac7e954c04f3236f6d196f79c94fa4a96f + languageName: node + linkType: hard + +"strip-final-newline@npm:^3.0.0": + version: 3.0.0 + resolution: "strip-final-newline@npm:3.0.0" + checksum: 10c0/a771a17901427bac6293fd416db7577e2bc1c34a19d38351e9d5478c3c415f523f391003b42ed475f27e33a78233035df183525395f731d3bfb8cdcbd4da08ce + languageName: node + linkType: hard + +"strip-indent@npm:^3.0.0": + version: 3.0.0 + resolution: "strip-indent@npm:3.0.0" + dependencies: + min-indent: "npm:^1.0.0" + checksum: 10c0/ae0deaf41c8d1001c5d4fbe16cb553865c1863da4fae036683b474fa926af9fc121e155cb3fc57a68262b2ae7d5b8420aa752c97a6428c315d00efe2a3875679 + languageName: node + linkType: hard + +"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": + version: 3.1.1 + resolution: "strip-json-comments@npm:3.1.1" + checksum: 10c0/9681a6257b925a7fa0f285851c0e613cc934a50661fa7bb41ca9cbbff89686bb4a0ee366e6ecedc4daafd01e83eee0720111ab294366fe7c185e935475ebcecd + languageName: node + linkType: hard + +"strip-json-comments@npm:~2.0.1": + version: 2.0.1 + resolution: "strip-json-comments@npm:2.0.1" + checksum: 10c0/b509231cbdee45064ff4f9fd73609e2bcc4e84a4d508e9dd0f31f70356473fde18abfb5838c17d56fb236f5a06b102ef115438de0600b749e818a35fbbc48c43 + languageName: node + linkType: hard + +"styled-components@npm:5.1.1": + version: 5.1.1 + resolution: "styled-components@npm:5.1.1" + dependencies: + "@babel/helper-module-imports": "npm:^7.0.0" + "@babel/traverse": "npm:^7.4.5" + "@emotion/is-prop-valid": "npm:^0.8.8" + "@emotion/stylis": "npm:^0.8.4" + "@emotion/unitless": "npm:^0.7.4" + babel-plugin-styled-components: "npm:>= 1" + css-to-react-native: "npm:^3.0.0" + hoist-non-react-statics: "npm:^3.0.0" + shallowequal: "npm:^1.1.0" + supports-color: "npm:^5.5.0" + peerDependencies: + react: ">= 16.8.0" + react-dom: ">= 16.8.0" + react-is: ">= 16.8.0" + checksum: 10c0/3293a50bf6891d5c68068712694b2dc3f02f759e87dc134822741cd983a7dd9782da0a65386dfd68111f6380049d8bc2ab85cb6395a343ebf5ee166646f4e9c5 + languageName: node + linkType: hard + +"stylis@npm:^4.0.6": + version: 4.3.0 + resolution: "stylis@npm:4.3.0" + checksum: 10c0/5a9f7e0cf2a15591efaacc1c6416a8785d2b57522cd38bb8e0a81a03c23d3bea2363659fa5f9d486a73d1b6ebaf1d32826ce1c1974c95afdb5b495d98acb25c0 + languageName: node + linkType: hard + +"substyle@npm:^9.1.0": + version: 9.4.1 + resolution: "substyle@npm:9.4.1" + dependencies: + "@babel/runtime": "npm:^7.3.4" + invariant: "npm:^2.2.4" + peerDependencies: + react: ">=16.8.3" + checksum: 10c0/145c7c7e3642c3c2edca5b095725063a492d5657eeb12daa8160e4fa964ef926abd9ea1dd3bbf5a5e9edf6a70c89f0f4afa72aacd4b47e2c0970a8f344f75f85 + languageName: node + linkType: hard + +"sumchecker@npm:^3.0.1": + version: 3.0.1 + resolution: "sumchecker@npm:3.0.1" + dependencies: + debug: "npm:^4.1.0" + checksum: 10c0/43c387be9dfe22dbeaf39dfa4ffb279847aeb37a42a8988c0b066f548bbd209aa8c65e03da29f2b29be1a66b577801bf89fff0007df4183db2f286263a9569e5 + languageName: node + linkType: hard + +"supports-color@npm:8.1.1, supports-color@npm:^8.0.0": + version: 8.1.1 + resolution: "supports-color@npm:8.1.1" + dependencies: + has-flag: "npm:^4.0.0" + checksum: 10c0/ea1d3c275dd604c974670f63943ed9bd83623edc102430c05adb8efc56ba492746b6e95386e7831b872ec3807fd89dd8eb43f735195f37b5ec343e4234cc7e89 + languageName: node + linkType: hard + +"supports-color@npm:^2.0.0": + version: 2.0.0 + resolution: "supports-color@npm:2.0.0" + checksum: 10c0/570e0b63be36cccdd25186350a6cb2eaad332a95ff162fa06d9499982315f2fe4217e69dd98e862fbcd9c81eaff300a825a1fe7bf5cc752e5b84dfed042b0dda + languageName: node + linkType: hard + +"supports-color@npm:^5.3.0, supports-color@npm:^5.5.0": + version: 5.5.0 + resolution: "supports-color@npm:5.5.0" + dependencies: + has-flag: "npm:^3.0.0" + checksum: 10c0/6ae5ff319bfbb021f8a86da8ea1f8db52fac8bd4d499492e30ec17095b58af11f0c55f8577390a749b1c4dde691b6a0315dab78f5f54c9b3d83f8fb5905c1c05 + languageName: node + linkType: hard + +"supports-color@npm:^7.1.0": + version: 7.2.0 + resolution: "supports-color@npm:7.2.0" + dependencies: + has-flag: "npm:^4.0.0" + checksum: 10c0/afb4c88521b8b136b5f5f95160c98dee7243dc79d5432db7efc27efb219385bbc7d9427398e43dd6cc730a0f87d5085ce1652af7efbe391327bc0a7d0f7fc124 + languageName: node + linkType: hard + +"supports-preserve-symlinks-flag@npm:^1.0.0": + version: 1.0.0 + resolution: "supports-preserve-symlinks-flag@npm:1.0.0" + checksum: 10c0/6c4032340701a9950865f7ae8ef38578d8d7053f5e10518076e6554a9381fa91bd9c6850193695c141f32b21f979c985db07265a758867bac95de05f7d8aeb39 + languageName: node + linkType: hard + +"symbol-observable@npm:^1.0.3": + version: 1.2.0 + resolution: "symbol-observable@npm:1.2.0" + checksum: 10c0/009fee50798ef80ed4b8195048288f108b03de162db07493f2e1fd993b33fafa72d659e832b584da5a2427daa78e5a738fb2a9ab027ee9454252e0bedbcd1fdc + languageName: node + linkType: hard + +"symbol-tree@npm:^3.2.4": + version: 3.2.4 + resolution: "symbol-tree@npm:3.2.4" + checksum: 10c0/dfbe201ae09ac6053d163578778c53aa860a784147ecf95705de0cd23f42c851e1be7889241495e95c37cabb058edb1052f141387bef68f705afc8f9dd358509 + languageName: node + linkType: hard + +"tapable@npm:^2.1.1, tapable@npm:^2.2.0": + version: 2.2.1 + resolution: "tapable@npm:2.2.1" + checksum: 10c0/bc40e6efe1e554d075469cedaba69a30eeb373552aaf41caeaaa45bf56ffacc2674261b106245bd566b35d8f3329b52d838e851ee0a852120acae26e622925c9 + languageName: node + linkType: hard + +"tar@npm:^6.1.0, tar@npm:^6.1.11": + version: 6.2.0 + resolution: "tar@npm:6.2.0" + dependencies: + chownr: "npm:^2.0.0" + fs-minipass: "npm:^2.0.0" + minipass: "npm:^5.0.0" + minizlib: "npm:^2.1.1" + mkdirp: "npm:^1.0.3" + yallist: "npm:^4.0.0" + checksum: 10c0/02ca064a1a6b4521fef88c07d389ac0936730091f8c02d30ea60d472e0378768e870769ab9e986d87807bfee5654359cf29ff4372746cc65e30cbddc352660d8 + languageName: node + linkType: hard + +"tar@npm:^6.1.2": + version: 6.2.1 + resolution: "tar@npm:6.2.1" + dependencies: + chownr: "npm:^2.0.0" + fs-minipass: "npm:^2.0.0" + minipass: "npm:^5.0.0" + minizlib: "npm:^2.1.1" + mkdirp: "npm:^1.0.3" + yallist: "npm:^4.0.0" + checksum: 10c0/a5eca3eb50bc11552d453488344e6507156b9193efd7635e98e867fab275d527af53d8866e2370cd09dfe74378a18111622ace35af6a608e5223a7d27fe99537 + languageName: node + linkType: hard + +"temp-file@npm:^3.4.0": + version: 3.4.0 + resolution: "temp-file@npm:3.4.0" + dependencies: + async-exit-hook: "npm:^2.0.1" + fs-extra: "npm:^10.0.0" + checksum: 10c0/70e441909097346a930ae02278df9b0133cd02dddf0b49e5ddaade735fef1410a50a448a2a812106f97c045294c99cc19f26943eb88f1d728d41fbc445a40298 + languageName: node + linkType: hard + +"terser-webpack-plugin@npm:^5.3.7": + version: 5.3.9 + resolution: "terser-webpack-plugin@npm:5.3.9" + dependencies: + "@jridgewell/trace-mapping": "npm:^0.3.17" + jest-worker: "npm:^27.4.5" + schema-utils: "npm:^3.1.1" + serialize-javascript: "npm:^6.0.1" + terser: "npm:^5.16.8" + peerDependencies: + webpack: ^5.1.0 + peerDependenciesMeta: + "@swc/core": + optional: true + esbuild: + optional: true + uglify-js: + optional: true + checksum: 10c0/8a757106101ea1504e5dc549c722506506e7d3f0d38e72d6c8108ad814c994ca0d67ac5d0825ba59704a4b2b04548201b2137f198bfce897b09fe9e36727a1e9 + languageName: node + linkType: hard + +"terser@npm:^5.14.2": + version: 5.19.4 + resolution: "terser@npm:5.19.4" + dependencies: + "@jridgewell/source-map": "npm:^0.3.3" + acorn: "npm:^8.8.2" + commander: "npm:^2.20.0" + source-map-support: "npm:~0.5.20" + bin: + terser: bin/terser + checksum: 10c0/39c6687609f5b9061f2fb82bee02d2f9d7756fcb5bd50c67da1482f52cf5977e03e0c5df5cb4ce17e549428024c8859075137c461ec4a9ae8cf91a505759255a + languageName: node + linkType: hard + +"text-extensions@npm:^1.0.0": + version: 1.9.0 + resolution: "text-extensions@npm:1.9.0" + checksum: 10c0/9ad5a9f723a871e2d884e132d7e93f281c60b5759c95f3f6b04704856548715d93a36c10dbaf5f12b91bf405f0cf3893bf169d4d143c0f5509563b992d385443 + languageName: node + linkType: hard + +"text-table@npm:^0.2.0": + version: 0.2.0 + resolution: "text-table@npm:0.2.0" + checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c + languageName: node + linkType: hard + +"throttle-debounce@npm:^3.0.1": + version: 3.0.1 + resolution: "throttle-debounce@npm:3.0.1" + checksum: 10c0/c8e558479463b7ed8bac30d6b10cc87abd1c9fc64edfce2db4109be1a04acaef5d2d0557f49c1a3845ea07d9f79e6e0389b1b60db0a77c44e5b7a1216596f285 + languageName: node + linkType: hard + +"through2@npm:^4.0.0": + version: 4.0.2 + resolution: "through2@npm:4.0.2" + dependencies: + readable-stream: "npm:3" + checksum: 10c0/3741564ae99990a4a79097fe7a4152c22348adc4faf2df9199a07a66c81ed2011da39f631e479fdc56483996a9d34a037ad64e76d79f18c782ab178ea9b6778c + languageName: node + linkType: hard + +"through@npm:>=2.2.7 <3": + version: 2.3.8 + resolution: "through@npm:2.3.8" + checksum: 10c0/4b09f3774099de0d4df26d95c5821a62faee32c7e96fb1f4ebd54a2d7c11c57fe88b0a0d49cf375de5fee5ae6bf4eb56dbbf29d07366864e2ee805349970d3cc + languageName: node + linkType: hard + +"tmp-promise@npm:^3.0.2": + version: 3.0.3 + resolution: "tmp-promise@npm:3.0.3" + dependencies: + tmp: "npm:^0.2.0" + checksum: 10c0/23b47dcb2e82b14bbd8f61ed7a9d9353cdb6a6f09d7716616cfd27d0087040cd40152965a518e598d7aabe1489b9569bf1eebde0c5fadeaf3ec8098adcebea4e + languageName: node + linkType: hard + +"tmp@npm:^0.0.33": + version: 0.0.33 + resolution: "tmp@npm:0.0.33" + dependencies: + os-tmpdir: "npm:~1.0.2" + checksum: 10c0/69863947b8c29cabad43fe0ce65cec5bb4b481d15d4b4b21e036b060b3edbf3bc7a5541de1bacb437bb3f7c4538f669752627fdf9b4aaf034cebd172ba373408 + languageName: node + linkType: hard + +"tmp@npm:^0.2.0, tmp@npm:^0.2.1": + version: 0.2.1 + resolution: "tmp@npm:0.2.1" + dependencies: + rimraf: "npm:^3.0.0" + checksum: 10c0/67607aa012059c9ce697bee820ee51bc0f39b29a8766def4f92d3f764d67c7cf9205d537d24e0cb1ce9685c40d4c628ead010910118ea18348666b5c46ed9123 + languageName: node + linkType: hard + +"to-fast-properties@npm:^2.0.0": + version: 2.0.0 + resolution: "to-fast-properties@npm:2.0.0" + checksum: 10c0/b214d21dbfb4bce3452b6244b336806ffea9c05297148d32ebb428d5c43ce7545bdfc65a1ceb58c9ef4376a65c0cb2854d645f33961658b3e3b4f84910ddcdd7 + languageName: node + linkType: hard + +"to-regex-range@npm:^5.0.1": + version: 5.0.1 + resolution: "to-regex-range@npm:5.0.1" + dependencies: + is-number: "npm:^7.0.0" + checksum: 10c0/487988b0a19c654ff3e1961b87f471702e708fa8a8dd02a298ef16da7206692e8552a0250e8b3e8759270f62e9d8314616f6da274734d3b558b1fc7b7724e892 + languageName: node + linkType: hard + +"toggle-selection@npm:^1.0.6": + version: 1.0.6 + resolution: "toggle-selection@npm:1.0.6" + checksum: 10c0/f2cf1f2c70f374fd87b0cdc8007453ba9e981c4305a8bf4eac10a30e62ecdfd28bca7d18f8f15b15a506bf8a7bfb20dbe3539f0fcf2a2c8396c1a78d53e1f179 + languageName: node + linkType: hard + +"tough-cookie@npm:^4.1.2": + version: 4.1.3 + resolution: "tough-cookie@npm:4.1.3" + dependencies: + psl: "npm:^1.1.33" + punycode: "npm:^2.1.1" + universalify: "npm:^0.2.0" + url-parse: "npm:^1.5.3" + checksum: 10c0/4fc0433a0cba370d57c4b240f30440c848906dee3180bb6e85033143c2726d322e7e4614abb51d42d111ebec119c4876ed8d7247d4113563033eebbc1739c831 + languageName: node + linkType: hard + +"tr46@npm:^4.1.1": + version: 4.1.1 + resolution: "tr46@npm:4.1.1" + dependencies: + punycode: "npm:^2.3.0" + checksum: 10c0/92085dcf186f56a49ba4124a581d9ae6a5d0cd4878107c34e2e670b9ddc49da85e4950084bb3e75015195cc23f37ae1c02d45064e94dd6018f5e789aa51d93a8 + languageName: node + linkType: hard + +"tr46@npm:~0.0.3": + version: 0.0.3 + resolution: "tr46@npm:0.0.3" + checksum: 10c0/047cb209a6b60c742f05c9d3ace8fa510bff609995c129a37ace03476a9b12db4dbf975e74600830ef0796e18882b2381fb5fb1f6b4f96b832c374de3ab91a11 + languageName: node + linkType: hard + +"trim-newlines@npm:^3.0.0": + version: 3.0.1 + resolution: "trim-newlines@npm:3.0.1" + checksum: 10c0/03cfefde6c59ff57138412b8c6be922ecc5aec30694d784f2a65ef8dcbd47faef580b7de0c949345abdc56ec4b4abf64dd1e5aea619b200316e471a3dd5bf1f6 + languageName: node + linkType: hard + +"truncate-utf8-bytes@npm:^1.0.0": + version: 1.0.2 + resolution: "truncate-utf8-bytes@npm:1.0.2" + dependencies: + utf8-byte-length: "npm:^1.0.1" + checksum: 10c0/af2b431fc4314f119b551e5fccfad49d4c0ef82e13ba9ca61be6567801195b08e732ce9643542e8ad1b3df44f3df2d7345b3dd34f723954b6bb43a14584d6b3c + languageName: node + linkType: hard + +"ts-api-utils@npm:^1.0.1": + version: 1.0.2 + resolution: "ts-api-utils@npm:1.0.2" + peerDependencies: + typescript: ">=4.2.0" + checksum: 10c0/de4f877f23be44b48d605929c4fa79aeaf22f4945ff8ce91920afacbff7c4ec6235ada8a55e3f04ec7ac6c71dbbbed9b46a7cd34029687a4318d42b49222fcc8 + languageName: node + linkType: hard + +"ts-easing@npm:^0.2.0": + version: 0.2.0 + resolution: "ts-easing@npm:0.2.0" + checksum: 10c0/84ec20192310c697ff890ca2e0625e131a32596a7c5956326c9632faca9037abf2dd3de4d81ac358ae9f26a6a2cfe2300f13756b26995f753d882e3d0463e327 + languageName: node + linkType: hard + +"ts-loader@npm:^9.4.2": + version: 9.4.4 + resolution: "ts-loader@npm:9.4.4" + dependencies: + chalk: "npm:^4.1.0" + enhanced-resolve: "npm:^5.0.0" + micromatch: "npm:^4.0.0" + semver: "npm:^7.3.4" + peerDependencies: + typescript: "*" + webpack: ^5.0.0 + checksum: 10c0/11dba0651d7177eba9af38c43c79a28898ffcdfe7e73079fe48716dd93ca6634d3140dbbbc3ac34907be564be2429f0299ebdc7b58ce09482fad54333ccf611c + languageName: node + linkType: hard + +"ts-node@npm:^10.8.1": + version: 10.9.1 + resolution: "ts-node@npm:10.9.1" + dependencies: + "@cspotcode/source-map-support": "npm:^0.8.0" + "@tsconfig/node10": "npm:^1.0.7" + "@tsconfig/node12": "npm:^1.0.7" + "@tsconfig/node14": "npm:^1.0.0" + "@tsconfig/node16": "npm:^1.0.2" + acorn: "npm:^8.4.1" + acorn-walk: "npm:^8.1.1" + arg: "npm:^4.1.0" + create-require: "npm:^1.1.0" + diff: "npm:^4.0.1" + make-error: "npm:^1.1.1" + v8-compile-cache-lib: "npm:^3.0.1" + yn: "npm:3.1.1" + peerDependencies: + "@swc/core": ">=1.2.50" + "@swc/wasm": ">=1.2.50" + "@types/node": "*" + typescript: ">=2.7" + peerDependenciesMeta: + "@swc/core": + optional: true + "@swc/wasm": + optional: true + bin: + ts-node: dist/bin.js + ts-node-cwd: dist/bin-cwd.js + ts-node-esm: dist/bin-esm.js + ts-node-script: dist/bin-script.js + ts-node-transpile-only: dist/bin-transpile.js + ts-script: dist/bin-script-deprecated.js + checksum: 10c0/95187932fb83f3901e22546bd2feeac7d2feb4f412f42ac3a595f049a23e8dcf70516dffb51866391228ea2dbcfaea039e250fb2bb334d48a86ab2b6aea0ae2d + languageName: node + linkType: hard + +"tsconfig-paths@npm:^3.15.0": + version: 3.15.0 + resolution: "tsconfig-paths@npm:3.15.0" + dependencies: + "@types/json5": "npm:^0.0.29" + json5: "npm:^1.0.2" + minimist: "npm:^1.2.6" + strip-bom: "npm:^3.0.0" + checksum: 10c0/5b4f301a2b7a3766a986baf8fc0e177eb80bdba6e396792ff92dc23b5bca8bb279fc96517dcaaef63a3b49bebc6c4c833653ec58155780bc906bdbcf7dda0ef5 + languageName: node + linkType: hard + +"tslib@npm:^2.1.0": + version: 2.6.2 + resolution: "tslib@npm:2.6.2" + checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb + languageName: node + linkType: hard + +"type-check@npm:^0.4.0, type-check@npm:~0.4.0": + version: 0.4.0 + resolution: "type-check@npm:0.4.0" + dependencies: + prelude-ls: "npm:^1.2.1" + checksum: 10c0/7b3fd0ed43891e2080bf0c5c504b418fbb3e5c7b9708d3d015037ba2e6323a28152ec163bcb65212741fa5d2022e3075ac3c76440dbd344c9035f818e8ecee58 + languageName: node + linkType: hard + +"type-check@npm:~0.3.2": + version: 0.3.2 + resolution: "type-check@npm:0.3.2" + dependencies: + prelude-ls: "npm:~1.1.2" + checksum: 10c0/776217116b2b4e50e368c7ee0c22c0a85e982881c16965b90d52f216bc296d6a52ef74f9202d22158caacc092a7645b0b8d5fe529a96e3fe35d0fb393966c875 + languageName: node + linkType: hard + +"type-detect@npm:4.0.8, type-detect@npm:^4.0.0, type-detect@npm:^4.0.5, type-detect@npm:^4.0.8": + version: 4.0.8 + resolution: "type-detect@npm:4.0.8" + checksum: 10c0/8fb9a51d3f365a7de84ab7f73b653534b61b622aa6800aecdb0f1095a4a646d3f5eb295322127b6573db7982afcd40ab492d038cf825a42093a58b1e1353e0bd + languageName: node + linkType: hard + +"type-fest@npm:^0.13.1": + version: 0.13.1 + resolution: "type-fest@npm:0.13.1" + checksum: 10c0/0c0fa07ae53d4e776cf4dac30d25ad799443e9eef9226f9fddbb69242db86b08584084a99885cfa5a9dfe4c063ebdc9aa7b69da348e735baede8d43f1aeae93b + languageName: node + linkType: hard + +"type-fest@npm:^0.18.0": + version: 0.18.1 + resolution: "type-fest@npm:0.18.1" + checksum: 10c0/303f5ecf40d03e1d5b635ce7660de3b33c18ed8ebc65d64920c02974d9e684c72483c23f9084587e9dd6466a2ece1da42ddc95b412a461794dd30baca95e2bac + languageName: node + linkType: hard + +"type-fest@npm:^0.20.2": + version: 0.20.2 + resolution: "type-fest@npm:0.20.2" + checksum: 10c0/dea9df45ea1f0aaa4e2d3bed3f9a0bfe9e5b2592bddb92eb1bf06e50bcf98dbb78189668cd8bc31a0511d3fc25539b4cd5c704497e53e93e2d40ca764b10bfc3 + languageName: node + linkType: hard + +"type-fest@npm:^0.6.0": + version: 0.6.0 + resolution: "type-fest@npm:0.6.0" + checksum: 10c0/0c585c26416fce9ecb5691873a1301b5aff54673c7999b6f925691ed01f5b9232db408cdbb0bd003d19f5ae284322523f44092d1f81ca0a48f11f7cf0be8cd38 + languageName: node + linkType: hard + +"type-fest@npm:^0.8.1": + version: 0.8.1 + resolution: "type-fest@npm:0.8.1" + checksum: 10c0/dffbb99329da2aa840f506d376c863bd55f5636f4741ad6e65e82f5ce47e6914108f44f340a0b74009b0cb5d09d6752ae83203e53e98b1192cf80ecee5651636 + languageName: node + linkType: hard + +"type-fest@npm:^1.0.2": + version: 1.4.0 + resolution: "type-fest@npm:1.4.0" + checksum: 10c0/a3c0f4ee28ff6ddf800d769eafafcdeab32efa38763c1a1b8daeae681920f6e345d7920bf277245235561d8117dab765cb5f829c76b713b4c9de0998a5397141 + languageName: node + linkType: hard + +"typed-array-buffer@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-buffer@npm:1.0.0" + dependencies: + call-bind: "npm:^1.0.2" + get-intrinsic: "npm:^1.2.1" + is-typed-array: "npm:^1.1.10" + checksum: 10c0/ebad66cdf00c96b1395dffc7873169cf09801fca5954507a484f41f253feb1388d815db297b0b3bb8ce7421eac6f7ff45e2ec68450a3d68408aa4ae02fcf3a6c + languageName: node + linkType: hard + +"typed-array-buffer@npm:^1.0.1": + version: 1.0.2 + resolution: "typed-array-buffer@npm:1.0.2" + dependencies: + call-bind: "npm:^1.0.7" + es-errors: "npm:^1.3.0" + is-typed-array: "npm:^1.1.13" + checksum: 10c0/9e043eb38e1b4df4ddf9dde1aa64919ae8bb909571c1cc4490ba777d55d23a0c74c7d73afcdd29ec98616d91bb3ae0f705fad4421ea147e1daf9528200b562da + languageName: node + linkType: hard + +"typed-array-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-length@npm:1.0.0" + dependencies: + call-bind: "npm:^1.0.2" + for-each: "npm:^0.3.3" + has-proto: "npm:^1.0.1" + is-typed-array: "npm:^1.1.10" + checksum: 10c0/6696435d53ce0e704ff6760c57ccc35138aec5f87859e03eb2a3246336d546feae367952dbc918116f3f0dffbe669734e3cbd8960283c2fa79aac925db50d888 + languageName: node + linkType: hard + +"typed-array-byte-offset@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-offset@npm:1.0.0" + dependencies: + available-typed-arrays: "npm:^1.0.5" + call-bind: "npm:^1.0.2" + for-each: "npm:^0.3.3" + has-proto: "npm:^1.0.1" + is-typed-array: "npm:^1.1.10" + checksum: 10c0/4036ce007ae9752931bed3dd61e0d6de2a3e5f6a5a85a05f3adb35388d2c0728f9b1a1e638d75579f168e49c289bfb5417f00e96d4ab081f38b647fc854ff7a5 + languageName: node + linkType: hard + +"typed-array-length@npm:^1.0.4": + version: 1.0.4 + resolution: "typed-array-length@npm:1.0.4" + dependencies: + call-bind: "npm:^1.0.2" + for-each: "npm:^0.3.3" + is-typed-array: "npm:^1.1.9" + checksum: 10c0/c5163c0103d07fefc8a2ad0fc151f9ca9a1f6422098c00f695d55f9896e4d63614cd62cf8d8a031c6cee5f418e8980a533796597174da4edff075b3d275a7e23 + languageName: node + linkType: hard + +"typedarray-to-buffer@npm:^3.1.5": + version: 3.1.5 + resolution: "typedarray-to-buffer@npm:3.1.5" + dependencies: + is-typedarray: "npm:^1.0.0" + checksum: 10c0/4ac5b7a93d604edabf3ac58d3a2f7e07487e9f6e98195a080e81dbffdc4127817f470f219d794a843b87052cedef102b53ac9b539855380b8c2172054b7d5027 + languageName: node + linkType: hard + +"typescript@npm:^4.6.4 || ^5.0.0, typescript@npm:^5.1.6": + version: 5.2.2 + resolution: "typescript@npm:5.2.2" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/91ae3e6193d0ddb8656d4c418a033f0f75dec5e077ebbc2bd6d76439b93f35683936ee1bdc0e9cf94ec76863aa49f27159b5788219b50e1cd0cd6d110aa34b07 + languageName: node + linkType: hard + +"typescript@patch:typescript@npm%3A^4.6.4 || ^5.0.0#optional!builtin, typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": + version: 5.2.2 + resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin::version=5.2.2&hash=f3b441" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 10c0/062c1cee1990e6b9419ce8a55162b8dc917eb87f807e4de0327dbc1c2fa4e5f61bc0dd4e034d38ff541d1ed0479b53bcee8e4de3a4075c51a1724eb6216cb6f5 + languageName: node + linkType: hard + +"uc.micro@npm:^1.0.1, uc.micro@npm:^1.0.5": + version: 1.0.6 + resolution: "uc.micro@npm:1.0.6" + checksum: 10c0/9bde2afc6f2e24b899db6caea47dae778b88862ca76688d844ef6e6121dec0679c152893a74a6cfbd2e6fde34654e6bd8424fee8e0166cdfa6c9ae5d42b8a17b + languageName: node + linkType: hard + +"uglify-js@npm:^3.7.7": + version: 3.17.4 + resolution: "uglify-js@npm:3.17.4" + bin: + uglifyjs: bin/uglifyjs + checksum: 10c0/8b7fcdca69deb284fed7d2025b73eb747ce37f9aca6af53422844f46427152d5440601b6e2a033e77856a2f0591e4167153d5a21b68674ad11f662034ec13ced + languageName: node + linkType: hard + +"unbox-primitive@npm:^1.0.2": + version: 1.0.2 + resolution: "unbox-primitive@npm:1.0.2" + dependencies: + call-bind: "npm:^1.0.2" + has-bigints: "npm:^1.0.2" + has-symbols: "npm:^1.0.3" + which-boxed-primitive: "npm:^1.0.2" + checksum: 10c0/81ca2e81134167cc8f75fa79fbcc8a94379d6c61de67090986a2273850989dd3bae8440c163121b77434b68263e34787a675cbdcb34bb2f764c6b9c843a11b66 + languageName: node + linkType: hard + +"underscore@npm:>=1.8.3, underscore@npm:~1.13.2": + version: 1.13.6 + resolution: "underscore@npm:1.13.6" + checksum: 10c0/5f57047f47273044c045fddeb8b141dafa703aa487afd84b319c2495de2e685cecd0b74abec098292320d518b267c0c4598e45aa47d4c3628d0d4020966ba521 + languageName: node + linkType: hard + +"unique-filename@npm:^3.0.0": + version: 3.0.0 + resolution: "unique-filename@npm:3.0.0" + dependencies: + unique-slug: "npm:^4.0.0" + checksum: 10c0/6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f + languageName: node + linkType: hard + +"unique-slug@npm:^4.0.0": + version: 4.0.0 + resolution: "unique-slug@npm:4.0.0" + dependencies: + imurmurhash: "npm:^0.1.4" + checksum: 10c0/cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635 + languageName: node + linkType: hard + +"unique-string@npm:^2.0.0": + version: 2.0.0 + resolution: "unique-string@npm:2.0.0" + dependencies: + crypto-random-string: "npm:^2.0.0" + checksum: 10c0/11820db0a4ba069d174bedfa96c588fc2c96b083066fafa186851e563951d0de78181ac79c744c1ed28b51f9d82ac5b8196ff3e4560d0178046ef455d8c2244b + languageName: node + linkType: hard + +"universalify@npm:^0.1.0": + version: 0.1.2 + resolution: "universalify@npm:0.1.2" + checksum: 10c0/e70e0339f6b36f34c9816f6bf9662372bd241714dc77508d231d08386d94f2c4aa1ba1318614f92015f40d45aae1b9075cd30bd490efbe39387b60a76ca3f045 + languageName: node + linkType: hard + +"universalify@npm:^0.2.0": + version: 0.2.0 + resolution: "universalify@npm:0.2.0" + checksum: 10c0/cedbe4d4ca3967edf24c0800cfc161c5a15e240dac28e3ce575c689abc11f2c81ccc6532c8752af3b40f9120fb5e454abecd359e164f4f6aa44c29cd37e194fe + languageName: node + linkType: hard + +"universalify@npm:^1.0.0": + version: 1.0.0 + resolution: "universalify@npm:1.0.0" + checksum: 10c0/735dd9c118f96a13c7810212ef8b45e239e2fe6bf65aceefbc2826334fcfe8c523dbbf1458cef011563c51505e3a367dff7654cfb0cec5b6aa710ef120843396 + languageName: node + linkType: hard + +"universalify@npm:^2.0.0": + version: 2.0.0 + resolution: "universalify@npm:2.0.0" + checksum: 10c0/07092b9f46df61b823d8ab5e57f0ee5120c178b39609a95e4a15a98c42f6b0b8e834e66fbb47ff92831786193be42f1fd36347169b88ce8639d0f9670af24a71 + languageName: node + linkType: hard + +"update-browserslist-db@npm:^1.0.11": + version: 1.0.11 + resolution: "update-browserslist-db@npm:1.0.11" + dependencies: + escalade: "npm:^3.1.1" + picocolors: "npm:^1.0.0" + peerDependencies: + browserslist: ">= 4.21.0" + bin: + update-browserslist-db: cli.js + checksum: 10c0/280d5cf92e302d8de0c12ef840a6af26ec024a5158aa2020975cd01bf0ded09c709793a6f421e6d0f1a47557d6a1a10dc43af80f9c30b8fd0df9691eb98c1c69 + languageName: node + linkType: hard + +"update-notifier@npm:^5.1.0": + version: 5.1.0 + resolution: "update-notifier@npm:5.1.0" + dependencies: + boxen: "npm:^5.0.0" + chalk: "npm:^4.1.0" + configstore: "npm:^5.0.1" + has-yarn: "npm:^2.1.0" + import-lazy: "npm:^2.1.0" + is-ci: "npm:^2.0.0" + is-installed-globally: "npm:^0.4.0" + is-npm: "npm:^5.0.0" + is-yarn-global: "npm:^0.3.0" + latest-version: "npm:^5.1.0" + pupa: "npm:^2.1.1" + semver: "npm:^7.3.4" + semver-diff: "npm:^3.1.1" + xdg-basedir: "npm:^4.0.0" + checksum: 10c0/0dde6db5ac1e5244e1f8bf5b26895a0d53c00797ea2bdbc1302623dd1aecab5cfb88b4f324d482cbd4c8b089464383d8c83db64dec5798ec0136820e22478e47 + languageName: node + linkType: hard + +"uri-js@npm:^4.2.2": + version: 4.4.1 + resolution: "uri-js@npm:4.4.1" + dependencies: + punycode: "npm:^2.1.0" + checksum: 10c0/4ef57b45aa820d7ac6496e9208559986c665e49447cb072744c13b66925a362d96dd5a46c4530a6b8e203e5db5fe849369444440cb22ecfc26c679359e5dfa3c + languageName: node + linkType: hard + +"url-join@npm:^4.0.1": + version: 4.0.1 + resolution: "url-join@npm:4.0.1" + checksum: 10c0/ac65e2c7c562d7b49b68edddcf55385d3e922bc1dd5d90419ea40b53b6de1607d1e45ceb71efb9d60da02c681d13c6cb3a1aa8b13fc0c989dfc219df97ee992d + languageName: node + linkType: hard + +"url-parse@npm:^1.5.3": + version: 1.5.10 + resolution: "url-parse@npm:1.5.10" + dependencies: + querystringify: "npm:^2.1.1" + requires-port: "npm:^1.0.0" + checksum: 10c0/bd5aa9389f896974beb851c112f63b466505a04b4807cea2e5a3b7092f6fbb75316f0491ea84e44f66fed55f1b440df5195d7e3a8203f64fcefa19d182f5be87 + languageName: node + linkType: hard + +"use-strict@npm:1.0.1": + version: 1.0.1 + resolution: "use-strict@npm:1.0.1" + checksum: 10c0/c78ee085cbcb68bd3abd4a7dec78704dc3ad4ddeb19f37ed077f93617dd36415b4219991fbc270ad9a953e672ac65f3fd26e251d98bd7086098fd7e00fb87f2f + languageName: node + linkType: hard + +"use-sync-external-store@npm:^1.0.0": + version: 1.2.0 + resolution: "use-sync-external-store@npm:1.2.0" + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + checksum: 10c0/ac4814e5592524f242921157e791b022efe36e451fe0d4fd4d204322d5433a4fc300d63b0ade5185f8e0735ded044c70bcf6d2352db0f74d097a238cebd2da02 + languageName: node + linkType: hard + +"utf8-byte-length@npm:^1.0.1": + version: 1.0.4 + resolution: "utf8-byte-length@npm:1.0.4" + checksum: 10c0/78eeae05e7b44cd5cd382f00477fe07f5f14e04e83625cd5680e4b41ec29630fb8f85a553a650ae4131216019ef0569169990015e34619d3a2906380ecac6da8 + languageName: node + linkType: hard + +"util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2": + version: 1.0.2 + resolution: "util-deprecate@npm:1.0.2" + checksum: 10c0/41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942 + languageName: node + linkType: hard + +"uuid@npm:8.3.2": + version: 8.3.2 + resolution: "uuid@npm:8.3.2" + bin: + uuid: dist/bin/uuid + checksum: 10c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54 + languageName: node + linkType: hard + +"v8-compile-cache-lib@npm:^3.0.1": + version: 3.0.1 + resolution: "v8-compile-cache-lib@npm:3.0.1" + checksum: 10c0/bdc36fb8095d3b41df197f5fb6f11e3a26adf4059df3213e3baa93810d8f0cc76f9a74aaefc18b73e91fe7e19154ed6f134eda6fded2e0f1c8d2272ed2d2d391 + languageName: node + linkType: hard + +"validate-npm-package-license@npm:^3.0.1": + version: 3.0.4 + resolution: "validate-npm-package-license@npm:3.0.4" + dependencies: + spdx-correct: "npm:^3.0.0" + spdx-expression-parse: "npm:^3.0.0" + checksum: 10c0/7b91e455a8de9a0beaa9fe961e536b677da7f48c9a493edf4d4d4a87fd80a7a10267d438723364e432c2fcd00b5650b5378275cded362383ef570276e6312f4f + languageName: node + linkType: hard + +"verror@npm:^1.10.0": + version: 1.10.1 + resolution: "verror@npm:1.10.1" + dependencies: + assert-plus: "npm:^1.0.0" + core-util-is: "npm:1.0.2" + extsprintf: "npm:^1.2.0" + checksum: 10c0/293fb060a4c9b07965569a0c3e45efa954127818707995a8a4311f691b5d6687be99f972c759838ba6eecae717f9af28e3c49d2afc7bbdf5f0b675238f1426e8 + languageName: node + linkType: hard + +"w3c-xmlserializer@npm:^4.0.0": + version: 4.0.0 + resolution: "w3c-xmlserializer@npm:4.0.0" + dependencies: + xml-name-validator: "npm:^4.0.0" + checksum: 10c0/02cc66d6efc590bd630086cd88252444120f5feec5c4043932b0d0f74f8b060512f79dc77eb093a7ad04b4f02f39da79ce4af47ceb600f2bf9eacdc83204b1a8 + languageName: node + linkType: hard + +"watchpack@npm:^2.4.0": + version: 2.4.0 + resolution: "watchpack@npm:2.4.0" + dependencies: + glob-to-regexp: "npm:^0.4.1" + graceful-fs: "npm:^4.1.2" + checksum: 10c0/c5e35f9fb9338d31d2141d9835643c0f49b5f9c521440bb648181059e5940d93dd8ed856aa8a33fbcdd4e121dad63c7e8c15c063cf485429cd9d427be197fe62 + languageName: node + linkType: hard + +"webidl-conversions@npm:^3.0.0": + version: 3.0.1 + resolution: "webidl-conversions@npm:3.0.1" + checksum: 10c0/5612d5f3e54760a797052eb4927f0ddc01383550f542ccd33d5238cfd65aeed392a45ad38364970d0a0f4fea32e1f4d231b3d8dac4a3bdd385e5cf802ae097db + languageName: node + linkType: hard + +"webidl-conversions@npm:^7.0.0": + version: 7.0.0 + resolution: "webidl-conversions@npm:7.0.0" + checksum: 10c0/228d8cb6d270c23b0720cb2d95c579202db3aaf8f633b4e9dd94ec2000a04e7e6e43b76a94509cdb30479bd00ae253ab2371a2da9f81446cc313f89a4213a2c4 + languageName: node + linkType: hard + +"webpack-cli@npm:^5.1.4": + version: 5.1.4 + resolution: "webpack-cli@npm:5.1.4" + dependencies: + "@discoveryjs/json-ext": "npm:^0.5.0" + "@webpack-cli/configtest": "npm:^2.1.1" + "@webpack-cli/info": "npm:^2.0.2" + "@webpack-cli/serve": "npm:^2.0.5" + colorette: "npm:^2.0.14" + commander: "npm:^10.0.1" + cross-spawn: "npm:^7.0.3" + envinfo: "npm:^7.7.3" + fastest-levenshtein: "npm:^1.0.12" + import-local: "npm:^3.0.2" + interpret: "npm:^3.1.1" + rechoir: "npm:^0.8.0" + webpack-merge: "npm:^5.7.3" + peerDependencies: + webpack: 5.x.x + peerDependenciesMeta: + "@webpack-cli/generators": + optional: true + webpack-bundle-analyzer: + optional: true + webpack-dev-server: + optional: true + bin: + webpack-cli: bin/cli.js + checksum: 10c0/4266909ae5e2e662c8790ac286e965b2c7fd5a4a2f07f48e28576234c9a5f631847ccddc18e1b3281c7b4be04a7ff4717d2636033a322dde13ac995fd0d9de10 + languageName: node + linkType: hard + +"webpack-merge@npm:^5.7.3": + version: 5.9.0 + resolution: "webpack-merge@npm:5.9.0" + dependencies: + clone-deep: "npm:^4.0.1" + wildcard: "npm:^2.0.0" + checksum: 10c0/74935a4b03612ee65c0867ca1050788ccfec3efa6d17bb5acceacbd4fbbd0356a073997723eff7380deccd88f13a55c52cb004e80e34f3a67808ac455da6ad64 + languageName: node + linkType: hard + +"webpack-sources@npm:^3.2.3": + version: 3.2.3 + resolution: "webpack-sources@npm:3.2.3" + checksum: 10c0/2ef63d77c4fad39de4a6db17323d75eb92897b32674e97d76f0a1e87c003882fc038571266ad0ef581ac734cbe20952912aaa26155f1905e96ce251adbb1eb4e + languageName: node + linkType: hard + +"webpack@npm:^5.76.3": + version: 5.88.2 + resolution: "webpack@npm:5.88.2" + dependencies: + "@types/eslint-scope": "npm:^3.7.3" + "@types/estree": "npm:^1.0.0" + "@webassemblyjs/ast": "npm:^1.11.5" + "@webassemblyjs/wasm-edit": "npm:^1.11.5" + "@webassemblyjs/wasm-parser": "npm:^1.11.5" + acorn: "npm:^8.7.1" + acorn-import-assertions: "npm:^1.9.0" + browserslist: "npm:^4.14.5" + chrome-trace-event: "npm:^1.0.2" + enhanced-resolve: "npm:^5.15.0" + es-module-lexer: "npm:^1.2.1" + eslint-scope: "npm:5.1.1" + events: "npm:^3.2.0" + glob-to-regexp: "npm:^0.4.1" + graceful-fs: "npm:^4.2.9" + json-parse-even-better-errors: "npm:^2.3.1" + loader-runner: "npm:^4.2.0" + mime-types: "npm:^2.1.27" + neo-async: "npm:^2.6.2" + schema-utils: "npm:^3.2.0" + tapable: "npm:^2.1.1" + terser-webpack-plugin: "npm:^5.3.7" + watchpack: "npm:^2.4.0" + webpack-sources: "npm:^3.2.3" + peerDependenciesMeta: + webpack-cli: + optional: true + bin: + webpack: bin/webpack.js + checksum: 10c0/743acf04cdb7f73ec059761d3921798014139005c88e136ab99fe158f544695eee2caf4be775cc06e7f481d84725d443df2c1c8e00ec24a130e8b8fd514ff7b9 + languageName: node + linkType: hard + +"webrtc-adapter@npm:^4.1.1": + version: 4.2.2 + resolution: "webrtc-adapter@npm:4.2.2" + dependencies: + sdp: "npm:^2.1.0" + checksum: 10c0/8ec48d819ae5cb5613234851e1905e48b04ffea2b54318fdb5a0d95fc93e6236dd1dd9716bdc50c0a109ddb90c432a8f46c950dbfe1d9ee62275a0ace74b044c + languageName: node + linkType: hard + +"whatwg-encoding@npm:^2.0.0": + version: 2.0.0 + resolution: "whatwg-encoding@npm:2.0.0" + dependencies: + iconv-lite: "npm:0.6.3" + checksum: 10c0/91b90a49f312dc751496fd23a7e68981e62f33afe938b97281ad766235c4872fc4e66319f925c5e9001502b3040dd25a33b02a9c693b73a4cbbfdc4ad10c3e3e + languageName: node + linkType: hard + +"whatwg-mimetype@npm:^3.0.0": + version: 3.0.0 + resolution: "whatwg-mimetype@npm:3.0.0" + checksum: 10c0/323895a1cda29a5fb0b9ca82831d2c316309fede0365047c4c323073e3239067a304a09a1f4b123b9532641ab604203f33a1403b5ca6a62ef405bcd7a204080f + languageName: node + linkType: hard + +"whatwg-url@npm:^12.0.0, whatwg-url@npm:^12.0.1": + version: 12.0.1 + resolution: "whatwg-url@npm:12.0.1" + dependencies: + tr46: "npm:^4.1.1" + webidl-conversions: "npm:^7.0.0" + checksum: 10c0/99f506b2c996704fa0fc5c70d8e5e27dce15492db2921c99cf319a8d56cb61641f5c06089f63e1ab1983de9fd6a63c3c112a90cdb5fe352d7a846979b10df566 + languageName: node + linkType: hard + +"whatwg-url@npm:^5.0.0": + version: 5.0.0 + resolution: "whatwg-url@npm:5.0.0" + dependencies: + tr46: "npm:~0.0.3" + webidl-conversions: "npm:^3.0.0" + checksum: 10c0/1588bed84d10b72d5eec1d0faa0722ba1962f1821e7539c535558fb5398d223b0c50d8acab950b8c488b4ba69043fd833cc2697056b167d8ad46fac3995a55d5 + languageName: node + linkType: hard + +"which-boxed-primitive@npm:^1.0.2": + version: 1.0.2 + resolution: "which-boxed-primitive@npm:1.0.2" + dependencies: + is-bigint: "npm:^1.0.1" + is-boolean-object: "npm:^1.1.0" + is-number-object: "npm:^1.0.4" + is-string: "npm:^1.0.5" + is-symbol: "npm:^1.0.3" + checksum: 10c0/0a62a03c00c91dd4fb1035b2f0733c341d805753b027eebd3a304b9cb70e8ce33e25317add2fe9b5fea6f53a175c0633ae701ff812e604410ddd049777cd435e + languageName: node + linkType: hard + +"which-builtin-type@npm:^1.1.3": + version: 1.1.3 + resolution: "which-builtin-type@npm:1.1.3" + dependencies: + function.prototype.name: "npm:^1.1.5" + has-tostringtag: "npm:^1.0.0" + is-async-function: "npm:^2.0.0" + is-date-object: "npm:^1.0.5" + is-finalizationregistry: "npm:^1.0.2" + is-generator-function: "npm:^1.0.10" + is-regex: "npm:^1.1.4" + is-weakref: "npm:^1.0.2" + isarray: "npm:^2.0.5" + which-boxed-primitive: "npm:^1.0.2" + which-collection: "npm:^1.0.1" + which-typed-array: "npm:^1.1.9" + checksum: 10c0/2b7b234df3443b52f4fbd2b65b731804de8d30bcc4210ec84107ef377a81923cea7f2763b7fb78b394175cea59118bf3c41b9ffd2d643cb1d748ef93b33b6bd4 + languageName: node + linkType: hard + +"which-collection@npm:^1.0.1": + version: 1.0.1 + resolution: "which-collection@npm:1.0.1" + dependencies: + is-map: "npm:^2.0.1" + is-set: "npm:^2.0.1" + is-weakmap: "npm:^2.0.1" + is-weakset: "npm:^2.0.1" + checksum: 10c0/249f913e1758ed2f06f00706007d87dc22090a80591a56917376e70ecf8fc9ab6c41d98e1c87208bb9648676f65d4b09c0e4d23c56c7afb0f0a73a27d701df5d + languageName: node + linkType: hard + +"which-typed-array@npm:^1.1.10, which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.9": + version: 1.1.11 + resolution: "which-typed-array@npm:1.1.11" + dependencies: + available-typed-arrays: "npm:^1.0.5" + call-bind: "npm:^1.0.2" + for-each: "npm:^0.3.3" + gopd: "npm:^1.0.1" + has-tostringtag: "npm:^1.0.0" + checksum: 10c0/2cf4ce417beb50ae0ec3b1b479ea6d72d3e71986462ebd77344ca6398f77c7c59804eebe88f4126ce79f85edbcaa6c7783f54b0a5bf34f785eab7cbb35c30499 + languageName: node + linkType: hard + +"which-typed-array@npm:^1.1.14": + version: 1.1.14 + resolution: "which-typed-array@npm:1.1.14" + dependencies: + available-typed-arrays: "npm:^1.0.6" + call-bind: "npm:^1.0.5" + for-each: "npm:^0.3.3" + gopd: "npm:^1.0.1" + has-tostringtag: "npm:^1.0.1" + checksum: 10c0/0960f1e77807058819451b98c51d4cd72031593e8de990b24bd3fc22e176f5eee22921d68d852297c786aec117689f0423ed20aa4fde7ce2704d680677891f56 + languageName: node + linkType: hard + +"which@npm:^1.2.9": + version: 1.3.1 + resolution: "which@npm:1.3.1" + dependencies: + isexe: "npm:^2.0.0" + bin: + which: ./bin/which + checksum: 10c0/e945a8b6bbf6821aaaef7f6e0c309d4b615ef35699576d5489b4261da9539f70393c6b2ce700ee4321c18f914ebe5644bc4631b15466ffbaad37d83151f6af59 + languageName: node + linkType: hard + +"which@npm:^2.0.1, which@npm:^2.0.2": + version: 2.0.2 + resolution: "which@npm:2.0.2" + dependencies: + isexe: "npm:^2.0.0" + bin: + node-which: ./bin/node-which + checksum: 10c0/66522872a768b60c2a65a57e8ad184e5372f5b6a9ca6d5f033d4b0dc98aff63995655a7503b9c0a2598936f532120e81dd8cc155e2e92ed662a2b9377cc4374f + languageName: node + linkType: hard + +"which@npm:^4.0.0": + version: 4.0.0 + resolution: "which@npm:4.0.0" + dependencies: + isexe: "npm:^3.1.1" + bin: + node-which: bin/which.js + checksum: 10c0/449fa5c44ed120ccecfe18c433296a4978a7583bf2391c50abce13f76878d2476defde04d0f79db8165bdf432853c1f8389d0485ca6e8ebce3bbcded513d5e6a + languageName: node + linkType: hard + +"wide-align@npm:^1.1.5": + version: 1.1.5 + resolution: "wide-align@npm:1.1.5" + dependencies: + string-width: "npm:^1.0.2 || 2 || 3 || 4" + checksum: 10c0/1d9c2a3e36dfb09832f38e2e699c367ef190f96b82c71f809bc0822c306f5379df87bab47bed27ea99106d86447e50eb972d3c516c2f95782807a9d082fbea95 + languageName: node + linkType: hard + +"widest-line@npm:^3.1.0": + version: 3.1.0 + resolution: "widest-line@npm:3.1.0" + dependencies: + string-width: "npm:^4.0.0" + checksum: 10c0/b1e623adcfb9df35350dd7fc61295d6d4a1eaa65a406ba39c4b8360045b614af95ad10e05abf704936ed022569be438c4bfa02d6d031863c4166a238c301119f + languageName: node + linkType: hard + +"wildcard@npm:^2.0.0": + version: 2.0.1 + resolution: "wildcard@npm:2.0.1" + checksum: 10c0/08f70cd97dd9a20aea280847a1fe8148e17cae7d231640e41eb26d2388697cbe65b67fd9e68715251c39b080c5ae4f76d71a9a69fa101d897273efdfb1b58bf7 + languageName: node + linkType: hard + +"word-wrap@npm:~1.2.3": + version: 1.2.5 + resolution: "word-wrap@npm:1.2.5" + checksum: 10c0/e0e4a1ca27599c92a6ca4c32260e8a92e8a44f4ef6ef93f803f8ed823f486e0889fc0b93be4db59c8d51b3064951d25e43d434e95dc8c960cc3a63d65d00ba20 + languageName: node + linkType: hard + +"workerpool@npm:6.2.1": + version: 6.2.1 + resolution: "workerpool@npm:6.2.1" + checksum: 10c0/f0efd2d74eafd58eaeb36d7d85837d080f75c52b64893cff317b66257dd308e5c9f85ef0b12904f6c7f24ed2365bc3cfeba1f1d16aa736d84d6ef8156ae37c80 + languageName: node + linkType: hard + +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0": + version: 7.0.0 + resolution: "wrap-ansi@npm:7.0.0" + dependencies: + ansi-styles: "npm:^4.0.0" + string-width: "npm:^4.1.0" + strip-ansi: "npm:^6.0.0" + checksum: 10c0/d15fc12c11e4cbc4044a552129ebc75ee3f57aa9c1958373a4db0292d72282f54373b536103987a4a7594db1ef6a4f10acf92978f79b98c49306a4b58c77d4da + languageName: node + linkType: hard + +"wrap-ansi@npm:^8.0.1, wrap-ansi@npm:^8.1.0": + version: 8.1.0 + resolution: "wrap-ansi@npm:8.1.0" + dependencies: + ansi-styles: "npm:^6.1.0" + string-width: "npm:^5.0.1" + strip-ansi: "npm:^7.0.1" + checksum: 10c0/138ff58a41d2f877eae87e3282c0630fc2789012fc1af4d6bd626eeb9a2f9a65ca92005e6e69a75c7b85a68479fe7443c7dbe1eb8fbaa681a4491364b7c55c60 + languageName: node + linkType: hard + +"wrappy@npm:1": + version: 1.0.2 + resolution: "wrappy@npm:1.0.2" + checksum: 10c0/56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0 + languageName: node + linkType: hard + +"write-file-atomic@npm:^3.0.0": + version: 3.0.3 + resolution: "write-file-atomic@npm:3.0.3" + dependencies: + imurmurhash: "npm:^0.1.4" + is-typedarray: "npm:^1.0.0" + signal-exit: "npm:^3.0.2" + typedarray-to-buffer: "npm:^3.1.5" + checksum: 10c0/7fb67affd811c7a1221bed0c905c26e28f0041e138fb19ccf02db57a0ef93ea69220959af3906b920f9b0411d1914474cdd90b93a96e5cd9e8368d9777caac0e + languageName: node + linkType: hard + +"ws@npm:^8.13.0": + version: 8.14.0 + resolution: "ws@npm:8.14.0" + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: ">=5.0.2" + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + checksum: 10c0/d623858a236b5ed97d850c4a9677e110cb849696a956c1e770c4c560eab5cb23efb8c5a93aa7b611e25bcfc834fd9aee598f19d307cfebae032c4c30b75138b2 + languageName: node + linkType: hard + +"xdg-basedir@npm:^4.0.0": + version: 4.0.0 + resolution: "xdg-basedir@npm:4.0.0" + checksum: 10c0/1b5d70d58355af90363a4e0a51c992e77fc5a1d8de5822699c7d6e96a6afea9a1e048cb93312be6870f338ca45ebe97f000425028fa149c1e87d1b5b8b212a06 + languageName: node + linkType: hard + +"xml-name-validator@npm:^4.0.0": + version: 4.0.0 + resolution: "xml-name-validator@npm:4.0.0" + checksum: 10c0/c1bfa219d64e56fee265b2bd31b2fcecefc063ee802da1e73bad1f21d7afd89b943c9e2c97af2942f60b1ad46f915a4c81e00039c7d398b53cf410e29d3c30bd + languageName: node + linkType: hard + +"xmlbuilder@npm:>=11.0.1, xmlbuilder@npm:^15.1.1": + version: 15.1.1 + resolution: "xmlbuilder@npm:15.1.1" + checksum: 10c0/665266a8916498ff8d82b3d46d3993913477a254b98149ff7cff060d9b7cc0db7cf5a3dae99aed92355254a808c0e2e3ec74ad1b04aa1061bdb8dfbea26c18b8 + languageName: node + linkType: hard + +"xmlchars@npm:^2.2.0": + version: 2.2.0 + resolution: "xmlchars@npm:2.2.0" + checksum: 10c0/b64b535861a6f310c5d9bfa10834cf49127c71922c297da9d4d1b45eeaae40bf9b4363275876088fbe2667e5db028d2cd4f8ee72eed9bede840a67d57dab7593 + languageName: node + linkType: hard + +"xmlcreate@npm:^2.0.4": + version: 2.0.4 + resolution: "xmlcreate@npm:2.0.4" + checksum: 10c0/fc4234e2d1942877d761d4f3d64410b54633d2ec60b13a5d56a6a06545aba39a0df8ed7ded10785a302f632eb4f0a4fedbf4bf10e17892e11d5075244b9e5705 + languageName: node + linkType: hard + +"y18n@npm:^5.0.5": + version: 5.0.8 + resolution: "y18n@npm:5.0.8" + checksum: 10c0/4df2842c36e468590c3691c894bc9cdbac41f520566e76e24f59401ba7d8b4811eb1e34524d57e54bc6d864bcb66baab7ffd9ca42bf1eda596618f9162b91249 + languageName: node + linkType: hard + +"yallist@npm:^4.0.0": + version: 4.0.0 + resolution: "yallist@npm:4.0.0" + checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a + languageName: node + linkType: hard + +"yaml@npm:2.3.1": + version: 2.3.1 + resolution: "yaml@npm:2.3.1" + checksum: 10c0/ed4c21a907fb1cd60a25177612fa46d95064a144623d269199817908475fe85bef20fb17406e3bdc175351b6488056a6f84beb7836e8c262646546a0220188e3 + languageName: node + linkType: hard + +"yaml@npm:^1.10.2": + version: 1.10.2 + resolution: "yaml@npm:1.10.2" + checksum: 10c0/5c28b9eb7adc46544f28d9a8d20c5b3cb1215a886609a2fd41f51628d8aaa5878ccd628b755dbcd29f6bb4921bd04ffbc6dcc370689bb96e594e2f9813d2605f + languageName: node + linkType: hard + +"yargs-parser@npm:20.2.4": + version: 20.2.4 + resolution: "yargs-parser@npm:20.2.4" + checksum: 10c0/08dc341f0b9f940c2fffc1d1decf3be00e28cabd2b578a694901eccc7dcd10577f10c6aa1b040fdd9a68b2042515a60f18476543bccacf9f3ce2c8534cd87435 + languageName: node + linkType: hard + +"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3": + version: 20.2.9 + resolution: "yargs-parser@npm:20.2.9" + checksum: 10c0/0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72 + languageName: node + linkType: hard + +"yargs-parser@npm:^21.1.1": + version: 21.1.1 + resolution: "yargs-parser@npm:21.1.1" + checksum: 10c0/f84b5e48169479d2f402239c59f084cfd1c3acc197a05c59b98bab067452e6b3ea46d4dd8ba2985ba7b3d32a343d77df0debd6b343e5dae3da2aab2cdf5886b2 + languageName: node + linkType: hard + +"yargs-unparser@npm:2.0.0": + version: 2.0.0 + resolution: "yargs-unparser@npm:2.0.0" + dependencies: + camelcase: "npm:^6.0.0" + decamelize: "npm:^4.0.0" + flat: "npm:^5.0.2" + is-plain-obj: "npm:^2.1.0" + checksum: 10c0/a5a7d6dc157efa95122e16780c019f40ed91d4af6d2bac066db8194ed0ec5c330abb115daa5a79ff07a9b80b8ea80c925baacf354c4c12edd878c0529927ff03 + languageName: node + linkType: hard + +"yargs@npm:16.2.0": + version: 16.2.0 + resolution: "yargs@npm:16.2.0" + dependencies: + cliui: "npm:^7.0.2" + escalade: "npm:^3.1.1" + get-caller-file: "npm:^2.0.5" + require-directory: "npm:^2.1.1" + string-width: "npm:^4.2.0" + y18n: "npm:^5.0.5" + yargs-parser: "npm:^20.2.2" + checksum: 10c0/b1dbfefa679848442454b60053a6c95d62f2d2e21dd28def92b647587f415969173c6e99a0f3bab4f1b67ee8283bf735ebe3544013f09491186ba9e8a9a2b651 + languageName: node + linkType: hard + +"yargs@npm:^17.0.0, yargs@npm:^17.0.1, yargs@npm:^17.6.0": + version: 17.7.2 + resolution: "yargs@npm:17.7.2" + dependencies: + cliui: "npm:^8.0.1" + escalade: "npm:^3.1.1" + get-caller-file: "npm:^2.0.5" + require-directory: "npm:^2.1.1" + string-width: "npm:^4.2.3" + y18n: "npm:^5.0.5" + yargs-parser: "npm:^21.1.1" + checksum: 10c0/ccd7e723e61ad5965fffbb791366db689572b80cca80e0f96aad968dfff4156cd7cd1ad18607afe1046d8241e6fb2d6c08bf7fa7bfb5eaec818735d8feac8f05 + languageName: node + linkType: hard + +"yauzl@npm:^2.10.0": + version: 2.10.0 + resolution: "yauzl@npm:2.10.0" + dependencies: + buffer-crc32: "npm:~0.2.3" + fd-slicer: "npm:~1.1.0" + checksum: 10c0/f265002af7541b9ec3589a27f5fb8f11cf348b53cc15e2751272e3c062cd73f3e715bc72d43257de71bbaecae446c3f1b14af7559e8ab0261625375541816422 + languageName: node + linkType: hard + +"yn@npm:3.1.1": + version: 3.1.1 + resolution: "yn@npm:3.1.1" + checksum: 10c0/0732468dd7622ed8a274f640f191f3eaf1f39d5349a1b72836df484998d7d9807fbea094e2f5486d6b0cd2414aad5775972df0e68f8604db89a239f0f4bf7443 + languageName: node + linkType: hard + +"yocto-queue@npm:^0.1.0": + version: 0.1.0 + resolution: "yocto-queue@npm:0.1.0" + checksum: 10c0/dceb44c28578b31641e13695d200d34ec4ab3966a5729814d5445b194933c096b7ced71494ce53a0e8820685d1d010df8b2422e5bf2cdea7e469d97ffbea306f + languageName: node + linkType: hard + +"zod@npm:^3.22.4": + version: 3.22.4 + resolution: "zod@npm:3.22.4" + checksum: 10c0/7578ab283dac0eee66a0ad0fc4a7f28c43e6745aadb3a529f59a4b851aa10872b3890398b3160f257f4b6817b4ce643debdda4fb21a2c040adda7862cab0a587 + languageName: node + linkType: hard From 6f7e57660476b1e81291ed862e0e837ba3ca86a1 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 22 May 2024 15:32:44 +1000 Subject: [PATCH 114/302] feat: add notice banner for deprecating group and inviting users --- _locales/en/messages.json | 2 + ts/components/NoticeBanner.tsx | 41 +++++++++-- ts/components/SessionInboxView.tsx | 4 +- ts/components/SessionWrapperModal.tsx | 5 +- .../conversation/SessionConversation.tsx | 68 ++++++++++++++----- ts/components/dialog/InviteContactsDialog.tsx | 13 ++-- ts/components/dialog/StyledRootDialog.tsx | 3 + .../leftpane/overlay/OverlayClosedGroup.tsx | 5 ++ ts/react.d.ts | 4 ++ ts/types/LocalizerKeys.ts | 4 +- 10 files changed, 119 insertions(+), 30 deletions(-) create mode 100644 ts/components/dialog/StyledRootDialog.tsx diff --git a/_locales/en/messages.json b/_locales/en/messages.json index cafa1c320b..9c6bca17dc 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -590,6 +590,8 @@ "noMessagesInEverythingElse": "You have no messages from $name$. Send a message to start the conversation!", "hideBanner": "Hide", "someOfYourDeviceUseOutdatedVersion": "Some of your devices are using outdated versions. Syncing may be unreliable until they are updated.", + "versionRequiredForNewGroupDescription": "Users must have version {VERSION} or higher to receive invitations", + "upgradeYourGroupBefore": "Groups have been upgraded. Upgrade your group chats by creating a new Group. Support for old Groups will be discontinued on [Date].", "openMessageRequestInboxDescription": "View your Message Request inbox", "clearAllReactions": "Are you sure you want to clear all $emoji$ ?", "expandedReactionsText": "Show Less", diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx index 255926d829..592f113dbf 100644 --- a/ts/components/NoticeBanner.tsx +++ b/ts/components/NoticeBanner.tsx @@ -1,7 +1,8 @@ -import React from 'react'; +import React, { SessionDataTestId } from 'react'; import styled from 'styled-components'; import { Flex } from './basic/Flex'; -import { SessionIconButton } from './icon'; +import { SessionIconButton, SessionIconType } from './icon'; +import { StyledRootDialog } from './dialog/StyledRootDialog'; const StyledNoticeBanner = styled(Flex)` position: relative; @@ -23,11 +24,13 @@ const StyledText = styled.span` type NoticeBannerProps = { text: string; - dismissCallback: () => void; + icon: SessionIconType; + onButtonClick: () => void; + dataTestId: SessionDataTestId; }; export const NoticeBanner = (props: NoticeBannerProps) => { - const { text, dismissCallback } = props; + const { text, onButtonClick, icon, dataTestId } = props; return ( { flexDirection={'row'} justifyContent={'center'} alignItems={'center'} + data-testid={dataTestId} > {text} { event?.preventDefault(); - dismissCallback(); + onButtonClick(); }} /> ); }; + +const StyledGroupInviteBanner = styled(Flex)` + position: relative; + background-color: var(--orange-color); + color: var(--black-color); + font-size: var(--font-size-sm); + padding: var(--margins-xs) var(--margins-lg); + text-align: center; + flex-shrink: 0; + + // when part a a dialog, invert it and make it narrower (as the dialog grows to make it fit) + ${StyledRootDialog} & { + background-color: unset; + color: var(--orange-color); + max-width: 300px; + } +`; + +export const GroupInviteRequiredVersionBanner = () => { + return ( + + {window.i18n('versionRequiredForNewGroupDescription')} + + ); +}; diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index bc69090b2f..df3b0b78b9 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -120,7 +120,9 @@ const SomeDeviceOutdatedSyncingNotice = () => { return ( ); }; diff --git a/ts/components/SessionWrapperModal.tsx b/ts/components/SessionWrapperModal.tsx index c75a64c0df..cf5a2cfe65 100644 --- a/ts/components/SessionWrapperModal.tsx +++ b/ts/components/SessionWrapperModal.tsx @@ -5,6 +5,7 @@ import useKey from 'react-use/lib/useKey'; import { SessionIconButton } from './icon'; import { SessionButton, SessionButtonColor, SessionButtonType } from './basic/SessionButton'; +import { StyledRootDialog } from './dialog/StyledRootDialog'; export type SessionWrapperModalType = { title?: string; @@ -63,7 +64,7 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => { }; return ( -
{
-
+ ); }; diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index df5128e6ae..df9f157a20 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -251,26 +251,15 @@ export class SessionConversation extends React.Component { // TODOLATER break selectionMode into it's own container component so we can use hooks to fetch relevant state from the store const selectionMode = selectedMessages.length > 0; - const bannerText = - selectedConversation.hasOutdatedClient && - selectedConversation.hasOutdatedClient !== ourDisplayNameInProfile - ? window.i18n('disappearingMessagesModeOutdated', [selectedConversation.hasOutdatedClient]) - : window.i18n('someOfYourDeviceUseOutdatedVersion'); - return (
- {selectedConversation?.hasOutdatedClient?.length ? ( - { - const conversation = ConvoHub.use().get(selectedConversation.id); - conversation.set({ hasOutdatedClient: undefined }); - void conversation.commit(); - }} - /> - ) : null} + +
{isSelectedConvoInitialLoadingInProgress ? ( @@ -652,3 +641,50 @@ const renderImagePreview = async (contentType: string, file: File, fileName: str thumbnail: null, }; }; + +function OutdatedClientBanner(props: { + selectedConversation: Pick; + ourDisplayNameInProfile: string; +}) { + const { selectedConversation, ourDisplayNameInProfile } = props; + const bannerText = + selectedConversation.hasOutdatedClient && + selectedConversation.hasOutdatedClient !== ourDisplayNameInProfile + ? window.i18n('disappearingMessagesModeOutdated', [selectedConversation.hasOutdatedClient]) + : window.i18n('someOfYourDeviceUseOutdatedVersion'); + + return selectedConversation.hasOutdatedClient?.length ? ( + { + const conversation = ConvoHub.use().get(selectedConversation.id); + conversation.set({ hasOutdatedClient: undefined }); + void conversation.commit(); + }} + icon="exit" + dataTestId="some-of-your-devices-outdated-conversation" + /> + ) : null; +} + +function OutdatedLegacyGroupBanner(props: { + selectedConversation: Pick; +}) { + const { selectedConversation } = props; + + const isLegacyGroup = + !selectedConversation.isPrivate && + !selectedConversation.isPublic && + selectedConversation.id.startsWith('05'); + + return isLegacyGroup ? ( + { + throw new Error('TODO'); // fixme audric + }} + icon="externalLink" + dataTestId="legacy-group-banner" + /> + ) : null; +} diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index 86bfd0ad3e..6f80fac8e8 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -31,6 +31,7 @@ import { SessionWrapperModal } from '../SessionWrapperModal'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; import { SessionSpinner } from '../basic/SessionSpinner'; import { SessionToggle } from '../basic/SessionToggle'; +import { GroupInviteRequiredVersionBanner } from '../NoticeBanner'; type Props = { conversationId: string; @@ -186,12 +187,16 @@ const InviteContactsDialogInner = (props: Props) => { return ( + {hasContacts && isGroupV2 && } + {isGroupV2 && ( - - Share History?{' '} - setShareHistory(!shareHistory)} /> - + <> + + Share History?{' '} + setShareHistory(!shareHistory)} /> + + )}
{hasContacts ? ( diff --git a/ts/components/dialog/StyledRootDialog.tsx b/ts/components/dialog/StyledRootDialog.tsx new file mode 100644 index 0000000000..d98a95fae8 --- /dev/null +++ b/ts/components/dialog/StyledRootDialog.tsx @@ -0,0 +1,3 @@ +import styled from 'styled-components'; + +export const StyledRootDialog = styled.div``; diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index a5609094d9..fe8db6d1b1 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -23,6 +23,7 @@ import { getSearchResultsContactOnly, isSearching } from '../../../state/selecto import { useOurPkStr } from '../../../state/selectors/user'; import { SessionSearchInput } from '../../SessionSearchInput'; import { SpacerLG } from '../../basic/Text'; +import { GroupInviteRequiredVersionBanner } from '../../NoticeBanner'; const StyledMemberListNoContacts = styled.div` font-family: var(--font-mono), var(--font-default); @@ -178,6 +179,10 @@ export const OverlayClosedGroupV2 = () => { + {!noContactsForClosedGroup && window.sessionFeatureFlags.useClosedGroupV2 && ( + + )} + {noContactsForClosedGroup ? ( diff --git a/ts/react.d.ts b/ts/react.d.ts index ba47a8b343..92b76d5ea6 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -51,6 +51,10 @@ declare module 'react' { | 'microphone-button' | 'call-button' | 'attachments-button' + | 'invite-warning' + | 'some-of-your-devices-outdated-conversation' + | 'some-of-your-devices-outdated-inbox' + | 'legacy-group-banner' // generic button types | 'emoji-button' diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 458be881cc..8bbc5a6b32 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -290,8 +290,8 @@ export type LocalizerKeys = | 'leaveGroupConfirmation' | 'leaveGroupConfirmationAdmin' | 'leaveGroupConfirmationOnlyAdmin' - | 'leaveGroupConfirmationOnlyAdminWarning' | 'leaveGroupConfirmationOnlyAdminLegacy' + | 'leaveGroupConfirmationOnlyAdminWarning' | 'leaveGroupFailed' | 'leaveGroupFailedPleaseTryAgain' | 'leaving' @@ -575,6 +575,7 @@ export type LocalizerKeys = | 'unreadMessages' | 'updateDisappearingMessagesFallback' | 'updateGroupDialogTitle' + | 'upgradeYourGroupBefore' | 'userAddedToModerators' | 'userBanFailed' | 'userBanned' @@ -582,6 +583,7 @@ export type LocalizerKeys = | 'userRemovedFromModerators' | 'userUnbanFailed' | 'userUnbanned' + | 'versionRequiredForNewGroupDescription' | 'video' | 'videoAttachmentAlt' | 'viewMenuResetZoom' From 176f125028ea756433fb6f9b9512f50e27358f34 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 3 Jun 2024 13:26:01 +1000 Subject: [PATCH 115/302] chore: working deps after merge --- package.json | 9 +- yarn.lock | 22221 ++++++++++++++++++++++++------------------------- 2 files changed, 10732 insertions(+), 11498 deletions(-) diff --git a/package.json b/package.json index 6e53791692..ca047dd094 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,7 @@ "loader-utils": "^2.0.4", "http-cache-semantics": "^4.1.1", "terser": "^5.14.2", - "minimatch": "^3.0.5", - "libsession_util_nodejs": "portal:/home/audric/pro/contribs/libsession-util-nodejs" + "minimatch": "^3.0.5" }, "scripts": { "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .", @@ -62,7 +61,7 @@ "sedtoAppImage": "sed -i 's/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/\"target\": \"AppImage\"/g' package.json", "sedtoDeb": "sed -i 's/\"target\": \"AppImage\"/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/g' package.json", "ready": "yarn build-everything && yarn lint-full && yarn test", - "postinstall": "yarn patch-package && yarn electron-builder install-app-deps", + "postinstall": "yarn patch-package", "update-git-info": "node ./build/updateLocalConfig.js", "worker:utils": "webpack --config=./utils.worker.config.js", "worker:libsession": "rimraf 'ts/webworker/workers/node/libsession/*.node' && webpack --config=./libsession.worker.config.js", @@ -96,7 +95,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.3/libsession_util_nodejs-v0.4.3.tar.gz", + "libsession_util_nodejs": "link:../libsession-util-nodejs", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", @@ -158,7 +157,7 @@ "@types/lodash": "^4.14.194", "@types/mocha": "5.0.0", "@types/node-fetch": "^2.5.7", - "@types/react": "^17.0.2", + "@types/react": "17.0.2", "@types/react-dom": "^17.0.2", "@types/react-redux": "^7.1.24", "@types/react-virtualized": "9.18.12", diff --git a/yarn.lock b/yarn.lock index 74445307e9..518c90deff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1,11497 +1,10732 @@ -# This file is generated by running "yarn install" inside your project. -# Manual changes might be lost - proceed with caution! - -__metadata: - version: 8 - cacheKey: 10c0 - -"7zip-bin@npm:~5.1.1": - version: 5.1.1 - resolution: "7zip-bin@npm:5.1.1" - checksum: 10c0/528db0d93d8a1de62e12624570f49c733e707606602a48be211b2186b6453903b61c659bcc919bfbb021029157af06f43d5017b628fff2a1e66d0190b26eea0e - languageName: node - linkType: hard - -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/code-frame@npm:7.24.6" - dependencies: - "@babel/highlight": "npm:^7.24.6" - picocolors: "npm:^1.0.0" - checksum: 10c0/c93c6d1763530f415218c31d07359364397f19b70026abdff766164c21ed352a931cf07f3102c5fb9e04792de319e332d68bcb1f7debef601a02197f90f9ba24 - languageName: node - linkType: hard - -"@babel/generator@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/generator@npm:7.24.6" - dependencies: - "@babel/types": "npm:^7.24.6" - "@jridgewell/gen-mapping": "npm:^0.3.5" - "@jridgewell/trace-mapping": "npm:^0.3.25" - jsesc: "npm:^2.5.1" - checksum: 10c0/8d71a17b386536582354afba53cc784396458a88cc9f05f0c6de0ec99475f6f539943b3566b2e733820c4928236952473831765e483c25d68cc007a6e604d782 - languageName: node - linkType: hard - -"@babel/helper-annotate-as-pure@npm:^7.22.5": - version: 7.24.6 - resolution: "@babel/helper-annotate-as-pure@npm:7.24.6" - dependencies: - "@babel/types": "npm:^7.24.6" - checksum: 10c0/3fe446e3bd37e5e32152279c84ace4e83815e5b88b9e09a82a83974a0bb22e941d89db26b23aaab4c9eb0f9713772c2f6163feffc1bcb055c4cdb6b67e5dc82f - languageName: node - linkType: hard - -"@babel/helper-environment-visitor@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/helper-environment-visitor@npm:7.24.6" - checksum: 10c0/fdcd18ac505ed71f40c05cc992b648a4495b0aa5310a774492a0f74d8dcf3579691102f516561a651d3de6c3a44fe64bfb3049d11c14c5857634ef1823ea409a - languageName: node - linkType: hard - -"@babel/helper-function-name@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/helper-function-name@npm:7.24.6" - dependencies: - "@babel/template": "npm:^7.24.6" - "@babel/types": "npm:^7.24.6" - checksum: 10c0/5ba2f8db789b3f5a2b2239300a217aa212e303cd7bfad9c8b90563807f49215e8c679e8f8f177b6aaca2038038e29bc702b83839e1f7b4896d79c44a75cac97a - languageName: node - linkType: hard - -"@babel/helper-hoist-variables@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/helper-hoist-variables@npm:7.24.6" - dependencies: - "@babel/types": "npm:^7.24.6" - checksum: 10c0/e10ec6b864aaa419ec4934f5fcb5d0cfcc9d0657584a1b6c3c42ada949d44ca6bffcdab433a90ada4396c747e551cca31ba0e565ea005ab3f50964e3817bf6cf - languageName: node - linkType: hard - -"@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.22.5": - version: 7.24.6 - resolution: "@babel/helper-module-imports@npm:7.24.6" - dependencies: - "@babel/types": "npm:^7.24.6" - checksum: 10c0/e0db3fbfcd963d138f0792ff626f940a576fcf212d02b8fe6478dccf3421bd1c2a76f8e69c7450c049985e7b63b30be309a24eeeb6ad7c2137a31b676a095a84 - languageName: node - linkType: hard - -"@babel/helper-plugin-utils@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/helper-plugin-utils@npm:7.24.6" - checksum: 10c0/636d3ce8cabc0621c1f78187e1d95f1087209921fa452f76aad06224ef5dffb3d934946f5183109920f32a4b94dd75ac91c63bc52813fee639d10cd54d49ba1f - languageName: node - linkType: hard - -"@babel/helper-split-export-declaration@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/helper-split-export-declaration@npm:7.24.6" - dependencies: - "@babel/types": "npm:^7.24.6" - checksum: 10c0/53a5dd8691fdffc89cc7fcf5aed0ad1d8bc39796a5782a3d170dcbf249eb5c15cc8a290e8d09615711d18798ad04a7d0694ab5195d35fa651abbc1b9c885d6a8 - languageName: node - linkType: hard - -"@babel/helper-string-parser@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/helper-string-parser@npm:7.24.6" - checksum: 10c0/95115bf676e92c4e99166395649108d97447e6cabef1fabaec8cdbc53a43f27b5df2268ff6534439d405bc1bd06685b163eb3b470455bd49f69159dada414145 - languageName: node - linkType: hard - -"@babel/helper-validator-identifier@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/helper-validator-identifier@npm:7.24.6" - checksum: 10c0/d29d2e3fca66c31867a009014169b93f7bc21c8fc1dd7d0b9d85d7a4000670526ff2222d966febb75a6e12f9859a31d1e75b558984e28ecb69651314dd0a6fd1 - languageName: node - linkType: hard - -"@babel/highlight@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/highlight@npm:7.24.6" - dependencies: - "@babel/helper-validator-identifier": "npm:^7.24.6" - chalk: "npm:^2.4.2" - js-tokens: "npm:^4.0.0" - picocolors: "npm:^1.0.0" - checksum: 10c0/5bbc31695e5d44e97feb267f7aaf4c52908560d184ffeb2e2e57aae058d40125592931883889413e19def3326895ddb41ff45e090fa90b459d8c294b4ffc238c - languageName: node - linkType: hard - -"@babel/parser@npm:^7.20.15, @babel/parser@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/parser@npm:7.24.6" - bin: - parser: ./bin/babel-parser.js - checksum: 10c0/cbef70923078a20fe163b03f4a6482be65ed99d409a57f3091a23ce3a575ee75716c30e7ea9f40b692ac5660f34055f4cbeb66a354fad15a6cf1fca35c3496c5 - languageName: node - linkType: hard - -"@babel/plugin-syntax-jsx@npm:^7.22.5": - version: 7.24.6 - resolution: "@babel/plugin-syntax-jsx@npm:7.24.6" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.6" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 10c0/f00d783a9e2d52f0a8797823a3cbdbe2d0dc09c7235fe8c88e6dce3a02f234f52fb5e976a001cc30b0e2b330590b5680f54436e56d67f9ab05d1e4bdeb3992cd - languageName: node - linkType: hard - -"@babel/runtime@npm:7.4.5": - version: 7.4.5 - resolution: "@babel/runtime@npm:7.4.5" - dependencies: - regenerator-runtime: "npm:^0.13.2" - checksum: 10c0/17d80f109e70e125c9cf7f484ebf02e2d9f1ca2b62297a682ad5fa3935290d48584e100d6b6ad1f6be356764e31405560e677893e0f1802183582166011731fd - languageName: node - linkType: hard - -"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.3.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2": - version: 7.24.6 - resolution: "@babel/runtime@npm:7.24.6" - dependencies: - regenerator-runtime: "npm:^0.14.0" - checksum: 10c0/224ad205de33ea28979baaec89eea4c4d4e9482000dd87d15b97859365511cdd4d06517712504024f5d33a5fb9412f9b91c96f1d923974adf9359e1575cde049 - languageName: node - linkType: hard - -"@babel/template@npm:^7.24.6": - version: 7.24.6 - resolution: "@babel/template@npm:7.24.6" - dependencies: - "@babel/code-frame": "npm:^7.24.6" - "@babel/parser": "npm:^7.24.6" - "@babel/types": "npm:^7.24.6" - checksum: 10c0/a4d5805770de908b445f7cdcebfcb6eaa07b1ec9c7b78fd3f375a911b1522c249bddae6b96bc4aac24247cc603e3e6cffcf2fe50b4c929dfeb22de289b517525 - languageName: node - linkType: hard - -"@babel/traverse@npm:^7.4.5": - version: 7.24.6 - resolution: "@babel/traverse@npm:7.24.6" - dependencies: - "@babel/code-frame": "npm:^7.24.6" - "@babel/generator": "npm:^7.24.6" - "@babel/helper-environment-visitor": "npm:^7.24.6" - "@babel/helper-function-name": "npm:^7.24.6" - "@babel/helper-hoist-variables": "npm:^7.24.6" - "@babel/helper-split-export-declaration": "npm:^7.24.6" - "@babel/parser": "npm:^7.24.6" - "@babel/types": "npm:^7.24.6" - debug: "npm:^4.3.1" - globals: "npm:^11.1.0" - checksum: 10c0/39027d5fc7a241c6b71bb5872c2bdcec53743cd7ef3c151bbe6fd7cf874d15f4bc09e5d7e19e2f534b0eb2c115f5368553885fa4253aa1bc9441c6e5bf9efdaf - languageName: node - linkType: hard - -"@babel/types@npm:^7.24.6, @babel/types@npm:^7.8.3": - version: 7.24.6 - resolution: "@babel/types@npm:7.24.6" - dependencies: - "@babel/helper-string-parser": "npm:^7.24.6" - "@babel/helper-validator-identifier": "npm:^7.24.6" - to-fast-properties: "npm:^2.0.0" - checksum: 10c0/1d94d92d97ef49030ad7f9e14cfccfeb70b1706dabcaa69037e659ec9d2c3178fb005d2088cce40d88dfc1306153d9157fe038a79ea2be92e5e6b99a59ef80cc - languageName: node - linkType: hard - -"@commitlint/cli@npm:^17.7.1": - version: 17.8.1 - resolution: "@commitlint/cli@npm:17.8.1" - dependencies: - "@commitlint/format": "npm:^17.8.1" - "@commitlint/lint": "npm:^17.8.1" - "@commitlint/load": "npm:^17.8.1" - "@commitlint/read": "npm:^17.8.1" - "@commitlint/types": "npm:^17.8.1" - execa: "npm:^5.0.0" - lodash.isfunction: "npm:^3.0.9" - resolve-from: "npm:5.0.0" - resolve-global: "npm:1.0.0" - yargs: "npm:^17.0.0" - bin: - commitlint: cli.js - checksum: 10c0/d8f4f3d8601703271f6cef15f5a35864de1e4f949fba7a8bf5c8be786ed4d231208b7322068c5126d08d0885ecfec77cf0fcdc12ae59e72b514d68dbccd4451f - languageName: node - linkType: hard - -"@commitlint/config-conventional@npm:^17.7.0": - version: 17.8.1 - resolution: "@commitlint/config-conventional@npm:17.8.1" - dependencies: - conventional-changelog-conventionalcommits: "npm:^6.1.0" - checksum: 10c0/70abdc9f1361386060b30620decc376bc33ff0c27c6f2f89511df1d53127d238af7c3409db22651282caa614d54b91b1f5e35905d12b1f5db70603c351f6e482 - languageName: node - linkType: hard - -"@commitlint/config-validator@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/config-validator@npm:17.8.1" - dependencies: - "@commitlint/types": "npm:^17.8.1" - ajv: "npm:^8.11.0" - checksum: 10c0/f60a000832c878cb2133aae34599f5b4a38d00bdbead9a07147b00b39a06a1aa59021268198795509a2bea69ddbf8c676c20209146b8d7a628405f5e6b6b9ee1 - languageName: node - linkType: hard - -"@commitlint/ensure@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/ensure@npm:17.8.1" - dependencies: - "@commitlint/types": "npm:^17.8.1" - lodash.camelcase: "npm:^4.3.0" - lodash.kebabcase: "npm:^4.1.1" - lodash.snakecase: "npm:^4.1.1" - lodash.startcase: "npm:^4.4.0" - lodash.upperfirst: "npm:^4.3.1" - checksum: 10c0/35b3b754f290cec71fa5f76e1fde02eabd8b301c24a37f2309a994cd698416c00cc4d5abc591af95846b667db01943ede9817dcb3358d7dcb73e9da1410b5ebe - languageName: node - linkType: hard - -"@commitlint/execute-rule@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/execute-rule@npm:17.8.1" - checksum: 10c0/fa952f10caf48d934668227dcef257e406ea6c9ed0a710c1ec29984ef128c49c985f7d490ad0481dffc694da2d5bc171862e9a17feebab136b163cd92ee14f19 - languageName: node - linkType: hard - -"@commitlint/format@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/format@npm:17.8.1" - dependencies: - "@commitlint/types": "npm:^17.8.1" - chalk: "npm:^4.1.0" - checksum: 10c0/2a42291cbff467b343a2c2c14fa049a04ba0c2913fd9e6cc7550ac31be9581c8c6d1ce4e7cadccf011228be6e1b513a704f793e5cdd82995c97a7629a68e806c - languageName: node - linkType: hard - -"@commitlint/is-ignored@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/is-ignored@npm:17.8.1" - dependencies: - "@commitlint/types": "npm:^17.8.1" - semver: "npm:7.5.4" - checksum: 10c0/7a7f90ffb25a16a3a2e08a53e0a8c08d4c5d9646a3e3bd8372fdd8f1f8bc260a97fcf4bf58420140da4d16675c13ecc007b41836d173d4efb71942173b0717e3 - languageName: node - linkType: hard - -"@commitlint/lint@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/lint@npm:17.8.1" - dependencies: - "@commitlint/is-ignored": "npm:^17.8.1" - "@commitlint/parse": "npm:^17.8.1" - "@commitlint/rules": "npm:^17.8.1" - "@commitlint/types": "npm:^17.8.1" - checksum: 10c0/7cd6ab67d76d7cbacaf4adf80ca1785f12882c900222cb8e575df1b766bfbeaa022b5c9f59ee3ae6f99deb6ec884787c01e4e80b28867469c7fb08a968b5b495 - languageName: node - linkType: hard - -"@commitlint/load@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/load@npm:17.8.1" - dependencies: - "@commitlint/config-validator": "npm:^17.8.1" - "@commitlint/execute-rule": "npm:^17.8.1" - "@commitlint/resolve-extends": "npm:^17.8.1" - "@commitlint/types": "npm:^17.8.1" - "@types/node": "npm:20.5.1" - chalk: "npm:^4.1.0" - cosmiconfig: "npm:^8.0.0" - cosmiconfig-typescript-loader: "npm:^4.0.0" - lodash.isplainobject: "npm:^4.0.6" - lodash.merge: "npm:^4.6.2" - lodash.uniq: "npm:^4.5.0" - resolve-from: "npm:^5.0.0" - ts-node: "npm:^10.8.1" - typescript: "npm:^4.6.4 || ^5.2.2" - checksum: 10c0/2a1345660e6deb3acd649c49487f7311d5678b8f09bd2bf9e8c6d0a1895b439c1811ff5524b0072dd251fbf751cffa199443bbb0a22a086520475227ca878bb6 - languageName: node - linkType: hard - -"@commitlint/message@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/message@npm:17.8.1" - checksum: 10c0/e8d7e7874e38e599f17865ffb6a50461de2027b09593aed5cfacc3811f21a77448586c71f8c861357d4f27673a1f5293add09f9101105c73357cdb1e29595de0 - languageName: node - linkType: hard - -"@commitlint/parse@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/parse@npm:17.8.1" - dependencies: - "@commitlint/types": "npm:^17.8.1" - conventional-changelog-angular: "npm:^6.0.0" - conventional-commits-parser: "npm:^4.0.0" - checksum: 10c0/cde1f35dbac72ac30ac9803d4342bc5784116b56e09bf1ff02738ffbaa54a43da3360bf7b10d2a6b98067eea1026ef561acef2bf762b77739e4edef0feaea318 - languageName: node - linkType: hard - -"@commitlint/read@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/read@npm:17.8.1" - dependencies: - "@commitlint/top-level": "npm:^17.8.1" - "@commitlint/types": "npm:^17.8.1" - fs-extra: "npm:^11.0.0" - git-raw-commits: "npm:^2.0.11" - minimist: "npm:^1.2.6" - checksum: 10c0/700dcab7f83f27a8262a8ac09e4431f5a42a5e0b180eaed0b1707ae9252d74f4686ee4fef5d8cd928a06c57bf09e876a2196f0c32dd09e285420da492d00dafa - languageName: node - linkType: hard - -"@commitlint/resolve-extends@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/resolve-extends@npm:17.8.1" - dependencies: - "@commitlint/config-validator": "npm:^17.8.1" - "@commitlint/types": "npm:^17.8.1" - import-fresh: "npm:^3.0.0" - lodash.mergewith: "npm:^4.6.2" - resolve-from: "npm:^5.0.0" - resolve-global: "npm:^1.0.0" - checksum: 10c0/785fa1ed4675671383dd6ee55dabfba662d0f336a038ae6e84aacc6d8ffd03033df5f43c3d2daf4bc1047060a54efe1c1255517ca8eb6f50ec7f2874c6db182d - languageName: node - linkType: hard - -"@commitlint/rules@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/rules@npm:17.8.1" - dependencies: - "@commitlint/ensure": "npm:^17.8.1" - "@commitlint/message": "npm:^17.8.1" - "@commitlint/to-lines": "npm:^17.8.1" - "@commitlint/types": "npm:^17.8.1" - execa: "npm:^5.0.0" - checksum: 10c0/f8139c86d998a984cc9d873a8650cb28edf4b0da16351f6a0787d920b47209f8a346ce0c6405257a3cf1ab7e238805d93fd708dea63f82a25506a970a6fa350e - languageName: node - linkType: hard - -"@commitlint/to-lines@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/to-lines@npm:17.8.1" - checksum: 10c0/14d70d2f4826fd00236a2a36f8ab18ea44892d5fd82f50a99fe996f92a9efdedf50864dddaff7f266da8140eee6f2e255ce3f8b77bac04532c13b37d49761698 - languageName: node - linkType: hard - -"@commitlint/top-level@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/top-level@npm:17.8.1" - dependencies: - find-up: "npm:^5.0.0" - checksum: 10c0/0b68105cad4762fb75a46643850e43c793b359233f11eafa3591cc944756cd906211ef17fb34ce8365723077c2025b1f5d240f1f02fc423b8aa9b69c7d20bdf2 - languageName: node - linkType: hard - -"@commitlint/types@npm:^17.4.4, @commitlint/types@npm:^17.8.1": - version: 17.8.1 - resolution: "@commitlint/types@npm:17.8.1" - dependencies: - chalk: "npm:^4.1.0" - checksum: 10c0/303528008d4c8b2e5b9a4a8177a072ead740cfbc1bad47b5327466a78c4029730bfaf805181dd38e86f38f2981ad20e6d2195fb5fcb0aa91afb8e87c2c848383 - languageName: node - linkType: hard - -"@cspotcode/source-map-support@npm:^0.8.0": - version: 0.8.1 - resolution: "@cspotcode/source-map-support@npm:0.8.1" - dependencies: - "@jridgewell/trace-mapping": "npm:0.3.9" - checksum: 10c0/05c5368c13b662ee4c122c7bfbe5dc0b613416672a829f3e78bc49a357a197e0218d6e74e7c66cfcd04e15a179acab080bd3c69658c9fbefd0e1ccd950a07fc6 - languageName: node - linkType: hard - -"@develar/schema-utils@npm:~2.6.5": - version: 2.6.5 - resolution: "@develar/schema-utils@npm:2.6.5" - dependencies: - ajv: "npm:^6.12.0" - ajv-keywords: "npm:^3.4.1" - checksum: 10c0/7c6075ce6742dd5c89b3cebf81351ec1d73dafc7c3409748860e4f8262fb26ffe6d998c5baab4eca579cd436e7c6c12c615fe89819c19484a22d25b3e6825cb5 - languageName: node - linkType: hard - -"@discoveryjs/json-ext@npm:^0.5.0": - version: 0.5.7 - resolution: "@discoveryjs/json-ext@npm:0.5.7" - checksum: 10c0/e10f1b02b78e4812646ddf289b7d9f2cb567d336c363b266bd50cd223cf3de7c2c74018d91cd2613041568397ef3a4a2b500aba588c6e5bd78c38374ba68f38c - languageName: node - linkType: hard - -"@electron/get@npm:^2.0.0": - version: 2.0.3 - resolution: "@electron/get@npm:2.0.3" - dependencies: - debug: "npm:^4.1.1" - env-paths: "npm:^2.2.0" - fs-extra: "npm:^8.1.0" - global-agent: "npm:^3.0.0" - got: "npm:^11.8.5" - progress: "npm:^2.0.3" - semver: "npm:^6.2.0" - sumchecker: "npm:^3.0.1" - dependenciesMeta: - global-agent: - optional: true - checksum: 10c0/148957d531bac50c29541515f2483c3e5c9c6ba9f0269a5d536540d2b8d849188a89588f18901f3a84c2b4fd376d1e0c5ea2159eb2d17bda68558f57df19015e - languageName: node - linkType: hard - -"@electron/notarize@npm:^2.1.0": - version: 2.3.2 - resolution: "@electron/notarize@npm:2.3.2" - dependencies: - debug: "npm:^4.1.1" - fs-extra: "npm:^9.0.1" - promise-retry: "npm:^2.0.1" - checksum: 10c0/539ed5cd264c3885fd3ca9c0b243144e3e2856d767de3999da1e3f94f0d79db57cbb08862b640270dfad0292bc5345cd7177db096da2061e28e15a6b85946b32 - languageName: node - linkType: hard - -"@electron/universal@npm:1.2.1": - version: 1.2.1 - resolution: "@electron/universal@npm:1.2.1" - dependencies: - "@malept/cross-spawn-promise": "npm:^1.1.0" - asar: "npm:^3.1.0" - debug: "npm:^4.3.1" - dir-compare: "npm:^2.4.0" - fs-extra: "npm:^9.0.1" - minimatch: "npm:^3.0.4" - plist: "npm:^3.0.4" - checksum: 10c0/b6e2c5948db24944d23fb16621154af93fdee56ee87dcbe18534d44d2d519f50572fe784310640cd6a3be3ebe4b0f393fbc20e7aa57c410afff6834344f6bb05 - languageName: node - linkType: hard - -"@emoji-mart/data@npm:^1.1.2": - version: 1.2.1 - resolution: "@emoji-mart/data@npm:1.2.1" - checksum: 10c0/6784b97bf49a0d3ff110d8447bbd3b0449fcbc497294be3d1c3a6cb1609308776895c7520200be604cbecaa5e172c76927e47f34419c72ba8a76fd4e5a53674b - languageName: node - linkType: hard - -"@emoji-mart/react@npm:^1.1.1": - version: 1.1.1 - resolution: "@emoji-mart/react@npm:1.1.1" - peerDependencies: - emoji-mart: ^5.2 - react: ^16.8 || ^17 || ^18 - checksum: 10c0/88a9c8c24bbc5695f0ed2458734c9982c965a16db1999bc731c7cce77f9bf228f1871e899744f9a3f9fdd36a11db7ad6c0e049d710cb91c66c69a2cd4d2ee40a - languageName: node - linkType: hard - -"@emotion/is-prop-valid@npm:^0.8.8": - version: 0.8.8 - resolution: "@emotion/is-prop-valid@npm:0.8.8" - dependencies: - "@emotion/memoize": "npm:0.7.4" - checksum: 10c0/f6be625f067c7fa56a12a4edaf090715616dc4fc7803c87212831f38c969350107b9709b1be54100e53153b18d9fa068eb4bf4f9ac66a37a8edf1bac9b64e279 - languageName: node - linkType: hard - -"@emotion/memoize@npm:0.7.4": - version: 0.7.4 - resolution: "@emotion/memoize@npm:0.7.4" - checksum: 10c0/b2376548fc147b43afd1ff005a80a1a025bd7eb4fb759fdb23e96e5ff290ee8ba16628a332848d600fb91c3cdc319eee5395fa33d8875e5d5a8c4ce18cddc18e - languageName: node - linkType: hard - -"@emotion/stylis@npm:^0.8.4": - version: 0.8.5 - resolution: "@emotion/stylis@npm:0.8.5" - checksum: 10c0/f109e3f11cb0d48e8658aaa23578c5bcfe35e297819cfb089a3de6ba8dc0f89b0960474922690c6028df5d2e1895b4967f2fb280642c030054c312f1e137ce26 - languageName: node - linkType: hard - -"@emotion/unitless@npm:^0.7.4": - version: 0.7.5 - resolution: "@emotion/unitless@npm:0.7.5" - checksum: 10c0/4d0d94f53cb97b4481bbfa394953e1899a0b877644642ba9dd7247c27eb8c48e14e22aeb11411d7d9874685ad85dd5fb5b50eb78c6d8840eb56a84b92dcef2f4 - languageName: node - linkType: hard - -"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": - version: 4.4.0 - resolution: "@eslint-community/eslint-utils@npm:4.4.0" - dependencies: - eslint-visitor-keys: "npm:^3.3.0" - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 - checksum: 10c0/7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e - languageName: node - linkType: hard - -"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1": - version: 4.10.0 - resolution: "@eslint-community/regexpp@npm:4.10.0" - checksum: 10c0/c5f60ef1f1ea7649fa7af0e80a5a79f64b55a8a8fa5086de4727eb4c86c652aedee407a9c143b8995d2c0b2d75c1222bec9ba5d73dbfc1f314550554f0979ef4 - languageName: node - linkType: hard - -"@eslint/eslintrc@npm:^2.1.4": - version: 2.1.4 - resolution: "@eslint/eslintrc@npm:2.1.4" - dependencies: - ajv: "npm:^6.12.4" - debug: "npm:^4.3.2" - espree: "npm:^9.6.0" - globals: "npm:^13.19.0" - ignore: "npm:^5.2.0" - import-fresh: "npm:^3.2.1" - js-yaml: "npm:^4.1.0" - minimatch: "npm:^3.1.2" - strip-json-comments: "npm:^3.1.1" - checksum: 10c0/32f67052b81768ae876c84569ffd562491ec5a5091b0c1e1ca1e0f3c24fb42f804952fdd0a137873bc64303ba368a71ba079a6f691cee25beee9722d94cc8573 - languageName: node - linkType: hard - -"@eslint/js@npm:8.57.0": - version: 8.57.0 - resolution: "@eslint/js@npm:8.57.0" - checksum: 10c0/9a518bb8625ba3350613903a6d8c622352ab0c6557a59fe6ff6178bf882bf57123f9d92aa826ee8ac3ee74b9c6203fe630e9ee00efb03d753962dcf65ee4bd94 - languageName: node - linkType: hard - -"@humanwhocodes/config-array@npm:^0.11.14": - version: 0.11.14 - resolution: "@humanwhocodes/config-array@npm:0.11.14" - dependencies: - "@humanwhocodes/object-schema": "npm:^2.0.2" - debug: "npm:^4.3.1" - minimatch: "npm:^3.0.5" - checksum: 10c0/66f725b4ee5fdd8322c737cb5013e19fac72d4d69c8bf4b7feb192fcb83442b035b92186f8e9497c220e58b2d51a080f28a73f7899bc1ab288c3be172c467541 - languageName: node - linkType: hard - -"@humanwhocodes/module-importer@npm:^1.0.1": - version: 1.0.1 - resolution: "@humanwhocodes/module-importer@npm:1.0.1" - checksum: 10c0/909b69c3b86d482c26b3359db16e46a32e0fb30bd306a3c176b8313b9e7313dba0f37f519de6aa8b0a1921349e505f259d19475e123182416a506d7f87e7f529 - languageName: node - linkType: hard - -"@humanwhocodes/object-schema@npm:^2.0.2": - version: 2.0.3 - resolution: "@humanwhocodes/object-schema@npm:2.0.3" - checksum: 10c0/80520eabbfc2d32fe195a93557cef50dfe8c8905de447f022675aaf66abc33ae54098f5ea78548d925aa671cd4ab7c7daa5ad704fe42358c9b5e7db60f80696c - languageName: node - linkType: hard - -"@iconify/react@npm:^4.1.1": - version: 4.1.1 - resolution: "@iconify/react@npm:4.1.1" - dependencies: - "@iconify/types": "npm:^2.0.0" - peerDependencies: - react: ">=16" - checksum: 10c0/636fd1d953abd7562d7c4d9c60b5a5c6b202c5b59b0cfb7dab58c4cf5f66334f66d6736f5fe9cdc0e1b6b0c3a7d713f284a296c7fb154dbd20efd339fe0e5f6c - languageName: node - linkType: hard - -"@iconify/types@npm:^2.0.0": - version: 2.0.0 - resolution: "@iconify/types@npm:2.0.0" - checksum: 10c0/65a3be43500c7ccacf360e136d00e1717f050b7b91da644e94370256ac66f582d59212bdb30d00788aab4fc078262e91c95b805d1808d654b72f6d2072a7e4b2 - languageName: node - linkType: hard - -"@isaacs/cliui@npm:^8.0.2": - version: 8.0.2 - resolution: "@isaacs/cliui@npm:8.0.2" - dependencies: - string-width: "npm:^5.1.2" - string-width-cjs: "npm:string-width@^4.2.0" - strip-ansi: "npm:^7.0.1" - strip-ansi-cjs: "npm:strip-ansi@^6.0.1" - wrap-ansi: "npm:^8.1.0" - wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0" - checksum: 10c0/b1bf42535d49f11dc137f18d5e4e63a28c5569de438a221c369483731e9dac9fb797af554e8bf02b6192d1e5eba6e6402cf93900c3d0ac86391d00d04876789e - languageName: node - linkType: hard - -"@jridgewell/gen-mapping@npm:^0.3.5": - version: 0.3.5 - resolution: "@jridgewell/gen-mapping@npm:0.3.5" - dependencies: - "@jridgewell/set-array": "npm:^1.2.1" - "@jridgewell/sourcemap-codec": "npm:^1.4.10" - "@jridgewell/trace-mapping": "npm:^0.3.24" - checksum: 10c0/1be4fd4a6b0f41337c4f5fdf4afc3bd19e39c3691924817108b82ffcb9c9e609c273f936932b9fba4b3a298ce2eb06d9bff4eb1cc3bd81c4f4ee1b4917e25feb - languageName: node - linkType: hard - -"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0": - version: 3.1.2 - resolution: "@jridgewell/resolve-uri@npm:3.1.2" - checksum: 10c0/d502e6fb516b35032331406d4e962c21fe77cdf1cbdb49c6142bcbd9e30507094b18972778a6e27cbad756209cfe34b1a27729e6fa08a2eb92b33943f680cf1e - languageName: node - linkType: hard - -"@jridgewell/set-array@npm:^1.2.1": - version: 1.2.1 - resolution: "@jridgewell/set-array@npm:1.2.1" - checksum: 10c0/2a5aa7b4b5c3464c895c802d8ae3f3d2b92fcbe84ad12f8d0bfbb1f5ad006717e7577ee1fd2eac00c088abe486c7adb27976f45d2941ff6b0b92b2c3302c60f4 - languageName: node - linkType: hard - -"@jridgewell/source-map@npm:^0.3.3": - version: 0.3.6 - resolution: "@jridgewell/source-map@npm:0.3.6" - dependencies: - "@jridgewell/gen-mapping": "npm:^0.3.5" - "@jridgewell/trace-mapping": "npm:^0.3.25" - checksum: 10c0/6a4ecc713ed246ff8e5bdcc1ef7c49aaa93f7463d948ba5054dda18b02dcc6a055e2828c577bcceee058f302ce1fc95595713d44f5c45e43d459f88d267f2f04 - languageName: node - linkType: hard - -"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15": - version: 1.4.15 - resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" - checksum: 10c0/0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5 - languageName: node - linkType: hard - -"@jridgewell/trace-mapping@npm:0.3.9": - version: 0.3.9 - resolution: "@jridgewell/trace-mapping@npm:0.3.9" - dependencies: - "@jridgewell/resolve-uri": "npm:^3.0.3" - "@jridgewell/sourcemap-codec": "npm:^1.4.10" - checksum: 10c0/fa425b606d7c7ee5bfa6a31a7b050dd5814b4082f318e0e4190f991902181b4330f43f4805db1dd4f2433fd0ed9cc7a7b9c2683f1deeab1df1b0a98b1e24055b - languageName: node - linkType: hard - -"@jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25": - version: 0.3.25 - resolution: "@jridgewell/trace-mapping@npm:0.3.25" - dependencies: - "@jridgewell/resolve-uri": "npm:^3.1.0" - "@jridgewell/sourcemap-codec": "npm:^1.4.14" - checksum: 10c0/3d1ce6ebc69df9682a5a8896b414c6537e428a1d68b02fcc8363b04284a8ca0df04d0ee3013132252ab14f2527bc13bea6526a912ecb5658f0e39fd2860b4df4 - languageName: node - linkType: hard - -"@jsdoc/salty@npm:^0.2.1": - version: 0.2.8 - resolution: "@jsdoc/salty@npm:0.2.8" - dependencies: - lodash: "npm:^4.17.21" - checksum: 10c0/ace2a0ef346e49e9573623544939e1b07906c2775d1027113e10666997c9a50397059b3212e233a053f9d8a118818b847f1690177017b1126408d9bcc7054938 - languageName: node - linkType: hard - -"@malept/cross-spawn-promise@npm:^1.1.0": - version: 1.1.1 - resolution: "@malept/cross-spawn-promise@npm:1.1.1" - dependencies: - cross-spawn: "npm:^7.0.1" - checksum: 10c0/74c427a152ffff0f19b74af6479d05bef1e996d5e081cfc3b8c47477b9240bd1c42a930884cbcd0c89ee3835201a3bd88d0b0bfd754c0cbb56fc84a28996a8e7 - languageName: node - linkType: hard - -"@malept/flatpak-bundler@npm:^0.4.0": - version: 0.4.0 - resolution: "@malept/flatpak-bundler@npm:0.4.0" - dependencies: - debug: "npm:^4.1.1" - fs-extra: "npm:^9.0.0" - lodash: "npm:^4.17.15" - tmp-promise: "npm:^3.0.2" - checksum: 10c0/b3c87f6482b1956411af1118c771afb39cd9a0568fbb5e86015547ff6d68d2e73a7f0d74b75a57f0a156391c347c8d0adc1037e75172b92da72b96e0a05a2f4f - languageName: node - linkType: hard - -"@nodelib/fs.scandir@npm:2.1.5": - version: 2.1.5 - resolution: "@nodelib/fs.scandir@npm:2.1.5" - dependencies: - "@nodelib/fs.stat": "npm:2.0.5" - run-parallel: "npm:^1.1.9" - checksum: 10c0/732c3b6d1b1e967440e65f284bd06e5821fedf10a1bea9ed2bb75956ea1f30e08c44d3def9d6a230666574edbaf136f8cfd319c14fd1f87c66e6a44449afb2eb - languageName: node - linkType: hard - -"@nodelib/fs.stat@npm:2.0.5, @nodelib/fs.stat@npm:^2.0.2": - version: 2.0.5 - resolution: "@nodelib/fs.stat@npm:2.0.5" - checksum: 10c0/88dafe5e3e29a388b07264680dc996c17f4bda48d163a9d4f5c1112979f0ce8ec72aa7116122c350b4e7976bc5566dc3ddb579be1ceaacc727872eb4ed93926d - languageName: node - linkType: hard - -"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8": - version: 1.2.8 - resolution: "@nodelib/fs.walk@npm:1.2.8" - dependencies: - "@nodelib/fs.scandir": "npm:2.1.5" - fastq: "npm:^1.6.0" - checksum: 10c0/db9de047c3bb9b51f9335a7bb46f4fcfb6829fb628318c12115fbaf7d369bfce71c15b103d1fc3b464812d936220ee9bc1c8f762d032c9f6be9acc99249095b1 - languageName: node - linkType: hard - -"@npmcli/agent@npm:^2.0.0": - version: 2.2.2 - resolution: "@npmcli/agent@npm:2.2.2" - dependencies: - agent-base: "npm:^7.1.0" - http-proxy-agent: "npm:^7.0.0" - https-proxy-agent: "npm:^7.0.1" - lru-cache: "npm:^10.0.1" - socks-proxy-agent: "npm:^8.0.3" - checksum: 10c0/325e0db7b287d4154ecd164c0815c08007abfb07653cc57bceded17bb7fd240998a3cbdbe87d700e30bef494885eccc725ab73b668020811d56623d145b524ae - languageName: node - linkType: hard - -"@npmcli/fs@npm:^3.1.0": - version: 3.1.1 - resolution: "@npmcli/fs@npm:3.1.1" - dependencies: - semver: "npm:^7.3.5" - checksum: 10c0/c37a5b4842bfdece3d14dfdb054f73fe15ed2d3da61b34ff76629fb5b1731647c49166fd2a8bf8b56fcfa51200382385ea8909a3cbecdad612310c114d3f6c99 - languageName: node - linkType: hard - -"@pkgjs/parseargs@npm:^0.11.0": - version: 0.11.0 - resolution: "@pkgjs/parseargs@npm:0.11.0" - checksum: 10c0/5bd7576bb1b38a47a7fc7b51ac9f38748e772beebc56200450c4a817d712232b8f1d3ef70532c80840243c657d491cf6a6be1e3a214cff907645819fdc34aadd - languageName: node - linkType: hard - -"@protobufjs/aspromise@npm:^1.1.1, @protobufjs/aspromise@npm:^1.1.2": - version: 1.1.2 - resolution: "@protobufjs/aspromise@npm:1.1.2" - checksum: 10c0/a83343a468ff5b5ec6bff36fd788a64c839e48a07ff9f4f813564f58caf44d011cd6504ed2147bf34835bd7a7dd2107052af755961c6b098fd8902b4f6500d0f - languageName: node - linkType: hard - -"@protobufjs/base64@npm:^1.1.2": - version: 1.1.2 - resolution: "@protobufjs/base64@npm:1.1.2" - checksum: 10c0/eec925e681081af190b8ee231f9bad3101e189abbc182ff279da6b531e7dbd2a56f1f306f37a80b1be9e00aa2d271690d08dcc5f326f71c9eed8546675c8caf6 - languageName: node - linkType: hard - -"@protobufjs/codegen@npm:^2.0.4": - version: 2.0.4 - resolution: "@protobufjs/codegen@npm:2.0.4" - checksum: 10c0/26ae337c5659e41f091606d16465bbcc1df1f37cc1ed462438b1f67be0c1e28dfb2ca9f294f39100c52161aef82edf758c95d6d75650a1ddf31f7ddee1440b43 - languageName: node - linkType: hard - -"@protobufjs/eventemitter@npm:^1.1.0": - version: 1.1.0 - resolution: "@protobufjs/eventemitter@npm:1.1.0" - checksum: 10c0/1eb0a75180e5206d1033e4138212a8c7089a3d418c6dfa5a6ce42e593a4ae2e5892c4ef7421f38092badba4040ea6a45f0928869989411001d8c1018ea9a6e70 - languageName: node - linkType: hard - -"@protobufjs/fetch@npm:^1.1.0": - version: 1.1.0 - resolution: "@protobufjs/fetch@npm:1.1.0" - dependencies: - "@protobufjs/aspromise": "npm:^1.1.1" - "@protobufjs/inquire": "npm:^1.1.0" - checksum: 10c0/cda6a3dc2d50a182c5865b160f72077aac197046600091dbb005dd0a66db9cce3c5eaed6d470ac8ed49d7bcbeef6ee5f0bc288db5ff9a70cbd003e5909065233 - languageName: node - linkType: hard - -"@protobufjs/float@npm:^1.0.2": - version: 1.0.2 - resolution: "@protobufjs/float@npm:1.0.2" - checksum: 10c0/18f2bdede76ffcf0170708af15c9c9db6259b771e6b84c51b06df34a9c339dbbeec267d14ce0bddd20acc142b1d980d983d31434398df7f98eb0c94a0eb79069 - languageName: node - linkType: hard - -"@protobufjs/inquire@npm:^1.1.0": - version: 1.1.0 - resolution: "@protobufjs/inquire@npm:1.1.0" - checksum: 10c0/64372482efcba1fb4d166a2664a6395fa978b557803857c9c03500e0ac1013eb4b1aacc9ed851dd5fc22f81583670b4f4431bae186f3373fedcfde863ef5921a - languageName: node - linkType: hard - -"@protobufjs/path@npm:^1.1.2": - version: 1.1.2 - resolution: "@protobufjs/path@npm:1.1.2" - checksum: 10c0/cece0a938e7f5dfd2fa03f8c14f2f1cf8b0d6e13ac7326ff4c96ea311effd5fb7ae0bba754fbf505312af2e38500250c90e68506b97c02360a43793d88a0d8b4 - languageName: node - linkType: hard - -"@protobufjs/pool@npm:^1.1.0": - version: 1.1.0 - resolution: "@protobufjs/pool@npm:1.1.0" - checksum: 10c0/eda2718b7f222ac6e6ad36f758a92ef90d26526026a19f4f17f668f45e0306a5bd734def3f48f51f8134ae0978b6262a5c517c08b115a551756d1a3aadfcf038 - languageName: node - linkType: hard - -"@protobufjs/utf8@npm:^1.1.0": - version: 1.1.0 - resolution: "@protobufjs/utf8@npm:1.1.0" - checksum: 10c0/a3fe31fe3fa29aa3349e2e04ee13dc170cc6af7c23d92ad49e3eeaf79b9766264544d3da824dba93b7855bd6a2982fb40032ef40693da98a136d835752beb487 - languageName: node - linkType: hard - -"@react-native/virtualized-lists@npm:^0.72.4": - version: 0.72.8 - resolution: "@react-native/virtualized-lists@npm:0.72.8" - dependencies: - invariant: "npm:^2.2.4" - nullthrows: "npm:^1.1.1" - peerDependencies: - react-native: "*" - checksum: 10c0/1fe43afeacf5aacec270d7f64b9ce6c69afe1c65d1e487fff75e647d1f57114527f2223602d546b95fc982b348a6f1773db66184a2e90ba434f4f013f3991bac - languageName: node - linkType: hard - -"@reduxjs/toolkit@npm:1.8.5": - version: 1.8.5 - resolution: "@reduxjs/toolkit@npm:1.8.5" - dependencies: - immer: "npm:^9.0.7" - redux: "npm:^4.1.2" - redux-thunk: "npm:^2.4.1" - reselect: "npm:^4.1.5" - peerDependencies: - react: ^16.9.0 || ^17.0.0 || ^18 - react-redux: ^7.2.1 || ^8.0.2 - peerDependenciesMeta: - react: - optional: true - react-redux: - optional: true - checksum: 10c0/fef5f7cd1ee84191bfebd02c097720f64a8fb106c741d4a9f3af52636907326a69ecf1db98a6da3849127c557d7585698c261849f20c9208680a673f0d06f31a - languageName: node - linkType: hard - -"@signalapp/better-sqlite3@npm:^8.4.3": - version: 8.7.1 - resolution: "@signalapp/better-sqlite3@npm:8.7.1" - dependencies: - bindings: "npm:^1.5.0" - node-gyp: "npm:latest" - tar: "npm:^6.1.0" - checksum: 10c0/e193f07a142096d158f85c4f98ec1a72240cab212748a5ca346cee43a5b97120b5daca898a407bb0205f68010bf357dde46251125e5f194a2b391cfe45c08ca4 - languageName: node - linkType: hard - -"@sindresorhus/is@npm:^4.0.0": - version: 4.6.0 - resolution: "@sindresorhus/is@npm:4.6.0" - checksum: 10c0/33b6fb1d0834ec8dd7689ddc0e2781c2bfd8b9c4e4bacbcb14111e0ae00621f2c264b8a7d36541799d74888b5dccdf422a891a5cb5a709ace26325eedc81e22e - languageName: node - linkType: hard - -"@sinonjs/commons@npm:^1, @sinonjs/commons@npm:^1.6.0, @sinonjs/commons@npm:^1.7.0, @sinonjs/commons@npm:^1.7.2": - version: 1.8.6 - resolution: "@sinonjs/commons@npm:1.8.6" - dependencies: - type-detect: "npm:4.0.8" - checksum: 10c0/93b4d4e27e93652b83467869c2fe09cbd8f37cd5582327f0e081fbf9b93899e2d267db7b668c96810c63dc229867614ced825e5512b47db96ca6f87cb3ec0f61 - languageName: node - linkType: hard - -"@sinonjs/fake-timers@npm:^6.0.0, @sinonjs/fake-timers@npm:^6.0.1": - version: 6.0.1 - resolution: "@sinonjs/fake-timers@npm:6.0.1" - dependencies: - "@sinonjs/commons": "npm:^1.7.0" - checksum: 10c0/a77bead4d71b40d6f7f9a3ad66a00269aa2c078260f43f594b8aed4676c6c4e7c2b642d4b8e34df314e1c971589455f7b4267ab831bf44ffdccc0bda599850ad - languageName: node - linkType: hard - -"@sinonjs/formatio@npm:^5.0.1": - version: 5.0.1 - resolution: "@sinonjs/formatio@npm:5.0.1" - dependencies: - "@sinonjs/commons": "npm:^1" - "@sinonjs/samsam": "npm:^5.0.2" - checksum: 10c0/b24323cda8531f170c87a07975075e42e5981679a82561df07cf6879e76d76bb071693e1c0681e59d92b5d2ae6983432084916b3297eee883011bb3485f4c8c8 - languageName: node - linkType: hard - -"@sinonjs/samsam@npm:^5.0.2, @sinonjs/samsam@npm:^5.0.3": - version: 5.3.1 - resolution: "@sinonjs/samsam@npm:5.3.1" - dependencies: - "@sinonjs/commons": "npm:^1.6.0" - lodash.get: "npm:^4.4.2" - type-detect: "npm:^4.0.8" - checksum: 10c0/bc6a95b55517da35322b0287e2aae62f5a340b8dce86ae239a9952c80fa4044339a4644d387a47bfded13e0a21066d4a70aee07e8294abc5b89c49d0bcfd7d9a - languageName: node - linkType: hard - -"@sinonjs/text-encoding@npm:^0.7.1": - version: 0.7.2 - resolution: "@sinonjs/text-encoding@npm:0.7.2" - checksum: 10c0/583a45bf3643169e313ff9d4395aff28b0c4f330d3697e252c3effc13d4303ee30f83df542732c1a68617720e4ea6fc08d48a3d9151c9b354a7fc356a8e9b162 - languageName: node - linkType: hard - -"@szmarczak/http-timer@npm:^4.0.5": - version: 4.0.6 - resolution: "@szmarczak/http-timer@npm:4.0.6" - dependencies: - defer-to-connect: "npm:^2.0.0" - checksum: 10c0/73946918c025339db68b09abd91fa3001e87fc749c619d2e9c2003a663039d4c3cb89836c98a96598b3d47dec2481284ba85355392644911f5ecd2336536697f - languageName: node - linkType: hard - -"@tootallnate/once@npm:2": - version: 2.0.0 - resolution: "@tootallnate/once@npm:2.0.0" - checksum: 10c0/073bfa548026b1ebaf1659eb8961e526be22fa77139b10d60e712f46d2f0f05f4e6c8bec62a087d41088ee9e29faa7f54838568e475ab2f776171003c3920858 - languageName: node - linkType: hard - -"@tsconfig/node10@npm:^1.0.7": - version: 1.0.11 - resolution: "@tsconfig/node10@npm:1.0.11" - checksum: 10c0/28a0710e5d039e0de484bdf85fee883bfd3f6a8980601f4d44066b0a6bcd821d31c4e231d1117731c4e24268bd4cf2a788a6787c12fc7f8d11014c07d582783c - languageName: node - linkType: hard - -"@tsconfig/node12@npm:^1.0.7": - version: 1.0.11 - resolution: "@tsconfig/node12@npm:1.0.11" - checksum: 10c0/dddca2b553e2bee1308a056705103fc8304e42bb2d2cbd797b84403a223b25c78f2c683ec3e24a095e82cd435387c877239bffcb15a590ba817cd3f6b9a99fd9 - languageName: node - linkType: hard - -"@tsconfig/node14@npm:^1.0.0": - version: 1.0.3 - resolution: "@tsconfig/node14@npm:1.0.3" - checksum: 10c0/67c1316d065fdaa32525bc9449ff82c197c4c19092b9663b23213c8cbbf8d88b6ed6a17898e0cbc2711950fbfaf40388938c1c748a2ee89f7234fc9e7fe2bf44 - languageName: node - linkType: hard - -"@tsconfig/node16@npm:^1.0.2": - version: 1.0.4 - resolution: "@tsconfig/node16@npm:1.0.4" - checksum: 10c0/05f8f2734e266fb1839eb1d57290df1664fe2aa3b0fdd685a9035806daa635f7519bf6d5d9b33f6e69dd545b8c46bd6e2b5c79acb2b1f146e885f7f11a42a5bb - languageName: node - linkType: hard - -"@types/backbone@npm:1.4.2": - version: 1.4.2 - resolution: "@types/backbone@npm:1.4.2" - dependencies: - "@types/jquery": "npm:*" - "@types/underscore": "npm:*" - checksum: 10c0/54a43c2cc98503914b96873b2544a01038385506264493acd2dc623116bbeb59dc3b458ba7be5270f77b6297f4fece560a74854f67d3498f8b0048390a7a8372 - languageName: node - linkType: hard - -"@types/blueimp-load-image@npm:^5.16.2": - version: 5.16.6 - resolution: "@types/blueimp-load-image@npm:5.16.6" - checksum: 10c0/d528e3776ab9a842d251d4114499726ba9ee5bd942da61a39bbdde8f663676b6d7a32c12279f6637f25a543425e0aff8dafb4d34eb7d7a33244f1eb0e28d35ec - languageName: node - linkType: hard - -"@types/buffer-crc32@npm:^0.2.0": - version: 0.2.4 - resolution: "@types/buffer-crc32@npm:0.2.4" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/965c667ca04b6bfc434124d46de8a74df37782f5301c11df7797198518e083a0d42040f57af07a6e30e4bc6110a2b1d32d989465d91604f6fd5ee30007a6b358 - languageName: node - linkType: hard - -"@types/bunyan@npm:^1.8.8": - version: 1.8.11 - resolution: "@types/bunyan@npm:1.8.11" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/07d762499307a1c3f04f56f2c62417b909f86f6090cee29b73a00dde323a4463cfd2e78888598cb1cd3b1eb88e6c47ef2a58e17f119dae27ff04cd361c0a1d4c - languageName: node - linkType: hard - -"@types/bytebuffer@npm:^5.0.41": - version: 5.0.49 - resolution: "@types/bytebuffer@npm:5.0.49" - dependencies: - "@types/long": "npm:^3.0.0" - "@types/node": "npm:*" - checksum: 10c0/7cb21e6479d887c192c5f05341c8f9f1293d3eb5573e608e4076a0734c544be0a9fa6b4d47ac64eb29bf0f0b345443683603c9fbe166c737584e41f6e0989e0b - languageName: node - linkType: hard - -"@types/cacheable-request@npm:^6.0.1": - version: 6.0.3 - resolution: "@types/cacheable-request@npm:6.0.3" - dependencies: - "@types/http-cache-semantics": "npm:*" - "@types/keyv": "npm:^3.1.4" - "@types/node": "npm:*" - "@types/responselike": "npm:^1.0.0" - checksum: 10c0/10816a88e4e5b144d43c1d15a81003f86d649776c7f410c9b5e6579d0ad9d4ca71c541962fb403077388b446e41af7ae38d313e46692144985f006ac5e11fa03 - languageName: node - linkType: hard - -"@types/chai-as-promised@npm:^7.1.2": - version: 7.1.8 - resolution: "@types/chai-as-promised@npm:7.1.8" - dependencies: - "@types/chai": "npm:*" - checksum: 10c0/c0a19cffe8d3f406b2cb9ba17f5f0efe318b14f27896d807b3199cc2231c16a4b5b6c464fdf2a939214de481de58cffd46c240539d3d4ece18659277d71ccc23 - languageName: node - linkType: hard - -"@types/chai@npm:*": - version: 4.3.16 - resolution: "@types/chai@npm:4.3.16" - checksum: 10c0/745d4a9be429d5d86a7ab26064610b8957fe12dd80e94dc7d0707cf3db1c889e3ffe0d73d69bb15e6d376bf4462a7a75e9d8fc1051750b5d656d6cfe459829b7 - languageName: node - linkType: hard - -"@types/chai@npm:4.2.18": - version: 4.2.18 - resolution: "@types/chai@npm:4.2.18" - checksum: 10c0/14a74da97b714100f12b2d711483b18613666e1aa64a478dc75f8f97bf6c00544dee159c5bed3846fc375988248e88a648fa4a0d9db76b11056053a366fcc124 - languageName: node - linkType: hard - -"@types/classnames@npm:2.2.3": - version: 2.2.3 - resolution: "@types/classnames@npm:2.2.3" - checksum: 10c0/6ba3dfc8251567e703e5255c2367f2ec7b9ee6fec29f0b89ad89ec0383671e7dfcb88c76201070607be6a706fdfeae758029bd8e64a1d72cd68f37623ac78b74 - languageName: node - linkType: hard - -"@types/config@npm:0.0.34": - version: 0.0.34 - resolution: "@types/config@npm:0.0.34" - checksum: 10c0/7a8ca781f224112fa6c9af1ed317f09a6b64dc6740e8c90ffd9f80ad348b853cb29f8a4fc7325d6c0652da37900055004a213892eef7324beb039acb7152a22a - languageName: node - linkType: hard - -"@types/debug@npm:^4.1.6": - version: 4.1.12 - resolution: "@types/debug@npm:4.1.12" - dependencies: - "@types/ms": "npm:*" - checksum: 10c0/5dcd465edbb5a7f226e9a5efd1f399c6172407ef5840686b73e3608ce135eeca54ae8037dcd9f16bdb2768ac74925b820a8b9ecc588a58ca09eca6acabe33e2f - languageName: node - linkType: hard - -"@types/dompurify@npm:^2.0.0": - version: 2.4.0 - resolution: "@types/dompurify@npm:2.4.0" - dependencies: - "@types/trusted-types": "npm:*" - checksum: 10c0/a20c4288a067811e097f0b92a0cae927a9c49c0d5de36fea66b85fcc5c8db63a22ac47df37f324e426a01e8ab99ae28ea04260301350bda194850617a26931d6 - languageName: node - linkType: hard - -"@types/electron-localshortcut@npm:^3.1.0": - version: 3.1.3 - resolution: "@types/electron-localshortcut@npm:3.1.3" - dependencies: - electron: "npm:*" - checksum: 10c0/eaf89d15b186ff4c89c3a2ca7bb6c0d61ca900574935ab29aed5faf7796f28ec601fb06e30aa2dc3fae9baaf9e04a62a304ebfeceeb1b71f373c9b0685b81bc4 - languageName: node - linkType: hard - -"@types/eslint-scope@npm:^3.7.3": - version: 3.7.7 - resolution: "@types/eslint-scope@npm:3.7.7" - dependencies: - "@types/eslint": "npm:*" - "@types/estree": "npm:*" - checksum: 10c0/a0ecbdf2f03912679440550817ff77ef39a30fa8bfdacaf6372b88b1f931828aec392f52283240f0d648cf3055c5ddc564544a626bcf245f3d09fcb099ebe3cc - languageName: node - linkType: hard - -"@types/eslint@npm:*": - version: 8.56.10 - resolution: "@types/eslint@npm:8.56.10" - dependencies: - "@types/estree": "npm:*" - "@types/json-schema": "npm:*" - checksum: 10c0/674349d6c342c3864d70f4d5a9965f96fb253801532752c8c500ad6a1c2e8b219e01ccff5dc8791dcb58b5483012c495708bb9f3ff929f5c9322b3da126c15d3 - languageName: node - linkType: hard - -"@types/estree@npm:*, @types/estree@npm:^1.0.5": - version: 1.0.5 - resolution: "@types/estree@npm:1.0.5" - checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d - languageName: node - linkType: hard - -"@types/filesize@npm:3.6.0": - version: 3.6.0 - resolution: "@types/filesize@npm:3.6.0" - checksum: 10c0/c544c86e78a0e5b9477f23279562471478ee61134b00e6048a0c86db78604dd2c3ce4a84f0afb0e321efa7b6853030fca071a03e54cb30989f79c8bc10d34319 - languageName: node - linkType: hard - -"@types/firstline@npm:^2.0.2": - version: 2.0.4 - resolution: "@types/firstline@npm:2.0.4" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/fff7bbfc7b274e39400e35b1ad793b2332e48288075117a0bd21fbe766f0d0375f6e3afe8329d7ed044e752975dd5414906a02720a0d866cd60176fd823eeb4e - languageName: node - linkType: hard - -"@types/fs-extra@npm:5.0.5": - version: 5.0.5 - resolution: "@types/fs-extra@npm:5.0.5" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/06ad0461753542e212cbbd46f858234d491f0dabaa2d142ac580b320d794165196b00f0f34e2e6b03a469e9622b2092b878365969df3119cc9728f2c962a8d1d - languageName: node - linkType: hard - -"@types/fs-extra@npm:^9.0.11": - version: 9.0.13 - resolution: "@types/fs-extra@npm:9.0.13" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/576d4e9d382393316ed815c593f7f5c157408ec5e184521d077fcb15d514b5a985245f153ef52142b9b976cb9bd8f801850d51238153ebd0dc9e96b7a7548588 - languageName: node - linkType: hard - -"@types/glob@npm:*": - version: 8.1.0 - resolution: "@types/glob@npm:8.1.0" - dependencies: - "@types/minimatch": "npm:^5.1.2" - "@types/node": "npm:*" - checksum: 10c0/ded07aa0d7a1caf3c47b85e262be82989ccd7933b4a14712b79c82fd45a239249811d9fc3a135b3e9457afa163e74a297033d7245b0dc63cd3d032f3906b053f - languageName: node - linkType: hard - -"@types/glob@npm:^7.1.1": - version: 7.2.0 - resolution: "@types/glob@npm:7.2.0" - dependencies: - "@types/minimatch": "npm:*" - "@types/node": "npm:*" - checksum: 10c0/a8eb5d5cb5c48fc58c7ca3ff1e1ddf771ee07ca5043da6e4871e6757b4472e2e73b4cfef2644c38983174a4bc728c73f8da02845c28a1212f98cabd293ecae98 - languageName: node - linkType: hard - -"@types/hoist-non-react-statics@npm:*, @types/hoist-non-react-statics@npm:^3.3.0, @types/hoist-non-react-statics@npm:^3.3.1": - version: 3.3.5 - resolution: "@types/hoist-non-react-statics@npm:3.3.5" - dependencies: - "@types/react": "npm:*" - hoist-non-react-statics: "npm:^3.3.0" - checksum: 10c0/2a3b64bf3d9817d7830afa60ee314493c475fb09570a64e7737084cd482d2177ebdddf888ce837350bac51741278b077683facc9541f052d4bbe8487b4e3e618 - languageName: node - linkType: hard - -"@types/http-cache-semantics@npm:*": - version: 4.0.4 - resolution: "@types/http-cache-semantics@npm:4.0.4" - checksum: 10c0/51b72568b4b2863e0fe8d6ce8aad72a784b7510d72dc866215642da51d84945a9459fa89f49ec48f1e9a1752e6a78e85a4cda0ded06b1c73e727610c925f9ce6 - languageName: node - linkType: hard - -"@types/jquery@npm:*": - version: 3.5.30 - resolution: "@types/jquery@npm:3.5.30" - dependencies: - "@types/sizzle": "npm:*" - checksum: 10c0/7355b2b2cb44eba7a2afa4a1c653157e4bc055be1f14a4c8874e349e6860dd36ca237e538294c2d709f1ffa0d5b12a39ea97be179f3f7fb445e17e12949ccb33 - languageName: node - linkType: hard - -"@types/js-cookie@npm:^2.2.6": - version: 2.2.7 - resolution: "@types/js-cookie@npm:2.2.7" - checksum: 10c0/29196c6829982b5efa79117122a7d62cf4bc2f6397ce8eac1539319ff5dce3b44b2d86f2ac064f2ed3488fb24439358f24af6914fde5c5c4bab9a85728a13a6f - languageName: node - linkType: hard - -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": - version: 7.0.15 - resolution: "@types/json-schema@npm:7.0.15" - checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db - languageName: node - linkType: hard - -"@types/json5@npm:^0.0.29": - version: 0.0.29 - resolution: "@types/json5@npm:0.0.29" - checksum: 10c0/6bf5337bc447b706bb5b4431d37686aa2ea6d07cfd6f79cc31de80170d6ff9b1c7384a9c0ccbc45b3f512bae9e9f75c2e12109806a15331dc94e8a8db6dbb4ac - languageName: node - linkType: hard - -"@types/keyv@npm:^3.1.4": - version: 3.1.4 - resolution: "@types/keyv@npm:3.1.4" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/ff8f54fc49621210291f815fe5b15d809fd7d032941b3180743440bd507ecdf08b9e844625fa346af568c84bf34114eb378dcdc3e921a08ba1e2a08d7e3c809c - languageName: node - linkType: hard - -"@types/libsodium-wrappers-sumo@npm:^0.7.5": - version: 0.7.8 - resolution: "@types/libsodium-wrappers-sumo@npm:0.7.8" - dependencies: - "@types/libsodium-wrappers": "npm:*" - checksum: 10c0/6670eaea7a368819854784b347c0e634d54de11ab50d8c3fa33cd831d3a3c6c80178d6cf11d9f82fa241c5220f0e44a87574f13303b138a2de1cec1b6b3d557c - languageName: node - linkType: hard - -"@types/libsodium-wrappers@npm:*": - version: 0.7.14 - resolution: "@types/libsodium-wrappers@npm:0.7.14" - checksum: 10c0/4d6da97de60a1f79b2d3bb195ab3051e2216aae9aa70b9e13c2d9fb0675fbb68d57266e82eb80886f7dcbaba2c7b16f14acecb5a6b6ae4fea267b2499f49272c - languageName: node - linkType: hard - -"@types/linkify-it@npm:^3.0.2": - version: 3.0.5 - resolution: "@types/linkify-it@npm:3.0.5" - checksum: 10c0/696e09975991c649ba37c5585714929fdebf5c64a8bfb99910613ef838337dbbba6c608fccdfa03d6347432586ef12e139bc0e947ae6fec569096fef5cc1c550 - languageName: node - linkType: hard - -"@types/linkify-it@npm:^5": - version: 5.0.0 - resolution: "@types/linkify-it@npm:5.0.0" - checksum: 10c0/7bbbf45b9dde17bf3f184fee585aef0e7342f6954f0377a24e4ff42ab5a85d5b806aaa5c8d16e2faf2a6b87b2d94467a196b7d2b85c9c7de2f0eaac5487aaab8 - languageName: node - linkType: hard - -"@types/lodash@npm:^4.14.194": - version: 4.17.4 - resolution: "@types/lodash@npm:4.17.4" - checksum: 10c0/0124c64cb9fe7a0f78b6777955abd05ef0d97844d49118652eae45f8fa57bfb7f5a7a9bccc0b5a84c0a6dc09631042e4590cb665acb9d58dfd5e6543c75341ec - languageName: node - linkType: hard - -"@types/long@npm:^3.0.0": - version: 3.0.32 - resolution: "@types/long@npm:3.0.32" - checksum: 10c0/996d0efc4fd6e7c0a61cf675f2e92c4a6c7bf15a72acaa1ebe16b8e9486d8a30cbf2072d2bde950f98ed5a23808e828a9aeddfe9807fd8e53764edfe2aba0f9d - languageName: node - linkType: hard - -"@types/markdown-it@npm:^14.1.1": - version: 14.1.1 - resolution: "@types/markdown-it@npm:14.1.1" - dependencies: - "@types/linkify-it": "npm:^5" - "@types/mdurl": "npm:^2" - checksum: 10c0/f029e471d6927c78879de8de085302544cd43643e2435775fbe0d49be998d4a23890555b0c090c154925e3a9df01ba48514582671e4f8488d8dcf992e2d155ef - languageName: node - linkType: hard - -"@types/mdurl@npm:^2": - version: 2.0.0 - resolution: "@types/mdurl@npm:2.0.0" - checksum: 10c0/cde7bb571630ed1ceb3b92a28f7b59890bb38b8f34cd35326e2df43eebfc74985e6aa6fd4184e307393bad8a9e0783a519a3f9d13c8e03788c0f98e5ec869c5e - languageName: node - linkType: hard - -"@types/minimatch@npm:*, @types/minimatch@npm:^5.1.2": - version: 5.1.2 - resolution: "@types/minimatch@npm:5.1.2" - checksum: 10c0/83cf1c11748891b714e129de0585af4c55dd4c2cafb1f1d5233d79246e5e1e19d1b5ad9e8db449667b3ffa2b6c80125c429dbee1054e9efb45758dbc4e118562 - languageName: node - linkType: hard - -"@types/minimist@npm:^1.2.0": - version: 1.2.5 - resolution: "@types/minimist@npm:1.2.5" - checksum: 10c0/3f791258d8e99a1d7d0ca2bda1ca6ea5a94e5e7b8fc6cde84dd79b0552da6fb68ade750f0e17718f6587783c24254bbca0357648dd59dc3812c150305cabdc46 - languageName: node - linkType: hard - -"@types/mocha@npm:5.0.0": - version: 5.0.0 - resolution: "@types/mocha@npm:5.0.0" - checksum: 10c0/d9a721774b13385b6801cb5dda03136742a018fd43fb0abd92d36c67a0dfc6e22adf9ea206bac22d10da28347fa6427155527bb573684d3255d6a33f397910fa - languageName: node - linkType: hard - -"@types/ms@npm:*": - version: 0.7.34 - resolution: "@types/ms@npm:0.7.34" - checksum: 10c0/ac80bd90012116ceb2d188fde62d96830ca847823e8ca71255616bc73991aa7d9f057b8bfab79e8ee44ffefb031ddd1bcce63ea82f9e66f7c31ec02d2d823ccc - languageName: node - linkType: hard - -"@types/node-fetch@npm:^2.5.7": - version: 2.6.11 - resolution: "@types/node-fetch@npm:2.6.11" - dependencies: - "@types/node": "npm:*" - form-data: "npm:^4.0.0" - checksum: 10c0/5283d4e0bcc37a5b6d8e629aee880a4ffcfb33e089f4b903b2981b19c623972d1e64af7c3f9540ab990f0f5c89b9b5dda19c5bcb37a8e177079e93683bfd2f49 - languageName: node - linkType: hard - -"@types/node@npm:*, @types/node@npm:>=13.7.0, @types/node@npm:^20.9.0": - version: 20.12.12 - resolution: "@types/node@npm:20.12.12" - dependencies: - undici-types: "npm:~5.26.4" - checksum: 10c0/f374b763c744e8f16e4f38cf6e2c0eef31781ec9228c9e43a6f267880fea420fab0a238b59f10a7cb3444e49547c5e3785787e371fc242307310995b21988812 - languageName: node - linkType: hard - -"@types/node@npm:20.5.1": - version: 20.5.1 - resolution: "@types/node@npm:20.5.1" - checksum: 10c0/b5aeaeb489842081190f8c2c09e923ff7b1b4ee3ecfceba12ba1030ce7750909a1b3c0f5372bd60cbe955e48a9889f416522e8a96697ad7209317752f395e3e5 - languageName: node - linkType: hard - -"@types/node@npm:^18.11.18": - version: 18.19.33 - resolution: "@types/node@npm:18.19.33" - dependencies: - undici-types: "npm:~5.26.4" - checksum: 10c0/0a17cf55c4e6ec90fdb47e73fde44a613ec0f6cd02619b156b1e8fd3f81f8b3346b06ca0757024ddff304d44c8ce5b99570eac8fa2d6baa0fc12e4b2146ac7c6 - languageName: node - linkType: hard - -"@types/normalize-package-data@npm:^2.4.0": - version: 2.4.4 - resolution: "@types/normalize-package-data@npm:2.4.4" - checksum: 10c0/aef7bb9b015883d6f4119c423dd28c4bdc17b0e8a0ccf112c78b4fe0e91fbc4af7c6204b04bba0e199a57d2f3fbbd5b4a14bf8739bf9d2a39b2a0aad545e0f86 - languageName: node - linkType: hard - -"@types/plist@npm:^3.0.1": - version: 3.0.5 - resolution: "@types/plist@npm:3.0.5" - dependencies: - "@types/node": "npm:*" - xmlbuilder: "npm:>=11.0.1" - checksum: 10c0/2a929f4482e3bea8c3288a46ae589a2ae2d01df5b7841ead7032d7baa79d79af6c875a5798c90705eea9306c2fb1544d7ed12ab3c905c5626d5dd5dc9f464b94 - languageName: node - linkType: hard - -"@types/prop-types@npm:*": - version: 15.7.12 - resolution: "@types/prop-types@npm:15.7.12" - checksum: 10c0/1babcc7db6a1177779f8fde0ccc78d64d459906e6ef69a4ed4dd6339c920c2e05b074ee5a92120fe4e9d9f1a01c952f843ebd550bee2332fc2ef81d1706878f8 - languageName: node - linkType: hard - -"@types/react-dom@npm:^17.0.2": - version: 17.0.25 - resolution: "@types/react-dom@npm:17.0.25" - dependencies: - "@types/react": "npm:^17" - checksum: 10c0/18a95d4d684cacc697d97ae66e3c8402da2f866c053fa6a5982694aa8eb6229afcefd3bfaaab4175c1b0ef3494c881e4d25e2167aa669bcbbb84114fd02ae5ba - languageName: node - linkType: hard - -"@types/react-mentions@npm:^4.1.8": - version: 4.1.13 - resolution: "@types/react-mentions@npm:4.1.13" - dependencies: - "@types/react": "npm:*" - checksum: 10c0/7896c956ca17cd62b7984694b32e503f18708ab57c946ed85da07580ca6b2028a592f7d216108107509617bb92c7d7ebc5b1cb5fd5de7c1868eab404d6d59d85 - languageName: node - linkType: hard - -"@types/react-native@npm:*": - version: 0.72.8 - resolution: "@types/react-native@npm:0.72.8" - dependencies: - "@react-native/virtualized-lists": "npm:^0.72.4" - "@types/react": "npm:*" - checksum: 10c0/2dde171c2331ac8f6102f9b7a88616c695d158d3140e7b7aee3a393e3645f2aaa202b3411ae371fbbcd28386459fca8d47bd5d3801a0adfdd8815a8ba5c0d5fe - languageName: node - linkType: hard - -"@types/react-redux@npm:^7.1.24": - version: 7.1.33 - resolution: "@types/react-redux@npm:7.1.33" - dependencies: - "@types/hoist-non-react-statics": "npm:^3.3.0" - "@types/react": "npm:*" - hoist-non-react-statics: "npm:^3.3.0" - redux: "npm:^4.0.0" - checksum: 10c0/e17a2fea00c6ab5f22868e927b4da7b7cf8dc7c85102638fa0f87e12ae0ec13335d9b3bf75098b3316dd8d2a18c99fe08bed22daa989a13f3710c4530f7b979e - languageName: node - linkType: hard - -"@types/react-virtualized@npm:9.18.12": - version: 9.18.12 - resolution: "@types/react-virtualized@npm:9.18.12" - dependencies: - "@types/prop-types": "npm:*" - "@types/react": "npm:*" - checksum: 10c0/9759df5c3b6766270b5d5484def3b47800ddfff0f1ec27a6414292c3ef1c57db20cef2afdc8684a2b8d62638e0d089caefaa27bb5178d4e3e0e323e0693183b5 - languageName: node - linkType: hard - -"@types/react@npm:17.0.2": - version: 17.0.2 - resolution: "@types/react@npm:17.0.2" - dependencies: - "@types/prop-types": "npm:*" - csstype: "npm:^3.0.2" - checksum: 10c0/6b48673db526015c45a0dc036394cdc7d5fd48388b3f05f8f433e74c08fb4c80e5acfc66baa2c7cc8a091d0d8524bcb00397bc7c6286fcefad4bf4cef959d764 - languageName: node - linkType: hard - -"@types/redux-logger@npm:3.0.7": - version: 3.0.7 - resolution: "@types/redux-logger@npm:3.0.7" - dependencies: - redux: "npm:^3.6.0" - checksum: 10c0/22eed8c0735ef59a0fd93079572234339d26df74aadf19e0e74ca998af85ba74af4b4d54c259289b23c49c7e039dde7a5a6c1232e5a74a490c5b2fe39e3052a5 - languageName: node - linkType: hard - -"@types/responselike@npm:^1.0.0": - version: 1.0.3 - resolution: "@types/responselike@npm:1.0.3" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/a58ba341cb9e7d74f71810a88862da7b2a6fa42e2a1fc0ce40498f6ea1d44382f0640117057da779f74c47039f7166bf48fad02dc876f94e005c7afa50f5e129 - languageName: node - linkType: hard - -"@types/retry@npm:0.12.0": - version: 0.12.0 - resolution: "@types/retry@npm:0.12.0" - checksum: 10c0/7c5c9086369826f569b83a4683661557cab1361bac0897a1cefa1a915ff739acd10ca0d62b01071046fe3f5a3f7f2aec80785fe283b75602dc6726781ea3e328 - languageName: node - linkType: hard - -"@types/rimraf@npm:2.0.2": - version: 2.0.2 - resolution: "@types/rimraf@npm:2.0.2" - dependencies: - "@types/glob": "npm:*" - "@types/node": "npm:*" - checksum: 10c0/794e8d311307bf10400ba8172cba2bb25ee9f985bd31df56295599f226c86a9a252cc5cc8944ca048e6d9d97a173e435dfe90000baf39545c6bbbd440c862cbd - languageName: node - linkType: hard - -"@types/semver@npm:5.5.0": - version: 5.5.0 - resolution: "@types/semver@npm:5.5.0" - checksum: 10c0/eea2e17ea9dadde0fb8f053b445d7567288d9f00f4e0971e39ed9541705c324c5453681ef6ab098c244f402757adc0ddde0f9b4887edaa088134bcf56d09352a - languageName: node - linkType: hard - -"@types/semver@npm:^7.3.6, @types/semver@npm:^7.5.0": - version: 7.5.8 - resolution: "@types/semver@npm:7.5.8" - checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa - languageName: node - linkType: hard - -"@types/sinon@npm:9.0.4": - version: 9.0.4 - resolution: "@types/sinon@npm:9.0.4" - dependencies: - "@types/sinonjs__fake-timers": "npm:*" - checksum: 10c0/86b64eebd165823a1bcd3fa1989794b544776223c0316a79153dc8cb21221fba1f3eeb36ceb933dc1a61087806600f1d39e28bfa844766ef227627abdfd5f8d4 - languageName: node - linkType: hard - -"@types/sinonjs__fake-timers@npm:*": - version: 8.1.5 - resolution: "@types/sinonjs__fake-timers@npm:8.1.5" - checksum: 10c0/2b8bdc246365518fc1b08f5720445093cce586183acca19a560be6ef81f824bd9a96c090e462f622af4d206406dadf2033c5daf99a51c1096da6494e5c8dc32e - languageName: node - linkType: hard - -"@types/sizzle@npm:*": - version: 2.3.8 - resolution: "@types/sizzle@npm:2.3.8" - checksum: 10c0/ab5460147ae6680cc20c2223a8f17d9f7c97144b70f00a222a1c32d68b5207696d48177ab9784dda88c74d93ed5a78dd31f74d271b15382520b423c81b4aac89 - languageName: node - linkType: hard - -"@types/styled-components@npm:5.1.1": - version: 5.1.1 - resolution: "@types/styled-components@npm:5.1.1" - dependencies: - "@types/hoist-non-react-statics": "npm:*" - "@types/react": "npm:*" - "@types/react-native": "npm:*" - csstype: "npm:^2.2.0" - checksum: 10c0/2db3a7b37d498812bf11ba1ccffa20f3a3261d44aefbd3b015b3d97eec7aa8391620049c3188bc04f7c5f454119f504791a8c3b64a53384f15770d146b7152e8 - languageName: node - linkType: hard - -"@types/trusted-types@npm:*": - version: 2.0.7 - resolution: "@types/trusted-types@npm:2.0.7" - checksum: 10c0/4c4855f10de7c6c135e0d32ce462419d8abbbc33713b31d294596c0cc34ae1fa6112a2f9da729c8f7a20707782b0d69da3b1f8df6645b0366d08825ca1522e0c - languageName: node - linkType: hard - -"@types/underscore@npm:*": - version: 1.11.15 - resolution: "@types/underscore@npm:1.11.15" - checksum: 10c0/f1bbe78337a8b800b6cb96435c54c9428d00c64eabcb8ba690302cb76c4c068d69e663a048c6b05bc9154ba723b1bcb6bcf39f753f6a0eb8c477accde7bd6056 - languageName: node - linkType: hard - -"@types/use-sync-external-store@npm:^0.0.3": - version: 0.0.3 - resolution: "@types/use-sync-external-store@npm:0.0.3" - checksum: 10c0/82824c1051ba40a00e3d47964cdf4546a224e95f172e15a9c62aa3f118acee1c7518b627a34f3aa87298a2039f982e8509f92bfcc18bea7c255c189c293ba547 - languageName: node - linkType: hard - -"@types/uuid@npm:8.3.4": - version: 8.3.4 - resolution: "@types/uuid@npm:8.3.4" - checksum: 10c0/b9ac98f82fcf35962317ef7dc44d9ac9e0f6fdb68121d384c88fe12ea318487d5585d3480fa003cf28be86a3bbe213ca688ba786601dce4a97724765eb5b1cf2 - languageName: node - linkType: hard - -"@types/verror@npm:^1.10.3": - version: 1.10.10 - resolution: "@types/verror@npm:1.10.10" - checksum: 10c0/413c0c0370ed6a796d630fbcdae20049ab3e26558c62bc5f53327830ddb0965aaadedb92f4933b28ee8fc8089e1293b742a0efbf6b264d15ce3930c6b83b0984 - languageName: node - linkType: hard - -"@types/yargs-parser@npm:*": - version: 21.0.3 - resolution: "@types/yargs-parser@npm:21.0.3" - checksum: 10c0/e71c3bd9d0b73ca82e10bee2064c384ab70f61034bbfb78e74f5206283fc16a6d85267b606b5c22cb2a3338373586786fed595b2009825d6a9115afba36560a0 - languageName: node - linkType: hard - -"@types/yargs@npm:^17.0.1": - version: 17.0.32 - resolution: "@types/yargs@npm:17.0.32" - dependencies: - "@types/yargs-parser": "npm:*" - checksum: 10c0/2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf - languageName: node - linkType: hard - -"@types/yauzl@npm:^2.9.1": - version: 2.10.3 - resolution: "@types/yauzl@npm:2.10.3" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/f1b7c1b99fef9f2fe7f1985ef7426d0cebe48cd031f1780fcdc7451eec7e31ac97028f16f50121a59bcf53086a1fc8c856fd5b7d3e00970e43d92ae27d6b43dc - languageName: node - linkType: hard - -"@typescript-eslint/eslint-plugin@npm:7.1.0": - version: 7.1.0 - resolution: "@typescript-eslint/eslint-plugin@npm:7.1.0" - dependencies: - "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:7.1.0" - "@typescript-eslint/type-utils": "npm:7.1.0" - "@typescript-eslint/utils": "npm:7.1.0" - "@typescript-eslint/visitor-keys": "npm:7.1.0" - debug: "npm:^4.3.4" - graphemer: "npm:^1.4.0" - ignore: "npm:^5.2.4" - natural-compare: "npm:^1.4.0" - semver: "npm:^7.5.4" - ts-api-utils: "npm:^1.0.1" - peerDependencies: - "@typescript-eslint/parser": ^7.0.0 - eslint: ^8.56.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 10c0/e5644a987969cbb614bbf766b6bf51341e123c774953690548610147eae0041d70e48ef42be97b68a6e2f5ed9aae37fe040e8054d35bb0568c14194ba564b2d8 - languageName: node - linkType: hard - -"@typescript-eslint/parser@npm:7.1.0": - version: 7.1.0 - resolution: "@typescript-eslint/parser@npm:7.1.0" - dependencies: - "@typescript-eslint/scope-manager": "npm:7.1.0" - "@typescript-eslint/types": "npm:7.1.0" - "@typescript-eslint/typescript-estree": "npm:7.1.0" - "@typescript-eslint/visitor-keys": "npm:7.1.0" - debug: "npm:^4.3.4" - peerDependencies: - eslint: ^8.56.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 10c0/8fcbfc8c0c86abb750173096e7ca09e1cd44aba3f6115bdb94ffb6b409b86ee23526e9d5a44935b69a6be2385893e66d8e55d92063206028dc48f70d379afcab - languageName: node - linkType: hard - -"@typescript-eslint/scope-manager@npm:7.1.0": - version: 7.1.0 - resolution: "@typescript-eslint/scope-manager@npm:7.1.0" - dependencies: - "@typescript-eslint/types": "npm:7.1.0" - "@typescript-eslint/visitor-keys": "npm:7.1.0" - checksum: 10c0/2fd167730bbe984343ab94739b00bd82e8cdeea9e63674b099cc5c89b420b28dbf79f40dab48022dc717db8d14ae6ee2739e0fcbdcc0321bc9da5f2602b55788 - languageName: node - linkType: hard - -"@typescript-eslint/type-utils@npm:7.1.0": - version: 7.1.0 - resolution: "@typescript-eslint/type-utils@npm:7.1.0" - dependencies: - "@typescript-eslint/typescript-estree": "npm:7.1.0" - "@typescript-eslint/utils": "npm:7.1.0" - debug: "npm:^4.3.4" - ts-api-utils: "npm:^1.0.1" - peerDependencies: - eslint: ^8.56.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 10c0/3e3eea6c03692a643bf4ed11646b0679c6ff13baf1647d97e793f3d8c3adb83061e27a17c2a1470166a3c6c444b974bebc8096d36e0b4b3c36c289ff38bcfc9b - languageName: node - linkType: hard - -"@typescript-eslint/types@npm:7.1.0": - version: 7.1.0 - resolution: "@typescript-eslint/types@npm:7.1.0" - checksum: 10c0/095cde3e773b7605c5e0c86642002768ced09e94def7f3c6f49a67863f47d7c8ae15413a4ab1a2407f779d1b5ede5fb3000bc98b1cf9ed7ec938acc38cac89e7 - languageName: node - linkType: hard - -"@typescript-eslint/typescript-estree@npm:7.1.0": - version: 7.1.0 - resolution: "@typescript-eslint/typescript-estree@npm:7.1.0" - dependencies: - "@typescript-eslint/types": "npm:7.1.0" - "@typescript-eslint/visitor-keys": "npm:7.1.0" - debug: "npm:^4.3.4" - globby: "npm:^11.1.0" - is-glob: "npm:^4.0.3" - minimatch: "npm:9.0.3" - semver: "npm:^7.5.4" - ts-api-utils: "npm:^1.0.1" - peerDependenciesMeta: - typescript: - optional: true - checksum: 10c0/063845dc8526dfda722d1b00960443a5158d1bce2bc39bf49bd353f33f42aa30116105a87b55a04df3eaef99c0d1c13fb987c53848dff43de6152c66dd3ba41c - languageName: node - linkType: hard - -"@typescript-eslint/utils@npm:7.1.0": - version: 7.1.0 - resolution: "@typescript-eslint/utils@npm:7.1.0" - dependencies: - "@eslint-community/eslint-utils": "npm:^4.4.0" - "@types/json-schema": "npm:^7.0.12" - "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:7.1.0" - "@typescript-eslint/types": "npm:7.1.0" - "@typescript-eslint/typescript-estree": "npm:7.1.0" - semver: "npm:^7.5.4" - peerDependencies: - eslint: ^8.56.0 - checksum: 10c0/3fefd51307d0e294462106c57c4b12cd610bfe1bdcc5ca0142bfac6a5d0d37c18d14be5ec89740eb85515f5512f45219a6048df0efccd457e96f9d0612af4abf - languageName: node - linkType: hard - -"@typescript-eslint/visitor-keys@npm:7.1.0": - version: 7.1.0 - resolution: "@typescript-eslint/visitor-keys@npm:7.1.0" - dependencies: - "@typescript-eslint/types": "npm:7.1.0" - eslint-visitor-keys: "npm:^3.4.1" - checksum: 10c0/9015a10e6ee2a99fc99e0f7a3f274496a813c2c239e868f29e7c0da919c825fe192fe21d3410c43d8a801e8186b51f08ef06523d2c3010570d893a1486ac293d - languageName: node - linkType: hard - -"@ungap/promise-all-settled@npm:1.1.2": - version: 1.1.2 - resolution: "@ungap/promise-all-settled@npm:1.1.2" - checksum: 10c0/7f9862bae3b6ce30675783428933be1738dca278901a6bcb55c29b8f54c08863ec8e6a7c884119877d90336501c33b7cfda36355ec7af4d703f65f54cb768913 - languageName: node - linkType: hard - -"@ungap/structured-clone@npm:^1.2.0": - version: 1.2.0 - resolution: "@ungap/structured-clone@npm:1.2.0" - checksum: 10c0/8209c937cb39119f44eb63cf90c0b73e7c754209a6411c707be08e50e29ee81356dca1a848a405c8bdeebfe2f5e4f831ad310ae1689eeef65e7445c090c6657d - languageName: node - linkType: hard - -"@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.12.1": - version: 1.12.1 - resolution: "@webassemblyjs/ast@npm:1.12.1" - dependencies: - "@webassemblyjs/helper-numbers": "npm:1.11.6" - "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" - checksum: 10c0/ba7f2b96c6e67e249df6156d02c69eb5f1bd18d5005303cdc42accb053bebbbde673826e54db0437c9748e97abd218366a1d13fa46859b23cde611b6b409998c - languageName: node - linkType: hard - -"@webassemblyjs/floating-point-hex-parser@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6" - checksum: 10c0/37fe26f89e18e4ca0e7d89cfe3b9f17cfa327d7daf906ae01400416dbb2e33c8a125b4dc55ad7ff405e5fcfb6cf0d764074c9bc532b9a31a71e762be57d2ea0a - languageName: node - linkType: hard - -"@webassemblyjs/helper-api-error@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/helper-api-error@npm:1.11.6" - checksum: 10c0/a681ed51863e4ff18cf38d223429f414894e5f7496856854d9a886eeddcee32d7c9f66290f2919c9bb6d2fc2b2fae3f989b6a1e02a81e829359738ea0c4d371a - languageName: node - linkType: hard - -"@webassemblyjs/helper-buffer@npm:1.12.1": - version: 1.12.1 - resolution: "@webassemblyjs/helper-buffer@npm:1.12.1" - checksum: 10c0/0270724afb4601237410f7fd845ab58ccda1d5456a8783aadfb16eaaf3f2c9610c28e4a5bcb6ad880cde5183c82f7f116d5ccfc2310502439d33f14b6888b48a - languageName: node - linkType: hard - -"@webassemblyjs/helper-numbers@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/helper-numbers@npm:1.11.6" - dependencies: - "@webassemblyjs/floating-point-hex-parser": "npm:1.11.6" - "@webassemblyjs/helper-api-error": "npm:1.11.6" - "@xtuc/long": "npm:4.2.2" - checksum: 10c0/c7d5afc0ff3bd748339b466d8d2f27b908208bf3ff26b2e8e72c39814479d486e0dca6f3d4d776fd9027c1efe05b5c0716c57a23041eb34473892b2731c33af3 - languageName: node - linkType: hard - -"@webassemblyjs/helper-wasm-bytecode@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6" - checksum: 10c0/79d2bebdd11383d142745efa32781249745213af8e022651847382685ca76709f83e1d97adc5f0d3c2b8546bf02864f8b43a531fdf5ca0748cb9e4e0ef2acaa5 - languageName: node - linkType: hard - -"@webassemblyjs/helper-wasm-section@npm:1.12.1": - version: 1.12.1 - resolution: "@webassemblyjs/helper-wasm-section@npm:1.12.1" - dependencies: - "@webassemblyjs/ast": "npm:1.12.1" - "@webassemblyjs/helper-buffer": "npm:1.12.1" - "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" - "@webassemblyjs/wasm-gen": "npm:1.12.1" - checksum: 10c0/0546350724d285ae3c26e6fc444be4c3b5fb824f3be0ec8ceb474179dc3f4430336dd2e36a44b3e3a1a6815960e5eec98cd9b3a8ec66dc53d86daedd3296a6a2 - languageName: node - linkType: hard - -"@webassemblyjs/ieee754@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/ieee754@npm:1.11.6" - dependencies: - "@xtuc/ieee754": "npm:^1.2.0" - checksum: 10c0/59de0365da450322c958deadade5ec2d300c70f75e17ae55de3c9ce564deff5b429e757d107c7ec69bd0ba169c6b6cc2ff66293ab7264a7053c829b50ffa732f - languageName: node - linkType: hard - -"@webassemblyjs/leb128@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/leb128@npm:1.11.6" - dependencies: - "@xtuc/long": "npm:4.2.2" - checksum: 10c0/cb344fc04f1968209804de4da018679c5d4708a03b472a33e0fa75657bb024978f570d3ccf9263b7f341f77ecaa75d0e051b9cd4b7bb17a339032cfd1c37f96e - languageName: node - linkType: hard - -"@webassemblyjs/utf8@npm:1.11.6": - version: 1.11.6 - resolution: "@webassemblyjs/utf8@npm:1.11.6" - checksum: 10c0/14d6c24751a89ad9d801180b0d770f30a853c39f035a15fbc96266d6ac46355227abd27a3fd2eeaa97b4294ced2440a6b012750ae17bafe1a7633029a87b6bee - languageName: node - linkType: hard - -"@webassemblyjs/wasm-edit@npm:^1.12.1": - version: 1.12.1 - resolution: "@webassemblyjs/wasm-edit@npm:1.12.1" - dependencies: - "@webassemblyjs/ast": "npm:1.12.1" - "@webassemblyjs/helper-buffer": "npm:1.12.1" - "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" - "@webassemblyjs/helper-wasm-section": "npm:1.12.1" - "@webassemblyjs/wasm-gen": "npm:1.12.1" - "@webassemblyjs/wasm-opt": "npm:1.12.1" - "@webassemblyjs/wasm-parser": "npm:1.12.1" - "@webassemblyjs/wast-printer": "npm:1.12.1" - checksum: 10c0/972f5e6c522890743999e0ed45260aae728098801c6128856b310dd21f1ee63435fc7b518e30e0ba1cdafd0d1e38275829c1e4451c3536a1d9e726e07a5bba0b - languageName: node - linkType: hard - -"@webassemblyjs/wasm-gen@npm:1.12.1": - version: 1.12.1 - resolution: "@webassemblyjs/wasm-gen@npm:1.12.1" - dependencies: - "@webassemblyjs/ast": "npm:1.12.1" - "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" - "@webassemblyjs/ieee754": "npm:1.11.6" - "@webassemblyjs/leb128": "npm:1.11.6" - "@webassemblyjs/utf8": "npm:1.11.6" - checksum: 10c0/1e257288177af9fa34c69cab94f4d9036ebed611f77f3897c988874e75182eeeec759c79b89a7a49dd24624fc2d3d48d5580b62b67c4a1c9bfbdcd266b281c16 - languageName: node - linkType: hard - -"@webassemblyjs/wasm-opt@npm:1.12.1": - version: 1.12.1 - resolution: "@webassemblyjs/wasm-opt@npm:1.12.1" - dependencies: - "@webassemblyjs/ast": "npm:1.12.1" - "@webassemblyjs/helper-buffer": "npm:1.12.1" - "@webassemblyjs/wasm-gen": "npm:1.12.1" - "@webassemblyjs/wasm-parser": "npm:1.12.1" - checksum: 10c0/992a45e1f1871033c36987459436ab4e6430642ca49328e6e32a13de9106fe69ae6c0ac27d7050efd76851e502d11cd1ac0e06b55655dfa889ad82f11a2712fb - languageName: node - linkType: hard - -"@webassemblyjs/wasm-parser@npm:1.12.1, @webassemblyjs/wasm-parser@npm:^1.12.1": - version: 1.12.1 - resolution: "@webassemblyjs/wasm-parser@npm:1.12.1" - dependencies: - "@webassemblyjs/ast": "npm:1.12.1" - "@webassemblyjs/helper-api-error": "npm:1.11.6" - "@webassemblyjs/helper-wasm-bytecode": "npm:1.11.6" - "@webassemblyjs/ieee754": "npm:1.11.6" - "@webassemblyjs/leb128": "npm:1.11.6" - "@webassemblyjs/utf8": "npm:1.11.6" - checksum: 10c0/e85cec1acad07e5eb65b92d37c8e6ca09c6ca50d7ca58803a1532b452c7321050a0328c49810c337cc2dfd100c5326a54d5ebd1aa5c339ebe6ef10c250323a0e - languageName: node - linkType: hard - -"@webassemblyjs/wast-printer@npm:1.12.1": - version: 1.12.1 - resolution: "@webassemblyjs/wast-printer@npm:1.12.1" - dependencies: - "@webassemblyjs/ast": "npm:1.12.1" - "@xtuc/long": "npm:4.2.2" - checksum: 10c0/39bf746eb7a79aa69953f194943bbc43bebae98bd7cadd4d8bc8c0df470ca6bf9d2b789effaa180e900fab4e2691983c1f7d41571458bd2a26267f2f0c73705a - languageName: node - linkType: hard - -"@webpack-cli/configtest@npm:^2.1.1": - version: 2.1.1 - resolution: "@webpack-cli/configtest@npm:2.1.1" - peerDependencies: - webpack: 5.x.x - webpack-cli: 5.x.x - checksum: 10c0/a8da1f15702cb289807da99235ed95326ed7dabeb1a36ca59bd3a5dbe6adcc946a9a2767936050fc4d5ed14efab0e5b5a641dfe8e3d862c36caa5791ac12759d - languageName: node - linkType: hard - -"@webpack-cli/info@npm:^2.0.2": - version: 2.0.2 - resolution: "@webpack-cli/info@npm:2.0.2" - peerDependencies: - webpack: 5.x.x - webpack-cli: 5.x.x - checksum: 10c0/ca88a35604dc9aedac7c26e8f6793c5039dc1eea2b12a85fbfd669a5f21ecf9cf169d7fd157ea366a62666e3fa05b776306a96742ac61a9868f44fdce6b40f7d - languageName: node - linkType: hard - -"@webpack-cli/serve@npm:^2.0.5": - version: 2.0.5 - resolution: "@webpack-cli/serve@npm:2.0.5" - peerDependencies: - webpack: 5.x.x - webpack-cli: 5.x.x - peerDependenciesMeta: - webpack-dev-server: - optional: true - checksum: 10c0/36079d34971ff99a58b66b13f4184dcdd8617853c48cccdbc3f9ab7ea9e5d4fcf504e873c298ea7aa15e0b51ad2c4aee4d7a70bd7d9364e60f57b0eb93ca15fc - languageName: node - linkType: hard - -"@xmldom/xmldom@npm:^0.8.8": - version: 0.8.10 - resolution: "@xmldom/xmldom@npm:0.8.10" - checksum: 10c0/c7647c442502720182b0d65b17d45d2d95317c1c8c497626fe524bda79b4fb768a9aa4fae2da919f308e7abcff7d67c058b102a9d641097e9a57f0b80187851f - languageName: node - linkType: hard - -"@xobotyi/scrollbar-width@npm:^1.9.5": - version: 1.9.5 - resolution: "@xobotyi/scrollbar-width@npm:1.9.5" - checksum: 10c0/4ebc79e4f798e2a5e89a5122f8fc4a086f08a92a44ac020599c4fe20d105b7d76ba06c094260b5f386a75e7ce6f6c518d9fc295228b651296b99c4477f986ac4 - languageName: node - linkType: hard - -"@xtuc/ieee754@npm:^1.2.0": - version: 1.2.0 - resolution: "@xtuc/ieee754@npm:1.2.0" - checksum: 10c0/a8565d29d135039bd99ae4b2220d3e167d22cf53f867e491ed479b3f84f895742d0097f935b19aab90265a23d5d46711e4204f14c479ae3637fbf06c4666882f - languageName: node - linkType: hard - -"@xtuc/long@npm:4.2.2": - version: 4.2.2 - resolution: "@xtuc/long@npm:4.2.2" - checksum: 10c0/8582cbc69c79ad2d31568c412129bf23d2b1210a1dfb60c82d5a1df93334da4ee51f3057051658569e2c196d8dc33bc05ae6b974a711d0d16e801e1d0647ccd1 - languageName: node - linkType: hard - -"@yarnpkg/lockfile@npm:^1.1.0": - version: 1.1.0 - resolution: "@yarnpkg/lockfile@npm:1.1.0" - checksum: 10c0/0bfa50a3d756623d1f3409bc23f225a1d069424dbc77c6fd2f14fb377390cd57ec703dc70286e081c564be9051ead9ba85d81d66a3e68eeb6eb506d4e0c0fbda - languageName: node - linkType: hard - -"JSONStream@npm:^1.3.5": - version: 1.3.5 - resolution: "JSONStream@npm:1.3.5" - dependencies: - jsonparse: "npm:^1.2.0" - through: "npm:>=2.2.7 <3" - bin: - JSONStream: ./bin.js - checksum: 10c0/0f54694da32224d57b715385d4a6b668d2117379d1f3223dc758459246cca58fdc4c628b83e8a8883334e454a0a30aa198ede77c788b55537c1844f686a751f2 - languageName: node - linkType: hard - -"abab@npm:^2.0.6": - version: 2.0.6 - resolution: "abab@npm:2.0.6" - checksum: 10c0/0b245c3c3ea2598fe0025abf7cc7bb507b06949d51e8edae5d12c1b847a0a0c09639abcb94788332b4e2044ac4491c1e8f571b51c7826fd4b0bda1685ad4a278 - languageName: node - linkType: hard - -"abbrev@npm:^2.0.0": - version: 2.0.0 - resolution: "abbrev@npm:2.0.0" - checksum: 10c0/f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372 - languageName: node - linkType: hard - -"abort-controller@npm:3.0.0": - version: 3.0.0 - resolution: "abort-controller@npm:3.0.0" - dependencies: - event-target-shim: "npm:^5.0.0" - checksum: 10c0/90ccc50f010250152509a344eb2e71977fbf8db0ab8f1061197e3275ddf6c61a41a6edfd7b9409c664513131dd96e962065415325ef23efa5db931b382d24ca5 - languageName: node - linkType: hard - -"acorn-import-assertions@npm:^1.9.0": - version: 1.9.0 - resolution: "acorn-import-assertions@npm:1.9.0" - peerDependencies: - acorn: ^8 - checksum: 10c0/3b4a194e128efdc9b86c2b1544f623aba4c1aa70d638f8ab7dc3971a5b4aa4c57bd62f99af6e5325bb5973c55863b4112e708a6f408bad7a138647ca72283afe - languageName: node - linkType: hard - -"acorn-jsx@npm:^5.3.2": - version: 5.3.2 - resolution: "acorn-jsx@npm:5.3.2" - peerDependencies: - acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 10c0/4c54868fbef3b8d58927d5e33f0a4de35f59012fe7b12cf9dfbb345fb8f46607709e1c4431be869a23fb63c151033d84c4198fa9f79385cec34fcb1dd53974c1 - languageName: node - linkType: hard - -"acorn-walk@npm:^8.1.1": - version: 8.3.2 - resolution: "acorn-walk@npm:8.3.2" - checksum: 10c0/7e2a8dad5480df7f872569b9dccff2f3da7e65f5353686b1d6032ab9f4ddf6e3a2cb83a9b52cf50b1497fd522154dda92f0abf7153290cc79cd14721ff121e52 - languageName: node - linkType: hard - -"acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": - version: 8.11.3 - resolution: "acorn@npm:8.11.3" - bin: - acorn: bin/acorn - checksum: 10c0/3ff155f8812e4a746fee8ecff1f227d527c4c45655bb1fad6347c3cb58e46190598217551b1500f18542d2bbe5c87120cb6927f5a074a59166fbdd9468f0a299 - languageName: node - linkType: hard - -"agent-base@npm:6": - version: 6.0.2 - resolution: "agent-base@npm:6.0.2" - dependencies: - debug: "npm:4" - checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261 - languageName: node - linkType: hard - -"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1": - version: 7.1.1 - resolution: "agent-base@npm:7.1.1" - dependencies: - debug: "npm:^4.3.4" - checksum: 10c0/e59ce7bed9c63bf071a30cc471f2933862044c97fd9958967bfe22521d7a0f601ce4ed5a8c011799d0c726ca70312142ae193bbebb60f576b52be19d4a363b50 - languageName: node - linkType: hard - -"aggregate-error@npm:^3.0.0": - version: 3.1.0 - resolution: "aggregate-error@npm:3.1.0" - dependencies: - clean-stack: "npm:^2.0.0" - indent-string: "npm:^4.0.0" - checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039 - languageName: node - linkType: hard - -"ajv-formats@npm:^2.1.1": - version: 2.1.1 - resolution: "ajv-formats@npm:2.1.1" - dependencies: - ajv: "npm:^8.0.0" - peerDependencies: - ajv: ^8.0.0 - peerDependenciesMeta: - ajv: - optional: true - checksum: 10c0/e43ba22e91b6a48d96224b83d260d3a3a561b42d391f8d3c6d2c1559f9aa5b253bfb306bc94bbeca1d967c014e15a6efe9a207309e95b3eaae07fcbcdc2af662 - languageName: node - linkType: hard - -"ajv-keywords@npm:^3.4.1, ajv-keywords@npm:^3.5.2": - version: 3.5.2 - resolution: "ajv-keywords@npm:3.5.2" - peerDependencies: - ajv: ^6.9.1 - checksum: 10c0/0c57a47cbd656e8cdfd99d7c2264de5868918ffa207c8d7a72a7f63379d4333254b2ba03d69e3c035e996a3fd3eb6d5725d7a1597cca10694296e32510546360 - languageName: node - linkType: hard - -"ajv-keywords@npm:^5.1.0": - version: 5.1.0 - resolution: "ajv-keywords@npm:5.1.0" - dependencies: - fast-deep-equal: "npm:^3.1.3" - peerDependencies: - ajv: ^8.8.2 - checksum: 10c0/18bec51f0171b83123ba1d8883c126e60c6f420cef885250898bf77a8d3e65e3bfb9e8564f497e30bdbe762a83e0d144a36931328616a973ee669dc74d4a9590 - languageName: node - linkType: hard - -"ajv@npm:^6.10.0, ajv@npm:^6.12.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5": - version: 6.12.6 - resolution: "ajv@npm:6.12.6" - dependencies: - fast-deep-equal: "npm:^3.1.1" - fast-json-stable-stringify: "npm:^2.0.0" - json-schema-traverse: "npm:^0.4.1" - uri-js: "npm:^4.2.2" - checksum: 10c0/41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71 - languageName: node - linkType: hard - -"ajv@npm:^8.0.0, ajv@npm:^8.11.0, ajv@npm:^8.9.0": - version: 8.14.0 - resolution: "ajv@npm:8.14.0" - dependencies: - fast-deep-equal: "npm:^3.1.3" - json-schema-traverse: "npm:^1.0.0" - require-from-string: "npm:^2.0.2" - uri-js: "npm:^4.4.1" - checksum: 10c0/89aedf51bc3cd2a98214ef8d4081a9d5c02cedbfd28ada48deb9ae3d456fdfe3dc8899cce44736c80b3965840e32ba8827032df6a60af5671f27f47f8082a3bf - languageName: node - linkType: hard - -"ansi-align@npm:^3.0.0": - version: 3.0.1 - resolution: "ansi-align@npm:3.0.1" - dependencies: - string-width: "npm:^4.1.0" - checksum: 10c0/ad8b755a253a1bc8234eb341e0cec68a857ab18bf97ba2bda529e86f6e30460416523e0ec58c32e5c21f0ca470d779503244892873a5895dbd0c39c788e82467 - languageName: node - linkType: hard - -"ansi-colors@npm:4.1.1": - version: 4.1.1 - resolution: "ansi-colors@npm:4.1.1" - checksum: 10c0/6086ade4336b4250b6b25e144b83e5623bcaf654d3df0c3546ce09c9c5ff999cb6a6f00c87e802d05cf98aef79d92dc76ade2670a2493b8dcb80220bec457838 - languageName: node - linkType: hard - -"ansi-escapes@npm:^5.0.0": - version: 5.0.0 - resolution: "ansi-escapes@npm:5.0.0" - dependencies: - type-fest: "npm:^1.0.2" - checksum: 10c0/f705cc7fbabb981ddf51562cd950792807bccd7260cc3d9478a619dda62bff6634c87ca100f2545ac7aade9b72652c4edad8c7f0d31a0b949b5fa58f33eaf0d0 - languageName: node - linkType: hard - -"ansi-regex@npm:^4.1.1": - version: 4.1.1 - resolution: "ansi-regex@npm:4.1.1" - checksum: 10c0/d36d34234d077e8770169d980fed7b2f3724bfa2a01da150ccd75ef9707c80e883d27cdf7a0eac2f145ac1d10a785a8a855cffd05b85f778629a0db62e7033da - languageName: node - linkType: hard - -"ansi-styles@npm:^3.2.1": - version: 3.2.1 - resolution: "ansi-styles@npm:3.2.1" - dependencies: - color-convert: "npm:^1.9.0" - checksum: 10c0/ece5a8ef069fcc5298f67e3f4771a663129abd174ea2dfa87923a2be2abf6cd367ef72ac87942da00ce85bd1d651d4cd8595aebdb1b385889b89b205860e977b - languageName: node - linkType: hard - -"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0": - version: 4.3.0 - resolution: "ansi-styles@npm:4.3.0" - dependencies: - color-convert: "npm:^2.0.1" - checksum: 10c0/895a23929da416f2bd3de7e9cb4eabd340949328ab85ddd6e484a637d8f6820d485f53933446f5291c3b760cbc488beb8e88573dd0f9c7daf83dccc8fe81b041 - languageName: node - linkType: hard - -"ansi-styles@npm:^6.0.0, ansi-styles@npm:^6.1.0": - version: 6.2.1 - resolution: "ansi-styles@npm:6.2.1" - checksum: 10c0/5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c - languageName: node - linkType: hard - -"anymatch@npm:~3.1.2": - version: 3.1.3 - resolution: "anymatch@npm:3.1.3" - dependencies: - normalize-path: "npm:^3.0.0" - picomatch: "npm:^2.0.4" - checksum: 10c0/57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac - languageName: node - linkType: hard - -"app-builder-bin@npm:4.0.0": - version: 4.0.0 - resolution: "app-builder-bin@npm:4.0.0" - checksum: 10c0/9df57b2460aa058971c8619132c4ab5b7b4572449c8f5b562e44c9d6c1c73ec7284f4d1e170549c42eef53cd9e0b7579409fb49fba862ab4d3050433579ef14c - languageName: node - linkType: hard - -"app-builder-lib@npm:23.0.8": - version: 23.0.8 - resolution: "app-builder-lib@npm:23.0.8" - dependencies: - 7zip-bin: "npm:~5.1.1" - "@develar/schema-utils": "npm:~2.6.5" - "@electron/universal": "npm:1.2.1" - "@malept/flatpak-bundler": "npm:^0.4.0" - async-exit-hook: "npm:^2.0.1" - bluebird-lst: "npm:^1.0.9" - builder-util: "npm:23.0.8" - builder-util-runtime: "npm:9.0.2" - chromium-pickle-js: "npm:^0.2.0" - debug: "npm:^4.3.4" - ejs: "npm:^3.1.7" - electron-osx-sign: "npm:^0.6.0" - electron-publish: "npm:23.0.8" - form-data: "npm:^4.0.0" - fs-extra: "npm:^10.1.0" - hosted-git-info: "npm:^4.1.0" - is-ci: "npm:^3.0.0" - isbinaryfile: "npm:^4.0.10" - js-yaml: "npm:^4.1.0" - lazy-val: "npm:^1.0.5" - minimatch: "npm:^3.1.2" - read-config-file: "npm:6.2.0" - sanitize-filename: "npm:^1.6.3" - semver: "npm:^7.3.7" - tar: "npm:^6.1.11" - temp-file: "npm:^3.4.0" - checksum: 10c0/9d832a9caa0b32ead71aee3ecb8b16d776a7c590f237345852087847f71ad8cf70c00b0db7e00891e24541c24097d97299042816a8f7615590b3e408af84e6b8 - languageName: node - linkType: hard - -"app-builder-lib@npm:23.6.0": - version: 23.6.0 - resolution: "app-builder-lib@npm:23.6.0" - dependencies: - 7zip-bin: "npm:~5.1.1" - "@develar/schema-utils": "npm:~2.6.5" - "@electron/universal": "npm:1.2.1" - "@malept/flatpak-bundler": "npm:^0.4.0" - async-exit-hook: "npm:^2.0.1" - bluebird-lst: "npm:^1.0.9" - builder-util: "npm:23.6.0" - builder-util-runtime: "npm:9.1.1" - chromium-pickle-js: "npm:^0.2.0" - debug: "npm:^4.3.4" - ejs: "npm:^3.1.7" - electron-osx-sign: "npm:^0.6.0" - electron-publish: "npm:23.6.0" - form-data: "npm:^4.0.0" - fs-extra: "npm:^10.1.0" - hosted-git-info: "npm:^4.1.0" - is-ci: "npm:^3.0.0" - isbinaryfile: "npm:^4.0.10" - js-yaml: "npm:^4.1.0" - lazy-val: "npm:^1.0.5" - minimatch: "npm:^3.1.2" - read-config-file: "npm:6.2.0" - sanitize-filename: "npm:^1.6.3" - semver: "npm:^7.3.7" - tar: "npm:^6.1.11" - temp-file: "npm:^3.4.0" - checksum: 10c0/a4878df17dc24e7ac3cc9e4536fedff921bae8b6b953d708fff8a37bf4d533a23a112d3b904aec3a901b81222ef1fbe08b63e172ec94ae466d871d289b64b8fa - languageName: node - linkType: hard - -"aproba@npm:^1.0.3 || ^2.0.0": - version: 2.0.0 - resolution: "aproba@npm:2.0.0" - checksum: 10c0/d06e26384a8f6245d8c8896e138c0388824e259a329e0c9f196b4fa533c82502a6fd449586e3604950a0c42921832a458bb3aa0aa9f0ba449cfd4f50fd0d09b5 - languageName: node - linkType: hard - -"are-we-there-yet@npm:^3.0.0": - version: 3.0.1 - resolution: "are-we-there-yet@npm:3.0.1" - dependencies: - delegates: "npm:^1.0.0" - readable-stream: "npm:^3.6.0" - checksum: 10c0/8373f289ba42e4b5ec713bb585acdac14b5702c75f2a458dc985b9e4fa5762bc5b46b40a21b72418a3ed0cfb5e35bdc317ef1ae132f3035f633d581dd03168c3 - languageName: node - linkType: hard - -"arg@npm:^4.1.0": - version: 4.1.3 - resolution: "arg@npm:4.1.3" - checksum: 10c0/070ff801a9d236a6caa647507bdcc7034530604844d64408149a26b9e87c2f97650055c0f049abd1efc024b334635c01f29e0b632b371ac3f26130f4cf65997a - languageName: node - linkType: hard - -"argparse@npm:^2.0.1": - version: 2.0.1 - resolution: "argparse@npm:2.0.1" - checksum: 10c0/c5640c2d89045371c7cedd6a70212a04e360fd34d6edeae32f6952c63949e3525ea77dbec0289d8213a99bbaeab5abfa860b5c12cf88a2e6cf8106e90dd27a7e - languageName: node - linkType: hard - -"array-buffer-byte-length@npm:^1.0.1": - version: 1.0.1 - resolution: "array-buffer-byte-length@npm:1.0.1" - dependencies: - call-bind: "npm:^1.0.5" - is-array-buffer: "npm:^3.0.4" - checksum: 10c0/f5cdf54527cd18a3d2852ddf73df79efec03829e7373a8322ef5df2b4ef546fb365c19c71d6b42d641cb6bfe0f1a2f19bc0ece5b533295f86d7c3d522f228917 - languageName: node - linkType: hard - -"array-ify@npm:^1.0.0": - version: 1.0.0 - resolution: "array-ify@npm:1.0.0" - checksum: 10c0/75c9c072faac47bd61779c0c595e912fe660d338504ac70d10e39e1b8a4a0c9c87658703d619b9d1b70d324177ae29dc8d07dda0d0a15d005597bc4c5a59c70c - languageName: node - linkType: hard - -"array-includes@npm:^3.1.6, array-includes@npm:^3.1.7": - version: 3.1.8 - resolution: "array-includes@npm:3.1.8" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.2" - es-object-atoms: "npm:^1.0.0" - get-intrinsic: "npm:^1.2.4" - is-string: "npm:^1.0.7" - checksum: 10c0/5b1004d203e85873b96ddc493f090c9672fd6c80d7a60b798da8a14bff8a670ff95db5aafc9abc14a211943f05220dacf8ea17638ae0af1a6a47b8c0b48ce370 - languageName: node - linkType: hard - -"array-union@npm:^2.1.0": - version: 2.1.0 - resolution: "array-union@npm:2.1.0" - checksum: 10c0/429897e68110374f39b771ec47a7161fc6a8fc33e196857c0a396dc75df0b5f65e4d046674db764330b6bb66b39ef48dd7c53b6a2ee75cfb0681e0c1a7033962 - languageName: node - linkType: hard - -"array.prototype.findlastindex@npm:^1.2.3": - version: 1.2.5 - resolution: "array.prototype.findlastindex@npm:1.2.5" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.2" - es-errors: "npm:^1.3.0" - es-object-atoms: "npm:^1.0.0" - es-shim-unscopables: "npm:^1.0.2" - checksum: 10c0/962189487728b034f3134802b421b5f39e42ee2356d13b42d2ddb0e52057ffdcc170b9524867f4f0611a6f638f4c19b31e14606e8bcbda67799e26685b195aa3 - languageName: node - linkType: hard - -"array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.2": - version: 1.3.2 - resolution: "array.prototype.flat@npm:1.3.2" - dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - es-shim-unscopables: "npm:^1.0.0" - checksum: 10c0/a578ed836a786efbb6c2db0899ae80781b476200617f65a44846cb1ed8bd8b24c8821b83703375d8af639c689497b7b07277060024b9919db94ac3e10dc8a49b - languageName: node - linkType: hard - -"array.prototype.flatmap@npm:^1.3.1, array.prototype.flatmap@npm:^1.3.2": - version: 1.3.2 - resolution: "array.prototype.flatmap@npm:1.3.2" - dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - es-shim-unscopables: "npm:^1.0.0" - checksum: 10c0/67b3f1d602bb73713265145853128b1ad77cc0f9b833c7e1e056b323fbeac41a4ff1c9c99c7b9445903caea924d9ca2450578d9011913191aa88cc3c3a4b54f4 - languageName: node - linkType: hard - -"array.prototype.tosorted@npm:^1.1.1": - version: 1.1.3 - resolution: "array.prototype.tosorted@npm:1.1.3" - dependencies: - call-bind: "npm:^1.0.5" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.22.3" - es-errors: "npm:^1.1.0" - es-shim-unscopables: "npm:^1.0.2" - checksum: 10c0/a27e1ca51168ecacf6042901f5ef021e43c8fa04b6c6b6f2a30bac3645cd2b519cecbe0bc45db1b85b843f64dc3207f0268f700b4b9fbdec076d12d432cf0865 - languageName: node - linkType: hard - -"arraybuffer.prototype.slice@npm:^1.0.3": - version: 1.0.3 - resolution: "arraybuffer.prototype.slice@npm:1.0.3" - dependencies: - array-buffer-byte-length: "npm:^1.0.1" - call-bind: "npm:^1.0.5" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.22.3" - es-errors: "npm:^1.2.1" - get-intrinsic: "npm:^1.2.3" - is-array-buffer: "npm:^3.0.4" - is-shared-array-buffer: "npm:^1.0.2" - checksum: 10c0/d32754045bcb2294ade881d45140a5e52bda2321b9e98fa514797b7f0d252c4c5ab0d1edb34112652c62fa6a9398def568da63a4d7544672229afea283358c36 - languageName: node - linkType: hard - -"arrify@npm:^1.0.1": - version: 1.0.1 - resolution: "arrify@npm:1.0.1" - checksum: 10c0/c35c8d1a81bcd5474c0c57fe3f4bad1a4d46a5fa353cedcff7a54da315df60db71829e69104b859dff96c5d68af46bd2be259fe5e50dc6aa9df3b36bea0383ab - languageName: node - linkType: hard - -"asar@npm:^3.1.0": - version: 3.2.0 - resolution: "asar@npm:3.2.0" - dependencies: - "@types/glob": "npm:^7.1.1" - chromium-pickle-js: "npm:^0.2.0" - commander: "npm:^5.0.0" - glob: "npm:^7.1.6" - minimatch: "npm:^3.0.4" - dependenciesMeta: - "@types/glob": - optional: true - bin: - asar: bin/asar.js - checksum: 10c0/1eea9686e3df8102251b911951d374c4bb758ce2881471c94c3999f7c473c96be6036ac09aafbd9453ba43b901e96ad0082d7e1bafc12f6768571353297c516f - languageName: node - linkType: hard - -"assert-plus@npm:^1.0.0": - version: 1.0.0 - resolution: "assert-plus@npm:1.0.0" - checksum: 10c0/b194b9d50c3a8f872ee85ab110784911e696a4d49f7ee6fc5fb63216dedbefd2c55999c70cb2eaeb4cf4a0e0338b44e9ace3627117b5bf0d42460e9132f21b91 - languageName: node - linkType: hard - -"assertion-error@npm:^1.1.0": - version: 1.1.0 - resolution: "assertion-error@npm:1.1.0" - checksum: 10c0/25456b2aa333250f01143968e02e4884a34588a8538fbbf65c91a637f1dbfb8069249133cd2f4e530f10f624d206a664e7df30207830b659e9f5298b00a4099b - languageName: node - linkType: hard - -"astral-regex@npm:^2.0.0": - version: 2.0.0 - resolution: "astral-regex@npm:2.0.0" - checksum: 10c0/f63d439cc383db1b9c5c6080d1e240bd14dae745f15d11ec5da863e182bbeca70df6c8191cffef5deba0b566ef98834610a68be79ac6379c95eeb26e1b310e25 - languageName: node - linkType: hard - -"async-exit-hook@npm:^2.0.1": - version: 2.0.1 - resolution: "async-exit-hook@npm:2.0.1" - checksum: 10c0/81407a440ef0aab328df2369f1a9d957ee53e9a5a43e3b3dcb2be05151a68de0e4ff5e927f4718c88abf85800731f5b3f69a47a6642ce135f5e7d43ca0fce41d - languageName: node - linkType: hard - -"async@npm:^2.6.4": - version: 2.6.4 - resolution: "async@npm:2.6.4" - dependencies: - lodash: "npm:^4.17.14" - checksum: 10c0/0ebb3273ef96513389520adc88e0d3c45e523d03653cc9b66f5c46f4239444294899bfd13d2b569e7dbfde7da2235c35cf5fd3ece9524f935d41bbe4efccdad0 - languageName: node - linkType: hard - -"asynckit@npm:^0.4.0": - version: 0.4.0 - resolution: "asynckit@npm:0.4.0" - checksum: 10c0/d73e2ddf20c4eb9337e1b3df1a0f6159481050a5de457c55b14ea2e5cb6d90bb69e004c9af54737a5ee0917fcf2c9e25de67777bbe58261847846066ba75bc9d - languageName: node - linkType: hard - -"at-least-node@npm:^1.0.0": - version: 1.0.0 - resolution: "at-least-node@npm:1.0.0" - checksum: 10c0/4c058baf6df1bc5a1697cf182e2029c58cd99975288a13f9e70068ef5d6f4e1f1fd7c4d2c3c4912eae44797d1725be9700995736deca441b39f3e66d8dee97ef - languageName: node - linkType: hard - -"auto-bind@npm:^4.0.0": - version: 4.0.0 - resolution: "auto-bind@npm:4.0.0" - checksum: 10c0/12f70745d081ba990dca028ecfa70de25d4baa9a8b74a5bef3ab293da56cba32ff8276c3ff8e5fe6d9f370547bf3fa71486befbfefe272af7e722c21d0c25530 - languageName: node - linkType: hard - -"available-typed-arrays@npm:^1.0.7": - version: 1.0.7 - resolution: "available-typed-arrays@npm:1.0.7" - dependencies: - possible-typed-array-names: "npm:^1.0.0" - checksum: 10c0/d07226ef4f87daa01bd0fe80f8f310982e345f372926da2e5296aecc25c41cab440916bbaa4c5e1034b453af3392f67df5961124e4b586df1e99793a1374bdb2 - languageName: node - linkType: hard - -"axios@npm:^1.3.2": - version: 1.7.2 - resolution: "axios@npm:1.7.2" - dependencies: - follow-redirects: "npm:^1.15.6" - form-data: "npm:^4.0.0" - proxy-from-env: "npm:^1.1.0" - checksum: 10c0/cbd47ce380fe045313364e740bb03b936420b8b5558c7ea36a4563db1258c658f05e40feb5ddd41f6633fdd96d37ac2a76f884dad599c5b0224b4c451b3fa7ae - languageName: node - linkType: hard - -"babel-plugin-styled-components@npm:>= 1": - version: 2.1.4 - resolution: "babel-plugin-styled-components@npm:2.1.4" - dependencies: - "@babel/helper-annotate-as-pure": "npm:^7.22.5" - "@babel/helper-module-imports": "npm:^7.22.5" - "@babel/plugin-syntax-jsx": "npm:^7.22.5" - lodash: "npm:^4.17.21" - picomatch: "npm:^2.3.1" - peerDependencies: - styled-components: ">= 2" - checksum: 10c0/553f35f5feb4b51fda9c9aeef8a31c1b66f430687ab17830b7cdacfe7e93f912aef55bf59e402f4e0a1fa7ad039768ab3626512bbb9bf1f76fcc67ba47e7a56e - languageName: node - linkType: hard - -"backbone@npm:1.3.3": - version: 1.3.3 - resolution: "backbone@npm:1.3.3" - dependencies: - underscore: "npm:>=1.8.3" - checksum: 10c0/49e1255a232b6b4b8f36045f6e4560e8b8242c925e8ba16f99dbd8fa8d11b6baf39c4d5f0637eb4d7c2bec66aeafc63a17e16ab43abc99dc9b3c142968c3101f - languageName: node - linkType: hard - -"balanced-match@npm:^1.0.0": - version: 1.0.2 - resolution: "balanced-match@npm:1.0.2" - checksum: 10c0/9308baf0a7e4838a82bbfd11e01b1cb0f0cf2893bc1676c27c2a8c0e70cbae1c59120c3268517a8ae7fb6376b4639ef81ca22582611dbee4ed28df945134aaee - languageName: node - linkType: hard - -"base64-js@npm:^1.3.1, base64-js@npm:^1.5.1": - version: 1.5.1 - resolution: "base64-js@npm:1.5.1" - checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf - languageName: node - linkType: hard - -"big.js@npm:^5.2.2": - version: 5.2.2 - resolution: "big.js@npm:5.2.2" - checksum: 10c0/230520f1ff920b2d2ce3e372d77a33faa4fa60d802fe01ca4ffbc321ee06023fe9a741ac02793ee778040a16b7e497f7d60c504d1c402b8fdab6f03bb785a25f - languageName: node - linkType: hard - -"binary-extensions@npm:^2.0.0": - version: 2.3.0 - resolution: "binary-extensions@npm:2.3.0" - checksum: 10c0/75a59cafc10fb12a11d510e77110c6c7ae3f4ca22463d52487709ca7f18f69d886aa387557cc9864fbdb10153d0bdb4caacabf11541f55e89ed6e18d12ece2b5 - languageName: node - linkType: hard - -"bindings@npm:^1.5.0": - version: 1.5.0 - resolution: "bindings@npm:1.5.0" - dependencies: - file-uri-to-path: "npm:1.0.0" - checksum: 10c0/3dab2491b4bb24124252a91e656803eac24292473e56554e35bbfe3cc1875332cfa77600c3bac7564049dc95075bf6fcc63a4609920ff2d64d0fe405fcf0d4ba - languageName: node - linkType: hard - -"blob-util@npm:2.0.2": - version: 2.0.2 - resolution: "blob-util@npm:2.0.2" - checksum: 10c0/ed82d587827e5c86be122301a7c250f8364963e9582f72a826255bfbd32f8d69cc10169413d666667bb1c4fc8061329ae89d176ffe46fee8f32080af944ccddc - languageName: node - linkType: hard - -"bluebird-lst@npm:^1.0.9": - version: 1.0.9 - resolution: "bluebird-lst@npm:1.0.9" - dependencies: - bluebird: "npm:^3.5.5" - checksum: 10c0/701eef18f37a53277adeacb21281a70fc4536e521fe0deb665a284f4d8480056c6932988c3dfa6a0c46b4d55f4599f716a15873f30ed5fc2470928093438f87e - languageName: node - linkType: hard - -"bluebird@npm:^3.5.0, bluebird@npm:^3.5.5, bluebird@npm:^3.7.2": - version: 3.7.2 - resolution: "bluebird@npm:3.7.2" - checksum: 10c0/680de03adc54ff925eaa6c7bb9a47a0690e8b5de60f4792604aae8ed618c65e6b63a7893b57ca924beaf53eee69c5af4f8314148c08124c550fe1df1add897d2 - languageName: node - linkType: hard - -"blueimp-load-image@npm:^5.16.0": - version: 5.16.0 - resolution: "blueimp-load-image@npm:5.16.0" - checksum: 10c0/17d37d811ec6778f494fbaf62414ae7b470412106c17a6ebc9805d95c3cf4f88c31f5609cd51b007076e247b99088c6ed157eee9f5e247e03482cbc2951e1611 - languageName: node - linkType: hard - -"boolean@npm:^3.0.1": - version: 3.2.0 - resolution: "boolean@npm:3.2.0" - checksum: 10c0/6a0dc9668f6f3dda42a53c181fcbdad223169c8d87b6c4011b87a8b14a21770efb2934a778f063d7ece17280f8c06d313c87f7b834bb1dd526a867ffcd00febf - languageName: node - linkType: hard - -"boxen@npm:^5.0.0": - version: 5.1.2 - resolution: "boxen@npm:5.1.2" - dependencies: - ansi-align: "npm:^3.0.0" - camelcase: "npm:^6.2.0" - chalk: "npm:^4.1.0" - cli-boxes: "npm:^2.2.1" - string-width: "npm:^4.2.2" - type-fest: "npm:^0.20.2" - widest-line: "npm:^3.1.0" - wrap-ansi: "npm:^7.0.0" - checksum: 10c0/71f31c2eb3dcacd5fce524ae509e0cc90421752e0bfbd0281fd3352871d106c462a0f810c85f2fdb02f3a9fab2d7a84e9718b4999384d651b76104ebe5d2c024 - languageName: node - linkType: hard - -"brace-expansion@npm:^1.1.7": - version: 1.1.11 - resolution: "brace-expansion@npm:1.1.11" - dependencies: - balanced-match: "npm:^1.0.0" - concat-map: "npm:0.0.1" - checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668 - languageName: node - linkType: hard - -"braces@npm:^3.0.2, braces@npm:^3.0.3, braces@npm:~3.0.2": - version: 3.0.3 - resolution: "braces@npm:3.0.3" - dependencies: - fill-range: "npm:^7.1.1" - checksum: 10c0/7c6dfd30c338d2997ba77500539227b9d1f85e388a5f43220865201e407e076783d0881f2d297b9f80951b4c957fcf0b51c1d2d24227631643c3f7c284b0aa04 - languageName: node - linkType: hard - -"browser-stdout@npm:1.3.1": - version: 1.3.1 - resolution: "browser-stdout@npm:1.3.1" - checksum: 10c0/c40e482fd82be872b6ea7b9f7591beafbf6f5ba522fe3dade98ba1573a1c29a11101564993e4eb44e5488be8f44510af072df9a9637c739217eb155ceb639205 - languageName: node - linkType: hard - -"browserslist@npm:^4.21.10": - version: 4.23.0 - resolution: "browserslist@npm:4.23.0" - dependencies: - caniuse-lite: "npm:^1.0.30001587" - electron-to-chromium: "npm:^1.4.668" - node-releases: "npm:^2.0.14" - update-browserslist-db: "npm:^1.0.13" - bin: - browserslist: cli.js - checksum: 10c0/8e9cc154529062128d02a7af4d8adeead83ca1df8cd9ee65a88e2161039f3d68a4d40fea7353cab6bae4c16182dec2fdd9a1cf7dc2a2935498cee1af0e998943 - languageName: node - linkType: hard - -"buffer-alloc-unsafe@npm:^1.1.0": - version: 1.1.0 - resolution: "buffer-alloc-unsafe@npm:1.1.0" - checksum: 10c0/06b9298c9369621a830227c3797ceb3ff5535e323946d7b39a7398fed8b3243798259b3c85e287608c5aad35ccc551cec1a0a5190cc8f39652e8eee25697fc9c - languageName: node - linkType: hard - -"buffer-alloc@npm:^1.2.0": - version: 1.2.0 - resolution: "buffer-alloc@npm:1.2.0" - dependencies: - buffer-alloc-unsafe: "npm:^1.1.0" - buffer-fill: "npm:^1.0.0" - checksum: 10c0/09d87dd53996342ccfbeb2871257d8cdb25ce9ee2259adc95c6490200cd6e528c5fbae8f30bcc323fe8d8efb0fe541e4ac3bbe9ee3f81c6b7c4b27434cc02ab4 - languageName: node - linkType: hard - -"buffer-crc32@npm:0.2.13, buffer-crc32@npm:~0.2.3": - version: 0.2.13 - resolution: "buffer-crc32@npm:0.2.13" - checksum: 10c0/cb0a8ddf5cf4f766466db63279e47761eb825693eeba6a5a95ee4ec8cb8f81ede70aa7f9d8aeec083e781d47154290eb5d4d26b3f7a465ec57fb9e7d59c47150 - languageName: node - linkType: hard - -"buffer-equal@npm:1.0.0": - version: 1.0.0 - resolution: "buffer-equal@npm:1.0.0" - checksum: 10c0/2459f0b6a50dec18571c56dc2a2a0603d2078e79cb0cad2a6eabd093c9fc6e40e7c0a42170fa982324e8defb5d7fe7318e3a91458bc26a00ada1adef87849aaf - languageName: node - linkType: hard - -"buffer-fill@npm:^1.0.0": - version: 1.0.0 - resolution: "buffer-fill@npm:1.0.0" - checksum: 10c0/55b5654fbbf2d7ceb4991bb537f5e5b5b5b9debca583fee416a74fcec47c16d9e7a90c15acd27577da7bd750b7fa6396e77e7c221e7af138b6d26242381c6e4d - languageName: node - linkType: hard - -"buffer-from@npm:^1.0.0": - version: 1.1.2 - resolution: "buffer-from@npm:1.1.2" - checksum: 10c0/124fff9d66d691a86d3b062eff4663fe437a9d9ee4b47b1b9e97f5a5d14f6d5399345db80f796827be7c95e70a8e765dd404b7c3ff3b3324f98e9b0c8826cc34 - languageName: node - linkType: hard - -"buffer@npm:^5.1.0": - version: 5.7.1 - resolution: "buffer@npm:5.7.1" - dependencies: - base64-js: "npm:^1.3.1" - ieee754: "npm:^1.1.13" - checksum: 10c0/27cac81cff434ed2876058d72e7c4789d11ff1120ef32c9de48f59eab58179b66710c488987d295ae89a228f835fc66d088652dffeb8e3ba8659f80eb091d55e - languageName: node - linkType: hard - -"builder-util-runtime@npm:8.9.2": - version: 8.9.2 - resolution: "builder-util-runtime@npm:8.9.2" - dependencies: - debug: "npm:^4.3.2" - sax: "npm:^1.2.4" - checksum: 10c0/0afc2c9025c0bb1ad66749fb4d47b3ca87df7194aab29df1377017adaea3bfd84afeadba8ecbda23071ee93267cb933d855237cf56299d5c021b8d0e62ed89ef - languageName: node - linkType: hard - -"builder-util-runtime@npm:9.0.2": - version: 9.0.2 - resolution: "builder-util-runtime@npm:9.0.2" - dependencies: - debug: "npm:^4.3.4" - sax: "npm:^1.2.4" - checksum: 10c0/cfd9073f01ef49b9c6faf631e1030ac8e6084746ad38c2c989df4b7a2c26147b535991de8739aa4ea3d1bcb1b64b61694ad6955466b30eab8c15463c9ac79689 - languageName: node - linkType: hard - -"builder-util-runtime@npm:9.1.1": - version: 9.1.1 - resolution: "builder-util-runtime@npm:9.1.1" - dependencies: - debug: "npm:^4.3.4" - sax: "npm:^1.2.4" - checksum: 10c0/6f0eadd6c600db982bb00a9e9b58f00e1c3b67c5dd6bbb940c0caab46b680cf666983a1469efb09861084d85a6a3779887990189f436387fb3057706c063165e - languageName: node - linkType: hard - -"builder-util@npm:23.0.8": - version: 23.0.8 - resolution: "builder-util@npm:23.0.8" - dependencies: - 7zip-bin: "npm:~5.1.1" - "@types/debug": "npm:^4.1.6" - "@types/fs-extra": "npm:^9.0.11" - app-builder-bin: "npm:4.0.0" - bluebird-lst: "npm:^1.0.9" - builder-util-runtime: "npm:9.0.2" - chalk: "npm:^4.1.1" - cross-spawn: "npm:^7.0.3" - debug: "npm:^4.3.4" - fs-extra: "npm:^10.0.0" - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.0" - is-ci: "npm:^3.0.0" - js-yaml: "npm:^4.1.0" - source-map-support: "npm:^0.5.19" - stat-mode: "npm:^1.0.0" - temp-file: "npm:^3.4.0" - checksum: 10c0/f2aff5de3a0efa7c7b366cba79d42ee6e9e870edafc1c9125f52db5c75e706ef96fdbbb2bb5cb2347a8c79f0a87c3605f69541da27e37f8846778288c364ac65 - languageName: node - linkType: hard - -"builder-util@npm:23.6.0": - version: 23.6.0 - resolution: "builder-util@npm:23.6.0" - dependencies: - 7zip-bin: "npm:~5.1.1" - "@types/debug": "npm:^4.1.6" - "@types/fs-extra": "npm:^9.0.11" - app-builder-bin: "npm:4.0.0" - bluebird-lst: "npm:^1.0.9" - builder-util-runtime: "npm:9.1.1" - chalk: "npm:^4.1.1" - cross-spawn: "npm:^7.0.3" - debug: "npm:^4.3.4" - fs-extra: "npm:^10.0.0" - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.0" - is-ci: "npm:^3.0.0" - js-yaml: "npm:^4.1.0" - source-map-support: "npm:^0.5.19" - stat-mode: "npm:^1.0.0" - temp-file: "npm:^3.4.0" - checksum: 10c0/1e8b5c865813c9fcd4d0a209be6f86493c650883dab5788be8cf58f45004fba029061a42e4f15d307d312fc08936281de538f0688692dfb037eb2bbdc3d77052 - languageName: node - linkType: hard +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"7zip-bin@~5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" + integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== + +"@ampproject/remapping@^2.2.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4" + integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.24" + +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.6.tgz#ab88da19344445c3d8889af2216606d3329f3ef2" + integrity sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA== + dependencies: + "@babel/highlight" "^7.24.6" + picocolors "^1.0.0" + +"@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.6.tgz#b3600217688cabb26e25f8e467019e66d71b7ae2" + integrity sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ== + +"@babel/core@^7.13.16", "@babel/core@^7.20.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.6.tgz#8650e0e4b03589ebe886c4e4a60398db0a7ec787" + integrity sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ== + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.24.6" + "@babel/generator" "^7.24.6" + "@babel/helper-compilation-targets" "^7.24.6" + "@babel/helper-module-transforms" "^7.24.6" + "@babel/helpers" "^7.24.6" + "@babel/parser" "^7.24.6" + "@babel/template" "^7.24.6" + "@babel/traverse" "^7.24.6" + "@babel/types" "^7.24.6" + convert-source-map "^2.0.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.3" + semver "^6.3.1" + +"@babel/generator@^7.20.0", "@babel/generator@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.6.tgz#dfac82a228582a9d30c959fe50ad28951d4737a7" + integrity sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg== + dependencies: + "@babel/types" "^7.24.6" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^2.5.1" + +"@babel/helper-annotate-as-pure@^7.22.5", "@babel/helper-annotate-as-pure@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.6.tgz#517af93abc77924f9b2514c407bbef527fb8938d" + integrity sha512-DitEzDfOMnd13kZnDqns1ccmftwJTS9DMkyn9pYTxulS7bZxUxpMly3Nf23QQ6NwA4UB8lAqjbqWtyvElEMAkg== + dependencies: + "@babel/types" "^7.24.6" + +"@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.6.tgz#4a51d681f7680043d38e212715e2a7b1ad29cb51" + integrity sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg== + dependencies: + "@babel/compat-data" "^7.24.6" + "@babel/helper-validator-option" "^7.24.6" + browserslist "^4.22.2" + lru-cache "^5.1.1" + semver "^6.3.1" + +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.6.tgz#c50b86fa1c4ca9b7a890dc21884f097b6c4b5286" + integrity sha512-djsosdPJVZE6Vsw3kk7IPRWethP94WHGOhQTc67SNXE0ZzMhHgALw8iGmYS0TD1bbMM0VDROy43od7/hN6WYcA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.6" + "@babel/helper-environment-visitor" "^7.24.6" + "@babel/helper-function-name" "^7.24.6" + "@babel/helper-member-expression-to-functions" "^7.24.6" + "@babel/helper-optimise-call-expression" "^7.24.6" + "@babel/helper-replace-supers" "^7.24.6" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6" + "@babel/helper-split-export-declaration" "^7.24.6" + semver "^6.3.1" + +"@babel/helper-create-regexp-features-plugin@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.24.6.tgz#47d382dec0d49e74ca1b6f7f3b81f5968022a3c8" + integrity sha512-C875lFBIWWwyv6MHZUG9HmRrlTDgOsLWZfYR0nW69gaKJNe0/Mpxx5r0EID2ZdHQkdUmQo2t0uNckTL08/1BgA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.6" + regexpu-core "^5.3.1" + semver "^6.3.1" + +"@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" + integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ== + dependencies: + "@babel/helper-compilation-targets" "^7.22.6" + "@babel/helper-plugin-utils" "^7.22.5" + debug "^4.1.1" + lodash.debounce "^4.0.8" + resolve "^1.14.2" + +"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz#ac7ad5517821641550f6698dd5468f8cef78620d" + integrity sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g== + +"@babel/helper-function-name@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.6.tgz#cebdd063386fdb95d511d84b117e51fc68fec0c8" + integrity sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w== + dependencies: + "@babel/template" "^7.24.6" + "@babel/types" "^7.24.6" + +"@babel/helper-hoist-variables@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.6.tgz#8a7ece8c26756826b6ffcdd0e3cf65de275af7f9" + integrity sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA== + dependencies: + "@babel/types" "^7.24.6" + +"@babel/helper-member-expression-to-functions@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.6.tgz#86084f3e0e4e2169a134754df3870bc7784db71e" + integrity sha512-OTsCufZTxDUsv2/eDXanw/mUZHWOxSbEmC3pP8cgjcy5rgeVPWWMStnv274DV60JtHxTk0adT0QrCzC4M9NWGg== + dependencies: + "@babel/types" "^7.24.6" + +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5", "@babel/helper-module-imports@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz#65e54ffceed6a268dc4ce11f0433b82cfff57852" + integrity sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g== + dependencies: + "@babel/types" "^7.24.6" + +"@babel/helper-module-transforms@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.6.tgz#22346ed9df44ce84dee850d7433c5b73fab1fe4e" + integrity sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA== + dependencies: + "@babel/helper-environment-visitor" "^7.24.6" + "@babel/helper-module-imports" "^7.24.6" + "@babel/helper-simple-access" "^7.24.6" + "@babel/helper-split-export-declaration" "^7.24.6" + "@babel/helper-validator-identifier" "^7.24.6" + +"@babel/helper-optimise-call-expression@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.6.tgz#f7836e3ccca3dfa02f15d2bc8b794efe75a5256e" + integrity sha512-3SFDJRbx7KuPRl8XDUr8O7GAEB8iGyWPjLKJh/ywP/Iy9WOmEfMrsWbaZpvBu2HSYn4KQygIsz0O7m8y10ncMA== + dependencies: + "@babel/types" "^7.24.6" + +"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.6", "@babel/helper-plugin-utils@^7.8.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.6.tgz#fa02a32410a15a6e8f8185bcbf608f10528d2a24" + integrity sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg== + +"@babel/helper-remap-async-to-generator@^7.18.9", "@babel/helper-remap-async-to-generator@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.24.6.tgz#c96ceb9846e877d806ce82a1521230ea7e0fc354" + integrity sha512-1Qursq9ArRZPAMOZf/nuzVW8HgJLkTB9y9LfP4lW2MVp4e9WkLJDovfKBxoDcCk6VuzIxyqWHyBoaCtSRP10yg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.6" + "@babel/helper-environment-visitor" "^7.24.6" + "@babel/helper-wrap-function" "^7.24.6" + +"@babel/helper-replace-supers@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.6.tgz#3ea87405a2986a49ab052d10e540fe036d747c71" + integrity sha512-mRhfPwDqDpba8o1F8ESxsEkJMQkUF8ZIWrAc0FtWhxnjfextxMWxr22RtFizxxSYLjVHDeMgVsRq8BBZR2ikJQ== + dependencies: + "@babel/helper-environment-visitor" "^7.24.6" + "@babel/helper-member-expression-to-functions" "^7.24.6" + "@babel/helper-optimise-call-expression" "^7.24.6" + +"@babel/helper-simple-access@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.6.tgz#1d6e04d468bba4fc963b4906f6dac6286cfedff1" + integrity sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g== + dependencies: + "@babel/types" "^7.24.6" + +"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.6.tgz#c47e9b33b7ea50d1073e125ebc26661717cb7040" + integrity sha512-jhbbkK3IUKc4T43WadP96a27oYti9gEf1LdyGSP2rHGH77kwLwfhO7TgwnWvxxQVmke0ImmCSS47vcuxEMGD3Q== + dependencies: + "@babel/types" "^7.24.6" + +"@babel/helper-split-export-declaration@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.6.tgz#e830068f7ba8861c53b7421c284da30ae656d7a3" + integrity sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw== + dependencies: + "@babel/types" "^7.24.6" + +"@babel/helper-string-parser@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz#28583c28b15f2a3339cfafafeaad42f9a0e828df" + integrity sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q== + +"@babel/helper-validator-identifier@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz#08bb6612b11bdec78f3feed3db196da682454a5e" + integrity sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw== + +"@babel/helper-validator-option@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz#59d8e81c40b7d9109ab7e74457393442177f460a" + integrity sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ== + +"@babel/helper-wrap-function@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.6.tgz#c27af1006e310683fdc76b668a0a1f6003e36217" + integrity sha512-f1JLrlw/jbiNfxvdrfBgio/gRBk3yTAEJWirpAkiJG2Hb22E7cEYKHWo0dFPTv/niPovzIdPdEDetrv6tC6gPQ== + dependencies: + "@babel/helper-function-name" "^7.24.6" + "@babel/template" "^7.24.6" + "@babel/types" "^7.24.6" + +"@babel/helpers@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.6.tgz#cd124245299e494bd4e00edda0e4ea3545c2c176" + integrity sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA== + dependencies: + "@babel/template" "^7.24.6" + "@babel/types" "^7.24.6" + +"@babel/highlight@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.6.tgz#6d610c1ebd2c6e061cade0153bf69b0590b7b3df" + integrity sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ== + dependencies: + "@babel/helper-validator-identifier" "^7.24.6" + chalk "^2.4.2" + js-tokens "^4.0.0" + picocolors "^1.0.0" + +"@babel/parser@^7.13.16", "@babel/parser@^7.20.0", "@babel/parser@^7.20.15", "@babel/parser@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.6.tgz#5e030f440c3c6c78d195528c3b688b101a365328" + integrity sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q== + +"@babel/plugin-proposal-async-generator-functions@^7.0.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" + integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-remap-async-to-generator" "^7.18.9" + "@babel/plugin-syntax-async-generators" "^7.8.4" + +"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.18.0": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" + integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" + +"@babel/plugin-proposal-export-default-from@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.24.6.tgz#ad7567fdf43cecc00f5314cedd1db60fdee99c6a" + integrity sha512-qPPDbYs9j5IArMFqYi85QxatHURSzRyskKpIbjrVoVglDuGdhu1s7UTCmXvP/qR2aHa3EdJ8X3iZvQAHjmdHUw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/plugin-syntax-export-default-from" "^7.24.6" + +"@babel/plugin-proposal-logical-assignment-operators@^7.18.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" + integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + +"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.0": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" + integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + +"@babel/plugin-proposal-numeric-separator@^7.0.0": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75" + integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-numeric-separator" "^7.10.4" + +"@babel/plugin-proposal-object-rest-spread@^7.20.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a" + integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== + dependencies: + "@babel/compat-data" "^7.20.5" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.20.7" + +"@babel/plugin-proposal-optional-catch-binding@^7.0.0": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb" + integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw== + dependencies: + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + +"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.20.0": + version "7.21.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea" + integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA== + dependencies: + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + +"@babel/plugin-syntax-async-generators@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-dynamic-import@^7.8.0": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-export-default-from@^7.0.0", "@babel/plugin-syntax-export-default-from@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.24.6.tgz#aaf9ed2300ad6f942d0ee3742634e6e895b6011f" + integrity sha512-Nzl7kZ4tjOM2LJpejBMPwZs7OJfc26++2HsMQuSrw6gxpqXGtZZ3Rj4Zt4Qm7vulMZL2gHIGGc2stnlQnHQCqA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-syntax-flow@^7.12.1", "@babel/plugin-syntax-flow@^7.18.0", "@babel/plugin-syntax-flow@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.6.tgz#1102a710771326b8e2f0c85ac2aecb6f52eb601e" + integrity sha512-gNkksSdV8RbsCoHF9sjVYrHfYACMl/8U32UfUhJ9+84/ASXw8dlx+eHyyF0m6ncQJ9IBSxfuCkB36GJqYdXTOA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-syntax-jsx@^7.22.5", "@babel/plugin-syntax-jsx@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.6.tgz#bcca2964150437f88f65e3679e3d68762287b9c8" + integrity sha512-lWfvAIFNWMlCsU0DRUun2GpFwZdGTukLaHJqRh1JRb80NdAP5Sb1HDHB5X9P9OtgZHQl089UzQkpYlBq2VTPRw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.0.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-numeric-separator@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-object-rest-spread@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.0.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-private-property-in-object@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-syntax-typescript@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.6.tgz#769daf2982d60308bc83d8936eaecb7582463c87" + integrity sha512-TzCtxGgVTEJWWwcYwQhCIQ6WaKlo80/B+Onsk4RRCcYqpYGFcG9etPW94VToGte5AAcxRrhjPUFvUS3Y2qKi4A== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-arrow-functions@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.6.tgz#93607d1ef5b81c70af174aff3532d57216367492" + integrity sha512-jSSSDt4ZidNMggcLx8SaKsbGNEfIl0PHx/4mFEulorE7bpYLbN0d3pDW3eJ7Y5Z3yPhy3L3NaPCYyTUY7TuugQ== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-async-to-generator@^7.20.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.6.tgz#eb11434b11d73d8c0cf9f71a6f4f1e6ba441df35" + integrity sha512-NTBA2SioI3OsHeIn6sQmhvXleSl9T70YY/hostQLveWs0ic+qvbA3fa0kwAwQ0OA/XGaAerNZRQGJyRfhbJK4g== + dependencies: + "@babel/helper-module-imports" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/helper-remap-async-to-generator" "^7.24.6" + +"@babel/plugin-transform-block-scoping@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.6.tgz#a03ec8a4591c2b43cf7798bc633e698293fda179" + integrity sha512-S/t1Xh4ehW7sGA7c1j/hiOBLnEYCp/c2sEG4ZkL8kI1xX9tW2pqJTCHKtdhe/jHKt8nG0pFCrDHUXd4DvjHS9w== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-classes@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.6.tgz#0cc198c02720d4eeb091004843477659c6b37977" + integrity sha512-+fN+NO2gh8JtRmDSOB6gaCVo36ha8kfCW1nMq2Gc0DABln0VcHN4PrALDvF5/diLzIRKptC7z/d7Lp64zk92Fg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.6" + "@babel/helper-compilation-targets" "^7.24.6" + "@babel/helper-environment-visitor" "^7.24.6" + "@babel/helper-function-name" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/helper-replace-supers" "^7.24.6" + "@babel/helper-split-export-declaration" "^7.24.6" + globals "^11.1.0" + +"@babel/plugin-transform-computed-properties@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.6.tgz#7a1765c01cdfe59c320d2d0f37a4dc4aecd14df1" + integrity sha512-cRzPobcfRP0ZtuIEkA8QzghoUpSB3X3qSH5W2+FzG+VjWbJXExtx0nbRqwumdBN1x/ot2SlTNQLfBCnPdzp6kg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/template" "^7.24.6" + +"@babel/plugin-transform-destructuring@^7.20.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.6.tgz#bdd1a6c90ffb2bfd13b6007b13316eeafc97cb53" + integrity sha512-YLW6AE5LQpk5npNXL7i/O+U9CE4XsBCuRPgyjl1EICZYKmcitV+ayuuUGMJm2lC1WWjXYszeTnIxF/dq/GhIZQ== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-flow-strip-types@^7.20.0", "@babel/plugin-transform-flow-strip-types@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.6.tgz#dfd9d1c90e74335bc68d82f41ad9224960a4de84" + integrity sha512-1l8b24NoCpaQ13Vi6FtLG1nv6kNoi8PWvQb1AYO7GHZDpFfBYc3lbXArx1lP2KRt8b4pej1eWc/zrRmsQTfOdQ== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/plugin-syntax-flow" "^7.24.6" + +"@babel/plugin-transform-function-name@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.6.tgz#60d1de3f6fd816a3e3bf9538578a64527e1b9c97" + integrity sha512-sOajCu6V0P1KPljWHKiDq6ymgqB+vfo3isUS4McqW1DZtvSVU2v/wuMhmRmkg3sFoq6GMaUUf8W4WtoSLkOV/Q== + dependencies: + "@babel/helper-compilation-targets" "^7.24.6" + "@babel/helper-function-name" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-literals@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.6.tgz#7f44f2871d7a4456030b0540858046f0b7bc6b18" + integrity sha512-f2wHfR2HF6yMj+y+/y07+SLqnOSwRp8KYLpQKOzS58XLVlULhXbiYcygfXQxJlMbhII9+yXDwOUFLf60/TL5tw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.6.tgz#1b8269902f25bd91ca6427230d4735ddd1e1283e" + integrity sha512-JEV8l3MHdmmdb7S7Cmx6rbNEjRCgTQMZxllveHO0mx6uiclB0NflCawlQQ6+o5ZrwjUBYPzHm2XoK4wqGVUFuw== + dependencies: + "@babel/helper-module-transforms" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/helper-simple-access" "^7.24.6" + +"@babel/plugin-transform-named-capturing-groups-regex@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.24.6.tgz#352ee2861ab8705320029f80238cf26a92ba65d5" + integrity sha512-6DneiCiu91wm3YiNIGDWZsl6GfTTbspuj/toTEqLh9d4cx50UIzSdg+T96p8DuT7aJOBRhFyaE9ZvTHkXrXr6Q== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.20.7": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.6.tgz#7aee86dfedd2fc0136fecbe6f7649fc02d86ab22" + integrity sha512-ST7guE8vLV+vI70wmAxuZpIKzVjvFX9Qs8bl5w6tN/6gOypPWUmMQL2p7LJz5E63vEGrDhAiYetniJFyBH1RkA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-private-methods@^7.22.5": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.6.tgz#258e1f859a52ff7b30ad556598224c192defcda7" + integrity sha512-T9LtDI0BgwXOzyXrvgLTT8DFjCC/XgWLjflczTLXyvxbnSR/gpv0hbmzlHE/kmh9nOvlygbamLKRo6Op4yB6aw== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-private-property-in-object@^7.22.11": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.6.tgz#59ff09a099f62213112cf348e96b6b11957d1f28" + integrity sha512-Qu/ypFxCY5NkAnEhCF86Mvg3NSabKsh/TPpBVswEdkGl7+FbsYHy1ziRqJpwGH4thBdQHh8zx+z7vMYmcJ7iaQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.6" + "@babel/helper-create-class-features-plugin" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + +"@babel/plugin-transform-react-display-name@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.6.tgz#2a10c732c2c87a8f06e4413fb4a14e76e6c67a99" + integrity sha512-/3iiEEHDsJuj9QU09gbyWGSUxDboFcD7Nj6dnHIlboWSodxXAoaY/zlNMHeYAC0WsERMqgO9a7UaM77CsYgWcg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-react-jsx-self@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.6.tgz#4fa4870d594d6840d724d2006d0f98b19be6f502" + integrity sha512-FfZfHXtQ5jYPQsCRyLpOv2GeLIIJhs8aydpNh39vRDjhD411XcfWDni5i7OjP/Rs8GAtTn7sWFFELJSHqkIxYg== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-react-jsx-source@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.6.tgz#4e1503f24ca5fccb1fc7f20c57426899d5ce5c1f" + integrity sha512-BQTBCXmFRreU3oTUXcGKuPOfXAGb1liNY4AvvFKsOBAJ89RKcTsIrSsnMYkj59fNa66OFKnSa4AJZfy5Y4B9WA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-react-jsx@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.24.6.tgz#4ca3660ca663d20095455571615d6263986cdfe4" + integrity sha512-pCtPHhpRZHfwdA5G1Gpk5mIzMA99hv0R8S/Ket50Rw+S+8hkt3wBWqdqHaPw0CuUYxdshUgsPiLQ5fAs4ASMhw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.6" + "@babel/helper-module-imports" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/plugin-syntax-jsx" "^7.24.6" + "@babel/types" "^7.24.6" + +"@babel/plugin-transform-runtime@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.6.tgz#1e3256246004c3724b8e07c7cb25e35913c4e373" + integrity sha512-W3gQydMb0SY99y/2lV0Okx2xg/8KzmZLQsLaiCmwNRl1kKomz14VurEm+2TossUb+sRvBCnGe+wx8KtIgDtBbQ== + dependencies: + "@babel/helper-module-imports" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + babel-plugin-polyfill-corejs2 "^0.4.10" + babel-plugin-polyfill-corejs3 "^0.10.1" + babel-plugin-polyfill-regenerator "^0.6.1" + semver "^6.3.1" + +"@babel/plugin-transform-shorthand-properties@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.6.tgz#ef734ebccc428d2174c7bb36015d0800faf5381e" + integrity sha512-xnEUvHSMr9eOWS5Al2YPfc32ten7CXdH7Zwyyk7IqITg4nX61oHj+GxpNvl+y5JHjfN3KXE2IV55wAWowBYMVw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-spread@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.6.tgz#a56cecbd8617675531d1b79f5b755b7613aa0822" + integrity sha512-h/2j7oIUDjS+ULsIrNZ6/TKG97FgmEk1PXryk/HQq6op4XUUUwif2f69fJrzK0wza2zjCS1xhXmouACaWV5uPA== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/helper-skip-transparent-expression-wrappers" "^7.24.6" + +"@babel/plugin-transform-sticky-regex@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.6.tgz#1a78127731fea87d954bed193840986a38f04327" + integrity sha512-fN8OcTLfGmYv7FnDrsjodYBo1DhPL3Pze/9mIIE2MGCT1KgADYIOD7rEglpLHZj8PZlC/JFX5WcD+85FLAQusw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/plugin-transform-typescript@^7.24.6", "@babel/plugin-transform-typescript@^7.5.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.6.tgz#339c6127a783c32e28a5b591e6c666f899b57db0" + integrity sha512-H0i+hDLmaYYSt6KU9cZE0gb3Cbssa/oxWis7PX4ofQzbvsfix9Lbh8SRk7LCPDlLWJHUiFeHU0qRRpF/4Zv7mQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.24.6" + "@babel/helper-create-class-features-plugin" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/plugin-syntax-typescript" "^7.24.6" + +"@babel/plugin-transform-unicode-regex@^7.0.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.6.tgz#2001e7d87ed709eea145e0b65fb5f93c3c0e225b" + integrity sha512-pssN6ExsvxaKU638qcWb81RrvvgZom3jDgU/r5xFZ7TONkZGFf4MhI2ltMb8OcQWhHyxgIavEU+hgqtbKOmsPA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.24.6" + "@babel/helper-plugin-utils" "^7.24.6" + +"@babel/preset-flow@^7.13.13": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.24.6.tgz#df09ee46558577bea49bc71d597604c03c9bf7a6" + integrity sha512-huoe0T1Qs9fQhMWbmqE/NHUeZbqmHDsN6n/jYvPcUUHfuKiPV32C9i8tDhMbQ1DEKTjbBP7Rjm3nSLwlB2X05g== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/helper-validator-option" "^7.24.6" + "@babel/plugin-transform-flow-strip-types" "^7.24.6" + +"@babel/preset-typescript@^7.13.0": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.6.tgz#27057470fb981c31338bdb897fc3d9aa0cb7dab2" + integrity sha512-U10aHPDnokCFRXgyT/MaIRTivUu2K/mu0vJlwRS9LxJmJet+PFQNKpggPyFCUtC6zWSBPjvxjnpNkAn3Uw2m5w== + dependencies: + "@babel/helper-plugin-utils" "^7.24.6" + "@babel/helper-validator-option" "^7.24.6" + "@babel/plugin-syntax-jsx" "^7.24.6" + "@babel/plugin-transform-modules-commonjs" "^7.24.6" + "@babel/plugin-transform-typescript" "^7.24.6" + +"@babel/register@^7.13.16": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.24.6.tgz#59e21dcc79e1d04eed5377633b0f88029a6bef9e" + integrity sha512-WSuFCc2wCqMeXkz/i3yfAAsxwWflEgbVkZzivgAmXl/MxrXeoYFZOOPllbC8R8WTF7u61wSRQtDVZ1879cdu6w== + dependencies: + clone-deep "^4.0.1" + find-cache-dir "^2.0.0" + make-dir "^2.1.0" + pirates "^4.0.6" + source-map-support "^0.5.16" + +"@babel/regjsgen@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" + integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== + +"@babel/runtime@7.4.5": + version "7.4.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12" + integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ== + dependencies: + regenerator-runtime "^0.13.2" + +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.6.tgz#5b76eb89ad45e2e4a0a8db54c456251469a3358e" + integrity sha512-Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw== + dependencies: + regenerator-runtime "^0.14.0" + +"@babel/template@^7.0.0", "@babel/template@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.6.tgz#048c347b2787a6072b24c723664c8d02b67a44f9" + integrity sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw== + dependencies: + "@babel/code-frame" "^7.24.6" + "@babel/parser" "^7.24.6" + "@babel/types" "^7.24.6" + +"@babel/traverse@^7.20.0", "@babel/traverse@^7.24.6", "@babel/traverse@^7.4.5": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.6.tgz#0941ec50cdeaeacad0911eb67ae227a4f8424edc" + integrity sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw== + dependencies: + "@babel/code-frame" "^7.24.6" + "@babel/generator" "^7.24.6" + "@babel/helper-environment-visitor" "^7.24.6" + "@babel/helper-function-name" "^7.24.6" + "@babel/helper-hoist-variables" "^7.24.6" + "@babel/helper-split-export-declaration" "^7.24.6" + "@babel/parser" "^7.24.6" + "@babel/types" "^7.24.6" + debug "^4.3.1" + globals "^11.1.0" + +"@babel/types@^7.20.0", "@babel/types@^7.24.6": + version "7.24.6" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.6.tgz#ba4e1f59870c10dc2fa95a274ac4feec23b21912" + integrity sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ== + dependencies: + "@babel/helper-string-parser" "^7.24.6" + "@babel/helper-validator-identifier" "^7.24.6" + to-fast-properties "^2.0.0" + +"@commitlint/cli@^17.7.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.8.1.tgz#10492114a022c91dcfb1d84dac773abb3db76d33" + integrity sha512-ay+WbzQesE0Rv4EQKfNbSMiJJ12KdKTDzIt0tcK4k11FdsWmtwP0Kp1NWMOUswfIWo6Eb7p7Ln721Nx9FLNBjg== + dependencies: + "@commitlint/format" "^17.8.1" + "@commitlint/lint" "^17.8.1" + "@commitlint/load" "^17.8.1" + "@commitlint/read" "^17.8.1" + "@commitlint/types" "^17.8.1" + execa "^5.0.0" + lodash.isfunction "^3.0.9" + resolve-from "5.0.0" + resolve-global "1.0.0" + yargs "^17.0.0" + +"@commitlint/config-conventional@^17.7.0": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-17.8.1.tgz#e5bcf0cfec8da7ac50bc04dc92e0a4ea74964ce0" + integrity sha512-NxCOHx1kgneig3VLauWJcDWS40DVjg7nKOpBEEK9E5fjJpQqLCilcnKkIIjdBH98kEO1q3NpE5NSrZ2kl/QGJg== + dependencies: + conventional-changelog-conventionalcommits "^6.1.0" + +"@commitlint/config-validator@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/config-validator/-/config-validator-17.8.1.tgz#5cc93b6b49d5524c9cc345a60e5bf74bcca2b7f9" + integrity sha512-UUgUC+sNiiMwkyiuIFR7JG2cfd9t/7MV8VB4TZ+q02ZFkHoduUS4tJGsCBWvBOGD9Btev6IecPMvlWUfJorkEA== + dependencies: + "@commitlint/types" "^17.8.1" + ajv "^8.11.0" + +"@commitlint/ensure@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-17.8.1.tgz#59183557844999dbb6aab6d03629a3d104d01a8d" + integrity sha512-xjafwKxid8s1K23NFpL8JNo6JnY/ysetKo8kegVM7c8vs+kWLP8VrQq+NbhgVlmCojhEDbzQKp4eRXSjVOGsow== + dependencies: + "@commitlint/types" "^17.8.1" + lodash.camelcase "^4.3.0" + lodash.kebabcase "^4.1.1" + lodash.snakecase "^4.1.1" + lodash.startcase "^4.4.0" + lodash.upperfirst "^4.3.1" + +"@commitlint/execute-rule@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-17.8.1.tgz#504ed69eb61044eeb84fdfd10cc18f0dab14f34c" + integrity sha512-JHVupQeSdNI6xzA9SqMF+p/JjrHTcrJdI02PwesQIDCIGUrv04hicJgCcws5nzaoZbROapPs0s6zeVHoxpMwFQ== + +"@commitlint/format@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-17.8.1.tgz#6108bb6b4408e711006680649927e1b559bdc5f8" + integrity sha512-f3oMTyZ84M9ht7fb93wbCKmWxO5/kKSbwuYvS867duVomoOsgrgljkGGIztmT/srZnaiGbaK8+Wf8Ik2tSr5eg== + dependencies: + "@commitlint/types" "^17.8.1" + chalk "^4.1.0" + +"@commitlint/is-ignored@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-17.8.1.tgz#cf25bcd8409c79684b63f8bdeb35df48edda244e" + integrity sha512-UshMi4Ltb4ZlNn4F7WtSEugFDZmctzFpmbqvpyxD3la510J+PLcnyhf9chs7EryaRFJMdAKwsEKfNK0jL/QM4g== + dependencies: + "@commitlint/types" "^17.8.1" + semver "7.5.4" + +"@commitlint/lint@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.8.1.tgz#bfc21215f6b18d41d4d43e2aa3cb79a5d7726cd8" + integrity sha512-aQUlwIR1/VMv2D4GXSk7PfL5hIaFSfy6hSHV94O8Y27T5q+DlDEgd/cZ4KmVI+MWKzFfCTiTuWqjfRSfdRllCA== + dependencies: + "@commitlint/is-ignored" "^17.8.1" + "@commitlint/parse" "^17.8.1" + "@commitlint/rules" "^17.8.1" + "@commitlint/types" "^17.8.1" + +"@commitlint/load@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.8.1.tgz#fa061e7bfa53281eb03ca8517ca26d66a189030c" + integrity sha512-iF4CL7KDFstP1kpVUkT8K2Wl17h2yx9VaR1ztTc8vzByWWcbO/WaKwxsnCOqow9tVAlzPfo1ywk9m2oJ9ucMqA== + dependencies: + "@commitlint/config-validator" "^17.8.1" + "@commitlint/execute-rule" "^17.8.1" + "@commitlint/resolve-extends" "^17.8.1" + "@commitlint/types" "^17.8.1" + "@types/node" "20.5.1" + chalk "^4.1.0" + cosmiconfig "^8.0.0" + cosmiconfig-typescript-loader "^4.0.0" + lodash.isplainobject "^4.0.6" + lodash.merge "^4.6.2" + lodash.uniq "^4.5.0" + resolve-from "^5.0.0" + ts-node "^10.8.1" + typescript "^4.6.4 || ^5.2.2" + +"@commitlint/message@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-17.8.1.tgz#a5cd226c419be20ee03c3d237db6ac37b95958b3" + integrity sha512-6bYL1GUQsD6bLhTH3QQty8pVFoETfFQlMn2Nzmz3AOLqRVfNNtXBaSY0dhZ0dM6A2MEq4+2d7L/2LP8TjqGRkA== + +"@commitlint/parse@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-17.8.1.tgz#6e00b8f50ebd63562d25dcf4230da2c9f984e626" + integrity sha512-/wLUickTo0rNpQgWwLPavTm7WbwkZoBy3X8PpkUmlSmQJyWQTj0m6bDjiykMaDt41qcUbfeFfaCvXfiR4EGnfw== + dependencies: + "@commitlint/types" "^17.8.1" + conventional-changelog-angular "^6.0.0" + conventional-commits-parser "^4.0.0" + +"@commitlint/read@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-17.8.1.tgz#b3f28777607c756078356cc133368b0e8c08092f" + integrity sha512-Fd55Oaz9irzBESPCdMd8vWWgxsW3OWR99wOntBDHgf9h7Y6OOHjWEdS9Xzen1GFndqgyoaFplQS5y7KZe0kO2w== + dependencies: + "@commitlint/top-level" "^17.8.1" + "@commitlint/types" "^17.8.1" + fs-extra "^11.0.0" + git-raw-commits "^2.0.11" + minimist "^1.2.6" + +"@commitlint/resolve-extends@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-17.8.1.tgz#9af01432bf2fd9ce3dd5a00d266cce14e4c977e7" + integrity sha512-W/ryRoQ0TSVXqJrx5SGkaYuAaE/BUontL1j1HsKckvM6e5ZaG0M9126zcwL6peKSuIetJi7E87PRQF8O86EW0Q== + dependencies: + "@commitlint/config-validator" "^17.8.1" + "@commitlint/types" "^17.8.1" + import-fresh "^3.0.0" + lodash.mergewith "^4.6.2" + resolve-from "^5.0.0" + resolve-global "^1.0.0" + +"@commitlint/rules@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.8.1.tgz#da49cab1b7ebaf90d108de9f58f684dc4ccb65a0" + integrity sha512-2b7OdVbN7MTAt9U0vKOYKCDsOvESVXxQmrvuVUZ0rGFMCrCPJWWP1GJ7f0lAypbDAhaGb8zqtdOr47192LBrIA== + dependencies: + "@commitlint/ensure" "^17.8.1" + "@commitlint/message" "^17.8.1" + "@commitlint/to-lines" "^17.8.1" + "@commitlint/types" "^17.8.1" + execa "^5.0.0" + +"@commitlint/to-lines@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-17.8.1.tgz#a5c4a7cf7dff3dbdd69289fc0eb19b66f3cfe017" + integrity sha512-LE0jb8CuR/mj6xJyrIk8VLz03OEzXFgLdivBytoooKO5xLt5yalc8Ma5guTWobw998sbR3ogDd+2jed03CFmJA== + +"@commitlint/top-level@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-17.8.1.tgz#206d37d6782f33c9572e44fbe3758392fdeea7bc" + integrity sha512-l6+Z6rrNf5p333SHfEte6r+WkOxGlWK4bLuZKbtf/2TXRN+qhrvn1XE63VhD8Oe9oIHQ7F7W1nG2k/TJFhx2yA== + dependencies: + find-up "^5.0.0" + +"@commitlint/types@^17.4.4", "@commitlint/types@^17.8.1": + version "17.8.1" + resolved "https://registry.yarnpkg.com/@commitlint/types/-/types-17.8.1.tgz#883a0ad35c5206d5fef7bc6ce1bbe648118af44e" + integrity sha512-PXDQXkAmiMEG162Bqdh9ChML/GJZo6vU+7F03ALKDK8zYc6SuAr47LjG7hGYRqUOz+WK0dU7bQ0xzuqFMdxzeQ== + dependencies: + chalk "^4.1.0" + +"@cspotcode/source-map-support@^0.8.0": + version "0.8.1" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" + integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== + dependencies: + "@jridgewell/trace-mapping" "0.3.9" + +"@develar/schema-utils@~2.6.5": + version "2.6.5" + resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" + integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig== + dependencies: + ajv "^6.12.0" + ajv-keywords "^3.4.1" + +"@discoveryjs/json-ext@^0.5.0": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== + +"@electron/get@^2.0.0": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.3.tgz#fba552683d387aebd9f3fcadbcafc8e12ee4f960" + integrity sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^11.8.5" + progress "^2.0.3" + semver "^6.2.0" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^3.0.0" + +"@electron/notarize@^2.1.0": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.3.2.tgz#20a52a961747be8542a35003380988a0d3fe15e6" + integrity sha512-zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.1" + promise-retry "^2.0.1" + +"@electron/universal@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339" + integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== + dependencies: + "@malept/cross-spawn-promise" "^1.1.0" + asar "^3.1.0" + debug "^4.3.1" + dir-compare "^2.4.0" + fs-extra "^9.0.1" + minimatch "^3.0.4" + plist "^3.0.4" + +"@emoji-mart/data@^1.1.2": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.2.1.tgz#0ad70c662e3bc603e23e7d98413bd1e64c4fcb6c" + integrity sha512-no2pQMWiBy6gpBEiqGeU77/bFejDqUTRY7KX+0+iur13op3bqUsXdnwoZs6Xb1zbv0gAj5VvS1PWoUUckSr5Dw== + +"@emoji-mart/react@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@emoji-mart/react/-/react-1.1.1.tgz#ddad52f93a25baf31c5383c3e7e4c6e05554312a" + integrity sha512-NMlFNeWgv1//uPsvLxvGQoIerPuVdXwK/EUek8OOkJ6wVOWPUizRBJU0hDqWZCOROVpfBgCemaC3m6jDOXi03g== + +"@emotion/is-prop-valid@^0.8.8": + version "0.8.8" + resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" + integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== + dependencies: + "@emotion/memoize" "0.7.4" + +"@emotion/memoize@0.7.4": + version "0.7.4" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" + integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== + +"@emotion/stylis@^0.8.4": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" + integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== + +"@emotion/unitless@^0.7.4": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" + integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== + +"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" + integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== + dependencies: + eslint-visitor-keys "^3.3.0" + +"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": + version "4.10.0" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" + integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== + +"@eslint/eslintrc@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad" + integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ== + dependencies: + ajv "^6.12.4" + debug "^4.3.2" + espree "^9.6.0" + globals "^13.19.0" + ignore "^5.2.0" + import-fresh "^3.2.1" + js-yaml "^4.1.0" + minimatch "^3.1.2" + strip-json-comments "^3.1.1" + +"@eslint/js@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" + integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== + +"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" + integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== + +"@hapi/topo@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" + integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== + dependencies: + "@hapi/hoek" "^9.0.0" + +"@humanwhocodes/config-array@^0.11.14": + version "0.11.14" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" + integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== + dependencies: + "@humanwhocodes/object-schema" "^2.0.2" + debug "^4.3.1" + minimatch "^3.0.5" + +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + +"@humanwhocodes/object-schema@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3" + integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA== + +"@iconify/react@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@iconify/react/-/react-4.1.1.tgz#da1bf03cdca9427f07cf22cf5b63fa8f02db4722" + integrity sha512-jed14EjvKjee8mc0eoscGxlg7mSQRkwQG3iX3cPBCO7UlOjz0DtlvTqxqEcHUJGh+z1VJ31Yhu5B9PxfO0zbdg== + dependencies: + "@iconify/types" "^2.0.0" + +"@iconify/types@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57" + integrity sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg== + +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" + +"@isaacs/ttlcache@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@isaacs/ttlcache/-/ttlcache-1.4.1.tgz#21fb23db34e9b6220c6ba023a0118a2dd3461ea2" + integrity sha512-RQgQ4uQ+pLbqXfOmieB91ejmLwvSgv9nLx6sT6sD83s7umBypgg+OIBOBbEUiJXrfpnp9j0mRhYYdzp9uqq3lA== + +"@jest/create-cache-key-function@^29.6.3": + version "29.7.0" + resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-29.7.0.tgz#793be38148fab78e65f40ae30c36785f4ad859f0" + integrity sha512-4QqS3LY5PBmTRHj9sAg1HLoPzqAI0uOX6wI/TRqHIcOxlFidy6YEmCQJk6FSZjNLGCeubDMfmkWL+qaLKhSGQA== + dependencies: + "@jest/types" "^29.6.3" + +"@jest/environment@^29.7.0": + version "29.7.0" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7" + integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw== + dependencies: + "@jest/fake-timers" "^29.7.0" + "@jest/types" "^29.6.3" + "@types/node" "*" + jest-mock "^29.7.0" + +"@jest/fake-timers@^29.7.0": + version "29.7.0" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565" + integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ== + dependencies: + "@jest/types" "^29.6.3" + "@sinonjs/fake-timers" "^10.0.2" + "@types/node" "*" + jest-message-util "^29.7.0" + jest-mock "^29.7.0" + jest-util "^29.7.0" + +"@jest/schemas@^29.6.3": + version "29.6.3" + resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03" + integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA== + dependencies: + "@sinclair/typebox" "^0.27.8" + +"@jest/types@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" + integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + +"@jest/types@^29.6.3": + version "29.6.3" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59" + integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw== + dependencies: + "@jest/schemas" "^29.6.3" + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^17.0.8" + chalk "^4.0.0" + +"@jridgewell/gen-mapping@^0.3.5": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" + integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== + dependencies: + "@jridgewell/set-array" "^1.2.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.24" + +"@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== + +"@jridgewell/set-array@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280" + integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A== + +"@jridgewell/source-map@^0.3.3": + version "0.3.6" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a" + integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ== + dependencies: + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + +"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + +"@jridgewell/trace-mapping@0.3.9": + version "0.3.9" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" + integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== + dependencies: + "@jridgewell/resolve-uri" "^3.0.3" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": + version "0.3.25" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" + integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + +"@jsdoc/salty@^0.2.1": + version "0.2.8" + resolved "https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.8.tgz#8d29923a9429694a437a50ab75004b576131d597" + integrity sha512-5e+SFVavj1ORKlKaKr2BmTOekmXbelU7dC0cDkQLqag7xfuTPuGMUFx7KWJuv4bYZrTsoL2Z18VVCOKYxzoHcg== + dependencies: + lodash "^4.17.21" + +"@malept/cross-spawn-promise@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" + integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== + dependencies: + cross-spawn "^7.0.1" + +"@malept/flatpak-bundler@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" + integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.0" + lodash "^4.17.15" + tmp-promise "^3.0.2" + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + +"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" + integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ== + +"@protobufjs/base64@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" + integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== + +"@protobufjs/codegen@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" + integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== + +"@protobufjs/eventemitter@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" + integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q== + +"@protobufjs/fetch@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" + integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ== + dependencies: + "@protobufjs/aspromise" "^1.1.1" + "@protobufjs/inquire" "^1.1.0" + +"@protobufjs/float@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" + integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ== + +"@protobufjs/inquire@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" + integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q== + +"@protobufjs/path@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" + integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA== + +"@protobufjs/pool@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" + integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw== + +"@protobufjs/utf8@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" + integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw== + +"@react-native-community/cli-clean@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-13.6.6.tgz#87c7ad8746c38dab0fe7b3c6ff89d44351d5d943" + integrity sha512-cBwJTwl0NyeA4nyMxbhkWZhxtILYkbU3TW3k8AXLg+iGphe0zikYMGB3T+haTvTc6alTyEFwPbimk9bGIqkjAQ== + dependencies: + "@react-native-community/cli-tools" "13.6.6" + chalk "^4.1.2" + execa "^5.0.0" + fast-glob "^3.3.2" + +"@react-native-community/cli-config@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-config/-/cli-config-13.6.6.tgz#69f590694b3a079c74f781baab3b762db74f5dbd" + integrity sha512-mbG425zCKr8JZhv/j11382arezwS/70juWMsn8j2lmrGTrP1cUdW0MF15CCIFtJsqyK3Qs+FTmqttRpq81QfSg== + dependencies: + "@react-native-community/cli-tools" "13.6.6" + chalk "^4.1.2" + cosmiconfig "^5.1.0" + deepmerge "^4.3.0" + fast-glob "^3.3.2" + joi "^17.2.1" + +"@react-native-community/cli-debugger-ui@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-13.6.6.tgz#ac021ebd795b0fd66fb52a8987d1d41c5a4b8cb3" + integrity sha512-Vv9u6eS4vKSDAvdhA0OiQHoA7y39fiPIgJ6biT32tN4avHDtxlc6TWZGiqv7g98SBvDWvoVAmdPLcRf3kU+c8g== + dependencies: + serve-static "^1.13.1" + +"@react-native-community/cli-doctor@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-doctor/-/cli-doctor-13.6.6.tgz#ac0febff05601d9b86af3e03460e1a6b0a1d33a5" + integrity sha512-TWZb5g6EmQe2Ua2TEWNmyaEayvlWH4GmdD9ZC+p8EpKFpB1NpDGMK6sXbpb42TDvwZg5s4TDRplK0PBEA/SVDg== + dependencies: + "@react-native-community/cli-config" "13.6.6" + "@react-native-community/cli-platform-android" "13.6.6" + "@react-native-community/cli-platform-apple" "13.6.6" + "@react-native-community/cli-platform-ios" "13.6.6" + "@react-native-community/cli-tools" "13.6.6" + chalk "^4.1.2" + command-exists "^1.2.8" + deepmerge "^4.3.0" + envinfo "^7.10.0" + execa "^5.0.0" + hermes-profile-transformer "^0.0.6" + node-stream-zip "^1.9.1" + ora "^5.4.1" + semver "^7.5.2" + strip-ansi "^5.2.0" + wcwidth "^1.0.1" + yaml "^2.2.1" + +"@react-native-community/cli-hermes@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-13.6.6.tgz#590f55f151fec23b55498228f92d100a0e71d474" + integrity sha512-La5Ie+NGaRl3klei6WxKoOxmCUSGGxpOk6vU5pEGf0/O7ky+Ay0io+zXYUZqlNMi/cGpO7ZUijakBYOB/uyuFg== + dependencies: + "@react-native-community/cli-platform-android" "13.6.6" + "@react-native-community/cli-tools" "13.6.6" + chalk "^4.1.2" + hermes-profile-transformer "^0.0.6" + +"@react-native-community/cli-platform-android@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-13.6.6.tgz#9e3863cb092709021f11848890bff0fc16fc1609" + integrity sha512-/tMwkBeNxh84syiSwNlYtmUz/Ppc+HfKtdopL/5RB+fd3SV1/5/NPNjMlyLNgFKnpxvKCInQ7dnl6jGHJjeHjg== + dependencies: + "@react-native-community/cli-tools" "13.6.6" + chalk "^4.1.2" + execa "^5.0.0" + fast-glob "^3.3.2" + fast-xml-parser "^4.2.4" + logkitty "^0.7.1" + +"@react-native-community/cli-platform-apple@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-apple/-/cli-platform-apple-13.6.6.tgz#d445fd6ed02c5ae2f43f9c45501e04fee53a2790" + integrity sha512-bOmSSwoqNNT3AmCRZXEMYKz1Jf1l2F86Nhs7qBcXdY/sGiJ+Flng564LOqvdAlVLTbkgz47KjNKCS2pP4Jg0Mg== + dependencies: + "@react-native-community/cli-tools" "13.6.6" + chalk "^4.1.2" + execa "^5.0.0" + fast-glob "^3.3.2" + fast-xml-parser "^4.0.12" + ora "^5.4.1" + +"@react-native-community/cli-platform-ios@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-13.6.6.tgz#0cd700f36483ca37dda7ec044377f8a926b1df1f" + integrity sha512-vjDnRwhlSN5ryqKTas6/DPkxuouuyFBAqAROH4FR1cspTbn6v78JTZKDmtQy9JMMo7N5vZj1kASU5vbFep9IOQ== + dependencies: + "@react-native-community/cli-platform-apple" "13.6.6" + +"@react-native-community/cli-server-api@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-13.6.6.tgz#467993006ef82361cdf7a9817999d5a09e85ca6a" + integrity sha512-ZtCXxoFlM7oDv3iZ3wsrT3SamhtUJuIkX2WePLPlN5bcbq7zimbPm2lHyicNJtpcGQ5ymsgpUWPCNZsWQhXBqQ== + dependencies: + "@react-native-community/cli-debugger-ui" "13.6.6" + "@react-native-community/cli-tools" "13.6.6" + compression "^1.7.1" + connect "^3.6.5" + errorhandler "^1.5.1" + nocache "^3.0.1" + pretty-format "^26.6.2" + serve-static "^1.13.1" + ws "^6.2.2" + +"@react-native-community/cli-tools@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-13.6.6.tgz#55c40cbabafbfc56cfb95a4d5fbf73ef60ec3cbc" + integrity sha512-ptOnn4AJczY5njvbdK91k4hcYazDnGtEPrqIwEI+k/CTBHNdb27Rsm2OZ7ye6f7otLBqF8gj/hK6QzJs8CEMgw== + dependencies: + appdirsjs "^1.2.4" + chalk "^4.1.2" + execa "^5.0.0" + find-up "^5.0.0" + mime "^2.4.1" + node-fetch "^2.6.0" + open "^6.2.0" + ora "^5.4.1" + semver "^7.5.2" + shell-quote "^1.7.3" + sudo-prompt "^9.0.0" + +"@react-native-community/cli-types@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-13.6.6.tgz#b45af119d61888fea1074a7c32ddb093e3f119a9" + integrity sha512-733iaYzlmvNK7XYbnWlMjdE+2k0hlTBJW071af/xb6Bs+hbJqBP9c03FZuYH2hFFwDDntwj05bkri/P7VgSxug== + dependencies: + joi "^17.2.1" + +"@react-native-community/cli@13.6.6": + version "13.6.6" + resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-13.6.6.tgz#b929c8668e88344c03a46a3e635cb382dba16773" + integrity sha512-IqclB7VQ84ye8Fcs89HOpOscY4284VZg2pojHNl8H0Lzd4DadXJWQoxC7zWm8v2f8eyeX2kdhxp2ETD5tceIgA== + dependencies: + "@react-native-community/cli-clean" "13.6.6" + "@react-native-community/cli-config" "13.6.6" + "@react-native-community/cli-debugger-ui" "13.6.6" + "@react-native-community/cli-doctor" "13.6.6" + "@react-native-community/cli-hermes" "13.6.6" + "@react-native-community/cli-server-api" "13.6.6" + "@react-native-community/cli-tools" "13.6.6" + "@react-native-community/cli-types" "13.6.6" + chalk "^4.1.2" + commander "^9.4.1" + deepmerge "^4.3.0" + execa "^5.0.0" + find-up "^4.1.0" + fs-extra "^8.1.0" + graceful-fs "^4.1.3" + prompts "^2.4.2" + semver "^7.5.2" + +"@react-native/assets-registry@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/assets-registry/-/assets-registry-0.74.83.tgz#c1815dc10f9e1075e0d03b4c8a9619145969522e" + integrity sha512-2vkLMVnp+YTZYTNSDIBZojSsjz8sl5PscP3j4GcV6idD8V978SZfwFlk8K0ti0BzRs11mzL0Pj17km597S/eTQ== + +"@react-native/babel-plugin-codegen@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.74.83.tgz#971f9cfec980dd05598d81964c05a26c6166f9fb" + integrity sha512-+S0st3t4Ro00bi9gjT1jnK8qTFOU+CwmziA7U9odKyWrCoRJrgmrvogq/Dr1YXlpFxexiGIupGut1VHxr+fxJA== + dependencies: + "@react-native/codegen" "0.74.83" + +"@react-native/babel-preset@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/babel-preset/-/babel-preset-0.74.83.tgz#9828457779b4ce0219078652327ce3203115cdf9" + integrity sha512-KJuu3XyVh3qgyUer+rEqh9a/JoUxsDOzkJNfRpDyXiAyjDRoVch60X/Xa/NcEQ93iCVHAWs0yQ+XGNGIBCYE6g== + dependencies: + "@babel/core" "^7.20.0" + "@babel/plugin-proposal-async-generator-functions" "^7.0.0" + "@babel/plugin-proposal-class-properties" "^7.18.0" + "@babel/plugin-proposal-export-default-from" "^7.0.0" + "@babel/plugin-proposal-logical-assignment-operators" "^7.18.0" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.0" + "@babel/plugin-proposal-numeric-separator" "^7.0.0" + "@babel/plugin-proposal-object-rest-spread" "^7.20.0" + "@babel/plugin-proposal-optional-catch-binding" "^7.0.0" + "@babel/plugin-proposal-optional-chaining" "^7.20.0" + "@babel/plugin-syntax-dynamic-import" "^7.8.0" + "@babel/plugin-syntax-export-default-from" "^7.0.0" + "@babel/plugin-syntax-flow" "^7.18.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0" + "@babel/plugin-syntax-optional-chaining" "^7.0.0" + "@babel/plugin-transform-arrow-functions" "^7.0.0" + "@babel/plugin-transform-async-to-generator" "^7.20.0" + "@babel/plugin-transform-block-scoping" "^7.0.0" + "@babel/plugin-transform-classes" "^7.0.0" + "@babel/plugin-transform-computed-properties" "^7.0.0" + "@babel/plugin-transform-destructuring" "^7.20.0" + "@babel/plugin-transform-flow-strip-types" "^7.20.0" + "@babel/plugin-transform-function-name" "^7.0.0" + "@babel/plugin-transform-literals" "^7.0.0" + "@babel/plugin-transform-modules-commonjs" "^7.0.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.0.0" + "@babel/plugin-transform-parameters" "^7.0.0" + "@babel/plugin-transform-private-methods" "^7.22.5" + "@babel/plugin-transform-private-property-in-object" "^7.22.11" + "@babel/plugin-transform-react-display-name" "^7.0.0" + "@babel/plugin-transform-react-jsx" "^7.0.0" + "@babel/plugin-transform-react-jsx-self" "^7.0.0" + "@babel/plugin-transform-react-jsx-source" "^7.0.0" + "@babel/plugin-transform-runtime" "^7.0.0" + "@babel/plugin-transform-shorthand-properties" "^7.0.0" + "@babel/plugin-transform-spread" "^7.0.0" + "@babel/plugin-transform-sticky-regex" "^7.0.0" + "@babel/plugin-transform-typescript" "^7.5.0" + "@babel/plugin-transform-unicode-regex" "^7.0.0" + "@babel/template" "^7.0.0" + "@react-native/babel-plugin-codegen" "0.74.83" + babel-plugin-transform-flow-enums "^0.0.2" + react-refresh "^0.14.0" + +"@react-native/codegen@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/codegen/-/codegen-0.74.83.tgz#7c56a82fe7603f0867f0d80ff29db3757b71be55" + integrity sha512-GgvgHS3Aa2J8/mp1uC/zU8HuTh8ZT5jz7a4mVMWPw7+rGyv70Ba8uOVBq6UH2Q08o617IATYc+0HfyzAfm4n0w== + dependencies: + "@babel/parser" "^7.20.0" + glob "^7.1.1" + hermes-parser "0.19.1" + invariant "^2.2.4" + jscodeshift "^0.14.0" + mkdirp "^0.5.1" + nullthrows "^1.1.1" + +"@react-native/community-cli-plugin@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/community-cli-plugin/-/community-cli-plugin-0.74.83.tgz#58808a58a5288895627548338731e72ebb5b507c" + integrity sha512-7GAFjFOg1mFSj8bnFNQS4u8u7+QtrEeflUIDVZGEfBZQ3wMNI5ycBzbBGycsZYiq00Xvoc6eKFC7kvIaqeJpUQ== + dependencies: + "@react-native-community/cli-server-api" "13.6.6" + "@react-native-community/cli-tools" "13.6.6" + "@react-native/dev-middleware" "0.74.83" + "@react-native/metro-babel-transformer" "0.74.83" + chalk "^4.0.0" + execa "^5.1.1" + metro "^0.80.3" + metro-config "^0.80.3" + metro-core "^0.80.3" + node-fetch "^2.2.0" + querystring "^0.2.1" + readline "^1.3.0" + +"@react-native/debugger-frontend@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/debugger-frontend/-/debugger-frontend-0.74.83.tgz#48050afa4e086438073b95f041c0cc84fe3f20de" + integrity sha512-RGQlVUegBRxAUF9c1ss1ssaHZh6CO+7awgtI9sDeU0PzDZY/40ImoPD5m0o0SI6nXoVzbPtcMGzU+VO590pRfA== + +"@react-native/dev-middleware@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/dev-middleware/-/dev-middleware-0.74.83.tgz#9d09cfdb763e8ef81c003b0f99ae4ed1a3539639" + integrity sha512-UH8iriqnf7N4Hpi20D7M2FdvSANwTVStwFCSD7VMU9agJX88Yk0D1T6Meh2RMhUu4kY2bv8sTkNRm7LmxvZqgA== + dependencies: + "@isaacs/ttlcache" "^1.4.1" + "@react-native/debugger-frontend" "0.74.83" + "@rnx-kit/chromium-edge-launcher" "^1.0.0" + chrome-launcher "^0.15.2" + connect "^3.6.5" + debug "^2.2.0" + node-fetch "^2.2.0" + nullthrows "^1.1.1" + open "^7.0.3" + selfsigned "^2.4.1" + serve-static "^1.13.1" + temp-dir "^2.0.0" + ws "^6.2.2" + +"@react-native/gradle-plugin@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/gradle-plugin/-/gradle-plugin-0.74.83.tgz#4ac60a6d6295d5b920173cbf184ee32e53690810" + integrity sha512-Pw2BWVyOHoBuJVKxGVYF6/GSZRf6+v1Ygc+ULGz5t20N8qzRWPa2fRZWqoxsN7TkNLPsECYY8gooOl7okOcPAQ== + +"@react-native/js-polyfills@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.74.83.tgz#0e189ce3ab0efecd00223f3bfc53663ce08ba013" + integrity sha512-/t74n8r6wFhw4JEoOj3bN71N1NDLqaawB75uKAsSjeCwIR9AfCxlzZG0etsXtOexkY9KMeZIQ7YwRPqUdNXuqw== + +"@react-native/metro-babel-transformer@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.74.83.tgz#ba87c3cf041f4c0d2b991231af1a6b4a216e9b5d" + integrity sha512-hGdx5N8diu8y+GW/ED39vTZa9Jx1di2ZZ0aapbhH4egN1agIAusj5jXTccfNBwwWF93aJ5oVbRzfteZgjbutKg== + dependencies: + "@babel/core" "^7.20.0" + "@react-native/babel-preset" "0.74.83" + hermes-parser "0.19.1" + nullthrows "^1.1.1" + +"@react-native/normalize-colors@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/normalize-colors/-/normalize-colors-0.74.83.tgz#86ef925bacf219d74df115bcfb615f62d8142e85" + integrity sha512-jhCY95gRDE44qYawWVvhTjTplW1g+JtKTKM3f8xYT1dJtJ8QWv+gqEtKcfmOHfDkSDaMKG0AGBaDTSK8GXLH8Q== + +"@react-native/virtualized-lists@0.74.83": + version "0.74.83" + resolved "https://registry.yarnpkg.com/@react-native/virtualized-lists/-/virtualized-lists-0.74.83.tgz#5595d6aefd9679d1295c56a1d1653b1fb261bd62" + integrity sha512-rmaLeE34rj7py4FxTod7iMTC7BAsm+HrGA8WxYmEJeyTV7WSaxAkosKoYBz8038mOiwnG9VwA/7FrB6bEQvn1A== + dependencies: + invariant "^2.2.4" + nullthrows "^1.1.1" + +"@reduxjs/toolkit@1.8.5": + version "1.8.5" + resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.8.5.tgz#c14bece03ee08be88467f22dc0ecf9cf875527cd" + integrity sha512-f4D5EXO7A7Xq35T0zRbWq5kJQyXzzscnHKmjnu2+37B3rwHU6mX9PYlbfXdnxcY6P/7zfmjhgan0Z+yuOfeBmA== + dependencies: + immer "^9.0.7" + redux "^4.1.2" + redux-thunk "^2.4.1" + reselect "^4.1.5" + +"@rnx-kit/chromium-edge-launcher@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@rnx-kit/chromium-edge-launcher/-/chromium-edge-launcher-1.0.0.tgz#c0df8ea00a902c7a417cd9655aab06de398b939c" + integrity sha512-lzD84av1ZQhYUS+jsGqJiCMaJO2dn9u+RTT9n9q6D3SaKVwWqv+7AoRKqBu19bkwyE+iFRl1ymr40QS90jVFYg== + dependencies: + "@types/node" "^18.0.0" + escape-string-regexp "^4.0.0" + is-wsl "^2.2.0" + lighthouse-logger "^1.0.0" + mkdirp "^1.0.4" + rimraf "^3.0.2" + +"@sideway/address@^4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5" + integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q== + dependencies: + "@hapi/hoek" "^9.0.0" + +"@sideway/formula@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f" + integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg== + +"@sideway/pinpoint@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" + integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== + +"@signalapp/better-sqlite3@^8.4.3": + version "8.7.1" + resolved "https://registry.yarnpkg.com/@signalapp/better-sqlite3/-/better-sqlite3-8.7.1.tgz#0a09293aa833b836ec6b17f6ab0e790097f3fdeb" + integrity sha512-T/7OXR0RfSJ8jXK837wXmad0c4XESBHoGDCLDZFTrd4l0nzfbTxEbXo6VCvUyxDTGrKUfIHCo5JtffIl8jQL5Q== + dependencies: + bindings "^1.5.0" + tar "^6.1.0" + +"@sinclair/typebox@^0.27.8": + version "0.27.8" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" + integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== + +"@sindresorhus/is@^4.0.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" + integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== + +"@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2": + version "1.8.6" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9" + integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ== + dependencies: + type-detect "4.0.8" + +"@sinonjs/commons@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd" + integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^10.0.2": + version "10.3.0" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66" + integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA== + dependencies: + "@sinonjs/commons" "^3.0.0" + +"@sinonjs/fake-timers@^6.0.0", "@sinonjs/fake-timers@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" + integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== + dependencies: + "@sinonjs/commons" "^1.7.0" + +"@sinonjs/formatio@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz#f13e713cb3313b1ab965901b01b0828ea6b77089" + integrity sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ== + dependencies: + "@sinonjs/commons" "^1" + "@sinonjs/samsam" "^5.0.2" + +"@sinonjs/samsam@^5.0.2", "@sinonjs/samsam@^5.0.3": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.3.1.tgz#375a45fe6ed4e92fca2fb920e007c48232a6507f" + integrity sha512-1Hc0b1TtyfBu8ixF/tpfSHTVWKwCBLY4QJbkgnE7HcwyvT2xArDxb4K7dMgqRm3szI+LJbzmW/s4xxEhv6hwDg== + dependencies: + "@sinonjs/commons" "^1.6.0" + lodash.get "^4.4.2" + type-detect "^4.0.8" + +"@sinonjs/text-encoding@^0.7.1": + version "0.7.2" + resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918" + integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ== + +"@szmarczak/http-timer@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" + integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== + dependencies: + defer-to-connect "^2.0.0" + +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + +"@tsconfig/node10@^1.0.7": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2" + integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw== + +"@tsconfig/node12@^1.0.7": + version "1.0.11" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" + integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== + +"@tsconfig/node14@^1.0.0": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" + integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== + +"@tsconfig/node16@^1.0.2": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" + integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== + +"@types/backbone@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@types/backbone/-/backbone-1.4.2.tgz#2af5ca6536d4cd510842eea6eeea11a42fa704b9" + integrity sha512-+yfi5cLeIPU3JuCrFP4Bodpv8oLrE5sbiqQIMPvHIKaVCz0JCBt9GEQKZsz2haibrTV4Axks6ovoHc2yUbpWzg== + dependencies: + "@types/jquery" "*" + "@types/underscore" "*" + +"@types/blueimp-load-image@^5.16.2": + version "5.16.6" + resolved "https://registry.yarnpkg.com/@types/blueimp-load-image/-/blueimp-load-image-5.16.6.tgz#2532889b528ca347703272fd271230cf3e1db64a" + integrity sha512-e7s6CdDCUoBQdCe62Q6OS+DF68M8+ABxCEMh2Isjt4Fl3xuddljCHMN8mak48AMSVGGwUUtNRaZbkzgL5PEWew== + +"@types/buffer-crc32@^0.2.0": + version "0.2.4" + resolved "https://registry.yarnpkg.com/@types/buffer-crc32/-/buffer-crc32-0.2.4.tgz#d70dbf4d968fe98913324d580934b8fb0c857512" + integrity sha512-GSrhSZOK1/wazf2CjDp3CVJQKWzSc5Ugq3NyZ/RQqg1MWtmA9mAT6i6LzGKhzcRxDOl8aLB+AzvObDSlrMpvLw== + dependencies: + "@types/node" "*" + +"@types/bunyan@^1.8.8": + version "1.8.11" + resolved "https://registry.yarnpkg.com/@types/bunyan/-/bunyan-1.8.11.tgz#0b9e7578a5aa2390faf12a460827154902299638" + integrity sha512-758fRH7umIMk5qt5ELmRMff4mLDlN+xyYzC+dkPTdKwbSkJFvz6xwyScrytPU0QIBbRRwbiE8/BIg8bpajerNQ== + dependencies: + "@types/node" "*" + +"@types/bytebuffer@^5.0.41": + version "5.0.49" + resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.49.tgz#04cb63de6c83ae2b6f33f397d2503c079bfc321a" + integrity sha512-lV4YLiolMdD4upDmr4vnfiwV/FN9Jg33eNTSFMkHqyMKqTIAn5TmFTYsARwXwUXeFU7yzRpECmWV1SOhIvdkRQ== + dependencies: + "@types/long" "^3.0.0" + "@types/node" "*" + +"@types/cacheable-request@^6.0.1": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" + integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== + dependencies: + "@types/http-cache-semantics" "*" + "@types/keyv" "^3.1.4" + "@types/node" "*" + "@types/responselike" "^1.0.0" + +"@types/chai-as-promised@^7.1.2": + version "7.1.8" + resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.8.tgz#f2b3d82d53c59626b5d6bbc087667ccb4b677fe9" + integrity sha512-ThlRVIJhr69FLlh6IctTXFkmhtP3NpMZ2QGq69StYLyKZFp/HOp1VdKZj7RvfNWYYcJ1xlbLGLLWj1UvP5u/Gw== + dependencies: + "@types/chai" "*" + +"@types/chai@*": + version "4.3.16" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.16.tgz#b1572967f0b8b60bf3f87fe1d854a5604ea70c82" + integrity sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ== + +"@types/chai@4.2.18": + version "4.2.18" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.2.18.tgz#0c8e298dbff8205e2266606c1ea5fbdba29b46e4" + integrity sha512-rS27+EkB/RE1Iz3u0XtVL5q36MGDWbgYe7zWiodyKNUnthxY0rukK5V36eiUCtCisB7NN8zKYH6DO2M37qxFEQ== + +"@types/classnames@2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.3.tgz#3f0ff6873da793870e20a260cada55982f38a9e5" + integrity sha512-x15/Io+JdzrkM9gnX6SWUs/EmqQzd65TD9tcZIAQ1VIdb93XErNuYmB7Yho8JUCE189ipUSESsWvGvYXRRIvYA== + +"@types/config@0.0.34": + version "0.0.34" + resolved "https://registry.yarnpkg.com/@types/config/-/config-0.0.34.tgz#123f91bdb5afdd702294b9de9ca04d9ea11137b0" + integrity sha512-jWi9DXx77hnzN4kHCNEvP/kab+nchRLTg9yjXYxjTcMBkuc5iBb3QuwJ4sPrb+nzy1GQjrfyfMqZOdR4i7opRQ== + +"@types/debug@^4.1.6": + version "4.1.12" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917" + integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ== + dependencies: + "@types/ms" "*" + +"@types/dompurify@^2.0.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9" + integrity sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg== + dependencies: + "@types/trusted-types" "*" + +"@types/electron-localshortcut@^3.1.0": + version "3.1.3" + resolved "https://registry.yarnpkg.com/@types/electron-localshortcut/-/electron-localshortcut-3.1.3.tgz#f248a9c8016ff28cd783708d8664b806e45c4787" + integrity sha512-D+CRdDTRZ4/9UmcSaZ5qvW4uq2VyyVmqsH9cdNReB4CL6MSIgyhr9w2PKeNEb0J/ZS7db7irJM/+ZiA5uSQsLw== + dependencies: + electron "*" + +"@types/eslint-scope@^3.7.3": + version "3.7.7" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" + integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "8.56.10" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d" + integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" + integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== + +"@types/filesize@3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@types/filesize/-/filesize-3.6.0.tgz#5f1a25c7b4e3d5ee2bc63133d374d096b7008c8d" + integrity sha512-rOWxCKMjt2DBuwddUnl5GOpf/jAkkqteB+XldncpVxVX+HPTmK2c5ACMOVEbp9gaH81IlhTdC3TwvRa5nopasw== + +"@types/firstline@^2.0.2": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/firstline/-/firstline-2.0.4.tgz#b8d3f8f7396d1589efea89db183c047a42efaf04" + integrity sha512-EYoMzk783ncj3soLGADXD/rklDMw1PAO5Hc3lRZa5G21vkfacwkdTlIdhTJ39omqDLezTSmxjDG1psd4A/mUHg== + dependencies: + "@types/node" "*" + +"@types/fs-extra@5.0.5": + version "5.0.5" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.5.tgz#080d90a792f3fa2c5559eb44bd8ef840aae9104b" + integrity sha512-w7iqhDH9mN8eLClQOYTkhdYUOSpp25eXxfc6VbFOGtzxW34JcvctH2bKjj4jD4++z4R5iO5D+pg48W2e03I65A== + dependencies: + "@types/node" "*" + +"@types/fs-extra@^9.0.11": + version "9.0.13" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" + integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== + dependencies: + "@types/node" "*" + +"@types/glob@*": + version "8.1.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc" + integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w== + dependencies: + "@types/minimatch" "^5.1.2" + "@types/node" "*" + +"@types/glob@^7.1.1": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" + integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== + dependencies: + "@types/minimatch" "*" + "@types/node" "*" + +"@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1": + version "3.3.5" + resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494" + integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg== + dependencies: + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + +"@types/http-cache-semantics@*": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4" + integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA== + +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7" + integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w== + +"@types/istanbul-lib-report@*": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf" + integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^3.0.0": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54" + integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ== + dependencies: + "@types/istanbul-lib-report" "*" + +"@types/jquery@*": + version "3.5.30" + resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.30.tgz#888d584cbf844d3df56834b69925085038fd80f7" + integrity sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A== + dependencies: + "@types/sizzle" "*" + +"@types/js-cookie@^2.2.6": + version "2.2.7" + resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.7.tgz#226a9e31680835a6188e887f3988e60c04d3f6a3" + integrity sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA== + +"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" + integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== + +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== + +"@types/keyv@^3.1.4": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" + integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== + dependencies: + "@types/node" "*" + +"@types/libsodium-wrappers-sumo@^0.7.5": + version "0.7.8" + resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.8.tgz#33e32b454fb6b340758c9ffdb1f9657e1be058ff" + integrity sha512-N2+df4MB/A+W0RAcTw7A5oxKgzD+Vh6Ye7lfjWIi5SdTzVLfHPzxUjhwPqHLO5Ev9fv/+VHl+sUaUuTg4fUPqw== + dependencies: + "@types/libsodium-wrappers" "*" + +"@types/libsodium-wrappers@*": + version "0.7.14" + resolved "https://registry.yarnpkg.com/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.14.tgz#f688f8d44e46ed61c401f82ff757581655fbcc42" + integrity sha512-5Kv68fXuXK0iDuUir1WPGw2R9fOZUlYlSAa0ztMcL0s0BfIDTqg9GXz8K30VJpPP3sxWhbolnQma2x+/TfkzDQ== + +"@types/linkify-it@^3.0.2": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.5.tgz#1e78a3ac2428e6d7e6c05c1665c242023a4601d8" + integrity sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw== + +"@types/linkify-it@^5": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-5.0.0.tgz#21413001973106cda1c3a9b91eedd4ccd5469d76" + integrity sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q== + +"@types/lodash@^4.14.194": + version "4.17.4" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.4.tgz#0303b64958ee070059e3a7184048a55159fe20b7" + integrity sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ== + +"@types/long@^3.0.0": + version "3.0.32" + resolved "https://registry.yarnpkg.com/@types/long/-/long-3.0.32.tgz#f4e5af31e9e9b196d8e5fca8a5e2e20aa3d60b69" + integrity sha512-ZXyOOm83p7X8p3s0IYM3VeueNmHpkk/yMlP8CLeOnEcu6hIwPH7YjZBvhQkR0ZFS2DqZAxKtJ/M5fcuv3OU5BA== + +"@types/markdown-it@^14.1.1": + version "14.1.1" + resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-14.1.1.tgz#06bafb7a4e3f77b62b1f308acf7df76687887e0b" + integrity sha512-4NpsnpYl2Gt1ljyBGrKMxFYAYvpqbnnkgP/i/g+NLpjEUa3obn1XJCur9YbEXKDAkaXqsR1LbDnGEJ0MmKFxfg== + dependencies: + "@types/linkify-it" "^5" + "@types/mdurl" "^2" + +"@types/mdurl@^2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-2.0.0.tgz#d43878b5b20222682163ae6f897b20447233bdfd" + integrity sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg== + +"@types/minimatch@*", "@types/minimatch@^5.1.2": + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" + integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== + +"@types/minimist@^1.2.0": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" + integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== + +"@types/mocha@5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-5.0.0.tgz#a3014921991066193f6c8e47290d4d598dfd19e6" + integrity sha512-ZS0vBV7Jn5Z/Q4T3VXauEKMDCV8nWOtJJg90OsDylkYJiQwcWtKuLzohWzrthBkerUF7DLMmJcwOPEP0i/AOXw== + +"@types/ms@*": + version "0.7.34" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" + integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== + +"@types/node-fetch@^2.5.7": + version "2.6.11" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24" + integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g== + dependencies: + "@types/node" "*" + form-data "^4.0.0" + +"@types/node-forge@^1.3.0": + version "1.3.11" + resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da" + integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ== + dependencies: + "@types/node" "*" + +"@types/node@*", "@types/node@>=13.7.0", "@types/node@^20.9.0": + version "20.12.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050" + integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw== + dependencies: + undici-types "~5.26.4" + +"@types/node@20.5.1": + version "20.5.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.1.tgz#178d58ee7e4834152b0e8b4d30cbfab578b9bb30" + integrity sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg== + +"@types/node@^18.0.0", "@types/node@^18.11.18": + version "18.19.33" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.33.tgz#98cd286a1b8a5e11aa06623210240bcc28e95c48" + integrity sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A== + dependencies: + undici-types "~5.26.4" + +"@types/normalize-package-data@^2.4.0": + version "2.4.4" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" + integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== + +"@types/plist@^3.0.1": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.5.tgz#9a0c49c0f9886c8c8696a7904dd703f6284036e0" + integrity sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA== + dependencies: + "@types/node" "*" + xmlbuilder ">=11.0.1" + +"@types/prop-types@*": + version "15.7.12" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.12.tgz#12bb1e2be27293c1406acb6af1c3f3a1481d98c6" + integrity sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q== + +"@types/react-dom@^17.0.2": + version "17.0.25" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5" + integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA== + dependencies: + "@types/react" "^17" + +"@types/react-mentions@^4.1.8": + version "4.1.13" + resolved "https://registry.yarnpkg.com/@types/react-mentions/-/react-mentions-4.1.13.tgz#293e56e14c502f6a73217fece0b870e54a0cc657" + integrity sha512-kRulAAjlmhCtsJ9bapO0foocknaE/rEuFKpmFEU81fBfnXZmZNBaJ9J/DBjwigT3WDHjQVUmYoi5sxEXrcdzAw== + dependencies: + "@types/react" "*" + +"@types/react-native@*": + version "0.73.0" + resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.73.0.tgz#b316be230745779814caa533360262140b0f5984" + integrity sha512-6ZRPQrYM72qYKGWidEttRe6M5DZBEV5F+MHMHqd4TTYx0tfkcdrUFGdef6CCxY0jXU7wldvd/zA/b0A/kTeJmA== + dependencies: + react-native "*" + +"@types/react-redux@^7.1.24": + version "7.1.33" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15" + integrity sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg== + dependencies: + "@types/hoist-non-react-statics" "^3.3.0" + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + redux "^4.0.0" + +"@types/react-virtualized@9.18.12": + version "9.18.12" + resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.18.12.tgz#541e65c5e0b4629d6a1c6f339171c7943e016ecb" + integrity sha512-Msdpt9zvYlb5Ul4PA339QUkJ0/z2O+gaFxed1rG+2rZjbe6XdYo7jWfJe206KBnjj84DwPPIbPFQCtoGuNwNTQ== + dependencies: + "@types/prop-types" "*" + "@types/react" "*" + +"@types/react@*", "@types/react@17.0.2", "@types/react@^17": + version "17.0.2" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" + integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" + +"@types/redux-logger@3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@types/redux-logger/-/redux-logger-3.0.7.tgz#163f6f6865c69c21d56f9356dc8d741718ec0db0" + integrity sha512-oV9qiCuowhVR/ehqUobWWkXJjohontbDGLV88Be/7T4bqMQ3kjXwkFNL7doIIqlbg3X2PC5WPziZ8/j/QHNQ4A== + dependencies: + redux "^3.6.0" + +"@types/responselike@^1.0.0": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.3.tgz#cc29706f0a397cfe6df89debfe4bf5cea159db50" + integrity sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw== + dependencies: + "@types/node" "*" + +"@types/retry@0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" + integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== + +"@types/rimraf@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e" + integrity sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ== + dependencies: + "@types/glob" "*" + "@types/node" "*" + +"@types/semver@5.5.0": + version "5.5.0" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" + integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== + +"@types/semver@^7.3.6", "@types/semver@^7.5.0": + version "7.5.8" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" + integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== + +"@types/sinon@9.0.4": + version "9.0.4" + resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.4.tgz#e934f904606632287a6e7f7ab0ce3f08a0dad4b1" + integrity sha512-sJmb32asJZY6Z2u09bl0G2wglSxDlROlAejCjsnor+LzBMz17gu8IU7vKC/vWDnv9zEq2wqADHVXFjf4eE8Gdw== + dependencies: + "@types/sinonjs__fake-timers" "*" + +"@types/sinonjs__fake-timers@*": + version "8.1.5" + resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.5.tgz#5fd3592ff10c1e9695d377020c033116cc2889f2" + integrity sha512-mQkU2jY8jJEF7YHjHvsQO8+3ughTL1mcnn96igfhONmR+fUPSKIkefQYpSe8bsly2Ep7oQbn/6VG5/9/0qcArQ== + +"@types/sizzle@*": + version "2.3.8" + resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.8.tgz#518609aefb797da19bf222feb199e8f653ff7627" + integrity sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg== + +"@types/stack-utils@^2.0.0": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8" + integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw== + +"@types/styled-components@5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-5.1.1.tgz#17c3b3a299aa38254189e04a72a8ee009a22e42d" + integrity sha512-fIjKvDU1LJExBZWEQilHqzfpOK4KUwBsj5zC79lxa94ekz8oDQSBNcayMACBImxIuevF+NbBGL9O/2CQ67Zhig== + dependencies: + "@types/hoist-non-react-statics" "*" + "@types/react" "*" + "@types/react-native" "*" + csstype "^2.2.0" + +"@types/trusted-types@*": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" + integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== + +"@types/underscore@*": + version "1.11.15" + resolved "https://registry.yarnpkg.com/@types/underscore/-/underscore-1.11.15.tgz#29c776daecf6f1935da9adda17509686bf979947" + integrity sha512-HP38xE+GuWGlbSRq9WrZkousaQ7dragtZCruBVMi0oX1migFZavZ3OROKHSkNp/9ouq82zrWtZpg18jFnVN96g== + +"@types/use-sync-external-store@^0.0.3": + version "0.0.3" + resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43" + integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA== + +"@types/uuid@8.3.4": + version "8.3.4" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" + integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== + +"@types/verror@^1.10.3": + version "1.10.10" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.10.tgz#d5a4b56abac169bfbc8b23d291363a682e6fa087" + integrity sha512-l4MM0Jppn18hb9xmM6wwD1uTdShpf9Pn80aXTStnK1C94gtPvJcV2FrDmbOQUAQfJ1cKZHktkQUDwEqaAKXMMg== + +"@types/yargs-parser@*": + version "21.0.3" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15" + integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ== + +"@types/yargs@^15.0.0": + version "15.0.19" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.19.tgz#328fb89e46109ecbdb70c295d96ff2f46dfd01b9" + integrity sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA== + dependencies: + "@types/yargs-parser" "*" + +"@types/yargs@^17.0.1", "@types/yargs@^17.0.8": + version "17.0.32" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229" + integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog== + dependencies: + "@types/yargs-parser" "*" + +"@types/yauzl@^2.9.1": + version "2.10.3" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999" + integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q== + dependencies: + "@types/node" "*" + +"@typescript-eslint/eslint-plugin@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.0.tgz#22bb999a8d59893c0ea07923e8a21f9d985ad740" + integrity sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w== + dependencies: + "@eslint-community/regexpp" "^4.5.1" + "@typescript-eslint/scope-manager" "7.1.0" + "@typescript-eslint/type-utils" "7.1.0" + "@typescript-eslint/utils" "7.1.0" + "@typescript-eslint/visitor-keys" "7.1.0" + debug "^4.3.4" + graphemer "^1.4.0" + ignore "^5.2.4" + natural-compare "^1.4.0" + semver "^7.5.4" + ts-api-utils "^1.0.1" + +"@typescript-eslint/parser@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.1.0.tgz#b89dab90840f7d2a926bf4c23b519576e8c31970" + integrity sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w== + dependencies: + "@typescript-eslint/scope-manager" "7.1.0" + "@typescript-eslint/types" "7.1.0" + "@typescript-eslint/typescript-estree" "7.1.0" + "@typescript-eslint/visitor-keys" "7.1.0" + debug "^4.3.4" + +"@typescript-eslint/scope-manager@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.1.0.tgz#e4babaa39a3d612eff0e3559f3e99c720a2b4a54" + integrity sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A== + dependencies: + "@typescript-eslint/types" "7.1.0" + "@typescript-eslint/visitor-keys" "7.1.0" + +"@typescript-eslint/type-utils@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.1.0.tgz#372dfa470df181bcee0072db464dc778b75ed722" + integrity sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew== + dependencies: + "@typescript-eslint/typescript-estree" "7.1.0" + "@typescript-eslint/utils" "7.1.0" + debug "^4.3.4" + ts-api-utils "^1.0.1" + +"@typescript-eslint/types@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.1.0.tgz#52a86d6236fda646e7e5fe61154991dc0dc433ef" + integrity sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA== + +"@typescript-eslint/typescript-estree@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.0.tgz#419b1310f061feee6df676c5bed460537310c593" + integrity sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ== + dependencies: + "@typescript-eslint/types" "7.1.0" + "@typescript-eslint/visitor-keys" "7.1.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + minimatch "9.0.3" + semver "^7.5.4" + ts-api-utils "^1.0.1" + +"@typescript-eslint/utils@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.1.0.tgz#710ecda62aff4a3c8140edabf3c5292d31111ddd" + integrity sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@types/json-schema" "^7.0.12" + "@types/semver" "^7.5.0" + "@typescript-eslint/scope-manager" "7.1.0" + "@typescript-eslint/types" "7.1.0" + "@typescript-eslint/typescript-estree" "7.1.0" + semver "^7.5.4" + +"@typescript-eslint/visitor-keys@7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.0.tgz#576c4ad462ca1378135a55e2857d7aced96ce0a0" + integrity sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA== + dependencies: + "@typescript-eslint/types" "7.1.0" + eslint-visitor-keys "^3.4.1" + +"@ungap/promise-all-settled@1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" + integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== + +"@ungap/structured-clone@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" + integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== + +"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb" + integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + +"@webassemblyjs/floating-point-hex-parser@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" + integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== + +"@webassemblyjs/helper-api-error@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" + integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== + +"@webassemblyjs/helper-buffer@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6" + integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw== + +"@webassemblyjs/helper-numbers@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" + integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" + integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== + +"@webassemblyjs/helper-wasm-section@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf" + integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/wasm-gen" "1.12.1" + +"@webassemblyjs/ieee754@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" + integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== + dependencies: + "@xtuc/ieee754" "^1.2.0" + +"@webassemblyjs/leb128@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" + integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== + dependencies: + "@xtuc/long" "4.2.2" + +"@webassemblyjs/utf8@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" + integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== + +"@webassemblyjs/wasm-edit@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b" + integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.12.1" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/wasm-opt" "1.12.1" + "@webassemblyjs/wasm-parser" "1.12.1" + "@webassemblyjs/wast-printer" "1.12.1" + +"@webassemblyjs/wasm-gen@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547" + integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + +"@webassemblyjs/wasm-opt@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5" + integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/wasm-parser" "1.12.1" + +"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937" + integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-api-error" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + +"@webassemblyjs/wast-printer@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac" + integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA== + dependencies: + "@webassemblyjs/ast" "1.12.1" + "@xtuc/long" "4.2.2" + +"@webpack-cli/configtest@^2.1.1": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646" + integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw== + +"@webpack-cli/info@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd" + integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A== + +"@webpack-cli/serve@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e" + integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ== + +"@xmldom/xmldom@^0.8.8": + version "0.8.10" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" + integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== + +"@xobotyi/scrollbar-width@^1.9.5": + version "1.9.5" + resolved "https://registry.yarnpkg.com/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d" + integrity sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ== + +"@xtuc/ieee754@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== + +"@xtuc/long@4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== + +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + +JSONStream@^1.3.5: + version "1.3.5" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + +abab@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== + +abort-controller@3.0.0, abort-controller@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" + integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== + dependencies: + event-target-shim "^5.0.0" + +accepts@^1.3.7, accepts@~1.3.5, accepts@~1.3.7: + version "1.3.8" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== + dependencies: + mime-types "~2.1.34" + negotiator "0.6.3" + +acorn-import-assertions@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" + integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== + +acorn-jsx@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== + +acorn-walk@^8.1.1: + version "8.3.2" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa" + integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== + +acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0: + version "8.11.3" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" + integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== + +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + +ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv-keywords@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== + dependencies: + fast-deep-equal "^3.1.3" + +ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.0, ajv@^8.11.0, ajv@^8.9.0: + version "8.14.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.14.0.tgz#f514ddfd4756abb200e1704414963620a625ebbb" + integrity sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA== + dependencies: + fast-deep-equal "^3.1.3" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.4.1" + +anser@^1.4.9: + version "1.4.10" + resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.10.tgz#befa3eddf282684bd03b63dcda3927aef8c2e35b" + integrity sha512-hCv9AqTQ8ycjpSd3upOJd7vFwW1JaoYQ7tpham03GJ1ca8/65rqn0RpaWpItOAd6ylW9wAw6luXYPJIyPFVOww== + +ansi-align@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== + dependencies: + string-width "^4.1.0" + +ansi-colors@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-escapes@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6" + integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA== + dependencies: + type-fest "^1.0.2" + +ansi-fragments@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/ansi-fragments/-/ansi-fragments-0.2.1.tgz#24409c56c4cc37817c3d7caa99d8969e2de5a05e" + integrity sha512-DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w== + dependencies: + colorette "^1.0.7" + slice-ansi "^2.0.0" + strip-ansi "^5.0.0" + +ansi-regex@^4.1.0, ansi-regex@^4.1.1, ansi-regex@^5.0.0, ansi-regex@^5.0.1, ansi-regex@^6.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed" + integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g== + +ansi-styles@^3.2.0, ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +ansi-styles@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" + integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== + +ansi-styles@^6.0.0, ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + +anymatch@^3.0.3, anymatch@~3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +app-builder-bin@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" + integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== + +app-builder-lib@23.0.8: + version "23.0.8" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.8.tgz#06750dac27b564333f4026db813f4987cabd41b1" + integrity sha512-IObTdRc/0TQsfGn9IvaEXULE/QacgyFgpz3+vmlpZgHHjQ6V1c/T4pKlzNTsNHGjJBuEg2FvTvYi9ZVFfhyWow== + dependencies: + "7zip-bin" "~5.1.1" + "@develar/schema-utils" "~2.6.5" + "@electron/universal" "1.2.1" + "@malept/flatpak-bundler" "^0.4.0" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.9" + builder-util "23.0.8" + builder-util-runtime "9.0.2" + chromium-pickle-js "^0.2.0" + debug "^4.3.4" + ejs "^3.1.7" + electron-osx-sign "^0.6.0" + electron-publish "23.0.8" + form-data "^4.0.0" + fs-extra "^10.1.0" + hosted-git-info "^4.1.0" + is-ci "^3.0.0" + isbinaryfile "^4.0.10" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + minimatch "^3.1.2" + read-config-file "6.2.0" + sanitize-filename "^1.6.3" + semver "^7.3.7" + tar "^6.1.11" + temp-file "^3.4.0" + +app-builder-lib@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" + integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== + dependencies: + "7zip-bin" "~5.1.1" + "@develar/schema-utils" "~2.6.5" + "@electron/universal" "1.2.1" + "@malept/flatpak-bundler" "^0.4.0" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.9" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + chromium-pickle-js "^0.2.0" + debug "^4.3.4" + ejs "^3.1.7" + electron-osx-sign "^0.6.0" + electron-publish "23.6.0" + form-data "^4.0.0" + fs-extra "^10.1.0" + hosted-git-info "^4.1.0" + is-ci "^3.0.0" + isbinaryfile "^4.0.10" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + minimatch "^3.1.2" + read-config-file "6.2.0" + sanitize-filename "^1.6.3" + semver "^7.3.7" + tar "^6.1.11" + temp-file "^3.4.0" + +appdirsjs@^1.2.4: + version "1.2.7" + resolved "https://registry.yarnpkg.com/appdirsjs/-/appdirsjs-1.2.7.tgz#50b4b7948a26ba6090d4aede2ae2dc2b051be3b3" + integrity sha512-Quji6+8kLBC3NnBeo14nPDq0+2jUs5s3/xEye+udFHumHhRk4M7aAMXp/PBJqkKYGuuyR9M/6Dq7d2AViiGmhw== + +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +are-we-there-yet@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" + integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + +arg@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +array-buffer-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" + integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== + dependencies: + call-bind "^1.0.5" + is-array-buffer "^3.0.4" + +array-ify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" + integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng== + +array-includes@^3.1.6, array-includes@^3.1.7: + version "3.1.8" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d" + integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.4" + is-string "^1.0.7" + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +array.prototype.findlastindex@^1.2.3: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d" + integrity sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-shim-unscopables "^1.0.2" + +array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18" + integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + +array.prototype.flatmap@^1.3.1, array.prototype.flatmap@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527" + integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + +array.prototype.tosorted@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz#c8c89348337e51b8a3c48a9227f9ce93ceedcba8" + integrity sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg== + dependencies: + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.1.0" + es-shim-unscopables "^1.0.2" + +arraybuffer.prototype.slice@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" + integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== + dependencies: + array-buffer-byte-length "^1.0.1" + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.2.1" + get-intrinsic "^1.2.3" + is-array-buffer "^3.0.4" + is-shared-array-buffer "^1.0.2" + +arrify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" + integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== + +asap@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== + +asar@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221" + integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg== + dependencies: + chromium-pickle-js "^0.2.0" + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + optionalDependencies: + "@types/glob" "^7.1.1" + +assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== + +assertion-error@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" + integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== + +ast-types@0.15.2: + version "0.15.2" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d" + integrity sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg== + dependencies: + tslib "^2.0.1" + +astral-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" + integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + +async-exit-hook@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" + integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== + +async-limiter@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" + integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== + +async@^2.6.4, async@^3.2.3: + version "2.6.4" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" + integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA== + dependencies: + lodash "^4.17.14" + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== + +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +auto-bind@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb" + integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ== + +available-typed-arrays@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" + integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== + dependencies: + possible-typed-array-names "^1.0.0" + +axios@^1.3.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" + integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== + dependencies: + follow-redirects "^1.15.6" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + +babel-core@^7.0.0-bridge.0: + version "7.0.0-bridge.0" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" + integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg== + +babel-plugin-polyfill-corejs2@^0.4.10: + version "0.4.11" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" + integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q== + dependencies: + "@babel/compat-data" "^7.22.6" + "@babel/helper-define-polyfill-provider" "^0.6.2" + semver "^6.3.1" + +babel-plugin-polyfill-corejs3@^0.10.1: + version "0.10.4" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz#789ac82405ad664c20476d0233b485281deb9c77" + integrity sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.6.1" + core-js-compat "^3.36.1" + +babel-plugin-polyfill-regenerator@^0.6.1: + version "0.6.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e" + integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg== + dependencies: + "@babel/helper-define-polyfill-provider" "^0.6.2" + +"babel-plugin-styled-components@>= 1": + version "2.1.4" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.1.4.tgz#9a1f37c7f32ef927b4b008b529feb4a2c82b1092" + integrity sha512-Xgp9g+A/cG47sUyRwwYxGM4bR/jDRg5N6it/8+HxCnbT5XNKSKDT9xm4oag/osgqjC2It/vH0yXsomOG6k558g== + dependencies: + "@babel/helper-annotate-as-pure" "^7.22.5" + "@babel/helper-module-imports" "^7.22.5" + "@babel/plugin-syntax-jsx" "^7.22.5" + lodash "^4.17.21" + picomatch "^2.3.1" + +babel-plugin-transform-flow-enums@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-enums/-/babel-plugin-transform-flow-enums-0.0.2.tgz#d1d0cc9bdc799c850ca110d0ddc9f21b9ec3ef25" + integrity sha512-g4aaCrDDOsWjbm0PUUeVnkcVd6AKJsVc/MbnPhEotEpkeJQP6b8nzewohQi7+QS8UyPehOhGWn0nOwjvWpmMvQ== + dependencies: + "@babel/plugin-syntax-flow" "^7.12.1" + +backbone@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999" + integrity sha512-aK+k3TiU4tQDUrRCymDDE7XDFnMVuyE6zbZ4JX7mb4pJbQTVOH997/kyBzb8wB2s5Y/Oh7EUfj+sZhwRPxWwow== + dependencies: + underscore ">=1.8.3" + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +base64-js@^1.3.1, base64-js@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +big.js@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== + +binary-extensions@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" + integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== + +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +bl@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" + integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +blob-util@2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb" + integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ== + +bluebird-lst@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" + integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== + dependencies: + bluebird "^3.5.5" + +bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +blueimp-load-image@^5.16.0: + version "5.16.0" + resolved "https://registry.yarnpkg.com/blueimp-load-image/-/blueimp-load-image-5.16.0.tgz#16b763f57e6725f8865517bca8eb7c3dc7d41e09" + integrity sha512-3DUSVdOtlfNRk7moRZuTwDmA3NnG8KIJuLcq3c0J7/BIr6X3Vb/EpX3kUH1joxUhmoVF4uCpDfz7wHkz8pQajA== + +boolean@^3.0.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" + integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== + +boxen@^5.0.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== + dependencies: + ansi-align "^3.0.0" + camelcase "^6.2.0" + chalk "^4.1.0" + cli-boxes "^2.2.1" + string-width "^4.2.2" + type-fest "^0.20.2" + widest-line "^3.1.0" + wrap-ansi "^7.0.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.2, braces@^3.0.3, braces@~3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== + dependencies: + fill-range "^7.1.1" + +browser-stdout@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" + integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== + +browserslist@^4.21.10, browserslist@^4.22.2, browserslist@^4.23.0: + version "4.23.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" + integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== + dependencies: + caniuse-lite "^1.0.30001587" + electron-to-chromium "^1.4.668" + node-releases "^2.0.14" + update-browserslist-db "^1.0.13" + +bser@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== + dependencies: + node-int64 "^0.4.0" + +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + +buffer-crc32@0.2.13, buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== + +buffer-equal@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" + integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== + +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer@^5.1.0, buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +builder-util-runtime@8.9.2: + version "8.9.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28" + integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A== + dependencies: + debug "^4.3.2" + sax "^1.2.4" + +builder-util-runtime@9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.2.tgz#dc54f8581bbcf1e0428da4483fa46d09524be857" + integrity sha512-xF55W/8mgfT6+sMbX0TeiJkTusA5GMOzckM4rajN4KirFcUIuLTH8oEaTYmM86YwVCZaTwa/7GyFhauXaEICwA== + dependencies: + debug "^4.3.4" + sax "^1.2.4" + +builder-util-runtime@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" + integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== + dependencies: + debug "^4.3.4" + sax "^1.2.4" + +builder-util@23.0.8: + version "23.0.8" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.8.tgz#b59af2248f23270ed669cffc4a442418df83a303" + integrity sha512-xPpnoLLAEPx5oxxzRFINRnxmLNQDn+FddU7QRvCJDQi0jvUJ7UjdoGoM+UPy9yh+p9O82/nC7MHGuUptJkOXyQ== + dependencies: + "7zip-bin" "~5.1.1" + "@types/debug" "^4.1.6" + "@types/fs-extra" "^9.0.11" + app-builder-bin "4.0.0" + bluebird-lst "^1.0.9" + builder-util-runtime "9.0.2" + chalk "^4.1.1" + cross-spawn "^7.0.3" + debug "^4.3.4" + fs-extra "^10.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" + source-map-support "^0.5.19" + stat-mode "^1.0.0" + temp-file "^3.4.0" + +builder-util@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" + integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== + dependencies: + "7zip-bin" "~5.1.1" + "@types/debug" "^4.1.6" + "@types/fs-extra" "^9.0.11" + app-builder-bin "4.0.0" + bluebird-lst "^1.0.9" + builder-util-runtime "9.1.1" + chalk "^4.1.1" + cross-spawn "^7.0.3" + debug "^4.3.4" + fs-extra "^10.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" + source-map-support "^0.5.19" + stat-mode "^1.0.0" + temp-file "^3.4.0" "bunyan@https://github.com/Bilb/node-bunyan": - version: 2.0.5 - resolution: "bunyan@https://github.com/Bilb/node-bunyan.git#commit=1f69cb340cd25485c508e65197d05ae534b212e2" - dependencies: - exeunt: "npm:1.1.0" - moment: "npm:^2.19.3" - mv: "npm:~2" - safe-json-stringify: "npm:~1" - dependenciesMeta: - moment: - optional: true - mv: - optional: true - safe-json-stringify: - optional: true - bin: - bunyan: ./bin/bunyan - checksum: 10c0/37f821f240daf3a809415aaa3ecdf2fe7b129d831ff3d8aa5543c17eda30de6b8535553b8876c3fab12969cfc298aeda90ced2710b318ca542aaf9f9de25b09e - languageName: node - linkType: hard - -"bytebuffer@npm:^5.0.1": - version: 5.0.1 - resolution: "bytebuffer@npm:5.0.1" - dependencies: - long: "npm:~3" - checksum: 10c0/d2f1342ac50a047e50ebaea7c3b73751c113aec84baddda0849e7cf2beb9feb52c93fd67425630976bdb7d801f048f47003a07f83dcda59f1c49ec6eb4e106bb - languageName: node - linkType: hard - -"cacache@npm:^18.0.0": - version: 18.0.3 - resolution: "cacache@npm:18.0.3" - dependencies: - "@npmcli/fs": "npm:^3.1.0" - fs-minipass: "npm:^3.0.0" - glob: "npm:^10.2.2" - lru-cache: "npm:^10.0.1" - minipass: "npm:^7.0.3" - minipass-collect: "npm:^2.0.1" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - p-map: "npm:^4.0.0" - ssri: "npm:^10.0.0" - tar: "npm:^6.1.11" - unique-filename: "npm:^3.0.0" - checksum: 10c0/dfda92840bb371fb66b88c087c61a74544363b37a265023223a99965b16a16bbb87661fe4948718d79df6e0cc04e85e62784fbcf1832b2a5e54ff4c46fbb45b7 - languageName: node - linkType: hard - -"cacheable-lookup@npm:^5.0.3": - version: 5.0.4 - resolution: "cacheable-lookup@npm:5.0.4" - checksum: 10c0/a6547fb4954b318aa831cbdd2f7b376824bc784fb1fa67610e4147099e3074726072d9af89f12efb69121415a0e1f2918a8ddd4aafcbcf4e91fbeef4a59cd42c - languageName: node - linkType: hard - -"cacheable-request@npm:^7.0.2": - version: 7.0.4 - resolution: "cacheable-request@npm:7.0.4" - dependencies: - clone-response: "npm:^1.0.2" - get-stream: "npm:^5.1.0" - http-cache-semantics: "npm:^4.0.0" - keyv: "npm:^4.0.0" - lowercase-keys: "npm:^2.0.0" - normalize-url: "npm:^6.0.1" - responselike: "npm:^2.0.0" - checksum: 10c0/0834a7d17ae71a177bc34eab06de112a43f9b5ad05ebe929bec983d890a7d9f2bc5f1aa8bb67ea2b65e07a3bc74bea35fa62dd36dbac52876afe36fdcf83da41 - languageName: node - linkType: hard - -"call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7": - version: 1.0.7 - resolution: "call-bind@npm:1.0.7" - dependencies: - es-define-property: "npm:^1.0.0" - es-errors: "npm:^1.3.0" - function-bind: "npm:^1.1.2" - get-intrinsic: "npm:^1.2.4" - set-function-length: "npm:^1.2.1" - checksum: 10c0/a3ded2e423b8e2a265983dba81c27e125b48eefb2655e7dfab6be597088da3d47c47976c24bc51b8fd9af1061f8f87b4ab78a314f3c77784b2ae2ba535ad8b8d - languageName: node - linkType: hard - -"callsites@npm:^3.0.0": - version: 3.1.0 - resolution: "callsites@npm:3.1.0" - checksum: 10c0/fff92277400eb06c3079f9e74f3af120db9f8ea03bad0e84d9aede54bbe2d44a56cccb5f6cf12211f93f52306df87077ecec5b712794c5a9b5dac6d615a3f301 - languageName: node - linkType: hard - -"camelcase-keys@npm:^6.2.2": - version: 6.2.2 - resolution: "camelcase-keys@npm:6.2.2" - dependencies: - camelcase: "npm:^5.3.1" - map-obj: "npm:^4.0.0" - quick-lru: "npm:^4.0.1" - checksum: 10c0/bf1a28348c0f285c6c6f68fb98a9d088d3c0269fed0cdff3ea680d5a42df8a067b4de374e7a33e619eb9d5266a448fe66c2dd1f8e0c9209ebc348632882a3526 - languageName: node - linkType: hard - -"camelcase@npm:^5.3.1": - version: 5.3.1 - resolution: "camelcase@npm:5.3.1" - checksum: 10c0/92ff9b443bfe8abb15f2b1513ca182d16126359ad4f955ebc83dc4ddcc4ef3fdd2c078bc223f2673dc223488e75c99b16cc4d056624374b799e6a1555cf61b23 - languageName: node - linkType: hard - -"camelcase@npm:^6.0.0, camelcase@npm:^6.2.0": - version: 6.3.0 - resolution: "camelcase@npm:6.3.0" - checksum: 10c0/0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710 - languageName: node - linkType: hard - -"camelize@npm:^1.0.0": - version: 1.0.1 - resolution: "camelize@npm:1.0.1" - checksum: 10c0/4c9ac55efd356d37ac483bad3093758236ab686192751d1c9daa43188cc5a07b09bd431eb7458a4efd9ca22424bba23253e7b353feb35d7c749ba040de2385fb - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001587": - version: 1.0.30001621 - resolution: "caniuse-lite@npm:1.0.30001621" - checksum: 10c0/c7e7fb021ca32b26394ddf0d62faa8a7919c2e50f8a0dcc51f02a96b7b46fff69a81d6b7ead711367fcaf9dfbc6c795320553b6f84dcb393806a10efeb756ce7 - languageName: node - linkType: hard - -"catharsis@npm:^0.9.0": - version: 0.9.0 - resolution: "catharsis@npm:0.9.0" - dependencies: - lodash: "npm:^4.17.15" - checksum: 10c0/9ac03ca48154ac63cfdb6c1645481d9d04f3c3e0dea131debf3116a0c12aa47e8864be7dcf770932c46d75bdd844a99f0c116c234e57232ad1f427751498e7ed - languageName: node - linkType: hard - -"chai-as-promised@npm:^7.1.1": - version: 7.1.2 - resolution: "chai-as-promised@npm:7.1.2" - dependencies: - check-error: "npm:^1.0.2" - peerDependencies: - chai: ">= 2.1.2 < 6" - checksum: 10c0/ee20ed75296d8cbf828b2f3c9ad64627cee67b1a38b8e906ca59fe788fb6965ddb10f702ae66645ed88f15a905ade4f2d9f8540029e92e2d59b229c9f912273f - languageName: node - linkType: hard - -"chai-bytes@npm:^0.1.2": - version: 0.1.2 - resolution: "chai-bytes@npm:0.1.2" - peerDependencies: - chai: ">=2 <5" - checksum: 10c0/09f46dbc77d9101fb4a491b998edd197c73072ee8c0b94da2ba36440019a6845868fc35ba3c2d92155aef54308d262f50858629f7ef5e3e8c5eab479ea0291b1 - languageName: node - linkType: hard - -"chai@npm:^4.3.4": - version: 4.4.1 - resolution: "chai@npm:4.4.1" - dependencies: - assertion-error: "npm:^1.1.0" - check-error: "npm:^1.0.3" - deep-eql: "npm:^4.1.3" - get-func-name: "npm:^2.0.2" - loupe: "npm:^2.3.6" - pathval: "npm:^1.1.1" - type-detect: "npm:^4.0.8" - checksum: 10c0/91590a8fe18bd6235dece04ccb2d5b4ecec49984b50924499bdcd7a95c02cb1fd2a689407c19bb854497bde534ef57525cfad6c7fdd2507100fd802fbc2aefbd - languageName: node - linkType: hard - -"chalk@npm:5.3.0": - version: 5.3.0 - resolution: "chalk@npm:5.3.0" - checksum: 10c0/8297d436b2c0f95801103ff2ef67268d362021b8210daf8ddbe349695333eb3610a71122172ff3b0272f1ef2cf7cc2c41fdaa4715f52e49ffe04c56340feed09 - languageName: node - linkType: hard - -"chalk@npm:^2.4.2": - version: 2.4.2 - resolution: "chalk@npm:2.4.2" - dependencies: - ansi-styles: "npm:^3.2.1" - escape-string-regexp: "npm:^1.0.5" - supports-color: "npm:^5.3.0" - checksum: 10c0/e6543f02ec877732e3a2d1c3c3323ddb4d39fbab687c23f526e25bd4c6a9bf3b83a696e8c769d078e04e5754921648f7821b2a2acfd16c550435fd630026e073 - languageName: node - linkType: hard - -"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2": - version: 4.1.2 - resolution: "chalk@npm:4.1.2" - dependencies: - ansi-styles: "npm:^4.1.0" - supports-color: "npm:^7.1.0" - checksum: 10c0/4a3fef5cc34975c898ffe77141450f679721df9dde00f6c304353fa9c8b571929123b26a0e4617bde5018977eb655b31970c297b91b63ee83bb82aeb04666880 - languageName: node - linkType: hard - -"check-error@npm:^1.0.2, check-error@npm:^1.0.3": - version: 1.0.3 - resolution: "check-error@npm:1.0.3" - dependencies: - get-func-name: "npm:^2.0.2" - checksum: 10c0/94aa37a7315c0e8a83d0112b5bfb5a8624f7f0f81057c73e4707729cdd8077166c6aefb3d8e2b92c63ee130d4a2ff94bad46d547e12f3238cc1d78342a973841 - languageName: node - linkType: hard - -"chokidar@npm:3.5.3": - version: 3.5.3 - resolution: "chokidar@npm:3.5.3" - dependencies: - anymatch: "npm:~3.1.2" - braces: "npm:~3.0.2" - fsevents: "npm:~2.3.2" - glob-parent: "npm:~5.1.2" - is-binary-path: "npm:~2.1.0" - is-glob: "npm:~4.0.1" - normalize-path: "npm:~3.0.0" - readdirp: "npm:~3.6.0" - dependenciesMeta: - fsevents: - optional: true - checksum: 10c0/1076953093e0707c882a92c66c0f56ba6187831aa51bb4de878c1fec59ae611a3bf02898f190efec8e77a086b8df61c2b2a3ea324642a0558bdf8ee6c5dc9ca1 - languageName: node - linkType: hard - -"chokidar@npm:>=3.0.0 <4.0.0": - version: 3.6.0 - resolution: "chokidar@npm:3.6.0" - dependencies: - anymatch: "npm:~3.1.2" - braces: "npm:~3.0.2" - fsevents: "npm:~2.3.2" - glob-parent: "npm:~5.1.2" - is-binary-path: "npm:~2.1.0" - is-glob: "npm:~4.0.1" - normalize-path: "npm:~3.0.0" - readdirp: "npm:~3.6.0" - dependenciesMeta: - fsevents: - optional: true - checksum: 10c0/8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462 - languageName: node - linkType: hard - -"chownr@npm:^2.0.0": - version: 2.0.0 - resolution: "chownr@npm:2.0.0" - checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6 - languageName: node - linkType: hard - -"chrome-trace-event@npm:^1.0.2": - version: 1.0.3 - resolution: "chrome-trace-event@npm:1.0.3" - checksum: 10c0/080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c - languageName: node - linkType: hard - -"chromium-pickle-js@npm:^0.2.0": - version: 0.2.0 - resolution: "chromium-pickle-js@npm:0.2.0" - checksum: 10c0/0a95bd280acdf05b0e08fa1a0e1db58c815dd24e92d639add8f494d23a8a49c26e4829721224d68f2f0e57a69047714db29bcff6deb5d029332321223416cb29 - languageName: node - linkType: hard - -"ci-info@npm:^2.0.0": - version: 2.0.0 - resolution: "ci-info@npm:2.0.0" - checksum: 10c0/8c5fa3830a2bcee2b53c2e5018226f0141db9ec9f7b1e27a5c57db5512332cde8a0beb769bcbaf0d8775a78afbf2bb841928feca4ea6219638a5b088f9884b46 - languageName: node - linkType: hard - -"ci-info@npm:^3.2.0": - version: 3.9.0 - resolution: "ci-info@npm:3.9.0" - checksum: 10c0/6f0109e36e111684291d46123d491bc4e7b7a1934c3a20dea28cba89f1d4a03acd892f5f6a81ed3855c38647e285a150e3c9ba062e38943bef57fee6c1554c3a - languageName: node - linkType: hard - -"classnames@npm:2.2.5": - version: 2.2.5 - resolution: "classnames@npm:2.2.5" - checksum: 10c0/f1feafe7773f72ac0d788591782d25af1c3deabb8feb44a5a1c1d9cb687d5ef52dbd65088626135b1bfc36777dee5ece4571a25c28d497e0a75f1dba062f805b - languageName: node - linkType: hard - -"classnames@npm:^2.2.5": - version: 2.5.1 - resolution: "classnames@npm:2.5.1" - checksum: 10c0/afff4f77e62cea2d79c39962980bf316bacb0d7c49e13a21adaadb9221e1c6b9d3cdb829d8bb1b23c406f4e740507f37e1dcf506f7e3b7113d17c5bab787aa69 - languageName: node - linkType: hard - -"clean-stack@npm:^2.0.0": - version: 2.2.0 - resolution: "clean-stack@npm:2.2.0" - checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1 - languageName: node - linkType: hard - -"cli-boxes@npm:^2.2.1": - version: 2.2.1 - resolution: "cli-boxes@npm:2.2.1" - checksum: 10c0/6111352edbb2f62dbc7bfd58f2d534de507afed7f189f13fa894ce5a48badd94b2aa502fda28f1d7dd5f1eb456e7d4033d09a76660013ef50c7f66e7a034f050 - languageName: node - linkType: hard - -"cli-cursor@npm:^4.0.0": - version: 4.0.0 - resolution: "cli-cursor@npm:4.0.0" - dependencies: - restore-cursor: "npm:^4.0.0" - checksum: 10c0/e776e8c3c6727300d0539b0d25160b2bb56aed1a63942753ba1826b012f337a6f4b7ace3548402e4f2f13b5e16bfd751be672c44b203205e7eca8be94afec42c - languageName: node - linkType: hard - -"cli-truncate@npm:^2.1.0": - version: 2.1.0 - resolution: "cli-truncate@npm:2.1.0" - dependencies: - slice-ansi: "npm:^3.0.0" - string-width: "npm:^4.2.0" - checksum: 10c0/dfaa3df675bcef7a3254773de768712b590250420345a4c7ac151f041a4bacb4c25864b1377bee54a39b5925a030c00eabf014e312e3a4ac130952ed3b3879e9 - languageName: node - linkType: hard - -"cli-truncate@npm:^3.1.0": - version: 3.1.0 - resolution: "cli-truncate@npm:3.1.0" - dependencies: - slice-ansi: "npm:^5.0.0" - string-width: "npm:^5.0.0" - checksum: 10c0/a19088878409ec0e5dc2659a5166929629d93cfba6d68afc9cde2282fd4c751af5b555bf197047e31c87c574396348d011b7aa806fec29c4139ea4f7f00b324c - languageName: node - linkType: hard - -"cliui@npm:^7.0.2": - version: 7.0.4 - resolution: "cliui@npm:7.0.4" - dependencies: - string-width: "npm:^4.2.0" - strip-ansi: "npm:^6.0.0" - wrap-ansi: "npm:^7.0.0" - checksum: 10c0/6035f5daf7383470cef82b3d3db00bec70afb3423538c50394386ffbbab135e26c3689c41791f911fa71b62d13d3863c712fdd70f0fbdffd938a1e6fd09aac00 - languageName: node - linkType: hard - -"cliui@npm:^8.0.1": - version: 8.0.1 - resolution: "cliui@npm:8.0.1" - dependencies: - string-width: "npm:^4.2.0" - strip-ansi: "npm:^6.0.1" - wrap-ansi: "npm:^7.0.0" - checksum: 10c0/4bda0f09c340cbb6dfdc1ed508b3ca080f12992c18d68c6be4d9cf51756033d5266e61ec57529e610dacbf4da1c634423b0c1b11037709cc6b09045cbd815df5 - languageName: node - linkType: hard - -"clone-deep@npm:^4.0.1": - version: 4.0.1 - resolution: "clone-deep@npm:4.0.1" - dependencies: - is-plain-object: "npm:^2.0.4" - kind-of: "npm:^6.0.2" - shallow-clone: "npm:^3.0.0" - checksum: 10c0/637753615aa24adf0f2d505947a1bb75e63964309034a1cf56ba4b1f30af155201edd38d26ffe26911adaae267a3c138b344a4947d39f5fc1b6d6108125aa758 - languageName: node - linkType: hard - -"clone-response@npm:^1.0.2": - version: 1.0.3 - resolution: "clone-response@npm:1.0.3" - dependencies: - mimic-response: "npm:^1.0.0" - checksum: 10c0/06a2b611824efb128810708baee3bd169ec9a1bf5976a5258cd7eb3f7db25f00166c6eee5961f075c7e38e194f373d4fdf86b8166ad5b9c7e82bbd2e333a6087 - languageName: node - linkType: hard - -"clsx@npm:^1.0.4, clsx@npm:^1.1.1, clsx@npm:^1.2.1": - version: 1.2.1 - resolution: "clsx@npm:1.2.1" - checksum: 10c0/34dead8bee24f5e96f6e7937d711978380647e936a22e76380290e35486afd8634966ce300fc4b74a32f3762c7d4c0303f442c3e259f4ce02374eb0c82834f27 - languageName: node - linkType: hard - -"cmake-js@npm:7.2.1": - version: 7.2.1 - resolution: "cmake-js@npm:7.2.1" - dependencies: - axios: "npm:^1.3.2" - debug: "npm:^4" - fs-extra: "npm:^10.1.0" - lodash.isplainobject: "npm:^4.0.6" - memory-stream: "npm:^1.0.0" - node-api-headers: "npm:^0.0.2" - npmlog: "npm:^6.0.2" - rc: "npm:^1.2.7" - semver: "npm:^7.3.8" - tar: "npm:^6.1.11" - url-join: "npm:^4.0.1" - which: "npm:^2.0.2" - yargs: "npm:^17.6.0" - bin: - cmake-js: bin/cmake-js - checksum: 10c0/dab2fa2c04c31af90d58bdce8ad629cc35a15aac40908ab1680c0e23e752196cfdd9b0a68fc8b2f06b6fbbe7d853f4fe75d6e9b9084e26992e0270d4107e1332 - languageName: node - linkType: hard - -"color-convert@npm:^1.9.0": - version: 1.9.3 - resolution: "color-convert@npm:1.9.3" - dependencies: - color-name: "npm:1.1.3" - checksum: 10c0/5ad3c534949a8c68fca8fbc6f09068f435f0ad290ab8b2f76841b9e6af7e0bb57b98cb05b0e19fe33f5d91e5a8611ad457e5f69e0a484caad1f7487fd0e8253c - languageName: node - linkType: hard - -"color-convert@npm:^2.0.1": - version: 2.0.1 - resolution: "color-convert@npm:2.0.1" - dependencies: - color-name: "npm:~1.1.4" - checksum: 10c0/37e1150172f2e311fe1b2df62c6293a342ee7380da7b9cfdba67ea539909afbd74da27033208d01d6d5cfc65ee7868a22e18d7e7648e004425441c0f8a15a7d7 - languageName: node - linkType: hard - -"color-name@npm:1.1.3": - version: 1.1.3 - resolution: "color-name@npm:1.1.3" - checksum: 10c0/566a3d42cca25b9b3cd5528cd7754b8e89c0eb646b7f214e8e2eaddb69994ac5f0557d9c175eb5d8f0ad73531140d9c47525085ee752a91a2ab15ab459caf6d6 - languageName: node - linkType: hard - -"color-name@npm:~1.1.4": - version: 1.1.4 - resolution: "color-name@npm:1.1.4" - checksum: 10c0/a1a3f914156960902f46f7f56bc62effc6c94e84b2cae157a526b1c1f74b677a47ec602bf68a61abfa2b42d15b7c5651c6dbe72a43af720bc588dff885b10f95 - languageName: node - linkType: hard - -"color-support@npm:^1.1.3": - version: 1.1.3 - resolution: "color-support@npm:1.1.3" - bin: - color-support: bin.js - checksum: 10c0/8ffeaa270a784dc382f62d9be0a98581db43e11eee301af14734a6d089bd456478b1a8b3e7db7ca7dc5b18a75f828f775c44074020b51c05fc00e6d0992b1cc6 - languageName: node - linkType: hard - -"colorette@npm:^2.0.14, colorette@npm:^2.0.20": - version: 2.0.20 - resolution: "colorette@npm:2.0.20" - checksum: 10c0/e94116ff33b0ff56f3b83b9ace895e5bf87c2a7a47b3401b8c3f3226e050d5ef76cf4072fb3325f9dc24d1698f9b730baf4e05eeaf861d74a1883073f4c98a40 - languageName: node - linkType: hard - -"colors@npm:1.0.3": - version: 1.0.3 - resolution: "colors@npm:1.0.3" - checksum: 10c0/f9e40dd8b3e1a65378a7ced3fced15ddfd60aaf38e99a7521a7fdb25056b15e092f651cd0f5aa1e9b04fa8ce3616d094e07fc6c2bb261e24098db1ddd3d09a1d - languageName: node - linkType: hard - -"combined-stream@npm:^1.0.8": - version: 1.0.8 - resolution: "combined-stream@npm:1.0.8" - dependencies: - delayed-stream: "npm:~1.0.0" - checksum: 10c0/0dbb829577e1b1e839fa82b40c07ffaf7de8a09b935cadd355a73652ae70a88b4320db322f6634a4ad93424292fa80973ac6480986247f1734a1137debf271d5 - languageName: node - linkType: hard - -"commander@npm:11.0.0": - version: 11.0.0 - resolution: "commander@npm:11.0.0" - checksum: 10c0/471c44cd2d31dee556753df6ceb5ef52ccded0ba6308d3ba7a76251aa0edeedf5ac66ca86cb6096cc8fe20997064233c476983d346265f85180e86312724de0c - languageName: node - linkType: hard - -"commander@npm:2.9.0": - version: 2.9.0 - resolution: "commander@npm:2.9.0" - dependencies: - graceful-readlink: "npm:>= 1.0.0" - checksum: 10c0/56bcda1e47f453016ed25d9f300bed9e622842a5515802658adb62792fa2ff9af6ee3f9ff16e058d7b20aacc78fb3baa3e02f982414bae1fb5f198c7cb41d5ad - languageName: node - linkType: hard - -"commander@npm:^10.0.1": - version: 10.0.1 - resolution: "commander@npm:10.0.1" - checksum: 10c0/53f33d8927758a911094adadda4b2cbac111a5b377d8706700587650fd8f45b0bbe336de4b5c3fe47fd61f420a3d9bd452b6e0e6e5600a7e74d7bf0174f6efe3 - languageName: node - linkType: hard - -"commander@npm:^2.20.0": - version: 2.20.3 - resolution: "commander@npm:2.20.3" - checksum: 10c0/74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288 - languageName: node - linkType: hard - -"commander@npm:^5.0.0": - version: 5.1.0 - resolution: "commander@npm:5.1.0" - checksum: 10c0/da9d71dbe4ce039faf1fe9eac3771dca8c11d66963341f62602f7b66e36d2a3f8883407af4f9a37b1db1a55c59c0c1325f186425764c2e963dc1d67aec2a4b6d - languageName: node - linkType: hard - -"compare-func@npm:^2.0.0": - version: 2.0.0 - resolution: "compare-func@npm:2.0.0" - dependencies: - array-ify: "npm:^1.0.0" - dot-prop: "npm:^5.1.0" - checksum: 10c0/78bd4dd4ed311a79bd264c9e13c36ed564cde657f1390e699e0f04b8eee1fc06ffb8698ce2dfb5fbe7342d509579c82d4e248f08915b708f77f7b72234086cc3 - languageName: node - linkType: hard - -"compare-version@npm:^0.1.2": - version: 0.1.2 - resolution: "compare-version@npm:0.1.2" - checksum: 10c0/f38b853cf0d244c0af5f444409abde3d2198cd97312efa1dbc4ab41b520009327c2a63db59bbaf2d69288eff6167ef22be9788dc5476157d073ecdff1a8eeb2d - languageName: node - linkType: hard - -"concat-map@npm:0.0.1": - version: 0.0.1 - resolution: "concat-map@npm:0.0.1" - checksum: 10c0/c996b1cfdf95b6c90fee4dae37e332c8b6eb7d106430c17d538034c0ad9a1630cb194d2ab37293b1bdd4d779494beee7786d586a50bd9376fd6f7bcc2bd4c98f - languageName: node - linkType: hard - -"config@npm:1.28.1": - version: 1.28.1 - resolution: "config@npm:1.28.1" - dependencies: - json5: "npm:0.4.0" - os-homedir: "npm:1.0.2" - checksum: 10c0/9e424337fe7d1026e48e5a2e63bf0fca0f83121cbf13e2ca25bb526239f272caa5aa19125bc835d69106402241d568ad03643427fe52ff2df42a2018eeb7ba6d - languageName: node - linkType: hard - -"configstore@npm:^5.0.1": - version: 5.0.1 - resolution: "configstore@npm:5.0.1" - dependencies: - dot-prop: "npm:^5.2.0" - graceful-fs: "npm:^4.1.2" - make-dir: "npm:^3.0.0" - unique-string: "npm:^2.0.0" - write-file-atomic: "npm:^3.0.0" - xdg-basedir: "npm:^4.0.0" - checksum: 10c0/5af23830e78bdc56cbe92a2f81e87f1d3a39e96e51a0ab2a8bc79bbbc5d4440a48d92833b3fd9c6d34b4a9c4c5853c8487b8e6e68593e7ecbc7434822f7aced3 - languageName: node - linkType: hard - -"confusing-browser-globals@npm:^1.0.10": - version: 1.0.11 - resolution: "confusing-browser-globals@npm:1.0.11" - checksum: 10c0/475d0a284fa964a5182b519af5738b5b64bf7e413cfd703c1b3496bf6f4df9f827893a9b221c0ea5873c1476835beb1e0df569ba643eff0734010c1eb780589e - languageName: node - linkType: hard - -"console-control-strings@npm:^1.1.0": - version: 1.1.0 - resolution: "console-control-strings@npm:1.1.0" - checksum: 10c0/7ab51d30b52d461412cd467721bb82afe695da78fff8f29fe6f6b9cbaac9a2328e27a22a966014df9532100f6dd85370460be8130b9c677891ba36d96a343f50 - languageName: node - linkType: hard - -"conventional-changelog-angular@npm:^6.0.0": - version: 6.0.0 - resolution: "conventional-changelog-angular@npm:6.0.0" - dependencies: - compare-func: "npm:^2.0.0" - checksum: 10c0/a661ff7b79d4b829ccf8f424ef1bb210e777c1152a1ba5b2ba0a8639529c315755b82a6f84684f1b552c4e8ed6696bfe57317c5f7b868274e9a72b2bf13081ba - languageName: node - linkType: hard - -"conventional-changelog-conventionalcommits@npm:^6.1.0": - version: 6.1.0 - resolution: "conventional-changelog-conventionalcommits@npm:6.1.0" - dependencies: - compare-func: "npm:^2.0.0" - checksum: 10c0/b313f5c0160d109f58d976566e1331ede3a25ab19fbf43f86763b280659195de00a68551f7f3930bf1cbf39a5e707d94f2a25b79996e59043fa9ee0bed68a79f - languageName: node - linkType: hard - -"conventional-commits-parser@npm:^4.0.0": - version: 4.0.0 - resolution: "conventional-commits-parser@npm:4.0.0" - dependencies: - JSONStream: "npm:^1.3.5" - is-text-path: "npm:^1.0.1" - meow: "npm:^8.1.2" - split2: "npm:^3.2.2" - bin: - conventional-commits-parser: cli.js - checksum: 10c0/12e390cc80ad8a825c5775a329b95e11cf47a6df7b8a3875d375e28b8cb27c4f32955842ea73e4e357cff9757a6be99fdffe4fda87a23e9d8e73f983425537a0 - languageName: node - linkType: hard - -"copy-to-clipboard@npm:^3.3.1": - version: 3.3.3 - resolution: "copy-to-clipboard@npm:3.3.3" - dependencies: - toggle-selection: "npm:^1.0.6" - checksum: 10c0/3ebf5e8ee00601f8c440b83ec08d838e8eabb068c1fae94a9cda6b42f288f7e1b552f3463635f419af44bf7675afc8d0390d30876cf5c2d5d35f86d9c56a3e5f - languageName: node - linkType: hard - -"core-util-is@npm:1.0.2": - version: 1.0.2 - resolution: "core-util-is@npm:1.0.2" - checksum: 10c0/980a37a93956d0de8a828ce508f9b9e3317039d68922ca79995421944146700e4aaf490a6dbfebcb1c5292a7184600c7710b957d724be1e37b8254c6bc0fe246 - languageName: node - linkType: hard - -"cosmiconfig-typescript-loader@npm:^4.0.0": - version: 4.4.0 - resolution: "cosmiconfig-typescript-loader@npm:4.4.0" - peerDependencies: - "@types/node": "*" - cosmiconfig: ">=7" - ts-node: ">=10" - typescript: ">=4" - checksum: 10c0/a204eb354943f84ab0434d108fdf593db84c477f107f3ccb586e2d659c1d87f03071d8983c96d4ce2a59cc524ec845697f0432876339e4c28bde84b665cd92a6 - languageName: node - linkType: hard - -"cosmiconfig@npm:^8.0.0": - version: 8.3.6 - resolution: "cosmiconfig@npm:8.3.6" - dependencies: - import-fresh: "npm:^3.3.0" - js-yaml: "npm:^4.1.0" - parse-json: "npm:^5.2.0" - path-type: "npm:^4.0.0" - peerDependencies: - typescript: ">=4.9.5" - peerDependenciesMeta: - typescript: - optional: true - checksum: 10c0/0382a9ed13208f8bfc22ca2f62b364855207dffdb73dc26e150ade78c3093f1cf56172df2dd460c8caf2afa91c0ed4ec8a88c62f8f9cd1cf423d26506aa8797a - languageName: node - linkType: hard - -"crc@npm:^3.8.0": - version: 3.8.0 - resolution: "crc@npm:3.8.0" - dependencies: - buffer: "npm:^5.1.0" - checksum: 10c0/1a0da36e5f95b19cd2a7b2eab5306a08f1c47bdd22da6f761ab764e2222e8e90a877398907cea94108bd5e41a6d311ea84d7914eaca67da2baa4050bd6384b3d - languageName: node - linkType: hard - -"create-require@npm:^1.1.0": - version: 1.1.1 - resolution: "create-require@npm:1.1.1" - checksum: 10c0/157cbc59b2430ae9a90034a5f3a1b398b6738bf510f713edc4d4e45e169bc514d3d99dd34d8d01ca7ae7830b5b8b537e46ae8f3c8f932371b0875c0151d7ec91 - languageName: node - linkType: hard - -"cross-env@npm:^6.0.3": - version: 6.0.3 - resolution: "cross-env@npm:6.0.3" - dependencies: - cross-spawn: "npm:^7.0.0" - bin: - cross-env: src/bin/cross-env.js - cross-env-shell: src/bin/cross-env-shell.js - checksum: 10c0/0d176b91c730abb08589431970a59771148f8fbf338959f5e3aa71b866d38ba390fc67f5330306d0a37d7cb74675224d0f23086f291661b944abbf5a00bd7080 - languageName: node - linkType: hard - -"cross-spawn@npm:^6.0.5": - version: 6.0.5 - resolution: "cross-spawn@npm:6.0.5" - dependencies: - nice-try: "npm:^1.0.4" - path-key: "npm:^2.0.1" - semver: "npm:^5.5.0" - shebang-command: "npm:^1.2.0" - which: "npm:^1.2.9" - checksum: 10c0/e05544722e9d7189b4292c66e42b7abeb21db0d07c91b785f4ae5fefceb1f89e626da2703744657b287e86dcd4af57b54567cef75159957ff7a8a761d9055012 - languageName: node - linkType: hard - -"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": - version: 7.0.3 - resolution: "cross-spawn@npm:7.0.3" - dependencies: - path-key: "npm:^3.1.0" - shebang-command: "npm:^2.0.0" - which: "npm:^2.0.1" - checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750 - languageName: node - linkType: hard - -"crypto-random-string@npm:^2.0.0": - version: 2.0.0 - resolution: "crypto-random-string@npm:2.0.0" - checksum: 10c0/288589b2484fe787f9e146f56c4be90b940018f17af1b152e4dde12309042ff5a2bf69e949aab8b8ac253948381529cc6f3e5a2427b73643a71ff177fa122b37 - languageName: node - linkType: hard - -"css-color-keywords@npm:^1.0.0": - version: 1.0.0 - resolution: "css-color-keywords@npm:1.0.0" - checksum: 10c0/af205a86c68e0051846ed91eb3e30b4517e1904aac040013ff1d742019b3f9369ba5658ba40901dbbc121186fc4bf0e75a814321cc3e3182fbb2feb81c6d9cb7 - languageName: node - linkType: hard - -"css-in-js-utils@npm:^3.1.0": - version: 3.1.0 - resolution: "css-in-js-utils@npm:3.1.0" - dependencies: - hyphenate-style-name: "npm:^1.0.3" - checksum: 10c0/8bb042e8f7701a7edadc3cce5ce2d5cf41189631d7e2aed194d5a7059b25776dded2a0466cb9da1d1f3fc6c99dcecb51e45671148d073b8a2a71e34755152e52 - languageName: node - linkType: hard - -"css-loader@npm:^6.7.2": - version: 6.11.0 - resolution: "css-loader@npm:6.11.0" - dependencies: - icss-utils: "npm:^5.1.0" - postcss: "npm:^8.4.33" - postcss-modules-extract-imports: "npm:^3.1.0" - postcss-modules-local-by-default: "npm:^4.0.5" - postcss-modules-scope: "npm:^3.2.0" - postcss-modules-values: "npm:^4.0.0" - postcss-value-parser: "npm:^4.2.0" - semver: "npm:^7.5.4" - peerDependencies: - "@rspack/core": 0.x || 1.x - webpack: ^5.0.0 - peerDependenciesMeta: - "@rspack/core": - optional: true - webpack: - optional: true - checksum: 10c0/bb52434138085fed06a33e2ffbdae9ee9014ad23bf60f59d6b7ee67f28f26c6b1764024d3030bd19fd884d6ee6ee2224eaed64ad19eb18fbbb23d148d353a965 - languageName: node - linkType: hard - -"css-to-react-native@npm:^3.0.0": - version: 3.2.0 - resolution: "css-to-react-native@npm:3.2.0" - dependencies: - camelize: "npm:^1.0.0" - css-color-keywords: "npm:^1.0.0" - postcss-value-parser: "npm:^4.0.2" - checksum: 10c0/fde850a511d5d3d7c55a1e9b8ed26b69a8ad4868b3487e36ebfbfc0b96fc34bc977d9cd1d61a289d0c74d3f9a662d8cee297da53d4433bf2e27d6acdff8e1003 - languageName: node - linkType: hard - -"css-tree@npm:^1.1.2": - version: 1.1.3 - resolution: "css-tree@npm:1.1.3" - dependencies: - mdn-data: "npm:2.0.14" - source-map: "npm:^0.6.1" - checksum: 10c0/499a507bfa39b8b2128f49736882c0dd636b0cd3370f2c69f4558ec86d269113286b7df469afc955de6a68b0dba00bc533e40022a73698081d600072d5d83c1c - languageName: node - linkType: hard - -"cssesc@npm:^3.0.0": - version: 3.0.0 - resolution: "cssesc@npm:3.0.0" - bin: - cssesc: bin/cssesc - checksum: 10c0/6bcfd898662671be15ae7827120472c5667afb3d7429f1f917737f3bf84c4176003228131b643ae74543f17a394446247df090c597bb9a728cce298606ed0aa7 - languageName: node - linkType: hard - -"cssstyle@npm:^3.0.0": - version: 3.0.0 - resolution: "cssstyle@npm:3.0.0" - dependencies: - rrweb-cssom: "npm:^0.6.0" - checksum: 10c0/23acee092c1cec670fb7b8110e48abd740dc4e574d3b74848743067cb3377a86a1f64cf02606aabd7bb153785e68c2c1e09ce53295ddf7a4b470b3c7c55ec807 - languageName: node - linkType: hard - -"csstype@npm:^2.2.0": - version: 2.6.21 - resolution: "csstype@npm:2.6.21" - checksum: 10c0/e07f27f2100bce9890bb4c3cb9263af97388f0d99b50073b663f1e363fa51b68ac7e2c8a612cd911d2b33c52d83afd1b0b8bc4de1d3ca76ee019a230295daffb - languageName: node - linkType: hard - -"csstype@npm:^3.0.2, csstype@npm:^3.1.2": - version: 3.1.3 - resolution: "csstype@npm:3.1.3" - checksum: 10c0/80c089d6f7e0c5b2bd83cf0539ab41474198579584fa10d86d0cafe0642202343cbc119e076a0b1aece191989477081415d66c9fefbf3c957fc2fc4b7009f248 - languageName: node - linkType: hard + version "2.0.5" + resolved "https://github.com/Bilb/node-bunyan#1f69cb340cd25485c508e65197d05ae534b212e2" + dependencies: + exeunt "1.1.0" + optionalDependencies: + moment "^2.19.3" + mv "~2" + safe-json-stringify "~1" + +bytebuffer@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" + integrity sha512-IuzSdmADppkZ6DlpycMkm8l9zeEq16fWtLvunEwFiYciR/BHo4E8/xs5piFquG+Za8OWmMqHF8zuRviz2LHvRQ== + dependencies: + long "~3" + +bytes@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== + +cacheable-lookup@^5.0.3: + version "5.0.4" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" + integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== + +cacheable-request@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817" + integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^4.0.0" + lowercase-keys "^2.0.0" + normalize-url "^6.0.1" + responselike "^2.0.0" + +call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + +caller-callsite@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" + integrity sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ== + dependencies: + callsites "^2.0.0" + +caller-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" + integrity sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A== + dependencies: + caller-callsite "^2.0.0" + +callsites@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" + integrity sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ== + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camelcase-keys@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" + integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== + dependencies: + camelcase "^5.3.1" + map-obj "^4.0.0" + quick-lru "^4.0.1" + +camelcase@^5.0.0, camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +camelcase@^6.0.0, camelcase@^6.2.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== + +camelize@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3" + integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ== + +caniuse-lite@^1.0.30001587: + version "1.0.30001624" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001624.tgz#0ec4c8fa7a46e5b785477c70b38a56d0b10058eb" + integrity sha512-0dWnQG87UevOCPYaOR49CBcLBwoZLpws+k6W37nLjWUhumP1Isusj0p2u+3KhjNloRWK9OKMgjBBzPujQHw4nA== + +catharsis@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121" + integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A== + dependencies: + lodash "^4.17.15" + +chai-as-promised@^7.1.1: + version "7.1.2" + resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.2.tgz#70cd73b74afd519754161386421fb71832c6d041" + integrity sha512-aBDHZxRzYnUYuIAIPBH2s511DjlKPzXNlXSGFC8CwmroWQLfrW0LtE1nK3MAwwNhJPa9raEjNCmRoFpG0Hurdw== + dependencies: + check-error "^1.0.2" + +chai-bytes@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/chai-bytes/-/chai-bytes-0.1.2.tgz#c297e81d47eb3106af0676ded5bb5e0c9f981db3" + integrity sha512-0ol6oJS0y1ozj6AZK8n1pyv1/G+l44nqUJygAkK1UrYl+IOGie5vcrEdrAlwmLYGIA9NVvtHWosPYwWWIXf/XA== + +chai@^4.3.4: + version "4.4.1" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.4.1.tgz#3603fa6eba35425b0f2ac91a009fe924106e50d1" + integrity sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g== + dependencies: + assertion-error "^1.1.0" + check-error "^1.0.3" + deep-eql "^4.1.3" + get-func-name "^2.0.2" + loupe "^2.3.6" + pathval "^1.1.1" + type-detect "^4.0.8" + +chalk@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" + integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== + +chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +check-error@^1.0.2, check-error@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.3.tgz#a6502e4312a7ee969f646e83bb3ddd56281bd694" + integrity sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg== + dependencies: + get-func-name "^2.0.2" + +chokidar@3.5.3: + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +"chokidar@>=3.0.0 <4.0.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +chrome-launcher@^0.15.2: + version "0.15.2" + resolved "https://registry.yarnpkg.com/chrome-launcher/-/chrome-launcher-0.15.2.tgz#4e6404e32200095fdce7f6a1e1004f9bd36fa5da" + integrity sha512-zdLEwNo3aUVzIhKhTtXfxhdvZhUghrnmkvcAq2NoDd+LeOHKf03H5jwZ8T/STsAlzyALkBVK552iaG1fGf1xVQ== + dependencies: + "@types/node" "*" + escape-string-regexp "^4.0.0" + is-wsl "^2.2.0" + lighthouse-logger "^1.0.0" + +chrome-trace-event@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + +chromium-pickle-js@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" + integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +ci-info@^3.2.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" + integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== + +classnames@2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d" + integrity sha512-DTt3GhOUDKhh4ONwIJW4lmhyotQmV2LjNlGK/J2hkwUcqcbKkCLAdJPtxQnxnlc7SR3f1CEXCyMmc7WLUsWbNA== + +classnames@^2.2.5: + version "2.5.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b" + integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow== + +cli-boxes@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + +cli-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" + integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== + dependencies: + restore-cursor "^3.1.0" + +cli-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea" + integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg== + dependencies: + restore-cursor "^4.0.0" + +cli-spinners@^2.5.0: + version "2.9.2" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41" + integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg== + +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== + dependencies: + slice-ansi "^3.0.0" + string-width "^4.2.0" + +cli-truncate@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389" + integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA== + dependencies: + slice-ansi "^5.0.0" + string-width "^5.0.0" + +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + +clone-deep@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== + dependencies: + is-plain-object "^2.0.4" + kind-of "^6.0.2" + shallow-clone "^3.0.0" + +clone-response@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" + integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== + dependencies: + mimic-response "^1.0.0" + +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== + +clsx@^1.0.4, clsx@^1.1.1, clsx@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" + integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== + +cmake-js@7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.2.1.tgz#757c0d39994121b084bab96290baf115ee7712cd" + integrity sha512-AdPSz9cSIJWdKvm0aJgVu3X8i0U3mNTswJkSHzZISqmYVjZk7Td4oDFg0mCBA383wO+9pG5Ix7pEP1CZH9x2BA== + dependencies: + axios "^1.3.2" + debug "^4" + fs-extra "^10.1.0" + lodash.isplainobject "^4.0.6" + memory-stream "^1.0.0" + node-api-headers "^0.0.2" + npmlog "^6.0.2" + rc "^1.2.7" + semver "^7.3.8" + tar "^6.1.11" + url-join "^4.0.1" + which "^2.0.2" + yargs "^17.6.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + +colorette@^1.0.7: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" + integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== + +colorette@^2.0.14, colorette@^2.0.20: + version "2.0.20" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" + integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== + +colors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" + integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== + +combined-stream@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +command-exists@^1.2.8: + version "1.2.9" + resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.9.tgz#c50725af3808c8ab0260fd60b01fbfa25b954f69" + integrity sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w== + +commander@11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-11.0.0.tgz#43e19c25dbedc8256203538e8d7e9346877a6f67" + integrity sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ== + +commander@2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" + integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A== + dependencies: + graceful-readlink ">= 1.0.0" + +commander@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" + integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== + +commander@^2.20.0: + version "2.20.3" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== + +commander@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== + +commander@^9.4.1: + version "9.5.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" + integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== + +commondir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== + +compare-func@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3" + integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA== + dependencies: + array-ify "^1.0.0" + dot-prop "^5.1.0" + +compare-version@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" + integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== + +compressible@~2.0.16: + version "2.0.18" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== + dependencies: + mime-db ">= 1.43.0 < 2" + +compression@^1.7.1: + version "1.7.4" + resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== + dependencies: + accepts "~1.3.5" + bytes "3.0.0" + compressible "~2.0.16" + debug "2.6.9" + on-headers "~1.0.2" + safe-buffer "5.1.2" + vary "~1.1.2" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== + +config@1.28.1: + version "1.28.1" + resolved "https://registry.yarnpkg.com/config/-/config-1.28.1.tgz#7625d2a1e4c90f131d8a73347982d93c3873282d" + integrity sha512-NT2hna+ec7G1hLB+Jimu6tuzQQqAG81YJM2P4x31hM9qffcOeaMlue6tc/TTEEfRcyzVTJFzBzweRQf0FBHghQ== + dependencies: + json5 "0.4.0" + os-homedir "1.0.2" + +configstore@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== + dependencies: + dot-prop "^5.2.0" + graceful-fs "^4.1.2" + make-dir "^3.0.0" + unique-string "^2.0.0" + write-file-atomic "^3.0.0" + xdg-basedir "^4.0.0" + +confusing-browser-globals@^1.0.10: + version "1.0.11" + resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" + integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA== + +connect@^3.6.5: + version "3.7.0" + resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" + integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== + dependencies: + debug "2.6.9" + finalhandler "1.1.2" + parseurl "~1.3.3" + utils-merge "1.0.1" + +console-control-strings@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + +conventional-changelog-angular@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-6.0.0.tgz#a9a9494c28b7165889144fd5b91573c4aa9ca541" + integrity sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg== + dependencies: + compare-func "^2.0.0" + +conventional-changelog-conventionalcommits@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-6.1.0.tgz#3bad05f4eea64e423d3d90fc50c17d2c8cf17652" + integrity sha512-3cS3GEtR78zTfMzk0AizXKKIdN4OvSh7ibNz6/DPbhWWQu7LqE/8+/GqSodV+sywUR2gpJAdP/1JFf4XtN7Zpw== + dependencies: + compare-func "^2.0.0" + +conventional-commits-parser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz#02ae1178a381304839bce7cea9da5f1b549ae505" + integrity sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg== + dependencies: + JSONStream "^1.3.5" + is-text-path "^1.0.1" + meow "^8.1.2" + split2 "^3.2.2" + +convert-source-map@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" + integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== + +copy-to-clipboard@^3.3.1: + version "3.3.3" + resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0" + integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA== + dependencies: + toggle-selection "^1.0.6" + +core-js-compat@^3.36.1: + version "3.37.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.1.tgz#c844310c7852f4bdf49b8d339730b97e17ff09ee" + integrity sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg== + dependencies: + browserslist "^4.23.0" + +core-util-is@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + +cosmiconfig-typescript-loader@^4.0.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.4.0.tgz#f3feae459ea090f131df5474ce4b1222912319f9" + integrity sha512-BabizFdC3wBHhbI4kJh0VkQP9GkBfoHPydD0COMce1nJ1kJAB3F2TmJ/I7diULBKtmEWSwEbuN/KDtgnmUUVmw== + +cosmiconfig@^5.0.5, cosmiconfig@^5.1.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" + integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== + dependencies: + import-fresh "^2.0.0" + is-directory "^0.3.1" + js-yaml "^3.13.1" + parse-json "^4.0.0" + +cosmiconfig@^8.0.0: + version "8.3.6" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3" + integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA== + dependencies: + import-fresh "^3.3.0" + js-yaml "^4.1.0" + parse-json "^5.2.0" + path-type "^4.0.0" + +crc@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== + dependencies: + buffer "^5.1.0" + +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + +cross-env@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941" + integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag== + dependencies: + cross-spawn "^7.0.0" + +cross-spawn@^6.0.5: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +crypto-random-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== + +css-color-keywords@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" + integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg== + +css-in-js-utils@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz#640ae6a33646d401fc720c54fc61c42cd76ae2bb" + integrity sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A== + dependencies: + hyphenate-style-name "^1.0.3" + +css-loader@^6.7.2: + version "6.11.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.11.0.tgz#33bae3bf6363d0a7c2cf9031c96c744ff54d85ba" + integrity sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g== + dependencies: + icss-utils "^5.1.0" + postcss "^8.4.33" + postcss-modules-extract-imports "^3.1.0" + postcss-modules-local-by-default "^4.0.5" + postcss-modules-scope "^3.2.0" + postcss-modules-values "^4.0.0" + postcss-value-parser "^4.2.0" + semver "^7.5.4" + +css-to-react-native@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.2.0.tgz#cdd8099f71024e149e4f6fe17a7d46ecd55f1e32" + integrity sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ== + dependencies: + camelize "^1.0.0" + css-color-keywords "^1.0.0" + postcss-value-parser "^4.0.2" + +css-tree@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== + dependencies: + mdn-data "2.0.14" + source-map "^0.6.1" + +cssesc@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== + +cssstyle@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-3.0.0.tgz#17ca9c87d26eac764bb8cfd00583cff21ce0277a" + integrity sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg== + dependencies: + rrweb-cssom "^0.6.0" + +csstype@^2.2.0: + version "2.6.21" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" + integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== + +csstype@^3.0.2, csstype@^3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" + integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== "curve25519-js@https://github.com/oxen-io/curve25519-js": - version: 0.0.4 - resolution: "curve25519-js@https://github.com/oxen-io/curve25519-js.git#commit=102f8c0a31b5c58bad8606979036cf763be9f4f6" - checksum: 10c0/ed0860ae225d81dcacd5d95ec4bf4e1fd4a3785be9cf4cb440fdbb49d0be0fb740ef118f4b4883fb83e60c4a48f7cae3fb3c0bb7f55428af8a7bab7124fd5c23 - languageName: node - linkType: hard - -"dargs@npm:^7.0.0": - version: 7.0.0 - resolution: "dargs@npm:7.0.0" - checksum: 10c0/ec7f6a8315a8fa2f8b12d39207615bdf62b4d01f631b96fbe536c8ad5469ab9ed710d55811e564d0d5c1d548fc8cb6cc70bf0939f2415790159f5a75e0f96c92 - languageName: node - linkType: hard - -"data-urls@npm:^4.0.0": - version: 4.0.0 - resolution: "data-urls@npm:4.0.0" - dependencies: - abab: "npm:^2.0.6" - whatwg-mimetype: "npm:^3.0.0" - whatwg-url: "npm:^12.0.0" - checksum: 10c0/928d9a21db31d3dcee125d514fddfeb88067c348b1225e9d2c6ca55db16e1cbe49bf58c092cae7163de958f415fd5c612c2aef2eef87896e097656fce205d766 - languageName: node - linkType: hard - -"data-view-buffer@npm:^1.0.1": - version: 1.0.1 - resolution: "data-view-buffer@npm:1.0.1" - dependencies: - call-bind: "npm:^1.0.6" - es-errors: "npm:^1.3.0" - is-data-view: "npm:^1.0.1" - checksum: 10c0/8984119e59dbed906a11fcfb417d7d861936f16697a0e7216fe2c6c810f6b5e8f4a5281e73f2c28e8e9259027190ac4a33e2a65fdd7fa86ac06b76e838918583 - languageName: node - linkType: hard - -"data-view-byte-length@npm:^1.0.1": - version: 1.0.1 - resolution: "data-view-byte-length@npm:1.0.1" - dependencies: - call-bind: "npm:^1.0.7" - es-errors: "npm:^1.3.0" - is-data-view: "npm:^1.0.1" - checksum: 10c0/b7d9e48a0cf5aefed9ab7d123559917b2d7e0d65531f43b2fd95b9d3a6b46042dd3fca597c42bba384e66b70d7ad66ff23932f8367b241f53d93af42cfe04ec2 - languageName: node - linkType: hard - -"data-view-byte-offset@npm:^1.0.0": - version: 1.0.0 - resolution: "data-view-byte-offset@npm:1.0.0" - dependencies: - call-bind: "npm:^1.0.6" - es-errors: "npm:^1.3.0" - is-data-view: "npm:^1.0.1" - checksum: 10c0/21b0d2e53fd6e20cc4257c873bf6d36d77bd6185624b84076c0a1ddaa757b49aaf076254006341d35568e89f52eecd1ccb1a502cfb620f2beca04f48a6a62a8f - languageName: node - linkType: hard - -"date-fns@npm:^3.3.1": - version: 3.6.0 - resolution: "date-fns@npm:3.6.0" - checksum: 10c0/0b5fb981590ef2f8e5a3ba6cd6d77faece0ea7f7158948f2eaae7bbb7c80a8f63ae30b01236c2923cf89bb3719c33aeb150c715ea4fe4e86e37dcf06bed42fb6 - languageName: node - linkType: hard - -"debug@npm:4, debug@npm:4.3.4, debug@npm:^4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4": - version: 4.3.4 - resolution: "debug@npm:4.3.4" - dependencies: - ms: "npm:2.1.2" - peerDependenciesMeta: - supports-color: - optional: true - checksum: 10c0/cedbec45298dd5c501d01b92b119cd3faebe5438c3917ff11ae1bff86a6c722930ac9c8659792824013168ba6db7c4668225d845c633fbdafbbf902a6389f736 - languageName: node - linkType: hard - -"debug@npm:^2.6.8": - version: 2.6.9 - resolution: "debug@npm:2.6.9" - dependencies: - ms: "npm:2.0.0" - checksum: 10c0/121908fb839f7801180b69a7e218a40b5a0b718813b886b7d6bdb82001b931c938e2941d1e4450f33a1b1df1da653f5f7a0440c197f29fbf8a6e9d45ff6ef589 - languageName: node - linkType: hard - -"debug@npm:^3.2.7": - version: 3.2.7 - resolution: "debug@npm:3.2.7" - dependencies: - ms: "npm:^2.1.1" - checksum: 10c0/37d96ae42cbc71c14844d2ae3ba55adf462ec89fd3a999459dec3833944cd999af6007ff29c780f1c61153bcaaf2c842d1e4ce1ec621e4fc4923244942e4a02a - languageName: node - linkType: hard - -"decamelize-keys@npm:^1.1.0": - version: 1.1.1 - resolution: "decamelize-keys@npm:1.1.1" - dependencies: - decamelize: "npm:^1.1.0" - map-obj: "npm:^1.0.0" - checksum: 10c0/4ca385933127437658338c65fb9aead5f21b28d3dd3ccd7956eb29aab0953b5d3c047fbc207111672220c71ecf7a4d34f36c92851b7bbde6fca1a02c541bdd7d - languageName: node - linkType: hard - -"decamelize@npm:^1.1.0": - version: 1.2.0 - resolution: "decamelize@npm:1.2.0" - checksum: 10c0/85c39fe8fbf0482d4a1e224ef0119db5c1897f8503bcef8b826adff7a1b11414972f6fef2d7dec2ee0b4be3863cf64ac1439137ae9e6af23a3d8dcbe26a5b4b2 - languageName: node - linkType: hard - -"decamelize@npm:^4.0.0": - version: 4.0.0 - resolution: "decamelize@npm:4.0.0" - checksum: 10c0/e06da03fc05333e8cd2778c1487da67ffbea5b84e03ca80449519b8fa61f888714bbc6f459ea963d5641b4aa98832130eb5cd193d90ae9f0a27eee14be8e278d - languageName: node - linkType: hard - -"decimal.js@npm:^10.4.3": - version: 10.4.3 - resolution: "decimal.js@npm:10.4.3" - checksum: 10c0/6d60206689ff0911f0ce968d40f163304a6c1bc739927758e6efc7921cfa630130388966f16bf6ef6b838cb33679fbe8e7a78a2f3c478afce841fd55ac8fb8ee - languageName: node - linkType: hard - -"decompress-response@npm:^6.0.0": - version: 6.0.0 - resolution: "decompress-response@npm:6.0.0" - dependencies: - mimic-response: "npm:^3.1.0" - checksum: 10c0/bd89d23141b96d80577e70c54fb226b2f40e74a6817652b80a116d7befb8758261ad073a8895648a29cc0a5947021ab66705cb542fa9c143c82022b27c5b175e - languageName: node - linkType: hard - -"deep-diff@npm:^0.3.5": - version: 0.3.8 - resolution: "deep-diff@npm:0.3.8" - checksum: 10c0/dbb10937ccff21b1ad1ee5e64ad926643a7000cb9837bc2165bacfddf569788c78b8bfd74401c32121af3fb1cb1092b7447319d9f01900676473a1b840c08ade - languageName: node - linkType: hard - -"deep-eql@npm:^4.1.3": - version: 4.1.3 - resolution: "deep-eql@npm:4.1.3" - dependencies: - type-detect: "npm:^4.0.0" - checksum: 10c0/ff34e8605d8253e1bf9fe48056e02c6f347b81d9b5df1c6650a1b0f6f847b4a86453b16dc226b34f853ef14b626e85d04e081b022e20b00cd7d54f079ce9bbdd - languageName: node - linkType: hard - -"deep-extend@npm:^0.6.0": - version: 0.6.0 - resolution: "deep-extend@npm:0.6.0" - checksum: 10c0/1c6b0abcdb901e13a44c7d699116d3d4279fdb261983122a3783e7273844d5f2537dc2e1c454a23fcf645917f93fbf8d07101c1d03c015a87faa662755212566 - languageName: node - linkType: hard - -"deep-is@npm:^0.1.3, deep-is@npm:~0.1.3": - version: 0.1.4 - resolution: "deep-is@npm:0.1.4" - checksum: 10c0/7f0ee496e0dff14a573dc6127f14c95061b448b87b995fc96c017ce0a1e66af1675e73f1d6064407975bc4ea6ab679497a29fff7b5b9c4e99cb10797c1ad0b4c - languageName: node - linkType: hard - -"defer-to-connect@npm:^2.0.0": - version: 2.0.1 - resolution: "defer-to-connect@npm:2.0.1" - checksum: 10c0/625ce28e1b5ad10cf77057b9a6a727bf84780c17660f6644dab61dd34c23de3001f03cedc401f7d30a4ed9965c2e8a7336e220a329146f2cf85d4eddea429782 - languageName: node - linkType: hard - -"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.4": - version: 1.1.4 - resolution: "define-data-property@npm:1.1.4" - dependencies: - es-define-property: "npm:^1.0.0" - es-errors: "npm:^1.3.0" - gopd: "npm:^1.0.1" - checksum: 10c0/dea0606d1483eb9db8d930d4eac62ca0fa16738b0b3e07046cddfacf7d8c868bbe13fa0cb263eb91c7d0d527960dc3f2f2471a69ed7816210307f6744fe62e37 - languageName: node - linkType: hard - -"define-properties@npm:^1.2.0, define-properties@npm:^1.2.1": - version: 1.2.1 - resolution: "define-properties@npm:1.2.1" - dependencies: - define-data-property: "npm:^1.0.1" - has-property-descriptors: "npm:^1.0.0" - object-keys: "npm:^1.1.1" - checksum: 10c0/88a152319ffe1396ccc6ded510a3896e77efac7a1bfbaa174a7b00414a1747377e0bb525d303794a47cf30e805c2ec84e575758512c6e44a993076d29fd4e6c3 - languageName: node - linkType: hard - -"delayed-stream@npm:~1.0.0": - version: 1.0.0 - resolution: "delayed-stream@npm:1.0.0" - checksum: 10c0/d758899da03392e6712f042bec80aa293bbe9e9ff1b2634baae6a360113e708b91326594c8a486d475c69d6259afb7efacdc3537bfcda1c6c648e390ce601b19 - languageName: node - linkType: hard - -"delegates@npm:^1.0.0": - version: 1.0.0 - resolution: "delegates@npm:1.0.0" - checksum: 10c0/ba05874b91148e1db4bf254750c042bf2215febd23a6d3cda2e64896aef79745fbd4b9996488bd3cafb39ce19dbce0fd6e3b6665275638befffe1c9b312b91b5 - languageName: node - linkType: hard - -"detect-node@npm:^2.0.4": - version: 2.1.0 - resolution: "detect-node@npm:2.1.0" - checksum: 10c0/f039f601790f2e9d4654e499913259a798b1f5246ae24f86ab5e8bd4aaf3bce50484234c494f11fb00aecb0c6e2733aa7b1cf3f530865640b65fbbd65b2c4e09 - languageName: node - linkType: hard - -"diff@npm:5.0.0": - version: 5.0.0 - resolution: "diff@npm:5.0.0" - checksum: 10c0/08c5904779bbababcd31f1707657b1ad57f8a9b65e6f88d3fb501d09a965d5f8d73066898a7d3f35981f9e4101892c61d99175d421f3b759533213c253d91134 - languageName: node - linkType: hard - -"diff@npm:^4.0.1, diff@npm:^4.0.2": - version: 4.0.2 - resolution: "diff@npm:4.0.2" - checksum: 10c0/81b91f9d39c4eaca068eb0c1eb0e4afbdc5bb2941d197f513dd596b820b956fef43485876226d65d497bebc15666aa2aa82c679e84f65d5f2bfbf14ee46e32c1 - languageName: node - linkType: hard - -"dir-compare@npm:^2.4.0": - version: 2.4.0 - resolution: "dir-compare@npm:2.4.0" - dependencies: - buffer-equal: "npm:1.0.0" - colors: "npm:1.0.3" - commander: "npm:2.9.0" - minimatch: "npm:3.0.4" - bin: - dircompare: src/cli/dircompare.js - checksum: 10c0/f1bf30faeeb2829f5d209ed72d94b3c4973c02765d2defc206e84963b3ce31fd0f5b0e86e9cf075dff917402846e7bb6efffd7836ea35c0ee46adcaad8ca345f - languageName: node - linkType: hard - -"dir-glob@npm:^3.0.1": - version: 3.0.1 - resolution: "dir-glob@npm:3.0.1" - dependencies: - path-type: "npm:^4.0.0" - checksum: 10c0/dcac00920a4d503e38bb64001acb19df4efc14536ada475725e12f52c16777afdee4db827f55f13a908ee7efc0cb282e2e3dbaeeb98c0993dd93d1802d3bf00c - languageName: node - linkType: hard - -"dmg-builder@npm:23.0.8": - version: 23.0.8 - resolution: "dmg-builder@npm:23.0.8" - dependencies: - app-builder-lib: "npm:23.0.8" - builder-util: "npm:23.0.8" - builder-util-runtime: "npm:9.0.2" - dmg-license: "npm:^1.0.11" - fs-extra: "npm:^10.0.0" - iconv-lite: "npm:^0.6.2" - js-yaml: "npm:^4.1.0" - dependenciesMeta: - dmg-license: - optional: true - checksum: 10c0/2c64b9c597a09cd3c9a42ddbca3571074e26645d172fa3fb21b5bbec392a6d90236056bca50d5792042cde701013d1347edbf4264fe20a654a63dcdbc8882edf - languageName: node - linkType: hard - -"dmg-builder@npm:23.6.0": - version: 23.6.0 - resolution: "dmg-builder@npm:23.6.0" - dependencies: - app-builder-lib: "npm:23.6.0" - builder-util: "npm:23.6.0" - builder-util-runtime: "npm:9.1.1" - dmg-license: "npm:^1.0.11" - fs-extra: "npm:^10.0.0" - iconv-lite: "npm:^0.6.2" - js-yaml: "npm:^4.1.0" - dependenciesMeta: - dmg-license: - optional: true - checksum: 10c0/3710e00e0b92305f3f744c8cf8dfcf54439785d724831b28e9e6944f9c63b510059d341212e059e0934bdc5243b30a6801153b490a9ad2bc1b9a1f07f690fa02 - languageName: node - linkType: hard - -"dmg-license@npm:^1.0.11": - version: 1.0.11 - resolution: "dmg-license@npm:1.0.11" - dependencies: - "@types/plist": "npm:^3.0.1" - "@types/verror": "npm:^1.10.3" - ajv: "npm:^6.10.0" - crc: "npm:^3.8.0" - iconv-corefoundation: "npm:^1.1.7" - plist: "npm:^3.0.4" - smart-buffer: "npm:^4.0.2" - verror: "npm:^1.10.0" - bin: - dmg-license: bin/dmg-license.js - conditions: os=darwin - languageName: node - linkType: hard - -"doctrine@npm:^2.1.0": - version: 2.1.0 - resolution: "doctrine@npm:2.1.0" - dependencies: - esutils: "npm:^2.0.2" - checksum: 10c0/b6416aaff1f380bf56c3b552f31fdf7a69b45689368deca72d28636f41c16bb28ec3ebc40ace97db4c1afc0ceeb8120e8492fe0046841c94c2933b2e30a7d5ac - languageName: node - linkType: hard - -"doctrine@npm:^3.0.0": - version: 3.0.0 - resolution: "doctrine@npm:3.0.0" - dependencies: - esutils: "npm:^2.0.2" - checksum: 10c0/c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520 - languageName: node - linkType: hard - -"dom-helpers@npm:^5.0.1, dom-helpers@npm:^5.1.3": - version: 5.2.1 - resolution: "dom-helpers@npm:5.2.1" - dependencies: - "@babel/runtime": "npm:^7.8.7" - csstype: "npm:^3.0.2" - checksum: 10c0/f735074d66dd759b36b158fa26e9d00c9388ee0e8c9b16af941c38f014a37fc80782de83afefd621681b19ac0501034b4f1c4a3bff5caa1b8667f0212b5e124c - languageName: node - linkType: hard - -"domexception@npm:^4.0.0": - version: 4.0.0 - resolution: "domexception@npm:4.0.0" - dependencies: - webidl-conversions: "npm:^7.0.0" - checksum: 10c0/774277cd9d4df033f852196e3c0077a34dbd15a96baa4d166e0e47138a80f4c0bdf0d94e4703e6ff5883cec56bb821a6fff84402d8a498e31de7c87eb932a294 - languageName: node - linkType: hard - -"dompurify@npm:^2.0.7": - version: 2.5.4 - resolution: "dompurify@npm:2.5.4" - checksum: 10c0/c7e974a24375295b5762e688807aeea6d972f393fc07dd0c24800c6aa31660d4e628184b7e5eaf36a1ae527249537a96e5eb440ddaa9b4872162cc0580b08238 - languageName: node - linkType: hard - -"dot-prop@npm:^5.1.0, dot-prop@npm:^5.2.0": - version: 5.3.0 - resolution: "dot-prop@npm:5.3.0" - dependencies: - is-obj: "npm:^2.0.0" - checksum: 10c0/93f0d343ef87fe8869320e62f2459f7e70f49c6098d948cc47e060f4a3f827d0ad61e83cb82f2bd90cd5b9571b8d334289978a43c0f98fea4f0e99ee8faa0599 - languageName: node - linkType: hard - -"dotenv-expand@npm:^5.1.0": - version: 5.1.0 - resolution: "dotenv-expand@npm:5.1.0" - checksum: 10c0/24ac633de853ef474d0421cc639328b7134109c8dc2baaa5e3afb7495af5e9237136d7e6971e55668e4dce915487eb140967cdd2b3e99aa439e0f6bf8b56faeb - languageName: node - linkType: hard - -"dotenv@npm:^9.0.2": - version: 9.0.2 - resolution: "dotenv@npm:9.0.2" - checksum: 10c0/535f04d59e0bf58fe0c7966886eff42fb5e0227e2f7bfa38d37439bbf6b3c25d1b085bd235c9b98e7e9a032b1cd310904366e5588b320c29335d359660fab0d4 - languageName: node - linkType: hard - -"eastasianwidth@npm:^0.2.0": - version: 0.2.0 - resolution: "eastasianwidth@npm:0.2.0" - checksum: 10c0/26f364ebcdb6395f95124fda411f63137a4bfb5d3a06453f7f23dfe52502905bd84e0488172e0f9ec295fdc45f05c23d5d91baf16bd26f0fe9acd777a188dc39 - languageName: node - linkType: hard - -"ejs@npm:^3.1.7": - version: 3.1.10 - resolution: "ejs@npm:3.1.10" - dependencies: - jake: "npm:^10.8.5" - bin: - ejs: bin/cli.js - checksum: 10c0/52eade9e68416ed04f7f92c492183340582a36482836b11eab97b159fcdcfdedc62233a1bf0bf5e5e1851c501f2dca0e2e9afd111db2599e4e7f53ee29429ae1 - languageName: node - linkType: hard - -"electron-builder@npm:23.0.8": - version: 23.0.8 - resolution: "electron-builder@npm:23.0.8" - dependencies: - "@types/yargs": "npm:^17.0.1" - app-builder-lib: "npm:23.0.8" - builder-util: "npm:23.0.8" - builder-util-runtime: "npm:9.0.2" - chalk: "npm:^4.1.1" - dmg-builder: "npm:23.0.8" - fs-extra: "npm:^10.0.0" - is-ci: "npm:^3.0.0" - lazy-val: "npm:^1.0.5" - read-config-file: "npm:6.2.0" - update-notifier: "npm:^5.1.0" - yargs: "npm:^17.0.1" - bin: - electron-builder: cli.js - install-app-deps: install-app-deps.js - checksum: 10c0/041fd75d52ac9ab2fecb880b2a1264833e3475a749de608c3cb08cbee845587784796f7ca2c963f4cd81672591b2366a1bdb9b125d1c517f292463279a4869e3 - languageName: node - linkType: hard - -"electron-is-accelerator@npm:^0.1.0": - version: 0.1.2 - resolution: "electron-is-accelerator@npm:0.1.2" - checksum: 10c0/120da55c3b581cbca5eccdd80c9099574a7aa0a8ea8b9fd4e5dcd906dcf83308c94587ad771b066cdd073e45e68dbe4c06256602998f16ccafbcfe1cab968718 - languageName: node - linkType: hard - -"electron-localshortcut@npm:^3.2.1": - version: 3.2.1 - resolution: "electron-localshortcut@npm:3.2.1" - dependencies: - debug: "npm:^4.0.1" - electron-is-accelerator: "npm:^0.1.0" - keyboardevent-from-electron-accelerator: "npm:^2.0.0" - keyboardevents-areequal: "npm:^0.2.1" - checksum: 10c0/6490a1dd0155926d5664500d45a5acb4771ba96e3ad4a878367e24ab96096c8824197cf3e2890a4f51b0307665afe680fe5f22dae2e4ba781cf32ddab9dcc335 - languageName: node - linkType: hard - -"electron-osx-sign@npm:^0.6.0": - version: 0.6.0 - resolution: "electron-osx-sign@npm:0.6.0" - dependencies: - bluebird: "npm:^3.5.0" - compare-version: "npm:^0.1.2" - debug: "npm:^2.6.8" - isbinaryfile: "npm:^3.0.2" - minimist: "npm:^1.2.0" - plist: "npm:^3.0.1" - bin: - electron-osx-flat: bin/electron-osx-flat.js - electron-osx-sign: bin/electron-osx-sign.js - checksum: 10c0/57ff8a90b59ad976de7c1cfc9c3813c24b1d2f56fd117a753f717b6157f244184e5696cb6e024b4491f0c9b2e0856b82cc983bf66fc2b21735175246d37aab6b - languageName: node - linkType: hard - -"electron-publish@npm:23.0.8": - version: 23.0.8 - resolution: "electron-publish@npm:23.0.8" - dependencies: - "@types/fs-extra": "npm:^9.0.11" - builder-util: "npm:23.0.8" - builder-util-runtime: "npm:9.0.2" - chalk: "npm:^4.1.1" - fs-extra: "npm:^10.0.0" - lazy-val: "npm:^1.0.5" - mime: "npm:^2.5.2" - checksum: 10c0/cdd1b11254cca9c46d0374098ba30944a5a42ebc13430fc01ff39ad54c2681051cab7db15a783c43d56d9e465b8ed6535e422e1479665776a750c8d5a7bb6a21 - languageName: node - linkType: hard - -"electron-publish@npm:23.6.0": - version: 23.6.0 - resolution: "electron-publish@npm:23.6.0" - dependencies: - "@types/fs-extra": "npm:^9.0.11" - builder-util: "npm:23.6.0" - builder-util-runtime: "npm:9.1.1" - chalk: "npm:^4.1.1" - fs-extra: "npm:^10.0.0" - lazy-val: "npm:^1.0.5" - mime: "npm:^2.5.2" - checksum: 10c0/89e9378894ef4582cbfc56a173cefb301b39a59e8fe8a8ac9e9f54d416acff809c1187bd9ee933ac7629c37a66d2768402f55fcd3bc5119da95665bfd788ce87 - languageName: node - linkType: hard - -"electron-to-chromium@npm:^1.4.668": - version: 1.4.783 - resolution: "electron-to-chromium@npm:1.4.783" - checksum: 10c0/d112e5602e2ee7516ead648e2d2449027f1106147858442781ac475f9a3861a783cb6c8f4638316800f5eff2c4a1f046cd412704678c90479c5417bf204de572 - languageName: node - linkType: hard - -"electron-updater@npm:^4.2.2": - version: 4.6.5 - resolution: "electron-updater@npm:4.6.5" - dependencies: - "@types/semver": "npm:^7.3.6" - builder-util-runtime: "npm:8.9.2" - fs-extra: "npm:^10.0.0" - js-yaml: "npm:^4.1.0" - lazy-val: "npm:^1.0.5" - lodash.escaperegexp: "npm:^4.1.2" - lodash.isequal: "npm:^4.5.0" - semver: "npm:^7.3.5" - checksum: 10c0/a1db9e796d51545165bba4d200d753e91fb71b2b33c08de4ebbc692ec56a7439a3f6135e8cee95cc934cd34a6f43d25fd252e792f8a77530d3c00ea9b2586640 - languageName: node - linkType: hard - -"electron@npm:*": - version: 30.0.8 - resolution: "electron@npm:30.0.8" - dependencies: - "@electron/get": "npm:^2.0.0" - "@types/node": "npm:^20.9.0" - extract-zip: "npm:^2.0.1" - bin: - electron: cli.js - checksum: 10c0/eedeb7e2a922c8cd59df1b8413317a510d58eb1d12bd6cdaeef20461d3553f5880d441efee91e702798f17271066f1bc120785624fc561bee998ab46c3740470 - languageName: node - linkType: hard - -"electron@npm:25.8.4": - version: 25.8.4 - resolution: "electron@npm:25.8.4" - dependencies: - "@electron/get": "npm:^2.0.0" - "@types/node": "npm:^18.11.18" - extract-zip: "npm:^2.0.1" - bin: - electron: cli.js - checksum: 10c0/edeafc3c001df180178ba568e7ffef0e3fbe78b28fed7e21004857b5b7cda11726f021e77bb2c4d326dcfc6599003ef109b0853c94434ce9b133178fd8c6d39f - languageName: node - linkType: hard - -"emoji-mart@npm:^5.5.2": - version: 5.6.0 - resolution: "emoji-mart@npm:5.6.0" - checksum: 10c0/23e68ab10984f101b696d8f8e103e553ffa8e4d644e9a315190a9657903f71b833db09aac51b05de20f33bb9eef5bc1425eecdb2437042b25aff2dad0231f029 - languageName: node - linkType: hard - -"emoji-regex@npm:^8.0.0": - version: 8.0.0 - resolution: "emoji-regex@npm:8.0.0" - checksum: 10c0/b6053ad39951c4cf338f9092d7bfba448cdfd46fe6a2a034700b149ac9ffbc137e361cbd3c442297f86bed2e5f7576c1b54cc0a6bf8ef5106cc62f496af35010 - languageName: node - linkType: hard - -"emoji-regex@npm:^9.2.2": - version: 9.2.2 - resolution: "emoji-regex@npm:9.2.2" - checksum: 10c0/af014e759a72064cf66e6e694a7fc6b0ed3d8db680427b021a89727689671cefe9d04151b2cad51dbaf85d5ba790d061cd167f1cf32eb7b281f6368b3c181639 - languageName: node - linkType: hard - -"emojis-list@npm:^3.0.0": - version: 3.0.0 - resolution: "emojis-list@npm:3.0.0" - checksum: 10c0/7dc4394b7b910444910ad64b812392159a21e1a7ecc637c775a440227dcb4f80eff7fe61f4453a7d7603fa23d23d30cc93fe9e4b5ed985b88d6441cd4a35117b - languageName: node - linkType: hard - -"encoding@npm:^0.1.13": - version: 0.1.13 - resolution: "encoding@npm:0.1.13" - dependencies: - iconv-lite: "npm:^0.6.2" - checksum: 10c0/36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039 - languageName: node - linkType: hard - -"end-of-stream@npm:^1.1.0": - version: 1.4.4 - resolution: "end-of-stream@npm:1.4.4" - dependencies: - once: "npm:^1.4.0" - checksum: 10c0/870b423afb2d54bb8d243c63e07c170409d41e20b47eeef0727547aea5740bd6717aca45597a9f2745525667a6b804c1e7bede41f856818faee5806dd9ff3975 - languageName: node - linkType: hard - -"enhanced-resolve@npm:^5.0.0, enhanced-resolve@npm:^5.12.0, enhanced-resolve@npm:^5.16.0": - version: 5.16.1 - resolution: "enhanced-resolve@npm:5.16.1" - dependencies: - graceful-fs: "npm:^4.2.4" - tapable: "npm:^2.2.0" - checksum: 10c0/57d52625b978f18b32351a03006699de1e3695ce27af936ab4f1f98d3a4c825b219b445910bb4eef398303bbb5f37d7e382f842513d0f3a32614b78f6fd07ab7 - languageName: node - linkType: hard - -"entities@npm:^4.4.0": - version: 4.5.0 - resolution: "entities@npm:4.5.0" - checksum: 10c0/5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250 - languageName: node - linkType: hard - -"env-paths@npm:^2.2.0": - version: 2.2.1 - resolution: "env-paths@npm:2.2.1" - checksum: 10c0/285325677bf00e30845e330eec32894f5105529db97496ee3f598478e50f008c5352a41a30e5e72ec9de8a542b5a570b85699cd63bd2bc646dbcb9f311d83bc4 - languageName: node - linkType: hard - -"envinfo@npm:^7.7.3": - version: 7.13.0 - resolution: "envinfo@npm:7.13.0" - bin: - envinfo: dist/cli.js - checksum: 10c0/9c279213cbbb353b3171e8e333fd2ed564054abade08ab3d735fe136e10a0e14e0588e1ce77e6f01285f2462eaca945d64f0778be5ae3d9e82804943e36a4411 - languageName: node - linkType: hard - -"err-code@npm:^2.0.2": - version: 2.0.3 - resolution: "err-code@npm:2.0.3" - checksum: 10c0/b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66 - languageName: node - linkType: hard - -"error-ex@npm:^1.3.1": - version: 1.3.2 - resolution: "error-ex@npm:1.3.2" - dependencies: - is-arrayish: "npm:^0.2.1" - checksum: 10c0/ba827f89369b4c93382cfca5a264d059dfefdaa56ecc5e338ffa58a6471f5ed93b71a20add1d52290a4873d92381174382658c885ac1a2305f7baca363ce9cce - languageName: node - linkType: hard - -"error-stack-parser@npm:^2.0.6": - version: 2.1.4 - resolution: "error-stack-parser@npm:2.1.4" - dependencies: - stackframe: "npm:^1.3.4" - checksum: 10c0/7679b780043c98b01fc546725484e0cfd3071bf5c906bbe358722972f04abf4fc3f0a77988017665bab367f6ef3fc2d0185f7528f45966b83e7c99c02d5509b9 - languageName: node - linkType: hard - -"es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.1, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3": - version: 1.23.3 - resolution: "es-abstract@npm:1.23.3" - dependencies: - array-buffer-byte-length: "npm:^1.0.1" - arraybuffer.prototype.slice: "npm:^1.0.3" - available-typed-arrays: "npm:^1.0.7" - call-bind: "npm:^1.0.7" - data-view-buffer: "npm:^1.0.1" - data-view-byte-length: "npm:^1.0.1" - data-view-byte-offset: "npm:^1.0.0" - es-define-property: "npm:^1.0.0" - es-errors: "npm:^1.3.0" - es-object-atoms: "npm:^1.0.0" - es-set-tostringtag: "npm:^2.0.3" - es-to-primitive: "npm:^1.2.1" - function.prototype.name: "npm:^1.1.6" - get-intrinsic: "npm:^1.2.4" - get-symbol-description: "npm:^1.0.2" - globalthis: "npm:^1.0.3" - gopd: "npm:^1.0.1" - has-property-descriptors: "npm:^1.0.2" - has-proto: "npm:^1.0.3" - has-symbols: "npm:^1.0.3" - hasown: "npm:^2.0.2" - internal-slot: "npm:^1.0.7" - is-array-buffer: "npm:^3.0.4" - is-callable: "npm:^1.2.7" - is-data-view: "npm:^1.0.1" - is-negative-zero: "npm:^2.0.3" - is-regex: "npm:^1.1.4" - is-shared-array-buffer: "npm:^1.0.3" - is-string: "npm:^1.0.7" - is-typed-array: "npm:^1.1.13" - is-weakref: "npm:^1.0.2" - object-inspect: "npm:^1.13.1" - object-keys: "npm:^1.1.1" - object.assign: "npm:^4.1.5" - regexp.prototype.flags: "npm:^1.5.2" - safe-array-concat: "npm:^1.1.2" - safe-regex-test: "npm:^1.0.3" - string.prototype.trim: "npm:^1.2.9" - string.prototype.trimend: "npm:^1.0.8" - string.prototype.trimstart: "npm:^1.0.8" - typed-array-buffer: "npm:^1.0.2" - typed-array-byte-length: "npm:^1.0.1" - typed-array-byte-offset: "npm:^1.0.2" - typed-array-length: "npm:^1.0.6" - unbox-primitive: "npm:^1.0.2" - which-typed-array: "npm:^1.1.15" - checksum: 10c0/d27e9afafb225c6924bee9971a7f25f20c314f2d6cb93a63cada4ac11dcf42040896a6c22e5fb8f2a10767055ed4ddf400be3b1eb12297d281726de470b75666 - languageName: node - linkType: hard - -"es-define-property@npm:^1.0.0": - version: 1.0.0 - resolution: "es-define-property@npm:1.0.0" - dependencies: - get-intrinsic: "npm:^1.2.4" - checksum: 10c0/6bf3191feb7ea2ebda48b577f69bdfac7a2b3c9bcf97307f55fd6ef1bbca0b49f0c219a935aca506c993d8c5d8bddd937766cb760cd5e5a1071351f2df9f9aa4 - languageName: node - linkType: hard - -"es-errors@npm:^1.1.0, es-errors@npm:^1.2.1, es-errors@npm:^1.3.0": - version: 1.3.0 - resolution: "es-errors@npm:1.3.0" - checksum: 10c0/0a61325670072f98d8ae3b914edab3559b6caa980f08054a3b872052640d91da01d38df55df797fcc916389d77fc92b8d5906cf028f4db46d7e3003abecbca85 - languageName: node - linkType: hard - -"es-iterator-helpers@npm:^1.0.12": - version: 1.0.19 - resolution: "es-iterator-helpers@npm:1.0.19" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.3" - es-errors: "npm:^1.3.0" - es-set-tostringtag: "npm:^2.0.3" - function-bind: "npm:^1.1.2" - get-intrinsic: "npm:^1.2.4" - globalthis: "npm:^1.0.3" - has-property-descriptors: "npm:^1.0.2" - has-proto: "npm:^1.0.3" - has-symbols: "npm:^1.0.3" - internal-slot: "npm:^1.0.7" - iterator.prototype: "npm:^1.1.2" - safe-array-concat: "npm:^1.1.2" - checksum: 10c0/ae8f0241e383b3d197383b9842c48def7fce0255fb6ed049311b686ce295595d9e389b466f6a1b7d4e7bb92d82f5e716d6fae55e20c1040249bf976743b038c5 - languageName: node - linkType: hard - -"es-module-lexer@npm:^1.2.1": - version: 1.5.3 - resolution: "es-module-lexer@npm:1.5.3" - checksum: 10c0/0f50b655490d1048432eac6eec94d99d3933119666ae82be578c3db1ea4b2c594118a336f6b7a3c4e2815355dcc9a469d880acef1c45aa656a5aae8c8ae8e5f6 - languageName: node - linkType: hard - -"es-object-atoms@npm:^1.0.0": - version: 1.0.0 - resolution: "es-object-atoms@npm:1.0.0" - dependencies: - es-errors: "npm:^1.3.0" - checksum: 10c0/1fed3d102eb27ab8d983337bb7c8b159dd2a1e63ff833ec54eea1311c96d5b08223b433060ba240541ca8adba9eee6b0a60cdbf2f80634b784febc9cc8b687b4 - languageName: node - linkType: hard - -"es-set-tostringtag@npm:^2.0.3": - version: 2.0.3 - resolution: "es-set-tostringtag@npm:2.0.3" - dependencies: - get-intrinsic: "npm:^1.2.4" - has-tostringtag: "npm:^1.0.2" - hasown: "npm:^2.0.1" - checksum: 10c0/f22aff1585eb33569c326323f0b0d175844a1f11618b86e193b386f8be0ea9474cfbe46df39c45d959f7aa8f6c06985dc51dd6bce5401645ec5a74c4ceaa836a - languageName: node - linkType: hard - -"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2": - version: 1.0.2 - resolution: "es-shim-unscopables@npm:1.0.2" - dependencies: - hasown: "npm:^2.0.0" - checksum: 10c0/f495af7b4b7601a4c0cfb893581c352636e5c08654d129590386a33a0432cf13a7bdc7b6493801cadd990d838e2839b9013d1de3b880440cb537825e834fe783 - languageName: node - linkType: hard - -"es-to-primitive@npm:^1.2.1": - version: 1.2.1 - resolution: "es-to-primitive@npm:1.2.1" - dependencies: - is-callable: "npm:^1.1.4" - is-date-object: "npm:^1.0.1" - is-symbol: "npm:^1.0.2" - checksum: 10c0/0886572b8dc075cb10e50c0af62a03d03a68e1e69c388bd4f10c0649ee41b1fbb24840a1b7e590b393011b5cdbe0144b776da316762653685432df37d6de60f1 - languageName: node - linkType: hard - -"es6-error@npm:^4.1.1": - version: 4.1.1 - resolution: "es6-error@npm:4.1.1" - checksum: 10c0/357663fb1e845c047d548c3d30f86e005db71e122678f4184ced0693f634688c3f3ef2d7de7d4af732f734de01f528b05954e270f06aa7d133679fb9fe6600ef - languageName: node - linkType: hard - -"escalade@npm:^3.1.1, escalade@npm:^3.1.2": - version: 3.1.2 - resolution: "escalade@npm:3.1.2" - checksum: 10c0/6b4adafecd0682f3aa1cd1106b8fff30e492c7015b178bc81b2d2f75106dabea6c6d6e8508fc491bd58e597c74abb0e8e2368f943ecb9393d4162e3c2f3cf287 - languageName: node - linkType: hard - -"escape-goat@npm:^2.0.0": - version: 2.1.1 - resolution: "escape-goat@npm:2.1.1" - checksum: 10c0/fc0ad656f89c05e86a9641a21bdc5ea37b258714c057430b68a834854fa3e5770cda7d41756108863fc68b1e36a0946463017b7553ac39eaaf64815be07816fc - languageName: node - linkType: hard - -"escape-string-regexp@npm:4.0.0, escape-string-regexp@npm:^4.0.0": - version: 4.0.0 - resolution: "escape-string-regexp@npm:4.0.0" - checksum: 10c0/9497d4dd307d845bd7f75180d8188bb17ea8c151c1edbf6b6717c100e104d629dc2dfb687686181b0f4b7d732c7dfdc4d5e7a8ff72de1b0ca283a75bbb3a9cd9 - languageName: node - linkType: hard - -"escape-string-regexp@npm:^1.0.5": - version: 1.0.5 - resolution: "escape-string-regexp@npm:1.0.5" - checksum: 10c0/a968ad453dd0c2724e14a4f20e177aaf32bb384ab41b674a8454afe9a41c5e6fe8903323e0a1052f56289d04bd600f81278edf140b0fcc02f5cac98d0f5b5371 - languageName: node - linkType: hard - -"escape-string-regexp@npm:^2.0.0": - version: 2.0.0 - resolution: "escape-string-regexp@npm:2.0.0" - checksum: 10c0/2530479fe8db57eace5e8646c9c2a9c80fa279614986d16dcc6bcaceb63ae77f05a851ba6c43756d816c61d7f4534baf56e3c705e3e0d884818a46808811c507 - languageName: node - linkType: hard - -"escodegen@npm:^1.13.0": - version: 1.14.3 - resolution: "escodegen@npm:1.14.3" - dependencies: - esprima: "npm:^4.0.1" - estraverse: "npm:^4.2.0" - esutils: "npm:^2.0.2" - optionator: "npm:^0.8.1" - source-map: "npm:~0.6.1" - dependenciesMeta: - source-map: - optional: true - bin: - escodegen: bin/escodegen.js - esgenerate: bin/esgenerate.js - checksum: 10c0/30d337803e8f44308c90267bf6192399e4b44792497c77a7506b68ab802ba6a48ebbe1ce77b219aba13dfd2de5f5e1c267e35be1ed87b2a9c3315e8b283e302a - languageName: node - linkType: hard - -"eslint-config-airbnb-base@npm:^15.0.0": - version: 15.0.0 - resolution: "eslint-config-airbnb-base@npm:15.0.0" - dependencies: - confusing-browser-globals: "npm:^1.0.10" - object.assign: "npm:^4.1.2" - object.entries: "npm:^1.1.5" - semver: "npm:^6.3.0" - peerDependencies: - eslint: ^7.32.0 || ^8.2.0 - eslint-plugin-import: ^2.25.2 - checksum: 10c0/93639d991654414756f82ad7860aac30b0dc6797277b7904ddb53ed88a32c470598696bbc6c503e066414024d305221974d3769e6642de65043bedf29cbbd30f - languageName: node - linkType: hard - -"eslint-config-prettier@npm:9.1.0": - version: 9.1.0 - resolution: "eslint-config-prettier@npm:9.1.0" - peerDependencies: - eslint: ">=7.0.0" - bin: - eslint-config-prettier: bin/cli.js - checksum: 10c0/6d332694b36bc9ac6fdb18d3ca2f6ac42afa2ad61f0493e89226950a7091e38981b66bac2b47ba39d15b73fff2cd32c78b850a9cf9eed9ca9a96bfb2f3a2f10d - languageName: node - linkType: hard - -"eslint-import-resolver-node@npm:^0.3.9": - version: 0.3.9 - resolution: "eslint-import-resolver-node@npm:0.3.9" - dependencies: - debug: "npm:^3.2.7" - is-core-module: "npm:^2.13.0" - resolve: "npm:^1.22.4" - checksum: 10c0/0ea8a24a72328a51fd95aa8f660dcca74c1429806737cf10261ab90cfcaaf62fd1eff664b76a44270868e0a932711a81b250053942595bcd00a93b1c1575dd61 - languageName: node - linkType: hard - -"eslint-import-resolver-typescript@npm:3.6.1": - version: 3.6.1 - resolution: "eslint-import-resolver-typescript@npm:3.6.1" - dependencies: - debug: "npm:^4.3.4" - enhanced-resolve: "npm:^5.12.0" - eslint-module-utils: "npm:^2.7.4" - fast-glob: "npm:^3.3.1" - get-tsconfig: "npm:^4.5.0" - is-core-module: "npm:^2.11.0" - is-glob: "npm:^4.0.3" - peerDependencies: - eslint: "*" - eslint-plugin-import: "*" - checksum: 10c0/cb1cb4389916fe78bf8c8567aae2f69243dbfe624bfe21078c56ad46fa1ebf0634fa7239dd3b2055ab5c27359e4b4c28b69b11fcb3a5df8a9e6f7add8e034d86 - languageName: node - linkType: hard - -"eslint-module-utils@npm:^2.7.4, eslint-module-utils@npm:^2.8.0": - version: 2.8.1 - resolution: "eslint-module-utils@npm:2.8.1" - dependencies: - debug: "npm:^3.2.7" - peerDependenciesMeta: - eslint: - optional: true - checksum: 10c0/1aeeb97bf4b688d28de136ee57c824480c37691b40fa825c711a4caf85954e94b99c06ac639d7f1f6c1d69223bd21bcb991155b3e589488e958d5b83dfd0f882 - languageName: node - linkType: hard - -"eslint-plugin-import@npm:2.29.1": - version: 2.29.1 - resolution: "eslint-plugin-import@npm:2.29.1" - dependencies: - array-includes: "npm:^3.1.7" - array.prototype.findlastindex: "npm:^1.2.3" - array.prototype.flat: "npm:^1.3.2" - array.prototype.flatmap: "npm:^1.3.2" - debug: "npm:^3.2.7" - doctrine: "npm:^2.1.0" - eslint-import-resolver-node: "npm:^0.3.9" - eslint-module-utils: "npm:^2.8.0" - hasown: "npm:^2.0.0" - is-core-module: "npm:^2.13.1" - is-glob: "npm:^4.0.3" - minimatch: "npm:^3.1.2" - object.fromentries: "npm:^2.0.7" - object.groupby: "npm:^1.0.1" - object.values: "npm:^1.1.7" - semver: "npm:^6.3.1" - tsconfig-paths: "npm:^3.15.0" - peerDependencies: - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: 10c0/5f35dfbf4e8e67f741f396987de9504ad125c49f4144508a93282b4ea0127e052bde65ab6def1f31b6ace6d5d430be698333f75bdd7dca3bc14226c92a083196 - languageName: node - linkType: hard - -"eslint-plugin-mocha@npm:^10.1.0": - version: 10.4.3 - resolution: "eslint-plugin-mocha@npm:10.4.3" - dependencies: - eslint-utils: "npm:^3.0.0" - globals: "npm:^13.24.0" - rambda: "npm:^7.4.0" - peerDependencies: - eslint: ">=7.0.0" - checksum: 10c0/4161132800363a2c9bbb89a77ac8a1055100b8882530ff06e4067c3c5d2b30af974e09a1b079a96eb696d8ec44d4a9ed56bdc3c03359149d4448baa38395463b - languageName: node - linkType: hard - -"eslint-plugin-more@npm:^1.0.5": - version: 1.0.5 - resolution: "eslint-plugin-more@npm:1.0.5" - peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: 10c0/ad7d39c43d49724f0d690558392170f4e4a1fd48f166f63713ae14627d40a3dc98c0333f608694a71f48c08b38f866ece5591cc5b6ad5d51cf5eb36aea55ff00 - languageName: node - linkType: hard - -"eslint-plugin-react-hooks@npm:^4.6.0": - version: 4.6.2 - resolution: "eslint-plugin-react-hooks@npm:4.6.2" - peerDependencies: - eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 - checksum: 10c0/4844e58c929bc05157fb70ba1e462e34f1f4abcbc8dd5bbe5b04513d33e2699effb8bca668297976ceea8e7ebee4e8fc29b9af9d131bcef52886feaa2308b2cc - languageName: node - linkType: hard - -"eslint-plugin-react@npm:7.33.2": - version: 7.33.2 - resolution: "eslint-plugin-react@npm:7.33.2" - dependencies: - array-includes: "npm:^3.1.6" - array.prototype.flatmap: "npm:^1.3.1" - array.prototype.tosorted: "npm:^1.1.1" - doctrine: "npm:^2.1.0" - es-iterator-helpers: "npm:^1.0.12" - estraverse: "npm:^5.3.0" - jsx-ast-utils: "npm:^2.4.1 || ^3.0.0" - minimatch: "npm:^3.1.2" - object.entries: "npm:^1.1.6" - object.fromentries: "npm:^2.0.6" - object.hasown: "npm:^1.1.2" - object.values: "npm:^1.1.6" - prop-types: "npm:^15.8.1" - resolve: "npm:^2.0.0-next.4" - semver: "npm:^6.3.1" - string.prototype.matchall: "npm:^4.0.8" - peerDependencies: - eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: 10c0/f9b247861024bafc396c4bd3c9ac946604b3b23077251c98f23602aa22027a0c33a69157fd49564e4ff7f17b3678e5dc366a46c7ec42a09454d7cbce786d5001 - languageName: node - linkType: hard - -"eslint-scope@npm:5.1.1": - version: 5.1.1 - resolution: "eslint-scope@npm:5.1.1" - dependencies: - esrecurse: "npm:^4.3.0" - estraverse: "npm:^4.1.1" - checksum: 10c0/d30ef9dc1c1cbdece34db1539a4933fe3f9b14e1ffb27ecc85987902ee663ad7c9473bbd49a9a03195a373741e62e2f807c4938992e019b511993d163450e70a - languageName: node - linkType: hard - -"eslint-scope@npm:^7.2.2": - version: 7.2.2 - resolution: "eslint-scope@npm:7.2.2" - dependencies: - esrecurse: "npm:^4.3.0" - estraverse: "npm:^5.2.0" - checksum: 10c0/613c267aea34b5a6d6c00514e8545ef1f1433108097e857225fed40d397dd6b1809dffd11c2fde23b37ca53d7bf935fe04d2a18e6fc932b31837b6ad67e1c116 - languageName: node - linkType: hard - -"eslint-utils@npm:^3.0.0": - version: 3.0.0 - resolution: "eslint-utils@npm:3.0.0" - dependencies: - eslint-visitor-keys: "npm:^2.0.0" - peerDependencies: - eslint: ">=5" - checksum: 10c0/45aa2b63667a8d9b474c98c28af908d0a592bed1a4568f3145cd49fb5d9510f545327ec95561625290313fe126e6d7bdfe3fdbdb6f432689fab6b9497d3bfb52 - languageName: node - linkType: hard - -"eslint-visitor-keys@npm:^2.0.0": - version: 2.1.0 - resolution: "eslint-visitor-keys@npm:2.1.0" - checksum: 10c0/9f0e3a2db751d84067d15977ac4b4472efd6b303e369e6ff241a99feac04da758f46d5add022c33d06b53596038dbae4b4aceb27c7e68b8dfc1055b35e495787 - languageName: node - linkType: hard - -"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3": - version: 3.4.3 - resolution: "eslint-visitor-keys@npm:3.4.3" - checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820 - languageName: node - linkType: hard - -"eslint@npm:8.57.0": - version: 8.57.0 - resolution: "eslint@npm:8.57.0" - dependencies: - "@eslint-community/eslint-utils": "npm:^4.2.0" - "@eslint-community/regexpp": "npm:^4.6.1" - "@eslint/eslintrc": "npm:^2.1.4" - "@eslint/js": "npm:8.57.0" - "@humanwhocodes/config-array": "npm:^0.11.14" - "@humanwhocodes/module-importer": "npm:^1.0.1" - "@nodelib/fs.walk": "npm:^1.2.8" - "@ungap/structured-clone": "npm:^1.2.0" - ajv: "npm:^6.12.4" - chalk: "npm:^4.0.0" - cross-spawn: "npm:^7.0.2" - debug: "npm:^4.3.2" - doctrine: "npm:^3.0.0" - escape-string-regexp: "npm:^4.0.0" - eslint-scope: "npm:^7.2.2" - eslint-visitor-keys: "npm:^3.4.3" - espree: "npm:^9.6.1" - esquery: "npm:^1.4.2" - esutils: "npm:^2.0.2" - fast-deep-equal: "npm:^3.1.3" - file-entry-cache: "npm:^6.0.1" - find-up: "npm:^5.0.0" - glob-parent: "npm:^6.0.2" - globals: "npm:^13.19.0" - graphemer: "npm:^1.4.0" - ignore: "npm:^5.2.0" - imurmurhash: "npm:^0.1.4" - is-glob: "npm:^4.0.0" - is-path-inside: "npm:^3.0.3" - js-yaml: "npm:^4.1.0" - json-stable-stringify-without-jsonify: "npm:^1.0.1" - levn: "npm:^0.4.1" - lodash.merge: "npm:^4.6.2" - minimatch: "npm:^3.1.2" - natural-compare: "npm:^1.4.0" - optionator: "npm:^0.9.3" - strip-ansi: "npm:^6.0.1" - text-table: "npm:^0.2.0" - bin: - eslint: bin/eslint.js - checksum: 10c0/00bb96fd2471039a312435a6776fe1fd557c056755eaa2b96093ef3a8508c92c8775d5f754768be6b1dddd09fdd3379ddb231eeb9b6c579ee17ea7d68000a529 - languageName: node - linkType: hard - -"espree@npm:^9.0.0, espree@npm:^9.6.0, espree@npm:^9.6.1": - version: 9.6.1 - resolution: "espree@npm:9.6.1" - dependencies: - acorn: "npm:^8.9.0" - acorn-jsx: "npm:^5.3.2" - eslint-visitor-keys: "npm:^3.4.1" - checksum: 10c0/1a2e9b4699b715347f62330bcc76aee224390c28bb02b31a3752e9d07549c473f5f986720483c6469cf3cfb3c9d05df612ffc69eb1ee94b54b739e67de9bb460 - languageName: node - linkType: hard - -"esprima@npm:^4.0.1": - version: 4.0.1 - resolution: "esprima@npm:4.0.1" - bin: - esparse: ./bin/esparse.js - esvalidate: ./bin/esvalidate.js - checksum: 10c0/ad4bab9ead0808cf56501750fd9d3fb276f6b105f987707d059005d57e182d18a7c9ec7f3a01794ebddcca676773e42ca48a32d67a250c9d35e009ca613caba3 - languageName: node - linkType: hard - -"esquery@npm:^1.4.2": - version: 1.5.0 - resolution: "esquery@npm:1.5.0" - dependencies: - estraverse: "npm:^5.1.0" - checksum: 10c0/a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213 - languageName: node - linkType: hard - -"esrecurse@npm:^4.3.0": - version: 4.3.0 - resolution: "esrecurse@npm:4.3.0" - dependencies: - estraverse: "npm:^5.2.0" - checksum: 10c0/81a37116d1408ded88ada45b9fb16dbd26fba3aadc369ce50fcaf82a0bac12772ebd7b24cd7b91fc66786bf2c1ac7b5f196bc990a473efff972f5cb338877cf5 - languageName: node - linkType: hard - -"estraverse@npm:^4.1.1, estraverse@npm:^4.2.0": - version: 4.3.0 - resolution: "estraverse@npm:4.3.0" - checksum: 10c0/9cb46463ef8a8a4905d3708a652d60122a0c20bb58dec7e0e12ab0e7235123d74214fc0141d743c381813e1b992767e2708194f6f6e0f9fd00c1b4e0887b8b6d - languageName: node - linkType: hard - -"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0": - version: 5.3.0 - resolution: "estraverse@npm:5.3.0" - checksum: 10c0/1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107 - languageName: node - linkType: hard - -"esutils@npm:^2.0.2": - version: 2.0.3 - resolution: "esutils@npm:2.0.3" - checksum: 10c0/9a2fe69a41bfdade834ba7c42de4723c97ec776e40656919c62cbd13607c45e127a003f05f724a1ea55e5029a4cf2de444b13009f2af71271e42d93a637137c7 - languageName: node - linkType: hard - -"event-target-shim@npm:^5.0.0": - version: 5.0.1 - resolution: "event-target-shim@npm:5.0.1" - checksum: 10c0/0255d9f936215fd206156fd4caa9e8d35e62075d720dc7d847e89b417e5e62cf1ce6c9b4e0a1633a9256de0efefaf9f8d26924b1f3c8620cffb9db78e7d3076b - languageName: node - linkType: hard - -"eventemitter3@npm:^5.0.1": - version: 5.0.1 - resolution: "eventemitter3@npm:5.0.1" - checksum: 10c0/4ba5c00c506e6c786b4d6262cfbce90ddc14c10d4667e5c83ae993c9de88aa856033994dd2b35b83e8dc1170e224e66a319fa80adc4c32adcd2379bbc75da814 - languageName: node - linkType: hard - -"events@npm:^3.2.0, events@npm:^3.3.0": - version: 3.3.0 - resolution: "events@npm:3.3.0" - checksum: 10c0/d6b6f2adbccbcda74ddbab52ed07db727ef52e31a61ed26db9feb7dc62af7fc8e060defa65e5f8af9449b86b52cc1a1f6a79f2eafcf4e62add2b7a1fa4a432f6 - languageName: node - linkType: hard - -"execa@npm:7.2.0": - version: 7.2.0 - resolution: "execa@npm:7.2.0" - dependencies: - cross-spawn: "npm:^7.0.3" - get-stream: "npm:^6.0.1" - human-signals: "npm:^4.3.0" - is-stream: "npm:^3.0.0" - merge-stream: "npm:^2.0.0" - npm-run-path: "npm:^5.1.0" - onetime: "npm:^6.0.0" - signal-exit: "npm:^3.0.7" - strip-final-newline: "npm:^3.0.0" - checksum: 10c0/098cd6a1bc26d509e5402c43f4971736450b84d058391820c6f237aeec6436963e006fd8423c9722f148c53da86aa50045929c7278b5522197dff802d10f9885 - languageName: node - linkType: hard - -"execa@npm:^4.0.0": - version: 4.1.0 - resolution: "execa@npm:4.1.0" - dependencies: - cross-spawn: "npm:^7.0.0" - get-stream: "npm:^5.0.0" - human-signals: "npm:^1.1.1" - is-stream: "npm:^2.0.0" - merge-stream: "npm:^2.0.0" - npm-run-path: "npm:^4.0.0" - onetime: "npm:^5.1.0" - signal-exit: "npm:^3.0.2" - strip-final-newline: "npm:^2.0.0" - checksum: 10c0/02211601bb1c52710260edcc68fb84c3c030dc68bafc697c90ada3c52cc31375337de8c24826015b8382a58d63569ffd203b79c94fef217d65503e3e8d2c52ba - languageName: node - linkType: hard - -"execa@npm:^5.0.0": - version: 5.1.1 - resolution: "execa@npm:5.1.1" - dependencies: - cross-spawn: "npm:^7.0.3" - get-stream: "npm:^6.0.0" - human-signals: "npm:^2.1.0" - is-stream: "npm:^2.0.0" - merge-stream: "npm:^2.0.0" - npm-run-path: "npm:^4.0.1" - onetime: "npm:^5.1.2" - signal-exit: "npm:^3.0.3" - strip-final-newline: "npm:^2.0.0" - checksum: 10c0/c8e615235e8de4c5addf2fa4c3da3e3aa59ce975a3e83533b4f6a71750fb816a2e79610dc5f1799b6e28976c9ae86747a36a606655bf8cb414a74d8d507b304f - languageName: node - linkType: hard - -"exeunt@npm:1.1.0": - version: 1.1.0 - resolution: "exeunt@npm:1.1.0" - checksum: 10c0/dc2012d9016c01ec321e4d642d2f165ce7dc4a4d141c523a818416035bcfe11bd1d9abc142f6f608d6a7719824295131a1b8c89006eb308aafd3aba385bf40d2 - languageName: node - linkType: hard - -"exponential-backoff@npm:^3.1.1": - version: 3.1.1 - resolution: "exponential-backoff@npm:3.1.1" - checksum: 10c0/160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579 - languageName: node - linkType: hard - -"extract-zip@npm:^2.0.1": - version: 2.0.1 - resolution: "extract-zip@npm:2.0.1" - dependencies: - "@types/yauzl": "npm:^2.9.1" - debug: "npm:^4.1.1" - get-stream: "npm:^5.1.0" - yauzl: "npm:^2.10.0" - dependenciesMeta: - "@types/yauzl": - optional: true - bin: - extract-zip: cli.js - checksum: 10c0/9afbd46854aa15a857ae0341a63a92743a7b89c8779102c3b4ffc207516b2019337353962309f85c66ee3d9092202a83cdc26dbf449a11981272038443974aee - languageName: node - linkType: hard - -"extsprintf@npm:^1.2.0": - version: 1.4.1 - resolution: "extsprintf@npm:1.4.1" - checksum: 10c0/e10e2769985d0e9b6c7199b053a9957589d02e84de42832c295798cb422a025e6d4a92e0259c1fb4d07090f5bfde6b55fd9f880ac5855bd61d775f8ab75a7ab0 - languageName: node - linkType: hard - -"fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": - version: 3.1.3 - resolution: "fast-deep-equal@npm:3.1.3" - checksum: 10c0/40dedc862eb8992c54579c66d914635afbec43350afbbe991235fdcb4e3a8d5af1b23ae7e79bef7d4882d0ecee06c3197488026998fb19f72dc95acff1d1b1d0 - languageName: node - linkType: hard - -"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.1": - version: 3.3.2 - resolution: "fast-glob@npm:3.3.2" - dependencies: - "@nodelib/fs.stat": "npm:^2.0.2" - "@nodelib/fs.walk": "npm:^1.2.3" - glob-parent: "npm:^5.1.2" - merge2: "npm:^1.3.0" - micromatch: "npm:^4.0.4" - checksum: 10c0/42baad7b9cd40b63e42039132bde27ca2cb3a4950d0a0f9abe4639ea1aa9d3e3b40f98b1fe31cbc0cc17b664c9ea7447d911a152fa34ec5b72977b125a6fc845 - languageName: node - linkType: hard - -"fast-json-stable-stringify@npm:^2.0.0": - version: 2.1.0 - resolution: "fast-json-stable-stringify@npm:2.1.0" - checksum: 10c0/7f081eb0b8a64e0057b3bb03f974b3ef00135fbf36c1c710895cd9300f13c94ba809bb3a81cf4e1b03f6e5285610a61abbd7602d0652de423144dfee5a389c9b - languageName: node - linkType: hard - -"fast-levenshtein@npm:^2.0.6, fast-levenshtein@npm:~2.0.6": - version: 2.0.6 - resolution: "fast-levenshtein@npm:2.0.6" - checksum: 10c0/111972b37338bcb88f7d9e2c5907862c280ebf4234433b95bc611e518d192ccb2d38119c4ac86e26b668d75f7f3894f4ff5c4982899afced7ca78633b08287c4 - languageName: node - linkType: hard - -"fast-loops@npm:^1.1.3": - version: 1.1.3 - resolution: "fast-loops@npm:1.1.3" - checksum: 10c0/ba71c001704c44a617053ed34b1a8c0d2ed9723022eb7b93c98299d9862f93213609b32c9daec7d606625ab318769d11da8bb06e9ddd9c28e3bda1249fb6e36d - languageName: node - linkType: hard - -"fast-shallow-equal@npm:^1.0.0": - version: 1.0.0 - resolution: "fast-shallow-equal@npm:1.0.0" - checksum: 10c0/526c393c011ab5a0ca5a36c5ea25c9730acd027503ccbec6c7825397ab9375f51f67f14c8829b4c4b1ccccede695391dd14863a15e40a37fc4af08c1440a1b66 - languageName: node - linkType: hard - -"fastest-levenshtein@npm:^1.0.12": - version: 1.0.16 - resolution: "fastest-levenshtein@npm:1.0.16" - checksum: 10c0/7e3d8ae812a7f4fdf8cad18e9cde436a39addf266a5986f653ea0d81e0de0900f50c0f27c6d5aff3f686bcb48acbd45be115ae2216f36a6a13a7dbbf5cad878b - languageName: node - linkType: hard - -"fastest-stable-stringify@npm:^2.0.2": - version: 2.0.2 - resolution: "fastest-stable-stringify@npm:2.0.2" - checksum: 10c0/abbe5ff48f13f5819e7312dbb38bae5d9960694cffd315b464df9adcd02a8fa7e9eec32c314655674c7134905c544b7a0c14b05bfbe30b3f678609bebc9fecb9 - languageName: node - linkType: hard - -"fastq@npm:^1.6.0": - version: 1.17.1 - resolution: "fastq@npm:1.17.1" - dependencies: - reusify: "npm:^1.0.4" - checksum: 10c0/1095f16cea45fb3beff558bb3afa74ca7a9250f5a670b65db7ed585f92b4b48381445cd328b3d87323da81e43232b5d5978a8201bde84e0cd514310f1ea6da34 - languageName: node - linkType: hard - -"fd-slicer@npm:~1.1.0": - version: 1.1.0 - resolution: "fd-slicer@npm:1.1.0" - dependencies: - pend: "npm:~1.2.0" - checksum: 10c0/304dd70270298e3ffe3bcc05e6f7ade2511acc278bc52d025f8918b48b6aa3b77f10361bddfadfe2a28163f7af7adbdce96f4d22c31b2f648ba2901f0c5fc20e - languageName: node - linkType: hard - -"file-entry-cache@npm:^6.0.1": - version: 6.0.1 - resolution: "file-entry-cache@npm:6.0.1" - dependencies: - flat-cache: "npm:^3.0.4" - checksum: 10c0/58473e8a82794d01b38e5e435f6feaf648e3f36fdb3a56e98f417f4efae71ad1c0d4ebd8a9a7c50c3ad085820a93fc7494ad721e0e4ebc1da3573f4e1c3c7cdd - languageName: node - linkType: hard - -"file-type@npm:^10.10.0": - version: 10.11.0 - resolution: "file-type@npm:10.11.0" - checksum: 10c0/2d6280d84f2499878ebdf8236a6e83b3c747f08b91d84cf99785afe3c9ac52775e52dcec15a4141cc24eb3006f274eb46dc7d13395920a1763d936c6d6e8afde - languageName: node - linkType: hard - -"file-uri-to-path@npm:1.0.0": - version: 1.0.0 - resolution: "file-uri-to-path@npm:1.0.0" - checksum: 10c0/3b545e3a341d322d368e880e1c204ef55f1d45cdea65f7efc6c6ce9e0c4d22d802d5629320eb779d006fe59624ac17b0e848d83cc5af7cd101f206cb704f5519 - languageName: node - linkType: hard - -"filelist@npm:^1.0.4": - version: 1.0.4 - resolution: "filelist@npm:1.0.4" - dependencies: - minimatch: "npm:^5.0.1" - checksum: 10c0/426b1de3944a3d153b053f1c0ebfd02dccd0308a4f9e832ad220707a6d1f1b3c9784d6cadf6b2f68f09a57565f63ebc7bcdc913ccf8012d834f472c46e596f41 - languageName: node - linkType: hard - -"filesize@npm:3.6.1": - version: 3.6.1 - resolution: "filesize@npm:3.6.1" - checksum: 10c0/7b900b488c914d4b9146ddaf2865c410687977cf62c627760ff3c47dce4a00a53523658f40c9023bba8894d2e4841bc913af280472c2bb5aec29bc342eb33b6f - languageName: node - linkType: hard - -"fill-range@npm:^7.1.1": - version: 7.1.1 - resolution: "fill-range@npm:7.1.1" - dependencies: - to-regex-range: "npm:^5.0.1" - checksum: 10c0/b75b691bbe065472f38824f694c2f7449d7f5004aa950426a2c28f0306c60db9b880c0b0e4ed819997ffb882d1da02cfcfc819bddc94d71627f5269682edf018 - languageName: node - linkType: hard - -"find-up@npm:5.0.0, find-up@npm:^5.0.0": - version: 5.0.0 - resolution: "find-up@npm:5.0.0" - dependencies: - locate-path: "npm:^6.0.0" - path-exists: "npm:^4.0.0" - checksum: 10c0/062c5a83a9c02f53cdd6d175a37ecf8f87ea5bbff1fdfb828f04bfa021441bc7583e8ebc0872a4c1baab96221fb8a8a275a19809fb93fbc40bd69ec35634069a - languageName: node - linkType: hard - -"find-up@npm:^4.0.0, find-up@npm:^4.1.0": - version: 4.1.0 - resolution: "find-up@npm:4.1.0" - dependencies: - locate-path: "npm:^5.0.0" - path-exists: "npm:^4.0.0" - checksum: 10c0/0406ee89ebeefa2d507feb07ec366bebd8a6167ae74aa4e34fb4c4abd06cf782a3ce26ae4194d70706f72182841733f00551c209fe575cb00bd92104056e78c1 - languageName: node - linkType: hard - -"find-yarn-workspace-root@npm:^2.0.0": - version: 2.0.0 - resolution: "find-yarn-workspace-root@npm:2.0.0" - dependencies: - micromatch: "npm:^4.0.2" - checksum: 10c0/b0d3843013fbdaf4e57140e0165889d09fa61745c9e85da2af86e54974f4cc9f1967e40f0d8fc36a79d53091f0829c651d06607d552582e53976f3cd8f4e5689 - languageName: node - linkType: hard - -"firstline@npm:1.2.1": - version: 1.2.1 - resolution: "firstline@npm:1.2.1" - checksum: 10c0/cb6cb3b13852c7363dc216a0e1a0e10bb80842fb3a186d0caa8645c2772d03dcbf02ed33e6ce09b005ad61cf18d8f9707c644a12866b9fddfe7f01bcc28293df - languageName: node - linkType: hard - -"flat-cache@npm:^3.0.4": - version: 3.2.0 - resolution: "flat-cache@npm:3.2.0" - dependencies: - flatted: "npm:^3.2.9" - keyv: "npm:^4.5.3" - rimraf: "npm:^3.0.2" - checksum: 10c0/b76f611bd5f5d68f7ae632e3ae503e678d205cf97a17c6ab5b12f6ca61188b5f1f7464503efae6dc18683ed8f0b41460beb48ac4b9ac63fe6201296a91ba2f75 - languageName: node - linkType: hard - -"flat@npm:^5.0.2": - version: 5.0.2 - resolution: "flat@npm:5.0.2" - bin: - flat: cli.js - checksum: 10c0/f178b13482f0cd80c7fede05f4d10585b1f2fdebf26e12edc138e32d3150c6ea6482b7f12813a1091143bad52bb6d3596bca51a162257a21163c0ff438baa5fe - languageName: node - linkType: hard - -"flatted@npm:^3.2.9": - version: 3.3.1 - resolution: "flatted@npm:3.3.1" - checksum: 10c0/324166b125ee07d4ca9bcf3a5f98d915d5db4f39d711fba640a3178b959919aae1f7cfd8aabcfef5826ed8aa8a2aa14cc85b2d7d18ff638ddf4ae3df39573eaf - languageName: node - linkType: hard - -"focus-trap-react@npm:^10.2.3": - version: 10.2.3 - resolution: "focus-trap-react@npm:10.2.3" - dependencies: - focus-trap: "npm:^7.5.4" - tabbable: "npm:^6.2.0" - peerDependencies: - prop-types: ^15.8.1 - react: ">=16.3.0" - react-dom: ">=16.3.0" - checksum: 10c0/18527771cacc1083ecdf472276a4c46581a6289dc98b6caf1c31641091732933cbffdec78e4c86c2c1568ac4f82a83c367d6a4d7e0e84dc96b239d2d4c12c071 - languageName: node - linkType: hard - -"focus-trap@npm:^7.5.4": - version: 7.5.4 - resolution: "focus-trap@npm:7.5.4" - dependencies: - tabbable: "npm:^6.2.0" - checksum: 10c0/c09e12b957862b2608977ff90de782645f99c3555cc5d93977240c179befa8723b9b1183e93890b4ad9d364d52a1af36416e63a728522ecce656a447d9ddd945 - languageName: node - linkType: hard - -"follow-redirects@npm:^1.15.6": - version: 1.15.6 - resolution: "follow-redirects@npm:1.15.6" - peerDependenciesMeta: - debug: - optional: true - checksum: 10c0/9ff767f0d7be6aa6870c82ac79cf0368cd73e01bbc00e9eb1c2a16fbb198ec105e3c9b6628bb98e9f3ac66fe29a957b9645bcb9a490bb7aa0d35f908b6b85071 - languageName: node - linkType: hard - -"for-each@npm:^0.3.3": - version: 0.3.3 - resolution: "for-each@npm:0.3.3" - dependencies: - is-callable: "npm:^1.1.3" - checksum: 10c0/22330d8a2db728dbf003ec9182c2d421fbcd2969b02b4f97ec288721cda63eb28f2c08585ddccd0f77cb2930af8d958005c9e72f47141dc51816127a118f39aa - languageName: node - linkType: hard - -"foreground-child@npm:^3.1.0": - version: 3.1.1 - resolution: "foreground-child@npm:3.1.1" - dependencies: - cross-spawn: "npm:^7.0.0" - signal-exit: "npm:^4.0.1" - checksum: 10c0/9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0 - languageName: node - linkType: hard - -"form-data@npm:^4.0.0": - version: 4.0.0 - resolution: "form-data@npm:4.0.0" - dependencies: - asynckit: "npm:^0.4.0" - combined-stream: "npm:^1.0.8" - mime-types: "npm:^2.1.12" - checksum: 10c0/cb6f3ac49180be03ff07ba3ff125f9eba2ff0b277fb33c7fc47569fc5e616882c5b1c69b9904c4c4187e97dd0419dd03b134174756f296dec62041e6527e2c6e - languageName: node - linkType: hard - -"fs-extra@npm:9.0.0": - version: 9.0.0 - resolution: "fs-extra@npm:9.0.0" - dependencies: - at-least-node: "npm:^1.0.0" - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^6.0.1" - universalify: "npm:^1.0.0" - checksum: 10c0/c7f8903b5939a585d16c064142929a9ad12d63084009a198da37bd2c49095b938c8f9a88f8378235dafd5312354b6e872c0181f97f820095fb3539c9d5fe6cd0 - languageName: node - linkType: hard - -"fs-extra@npm:^10.0.0, fs-extra@npm:^10.1.0": - version: 10.1.0 - resolution: "fs-extra@npm:10.1.0" - dependencies: - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^6.0.1" - universalify: "npm:^2.0.0" - checksum: 10c0/5f579466e7109719d162a9249abbeffe7f426eb133ea486e020b89bc6d67a741134076bf439983f2eb79276ceaf6bd7b7c1e43c3fd67fe889863e69072fb0a5e - languageName: node - linkType: hard - -"fs-extra@npm:^11.0.0": - version: 11.2.0 - resolution: "fs-extra@npm:11.2.0" - dependencies: - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^6.0.1" - universalify: "npm:^2.0.0" - checksum: 10c0/d77a9a9efe60532d2e790e938c81a02c1b24904ef7a3efb3990b835514465ba720e99a6ea56fd5e2db53b4695319b644d76d5a0e9988a2beef80aa7b1da63398 - languageName: node - linkType: hard - -"fs-extra@npm:^8.1.0": - version: 8.1.0 - resolution: "fs-extra@npm:8.1.0" - dependencies: - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^4.0.0" - universalify: "npm:^0.1.0" - checksum: 10c0/259f7b814d9e50d686899550c4f9ded85c46c643f7fe19be69504888e007fcbc08f306fae8ec495b8b998635e997c9e3e175ff2eeed230524ef1c1684cc96423 - languageName: node - linkType: hard - -"fs-extra@npm:^9.0.0, fs-extra@npm:^9.0.1": - version: 9.1.0 - resolution: "fs-extra@npm:9.1.0" - dependencies: - at-least-node: "npm:^1.0.0" - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^6.0.1" - universalify: "npm:^2.0.0" - checksum: 10c0/9b808bd884beff5cb940773018179a6b94a966381d005479f00adda6b44e5e3d4abf765135773d849cc27efe68c349e4a7b86acd7d3306d5932c14f3a4b17a92 - languageName: node - linkType: hard - -"fs-minipass@npm:^2.0.0": - version: 2.1.0 - resolution: "fs-minipass@npm:2.1.0" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004 - languageName: node - linkType: hard - -"fs-minipass@npm:^3.0.0": - version: 3.0.3 - resolution: "fs-minipass@npm:3.0.3" - dependencies: - minipass: "npm:^7.0.3" - checksum: 10c0/63e80da2ff9b621e2cb1596abcb9207f1cf82b968b116ccd7b959e3323144cce7fb141462200971c38bbf2ecca51695069db45265705bed09a7cd93ae5b89f94 - languageName: node - linkType: hard - -"fs.realpath@npm:^1.0.0": - version: 1.0.0 - resolution: "fs.realpath@npm:1.0.0" - checksum: 10c0/444cf1291d997165dfd4c0d58b69f0e4782bfd9149fd72faa4fe299e68e0e93d6db941660b37dd29153bf7186672ececa3b50b7e7249477b03fdf850f287c948 - languageName: node - linkType: hard - -"fsevents@npm:~2.3.2": - version: 2.3.3 - resolution: "fsevents@npm:2.3.3" - dependencies: - node-gyp: "npm:latest" - checksum: 10c0/a1f0c44595123ed717febbc478aa952e47adfc28e2092be66b8ab1635147254ca6cfe1df792a8997f22716d4cbafc73309899ff7bfac2ac3ad8cf2e4ecc3ec60 - conditions: os=darwin - languageName: node - linkType: hard - -"fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": - version: 2.3.3 - resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" - dependencies: - node-gyp: "npm:latest" - conditions: os=darwin - languageName: node - linkType: hard - -"function-bind@npm:^1.1.2": - version: 1.1.2 - resolution: "function-bind@npm:1.1.2" - checksum: 10c0/d8680ee1e5fcd4c197e4ac33b2b4dce03c71f4d91717292785703db200f5c21f977c568d28061226f9b5900cbcd2c84463646134fd5337e7925e0942bc3f46d5 - languageName: node - linkType: hard - -"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6": - version: 1.1.6 - resolution: "function.prototype.name@npm:1.1.6" - dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - functions-have-names: "npm:^1.2.3" - checksum: 10c0/9eae11294905b62cb16874adb4fc687927cda3162285e0ad9612e6a1d04934005d46907362ea9cdb7428edce05a2f2c3dabc3b2d21e9fd343e9bb278230ad94b - languageName: node - linkType: hard - -"functions-have-names@npm:^1.2.3": - version: 1.2.3 - resolution: "functions-have-names@npm:1.2.3" - checksum: 10c0/33e77fd29bddc2d9bb78ab3eb854c165909201f88c75faa8272e35899e2d35a8a642a15e7420ef945e1f64a9670d6aa3ec744106b2aa42be68ca5114025954ca - languageName: node - linkType: hard - -"gauge@npm:^4.0.3": - version: 4.0.4 - resolution: "gauge@npm:4.0.4" - dependencies: - aproba: "npm:^1.0.3 || ^2.0.0" - color-support: "npm:^1.1.3" - console-control-strings: "npm:^1.1.0" - has-unicode: "npm:^2.0.1" - signal-exit: "npm:^3.0.7" - string-width: "npm:^4.2.3" - strip-ansi: "npm:^6.0.1" - wide-align: "npm:^1.1.5" - checksum: 10c0/ef10d7981113d69225135f994c9f8c4369d945e64a8fc721d655a3a38421b738c9fe899951721d1b47b73c41fdb5404ac87cc8903b2ecbed95d2800363e7e58c - languageName: node - linkType: hard - -"get-caller-file@npm:^2.0.5": - version: 2.0.5 - resolution: "get-caller-file@npm:2.0.5" - checksum: 10c0/c6c7b60271931fa752aeb92f2b47e355eac1af3a2673f47c9589e8f8a41adc74d45551c1bc57b5e66a80609f10ffb72b6f575e4370d61cc3f7f3aaff01757cde - languageName: node - linkType: hard - -"get-func-name@npm:^2.0.1, get-func-name@npm:^2.0.2": - version: 2.0.2 - resolution: "get-func-name@npm:2.0.2" - checksum: 10c0/89830fd07623fa73429a711b9daecdb304386d237c71268007f788f113505ef1d4cc2d0b9680e072c5082490aec9df5d7758bf5ac6f1c37062855e8e3dc0b9df - languageName: node - linkType: hard - -"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4": - version: 1.2.4 - resolution: "get-intrinsic@npm:1.2.4" - dependencies: - es-errors: "npm:^1.3.0" - function-bind: "npm:^1.1.2" - has-proto: "npm:^1.0.1" - has-symbols: "npm:^1.0.3" - hasown: "npm:^2.0.0" - checksum: 10c0/0a9b82c16696ed6da5e39b1267104475c47e3a9bdbe8b509dfe1710946e38a87be70d759f4bb3cda042d76a41ef47fe769660f3b7c0d1f68750299344ffb15b7 - languageName: node - linkType: hard - -"get-stream@npm:^5.0.0, get-stream@npm:^5.1.0": - version: 5.2.0 - resolution: "get-stream@npm:5.2.0" - dependencies: - pump: "npm:^3.0.0" - checksum: 10c0/43797ffd815fbb26685bf188c8cfebecb8af87b3925091dd7b9a9c915993293d78e3c9e1bce125928ff92f2d0796f3889b92b5ec6d58d1041b574682132e0a80 - languageName: node - linkType: hard - -"get-stream@npm:^6.0.0, get-stream@npm:^6.0.1": - version: 6.0.1 - resolution: "get-stream@npm:6.0.1" - checksum: 10c0/49825d57d3fd6964228e6200a58169464b8e8970489b3acdc24906c782fb7f01f9f56f8e6653c4a50713771d6658f7cfe051e5eb8c12e334138c9c918b296341 - languageName: node - linkType: hard - -"get-symbol-description@npm:^1.0.2": - version: 1.0.2 - resolution: "get-symbol-description@npm:1.0.2" - dependencies: - call-bind: "npm:^1.0.5" - es-errors: "npm:^1.3.0" - get-intrinsic: "npm:^1.2.4" - checksum: 10c0/867be6d63f5e0eb026cb3b0ef695ec9ecf9310febb041072d2e142f260bd91ced9eeb426b3af98791d1064e324e653424afa6fd1af17dee373bea48ae03162bc - languageName: node - linkType: hard - -"get-tsconfig@npm:^4.5.0": - version: 4.7.5 - resolution: "get-tsconfig@npm:4.7.5" - dependencies: - resolve-pkg-maps: "npm:^1.0.0" - checksum: 10c0/a917dff2ba9ee187c41945736bf9bbab65de31ce5bc1effd76267be483a7340915cff232199406379f26517d2d0a4edcdbcda8cca599c2480a0f2cf1e1de3efa - languageName: node - linkType: hard - -"git-raw-commits@npm:^2.0.11": - version: 2.0.11 - resolution: "git-raw-commits@npm:2.0.11" - dependencies: - dargs: "npm:^7.0.0" - lodash: "npm:^4.17.15" - meow: "npm:^8.0.0" - split2: "npm:^3.0.0" - through2: "npm:^4.0.0" - bin: - git-raw-commits: cli.js - checksum: 10c0/c9cee7ce11a6703098f028d7e47986d5d3e4147d66640086734d6ee2472296b8711f91b40ad458e95acac1bc33cf2898059f1dc890f91220ff89c5fcc609ab64 - languageName: node - linkType: hard - -"glob-parent@npm:^6.0.1": - version: 6.0.2 - resolution: "glob-parent@npm:6.0.2" - dependencies: - is-glob: "npm:^4.0.3" - checksum: 10c0/317034d88654730230b3f43bb7ad4f7c90257a426e872ea0bf157473ac61c99bf5d205fad8f0185f989be8d2fa6d3c7dce1645d99d545b6ea9089c39f838e7f8 - languageName: node - linkType: hard - -"glob-to-regexp@npm:^0.4.1": - version: 0.4.1 - resolution: "glob-to-regexp@npm:0.4.1" - checksum: 10c0/0486925072d7a916f052842772b61c3e86247f0a80cc0deb9b5a3e8a1a9faad5b04fb6f58986a09f34d3e96cd2a22a24b7e9882fb1cf904c31e9a310de96c429 - languageName: node - linkType: hard - -"glob@npm:10.3.10": - version: 10.3.10 - resolution: "glob@npm:10.3.10" - dependencies: - foreground-child: "npm:^3.1.0" - jackspeak: "npm:^2.3.5" - minimatch: "npm:^9.0.1" - minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry: "npm:^1.10.1" - bin: - glob: dist/esm/bin.mjs - checksum: 10c0/13d8a1feb7eac7945f8c8480e11cd4a44b24d26503d99a8d8ac8d5aefbf3e9802a2b6087318a829fad04cb4e829f25c5f4f1110c68966c498720dd261c7e344d - languageName: node - linkType: hard - -"glob@npm:7.2.0": - version: 7.2.0 - resolution: "glob@npm:7.2.0" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^3.0.4" - once: "npm:^1.3.0" - path-is-absolute: "npm:^1.0.0" - checksum: 10c0/478b40e38be5a3d514e64950e1e07e0ac120585add6a37c98d0ed24d72d9127d734d2a125786073c8deb687096e84ae82b641c441a869ada3a9cc91b68978632 - languageName: node - linkType: hard - -"glob@npm:^10.2.2, glob@npm:^10.3.10": - version: 10.4.1 - resolution: "glob@npm:10.4.1" - dependencies: - foreground-child: "npm:^3.1.0" - jackspeak: "npm:^3.1.2" - minimatch: "npm:^9.0.4" - minipass: "npm:^7.1.2" - path-scurry: "npm:^1.11.1" - bin: - glob: dist/esm/bin.mjs - checksum: 10c0/77f2900ed98b9cc2a0e1901ee5e476d664dae3cd0f1b662b8bfd4ccf00d0edc31a11595807706a274ca10e1e251411bbf2e8e976c82bed0d879a9b89343ed379 - languageName: node - linkType: hard - -"glob@npm:^6.0.1": - version: 6.0.4 - resolution: "glob@npm:6.0.4" - dependencies: - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:2 || 3" - once: "npm:^1.3.0" - path-is-absolute: "npm:^1.0.0" - checksum: 10c0/520146ebce0f4594b8357338f86281b38ee14214debce398a2902176a28f18e0f98911ea48516d85022de64fbbaa57f074aa13715d1daa5d70e21b82cea22183 - languageName: node - linkType: hard - -"glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.6": - version: 7.2.3 - resolution: "glob@npm:7.2.3" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^3.1.1" - once: "npm:^1.3.0" - path-is-absolute: "npm:^1.0.0" - checksum: 10c0/65676153e2b0c9095100fe7f25a778bf45608eeb32c6048cf307f579649bcc30353277b3b898a3792602c65764e5baa4f643714dfbdfd64ea271d210c7a425fe - languageName: node - linkType: hard - -"glob@npm:^8.0.0": - version: 8.1.0 - resolution: "glob@npm:8.1.0" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^5.0.1" - once: "npm:^1.3.0" - checksum: 10c0/cb0b5cab17a59c57299376abe5646c7070f8acb89df5595b492dba3bfb43d301a46c01e5695f01154e6553168207cb60d4eaf07d3be4bc3eb9b0457c5c561d0f - languageName: node - linkType: hard - -"global-agent@npm:^3.0.0": - version: 3.0.0 - resolution: "global-agent@npm:3.0.0" - dependencies: - boolean: "npm:^3.0.1" - es6-error: "npm:^4.1.1" - matcher: "npm:^3.0.0" - roarr: "npm:^2.15.3" - semver: "npm:^7.3.2" - serialize-error: "npm:^7.0.1" - checksum: 10c0/bb8750d026b25da437072762fd739098bad92ff72f66483c3929db4579e072f5523960f7e7fd70ee0d75db48898067b5dc1c9c1d17888128cff008fcc34d1bd3 - languageName: node - linkType: hard - -"global-dirs@npm:^0.1.1": - version: 0.1.1 - resolution: "global-dirs@npm:0.1.1" - dependencies: - ini: "npm:^1.3.4" - checksum: 10c0/3608072e58962396c124ad5a1cfb3f99ee76c998654a3432d82977b3c3eeb09dc8a5a2a9849b2b8113906c8d0aad89ce362c22e97cec5fe34405bbf4f3cdbe7a - languageName: node - linkType: hard - -"global-dirs@npm:^3.0.0": - version: 3.0.1 - resolution: "global-dirs@npm:3.0.1" - dependencies: - ini: "npm:2.0.0" - checksum: 10c0/ef65e2241a47ff978f7006a641302bc7f4c03dfb98783d42bf7224c136e3a06df046e70ee3a010cf30214114755e46c9eb5eb1513838812fbbe0d92b14c25080 - languageName: node - linkType: hard - -"globals@npm:^11.1.0": - version: 11.12.0 - resolution: "globals@npm:11.12.0" - checksum: 10c0/758f9f258e7b19226bd8d4af5d3b0dcf7038780fb23d82e6f98932c44e239f884847f1766e8fa9cc5635ccb3204f7fa7314d4408dd4002a5e8ea827b4018f0a1 - languageName: node - linkType: hard - -"globals@npm:^13.19.0, globals@npm:^13.24.0": - version: 13.24.0 - resolution: "globals@npm:13.24.0" - dependencies: - type-fest: "npm:^0.20.2" - checksum: 10c0/d3c11aeea898eb83d5ec7a99508600fbe8f83d2cf00cbb77f873dbf2bcb39428eff1b538e4915c993d8a3b3473fa71eeebfe22c9bb3a3003d1e26b1f2c8a42cd - languageName: node - linkType: hard - -"globalthis@npm:^1.0.1, globalthis@npm:^1.0.3": - version: 1.0.4 - resolution: "globalthis@npm:1.0.4" - dependencies: - define-properties: "npm:^1.2.1" - gopd: "npm:^1.0.1" - checksum: 10c0/9d156f313af79d80b1566b93e19285f481c591ad6d0d319b4be5e03750d004dde40a39a0f26f7e635f9007a3600802f53ecd85a759b86f109e80a5f705e01846 - languageName: node - linkType: hard - -"globby@npm:^11.1.0": - version: 11.1.0 - resolution: "globby@npm:11.1.0" - dependencies: - array-union: "npm:^2.1.0" - dir-glob: "npm:^3.0.1" - fast-glob: "npm:^3.2.9" - ignore: "npm:^5.2.0" - merge2: "npm:^1.4.1" - slash: "npm:^3.0.0" - checksum: 10c0/b39511b4afe4bd8a7aead3a27c4ade2b9968649abab0a6c28b1a90141b96ca68ca5db1302f7c7bd29eab66bf51e13916b8e0a3d0ac08f75e1e84a39b35691189 - languageName: node - linkType: hard - -"gopd@npm:^1.0.1": - version: 1.0.1 - resolution: "gopd@npm:1.0.1" - dependencies: - get-intrinsic: "npm:^1.1.3" - checksum: 10c0/505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63 - languageName: node - linkType: hard - -"got@npm:^11.8.5": - version: 11.8.6 - resolution: "got@npm:11.8.6" - dependencies: - "@sindresorhus/is": "npm:^4.0.0" - "@szmarczak/http-timer": "npm:^4.0.5" - "@types/cacheable-request": "npm:^6.0.1" - "@types/responselike": "npm:^1.0.0" - cacheable-lookup: "npm:^5.0.3" - cacheable-request: "npm:^7.0.2" - decompress-response: "npm:^6.0.0" - http2-wrapper: "npm:^1.0.0-beta.5.2" - lowercase-keys: "npm:^2.0.0" - p-cancelable: "npm:^2.0.0" - responselike: "npm:^2.0.0" - checksum: 10c0/754dd44877e5cf6183f1e989ff01c648d9a4719e357457bd4c78943911168881f1cfb7b2cb15d885e2105b3ad313adb8f017a67265dd7ade771afdb261ee8cb1 - languageName: node - linkType: hard - -"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": - version: 4.2.11 - resolution: "graceful-fs@npm:4.2.11" - checksum: 10c0/386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 - languageName: node - linkType: hard - -"graceful-readlink@npm:>= 1.0.0": - version: 1.0.1 - resolution: "graceful-readlink@npm:1.0.1" - checksum: 10c0/c53e703257e77f8a4495ff0d476c09aa413251acd26684f4544771b15e0ad361d1075b8f6d27b52af6942ea58155a9bbdb8125d717c70df27117460fee295a54 - languageName: node - linkType: hard - -"graphemer@npm:^1.4.0": - version: 1.4.0 - resolution: "graphemer@npm:1.4.0" - checksum: 10c0/e951259d8cd2e0d196c72ec711add7115d42eb9a8146c8eeda5b8d3ac91e5dd816b9cd68920726d9fd4490368e7ed86e9c423f40db87e2d8dfafa00fa17c3a31 - languageName: node - linkType: hard - -"hard-rejection@npm:^2.1.0": - version: 2.1.0 - resolution: "hard-rejection@npm:2.1.0" - checksum: 10c0/febc3343a1ad575aedcc112580835b44a89a89e01f400b4eda6e8110869edfdab0b00cd1bd4c3bfec9475a57e79e0b355aecd5be46454b6a62b9a359af60e564 - languageName: node - linkType: hard - -"has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2": - version: 1.0.2 - resolution: "has-bigints@npm:1.0.2" - checksum: 10c0/724eb1485bfa3cdff6f18d95130aa190561f00b3fcf9f19dc640baf8176b5917c143b81ec2123f8cddb6c05164a198c94b13e1377c497705ccc8e1a80306e83b - languageName: node - linkType: hard - -"has-flag@npm:^3.0.0": - version: 3.0.0 - resolution: "has-flag@npm:3.0.0" - checksum: 10c0/1c6c83b14b8b1b3c25b0727b8ba3e3b647f99e9e6e13eb7322107261de07a4c1be56fc0d45678fc376e09772a3a1642ccdaf8fc69bdf123b6c086598397ce473 - languageName: node - linkType: hard - -"has-flag@npm:^4.0.0": - version: 4.0.0 - resolution: "has-flag@npm:4.0.0" - checksum: 10c0/2e789c61b7888d66993e14e8331449e525ef42aac53c627cc53d1c3334e768bcb6abdc4f5f0de1478a25beec6f0bd62c7549058b7ac53e924040d4f301f02fd1 - languageName: node - linkType: hard - -"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.2": - version: 1.0.2 - resolution: "has-property-descriptors@npm:1.0.2" - dependencies: - es-define-property: "npm:^1.0.0" - checksum: 10c0/253c1f59e80bb476cf0dde8ff5284505d90c3bdb762983c3514d36414290475fe3fd6f574929d84de2a8eec00d35cf07cb6776205ff32efd7c50719125f00236 - languageName: node - linkType: hard - -"has-proto@npm:^1.0.1, has-proto@npm:^1.0.3": - version: 1.0.3 - resolution: "has-proto@npm:1.0.3" - checksum: 10c0/35a6989f81e9f8022c2f4027f8b48a552de714938765d019dbea6bb547bd49ce5010a3c7c32ec6ddac6e48fc546166a3583b128f5a7add8b058a6d8b4afec205 - languageName: node - linkType: hard - -"has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": - version: 1.0.3 - resolution: "has-symbols@npm:1.0.3" - checksum: 10c0/e6922b4345a3f37069cdfe8600febbca791c94988c01af3394d86ca3360b4b93928bbf395859158f88099cb10b19d98e3bbab7c9ff2c1bd09cf665ee90afa2c3 - languageName: node - linkType: hard - -"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.2": - version: 1.0.2 - resolution: "has-tostringtag@npm:1.0.2" - dependencies: - has-symbols: "npm:^1.0.3" - checksum: 10c0/a8b166462192bafe3d9b6e420a1d581d93dd867adb61be223a17a8d6dad147aa77a8be32c961bb2f27b3ef893cae8d36f564ab651f5e9b7938ae86f74027c48c - languageName: node - linkType: hard - -"has-unicode@npm:^2.0.1": - version: 2.0.1 - resolution: "has-unicode@npm:2.0.1" - checksum: 10c0/ebdb2f4895c26bb08a8a100b62d362e49b2190bcfd84b76bc4be1a3bd4d254ec52d0dd9f2fbcc093fc5eb878b20c52146f9dfd33e2686ed28982187be593b47c - languageName: node - linkType: hard - -"has-yarn@npm:^2.1.0": - version: 2.1.0 - resolution: "has-yarn@npm:2.1.0" - checksum: 10c0/b5cab61b4129c2fc0474045b59705371b7f5ddf2aab8ba8725011e52269f017e06f75059a2c8a1d8011e9779c2885ad987263cfc6d1280f611c396b45fd5d74a - languageName: node - linkType: hard - -"hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2": - version: 2.0.2 - resolution: "hasown@npm:2.0.2" - dependencies: - function-bind: "npm:^1.1.2" - checksum: 10c0/3769d434703b8ac66b209a4cca0737519925bbdb61dd887f93a16372b14694c63ff4e797686d87c90f08168e81082248b9b028bad60d4da9e0d1148766f56eb9 - languageName: node - linkType: hard - -"he@npm:1.2.0": - version: 1.2.0 - resolution: "he@npm:1.2.0" - bin: - he: bin/he - checksum: 10c0/a27d478befe3c8192f006cdd0639a66798979dfa6e2125c6ac582a19a5ebfec62ad83e8382e6036170d873f46e4536a7e795bf8b95bf7c247f4cc0825ccc8c17 - languageName: node - linkType: hard - -"hoist-non-react-statics@npm:^3.0.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.2": - version: 3.3.2 - resolution: "hoist-non-react-statics@npm:3.3.2" - dependencies: - react-is: "npm:^16.7.0" - checksum: 10c0/fe0889169e845d738b59b64badf5e55fa3cf20454f9203d1eb088df322d49d4318df774828e789898dcb280e8a5521bb59b3203385662ca5e9218a6ca5820e74 - languageName: node - linkType: hard - -"hosted-git-info@npm:^2.1.4": - version: 2.8.9 - resolution: "hosted-git-info@npm:2.8.9" - checksum: 10c0/317cbc6b1bbbe23c2a40ae23f3dafe9fa349ce42a89a36f930e3f9c0530c179a3882d2ef1e4141a4c3674d6faaea862138ec55b43ad6f75e387fda2483a13c70 - languageName: node - linkType: hard - -"hosted-git-info@npm:^4.0.1, hosted-git-info@npm:^4.1.0": - version: 4.1.0 - resolution: "hosted-git-info@npm:4.1.0" - dependencies: - lru-cache: "npm:^6.0.0" - checksum: 10c0/150fbcb001600336d17fdbae803264abed013548eea7946c2264c49ebe2ebd8c4441ba71dd23dd8e18c65de79d637f98b22d4760ba5fb2e0b15d62543d0fff07 - languageName: node - linkType: hard - -"html-encoding-sniffer@npm:^3.0.0": - version: 3.0.0 - resolution: "html-encoding-sniffer@npm:3.0.0" - dependencies: - whatwg-encoding: "npm:^2.0.0" - checksum: 10c0/b17b3b0fb5d061d8eb15121c3b0b536376c3e295ecaf09ba48dd69c6b6c957839db124fe1e2b3f11329753a4ee01aa7dedf63b7677999e86da17fbbdd82c5386 - languageName: node - linkType: hard - -"http-cache-semantics@npm:^4.1.1": - version: 4.1.1 - resolution: "http-cache-semantics@npm:4.1.1" - checksum: 10c0/ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc - languageName: node - linkType: hard - -"http-proxy-agent@npm:^5.0.0": - version: 5.0.0 - resolution: "http-proxy-agent@npm:5.0.0" - dependencies: - "@tootallnate/once": "npm:2" - agent-base: "npm:6" - debug: "npm:4" - checksum: 10c0/32a05e413430b2c1e542e5c74b38a9f14865301dd69dff2e53ddb684989440e3d2ce0c4b64d25eb63cf6283e6265ff979a61cf93e3ca3d23047ddfdc8df34a32 - languageName: node - linkType: hard - -"http-proxy-agent@npm:^7.0.0": - version: 7.0.2 - resolution: "http-proxy-agent@npm:7.0.2" - dependencies: - agent-base: "npm:^7.1.0" - debug: "npm:^4.3.4" - checksum: 10c0/4207b06a4580fb85dd6dff521f0abf6db517489e70863dca1a0291daa7f2d3d2d6015a57bd702af068ea5cf9f1f6ff72314f5f5b4228d299c0904135d2aef921 - languageName: node - linkType: hard - -"http2-wrapper@npm:^1.0.0-beta.5.2": - version: 1.0.3 - resolution: "http2-wrapper@npm:1.0.3" - dependencies: - quick-lru: "npm:^5.1.1" - resolve-alpn: "npm:^1.0.0" - checksum: 10c0/6a9b72a033e9812e1476b9d776ce2f387bc94bc46c88aea0d5dab6bd47d0a539b8178830e77054dd26d1142c866d515a28a4dc7c3ff4232c88ff2ebe4f5d12d1 - languageName: node - linkType: hard - -"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1": - version: 5.0.1 - resolution: "https-proxy-agent@npm:5.0.1" - dependencies: - agent-base: "npm:6" - debug: "npm:4" - checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1 - languageName: node - linkType: hard - -"https-proxy-agent@npm:^7.0.1": - version: 7.0.4 - resolution: "https-proxy-agent@npm:7.0.4" - dependencies: - agent-base: "npm:^7.0.2" - debug: "npm:4" - checksum: 10c0/bc4f7c38da32a5fc622450b6cb49a24ff596f9bd48dcedb52d2da3fa1c1a80e100fb506bd59b326c012f21c863c69b275c23de1a01d0b84db396822fdf25e52b - languageName: node - linkType: hard - -"human-signals@npm:^1.1.1": - version: 1.1.1 - resolution: "human-signals@npm:1.1.1" - checksum: 10c0/18810ed239a7a5e23fb6c32d0fd4be75d7cd337a07ad59b8dbf0794cb0761e6e628349ee04c409e605fe55344716eab5d0a47a62ba2a2d0d367c89a2b4247b1e - languageName: node - linkType: hard - -"human-signals@npm:^2.1.0": - version: 2.1.0 - resolution: "human-signals@npm:2.1.0" - checksum: 10c0/695edb3edfcfe9c8b52a76926cd31b36978782062c0ed9b1192b36bebc75c4c87c82e178dfcb0ed0fc27ca59d434198aac0bd0be18f5781ded775604db22304a - languageName: node - linkType: hard - -"human-signals@npm:^4.3.0": - version: 4.3.1 - resolution: "human-signals@npm:4.3.1" - checksum: 10c0/40498b33fe139f5cc4ef5d2f95eb1803d6318ac1b1c63eaf14eeed5484d26332c828de4a5a05676b6c83d7b9e57727c59addb4b1dea19cb8d71e83689e5b336c - languageName: node - linkType: hard - -"husky@npm:^8.0.0": - version: 8.0.3 - resolution: "husky@npm:8.0.3" - bin: - husky: lib/bin.js - checksum: 10c0/6722591771c657b91a1abb082e07f6547eca79144d678e586828ae806499d90dce2a6aee08b66183fd8b085f19d20e0990a2ad396961746b4c8bd5bdb619d668 - languageName: node - linkType: hard - -"hyphenate-style-name@npm:^1.0.3": - version: 1.0.5 - resolution: "hyphenate-style-name@npm:1.0.5" - checksum: 10c0/d115f8caf49c17b5f35442cf5ebf282c8068e46d93db70c2e7abf48f2b1a433905375649283bb21906e9402400af2f24bd1812d39bd4865482de749001bd699b - languageName: node - linkType: hard - -"iconv-corefoundation@npm:^1.1.7": - version: 1.1.7 - resolution: "iconv-corefoundation@npm:1.1.7" - dependencies: - cli-truncate: "npm:^2.1.0" - node-addon-api: "npm:^1.6.3" - conditions: os=darwin - languageName: node - linkType: hard - -"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2": - version: 0.6.3 - resolution: "iconv-lite@npm:0.6.3" - dependencies: - safer-buffer: "npm:>= 2.1.2 < 3.0.0" - checksum: 10c0/98102bc66b33fcf5ac044099d1257ba0b7ad5e3ccd3221f34dd508ab4070edff183276221684e1e0555b145fce0850c9f7d2b60a9fcac50fbb4ea0d6e845a3b1 - languageName: node - linkType: hard - -"icss-utils@npm:^5.0.0, icss-utils@npm:^5.1.0": - version: 5.1.0 - resolution: "icss-utils@npm:5.1.0" - peerDependencies: - postcss: ^8.1.0 - checksum: 10c0/39c92936fabd23169c8611d2b5cc39e39d10b19b0d223352f20a7579f75b39d5f786114a6b8fc62bee8c5fed59ba9e0d38f7219a4db383e324fb3061664b043d - languageName: node - linkType: hard - -"ieee754@npm:^1.1.13": - version: 1.2.1 - resolution: "ieee754@npm:1.2.1" - checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb - languageName: node - linkType: hard - -"ignore@npm:^5.2.0, ignore@npm:^5.2.4": - version: 5.3.1 - resolution: "ignore@npm:5.3.1" - checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd - languageName: node - linkType: hard - -"image-type@npm:^4.1.0": - version: 4.1.0 - resolution: "image-type@npm:4.1.0" - dependencies: - file-type: "npm:^10.10.0" - checksum: 10c0/896d6560d5306276eb3426ad0af12519a5c7dc85f8e5ec8d2e9b91535411cea85b814574fd186f312ee49d3176c38a6524389ff153e81d1003bed71bf4c1f15b - languageName: node - linkType: hard - -"immer@npm:^9.0.7": - version: 9.0.21 - resolution: "immer@npm:9.0.21" - checksum: 10c0/03ea3ed5d4d72e8bd428df4a38ad7e483ea8308e9a113d3b42e0ea2cc0cc38340eb0a6aca69592abbbf047c685dbda04e3d34bf2ff438ab57339ed0a34cc0a05 - languageName: node - linkType: hard - -"immutable@npm:^4.0.0": - version: 4.3.6 - resolution: "immutable@npm:4.3.6" - checksum: 10c0/7d0952a768b4fadcee47230ed86dc9505a4517095eceaf5a47e65288571c42400c6e4a2ae21eca4eda957cb7bc50720213135b62cf6a181639111f8acae128c3 - languageName: node - linkType: hard - -"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0": - version: 3.3.0 - resolution: "import-fresh@npm:3.3.0" - dependencies: - parent-module: "npm:^1.0.0" - resolve-from: "npm:^4.0.0" - checksum: 10c0/7f882953aa6b740d1f0e384d0547158bc86efbf2eea0f1483b8900a6f65c5a5123c2cf09b0d542cc419d0b98a759ecaeb394237e97ea427f2da221dc3cd80cc3 - languageName: node - linkType: hard - -"import-lazy@npm:^2.1.0": - version: 2.1.0 - resolution: "import-lazy@npm:2.1.0" - checksum: 10c0/c5e5f507d26ee23c5b2ed64577155810361ac37863b322cae0c17f16b6a8cdd15adf370288384ddd95ef9de05602fb8d87bf76ff835190eb037333c84db8062c - languageName: node - linkType: hard - -"import-local@npm:^3.0.2": - version: 3.1.0 - resolution: "import-local@npm:3.1.0" - dependencies: - pkg-dir: "npm:^4.2.0" - resolve-cwd: "npm:^3.0.0" - bin: - import-local-fixture: fixtures/cli.js - checksum: 10c0/c67ecea72f775fe8684ca3d057e54bdb2ae28c14bf261d2607c269c18ea0da7b730924c06262eca9aed4b8ab31e31d65bc60b50e7296c85908a56e2f7d41ecd2 - languageName: node - linkType: hard - -"imurmurhash@npm:^0.1.4": - version: 0.1.4 - resolution: "imurmurhash@npm:0.1.4" - checksum: 10c0/8b51313850dd33605c6c9d3fd9638b714f4c4c40250cff658209f30d40da60f78992fb2df5dabee4acf589a6a82bbc79ad5486550754bd9ec4e3fc0d4a57d6a6 - languageName: node - linkType: hard - -"indent-string@npm:^4.0.0": - version: 4.0.0 - resolution: "indent-string@npm:4.0.0" - checksum: 10c0/1e1904ddb0cb3d6cce7cd09e27a90184908b7a5d5c21b92e232c93579d314f0b83c246ffb035493d0504b1e9147ba2c9b21df0030f48673fba0496ecd698161f - languageName: node - linkType: hard - -"inflight@npm:^1.0.4": - version: 1.0.6 - resolution: "inflight@npm:1.0.6" - dependencies: - once: "npm:^1.3.0" - wrappy: "npm:1" - checksum: 10c0/7faca22584600a9dc5b9fca2cd5feb7135ac8c935449837b315676b4c90aa4f391ec4f42240178244b5a34e8bede1948627fda392ca3191522fc46b34e985ab2 - languageName: node - linkType: hard - -"inherits@npm:2, inherits@npm:^2.0.3": - version: 2.0.4 - resolution: "inherits@npm:2.0.4" - checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2 - languageName: node - linkType: hard - -"ini@npm:^1.3.6": - version: 1.3.8 - resolution: "ini@npm:1.3.8" - checksum: 10c0/ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a - languageName: node - linkType: hard - -"inline-style-prefixer@npm:^7.0.0": - version: 7.0.0 - resolution: "inline-style-prefixer@npm:7.0.0" - dependencies: - css-in-js-utils: "npm:^3.1.0" - fast-loops: "npm:^1.1.3" - checksum: 10c0/d19eb485961854c5e00152b351a0d161b1a8d80d415bab2ba79ad10059d03843bc1e71415d265f1ec10857f5dd4a75c2491fced08eb0c5883cf42c8a9dccb473 - languageName: node - linkType: hard - -"internal-slot@npm:^1.0.7": - version: 1.0.7 - resolution: "internal-slot@npm:1.0.7" - dependencies: - es-errors: "npm:^1.3.0" - hasown: "npm:^2.0.0" - side-channel: "npm:^1.0.4" - checksum: 10c0/f8b294a4e6ea3855fc59551bbf35f2b832cf01fd5e6e2a97f5c201a071cc09b49048f856e484b67a6c721da5e55736c5b6ddafaf19e2dbeb4a3ff1821680de6c - languageName: node - linkType: hard - -"interpret@npm:^3.1.1": - version: 3.1.1 - resolution: "interpret@npm:3.1.1" - checksum: 10c0/6f3c4d0aa6ec1b43a8862375588a249e3c917739895cbe67fe12f0a76260ea632af51e8e2431b50fbcd0145356dc28ca147be08dbe6a523739fd55c0f91dc2a5 - languageName: node - linkType: hard - -"invariant@npm:^2.2.4": - version: 2.2.4 - resolution: "invariant@npm:2.2.4" - dependencies: - loose-envify: "npm:^1.0.0" - checksum: 10c0/5af133a917c0bcf65e84e7f23e779e7abc1cd49cb7fdc62d00d1de74b0d8c1b5ee74ac7766099fb3be1b05b26dfc67bab76a17030d2fe7ea2eef867434362dfc - languageName: node - linkType: hard - -"invert-kv@npm:^3.0.0": - version: 3.0.1 - resolution: "invert-kv@npm:3.0.1" - checksum: 10c0/a3d90951a635e35dea9c9a5fd749e981e9c54e8a362ad80b2253dad03b9257314b7c4e4d250d61bcd79698ccd5f4c6b0c750cd991bb5ce16352bf830e77ea64b - languageName: node - linkType: hard - -"ip-address@npm:^9.0.5": - version: 9.0.5 - resolution: "ip-address@npm:9.0.5" - dependencies: - jsbn: "npm:1.1.0" - sprintf-js: "npm:^1.1.3" - checksum: 10c0/331cd07fafcb3b24100613e4b53e1a2b4feab11e671e655d46dc09ee233da5011284d09ca40c4ecbdfe1d0004f462958675c224a804259f2f78d2465a87824bc - languageName: node - linkType: hard - -"is-array-buffer@npm:^3.0.4": - version: 3.0.4 - resolution: "is-array-buffer@npm:3.0.4" - dependencies: - call-bind: "npm:^1.0.2" - get-intrinsic: "npm:^1.2.1" - checksum: 10c0/42a49d006cc6130bc5424eae113e948c146f31f9d24460fc0958f855d9d810e6fd2e4519bf19aab75179af9c298ea6092459d8cafdec523cd19e529b26eab860 - languageName: node - linkType: hard - -"is-arrayish@npm:^0.2.1": - version: 0.2.1 - resolution: "is-arrayish@npm:0.2.1" - checksum: 10c0/e7fb686a739068bb70f860b39b67afc62acc62e36bb61c5f965768abce1873b379c563e61dd2adad96ebb7edf6651111b385e490cf508378959b0ed4cac4e729 - languageName: node - linkType: hard - -"is-async-function@npm:^2.0.0": - version: 2.0.0 - resolution: "is-async-function@npm:2.0.0" - dependencies: - has-tostringtag: "npm:^1.0.0" - checksum: 10c0/787bc931576aad525d751fc5ce211960fe91e49ac84a5c22d6ae0bc9541945fbc3f686dc590c3175722ce4f6d7b798a93f6f8ff4847fdb2199aea6f4baf5d668 - languageName: node - linkType: hard - -"is-bigint@npm:^1.0.1": - version: 1.0.4 - resolution: "is-bigint@npm:1.0.4" - dependencies: - has-bigints: "npm:^1.0.1" - checksum: 10c0/eb9c88e418a0d195ca545aff2b715c9903d9b0a5033bc5922fec600eb0c3d7b1ee7f882dbf2e0d5a6e694e42391be3683e4368737bd3c4a77f8ac293e7773696 - languageName: node - linkType: hard - -"is-binary-path@npm:~2.1.0": - version: 2.1.0 - resolution: "is-binary-path@npm:2.1.0" - dependencies: - binary-extensions: "npm:^2.0.0" - checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38 - languageName: node - linkType: hard - -"is-boolean-object@npm:^1.1.0": - version: 1.1.2 - resolution: "is-boolean-object@npm:1.1.2" - dependencies: - call-bind: "npm:^1.0.2" - has-tostringtag: "npm:^1.0.0" - checksum: 10c0/6090587f8a8a8534c0f816da868bc94f32810f08807aa72fa7e79f7e11c466d281486ffe7a788178809c2aa71fe3e700b167fe80dd96dad68026bfff8ebf39f7 - languageName: node - linkType: hard - -"is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": - version: 1.2.7 - resolution: "is-callable@npm:1.2.7" - checksum: 10c0/ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f - languageName: node - linkType: hard - -"is-ci@npm:^2.0.0": - version: 2.0.0 - resolution: "is-ci@npm:2.0.0" - dependencies: - ci-info: "npm:^2.0.0" - bin: - is-ci: bin.js - checksum: 10c0/17de4e2cd8f993c56c86472dd53dd9e2c7f126d0ee55afe610557046cdd64de0e8feadbad476edc9eeff63b060523b8673d9094ed2ab294b59efb5a66dd05a9a - languageName: node - linkType: hard - -"is-ci@npm:^3.0.0": - version: 3.0.1 - resolution: "is-ci@npm:3.0.1" - dependencies: - ci-info: "npm:^3.2.0" - bin: - is-ci: bin.js - checksum: 10c0/0e81caa62f4520d4088a5bef6d6337d773828a88610346c4b1119fb50c842587ed8bef1e5d9a656835a599e7209405b5761ddf2339668f2d0f4e889a92fe6051 - languageName: node - linkType: hard - -"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.13.1, is-core-module@npm:^2.5.0": - version: 2.13.1 - resolution: "is-core-module@npm:2.13.1" - dependencies: - hasown: "npm:^2.0.0" - checksum: 10c0/2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518 - languageName: node - linkType: hard - -"is-data-view@npm:^1.0.1": - version: 1.0.1 - resolution: "is-data-view@npm:1.0.1" - dependencies: - is-typed-array: "npm:^1.1.13" - checksum: 10c0/a3e6ec84efe303da859107aed9b970e018e2bee7ffcb48e2f8096921a493608134240e672a2072577e5f23a729846241d9634806e8a0e51d9129c56d5f65442d - languageName: node - linkType: hard - -"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5": - version: 1.0.5 - resolution: "is-date-object@npm:1.0.5" - dependencies: - has-tostringtag: "npm:^1.0.0" - checksum: 10c0/eed21e5dcc619c48ccef804dfc83a739dbb2abee6ca202838ee1bd5f760fe8d8a93444f0d49012ad19bb7c006186e2884a1b92f6e1c056da7fd23d0a9ad5992e - languageName: node - linkType: hard - -"is-docker@npm:^2.0.0": - version: 2.2.1 - resolution: "is-docker@npm:2.2.1" - bin: - is-docker: cli.js - checksum: 10c0/e828365958d155f90c409cdbe958f64051d99e8aedc2c8c4cd7c89dcf35329daed42f7b99346f7828df013e27deb8f721cf9408ba878c76eb9e8290235fbcdcc - languageName: node - linkType: hard - -"is-extglob@npm:^2.1.1": - version: 2.1.1 - resolution: "is-extglob@npm:2.1.1" - checksum: 10c0/5487da35691fbc339700bbb2730430b07777a3c21b9ebaecb3072512dfd7b4ba78ac2381a87e8d78d20ea08affb3f1971b4af629173a6bf435ff8a4c47747912 - languageName: node - linkType: hard - -"is-finalizationregistry@npm:^1.0.2": - version: 1.0.2 - resolution: "is-finalizationregistry@npm:1.0.2" - dependencies: - call-bind: "npm:^1.0.2" - checksum: 10c0/81caecc984d27b1a35c68741156fc651fb1fa5e3e6710d21410abc527eb226d400c0943a167922b2e920f6b3e58b0dede9aa795882b038b85f50b3a4b877db86 - languageName: node - linkType: hard - -"is-fullwidth-code-point@npm:^3.0.0": - version: 3.0.0 - resolution: "is-fullwidth-code-point@npm:3.0.0" - checksum: 10c0/bb11d825e049f38e04c06373a8d72782eee0205bda9d908cc550ccb3c59b99d750ff9537982e01733c1c94a58e35400661f57042158ff5e8f3e90cf936daf0fc - languageName: node - linkType: hard - -"is-fullwidth-code-point@npm:^4.0.0": - version: 4.0.0 - resolution: "is-fullwidth-code-point@npm:4.0.0" - checksum: 10c0/df2a717e813567db0f659c306d61f2f804d480752526886954a2a3e2246c7745fd07a52b5fecf2b68caf0a6c79dcdace6166fdf29cc76ed9975cc334f0a018b8 - languageName: node - linkType: hard - -"is-generator-function@npm:^1.0.10": - version: 1.0.10 - resolution: "is-generator-function@npm:1.0.10" - dependencies: - has-tostringtag: "npm:^1.0.0" - checksum: 10c0/df03514df01a6098945b5a0cfa1abff715807c8e72f57c49a0686ad54b3b74d394e2d8714e6f709a71eb00c9630d48e73ca1796c1ccc84ac95092c1fecc0d98b - languageName: node - linkType: hard - -"is-glob@npm:^4.0.0, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1": - version: 4.0.3 - resolution: "is-glob@npm:4.0.3" - dependencies: - is-extglob: "npm:^2.1.1" - checksum: 10c0/17fb4014e22be3bbecea9b2e3a76e9e34ff645466be702f1693e8f1ee1adac84710d0be0bd9f967d6354036fd51ab7c2741d954d6e91dae6bb69714de92c197a - languageName: node - linkType: hard - -"is-installed-globally@npm:^0.4.0": - version: 0.4.0 - resolution: "is-installed-globally@npm:0.4.0" - dependencies: - global-dirs: "npm:^3.0.0" - is-path-inside: "npm:^3.0.2" - checksum: 10c0/f3e6220ee5824b845c9ed0d4b42c24272701f1f9926936e30c0e676254ca5b34d1b92c6205cae11b283776f9529212c0cdabb20ec280a6451677d6493ca9c22d - languageName: node - linkType: hard - -"is-lambda@npm:^1.0.1": - version: 1.0.1 - resolution: "is-lambda@npm:1.0.1" - checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d - languageName: node - linkType: hard - -"is-map@npm:^2.0.3": - version: 2.0.3 - resolution: "is-map@npm:2.0.3" - checksum: 10c0/2c4d431b74e00fdda7162cd8e4b763d6f6f217edf97d4f8538b94b8702b150610e2c64961340015fe8df5b1fcee33ccd2e9b62619c4a8a3a155f8de6d6d355fc - languageName: node - linkType: hard - -"is-negative-zero@npm:^2.0.3": - version: 2.0.3 - resolution: "is-negative-zero@npm:2.0.3" - checksum: 10c0/bcdcf6b8b9714063ffcfa9929c575ac69bfdabb8f4574ff557dfc086df2836cf07e3906f5bbc4f2a5c12f8f3ba56af640c843cdfc74da8caed86c7c7d66fd08e - languageName: node - linkType: hard - -"is-npm@npm:^5.0.0": - version: 5.0.0 - resolution: "is-npm@npm:5.0.0" - checksum: 10c0/8ded3ae1119bbbda22395fe1c64d2d79d3b3baeb2635c90f9a9dca4b8ce19a67b55fda178269b63421b257b361892fd545807fb5ac212f06776f544d9fcc3ab0 - languageName: node - linkType: hard - -"is-number-object@npm:^1.0.4": - version: 1.0.7 - resolution: "is-number-object@npm:1.0.7" - dependencies: - has-tostringtag: "npm:^1.0.0" - checksum: 10c0/aad266da1e530f1804a2b7bd2e874b4869f71c98590b3964f9d06cc9869b18f8d1f4778f838ecd2a11011bce20aeecb53cb269ba916209b79c24580416b74b1b - languageName: node - linkType: hard - -"is-number@npm:^7.0.0": - version: 7.0.0 - resolution: "is-number@npm:7.0.0" - checksum: 10c0/b4686d0d3053146095ccd45346461bc8e53b80aeb7671cc52a4de02dbbf7dc0d1d2a986e2fe4ae206984b4d34ef37e8b795ebc4f4295c978373e6575e295d811 - languageName: node - linkType: hard - -"is-obj@npm:^2.0.0": - version: 2.0.0 - resolution: "is-obj@npm:2.0.0" - checksum: 10c0/85044ed7ba8bd169e2c2af3a178cacb92a97aa75de9569d02efef7f443a824b5e153eba72b9ae3aca6f8ce81955271aa2dc7da67a8b720575d3e38104208cb4e - languageName: node - linkType: hard - -"is-path-inside@npm:^3.0.2, is-path-inside@npm:^3.0.3": - version: 3.0.3 - resolution: "is-path-inside@npm:3.0.3" - checksum: 10c0/cf7d4ac35fb96bab6a1d2c3598fe5ebb29aafb52c0aaa482b5a3ed9d8ba3edc11631e3ec2637660c44b3ce0e61a08d54946e8af30dec0b60a7c27296c68ffd05 - languageName: node - linkType: hard - -"is-plain-obj@npm:^1.1.0": - version: 1.1.0 - resolution: "is-plain-obj@npm:1.1.0" - checksum: 10c0/daaee1805add26f781b413fdf192fc91d52409583be30ace35c82607d440da63cc4cac0ac55136716688d6c0a2c6ef3edb2254fecbd1fe06056d6bd15975ee8c - languageName: node - linkType: hard - -"is-plain-obj@npm:^2.1.0": - version: 2.1.0 - resolution: "is-plain-obj@npm:2.1.0" - checksum: 10c0/e5c9814cdaa627a9ad0a0964ded0e0491bfd9ace405c49a5d63c88b30a162f1512c069d5b80997893c4d0181eadc3fed02b4ab4b81059aba5620bfcdfdeb9c53 - languageName: node - linkType: hard - -"is-plain-object@npm:^2.0.4": - version: 2.0.4 - resolution: "is-plain-object@npm:2.0.4" - dependencies: - isobject: "npm:^3.0.1" - checksum: 10c0/f050fdd5203d9c81e8c4df1b3ff461c4bc64e8b5ca383bcdde46131361d0a678e80bcf00b5257646f6c636197629644d53bd8e2375aea633de09a82d57e942f4 - languageName: node - linkType: hard - -"is-potential-custom-element-name@npm:^1.0.1": - version: 1.0.1 - resolution: "is-potential-custom-element-name@npm:1.0.1" - checksum: 10c0/b73e2f22bc863b0939941d369486d308b43d7aef1f9439705e3582bfccaa4516406865e32c968a35f97a99396dac84e2624e67b0a16b0a15086a785e16ce7db9 - languageName: node - linkType: hard - -"is-regex@npm:^1.1.4": - version: 1.1.4 - resolution: "is-regex@npm:1.1.4" - dependencies: - call-bind: "npm:^1.0.2" - has-tostringtag: "npm:^1.0.0" - checksum: 10c0/bb72aae604a69eafd4a82a93002058c416ace8cde95873589a97fc5dac96a6c6c78a9977d487b7b95426a8f5073969124dd228f043f9f604f041f32fcc465fc1 - languageName: node - linkType: hard - -"is-set@npm:^2.0.3": - version: 2.0.3 - resolution: "is-set@npm:2.0.3" - checksum: 10c0/f73732e13f099b2dc879c2a12341cfc22ccaca8dd504e6edae26484bd5707a35d503fba5b4daad530a9b088ced1ae6c9d8200fd92e09b428fe14ea79ce8080b7 - languageName: node - linkType: hard - -"is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3": - version: 1.0.3 - resolution: "is-shared-array-buffer@npm:1.0.3" - dependencies: - call-bind: "npm:^1.0.7" - checksum: 10c0/adc11ab0acbc934a7b9e5e9d6c588d4ec6682f6fea8cda5180721704fa32927582ede5b123349e32517fdadd07958973d24716c80e7ab198970c47acc09e59c7 - languageName: node - linkType: hard - -"is-stream@npm:^2.0.0": - version: 2.0.1 - resolution: "is-stream@npm:2.0.1" - checksum: 10c0/7c284241313fc6efc329b8d7f08e16c0efeb6baab1b4cd0ba579eb78e5af1aa5da11e68559896a2067cd6c526bd29241dda4eb1225e627d5aa1a89a76d4635a5 - languageName: node - linkType: hard - -"is-stream@npm:^3.0.0": - version: 3.0.0 - resolution: "is-stream@npm:3.0.0" - checksum: 10c0/eb2f7127af02ee9aa2a0237b730e47ac2de0d4e76a4a905a50a11557f2339df5765eaea4ceb8029f1efa978586abe776908720bfcb1900c20c6ec5145f6f29d8 - languageName: node - linkType: hard - -"is-string@npm:^1.0.5, is-string@npm:^1.0.7": - version: 1.0.7 - resolution: "is-string@npm:1.0.7" - dependencies: - has-tostringtag: "npm:^1.0.0" - checksum: 10c0/905f805cbc6eedfa678aaa103ab7f626aac9ebbdc8737abb5243acaa61d9820f8edc5819106b8fcd1839e33db21de9f0116ae20de380c8382d16dc2a601921f6 - languageName: node - linkType: hard - -"is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3": - version: 1.0.4 - resolution: "is-symbol@npm:1.0.4" - dependencies: - has-symbols: "npm:^1.0.2" - checksum: 10c0/9381dd015f7c8906154dbcbf93fad769de16b4b961edc94f88d26eb8c555935caa23af88bda0c93a18e65560f6d7cca0fd5a3f8a8e1df6f1abbb9bead4502ef7 - languageName: node - linkType: hard - -"is-text-path@npm:^1.0.1": - version: 1.0.1 - resolution: "is-text-path@npm:1.0.1" - dependencies: - text-extensions: "npm:^1.0.0" - checksum: 10c0/61c8650c29548febb6bf69e9541fc11abbbb087a0568df7bc471ba264e95fb254def4e610631cbab4ddb0a1a07949d06416f4ebeaf37875023fb184cdb87ee84 - languageName: node - linkType: hard - -"is-typed-array@npm:^1.1.13": - version: 1.1.13 - resolution: "is-typed-array@npm:1.1.13" - dependencies: - which-typed-array: "npm:^1.1.14" - checksum: 10c0/fa5cb97d4a80e52c2cc8ed3778e39f175a1a2ae4ddf3adae3187d69586a1fd57cfa0b095db31f66aa90331e9e3da79184cea9c6abdcd1abc722dc3c3edd51cca - languageName: node - linkType: hard - -"is-typedarray@npm:^1.0.0": - version: 1.0.0 - resolution: "is-typedarray@npm:1.0.0" - checksum: 10c0/4c096275ba041a17a13cca33ac21c16bc4fd2d7d7eb94525e7cd2c2f2c1a3ab956e37622290642501ff4310601e413b675cf399ad6db49855527d2163b3eeeec - languageName: node - linkType: hard - -"is-unicode-supported@npm:^0.1.0": - version: 0.1.0 - resolution: "is-unicode-supported@npm:0.1.0" - checksum: 10c0/00cbe3455c3756be68d2542c416cab888aebd5012781d6819749fefb15162ff23e38501fe681b3d751c73e8ff561ac09a5293eba6f58fdf0178462ce6dcb3453 - languageName: node - linkType: hard - -"is-weakmap@npm:^2.0.2": - version: 2.0.2 - resolution: "is-weakmap@npm:2.0.2" - checksum: 10c0/443c35bb86d5e6cc5929cd9c75a4024bb0fff9586ed50b092f94e700b89c43a33b186b76dbc6d54f3d3d09ece689ab38dcdc1af6a482cbe79c0f2da0a17f1299 - languageName: node - linkType: hard - -"is-weakref@npm:^1.0.2": - version: 1.0.2 - resolution: "is-weakref@npm:1.0.2" - dependencies: - call-bind: "npm:^1.0.2" - checksum: 10c0/1545c5d172cb690c392f2136c23eec07d8d78a7f57d0e41f10078aa4f5daf5d7f57b6513a67514ab4f073275ad00c9822fc8935e00229d0a2089e1c02685d4b1 - languageName: node - linkType: hard - -"is-weakset@npm:^2.0.3": - version: 2.0.3 - resolution: "is-weakset@npm:2.0.3" - dependencies: - call-bind: "npm:^1.0.7" - get-intrinsic: "npm:^1.2.4" - checksum: 10c0/8ad6141b6a400e7ce7c7442a13928c676d07b1f315ab77d9912920bf5f4170622f43126f111615788f26c3b1871158a6797c862233124507db0bcc33a9537d1a - languageName: node - linkType: hard - -"is-wsl@npm:^2.1.1": - version: 2.2.0 - resolution: "is-wsl@npm:2.2.0" - dependencies: - is-docker: "npm:^2.0.0" - checksum: 10c0/a6fa2d370d21be487c0165c7a440d567274fbba1a817f2f0bfa41cc5e3af25041d84267baa22df66696956038a43973e72fca117918c91431920bdef490fa25e - languageName: node - linkType: hard - -"is-yarn-global@npm:^0.3.0": - version: 0.3.0 - resolution: "is-yarn-global@npm:0.3.0" - checksum: 10c0/9f1ab6f28e6e7961c4b97e564791d1decf2886a0dbe9b92b2176d76156adbb42b4c06c0f33d7107b270c207cbcfe0b2293b7cc4a0ec6774ac6d37af9503d51e1 - languageName: node - linkType: hard - -"isarray@npm:0.0.1": - version: 0.0.1 - resolution: "isarray@npm:0.0.1" - checksum: 10c0/ed1e62da617f71fe348907c71743b5ed550448b455f8d269f89a7c7ddb8ae6e962de3dab6a74a237b06f5eb7f6ece7a45ada8ce96d87fe972926530f91ae3311 - languageName: node - linkType: hard - -"isarray@npm:^2.0.5": - version: 2.0.5 - resolution: "isarray@npm:2.0.5" - checksum: 10c0/4199f14a7a13da2177c66c31080008b7124331956f47bca57dd0b6ea9f11687aa25e565a2c7a2b519bc86988d10398e3049a1f5df13c9f6b7664154690ae79fd - languageName: node - linkType: hard - -"isbinaryfile@npm:^3.0.2": - version: 3.0.3 - resolution: "isbinaryfile@npm:3.0.3" - dependencies: - buffer-alloc: "npm:^1.2.0" - checksum: 10c0/9f726a0fa083d28b568b0f137f214fa5b94e9497d0a2bcdf6370d0167333bba61e4e89f0f1841768706715bcc1c92d02d8123050503c5cc6621f89e65fb1cbed - languageName: node - linkType: hard - -"isbinaryfile@npm:^4.0.10": - version: 4.0.10 - resolution: "isbinaryfile@npm:4.0.10" - checksum: 10c0/0703d8cfeb69ed79e6d173120f327450011a066755150a6bbf97ffecec1069a5f2092777868315b21359098c84b54984871cad1abce877ad9141fb2caf3dcabf - languageName: node - linkType: hard - -"isexe@npm:^2.0.0": - version: 2.0.0 - resolution: "isexe@npm:2.0.0" - checksum: 10c0/228cfa503fadc2c31596ab06ed6aa82c9976eec2bfd83397e7eaf06d0ccf42cd1dfd6743bf9aeb01aebd4156d009994c5f76ea898d2832c1fe342da923ca457d - languageName: node - linkType: hard - -"isexe@npm:^3.1.1": - version: 3.1.1 - resolution: "isexe@npm:3.1.1" - checksum: 10c0/9ec257654093443eb0a528a9c8cbba9c0ca7616ccb40abd6dde7202734d96bb86e4ac0d764f0f8cd965856aacbff2f4ce23e730dc19dfb41e3b0d865ca6fdcc7 - languageName: node - linkType: hard - -"isobject@npm:^3.0.1": - version: 3.0.1 - resolution: "isobject@npm:3.0.1" - checksum: 10c0/03344f5064a82f099a0cd1a8a407f4c0d20b7b8485e8e816c39f249e9416b06c322e8dec5b842b6bb8a06de0af9cb48e7bc1b5352f0fadc2f0abac033db3d4db - languageName: node - linkType: hard - -"iterator.prototype@npm:^1.1.2": - version: 1.1.2 - resolution: "iterator.prototype@npm:1.1.2" - dependencies: - define-properties: "npm:^1.2.1" - get-intrinsic: "npm:^1.2.1" - has-symbols: "npm:^1.0.3" - reflect.getprototypeof: "npm:^1.0.4" - set-function-name: "npm:^2.0.1" - checksum: 10c0/a32151326095e916f306990d909f6bbf23e3221999a18ba686419535dcd1749b10ded505e89334b77dc4c7a58a8508978f0eb16c2c8573e6d412eb7eb894ea79 - languageName: node - linkType: hard - -"jackspeak@npm:^2.3.5": - version: 2.3.6 - resolution: "jackspeak@npm:2.3.6" - dependencies: - "@isaacs/cliui": "npm:^8.0.2" - "@pkgjs/parseargs": "npm:^0.11.0" - dependenciesMeta: - "@pkgjs/parseargs": - optional: true - checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111 - languageName: node - linkType: hard - -"jackspeak@npm:^3.1.2": - version: 3.1.2 - resolution: "jackspeak@npm:3.1.2" - dependencies: - "@isaacs/cliui": "npm:^8.0.2" - "@pkgjs/parseargs": "npm:^0.11.0" - dependenciesMeta: - "@pkgjs/parseargs": - optional: true - checksum: 10c0/5f1922a1ca0f19869e23f0dc4374c60d36e922f7926c76fecf8080cc6f7f798d6a9caac1b9428327d14c67731fd551bb3454cb270a5e13a0718f3b3660ec3d5d - languageName: node - linkType: hard - -"jake@npm:^10.8.5": - version: 10.9.1 - resolution: "jake@npm:10.9.1" - dependencies: - async: "npm:^3.2.3" - chalk: "npm:^4.0.2" - filelist: "npm:^1.0.4" - minimatch: "npm:^3.1.2" - bin: - jake: bin/cli.js - checksum: 10c0/dda972431a926462f08fcf583ea8997884216a43daa5cce81cb42e7e661dc244f836c0a802fde23439c6e1fc59743d1c0be340aa726d3b17d77557611a5cd541 - languageName: node - linkType: hard - -"jest-worker@npm:^27.4.5": - version: 27.5.1 - resolution: "jest-worker@npm:27.5.1" - dependencies: - "@types/node": "npm:*" - merge-stream: "npm:^2.0.0" - supports-color: "npm:^8.0.0" - checksum: 10c0/8c4737ffd03887b3c6768e4cc3ca0269c0336c1e4b1b120943958ddb035ed2a0fc6acab6dc99631720a3720af4e708ff84fb45382ad1e83c27946adf3623969b - languageName: node - linkType: hard - -"js-cookie@npm:^2.2.1": - version: 2.2.1 - resolution: "js-cookie@npm:2.2.1" - checksum: 10c0/ee67fc0f8495d0800b851910b5eb5bf49d3033adff6493d55b5c097ca6da46f7fe666b10e2ecb13cfcaf5b88d71c205ce00a7e646de791689bfd053bbb36a376 - languageName: node - linkType: hard - -"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0": - version: 4.0.0 - resolution: "js-tokens@npm:4.0.0" - checksum: 10c0/e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed - languageName: node - linkType: hard - -"js-yaml@npm:4.1.0, js-yaml@npm:^4.1.0": - version: 4.1.0 - resolution: "js-yaml@npm:4.1.0" - dependencies: - argparse: "npm:^2.0.1" - bin: - js-yaml: bin/js-yaml.js - checksum: 10c0/184a24b4eaacfce40ad9074c64fd42ac83cf74d8c8cd137718d456ced75051229e5061b8633c3366b8aada17945a7a356b337828c19da92b51ae62126575018f - languageName: node - linkType: hard - -"js2xmlparser@npm:^4.0.2": - version: 4.0.2 - resolution: "js2xmlparser@npm:4.0.2" - dependencies: - xmlcreate: "npm:^2.0.4" - checksum: 10c0/b00de9351649d67d225e21734a08f456a4ecb3c29cafcd3bbecb36a8ab61ec841fad7f425bed50e21936fe387f472e49cfe75ce71d0beaacb0475b077c88ed39 - languageName: node - linkType: hard - -"jsbn@npm:1.1.0": - version: 1.1.0 - resolution: "jsbn@npm:1.1.0" - checksum: 10c0/4f907fb78d7b712e11dea8c165fe0921f81a657d3443dde75359ed52eb2b5d33ce6773d97985a089f09a65edd80b11cb75c767b57ba47391fee4c969f7215c96 - languageName: node - linkType: hard - -"jsdoc@npm:^4.0.0": - version: 4.0.3 - resolution: "jsdoc@npm:4.0.3" - dependencies: - "@babel/parser": "npm:^7.20.15" - "@jsdoc/salty": "npm:^0.2.1" - "@types/markdown-it": "npm:^14.1.1" - bluebird: "npm:^3.7.2" - catharsis: "npm:^0.9.0" - escape-string-regexp: "npm:^2.0.0" - js2xmlparser: "npm:^4.0.2" - klaw: "npm:^3.0.0" - markdown-it: "npm:^14.1.0" - markdown-it-anchor: "npm:^8.6.7" - marked: "npm:^4.0.10" - mkdirp: "npm:^1.0.4" - requizzle: "npm:^0.2.3" - strip-json-comments: "npm:^3.1.0" - underscore: "npm:~1.13.2" - bin: - jsdoc: ./jsdoc.js - checksum: 10c0/0ad7b1fad0c55627809080e3195649c215c5f711d4b718c4cf907d2ac390c571b524077a02d928a2f56fd73dbe439ca2c09fdea6d8af9ca325e0e6c5801fd7cb - languageName: node - linkType: hard - -"jsdom-global@npm:^3.0.2": - version: 3.0.2 - resolution: "jsdom-global@npm:3.0.2" - peerDependencies: - jsdom: ">=10.0.0" - checksum: 10c0/cf6417b351732a2d4e97fbe8e2703f5dc28e30b212aef832d7bc9bea50570c6e20a8a49db370f05b9ae3b8ebe55a5efbedb00540f11c5d216569821f64d7c58f - languageName: node - linkType: hard - -"jsdom@npm:^22.1.0": - version: 22.1.0 - resolution: "jsdom@npm:22.1.0" - dependencies: - abab: "npm:^2.0.6" - cssstyle: "npm:^3.0.0" - data-urls: "npm:^4.0.0" - decimal.js: "npm:^10.4.3" - domexception: "npm:^4.0.0" - form-data: "npm:^4.0.0" - html-encoding-sniffer: "npm:^3.0.0" - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.1" - is-potential-custom-element-name: "npm:^1.0.1" - nwsapi: "npm:^2.2.4" - parse5: "npm:^7.1.2" - rrweb-cssom: "npm:^0.6.0" - saxes: "npm:^6.0.0" - symbol-tree: "npm:^3.2.4" - tough-cookie: "npm:^4.1.2" - w3c-xmlserializer: "npm:^4.0.0" - webidl-conversions: "npm:^7.0.0" - whatwg-encoding: "npm:^2.0.0" - whatwg-mimetype: "npm:^3.0.0" - whatwg-url: "npm:^12.0.1" - ws: "npm:^8.13.0" - xml-name-validator: "npm:^4.0.0" - peerDependencies: - canvas: ^2.5.0 - peerDependenciesMeta: - canvas: - optional: true - checksum: 10c0/a1c1501c611d1fe833e0a28796a234325aa09d4c597a9d8ccf6970004a9d946d261469502eadb555bdd7a55f5a2fbf3ce60c727cd99acb0d63f257fb9afcd33d - languageName: node - linkType: hard - -"jsesc@npm:^2.5.1": - version: 2.5.2 - resolution: "jsesc@npm:2.5.2" - bin: - jsesc: bin/jsesc - checksum: 10c0/dbf59312e0ebf2b4405ef413ec2b25abb5f8f4d9bc5fb8d9f90381622ebca5f2af6a6aa9a8578f65903f9e33990a6dc798edd0ce5586894bf0e9e31803a1de88 - languageName: node - linkType: hard - -"json-buffer@npm:3.0.1": - version: 3.0.1 - resolution: "json-buffer@npm:3.0.1" - checksum: 10c0/0d1c91569d9588e7eef2b49b59851f297f3ab93c7b35c7c221e288099322be6b562767d11e4821da500f3219542b9afd2e54c5dc573107c1126ed1080f8e96d7 - languageName: node - linkType: hard - -"json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1": - version: 2.3.1 - resolution: "json-parse-even-better-errors@npm:2.3.1" - checksum: 10c0/140932564c8f0b88455432e0f33c4cb4086b8868e37524e07e723f4eaedb9425bdc2bafd71bd1d9765bd15fd1e2d126972bc83990f55c467168c228c24d665f3 - languageName: node - linkType: hard - -"json-schema-traverse@npm:^0.4.1": - version: 0.4.1 - resolution: "json-schema-traverse@npm:0.4.1" - checksum: 10c0/108fa90d4cc6f08243aedc6da16c408daf81793bf903e9fd5ab21983cda433d5d2da49e40711da016289465ec2e62e0324dcdfbc06275a607fe3233fde4942ce - languageName: node - linkType: hard - -"json-schema-traverse@npm:^1.0.0": - version: 1.0.0 - resolution: "json-schema-traverse@npm:1.0.0" - checksum: 10c0/71e30015d7f3d6dc1c316d6298047c8ef98a06d31ad064919976583eb61e1018a60a0067338f0f79cabc00d84af3fcc489bd48ce8a46ea165d9541ba17fb30c6 - languageName: node - linkType: hard - -"json-stable-stringify-without-jsonify@npm:^1.0.1": - version: 1.0.1 - resolution: "json-stable-stringify-without-jsonify@npm:1.0.1" - checksum: 10c0/cb168b61fd4de83e58d09aaa6425ef71001bae30d260e2c57e7d09a5fd82223e2f22a042dedaab8db23b7d9ae46854b08bb1f91675a8be11c5cffebef5fb66a5 - languageName: node - linkType: hard - -"json-stringify-safe@npm:^5.0.1": - version: 5.0.1 - resolution: "json-stringify-safe@npm:5.0.1" - checksum: 10c0/7dbf35cd0411d1d648dceb6d59ce5857ec939e52e4afc37601aa3da611f0987d5cee5b38d58329ceddf3ed48bd7215229c8d52059ab01f2444a338bf24ed0f37 - languageName: node - linkType: hard - -"json5@npm:^2.2.2": - version: 2.2.3 - resolution: "json5@npm:2.2.3" - bin: - json5: lib/cli.js - checksum: 10c0/5a04eed94810fa55c5ea138b2f7a5c12b97c3750bc63d11e511dcecbfef758003861522a070c2272764ee0f4e3e323862f386945aeb5b85b87ee43f084ba586c - languageName: node - linkType: hard - -"jsonfile@npm:^4.0.0": - version: 4.0.0 - resolution: "jsonfile@npm:4.0.0" - dependencies: - graceful-fs: "npm:^4.1.6" - dependenciesMeta: - graceful-fs: - optional: true - checksum: 10c0/7dc94b628d57a66b71fb1b79510d460d662eb975b5f876d723f81549c2e9cd316d58a2ddf742b2b93a4fa6b17b2accaf1a738a0e2ea114bdfb13a32e5377e480 - languageName: node - linkType: hard - -"jsonfile@npm:^6.0.1": - version: 6.1.0 - resolution: "jsonfile@npm:6.1.0" - dependencies: - graceful-fs: "npm:^4.1.6" - universalify: "npm:^2.0.0" - dependenciesMeta: - graceful-fs: - optional: true - checksum: 10c0/4f95b5e8a5622b1e9e8f33c96b7ef3158122f595998114d1e7f03985649ea99cb3cd99ce1ed1831ae94c8c8543ab45ebd044207612f31a56fd08462140e46865 - languageName: node - linkType: hard - -"jsonparse@npm:^1.2.0": - version: 1.3.1 - resolution: "jsonparse@npm:1.3.1" - checksum: 10c0/89bc68080cd0a0e276d4b5ab1b79cacd68f562467008d176dc23e16e97d4efec9e21741d92ba5087a8433526a45a7e6a9d5ef25408696c402ca1cfbc01a90bf0 - languageName: node - linkType: hard - -"jsx-ast-utils@npm:^2.4.1 || ^3.0.0": - version: 3.3.5 - resolution: "jsx-ast-utils@npm:3.3.5" - dependencies: - array-includes: "npm:^3.1.6" - array.prototype.flat: "npm:^1.3.1" - object.assign: "npm:^4.1.4" - object.values: "npm:^1.1.6" - checksum: 10c0/a32679e9cb55469cb6d8bbc863f7d631b2c98b7fc7bf172629261751a6e7bc8da6ae374ddb74d5fbd8b06cf0eb4572287b259813d92b36e384024ed35e4c13e1 - languageName: node - linkType: hard - -"just-extend@npm:^4.0.2": - version: 4.2.1 - resolution: "just-extend@npm:4.2.1" - checksum: 10c0/ab01b807ae064eee016001df7e958fab9d878a6e2e32119f5f5a94e986daca9d940aa6176889f04c2658e6e3edd75000d7bab1a2376d473ccb20ae571f4b8cbc - languageName: node - linkType: hard - -"keyboardevent-from-electron-accelerator@npm:^2.0.0": - version: 2.0.0 - resolution: "keyboardevent-from-electron-accelerator@npm:2.0.0" - checksum: 10c0/94bd9da6eb80145b36f336adb3f0a55cc8fdf0138f0df3028feb30d790d0727f8de27f040278805a499cc61dba816c8fab012e7f76c2495033d2fd7c2762f309 - languageName: node - linkType: hard - -"keyboardevents-areequal@npm:^0.2.1": - version: 0.2.2 - resolution: "keyboardevents-areequal@npm:0.2.2" - checksum: 10c0/1612c2aa52001163b2517ef6c0ea9abf20117e206e6796ba15eb99c0ae331a8826ab60a18e7ddb8ed0e15272af64d3b14383d2ae832beaa2f68548c1c53e4fa6 - languageName: node - linkType: hard - -"keyv@npm:^4.0.0, keyv@npm:^4.5.3": - version: 4.5.4 - resolution: "keyv@npm:4.5.4" - dependencies: - json-buffer: "npm:3.0.1" - checksum: 10c0/aa52f3c5e18e16bb6324876bb8b59dd02acf782a4b789c7b2ae21107fab95fab3890ed448d4f8dba80ce05391eeac4bfabb4f02a20221342982f806fa2cf271e - languageName: node - linkType: hard - -"kind-of@npm:^6.0.2, kind-of@npm:^6.0.3": - version: 6.0.3 - resolution: "kind-of@npm:6.0.3" - checksum: 10c0/61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4 - languageName: node - linkType: hard - -"klaw-sync@npm:^6.0.0": - version: 6.0.0 - resolution: "klaw-sync@npm:6.0.0" - dependencies: - graceful-fs: "npm:^4.1.11" - checksum: 10c0/00d8e4c48d0d699b743b3b028e807295ea0b225caf6179f51029e19783a93ad8bb9bccde617d169659fbe99559d73fb35f796214de031d0023c26b906cecd70a - languageName: node - linkType: hard - -"klaw@npm:^3.0.0": - version: 3.0.0 - resolution: "klaw@npm:3.0.0" - dependencies: - graceful-fs: "npm:^4.1.9" - checksum: 10c0/8391cf6df6337dce02e44628b620b39412d007eff162d907d37063c23986041d9b5c3558851d473c2fae92c1ccb0fde8864e36f9c55ac339fc469b517a2caa1b - languageName: node - linkType: hard - -"lamejs@npm:^1.2.0": - version: 1.2.1 - resolution: "lamejs@npm:1.2.1" - dependencies: - use-strict: "npm:1.0.1" - checksum: 10c0/9396e3233f1d5f718f0f09e1c6936dea3332ab64f4d00f2cbdf93226b762faba390fc4b10311d97c92c8cdb666571b5032bd9ede90499a708a26448ead2e5c4a - languageName: node - linkType: hard - -"latest-version@npm:^5.1.0": - version: 5.1.0 - resolution: "latest-version@npm:5.1.0" - dependencies: - package-json: "npm:^6.3.0" - checksum: 10c0/6219631d8651467c54c58ef1b5d5c5c53e146f5ae2b0ecbb78b202da3eaad55b05b043db2d2d6f1d4230ee071b2ae8c2f85089e01377e4338bad97fa76a963b7 - languageName: node - linkType: hard - -"lazy-val@npm:^1.0.4, lazy-val@npm:^1.0.5": - version: 1.0.5 - resolution: "lazy-val@npm:1.0.5" - checksum: 10c0/28ba7a0e704895a444eed47d110274090f485b991f2ea6fff2ab0878c529c53f60f2eb2d944cbbd68b91408e7455eabc62861c48289d4757fa9c818b97454f24 - languageName: node - linkType: hard - -"lcid@npm:^3.0.0": - version: 3.1.1 - resolution: "lcid@npm:3.1.1" - dependencies: - invert-kv: "npm:^3.0.0" - checksum: 10c0/43a39c39d92d756b9671691bb36ac2667c44c4a7e30f55403dc9c98ca4e7bba8c2b35599e8d7967163d65c1697e0d136596e9a9b9bccbd2292caf915c77416a4 - languageName: node - linkType: hard - -"levn@npm:^0.4.1": - version: 0.4.1 - resolution: "levn@npm:0.4.1" - dependencies: - prelude-ls: "npm:^1.2.1" - type-check: "npm:~0.4.0" - checksum: 10c0/effb03cad7c89dfa5bd4f6989364bfc79994c2042ec5966cb9b95990e2edee5cd8969ddf42616a0373ac49fac1403437deaf6e9050fbbaa3546093a59b9ac94e - languageName: node - linkType: hard - -"levn@npm:~0.3.0": - version: 0.3.0 - resolution: "levn@npm:0.3.0" - dependencies: - prelude-ls: "npm:~1.1.2" - type-check: "npm:~0.3.2" - checksum: 10c0/e440df9de4233da0b389cd55bd61f0f6aaff766400bebbccd1231b81801f6dbc1d816c676ebe8d70566394b749fa624b1ed1c68070e9c94999f0bdecc64cb676 - languageName: node - linkType: hard - -"libsession_util_nodejs@portal:/home/audric/pro/contribs/libsession-util-nodejs::locator=session-desktop%40workspace%3A.": - version: 0.0.0-use.local - resolution: "libsession_util_nodejs@portal:/home/audric/pro/contribs/libsession-util-nodejs::locator=session-desktop%40workspace%3A." - dependencies: - cmake-js: "npm:7.2.1" - node-addon-api: "npm:^6.1.0" - languageName: node - linkType: soft - -"libsodium-sumo@npm:^0.7.13": - version: 0.7.13 - resolution: "libsodium-sumo@npm:0.7.13" - checksum: 10c0/8159205cc36cc4bdf46ee097e5f998d5cac7d11612be7406a8396ca3ee31560871ac17daa69e47ff0e8407eeae9f49313912ea95dbc8715875301b004c28ef5b - languageName: node - linkType: hard - -"libsodium-wrappers-sumo@npm:^0.7.9": - version: 0.7.13 - resolution: "libsodium-wrappers-sumo@npm:0.7.13" - dependencies: - libsodium-sumo: "npm:^0.7.13" - checksum: 10c0/51a151d0f73418632dcf9cf0184b14d8eb6e16b9a3f01a652c7401c6d1bf8ead4f5ce40a4f00bd4754c5719a7a5fb71d6125691896aeb7a9c1abcfe4b73afc02 - languageName: node - linkType: hard - -"lilconfig@npm:2.1.0": - version: 2.1.0 - resolution: "lilconfig@npm:2.1.0" - checksum: 10c0/64645641aa8d274c99338e130554abd6a0190533c0d9eb2ce7ebfaf2e05c7d9961f3ffe2bfa39efd3b60c521ba3dd24fa236fe2775fc38501bf82bf49d4678b8 - languageName: node - linkType: hard - -"lines-and-columns@npm:^1.1.6": - version: 1.2.4 - resolution: "lines-and-columns@npm:1.2.4" - checksum: 10c0/3da6ee62d4cd9f03f5dc90b4df2540fb85b352081bee77fe4bbcd12c9000ead7f35e0a38b8d09a9bb99b13223446dd8689ff3c4959807620726d788701a83d2d - languageName: node - linkType: hard - -"linkify-it@npm:^4.0.1": - version: 4.0.1 - resolution: "linkify-it@npm:4.0.1" - dependencies: - uc.micro: "npm:^1.0.1" - checksum: 10c0/f1949ee2c7c2979c4f80c8c08f507d813f50775ebc5adfdb7ee662f28e0ee53dbd4a329d5231be67414405fc60d4e99b37536d6949702d311fe509a6bcbcf4a6 - languageName: node - linkType: hard - -"linkify-it@npm:^5.0.0": - version: 5.0.0 - resolution: "linkify-it@npm:5.0.0" - dependencies: - uc.micro: "npm:^2.0.0" - checksum: 10c0/ff4abbcdfa2003472fc3eb4b8e60905ec97718e11e33cca52059919a4c80cc0e0c2a14d23e23d8c00e5402bc5a885cdba8ca053a11483ab3cc8b3c7a52f88e2d - languageName: node - linkType: hard - -"lint-staged@npm:^14.0.1": - version: 14.0.1 - resolution: "lint-staged@npm:14.0.1" - dependencies: - chalk: "npm:5.3.0" - commander: "npm:11.0.0" - debug: "npm:4.3.4" - execa: "npm:7.2.0" - lilconfig: "npm:2.1.0" - listr2: "npm:6.6.1" - micromatch: "npm:4.0.5" - pidtree: "npm:0.6.0" - string-argv: "npm:0.3.2" - yaml: "npm:2.3.1" - bin: - lint-staged: bin/lint-staged.js - checksum: 10c0/57291d036123168998cb248ca70974b835edb231dbe0dc395cef44a4073a2c2404215e9cae8657ce562a559fc30cdaa4c20775dff6e8d2aa519243cc8bc294f4 - languageName: node - linkType: hard - -"listr2@npm:6.6.1": - version: 6.6.1 - resolution: "listr2@npm:6.6.1" - dependencies: - cli-truncate: "npm:^3.1.0" - colorette: "npm:^2.0.20" - eventemitter3: "npm:^5.0.1" - log-update: "npm:^5.0.1" - rfdc: "npm:^1.3.0" - wrap-ansi: "npm:^8.1.0" - peerDependencies: - enquirer: ">= 2.3.0 < 3" - peerDependenciesMeta: - enquirer: - optional: true - checksum: 10c0/2abfcd4346b8208e8d406cfe7a058cd10e3238f60de1ee53fa108a507b45b853ceb87e0d1d4ff229bbf6dd6e896262352e0c7a8895b8511cd55fe94304d3921e - languageName: node - linkType: hard - -"loader-runner@npm:^4.2.0": - version: 4.3.0 - resolution: "loader-runner@npm:4.3.0" - checksum: 10c0/a44d78aae0907a72f73966fe8b82d1439c8c485238bd5a864b1b9a2a3257832effa858790241e6b37876b5446a78889adf2fcc8dd897ce54c089ecc0a0ce0bf0 - languageName: node - linkType: hard - -"loader-utils@npm:^2.0.4": - version: 2.0.4 - resolution: "loader-utils@npm:2.0.4" - dependencies: - big.js: "npm:^5.2.2" - emojis-list: "npm:^3.0.0" - json5: "npm:^2.1.2" - checksum: 10c0/d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100 - languageName: node - linkType: hard - -"locate-path@npm:^5.0.0": - version: 5.0.0 - resolution: "locate-path@npm:5.0.0" - dependencies: - p-locate: "npm:^4.1.0" - checksum: 10c0/33a1c5247e87e022f9713e6213a744557a3e9ec32c5d0b5efb10aa3a38177615bf90221a5592674857039c1a0fd2063b82f285702d37b792d973e9e72ace6c59 - languageName: node - linkType: hard - -"locate-path@npm:^6.0.0": - version: 6.0.0 - resolution: "locate-path@npm:6.0.0" - dependencies: - p-locate: "npm:^5.0.0" - checksum: 10c0/d3972ab70dfe58ce620e64265f90162d247e87159b6126b01314dd67be43d50e96a50b517bce2d9452a79409c7614054c277b5232377de50416564a77ac7aad3 - languageName: node - linkType: hard - -"lodash-es@npm:^4.2.1": - version: 4.17.21 - resolution: "lodash-es@npm:4.17.21" - checksum: 10c0/fb407355f7e6cd523a9383e76e6b455321f0f153a6c9625e21a8827d10c54c2a2341bd2ae8d034358b60e07325e1330c14c224ff582d04612a46a4f0479ff2f2 - languageName: node - linkType: hard - -"lodash.camelcase@npm:^4.3.0": - version: 4.3.0 - resolution: "lodash.camelcase@npm:4.3.0" - checksum: 10c0/fcba15d21a458076dd309fce6b1b4bf611d84a0ec252cb92447c948c533ac250b95d2e00955801ebc367e5af5ed288b996d75d37d2035260a937008e14eaf432 - languageName: node - linkType: hard - -"lodash.escaperegexp@npm:^4.1.2": - version: 4.1.2 - resolution: "lodash.escaperegexp@npm:4.1.2" - checksum: 10c0/484ad4067fa9119bb0f7c19a36ab143d0173a081314993fe977bd00cf2a3c6a487ce417a10f6bac598d968364f992153315f0dbe25c9e38e3eb7581dd333e087 - languageName: node - linkType: hard - -"lodash.get@npm:^4.4.2": - version: 4.4.2 - resolution: "lodash.get@npm:4.4.2" - checksum: 10c0/48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e - languageName: node - linkType: hard - -"lodash.isequal@npm:^4.5.0": - version: 4.5.0 - resolution: "lodash.isequal@npm:4.5.0" - checksum: 10c0/dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f - languageName: node - linkType: hard - -"lodash.isfunction@npm:^3.0.9": - version: 3.0.9 - resolution: "lodash.isfunction@npm:3.0.9" - checksum: 10c0/e88620922f5f104819496884779ca85bfc542efb2946df661ab3e2cd38da5c8375434c6adbedfc76dd3c2b04075d2ba8ec215cfdedf08ddd2e3c3467e8a26ccd - languageName: node - linkType: hard - -"lodash.isplainobject@npm:^4.0.6": - version: 4.0.6 - resolution: "lodash.isplainobject@npm:4.0.6" - checksum: 10c0/afd70b5c450d1e09f32a737bed06ff85b873ecd3d3d3400458725283e3f2e0bb6bf48e67dbe7a309eb371a822b16a26cca4a63c8c52db3fc7dc9d5f9dd324cbb - languageName: node - linkType: hard - -"lodash.kebabcase@npm:^4.1.1": - version: 4.1.1 - resolution: "lodash.kebabcase@npm:4.1.1" - checksum: 10c0/da5d8f41dbb5bc723d4bf9203d5096ca8da804d6aec3d2b56457156ba6c8d999ff448d347ebd97490da853cb36696ea4da09a431499f1ee8deb17b094ecf4e33 - languageName: node - linkType: hard - -"lodash.merge@npm:^4.6.2": - version: 4.6.2 - resolution: "lodash.merge@npm:4.6.2" - checksum: 10c0/402fa16a1edd7538de5b5903a90228aa48eb5533986ba7fa26606a49db2572bf414ff73a2c9f5d5fd36b31c46a5d5c7e1527749c07cbcf965ccff5fbdf32c506 - languageName: node - linkType: hard - -"lodash.mergewith@npm:^4.6.2": - version: 4.6.2 - resolution: "lodash.mergewith@npm:4.6.2" - checksum: 10c0/4adbed65ff96fd65b0b3861f6899f98304f90fd71e7f1eb36c1270e05d500ee7f5ec44c02ef979b5ddbf75c0a0b9b99c35f0ad58f4011934c4d4e99e5200b3b5 - languageName: node - linkType: hard - -"lodash.snakecase@npm:^4.1.1": - version: 4.1.1 - resolution: "lodash.snakecase@npm:4.1.1" - checksum: 10c0/f0b3f2497eb20eea1a1cfc22d645ecaeb78ac14593eb0a40057977606d2f35f7aaff0913a06553c783b535aafc55b718f523f9eb78f8d5293f492af41002eaf9 - languageName: node - linkType: hard - -"lodash.startcase@npm:^4.4.0": - version: 4.4.0 - resolution: "lodash.startcase@npm:4.4.0" - checksum: 10c0/bd82aa87a45de8080e1c5ee61128c7aee77bf7f1d86f4ff94f4a6d7438fc9e15e5f03374b947be577a93804c8ad6241f0251beaf1452bf716064eeb657b3a9f0 - languageName: node - linkType: hard - -"lodash.uniq@npm:^4.5.0": - version: 4.5.0 - resolution: "lodash.uniq@npm:4.5.0" - checksum: 10c0/262d400bb0952f112162a320cc4a75dea4f66078b9e7e3075ffbc9c6aa30b3e9df3cf20e7da7d566105e1ccf7804e4fbd7d804eee0b53de05d83f16ffbf41c5e - languageName: node - linkType: hard - -"lodash.upperfirst@npm:^4.3.1": - version: 4.3.1 - resolution: "lodash.upperfirst@npm:4.3.1" - checksum: 10c0/435625da4b3ee74e7a1367a780d9107ab0b13ef4359fc074b2a1a40458eb8d91b655af62f6795b7138d493303a98c0285340160341561d6896e4947e077fa975 - languageName: node - linkType: hard - -"lodash@npm:^4.17.20": - version: 4.17.21 - resolution: "lodash@npm:4.17.21" - checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c - languageName: node - linkType: hard - -"log-symbols@npm:4.1.0": - version: 4.1.0 - resolution: "log-symbols@npm:4.1.0" - dependencies: - chalk: "npm:^4.1.0" - is-unicode-supported: "npm:^0.1.0" - checksum: 10c0/67f445a9ffa76db1989d0fa98586e5bc2fd5247260dafb8ad93d9f0ccd5896d53fb830b0e54dade5ad838b9de2006c826831a3c528913093af20dff8bd24aca6 - languageName: node - linkType: hard - -"log-update@npm:^5.0.1": - version: 5.0.1 - resolution: "log-update@npm:5.0.1" - dependencies: - ansi-escapes: "npm:^5.0.0" - cli-cursor: "npm:^4.0.0" - slice-ansi: "npm:^5.0.0" - strip-ansi: "npm:^7.0.1" - wrap-ansi: "npm:^8.0.1" - checksum: 10c0/1050ea2027e80f32e132aace909987cb00c2719368c78b82ffca681a5b3f4020eeb5f4b4e310c47c35c6c36aff258c1d1bc51485ac44d6fdac9eb0a4275c539f - languageName: node - linkType: hard - -"long@npm:^4.0.0": - version: 4.0.0 - resolution: "long@npm:4.0.0" - checksum: 10c0/50a6417d15b06104dbe4e3d4a667c39b137f130a9108ea8752b352a4cfae047531a3ac351c181792f3f8768fe17cca6b0f406674a541a86fb638aaac560d83ed - languageName: node - linkType: hard - -"long@npm:^5.0.0": - version: 5.2.3 - resolution: "long@npm:5.2.3" - checksum: 10c0/6a0da658f5ef683b90330b1af76f06790c623e148222da9d75b60e266bbf88f803232dd21464575681638894a84091616e7f89557aa087fd14116c0f4e0e43d9 - languageName: node - linkType: hard - -"long@npm:~3": - version: 3.2.0 - resolution: "long@npm:3.2.0" - checksum: 10c0/03884ad097403bda356228899c8397d7e4e2cd26489983034faa8e52ab9f18df4539de548571ad2f574ecf78454fc377bbcd2ba8ba76d567bf973345aefcbdb2 - languageName: node - linkType: hard - -"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0": - version: 1.4.0 - resolution: "loose-envify@npm:1.4.0" - dependencies: - js-tokens: "npm:^3.0.0 || ^4.0.0" - bin: - loose-envify: cli.js - checksum: 10c0/655d110220983c1a4b9c0c679a2e8016d4b67f6e9c7b5435ff5979ecdb20d0813f4dec0a08674fcbdd4846a3f07edbb50a36811fd37930b94aaa0d9daceb017e - languageName: node - linkType: hard - -"loupe@npm:^2.3.6": - version: 2.3.7 - resolution: "loupe@npm:2.3.7" - dependencies: - get-func-name: "npm:^2.0.1" - checksum: 10c0/71a781c8fc21527b99ed1062043f1f2bb30bdaf54fa4cf92463427e1718bc6567af2988300bc243c1f276e4f0876f29e3cbf7b58106fdc186915687456ce5bf4 - languageName: node - linkType: hard - -"lowercase-keys@npm:^2.0.0": - version: 2.0.0 - resolution: "lowercase-keys@npm:2.0.0" - checksum: 10c0/f82a2b3568910509da4b7906362efa40f5b54ea14c2584778ddb313226f9cbf21020a5db35f9b9a0e95847a9b781d548601f31793d736b22a2b8ae8eb9ab1082 - languageName: node - linkType: hard - -"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0": - version: 10.2.2 - resolution: "lru-cache@npm:10.2.2" - checksum: 10c0/402d31094335851220d0b00985084288136136992979d0e015f0f1697e15d1c86052d7d53ae86b614e5b058425606efffc6969a31a091085d7a2b80a8a1e26d6 - languageName: node - linkType: hard - -"lru-cache@npm:^6.0.0": - version: 6.0.0 - resolution: "lru-cache@npm:6.0.0" - dependencies: - yallist: "npm:^4.0.0" - checksum: 10c0/cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9 - languageName: node - linkType: hard - -"make-dir@npm:^3.0.0": - version: 3.1.0 - resolution: "make-dir@npm:3.1.0" - dependencies: - semver: "npm:^6.0.0" - checksum: 10c0/56aaafefc49c2dfef02c5c95f9b196c4eb6988040cf2c712185c7fe5c99b4091591a7fc4d4eafaaefa70ff763a26f6ab8c3ff60b9e75ea19876f49b18667ecaa - languageName: node - linkType: hard - -"make-error@npm:^1.1.1": - version: 1.3.6 - resolution: "make-error@npm:1.3.6" - checksum: 10c0/171e458d86854c6b3fc46610cfacf0b45149ba043782558c6875d9f42f222124384ad0b468c92e996d815a8a2003817a710c0a160e49c1c394626f76fa45396f - languageName: node - linkType: hard - -"make-fetch-happen@npm:^13.0.0": - version: 13.0.1 - resolution: "make-fetch-happen@npm:13.0.1" - dependencies: - "@npmcli/agent": "npm:^2.0.0" - cacache: "npm:^18.0.0" - http-cache-semantics: "npm:^4.1.1" - is-lambda: "npm:^1.0.1" - minipass: "npm:^7.0.2" - minipass-fetch: "npm:^3.0.0" - minipass-flush: "npm:^1.0.5" - minipass-pipeline: "npm:^1.2.4" - negotiator: "npm:^0.6.3" - proc-log: "npm:^4.2.0" - promise-retry: "npm:^2.0.1" - ssri: "npm:^10.0.0" - checksum: 10c0/df5f4dbb6d98153b751bccf4dc4cc500de85a96a9331db9805596c46aa9f99d9555983954e6c1266d9f981ae37a9e4647f42b9a4bb5466f867f4012e582c9e7e - languageName: node - linkType: hard - -"map-age-cleaner@npm:^0.1.3": - version: 0.1.3 - resolution: "map-age-cleaner@npm:0.1.3" - dependencies: - p-defer: "npm:^1.0.0" - checksum: 10c0/7495236c7b0950956c144fd8b4bc6399d4e78072a8840a4232fe1c4faccbb5eb5d842e5c0a56a60afc36d723f315c1c672325ca03c1b328650f7fcc478f385fd - languageName: node - linkType: hard - -"map-obj@npm:^1.0.0": - version: 1.0.1 - resolution: "map-obj@npm:1.0.1" - checksum: 10c0/ccca88395e7d38671ed9f5652ecf471ecd546924be2fb900836b9da35e068a96687d96a5f93dcdfa94d9a27d649d2f10a84595590f89a347fb4dda47629dcc52 - languageName: node - linkType: hard - -"map-obj@npm:^4.0.0": - version: 4.3.0 - resolution: "map-obj@npm:4.3.0" - checksum: 10c0/1c19e1c88513c8abdab25c316367154c6a0a6a0f77e3e8c391bb7c0e093aefed293f539d026dc013d86219e5e4c25f23b0003ea588be2101ccd757bacc12d43b - languageName: node - linkType: hard - -"markdown-it-anchor@npm:^8.6.7": - version: 8.6.7 - resolution: "markdown-it-anchor@npm:8.6.7" - peerDependencies: - "@types/markdown-it": "*" - markdown-it: "*" - checksum: 10c0/f117866488013b7e4085a6b59d12bf62879181aef65ea2851f01ed1b763b8c052580c2c27fa8bd009421886220c6beeb373a65af9e885ce63a36ee9f8dcd0e89 - languageName: node - linkType: hard - -"markdown-it@npm:^14.1.0": - version: 14.1.0 - resolution: "markdown-it@npm:14.1.0" - dependencies: - argparse: "npm:^2.0.1" - entities: "npm:^4.4.0" - linkify-it: "npm:^5.0.0" - mdurl: "npm:^2.0.0" - punycode.js: "npm:^2.3.1" - uc.micro: "npm:^2.1.0" - bin: - markdown-it: bin/markdown-it.mjs - checksum: 10c0/9a6bb444181d2db7016a4173ae56a95a62c84d4cbfb6916a399b11d3e6581bf1cc2e4e1d07a2f022ae72c25f56db90fbe1e529fca16fbf9541659dc53480d4b4 - languageName: node - linkType: hard - -"marked@npm:^4.0.10": - version: 4.3.0 - resolution: "marked@npm:4.3.0" - bin: - marked: bin/marked.js - checksum: 10c0/0013463855e31b9c88d8bb2891a611d10ef1dc79f2e3cbff1bf71ba389e04c5971298c886af0be799d7fa9aa4593b086a136062d59f1210b0480b026a8c5dc47 - languageName: node - linkType: hard - -"matcher@npm:^3.0.0": - version: 3.0.0 - resolution: "matcher@npm:3.0.0" - dependencies: - escape-string-regexp: "npm:^4.0.0" - checksum: 10c0/2edf24194a2879690bcdb29985fc6bc0d003df44e04df21ebcac721fa6ce2f6201c579866bb92f9380bffe946f11ecd8cd31f34117fb67ebf8aca604918e127e - languageName: node - linkType: hard - -"maxmind@npm:^4.3.18": - version: 4.3.19 - resolution: "maxmind@npm:4.3.19" - dependencies: - mmdb-lib: "npm:2.1.0" - tiny-lru: "npm:11.2.6" - checksum: 10c0/8aa11eb781f7766c92ec0e170f8fa22099a1ef39937197b34dd80be94ee0f9a2af7c6df46eebf8cf51e3750baeb87f0e00078256e6f02fdd015cf0565a63a587 - languageName: node - linkType: hard - -"mdn-data@npm:2.0.14": - version: 2.0.14 - resolution: "mdn-data@npm:2.0.14" - checksum: 10c0/67241f8708c1e665a061d2b042d2d243366e93e5bf1f917693007f6d55111588b952dcbfd3ea9c2d0969fb754aad81b30fdcfdcc24546495fc3b24336b28d4bd - languageName: node - linkType: hard - -"mdurl@npm:^2.0.0": - version: 2.0.0 - resolution: "mdurl@npm:2.0.0" - checksum: 10c0/633db522272f75ce4788440669137c77540d74a83e9015666a9557a152c02e245b192edc20bc90ae953bbab727503994a53b236b4d9c99bdaee594d0e7dd2ce0 - languageName: node - linkType: hard - -"mem@npm:^5.0.0": - version: 5.1.1 - resolution: "mem@npm:5.1.1" - dependencies: - map-age-cleaner: "npm:^0.1.3" - mimic-fn: "npm:^2.1.0" - p-is-promise: "npm:^2.1.0" - checksum: 10c0/2fa86d04793d95665379d5f45b5aede2d1b88b9ec845db3274956c75bb9e88834a78605b683344d0ca03d45432124774589ca4bd0c83d481b80c2f2cd97914b3 - languageName: node - linkType: hard - -"memory-stream@npm:^1.0.0": - version: 1.0.0 - resolution: "memory-stream@npm:1.0.0" - dependencies: - readable-stream: "npm:^3.4.0" - checksum: 10c0/a2d9abd35845b228055ce5424dbdd8478711ba41325d02e6c8ef9baeba557287d4493a6e74d3db5c9849c58ea13fdc1dd445c96f469cbd02f47d22cfba930306 - languageName: node - linkType: hard - -"meow@npm:^8.0.0, meow@npm:^8.1.2": - version: 8.1.2 - resolution: "meow@npm:8.1.2" - dependencies: - "@types/minimist": "npm:^1.2.0" - camelcase-keys: "npm:^6.2.2" - decamelize-keys: "npm:^1.1.0" - hard-rejection: "npm:^2.1.0" - minimist-options: "npm:4.1.0" - normalize-package-data: "npm:^3.0.0" - read-pkg-up: "npm:^7.0.1" - redent: "npm:^3.0.0" - trim-newlines: "npm:^3.0.0" - type-fest: "npm:^0.18.0" - yargs-parser: "npm:^20.2.3" - checksum: 10c0/9a8d90e616f783650728a90f4ea1e5f763c1c5260369e6596b52430f877f4af8ecbaa8c9d952c93bbefd6d5bda4caed6a96a20ba7d27b511d2971909b01922a2 - languageName: node - linkType: hard - -"merge-stream@npm:^2.0.0": - version: 2.0.0 - resolution: "merge-stream@npm:2.0.0" - checksum: 10c0/867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5 - languageName: node - linkType: hard - -"merge2@npm:^1.3.0, merge2@npm:^1.4.1": - version: 1.4.1 - resolution: "merge2@npm:1.4.1" - checksum: 10c0/254a8a4605b58f450308fc474c82ac9a094848081bf4c06778200207820e5193726dc563a0d2c16468810516a5c97d9d3ea0ca6585d23c58ccfff2403e8dbbeb - languageName: node - linkType: hard - -"mic-recorder-to-mp3@npm:^2.2.2": - version: 2.2.2 - resolution: "mic-recorder-to-mp3@npm:2.2.2" - dependencies: - lamejs: "npm:^1.2.0" - peerDependencies: - webrtc-adapter: ">=4.1.1" - checksum: 10c0/639bc1ac5885563f64424eda913a7ab6ae3d6c88ea49143d0a6ef409a9b0e9dc4f86573f61578fd3179e4baf8395f765ef36d344054ab669a166497f0f016abb - languageName: node - linkType: hard - -"micromatch@npm:4.0.5": - version: 4.0.5 - resolution: "micromatch@npm:4.0.5" - dependencies: - braces: "npm:^3.0.2" - picomatch: "npm:^2.3.1" - checksum: 10c0/3d6505b20f9fa804af5d8c596cb1c5e475b9b0cd05f652c5b56141cf941bd72adaeb7a436fda344235cef93a7f29b7472efc779fcdb83b478eab0867b95cdeff - languageName: node - linkType: hard - -"micromatch@npm:^4.0.0, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4": - version: 4.0.7 - resolution: "micromatch@npm:4.0.7" - dependencies: - braces: "npm:^3.0.3" - picomatch: "npm:^2.3.1" - checksum: 10c0/58fa99bc5265edec206e9163a1d2cec5fabc46a5b473c45f4a700adce88c2520456ae35f2b301e4410fb3afb27e9521fb2813f6fc96be0a48a89430e0916a772 - languageName: node - linkType: hard - -"mime-db@npm:1.52.0": - version: 1.52.0 - resolution: "mime-db@npm:1.52.0" - checksum: 10c0/0557a01deebf45ac5f5777fe7740b2a5c309c6d62d40ceab4e23da9f821899ce7a900b7ac8157d4548ddbb7beffe9abc621250e6d182b0397ec7f10c7b91a5aa - languageName: node - linkType: hard - -"mime-types@npm:^2.1.12, mime-types@npm:^2.1.27": - version: 2.1.35 - resolution: "mime-types@npm:2.1.35" - dependencies: - mime-db: "npm:1.52.0" - checksum: 10c0/82fb07ec56d8ff1fc999a84f2f217aa46cb6ed1033fefaabd5785b9a974ed225c90dc72fff460259e66b95b73648596dbcc50d51ed69cdf464af2d237d3149b2 - languageName: node - linkType: hard - -"mime@npm:^2.5.2": - version: 2.6.0 - resolution: "mime@npm:2.6.0" - bin: - mime: cli.js - checksum: 10c0/a7f2589900d9c16e3bdf7672d16a6274df903da958c1643c9c45771f0478f3846dcb1097f31eb9178452570271361e2149310931ec705c037210fc69639c8e6c - languageName: node - linkType: hard - -"mimic-fn@npm:^2.1.0": - version: 2.1.0 - resolution: "mimic-fn@npm:2.1.0" - checksum: 10c0/b26f5479d7ec6cc2bce275a08f146cf78f5e7b661b18114e2506dd91ec7ec47e7a25bf4360e5438094db0560bcc868079fb3b1fb3892b833c1ecbf63f80c95a4 - languageName: node - linkType: hard - -"mimic-fn@npm:^4.0.0": - version: 4.0.0 - resolution: "mimic-fn@npm:4.0.0" - checksum: 10c0/de9cc32be9996fd941e512248338e43407f63f6d497abe8441fa33447d922e927de54d4cc3c1a3c6d652857acd770389d5a3823f311a744132760ce2be15ccbf - languageName: node - linkType: hard - -"mimic-response@npm:^1.0.0": - version: 1.0.1 - resolution: "mimic-response@npm:1.0.1" - checksum: 10c0/c5381a5eae997f1c3b5e90ca7f209ed58c3615caeee850e85329c598f0c000ae7bec40196580eef1781c60c709f47258131dab237cad8786f8f56750594f27fa - languageName: node - linkType: hard - -"mimic-response@npm:^3.1.0": - version: 3.1.0 - resolution: "mimic-response@npm:3.1.0" - checksum: 10c0/0d6f07ce6e03e9e4445bee655202153bdb8a98d67ee8dc965ac140900d7a2688343e6b4c9a72cfc9ef2f7944dfd76eef4ab2482eb7b293a68b84916bac735362 - languageName: node - linkType: hard - -"min-indent@npm:^1.0.0": - version: 1.0.1 - resolution: "min-indent@npm:1.0.1" - checksum: 10c0/7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c - languageName: node - linkType: hard - -"mini-css-extract-plugin@npm:^2.7.5": - version: 2.9.0 - resolution: "mini-css-extract-plugin@npm:2.9.0" - dependencies: - schema-utils: "npm:^4.0.0" - tapable: "npm:^2.2.1" - peerDependencies: - webpack: ^5.0.0 - checksum: 10c0/46e20747ea250420db8a82801b9779299ce3cd5ec4d6dd75e00904c39cc80f0f01decaa534b8cb9658d7d3b656b919cb2cc84b1ba7e2394d2d6548578a5c2901 - languageName: node - linkType: hard - -"minimatch@npm:^3.0.5": - version: 3.1.2 - resolution: "minimatch@npm:3.1.2" - dependencies: - brace-expansion: "npm:^1.1.7" - checksum: 10c0/0262810a8fc2e72cca45d6fd86bd349eee435eb95ac6aa45c9ea2180e7ee875ef44c32b55b5973ceabe95ea12682f6e3725cbb63d7a2d1da3ae1163c8b210311 - languageName: node - linkType: hard - -"minimist-options@npm:4.1.0": - version: 4.1.0 - resolution: "minimist-options@npm:4.1.0" - dependencies: - arrify: "npm:^1.0.1" - is-plain-obj: "npm:^1.1.0" - kind-of: "npm:^6.0.3" - checksum: 10c0/7871f9cdd15d1e7374e5b013e2ceda3d327a06a8c7b38ae16d9ef941e07d985e952c589e57213f7aa90a8744c60aed9524c0d85e501f5478382d9181f2763f54 - languageName: node - linkType: hard - -"minimist@npm:^1.2.6": - version: 1.2.8 - resolution: "minimist@npm:1.2.8" - checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6 - languageName: node - linkType: hard - -"minipass-collect@npm:^2.0.1": - version: 2.0.1 - resolution: "minipass-collect@npm:2.0.1" - dependencies: - minipass: "npm:^7.0.3" - checksum: 10c0/5167e73f62bb74cc5019594709c77e6a742051a647fe9499abf03c71dca75515b7959d67a764bdc4f8b361cf897fbf25e2d9869ee039203ed45240f48b9aa06e - languageName: node - linkType: hard - -"minipass-fetch@npm:^3.0.0": - version: 3.0.5 - resolution: "minipass-fetch@npm:3.0.5" - dependencies: - encoding: "npm:^0.1.13" - minipass: "npm:^7.0.3" - minipass-sized: "npm:^1.0.3" - minizlib: "npm:^2.1.2" - dependenciesMeta: - encoding: - optional: true - checksum: 10c0/9d702d57f556274286fdd97e406fc38a2f5c8d15e158b498d7393b1105974b21249289ec571fa2b51e038a4872bfc82710111cf75fae98c662f3d6f95e72152b - languageName: node - linkType: hard - -"minipass-flush@npm:^1.0.5": - version: 1.0.5 - resolution: "minipass-flush@npm:1.0.5" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10c0/2a51b63feb799d2bb34669205eee7c0eaf9dce01883261a5b77410c9408aa447e478efd191b4de6fc1101e796ff5892f8443ef20d9544385819093dbb32d36bd - languageName: node - linkType: hard - -"minipass-pipeline@npm:^1.2.4": - version: 1.2.4 - resolution: "minipass-pipeline@npm:1.2.4" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10c0/cbda57cea20b140b797505dc2cac71581a70b3247b84480c1fed5ca5ba46c25ecc25f68bfc9e6dcb1a6e9017dab5c7ada5eab73ad4f0a49d84e35093e0c643f2 - languageName: node - linkType: hard - -"minipass-sized@npm:^1.0.3": - version: 1.0.3 - resolution: "minipass-sized@npm:1.0.3" - dependencies: - minipass: "npm:^3.0.0" - checksum: 10c0/298f124753efdc745cfe0f2bdfdd81ba25b9f4e753ca4a2066eb17c821f25d48acea607dfc997633ee5bf7b6dfffb4eee4f2051eb168663f0b99fad2fa4829cb - languageName: node - linkType: hard - -"minipass@npm:^3.0.0": - version: 3.3.6 - resolution: "minipass@npm:3.3.6" - dependencies: - yallist: "npm:^4.0.0" - checksum: 10c0/a114746943afa1dbbca8249e706d1d38b85ed1298b530f5808ce51f8e9e941962e2a5ad2e00eae7dd21d8a4aae6586a66d4216d1a259385e9d0358f0c1eba16c - languageName: node - linkType: hard - -"minipass@npm:^5.0.0": - version: 5.0.0 - resolution: "minipass@npm:5.0.0" - checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462 - languageName: node - linkType: hard - -"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.1.2": - version: 7.1.2 - resolution: "minipass@npm:7.1.2" - checksum: 10c0/b0fd20bb9fb56e5fa9a8bfac539e8915ae07430a619e4b86ff71f5fc757ef3924b23b2c4230393af1eda647ed3d75739e4e0acb250a6b1eb277cf7f8fe449557 - languageName: node - linkType: hard - -"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2": - version: 2.1.2 - resolution: "minizlib@npm:2.1.2" - dependencies: - minipass: "npm:^3.0.0" - yallist: "npm:^4.0.0" - checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78 - languageName: node - linkType: hard - -"mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4": - version: 1.0.4 - resolution: "mkdirp@npm:1.0.4" - bin: - mkdirp: bin/cmd.js - checksum: 10c0/46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf - languageName: node - linkType: hard - -"mkdirp@npm:~0.5.1": - version: 0.5.6 - resolution: "mkdirp@npm:0.5.6" - dependencies: - minimist: "npm:^1.2.6" - bin: - mkdirp: bin/cmd.js - checksum: 10c0/e2e2be789218807b58abced04e7b49851d9e46e88a2f9539242cc8a92c9b5c3a0b9bab360bd3014e02a140fc4fbc58e31176c408b493f8a2a6f4986bd7527b01 - languageName: node - linkType: hard - -"mmdb-lib@npm:2.1.0": - version: 2.1.0 - resolution: "mmdb-lib@npm:2.1.0" - checksum: 10c0/4209c9d0286cfd69e9bc68187b4ebdb4735ab022d94f57b4785d2aa38a99edebfe854bd8ae1d32b1c7a5337f46a6eb8c445d830481792f9760b77010e5fddba8 - languageName: node - linkType: hard - -"mocha@npm:10.0.0": - version: 10.0.0 - resolution: "mocha@npm:10.0.0" - dependencies: - "@ungap/promise-all-settled": "npm:1.1.2" - ansi-colors: "npm:4.1.1" - browser-stdout: "npm:1.3.1" - chokidar: "npm:3.5.3" - debug: "npm:4.3.4" - diff: "npm:5.0.0" - escape-string-regexp: "npm:4.0.0" - find-up: "npm:5.0.0" - glob: "npm:7.2.0" - he: "npm:1.2.0" - js-yaml: "npm:4.1.0" - log-symbols: "npm:4.1.0" - minimatch: "npm:5.0.1" - ms: "npm:2.1.3" - nanoid: "npm:3.3.3" - serialize-javascript: "npm:6.0.0" - strip-json-comments: "npm:3.1.1" - supports-color: "npm:8.1.1" - workerpool: "npm:6.2.1" - yargs: "npm:16.2.0" - yargs-parser: "npm:20.2.4" - yargs-unparser: "npm:2.0.0" - bin: - _mocha: bin/_mocha - mocha: bin/mocha.js - checksum: 10c0/45728af7cd5a640bd964e4c1d1c9e5318499e9ba3494493a4bd05b3f03ca55bc51397323e160baab29407a56e7a7223cbb23f03e95a69317b44660099521038f - languageName: node - linkType: hard - -"moment@npm:^2.29.4": - version: 2.30.1 - resolution: "moment@npm:2.30.1" - checksum: 10c0/865e4279418c6de666fca7786607705fd0189d8a7b7624e2e56be99290ac846f90878a6f602e34b4e0455c549b85385b1baf9966845962b313699e7cb847543a - languageName: node - linkType: hard - -"ms@npm:2.0.0": - version: 2.0.0 - resolution: "ms@npm:2.0.0" - checksum: 10c0/f8fda810b39fd7255bbdc451c46286e549794fcc700dc9cd1d25658bbc4dc2563a5de6fe7c60f798a16a60c6ceb53f033cb353f493f0cf63e5199b702943159d - languageName: node - linkType: hard - -"ms@npm:2.1.2": - version: 2.1.2 - resolution: "ms@npm:2.1.2" - checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc - languageName: node - linkType: hard - -"ms@npm:2.1.3, ms@npm:^2.1.1": - version: 2.1.3 - resolution: "ms@npm:2.1.3" - checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48 - languageName: node - linkType: hard - -"mv@npm:~2": - version: 2.1.1 - resolution: "mv@npm:2.1.1" - dependencies: - mkdirp: "npm:~0.5.1" - ncp: "npm:~2.0.0" - rimraf: "npm:~2.4.0" - checksum: 10c0/5da59a9f4ec16da0867289b5018c81c25c59b06bb9da717bc7bd0b40363d6653dc88d6da32a9434fd7416bfc3f67184c306ea44d3856ff97f3214cc96960efcd - languageName: node - linkType: hard - -"nano-css@npm:^5.6.1": - version: 5.6.1 - resolution: "nano-css@npm:5.6.1" - dependencies: - "@jridgewell/sourcemap-codec": "npm:^1.4.15" - css-tree: "npm:^1.1.2" - csstype: "npm:^3.1.2" - fastest-stable-stringify: "npm:^2.0.2" - inline-style-prefixer: "npm:^7.0.0" - rtl-css-js: "npm:^1.16.1" - stacktrace-js: "npm:^2.0.2" - stylis: "npm:^4.3.0" - peerDependencies: - react: "*" - react-dom: "*" - checksum: 10c0/7328c973852d2471bd154c61d21392a3d6357f276a7a090b8a179fb06d71ba58c987b04c0bd80efebd87aa4f433428a25e37820e65484b3c4c44b84339b99d87 - languageName: node - linkType: hard - -"nanoid@npm:3.3.3": - version: 3.3.3 - resolution: "nanoid@npm:3.3.3" - bin: - nanoid: bin/nanoid.cjs - checksum: 10c0/d7ab68893cdb92dd2152d505e56571d571c65b71a9815f9dfb3c9a8cbf943fe43c9777d9a95a3b81ef01e442fec8409a84375c08f90a5753610a9f22672d953a - languageName: node - linkType: hard - -"nanoid@npm:^3.3.7": - version: 3.3.7 - resolution: "nanoid@npm:3.3.7" - bin: - nanoid: bin/nanoid.cjs - checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3 - languageName: node - linkType: hard - -"natural-compare@npm:^1.4.0": - version: 1.4.0 - resolution: "natural-compare@npm:1.4.0" - checksum: 10c0/f5f9a7974bfb28a91afafa254b197f0f22c684d4a1731763dda960d2c8e375b36c7d690e0d9dc8fba774c537af14a7e979129bca23d88d052fbeb9466955e447 - languageName: node - linkType: hard - -"ncp@npm:~2.0.0": - version: 2.0.0 - resolution: "ncp@npm:2.0.0" - bin: - ncp: ./bin/ncp - checksum: 10c0/d515babf9d3205ab9252e7d640af7c3e1a880317016d41f2fce2e6b9c8f60eb8bb6afde30e8c4f8e1e3fa551465f094433c3f364b25a85d6a28ec52c1ad6e067 - languageName: node - linkType: hard - -"negotiator@npm:^0.6.3": - version: 0.6.3 - resolution: "negotiator@npm:0.6.3" - checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2 - languageName: node - linkType: hard - -"neo-async@npm:^2.6.2": - version: 2.6.2 - resolution: "neo-async@npm:2.6.2" - checksum: 10c0/c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d - languageName: node - linkType: hard - -"nice-try@npm:^1.0.4": - version: 1.0.5 - resolution: "nice-try@npm:1.0.5" - checksum: 10c0/95568c1b73e1d0d4069a3e3061a2102d854513d37bcfda73300015b7ba4868d3b27c198d1dbbd8ebdef4112fc2ed9e895d4a0f2e1cce0bd334f2a1346dc9205f - languageName: node - linkType: hard - -"nise@npm:^4.0.1": - version: 4.1.0 - resolution: "nise@npm:4.1.0" - dependencies: - "@sinonjs/commons": "npm:^1.7.0" - "@sinonjs/fake-timers": "npm:^6.0.0" - "@sinonjs/text-encoding": "npm:^0.7.1" - just-extend: "npm:^4.0.2" - path-to-regexp: "npm:^1.7.0" - checksum: 10c0/63ddcb88bb979f7fccbb8094af9ffc8e12753665eae34367fc31bbbbf5f2c7694146a1379e89043a3ac8d30be77653ce1abbaa5f7aaeaab95d9578b714817e00 - languageName: node - linkType: hard - -"node-addon-api@npm:^1.6.3": - version: 1.7.2 - resolution: "node-addon-api@npm:1.7.2" - dependencies: - node-gyp: "npm:latest" - checksum: 10c0/bcf526f2ce788182730d3c3df5206585873d1e837a6e1378ff84abccf2f19cf3f93a8274f9c1245af0de63a0dbd1bb95ca2f767ecf5c678d6930326aaf396c4e - languageName: node - linkType: hard - -"node-addon-api@npm:^6.1.0": - version: 6.1.0 - resolution: "node-addon-api@npm:6.1.0" - dependencies: - node-gyp: "npm:latest" - checksum: 10c0/d2699c4ad15740fd31482a3b6fca789af7723ab9d393adc6ac45250faaee72edad8f0b10b2b9d087df0de93f1bdc16d97afdd179b26b9ebc9ed68b569faa4bac - languageName: node - linkType: hard - -"node-api-headers@npm:^0.0.2": - version: 0.0.2 - resolution: "node-api-headers@npm:0.0.2" - checksum: 10c0/0b1ea35d66b2be61427df8a94a0468a2979b32263fd6f4203d1e249738a89a7b6a803bd12fbe81ac731e4dab5f385968937ed4462811685700cc5b48ae316b59 - languageName: node - linkType: hard - -"node-fetch@npm:^2.6.7": - version: 2.7.0 - resolution: "node-fetch@npm:2.7.0" - dependencies: - whatwg-url: "npm:^5.0.0" - peerDependencies: - encoding: ^0.1.0 - peerDependenciesMeta: - encoding: - optional: true - checksum: 10c0/b55786b6028208e6fbe594ccccc213cab67a72899c9234eb59dba51062a299ea853210fcf526998eaa2867b0963ad72338824450905679ff0fa304b8c5093ae8 - languageName: node - linkType: hard - -"node-gyp@npm:latest": - version: 10.1.0 - resolution: "node-gyp@npm:10.1.0" - dependencies: - env-paths: "npm:^2.2.0" - exponential-backoff: "npm:^3.1.1" - glob: "npm:^10.3.10" - graceful-fs: "npm:^4.2.6" - make-fetch-happen: "npm:^13.0.0" - nopt: "npm:^7.0.0" - proc-log: "npm:^3.0.0" - semver: "npm:^7.3.5" - tar: "npm:^6.1.2" - which: "npm:^4.0.0" - bin: - node-gyp: bin/node-gyp.js - checksum: 10c0/9cc821111ca244a01fb7f054db7523ab0a0cd837f665267eb962eb87695d71fb1e681f9e21464cc2fd7c05530dc4c81b810bca1a88f7d7186909b74477491a3c - languageName: node - linkType: hard - -"node-loader@npm:^2.0.0": - version: 2.0.0 - resolution: "node-loader@npm:2.0.0" - dependencies: - loader-utils: "npm:^2.0.0" - peerDependencies: - webpack: ^5.0.0 - checksum: 10c0/ceacf34ccb05c5efe7fbed2224dfa42ec9dd8e5bd70e9dc90bb618ee6372cc1ff54edc60d1d71f4ff52c4b4db0ac410caa6ae74d90bbc68b88a70bba5f75c727 - languageName: node - linkType: hard - -"node-releases@npm:^2.0.14": - version: 2.0.14 - resolution: "node-releases@npm:2.0.14" - checksum: 10c0/199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9 - languageName: node - linkType: hard - -"nopt@npm:^7.0.0": - version: 7.2.1 - resolution: "nopt@npm:7.2.1" - dependencies: - abbrev: "npm:^2.0.0" - bin: - nopt: bin/nopt.js - checksum: 10c0/a069c7c736767121242037a22a788863accfa932ab285a1eb569eb8cd534b09d17206f68c37f096ae785647435e0c5a5a0a67b42ec743e481a455e5ae6a6df81 - languageName: node - linkType: hard - -"normalize-package-data@npm:^2.5.0": - version: 2.5.0 - resolution: "normalize-package-data@npm:2.5.0" - dependencies: - hosted-git-info: "npm:^2.1.4" - resolve: "npm:^1.10.0" - semver: "npm:2 || 3 || 4 || 5" - validate-npm-package-license: "npm:^3.0.1" - checksum: 10c0/357cb1646deb42f8eb4c7d42c4edf0eec312f3628c2ef98501963cc4bbe7277021b2b1d977f982b2edce78f5a1014613ce9cf38085c3df2d76730481357ca504 - languageName: node - linkType: hard - -"normalize-package-data@npm:^3.0.0": - version: 3.0.3 - resolution: "normalize-package-data@npm:3.0.3" - dependencies: - hosted-git-info: "npm:^4.0.1" - is-core-module: "npm:^2.5.0" - semver: "npm:^7.3.4" - validate-npm-package-license: "npm:^3.0.1" - checksum: 10c0/e5d0f739ba2c465d41f77c9d950e291ea4af78f8816ddb91c5da62257c40b76d8c83278b0d08ffbcd0f187636ebddad20e181e924873916d03e6e5ea2ef026be - languageName: node - linkType: hard - -"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": - version: 3.0.0 - resolution: "normalize-path@npm:3.0.0" - checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046 - languageName: node - linkType: hard - -"normalize-url@npm:^6.0.1": - version: 6.1.0 - resolution: "normalize-url@npm:6.1.0" - checksum: 10c0/95d948f9bdd2cfde91aa786d1816ae40f8262946e13700bf6628105994fe0ff361662c20af3961161c38a119dc977adeb41fc0b41b1745eb77edaaf9cb22db23 - languageName: node - linkType: hard - -"npm-run-path@npm:^4.0.0, npm-run-path@npm:^4.0.1": - version: 4.0.1 - resolution: "npm-run-path@npm:4.0.1" - dependencies: - path-key: "npm:^3.0.0" - checksum: 10c0/6f9353a95288f8455cf64cbeb707b28826a7f29690244c1e4bb61ec573256e021b6ad6651b394eb1ccfd00d6ec50147253aba2c5fe58a57ceb111fad62c519ac - languageName: node - linkType: hard - -"npm-run-path@npm:^5.1.0": - version: 5.3.0 - resolution: "npm-run-path@npm:5.3.0" - dependencies: - path-key: "npm:^4.0.0" - checksum: 10c0/124df74820c40c2eb9a8612a254ea1d557ddfab1581c3e751f825e3e366d9f00b0d76a3c94ecd8398e7f3eee193018622677e95816e8491f0797b21e30b2deba - languageName: node - linkType: hard - -"npmlog@npm:^6.0.2": - version: 6.0.2 - resolution: "npmlog@npm:6.0.2" - dependencies: - are-we-there-yet: "npm:^3.0.0" - console-control-strings: "npm:^1.1.0" - gauge: "npm:^4.0.3" - set-blocking: "npm:^2.0.0" - checksum: 10c0/0cacedfbc2f6139c746d9cd4a85f62718435ad0ca4a2d6459cd331dd33ae58206e91a0742c1558634efcde3f33f8e8e7fd3adf1bfe7978310cf00bd55cccf890 - languageName: node - linkType: hard - -"nullthrows@npm:^1.1.1": - version: 1.1.1 - resolution: "nullthrows@npm:1.1.1" - checksum: 10c0/56f34bd7c3dcb3bd23481a277fa22918120459d3e9d95ca72976c72e9cac33a97483f0b95fc420e2eb546b9fe6db398273aba9a938650cdb8c98ee8f159dcb30 - languageName: node - linkType: hard - -"nwsapi@npm:^2.2.4": - version: 2.2.10 - resolution: "nwsapi@npm:2.2.10" - checksum: 10c0/43dfa150387bd2a578e37556d0ae3330d5617f99e5a7b64e3400d4c2785620762aa6169caf8f5fbce17b7ef29c372060b602594320c374fba0a39da4163d77ed - languageName: node - linkType: hard - -"object-assign@npm:^4.1.1": - version: 4.1.1 - resolution: "object-assign@npm:4.1.1" - checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414 - languageName: node - linkType: hard - -"object-inspect@npm:^1.13.1": - version: 1.13.1 - resolution: "object-inspect@npm:1.13.1" - checksum: 10c0/fad603f408e345c82e946abdf4bfd774260a5ed3e5997a0b057c44153ac32c7271ff19e3a5ae39c858da683ba045ccac2f65245c12763ce4e8594f818f4a648d - languageName: node - linkType: hard - -"object-keys@npm:^1.1.1": - version: 1.1.1 - resolution: "object-keys@npm:1.1.1" - checksum: 10c0/b11f7ccdbc6d406d1f186cdadb9d54738e347b2692a14439ca5ac70c225fa6db46db809711b78589866d47b25fc3e8dee0b4c722ac751e11180f9380e3d8601d - languageName: node - linkType: hard - -"object.assign@npm:^4.1.2, object.assign@npm:^4.1.4, object.assign@npm:^4.1.5": - version: 4.1.5 - resolution: "object.assign@npm:4.1.5" - dependencies: - call-bind: "npm:^1.0.5" - define-properties: "npm:^1.2.1" - has-symbols: "npm:^1.0.3" - object-keys: "npm:^1.1.1" - checksum: 10c0/60108e1fa2706f22554a4648299b0955236c62b3685c52abf4988d14fffb0e7731e00aa8c6448397e3eb63d087dcc124a9f21e1980f36d0b2667f3c18bacd469 - languageName: node - linkType: hard - -"object.entries@npm:^1.1.5, object.entries@npm:^1.1.6": - version: 1.1.8 - resolution: "object.entries@npm:1.1.8" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-object-atoms: "npm:^1.0.0" - checksum: 10c0/db9ea979d2956a3bc26c262da4a4d212d36f374652cc4c13efdd069c1a519c16571c137e2893d1c46e1cb0e15c88fd6419eaf410c945f329f09835487d7e65d3 - languageName: node - linkType: hard - -"object.fromentries@npm:^2.0.6, object.fromentries@npm:^2.0.7": - version: 2.0.8 - resolution: "object.fromentries@npm:2.0.8" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.2" - es-object-atoms: "npm:^1.0.0" - checksum: 10c0/cd4327e6c3369cfa805deb4cbbe919bfb7d3aeebf0bcaba291bb568ea7169f8f8cdbcabe2f00b40db0c20cd20f08e11b5f3a5a36fb7dd3fe04850c50db3bf83b - languageName: node - linkType: hard - -"object.groupby@npm:^1.0.1": - version: 1.0.3 - resolution: "object.groupby@npm:1.0.3" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.2" - checksum: 10c0/60d0455c85c736fbfeda0217d1a77525956f76f7b2495edeca9e9bbf8168a45783199e77b894d30638837c654d0cc410e0e02cbfcf445bc8de71c3da1ede6a9c - languageName: node - linkType: hard - -"object.hasown@npm:^1.1.2": - version: 1.1.4 - resolution: "object.hasown@npm:1.1.4" - dependencies: - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.2" - es-object-atoms: "npm:^1.0.0" - checksum: 10c0/f23187b08d874ef1aea060118c8259eb7f99f93c15a50771d710569534119062b90e087b92952b2d0fb1bb8914d61fb0b43c57fb06f622aaad538fe6868ab987 - languageName: node - linkType: hard - -"object.values@npm:^1.1.6, object.values@npm:^1.1.7": - version: 1.2.0 - resolution: "object.values@npm:1.2.0" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-object-atoms: "npm:^1.0.0" - checksum: 10c0/15809dc40fd6c5529501324fec5ff08570b7d70fb5ebbe8e2b3901afec35cf2b3dc484d1210c6c642cd3e7e0a5e18dd1d6850115337fef46bdae14ab0cb18ac3 - languageName: node - linkType: hard - -"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0": - version: 1.4.0 - resolution: "once@npm:1.4.0" - dependencies: - wrappy: "npm:1" - checksum: 10c0/5d48aca287dfefabd756621c5dfce5c91a549a93e9fdb7b8246bc4c4790aa2ec17b34a260530474635147aeb631a2dcc8b32c613df0675f96041cbb8244517d0 - languageName: node - linkType: hard - -"onetime@npm:^5.1.0, onetime@npm:^5.1.2": - version: 5.1.2 - resolution: "onetime@npm:5.1.2" - dependencies: - mimic-fn: "npm:^2.1.0" - checksum: 10c0/ffcef6fbb2692c3c40749f31ea2e22677a876daea92959b8a80b521d95cca7a668c884d8b2045d1d8ee7d56796aa405c405462af112a1477594cc63531baeb8f - languageName: node - linkType: hard - -"onetime@npm:^6.0.0": - version: 6.0.0 - resolution: "onetime@npm:6.0.0" - dependencies: - mimic-fn: "npm:^4.0.0" - checksum: 10c0/4eef7c6abfef697dd4479345a4100c382d73c149d2d56170a54a07418c50816937ad09500e1ed1e79d235989d073a9bade8557122aee24f0576ecde0f392bb6c - languageName: node - linkType: hard - -"open@npm:^7.4.2": - version: 7.4.2 - resolution: "open@npm:7.4.2" - dependencies: - is-docker: "npm:^2.0.0" - is-wsl: "npm:^2.1.1" - checksum: 10c0/77573a6a68f7364f3a19a4c80492712720746b63680ee304555112605ead196afe91052bd3c3d165efdf4e9d04d255e87de0d0a77acec11ef47fd5261251813f - languageName: node - linkType: hard - -"optionator@npm:^0.8.1": - version: 0.8.3 - resolution: "optionator@npm:0.8.3" - dependencies: - deep-is: "npm:~0.1.3" - fast-levenshtein: "npm:~2.0.6" - levn: "npm:~0.3.0" - prelude-ls: "npm:~1.1.2" - type-check: "npm:~0.3.2" - word-wrap: "npm:~1.2.3" - checksum: 10c0/ad7000ea661792b3ec5f8f86aac28895850988926f483b5f308f59f4607dfbe24c05df2d049532ee227c040081f39401a268cf7bbf3301512f74c4d760dc6dd8 - languageName: node - linkType: hard - -"optionator@npm:^0.9.3": - version: 0.9.4 - resolution: "optionator@npm:0.9.4" - dependencies: - deep-is: "npm:^0.1.3" - fast-levenshtein: "npm:^2.0.6" - levn: "npm:^0.4.1" - prelude-ls: "npm:^1.2.1" - type-check: "npm:^0.4.0" - word-wrap: "npm:^1.2.5" - checksum: 10c0/4afb687a059ee65b61df74dfe87d8d6815cd6883cb8b3d5883a910df72d0f5d029821f37025e4bccf4048873dbdb09acc6d303d27b8f76b1a80dd5a7d5334675 - languageName: node - linkType: hard - -"os-homedir@npm:1.0.2": - version: 1.0.2 - resolution: "os-homedir@npm:1.0.2" - checksum: 10c0/6be4aa67317ee247b8d46142e243fb4ef1d2d65d3067f54bfc5079257a2f4d4d76b2da78cba7af3cb3f56dbb2e4202e0c47f26171d11ca1ed4008d842c90363f - languageName: node - linkType: hard - -"os-locale@npm:5.0.0": - version: 5.0.0 - resolution: "os-locale@npm:5.0.0" - dependencies: - execa: "npm:^4.0.0" - lcid: "npm:^3.0.0" - mem: "npm:^5.0.0" - checksum: 10c0/f86237f8e6110651e5b10462ec45bbc7b9940fe2b65cba1fd0e07e2790762881f1835fd71316065326c528b0fb54301e85a1fa2f8ab144bfa587fffa04c735d6 - languageName: node - linkType: hard - -"os-tmpdir@npm:~1.0.2": - version: 1.0.2 - resolution: "os-tmpdir@npm:1.0.2" - checksum: 10c0/f438450224f8e2687605a8dd318f0db694b6293c5d835ae509a69e97c8de38b6994645337e5577f5001115470414638978cc49da1cdcc25106dad8738dc69990 - languageName: node - linkType: hard - -"p-cancelable@npm:^2.0.0": - version: 2.1.1 - resolution: "p-cancelable@npm:2.1.1" - checksum: 10c0/8c6dc1f8dd4154fd8b96a10e55a3a832684c4365fb9108056d89e79fbf21a2465027c04a59d0d797b5ffe10b54a61a32043af287d5c4860f1e996cbdbc847f01 - languageName: node - linkType: hard - -"p-defer@npm:^1.0.0": - version: 1.0.0 - resolution: "p-defer@npm:1.0.0" - checksum: 10c0/ed603c3790e74b061ac2cb07eb6e65802cf58dce0fbee646c113a7b71edb711101329ad38f99e462bd2e343a74f6e9366b496a35f1d766c187084d3109900487 - languageName: node - linkType: hard - -"p-is-promise@npm:^2.1.0": - version: 2.1.0 - resolution: "p-is-promise@npm:2.1.0" - checksum: 10c0/115c50960739c26e9b3e8a3bd453341a3b02a2e5ba41109b904ff53deb0b941ef81b196e106dc11f71698f591b23055c82d81188b7b670e9d5e28bc544b0674d - languageName: node - linkType: hard - -"p-limit@npm:^2.2.0": - version: 2.3.0 - resolution: "p-limit@npm:2.3.0" - dependencies: - p-try: "npm:^2.0.0" - checksum: 10c0/8da01ac53efe6a627080fafc127c873da40c18d87b3f5d5492d465bb85ec7207e153948df6b9cbaeb130be70152f874229b8242ee2be84c0794082510af97f12 - languageName: node - linkType: hard - -"p-limit@npm:^3.0.2": - version: 3.1.0 - resolution: "p-limit@npm:3.1.0" - dependencies: - yocto-queue: "npm:^0.1.0" - checksum: 10c0/9db675949dbdc9c3763c89e748d0ef8bdad0afbb24d49ceaf4c46c02c77d30db4e0652ed36d0a0a7a95154335fab810d95c86153105bb73b3a90448e2bb14e1a - languageName: node - linkType: hard - -"p-locate@npm:^4.1.0": - version: 4.1.0 - resolution: "p-locate@npm:4.1.0" - dependencies: - p-limit: "npm:^2.2.0" - checksum: 10c0/1b476ad69ad7f6059744f343b26d51ce091508935c1dbb80c4e0a2f397ffce0ca3a1f9f5cd3c7ce19d7929a09719d5c65fe70d8ee289c3f267cd36f2881813e9 - languageName: node - linkType: hard - -"p-locate@npm:^5.0.0": - version: 5.0.0 - resolution: "p-locate@npm:5.0.0" - dependencies: - p-limit: "npm:^3.0.2" - checksum: 10c0/2290d627ab7903b8b70d11d384fee714b797f6040d9278932754a6860845c4d3190603a0772a663c8cb5a7b21d1b16acb3a6487ebcafa9773094edc3dfe6009a - languageName: node - linkType: hard - -"p-map@npm:^4.0.0": - version: 4.0.0 - resolution: "p-map@npm:4.0.0" - dependencies: - aggregate-error: "npm:^3.0.0" - checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75 - languageName: node - linkType: hard - -"p-retry@npm:^4.2.0": - version: 4.6.2 - resolution: "p-retry@npm:4.6.2" - dependencies: - "@types/retry": "npm:0.12.0" - retry: "npm:^0.13.1" - checksum: 10c0/d58512f120f1590cfedb4c2e0c42cb3fa66f3cea8a4646632fcb834c56055bb7a6f138aa57b20cc236fb207c9d694e362e0b5c2b14d9b062f67e8925580c73b0 - languageName: node - linkType: hard - -"p-try@npm:^2.0.0": - version: 2.2.0 - resolution: "p-try@npm:2.2.0" - checksum: 10c0/c36c19907734c904b16994e6535b02c36c2224d433e01a2f1ab777237f4d86e6289fd5fd464850491e940379d4606ed850c03e0f9ab600b0ebddb511312e177f - languageName: node - linkType: hard - -"package-json@npm:^6.3.0": - version: 6.5.0 - resolution: "package-json@npm:6.5.0" - dependencies: - got: "npm:^9.6.0" - registry-auth-token: "npm:^4.0.0" - registry-url: "npm:^5.0.0" - semver: "npm:^6.2.0" - checksum: 10c0/60c29fe357af43f96c92c334aa0160cebde44e8e65c1e5f9b065efb3f501af812f268ec967a07757b56447834ef7f71458ebbab94425a9f09c271f348f9b764f - languageName: node - linkType: hard - -"parent-module@npm:^1.0.0": - version: 1.0.1 - resolution: "parent-module@npm:1.0.1" - dependencies: - callsites: "npm:^3.0.0" - checksum: 10c0/c63d6e80000d4babd11978e0d3fee386ca7752a02b035fd2435960ffaa7219dc42146f07069fb65e6e8bf1caef89daf9af7535a39bddf354d78bf50d8294f556 - languageName: node - linkType: hard - -"parse-json@npm:^5.0.0, parse-json@npm:^5.2.0": - version: 5.2.0 - resolution: "parse-json@npm:5.2.0" - dependencies: - "@babel/code-frame": "npm:^7.0.0" - error-ex: "npm:^1.3.1" - json-parse-even-better-errors: "npm:^2.3.0" - lines-and-columns: "npm:^1.1.6" - checksum: 10c0/77947f2253005be7a12d858aedbafa09c9ae39eb4863adf330f7b416ca4f4a08132e453e08de2db46459256fb66afaac5ee758b44fe6541b7cdaf9d252e59585 - languageName: node - linkType: hard - -"parse5@npm:^7.1.2": - version: 7.1.2 - resolution: "parse5@npm:7.1.2" - dependencies: - entities: "npm:^4.4.0" - checksum: 10c0/297d7af8224f4b5cb7f6617ecdae98eeaed7f8cbd78956c42785e230505d5a4f07cef352af10d3006fa5c1544b76b57784d3a22d861ae071bbc460c649482bf4 - languageName: node - linkType: hard - -"patch-package@npm:^6.4.7": - version: 6.5.1 - resolution: "patch-package@npm:6.5.1" - dependencies: - "@yarnpkg/lockfile": "npm:^1.1.0" - chalk: "npm:^4.1.2" - cross-spawn: "npm:^6.0.5" - find-yarn-workspace-root: "npm:^2.0.0" - fs-extra: "npm:^9.0.0" - is-ci: "npm:^2.0.0" - klaw-sync: "npm:^6.0.0" - minimist: "npm:^1.2.6" - open: "npm:^7.4.2" - rimraf: "npm:^2.6.3" - semver: "npm:^5.6.0" - slash: "npm:^2.0.0" - tmp: "npm:^0.0.33" - yaml: "npm:^1.10.2" - bin: - patch-package: index.js - checksum: 10c0/0f74d6099b05431c88a60308bd9ec0b1f9d3ae436026f488cfe99476ae74e7a464be4a16a7c83c7b89c23764502c79d37227cf27b17c30b9b2e4d577f8aecedb - languageName: node - linkType: hard - -"path-exists@npm:^4.0.0": - version: 4.0.0 - resolution: "path-exists@npm:4.0.0" - checksum: 10c0/8c0bd3f5238188197dc78dced15207a4716c51cc4e3624c44fc97acf69558f5ebb9a2afff486fe1b4ee148e0c133e96c5e11a9aa5c48a3006e3467da070e5e1b - languageName: node - linkType: hard - -"path-is-absolute@npm:^1.0.0": - version: 1.0.1 - resolution: "path-is-absolute@npm:1.0.1" - checksum: 10c0/127da03c82172a2a50099cddbf02510c1791fc2cc5f7713ddb613a56838db1e8168b121a920079d052e0936c23005562059756d653b7c544c53185efe53be078 - languageName: node - linkType: hard - -"path-key@npm:^2.0.1": - version: 2.0.1 - resolution: "path-key@npm:2.0.1" - checksum: 10c0/dd2044f029a8e58ac31d2bf34c34b93c3095c1481942960e84dd2faa95bbb71b9b762a106aead0646695330936414b31ca0bd862bf488a937ad17c8c5d73b32b - languageName: node - linkType: hard - -"path-key@npm:^3.0.0, path-key@npm:^3.1.0": - version: 3.1.1 - resolution: "path-key@npm:3.1.1" - checksum: 10c0/748c43efd5a569c039d7a00a03b58eecd1d75f3999f5a28303d75f521288df4823bc057d8784eb72358b2895a05f29a070bc9f1f17d28226cc4e62494cc58c4c - languageName: node - linkType: hard - -"path-key@npm:^4.0.0": - version: 4.0.0 - resolution: "path-key@npm:4.0.0" - checksum: 10c0/794efeef32863a65ac312f3c0b0a99f921f3e827ff63afa5cb09a377e202c262b671f7b3832a4e64731003fa94af0263713962d317b9887bd1e0c48a342efba3 - languageName: node - linkType: hard - -"path-parse@npm:^1.0.7": - version: 1.0.7 - resolution: "path-parse@npm:1.0.7" - checksum: 10c0/11ce261f9d294cc7a58d6a574b7f1b935842355ec66fba3c3fd79e0f036462eaf07d0aa95bb74ff432f9afef97ce1926c720988c6a7451d8a584930ae7de86e1 - languageName: node - linkType: hard - -"path-scurry@npm:^1.10.1, path-scurry@npm:^1.11.1": - version: 1.11.1 - resolution: "path-scurry@npm:1.11.1" - dependencies: - lru-cache: "npm:^10.2.0" - minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" - checksum: 10c0/32a13711a2a505616ae1cc1b5076801e453e7aae6ac40ab55b388bb91b9d0547a52f5aaceff710ea400205f18691120d4431e520afbe4266b836fadede15872d - languageName: node - linkType: hard - -"path-to-regexp@npm:^1.7.0": - version: 1.8.0 - resolution: "path-to-regexp@npm:1.8.0" - dependencies: - isarray: "npm:0.0.1" - checksum: 10c0/7b25d6f27a8de03f49406d16195450f5ced694398adea1510b0f949d9660600d1769c5c6c83668583b7e6b503f3caf1ede8ffc08135dbe3e982f034f356fbb5c - languageName: node - linkType: hard - -"path-type@npm:^4.0.0": - version: 4.0.0 - resolution: "path-type@npm:4.0.0" - checksum: 10c0/666f6973f332f27581371efaf303fd6c272cc43c2057b37aa99e3643158c7e4b2626549555d88626e99ea9e046f82f32e41bbde5f1508547e9a11b149b52387c - languageName: node - linkType: hard - -"pathval@npm:^1.1.1": - version: 1.1.1 - resolution: "pathval@npm:1.1.1" - checksum: 10c0/f63e1bc1b33593cdf094ed6ff5c49c1c0dc5dc20a646ca9725cc7fe7cd9995002d51d5685b9b2ec6814342935748b711bafa840f84c0bb04e38ff40a335c94dc - languageName: node - linkType: hard - -"pend@npm:~1.2.0": - version: 1.2.0 - resolution: "pend@npm:1.2.0" - checksum: 10c0/8a87e63f7a4afcfb0f9f77b39bb92374afc723418b9cb716ee4257689224171002e07768eeade4ecd0e86f1fa3d8f022994219fb45634f2dbd78c6803e452458 - languageName: node - linkType: hard - -"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1": - version: 1.0.1 - resolution: "picocolors@npm:1.0.1" - checksum: 10c0/c63cdad2bf812ef0d66c8db29583802355d4ca67b9285d846f390cc15c2f6ccb94e8cb7eb6a6e97fc5990a6d3ad4ae42d86c84d3146e667c739a4234ed50d400 - languageName: node - linkType: hard - -"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.3.1": - version: 2.3.1 - resolution: "picomatch@npm:2.3.1" - checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be - languageName: node - linkType: hard - -"pidtree@npm:0.6.0": - version: 0.6.0 - resolution: "pidtree@npm:0.6.0" - bin: - pidtree: bin/pidtree.js - checksum: 10c0/0829ec4e9209e230f74ebf4265f5ccc9ebfb488334b525cb13f86ff801dca44b362c41252cd43ae4d7653a10a5c6ab3be39d2c79064d6895e0d78dc50a5ed6e9 - languageName: node - linkType: hard - -"pkg-dir@npm:^4.2.0": - version: 4.2.0 - resolution: "pkg-dir@npm:4.2.0" - dependencies: - find-up: "npm:^4.0.0" - checksum: 10c0/c56bda7769e04907a88423feb320babaed0711af8c436ce3e56763ab1021ba107c7b0cafb11cde7529f669cfc22bffcaebffb573645cbd63842ea9fb17cd7728 - languageName: node - linkType: hard - -"plist@npm:^3.0.1, plist@npm:^3.0.4": - version: 3.1.0 - resolution: "plist@npm:3.1.0" - dependencies: - "@xmldom/xmldom": "npm:^0.8.8" - base64-js: "npm:^1.5.1" - xmlbuilder: "npm:^15.1.1" - checksum: 10c0/db19ba50faafc4103df8e79bcd6b08004a56db2a9dd30b3e5c8b0ef30398ef44344a674e594d012c8fc39e539a2b72cb58c60a76b4b4401cbbc7c8f6b028d93d - languageName: node - linkType: hard - -"possible-typed-array-names@npm:^1.0.0": - version: 1.0.0 - resolution: "possible-typed-array-names@npm:1.0.0" - checksum: 10c0/d9aa22d31f4f7680e20269db76791b41c3a32c01a373e25f8a4813b4d45f7456bfc2b6d68f752dc4aab0e0bb0721cb3d76fb678c9101cb7a16316664bc2c73fd - languageName: node - linkType: hard - -"postcss-modules-extract-imports@npm:^3.1.0": - version: 3.1.0 - resolution: "postcss-modules-extract-imports@npm:3.1.0" - peerDependencies: - postcss: ^8.1.0 - checksum: 10c0/402084bcab376083c4b1b5111b48ec92974ef86066f366f0b2d5b2ac2b647d561066705ade4db89875a13cb175b33dd6af40d16d32b2ea5eaf8bac63bd2bf219 - languageName: node - linkType: hard - -"postcss-modules-local-by-default@npm:^4.0.5": - version: 4.0.5 - resolution: "postcss-modules-local-by-default@npm:4.0.5" - dependencies: - icss-utils: "npm:^5.0.0" - postcss-selector-parser: "npm:^6.0.2" - postcss-value-parser: "npm:^4.1.0" - peerDependencies: - postcss: ^8.1.0 - checksum: 10c0/f4ad35abeb685ecb25f80c93d9fe23c8b89ee45ac4185f3560e701b4d7372f9b798577e79c5ed03b6d9c80bc923b001210c127c04ced781f43cda9e32b202a5b - languageName: node - linkType: hard - -"postcss-modules-scope@npm:^3.2.0": - version: 3.2.0 - resolution: "postcss-modules-scope@npm:3.2.0" - dependencies: - postcss-selector-parser: "npm:^6.0.4" - peerDependencies: - postcss: ^8.1.0 - checksum: 10c0/a2f5ffe372169b3feb8628cd785eb748bf12e344cfa57bce9e5cdc4fa5adcdb40d36daa86bb35dad53427703b185772aad08825b5783f745fcb1b6039454a84b - languageName: node - linkType: hard - -"postcss-modules-values@npm:^4.0.0": - version: 4.0.0 - resolution: "postcss-modules-values@npm:4.0.0" - dependencies: - icss-utils: "npm:^5.0.0" - peerDependencies: - postcss: ^8.1.0 - checksum: 10c0/dd18d7631b5619fb9921b198c86847a2a075f32e0c162e0428d2647685e318c487a2566cc8cc669fc2077ef38115cde7a068e321f46fb38be3ad49646b639dbc - languageName: node - linkType: hard - -"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": - version: 6.1.0 - resolution: "postcss-selector-parser@npm:6.1.0" - dependencies: - cssesc: "npm:^3.0.0" - util-deprecate: "npm:^1.0.2" - checksum: 10c0/91e9c6434772506bc7f318699dd9d19d32178b52dfa05bed24cb0babbdab54f8fb765d9920f01ac548be0a642aab56bce493811406ceb00ae182bbb53754c473 - languageName: node - linkType: hard - -"postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0": - version: 4.2.0 - resolution: "postcss-value-parser@npm:4.2.0" - checksum: 10c0/f4142a4f56565f77c1831168e04e3effd9ffcc5aebaf0f538eee4b2d465adfd4b85a44257bb48418202a63806a7da7fe9f56c330aebb3cac898e46b4cbf49161 - languageName: node - linkType: hard - -"postcss@npm:^8.4.33": - version: 8.4.38 - resolution: "postcss@npm:8.4.38" - dependencies: - nanoid: "npm:^3.3.7" - picocolors: "npm:^1.0.0" - source-map-js: "npm:^1.2.0" - checksum: 10c0/955407b8f70cf0c14acf35dab3615899a2a60a26718a63c848cf3c29f2467b0533991b985a2b994430d890bd7ec2b1963e36352b0774a19143b5f591540f7c06 - languageName: node - linkType: hard - -"postinstall-prepare@npm:^1.0.1": - version: 1.0.1 - resolution: "postinstall-prepare@npm:1.0.1" - checksum: 10c0/04593ce21bda898e6cfd245d35d312e1e4a03b6e316ac552408b479eb9093038c5c8b685147b658f6881ee5e0d5fce20a5a45cf22c9f9d346342e93a7defcbad - languageName: node - linkType: hard - -"prelude-ls@npm:^1.2.1": - version: 1.2.1 - resolution: "prelude-ls@npm:1.2.1" - checksum: 10c0/b00d617431e7886c520a6f498a2e14c75ec58f6d93ba48c3b639cf241b54232d90daa05d83a9e9b9fef6baa63cb7e1e4602c2372fea5bc169668401eb127d0cd - languageName: node - linkType: hard - -"prelude-ls@npm:~1.1.2": - version: 1.1.2 - resolution: "prelude-ls@npm:1.1.2" - checksum: 10c0/7284270064f74e0bb7f04eb9bff7be677e4146417e599ccc9c1200f0f640f8b11e592d94eb1b18f7aa9518031913bb42bea9c86af07ba69902864e61005d6f18 - languageName: node - linkType: hard - -"prettier@npm:3.2.5": - version: 3.2.5 - resolution: "prettier@npm:3.2.5" - bin: - prettier: bin/prettier.cjs - checksum: 10c0/ea327f37a7d46f2324a34ad35292af2ad4c4c3c3355da07313339d7e554320f66f65f91e856add8530157a733c6c4a897dc41b577056be5c24c40f739f5ee8c6 - languageName: node - linkType: hard - -"proc-log@npm:^3.0.0": - version: 3.0.0 - resolution: "proc-log@npm:3.0.0" - checksum: 10c0/f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc - languageName: node - linkType: hard - -"proc-log@npm:^4.2.0": - version: 4.2.0 - resolution: "proc-log@npm:4.2.0" - checksum: 10c0/17db4757c2a5c44c1e545170e6c70a26f7de58feb985091fb1763f5081cab3d01b181fb2dd240c9f4a4255a1d9227d163d5771b7e69c9e49a561692db865efb9 - languageName: node - linkType: hard - -"progress@npm:^2.0.3": - version: 2.0.3 - resolution: "progress@npm:2.0.3" - checksum: 10c0/1697e07cb1068055dbe9fe858d242368ff5d2073639e652b75a7eb1f2a1a8d4afd404d719de23c7b48481a6aa0040686310e2dac2f53d776daa2176d3f96369c - languageName: node - linkType: hard - -"promise-retry@npm:^2.0.1": - version: 2.0.1 - resolution: "promise-retry@npm:2.0.1" - dependencies: - err-code: "npm:^2.0.2" - retry: "npm:^0.12.0" - checksum: 10c0/9c7045a1a2928094b5b9b15336dcd2a7b1c052f674550df63cc3f36cd44028e5080448175b6f6ca32b642de81150f5e7b1a98b728f15cb069f2dd60ac2616b96 - languageName: node - linkType: hard - -"prop-types@npm:^15.5.8, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1": - version: 15.8.1 - resolution: "prop-types@npm:15.8.1" - dependencies: - loose-envify: "npm:^1.4.0" - object-assign: "npm:^4.1.1" - react-is: "npm:^16.13.1" - checksum: 10c0/59ece7ca2fb9838031d73a48d4becb9a7cc1ed10e610517c7d8f19a1e02fa47f7c27d557d8a5702bec3cfeccddc853579832b43f449e54635803f277b1c78077 - languageName: node - linkType: hard - -"protobufjs-cli@npm:^1.1.1": - version: 1.1.2 - resolution: "protobufjs-cli@npm:1.1.2" - dependencies: - chalk: "npm:^4.0.0" - escodegen: "npm:^1.13.0" - espree: "npm:^9.0.0" - estraverse: "npm:^5.1.0" - glob: "npm:^8.0.0" - jsdoc: "npm:^4.0.0" - minimist: "npm:^1.2.0" - semver: "npm:^7.1.2" - tmp: "npm:^0.2.1" - uglify-js: "npm:^3.7.7" - peerDependencies: - protobufjs: ^7.0.0 - bin: - pbjs: bin/pbjs - pbts: bin/pbts - checksum: 10c0/931ff25204329d4c39ad3d6ae48b46349357de49a7061bd02ad3746ac4d9acd498c05f4d39eac8444ec8d39cae5c3f7e5738d45a461be2a0eb18d13c4bc0d549 - languageName: node - linkType: hard - -"protobufjs@npm:^7.2.4": - version: 7.3.0 - resolution: "protobufjs@npm:7.3.0" - dependencies: - "@protobufjs/aspromise": "npm:^1.1.2" - "@protobufjs/base64": "npm:^1.1.2" - "@protobufjs/codegen": "npm:^2.0.4" - "@protobufjs/eventemitter": "npm:^1.1.0" - "@protobufjs/fetch": "npm:^1.1.0" - "@protobufjs/float": "npm:^1.0.2" - "@protobufjs/inquire": "npm:^1.1.0" - "@protobufjs/path": "npm:^1.1.2" - "@protobufjs/pool": "npm:^1.1.0" - "@protobufjs/utf8": "npm:^1.1.0" - "@types/node": "npm:>=13.7.0" - long: "npm:^5.0.0" - checksum: 10c0/fdcd17a783a4d71dd46463419cdfb5a5e3ad07cf4d9460abb5bdeb2547b0fa77c55955ac26c38e5557f5169dc3909456c675a08c56268c0e79b34d348c05dcab - languageName: node - linkType: hard - -"proxy-from-env@npm:^1.1.0": - version: 1.1.0 - resolution: "proxy-from-env@npm:1.1.0" - checksum: 10c0/fe7dd8b1bdbbbea18d1459107729c3e4a2243ca870d26d34c2c1bcd3e4425b7bcc5112362df2d93cc7fb9746f6142b5e272fd1cc5c86ddf8580175186f6ad42b - languageName: node - linkType: hard - -"psl@npm:^1.1.33": - version: 1.9.0 - resolution: "psl@npm:1.9.0" - checksum: 10c0/6a3f805fdab9442f44de4ba23880c4eba26b20c8e8e0830eff1cb31007f6825dace61d17203c58bfe36946842140c97a1ba7f67bc63ca2d88a7ee052b65d97ab - languageName: node - linkType: hard - -"pump@npm:^3.0.0": - version: 3.0.0 - resolution: "pump@npm:3.0.0" - dependencies: - end-of-stream: "npm:^1.1.0" - once: "npm:^1.3.1" - checksum: 10c0/bbdeda4f747cdf47db97428f3a135728669e56a0ae5f354a9ac5b74556556f5446a46f720a8f14ca2ece5be9b4d5d23c346db02b555f46739934cc6c093a5478 - languageName: node - linkType: hard - -"punycode.js@npm:^2.3.1": - version: 2.3.1 - resolution: "punycode.js@npm:2.3.1" - checksum: 10c0/1d12c1c0e06127fa5db56bd7fdf698daf9a78104456a6b67326877afc21feaa821257b171539caedd2f0524027fa38e67b13dd094159c8d70b6d26d2bea4dfdb - languageName: node - linkType: hard - -"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0": - version: 2.3.1 - resolution: "punycode@npm:2.3.1" - checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9 - languageName: node - linkType: hard - -"pupa@npm:^2.1.1": - version: 2.1.1 - resolution: "pupa@npm:2.1.1" - dependencies: - escape-goat: "npm:^2.0.0" - checksum: 10c0/d2346324780ebae4be847cad052b830e004d816851dd4750fc73faa6cd360f443e358f6b1c83641fd4c904c6055dcb545807f55259a20a52ad86d9477746c724 - languageName: node - linkType: hard - -"qr.js@npm:0.0.0": - version: 0.0.0 - resolution: "qr.js@npm:0.0.0" - checksum: 10c0/1c6a4c7a58d04e52ec2fee99e39b680fdc5b2a510a981df42c36b716a8eac6634d130fc4d65af8f030f2a07dbf5fa046b97cdfa7456c250ebb50a73916efdcb5 - languageName: node - linkType: hard - -"querystringify@npm:^2.1.1": - version: 2.2.0 - resolution: "querystringify@npm:2.2.0" - checksum: 10c0/3258bc3dbdf322ff2663619afe5947c7926a6ef5fb78ad7d384602974c467fadfc8272af44f5eb8cddd0d011aae8fabf3a929a8eee4b86edcc0a21e6bd10f9aa - languageName: node - linkType: hard - -"queue-microtask@npm:^1.2.2": - version: 1.2.3 - resolution: "queue-microtask@npm:1.2.3" - checksum: 10c0/900a93d3cdae3acd7d16f642c29a642aea32c2026446151f0778c62ac089d4b8e6c986811076e1ae180a694cedf077d453a11b58ff0a865629a4f82ab558e102 - languageName: node - linkType: hard - -"quick-lru@npm:^4.0.1": - version: 4.0.1 - resolution: "quick-lru@npm:4.0.1" - checksum: 10c0/f9b1596fa7595a35c2f9d913ac312fede13d37dc8a747a51557ab36e11ce113bbe88ef4c0154968845559a7709cb6a7e7cbe75f7972182451cd45e7f057a334d - languageName: node - linkType: hard - -"quick-lru@npm:^5.1.1": - version: 5.1.1 - resolution: "quick-lru@npm:5.1.1" - checksum: 10c0/a24cba5da8cec30d70d2484be37622580f64765fb6390a928b17f60cd69e8dbd32a954b3ff9176fa1b86d86ff2ba05252fae55dc4d40d0291c60412b0ad096da - languageName: node - linkType: hard - -"rambda@npm:^7.4.0": - version: 7.5.0 - resolution: "rambda@npm:7.5.0" - checksum: 10c0/7285b60cfc0737394dda6d467ef65a97221f9e208041d212378d78264d17acd372e09070f570af821314a9243b4edf465cbb5e15297ad44e484eac10535b8920 - languageName: node - linkType: hard - -"randombytes@npm:^2.1.0": - version: 2.1.0 - resolution: "randombytes@npm:2.1.0" - dependencies: - safe-buffer: "npm:^5.1.0" - checksum: 10c0/50395efda7a8c94f5dffab564f9ff89736064d32addf0cc7e8bf5e4166f09f8ded7a0849ca6c2d2a59478f7d90f78f20d8048bca3cdf8be09d8e8a10790388f3 - languageName: node - linkType: hard - -"rc-slider@npm:^10.2.1": - version: 10.6.2 - resolution: "rc-slider@npm:10.6.2" - dependencies: - "@babel/runtime": "npm:^7.10.1" - classnames: "npm:^2.2.5" - rc-util: "npm:^5.36.0" - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: 10c0/f2d156ffa88596419957f3955a2be86a98705140546f24e53180a17baa20f948187db55529759451adcfbcc52dc67c72bd26b4d3afd54529be8f092e81fa8f65 - languageName: node - linkType: hard - -"rc-util@npm:^5.36.0": - version: 5.41.0 - resolution: "rc-util@npm:5.41.0" - dependencies: - "@babel/runtime": "npm:^7.18.3" - react-is: "npm:^18.2.0" - peerDependencies: - react: ">=16.9.0" - react-dom: ">=16.9.0" - checksum: 10c0/4fe87bd84a1af0347b4bf7635faa41a92c89099aafd9482052d1fa0d6056be3b676f904fcef8c7ad17f6ff65efac8182c023d2c7f306deb7056d933f1d72a08d - languageName: node - linkType: hard - -"rc@npm:1.2.8, rc@npm:^1.2.7, rc@npm:^1.2.8": - version: 1.2.8 - resolution: "rc@npm:1.2.8" - dependencies: - deep-extend: "npm:^0.6.0" - ini: "npm:~1.3.0" - minimist: "npm:^1.2.0" - strip-json-comments: "npm:~2.0.1" - bin: - rc: ./cli.js - checksum: 10c0/24a07653150f0d9ac7168e52943cc3cb4b7a22c0e43c7dff3219977c2fdca5a2760a304a029c20811a0e79d351f57d46c9bde216193a0f73978496afc2b85b15 - languageName: node - linkType: hard - -"react-contexify@npm:^6.0.0": - version: 6.0.0 - resolution: "react-contexify@npm:6.0.0" - dependencies: - clsx: "npm:^1.2.1" - peerDependencies: - react: ">=16" - react-dom: ">=16" - checksum: 10c0/f43ece394e0d398941bdc46930759582a447372b48fac06a382acfb447ca6f359d8c882f8bfd25d38d951966dcb19a566d9bd00d157e81a32a15f77a771ef45d - languageName: node - linkType: hard - -"react-dom@npm:^17.0.2": - version: 17.0.2 - resolution: "react-dom@npm:17.0.2" - dependencies: - loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - scheduler: "npm:^0.20.2" - peerDependencies: - react: 17.0.2 - checksum: 10c0/51abbcb72450fe527ebf978c3bc989ba266630faaa53f47a2fae5392369729e8de62b2e4683598cbe651ea7873cd34ec7d5127e2f50bf4bfe6bd0c3ad9bddcb0 - languageName: node - linkType: hard - -"react-draggable@npm:^4.4.4": - version: 4.4.6 - resolution: "react-draggable@npm:4.4.6" - dependencies: - clsx: "npm:^1.1.1" - prop-types: "npm:^15.8.1" - peerDependencies: - react: ">= 16.3.0" - react-dom: ">= 16.3.0" - checksum: 10c0/1e8cf47414a8554caa68447e5f27749bc40e1eabb4806e2dadcb39ab081d263f517d6aaec5231677e6b425603037c7e3386d1549898f9ffcc98a86cabafb2b9a - languageName: node - linkType: hard - -"react-h5-audio-player@npm:^3.2.0": - version: 3.9.1 - resolution: "react-h5-audio-player@npm:3.9.1" - dependencies: - "@babel/runtime": "npm:^7.10.2" - "@iconify/react": "npm:^4.1.1" - peerDependencies: - react: ^16.3.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.3.0 || ^17.0.0 || ^18.0.0 - checksum: 10c0/b260ff972be48500f4f89b4aba5a54b83e9dfb3d3edce9abff219953a759177b257eff43dfada4397f2a4f537f256628e5985cb98cbf004a4e55e629f78f10e6 - languageName: node - linkType: hard - -"react-intersection-observer@npm:^9.7.0": - version: 9.10.2 - resolution: "react-intersection-observer@npm:9.10.2" - peerDependencies: - react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 - react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 - peerDependenciesMeta: - react-dom: - optional: true - checksum: 10c0/e2224de16ed5617a7e75f0644abebd5668f4ccc78e9a210ae4b0307d8f306719fce8a7e3e1a4aec0f815b954934028e6a9d14cd70e50f11a603e392dce0450a4 - languageName: node - linkType: hard - -"react-is@npm:^16.13.1, react-is@npm:^16.7.0": - version: 16.13.1 - resolution: "react-is@npm:16.13.1" - checksum: 10c0/33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1 - languageName: node - linkType: hard - -"react-is@npm:^18.0.0, react-is@npm:^18.2.0": - version: 18.3.1 - resolution: "react-is@npm:18.3.1" - checksum: 10c0/f2f1e60010c683479e74c63f96b09fb41603527cd131a9959e2aee1e5a8b0caf270b365e5ca77d4a6b18aae659b60a86150bb3979073528877029b35aecd2072 - languageName: node - linkType: hard - -"react-lifecycles-compat@npm:^3.0.4": - version: 3.0.4 - resolution: "react-lifecycles-compat@npm:3.0.4" - checksum: 10c0/1d0df3c85af79df720524780f00c064d53a9dd1899d785eddb7264b378026979acbddb58a4b7e06e7d0d12aa1494fd5754562ee55d32907b15601068dae82c27 - languageName: node - linkType: hard - -"react-mentions@npm:^4.4.9": - version: 4.4.10 - resolution: "react-mentions@npm:4.4.10" - dependencies: - "@babel/runtime": "npm:7.4.5" - invariant: "npm:^2.2.4" - prop-types: "npm:^15.5.8" - substyle: "npm:^9.1.0" - peerDependencies: - react: ">=16.8.3" - react-dom: ">=16.8.3" - checksum: 10c0/25683158de4b4be47a3e2ec9120aa3661f4b60458f6334a89c69815da9d5b989a79ccd912186b006003e8f779595de8e556682d71e49bb41b6bba129ba1b5c17 - languageName: node - linkType: hard - -"react-qr-svg@npm:^2.2.1": - version: 2.4.0 - resolution: "react-qr-svg@npm:2.4.0" - dependencies: - prop-types: "npm:^15.5.8" - qr.js: "npm:0.0.0" - peerDependencies: - react: ">= 0.11.2 < 18.0.0" - checksum: 10c0/b85de7ec5e086fd66e0ea8d2290aa132209ea049b079af1a19bdcb3aaa20261e7a1f1f3a7f7e51548b817a2c621f0ca8258bff78d700c6da60588b95b6bfa13c - languageName: node - linkType: hard - -"react-redux@npm:8.0.4": - version: 8.0.4 - resolution: "react-redux@npm:8.0.4" - dependencies: - "@babel/runtime": "npm:^7.12.1" - "@types/hoist-non-react-statics": "npm:^3.3.1" - "@types/use-sync-external-store": "npm:^0.0.3" - hoist-non-react-statics: "npm:^3.3.2" - react-is: "npm:^18.0.0" - use-sync-external-store: "npm:^1.0.0" - peerDependencies: - "@types/react": ^16.8 || ^17.0 || ^18.0 - "@types/react-dom": ^16.8 || ^17.0 || ^18.0 - react: ^16.8 || ^17.0 || ^18.0 - react-dom: ^16.8 || ^17.0 || ^18.0 - react-native: ">=0.59" - redux: ^4 - peerDependenciesMeta: - "@types/react": - optional: true - "@types/react-dom": - optional: true - react-dom: - optional: true - react-native: - optional: true - redux: - optional: true - checksum: 10c0/c1468dc2e40895e740282fd378cd736eec8f574e794ec629133a26ce6b808de15577f62ebe73cc74c59d3fa7e9c276313b8b618018f0159dc198f28328039a51 - languageName: node - linkType: hard - -"react-toastify@npm:^6.0.9": - version: 6.2.0 - resolution: "react-toastify@npm:6.2.0" - dependencies: - clsx: "npm:^1.1.1" - prop-types: "npm:^15.7.2" - react-transition-group: "npm:^4.4.1" - peerDependencies: - react: ">=16" - checksum: 10c0/81813421818314bf5f5befff4ada3fee4f607cd51bf70f6def6b00399fe5c821dea2fb8533d16092281d336dafa0edffc619bf272301d668126e45c133befe80 - languageName: node - linkType: hard - -"react-transition-group@npm:^4.4.1": - version: 4.4.5 - resolution: "react-transition-group@npm:4.4.5" - dependencies: - "@babel/runtime": "npm:^7.5.5" - dom-helpers: "npm:^5.0.1" - loose-envify: "npm:^1.4.0" - prop-types: "npm:^15.6.2" - peerDependencies: - react: ">=16.6.0" - react-dom: ">=16.6.0" - checksum: 10c0/2ba754ba748faefa15f87c96dfa700d5525054a0141de8c75763aae6734af0740e77e11261a1e8f4ffc08fd9ab78510122e05c21c2d79066c38bb6861a886c82 - languageName: node - linkType: hard - -"react-universal-interface@npm:^0.6.2": - version: 0.6.2 - resolution: "react-universal-interface@npm:0.6.2" - peerDependencies: - react: "*" - tslib: "*" - checksum: 10c0/97c32ecb7a425c3bcaa92dcf84c46146b49610d928efde9e9ee5518c475a0db942f01634dd490e4f42fcd95cc2f49657c1b96dcef96423c06f077147fe1968ab - languageName: node - linkType: hard - -"react-use@npm:^17.4.0": - version: 17.5.0 - resolution: "react-use@npm:17.5.0" - dependencies: - "@types/js-cookie": "npm:^2.2.6" - "@xobotyi/scrollbar-width": "npm:^1.9.5" - copy-to-clipboard: "npm:^3.3.1" - fast-deep-equal: "npm:^3.1.3" - fast-shallow-equal: "npm:^1.0.0" - js-cookie: "npm:^2.2.1" - nano-css: "npm:^5.6.1" - react-universal-interface: "npm:^0.6.2" - resize-observer-polyfill: "npm:^1.5.1" - screenfull: "npm:^5.1.0" - set-harmonic-interval: "npm:^1.0.1" - throttle-debounce: "npm:^3.0.1" - ts-easing: "npm:^0.2.0" - tslib: "npm:^2.1.0" - peerDependencies: - react: "*" - react-dom: "*" - checksum: 10c0/b2e606338f329f8f26bccbd1ae428cf63e1d9b4a940cb327823270955a2aae35972be745d333d1a1bd0276a3650038d1f7f6ae1077af5cccba8234a3e7376754 - languageName: node - linkType: hard - -"react-virtualized@npm:^9.22.4": - version: 9.22.5 - resolution: "react-virtualized@npm:9.22.5" - dependencies: - "@babel/runtime": "npm:^7.7.2" - clsx: "npm:^1.0.4" - dom-helpers: "npm:^5.1.3" - loose-envify: "npm:^1.4.0" - prop-types: "npm:^15.7.2" - react-lifecycles-compat: "npm:^3.0.4" - peerDependencies: - react: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 - react-dom: ^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 - checksum: 10c0/b0444b472f317dce61119c07426c5e9ebfe5125d049996678da922717715a1aa83df755aa36877f4b1718aa2e181d22f15ebb807ee356418c56f922f865628c1 - languageName: node - linkType: hard - -"react@npm:17.0.2": - version: 17.0.2 - resolution: "react@npm:17.0.2" - dependencies: - loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - checksum: 10c0/07ae8959acf1596f0550685102fd6097d461a54a4fd46a50f88a0cd7daaa97fdd6415de1dcb4bfe0da6aa43221a6746ce380410fa848acc60f8ac41f6649c148 - languageName: node - linkType: hard - -"read-config-file@npm:6.2.0": - version: 6.2.0 - resolution: "read-config-file@npm:6.2.0" - dependencies: - dotenv: "npm:^9.0.2" - dotenv-expand: "npm:^5.1.0" - js-yaml: "npm:^4.1.0" - json5: "npm:^2.2.0" - lazy-val: "npm:^1.0.4" - checksum: 10c0/ea1ffc9dcbd44fcbcfa972f3deb9625725c5eb112ecc1da2fb05e8fc89ef8d21fae10539f4c312b9ed599d1d20ec3a85c66b71701fbd1a126562d8249ecd8f3a - languageName: node - linkType: hard - -"read-last-lines-ts@npm:^1.2.1": - version: 1.2.1 - resolution: "read-last-lines-ts@npm:1.2.1" - checksum: 10c0/c1b1295373c318be020662230493bcb58a8c90a861f231286729457c4a76c034318c80a9e9276d2e2bba23da3f2ceef716320be225946102d693b2099ae6e0f2 - languageName: node - linkType: hard - -"read-pkg-up@npm:^7.0.1": - version: 7.0.1 - resolution: "read-pkg-up@npm:7.0.1" - dependencies: - find-up: "npm:^4.1.0" - read-pkg: "npm:^5.2.0" - type-fest: "npm:^0.8.1" - checksum: 10c0/82b3ac9fd7c6ca1bdc1d7253eb1091a98ff3d195ee0a45386582ce3e69f90266163c34121e6a0a02f1630073a6c0585f7880b3865efcae9c452fa667f02ca385 - languageName: node - linkType: hard - -"read-pkg@npm:^5.2.0": - version: 5.2.0 - resolution: "read-pkg@npm:5.2.0" - dependencies: - "@types/normalize-package-data": "npm:^2.4.0" - normalize-package-data: "npm:^2.5.0" - parse-json: "npm:^5.0.0" - type-fest: "npm:^0.6.0" - checksum: 10c0/b51a17d4b51418e777029e3a7694c9bd6c578a5ab99db544764a0b0f2c7c0f58f8a6bc101f86a6fceb8ba6d237d67c89acf6170f6b98695d0420ddc86cf109fb - languageName: node - linkType: hard - -"readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": - version: 3.6.2 - resolution: "readable-stream@npm:3.6.2" - dependencies: - inherits: "npm:^2.0.3" - string_decoder: "npm:^1.1.1" - util-deprecate: "npm:^1.0.1" - checksum: 10c0/e37be5c79c376fdd088a45fa31ea2e423e5d48854be7a22a58869b4e84d25047b193f6acb54f1012331e1bcd667ffb569c01b99d36b0bd59658fb33f513511b7 - languageName: node - linkType: hard - -"readdirp@npm:~3.6.0": - version: 3.6.0 - resolution: "readdirp@npm:3.6.0" - dependencies: - picomatch: "npm:^2.2.1" - checksum: 10c0/6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b - languageName: node - linkType: hard - -"rechoir@npm:^0.8.0": - version: 0.8.0 - resolution: "rechoir@npm:0.8.0" - dependencies: - resolve: "npm:^1.20.0" - checksum: 10c0/1a30074124a22abbd5d44d802dac26407fa72a0a95f162aa5504ba8246bc5452f8b1a027b154d9bdbabcd8764920ff9333d934c46a8f17479c8912e92332f3ff - languageName: node - linkType: hard - -"redent@npm:^3.0.0": - version: 3.0.0 - resolution: "redent@npm:3.0.0" - dependencies: - indent-string: "npm:^4.0.0" - strip-indent: "npm:^3.0.0" - checksum: 10c0/d64a6b5c0b50eb3ddce3ab770f866658a2b9998c678f797919ceb1b586bab9259b311407280bd80b804e2a7c7539b19238ae6a2a20c843f1a7fcff21d48c2eae - languageName: node - linkType: hard - -"redux-logger@npm:3.0.6": - version: 3.0.6 - resolution: "redux-logger@npm:3.0.6" - dependencies: - deep-diff: "npm:^0.3.5" - checksum: 10c0/65eb71a1c72d9636368672a684bde62c746e64c19c8b92e3f00bdf5cf240ea1695eccb95a0fa3d5044f6a86cbf11fd35dc5150fd3351fa53c72721c336e9098f - languageName: node - linkType: hard - -"redux-persist@npm:^6.0.0": - version: 6.0.0 - resolution: "redux-persist@npm:6.0.0" - peerDependencies: - redux: ">4.0.0" - checksum: 10c0/8242d265ab8d28bbc95cf2dc2a05b869eb67aa309b1ed08163c926f3af56dd8eb1ea62118286083461b8ef2024d3b349fd264e5a62a70eb2e74d068c832d5bf2 - languageName: node - linkType: hard - -"redux-promise-middleware@npm:^6.1.2": - version: 6.2.0 - resolution: "redux-promise-middleware@npm:6.2.0" - peerDependencies: - redux: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 - checksum: 10c0/73f7610f9695ff47dd7e9b26b5cef6d65044061f0f50127889294882752669fb861beef3c95d1c9f10f74e01b70353abe8fd707e296b647a205d6514540f1de0 - languageName: node - linkType: hard - -"redux-thunk@npm:^2.4.1": - version: 2.4.2 - resolution: "redux-thunk@npm:2.4.2" - peerDependencies: - redux: ^4 - checksum: 10c0/e202d6ef7dfa7df08ed24cb221aa89d6c84dbaa7d65fe90dbd8e826d0c10d801f48388f9a7598a4fd970ecbc93d335014570a61ca7bc8bf569eab5de77b31a3c - languageName: node - linkType: hard - -"redux@npm:4.2.0": - version: 4.2.0 - resolution: "redux@npm:4.2.0" - dependencies: - "@babel/runtime": "npm:^7.9.2" - checksum: 10c0/6b8b543499c9b8aa6afa01ef68950f4b2ea68d803381ac65797b1a5a7e39ba88ee3650c2a5a1dd500c78ad022de45cd5ed4a5f41fe7d51db8b07d12fbe84d146 - languageName: node - linkType: hard - -"redux@npm:^3.6.0": - version: 3.7.2 - resolution: "redux@npm:3.7.2" - dependencies: - lodash: "npm:^4.2.1" - lodash-es: "npm:^4.2.1" - loose-envify: "npm:^1.1.0" - symbol-observable: "npm:^1.0.3" - checksum: 10c0/544456f95734de33326637b370894addb57d9de2524edf36a20e4a326d0a36a0e223979d027545c5aa8a8d7a2859363981f63d1146401b72df0d16f373dd09cb - languageName: node - linkType: hard - -"redux@npm:^4.0.0, redux@npm:^4.1.2": - version: 4.2.1 - resolution: "redux@npm:4.2.1" - dependencies: - "@babel/runtime": "npm:^7.9.2" - checksum: 10c0/136d98b3d5dbed1cd6279c8c18a6a74c416db98b8a432a46836bdd668475de6279a2d4fd9d1363f63904e00f0678a8a3e7fa532c897163340baf1e71bb42c742 - languageName: node - linkType: hard - -"reflect.getprototypeof@npm:^1.0.4": - version: 1.0.6 - resolution: "reflect.getprototypeof@npm:1.0.6" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.1" - es-errors: "npm:^1.3.0" - get-intrinsic: "npm:^1.2.4" - globalthis: "npm:^1.0.3" - which-builtin-type: "npm:^1.1.3" - checksum: 10c0/baf4ef8ee6ff341600f4720b251cf5a6cb552d6a6ab0fdc036988c451bf16f920e5feb0d46bd4f530a5cce568f1f7aca2d77447ca798920749cfc52783c39b55 - languageName: node - linkType: hard - -"regenerator-runtime@npm:^0.13.2": - version: 0.13.11 - resolution: "regenerator-runtime@npm:0.13.11" - checksum: 10c0/12b069dc774001fbb0014f6a28f11c09ebfe3c0d984d88c9bced77fdb6fedbacbca434d24da9ae9371bfbf23f754869307fb51a4c98a8b8b18e5ef748677ca24 - languageName: node - linkType: hard - -"regenerator-runtime@npm:^0.14.0": - version: 0.14.1 - resolution: "regenerator-runtime@npm:0.14.1" - checksum: 10c0/1b16eb2c4bceb1665c89de70dcb64126a22bc8eb958feef3cd68fe11ac6d2a4899b5cd1b80b0774c7c03591dc57d16631a7f69d2daa2ec98100e2f29f7ec4cc4 - languageName: node - linkType: hard - -"regexp.prototype.flags@npm:^1.5.2": - version: 1.5.2 - resolution: "regexp.prototype.flags@npm:1.5.2" - dependencies: - call-bind: "npm:^1.0.6" - define-properties: "npm:^1.2.1" - es-errors: "npm:^1.3.0" - set-function-name: "npm:^2.0.1" - checksum: 10c0/0f3fc4f580d9c349f8b560b012725eb9c002f36daa0041b3fbf6f4238cb05932191a4d7d5db3b5e2caa336d5150ad0402ed2be81f711f9308fe7e1a9bf9bd552 - languageName: node - linkType: hard - -"registry-auth-token@npm:^4.0.0": - version: 4.2.2 - resolution: "registry-auth-token@npm:4.2.2" - dependencies: - rc: "npm:1.2.8" - checksum: 10c0/1d0000b8b65e7141a4cc4594926e2551607f48596e01326e7aa2ba2bc688aea86b2aa0471c5cb5de7acc9a59808a3a1ddde9084f974da79bfc67ab67aa48e003 - languageName: node - linkType: hard - -"registry-url@npm:^5.0.0": - version: 5.1.0 - resolution: "registry-url@npm:5.1.0" - dependencies: - rc: "npm:^1.2.8" - checksum: 10c0/c2c455342b5836cbed5162092eba075c7a02c087d9ce0fde8aeb4dc87a8f4a34a542e58bf4d8ec2d4cb73f04408cb3148ceb1f76647f76b978cfec22047dc6d6 - languageName: node - linkType: hard - -"require-directory@npm:^2.1.1": - version: 2.1.1 - resolution: "require-directory@npm:2.1.1" - checksum: 10c0/83aa76a7bc1531f68d92c75a2ca2f54f1b01463cb566cf3fbc787d0de8be30c9dbc211d1d46be3497dac5785fe296f2dd11d531945ac29730643357978966e99 - languageName: node - linkType: hard - -"require-from-string@npm:^2.0.2": - version: 2.0.2 - resolution: "require-from-string@npm:2.0.2" - checksum: 10c0/aaa267e0c5b022fc5fd4eef49d8285086b15f2a1c54b28240fdf03599cbd9c26049fee3eab894f2e1f6ca65e513b030a7c264201e3f005601e80c49fb2937ce2 - languageName: node - linkType: hard - -"requires-port@npm:^1.0.0": - version: 1.0.0 - resolution: "requires-port@npm:1.0.0" - checksum: 10c0/b2bfdd09db16c082c4326e573a82c0771daaf7b53b9ce8ad60ea46aa6e30aaf475fe9b164800b89f93b748d2c234d8abff945d2551ba47bf5698e04cd7713267 - languageName: node - linkType: hard - -"requizzle@npm:^0.2.3": - version: 0.2.4 - resolution: "requizzle@npm:0.2.4" - dependencies: - lodash: "npm:^4.17.21" - checksum: 10c0/ad138f987943aeda5f96cd1ccba9752c96352a729a7e3c3e2545568703f7fc9b978d9b46715803408ef178b0d61d36a4b1b506b367b7e78fe6d041fa5bfa5e06 - languageName: node - linkType: hard - -"reselect@npm:^4.1.5": - version: 4.1.8 - resolution: "reselect@npm:4.1.8" - checksum: 10c0/06a305a504affcbb67dd0561ddc8306b35796199c7e15b38934c80606938a021eadcf68cfd58e7bb5e17786601c37602a3362a4665c7bf0a96c1041ceee9d0b7 - languageName: node - linkType: hard - -"resize-observer-polyfill@npm:^1.5.1": - version: 1.5.1 - resolution: "resize-observer-polyfill@npm:1.5.1" - checksum: 10c0/5e882475067f0b97dc07e0f37c3e335ac5bc3520d463f777cec7e894bb273eddbfecb857ae668e6fb6881fd6f6bb7148246967172139302da50fa12ea3a15d95 - languageName: node - linkType: hard - -"resolve-alpn@npm:^1.0.0": - version: 1.2.1 - resolution: "resolve-alpn@npm:1.2.1" - checksum: 10c0/b70b29c1843bc39781ef946c8cd4482e6d425976599c0f9c138cec8209e4e0736161bf39319b01676a847000085dfdaf63583c6fb4427bf751a10635bd2aa0c4 - languageName: node - linkType: hard - -"resolve-cwd@npm:^3.0.0": - version: 3.0.0 - resolution: "resolve-cwd@npm:3.0.0" - dependencies: - resolve-from: "npm:^5.0.0" - checksum: 10c0/e608a3ebd15356264653c32d7ecbc8fd702f94c6703ea4ac2fb81d9c359180cba0ae2e6b71faa446631ed6145454d5a56b227efc33a2d40638ac13f8beb20ee4 - languageName: node - linkType: hard - -"resolve-from@npm:5.0.0, resolve-from@npm:^5.0.0": - version: 5.0.0 - resolution: "resolve-from@npm:5.0.0" - checksum: 10c0/b21cb7f1fb746de8107b9febab60095187781137fd803e6a59a76d421444b1531b641bba5857f5dc011974d8a5c635d61cec49e6bd3b7fc20e01f0fafc4efbf2 - languageName: node - linkType: hard - -"resolve-from@npm:^4.0.0": - version: 4.0.0 - resolution: "resolve-from@npm:4.0.0" - checksum: 10c0/8408eec31a3112ef96e3746c37be7d64020cda07c03a920f5024e77290a218ea758b26ca9529fd7b1ad283947f34b2291c1c0f6aa0ed34acfdda9c6014c8d190 - languageName: node - linkType: hard - -"resolve-global@npm:1.0.0, resolve-global@npm:^1.0.0": - version: 1.0.0 - resolution: "resolve-global@npm:1.0.0" - dependencies: - global-dirs: "npm:^0.1.1" - checksum: 10c0/fda6ba81a07a0124756ce956dd871ca83763973326d8617143dab38d9c9afc666926604bfe8f0bfd046a9a285347568f32ceb3d4c55a1cb9de5614cca001a21c - languageName: node - linkType: hard - -"resolve-pkg-maps@npm:^1.0.0": - version: 1.0.0 - resolution: "resolve-pkg-maps@npm:1.0.0" - checksum: 10c0/fb8f7bbe2ca281a73b7ef423a1cbc786fb244bd7a95cbe5c3fba25b27d327150beca8ba02f622baea65919a57e061eb5005204daa5f93ed590d9b77463a567ab - languageName: node - linkType: hard - -"resolve@npm:^1.10.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4": - version: 1.22.8 - resolution: "resolve@npm:1.22.8" - dependencies: - is-core-module: "npm:^2.13.0" - path-parse: "npm:^1.0.7" - supports-preserve-symlinks-flag: "npm:^1.0.0" - bin: - resolve: bin/resolve - checksum: 10c0/07e179f4375e1fd072cfb72ad66d78547f86e6196c4014b31cb0b8bb1db5f7ca871f922d08da0fbc05b94e9fd42206f819648fa3b5b873ebbc8e1dc68fec433a - languageName: node - linkType: hard - -"resolve@npm:^2.0.0-next.4": - version: 2.0.0-next.5 - resolution: "resolve@npm:2.0.0-next.5" - dependencies: - is-core-module: "npm:^2.13.0" - path-parse: "npm:^1.0.7" - supports-preserve-symlinks-flag: "npm:^1.0.0" - bin: - resolve: bin/resolve - checksum: 10c0/a6c33555e3482ea2ec4c6e3d3bf0d78128abf69dca99ae468e64f1e30acaa318fd267fb66c8836b04d558d3e2d6ed875fe388067e7d8e0de647d3c21af21c43a - languageName: node - linkType: hard - -"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin": - version: 1.22.8 - resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" - dependencies: - is-core-module: "npm:^2.13.0" - path-parse: "npm:^1.0.7" - supports-preserve-symlinks-flag: "npm:^1.0.0" - bin: - resolve: bin/resolve - checksum: 10c0/0446f024439cd2e50c6c8fa8ba77eaa8370b4180f401a96abf3d1ebc770ac51c1955e12764cde449fde3fff480a61f84388e3505ecdbab778f4bef5f8212c729 - languageName: node - linkType: hard - -"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin": - version: 2.0.0-next.5 - resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin::version=2.0.0-next.5&hash=c3c19d" - dependencies: - is-core-module: "npm:^2.13.0" - path-parse: "npm:^1.0.7" - supports-preserve-symlinks-flag: "npm:^1.0.0" - bin: - resolve: bin/resolve - checksum: 10c0/78ad6edb8309a2bfb720c2c1898f7907a37f858866ce11a5974643af1203a6a6e05b2fa9c53d8064a673a447b83d42569260c306d43628bff5bb101969708355 - languageName: node - linkType: hard - -"responselike@npm:^2.0.0": - version: 2.0.1 - resolution: "responselike@npm:2.0.1" - dependencies: - lowercase-keys: "npm:^2.0.0" - checksum: 10c0/360b6deb5f101a9f8a4174f7837c523c3ec78b7ca8a7c1d45a1062b303659308a23757e318b1e91ed8684ad1205721142dd664d94771cd63499353fd4ee732b5 - languageName: node - linkType: hard - -"restore-cursor@npm:^4.0.0": - version: 4.0.0 - resolution: "restore-cursor@npm:4.0.0" - dependencies: - onetime: "npm:^5.1.0" - signal-exit: "npm:^3.0.2" - checksum: 10c0/6f7da8c5e422ac26aa38354870b1afac09963572cf2879443540449068cb43476e9cbccf6f8de3e0171e0d6f7f533c2bc1a0a008003c9a525bbc098e89041318 - languageName: node - linkType: hard - -"retry@npm:^0.12.0": - version: 0.12.0 - resolution: "retry@npm:0.12.0" - checksum: 10c0/59933e8501727ba13ad73ef4a04d5280b3717fd650408460c987392efe9d7be2040778ed8ebe933c5cbd63da3dcc37919c141ef8af0a54a6e4fca5a2af177bfe - languageName: node - linkType: hard - -"retry@npm:^0.13.1": - version: 0.13.1 - resolution: "retry@npm:0.13.1" - checksum: 10c0/9ae822ee19db2163497e074ea919780b1efa00431d197c7afdb950e42bf109196774b92a49fc9821f0b8b328a98eea6017410bfc5e8a0fc19c85c6d11adb3772 - languageName: node - linkType: hard - -"reusify@npm:^1.0.4": - version: 1.0.4 - resolution: "reusify@npm:1.0.4" - checksum: 10c0/c19ef26e4e188f408922c46f7ff480d38e8dfc55d448310dfb518736b23ed2c4f547fb64a6ed5bdba92cd7e7ddc889d36ff78f794816d5e71498d645ef476107 - languageName: node - linkType: hard - -"rfdc@npm:^1.3.0": - version: 1.3.1 - resolution: "rfdc@npm:1.3.1" - checksum: 10c0/69f65e3ed30970f8055fac9fbbef9ce578800ca19554eab1dcbffe73a4b8aef536bc4248313889cf25e3b4e38b212c721eabe30856575bf2b2bc3d90f8ba93ef - languageName: node - linkType: hard - -"rimraf@npm:2.6.2": - version: 2.6.2 - resolution: "rimraf@npm:2.6.2" - dependencies: - glob: "npm:^7.0.5" - bin: - rimraf: ./bin.js - checksum: 10c0/8caac0e6c36dad94556ec0ca97125d148a813b3f661f3fa9f4bcd6d60ed8e145d94258e102a05557f428086ab9d8de5c714cb2748b2020495056d6730a9ecc72 - languageName: node - linkType: hard - -"rimraf@npm:^2.6.3": - version: 2.7.1 - resolution: "rimraf@npm:2.7.1" - dependencies: - glob: "npm:^7.1.3" - bin: - rimraf: ./bin.js - checksum: 10c0/4eef73d406c6940927479a3a9dee551e14a54faf54b31ef861250ac815172bade86cc6f7d64a4dc5e98b65e4b18a2e1c9ff3b68d296be0c748413f092bb0dd40 - languageName: node - linkType: hard - -"rimraf@npm:^3.0.2": - version: 3.0.2 - resolution: "rimraf@npm:3.0.2" - dependencies: - glob: "npm:^7.1.3" - bin: - rimraf: bin.js - checksum: 10c0/9cb7757acb489bd83757ba1a274ab545eafd75598a9d817e0c3f8b164238dd90eba50d6b848bd4dcc5f3040912e882dc7ba71653e35af660d77b25c381d402e8 - languageName: node - linkType: hard - -"rimraf@npm:~2.4.0": - version: 2.4.5 - resolution: "rimraf@npm:2.4.5" - dependencies: - glob: "npm:^6.0.1" - bin: - rimraf: ./bin.js - checksum: 10c0/5251a36053165d23248efec5077f9addc13ad7f742a02dcd9ac7adda9e208cbf7523901e96a9ca6c33059bd0b573b97eab3334cf1d9976cc5ddc8b3c24d9ddd7 - languageName: node - linkType: hard - -"roarr@npm:^2.15.3": - version: 2.15.4 - resolution: "roarr@npm:2.15.4" - dependencies: - boolean: "npm:^3.0.1" - detect-node: "npm:^2.0.4" - globalthis: "npm:^1.0.1" - json-stringify-safe: "npm:^5.0.1" - semver-compare: "npm:^1.0.0" - sprintf-js: "npm:^1.1.2" - checksum: 10c0/7d01d4c14513c461778dd673a8f9e53255221f8d04173aafeb8e11b23d8b659bb83f1c90cfe81af7f9c213b8084b404b918108fd792bda76678f555340cc64ec - languageName: node - linkType: hard - -"rrweb-cssom@npm:^0.6.0": - version: 0.6.0 - resolution: "rrweb-cssom@npm:0.6.0" - checksum: 10c0/3d9d90d53c2349ea9c8509c2690df5a4ef930c9cf8242aeb9425d4046f09d712bb01047e00da0e1c1dab5db35740b3d78fd45c3e7272f75d3724a563f27c30a3 - languageName: node - linkType: hard - -"rtl-css-js@npm:^1.16.1": - version: 1.16.1 - resolution: "rtl-css-js@npm:1.16.1" - dependencies: - "@babel/runtime": "npm:^7.1.2" - checksum: 10c0/4b81ef50e50c97455d61c9bb576e2892651c79bac5d0c52b4123ebb9d6a2c5144590a79c9db0a3212a81b4eb83bf317e03637220f20b387a37b96cbac324d3d2 - languageName: node - linkType: hard - -"run-parallel@npm:^1.1.9": - version: 1.2.0 - resolution: "run-parallel@npm:1.2.0" - dependencies: - queue-microtask: "npm:^1.2.2" - checksum: 10c0/200b5ab25b5b8b7113f9901bfe3afc347e19bb7475b267d55ad0eb86a62a46d77510cb0f232507c9e5d497ebda569a08a9867d0d14f57a82ad5564d991588b39 - languageName: node - linkType: hard - -"run-script-os@npm:^1.1.6": - version: 1.1.6 - resolution: "run-script-os@npm:1.1.6" - bin: - run-os: index.js - run-script-os: index.js - checksum: 10c0/620e240a650c666bb8e3f5437680d88c522366e6c68d4867300caf6cad010c85ff36a016de2c71010debaf10e968966b2c6aaa8816bab8298381e5620d41d8aa - languageName: node - linkType: hard - -"safe-array-concat@npm:^1.1.2": - version: 1.1.2 - resolution: "safe-array-concat@npm:1.1.2" - dependencies: - call-bind: "npm:^1.0.7" - get-intrinsic: "npm:^1.2.4" - has-symbols: "npm:^1.0.3" - isarray: "npm:^2.0.5" - checksum: 10c0/12f9fdb01c8585e199a347eacc3bae7b5164ae805cdc8c6707199dbad5b9e30001a50a43c4ee24dc9ea32dbb7279397850e9208a7e217f4d8b1cf5d90129dec9 - languageName: node - linkType: hard - -"safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": - version: 5.2.1 - resolution: "safe-buffer@npm:5.2.1" - checksum: 10c0/6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3 - languageName: node - linkType: hard - -"safe-json-stringify@npm:~1": - version: 1.2.0 - resolution: "safe-json-stringify@npm:1.2.0" - checksum: 10c0/9c21c7b63a35a9e52d248eea2ad7bc9e790dde5aa418f0d4eed3c0b4c866e15337425b0d973173d30dd70a9e422271619f17e13574e0c8371d0c240cf72b871f - languageName: node - linkType: hard - -"safe-regex-test@npm:^1.0.3": - version: 1.0.3 - resolution: "safe-regex-test@npm:1.0.3" - dependencies: - call-bind: "npm:^1.0.6" - es-errors: "npm:^1.3.0" - is-regex: "npm:^1.1.4" - checksum: 10c0/900bf7c98dc58f08d8523b7012b468e4eb757afa624f198902c0643d7008ba777b0bdc35810ba0b758671ce887617295fb742b3f3968991b178ceca54cb07603 - languageName: node - linkType: hard - -"safer-buffer@npm:>= 2.1.2 < 3.0.0": - version: 2.1.2 - resolution: "safer-buffer@npm:2.1.2" - checksum: 10c0/7e3c8b2e88a1841c9671094bbaeebd94448111dd90a81a1f606f3f67708a6ec57763b3b47f06da09fc6054193e0e6709e77325415dc8422b04497a8070fa02d4 - languageName: node - linkType: hard - -"sanitize-filename@npm:^1.6.3": - version: 1.6.3 - resolution: "sanitize-filename@npm:1.6.3" - dependencies: - truncate-utf8-bytes: "npm:^1.0.0" - checksum: 10c0/16ff47556a6e54e228c28db096bedd303da67b030d4bea4925fd71324932d6b02c7b0446f00ad33987b25b6414f24ae968e01a1a1679ce599542e82c4b07eb1f - languageName: node - linkType: hard - -"sanitize.css@npm:^12.0.1": - version: 12.0.1 - resolution: "sanitize.css@npm:12.0.1" - checksum: 10c0/84f392e80376c7fb3e793d58daa97c79b7025dc29f5255e4fa02c6c368d2513ed651c2dc394887fcfed83bb068fcec0a6ec2ec0a8206c4456cbb9f7e5105903a - languageName: node - linkType: hard - -"sass-loader@npm:^13.2.2": - version: 13.3.3 - resolution: "sass-loader@npm:13.3.3" - dependencies: - neo-async: "npm:^2.6.2" - peerDependencies: - fibers: ">= 3.1.0" - node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 - sass: ^1.3.0 - sass-embedded: "*" - webpack: ^5.0.0 - peerDependenciesMeta: - fibers: - optional: true - node-sass: - optional: true - sass: - optional: true - sass-embedded: - optional: true - checksum: 10c0/5e955a4ffce35ee0a46fce677ce51eaa69587fb5371978588c83af00f49e7edc36dcf3bb559cbae27681c5e24a71284463ebe03a1fb65e6ecafa1db0620e3fc8 - languageName: node - linkType: hard - -"sass@npm:^1.60.0": - version: 1.77.2 - resolution: "sass@npm:1.77.2" - dependencies: - chokidar: "npm:>=3.0.0 <4.0.0" - immutable: "npm:^4.0.0" - source-map-js: "npm:>=0.6.2 <2.0.0" - bin: - sass: sass.js - checksum: 10c0/0d292339064de3c902e209d41de9c4eb2038cff326476aeebbb5be3eee1d23400d975face2b8e124ae617b10af3e93bec01580f61912f34e4c517fe137a118b6 - languageName: node - linkType: hard - -"sax@npm:^1.2.4": - version: 1.3.0 - resolution: "sax@npm:1.3.0" - checksum: 10c0/599dbe0ba9d8bd55e92d920239b21d101823a6cedff71e542589303fa0fa8f3ece6cf608baca0c51be846a2e88365fac94a9101a9c341d94b98e30c4deea5bea - languageName: node - linkType: hard - -"saxes@npm:^6.0.0": - version: 6.0.0 - resolution: "saxes@npm:6.0.0" - dependencies: - xmlchars: "npm:^2.2.0" - checksum: 10c0/3847b839f060ef3476eb8623d099aa502ad658f5c40fd60c105ebce86d244389b0d76fcae30f4d0c728d7705ceb2f7e9b34bb54717b6a7dbedaf5dad2d9a4b74 - languageName: node - linkType: hard - -"scheduler@npm:^0.20.2": - version: 0.20.2 - resolution: "scheduler@npm:0.20.2" - dependencies: - loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - checksum: 10c0/b0982e4b0f34f4ffa4f2f486161c0fd9ce9b88680b045dccbf250eb1aa4fd27413570645455187a83535e2370f5c667a251045547765408492bd883cbe95fcdb - languageName: node - linkType: hard - -"schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0": - version: 3.3.0 - resolution: "schema-utils@npm:3.3.0" - dependencies: - "@types/json-schema": "npm:^7.0.8" - ajv: "npm:^6.12.5" - ajv-keywords: "npm:^3.5.2" - checksum: 10c0/fafdbde91ad8aa1316bc543d4b61e65ea86970aebbfb750bfb6d8a6c287a23e415e0e926c2498696b242f63af1aab8e585252637fabe811fd37b604351da6500 - languageName: node - linkType: hard - -"schema-utils@npm:^4.0.0": - version: 4.2.0 - resolution: "schema-utils@npm:4.2.0" - dependencies: - "@types/json-schema": "npm:^7.0.9" - ajv: "npm:^8.9.0" - ajv-formats: "npm:^2.1.1" - ajv-keywords: "npm:^5.1.0" - checksum: 10c0/8dab7e7800316387fd8569870b4b668cfcecf95ac551e369ea799bbcbfb63fb0365366d4b59f64822c9f7904d8c5afcfaf5a6124a4b08783e558cd25f299a6b4 - languageName: node - linkType: hard - -"screenfull@npm:^5.1.0": - version: 5.2.0 - resolution: "screenfull@npm:5.2.0" - checksum: 10c0/86fd49983e2edc153ee2e674a570c711cb0961a9cacca659309f79636ccc8ca8a0b830ea4dacdae7403a8bb7ba6affd5bcdce053aa97782961247a49bfd2ba68 - languageName: node - linkType: hard - -"sdp@npm:^2.1.0": - version: 2.12.0 - resolution: "sdp@npm:2.12.0" - checksum: 10c0/1a2ffdc20d79711175f89e87a6ce8db9b4757e694bed9760e5f919eed5925c9fb43ea63c5fd38f428a3edd45baae826318153fdc1db590a504eed7a809a23e32 - languageName: node - linkType: hard - -"semver-compare@npm:^1.0.0": - version: 1.0.0 - resolution: "semver-compare@npm:1.0.0" - checksum: 10c0/9ef4d8b81847556f0865f46ddc4d276bace118c7cb46811867af82e837b7fc473911981d5a0abc561fa2db487065572217e5b06e18701c4281bcdd2a1affaff1 - languageName: node - linkType: hard - -"semver-diff@npm:^3.1.1": - version: 3.1.1 - resolution: "semver-diff@npm:3.1.1" - dependencies: - semver: "npm:^6.3.0" - checksum: 10c0/7d350f1450b9577d538ef866a9bc4cd97bfbf1f1d92070291495a31d0ec3aa808e826c223e5454ea9877cc06eaa886ffd71bb3a1f331b44bc210f9ff525c68d2 - languageName: node - linkType: hard - -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.6.0": - version: 5.7.2 - resolution: "semver@npm:5.7.2" - bin: - semver: bin/semver - checksum: 10c0/e4cf10f86f168db772ae95d86ba65b3fd6c5967c94d97c708ccb463b778c2ee53b914cd7167620950fc07faf5a564e6efe903836639e512a1aa15fbc9667fa25 - languageName: node - linkType: hard - -"semver@npm:7.5.4": - version: 7.5.4 - resolution: "semver@npm:7.5.4" - dependencies: - lru-cache: "npm:^6.0.0" - bin: - semver: bin/semver.js - checksum: 10c0/5160b06975a38b11c1ab55950cb5b8a23db78df88275d3d8a42ccf1f29e55112ac995b3a26a522c36e3b5f76b0445f1eef70d696b8c7862a2b4303d7b0e7609e - languageName: node - linkType: hard - -"semver@npm:^6.0.0, semver@npm:^6.2.0, semver@npm:^6.3.0, semver@npm:^6.3.1": - version: 6.3.1 - resolution: "semver@npm:6.3.1" - bin: - semver: bin/semver.js - checksum: 10c0/e3d79b609071caa78bcb6ce2ad81c7966a46a7431d9d58b8800cfa9cb6a63699b3899a0e4bcce36167a284578212d9ae6942b6929ba4aa5015c079a67751d42d - languageName: node - linkType: hard - -"semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.4": - version: 7.6.2 - resolution: "semver@npm:7.6.2" - bin: - semver: bin/semver.js - checksum: 10c0/97d3441e97ace8be4b1976433d1c32658f6afaff09f143e52c593bae7eef33de19e3e369c88bd985ce1042c6f441c80c6803078d1de2a9988080b66684cbb30c - languageName: node - linkType: hard - -"serialize-error@npm:^7.0.1": - version: 7.0.1 - resolution: "serialize-error@npm:7.0.1" - dependencies: - type-fest: "npm:^0.13.1" - checksum: 10c0/7982937d578cd901276c8ab3e2c6ed8a4c174137730f1fb0402d005af209a0e84d04acc874e317c936724c7b5b26c7a96ff7e4b8d11a469f4924a4b0ea814c05 - languageName: node - linkType: hard - -"serialize-javascript@npm:6.0.0": - version: 6.0.0 - resolution: "serialize-javascript@npm:6.0.0" - dependencies: - randombytes: "npm:^2.1.0" - checksum: 10c0/73104922ef0a919064346eea21caab99de1a019a1f5fb54a7daa7fcabc39e83b387a2a363e52a889598c3b1bcf507c4b2a7b26df76e991a310657af20eea2e7c - languageName: node - linkType: hard - -"serialize-javascript@npm:^6.0.1": - version: 6.0.2 - resolution: "serialize-javascript@npm:6.0.2" - dependencies: - randombytes: "npm:^2.1.0" - checksum: 10c0/2dd09ef4b65a1289ba24a788b1423a035581bef60817bea1f01eda8e3bda623f86357665fe7ac1b50f6d4f583f97db9615b3f07b2a2e8cbcb75033965f771dd2 - languageName: node - linkType: hard - -"session-desktop@workspace:.": - version: 0.0.0-use.local - resolution: "session-desktop@workspace:." - dependencies: - "@commitlint/cli": "npm:^17.7.1" - "@commitlint/config-conventional": "npm:^17.7.0" - "@commitlint/types": "npm:^17.4.4" - "@electron/notarize": "npm:^2.1.0" - "@emoji-mart/data": "npm:^1.1.2" - "@emoji-mart/react": "npm:^1.1.1" - "@reduxjs/toolkit": "npm:1.8.5" - "@signalapp/better-sqlite3": "npm:^8.4.3" - "@types/backbone": "npm:1.4.2" - "@types/blueimp-load-image": "npm:^5.16.2" - "@types/buffer-crc32": "npm:^0.2.0" - "@types/bunyan": "npm:^1.8.8" - "@types/bytebuffer": "npm:^5.0.41" - "@types/chai": "npm:4.2.18" - "@types/chai-as-promised": "npm:^7.1.2" - "@types/classnames": "npm:2.2.3" - "@types/config": "npm:0.0.34" - "@types/dompurify": "npm:^2.0.0" - "@types/electron-localshortcut": "npm:^3.1.0" - "@types/filesize": "npm:3.6.0" - "@types/firstline": "npm:^2.0.2" - "@types/fs-extra": "npm:5.0.5" - "@types/libsodium-wrappers-sumo": "npm:^0.7.5" - "@types/linkify-it": "npm:^3.0.2" - "@types/lodash": "npm:^4.14.194" - "@types/mocha": "npm:5.0.0" - "@types/node-fetch": "npm:^2.5.7" - "@types/react": "npm:^17.0.2" - "@types/react-dom": "npm:^17.0.2" - "@types/react-mentions": "npm:^4.1.8" - "@types/react-redux": "npm:^7.1.24" - "@types/react-virtualized": "npm:9.18.12" - "@types/redux-logger": "npm:3.0.7" - "@types/rimraf": "npm:2.0.2" - "@types/semver": "npm:5.5.0" - "@types/sinon": "npm:9.0.4" - "@types/styled-components": "npm:5.1.1" - "@types/uuid": "npm:8.3.4" - "@typescript-eslint/eslint-plugin": "npm:7.1.0" - "@typescript-eslint/parser": "npm:7.1.0" - abort-controller: "npm:3.0.0" - auto-bind: "npm:^4.0.0" - backbone: "npm:1.3.3" - blob-util: "npm:2.0.2" - blueimp-load-image: "npm:^5.16.0" - buffer-crc32: "npm:0.2.13" - bunyan: "https://github.com/Bilb/node-bunyan" - bytebuffer: "npm:^5.0.1" - chai: "npm:^4.3.4" - chai-as-promised: "npm:^7.1.1" - chai-bytes: "npm:^0.1.2" - classnames: "npm:2.2.5" - config: "npm:1.28.1" - cross-env: "npm:^6.0.3" - css-loader: "npm:^6.7.2" - curve25519-js: "https://github.com/oxen-io/curve25519-js" - date-fns: "npm:^3.3.1" - dmg-builder: "npm:23.6.0" - dompurify: "npm:^2.0.7" - electron: "npm:25.8.4" - electron-builder: "npm:23.0.8" - electron-localshortcut: "npm:^3.2.1" - electron-updater: "npm:^4.2.2" - emoji-mart: "npm:^5.5.2" - eslint: "npm:8.57.0" - eslint-config-airbnb-base: "npm:^15.0.0" - eslint-config-prettier: "npm:9.1.0" - eslint-import-resolver-typescript: "npm:3.6.1" - eslint-plugin-import: "npm:2.29.1" - eslint-plugin-mocha: "npm:^10.1.0" - eslint-plugin-more: "npm:^1.0.5" - eslint-plugin-react: "npm:7.33.2" - eslint-plugin-react-hooks: "npm:^4.6.0" - events: "npm:^3.3.0" - filesize: "npm:3.6.1" - firstline: "npm:1.2.1" - focus-trap-react: "npm:^10.2.3" - fs-extra: "npm:9.0.0" - glob: "npm:10.3.10" - husky: "npm:^8.0.0" - image-type: "npm:^4.1.0" - jsdom: "npm:^22.1.0" - jsdom-global: "npm:^3.0.2" - libsession_util_nodejs: "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.4.3/libsession_util_nodejs-v0.4.3.tar.gz" - libsodium-wrappers-sumo: "npm:^0.7.9" - linkify-it: "npm:^4.0.1" - lint-staged: "npm:^14.0.1" - lodash: "npm:^4.17.21" - long: "npm:^4.0.0" - maxmind: "npm:^4.3.18" - mic-recorder-to-mp3: "npm:^2.2.2" - mini-css-extract-plugin: "npm:^2.7.5" - mocha: "npm:10.0.0" - moment: "npm:^2.29.4" - node-fetch: "npm:^2.6.7" - node-loader: "npm:^2.0.0" - os-locale: "npm:5.0.0" - p-retry: "npm:^4.2.0" - patch-package: "npm:^6.4.7" - postinstall-prepare: "npm:^1.0.1" - prettier: "npm:3.2.5" - protobufjs: "npm:^7.2.4" - protobufjs-cli: "npm:^1.1.1" - rc-slider: "npm:^10.2.1" - react: "npm:^17.0.2" - react-contexify: "npm:^6.0.0" - react-dom: "npm:^17.0.2" - react-draggable: "npm:^4.4.4" - react-h5-audio-player: "npm:^3.2.0" - react-intersection-observer: "npm:^9.7.0" - react-mentions: "npm:^4.4.9" - react-qr-svg: "npm:^2.2.1" - react-redux: "npm:8.0.4" - react-toastify: "npm:^6.0.9" - react-use: "npm:^17.4.0" - react-virtualized: "npm:^9.22.4" - read-last-lines-ts: "npm:^1.2.1" - redux: "npm:4.2.0" - redux-logger: "npm:3.0.6" - redux-persist: "npm:^6.0.0" - redux-promise-middleware: "npm:^6.1.2" - rimraf: "npm:2.6.2" - run-script-os: "npm:^1.1.6" - sanitize.css: "npm:^12.0.1" - sass: "npm:^1.60.0" - sass-loader: "npm:^13.2.2" - semver: "npm:^7.5.4" - sinon: "npm:9.0.2" - styled-components: "npm:5.1.1" - ts-loader: "npm:^9.4.2" - typescript: "npm:^5.1.6" - uuid: "npm:8.3.2" - webpack: "npm:^5.76.3" - webpack-cli: "npm:^5.1.4" - webrtc-adapter: "npm:^4.1.1" - zod: "npm:^3.22.4" - languageName: unknown - linkType: soft - -"set-blocking@npm:^2.0.0": - version: 2.0.0 - resolution: "set-blocking@npm:2.0.0" - checksum: 10c0/9f8c1b2d800800d0b589de1477c753492de5c1548d4ade52f57f1d1f5e04af5481554d75ce5e5c43d4004b80a3eb714398d6907027dc0534177b7539119f4454 - languageName: node - linkType: hard - -"set-function-length@npm:^1.2.1": - version: 1.2.2 - resolution: "set-function-length@npm:1.2.2" - dependencies: - define-data-property: "npm:^1.1.4" - es-errors: "npm:^1.3.0" - function-bind: "npm:^1.1.2" - get-intrinsic: "npm:^1.2.4" - gopd: "npm:^1.0.1" - has-property-descriptors: "npm:^1.0.2" - checksum: 10c0/82850e62f412a258b71e123d4ed3873fa9377c216809551192bb6769329340176f109c2eeae8c22a8d386c76739855f78e8716515c818bcaef384b51110f0f3c - languageName: node - linkType: hard - -"set-function-name@npm:^2.0.1, set-function-name@npm:^2.0.2": - version: 2.0.2 - resolution: "set-function-name@npm:2.0.2" - dependencies: - define-data-property: "npm:^1.1.4" - es-errors: "npm:^1.3.0" - functions-have-names: "npm:^1.2.3" - has-property-descriptors: "npm:^1.0.2" - checksum: 10c0/fce59f90696c450a8523e754abb305e2b8c73586452619c2bad5f7bf38c7b6b4651895c9db895679c5bef9554339cf3ef1c329b66ece3eda7255785fbe299316 - languageName: node - linkType: hard - -"set-harmonic-interval@npm:^1.0.1": - version: 1.0.1 - resolution: "set-harmonic-interval@npm:1.0.1" - checksum: 10c0/49014d928a62c8418507bf66ffef7066783e8fb19f76e955318bbae5a8c4b56e1a7176b370f9040ef9de51531aa522a3f96fa5c47b1534635aa577ff7c12f9c6 - languageName: node - linkType: hard - -"shallow-clone@npm:^3.0.0": - version: 3.0.1 - resolution: "shallow-clone@npm:3.0.1" - dependencies: - kind-of: "npm:^6.0.2" - checksum: 10c0/7bab09613a1b9f480c85a9823aebec533015579fa055ba6634aa56ba1f984380670eaf33b8217502931872aa1401c9fcadaa15f9f604d631536df475b05bcf1e - languageName: node - linkType: hard - -"shallowequal@npm:^1.1.0": - version: 1.1.0 - resolution: "shallowequal@npm:1.1.0" - checksum: 10c0/b926efb51cd0f47aa9bc061add788a4a650550bbe50647962113a4579b60af2abe7b62f9b02314acc6f97151d4cf87033a2b15fc20852fae306d1a095215396c - languageName: node - linkType: hard - -"shebang-command@npm:^1.2.0": - version: 1.2.0 - resolution: "shebang-command@npm:1.2.0" - dependencies: - shebang-regex: "npm:^1.0.0" - checksum: 10c0/7b20dbf04112c456b7fc258622dafd566553184ac9b6938dd30b943b065b21dabd3776460df534cc02480db5e1b6aec44700d985153a3da46e7db7f9bd21326d - languageName: node - linkType: hard - -"shebang-command@npm:^2.0.0": - version: 2.0.0 - resolution: "shebang-command@npm:2.0.0" - dependencies: - shebang-regex: "npm:^3.0.0" - checksum: 10c0/a41692e7d89a553ef21d324a5cceb5f686d1f3c040759c50aab69688634688c5c327f26f3ecf7001ebfd78c01f3c7c0a11a7c8bfd0a8bc9f6240d4f40b224e4e - languageName: node - linkType: hard - -"shebang-regex@npm:^1.0.0": - version: 1.0.0 - resolution: "shebang-regex@npm:1.0.0" - checksum: 10c0/9abc45dee35f554ae9453098a13fdc2f1730e525a5eb33c51f096cc31f6f10a4b38074c1ebf354ae7bffa7229506083844008dfc3bb7818228568c0b2dc1fff2 - languageName: node - linkType: hard - -"shebang-regex@npm:^3.0.0": - version: 3.0.0 - resolution: "shebang-regex@npm:3.0.0" - checksum: 10c0/1dbed0726dd0e1152a92696c76c7f06084eb32a90f0528d11acd764043aacf76994b2fb30aa1291a21bd019d6699164d048286309a278855ee7bec06cf6fb690 - languageName: node - linkType: hard - -"side-channel@npm:^1.0.4, side-channel@npm:^1.0.6": - version: 1.0.6 - resolution: "side-channel@npm:1.0.6" - dependencies: - call-bind: "npm:^1.0.7" - es-errors: "npm:^1.3.0" - get-intrinsic: "npm:^1.2.4" - object-inspect: "npm:^1.13.1" - checksum: 10c0/d2afd163dc733cc0a39aa6f7e39bf0c436293510dbccbff446733daeaf295857dbccf94297092ec8c53e2503acac30f0b78830876f0485991d62a90e9cad305f - languageName: node - linkType: hard - -"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": - version: 3.0.7 - resolution: "signal-exit@npm:3.0.7" - checksum: 10c0/25d272fa73e146048565e08f3309d5b942c1979a6f4a58a8c59d5fa299728e9c2fcd1a759ec870863b1fd38653670240cd420dad2ad9330c71f36608a6a1c912 - languageName: node - linkType: hard - -"signal-exit@npm:^4.0.1": - version: 4.1.0 - resolution: "signal-exit@npm:4.1.0" - checksum: 10c0/41602dce540e46d599edba9d9860193398d135f7ff72cab629db5171516cfae628d21e7bfccde1bbfdf11c48726bc2a6d1a8fb8701125852fbfda7cf19c6aa83 - languageName: node - linkType: hard - -"sinon@npm:9.0.2": - version: 9.0.2 - resolution: "sinon@npm:9.0.2" - dependencies: - "@sinonjs/commons": "npm:^1.7.2" - "@sinonjs/fake-timers": "npm:^6.0.1" - "@sinonjs/formatio": "npm:^5.0.1" - "@sinonjs/samsam": "npm:^5.0.3" - diff: "npm:^4.0.2" - nise: "npm:^4.0.1" - supports-color: "npm:^7.1.0" - checksum: 10c0/2f683f0833e824f651bf71f9f31047747eb2a20800c904b9f9c74e37cab59d7ad2e0dee12f20db9eff821cda0e18c413834efbd68fdc99ade28f1b104469023d - languageName: node - linkType: hard - -"slash@npm:^2.0.0": - version: 2.0.0 - resolution: "slash@npm:2.0.0" - checksum: 10c0/f83dbd3cb62c41bb8fcbbc6bf5473f3234b97fa1d008f571710a9d3757a28c7169e1811cad1554ccb1cc531460b3d221c9a7b37f549398d9a30707f0a5af9193 - languageName: node - linkType: hard - -"slash@npm:^3.0.0": - version: 3.0.0 - resolution: "slash@npm:3.0.0" - checksum: 10c0/e18488c6a42bdfd4ac5be85b2ced3ccd0224773baae6ad42cfbb9ec74fc07f9fa8396bd35ee638084ead7a2a0818eb5e7151111544d4731ce843019dab4be47b - languageName: node - linkType: hard - -"slice-ansi@npm:^3.0.0": - version: 3.0.0 - resolution: "slice-ansi@npm:3.0.0" - dependencies: - ansi-styles: "npm:^4.0.0" - astral-regex: "npm:^2.0.0" - is-fullwidth-code-point: "npm:^3.0.0" - checksum: 10c0/88083c9d0ca67d09f8b4c78f68833d69cabbb7236b74df5d741ad572bbf022deaf243fa54009cd434350622a1174ab267710fcc80a214ecc7689797fe00cb27c - languageName: node - linkType: hard - -"slice-ansi@npm:^5.0.0": - version: 5.0.0 - resolution: "slice-ansi@npm:5.0.0" - dependencies: - ansi-styles: "npm:^6.0.0" - is-fullwidth-code-point: "npm:^4.0.0" - checksum: 10c0/2d4d40b2a9d5cf4e8caae3f698fe24ae31a4d778701724f578e984dcb485ec8c49f0c04dab59c401821e80fcdfe89cace9c66693b0244e40ec485d72e543914f - languageName: node - linkType: hard - -"smart-buffer@npm:^4.0.2, smart-buffer@npm:^4.2.0": - version: 4.2.0 - resolution: "smart-buffer@npm:4.2.0" - checksum: 10c0/a16775323e1404dd43fabafe7460be13a471e021637bc7889468eb45ce6a6b207261f454e4e530a19500cc962c4cc5348583520843b363f4193cee5c00e1e539 - languageName: node - linkType: hard - -"socks-proxy-agent@npm:^8.0.3": - version: 8.0.3 - resolution: "socks-proxy-agent@npm:8.0.3" - dependencies: - agent-base: "npm:^7.1.1" - debug: "npm:^4.3.4" - socks: "npm:^2.7.1" - checksum: 10c0/4950529affd8ccd6951575e21c1b7be8531b24d924aa4df3ee32df506af34b618c4e50d261f4cc603f1bfd8d426915b7d629966c8ce45b05fb5ad8c8b9a6459d - languageName: node - linkType: hard - -"socks@npm:^2.7.1": - version: 2.8.3 - resolution: "socks@npm:2.8.3" - dependencies: - ip-address: "npm:^9.0.5" - smart-buffer: "npm:^4.2.0" - checksum: 10c0/d54a52bf9325165770b674a67241143a3d8b4e4c8884560c4e0e078aace2a728dffc7f70150660f51b85797c4e1a3b82f9b7aa25e0a0ceae1a243365da5c51a7 - languageName: node - linkType: hard - -"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.2.0": - version: 1.2.0 - resolution: "source-map-js@npm:1.2.0" - checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4 - languageName: node - linkType: hard - -"source-map-support@npm:^0.5.19, source-map-support@npm:~0.5.20": - version: 0.5.21 - resolution: "source-map-support@npm:0.5.21" - dependencies: - buffer-from: "npm:^1.0.0" - source-map: "npm:^0.6.0" - checksum: 10c0/9ee09942f415e0f721d6daad3917ec1516af746a8120bba7bb56278707a37f1eb8642bde456e98454b8a885023af81a16e646869975f06afc1a711fb90484e7d - languageName: node - linkType: hard - -"source-map@npm:0.5.6": - version: 0.5.6 - resolution: "source-map@npm:0.5.6" - checksum: 10c0/beb2c5974bb58954d75e86249953d47ae16f7df1a8531abb9fcae0cd262d9fa09c2db3a134e20e99358b1adba42b6b054a32c8e16b571b3efcf6af644c329f0d - languageName: node - linkType: hard - -"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.1": - version: 0.6.1 - resolution: "source-map@npm:0.6.1" - checksum: 10c0/ab55398007c5e5532957cb0beee2368529618ac0ab372d789806f5718123cc4367d57de3904b4e6a4170eb5a0b0f41373066d02ca0735a0c4d75c7d328d3e011 - languageName: node - linkType: hard - -"source-map@npm:^0.7.4": - version: 0.7.4 - resolution: "source-map@npm:0.7.4" - checksum: 10c0/dc0cf3768fe23c345ea8760487f8c97ef6fca8a73c83cd7c9bf2fde8bc2c34adb9c0824d6feb14bc4f9e37fb522e18af621543f1289038a66ac7586da29aa7dc - languageName: node - linkType: hard - -"spdx-correct@npm:^3.0.0": - version: 3.2.0 - resolution: "spdx-correct@npm:3.2.0" - dependencies: - spdx-expression-parse: "npm:^3.0.0" - spdx-license-ids: "npm:^3.0.0" - checksum: 10c0/49208f008618b9119208b0dadc9208a3a55053f4fd6a0ae8116861bd22696fc50f4142a35ebfdb389e05ccf2de8ad142573fefc9e26f670522d899f7b2fe7386 - languageName: node - linkType: hard - -"spdx-exceptions@npm:^2.1.0": - version: 2.5.0 - resolution: "spdx-exceptions@npm:2.5.0" - checksum: 10c0/37217b7762ee0ea0d8b7d0c29fd48b7e4dfb94096b109d6255b589c561f57da93bf4e328c0290046115961b9209a8051ad9f525e48d433082fc79f496a4ea940 - languageName: node - linkType: hard - -"spdx-expression-parse@npm:^3.0.0": - version: 3.0.1 - resolution: "spdx-expression-parse@npm:3.0.1" - dependencies: - spdx-exceptions: "npm:^2.1.0" - spdx-license-ids: "npm:^3.0.0" - checksum: 10c0/6f8a41c87759fa184a58713b86c6a8b028250f158159f1d03ed9d1b6ee4d9eefdc74181c8ddc581a341aa971c3e7b79e30b59c23b05d2436d5de1c30bdef7171 - languageName: node - linkType: hard - -"spdx-license-ids@npm:^3.0.0": - version: 3.0.18 - resolution: "spdx-license-ids@npm:3.0.18" - checksum: 10c0/c64ba03d4727191c8fdbd001f137d6ab51386c350d5516be8a4576c2e74044cb27bc8a758f6a04809da986cc0b14213f069b04de72caccecbc9f733753ccde32 - languageName: node - linkType: hard - -"split2@npm:^3.0.0, split2@npm:^3.2.2": - version: 3.2.2 - resolution: "split2@npm:3.2.2" - dependencies: - readable-stream: "npm:^3.0.0" - checksum: 10c0/2dad5603c52b353939befa3e2f108f6e3aff42b204ad0f5f16dd12fd7c2beab48d117184ce6f7c8854f9ee5ffec6faae70d243711dd7d143a9f635b4a285de4e - languageName: node - linkType: hard - -"sprintf-js@npm:^1.1.2, sprintf-js@npm:^1.1.3": - version: 1.1.3 - resolution: "sprintf-js@npm:1.1.3" - checksum: 10c0/09270dc4f30d479e666aee820eacd9e464215cdff53848b443964202bf4051490538e5dd1b42e1a65cf7296916ca17640aebf63dae9812749c7542ee5f288dec - languageName: node - linkType: hard - -"ssri@npm:^10.0.0": - version: 10.0.6 - resolution: "ssri@npm:10.0.6" - dependencies: - minipass: "npm:^7.0.3" - checksum: 10c0/e5a1e23a4057a86a97971465418f22ea89bd439ac36ade88812dd920e4e61873e8abd6a9b72a03a67ef50faa00a2daf1ab745c5a15b46d03e0544a0296354227 - languageName: node - linkType: hard - -"stack-generator@npm:^2.0.5": - version: 2.0.10 - resolution: "stack-generator@npm:2.0.10" - dependencies: - stackframe: "npm:^1.3.4" - checksum: 10c0/c3f6f6c580488e65c0fee806a57f6ae4b79e6435f144be471c1f20328a8d9d8492d4f3beed31840f6dae03e2633325e2764fd3aca5c3126a0639e7c9ddfa45ce - languageName: node - linkType: hard - -"stackframe@npm:^1.3.4": - version: 1.3.4 - resolution: "stackframe@npm:1.3.4" - checksum: 10c0/18410f7a1e0c5d211a4effa83bdbf24adbe8faa8c34db52e1cd3e89837518c592be60b60d8b7270ac53eeeb8b807cd11b399a41667f6c9abb41059c3ccc8a989 - languageName: node - linkType: hard - -"stacktrace-gps@npm:^3.0.4": - version: 3.1.2 - resolution: "stacktrace-gps@npm:3.1.2" - dependencies: - source-map: "npm:0.5.6" - stackframe: "npm:^1.3.4" - checksum: 10c0/0dcc1aa46e364a2b4d1eabce4777fecf337576a11ee3cfc92f07b9ec79ccb76810752431eeb9771289d250d0bb58dbe19a178b96bf7b2e9f773334d03aa96bb9 - languageName: node - linkType: hard - -"stacktrace-js@npm:^2.0.2": - version: 2.0.2 - resolution: "stacktrace-js@npm:2.0.2" - dependencies: - error-stack-parser: "npm:^2.0.6" - stack-generator: "npm:^2.0.5" - stacktrace-gps: "npm:^3.0.4" - checksum: 10c0/9a10c222524ca03690bcb27437b39039885223e39320367f2be36e6f750c2d198ae99189869a22c255bf60072631eb609d47e8e33661e95133686904e01121ec - languageName: node - linkType: hard - -"stat-mode@npm:^1.0.0": - version: 1.0.0 - resolution: "stat-mode@npm:1.0.0" - checksum: 10c0/89b66a538dbfd45038fefdaf5b2104dc6e911605af1c201793e9629592ed9fdc7bdd1bca42806d0d4167c6d9cacac1f3fda41ddfe334a5c1f898113da38fae74 - languageName: node - linkType: hard - -"string-argv@npm:0.3.2": - version: 0.3.2 - resolution: "string-argv@npm:0.3.2" - checksum: 10c0/75c02a83759ad1722e040b86823909d9a2fc75d15dd71ec4b537c3560746e33b5f5a07f7332d1e3f88319909f82190843aa2f0a0d8c8d591ec08e93d5b8dec82 - languageName: node - linkType: hard - -"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.0.0, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": - version: 4.2.3 - resolution: "string-width@npm:4.2.3" - dependencies: - emoji-regex: "npm:^8.0.0" - is-fullwidth-code-point: "npm:^3.0.0" - strip-ansi: "npm:^6.0.1" - checksum: 10c0/1e525e92e5eae0afd7454086eed9c818ee84374bb80328fc41217ae72ff5f065ef1c9d7f72da41de40c75fa8bb3dee63d92373fd492c84260a552c636392a47b - languageName: node - linkType: hard - -"string-width@npm:^5.0.0, string-width@npm:^5.0.1, string-width@npm:^5.1.2": - version: 5.1.2 - resolution: "string-width@npm:5.1.2" - dependencies: - eastasianwidth: "npm:^0.2.0" - emoji-regex: "npm:^9.2.2" - strip-ansi: "npm:^7.0.1" - checksum: 10c0/ab9c4264443d35b8b923cbdd513a089a60de339216d3b0ed3be3ba57d6880e1a192b70ae17225f764d7adbf5994e9bb8df253a944736c15a0240eff553c678ca - languageName: node - linkType: hard - -"string.prototype.matchall@npm:^4.0.8": - version: 4.0.11 - resolution: "string.prototype.matchall@npm:4.0.11" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.2" - es-errors: "npm:^1.3.0" - es-object-atoms: "npm:^1.0.0" - get-intrinsic: "npm:^1.2.4" - gopd: "npm:^1.0.1" - has-symbols: "npm:^1.0.3" - internal-slot: "npm:^1.0.7" - regexp.prototype.flags: "npm:^1.5.2" - set-function-name: "npm:^2.0.2" - side-channel: "npm:^1.0.6" - checksum: 10c0/915a2562ac9ab5e01b7be6fd8baa0b2b233a0a9aa975fcb2ec13cc26f08fb9a3e85d5abdaa533c99c6fc4c5b65b914eba3d80c4aff9792a4c9fed403f28f7d9d - languageName: node - linkType: hard - -"string.prototype.trim@npm:^1.2.9": - version: 1.2.9 - resolution: "string.prototype.trim@npm:1.2.9" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.23.0" - es-object-atoms: "npm:^1.0.0" - checksum: 10c0/dcef1a0fb61d255778155006b372dff8cc6c4394bc39869117e4241f41a2c52899c0d263ffc7738a1f9e61488c490b05c0427faa15151efad721e1a9fb2663c2 - languageName: node - linkType: hard - -"string.prototype.trimend@npm:^1.0.8": - version: 1.0.8 - resolution: "string.prototype.trimend@npm:1.0.8" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-object-atoms: "npm:^1.0.0" - checksum: 10c0/0a0b54c17c070551b38e756ae271865ac6cc5f60dabf2e7e343cceae7d9b02e1a1120a824e090e79da1b041a74464e8477e2da43e2775c85392be30a6f60963c - languageName: node - linkType: hard - -"string.prototype.trimstart@npm:^1.0.8": - version: 1.0.8 - resolution: "string.prototype.trimstart@npm:1.0.8" - dependencies: - call-bind: "npm:^1.0.7" - define-properties: "npm:^1.2.1" - es-object-atoms: "npm:^1.0.0" - checksum: 10c0/d53af1899959e53c83b64a5fd120be93e067da740e7e75acb433849aa640782fb6c7d4cd5b84c954c84413745a3764df135a8afeb22908b86a835290788d8366 - languageName: node - linkType: hard - -"string_decoder@npm:^1.1.1": - version: 1.3.0 - resolution: "string_decoder@npm:1.3.0" - dependencies: - safe-buffer: "npm:~5.2.0" - checksum: 10c0/810614ddb030e271cd591935dcd5956b2410dd079d64ff92a1844d6b7588bf992b3e1b69b0f4d34a3e06e0bd73046ac646b5264c1987b20d0601f81ef35d731d - languageName: node - linkType: hard - -"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": - version: 6.0.1 - resolution: "strip-ansi@npm:6.0.1" - dependencies: - ansi-regex: "npm:^5.0.1" - checksum: 10c0/1ae5f212a126fe5b167707f716942490e3933085a5ff6c008ab97ab2f272c8025d3aa218b7bd6ab25729ca20cc81cddb252102f8751e13482a5199e873680952 - languageName: node - linkType: hard - -"strip-ansi@npm:^7.0.1": - version: 7.1.0 - resolution: "strip-ansi@npm:7.1.0" - dependencies: - ansi-regex: "npm:^6.0.1" - checksum: 10c0/a198c3762e8832505328cbf9e8c8381de14a4fa50a4f9b2160138158ea88c0f5549fb50cb13c651c3088f47e63a108b34622ec18c0499b6c8c3a5ddf6b305ac4 - languageName: node - linkType: hard - -"strip-bom@npm:^3.0.0": - version: 3.0.0 - resolution: "strip-bom@npm:3.0.0" - checksum: 10c0/51201f50e021ef16672593d7434ca239441b7b760e905d9f33df6e4f3954ff54ec0e0a06f100d028af0982d6f25c35cd5cda2ce34eaebccd0250b8befb90d8f1 - languageName: node - linkType: hard - -"strip-final-newline@npm:^2.0.0": - version: 2.0.0 - resolution: "strip-final-newline@npm:2.0.0" - checksum: 10c0/bddf8ccd47acd85c0e09ad7375409d81653f645fda13227a9d459642277c253d877b68f2e5e4d819fe75733b0e626bac7e954c04f3236f6d196f79c94fa4a96f - languageName: node - linkType: hard - -"strip-final-newline@npm:^3.0.0": - version: 3.0.0 - resolution: "strip-final-newline@npm:3.0.0" - checksum: 10c0/a771a17901427bac6293fd416db7577e2bc1c34a19d38351e9d5478c3c415f523f391003b42ed475f27e33a78233035df183525395f731d3bfb8cdcbd4da08ce - languageName: node - linkType: hard - -"strip-indent@npm:^3.0.0": - version: 3.0.0 - resolution: "strip-indent@npm:3.0.0" - dependencies: - min-indent: "npm:^1.0.0" - checksum: 10c0/ae0deaf41c8d1001c5d4fbe16cb553865c1863da4fae036683b474fa926af9fc121e155cb3fc57a68262b2ae7d5b8420aa752c97a6428c315d00efe2a3875679 - languageName: node - linkType: hard - -"strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": - version: 3.1.1 - resolution: "strip-json-comments@npm:3.1.1" - checksum: 10c0/9681a6257b925a7fa0f285851c0e613cc934a50661fa7bb41ca9cbbff89686bb4a0ee366e6ecedc4daafd01e83eee0720111ab294366fe7c185e935475ebcecd - languageName: node - linkType: hard - -"strip-json-comments@npm:~2.0.1": - version: 2.0.1 - resolution: "strip-json-comments@npm:2.0.1" - checksum: 10c0/b509231cbdee45064ff4f9fd73609e2bcc4e84a4d508e9dd0f31f70356473fde18abfb5838c17d56fb236f5a06b102ef115438de0600b749e818a35fbbc48c43 - languageName: node - linkType: hard - -"styled-components@npm:5.1.1": - version: 5.1.1 - resolution: "styled-components@npm:5.1.1" - dependencies: - "@babel/helper-module-imports": "npm:^7.0.0" - "@babel/traverse": "npm:^7.4.5" - "@emotion/is-prop-valid": "npm:^0.8.8" - "@emotion/stylis": "npm:^0.8.4" - "@emotion/unitless": "npm:^0.7.4" - babel-plugin-styled-components: "npm:>= 1" - css-to-react-native: "npm:^3.0.0" - hoist-non-react-statics: "npm:^3.0.0" - shallowequal: "npm:^1.1.0" - supports-color: "npm:^5.5.0" - peerDependencies: - react: ">= 16.8.0" - react-dom: ">= 16.8.0" - react-is: ">= 16.8.0" - checksum: 10c0/3293a50bf6891d5c68068712694b2dc3f02f759e87dc134822741cd983a7dd9782da0a65386dfd68111f6380049d8bc2ab85cb6395a343ebf5ee166646f4e9c5 - languageName: node - linkType: hard - -"stylis@npm:^4.3.0": - version: 4.3.2 - resolution: "stylis@npm:4.3.2" - checksum: 10c0/0410e1404cbeee3388a9e17587875211ce2f014c8379af0d1e24ca55878867c9f1ccc7b0ce9a156ca53f5d6e301391a82b0645522a604674a378b3189a4a1994 - languageName: node - linkType: hard - -"substyle@npm:^9.1.0": - version: 9.4.1 - resolution: "substyle@npm:9.4.1" - dependencies: - "@babel/runtime": "npm:^7.3.4" - invariant: "npm:^2.2.4" - peerDependencies: - react: ">=16.8.3" - checksum: 10c0/145c7c7e3642c3c2edca5b095725063a492d5657eeb12daa8160e4fa964ef926abd9ea1dd3bbf5a5e9edf6a70c89f0f4afa72aacd4b47e2c0970a8f344f75f85 - languageName: node - linkType: hard - -"sumchecker@npm:^3.0.1": - version: 3.0.1 - resolution: "sumchecker@npm:3.0.1" - dependencies: - debug: "npm:^4.1.0" - checksum: 10c0/43c387be9dfe22dbeaf39dfa4ffb279847aeb37a42a8988c0b066f548bbd209aa8c65e03da29f2b29be1a66b577801bf89fff0007df4183db2f286263a9569e5 - languageName: node - linkType: hard - -"supports-color@npm:8.1.1, supports-color@npm:^8.0.0": - version: 8.1.1 - resolution: "supports-color@npm:8.1.1" - dependencies: - has-flag: "npm:^4.0.0" - checksum: 10c0/ea1d3c275dd604c974670f63943ed9bd83623edc102430c05adb8efc56ba492746b6e95386e7831b872ec3807fd89dd8eb43f735195f37b5ec343e4234cc7e89 - languageName: node - linkType: hard - -"supports-color@npm:^5.3.0, supports-color@npm:^5.5.0": - version: 5.5.0 - resolution: "supports-color@npm:5.5.0" - dependencies: - has-flag: "npm:^3.0.0" - checksum: 10c0/6ae5ff319bfbb021f8a86da8ea1f8db52fac8bd4d499492e30ec17095b58af11f0c55f8577390a749b1c4dde691b6a0315dab78f5f54c9b3d83f8fb5905c1c05 - languageName: node - linkType: hard - -"supports-color@npm:^7.1.0": - version: 7.2.0 - resolution: "supports-color@npm:7.2.0" - dependencies: - has-flag: "npm:^4.0.0" - checksum: 10c0/afb4c88521b8b136b5f5f95160c98dee7243dc79d5432db7efc27efb219385bbc7d9427398e43dd6cc730a0f87d5085ce1652af7efbe391327bc0a7d0f7fc124 - languageName: node - linkType: hard - -"supports-preserve-symlinks-flag@npm:^1.0.0": - version: 1.0.0 - resolution: "supports-preserve-symlinks-flag@npm:1.0.0" - checksum: 10c0/6c4032340701a9950865f7ae8ef38578d8d7053f5e10518076e6554a9381fa91bd9c6850193695c141f32b21f979c985db07265a758867bac95de05f7d8aeb39 - languageName: node - linkType: hard - -"symbol-observable@npm:^1.0.3": - version: 1.2.0 - resolution: "symbol-observable@npm:1.2.0" - checksum: 10c0/009fee50798ef80ed4b8195048288f108b03de162db07493f2e1fd993b33fafa72d659e832b584da5a2427daa78e5a738fb2a9ab027ee9454252e0bedbcd1fdc - languageName: node - linkType: hard - -"symbol-tree@npm:^3.2.4": - version: 3.2.4 - resolution: "symbol-tree@npm:3.2.4" - checksum: 10c0/dfbe201ae09ac6053d163578778c53aa860a784147ecf95705de0cd23f42c851e1be7889241495e95c37cabb058edb1052f141387bef68f705afc8f9dd358509 - languageName: node - linkType: hard - -"tabbable@npm:^6.2.0": - version: 6.2.0 - resolution: "tabbable@npm:6.2.0" - checksum: 10c0/ced8b38f05f2de62cd46836d77c2646c42b8c9713f5bd265daf0e78ff5ac73d3ba48a7ca45f348bafeef29b23da7187c72250742d37627883ef89cbd7fa76898 - languageName: node - linkType: hard - -"tapable@npm:^2.1.1, tapable@npm:^2.2.0, tapable@npm:^2.2.1": - version: 2.2.1 - resolution: "tapable@npm:2.2.1" - checksum: 10c0/bc40e6efe1e554d075469cedaba69a30eeb373552aaf41caeaaa45bf56ffacc2674261b106245bd566b35d8f3329b52d838e851ee0a852120acae26e622925c9 - languageName: node - linkType: hard - -"tar@npm:^6.1.0, tar@npm:^6.1.11, tar@npm:^6.1.2": - version: 6.2.1 - resolution: "tar@npm:6.2.1" - dependencies: - chownr: "npm:^2.0.0" - fs-minipass: "npm:^2.0.0" - minipass: "npm:^5.0.0" - minizlib: "npm:^2.1.1" - mkdirp: "npm:^1.0.3" - yallist: "npm:^4.0.0" - checksum: 10c0/a5eca3eb50bc11552d453488344e6507156b9193efd7635e98e867fab275d527af53d8866e2370cd09dfe74378a18111622ace35af6a608e5223a7d27fe99537 - languageName: node - linkType: hard - -"temp-file@npm:^3.4.0": - version: 3.4.0 - resolution: "temp-file@npm:3.4.0" - dependencies: - async-exit-hook: "npm:^2.0.1" - fs-extra: "npm:^10.0.0" - checksum: 10c0/70e441909097346a930ae02278df9b0133cd02dddf0b49e5ddaade735fef1410a50a448a2a812106f97c045294c99cc19f26943eb88f1d728d41fbc445a40298 - languageName: node - linkType: hard - -"terser-webpack-plugin@npm:^5.3.10": - version: 5.3.10 - resolution: "terser-webpack-plugin@npm:5.3.10" - dependencies: - "@jridgewell/trace-mapping": "npm:^0.3.20" - jest-worker: "npm:^27.4.5" - schema-utils: "npm:^3.1.1" - serialize-javascript: "npm:^6.0.1" - terser: "npm:^5.26.0" - peerDependencies: - webpack: ^5.1.0 - peerDependenciesMeta: - "@swc/core": - optional: true - esbuild: - optional: true - uglify-js: - optional: true - checksum: 10c0/66d1ed3174542560911cf96f4716aeea8d60e7caab212291705d50072b6ba844c7391442541b13c848684044042bea9ec87512b8506528c12854943da05faf91 - languageName: node - linkType: hard - -"terser@npm:^5.14.2": - version: 5.31.0 - resolution: "terser@npm:5.31.0" - dependencies: - "@jridgewell/source-map": "npm:^0.3.3" - acorn: "npm:^8.8.2" - commander: "npm:^2.20.0" - source-map-support: "npm:~0.5.20" - bin: - terser: bin/terser - checksum: 10c0/cb127a579b03fb9dcee0d293ff24814deedcd430f447933b618e8593b7454f615b5c8493c68e86a4b0188769d5ea2af5251b5d507edb208114f7e8aebdc7c850 - languageName: node - linkType: hard - -"text-extensions@npm:^1.0.0": - version: 1.9.0 - resolution: "text-extensions@npm:1.9.0" - checksum: 10c0/9ad5a9f723a871e2d884e132d7e93f281c60b5759c95f3f6b04704856548715d93a36c10dbaf5f12b91bf405f0cf3893bf169d4d143c0f5509563b992d385443 - languageName: node - linkType: hard - -"text-table@npm:^0.2.0": - version: 0.2.0 - resolution: "text-table@npm:0.2.0" - checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c - languageName: node - linkType: hard - -"throttle-debounce@npm:^3.0.1": - version: 3.0.1 - resolution: "throttle-debounce@npm:3.0.1" - checksum: 10c0/c8e558479463b7ed8bac30d6b10cc87abd1c9fc64edfce2db4109be1a04acaef5d2d0557f49c1a3845ea07d9f79e6e0389b1b60db0a77c44e5b7a1216596f285 - languageName: node - linkType: hard - -"through2@npm:^4.0.0": - version: 4.0.2 - resolution: "through2@npm:4.0.2" - dependencies: - readable-stream: "npm:3" - checksum: 10c0/3741564ae99990a4a79097fe7a4152c22348adc4faf2df9199a07a66c81ed2011da39f631e479fdc56483996a9d34a037ad64e76d79f18c782ab178ea9b6778c - languageName: node - linkType: hard - -"through@npm:>=2.2.7 <3": - version: 2.3.8 - resolution: "through@npm:2.3.8" - checksum: 10c0/4b09f3774099de0d4df26d95c5821a62faee32c7e96fb1f4ebd54a2d7c11c57fe88b0a0d49cf375de5fee5ae6bf4eb56dbbf29d07366864e2ee805349970d3cc - languageName: node - linkType: hard - -"tiny-lru@npm:11.2.6": - version: 11.2.6 - resolution: "tiny-lru@npm:11.2.6" - checksum: 10c0/d59b2047edae1b4b79708070463ed27ddb1daa64563b74eedaa571e555c47f8de3a7cc19171f47dc46c01f1b7283d9afd2c682dddb4832552ed747d52cd297a6 - languageName: node - linkType: hard - -"tmp-promise@npm:^3.0.2": - version: 3.0.3 - resolution: "tmp-promise@npm:3.0.3" - dependencies: - tmp: "npm:^0.2.0" - checksum: 10c0/23b47dcb2e82b14bbd8f61ed7a9d9353cdb6a6f09d7716616cfd27d0087040cd40152965a518e598d7aabe1489b9569bf1eebde0c5fadeaf3ec8098adcebea4e - languageName: node - linkType: hard - -"tmp@npm:^0.0.33": - version: 0.0.33 - resolution: "tmp@npm:0.0.33" - dependencies: - os-tmpdir: "npm:~1.0.2" - checksum: 10c0/69863947b8c29cabad43fe0ce65cec5bb4b481d15d4b4b21e036b060b3edbf3bc7a5541de1bacb437bb3f7c4538f669752627fdf9b4aaf034cebd172ba373408 - languageName: node - linkType: hard - -"tmp@npm:^0.2.0, tmp@npm:^0.2.1": - version: 0.2.3 - resolution: "tmp@npm:0.2.3" - checksum: 10c0/3e809d9c2f46817475b452725c2aaa5d11985cf18d32a7a970ff25b568438e2c076c2e8609224feef3b7923fa9749b74428e3e634f6b8e520c534eef2fd24125 - languageName: node - linkType: hard - -"to-fast-properties@npm:^2.0.0": - version: 2.0.0 - resolution: "to-fast-properties@npm:2.0.0" - checksum: 10c0/b214d21dbfb4bce3452b6244b336806ffea9c05297148d32ebb428d5c43ce7545bdfc65a1ceb58c9ef4376a65c0cb2854d645f33961658b3e3b4f84910ddcdd7 - languageName: node - linkType: hard - -"to-regex-range@npm:^5.0.1": - version: 5.0.1 - resolution: "to-regex-range@npm:5.0.1" - dependencies: - is-number: "npm:^7.0.0" - checksum: 10c0/487988b0a19c654ff3e1961b87f471702e708fa8a8dd02a298ef16da7206692e8552a0250e8b3e8759270f62e9d8314616f6da274734d3b558b1fc7b7724e892 - languageName: node - linkType: hard - -"toggle-selection@npm:^1.0.6": - version: 1.0.6 - resolution: "toggle-selection@npm:1.0.6" - checksum: 10c0/f2cf1f2c70f374fd87b0cdc8007453ba9e981c4305a8bf4eac10a30e62ecdfd28bca7d18f8f15b15a506bf8a7bfb20dbe3539f0fcf2a2c8396c1a78d53e1f179 - languageName: node - linkType: hard - -"tough-cookie@npm:^4.1.2": - version: 4.1.4 - resolution: "tough-cookie@npm:4.1.4" - dependencies: - psl: "npm:^1.1.33" - punycode: "npm:^2.1.1" - universalify: "npm:^0.2.0" - url-parse: "npm:^1.5.3" - checksum: 10c0/aca7ff96054f367d53d1e813e62ceb7dd2eda25d7752058a74d64b7266fd07be75908f3753a32ccf866a2f997604b414cfb1916d6e7f69bc64d9d9939b0d6c45 - languageName: node - linkType: hard - -"tr46@npm:^4.1.1": - version: 4.1.1 - resolution: "tr46@npm:4.1.1" - dependencies: - punycode: "npm:^2.3.0" - checksum: 10c0/92085dcf186f56a49ba4124a581d9ae6a5d0cd4878107c34e2e670b9ddc49da85e4950084bb3e75015195cc23f37ae1c02d45064e94dd6018f5e789aa51d93a8 - languageName: node - linkType: hard - -"tr46@npm:~0.0.3": - version: 0.0.3 - resolution: "tr46@npm:0.0.3" - checksum: 10c0/047cb209a6b60c742f05c9d3ace8fa510bff609995c129a37ace03476a9b12db4dbf975e74600830ef0796e18882b2381fb5fb1f6b4f96b832c374de3ab91a11 - languageName: node - linkType: hard - -"trim-newlines@npm:^3.0.0": - version: 3.0.1 - resolution: "trim-newlines@npm:3.0.1" - checksum: 10c0/03cfefde6c59ff57138412b8c6be922ecc5aec30694d784f2a65ef8dcbd47faef580b7de0c949345abdc56ec4b4abf64dd1e5aea619b200316e471a3dd5bf1f6 - languageName: node - linkType: hard - -"truncate-utf8-bytes@npm:^1.0.0": - version: 1.0.2 - resolution: "truncate-utf8-bytes@npm:1.0.2" - dependencies: - utf8-byte-length: "npm:^1.0.1" - checksum: 10c0/af2b431fc4314f119b551e5fccfad49d4c0ef82e13ba9ca61be6567801195b08e732ce9643542e8ad1b3df44f3df2d7345b3dd34f723954b6bb43a14584d6b3c - languageName: node - linkType: hard - -"ts-api-utils@npm:^1.0.1": - version: 1.3.0 - resolution: "ts-api-utils@npm:1.3.0" - peerDependencies: - typescript: ">=4.2.0" - checksum: 10c0/f54a0ba9ed56ce66baea90a3fa087a484002e807f28a8ccb2d070c75e76bde64bd0f6dce98b3802834156306050871b67eec325cb4e918015a360a3f0868c77c - languageName: node - linkType: hard - -"ts-easing@npm:^0.2.0": - version: 0.2.0 - resolution: "ts-easing@npm:0.2.0" - checksum: 10c0/84ec20192310c697ff890ca2e0625e131a32596a7c5956326c9632faca9037abf2dd3de4d81ac358ae9f26a6a2cfe2300f13756b26995f753d882e3d0463e327 - languageName: node - linkType: hard - -"ts-loader@npm:^9.4.2": - version: 9.5.1 - resolution: "ts-loader@npm:9.5.1" - dependencies: - chalk: "npm:^4.1.0" - enhanced-resolve: "npm:^5.0.0" - micromatch: "npm:^4.0.0" - semver: "npm:^7.3.4" - source-map: "npm:^0.7.4" - peerDependencies: - typescript: "*" - webpack: ^5.0.0 - checksum: 10c0/7dc1e3e5d3d032b6ef27836032f02c57077dfbcdf5817cbbc16b7b8609e7ed1d0ec157a03eaac07960161d8ad4a9e030c4d6722fe33540cf6ee75156c7f9c33d - languageName: node - linkType: hard - -"ts-node@npm:^10.8.1": - version: 10.9.2 - resolution: "ts-node@npm:10.9.2" - dependencies: - "@cspotcode/source-map-support": "npm:^0.8.0" - "@tsconfig/node10": "npm:^1.0.7" - "@tsconfig/node12": "npm:^1.0.7" - "@tsconfig/node14": "npm:^1.0.0" - "@tsconfig/node16": "npm:^1.0.2" - acorn: "npm:^8.4.1" - acorn-walk: "npm:^8.1.1" - arg: "npm:^4.1.0" - create-require: "npm:^1.1.0" - diff: "npm:^4.0.1" - make-error: "npm:^1.1.1" - v8-compile-cache-lib: "npm:^3.0.1" - yn: "npm:3.1.1" - peerDependencies: - "@swc/core": ">=1.2.50" - "@swc/wasm": ">=1.2.50" - "@types/node": "*" - typescript: ">=2.7" - peerDependenciesMeta: - "@swc/core": - optional: true - "@swc/wasm": - optional: true - bin: - ts-node: dist/bin.js - ts-node-cwd: dist/bin-cwd.js - ts-node-esm: dist/bin-esm.js - ts-node-script: dist/bin-script.js - ts-node-transpile-only: dist/bin-transpile.js - ts-script: dist/bin-script-deprecated.js - checksum: 10c0/5f29938489f96982a25ba650b64218e83a3357d76f7bede80195c65ab44ad279c8357264639b7abdd5d7e75fc269a83daa0e9c62fd8637a3def67254ecc9ddc2 - languageName: node - linkType: hard - -"tsconfig-paths@npm:^3.15.0": - version: 3.15.0 - resolution: "tsconfig-paths@npm:3.15.0" - dependencies: - "@types/json5": "npm:^0.0.29" - json5: "npm:^1.0.2" - minimist: "npm:^1.2.6" - strip-bom: "npm:^3.0.0" - checksum: 10c0/5b4f301a2b7a3766a986baf8fc0e177eb80bdba6e396792ff92dc23b5bca8bb279fc96517dcaaef63a3b49bebc6c4c833653ec58155780bc906bdbcf7dda0ef5 - languageName: node - linkType: hard - -"tslib@npm:^2.1.0": - version: 2.6.2 - resolution: "tslib@npm:2.6.2" - checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb - languageName: node - linkType: hard - -"type-check@npm:^0.4.0, type-check@npm:~0.4.0": - version: 0.4.0 - resolution: "type-check@npm:0.4.0" - dependencies: - prelude-ls: "npm:^1.2.1" - checksum: 10c0/7b3fd0ed43891e2080bf0c5c504b418fbb3e5c7b9708d3d015037ba2e6323a28152ec163bcb65212741fa5d2022e3075ac3c76440dbd344c9035f818e8ecee58 - languageName: node - linkType: hard - -"type-check@npm:~0.3.2": - version: 0.3.2 - resolution: "type-check@npm:0.3.2" - dependencies: - prelude-ls: "npm:~1.1.2" - checksum: 10c0/776217116b2b4e50e368c7ee0c22c0a85e982881c16965b90d52f216bc296d6a52ef74f9202d22158caacc092a7645b0b8d5fe529a96e3fe35d0fb393966c875 - languageName: node - linkType: hard - -"type-detect@npm:4.0.8, type-detect@npm:^4.0.0, type-detect@npm:^4.0.8": - version: 4.0.8 - resolution: "type-detect@npm:4.0.8" - checksum: 10c0/8fb9a51d3f365a7de84ab7f73b653534b61b622aa6800aecdb0f1095a4a646d3f5eb295322127b6573db7982afcd40ab492d038cf825a42093a58b1e1353e0bd - languageName: node - linkType: hard - -"type-fest@npm:^0.13.1": - version: 0.13.1 - resolution: "type-fest@npm:0.13.1" - checksum: 10c0/0c0fa07ae53d4e776cf4dac30d25ad799443e9eef9226f9fddbb69242db86b08584084a99885cfa5a9dfe4c063ebdc9aa7b69da348e735baede8d43f1aeae93b - languageName: node - linkType: hard - -"type-fest@npm:^0.18.0": - version: 0.18.1 - resolution: "type-fest@npm:0.18.1" - checksum: 10c0/303f5ecf40d03e1d5b635ce7660de3b33c18ed8ebc65d64920c02974d9e684c72483c23f9084587e9dd6466a2ece1da42ddc95b412a461794dd30baca95e2bac - languageName: node - linkType: hard - -"type-fest@npm:^0.20.2": - version: 0.20.2 - resolution: "type-fest@npm:0.20.2" - checksum: 10c0/dea9df45ea1f0aaa4e2d3bed3f9a0bfe9e5b2592bddb92eb1bf06e50bcf98dbb78189668cd8bc31a0511d3fc25539b4cd5c704497e53e93e2d40ca764b10bfc3 - languageName: node - linkType: hard - -"type-fest@npm:^0.6.0": - version: 0.6.0 - resolution: "type-fest@npm:0.6.0" - checksum: 10c0/0c585c26416fce9ecb5691873a1301b5aff54673c7999b6f925691ed01f5b9232db408cdbb0bd003d19f5ae284322523f44092d1f81ca0a48f11f7cf0be8cd38 - languageName: node - linkType: hard - -"type-fest@npm:^0.8.1": - version: 0.8.1 - resolution: "type-fest@npm:0.8.1" - checksum: 10c0/dffbb99329da2aa840f506d376c863bd55f5636f4741ad6e65e82f5ce47e6914108f44f340a0b74009b0cb5d09d6752ae83203e53e98b1192cf80ecee5651636 - languageName: node - linkType: hard - -"type-fest@npm:^1.0.2": - version: 1.4.0 - resolution: "type-fest@npm:1.4.0" - checksum: 10c0/a3c0f4ee28ff6ddf800d769eafafcdeab32efa38763c1a1b8daeae681920f6e345d7920bf277245235561d8117dab765cb5f829c76b713b4c9de0998a5397141 - languageName: node - linkType: hard - -"typed-array-buffer@npm:^1.0.2": - version: 1.0.2 - resolution: "typed-array-buffer@npm:1.0.2" - dependencies: - call-bind: "npm:^1.0.7" - es-errors: "npm:^1.3.0" - is-typed-array: "npm:^1.1.13" - checksum: 10c0/9e043eb38e1b4df4ddf9dde1aa64919ae8bb909571c1cc4490ba777d55d23a0c74c7d73afcdd29ec98616d91bb3ae0f705fad4421ea147e1daf9528200b562da - languageName: node - linkType: hard - -"typed-array-byte-length@npm:^1.0.1": - version: 1.0.1 - resolution: "typed-array-byte-length@npm:1.0.1" - dependencies: - call-bind: "npm:^1.0.7" - for-each: "npm:^0.3.3" - gopd: "npm:^1.0.1" - has-proto: "npm:^1.0.3" - is-typed-array: "npm:^1.1.13" - checksum: 10c0/fcebeffb2436c9f355e91bd19e2368273b88c11d1acc0948a2a306792f1ab672bce4cfe524ab9f51a0505c9d7cd1c98eff4235c4f6bfef6a198f6cfc4ff3d4f3 - languageName: node - linkType: hard - -"typed-array-byte-offset@npm:^1.0.2": - version: 1.0.2 - resolution: "typed-array-byte-offset@npm:1.0.2" - dependencies: - available-typed-arrays: "npm:^1.0.7" - call-bind: "npm:^1.0.7" - for-each: "npm:^0.3.3" - gopd: "npm:^1.0.1" - has-proto: "npm:^1.0.3" - is-typed-array: "npm:^1.1.13" - checksum: 10c0/d2628bc739732072e39269389a758025f75339de2ed40c4f91357023c5512d237f255b633e3106c461ced41907c1bf9a533c7e8578066b0163690ca8bc61b22f - languageName: node - linkType: hard - -"typed-array-length@npm:^1.0.6": - version: 1.0.6 - resolution: "typed-array-length@npm:1.0.6" - dependencies: - call-bind: "npm:^1.0.7" - for-each: "npm:^0.3.3" - gopd: "npm:^1.0.1" - has-proto: "npm:^1.0.3" - is-typed-array: "npm:^1.1.13" - possible-typed-array-names: "npm:^1.0.0" - checksum: 10c0/74253d7dc488eb28b6b2711cf31f5a9dcefc9c41b0681fd1c178ed0a1681b4468581a3626d39cd4df7aee3d3927ab62be06aa9ca74e5baf81827f61641445b77 - languageName: node - linkType: hard - -"typedarray-to-buffer@npm:^3.1.5": - version: 3.1.5 - resolution: "typedarray-to-buffer@npm:3.1.5" - dependencies: - is-typedarray: "npm:^1.0.0" - checksum: 10c0/4ac5b7a93d604edabf3ac58d3a2f7e07487e9f6e98195a080e81dbffdc4127817f470f219d794a843b87052cedef102b53ac9b539855380b8c2172054b7d5027 - languageName: node - linkType: hard - -"typescript@npm:^4.6.4 || ^5.2.2, typescript@npm:^5.1.6": - version: 5.4.5 - resolution: "typescript@npm:5.4.5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/2954022ada340fd3d6a9e2b8e534f65d57c92d5f3989a263754a78aba549f7e6529acc1921913560a4b816c46dce7df4a4d29f9f11a3dc0d4213bb76d043251e - languageName: node - linkType: hard - -"typescript@patch:typescript@npm%3A^4.6.4 || ^5.2.2#optional!builtin, typescript@patch:typescript@npm%3A^5.1.6#optional!builtin": - version: 5.4.5 - resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/db2ad2a16ca829f50427eeb1da155e7a45e598eec7b086d8b4e8ba44e5a235f758e606d681c66992230d3fc3b8995865e5fd0b22a2c95486d0b3200f83072ec9 - languageName: node - linkType: hard - -"uc.micro@npm:^1.0.1": - version: 1.0.6 - resolution: "uc.micro@npm:1.0.6" - checksum: 10c0/9bde2afc6f2e24b899db6caea47dae778b88862ca76688d844ef6e6121dec0679c152893a74a6cfbd2e6fde34654e6bd8424fee8e0166cdfa6c9ae5d42b8a17b - languageName: node - linkType: hard - -"uc.micro@npm:^2.0.0, uc.micro@npm:^2.1.0": - version: 2.1.0 - resolution: "uc.micro@npm:2.1.0" - checksum: 10c0/8862eddb412dda76f15db8ad1c640ccc2f47cdf8252a4a30be908d535602c8d33f9855dfcccb8b8837855c1ce1eaa563f7fa7ebe3c98fd0794351aab9b9c55fa - languageName: node - linkType: hard - -"uglify-js@npm:^3.7.7": - version: 3.17.4 - resolution: "uglify-js@npm:3.17.4" - bin: - uglifyjs: bin/uglifyjs - checksum: 10c0/8b7fcdca69deb284fed7d2025b73eb747ce37f9aca6af53422844f46427152d5440601b6e2a033e77856a2f0591e4167153d5a21b68674ad11f662034ec13ced - languageName: node - linkType: hard - -"unbox-primitive@npm:^1.0.2": - version: 1.0.2 - resolution: "unbox-primitive@npm:1.0.2" - dependencies: - call-bind: "npm:^1.0.2" - has-bigints: "npm:^1.0.2" - has-symbols: "npm:^1.0.3" - which-boxed-primitive: "npm:^1.0.2" - checksum: 10c0/81ca2e81134167cc8f75fa79fbcc8a94379d6c61de67090986a2273850989dd3bae8440c163121b77434b68263e34787a675cbdcb34bb2f764c6b9c843a11b66 - languageName: node - linkType: hard - -"underscore@npm:>=1.8.3, underscore@npm:~1.13.2": - version: 1.13.6 - resolution: "underscore@npm:1.13.6" - checksum: 10c0/5f57047f47273044c045fddeb8b141dafa703aa487afd84b319c2495de2e685cecd0b74abec098292320d518b267c0c4598e45aa47d4c3628d0d4020966ba521 - languageName: node - linkType: hard - -"undici-types@npm:~5.26.4": - version: 5.26.5 - resolution: "undici-types@npm:5.26.5" - checksum: 10c0/bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501 - languageName: node - linkType: hard - -"unique-filename@npm:^3.0.0": - version: 3.0.0 - resolution: "unique-filename@npm:3.0.0" - dependencies: - unique-slug: "npm:^4.0.0" - checksum: 10c0/6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f - languageName: node - linkType: hard - -"unique-slug@npm:^4.0.0": - version: 4.0.0 - resolution: "unique-slug@npm:4.0.0" - dependencies: - imurmurhash: "npm:^0.1.4" - checksum: 10c0/cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635 - languageName: node - linkType: hard - -"unique-string@npm:^2.0.0": - version: 2.0.0 - resolution: "unique-string@npm:2.0.0" - dependencies: - crypto-random-string: "npm:^2.0.0" - checksum: 10c0/11820db0a4ba069d174bedfa96c588fc2c96b083066fafa186851e563951d0de78181ac79c744c1ed28b51f9d82ac5b8196ff3e4560d0178046ef455d8c2244b - languageName: node - linkType: hard - -"universalify@npm:^0.1.0": - version: 0.1.2 - resolution: "universalify@npm:0.1.2" - checksum: 10c0/e70e0339f6b36f34c9816f6bf9662372bd241714dc77508d231d08386d94f2c4aa1ba1318614f92015f40d45aae1b9075cd30bd490efbe39387b60a76ca3f045 - languageName: node - linkType: hard - -"universalify@npm:^0.2.0": - version: 0.2.0 - resolution: "universalify@npm:0.2.0" - checksum: 10c0/cedbe4d4ca3967edf24c0800cfc161c5a15e240dac28e3ce575c689abc11f2c81ccc6532c8752af3b40f9120fb5e454abecd359e164f4f6aa44c29cd37e194fe - languageName: node - linkType: hard - -"universalify@npm:^1.0.0": - version: 1.0.0 - resolution: "universalify@npm:1.0.0" - checksum: 10c0/735dd9c118f96a13c7810212ef8b45e239e2fe6bf65aceefbc2826334fcfe8c523dbbf1458cef011563c51505e3a367dff7654cfb0cec5b6aa710ef120843396 - languageName: node - linkType: hard - -"universalify@npm:^2.0.0": - version: 2.0.1 - resolution: "universalify@npm:2.0.1" - checksum: 10c0/73e8ee3809041ca8b818efb141801a1004e3fc0002727f1531f4de613ea281b494a40909596dae4a042a4fb6cd385af5d4db2e137b1362e0e91384b828effd3a - languageName: node - linkType: hard - -"update-browserslist-db@npm:^1.0.13": - version: 1.0.16 - resolution: "update-browserslist-db@npm:1.0.16" - dependencies: - escalade: "npm:^3.1.2" - picocolors: "npm:^1.0.1" - peerDependencies: - browserslist: ">= 4.21.0" - bin: - update-browserslist-db: cli.js - checksum: 10c0/5995399fc202adbb51567e4810e146cdf7af630a92cc969365a099150cb00597e425cc14987ca7080b09a4d0cfd2a3de53fbe72eebff171aed7f9bb81f9bf405 - languageName: node - linkType: hard - -"update-notifier@npm:^5.1.0": - version: 5.1.0 - resolution: "update-notifier@npm:5.1.0" - dependencies: - boxen: "npm:^5.0.0" - chalk: "npm:^4.1.0" - configstore: "npm:^5.0.1" - has-yarn: "npm:^2.1.0" - import-lazy: "npm:^2.1.0" - is-ci: "npm:^2.0.0" - is-installed-globally: "npm:^0.4.0" - is-npm: "npm:^5.0.0" - is-yarn-global: "npm:^0.3.0" - latest-version: "npm:^5.1.0" - pupa: "npm:^2.1.1" - semver: "npm:^7.3.4" - semver-diff: "npm:^3.1.1" - xdg-basedir: "npm:^4.0.0" - checksum: 10c0/0dde6db5ac1e5244e1f8bf5b26895a0d53c00797ea2bdbc1302623dd1aecab5cfb88b4f324d482cbd4c8b089464383d8c83db64dec5798ec0136820e22478e47 - languageName: node - linkType: hard - -"uri-js@npm:^4.2.2, uri-js@npm:^4.4.1": - version: 4.4.1 - resolution: "uri-js@npm:4.4.1" - dependencies: - punycode: "npm:^2.1.0" - checksum: 10c0/4ef57b45aa820d7ac6496e9208559986c665e49447cb072744c13b66925a362d96dd5a46c4530a6b8e203e5db5fe849369444440cb22ecfc26c679359e5dfa3c - languageName: node - linkType: hard - -"url-join@npm:^4.0.1": - version: 4.0.1 - resolution: "url-join@npm:4.0.1" - checksum: 10c0/ac65e2c7c562d7b49b68edddcf55385d3e922bc1dd5d90419ea40b53b6de1607d1e45ceb71efb9d60da02c681d13c6cb3a1aa8b13fc0c989dfc219df97ee992d - languageName: node - linkType: hard - -"url-parse@npm:^1.5.3": - version: 1.5.10 - resolution: "url-parse@npm:1.5.10" - dependencies: - querystringify: "npm:^2.1.1" - requires-port: "npm:^1.0.0" - checksum: 10c0/bd5aa9389f896974beb851c112f63b466505a04b4807cea2e5a3b7092f6fbb75316f0491ea84e44f66fed55f1b440df5195d7e3a8203f64fcefa19d182f5be87 - languageName: node - linkType: hard - -"use-strict@npm:1.0.1": - version: 1.0.1 - resolution: "use-strict@npm:1.0.1" - checksum: 10c0/c78ee085cbcb68bd3abd4a7dec78704dc3ad4ddeb19f37ed077f93617dd36415b4219991fbc270ad9a953e672ac65f3fd26e251d98bd7086098fd7e00fb87f2f - languageName: node - linkType: hard - -"use-sync-external-store@npm:^1.0.0": - version: 1.2.2 - resolution: "use-sync-external-store@npm:1.2.2" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10c0/23b1597c10adf15b26ade9e8c318d8cc0abc9ec0ab5fc7ca7338da92e89c2536abd150a5891bf076836c352fdfa104fc7231fb48f806fd9960e0cbe03601abaf - languageName: node - linkType: hard - -"utf8-byte-length@npm:^1.0.1": - version: 1.0.5 - resolution: "utf8-byte-length@npm:1.0.5" - checksum: 10c0/e69bda3299608f4cc75976da9fb74ac94801a58b9ca29fdad03a20ec952e7477d7f226c12716b5f36bd4cff8151d1d152d02ee1df3752f017d4b2c725ce3e47a - languageName: node - linkType: hard - -"util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2": - version: 1.0.2 - resolution: "util-deprecate@npm:1.0.2" - checksum: 10c0/41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942 - languageName: node - linkType: hard - -"uuid@npm:8.3.2": - version: 8.3.2 - resolution: "uuid@npm:8.3.2" - bin: - uuid: dist/bin/uuid - checksum: 10c0/bcbb807a917d374a49f475fae2e87fdca7da5e5530820ef53f65ba1d12131bd81a92ecf259cc7ce317cbe0f289e7d79fdfebcef9bfa3087c8c8a2fa304c9be54 - languageName: node - linkType: hard - -"v8-compile-cache-lib@npm:^3.0.1": - version: 3.0.1 - resolution: "v8-compile-cache-lib@npm:3.0.1" - checksum: 10c0/bdc36fb8095d3b41df197f5fb6f11e3a26adf4059df3213e3baa93810d8f0cc76f9a74aaefc18b73e91fe7e19154ed6f134eda6fded2e0f1c8d2272ed2d2d391 - languageName: node - linkType: hard - -"validate-npm-package-license@npm:^3.0.1": - version: 3.0.4 - resolution: "validate-npm-package-license@npm:3.0.4" - dependencies: - spdx-correct: "npm:^3.0.0" - spdx-expression-parse: "npm:^3.0.0" - checksum: 10c0/7b91e455a8de9a0beaa9fe961e536b677da7f48c9a493edf4d4d4a87fd80a7a10267d438723364e432c2fcd00b5650b5378275cded362383ef570276e6312f4f - languageName: node - linkType: hard - -"verror@npm:^1.10.0": - version: 1.10.1 - resolution: "verror@npm:1.10.1" - dependencies: - assert-plus: "npm:^1.0.0" - core-util-is: "npm:1.0.2" - extsprintf: "npm:^1.2.0" - checksum: 10c0/293fb060a4c9b07965569a0c3e45efa954127818707995a8a4311f691b5d6687be99f972c759838ba6eecae717f9af28e3c49d2afc7bbdf5f0b675238f1426e8 - languageName: node - linkType: hard - -"w3c-xmlserializer@npm:^4.0.0": - version: 4.0.0 - resolution: "w3c-xmlserializer@npm:4.0.0" - dependencies: - xml-name-validator: "npm:^4.0.0" - checksum: 10c0/02cc66d6efc590bd630086cd88252444120f5feec5c4043932b0d0f74f8b060512f79dc77eb093a7ad04b4f02f39da79ce4af47ceb600f2bf9eacdc83204b1a8 - languageName: node - linkType: hard - -"watchpack@npm:^2.4.1": - version: 2.4.1 - resolution: "watchpack@npm:2.4.1" - dependencies: - glob-to-regexp: "npm:^0.4.1" - graceful-fs: "npm:^4.1.2" - checksum: 10c0/c694de0a61004e587a8a0fdc9cfec20ee692c52032d9ab2c2e99969a37fdab9e6e1bd3164ed506f9a13f7c83e65563d563e0d6b87358470cdb7309b83db78683 - languageName: node - linkType: hard - -"webidl-conversions@npm:^3.0.0": - version: 3.0.1 - resolution: "webidl-conversions@npm:3.0.1" - checksum: 10c0/5612d5f3e54760a797052eb4927f0ddc01383550f542ccd33d5238cfd65aeed392a45ad38364970d0a0f4fea32e1f4d231b3d8dac4a3bdd385e5cf802ae097db - languageName: node - linkType: hard - -"webidl-conversions@npm:^7.0.0": - version: 7.0.0 - resolution: "webidl-conversions@npm:7.0.0" - checksum: 10c0/228d8cb6d270c23b0720cb2d95c579202db3aaf8f633b4e9dd94ec2000a04e7e6e43b76a94509cdb30479bd00ae253ab2371a2da9f81446cc313f89a4213a2c4 - languageName: node - linkType: hard - -"webpack-cli@npm:^5.1.4": - version: 5.1.4 - resolution: "webpack-cli@npm:5.1.4" - dependencies: - "@discoveryjs/json-ext": "npm:^0.5.0" - "@webpack-cli/configtest": "npm:^2.1.1" - "@webpack-cli/info": "npm:^2.0.2" - "@webpack-cli/serve": "npm:^2.0.5" - colorette: "npm:^2.0.14" - commander: "npm:^10.0.1" - cross-spawn: "npm:^7.0.3" - envinfo: "npm:^7.7.3" - fastest-levenshtein: "npm:^1.0.12" - import-local: "npm:^3.0.2" - interpret: "npm:^3.1.1" - rechoir: "npm:^0.8.0" - webpack-merge: "npm:^5.7.3" - peerDependencies: - webpack: 5.x.x - peerDependenciesMeta: - "@webpack-cli/generators": - optional: true - webpack-bundle-analyzer: - optional: true - webpack-dev-server: - optional: true - bin: - webpack-cli: bin/cli.js - checksum: 10c0/4266909ae5e2e662c8790ac286e965b2c7fd5a4a2f07f48e28576234c9a5f631847ccddc18e1b3281c7b4be04a7ff4717d2636033a322dde13ac995fd0d9de10 - languageName: node - linkType: hard - -"webpack-merge@npm:^5.7.3": - version: 5.10.0 - resolution: "webpack-merge@npm:5.10.0" - dependencies: - clone-deep: "npm:^4.0.1" - flat: "npm:^5.0.2" - wildcard: "npm:^2.0.0" - checksum: 10c0/b607c84cabaf74689f965420051a55a08722d897bdd6c29cb0b2263b451c090f962d41ecf8c9bf56b0ab3de56e65476ace0a8ecda4f4a4663684243d90e0512b - languageName: node - linkType: hard - -"webpack-sources@npm:^3.2.3": - version: 3.2.3 - resolution: "webpack-sources@npm:3.2.3" - checksum: 10c0/2ef63d77c4fad39de4a6db17323d75eb92897b32674e97d76f0a1e87c003882fc038571266ad0ef581ac734cbe20952912aaa26155f1905e96ce251adbb1eb4e - languageName: node - linkType: hard - -"webpack@npm:^5.76.3": - version: 5.91.0 - resolution: "webpack@npm:5.91.0" - dependencies: - "@types/eslint-scope": "npm:^3.7.3" - "@types/estree": "npm:^1.0.5" - "@webassemblyjs/ast": "npm:^1.12.1" - "@webassemblyjs/wasm-edit": "npm:^1.12.1" - "@webassemblyjs/wasm-parser": "npm:^1.12.1" - acorn: "npm:^8.7.1" - acorn-import-assertions: "npm:^1.9.0" - browserslist: "npm:^4.21.10" - chrome-trace-event: "npm:^1.0.2" - enhanced-resolve: "npm:^5.16.0" - es-module-lexer: "npm:^1.2.1" - eslint-scope: "npm:5.1.1" - events: "npm:^3.2.0" - glob-to-regexp: "npm:^0.4.1" - graceful-fs: "npm:^4.2.11" - json-parse-even-better-errors: "npm:^2.3.1" - loader-runner: "npm:^4.2.0" - mime-types: "npm:^2.1.27" - neo-async: "npm:^2.6.2" - schema-utils: "npm:^3.2.0" - tapable: "npm:^2.1.1" - terser-webpack-plugin: "npm:^5.3.10" - watchpack: "npm:^2.4.1" - webpack-sources: "npm:^3.2.3" - peerDependenciesMeta: - webpack-cli: - optional: true - bin: - webpack: bin/webpack.js - checksum: 10c0/74a3e0ea1c9a492accf035317f31769ffeaaab415811524b9f17bc7bf7012c5b6e1a9860df5ca6903f3ae2618727b801eb47d9351a2595dfffb25941d368b88c - languageName: node - linkType: hard - -"webrtc-adapter@npm:^4.1.1": - version: 4.2.2 - resolution: "webrtc-adapter@npm:4.2.2" - dependencies: - sdp: "npm:^2.1.0" - checksum: 10c0/8ec48d819ae5cb5613234851e1905e48b04ffea2b54318fdb5a0d95fc93e6236dd1dd9716bdc50c0a109ddb90c432a8f46c950dbfe1d9ee62275a0ace74b044c - languageName: node - linkType: hard - -"whatwg-encoding@npm:^2.0.0": - version: 2.0.0 - resolution: "whatwg-encoding@npm:2.0.0" - dependencies: - iconv-lite: "npm:0.6.3" - checksum: 10c0/91b90a49f312dc751496fd23a7e68981e62f33afe938b97281ad766235c4872fc4e66319f925c5e9001502b3040dd25a33b02a9c693b73a4cbbfdc4ad10c3e3e - languageName: node - linkType: hard - -"whatwg-mimetype@npm:^3.0.0": - version: 3.0.0 - resolution: "whatwg-mimetype@npm:3.0.0" - checksum: 10c0/323895a1cda29a5fb0b9ca82831d2c316309fede0365047c4c323073e3239067a304a09a1f4b123b9532641ab604203f33a1403b5ca6a62ef405bcd7a204080f - languageName: node - linkType: hard - -"whatwg-url@npm:^12.0.0, whatwg-url@npm:^12.0.1": - version: 12.0.1 - resolution: "whatwg-url@npm:12.0.1" - dependencies: - tr46: "npm:^4.1.1" - webidl-conversions: "npm:^7.0.0" - checksum: 10c0/99f506b2c996704fa0fc5c70d8e5e27dce15492db2921c99cf319a8d56cb61641f5c06089f63e1ab1983de9fd6a63c3c112a90cdb5fe352d7a846979b10df566 - languageName: node - linkType: hard - -"whatwg-url@npm:^5.0.0": - version: 5.0.0 - resolution: "whatwg-url@npm:5.0.0" - dependencies: - tr46: "npm:~0.0.3" - webidl-conversions: "npm:^3.0.0" - checksum: 10c0/1588bed84d10b72d5eec1d0faa0722ba1962f1821e7539c535558fb5398d223b0c50d8acab950b8c488b4ba69043fd833cc2697056b167d8ad46fac3995a55d5 - languageName: node - linkType: hard - -"which-boxed-primitive@npm:^1.0.2": - version: 1.0.2 - resolution: "which-boxed-primitive@npm:1.0.2" - dependencies: - is-bigint: "npm:^1.0.1" - is-boolean-object: "npm:^1.1.0" - is-number-object: "npm:^1.0.4" - is-string: "npm:^1.0.5" - is-symbol: "npm:^1.0.3" - checksum: 10c0/0a62a03c00c91dd4fb1035b2f0733c341d805753b027eebd3a304b9cb70e8ce33e25317add2fe9b5fea6f53a175c0633ae701ff812e604410ddd049777cd435e - languageName: node - linkType: hard - -"which-builtin-type@npm:^1.1.3": - version: 1.1.3 - resolution: "which-builtin-type@npm:1.1.3" - dependencies: - function.prototype.name: "npm:^1.1.5" - has-tostringtag: "npm:^1.0.0" - is-async-function: "npm:^2.0.0" - is-date-object: "npm:^1.0.5" - is-finalizationregistry: "npm:^1.0.2" - is-generator-function: "npm:^1.0.10" - is-regex: "npm:^1.1.4" - is-weakref: "npm:^1.0.2" - isarray: "npm:^2.0.5" - which-boxed-primitive: "npm:^1.0.2" - which-collection: "npm:^1.0.1" - which-typed-array: "npm:^1.1.9" - checksum: 10c0/2b7b234df3443b52f4fbd2b65b731804de8d30bcc4210ec84107ef377a81923cea7f2763b7fb78b394175cea59118bf3c41b9ffd2d643cb1d748ef93b33b6bd4 - languageName: node - linkType: hard - -"which-collection@npm:^1.0.1": - version: 1.0.2 - resolution: "which-collection@npm:1.0.2" - dependencies: - is-map: "npm:^2.0.3" - is-set: "npm:^2.0.3" - is-weakmap: "npm:^2.0.2" - is-weakset: "npm:^2.0.3" - checksum: 10c0/3345fde20964525a04cdf7c4a96821f85f0cc198f1b2ecb4576e08096746d129eb133571998fe121c77782ac8f21cbd67745a3d35ce100d26d4e684c142ea1f2 - languageName: node - linkType: hard - -"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.9": - version: 1.1.15 - resolution: "which-typed-array@npm:1.1.15" - dependencies: - available-typed-arrays: "npm:^1.0.7" - call-bind: "npm:^1.0.7" - for-each: "npm:^0.3.3" - gopd: "npm:^1.0.1" - has-tostringtag: "npm:^1.0.2" - checksum: 10c0/4465d5348c044032032251be54d8988270e69c6b7154f8fcb2a47ff706fe36f7624b3a24246b8d9089435a8f4ec48c1c1025c5d6b499456b9e5eff4f48212983 - languageName: node - linkType: hard - -"which@npm:^1.2.9": - version: 1.3.1 - resolution: "which@npm:1.3.1" - dependencies: - isexe: "npm:^2.0.0" - bin: - which: ./bin/which - checksum: 10c0/e945a8b6bbf6821aaaef7f6e0c309d4b615ef35699576d5489b4261da9539f70393c6b2ce700ee4321c18f914ebe5644bc4631b15466ffbaad37d83151f6af59 - languageName: node - linkType: hard - -"which@npm:^2.0.1, which@npm:^2.0.2": - version: 2.0.2 - resolution: "which@npm:2.0.2" - dependencies: - isexe: "npm:^2.0.0" - bin: - node-which: ./bin/node-which - checksum: 10c0/66522872a768b60c2a65a57e8ad184e5372f5b6a9ca6d5f033d4b0dc98aff63995655a7503b9c0a2598936f532120e81dd8cc155e2e92ed662a2b9377cc4374f - languageName: node - linkType: hard - -"which@npm:^4.0.0": - version: 4.0.0 - resolution: "which@npm:4.0.0" - dependencies: - isexe: "npm:^3.1.1" - bin: - node-which: bin/which.js - checksum: 10c0/449fa5c44ed120ccecfe18c433296a4978a7583bf2391c50abce13f76878d2476defde04d0f79db8165bdf432853c1f8389d0485ca6e8ebce3bbcded513d5e6a - languageName: node - linkType: hard - -"wide-align@npm:^1.1.5": - version: 1.1.5 - resolution: "wide-align@npm:1.1.5" - dependencies: - string-width: "npm:^1.0.2 || 2 || 3 || 4" - checksum: 10c0/1d9c2a3e36dfb09832f38e2e699c367ef190f96b82c71f809bc0822c306f5379df87bab47bed27ea99106d86447e50eb972d3c516c2f95782807a9d082fbea95 - languageName: node - linkType: hard - -"widest-line@npm:^3.1.0": - version: 3.1.0 - resolution: "widest-line@npm:3.1.0" - dependencies: - string-width: "npm:^4.0.0" - checksum: 10c0/b1e623adcfb9df35350dd7fc61295d6d4a1eaa65a406ba39c4b8360045b614af95ad10e05abf704936ed022569be438c4bfa02d6d031863c4166a238c301119f - languageName: node - linkType: hard - -"wildcard@npm:^2.0.0": - version: 2.0.1 - resolution: "wildcard@npm:2.0.1" - checksum: 10c0/08f70cd97dd9a20aea280847a1fe8148e17cae7d231640e41eb26d2388697cbe65b67fd9e68715251c39b080c5ae4f76d71a9a69fa101d897273efdfb1b58bf7 - languageName: node - linkType: hard - -"word-wrap@npm:^1.2.5, word-wrap@npm:~1.2.3": - version: 1.2.5 - resolution: "word-wrap@npm:1.2.5" - checksum: 10c0/e0e4a1ca27599c92a6ca4c32260e8a92e8a44f4ef6ef93f803f8ed823f486e0889fc0b93be4db59c8d51b3064951d25e43d434e95dc8c960cc3a63d65d00ba20 - languageName: node - linkType: hard - -"workerpool@npm:6.2.1": - version: 6.2.1 - resolution: "workerpool@npm:6.2.1" - checksum: 10c0/f0efd2d74eafd58eaeb36d7d85837d080f75c52b64893cff317b66257dd308e5c9f85ef0b12904f6c7f24ed2365bc3cfeba1f1d16aa736d84d6ef8156ae37c80 - languageName: node - linkType: hard - -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0": - version: 7.0.0 - resolution: "wrap-ansi@npm:7.0.0" - dependencies: - ansi-styles: "npm:^4.0.0" - string-width: "npm:^4.1.0" - strip-ansi: "npm:^6.0.0" - checksum: 10c0/d15fc12c11e4cbc4044a552129ebc75ee3f57aa9c1958373a4db0292d72282f54373b536103987a4a7594db1ef6a4f10acf92978f79b98c49306a4b58c77d4da - languageName: node - linkType: hard - -"wrap-ansi@npm:^8.0.1, wrap-ansi@npm:^8.1.0": - version: 8.1.0 - resolution: "wrap-ansi@npm:8.1.0" - dependencies: - ansi-styles: "npm:^6.1.0" - string-width: "npm:^5.0.1" - strip-ansi: "npm:^7.0.1" - checksum: 10c0/138ff58a41d2f877eae87e3282c0630fc2789012fc1af4d6bd626eeb9a2f9a65ca92005e6e69a75c7b85a68479fe7443c7dbe1eb8fbaa681a4491364b7c55c60 - languageName: node - linkType: hard - -"wrappy@npm:1": - version: 1.0.2 - resolution: "wrappy@npm:1.0.2" - checksum: 10c0/56fece1a4018c6a6c8e28fbc88c87e0fbf4ea8fd64fc6c63b18f4acc4bd13e0ad2515189786dd2c30d3eec9663d70f4ecf699330002f8ccb547e4a18231fc9f0 - languageName: node - linkType: hard - -"write-file-atomic@npm:^3.0.0": - version: 3.0.3 - resolution: "write-file-atomic@npm:3.0.3" - dependencies: - imurmurhash: "npm:^0.1.4" - is-typedarray: "npm:^1.0.0" - signal-exit: "npm:^3.0.2" - typedarray-to-buffer: "npm:^3.1.5" - checksum: 10c0/7fb67affd811c7a1221bed0c905c26e28f0041e138fb19ccf02db57a0ef93ea69220959af3906b920f9b0411d1914474cdd90b93a96e5cd9e8368d9777caac0e - languageName: node - linkType: hard - -"ws@npm:^8.13.0": - version: 8.17.0 - resolution: "ws@npm:8.17.0" - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ">=5.0.2" - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - checksum: 10c0/55241ec93a66fdfc4bf4f8bc66c8eb038fda2c7a4ee8f6f157f2ca7dc7aa76aea0c0da0bf3adb2af390074a70a0e45456a2eaf80e581e630b75df10a64b0a990 - languageName: node - linkType: hard - -"xdg-basedir@npm:^4.0.0": - version: 4.0.0 - resolution: "xdg-basedir@npm:4.0.0" - checksum: 10c0/1b5d70d58355af90363a4e0a51c992e77fc5a1d8de5822699c7d6e96a6afea9a1e048cb93312be6870f338ca45ebe97f000425028fa149c1e87d1b5b8b212a06 - languageName: node - linkType: hard - -"xml-name-validator@npm:^4.0.0": - version: 4.0.0 - resolution: "xml-name-validator@npm:4.0.0" - checksum: 10c0/c1bfa219d64e56fee265b2bd31b2fcecefc063ee802da1e73bad1f21d7afd89b943c9e2c97af2942f60b1ad46f915a4c81e00039c7d398b53cf410e29d3c30bd - languageName: node - linkType: hard - -"xmlbuilder@npm:>=11.0.1, xmlbuilder@npm:^15.1.1": - version: 15.1.1 - resolution: "xmlbuilder@npm:15.1.1" - checksum: 10c0/665266a8916498ff8d82b3d46d3993913477a254b98149ff7cff060d9b7cc0db7cf5a3dae99aed92355254a808c0e2e3ec74ad1b04aa1061bdb8dfbea26c18b8 - languageName: node - linkType: hard - -"xmlchars@npm:^2.2.0": - version: 2.2.0 - resolution: "xmlchars@npm:2.2.0" - checksum: 10c0/b64b535861a6f310c5d9bfa10834cf49127c71922c297da9d4d1b45eeaae40bf9b4363275876088fbe2667e5db028d2cd4f8ee72eed9bede840a67d57dab7593 - languageName: node - linkType: hard - -"xmlcreate@npm:^2.0.4": - version: 2.0.4 - resolution: "xmlcreate@npm:2.0.4" - checksum: 10c0/fc4234e2d1942877d761d4f3d64410b54633d2ec60b13a5d56a6a06545aba39a0df8ed7ded10785a302f632eb4f0a4fedbf4bf10e17892e11d5075244b9e5705 - languageName: node - linkType: hard - -"y18n@npm:^5.0.5": - version: 5.0.8 - resolution: "y18n@npm:5.0.8" - checksum: 10c0/4df2842c36e468590c3691c894bc9cdbac41f520566e76e24f59401ba7d8b4811eb1e34524d57e54bc6d864bcb66baab7ffd9ca42bf1eda596618f9162b91249 - languageName: node - linkType: hard - -"yallist@npm:^4.0.0": - version: 4.0.0 - resolution: "yallist@npm:4.0.0" - checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a - languageName: node - linkType: hard - -"yaml@npm:2.3.1": - version: 2.3.1 - resolution: "yaml@npm:2.3.1" - checksum: 10c0/ed4c21a907fb1cd60a25177612fa46d95064a144623d269199817908475fe85bef20fb17406e3bdc175351b6488056a6f84beb7836e8c262646546a0220188e3 - languageName: node - linkType: hard - -"yaml@npm:^1.10.2": - version: 1.10.2 - resolution: "yaml@npm:1.10.2" - checksum: 10c0/5c28b9eb7adc46544f28d9a8d20c5b3cb1215a886609a2fd41f51628d8aaa5878ccd628b755dbcd29f6bb4921bd04ffbc6dcc370689bb96e594e2f9813d2605f - languageName: node - linkType: hard - -"yargs-parser@npm:20.2.4": - version: 20.2.4 - resolution: "yargs-parser@npm:20.2.4" - checksum: 10c0/08dc341f0b9f940c2fffc1d1decf3be00e28cabd2b578a694901eccc7dcd10577f10c6aa1b040fdd9a68b2042515a60f18476543bccacf9f3ce2c8534cd87435 - languageName: node - linkType: hard - -"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3": - version: 20.2.9 - resolution: "yargs-parser@npm:20.2.9" - checksum: 10c0/0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72 - languageName: node - linkType: hard - -"yargs-parser@npm:^21.1.1": - version: 21.1.1 - resolution: "yargs-parser@npm:21.1.1" - checksum: 10c0/f84b5e48169479d2f402239c59f084cfd1c3acc197a05c59b98bab067452e6b3ea46d4dd8ba2985ba7b3d32a343d77df0debd6b343e5dae3da2aab2cdf5886b2 - languageName: node - linkType: hard - -"yargs-unparser@npm:2.0.0": - version: 2.0.0 - resolution: "yargs-unparser@npm:2.0.0" - dependencies: - camelcase: "npm:^6.0.0" - decamelize: "npm:^4.0.0" - flat: "npm:^5.0.2" - is-plain-obj: "npm:^2.1.0" - checksum: 10c0/a5a7d6dc157efa95122e16780c019f40ed91d4af6d2bac066db8194ed0ec5c330abb115daa5a79ff07a9b80b8ea80c925baacf354c4c12edd878c0529927ff03 - languageName: node - linkType: hard - -"yargs@npm:16.2.0": - version: 16.2.0 - resolution: "yargs@npm:16.2.0" - dependencies: - cliui: "npm:^7.0.2" - escalade: "npm:^3.1.1" - get-caller-file: "npm:^2.0.5" - require-directory: "npm:^2.1.1" - string-width: "npm:^4.2.0" - y18n: "npm:^5.0.5" - yargs-parser: "npm:^20.2.2" - checksum: 10c0/b1dbfefa679848442454b60053a6c95d62f2d2e21dd28def92b647587f415969173c6e99a0f3bab4f1b67ee8283bf735ebe3544013f09491186ba9e8a9a2b651 - languageName: node - linkType: hard - -"yargs@npm:^17.0.0, yargs@npm:^17.0.1, yargs@npm:^17.6.0": - version: 17.7.2 - resolution: "yargs@npm:17.7.2" - dependencies: - cliui: "npm:^8.0.1" - escalade: "npm:^3.1.1" - get-caller-file: "npm:^2.0.5" - require-directory: "npm:^2.1.1" - string-width: "npm:^4.2.3" - y18n: "npm:^5.0.5" - yargs-parser: "npm:^21.1.1" - checksum: 10c0/ccd7e723e61ad5965fffbb791366db689572b80cca80e0f96aad968dfff4156cd7cd1ad18607afe1046d8241e6fb2d6c08bf7fa7bfb5eaec818735d8feac8f05 - languageName: node - linkType: hard - -"yauzl@npm:^2.10.0": - version: 2.10.0 - resolution: "yauzl@npm:2.10.0" - dependencies: - buffer-crc32: "npm:~0.2.3" - fd-slicer: "npm:~1.1.0" - checksum: 10c0/f265002af7541b9ec3589a27f5fb8f11cf348b53cc15e2751272e3c062cd73f3e715bc72d43257de71bbaecae446c3f1b14af7559e8ab0261625375541816422 - languageName: node - linkType: hard - -"yn@npm:3.1.1": - version: 3.1.1 - resolution: "yn@npm:3.1.1" - checksum: 10c0/0732468dd7622ed8a274f640f191f3eaf1f39d5349a1b72836df484998d7d9807fbea094e2f5486d6b0cd2414aad5775972df0e68f8604db89a239f0f4bf7443 - languageName: node - linkType: hard - -"yocto-queue@npm:^0.1.0": - version: 0.1.0 - resolution: "yocto-queue@npm:0.1.0" - checksum: 10c0/dceb44c28578b31641e13695d200d34ec4ab3966a5729814d5445b194933c096b7ced71494ce53a0e8820685d1d010df8b2422e5bf2cdea7e469d97ffbea306f - languageName: node - linkType: hard - -"zod@npm:^3.22.4": - version: 3.23.8 - resolution: "zod@npm:3.23.8" - checksum: 10c0/8f14c87d6b1b53c944c25ce7a28616896319d95bc46a9660fe441adc0ed0a81253b02b5abdaeffedbeb23bdd25a0bf1c29d2c12dd919aef6447652dd295e3e69 - languageName: node - linkType: hard + version "0.0.4" + resolved "https://github.com/oxen-io/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6" + +dargs@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" + integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg== + +data-urls@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-4.0.0.tgz#333a454eca6f9a5b7b0f1013ff89074c3f522dd4" + integrity sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g== + dependencies: + abab "^2.0.6" + whatwg-mimetype "^3.0.0" + whatwg-url "^12.0.0" + +data-view-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2" + integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2" + integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a" + integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +date-fns@^3.3.1: + version "3.6.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf" + integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww== + +dayjs@^1.8.15: + version "1.11.11" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e" + integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg== + +debug@2.6.9, debug@^2.2.0, debug@^2.6.8, debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +debug@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + +debug@^4: + version "4.3.5" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e" + integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== + dependencies: + ms "2.1.2" + +decamelize-keys@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" + integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg== + dependencies: + decamelize "^1.1.0" + map-obj "^1.0.0" + +decamelize@^1.1.0, decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== + +decamelize@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" + integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== + +decimal.js@^10.4.3: + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== + +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + +deep-diff@^0.3.5: + version "0.3.8" + resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" + integrity sha512-yVn6RZmHiGnxRKR9sJb3iVV2XTF1Ghh2DiWRZ3dMnGc43yUdWWF/kX6lQyk3+P84iprfWKU/8zFTrlkvtFm1ug== + +deep-eql@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d" + integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw== + dependencies: + type-detect "^4.0.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +deep-is@^0.1.3, deep-is@~0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +deepmerge@^4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" + integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== + +defaults@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" + integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A== + dependencies: + clone "^1.0.2" + +defer-to-connect@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" + integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== + +define-data-property@^1.0.1, define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + +define-properties@^1.2.0, define-properties@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c" + integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg== + dependencies: + define-data-property "^1.0.1" + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== + +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== + +denodeify@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631" + integrity sha512-KNTihKNmQENUZeKu5fzfpzRqR5S2VMp4gl9RFHiWzj9DfvYQPMJ6XHKNaQxaGCXwPk6y9yme3aUoaiAe+KX+vg== + +depd@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== + +detect-node@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== + +diff@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" + integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== + +diff@^4.0.1, diff@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + +dir-compare@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" + integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== + dependencies: + buffer-equal "1.0.0" + colors "1.0.3" + commander "2.9.0" + minimatch "3.0.4" + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +dmg-builder@23.0.8: + version "23.0.8" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.8.tgz#c68d9811da8d1891e6121c1e0807635519856800" + integrity sha512-dXguxjekxY70hzgAW+0NPCI7bagQ2ZrLDwYf1bvHSwlVfVizyJ/EC+e71U/NUgiWlXU5nogbWcGC3H74mFu0iw== + dependencies: + app-builder-lib "23.0.8" + builder-util "23.0.8" + builder-util-runtime "9.0.2" + fs-extra "^10.0.0" + iconv-lite "^0.6.2" + js-yaml "^4.1.0" + optionalDependencies: + dmg-license "^1.0.11" + +dmg-builder@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" + integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== + dependencies: + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + fs-extra "^10.0.0" + iconv-lite "^0.6.2" + js-yaml "^4.1.0" + optionalDependencies: + dmg-license "^1.0.11" + +dmg-license@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" + integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== + dependencies: + "@types/plist" "^3.0.1" + "@types/verror" "^1.10.3" + ajv "^6.10.0" + crc "^3.8.0" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" + smart-buffer "^4.0.2" + verror "^1.10.0" + +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== + dependencies: + esutils "^2.0.2" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +dom-helpers@^5.0.1, dom-helpers@^5.1.3: + version "5.2.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902" + integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA== + dependencies: + "@babel/runtime" "^7.8.7" + csstype "^3.0.2" + +domexception@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" + integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== + dependencies: + webidl-conversions "^7.0.0" + +dompurify@^2.0.7: + version "2.5.4" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.4.tgz#347e91070963b22db31c7c8d0ce9a0a2c3c08746" + integrity sha512-l5NNozANzaLPPe0XaAwvg3uZcHtDBnziX/HjsY1UcDj1MxTK8Dd0Kv096jyPK5HRzs/XM5IMj20dW8Fk+HnbUA== + +dot-prop@^5.1.0, dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== + +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== + +ejs@^3.1.7: + version "3.1.10" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" + integrity sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA== + dependencies: + jake "^10.8.5" + +electron-builder@23.0.8: + version "23.0.8" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.8.tgz#7379b91905aa73d4757234550d76dbce3fd17433" + integrity sha512-7WxdR4+l+VL4QN/K6NdqRQg7+cbIka4By1+4eN8odMPySSTI5d6nrV8R+SSRt9MXeWVdWlW8RCX5Pk6L0oaRug== + dependencies: + "@types/yargs" "^17.0.1" + app-builder-lib "23.0.8" + builder-util "23.0.8" + builder-util-runtime "9.0.2" + chalk "^4.1.1" + dmg-builder "23.0.8" + fs-extra "^10.0.0" + is-ci "^3.0.0" + lazy-val "^1.0.5" + read-config-file "6.2.0" + update-notifier "^5.1.0" + yargs "^17.0.1" + +electron-is-accelerator@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b" + integrity sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA== + +electron-localshortcut@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz#cfc83a3eff5e28faf98ddcc87f80a2ce4f623cd3" + integrity sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q== + dependencies: + debug "^4.0.1" + electron-is-accelerator "^0.1.0" + keyboardevent-from-electron-accelerator "^2.0.0" + keyboardevents-areequal "^0.2.1" + +electron-osx-sign@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" + integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== + dependencies: + bluebird "^3.5.0" + compare-version "^0.1.2" + debug "^2.6.8" + isbinaryfile "^3.0.2" + minimist "^1.2.0" + plist "^3.0.1" + +electron-publish@23.0.8: + version "23.0.8" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.8.tgz#a55b0c4a9ceec1eadb9b1b19194b9d9f2ae4ec33" + integrity sha512-GnqJH7Wh8LnapN4npl1Xs2Er/486/qxE3dV42WxXHX2VeoKAJTOuCzOVWCxpajaR3Msji4SkS0p81R018uK6Mg== + dependencies: + "@types/fs-extra" "^9.0.11" + builder-util "23.0.8" + builder-util-runtime "9.0.2" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" + +electron-publish@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" + integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== + dependencies: + "@types/fs-extra" "^9.0.11" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" + +electron-to-chromium@^1.4.668: + version "1.4.783" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.783.tgz#933887165b8b6025a81663d2d97cf4b85cde27b2" + integrity sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ== + +electron-updater@^4.2.2: + version "4.6.5" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.5.tgz#e9a75458bbfd6bb41a58a829839e150ad2eb2d3d" + integrity sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA== + dependencies: + "@types/semver" "^7.3.6" + builder-util-runtime "8.9.2" + fs-extra "^10.0.0" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + lodash.escaperegexp "^4.1.2" + lodash.isequal "^4.5.0" + semver "^7.3.5" + +electron@*: + version "30.0.8" + resolved "https://registry.yarnpkg.com/electron/-/electron-30.0.8.tgz#aa54bab26ce706c9e1b244d79047a451733eb4b0" + integrity sha512-ivzXJJ/9gdb4oOw+5SDuaZpSInz8C+Z021dKZfFLMltKbDa4sSqt5cRBiUg7J36Z2kdus+Jai0bdHWutYE9wAA== + dependencies: + "@electron/get" "^2.0.0" + "@types/node" "^20.9.0" + extract-zip "^2.0.1" + +electron@25.8.4: + version "25.8.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.4.tgz#b50877aac7d96323920437baf309ad86382cb455" + integrity sha512-hUYS3RGdaa6E1UWnzeGnsdsBYOggwMMg4WGxNGvAoWtmRrr6J1BsjFW/yRq4WsJHJce2HdzQXtz4OGXV6yUCLg== + dependencies: + "@electron/get" "^2.0.0" + "@types/node" "^18.11.18" + extract-zip "^2.0.1" + +emoji-mart@^5.5.2: + version "5.6.0" + resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.6.0.tgz#71b3ed0091d3e8c68487b240d9d6d9a73c27f023" + integrity sha512-eJp3QRe79pjwa+duv+n7+5YsNhRcMl812EcFVwrnRvYKoNPoQb5qxU8DG6Bgwji0akHdp6D4Ln6tYLG58MFSow== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + +emojis-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== + +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== + +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enhanced-resolve@^5.0.0, enhanced-resolve@^5.12.0, enhanced-resolve@^5.16.0: + version "5.16.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz#e8bc63d51b826d6f1cbc0a150ecb5a8b0c62e567" + integrity sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +entities@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== + +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +envinfo@^7.10.0, envinfo@^7.7.3: + version "7.13.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.13.0.tgz#81fbb81e5da35d74e814941aeab7c325a606fb31" + integrity sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q== + +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +error-stack-parser@^2.0.6: + version "2.1.4" + resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" + integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ== + dependencies: + stackframe "^1.3.4" + +errorhandler@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91" + integrity sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A== + dependencies: + accepts "~1.3.7" + escape-html "~1.0.3" + +es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3: + version "1.23.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" + integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== + dependencies: + array-buffer-byte-length "^1.0.1" + arraybuffer.prototype.slice "^1.0.3" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + data-view-buffer "^1.0.1" + data-view-byte-length "^1.0.1" + data-view-byte-offset "^1.0.0" + es-define-property "^1.0.0" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-set-tostringtag "^2.0.3" + es-to-primitive "^1.2.1" + function.prototype.name "^1.1.6" + get-intrinsic "^1.2.4" + get-symbol-description "^1.0.2" + globalthis "^1.0.3" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + has-proto "^1.0.3" + has-symbols "^1.0.3" + hasown "^2.0.2" + internal-slot "^1.0.7" + is-array-buffer "^3.0.4" + is-callable "^1.2.7" + is-data-view "^1.0.1" + is-negative-zero "^2.0.3" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.3" + is-string "^1.0.7" + is-typed-array "^1.1.13" + is-weakref "^1.0.2" + object-inspect "^1.13.1" + object-keys "^1.1.1" + object.assign "^4.1.5" + regexp.prototype.flags "^1.5.2" + safe-array-concat "^1.1.2" + safe-regex-test "^1.0.3" + string.prototype.trim "^1.2.9" + string.prototype.trimend "^1.0.8" + string.prototype.trimstart "^1.0.8" + typed-array-buffer "^1.0.2" + typed-array-byte-length "^1.0.1" + typed-array-byte-offset "^1.0.2" + typed-array-length "^1.0.6" + unbox-primitive "^1.0.2" + which-typed-array "^1.1.15" + +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.1.0, es-errors@^1.2.1, es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + +es-iterator-helpers@^1.0.12: + version "1.0.19" + resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz#117003d0e5fec237b4b5c08aded722e0c6d50ca8" + integrity sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.3" + es-errors "^1.3.0" + es-set-tostringtag "^2.0.3" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + globalthis "^1.0.3" + has-property-descriptors "^1.0.2" + has-proto "^1.0.3" + has-symbols "^1.0.3" + internal-slot "^1.0.7" + iterator.prototype "^1.1.2" + safe-array-concat "^1.1.2" + +es-module-lexer@^1.2.1: + version "1.5.3" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.3.tgz#25969419de9c0b1fbe54279789023e8a9a788412" + integrity sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg== + +es-object-atoms@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941" + integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw== + dependencies: + es-errors "^1.3.0" + +es-set-tostringtag@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" + integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== + dependencies: + get-intrinsic "^1.2.4" + has-tostringtag "^1.0.2" + hasown "^2.0.1" + +es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" + integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== + dependencies: + hasown "^2.0.0" + +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + +es6-error@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" + integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== + +escalade@^3.1.1, escalade@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" + integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== + +escape-goat@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== + +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== + +escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== + +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + +escodegen@^1.13.0: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +eslint-config-airbnb-base@^15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236" + integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig== + dependencies: + confusing-browser-globals "^1.0.10" + object.assign "^4.1.2" + object.entries "^1.1.5" + semver "^6.3.0" + +eslint-config-prettier@9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f" + integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw== + +eslint-import-resolver-node@^0.3.9: + version "0.3.9" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac" + integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g== + dependencies: + debug "^3.2.7" + is-core-module "^2.13.0" + resolve "^1.22.4" + +eslint-import-resolver-typescript@3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz#7b983680edd3f1c5bce1a5829ae0bc2d57fe9efa" + integrity sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg== + dependencies: + debug "^4.3.4" + enhanced-resolve "^5.12.0" + eslint-module-utils "^2.7.4" + fast-glob "^3.3.1" + get-tsconfig "^4.5.0" + is-core-module "^2.11.0" + is-glob "^4.0.3" + +eslint-module-utils@^2.7.4, eslint-module-utils@^2.8.0: + version "2.8.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34" + integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q== + dependencies: + debug "^3.2.7" + +eslint-plugin-import@2.29.1: + version "2.29.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643" + integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw== + dependencies: + array-includes "^3.1.7" + array.prototype.findlastindex "^1.2.3" + array.prototype.flat "^1.3.2" + array.prototype.flatmap "^1.3.2" + debug "^3.2.7" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.9" + eslint-module-utils "^2.8.0" + hasown "^2.0.0" + is-core-module "^2.13.1" + is-glob "^4.0.3" + minimatch "^3.1.2" + object.fromentries "^2.0.7" + object.groupby "^1.0.1" + object.values "^1.1.7" + semver "^6.3.1" + tsconfig-paths "^3.15.0" + +eslint-plugin-mocha@^10.1.0: + version "10.4.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-mocha/-/eslint-plugin-mocha-10.4.3.tgz#bf641379d9f1c7d6a84646a3fc1a0baa50da8bfd" + integrity sha512-emc4TVjq5Ht0/upR+psftuz6IBG5q279p+1dSRDeHf+NS9aaerBi3lXKo1SEzwC29hFIW21gO89CEWSvRsi8IQ== + dependencies: + eslint-utils "^3.0.0" + globals "^13.24.0" + rambda "^7.4.0" + +eslint-plugin-more@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-more/-/eslint-plugin-more-1.0.5.tgz#667bffc2a64bde2d48b98c8faa111e213b2f873f" + integrity sha512-zjDza5jeNBHWf8ZezyW2Llk99abndcGlSz9GIKgVOGwISx0m+f4QoZAapjSmUjKSxHvmOa7Lt68Pk8XbRzWb7w== + +eslint-plugin-react-hooks@^4.6.0: + version "4.6.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596" + integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ== + +eslint-plugin-react@7.33.2: + version "7.33.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608" + integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw== + dependencies: + array-includes "^3.1.6" + array.prototype.flatmap "^1.3.1" + array.prototype.tosorted "^1.1.1" + doctrine "^2.1.0" + es-iterator-helpers "^1.0.12" + estraverse "^5.3.0" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.1.2" + object.entries "^1.1.6" + object.fromentries "^2.0.6" + object.hasown "^1.1.2" + object.values "^1.1.6" + prop-types "^15.8.1" + resolve "^2.0.0-next.4" + semver "^6.3.1" + string.prototype.matchall "^4.0.8" + +eslint-scope@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-scope@^7.2.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" + integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" + integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== + +eslint@8.57.0: + version "8.57.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" + integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@eslint-community/regexpp" "^4.6.1" + "@eslint/eslintrc" "^2.1.4" + "@eslint/js" "8.57.0" + "@humanwhocodes/config-array" "^0.11.14" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" + "@ungap/structured-clone" "^1.2.0" + ajv "^6.12.4" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.3.2" + doctrine "^3.0.0" + escape-string-regexp "^4.0.0" + eslint-scope "^7.2.2" + eslint-visitor-keys "^3.4.3" + espree "^9.6.1" + esquery "^1.4.2" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.19.0" + graphemer "^1.4.0" + ignore "^5.2.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + is-path-inside "^3.0.3" + js-yaml "^4.1.0" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.1.2" + natural-compare "^1.4.0" + optionator "^0.9.3" + strip-ansi "^6.0.1" + text-table "^0.2.0" + +espree@^9.0.0, espree@^9.6.0, espree@^9.6.1: + version "9.6.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" + integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== + dependencies: + acorn "^8.9.0" + acorn-jsx "^5.3.2" + eslint-visitor-keys "^3.4.1" + +esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.4.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" + integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1, estraverse@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== + +event-target-shim@^5.0.0, event-target-shim@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" + integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== + +eventemitter3@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== + +events@^3.2.0, events@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + +execa@7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9" + integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.1" + human-signals "^4.3.0" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^3.0.7" + strip-final-newline "^3.0.0" + +execa@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" + integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + +execa@^5.0.0, execa@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + strip-final-newline "^2.0.0" + +exeunt@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/exeunt/-/exeunt-1.1.0.tgz#af72db6f94b3cb75e921aee375d513049843d284" + integrity sha512-dd++Yn/0Fp+gtJ04YHov7MeAii+LFivJc6KqnJNfplzLVUkUDrfKoQDTLlCgzcW15vY5hKlHasWeIsQJ8agHsw== + +extract-zip@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== + dependencies: + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" + +extsprintf@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== + +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@^3.2.9, fast-glob@^3.3.1, fast-glob@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" + integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== + +fast-loops@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/fast-loops/-/fast-loops-1.1.3.tgz#ce96adb86d07e7bf9b4822ab9c6fac9964981f75" + integrity sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g== + +fast-shallow-equal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz#d4dcaf6472440dcefa6f88b98e3251e27f25628b" + integrity sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw== + +fast-xml-parser@^4.0.12, fast-xml-parser@^4.2.4: + version "4.4.0" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.0.tgz#341cc98de71e9ba9e651a67f41f1752d1441a501" + integrity sha512-kLY3jFlwIYwBNDojclKsNAC12sfD6NwW74QB2CoNGPvtVxjliYehVunB3HYyNi+n4Tt1dAcgwYvmKF/Z18flqg== + dependencies: + strnum "^1.0.5" + +fastest-levenshtein@^1.0.12: + version "1.0.16" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" + integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== + +fastest-stable-stringify@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/fastest-stable-stringify/-/fastest-stable-stringify-2.0.2.tgz#3757a6774f6ec8de40c4e86ec28ea02417214c76" + integrity sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q== + +fastq@^1.6.0: + version "1.17.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" + integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== + dependencies: + reusify "^1.0.4" + +fb-watchman@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" + integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== + dependencies: + bser "2.1.1" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== + dependencies: + pend "~1.2.0" + +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + +file-type@^10.10.0: + version "10.11.0" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890" + integrity sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw== + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +filelist@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== + dependencies: + minimatch "^5.0.1" + +filesize@3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" + integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg== + +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== + dependencies: + to-regex-range "^5.0.1" + +finalhandler@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + +find-cache-dir@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" + integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== + dependencies: + commondir "^1.0.1" + make-dir "^2.0.0" + pkg-dir "^3.0.0" + +find-up@5.0.0, find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + dependencies: + locate-path "^3.0.0" + +find-up@^4.0.0, find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +find-yarn-workspace-root@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" + integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== + dependencies: + micromatch "^4.0.2" + +firstline@1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/firstline/-/firstline-1.2.1.tgz#b88673c42009f8821fac2926e99720acee924fae" + integrity sha512-6eMQNJtDzyXSC1yeCBWspqA6LeV5la2XHGTXQq4O0xkglAutpyny/sB+zVdXTZ9nzcDW9ZGLxwXXkB+ZEtJuPw== + +flat-cache@^3.0.4: + version "3.2.0" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" + integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw== + dependencies: + flatted "^3.2.9" + keyv "^4.5.3" + rimraf "^3.0.2" + +flat@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" + integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== + +flatted@^3.2.9: + version "3.3.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" + integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== + +flow-enums-runtime@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/flow-enums-runtime/-/flow-enums-runtime-0.0.6.tgz#5bb0cd1b0a3e471330f4d109039b7eba5cb3e787" + integrity sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw== + +flow-parser@0.*: + version "0.236.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.236.0.tgz#8e8e6c59ff7e8d196c0ed215b3919320a1c6e332" + integrity sha512-0OEk9Gr+Yj7wjDW2KgaNYUypKau71jAfFyeLQF5iVtxqc6uJHag/MT7pmaEApf4qM7u86DkBcd4ualddYMfbLw== + +focus-trap-react@^10.2.3: + version "10.2.3" + resolved "https://registry.yarnpkg.com/focus-trap-react/-/focus-trap-react-10.2.3.tgz#a5a2ea7fbb042ffa4337fde72758325ed0fb793a" + integrity sha512-YXBpFu/hIeSu6NnmV2xlXzOYxuWkoOtar9jzgp3lOmjWLWY59C/b8DtDHEAV4SPU07Nd/t+nS/SBNGkhUBFmEw== + dependencies: + focus-trap "^7.5.4" + tabbable "^6.2.0" + +focus-trap@^7.5.4: + version "7.5.4" + resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.5.4.tgz#6c4e342fe1dae6add9c2aa332a6e7a0bbd495ba2" + integrity sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w== + dependencies: + tabbable "^6.2.0" + +follow-redirects@^1.15.6: + version "1.15.6" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== + +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" + +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== + +fs-extra@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3" + integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^1.0.0" + +fs-extra@^10.0.0, fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-extra@^11.0.0: + version "11.2.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" + integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-extra@^9.0.0, fs-extra@^9.0.1: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== + +fsevents@^2.3.2, fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + +function.prototype.name@^1.1.5, function.prototype.name@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" + integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + functions-have-names "^1.2.3" + +functions-have-names@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" + integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== + +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" + +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +get-caller-file@^2.0.1, get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-func-name@^2.0.1, get-func-name@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41" + integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ== + +get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + +get-stream@^5.0.0, get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-stream@^6.0.0, get-stream@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + +get-symbol-description@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" + integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== + dependencies: + call-bind "^1.0.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + +get-tsconfig@^4.5.0: + version "4.7.5" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.5.tgz#5e012498579e9a6947511ed0cd403272c7acbbaf" + integrity sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw== + dependencies: + resolve-pkg-maps "^1.0.0" + +getobject@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/getobject/-/getobject-1.1.1.tgz#29f7858609fee7ef1c58d062f1b2335e425bdb45" + integrity sha512-Rftr+NsUMxFcCmFopFmyCCfsJPaqUmf7TW61CtKMu0aE93ir62I6VjXt2koiCQgcunGgVog/U6g24tBPq67rlg== + +git-raw-commits@^2.0.11: + version "2.0.11" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723" + integrity sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A== + dependencies: + dargs "^7.0.0" + lodash "^4.17.15" + meow "^8.0.0" + split2 "^3.0.0" + through2 "^4.0.0" + +glob-parent@^5.1.2, glob-parent@^6.0.1, glob-parent@^6.0.2, glob-parent@~5.1.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== + dependencies: + is-glob "^4.0.3" + +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + +glob@10.3.10: + version "10.3.10" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.5" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + +glob@7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^6.0.1: + version "6.0.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" + integrity sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A== + dependencies: + inflight "^1.0.4" + inherits "2" + minimatch "2 || 3" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.6: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== + dependencies: + boolean "^3.0.1" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + +global-dirs@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" + integrity sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg== + dependencies: + ini "^1.3.4" + +global-dirs@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485" + integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA== + dependencies: + ini "2.0.0" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globals@^13.19.0, globals@^13.24.0: + version "13.24.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" + integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ== + dependencies: + type-fest "^0.20.2" + +globalthis@^1.0.1, globalthis@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236" + integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ== + dependencies: + define-properties "^1.2.1" + gopd "^1.0.1" + +globby@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^3.0.0" + +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + +got@^11.8.5, got@^9.6.0: + version "11.8.6" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" + integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== + dependencies: + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" + +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.9: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + +"graceful-readlink@>= 1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" + integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w== + +graphemer@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" + integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== + +hard-rejection@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" + integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== + +has-bigints@^1.0.1, has-bigints@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" + integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + +has-proto@^1.0.1, has-proto@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== + +has-symbols@^1.0.2, has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +has-tostringtag@^1.0.0, has-tostringtag@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" + integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== + dependencies: + has-symbols "^1.0.3" + +has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== + +has-yarn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== + +hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + +he@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + +hermes-estree@0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.19.1.tgz#d5924f5fac2bf0532547ae9f506d6db8f3c96392" + integrity sha512-daLGV3Q2MKk8w4evNMKwS8zBE/rcpA800nu1Q5kM08IKijoSnPe9Uo1iIxzPKRkn95IxxsgBMPeYHt3VG4ej2g== + +hermes-estree@0.20.1: + version "0.20.1" + resolved "https://registry.yarnpkg.com/hermes-estree/-/hermes-estree-0.20.1.tgz#0b9a544cf883a779a8e1444b915fa365bef7f72d" + integrity sha512-SQpZK4BzR48kuOg0v4pb3EAGNclzIlqMj3Opu/mu7bbAoFw6oig6cEt/RAi0zTFW/iW6Iz9X9ggGuZTAZ/yZHg== + +hermes-parser@0.19.1: + version "0.19.1" + resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.19.1.tgz#1044348097165b7c93dc198a80b04ed5130d6b1a" + integrity sha512-Vp+bXzxYJWrpEuJ/vXxUsLnt0+y4q9zyi4zUlkLqD8FKv4LjIfOvP69R/9Lty3dCyKh0E2BU7Eypqr63/rKT/A== + dependencies: + hermes-estree "0.19.1" + +hermes-parser@0.20.1: + version "0.20.1" + resolved "https://registry.yarnpkg.com/hermes-parser/-/hermes-parser-0.20.1.tgz#ad10597b99f718b91e283f81cbe636c50c3cff92" + integrity sha512-BL5P83cwCogI8D7rrDCgsFY0tdYUtmFP9XaXtl2IQjC+2Xo+4okjfXintlTxcIwl4qeGddEl28Z11kbVIw0aNA== + dependencies: + hermes-estree "0.20.1" + +hermes-profile-transformer@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/hermes-profile-transformer/-/hermes-profile-transformer-0.0.6.tgz#bd0f5ecceda80dd0ddaae443469ab26fb38fc27b" + integrity sha512-cnN7bQUm65UWOy6cbGcCcZ3rpwW8Q/j4OP5aWRhEry4Z2t2aR1cjrbp0BS+KiBN0smvP1caBgAuxutvyvJILzQ== + dependencies: + source-map "^0.7.3" + +hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== + dependencies: + react-is "^16.7.0" + +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + +hosted-git-info@^4.0.1, hosted-git-info@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== + dependencies: + lru-cache "^6.0.0" + +html-encoding-sniffer@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" + integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== + dependencies: + whatwg-encoding "^2.0.0" + +http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== + +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== + dependencies: + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" + +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + +http2-wrapper@^1.0.0-beta.5.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + +https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== + +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +human-signals@^4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" + integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== + +husky@^8.0.0: + version "8.0.3" + resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" + integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg== + +hyphenate-style-name@^1.0.3: + version "1.0.5" + resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.5.tgz#70b68605ee601b7142362239a0236159a8b2dc33" + integrity sha512-fedL7PRwmeVkgyhu9hLeTBaI6wcGk7JGJswdaRsa5aUbkXI1kr1xZwTPBtaYPpwf56878iDek6VbVnuWMebJmw== + +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== + dependencies: + cli-truncate "^2.1.0" + node-addon-api "^1.6.3" + +iconv-lite@0.6.3, iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +icss-utils@^5.0.0, icss-utils@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +ignore@^5.2.0, ignore@^5.2.4: + version "5.3.1" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" + integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== + +image-size@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.1.1.tgz#ddd67d4dc340e52ac29ce5f546a09f4e29e840ac" + integrity sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ== + dependencies: + queue "6.0.2" + +image-type@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/image-type/-/image-type-4.1.0.tgz#72a88d64ff5021371ed67b9a466442100be57cd1" + integrity sha512-CFJMJ8QK8lJvRlTCEgarL4ro6hfDQKif2HjSvYCdQZESaIPV4v9imrf7BQHK+sQeTeNeMpWciR9hyC/g8ybXEg== + dependencies: + file-type "^10.10.0" + +immer@^9.0.7: + version "9.0.21" + resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176" + integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA== + +immutable@^4.0.0: + version "4.3.6" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.6.tgz#6a05f7858213238e587fb83586ffa3b4b27f0447" + integrity sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ== + +import-fresh@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" + integrity sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg== + dependencies: + caller-path "^2.0.0" + resolve-from "^3.0.0" + +import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== + +import-local@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== + +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@2.0.0, ini@^1.3.4, ini@^1.3.6, ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +inline-style-prefixer@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-7.0.0.tgz#991d550735d42069f528ac1bcdacd378d1305442" + integrity sha512-I7GEdScunP1dQ6IM2mQWh6v0mOYdYmH3Bp31UecKdrcUgcURTcctSe1IECdUznSHKSmsHtjrT3CwCPI1pyxfUQ== + dependencies: + css-in-js-utils "^3.1.0" + fast-loops "^1.1.3" + +internal-slot@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" + integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== + dependencies: + es-errors "^1.3.0" + hasown "^2.0.0" + side-channel "^1.0.4" + +interpret@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4" + integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ== + +invariant@^2.2.4: + version "2.2.4" + resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" + integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== + dependencies: + loose-envify "^1.0.0" + +invert-kv@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-3.0.1.tgz#a93c7a3d4386a1dc8325b97da9bb1620c0282523" + integrity sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw== + +is-array-buffer@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" + integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + +is-async-function@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" + integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== + dependencies: + has-tostringtag "^1.0.0" + +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" + integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== + +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + +is-ci@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== + dependencies: + ci-info "^3.2.0" + +is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0: + version "2.13.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" + integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== + dependencies: + hasown "^2.0.0" + +is-data-view@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" + integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w== + dependencies: + is-typed-array "^1.1.13" + +is-date-object@^1.0.1, is-date-object@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" + +is-directory@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" + integrity sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw== + +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== + +is-finalizationregistry@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6" + integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw== + dependencies: + call-bind "^1.0.2" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-fullwidth-code-point@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" + integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== + +is-generator-function@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + dependencies: + has-tostringtag "^1.0.0" + +is-glob@^4.0.0, is-glob@^4.0.3, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-installed-globally@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== + dependencies: + global-dirs "^3.0.0" + is-path-inside "^3.0.2" + +is-interactive@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" + integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== + +is-map@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e" + integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw== + +is-negative-zero@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" + integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== + +is-npm@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" + integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== + +is-number-object@^1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" + integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== + dependencies: + has-tostringtag "^1.0.0" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-path-inside@^3.0.2, is-path-inside@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + +is-plain-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== + +is-plain-obj@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + +is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== + +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-set@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d" + integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg== + +is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" + integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== + dependencies: + call-bind "^1.0.7" + +is-stream@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== + +is-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" + integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== + +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + +is-text-path@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e" + integrity sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w== + dependencies: + text-extensions "^1.0.0" + +is-typed-array@^1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" + integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== + dependencies: + which-typed-array "^1.1.14" + +is-typedarray@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== + +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + +is-weakmap@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd" + integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w== + +is-weakref@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== + dependencies: + call-bind "^1.0.2" + +is-weakset@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007" + integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ== + dependencies: + call-bind "^1.0.7" + get-intrinsic "^1.2.4" + +is-wsl@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" + integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw== + +is-wsl@^2.1.1, is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +is-yarn-global@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== + +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== + +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== + +isbinaryfile@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== + dependencies: + buffer-alloc "^1.2.0" + +isbinaryfile@^4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" + integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== + +iterator.prototype@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0" + integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w== + dependencies: + define-properties "^1.2.1" + get-intrinsic "^1.2.1" + has-symbols "^1.0.3" + reflect.getprototypeof "^1.0.4" + set-function-name "^2.0.1" + +jackspeak@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + +jake@^10.8.5: + version "10.9.1" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.9.1.tgz#8dc96b7fcc41cb19aa502af506da4e1d56f5e62b" + integrity sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w== + dependencies: + async "^3.2.3" + chalk "^4.0.2" + filelist "^1.0.4" + minimatch "^3.1.2" + +jest-environment-node@^29.6.3: + version "29.7.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376" + integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw== + dependencies: + "@jest/environment" "^29.7.0" + "@jest/fake-timers" "^29.7.0" + "@jest/types" "^29.6.3" + "@types/node" "*" + jest-mock "^29.7.0" + jest-util "^29.7.0" + +jest-get-type@^29.6.3: + version "29.6.3" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1" + integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw== + +jest-message-util@^29.7.0: + version "29.7.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3" + integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w== + dependencies: + "@babel/code-frame" "^7.12.13" + "@jest/types" "^29.6.3" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + micromatch "^4.0.4" + pretty-format "^29.7.0" + slash "^3.0.0" + stack-utils "^2.0.3" + +jest-mock@^29.7.0: + version "29.7.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347" + integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw== + dependencies: + "@jest/types" "^29.6.3" + "@types/node" "*" + jest-util "^29.7.0" + +jest-util@^29.7.0: + version "29.7.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc" + integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA== + dependencies: + "@jest/types" "^29.6.3" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + +jest-validate@^29.6.3: + version "29.7.0" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c" + integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw== + dependencies: + "@jest/types" "^29.6.3" + camelcase "^6.2.0" + chalk "^4.0.0" + jest-get-type "^29.6.3" + leven "^3.1.0" + pretty-format "^29.7.0" + +jest-worker@^27.4.5: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +jest-worker@^29.6.3: + version "29.7.0" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a" + integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw== + dependencies: + "@types/node" "*" + jest-util "^29.7.0" + merge-stream "^2.0.0" + supports-color "^8.0.0" + +joi@^17.2.1: + version "17.13.1" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.1.tgz#9c7b53dc3b44dd9ae200255cc3b398874918a6ca" + integrity sha512-vaBlIKCyo4FCUtCm7Eu4QZd/q02bWcxfUO6YSXAZOWF6gzcLBeba8kwotUdYJjDLW8Cz8RywsSOqiNJZW0mNvg== + dependencies: + "@hapi/hoek" "^9.3.0" + "@hapi/topo" "^5.1.0" + "@sideway/address" "^4.1.5" + "@sideway/formula" "^3.0.1" + "@sideway/pinpoint" "^2.0.0" + +jpeg-js@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa" + integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg== + +js-cookie@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" + integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== + +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@4.1.0, js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js2xmlparser@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a" + integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA== + dependencies: + xmlcreate "^2.0.4" + +jsc-android@^250231.0.0: + version "250231.0.0" + resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-250231.0.0.tgz#91720f8df382a108872fa4b3f558f33ba5e95262" + integrity sha512-rS46PvsjYmdmuz1OAWXY/1kCYG7pnf1TBqeTiOJr1iDz7s5DLxxC9n/ZMknLDxzYzNVfI7R95MH10emSSG1Wuw== + +jsc-safe-url@^0.2.2: + version "0.2.4" + resolved "https://registry.yarnpkg.com/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz#141c14fbb43791e88d5dc64e85a374575a83477a" + integrity sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q== + +jscodeshift@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.14.0.tgz#7542e6715d6d2e8bde0b4e883f0ccea358b46881" + integrity sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA== + dependencies: + "@babel/core" "^7.13.16" + "@babel/parser" "^7.13.16" + "@babel/plugin-proposal-class-properties" "^7.13.0" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8" + "@babel/plugin-proposal-optional-chaining" "^7.13.12" + "@babel/plugin-transform-modules-commonjs" "^7.13.8" + "@babel/preset-flow" "^7.13.13" + "@babel/preset-typescript" "^7.13.0" + "@babel/register" "^7.13.16" + babel-core "^7.0.0-bridge.0" + chalk "^4.1.2" + flow-parser "0.*" + graceful-fs "^4.2.4" + micromatch "^4.0.4" + neo-async "^2.5.0" + node-dir "^0.1.17" + recast "^0.21.0" + temp "^0.8.4" + write-file-atomic "^2.3.0" + +jsdoc@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.3.tgz#bfee86c6a82f6823e12b5e8be698fd99ae46c061" + integrity sha512-Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw== + dependencies: + "@babel/parser" "^7.20.15" + "@jsdoc/salty" "^0.2.1" + "@types/markdown-it" "^14.1.1" + bluebird "^3.7.2" + catharsis "^0.9.0" + escape-string-regexp "^2.0.0" + js2xmlparser "^4.0.2" + klaw "^3.0.0" + markdown-it "^14.1.0" + markdown-it-anchor "^8.6.7" + marked "^4.0.10" + mkdirp "^1.0.4" + requizzle "^0.2.3" + strip-json-comments "^3.1.0" + underscore "~1.13.2" + +jsdom-global@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9" + integrity sha512-t1KMcBkz/pT5JrvcJbpUR2u/w1kO9jXctaaGJ0vZDzwFnIvGWw9IDSRciT83kIs8Bnw4qpOl8bQK08V01YgMPg== + +jsdom@^22.1.0: + version "22.1.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.1.0.tgz#0fca6d1a37fbeb7f4aac93d1090d782c56b611c8" + integrity sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw== + dependencies: + abab "^2.0.6" + cssstyle "^3.0.0" + data-urls "^4.0.0" + decimal.js "^10.4.3" + domexception "^4.0.0" + form-data "^4.0.0" + html-encoding-sniffer "^3.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" + is-potential-custom-element-name "^1.0.1" + nwsapi "^2.2.4" + parse5 "^7.1.2" + rrweb-cssom "^0.6.0" + saxes "^6.0.0" + symbol-tree "^3.2.4" + tough-cookie "^4.1.2" + w3c-xmlserializer "^4.0.0" + webidl-conversions "^7.0.0" + whatwg-encoding "^2.0.0" + whatwg-mimetype "^3.0.0" + whatwg-url "^12.0.1" + ws "^8.13.0" + xml-name-validator "^4.0.0" + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== + +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== + +json-parse-better-errors@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== + +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== + +json-stringify-safe@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== + +json5@0.4.0, json5@^1.0.2, json5@^2.1.2, json5@^2.2.0, json5@^2.2.2, json5@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== + optionalDependencies: + graceful-fs "^4.1.6" + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +jsonparse@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== + +"jsx-ast-utils@^2.4.1 || ^3.0.0": + version "3.3.5" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" + integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ== + dependencies: + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + object.assign "^4.1.4" + object.values "^1.1.6" + +just-extend@^4.0.2: + version "4.2.1" + resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744" + integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg== + +keyboardevent-from-electron-accelerator@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz#ace21b1aa4e47148815d160057f9edb66567c50c" + integrity sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA== + +keyboardevents-areequal@^0.2.1: + version "0.2.2" + resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194" + integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw== + +keyv@^4.0.0, keyv@^4.5.3: + version "4.5.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== + dependencies: + json-buffer "3.0.1" + +kind-of@^6.0.2, kind-of@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +klaw-sync@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" + integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== + dependencies: + graceful-fs "^4.1.11" + +klaw@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146" + integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g== + dependencies: + graceful-fs "^4.1.9" + +kleur@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== + +lamejs@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/lamejs/-/lamejs-1.2.1.tgz#0f92d38729213f106d4a19ded20821da7e89c8e4" + integrity sha512-s7bxvjvYthw6oPLCm5pFxvA84wUROODB8jEO2+CE1adhKgrIvVOlmMgY8zyugxGrvRaDHNJanOiS21/emty6dQ== + dependencies: + use-strict "1.0.1" + +latest-version@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== + dependencies: + package-json "^6.3.0" + +lazy-val@^1.0.4, lazy-val@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" + integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== + +lcid@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/lcid/-/lcid-3.1.1.tgz#9030ec479a058fc36b5e8243ebaac8b6ac582fd0" + integrity sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg== + dependencies: + invert-kv "^3.0.0" + +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +"libsession_util_nodejs@link:../libsession-util-nodejs": + version "0.0.0" + uid "" + +libsodium-sumo@^0.7.13: + version "0.7.13" + resolved "https://registry.yarnpkg.com/libsodium-sumo/-/libsodium-sumo-0.7.13.tgz#533b97d2be44b1277e59c1f9f60805978ac5542d" + integrity sha512-zTGdLu4b9zSNLfovImpBCbdAA4xkpkZbMnSQjP8HShyOutnGjRHmSOKlsylh1okao6QhLiz7nG98EGn+04cZjQ== + +libsodium-wrappers-sumo@^0.7.9: + version "0.7.13" + resolved "https://registry.yarnpkg.com/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.13.tgz#a33aea845a0bb56db067548f04feba28c730ab8e" + integrity sha512-lz4YdplzDRh6AhnLGF2Dj2IUj94xRN6Bh8T0HLNwzYGwPehQJX6c7iYVrFUPZ3QqxE0bqC+K0IIqqZJYWumwSQ== + dependencies: + libsodium-sumo "^0.7.13" + +lighthouse-logger@^1.0.0: + version "1.4.2" + resolved "https://registry.yarnpkg.com/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz#aef90f9e97cd81db367c7634292ee22079280aaa" + integrity sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g== + dependencies: + debug "^2.6.9" + marky "^1.2.2" + +lilconfig@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52" + integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== + +lines-and-columns@^1.1.6: + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== + +linkify-it@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec" + integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw== + dependencies: + uc.micro "^1.0.1" + +linkify-it@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421" + integrity sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ== + dependencies: + uc.micro "^2.0.0" + +lint-staged@^14.0.1: + version "14.0.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-14.0.1.tgz#57dfa3013a3d60762d9af5d9c83bdb51291a6232" + integrity sha512-Mw0cL6HXnHN1ag0mN/Dg4g6sr8uf8sn98w2Oc1ECtFto9tvRF7nkXGJRbx8gPlHyoR0pLyBr2lQHbWwmUHe1Sw== + dependencies: + chalk "5.3.0" + commander "11.0.0" + debug "4.3.4" + execa "7.2.0" + lilconfig "2.1.0" + listr2 "6.6.1" + micromatch "4.0.5" + pidtree "0.6.0" + string-argv "0.3.2" + yaml "2.3.1" + +listr2@6.6.1: + version "6.6.1" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-6.6.1.tgz#08b2329e7e8ba6298481464937099f4a2cd7f95d" + integrity sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg== + dependencies: + cli-truncate "^3.1.0" + colorette "^2.0.20" + eventemitter3 "^5.0.1" + log-update "^5.0.1" + rfdc "^1.3.0" + wrap-ansi "^8.1.0" + +loader-runner@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" + integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== + +loader-utils@^2.0.0, loader-utils@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" + integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + +lodash-es@^4.2.1: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== + +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== + +lodash.debounce@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== + +lodash.escaperegexp@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347" + integrity sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw== + +lodash.get@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== + +lodash.isequal@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" + integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== + +lodash.isfunction@^3.0.9: + version "3.0.9" + resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" + integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw== + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== + +lodash.kebabcase@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" + integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g== + +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lodash.mergewith@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" + integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ== + +lodash.snakecase@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" + integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw== + +lodash.startcase@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8" + integrity sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg== + +lodash.throttle@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" + integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ== + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== + +lodash.upperfirst@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" + integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== + +lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.2.1: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + +log-symbols@4.1.0, log-symbols@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" + +log-update@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09" + integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw== + dependencies: + ansi-escapes "^5.0.0" + cli-cursor "^4.0.0" + slice-ansi "^5.0.0" + strip-ansi "^7.0.1" + wrap-ansi "^8.0.1" + +logkitty@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/logkitty/-/logkitty-0.7.1.tgz#8e8d62f4085a826e8d38987722570234e33c6aa7" + integrity sha512-/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ== + dependencies: + ansi-fragments "^0.2.1" + dayjs "^1.8.15" + yargs "^15.1.0" + +long@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" + integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== + +long@^5.0.0: + version "5.2.3" + resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1" + integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q== + +long@~3: + version "3.2.0" + resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" + integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg== + +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== + dependencies: + js-tokens "^3.0.0 || ^4.0.0" + +loupe@^2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697" + integrity sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA== + dependencies: + get-func-name "^2.0.1" + +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + +lru-cache@^10.2.0: + version "10.2.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878" + integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ== + +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^2.0.0, make-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +make-error@^1.1.1: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + +makeerror@1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" + integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg== + dependencies: + tmpl "1.0.5" + +map-age-cleaner@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" + integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== + dependencies: + p-defer "^1.0.0" + +map-obj@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" + integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== + +map-obj@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" + integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== + +markdown-it-anchor@^8.6.7: + version "8.6.7" + resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz#ee6926daf3ad1ed5e4e3968b1740eef1c6399634" + integrity sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA== + +markdown-it@^14.1.0: + version "14.1.0" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.0.tgz#3c3c5992883c633db4714ccb4d7b5935d98b7d45" + integrity sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg== + dependencies: + argparse "^2.0.1" + entities "^4.4.0" + linkify-it "^5.0.0" + mdurl "^2.0.0" + punycode.js "^2.3.1" + uc.micro "^2.1.0" + +marked@^4.0.10: + version "4.3.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" + integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== + +marky@^1.2.2: + version "1.2.5" + resolved "https://registry.yarnpkg.com/marky/-/marky-1.2.5.tgz#55796b688cbd72390d2d399eaaf1832c9413e3c0" + integrity sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q== + +matcher@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" + integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== + dependencies: + escape-string-regexp "^4.0.0" + +maxmind@^4.3.18: + version "4.3.19" + resolved "https://registry.yarnpkg.com/maxmind/-/maxmind-4.3.19.tgz#da97391185b41373961685419f0f12dfd7b97ff9" + integrity sha512-Bu/VEN7ZWAOCjifdZaXJQuN6/yO7+OK35pnJsqmz8sOndK3KQFvJoY+6HX09/MmLLqtCfa+sMK0iaQOaTejGNA== + dependencies: + mmdb-lib "2.1.0" + tiny-lru "11.2.6" + +mdn-data@2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== + +mdurl@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-2.0.0.tgz#80676ec0433025dd3e17ee983d0fe8de5a2237e0" + integrity sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w== + +mem@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/mem/-/mem-5.1.1.tgz#7059b67bf9ac2c924c9f1cff7155a064394adfb3" + integrity sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw== + dependencies: + map-age-cleaner "^0.1.3" + mimic-fn "^2.1.0" + p-is-promise "^2.1.0" + +memoize-one@^5.0.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e" + integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== + +memory-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/memory-stream/-/memory-stream-1.0.0.tgz#481dfd259ccdf57b03ec2c9632960044180e73c2" + integrity sha512-Wm13VcsPIMdG96dzILfij09PvuS3APtcKNh7M28FsCA/w6+1mjR7hhPmfFNoilX9xU7wTdhsH5lJAm6XNzdtww== + dependencies: + readable-stream "^3.4.0" + +meow@^8.0.0, meow@^8.1.2: + version "8.1.2" + resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" + integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q== + dependencies: + "@types/minimist" "^1.2.0" + camelcase-keys "^6.2.2" + decamelize-keys "^1.1.0" + hard-rejection "^2.1.0" + minimist-options "4.1.0" + normalize-package-data "^3.0.0" + read-pkg-up "^7.0.1" + redent "^3.0.0" + trim-newlines "^3.0.0" + type-fest "^0.18.0" + yargs-parser "^20.2.3" + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +merge2@^1.3.0, merge2@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +metro-babel-transformer@0.80.9: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.80.9.tgz#7051ba377b7d2140abd23f4846bbbb1e81fea99b" + integrity sha512-d76BSm64KZam1nifRZlNJmtwIgAeZhZG3fi3K+EmPOlrR8rDtBxQHDSN3fSGeNB9CirdTyabTMQCkCup6BXFSQ== + dependencies: + "@babel/core" "^7.20.0" + hermes-parser "0.20.1" + nullthrows "^1.1.1" + +metro-cache-key@0.80.9: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-cache-key/-/metro-cache-key-0.80.9.tgz#a04cbb0a7828509bb10dde9789ef761c0c60bc3d" + integrity sha512-hRcYGhEiWIdM87hU0fBlcGr+tHDEAT+7LYNCW89p5JhErFt/QaAkVx4fb5bW3YtXGv5BTV7AspWPERoIb99CXg== + +metro-cache@0.80.9: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.80.9.tgz#b914318a90dbcd51b4c27836184519c441ba5123" + integrity sha512-ujEdSI43QwI+Dj2xuNax8LMo8UgKuXJEdxJkzGPU6iIx42nYa1byQ+aADv/iPh5sh5a//h5FopraW5voXSgm2w== + dependencies: + metro-core "0.80.9" + rimraf "^3.0.2" + +metro-config@0.80.9, metro-config@^0.80.3: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.80.9.tgz#4eb6948b0ddc7c38d9d4ba8ddf22a67ca1c2bc06" + integrity sha512-28wW7CqS3eJrunRGnsibWldqgwRP9ywBEf7kg+uzUHkSFJNKPM1K3UNSngHmH0EZjomizqQA2Zi6/y6VdZMolg== + dependencies: + connect "^3.6.5" + cosmiconfig "^5.0.5" + jest-validate "^29.6.3" + metro "0.80.9" + metro-cache "0.80.9" + metro-core "0.80.9" + metro-runtime "0.80.9" + +metro-core@0.80.9, metro-core@^0.80.3: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.80.9.tgz#3af21d0b09d71ec9c0840f028bffb36bc3619727" + integrity sha512-tbltWQn+XTdULkGdzHIxlxk4SdnKxttvQQV3wpqqFbHDteR4gwCyTR2RyYJvxgU7HELfHtrVbqgqAdlPByUSbg== + dependencies: + lodash.throttle "^4.1.1" + metro-resolver "0.80.9" + +metro-file-map@0.80.9: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-file-map/-/metro-file-map-0.80.9.tgz#ed8783f6e35dfc005794344c2a9fcd6e914885aa" + integrity sha512-sBUjVtQMHagItJH/wGU9sn3k2u0nrCl0CdR4SFMO1tksXLKbkigyQx4cbpcyPVOAmGTVuy3jyvBlELaGCAhplQ== + dependencies: + anymatch "^3.0.3" + debug "^2.2.0" + fb-watchman "^2.0.0" + graceful-fs "^4.2.4" + invariant "^2.2.4" + jest-worker "^29.6.3" + micromatch "^4.0.4" + node-abort-controller "^3.1.1" + nullthrows "^1.1.1" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.3.2" + +metro-minify-terser@0.80.9: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-minify-terser/-/metro-minify-terser-0.80.9.tgz#2b7798cba2bd4bd69cc5ce05a45bf66291542f83" + integrity sha512-FEeCeFbkvvPuhjixZ1FYrXtO0araTpV6UbcnGgDUpH7s7eR5FG/PiJz3TsuuPP/HwCK19cZtQydcA2QrCw446A== + dependencies: + terser "^5.15.0" + +metro-resolver@0.80.9: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.80.9.tgz#bae9120a0553e0cb59da6429e83a7e97465cc1a8" + integrity sha512-wAPIjkN59BQN6gocVsAvvpZ1+LQkkqUaswlT++cJafE/e54GoVkMNCmrR4BsgQHr9DknZ5Um/nKueeN7kaEz9w== + +metro-runtime@0.80.9, metro-runtime@^0.80.3: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-runtime/-/metro-runtime-0.80.9.tgz#665312bd4e4d38fea921b3153d6ab47846eb4f08" + integrity sha512-8PTVIgrVcyU+X/rVCy/9yxNlvXsBCk5JwwkbAm/Dm+Abo6NBGtNjWF0M1Xo/NWCb4phamNWcD7cHdR91HhbJvg== + dependencies: + "@babel/runtime" "^7.0.0" + +metro-source-map@0.80.9, metro-source-map@^0.80.3: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.80.9.tgz#df8f673137548f37ab9f9dcfa771b354a452cfab" + integrity sha512-RMn+XS4VTJIwMPOUSj61xlxgBvPeY4G6s5uIn6kt6HB6A/k9ekhr65UkkDD7WzHYs3a9o869qU8tvOZvqeQzgw== + dependencies: + "@babel/traverse" "^7.20.0" + "@babel/types" "^7.20.0" + invariant "^2.2.4" + metro-symbolicate "0.80.9" + nullthrows "^1.1.1" + ob1 "0.80.9" + source-map "^0.5.6" + vlq "^1.0.0" + +metro-symbolicate@0.80.9: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.80.9.tgz#8d1d19d26ebb36b9d13dbd29814fdd71d6009db7" + integrity sha512-Ykae12rdqSs98hg41RKEToojuIW85wNdmSe/eHUgMkzbvCFNVgcC0w3dKZEhSsqQOXapXRlLtHkaHLil0UD/EA== + dependencies: + invariant "^2.2.4" + metro-source-map "0.80.9" + nullthrows "^1.1.1" + source-map "^0.5.6" + through2 "^2.0.1" + vlq "^1.0.0" + +metro-transform-plugins@0.80.9: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-transform-plugins/-/metro-transform-plugins-0.80.9.tgz#473a2c0a9e48043210547abe61cdeedb77725422" + integrity sha512-UlDk/uc8UdfLNJhPbF3tvwajyuuygBcyp+yBuS/q0z3QSuN/EbLllY3rK8OTD9n4h00qZ/qgxGv/lMFJkwP4vg== + dependencies: + "@babel/core" "^7.20.0" + "@babel/generator" "^7.20.0" + "@babel/template" "^7.0.0" + "@babel/traverse" "^7.20.0" + nullthrows "^1.1.1" + +metro-transform-worker@0.80.9: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro-transform-worker/-/metro-transform-worker-0.80.9.tgz#f1d8ef4f77228bb7e1d20d3c06934166e8ee3b28" + integrity sha512-c/IrzMUVnI0hSVVit4TXzt3A1GiUltGVlzCmLJWxNrBGHGrJhvgePj38+GXl1Xf4Fd4vx6qLUkKMQ3ux73bFLQ== + dependencies: + "@babel/core" "^7.20.0" + "@babel/generator" "^7.20.0" + "@babel/parser" "^7.20.0" + "@babel/types" "^7.20.0" + metro "0.80.9" + metro-babel-transformer "0.80.9" + metro-cache "0.80.9" + metro-cache-key "0.80.9" + metro-minify-terser "0.80.9" + metro-source-map "0.80.9" + metro-transform-plugins "0.80.9" + nullthrows "^1.1.1" + +metro@0.80.9, metro@^0.80.3: + version "0.80.9" + resolved "https://registry.yarnpkg.com/metro/-/metro-0.80.9.tgz#de3c2011df62036520d51d040d2dde0d015aecb6" + integrity sha512-Bc57Xf3GO2Xe4UWQsBj/oW6YfLPABEu8jfDVDiNmJvoQW4CO34oDPuYKe4KlXzXhcuNsqOtSxpbjCRRVjhhREg== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/core" "^7.20.0" + "@babel/generator" "^7.20.0" + "@babel/parser" "^7.20.0" + "@babel/template" "^7.0.0" + "@babel/traverse" "^7.20.0" + "@babel/types" "^7.20.0" + accepts "^1.3.7" + chalk "^4.0.0" + ci-info "^2.0.0" + connect "^3.6.5" + debug "^2.2.0" + denodeify "^1.2.1" + error-stack-parser "^2.0.6" + graceful-fs "^4.2.4" + hermes-parser "0.20.1" + image-size "^1.0.2" + invariant "^2.2.4" + jest-worker "^29.6.3" + jsc-safe-url "^0.2.2" + lodash.throttle "^4.1.1" + metro-babel-transformer "0.80.9" + metro-cache "0.80.9" + metro-cache-key "0.80.9" + metro-config "0.80.9" + metro-core "0.80.9" + metro-file-map "0.80.9" + metro-resolver "0.80.9" + metro-runtime "0.80.9" + metro-source-map "0.80.9" + metro-symbolicate "0.80.9" + metro-transform-plugins "0.80.9" + metro-transform-worker "0.80.9" + mime-types "^2.1.27" + node-fetch "^2.2.0" + nullthrows "^1.1.1" + rimraf "^3.0.2" + serialize-error "^2.1.0" + source-map "^0.5.6" + strip-ansi "^6.0.0" + throat "^5.0.0" + ws "^7.5.1" + yargs "^17.6.2" + +mic-recorder-to-mp3@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/mic-recorder-to-mp3/-/mic-recorder-to-mp3-2.2.2.tgz#32e767d1196fb81d10e279f31c304350c9501d01" + integrity sha512-xDkOaHbojW3bdKOGn9CI5dT+Mc0RrfczsX/Y1zGJp3FUB4zei5ZKFnNm7Nguc9v910wkd7T3csnCTq5EtCF3Zw== + dependencies: + lamejs "^1.2.0" + +micromatch@4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + dependencies: + braces "^3.0.2" + picomatch "^2.3.1" + +micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4: + version "4.0.7" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" + integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== + dependencies: + braces "^3.0.3" + picomatch "^2.3.1" + +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + +mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.34: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + +mime@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + +mime@^2.4.1, mime@^2.5.2: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" + integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== + +mimic-response@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== + +min-indent@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" + integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== + +mini-css-extract-plugin@^2.7.5: + version "2.9.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz#c73a1327ccf466f69026ac22a8e8fd707b78a235" + integrity sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA== + dependencies: + schema-utils "^4.0.0" + tapable "^2.2.1" + +"minimatch@2 || 3", minimatch@3.0.4, minimatch@5.0.1, minimatch@9.0.3, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@^5.0.1, minimatch@^9.0.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +minimist-options@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" + integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== + dependencies: + arrify "^1.0.1" + is-plain-obj "^1.1.0" + kind-of "^6.0.3" + +minimist@^1.2.0, minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + +minipass@^3.0.0: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== + dependencies: + yallist "^4.0.0" + +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.1.2" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" + integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== + +minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + +mkdirp@^0.5.1, mkdirp@~0.5.1: + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== + dependencies: + minimist "^1.2.6" + +mkdirp@^1.0.3, mkdirp@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +mmdb-lib@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mmdb-lib/-/mmdb-lib-2.1.0.tgz#c2456caaf4c7ffa056f77575da6d40988e9e878b" + integrity sha512-tdDTZmnI5G4UoSctv2KxM/3VQt2XRj4CmR5R4VsAWsOUcS3LysHR34wtixWm/pXxXdkBDuN92auxkC0T2+qd1Q== + +mocha@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9" + integrity sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA== + dependencies: + "@ungap/promise-all-settled" "1.1.2" + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.3" + debug "4.3.4" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.2.0" + he "1.2.0" + js-yaml "4.1.0" + log-symbols "4.1.0" + minimatch "5.0.1" + ms "2.1.3" + nanoid "3.3.3" + serialize-javascript "6.0.0" + strip-json-comments "3.1.1" + supports-color "8.1.1" + workerpool "6.2.1" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + +moment@^2.19.3, moment@^2.29.4: + version "2.30.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae" + integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how== + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +ms@2.1.3, ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +mv@~2: + version "2.1.1" + resolved "https://registry.yarnpkg.com/mv/-/mv-2.1.1.tgz#ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2" + integrity sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg== + dependencies: + mkdirp "~0.5.1" + ncp "~2.0.0" + rimraf "~2.4.0" + +nano-css@^5.6.1: + version "5.6.1" + resolved "https://registry.yarnpkg.com/nano-css/-/nano-css-5.6.1.tgz#964120cb1af6cccaa6d0717a473ccd876b34c197" + integrity sha512-T2Mhc//CepkTa3X4pUhKgbEheJHYAxD0VptuqFhDbGMUWVV2m+lkNiW/Ieuj35wrfC8Zm0l7HvssQh7zcEttSw== + dependencies: + "@jridgewell/sourcemap-codec" "^1.4.15" + css-tree "^1.1.2" + csstype "^3.1.2" + fastest-stable-stringify "^2.0.2" + inline-style-prefixer "^7.0.0" + rtl-css-js "^1.16.1" + stacktrace-js "^2.0.2" + stylis "^4.3.0" + +nanoid@3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" + integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== + +nanoid@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== + +ncp@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" + integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA== + +negotiator@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + +neo-async@^2.5.0, neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +nise@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/nise/-/nise-4.1.0.tgz#8fb75a26e90b99202fa1e63f448f58efbcdedaf6" + integrity sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA== + dependencies: + "@sinonjs/commons" "^1.7.0" + "@sinonjs/fake-timers" "^6.0.0" + "@sinonjs/text-encoding" "^0.7.1" + just-extend "^4.0.2" + path-to-regexp "^1.7.0" + +nocache@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/nocache/-/nocache-3.0.4.tgz#5b37a56ec6e09fc7d401dceaed2eab40c8bfdf79" + integrity sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw== + +node-abort-controller@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548" + integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ== + +node-addon-api@^1.6.3: + version "1.7.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== + +node-addon-api@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76" + integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA== + +node-api-headers@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-0.0.2.tgz#31f4c6c2750b63e598128e76a60aefca6d76ac5d" + integrity sha512-YsjmaKGPDkmhoNKIpkChtCsPVaRE0a274IdERKnuc/E8K1UJdBZ4/mvI006OijlQZHCfpRNOH3dfHQs92se8gg== + +node-dir@^0.1.17: + version "0.1.17" + resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5" + integrity sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg== + dependencies: + minimatch "^3.0.2" + +node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.7: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + +node-forge@^1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" + integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== + +node-int64@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== + +node-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562" + integrity sha512-I5VN34NO4/5UYJaUBtkrODPWxbobrE4hgDqPrjB25yPkonFhCmZ146vTH+Zg417E9Iwoh1l/MbRs1apc5J295Q== + dependencies: + loader-utils "^2.0.0" + +node-releases@^2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" + integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== + +node-stream-zip@^1.9.1: + version "1.15.0" + resolved "https://registry.yarnpkg.com/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea" + integrity sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw== + +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-package-data@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" + integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== + dependencies: + hosted-git-info "^4.0.1" + is-core-module "^2.5.0" + semver "^7.3.4" + validate-npm-package-license "^3.0.1" + +normalize-path@^3.0.0, normalize-path@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== + +npm-run-path@^4.0.0, npm-run-path@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +npm-run-path@^5.1.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f" + integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ== + dependencies: + path-key "^4.0.0" + +npmlog@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== + dependencies: + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" + +nullthrows@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1" + integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw== + +nwsapi@^2.2.4: + version "2.2.10" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.10.tgz#0b77a68e21a0b483db70b11fad055906e867cda8" + integrity sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ== + +ob1@0.80.9: + version "0.80.9" + resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.80.9.tgz#4ae3edd807536097674ff943509089f5d4e0649f" + integrity sha512-v9yOxowkZbxWhKOaaTyLjIm1aLy4ebMNcSn4NYJKOAI/Qv+SkfEfszpLr2GIxsccmb2Y2HA9qtsqiIJ80ucpVA== + +object-assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== + +object-inspect@^1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" + integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== + +object-keys@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object.assign@^4.1.2, object.assign@^4.1.4, object.assign@^4.1.5: + version "4.1.5" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" + integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== + dependencies: + call-bind "^1.0.5" + define-properties "^1.2.1" + has-symbols "^1.0.3" + object-keys "^1.1.1" + +object.entries@^1.1.5, object.entries@^1.1.6: + version "1.1.8" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41" + integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + +object.fromentries@^2.0.6, object.fromentries@^2.0.7: + version "2.0.8" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65" + integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" + +object.groupby@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e" + integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + +object.hasown@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.4.tgz#e270ae377e4c120cdcb7656ce66884a6218283dc" + integrity sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg== + dependencies: + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" + +object.values@^1.1.6, object.values@^1.1.7: + version "1.2.0" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" + integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + +on-finished@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== + dependencies: + ee-first "1.1.1" + +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== + dependencies: + ee-first "1.1.1" + +on-headers@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" + integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== + dependencies: + wrappy "1" + +onetime@^5.1.0, onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +onetime@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" + integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ== + dependencies: + mimic-fn "^4.0.0" + +open@^6.2.0: + version "6.4.0" + resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9" + integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg== + dependencies: + is-wsl "^1.1.0" + +open@^7.0.3, open@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +optionator@^0.9.3: + version "0.9.4" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734" + integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.5" + +ora@^5.4.1: + version "5.4.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== + dependencies: + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + +os-homedir@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== + +os-locale@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-5.0.0.tgz#6d26c1d95b6597c5d5317bf5fba37eccec3672e0" + integrity sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA== + dependencies: + execa "^4.0.0" + lcid "^3.0.0" + mem "^5.0.0" + +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== + +p-cancelable@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" + integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== + +p-defer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" + integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw== + +p-is-promise@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" + integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== + +p-limit@^2.0.0, p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== + dependencies: + p-limit "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +p-retry@^4.2.0: + version "4.6.2" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" + integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== + dependencies: + "@types/retry" "0.12.0" + retry "^0.13.1" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +package-json@^6.3.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== + dependencies: + got "^9.6.0" + registry-auth-token "^4.0.0" + registry-url "^5.0.0" + semver "^6.2.0" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw== + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + +parse-json@^5.0.0, parse-json@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +parse5@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + dependencies: + entities "^4.4.0" + +parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + +patch-package@^6.4.7: + version "6.5.1" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.5.1.tgz#3e5d00c16997e6160291fee06a521c42ac99b621" + integrity sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + chalk "^4.1.2" + cross-spawn "^6.0.5" + find-yarn-workspace-root "^2.0.0" + fs-extra "^9.0.0" + is-ci "^2.0.0" + klaw-sync "^6.0.0" + minimist "^1.2.6" + open "^7.4.2" + rimraf "^2.6.3" + semver "^5.6.0" + slash "^2.0.0" + tmp "^0.0.33" + yaml "^1.10.2" + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== + +path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-key@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" + integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== + +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + +path-scurry@^1.10.1: + version "1.11.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" + integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA== + dependencies: + lru-cache "^10.2.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + +path-to-regexp@^1.7.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== + dependencies: + isarray "0.0.1" + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +pathval@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" + integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== + +picocolors@^1.0.0, picocolors@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" + integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== + +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +pidtree@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c" + integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== + +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + +pirates@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9" + integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg== + +pkg-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" + integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== + dependencies: + find-up "^3.0.0" + +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +plist@^3.0.1, plist@^3.0.4: + version "3.1.0" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" + integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ== + dependencies: + "@xmldom/xmldom" "^0.8.8" + base64-js "^1.5.1" + xmlbuilder "^15.1.1" + +possible-typed-array-names@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" + integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== + +postcss-modules-extract-imports@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz#b4497cb85a9c0c4b5aabeb759bb25e8d89f15002" + integrity sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q== + +postcss-modules-local-by-default@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz#f1b9bd757a8edf4d8556e8d0f4f894260e3df78f" + integrity sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw== + dependencies: + icss-utils "^5.0.0" + postcss-selector-parser "^6.0.2" + postcss-value-parser "^4.1.0" + +postcss-modules-scope@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz#a43d28289a169ce2c15c00c4e64c0858e43457d5" + integrity sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ== + dependencies: + postcss-selector-parser "^6.0.4" + +postcss-modules-values@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== + dependencies: + icss-utils "^5.0.0" + +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: + version "6.1.0" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53" + integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + +postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" + integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== + +postcss@^8.4.33: + version "8.4.38" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" + integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.2.0" + +postinstall-prepare@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/postinstall-prepare/-/postinstall-prepare-1.0.1.tgz#dac9b5d91b054389141b13c0192eb68a0aa002b5" + integrity sha512-4zxO4DjrV0XfD+ABUFEP0MiQmhKOGBnov5LfLsra/XVOUcQ5gMLLMcV3b8K8wJUfNDv1ozleGblYb06gPbjVUQ== + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== + +prettier@3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368" + integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A== + +pretty-format@^26.5.2, pretty-format@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" + integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== + dependencies: + "@jest/types" "^26.6.2" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^17.0.1" + +pretty-format@^29.7.0: + version "29.7.0" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812" + integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ== + dependencies: + "@jest/schemas" "^29.6.3" + ansi-styles "^5.0.0" + react-is "^18.0.0" + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + +promise@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a" + integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg== + dependencies: + asap "~2.0.6" + +prompts@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q== + dependencies: + kleur "^3.0.3" + sisteransi "^1.0.5" + +prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.13.1" + +protobufjs-cli@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.1.2.tgz#b32a7dc6aa3866cc103278539561bb4758249c8b" + integrity sha512-8ivXWxT39gZN4mm4ArQyJrRgnIwZqffBWoLDsE21TmMcKI3XwJMV4lEF2WU02C4JAtgYYc2SfJIltelD8to35g== + dependencies: + chalk "^4.0.0" + escodegen "^1.13.0" + espree "^9.0.0" + estraverse "^5.1.0" + glob "^8.0.0" + jsdoc "^4.0.0" + minimist "^1.2.0" + semver "^7.1.2" + tmp "^0.2.1" + uglify-js "^3.7.7" + +protobufjs@^7.2.4: + version "7.3.0" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.3.0.tgz#a32ec0422c039798c41a0700306a6e305b9cb32c" + integrity sha512-YWD03n3shzV9ImZRX3ccbjqLxj7NokGN0V/ESiBV5xWqrommYHYiihuIyavq03pWSGqlyvYUFmfoMKd+1rPA/g== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/node" ">=13.7.0" + long "^5.0.0" + +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + +psl@^1.1.33: + version "1.9.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode.js@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7" + integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA== + +punycode@^2.1.0, punycode@^2.1.1, punycode@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" + integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== + +pupa@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== + dependencies: + escape-goat "^2.0.0" + +qr.js@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f" + integrity sha512-c4iYnWb+k2E+vYpRimHqSu575b1/wKl4XFeJGpFmrJQz5I88v9aY2czh7s0w36srfCM1sXgC/xpoJz5dJfq+OQ== + +querystring@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" + integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== + +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +queue@6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65" + integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA== + dependencies: + inherits "~2.0.3" + +quick-lru@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" + integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== + +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== + +rambda@^7.4.0: + version "7.5.0" + resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.5.0.tgz#1865044c59bc0b16f63026c6e5a97e4b1bbe98fe" + integrity sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA== + +randombytes@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== + dependencies: + safe-buffer "^5.1.0" + +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +rc-slider@^10.2.1: + version "10.6.2" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.6.2.tgz#8bd3b63b24f2f3682ea1bf86d021073189cf33eb" + integrity sha512-FjkoFjyvUQWcBo1F3RgSglky3ar0+qHLM41PlFVYB4Bj3RD8E/Mv7kqMouLFBU+3aFglMzzctAIWRwajEuueSw== + dependencies: + "@babel/runtime" "^7.10.1" + classnames "^2.2.5" + rc-util "^5.36.0" + +rc-util@^5.36.0: + version "5.41.0" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.41.0.tgz#b1ba000d4f3a9e72563370a3243b59f89b40e1bd" + integrity sha512-xtlCim9RpmVv0Ar2Nnc3WfJCxjQkTf3xHPWoFdjp1fSs2NirQwqiQrfqdU9HUe0kdfb168M/T8Dq0IaX50xeKg== + dependencies: + "@babel/runtime" "^7.18.3" + react-is "^18.2.0" + +rc@1.2.8, rc@^1.2.7, rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +react-contexify@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/react-contexify/-/react-contexify-6.0.0.tgz#52959bb507d6a31224fe870ae147e211e359abe1" + integrity sha512-jMhz6yZI81Jv3UDj7TXqCkhdkCFEEmvwGCPXsQuA2ZUC8EbCuVQ6Cy8FzKMXa0y454XTDClBN2YFvvmoFlrFkg== + dependencies: + clsx "^1.2.1" + +react-devtools-core@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-5.2.0.tgz#072ecd2d84d3653817cc11e4b16f60a3c2b705f9" + integrity sha512-vZK+/gvxxsieAoAyYaiRIVFxlajb7KXhgBDV7OsoMzaAE+IqGpoxusBjIgq5ibqA2IloKu0p9n7tE68z1xs18A== + dependencies: + shell-quote "^1.6.1" + ws "^7" + +react-dom@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler "^0.20.2" + +react-draggable@^4.4.4: + version "4.4.6" + resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.6.tgz#63343ee945770881ca1256a5b6fa5c9f5983fe1e" + integrity sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw== + dependencies: + clsx "^1.1.1" + prop-types "^15.8.1" + +react-h5-audio-player@^3.2.0: + version "3.9.1" + resolved "https://registry.yarnpkg.com/react-h5-audio-player/-/react-h5-audio-player-3.9.1.tgz#8a9721fd7a5ff6a9185ce626435207bee1774e83" + integrity sha512-ILJdTXZgHEfv7WsvYPoN7afJncroYyg5Cxvs2qqrsnTzhtBdEuzlM0ETkhUhjqXOsAkbwAdHF9YgnEwgBJ8dCQ== + dependencies: + "@babel/runtime" "^7.10.2" + "@iconify/react" "^4.1.1" + +react-intersection-observer@^9.7.0: + version "9.10.2" + resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-9.10.2.tgz#d5b14f80c9a6bed525becc228db7dccac5d0ec1c" + integrity sha512-j2hGADK2hCbAlfaq6L3tVLb4iqngoN7B1fT16MwJ4J16YW/vWLcmAIinLsw0lgpZeMi4UDUWtHC9QDde0/P1yQ== + +"react-is@^16.12.0 || ^17.0.0 || ^18.0.0", react-is@^18.0.0, react-is@^18.2.0: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" + integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== + +react-is@^16.13.1, react-is@^16.7.0: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== + +react-is@^17.0.1: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== + +react-lifecycles-compat@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" + integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== + +react-mentions@^4.4.9: + version "4.4.10" + resolved "https://registry.yarnpkg.com/react-mentions/-/react-mentions-4.4.10.tgz#ae6c1e310a405597e83ce786f12c5bfb93b097ce" + integrity sha512-JHiQlgF1oSZR7VYPjq32wy97z1w1oE4x10EuhKjPr4WUKhVzG1uFQhQjKqjQkbVqJrmahf+ldgBTv36NrkpKpA== + dependencies: + "@babel/runtime" "7.4.5" + invariant "^2.2.4" + prop-types "^15.5.8" + substyle "^9.1.0" + +react-native@*: + version "0.74.1" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.74.1.tgz#8f5f59636242eb1b90ff675d9fcc7f5b8b1c9913" + integrity sha512-0H2XpmghwOtfPpM2LKqHIN7gxy+7G/r1hwJHKLV6uoyXGC/gCojRtoo5NqyKrWpFC8cqyT6wTYCLuG7CxEKilg== + dependencies: + "@jest/create-cache-key-function" "^29.6.3" + "@react-native-community/cli" "13.6.6" + "@react-native-community/cli-platform-android" "13.6.6" + "@react-native-community/cli-platform-ios" "13.6.6" + "@react-native/assets-registry" "0.74.83" + "@react-native/codegen" "0.74.83" + "@react-native/community-cli-plugin" "0.74.83" + "@react-native/gradle-plugin" "0.74.83" + "@react-native/js-polyfills" "0.74.83" + "@react-native/normalize-colors" "0.74.83" + "@react-native/virtualized-lists" "0.74.83" + abort-controller "^3.0.0" + anser "^1.4.9" + ansi-regex "^5.0.0" + base64-js "^1.5.1" + chalk "^4.0.0" + event-target-shim "^5.0.1" + flow-enums-runtime "^0.0.6" + invariant "^2.2.4" + jest-environment-node "^29.6.3" + jsc-android "^250231.0.0" + memoize-one "^5.0.0" + metro-runtime "^0.80.3" + metro-source-map "^0.80.3" + mkdirp "^0.5.1" + nullthrows "^1.1.1" + pretty-format "^26.5.2" + promise "^8.3.0" + react-devtools-core "^5.0.0" + react-refresh "^0.14.0" + react-shallow-renderer "^16.15.0" + regenerator-runtime "^0.13.2" + scheduler "0.24.0-canary-efb381bbf-20230505" + stacktrace-parser "^0.1.10" + whatwg-fetch "^3.0.0" + ws "^6.2.2" + yargs "^17.6.2" + +react-qr-svg@^2.2.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/react-qr-svg/-/react-qr-svg-2.4.0.tgz#c703d95907b9713192730a5bbeffb57e4aa782bd" + integrity sha512-3Q/LyjBi+eWjJ0WyZvBzyY3rCMlUBZyRnbTcKbXQ39J1bd0/vgqYhXoYai7XlDTS42Ro50BBY4TmeUVyIZh+nA== + dependencies: + prop-types "^15.5.8" + qr.js "0.0.0" + +react-redux@8.0.4: + version "8.0.4" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.0.4.tgz#80c31dffa8af9526967c4267022ae1525ff0e36a" + integrity sha512-yMfQ7mX6bWuicz2fids6cR1YT59VTuT8MKyyE310wJQlINKENCeT1UcPdEiX6znI5tF8zXyJ/VYvDgeGuaaNwQ== + dependencies: + "@babel/runtime" "^7.12.1" + "@types/hoist-non-react-statics" "^3.3.1" + "@types/use-sync-external-store" "^0.0.3" + hoist-non-react-statics "^3.3.2" + react-is "^18.0.0" + use-sync-external-store "^1.0.0" + +react-refresh@^0.14.0: + version "0.14.2" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9" + integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA== + +react-shallow-renderer@^16.15.0: + version "16.15.0" + resolved "https://registry.yarnpkg.com/react-shallow-renderer/-/react-shallow-renderer-16.15.0.tgz#48fb2cf9b23d23cde96708fe5273a7d3446f4457" + integrity sha512-oScf2FqQ9LFVQgA73vr86xl2NaOIX73rh+YFqcOp68CWj56tSfgtGKrEbyhCj0rSijyG9M1CYprTh39fBi5hzA== + dependencies: + object-assign "^4.1.1" + react-is "^16.12.0 || ^17.0.0 || ^18.0.0" + +react-toastify@^6.0.9: + version "6.2.0" + resolved "https://registry.yarnpkg.com/react-toastify/-/react-toastify-6.2.0.tgz#f2d76747c70b9de91f71f253d9feae6b53dc836c" + integrity sha512-XpjFrcBhQ0/nBOL4syqgP/TywFnOyxmstYLWgSQWcj39qpp+WU4vPt3C/ayIDx7RFyxRWfzWTdR2qOcDGo7G0w== + dependencies: + clsx "^1.1.1" + prop-types "^15.7.2" + react-transition-group "^4.4.1" + +react-transition-group@^4.4.1: + version "4.4.5" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1" + integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== + dependencies: + "@babel/runtime" "^7.5.5" + dom-helpers "^5.0.1" + loose-envify "^1.4.0" + prop-types "^15.6.2" + +react-universal-interface@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b" + integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw== + +react-use@^17.4.0: + version "17.5.0" + resolved "https://registry.yarnpkg.com/react-use/-/react-use-17.5.0.tgz#1fae45638828a338291efa0f0c61862db7ee6442" + integrity sha512-PbfwSPMwp/hoL847rLnm/qkjg3sTRCvn6YhUZiHaUa3FA6/aNoFX79ul5Xt70O1rK+9GxSVqkY0eTwMdsR/bWg== + dependencies: + "@types/js-cookie" "^2.2.6" + "@xobotyi/scrollbar-width" "^1.9.5" + copy-to-clipboard "^3.3.1" + fast-deep-equal "^3.1.3" + fast-shallow-equal "^1.0.0" + js-cookie "^2.2.1" + nano-css "^5.6.1" + react-universal-interface "^0.6.2" + resize-observer-polyfill "^1.5.1" + screenfull "^5.1.0" + set-harmonic-interval "^1.0.1" + throttle-debounce "^3.0.1" + ts-easing "^0.2.0" + tslib "^2.1.0" + +react-virtualized@^9.22.4: + version "9.22.5" + resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.22.5.tgz#bfb96fed519de378b50d8c0064b92994b3b91620" + integrity sha512-YqQMRzlVANBv1L/7r63OHa2b0ZsAaDp1UhVNEdUaXI8A5u6hTpA5NYtUueLH2rFuY/27mTGIBl7ZhqFKzw18YQ== + dependencies: + "@babel/runtime" "^7.7.2" + clsx "^1.0.4" + dom-helpers "^5.1.3" + loose-envify "^1.4.0" + prop-types "^15.7.2" + react-lifecycles-compat "^3.0.4" + +react@17.0.2, react@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +read-config-file@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" + integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== + dependencies: + dotenv "^9.0.2" + dotenv-expand "^5.1.0" + js-yaml "^4.1.0" + json5 "^2.2.0" + lazy-val "^1.0.4" + +read-last-lines-ts@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/read-last-lines-ts/-/read-last-lines-ts-1.2.1.tgz#99e46288c5373c06e16e90e666a46b595dad80a1" + integrity sha512-1VcCrAU38DILYiF4sbNY13zdrMGwrFqjGQnXJy28G1zLJItvnWtgCbqoAJlnZZSiEICMKdM4Ol7LYvVMEoKrAg== + +read-pkg-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + +read-pkg@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + +readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readable-stream@~2.3.6: + version "2.3.8" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" + integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + +readline@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/readline/-/readline-1.3.0.tgz#c580d77ef2cfc8752b132498060dc9793a7ac01c" + integrity sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg== + +recast@^0.21.0: + version "0.21.5" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.21.5.tgz#e8cd22bb51bcd6130e54f87955d33a2b2e57b495" + integrity sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg== + dependencies: + ast-types "0.15.2" + esprima "~4.0.0" + source-map "~0.6.1" + tslib "^2.0.1" + +rechoir@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22" + integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ== + dependencies: + resolve "^1.20.0" + +redent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" + integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== + dependencies: + indent-string "^4.0.0" + strip-indent "^3.0.0" + +redux-logger@3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf" + integrity sha512-JoCIok7bg/XpqA1JqCqXFypuqBbQzGQySrhFzewB7ThcnysTO30l4VCst86AuB9T9tuT03MAA56Jw2PNhRSNCg== + dependencies: + deep-diff "^0.3.5" + +redux-persist@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8" + integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ== + +redux-promise-middleware@^6.1.2: + version "6.2.0" + resolved "https://registry.yarnpkg.com/redux-promise-middleware/-/redux-promise-middleware-6.2.0.tgz#d139dfef50992d456860f8cf07a12085bd53f89d" + integrity sha512-TEzfMeLX63gju2WqkdFQlQMvUGYzFvJNePIJJsBlbPHs3Txsbc/5Rjhmtha1XdMU6lkeiIlp1Qx7AR3Zo9he9g== + +redux-thunk@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b" + integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q== + +redux@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13" + integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA== + dependencies: + "@babel/runtime" "^7.9.2" + +redux@^3.6.0: + version "3.7.2" + resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" + integrity sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A== + dependencies: + lodash "^4.2.1" + lodash-es "^4.2.1" + loose-envify "^1.1.0" + symbol-observable "^1.0.3" + +redux@^4.0.0, redux@^4.1.2: + version "4.2.1" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197" + integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w== + dependencies: + "@babel/runtime" "^7.9.2" + +reflect.getprototypeof@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz#3ab04c32a8390b770712b7a8633972702d278859" + integrity sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.1" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + globalthis "^1.0.3" + which-builtin-type "^1.1.3" + +regenerate-unicode-properties@^10.1.0: + version "10.1.1" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480" + integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q== + dependencies: + regenerate "^1.4.2" + +regenerate@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== + +regenerator-runtime@^0.13.2: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== + +regenerator-runtime@^0.14.0: + version "0.14.1" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" + integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== + +regexp.prototype.flags@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" + integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== + dependencies: + call-bind "^1.0.6" + define-properties "^1.2.1" + es-errors "^1.3.0" + set-function-name "^2.0.1" + +regexpu-core@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b" + integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ== + dependencies: + "@babel/regjsgen" "^0.8.0" + regenerate "^1.4.2" + regenerate-unicode-properties "^10.1.0" + regjsparser "^0.9.1" + unicode-match-property-ecmascript "^2.0.0" + unicode-match-property-value-ecmascript "^2.1.0" + +registry-auth-token@^4.0.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" + integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== + dependencies: + rc "1.2.8" + +registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== + dependencies: + rc "^1.2.8" + +regjsparser@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" + integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== + dependencies: + jsesc "~0.5.0" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + +requizzle@^0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.4.tgz#319eb658b28c370f0c20f968fa8ceab98c13d27c" + integrity sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw== + dependencies: + lodash "^4.17.21" + +reselect@^4.1.5: + version "4.1.8" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524" + integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ== + +resize-observer-polyfill@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" + integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== + +resolve-alpn@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" + integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@5.0.0, resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve-from@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" + integrity sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-global@1.0.0, resolve-global@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255" + integrity sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw== + dependencies: + global-dirs "^0.1.1" + +resolve-pkg-maps@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" + integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== + +resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.4: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +resolve@^2.0.0-next.4: + version "2.0.0-next.5" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c" + integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +responselike@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" + integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== + dependencies: + lowercase-keys "^2.0.0" + +restore-cursor@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" + integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +restore-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9" + integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + +retry@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" + integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rfdc@^1.3.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f" + integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg== + +rimraf@2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" + integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w== + dependencies: + glob "^7.0.5" + +rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +rimraf@~2.4.0: + version "2.4.5" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" + integrity sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ== + dependencies: + glob "^6.0.1" + +rimraf@~2.6.2: + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + dependencies: + glob "^7.1.3" + +roarr@^2.15.3: + version "2.15.4" + resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" + integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== + dependencies: + boolean "^3.0.1" + detect-node "^2.0.4" + globalthis "^1.0.1" + json-stringify-safe "^5.0.1" + semver-compare "^1.0.0" + sprintf-js "^1.1.2" + +rrweb-cssom@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1" + integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw== + +rtl-css-js@^1.16.1: + version "1.16.1" + resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.16.1.tgz#4b48b4354b0ff917a30488d95100fbf7219a3e80" + integrity sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg== + dependencies: + "@babel/runtime" "^7.1.2" + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +run-script-os@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/run-script-os/-/run-script-os-1.1.6.tgz#8b0177fb1b54c99a670f95c7fdc54f18b9c72347" + integrity sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw== + +safe-array-concat@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb" + integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q== + dependencies: + call-bind "^1.0.7" + get-intrinsic "^1.2.4" + has-symbols "^1.0.3" + isarray "^2.0.5" + +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@^5.1.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-json-stringify@~1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz#356e44bc98f1f93ce45df14bcd7c01cda86e0afd" + integrity sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg== + +safe-regex-test@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" + integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-regex "^1.1.4" + +"safer-buffer@>= 2.1.2 < 3.0.0": + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sanitize-filename@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" + integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== + dependencies: + truncate-utf8-bytes "^1.0.0" + +sanitize.css@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-12.0.1.tgz#f20369357557ba2b41d7278eeb3ea691a3bee514" + integrity sha512-QbusSBnWHaRBZeTxsJyknwI0q+q6m1NtLBmB76JfW/rdVN7Ws6Zz70w65+430/ouVcdNVT3qwrDgrM6PaYyRtw== + +sass-loader@^13.2.2: + version "13.3.3" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.3.tgz#60df5e858788cffb1a3215e5b92e9cba61e7e133" + integrity sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA== + dependencies: + neo-async "^2.6.2" + +sass@^1.60.0: + version "1.77.2" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.2.tgz#18d4ed2eefc260cdc8099c5439ec1303fd5863aa" + integrity sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + +sax@^1.2.4: + version "1.4.1" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" + integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== + +saxes@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" + integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== + dependencies: + xmlchars "^2.2.0" + +scheduler@0.24.0-canary-efb381bbf-20230505: + version "0.24.0-canary-efb381bbf-20230505" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.24.0-canary-efb381bbf-20230505.tgz#5dddc60e29f91cd7f8b983d7ce4a99c2202d178f" + integrity sha512-ABvovCDe/k9IluqSh4/ISoq8tIJnW8euVAWYt5j/bg6dRnqwQwiGO1F/V4AyK96NGF/FB04FhOUDuWj8IKfABA== + dependencies: + loose-envify "^1.1.0" + +scheduler@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + +schema-utils@^3.1.1, schema-utils@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" + integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + +schema-utils@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" + integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.9.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.1.0" + +screenfull@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba" + integrity sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA== + +sdp@^2.1.0: + version "2.12.0" + resolved "https://registry.yarnpkg.com/sdp/-/sdp-2.12.0.tgz#338a106af7560c86e4523f858349680350d53b22" + integrity sha512-jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw== + +selfsigned@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0" + integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q== + dependencies: + "@types/node-forge" "^1.3.0" + node-forge "^1" + +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== + +semver-diff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== + dependencies: + semver "^6.3.0" + +"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0: + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== + +semver@7.5.4: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + +semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.4: + version "7.6.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" + integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== + +send@0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" + integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== + dependencies: + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "2.0.0" + mime "1.6.0" + ms "2.1.3" + on-finished "2.4.1" + range-parser "~1.2.1" + statuses "2.0.1" + +serialize-error@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-2.1.0.tgz#50b679d5635cdf84667bdc8e59af4e5b81d5f60a" + integrity sha512-ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw== + +serialize-error@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" + integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== + dependencies: + type-fest "^0.13.1" + +serialize-javascript@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== + dependencies: + randombytes "^2.1.0" + +serialize-javascript@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== + dependencies: + randombytes "^2.1.0" + +serve-static@^1.13.1: + version "1.15.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.18.0" + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== + +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + +set-function-name@^2.0.1, set-function-name@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" + integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + functions-have-names "^1.2.3" + has-property-descriptors "^1.0.2" + +set-harmonic-interval@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249" + integrity sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g== + +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + +shallow-clone@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== + dependencies: + kind-of "^6.0.2" + +shallowequal@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +shell-quote@^1.6.1, shell-quote@^1.7.3: + version "1.8.1" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" + integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== + +side-channel@^1.0.4, side-channel@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" + +signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== + +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + +sinon@9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-9.0.2.tgz#b9017e24633f4b1c98dfb6e784a5f0509f5fd85d" + integrity sha512-0uF8Q/QHkizNUmbK3LRFqx5cpTttEVXudywY9Uwzy8bTfZUhljZ7ARzSxnRHWYWtVTeh4Cw+tTb3iU21FQVO9A== + dependencies: + "@sinonjs/commons" "^1.7.2" + "@sinonjs/fake-timers" "^6.0.1" + "@sinonjs/formatio" "^5.0.1" + "@sinonjs/samsam" "^5.0.3" + diff "^4.0.2" + nise "^4.0.1" + supports-color "^7.1.0" + +sisteransi@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== + +slash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slice-ansi@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" + integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== + dependencies: + ansi-styles "^3.2.0" + astral-regex "^1.0.0" + is-fullwidth-code-point "^2.0.0" + +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +slice-ansi@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" + integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== + dependencies: + ansi-styles "^6.0.0" + is-fullwidth-code-point "^4.0.0" + +smart-buffer@^4.0.2: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" + integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== + +source-map-support@^0.5.16, source-map-support@^0.5.19, source-map-support@~0.5.20: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@0.5.6: + version "0.5.6" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" + integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA== + +source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@^0.7.3, source-map@^0.7.4: + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + +spdx-correct@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" + integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66" + integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.18" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz#22aa922dcf2f2885a6494a261f2d8b75345d0326" + integrity sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ== + +split2@^3.0.0, split2@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" + integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== + dependencies: + readable-stream "^3.0.0" + +sprintf-js@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" + integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== + +stack-generator@^2.0.5: + version "2.0.10" + resolved "https://registry.yarnpkg.com/stack-generator/-/stack-generator-2.0.10.tgz#8ae171e985ed62287d4f1ed55a1633b3fb53bb4d" + integrity sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ== + dependencies: + stackframe "^1.3.4" + +stack-utils@^2.0.3: + version "2.0.6" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" + integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== + dependencies: + escape-string-regexp "^2.0.0" + +stackframe@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310" + integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw== + +stacktrace-gps@^3.0.4: + version "3.1.2" + resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz#0c40b24a9b119b20da4525c398795338966a2fb0" + integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ== + dependencies: + source-map "0.5.6" + stackframe "^1.3.4" + +stacktrace-js@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/stacktrace-js/-/stacktrace-js-2.0.2.tgz#4ca93ea9f494752d55709a081d400fdaebee897b" + integrity sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg== + dependencies: + error-stack-parser "^2.0.6" + stack-generator "^2.0.5" + stacktrace-gps "^3.0.4" + +stacktrace-parser@^0.1.10: + version "0.1.10" + resolved "https://registry.yarnpkg.com/stacktrace-parser/-/stacktrace-parser-0.1.10.tgz#29fb0cae4e0d0b85155879402857a1639eb6051a" + integrity sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg== + dependencies: + type-fest "^0.7.1" + +stat-mode@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" + integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== + +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +statuses@~1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== + +string-argv@0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" + integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== + +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + +string.prototype.matchall@^4.0.8: + version "4.0.11" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a" + integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-symbols "^1.0.3" + internal-slot "^1.0.7" + regexp.prototype.flags "^1.5.2" + set-function-name "^2.0.2" + side-channel "^1.0.6" + +string.prototype.trim@^1.2.9: + version "1.2.9" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4" + integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.0" + es-object-atoms "^1.0.0" + +string.prototype.trimend@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229" + integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + +string.prototype.trimstart@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde" + integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^5.0.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-final-newline@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" + integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== + +strip-indent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" + integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== + dependencies: + min-indent "^1.0.0" + +strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== + +strnum@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" + integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== + +styled-components@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.1.tgz#96dfb02a8025794960863b9e8e365e3b6be5518d" + integrity sha512-1ps8ZAYu2Husx+Vz8D+MvXwEwvMwFv+hqqUwhNlDN5ybg6A+3xyW1ECrAgywhvXapNfXiz79jJyU0x22z0FFTg== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/traverse" "^7.4.5" + "@emotion/is-prop-valid" "^0.8.8" + "@emotion/stylis" "^0.8.4" + "@emotion/unitless" "^0.7.4" + babel-plugin-styled-components ">= 1" + css-to-react-native "^3.0.0" + hoist-non-react-statics "^3.0.0" + shallowequal "^1.1.0" + supports-color "^5.5.0" + +stylis@^4.3.0: + version "4.3.2" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.2.tgz#8f76b70777dd53eb669c6f58c997bf0a9972e444" + integrity sha512-bhtUjWd/z6ltJiQwg0dUfxEJ+W+jdqQd8TbWLWyeIJHlnsqmGLRFFd8e5mA0AZi/zx90smXRlN66YMTcaSFifg== + +substyle@^9.1.0: + version "9.4.1" + resolved "https://registry.yarnpkg.com/substyle/-/substyle-9.4.1.tgz#6a4647f363bc14fecc51aac371d4dbeda082aa50" + integrity sha512-VOngeq/W1/UkxiGzeqVvDbGDPM8XgUyJVWjrqeh+GgKqspEPiLYndK+XRcsKUHM5Muz/++1ctJ1QCF/OqRiKWA== + dependencies: + "@babel/runtime" "^7.3.4" + invariant "^2.2.4" + +sudo-prompt@^9.0.0: + version "9.2.1" + resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.2.1.tgz#77efb84309c9ca489527a4e749f287e6bdd52afd" + integrity sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw== + +sumchecker@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" + integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== + dependencies: + debug "^4.1.0" + +supports-color@8.1.1, supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + +supports-color@^5.3.0, supports-color@^5.5.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + +symbol-observable@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" + integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== + +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + +tabbable@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97" + integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew== + +tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== + +tar@^6.1.0, tar@^6.1.11: + version "6.2.1" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" + integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^5.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +temp-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" + integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg== + +temp-file@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" + integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== + dependencies: + async-exit-hook "^2.0.1" + fs-extra "^10.0.0" + +temp@^0.8.4: + version "0.8.4" + resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2" + integrity sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg== + dependencies: + rimraf "~2.6.2" + +terser-webpack-plugin@^5.3.10: + version "5.3.10" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" + integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== + dependencies: + "@jridgewell/trace-mapping" "^0.3.20" + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.1" + terser "^5.26.0" + +terser@^5.14.2, terser@^5.15.0, terser@^5.26.0: + version "5.31.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.0.tgz#06eef86f17007dbad4593f11a574c7f5eb02c6a1" + integrity sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg== + dependencies: + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" + commander "^2.20.0" + source-map-support "~0.5.20" + +text-extensions@^1.0.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" + integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ== + +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== + +throat@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" + integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== + +throttle-debounce@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb" + integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg== + +through2@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + +through2@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" + integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw== + dependencies: + readable-stream "3" + +"through@>=2.2.7 <3": + version "2.3.8" + resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== + +tiny-lru@11.2.6: + version "11.2.6" + resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-11.2.6.tgz#86a4fd0ad615eac1639adf92010e8b944e209fdb" + integrity sha512-0PU3c9PjMnltZaFo2sGYv/nnJsMjG0Cxx8X6FXHPPGjFyoo1SJDxvUXW1207rdiSxYizf31roo+GrkIByQeZoA== + +tmp-promise@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" + integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== + dependencies: + tmp "^0.2.0" + +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + +tmp@^0.2.0, tmp@^0.2.1: + version "0.2.3" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae" + integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w== + +tmpl@1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +toggle-selection@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" + integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ== + +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + +tough-cookie@^4.1.2: + version "4.1.4" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36" + integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + +tr46@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469" + integrity sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw== + dependencies: + punycode "^2.3.0" + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + +trim-newlines@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" + integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== + +truncate-utf8-bytes@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" + integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== + dependencies: + utf8-byte-length "^1.0.1" + +ts-api-utils@^1.0.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1" + integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ== + +ts-easing@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/ts-easing/-/ts-easing-0.2.0.tgz#c8a8a35025105566588d87dbda05dd7fbfa5a4ec" + integrity sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ== + +ts-loader@^9.4.2: + version "9.5.1" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.1.tgz#63d5912a86312f1fbe32cef0859fb8b2193d9b89" + integrity sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg== + dependencies: + chalk "^4.1.0" + enhanced-resolve "^5.0.0" + micromatch "^4.0.0" + semver "^7.3.4" + source-map "^0.7.4" + +ts-node@^10.8.1: + version "10.9.2" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f" + integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ== + dependencies: + "@cspotcode/source-map-support" "^0.8.0" + "@tsconfig/node10" "^1.0.7" + "@tsconfig/node12" "^1.0.7" + "@tsconfig/node14" "^1.0.0" + "@tsconfig/node16" "^1.0.2" + acorn "^8.4.1" + acorn-walk "^8.1.1" + arg "^4.1.0" + create-require "^1.1.0" + diff "^4.0.1" + make-error "^1.1.1" + v8-compile-cache-lib "^3.0.1" + yn "3.1.1" + +tsconfig-paths@^3.15.0: + version "3.15.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" + integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.2" + minimist "^1.2.6" + strip-bom "^3.0.0" + +tslib@^2.0.1, tslib@^2.1.0: + version "2.6.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" + integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== + dependencies: + prelude-ls "~1.1.2" + +type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + +type-fest@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" + integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== + +type-fest@^0.18.0: + version "0.18.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" + integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-fest@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" + integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== + +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +type-fest@^1.0.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" + integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== + +typed-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" + integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + is-typed-array "^1.1.13" + +typed-array-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" + integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== + dependencies: + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + +typed-array-byte-offset@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" + integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== + dependencies: + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + +typed-array-length@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3" + integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g== + dependencies: + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + possible-typed-array-names "^1.0.0" + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + +"typescript@^4.6.4 || ^5.2.2", typescript@^5.1.6: + version "5.4.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" + integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== + +uc.micro@^1.0.1: + version "1.0.6" + resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" + integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== + +uc.micro@^2.0.0, uc.micro@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee" + integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A== + +uglify-js@^3.7.7: + version "3.17.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" + integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== + +unbox-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" + integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== + dependencies: + call-bind "^1.0.2" + has-bigints "^1.0.2" + has-symbols "^1.0.3" + which-boxed-primitive "^1.0.2" + +underscore@>=1.8.3, underscore@~1.13.2: + version "1.13.6" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441" + integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A== + +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + +unicode-canonical-property-names-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== + +unicode-match-property-ecmascript@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== + dependencies: + unicode-canonical-property-names-ecmascript "^2.0.0" + unicode-property-aliases-ecmascript "^2.0.0" + +unicode-match-property-value-ecmascript@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" + integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== + +unicode-property-aliases-ecmascript@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd" + integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w== + +unique-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== + dependencies: + crypto-random-string "^2.0.0" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + +universalify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" + integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== + +universalify@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" + integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== + +unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== + +update-browserslist-db@^1.0.13: + version "1.0.16" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz#f6d489ed90fb2f07d67784eb3f53d7891f736356" + integrity sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ== + dependencies: + escalade "^3.1.2" + picocolors "^1.0.1" + +update-notifier@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== + dependencies: + boxen "^5.0.0" + chalk "^4.1.0" + configstore "^5.0.1" + has-yarn "^2.1.0" + import-lazy "^2.1.0" + is-ci "^2.0.0" + is-installed-globally "^0.4.0" + is-npm "^5.0.0" + is-yarn-global "^0.3.0" + latest-version "^5.1.0" + pupa "^2.1.1" + semver "^7.3.4" + semver-diff "^3.1.1" + xdg-basedir "^4.0.0" + +uri-js@^4.2.2, uri-js@^4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +url-join@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" + integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== + +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + +use-strict@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/use-strict/-/use-strict-1.0.1.tgz#0bb80d94f49a4a05192b84a8c7d34e95f1a7e3a0" + integrity sha512-IeiWvvEXfW5ltKVMkxq6FvNf2LojMKvB2OCeja6+ct24S1XOmQw2dGr2JyndwACWAGJva9B7yPHwAmeA9QCqAQ== + +use-sync-external-store@^1.0.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz#c3b6390f3a30eba13200d2302dcdf1e7b57b2ef9" + integrity sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw== + +utf8-byte-length@^1.0.1: + version "1.0.5" + resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz#f9f63910d15536ee2b2d5dd4665389715eac5c1e" + integrity sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA== + +util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== + +uuid@8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + +v8-compile-cache-lib@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" + integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== + +verror@^1.10.0: + version "1.10.1" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" + integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +vlq@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/vlq/-/vlq-1.0.1.tgz#c003f6e7c0b4c1edd623fd6ee50bbc0d6a1de468" + integrity sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w== + +w3c-xmlserializer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" + integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== + dependencies: + xml-name-validator "^4.0.0" + +walker@^1.0.7: + version "1.0.8" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f" + integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ== + dependencies: + makeerror "1.0.12" + +watchpack@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff" + integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg== + dependencies: + defaults "^1.0.3" + +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== + +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + +webpack-cli@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b" + integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg== + dependencies: + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^2.1.1" + "@webpack-cli/info" "^2.0.2" + "@webpack-cli/serve" "^2.0.5" + colorette "^2.0.14" + commander "^10.0.1" + cross-spawn "^7.0.3" + envinfo "^7.7.3" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^3.1.1" + rechoir "^0.8.0" + webpack-merge "^5.7.3" + +webpack-merge@^5.7.3: + version "5.10.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" + integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA== + dependencies: + clone-deep "^4.0.1" + flat "^5.0.2" + wildcard "^2.0.0" + +webpack-sources@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" + integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== + +webpack@^5.76.3: + version "5.91.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9" + integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw== + dependencies: + "@types/eslint-scope" "^3.7.3" + "@types/estree" "^1.0.5" + "@webassemblyjs/ast" "^1.12.1" + "@webassemblyjs/wasm-edit" "^1.12.1" + "@webassemblyjs/wasm-parser" "^1.12.1" + acorn "^8.7.1" + acorn-import-assertions "^1.9.0" + browserslist "^4.21.10" + chrome-trace-event "^1.0.2" + enhanced-resolve "^5.16.0" + es-module-lexer "^1.2.1" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.11" + json-parse-even-better-errors "^2.3.1" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.2.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.3.10" + watchpack "^2.4.1" + webpack-sources "^3.2.3" + +webrtc-adapter@^4.1.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-4.2.2.tgz#17896c047084fd4c567958a0cd4321e17f32773c" + integrity sha512-JV2mqgwd8K+n0YrwohZgpZceojJRmC+1CsSTNOTdjDOKwCpffeY49d/0lks7dzw+nMtz8XQs9yaUafXh4iCINg== + dependencies: + sdp "^2.1.0" + +whatwg-encoding@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" + integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== + dependencies: + iconv-lite "0.6.3" + +whatwg-fetch@^3.0.0: + version "3.6.20" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz#580ce6d791facec91d37c72890995a0b48d31c70" + integrity sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg== + +whatwg-mimetype@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" + integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== + +whatwg-url@^12.0.0, whatwg-url@^12.0.1: + version "12.0.1" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c" + integrity sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ== + dependencies: + tr46 "^4.1.1" + webidl-conversions "^7.0.0" + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which-builtin-type@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b" + integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw== + dependencies: + function.prototype.name "^1.1.5" + has-tostringtag "^1.0.0" + is-async-function "^2.0.0" + is-date-object "^1.0.5" + is-finalizationregistry "^1.0.2" + is-generator-function "^1.0.10" + is-regex "^1.1.4" + is-weakref "^1.0.2" + isarray "^2.0.5" + which-boxed-primitive "^1.0.2" + which-collection "^1.0.1" + which-typed-array "^1.1.9" + +which-collection@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0" + integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw== + dependencies: + is-map "^2.0.3" + is-set "^2.0.3" + is-weakmap "^2.0.2" + is-weakset "^2.0.3" + +which-module@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" + integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== + +which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.9: + version "1.1.15" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" + integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== + dependencies: + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.2" + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1, which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +wide-align@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + +widest-line@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== + dependencies: + string-width "^4.0.0" + +wildcard@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" + integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== + +word-wrap@^1.2.5, word-wrap@~1.2.3: + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== + +workerpool@6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" + integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== + +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== + +write-file-atomic@^2.3.0: + version "2.4.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481" + integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ== + dependencies: + graceful-fs "^4.1.11" + imurmurhash "^0.1.4" + signal-exit "^3.0.2" + +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +ws@^6.2.2: + version "6.2.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" + integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw== + dependencies: + async-limiter "~1.0.0" + +ws@^7, ws@^7.5.1: + version "7.5.9" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" + integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== + +ws@^8.13.0: + version "8.17.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea" + integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow== + +xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== + +xml-name-validator@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" + integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== + +xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + +xmlcreate@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be" + integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg== + +xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + +y18n@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== + +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yaml@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" + integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== + +yaml@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + +yaml@^2.2.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.2.tgz#7a2b30f2243a5fc299e1f14ca58d475ed4bc5362" + integrity sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA== + +yargs-parser@20.2.4: + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + +yargs-parser@^18.1.2: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + +yargs-parser@^20.2.2, yargs-parser@^20.2.3: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + +yargs-unparser@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" + integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== + dependencies: + camelcase "^6.0.0" + decamelize "^4.0.0" + flat "^5.0.2" + is-plain-obj "^2.1.0" + +yargs@16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yargs@^15.1.0: + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" + +yargs@^17.0.0, yargs@^17.0.1, yargs@^17.6.0, yargs@^17.6.2: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + +zod@^3.22.4: + version "3.23.8" + resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d" + integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g== From 2ec6c7f29cc7d82f5ec1c37d7d2f9cd4024126f1 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 4 Jun 2024 12:02:11 +1000 Subject: [PATCH 116/302] feat: handle isDestroyed flag + "you were removed from XXX" --- _locales/en/messages.json | 1 + .../conversation/SubtleNotification.tsx | 12 +- .../overlay/OverlayRightPanelSettings.tsx | 62 ++++++- ts/interactions/conversationInteractions.ts | 19 ++- ts/react.d.ts | 2 + ts/receiver/closedGroups.ts | 18 +- ts/receiver/configMessage.ts | 7 +- .../libsession/handleLibSessionMessage.ts | 4 +- .../apis/snode_api/SnodeRequestTypes.ts | 61 ++++++- .../snode_api/signature/groupSignature.ts | 11 +- ts/session/apis/snode_api/swarmPolling.ts | 19 ++- .../SwarmPollingGroupConfig.ts | 111 +++++++------ .../conversations/ConversationController.ts | 154 ++++++++++++++---- ts/session/onions/onionPath.ts | 2 +- ts/session/sending/MessageSender.ts | 14 +- .../utils/job_runners/jobs/GroupSyncJob.ts | 20 ++- ts/state/ducks/metaGroups.ts | 102 ++---------- ts/state/selectors/selectedConversation.ts | 2 +- ts/types/LocalizerKeys.ts | 1 + ts/types/sqlSharedTypes.ts | 55 ------- 20 files changed, 407 insertions(+), 270 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 6f5e2a55ff..e7d08665cf 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -38,6 +38,7 @@ "done": "Done", "youLeftTheGroup": "You have left the group.", "youGotKickedFromGroup": "You were removed from the group.", + "youWereRemovedFrom": "You were removed from $name$.", "unreadMessages": "Unread Messages", "debugLogExplanation": "This log will be saved to your desktop.", "reportIssue": "Report a Bug", diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index f0202bb8bd..56719dcec1 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -24,6 +24,7 @@ import { import { useLibGroupInviteGroupName, useLibGroupInvitePending, + useLibGroupKicked, } from '../../state/selectors/userGroups'; import { LocalizerKeys } from '../../types/LocalizerKeys'; import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; @@ -140,6 +141,7 @@ export const NoMessageInConversation = () => { const nameToRender = useSelectedNicknameOrProfileNameOrShortenedPubkey() || ''; const isPrivate = useSelectedIsPrivate(); const isIncomingRequest = useIsIncomingRequest(selectedConversation); + const isKickedFromGroup = useLibGroupKicked(selectedConversation); // groupV2 use its own invite logic as part of if ( @@ -160,11 +162,13 @@ export const NoMessageInConversation = () => { } else if (isMe) { localizedKey = 'noMessagesInNoteToSelf'; } + let dataTestId: SessionDataTestId = 'empty-conversation-notification'; + if (isGroupV2 && isKickedFromGroup) { + localizedKey = 'youWereRemovedFrom'; + dataTestId = 'group-control-message'; + } return ( - + ); }; diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 78980902c6..b78259066a 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -24,8 +24,11 @@ import { triggerFakeAvatarUpdate, } from '../../../../interactions/conversationInteractions'; import { Constants } from '../../../../session'; -import { isDevProd } from '../../../../shared/env_vars'; +import { ConvoHub } from '../../../../session/conversations'; +import { PubKey } from '../../../../session/types'; +import { isDevProd, isTestIntegration } from '../../../../shared/env_vars'; import { closeRightPanel } from '../../../../state/ducks/conversations'; +import { updateConfirmModal } from '../../../../state/ducks/modalDialog'; import { resetRightOverlayMode, setRightOverlayMode } from '../../../../state/ducks/section'; import { useSelectedConversationKey, @@ -44,6 +47,7 @@ import { AttachmentTypeWithPath } from '../../../../types/Attachment'; import { getAbsoluteAttachmentPath } from '../../../../types/MessageAttachment'; import { Avatar, AvatarSize } from '../../../avatar/Avatar'; import { Flex } from '../../../basic/Flex'; +import { SessionButtonColor } from '../../../basic/SessionButton'; import { SpacerLG, SpacerMD, SpacerXL } from '../../../basic/Text'; import { PanelButtonGroup, PanelIconButton } from '../../../buttons'; import { MediaItemType } from '../../../lightbox/LightboxGallery'; @@ -192,6 +196,43 @@ const StyledName = styled.h4` font-size: var(--font-size-md); `; +const DestroyGroupForAllMembersButton = () => { + const dispatch = useDispatch(); + const groupPk = useSelectedConversationKey(); + if (groupPk && PubKey.is03Pubkey(groupPk) && (isDevProd() || isTestIntegration())) { + return ( + { + dispatch( + // TODO build the right UI for this (just adding buttons for QA for now) + updateConfirmModal({ + okText: window.i18n('delete'), + okTheme: SessionButtonColor.Danger, + title: window.i18n('editMenuDeleteGroup'), + conversationId: groupPk, + onClickOk: () => { + void ConvoHub.use().deleteGroup(groupPk, { + deleteAllMessagesOnSwarm: true, + emptyGroupButKeepAsKicked: false, + fromSyncMessage: false, + sendLeaveMessage: false, + forceDestroyForAllMembers: true, + }); + }, + }) + ); + }} + /> + ); + } + + return null; +}; + export const OverlayRightPanelSettings = () => { const [documents, setDocuments] = useState>([]); const [media, setMedia] = useState>([]); @@ -354,14 +395,17 @@ export const OverlayRightPanelSettings = () => { {isGroup && ( - void deleteConvoAction()} - color={'var(--danger-color)'} - iconType={'delete'} - /> + <> + void deleteConvoAction()} + color={'var(--danger-color)'} + iconType={'delete'} + /> + + )} diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 479133552a..59b696cf92 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -458,11 +458,20 @@ async function leaveGroupOrCommunityByConvoId({ status: ConversationInteractionStatus.Start, }); - await ConvoHub.use().deleteClosedGroup(conversationId, { - fromSyncMessage: false, - sendLeaveMessage, - emptyGroupButKeepAsKicked: false, - }); + if (PubKey.is05Pubkey(conversationId)) { + await ConvoHub.use().deleteLegacyGroup(conversationId, { + fromSyncMessage: false, + sendLeaveMessage, + }); + } else if (PubKey.is03Pubkey(conversationId)) { + await ConvoHub.use().deleteGroup(conversationId, { + fromSyncMessage: false, + sendLeaveMessage, + deleteAllMessagesOnSwarm: false, + emptyGroupButKeepAsKicked: false, + forceDestroyForAllMembers: false, + }); + } await clearConversationInteractionState({ conversationId }); } catch (err) { window.log.warn(`showLeaveGroupByConvoId error: ${err}`); diff --git a/ts/react.d.ts b/ts/react.d.ts index 49c2de5178..abfbdb49ae 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -107,6 +107,7 @@ declare module 'react' { | 'conversation-request-explanation' | 'group-invite-control-message' | 'empty-conversation-notification' + | 'group-control-message' // call notification types | 'call-notification-missed-call' @@ -138,6 +139,7 @@ declare module 'react' { | 'remove-moderators' | 'add-moderators' | 'edit-group-name' + | 'delete-group-button' // SessionRadioGroup & SessionRadio | 'password-input-confirm' diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 50d99b60b0..049c53af7a 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -768,11 +768,13 @@ async function handleClosedGroupMembersRemoved( const ourPubKey = UserUtils.getOurPubKeyFromCache(); const wasCurrentUserKicked = !membersAfterUpdate.includes(ourPubKey.key); if (wasCurrentUserKicked) { + if (!PubKey.is05Pubkey(groupPubKey)) { + throw new Error('handleClosedGroupMembersRemoved expected a 05 groupPk'); + } // we now want to remove everything related to a group when we get kicked from it. - await ConvoHub.use().deleteClosedGroup(groupPubKey, { + await ConvoHub.use().deleteLegacyGroup(groupPubKey, { fromSyncMessage: false, sendLeaveMessage: false, - emptyGroupButKeepAsKicked: false, // legacy group case only here }); } else { // Note: we don't want to send a new encryption keypair when we get a member removed. @@ -854,21 +856,25 @@ function removeMemberFromZombies( } async function handleClosedGroupAdminMemberLeft(groupPublicKey: string, envelope: EnvelopePlus) { + if (!PubKey.is05Pubkey(groupPublicKey)) { + throw new Error('handleClosedGroupAdminMemberLeft excepted a 05 groupPk'); + } // if the admin was remove and we are the admin, it can only be voluntary - await ConvoHub.use().deleteClosedGroup(groupPublicKey, { + await ConvoHub.use().deleteLegacyGroup(groupPublicKey, { fromSyncMessage: false, sendLeaveMessage: false, - emptyGroupButKeepAsKicked: false, }); await IncomingMessageCache.removeFromCache(envelope); } async function handleClosedGroupLeftOurself(groupId: string, envelope: EnvelopePlus) { + if (!PubKey.is05Pubkey(groupId)) { + throw new Error('handleClosedGroupLeftOurself excepted a 05 groupPk'); + } // if we ourself left. It can only mean that another of our device left the group and we just synced that message through the swarm - await ConvoHub.use().deleteClosedGroup(groupId, { + await ConvoHub.use().deleteLegacyGroup(groupId, { fromSyncMessage: false, sendLeaveMessage: false, - emptyGroupButKeepAsKicked: false, }); await IncomingMessageCache.removeFromCache(envelope); } diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index cffadf6938..66cc98b458 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -583,10 +583,9 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { ); const toLeaveFromDb = ConvoHub.use().get(toLeave.id); // the wrapper told us that this group is not tracked, so even if we left/got kicked from it, remove it from the DB completely - await ConvoHub.use().deleteClosedGroup(toLeaveFromDb.id, { + await ConvoHub.use().deleteLegacyGroup(toLeaveFromDb.id, { fromSyncMessage: true, sendLeaveMessage: false, // this comes from the wrapper, so we must have left/got kicked from that group already and our device already handled it. - emptyGroupButKeepAsKicked: false, }); } @@ -738,10 +737,12 @@ async function handleSingleGroupUpdateToLeave(toLeave: GroupPubkeyType) { `About to deleteGroup ${toLeave} via handleSingleGroupUpdateToLeave as in DB but not in wrapper` ); - await ConvoHub.use().deleteClosedGroup(toLeave, { + await ConvoHub.use().deleteGroup(toLeave, { fromSyncMessage: true, sendLeaveMessage: false, emptyGroupButKeepAsKicked: false, + deleteAllMessagesOnSwarm: false, + forceDestroyForAllMembers: false, }); } catch (e) { window.log.info('Failed to deleteClosedGroup with: ', e.message); diff --git a/ts/receiver/libsession/handleLibSessionMessage.ts b/ts/receiver/libsession/handleLibSessionMessage.ts index 2ed0db7932..b24c06ea9d 100644 --- a/ts/receiver/libsession/handleLibSessionMessage.ts +++ b/ts/receiver/libsession/handleLibSessionMessage.ts @@ -50,10 +50,12 @@ async function handleLibSessionKickedMessage({ } const inviteWasPending = (await UserGroupsWrapperActions.getGroup(groupPk))?.invitePending || false; - await ConvoHub.use().deleteClosedGroup(groupPk, { + await ConvoHub.use().deleteGroup(groupPk, { sendLeaveMessage: false, fromSyncMessage: false, emptyGroupButKeepAsKicked: !inviteWasPending, + deleteAllMessagesOnSwarm: false, + forceDestroyForAllMembers: false, }); } diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 1bbded3b11..512af0ac56 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1,7 +1,7 @@ import ByteBuffer from 'bytebuffer'; import { GroupPubkeyType, PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; import { from_hex } from 'libsodium-wrappers-sumo'; -import { isEmpty } from 'lodash'; +import { isEmpty, isString } from 'lodash'; import { AwaitedReturn, assertUnreachable } from '../../../types/sqlSharedTypes'; import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { concatUInt8Array } from '../../crypto'; @@ -310,7 +310,6 @@ abstract class AbstractRevokeSubRequest extends SnodeAPISubRequest { public readonly groupPk: GroupPubkeyType; public readonly timestamp: number; public readonly revokeTokenHex: Array; - protected readonly adminSecretKey: Uint8Array; constructor({ @@ -471,8 +470,49 @@ export class DeleteAllFromUserNodeSubRequest extends SnodeAPISubRequest { } } -// We don't need that one yet -// export class DeleteAllFromGroupNodeSubRequest extends DeleteAllFromUserNodeSubRequest {} +/** + * Delete all the messages and not the config messages for that group 03. + */ +export class DeleteAllFromGroupMsgNodeSubRequest extends SnodeAPISubRequest { + public method = 'delete_all' as const; + public readonly namespace = SnodeNamespaces.ClosedGroupMessages; + public readonly adminSecretKey: Uint8Array; + public readonly groupPk: GroupPubkeyType; + + constructor(args: WithGroupPubkey & WithSecretKey) { + super(); + this.groupPk = args.groupPk; + this.adminSecretKey = args.secretKey; + if (isEmpty(this.adminSecretKey)) { + throw new Error('DeleteAllFromGroupMsgNodeSubRequest needs an adminSecretKey'); + } + } + + public async buildAndSignParameters() { + const signDetails = await SnodeGroupSignature.getSnodeGroupSignature({ + method: this.method, + namespace: this.namespace, + group: { authData: null, pubkeyHex: this.groupPk, secretKey: this.adminSecretKey }, + }); + + if (!signDetails) { + throw new Error( + `[DeleteAllFromGroupMsgNodeSubRequest] SnodeSignature.getSnodeSignatureParamsUs returned an empty result` + ); + } + return { + method: this.method, + params: { + ...signDetails, + namespace: this.namespace, + }, + }; + } + + public loggingId(): string { + return `${this.method}-${ed25519Str(this.groupPk)}-${this.namespace}`; + } +} export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { public method = 'delete' as const; @@ -981,7 +1021,8 @@ export type RawSnodeSubRequests = | UpdateExpiryOnNodeGroupSubRequest | SubaccountRevokeSubRequest | SubaccountUnrevokeSubRequest - | GetExpiriesFromNodeSubRequest; + | GetExpiriesFromNodeSubRequest + | DeleteAllFromGroupMsgNodeSubRequest; export type BuiltSnodeSubRequests = | ReturnType @@ -1000,7 +1041,8 @@ export type BuiltSnodeSubRequests = | AwaitedReturn | AwaitedReturn | AwaitedReturn - | AwaitedReturn; + | AwaitedReturn + | AwaitedReturn; export function builtRequestToLoggingId(request: BuiltSnodeSubRequests): string { const { method, params } = request; @@ -1010,7 +1052,6 @@ export function builtRequestToLoggingId(request: BuiltSnodeSubRequests): string return `${method}`; case 'delete': - case 'delete_all': case 'expire': case 'get_expiries': case 'get_swarm': @@ -1019,6 +1060,12 @@ export function builtRequestToLoggingId(request: BuiltSnodeSubRequests): string const isUs = UserUtils.isUsFromCache(params.pubkey); return `${method}-${isUs ? 'us' : ed25519Str(params.pubkey)}`; } + case 'delete_all': { + const isUs = UserUtils.isUsFromCache(params.pubkey); + return `${method}-${isUs ? 'us' : ed25519Str(params.pubkey)}-${ + isString(params.namespace) ? params.namespace : SnodeNamespace.toRole(params.namespace) + }}`; + } case 'retrieve': case 'store': { diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 49d8239993..0843bc8a84 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -85,7 +85,7 @@ async function getGroupPromoteMessage({ type ParamsShared = { groupPk: GroupPubkeyType; namespace: SnodeNamespacesGroup; - method: 'retrieve' | 'store'; + method: 'retrieve' | 'store' | 'delete_all'; }; type SigParamsAdmin = ParamsShared & { @@ -140,13 +140,16 @@ export type GroupDetailsNeededForSignature = Pick< type StoreOrRetrieve = { method: 'store' | 'retrieve'; namespace: SnodeNamespacesGroup }; type DeleteHashes = { method: 'delete'; hashes: Array }; +type DeleteAllNonConfigs = { method: 'delete_all'; namespace: SnodeNamespacesGroup }; async function getSnodeGroupSignature({ group, ...args }: { group: GroupDetailsNeededForSignature | null; -} & (StoreOrRetrieve | DeleteHashes)): Promise { +} & (StoreOrRetrieve | DeleteHashes | DeleteAllNonConfigs)): Promise< + SigResultSubAccount | SigResultAdmin +> { if (!group) { throw new Error(`getSnodeGroupSignature: did not find group in wrapper`); } @@ -155,6 +158,10 @@ async function getSnodeGroupSignature({ const groupSecretKey = secretKey && !isEmpty(secretKey) ? secretKey : null; const groupAuthData = authData && !isEmpty(authData) ? authData : null; + if (args.method === 'delete_all' && isEmpty(secretKey)) { + throw new Error('getSnodeGroupSignature: delete_all needs an adminSecretKey'); + } + if (groupSecretKey) { if (args.method === 'delete') { return getGroupSignatureByHashesParams({ diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 3f2b6bde13..1ac35f380f 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -667,11 +667,20 @@ export class SwarmPolling { window.log.debug( `notPollingForGroupAsNotInWrapper ${ed25519Str(pubkey)} with reason:"${reason}"` ); - await ConvoHub.use().deleteClosedGroup(pubkey, { - fromSyncMessage: true, - sendLeaveMessage: false, - emptyGroupButKeepAsKicked: false, - }); + if (PubKey.is05Pubkey(pubkey)) { + await ConvoHub.use().deleteLegacyGroup(pubkey, { + fromSyncMessage: true, + sendLeaveMessage: false, + }); + } else if (PubKey.is03Pubkey(pubkey)) { + await ConvoHub.use().deleteGroup(pubkey, { + fromSyncMessage: true, + sendLeaveMessage: false, + emptyGroupButKeepAsKicked: false, + deleteAllMessagesOnSwarm: false, + forceDestroyForAllMembers: false, + }); + } } private loadGroupIds() { diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 00ddcaae6c..1e2bac46c3 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -9,6 +9,7 @@ import { GroupPendingRemovals } from '../../../utils/job_runners/jobs/GroupPendi import { LibSessionUtil } from '../../../utils/libsession/libsession_utils'; import { SnodeNamespaces } from '../namespaces'; import { RetrieveMessageItemWithNamespace } from '../types'; +import { ConvoHub } from '../../../conversations'; /** * This is a basic optimization to avoid running the logic when the `deleteBeforeSeconds` @@ -23,60 +24,70 @@ const lastAppliedRemoveAttachmentSentBeforeSeconds = new Map 0 && - (lastAppliedRemoveMsgSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > - infos.deleteBeforeSeconds - ) { - // delete any messages in this conversation sent before that timestamp (in seconds) - const deletedMsgIds = await Data.removeAllMessagesInConversationSentBefore({ - deleteBeforeSeconds: infos.deleteBeforeSeconds, - conversationId: groupPk, - }); - window.log.info( - `removeAllMessagesInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteBeforeSeconds}: `, - deletedMsgIds - ); - window.inboxStore.dispatch( - messagesExpired(deletedMsgIds.map(messageId => ({ conversationKey: groupPk, messageId }))) - ); - lastAppliedRemoveMsgSentBeforeSeconds.set(groupPk, infos.deleteBeforeSeconds); - } + if (infos) { + if (infos.isDestroyed) { + window.log.info(`${ed25519Str(groupPk)} is marked as destroyed after merge. Removing it.`); + await ConvoHub.use().deleteGroup(groupPk, { + sendLeaveMessage: false, + fromSyncMessage: false, + emptyGroupButKeepAsKicked: true, // we just got something from the group's swarm, so it is not pendingInvite + deleteAllMessagesOnSwarm: false, + forceDestroyForAllMembers: false, + }); + } else { + if ( + isNumber(infos.deleteBeforeSeconds) && + isFinite(infos.deleteBeforeSeconds) && + infos.deleteBeforeSeconds > 0 && + (lastAppliedRemoveMsgSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > + infos.deleteBeforeSeconds + ) { + // delete any messages in this conversation sent before that timestamp (in seconds) + const deletedMsgIds = await Data.removeAllMessagesInConversationSentBefore({ + deleteBeforeSeconds: infos.deleteBeforeSeconds, + conversationId: groupPk, + }); + window.log.info( + `removeAllMessagesInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteBeforeSeconds}: `, + deletedMsgIds + ); + window.inboxStore.dispatch( + messagesExpired(deletedMsgIds.map(messageId => ({ conversationKey: groupPk, messageId }))) + ); + lastAppliedRemoveMsgSentBeforeSeconds.set(groupPk, infos.deleteBeforeSeconds); + } - if ( - infos && - isNumber(infos.deleteAttachBeforeSeconds) && - isFinite(infos.deleteAttachBeforeSeconds) && - infos.deleteAttachBeforeSeconds > 0 && - (lastAppliedRemoveAttachmentSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > - infos.deleteAttachBeforeSeconds - ) { - // delete any attachments in this conversation sent before that timestamp (in seconds) - const impactedMsgModels = await Data.getAllMessagesWithAttachmentsInConversationSentBefore({ - deleteAttachBeforeSeconds: infos.deleteAttachBeforeSeconds, - conversationId: groupPk, - }); - window.log.info( - `getAllMessagesWithAttachmentsInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteAttachBeforeSeconds}: impactedMsgModelsIds `, - impactedMsgModels.map(m => m.id) - ); + if ( + isNumber(infos.deleteAttachBeforeSeconds) && + isFinite(infos.deleteAttachBeforeSeconds) && + infos.deleteAttachBeforeSeconds > 0 && + (lastAppliedRemoveAttachmentSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > + infos.deleteAttachBeforeSeconds + ) { + // delete any attachments in this conversation sent before that timestamp (in seconds) + const impactedMsgModels = await Data.getAllMessagesWithAttachmentsInConversationSentBefore({ + deleteAttachBeforeSeconds: infos.deleteAttachBeforeSeconds, + conversationId: groupPk, + }); + window.log.info( + `getAllMessagesWithAttachmentsInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteAttachBeforeSeconds}: impactedMsgModelsIds `, + impactedMsgModels.map(m => m.id) + ); - for (let index = 0; index < impactedMsgModels.length; index++) { - const msg = impactedMsgModels[index]; + for (let index = 0; index < impactedMsgModels.length; index++) { + const msg = impactedMsgModels[index]; - // eslint-disable-next-line no-await-in-loop - // eslint-disable-next-line no-await-in-loop - await msg?.cleanup(); + // eslint-disable-next-line no-await-in-loop + await msg?.cleanup(); + } + lastAppliedRemoveAttachmentSentBeforeSeconds.set(groupPk, infos.deleteAttachBeforeSeconds); + } + } + const membersWithPendingRemovals = + await MetaGroupWrapperActions.memberGetAllPendingRemovals(groupPk); + if (membersWithPendingRemovals.length) { + await GroupPendingRemovals.addJob({ groupPk }); } - lastAppliedRemoveAttachmentSentBeforeSeconds.set(groupPk, infos.deleteAttachBeforeSeconds); - } - const membersWithPendingRemovals = - await MetaGroupWrapperActions.memberGetAllPendingRemovals(groupPk); - if (membersWithPendingRemovals.length) { - await GroupPendingRemovals.addJob({ groupPk }); } } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 9f1ccf8326..0d67369209 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -15,26 +15,34 @@ import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGrou import { PubKey } from '../types'; import { getMessageQueue } from '..'; +import { ConfigDumpData } from '../../data/configDump/configDump'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/conversationAttributes'; import { removeAllClosedGroupEncryptionKeyPairs } from '../../receiver/closedGroups'; -import { groupInfoActions } from '../../state/ducks/metaGroups'; import { getCurrentlySelectedConversationOutsideRedux } from '../../state/selectors/conversations'; import { assertUnreachable } from '../../types/sqlSharedTypes'; -import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../../webworker/workers/browser/libsession_worker_interface'; import { OpenGroupUtils } from '../apis/open_group_api/utils'; import { getSwarmPollingInstance } from '../apis/snode_api'; +import { DeleteAllFromGroupMsgNodeSubRequest } from '../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage'; import { GroupUpdateMemberLeftMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage'; import { UserUtils } from '../utils'; +import { ed25519Str } from '../utils/String'; +import { PreConditionFailed } from '../utils/errors'; +import { RunJobResult } from '../utils/job_runners/PersistedJob'; +import { GroupSync } from '../utils/job_runners/jobs/GroupSyncJob'; import { UserSync } from '../utils/job_runners/jobs/UserSyncJob'; import { LibSessionUtil } from '../utils/libsession/libsession_utils'; import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts'; import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile'; import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups'; -import { ed25519Str } from '../utils/String'; +import { groupInfoActions } from '../../state/ducks/metaGroups'; let instance: ConvoController | null; @@ -205,57 +213,143 @@ class ConvoController { await conversation.commit(); } - public async deleteClosedGroup( - groupPk: string, + public async deleteLegacyGroup( + groupPk: PubkeyType, + { sendLeaveMessage, fromSyncMessage }: DeleteOptions & { sendLeaveMessage: boolean } + ) { + if (!PubKey.is05Pubkey(groupPk)) { + throw new PreConditionFailed('deleteLegacyGroup excepts a 05 group'); + } + + window.log.info( + `deleteLegacyGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}` + ); + + // this deletes all messages in the conversation + const conversation = await this.deleteConvoInitialChecks(groupPk, 'LegacyGroup', false); + if (!conversation || !conversation.isClosedGroup()) { + return; + } + // we don't need to keep polling anymore. + getSwarmPollingInstance().removePubkey(groupPk, 'deleteLegacyGroup'); + + // send the leave message before we delete everything for this group (including the key!) + if (sendLeaveMessage) { + await leaveClosedGroup(groupPk, fromSyncMessage); + } + + await removeLegacyGroupFromWrappers(groupPk); + + // we never keep a left legacy group. Only fully remove it. + await this.removeGroupOrCommunityFromDBAndRedux(groupPk); + await UserSync.queueNewJobIfNeeded(); + } + + public async deleteGroup( + groupPk: GroupPubkeyType, { sendLeaveMessage, fromSyncMessage, emptyGroupButKeepAsKicked, - }: DeleteOptions & { sendLeaveMessage: boolean; emptyGroupButKeepAsKicked: boolean } + deleteAllMessagesOnSwarm, + forceDestroyForAllMembers, + }: DeleteOptions & { + sendLeaveMessage: boolean; + emptyGroupButKeepAsKicked: boolean; + deleteAllMessagesOnSwarm: boolean; + forceDestroyForAllMembers: boolean; + } ) { - if (!PubKey.is03Pubkey(groupPk) && !PubKey.is05Pubkey(groupPk)) { - return; + if (!PubKey.is03Pubkey(groupPk)) { + throw new PreConditionFailed('deleteGroup excepts a 03-group'); } - const typeOfDelete: ConvoVolatileType = PubKey.is03Pubkey(groupPk) ? 'Group' : 'LegacyGroup'; window.log.info( - `deleteClosedGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, emptyGroupButKeepAsKicked:${emptyGroupButKeepAsKicked}` + `deleteGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, emptyGroupButKeepAsKicked:${emptyGroupButKeepAsKicked}, deleteAllMessagesOnSwarm:${deleteAllMessagesOnSwarm}, forceDestroyForAllMembers:${forceDestroyForAllMembers}` ); // this deletes all messages in the conversation - const conversation = await this.deleteConvoInitialChecks(groupPk, typeOfDelete, false); + const conversation = await this.deleteConvoInitialChecks(groupPk, 'Group', false); if (!conversation || !conversation.isClosedGroup()) { return; } // we don't need to keep polling anymore. - getSwarmPollingInstance().removePubkey(groupPk, 'deleteClosedGroup'); + getSwarmPollingInstance().removePubkey(groupPk, 'deleteGroup'); + + const group = await UserGroupsWrapperActions.getGroup(groupPk); // send the leave message before we delete everything for this group (including the key!) - if (sendLeaveMessage) { + // Note: if we were kicked, we already lost the authdata/secretKey for it, so no need to try to send our message. + if (sendLeaveMessage && !group?.kicked) { await leaveClosedGroup(groupPk, fromSyncMessage); } - if (PubKey.is03Pubkey(groupPk)) { - // a group 03 can be removed fully or kept empty as kicked. - // when it was pendingInvite, we delete it fully, - // when it was not, we empty the group but keep it with the "you have been kicked" message - // Note: the pendingInvite=true case cannot really happen as we wouldn't be polling from that group (and so, not get the message kicking us ) - if (emptyGroupButKeepAsKicked) { - window?.inboxStore?.dispatch(groupInfoActions.emptyGroupButKeepAsKicked({ groupPk })); - } else { - window?.inboxStore?.dispatch(groupInfoActions.destroyGroupDetails({ groupPk })); + // a group 03 can be removed fully or kept empty as kicked. + // when it was pendingInvite, we delete it fully, + // when it was not, we empty the group but keep it with the "you have been kicked" message + // Note: the pendingInvite=true case cannot really happen as we wouldn't be polling from that group (and so, not get the message kicking us) + if (emptyGroupButKeepAsKicked) { + // delete the secretKey/authData if we had it. If we need it for something, it has to be done before this call. + if (group) { + group.authData = null; + group.secretKey = null; + group.disappearingTimerSeconds = undefined; + group.kicked = true; + await UserGroupsWrapperActions.setGroup(group); } } else { - await removeLegacyGroupFromWrappers(groupPk); - } - // if we were kicked or sent our left message, we have nothing to do more with that group. - // Just delete everything related to it, not trying to add update message or send a left message. - if (!emptyGroupButKeepAsKicked) { + const us = UserUtils.getOurPubKeyStrFromCache(); + const allMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); + const otherAdminsCount = allMembers + .filter(m => m.admin || m.promoted) + .filter(m => m.pubkeyHex !== us).length; + const weAreLastAdmin = otherAdminsCount === 0; + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + const fromUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); + if (!infos || !fromUserGroup || isEmpty(infos) || isEmpty(fromUserGroup)) { + throw new Error('deleteGroup: some required data not present'); + } + const { secretKey } = fromUserGroup; + + // check if we are the last admin + if (secretKey && !isEmpty(secretKey) && (weAreLastAdmin || forceDestroyForAllMembers)) { + const deleteAllMessagesSubRequest = deleteAllMessagesOnSwarm + ? new DeleteAllFromGroupMsgNodeSubRequest({ + groupPk, + secretKey, + }) + : null; + + // this marks the group info as deleted. We need to push those details + await MetaGroupWrapperActions.infoDestroy(groupPk); + const lastPushResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + revokeSubRequest: null, + unrevokeSubRequest: null, + supplementKeys: [], + deleteAllMessagesSubRequest, + }); + if (lastPushResult !== RunJobResult.Success) { + throw new Error(`Failed to destroyGroupDetails for pk ${ed25519Str(groupPk)}`); + } + } + + // this deletes the secretKey if we had it. If we need it for something, it has to be done before this call. + await UserGroupsWrapperActions.eraseGroup(groupPk); + + // we are on the emptyGroupButKeepAsKicked=false case, so we remove it all await this.removeGroupOrCommunityFromDBAndRedux(groupPk); } - if (!fromSyncMessage) { - await UserSync.queueNewJobIfNeeded(); - } + await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupPk); + // release the memory (and the current meta-dumps in memory for that group) + window.log.info(`freeing metagroup wrapper: ${ed25519Str(groupPk)}`); + await MetaGroupWrapperActions.free(groupPk); + // delete the dumps from the metagroup state only, not the details in the UserGroups wrapper itself. + await ConfigDumpData.deleteDumpFor(groupPk); + getSwarmPollingInstance().removePubkey(groupPk, 'deleteGroup'); + + window.inboxStore.dispatch(groupInfoActions.removeGroupDetailsFromSlice({ groupPk })); + await UserSync.queueNewJobIfNeeded(); } public async deleteCommunity(convoId: string, options: DeleteOptions) { diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index e22f2c5d6e..4cfe09125a 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -312,7 +312,7 @@ export async function testGuardNode(snode: Snode) { response = await insecureNodeFetch(url, fetchOptions); } catch (e) { if (e.type === 'request-timeout') { - window?.log?.warn('test :,', ed25519Str(snode.pubkey_ed25519)); + window?.log?.warn('testGuardNode request timedout for:', ed25519Str(snode.pubkey_ed25519)); } if (e.code === 'ENETUNREACH') { window?.log?.warn('no network on node,', snode); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 464560b600..c327d5b656 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -16,6 +16,7 @@ import { } from '../apis/open_group_api/sogsv3/sogsV3SendMessage'; import { BuiltSnodeSubRequests, + DeleteAllFromGroupMsgNodeSubRequest, DeleteAllFromUserNodeSubRequest, DeleteHashesFromGroupNodeSubRequest, DeleteHashesFromUserNodeSubRequest, @@ -308,7 +309,8 @@ async function signSubRequests( p instanceof RetrieveGroupSubRequest || p instanceof UpdateExpiryOnNodeUserSubRequest || p instanceof UpdateExpiryOnNodeGroupSubRequest || - p instanceof GetExpiriesFromNodeSubRequest + p instanceof GetExpiriesFromNodeSubRequest || + p instanceof DeleteAllFromGroupMsgNodeSubRequest ) { return p.buildAndSignParameters(); } @@ -348,7 +350,11 @@ async function sendMessagesDataToSnode( messagesHashes: messagesToDelete, revokeSubRequest, unrevokeSubRequest, - }: WithMessagesHashes & WithRevokeSubRequest, + deleteAllMessagesSubRequest, + }: WithMessagesHashes & + WithRevokeSubRequest & { + deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; + }, method: MethodBatchType ): Promise { if (!asssociatedWith) { @@ -375,6 +381,7 @@ async function sendMessagesDataToSnode( deleteHashesSubRequest, revokeSubRequest, unrevokeSubRequest, + deleteAllMessagesSubRequest, ]); const targetNode = await SnodePool.getNodeFromSwarmOrThrow(asssociatedWith); @@ -564,10 +571,12 @@ async function sendEncryptedDataToSnode({ messagesHashesToDelete, revokeSubRequest, unrevokeSubRequest, + deleteAllMessagesSubRequest, }: WithRevokeSubRequest & { storeRequests: Array; destination: GroupPubkeyType | PubkeyType; messagesHashesToDelete: Set | null; + deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; }): Promise { try { const batchResults = await pRetry( @@ -579,6 +588,7 @@ async function sendEncryptedDataToSnode({ messagesHashes: [...(messagesHashesToDelete || [])], revokeSubRequest, unrevokeSubRequest, + deleteAllMessagesSubRequest, }, 'sequence' ); diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index 1cc7754b1b..efc977d68d 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -7,6 +7,7 @@ import { assertUnreachable } from '../../../../types/sqlSharedTypes'; import { isSignInByLinking } from '../../../../util/storage'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { + DeleteAllFromGroupMsgNodeSubRequest, StoreGroupConfigOrMessageSubRequest, StoreGroupExtraData, } from '../../../apis/snode_api/SnodeRequestTypes'; @@ -130,6 +131,7 @@ async function storeGroupUpdateMessages({ messagesHashesToDelete: null, revokeSubRequest: null, unrevokeSubRequest: null, + deleteAllMessagesSubRequest: null, }); const expectedReplyLength = updateMessagesRequests.length; // each of those messages are sent as a subrequest @@ -151,9 +153,11 @@ async function pushChangesToGroupSwarmIfNeeded({ unrevokeSubRequest, groupPk, supplementKeys, + deleteAllMessagesSubRequest, }: WithGroupPubkey & WithRevokeSubRequest & { supplementKeys: Array; + deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; }): Promise { // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc await LibSessionUtil.saveDumpsToDb(groupPk); @@ -161,7 +165,13 @@ async function pushChangesToGroupSwarmIfNeeded({ await LibSessionUtil.pendingChangesForGroup(groupPk); // If there are no pending changes then the job can just complete (next time something // is updated we want to try and run immediately so don't schedule another run in this case) - if (isEmpty(pendingConfigData) && !supplementKeys.length) { + if ( + isEmpty(pendingConfigData) && + !supplementKeys.length && + !revokeSubRequest && + !unrevokeSubRequest && + !deleteAllMessagesSubRequest + ) { return RunJobResult.Success; } @@ -233,14 +243,16 @@ async function pushChangesToGroupSwarmIfNeeded({ messagesHashesToDelete: allOldHashes, revokeSubRequest, unrevokeSubRequest, + deleteAllMessagesSubRequest, }); const expectedReplyLength = pendingConfigRequests.length + // each of those messages are sent as a subrequest keysEncryptedRequests.length + // each of those messages are sent as a subrequest - (allOldHashes.size ? 1 : 0) + // we are sending all hashes changes as a single request - (revokeSubRequest ? 1 : 0) + // we are sending all revoke updates as a single request - (unrevokeSubRequest ? 1 : 0); // we are sending all revoke updates as a single request + (allOldHashes.size ? 1 : 0) + // we are sending all hashes changes as a single subrequest + (revokeSubRequest ? 1 : 0) + // we are sending all revoke updates as a single subrequest + (unrevokeSubRequest ? 1 : 0) + // we are sending all revoke updates as a single subrequest + (deleteAllMessagesSubRequest ? 1 : 0); // a delete_all sub request is a single subrequest // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 94e1064442..ba978b05d4 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -38,7 +38,6 @@ import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; -import { SessionUtilConvoInfoVolatile } from '../../session/utils/libsession/libsession_utils_convo_info_volatile'; import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { @@ -52,7 +51,6 @@ import { import { StateType } from '../reducer'; import { openConversationWithMessages } from './conversations'; import { resetLeftOverlayMode } from './section'; -import { ed25519Str } from '../../session/utils/String'; type WithFromMemberLeftMessage = { fromMemberLeftMessage: boolean }; // there are some changes we want to skip when doing changes triggered from a memberLeft message. export type GroupState = { @@ -185,6 +183,7 @@ const initNewGroupInWrapper = createAsyncThunk( revokeSubRequest: null, unrevokeSubRequest: null, supplementKeys: [], + deleteAllMessagesSubRequest: null, }); if (result !== RunJobResult.Success) { window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); @@ -247,10 +246,12 @@ const initNewGroupInWrapper = createAsyncThunk( await MetaGroupWrapperActions.infoDestroy(groupPk); const foundConvo = ConvoHub.use().get(groupPk); if (foundConvo) { - await ConvoHub.use().deleteClosedGroup(groupPk, { + await ConvoHub.use().deleteGroup(groupPk, { fromSyncMessage: false, sendLeaveMessage: false, emptyGroupButKeepAsKicked: false, + deleteAllMessagesOnSwarm: false, + forceDestroyForAllMembers: false, }); } throw e; @@ -392,7 +393,6 @@ const loadMetaDumpsFromDB = createAsyncThunk( /** * This action is to be called when we get a merge event from the network. * It refreshes the state of that particular group (info & members) with the state from the wrapper after the merge is done. - * */ const refreshGroupDetailsFromWrapper = createAsyncThunk( 'group/refreshGroupDetailsFromWrapper', @@ -415,69 +415,6 @@ const refreshGroupDetailsFromWrapper = createAsyncThunk( } ); -const destroyGroupDetails = createAsyncThunk( - 'group/destroyGroupDetails', - async ({ groupPk }: { groupPk: GroupPubkeyType }) => { - const us = UserUtils.getOurPubKeyStrFromCache(); - const weAreAdmin = await checkWeAreAdmin(groupPk); - const allMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); - const otherAdminsCount = allMembers - .filter(m => m.admin || m.promoted) - .filter(m => m.pubkeyHex !== us).length; - - // we are the last admin promoted - if (weAreAdmin && otherAdminsCount === 0) { - // this marks the group info as deleted. We need to push those details - await MetaGroupWrapperActions.infoDestroy(groupPk); - const lastPushResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - revokeSubRequest: null, - unrevokeSubRequest: null, - supplementKeys: [], - }); - if (lastPushResult !== RunJobResult.Success) { - throw new Error(`Failed to destroyGroupDetails for pk ${ed25519Str(groupPk)}`); - } - } - - // this deletes the secretKey if we had it. If we need it for something, it has to be done before this call. - await UserGroupsWrapperActions.eraseGroup(groupPk); - - await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupPk); - await ConfigDumpData.deleteDumpFor(groupPk); - - getSwarmPollingInstance().removePubkey(groupPk, 'destroyGroupDetails'); - - return { groupPk }; - } -); - -const emptyGroupButKeepAsKicked = createAsyncThunk( - 'group/emptyGroupButKeepAsKicked', - async ({ groupPk }: { groupPk: GroupPubkeyType }) => { - window.log.info(`emptyGroupButKeepAsKicked for ${ed25519Str(groupPk)}`); - getSwarmPollingInstance().removePubkey(groupPk, 'emptyGroupButKeepAsKicked'); - - // this deletes the secretKey if we had it. If we need it for something, it has to be done before this call. - const group = await UserGroupsWrapperActions.getGroup(groupPk); - if (group) { - group.authData = null; - group.secretKey = null; - group.disappearingTimerSeconds = undefined; - group.kicked = true; - - await UserGroupsWrapperActions.setGroup(group); - } - await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupPk); - // release the memory (and the current meta-dumps in memory for that group) - await MetaGroupWrapperActions.free(groupPk); - // this deletes the dumps from the metagroup state only, not the details in the UserGroups wrapper itself. - await ConfigDumpData.deleteDumpFor(groupPk); - - return { groupPk }; - } -); - function validateMemberAddChange({ groupPk, withHistory: addMembersWithHistory, @@ -747,6 +684,7 @@ async function handleMemberAddedFromUI({ groupPk, supplementKeys, ...revokeUnrevokeParams, + deleteAllMessagesSubRequest: null, }); if (sequenceResult !== RunJobResult.Success) { throw new Error( @@ -868,6 +806,7 @@ async function handleMemberRemovedFromUI({ supplementKeys: [], revokeSubRequest: null, unrevokeSubRequest: null, + deleteAllMessagesSubRequest: null, }); if (sequenceResult !== RunJobResult.Success) { throw new Error( @@ -979,6 +918,7 @@ async function handleNameChangeFromUI({ supplementKeys: [], revokeSubRequest: null, unrevokeSubRequest: null, + deleteAllMessagesSubRequest: null, }); if (batchResult !== RunJobResult.Success) { @@ -1260,6 +1200,15 @@ const metaGroupSlice = createSlice({ ) { return applySendingStateChange({ changeType: 'promote', ...payload, state }); }, + removeGroupDetailsFromSlice( + state: GroupState, + { payload }: PayloadAction<{ groupPk: GroupPubkeyType }> + ) { + delete state.infos[payload.groupPk]; + delete state.members[payload.groupPk]; + delete state.membersInviteSending[payload.groupPk]; + delete state.membersPromoteSending[payload.groupPk]; + }, }, extraReducers: builder => { builder.addCase(initNewGroupInWrapper.fulfilled, (state, action) => { @@ -1316,22 +1265,7 @@ const metaGroupSlice = createSlice({ builder.addCase(refreshGroupDetailsFromWrapper.rejected, (_state, action) => { window.log.error('a refreshGroupDetailsFromWrapper was rejected', action.error); }); - builder.addCase(destroyGroupDetails.fulfilled, (state, action) => { - const { groupPk } = action.payload; - window.log.info(`removed 03 from metagroup wrapper ${ed25519Str(groupPk)}`); - deleteGroupPkEntriesFromState(state, groupPk); - }); - builder.addCase(destroyGroupDetails.rejected, (_state, action) => { - window.log.error('a destroyGroupDetails was rejected', action.error); - }); - builder.addCase(emptyGroupButKeepAsKicked.fulfilled, (state, action) => { - const { groupPk } = action.payload; - window.log.info(`markedAsKicked 03 from metagroup wrapper ${ed25519Str(groupPk)}`); - deleteGroupPkEntriesFromState(state, groupPk); - }); - builder.addCase(emptyGroupButKeepAsKicked.rejected, (_state, action) => { - window.log.error('a emptyGroupButKeepAsKicked was rejected', action.error); - }); + builder.addCase(handleUserGroupUpdate.fulfilled, (state, action) => { const { infos, members, groupPk } = action.payload; if (infos && members) { @@ -1437,8 +1371,6 @@ const metaGroupSlice = createSlice({ export const groupInfoActions = { initNewGroupInWrapper, loadMetaDumpsFromDB, - destroyGroupDetails, - emptyGroupButKeepAsKicked, refreshGroupDetailsFromWrapper, handleUserGroupUpdate, currentDeviceGroupMembersChange, diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index b8abcb0a87..a8c4b6b8b6 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -402,7 +402,7 @@ export function useSelectedNicknameOrProfileNameOrShortenedPubkey() { return window.i18n('noteToSelf'); } if (selectedId && PubKey.is03Pubkey(selectedId)) { - return libGroupName; + return libGroupName || profileName || shortenedPubkey; } return nickname || profileName || shortenedPubkey; } diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index c3c802364b..369aa218ed 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -608,6 +608,7 @@ export type LocalizerKeys = | 'youLeftTheGroup' | 'youSetYourDisappearingMessages' | 'youWereInvitedToGroup' + | 'youWereRemovedFrom' | 'yourSessionID' | 'yourUniqueSessionID' | 'zoomFactorSettingTitle'; diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 1257dd71e2..36b8a7c6c8 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -268,61 +268,6 @@ export function getLegacyGroupInfoFromDBValues({ return legacyGroup; } -/** - * This function should only be used to update the libsession fields of a 03-group. - * Most of the fields tracked in the usergroup wrapper in libsession are actually not updated - * once the entry is created, but some of them needs to be updated. - */ -export function getGroupInfoFromDBValues({ - id, - priority, - members: maybeMembers, - displayNameInProfile, - expirationMode, - expireTimer, - encPubkeyHex, - encSeckeyHex, - groupAdmins: maybeAdmins, - lastJoinedTimestamp, -}: { - id: string; - priority: number; - displayNameInProfile: string | undefined; - expirationMode: DisappearingMessageConversationModeType | undefined; - expireTimer: number | undefined; - encPubkeyHex: string; - encSeckeyHex: string; - members: string | Array; - groupAdmins: string | Array; - lastJoinedTimestamp: number; -}) { - const admins: Array = maybeArrayJSONtoArray(maybeAdmins); - const members: Array = maybeArrayJSONtoArray(maybeMembers); - - const wrappedMembers: Array = (members || []).map(m => { - return { - isAdmin: admins.includes(m), - pubkeyHex: m, - }; - }); - - const legacyGroup: LegacyGroupInfo = { - pubkeyHex: id, - name: displayNameInProfile || '', - priority: priority || 0, - members: wrappedMembers, - disappearingTimerSeconds: - expirationMode && expirationMode !== 'off' && !!expireTimer && expireTimer > 0 - ? expireTimer - : 0, - encPubkey: !isEmpty(encPubkeyHex) ? from_hex(encPubkeyHex) : new Uint8Array(), - encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(), - joinedAtSeconds: Math.floor(lastJoinedTimestamp / 1000), - }; - - return legacyGroup; -} - /** * This function can be used to make sure all the possible values as input of a switch as taken care off, without having a default case. * From 0a3d71fe0321b3323b515a4527d77f19f387be7c Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 4 Jun 2024 17:08:54 +1000 Subject: [PATCH 117/302] feat: delete msg on swarm when admin receives member request --- ts/data/sharedDataTypes.ts | 2 +- .../conversations/unsendingInteractions.ts | 11 +- ts/node/sql.ts | 14 +- ts/receiver/groupv2/handleGroupV2Message.ts | 26 +- ts/session/apis/snode_api/SNodeAPI.ts | 488 ++++++++++-------- .../apis/snode_api/SnodeRequestTypes.ts | 44 +- .../snode_api/signature/groupSignature.ts | 3 +- ts/session/sending/MessageSender.ts | 52 +- .../jobs/GroupPendingRemovalsJob.ts | 7 +- .../utils/job_runners/jobs/GroupSyncJob.ts | 106 +++- .../utils/job_runners/jobs/UserSyncJob.ts | 9 +- 11 files changed, 453 insertions(+), 309 deletions(-) diff --git a/ts/data/sharedDataTypes.ts b/ts/data/sharedDataTypes.ts index b7ba12572a..881a0c4861 100644 --- a/ts/data/sharedDataTypes.ts +++ b/ts/data/sharedDataTypes.ts @@ -24,4 +24,4 @@ export type DeleteAllMessageHashesInConversationMatchingAuthorType = ( author: PubkeyType; signatureTimestamp: number; } -) => PrArrayMsgIds; +) => Promise<{ msgIdsDeleted: Array; msgHashesDeleted: Array }>; diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 7f70aef2c5..c777a41734 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -126,7 +126,7 @@ async function unsendMessagesForEveryone( await unsendMessagesForEveryone1o1AndLegacy(conversation, conversation.id, msgsToDelete); } else if (conversation.isClosedGroupV2()) { if (!PubKey.is03Pubkey(destinationId)) { - throw new Error('invalid conversation id (03) for unsendMessageForEveryone'); + throw new Error('invalid conversation id (03) for unsendMessageForEveryone'); } await unsendMessagesForEveryoneGroupV2({ groupPk: destinationId, @@ -199,11 +199,10 @@ export async function deleteMessagesFromSwarmOnly( ); return false; } - const errorOnAtLeastOneSnode = await SnodeAPI.networkDeleteMessages( - deletionMessageHashes, - pubkey - ); - return errorOnAtLeastOneSnode; + if (PubKey.is03Pubkey(pubkey)) { + return await SnodeAPI.networkDeleteMessagesForGroup(deletionMessageHashes, pubkey); + } + return await SnodeAPI.networkDeleteMessageOurSwarm(deletionMessageHashes, pubkey); } catch (e) { window.log?.error( `deleteMessagesFromSwarmOnly: Error deleting message from swarm of ${ed25519Str(pubkey)}, hashes: ${deletionMessageHashes}`, diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 5c20dd8c37..5a886cb66a 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1134,14 +1134,18 @@ function deleteAllMessageHashesInConversationMatchingAuthor( instance?: BetterSqlite3.Database ): AwaitedReturn { if (!groupPk || !author || !messageHashes.length) { - return []; + return { msgHashesDeleted: [], msgIdsDeleted: [] }; } - return assertGlobalInstanceOrInstance(instance) + const results = assertGlobalInstanceOrInstance(instance) .prepare( - `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND source = ? AND sent_at <= ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING id` + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND source = ? AND sent_at <= ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING id, messageHash;` ) - .all(groupPk, author, signatureTimestamp, ...messageHashes) - .map(m => m.id); + .all(groupPk, author, signatureTimestamp, ...messageHashes); + + return { + msgHashesDeleted: results.map(m => m.messageHash), + msgIdsDeleted: results.map(m => m.id), + }; } function cleanUpExpirationTimerUpdateHistory( diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index f6261093da..9f35e11496 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -1,6 +1,7 @@ import { GroupPubkeyType, PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; import { isEmpty, isFinite, isNumber } from 'lodash'; import { Data } from '../../data/data'; +import { deleteMessagesFromSwarmOnly } from '../../interactions/conversations/unsendingInteractions'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; @@ -377,16 +378,27 @@ async function handleGroupDeleteMemberContentMessage({ if (isEmpty(change.adminSignature)) { // this is step 1. - const msgsDeleted = await Data.deleteAllMessageHashesInConversationMatchingAuthor({ - author, - groupPk, - messageHashes: change.messageHashes, - signatureTimestamp, - }); + const { msgIdsDeleted, msgHashesDeleted } = + await Data.deleteAllMessageHashesInConversationMatchingAuthor({ + author, + groupPk, + messageHashes: change.messageHashes, + signatureTimestamp, + }); window.inboxStore.dispatch( - messagesExpired(msgsDeleted.map(m => ({ conversationKey: groupPk, messageId: m }))) + messagesExpired(msgIdsDeleted.map(m => ({ conversationKey: groupPk, messageId: m }))) ); + + if (msgIdsDeleted.length) { + // Note: we `void` it because we don't want to hang while + // processing the handleGroupDeleteMemberContentMessage itself + // (we are running on the receiving pipeline here) + void deleteMessagesFromSwarmOnly(msgHashesDeleted, groupPk).catch(e => { + // we retry a bunch of times already, so if it still fails, there is not much we can do. + window.log.warn('deleteMessagesFromSwarmOnly failed with', e.message); + }); + } convo.updateLastMessage(); return; } diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 7b877d33ad..47d053a76f 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -14,7 +14,7 @@ import { BatchRequests } from './batchRequest'; import { SnodePool } from './snodePool'; import { StringUtils, UserUtils } from '../../utils'; import { ed25519Str, fromBase64ToArray, fromHexToArray } from '../../utils/String'; - +import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.'; @@ -30,124 +30,111 @@ const forceNetworkDeletion = async (): Promise | null> => { async () => { const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(usPk); const builtRequest = await request.buildAndSignParameters(); // we need the timestamp to verify the signature below - return pRetry( - async () => { - const ret = await BatchRequests.doSnodeBatchRequestNoRetries( - [builtRequest], - snodeToMakeRequestTo, - 10000, - usPk, - false - ); + const ret = await BatchRequests.doSnodeBatchRequestNoRetries( + [builtRequest], + snodeToMakeRequestTo, + 10000, + usPk, + false + ); - if (!ret || !ret?.[0].body || ret[0].code !== 200) { - throw new Error( - `Empty response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )}` - ); - } - - try { - const firstResultParsedBody = ret[0].body; - const { swarm } = firstResultParsedBody; - - if (!swarm) { - throw new Error( - `Invalid JSON swarm response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )}, ${firstResultParsedBody}` - ); - } - const swarmAsArray = Object.entries(swarm) as Array>; - if (!swarmAsArray.length) { - throw new Error( - `Invalid JSON swarmAsArray response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )}, ${firstResultParsedBody}` - ); - } - // results will only contains the snode pubkeys which returned invalid/empty results - const results: Array = compact( - swarmAsArray.map(snode => { - const snodePubkey = snode[0]; - const snodeJson = snode[1]; - - const isFailed = snodeJson.failed || false; - - if (isFailed) { - const reason = snodeJson.reason; - const statusCode = snodeJson.code; - if (reason && statusCode) { - window?.log?.warn( - `Could not ${request.method} from ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )} due to error: ${reason}: ${statusCode}` - ); - // if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to. - if (statusCode === 421) { - throw new pRetry.AbortError( - `421 error on network ${request.method}. Retrying with a new snode` - ); - } - } else { - window?.log?.warn( - `Could not ${request.method} from ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )}` - ); - } - return snodePubkey; - } + if (!ret || !ret?.[0].body || ret[0].code !== 200) { + throw new Error( + `Empty response got for ${request.method} on snode ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )}` + ); + } - const deletedObj = snodeJson.deleted as Record>; - const hashes: Array = []; + try { + const firstResultParsedBody = ret[0].body; + const { swarm } = firstResultParsedBody; - for (const key in deletedObj) { - if (deletedObj.hasOwnProperty(key)) { - hashes.push(...deletedObj[key]); - } - } - const sortedHashes = hashes.sort(); - const signatureSnode = snodeJson.signature as string; - // The signature format is (with sortedHashes accross all namespaces) ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] ) - const dataToVerify = `${usPk}${builtRequest.params.timestamp}${sortedHashes.join('')}`; - - const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8'); - const isValid = sodium.crypto_sign_verify_detached( - fromBase64ToArray(signatureSnode), - new Uint8Array(dataToVerifyUtf8), - fromHexToArray(snodePubkey) + if (!swarm) { + throw new Error( + `Invalid JSON swarm response got for ${request.method} on snode ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )}, ${firstResultParsedBody}` + ); + } + const swarmAsArray = Object.entries(swarm) as Array>; + if (!swarmAsArray.length) { + throw new Error( + `Invalid JSON swarmAsArray response got for ${request.method} on snode ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )}, ${firstResultParsedBody}` + ); + } + // results will only contains the snode pubkeys which returned invalid/empty results + const results: Array = compact( + swarmAsArray.map(snode => { + const snodePubkey = snode[0]; + const snodeJson = snode[1]; + + const isFailed = snodeJson.failed || false; + + if (isFailed) { + const reason = snodeJson.reason; + const statusCode = snodeJson.code; + if (reason && statusCode) { + window?.log?.warn( + `Could not ${request.method} from ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )} due to error: ${reason}: ${statusCode}` ); - if (!isValid) { - return snodePubkey; + // if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to. + if (statusCode === 421) { + throw new pRetry.AbortError( + `421 error on network ${request.method}. Retrying with a new snode` + ); } - return null; - }) - ); + } else { + window?.log?.warn( + `Could not ${request.method} from ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )}` + ); + } + return snodePubkey; + } - return results; - } catch (e) { - throw new Error( - `Invalid JSON response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )}, ${ret}` - ); - } - }, - { - retries: 3, - minTimeout: SnodeAPI.TEST_getMinTimeout(), - onFailedAttempt: e => { - window?.log?.warn( - `${request.method} INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...` + const deletedObj = snodeJson.deleted as Record>; + const hashes: Array = []; + + for (const key in deletedObj) { + if (deletedObj.hasOwnProperty(key)) { + hashes.push(...deletedObj[key]); + } + } + const sortedHashes = hashes.sort(); + const signatureSnode = snodeJson.signature as string; + // The signature format is (with sortedHashes accross all namespaces) ( PUBKEY_HEX || TIMESTAMP || DELETEDHASH[0] || ... || DELETEDHASH[N] ) + const dataToVerify = `${usPk}${builtRequest.params.timestamp}${sortedHashes.join('')}`; + + const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8'); + const isValid = sodium.crypto_sign_verify_detached( + fromBase64ToArray(signatureSnode), + new Uint8Array(dataToVerifyUtf8), + fromHexToArray(snodePubkey) ); - }, - } - ); + if (!isValid) { + return snodePubkey; + } + return null; + }) + ); + + return results; + } catch (e) { + throw new Error( + `Invalid JSON response got for ${request.method} on snode ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )}, ${ret}` + ); + } }, { - retries: 3, + retries: 5, minTimeout: SnodeAPI.TEST_getMinTimeout(), onFailedAttempt: e => { window?.log?.warn( @@ -167,141 +154,120 @@ const forceNetworkDeletion = async (): Promise | null> => { const TEST_getMinTimeout = () => 500; /** - * Locally deletes message and deletes message on the network (all nodes that contain the message) + * Delete the specified message hashes from the our own swarm only. + * Note: legacy group did not support removing messages from the swarm. */ -const networkDeleteMessages = async ( +const networkDeleteMessageOurSwarm = async ( messagesHashes: Array, - pubkey: PubkeyType | GroupPubkeyType + pubkey: PubkeyType ): Promise => { const sodium = await getSodiumRenderer(); - if (PubKey.is05Pubkey(pubkey) && pubkey !== UserUtils.getOurPubKeyStrFromCache()) { - throw new Error('networkDeleteMessages with 05 pk can only delete for ourself'); + if (!PubKey.is05Pubkey(pubkey) || pubkey !== UserUtils.getOurPubKeyStrFromCache()) { + throw new Error('networkDeleteMessageOurSwarm with 05 pk can only for our own swarm'); } - const request = PubKey.is03Pubkey(pubkey) - ? new DeleteHashesFromGroupNodeSubRequest({ messagesHashes, groupPk: pubkey }) - : new DeleteHashesFromUserNodeSubRequest({ messagesHashes }); + const request = new DeleteHashesFromUserNodeSubRequest({ messagesHashes }); try { const success = await pRetry( async () => { const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.pubkey); - return pRetry( - async () => { - const ret = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [request], - snodeToMakeRequestTo, - 10000, - request.pubkey, - false + const ret = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( + [request], + snodeToMakeRequestTo, + 10000, + request.pubkey, + false + ); + + if (!ret || !ret?.[0].body || ret[0].code !== 200) { + throw new Error( + `networkDeleteMessageOurSwarm: Empty response got for ${request.method} on snode ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )} about pk: ${ed25519Str(request.pubkey)}` + ); + } + + try { + const firstResultParsedBody = ret[0].body; + const { swarm } = firstResultParsedBody; + + if (!swarm) { + throw new Error( + `networkDeleteMessageOurSwarm: Invalid JSON swarm response got for ${request.method} on snode ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )}, ${firstResultParsedBody}` ); - debugger; + } + const swarmAsArray = Object.entries(swarm) as Array>; + if (!swarmAsArray.length) { + throw new Error( + `networkDeleteMessageOurSwarm: Invalid JSON swarmAsArray response got for ${request.method} on snode ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )}, ${firstResultParsedBody}` + ); + } + // results will only contains the snode pubkeys which returned invalid/empty results + const results: Array = compact( + swarmAsArray.map(snode => { + const snodePubkey = snode[0]; + const snodeJson = snode[1]; - if (!ret || !ret?.[0].body || ret[0].code !== 200) { - throw new Error( - `Empty response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )} about pk: ${ed25519Str(request.pubkey)}` - ); - } - - try { - const firstResultParsedBody = ret[0].body; - const { swarm } = firstResultParsedBody; - - if (!swarm) { - throw new Error( - `Invalid JSON swarm response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )}, ${firstResultParsedBody}` - ); - } - const swarmAsArray = Object.entries(swarm) as Array>; - if (!swarmAsArray.length) { - throw new Error( - `Invalid JSON swarmAsArray response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )}, ${firstResultParsedBody}` - ); - } - // results will only contains the snode pubkeys which returned invalid/empty results - const results: Array = compact( - swarmAsArray.map(snode => { - const snodePubkey = snode[0]; - const snodeJson = snode[1]; - - const isFailed = snodeJson.failed || false; - - if (isFailed) { - const reason = snodeJson.reason; - const statusCode = snodeJson.code; - if (reason && statusCode) { - window?.log?.warn( - `Could not ${request.method} from ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )} due to error: ${reason}: ${statusCode}` - ); - // if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to. - if (statusCode === 421) { - throw new pRetry.AbortError( - `421 error on network ${request.method}. Retrying with a new snode` - ); - } - } else { - window?.log?.warn( - `Could not ${request.method} from ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )}` - ); - } - return snodePubkey; - } + const isFailed = snodeJson.failed || false; - const responseHashes = snodeJson.deleted as Array; - const signatureSnode = snodeJson.signature as string; - // The signature looks like ( PUBKEY_HEX || RMSG[0] || ... || RMSG[N] || DMSG[0] || ... || DMSG[M] ) - const dataToVerify = `${request.pubkey}${messagesHashes.join( - '' - )}${responseHashes.join('')}`; - const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8'); - const isValid = sodium.crypto_sign_verify_detached( - fromBase64ToArray(signatureSnode), - new Uint8Array(dataToVerifyUtf8), - fromHexToArray(snodePubkey) + if (isFailed) { + const reason = snodeJson.reason; + const statusCode = snodeJson.code; + if (reason && statusCode) { + window?.log?.warn( + `networkDeleteMessageOurSwarm: Could not ${request.method} from ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )} due to error: ${reason}: ${statusCode}` ); - if (!isValid) { - return snodePubkey; - } - return null; - }) - ); + } else { + window?.log?.warn( + `networkDeleteMessageOurSwarm: Could not ${request.method} from ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )}` + ); + } + return snodePubkey; + } - return isEmpty(results); - } catch (e) { - throw new Error( - `Invalid JSON response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )}, ${ret}` - ); - } - }, - { - retries: 3, - minTimeout: SnodeAPI.TEST_getMinTimeout(), - onFailedAttempt: e => { - window?.log?.warn( - `${request.method} INNER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...` + const responseHashes = snodeJson.deleted as Array; + const signatureSnode = snodeJson.signature as string; + // The signature looks like ( PUBKEY_HEX || RMSG[0] || ... || RMSG[N] || DMSG[0] || ... || DMSG[M] ) + const dataToVerify = `${request.pubkey}${messagesHashes.join( + '' + )}${responseHashes.join('')}`; + const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8'); + const isValid = sodium.crypto_sign_verify_detached( + fromBase64ToArray(signatureSnode), + new Uint8Array(dataToVerifyUtf8), + fromHexToArray(snodePubkey) ); - }, - } - ); + if (!isValid) { + return snodePubkey; + } + return null; + }) + ); + + return isEmpty(results); + } catch (e) { + throw new Error( + `networkDeleteMessageOurSwarm: Invalid JSON response got for ${request.method} on snode ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )}, ${ret}` + ); + } }, { - retries: 3, + retries: 5, minTimeout: SnodeAPI.TEST_getMinTimeout(), onFailedAttempt: e => { window?.log?.warn( - `${request.method} OUTER request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}` + `networkDeleteMessageOurSwarm: ${request.method} request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}` ); }, } @@ -309,13 +275,85 @@ const networkDeleteMessages = async ( return success; } catch (e) { - window?.log?.warn(`failed to ${request.method} message on network:`, e); + window?.log?.warn( + `networkDeleteMessageOurSwarm: failed to ${request.method} message on network:`, + e + ); + return false; + } +}; + +/** + * Delete the specified message hashes from the 03-group's swarm. + * Returns true when the hashes have been removed successufuly. + * Returns false when + * - we don't have the secretKey + * - if one of the hash was already not present in the swarm, + * - if the request failed too many times + */ +const networkDeleteMessagesForGroup = async ( + messagesHashes: Array, + groupPk: GroupPubkeyType +): Promise => { + if (!PubKey.is03Pubkey(groupPk)) { + throw new Error('networkDeleteMessagesForGroup with 05 pk can only delete for ourself'); + } + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (!group || !group.secretKey || isEmpty(group.secretKey)) { + window.log.warn( + `networkDeleteMessagesForGroup: not deleting from swarm of 03-group ${messagesHashes.length} hashes as we do not the adminKey` + ); + return false; + } + + try { + const request = new DeleteHashesFromGroupNodeSubRequest({ + messagesHashes, + groupPk, + secretKey: group.secretKey, + }); + + await pRetry( + async () => { + const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.pubkey); + + const ret = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( + [request], + snodeToMakeRequestTo, + 10000, + request.pubkey, + false + ); + + if (!ret || !ret?.[0].body || ret[0].code !== 200) { + throw new Error( + `networkDeleteMessagesForGroup: Empty response got for ${request.method} on snode ${ed25519Str( + snodeToMakeRequestTo.pubkey_ed25519 + )} about pk: ${ed25519Str(request.pubkey)}` + ); + } + }, + { + retries: 5, + minTimeout: SnodeAPI.TEST_getMinTimeout(), + onFailedAttempt: e => { + window?.log?.warn( + `networkDeleteMessagesForGroup: ${request.method} request attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.message}` + ); + }, + } + ); + + return true; + } catch (e) { + window?.log?.warn(`networkDeleteMessagesForGroup: failed to delete messages on network:`, e); return false; } }; export const SnodeAPI = { TEST_getMinTimeout, - networkDeleteMessages, + networkDeleteMessagesForGroup, + networkDeleteMessageOurSwarm, forceNetworkDeletion, }; diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 512af0ac56..d0cf76a1cc 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -3,10 +3,10 @@ import { GroupPubkeyType, PubkeyType, WithGroupPubkey } from 'libsession_util_no import { from_hex } from 'libsodium-wrappers-sumo'; import { isEmpty, isString } from 'lodash'; import { AwaitedReturn, assertUnreachable } from '../../../types/sqlSharedTypes'; -import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { concatUInt8Array } from '../../crypto'; import { PubKey } from '../../types'; import { StringUtils, UserUtils } from '../../utils'; +import { ed25519Str } from '../../utils/String'; import { GetNetworkTime } from './getNetworkTime'; import { SnodeNamespace, @@ -25,7 +25,6 @@ import { WithSignature, WithTimestamp, } from './types'; -import { ed25519Str } from '../../utils/String'; type WithMaxSize = { max_size?: number }; export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; @@ -559,25 +558,25 @@ export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { public method = 'delete' as const; public readonly messageHashes: Array; public readonly pubkey: GroupPubkeyType; + public readonly secretKey: Uint8Array; - constructor(args: WithMessagesHashes & WithGroupPubkey) { + constructor(args: WithMessagesHashes & WithGroupPubkey & WithSecretKey) { super(); this.messageHashes = args.messagesHashes; this.pubkey = args.groupPk; + this.secretKey = args.secretKey; + if (!this.secretKey || isEmpty(this.secretKey)) { + throw new Error('DeleteHashesFromGroupNodeSubRequest needs a secretKey'); + } } public async buildAndSignParameters() { - const group = await UserGroupsWrapperActions.getGroup(this.pubkey); - if (!group) { - throw new Error('DeleteHashesFromGroupNodeSubRequest no such group found'); - } - // This will try to use the adminSecretKey if we have it, or the authData if we have it. - // Otherwise, it will throw + // Note: this request can only be made by an admin and will be denied otherwise, so we make the secretKey mandatory in the constructor. const signResult = await SnodeGroupSignature.getGroupSignatureByHashesParams({ method: this.method, messagesHashes: this.messageHashes, groupPk: this.pubkey, - group, + group: { authData: null, pubkeyHex: this.pubkey, secretKey: this.secretKey }, }); return { @@ -714,8 +713,9 @@ export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { public readonly destination: GroupPubkeyType; public readonly ttlMs: number; public readonly encryptedData: Uint8Array; - public readonly dbMessageIdentifier: string | null; + public readonly secretKey: Uint8Array | null; + public readonly authData: Uint8Array | null; constructor( args: WithGroupPubkey & { @@ -726,6 +726,8 @@ export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { ttlMs: number; encryptedData: Uint8Array; dbMessageIdentifier: string | null; + authData: Uint8Array | null; + secretKey: Uint8Array | null; } ) { super(); @@ -734,6 +736,8 @@ export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { this.ttlMs = args.ttlMs; this.encryptedData = args.encryptedData; this.dbMessageIdentifier = args.dbMessageIdentifier; + this.authData = args.authData; + this.secretKey = args.secretKey; if (isEmpty(this.encryptedData)) { throw new Error('this.encryptedData cannot be empty'); @@ -743,6 +747,16 @@ export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { 'StoreGroupConfigOrMessageSubRequest: groupconfig namespace required a 03 pubkey' ); } + if (isEmpty(this.secretKey) && isEmpty(this.authData)) { + throw new Error( + 'StoreGroupConfigOrMessageSubRequest needs either authData or secretKey to be set' + ); + } + if (SnodeNamespace.isGroupConfigNamespace(this.namespace) && isEmpty(this.secretKey)) { + throw new Error( + `StoreGroupConfigOrMessageSubRequest: groupconfig namespace [${this.namespace}] requires an adminSecretKey` + ); + } } public async buildAndSignParameters(): Promise<{ @@ -751,17 +765,11 @@ export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { }> { const encryptedDataBase64 = ByteBuffer.wrap(this.encryptedData).toString('base64'); - const found = await UserGroupsWrapperActions.getGroup(this.destination); - if (SnodeNamespace.isGroupConfigNamespace(this.namespace) && isEmpty(found?.secretKey)) { - throw new Error( - `groupconfig namespace [${this.namespace}] require an adminSecretKey for signature but we found none` - ); - } // this will either sign with our admin key or with the subaccount key if the admin one isn't there const signDetails = await SnodeGroupSignature.getSnodeGroupSignature({ method: this.method, namespace: this.namespace, - group: found, + group: { authData: this.authData, pubkeyHex: this.destination, secretKey: this.secretKey }, }); if (!signDetails) { diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 0843bc8a84..48f4151748 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -293,7 +293,6 @@ async function getGroupSignatureByHashesParams({ const signatureTimestamp = GetNetworkTime.now(); const sodium = await getSodiumRenderer(); - // N try { if (group.secretKey && !isEmpty(group.secretKey)) { const signature = sodium.crypto_sign_detached(message, group.secretKey); @@ -303,7 +302,7 @@ async function getGroupSignatureByHashesParams({ signature: signatureBase64, pubkey: group.pubkeyHex, messages: messagesHashes, - timestamp: signatureTimestamp, // TODO audric is this causing backend signature issues? + timestamp: signatureTimestamp, }; } diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index c327d5b656..1b8d435cca 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -50,7 +50,7 @@ import { } from '../apis/snode_api/signature/groupSignature'; import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/signature/snodeSignatures'; import { SnodePool } from '../apis/snode_api/snodePool'; -import { WithMessagesHashes, WithRevokeSubRequest } from '../apis/snode_api/types'; +import { WithRevokeSubRequest } from '../apis/snode_api/types'; import { TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; import { MessageEncrypter } from '../crypto/MessageEncrypter'; @@ -184,6 +184,13 @@ async function sendSingleMessage({ ); } } else if (PubKey.is03Pubkey(destination)) { + const group = await UserGroupsWrapperActions.getGroup(destination); + if (!group) { + window.log.warn( + `sendSingleMessage: no such group found in wrapper: ${ed25519Str(destination)}` + ); + throw new Error('sendSingleMessage: no such group found in wrapper'); + } if (SnodeNamespace.isGroupConfigNamespace(encryptedAndWrapped.namespace)) { subRequests.push( new StoreGroupConfigOrMessageSubRequest({ @@ -192,6 +199,7 @@ async function sendSingleMessage({ ttlMs: overridenTtl, groupPk: destination, dbMessageIdentifier: encryptedAndWrapped.identifier || null, + ...group, }) ); } else if (encryptedAndWrapped.namespace === SnodeNamespaces.ClosedGroupMessages) { @@ -202,6 +210,7 @@ async function sendSingleMessage({ ttlMs: overridenTtl, groupPk: destination, dbMessageIdentifier: encryptedAndWrapped.identifier || null, + ...group, }) ); } else { @@ -338,38 +347,33 @@ async function signSubRequests( return signedRequests; } -async function sendMessagesDataToSnode( +async function sendMessagesDataToSnode( storeRequests: Array< | StoreGroupConfigOrMessageSubRequest | StoreUserConfigSubRequest | StoreUserMessageSubRequest | StoreLegacyGroupMessageSubRequest >, - asssociatedWith: PubkeyType | GroupPubkeyType, + asssociatedWith: T, { - messagesHashes: messagesToDelete, revokeSubRequest, unrevokeSubRequest, + deleteHashesSubRequest, deleteAllMessagesSubRequest, - }: WithMessagesHashes & - WithRevokeSubRequest & { - deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; - }, + }: WithRevokeSubRequest & { + deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; + deleteHashesSubRequest: + | (T extends PubkeyType + ? DeleteHashesFromUserNodeSubRequest + : DeleteHashesFromGroupNodeSubRequest) + | null; + }, method: MethodBatchType ): Promise { if (!asssociatedWith) { throw new Error('sendMessagesDataToSnode first subrequest pubkey needs to be set'); } - const deleteHashesSubRequest = !messagesToDelete.length - ? null - : PubKey.is05Pubkey(asssociatedWith) - ? new DeleteHashesFromUserNodeSubRequest({ messagesHashes: messagesToDelete }) - : new DeleteHashesFromGroupNodeSubRequest({ - messagesHashes: messagesToDelete, - groupPk: asssociatedWith, - }); - if (storeRequests.some(m => m.destination !== asssociatedWith)) { throw new Error( 'sendMessagesDataToSnode tried to send batchrequest containing subrequest not for the right destination' @@ -565,17 +569,21 @@ async function encryptMessagesAndWrap( * @param destination the pubkey we should deposit those message to * @returns the hashes of successful deposit */ -async function sendEncryptedDataToSnode({ +async function sendEncryptedDataToSnode({ destination, storeRequests, - messagesHashesToDelete, + deleteHashesSubRequest, revokeSubRequest, unrevokeSubRequest, deleteAllMessagesSubRequest, }: WithRevokeSubRequest & { storeRequests: Array; - destination: GroupPubkeyType | PubkeyType; - messagesHashesToDelete: Set | null; + destination: T; + deleteHashesSubRequest: + | (T extends PubkeyType + ? DeleteHashesFromUserNodeSubRequest + : DeleteHashesFromGroupNodeSubRequest) + | null; deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; }): Promise { try { @@ -585,7 +593,7 @@ async function sendEncryptedDataToSnode({ storeRequests, destination, { - messagesHashes: [...(messagesHashesToDelete || [])], + deleteHashesSubRequest, revokeSubRequest, unrevokeSubRequest, deleteAllMessagesSubRequest, diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 75e70bce2d..ba14067f31 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -139,7 +139,6 @@ class GroupPendingRemovalsJob extends PersistedJob = updateMessages.map(updateMessage => { const wrapped = MessageSender.wrapContentIntoEnvelope( SignalService.Envelope.Type.SESSION_MESSAGE, @@ -122,13 +134,14 @@ async function storeGroupUpdateMessages({ namespace: m.namespace, ttlMs: m.ttl, dbMessageIdentifier: m.dbMessageIdentifier, + ...group, }); }); const result = await MessageSender.sendEncryptedDataToSnode({ storeRequests: [...updateMessagesRequests], destination: groupPk, - messagesHashesToDelete: null, + deleteHashesSubRequest: null, revokeSubRequest: null, unrevokeSubRequest: null, deleteAllMessagesSubRequest: null, @@ -172,6 +185,13 @@ async function pushChangesToGroupSwarmIfNeeded({ !unrevokeSubRequest && !deleteAllMessagesSubRequest ) { + window.log.debug(`pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: nothing to push`); + return RunJobResult.Success; + } + + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (!group) { + window.log.debug(`pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: group not found`); return RunJobResult.Success; } @@ -208,25 +228,75 @@ async function pushChangesToGroupSwarmIfNeeded({ data: keysEncrypted[index], })); - const pendingConfigRequests = pendingConfigMsgs.map(m => { - return new StoreGroupConfigOrMessageSubRequest({ - encryptedData: m.data, - groupPk, - namespace: m.namespace, - ttlMs: m.ttl, - dbMessageIdentifier: null, // those are config messages only, they have no dbMessageIdentifier + let pendingConfigRequests: Array = []; + let keysEncryptedRequests: Array = []; + + if (pendingConfigMsgs.length) { + if (!group.secretKey || isEmpty(group.secretKey)) { + window.log.debug( + `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: pendingConfigMsgs not empty but we do not have the secretKey` + ); + + throw new Error( + 'pushChangesToGroupSwarmIfNeeded: pendingConfigMsgs not empty but we do not have the secretKey' + ); + } + + pendingConfigRequests = pendingConfigMsgs.map(m => { + return new StoreGroupConfigOrMessageSubRequest({ + encryptedData: m.data, + groupPk, + namespace: m.namespace, + ttlMs: m.ttl, + dbMessageIdentifier: null, // those are config messages only, they have no dbMessageIdentifier + secretKey: group.secretKey, + authData: null, + }); }); - }); + } - const keysEncryptedRequests = keysEncryptedmessage.map(m => { - return new StoreGroupConfigOrMessageSubRequest({ - encryptedData: m.data, + if (keysEncryptedmessage.length) { + if (!group.secretKey || isEmpty(group.secretKey)) { + window.log.debug( + `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: keysEncryptedmessage not empty but we do not have the secretKey` + ); + + throw new Error( + 'pushChangesToGroupSwarmIfNeeded: keysEncryptedmessage not empty but we do not have the secretKey' + ); + } + keysEncryptedRequests = keysEncryptedmessage.map(m => { + return new StoreGroupConfigOrMessageSubRequest({ + encryptedData: m.data, + groupPk, + namespace: m.namespace, + ttlMs: m.ttl, + dbMessageIdentifier: null, // those are supplemental keys messages only, they have no dbMessageIdentifier + secretKey: group.secretKey, + authData: null, + }); + }); + } + + let deleteHashesSubRequest: DeleteHashesFromGroupNodeSubRequest | null = null; + const allOldHashesArray = [...allOldHashes]; + if (allOldHashesArray.length) { + if (!group.secretKey || isEmpty(group.secretKey)) { + window.log.debug( + `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: allOldHashesArray not empty but we do not have the secretKey` + ); + + throw new Error( + 'pushChangesToGroupSwarmIfNeeded: allOldHashesArray not empty but we do not have the secretKey' + ); + } + + deleteHashesSubRequest = new DeleteHashesFromGroupNodeSubRequest({ + messagesHashes: [...allOldHashes], groupPk, - namespace: m.namespace, - ttlMs: m.ttl, - dbMessageIdentifier: null, // those are supplemental keys messages only, they have no dbMessageIdentifier + secretKey: group.secretKey, }); - }); + } if ( revokeSubRequest?.revokeTokenHex.length === 0 || @@ -240,7 +310,7 @@ async function pushChangesToGroupSwarmIfNeeded({ const result = await MessageSender.sendEncryptedDataToSnode({ storeRequests: [...pendingConfigRequests, ...keysEncryptedRequests], destination: groupPk, - messagesHashesToDelete: allOldHashes, + deleteHashesSubRequest, revokeSubRequest, unrevokeSubRequest, deleteAllMessagesSubRequest, diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index 50d5fb3785..86fef80cbd 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -8,7 +8,10 @@ import { ConfigDumpData } from '../../../../data/configDump/configDump'; import { UserSyncJobDone } from '../../../../shims/events'; import { isSignInByLinking } from '../../../../util/storage'; import { GenericWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { StoreUserConfigSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; +import { + DeleteHashesFromUserNodeSubRequest, + StoreUserConfigSubRequest, +} from '../../../apis/snode_api/SnodeRequestTypes'; import { TTL_DEFAULT } from '../../../constants'; import { ConvoHub } from '../../../conversations'; import { MessageSender } from '../../../sending/MessageSender'; @@ -109,7 +112,9 @@ async function pushChangesToUserSwarmIfNeeded() { const result = await MessageSender.sendEncryptedDataToSnode({ storeRequests, destination: us, - messagesHashesToDelete: changesToPush.allOldHashes, + deleteHashesSubRequest: new DeleteHashesFromUserNodeSubRequest({ + messagesHashes: [...changesToPush.allOldHashes], + }), revokeSubRequest: null, unrevokeSubRequest: null, }); From 9d9844aeb46244436621c46ef8d3127da7b7e932 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 7 Jun 2024 16:01:36 +1000 Subject: [PATCH 118/302] feat: make group v2 control messages disappear --- protos/SignalService.proto | 20 +- .../overlay/OverlayRightPanelSettings.tsx | 9 +- ts/interactions/conversationInteractions.ts | 41 +- .../conversations/unsendingInteractions.ts | 2 +- ts/models/conversation.ts | 31 +- ts/models/message.ts | 13 +- ts/receiver/configMessage.ts | 6 + ts/receiver/contentMessage.ts | 2 +- ts/receiver/dataMessage.ts | 6 +- ts/receiver/groupv2/handleGroupV2Message.ts | 62 ++- .../apis/snode_api/SnodeRequestTypes.ts | 173 ++++++-- ts/session/apis/snode_api/batchRequest.ts | 1 + ts/session/apis/snode_api/retrieveRequest.ts | 25 +- ts/session/apis/snode_api/revokeSubaccount.ts | 2 - .../snode_api/signature/groupSignature.ts | 4 +- ts/session/apis/snode_api/swarmPolling.ts | 33 +- .../SwarmPollingGroupConfig.ts | 46 ++- .../conversations/ConversationController.ts | 117 +++--- ts/session/disappearing_messages/index.ts | 23 +- ts/session/disappearing_messages/types.ts | 2 + ts/session/group/closed-group.ts | 31 +- ...roupUpdateMemberLeftNotificationMessage.ts | 26 ++ .../ClosedGroupVisibleMessage.ts | 8 +- ts/session/sending/MessageQueue.ts | 7 +- ts/session/sending/MessageSender.ts | 370 +++++++++++------- ts/session/sending/MessageSentHandler.ts | 69 ++-- .../jobs/GroupPendingRemovalsJob.ts | 8 +- .../utils/job_runners/jobs/GroupSyncJob.ts | 59 ++- .../utils/job_runners/jobs/UserSyncJob.ts | 10 +- ts/state/ducks/metaGroups.ts | 128 ++++-- .../group_sync_job/GroupSyncJob_test.ts | 6 +- 31 files changed, 869 insertions(+), 471 deletions(-) create mode 100644 ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftNotificationMessage.ts diff --git a/protos/SignalService.proto b/protos/SignalService.proto index e90f16605f..010513269d 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -132,14 +132,20 @@ message GroupUpdateDeleteMemberContentMessage { optional bytes adminSignature = 3; } +message GroupUpdateMemberLeftNotificationMessage { + // the pubkey of the member left is included as part of the closed group encryption logic (senderIdentity on desktop) +} + message GroupUpdateMessage { - optional GroupUpdateInviteMessage inviteMessage = 1; - optional GroupUpdateInfoChangeMessage infoChangeMessage = 2; - optional GroupUpdateMemberChangeMessage memberChangeMessage = 3; - optional GroupUpdatePromoteMessage promoteMessage = 4; - optional GroupUpdateMemberLeftMessage memberLeftMessage = 5; - optional GroupUpdateInviteResponseMessage inviteResponse = 6; - optional GroupUpdateDeleteMemberContentMessage deleteMemberContent = 7; + optional GroupUpdateInviteMessage inviteMessage = 1; + optional GroupUpdateInfoChangeMessage infoChangeMessage = 2; + optional GroupUpdateMemberChangeMessage memberChangeMessage = 3; + optional GroupUpdatePromoteMessage promoteMessage = 4; + optional GroupUpdateMemberLeftMessage memberLeftMessage = 5; + optional GroupUpdateInviteResponseMessage inviteResponse = 6; + optional GroupUpdateDeleteMemberContentMessage deleteMemberContent = 7; + optional GroupUpdateMemberLeftNotificationMessage memberLeftNotificationMessage = 8; + } diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index b78259066a..94646a220f 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -21,7 +21,6 @@ import { showRemoveModeratorsByConvoId, showUpdateGroupMembersByConvoId, showUpdateGroupNameByConvoId, - triggerFakeAvatarUpdate, } from '../../../../interactions/conversationInteractions'; import { Constants } from '../../../../session'; import { ConvoHub } from '../../../../session/conversations'; @@ -53,6 +52,7 @@ import { PanelButtonGroup, PanelIconButton } from '../../../buttons'; import { MediaItemType } from '../../../lightbox/LightboxGallery'; import { MediaGallery } from '../../media-gallery/MediaGallery'; import { Header, StyledScrollContainer } from './components'; +import { groupInfoActions } from '../../../../state/ducks/metaGroups'; async function getMediaGalleryProps(conversationId: string): Promise<{ documents: Array; @@ -342,7 +342,12 @@ export const OverlayRightPanelSettings = () => { iconType={'group'} text={'trigger avatar message'} // debugger FIXME Audric onClick={() => { - void triggerFakeAvatarUpdate(selectedConvoKey); + if (!PubKey.is03Pubkey(selectedConvoKey)) { + throw new Error('triggerFakeAvatarUpdate needs a 03 pubkey'); + } + window.inboxStore.dispatch( + groupInfoActions.triggerFakeAvatarUpdate({ groupPk: selectedConvoKey }) + ); }} dataTestId="edit-group-name" /> diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 59b696cf92..4f52b41b29 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -1,4 +1,4 @@ -import { isEmpty, isNil } from 'lodash'; +import { isNil } from 'lodash'; import { ConversationNotificationSettingType, ConversationTypeEnum, @@ -10,7 +10,6 @@ import { SessionButtonColor } from '../components/basic/SessionButton'; import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings'; import { Data } from '../data/data'; import { SettingsKey } from '../data/settings-key'; -import { SignalService } from '../protobuf'; import { GroupV2Receiver } from '../receiver/groupv2/handleGroupV2Message'; import { uploadFileToFsWithOnionV4 } from '../session/apis/file_server_api/FileServerApi'; import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; @@ -20,12 +19,10 @@ import { ConvoHub } from '../session/conversations'; import { getSodiumRenderer } from '../session/crypto'; import { DecryptedAttachmentsManager } from '../session/crypto/DecryptedAttachmentsManager'; import { DisappearingMessageConversationModeType } from '../session/disappearing_messages/types'; -import { GroupUpdateInfoChangeMessage } from '../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { PubKey } from '../session/types'; import { perfEnd, perfStart } from '../session/utils/Performance'; import { sleepFor } from '../session/utils/Promise'; import { ed25519Str, fromHexToArray, toHex } from '../session/utils/String'; -import { GroupSync } from '../session/utils/job_runners/jobs/GroupSyncJob'; import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils'; @@ -324,42 +321,6 @@ export async function showUpdateGroupNameByConvoId(conversationId: string) { window.inboxStore?.dispatch(updateGroupNameModal({ conversationId })); } -export async function triggerFakeAvatarUpdate(conversationId: string) { - if (!PubKey.is03Pubkey(conversationId)) { - throw new Error('triggerAvatarUpdate only works for groupv2'); - } - const convo = ConvoHub.use().get(conversationId); - const group = await UserGroupsWrapperActions.getGroup(conversationId); - if (!convo || !group || !group.secretKey || isEmpty(group.secretKey)) { - throw new Error( - 'triggerFakeAvatarUpdate: tried to make change to group but we do not have the admin secret key' - ); - } - - const createdAt = GetNetworkTime.now(); - - const msgModel = await convo.addSingleOutgoingMessage({ - group_update: { avatarChange: true }, - sent_at: createdAt, - // the store below will mark the message as sent based on msgModel.id - }); - await msgModel.commit(); - const updateMsg = new GroupUpdateInfoChangeMessage({ - createAtNetworkTimestamp: createdAt, - typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR, - expirationType: 'unknown', - expireTimer: 0, - groupPk: conversationId, - identifier: msgModel.id, - secretKey: group.secretKey, - sodium: await getSodiumRenderer(), - }); - await GroupSync.storeGroupUpdateMessages({ - groupPk: conversationId, - updateMessages: [updateMsg], - }); -} - export async function showUpdateGroupMembersByConvoId(conversationId: string) { const conversation = ConvoHub.use().get(conversationId); if (conversation.isClosedGroup()) { diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index c777a41734..875f63ba3e 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -87,7 +87,7 @@ export async function unsendMessagesForEveryoneGroupV2({ await getMessageQueue().sendToGroupV2NonDurably({ message: new GroupUpdateDeleteMemberContentMessage({ createAtNetworkTimestamp: GetNetworkTime.now(), - expirationType: 'unknown', + expirationType: 'unknown', // this is not displayed so not expiring. expireTimer: 0, groupPk, memberSessionIds: allMessagesFrom, diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index f160c27e3b..109ca2b65c 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -134,7 +134,10 @@ import { GroupSync } from '../session/utils/job_runners/jobs/GroupSyncJob'; import { UpdateMsgExpirySwarm } from '../session/utils/job_runners/jobs/UpdateMsgExpirySwarmJob'; import { getLibGroupKickedOutsideRedux } from '../state/selectors/userGroups'; import { ReleasedFeatures } from '../util/releaseFeature'; -import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../webworker/workers/browser/libsession_worker_interface'; import { markAttributesAsReadIfNeeded } from './messageFactory'; type InMemoryConvoInfos = { @@ -1008,10 +1011,11 @@ export class ConversationModel extends Backbone.Model { } } - // Note: we agreed that a closed group ControlMessage message does not expire. + // Note: we agreed that a **legacy closed** group ControlMessage message does not expire. + // Group v2 on the other hand, have expiring disappearing control message message.set({ - expirationType: this.isClosedGroup() ? 'unknown' : expirationType, - expireTimer: this.isClosedGroup() ? 0 : expireTimer, + expirationType: this.isClosedGroup() && !this.isClosedGroupV2() ? 'unknown' : expirationType, + expireTimer: this.isClosedGroup() && !this.isClosedGroupV2() ? 0 : expireTimer, }); if (!message.get('id')) { @@ -1038,7 +1042,8 @@ export class ConversationModel extends Backbone.Model { if (!message.getExpirationStartTimestamp()) { // Note: we agreed that a closed group ControlMessage message does not expire. - const canBeDeleteAfterSend = this.isMe() || !(this.isGroup() && message.isControlMessage()); + const canBeDeleteAfterSend = + this.isMe() || !(this.isGroup() && !this.isClosedGroupV2() && message.isControlMessage()); if ( (canBeDeleteAfterSend && expirationMode === 'legacy') || expirationMode === 'deleteAfterSend' @@ -1104,6 +1109,9 @@ export class ConversationModel extends Backbone.Model { 'trying to change timer for a group we do not have the secretKey is not possible' ); } + const info = await MetaGroupWrapperActions.infoGet(this.id); + info.expirySeconds = expireUpdate.expireTimer; + await MetaGroupWrapperActions.infoSet(this.id, info); const v2groupMessage = new GroupUpdateInfoChangeMessage({ typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES, ...expireUpdate, @@ -1114,10 +1122,22 @@ export class ConversationModel extends Backbone.Model { updatedExpirationSeconds: expireUpdate.expireTimer, }); + // TODO audric debugger, make pushChangesToGroupSwarmIfNeeded take extraStoreRequests + // but we'd also need to add a way to make a store subrequest from a v2groupMessage. + // we should be able to simplify a fair bit the GroupSyncJob file. + // i.e. we need an easy way (separate file) to wrap a message into a subrequest + await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk: this.id, + revokeSubRequest: null, + unrevokeSubRequest: null, + deleteAllMessagesSubRequest: null, + encryptedSupplementKeys: [], + }); await GroupSync.storeGroupUpdateMessages({ groupPk: this.id, updateMessages: [v2groupMessage], }); + await GroupSync.queueNewJobIfNeeded(this.id); return true; } @@ -2176,7 +2196,6 @@ export class ConversationModel extends Backbone.Model { const groupVisibleMessage = new ClosedGroupV2VisibleMessage({ chatMessage: visibleMessage, destination: this.id, - namespace: SnodeNamespaces.ClosedGroupMessages, }); // we need the return await so that errors are caught in the catch {} diff --git a/ts/models/message.ts b/ts/models/message.ts index af565014b2..836fc5adc4 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -928,7 +928,6 @@ export class MessageModel extends Backbone.Model { const groupV2VisibleMessage = new ClosedGroupV2VisibleMessage({ destination: PubKey.cast(this.get('conversationId')).key as GroupPubkeyType, chatMessage, - namespace: SnodeNamespaces.ClosedGroupMessages, }); // we need the return await so that errors are caught in the catch {} return await getMessageQueue().sendToGroupV2({ @@ -1001,13 +1000,17 @@ export class MessageModel extends Backbone.Model { * * @param messageHash */ - public async updateMessageHash(messageHash: string) { + public updateMessageHash(messageHash: string) { if (!messageHash) { window?.log?.error('Message hash not provided to update message hash'); } - this.set({ - messageHash, - }); + if (this.get('messageHash') !== messageHash) { + window?.log?.info(`updated message ${this.id} with hash: ${messageHash}`); + + this.set({ + messageHash, + }); + } } public async sendSyncMessageOnly(contentMessage: ContentMessage) { diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 66cc98b458..cad2b845f2 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -719,11 +719,17 @@ async function handleSingleGroupUpdate({ if (!ConvoHub.use().get(groupPk)) { const created = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); const joinedAt = groupInWrapper.joinedAtSeconds * 1000 || Date.now(); + const expireTimer = + groupInWrapper.disappearingTimerSeconds && groupInWrapper.disappearingTimerSeconds > 0 + ? groupInWrapper.disappearingTimerSeconds + : undefined; created.set({ active_at: joinedAt, displayNameInProfile: groupInWrapper.name || undefined, priority: groupInWrapper.priority, lastJoinedTimestamp: joinedAt, + expireTimer, + expirationMode: expireTimer ? 'deleteAfterSend' : 'off', }); await created.commit(); getSwarmPollingInstance().addGroupId(PubKey.cast(groupPk)); diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 7a28f75212..aba12d4126 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -549,7 +549,7 @@ export async function innerHandleSwarmContentMessage({ rawDataMessage: content.dataMessage as SignalService.DataMessage, messageHash, senderConversationModel, - expireUpdate, + expireUpdate: expireUpdate || null, }); return; diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index 1ad0b26a30..42bf4cb646 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -21,7 +21,7 @@ import { createSwarmMessageSentFromUs, } from '../models/messageFactory'; import { DisappearingMessages } from '../session/disappearing_messages'; -import { DisappearingMessageUpdate } from '../session/disappearing_messages/types'; +import { WithDisappearingMessageUpdate } from '../session/disappearing_messages/types'; import { ProfileManager } from '../session/profile_manager/ProfileManager'; import { isUsFromCache } from '../session/utils/User'; import { Action, Reaction } from '../types/Reaction'; @@ -155,13 +155,12 @@ export async function handleSwarmDataMessage({ senderConversationModel, sentAtTimestamp, expireUpdate, -}: { +}: WithDisappearingMessageUpdate & { envelope: EnvelopePlus; sentAtTimestamp: number; rawDataMessage: SignalService.DataMessage; messageHash: string; senderConversationModel: ConversationModel; - expireUpdate?: DisappearingMessageUpdate; }): Promise { window.log.info('handleSwarmDataMessage'); @@ -173,6 +172,7 @@ export async function handleSwarmDataMessage({ updateMessage: rawDataMessage.groupUpdateMessage as SignalService.GroupUpdateMessage, source: envelope.source, senderIdentity: envelope.senderIdentity, + expireUpdate, }); // Groups update should always be able to be decrypted as we get the keys before trying to decrypt them. // If decryption failed once, it will keep failing, so no need to keep it in the cache. diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 9f35e11496..bd69cb6023 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -10,6 +10,7 @@ import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../../session/conversations'; import { getSodiumRenderer } from '../../session/crypto'; +import { WithDisappearingMessageUpdate } from '../../session/disappearing_messages/types'; import { ClosedGroup } from '../../session/group/closed-group'; import { GroupUpdateInviteResponseMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage'; import { PubKey } from '../../session/types'; @@ -40,9 +41,12 @@ type GroupInviteDetails = { } & WithSignatureTimestamp & WithAuthor; -type GroupUpdateGeneric = { change: Omit } & WithSignatureTimestamp & +type GroupUpdateGeneric = { + change: Omit; +} & WithSignatureTimestamp & WithGroupPubkey & - WithAuthor; + WithAuthor & + WithDisappearingMessageUpdate; type GroupUpdateDetails = { updateMessage: SignalService.GroupUpdateMessage; @@ -61,7 +65,7 @@ async function sendInviteResponseToGroup({ groupPk }: { groupPk: GroupPubkeyType groupPk, isApproved: true, createAtNetworkTimestamp: GetNetworkTime.now(), - expirationType: 'unknown', // TODO audric do we want those not expiring? + expirationType: 'unknown', // an invite should not expire expireTimer: 0, }), }); @@ -187,6 +191,7 @@ async function handleGroupInfoChangeMessage({ groupPk, signatureTimestamp, author, + expireUpdate, }: GroupUpdateGeneric) { const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), @@ -211,7 +216,7 @@ async function handleGroupInfoChangeMessage({ diff: { type: 'name', newName: change.updatedName }, sender: author, sentAt: signatureTimestamp, - expireUpdate: null, + expireUpdate, markAlreadySent: true, }); @@ -223,7 +228,7 @@ async function handleGroupInfoChangeMessage({ diff: { type: 'avatarChange' }, sender: author, sentAt: signatureTimestamp, - expireUpdate: null, + expireUpdate, markAlreadySent: true, }); break; @@ -257,6 +262,7 @@ async function handleGroupMemberChangeMessage({ groupPk, signatureTimestamp, author, + expireUpdate, }: GroupUpdateGeneric) { const convo = ConvoHub.use().get(groupPk); if (!convo) { @@ -284,7 +290,7 @@ async function handleGroupMemberChangeMessage({ convo, sender: author, sentAt: signatureTimestamp, - expireUpdate: null, + expireUpdate, markAlreadySent: true, }; @@ -322,7 +328,6 @@ async function handleGroupMemberChangeMessage({ async function handleGroupMemberLeftMessage({ groupPk, - signatureTimestamp, author, }: GroupUpdateGeneric) { // No need to verify sig, the author is already verified with the libsession.decrypt() @@ -340,19 +345,34 @@ async function handleGroupMemberLeftMessage({ }) ); + // TODO We should process this message type even if the sender is blocked +} + +async function handleGroupUpdateMemberLeftNotificationMessage({ + groupPk, + signatureTimestamp, + author, + expireUpdate, +}: GroupUpdateGeneric) { + // No need to verify sig, the author is already verified with the libsession.decrypt() + const convo = ConvoHub.use().get(groupPk); + if (!convo || !PubKey.is05Pubkey(author)) { + return; + } + window.log.info(`handleGroupUpdateMemberLeftNotificationMessage for ${ed25519Str(groupPk)}`); + await ClosedGroup.addUpdateMessage({ convo, diff: { type: 'left', left: [author] }, sender: author, sentAt: signatureTimestamp, - expireUpdate: null, + expireUpdate, markAlreadySent: true, }); convo.set({ active_at: signatureTimestamp, }); - // TODO We should process this message type even if the sender is blocked } async function handleGroupDeleteMemberContentMessage({ @@ -445,7 +465,10 @@ async function handleGroupUpdateInviteResponseMessage({ groupPk, change, author, -}: Omit, 'signatureTimestamp'>) { +}: Omit< + GroupUpdateGeneric, + 'signatureTimestamp' | 'expireUpdate' +>) { // no sig verify for this type of message const convo = ConvoHub.use().get(groupPk); if (!convo) { @@ -505,7 +528,10 @@ async function handleGroupUpdatePromoteMessage({ } async function handle1o1GroupUpdateMessage( - details: GroupUpdateDetails & WithUncheckedSource & WithUncheckedSenderIdentity + details: GroupUpdateDetails & + WithUncheckedSource & + WithUncheckedSenderIdentity & + WithDisappearingMessageUpdate ) { // the message types below are received from our own swarm, so source is the sender, and senderIdentity is empty @@ -537,7 +563,10 @@ async function handle1o1GroupUpdateMessage( } async function handleGroupUpdateMessage( - details: GroupUpdateDetails & WithUncheckedSource & WithUncheckedSenderIdentity + details: GroupUpdateDetails & + WithUncheckedSource & + WithUncheckedSenderIdentity & + WithDisappearingMessageUpdate ) { const was1o1Message = await handle1o1GroupUpdateMessage(details); if (was1o1Message) { @@ -577,6 +606,15 @@ async function handleGroupUpdateMessage( }); return; } + + if (details.updateMessage.memberLeftNotificationMessage) { + await handleGroupUpdateMemberLeftNotificationMessage({ + change: details.updateMessage + .memberLeftNotificationMessage as SignalService.GroupUpdateMemberLeftNotificationMessage, + ...detailsWithContext, + }); + return; + } if (details.updateMessage.deleteMemberContent) { await handleGroupDeleteMemberContentMessage({ change: details.updateMessage diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index d0cf76a1cc..155a5ae7ba 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -396,6 +396,10 @@ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { constructor(args: WithMessagesHashes) { super(); this.messageHashes = args.messagesHashes; + if (this.messageHashes.length === 0) { + window.log.warn(`GetExpiriesFromNodeSubRequest given empty list of messageHashes`); + throw new Error('GetExpiriesFromNodeSubRequest given empty list of messageHashes'); + } } /** * For Revoke/unrevoke, this needs an admin signature @@ -522,6 +526,11 @@ export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { super(); this.messageHashes = args.messagesHashes; this.pubkey = UserUtils.getOurPubKeyStrFromCache(); + + if (this.messageHashes.length === 0) { + window.log.warn(`DeleteHashesFromUserNodeSubRequest given empty list of messageHashes`); + throw new Error('DeleteHashesFromUserNodeSubRequest given empty list of messageHashes'); + } } public async buildAndSignParameters() { @@ -568,6 +577,14 @@ export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { if (!this.secretKey || isEmpty(this.secretKey)) { throw new Error('DeleteHashesFromGroupNodeSubRequest needs a secretKey'); } + + if (this.messageHashes.length === 0) { + window.log.warn( + `DeleteHashesFromGroupNodeSubRequest given empty list of messageHashes for ${ed25519Str(this.pubkey)}` + ); + + throw new Error('DeleteHashesFromGroupNodeSubRequest given empty list of messageHashes'); + } } public async buildAndSignParameters() { @@ -605,6 +622,12 @@ export class UpdateExpiryOnNodeUserSubRequest extends SnodeAPISubRequest { this.messageHashes = args.messagesHashes; this.expiryMs = args.expiryMs; this.shortenOrExtend = args.shortenOrExtend; + + if (this.messageHashes.length === 0) { + window.log.warn(`UpdateExpiryOnNodeUserSubRequest given empty list of messageHashes`); + + throw new Error('UpdateExpiryOnNodeUserSubRequest given empty list of messageHashes'); + } } public async buildAndSignParameters() { @@ -664,6 +687,14 @@ export class UpdateExpiryOnNodeGroupSubRequest extends SnodeAPISubRequest { this.expiryMs = args.expiryMs; this.shortenOrExtend = args.shortenOrExtend; this.groupDetailsNeededForSignature = args.groupDetailsNeededForSignature; + + if (this.messageHashes.length === 0) { + window.log.warn( + `UpdateExpiryOnNodeGroupSubRequest given empty list of messageHashes for ${ed25519Str(this.groupDetailsNeededForSignature.pubkeyHex)}` + ); + + throw new Error('UpdateExpiryOnNodeGroupSubRequest given empty list of messageHashes'); + } } public async buildAndSignParameters() { @@ -704,28 +735,105 @@ export class UpdateExpiryOnNodeGroupSubRequest extends SnodeAPISubRequest { } } -export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { +type WithCreatedAtNetworkTimestamp = { createdAtNetworkTimestamp: number }; + +export class StoreGroupMessageSubRequest extends SnodeAPISubRequest { + public method = 'store' as const; + public readonly namespace = SnodeNamespaces.ClosedGroupMessages; + public readonly destination: GroupPubkeyType; + public readonly ttlMs: number; + public readonly encryptedData: Uint8Array; + public readonly dbMessageIdentifier: string | null; + public readonly secretKey: Uint8Array | null; + public readonly authData: Uint8Array | null; + public readonly createdAtNetworkTimestamp: number; + + constructor( + args: WithGroupPubkey & + WithCreatedAtNetworkTimestamp & { + ttlMs: number; + encryptedData: Uint8Array; + dbMessageIdentifier: string | null; + authData: Uint8Array | null; + secretKey: Uint8Array | null; + } + ) { + super(); + this.destination = args.groupPk; + this.ttlMs = args.ttlMs; + this.encryptedData = args.encryptedData; + this.dbMessageIdentifier = args.dbMessageIdentifier; + this.authData = args.authData; + this.secretKey = args.secretKey; + this.createdAtNetworkTimestamp = args.createdAtNetworkTimestamp; + + if (isEmpty(this.encryptedData)) { + throw new Error('this.encryptedData cannot be empty'); + } + if (!PubKey.is03Pubkey(this.destination)) { + throw new Error('StoreGroupMessageSubRequest: groupconfig namespace required a 03 pubkey'); + } + if (isEmpty(this.secretKey) && isEmpty(this.authData)) { + throw new Error('StoreGroupMessageSubRequest needs either authData or secretKey to be set'); + } + if (SnodeNamespace.isGroupConfigNamespace(this.namespace) && isEmpty(this.secretKey)) { + throw new Error( + `StoreGroupMessageSubRequest: groupconfig namespace [${this.namespace}] requires an adminSecretKey` + ); + } + } + + public async buildAndSignParameters(): Promise<{ + method: 'store'; + params: StoreOnNodeNormalParams; + }> { + const encryptedDataBase64 = ByteBuffer.wrap(this.encryptedData).toString('base64'); + + // this will either sign with our admin key or with the subaccount key if the admin one isn't there + const signDetails = await SnodeGroupSignature.getSnodeGroupSignature({ + method: this.method, + namespace: this.namespace, + group: { authData: this.authData, pubkeyHex: this.destination, secretKey: this.secretKey }, + }); + + if (!signDetails) { + throw new Error(`[${this.loggingId()}] sign details is empty result`); + } + + return { + method: this.method, + params: { + namespace: this.namespace, + ttl: this.ttlMs, + data: encryptedDataBase64, + ...signDetails, + }, + }; + } + + public loggingId(): string { + return `${this.method}-${ed25519Str(this.destination)}-${SnodeNamespace.toRole( + this.namespace + )}`; + } +} + +export class StoreGroupConfigSubRequest extends SnodeAPISubRequest { public method = 'store' as const; public readonly namespace: | SnodeNamespacesGroupConfig - | SnodeNamespaces.ClosedGroupMessages | SnodeNamespaces.ClosedGroupRevokedRetrievableMessages; public readonly destination: GroupPubkeyType; public readonly ttlMs: number; public readonly encryptedData: Uint8Array; - public readonly dbMessageIdentifier: string | null; public readonly secretKey: Uint8Array | null; public readonly authData: Uint8Array | null; constructor( args: WithGroupPubkey & { - namespace: - | SnodeNamespacesGroupConfig - | SnodeNamespaces.ClosedGroupMessages - | SnodeNamespaces.ClosedGroupRevokedRetrievableMessages; + namespace: SnodeNamespacesGroupConfig | SnodeNamespaces.ClosedGroupRevokedRetrievableMessages; ttlMs: number; encryptedData: Uint8Array; - dbMessageIdentifier: string | null; authData: Uint8Array | null; secretKey: Uint8Array | null; } @@ -735,7 +843,6 @@ export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { this.destination = args.groupPk; this.ttlMs = args.ttlMs; this.encryptedData = args.encryptedData; - this.dbMessageIdentifier = args.dbMessageIdentifier; this.authData = args.authData; this.secretKey = args.secretKey; @@ -743,18 +850,14 @@ export class StoreGroupConfigOrMessageSubRequest extends SnodeAPISubRequest { throw new Error('this.encryptedData cannot be empty'); } if (!PubKey.is03Pubkey(this.destination)) { - throw new Error( - 'StoreGroupConfigOrMessageSubRequest: groupconfig namespace required a 03 pubkey' - ); + throw new Error('StoreGroupConfigSubRequest: groupconfig namespace required a 03 pubkey'); } if (isEmpty(this.secretKey) && isEmpty(this.authData)) { - throw new Error( - 'StoreGroupConfigOrMessageSubRequest needs either authData or secretKey to be set' - ); + throw new Error('StoreGroupConfigSubRequest needs either authData or secretKey to be set'); } if (SnodeNamespace.isGroupConfigNamespace(this.namespace) && isEmpty(this.secretKey)) { throw new Error( - `StoreGroupConfigOrMessageSubRequest: groupconfig namespace [${this.namespace}] requires an adminSecretKey` + `StoreGroupConfigSubRequest: groupconfig namespace [${this.namespace}] requires an adminSecretKey` ); } } @@ -868,18 +971,22 @@ export class StoreUserMessageSubRequest extends SnodeAPISubRequest { public readonly namespace = SnodeNamespaces.Default; public readonly destination: PubkeyType; public readonly dbMessageIdentifier: string | null; + public readonly createdAtNetworkTimestamp: number; - constructor(args: { - ttlMs: number; - encryptedData: Uint8Array; - destination: PubkeyType; - dbMessageIdentifier: string | null; - }) { + constructor( + args: WithCreatedAtNetworkTimestamp & { + ttlMs: number; + encryptedData: Uint8Array; + destination: PubkeyType; + dbMessageIdentifier: string | null; + } + ) { super(); this.ttlMs = args.ttlMs; this.destination = args.destination; this.encryptedData = args.encryptedData; this.dbMessageIdentifier = args.dbMessageIdentifier; + this.createdAtNetworkTimestamp = args.createdAtNetworkTimestamp; if (isEmpty(this.encryptedData)) { throw new Error('this.encryptedData cannot be empty'); @@ -923,18 +1030,22 @@ export class StoreLegacyGroupMessageSubRequest extends SnodeAPISubRequest { public readonly namespace = SnodeNamespaces.LegacyClosedGroup; public readonly destination: PubkeyType; public readonly dbMessageIdentifier: string | null; + public readonly createdAtNetworkTimestamp: number; - constructor(args: { - ttlMs: number; - encryptedData: Uint8Array; - destination: PubkeyType; - dbMessageIdentifier: string | null; - }) { + constructor( + args: WithCreatedAtNetworkTimestamp & { + ttlMs: number; + encryptedData: Uint8Array; + destination: PubkeyType; + dbMessageIdentifier: string | null; + } + ) { super(); this.ttlMs = args.ttlMs; this.destination = args.destination; this.encryptedData = args.encryptedData; this.dbMessageIdentifier = args.dbMessageIdentifier; + this.createdAtNetworkTimestamp = args.createdAtNetworkTimestamp; if (isEmpty(this.encryptedData)) { throw new Error('this.encryptedData cannot be empty'); @@ -1014,7 +1125,8 @@ export type RawSnodeSubRequests = | RetrieveLegacyClosedGroupSubRequest | RetrieveUserSubRequest | RetrieveGroupSubRequest - | StoreGroupConfigOrMessageSubRequest + | StoreGroupConfigSubRequest + | StoreGroupMessageSubRequest | StoreUserConfigSubRequest | SwarmForSubRequest | OnsResolveSubRequest @@ -1036,7 +1148,8 @@ export type BuiltSnodeSubRequests = | ReturnType | AwaitedReturn | AwaitedReturn - | AwaitedReturn + | AwaitedReturn + | AwaitedReturn | AwaitedReturn | ReturnType | ReturnType diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 8ac4b9b5ec..0f0e81aeaf 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -57,6 +57,7 @@ async function doSnodeBatchRequestNoRetries( allow401s, timeout, }); + if (!result) { window?.log?.warn( `doSnodeBatchRequestNoRetries - sessionRpc could not talk to ${targetNode.ip}:${targetNode.port}` diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 28874adc02..64e7eb4fdd 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -195,6 +195,18 @@ async function buildRetrieveRequest( return retrieveRequestsParams; } +/** + * + * @param targetNode the node to make the request to + * @param associatedWith the pubkey for which this request is, used to handle 421 errors + * @param namespacesAndLastHashes the details of the retrieve request to make + * @param ourPubkey our current user pubkey + * @param configHashesToBump the config hashes to update the expiry of + * @param allow401s for groups we allow a 401 to not throw as we can be removed from it, but we still need to process part of the result. + * @returns an array of results with exactly namespacesAndLastHashes.length items in it. + * + * Note: Even if configHashesToBump is set, its result will be excluded from the return of this function, so what you get is always of namespacesAndLastHashes.length + */ async function retrieveNextMessagesNoRetries( targetNode: Snode, associatedWith: string, @@ -253,6 +265,16 @@ async function retrieveNextMessagesNoRetries( `_retrieveNextMessages - retrieve result is not 200 with ${targetNode.ip}:${targetNode.port} but ${firstResult.code}` ); } + if (configHashesToBump?.length) { + const lastResult = results[results.length - 1]; + if (lastResult?.code !== 200) { + // the update expiry of our config messages didn't work. + window.log.warn( + `the update expiry of our tracked config hashes didn't work: ${JSON.stringify(lastResult)}` + ); + } + } + if (!window.inboxStore?.getState().onionPaths.isOnline) { window.inboxStore?.dispatch(updateIsOnline(true)); } @@ -265,11 +287,12 @@ async function retrieveNextMessagesNoRetries( // merge results with their corresponding namespaces // NOTE: We don't want to sort messages here because the ordering depends on the snode and when it received each message. // The last_hash for that snode has to be the last one we've received from that same snode, othwerwise we end up fetching the same messages over and over again. - return namespacesAndLastHashes.map((n, index) => ({ + const toRet = namespacesAndLastHashes.map((n, index) => ({ code: results[index].code, messages: results[index].body as RetrieveMessagesResultsContent, namespace: n.namespace, })); + return toRet; } catch (e) { window?.log?.warn('exception while parsing json of nextMessage:', e); diff --git a/ts/session/apis/snode_api/revokeSubaccount.ts b/ts/session/apis/snode_api/revokeSubaccount.ts index aae7c65519..5572692e9a 100644 --- a/ts/session/apis/snode_api/revokeSubaccount.ts +++ b/ts/session/apis/snode_api/revokeSubaccount.ts @@ -21,8 +21,6 @@ async function getRevokeSubaccountParams( throw new Error('revokeSubaccountForGroup: not a 03 group'); } - window.log.warn('getRevokeSubaccountParams to enable once multisig is done'); // TODO audric debugger - const revokeSubRequest = revokeChanges.length ? new SubaccountRevokeSubRequest({ groupPk, diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 48f4151748..9512d11385 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -51,7 +51,7 @@ async function getGroupInviteMessage({ createAtNetworkTimestamp, adminSignature, memberAuthData, - expirationType: 'unknown', // TODO audric do we want those not expiring? + expirationType: 'unknown', // an invite is not expiring expireTimer: 0, }); return invite; @@ -76,7 +76,7 @@ async function getGroupPromoteMessage({ groupPk, createAtNetworkTimestamp, groupIdentitySeed: secretKey.slice(0, 32), // the seed is the first 32 bytes of the secretkey - expirationType: 'unknown', // TODO audric do we want those not expiring? + expirationType: 'unknown', // a promote message is not expiring expireTimer: 0, }); return msg; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 1ac35f380f..8f9bc8367b 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -595,7 +595,7 @@ export class SwarmPolling { ); const allow401s = type === ConversationTypeEnum.GROUPV2; - let results = await SnodeAPIRetrieve.retrieveNextMessagesNoRetries( + const results = await SnodeAPIRetrieve.retrieveNextMessagesNoRetries( node, pubkey, namespacesAndLastHashes, @@ -607,36 +607,24 @@ export class SwarmPolling { if (!results.length) { return []; } - // NOTE when we asked to extend the expiry of the config messages, exclude it from the list of results as we do not want to mess up the last hash tracking logic - if (configHashesToBump.length) { - try { - const lastResult = results[results.length - 1]; - if (lastResult?.code !== 200) { - // the update expiry of our config messages didn't work. - window.log.warn( - `the update expiry of our tracked config hashes didn't work: ${JSON.stringify( - lastResult - )}` - ); - } - } catch (e) { - // nothing to do I suppose here. - } - results = results.slice(0, results.length - 1); - } - // console.warn('results what when we get kicked out?: ', results); // debugger const lastMessages = results.map(r => { return last(r.messages.messages); }); + const namespacesWithNewLastHashes = namespacesAndLastHashes.map((n, i) => { + const newHash = lastMessages[i]?.hash || ''; + const role = SnodeNamespace.toRole(n.namespace); + return `${role}:${newHash}`; + }); + window.log.info( - `updating last hashes for ${ed25519Str(pubkey)}: ${ed25519Str(snodeEdkey)} ${lastMessages.map(m => m?.hash || '')}` + `updating last hashes for ${ed25519Str(pubkey)}: ${ed25519Str(snodeEdkey)} ${namespacesWithNewLastHashes.join(', ')}` ); await Promise.all( lastMessages.map(async (lastMessage, index) => { if (!lastMessage) { - return undefined; + return; } - return this.updateLastHash({ + await this.updateLastHash({ edkey: snodeEdkey, pubkey, namespace: namespaces[index], @@ -884,6 +872,7 @@ function filterMessagesPerTypeOfConvo( const groupConfMessages = retrieveItemWithNamespace(groupConfs); const groupOtherMessages = retrieveItemWithNamespace(groupOthers); const revokedMessages = retrieveItemWithNamespace(groupRevoked); + return { confMessages: groupConfMessages, otherMessages: uniqBy(groupOtherMessages, x => x.hash), diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 1e2bac46c3..0e78581382 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -1,9 +1,13 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { isFinite, isNumber } from 'lodash'; +import { isEmpty, isFinite, isNumber } from 'lodash'; +import { to_hex } from 'libsodium-wrappers-sumo'; import { Data } from '../../../../data/data'; import { messagesExpired } from '../../../../state/ducks/conversations'; import { groupInfoActions } from '../../../../state/ducks/metaGroups'; -import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../../../../webworker/workers/browser/libsession_worker_interface'; import { ed25519Str, fromBase64ToArray } from '../../../utils/String'; import { GroupPendingRemovals } from '../../../utils/job_runners/jobs/GroupPendingRemovalsJob'; import { LibSessionUtil } from '../../../utils/libsession/libsession_utils'; @@ -24,6 +28,13 @@ const lastAppliedRemoveAttachmentSentBeforeSeconds = new Map m.admin || m.promoted) - .filter(m => m.pubkeyHex !== us).length; - const weAreLastAdmin = otherAdminsCount === 0; - const infos = await MetaGroupWrapperActions.infoGet(groupPk); - const fromUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); - if (!infos || !fromUserGroup || isEmpty(infos) || isEmpty(fromUserGroup)) { - throw new Error('deleteGroup: some required data not present'); - } - const { secretKey } = fromUserGroup; - - // check if we are the last admin - if (secretKey && !isEmpty(secretKey) && (weAreLastAdmin || forceDestroyForAllMembers)) { - const deleteAllMessagesSubRequest = deleteAllMessagesOnSwarm - ? new DeleteAllFromGroupMsgNodeSubRequest({ - groupPk, - secretKey, - }) - : null; - - // this marks the group info as deleted. We need to push those details - await MetaGroupWrapperActions.infoDestroy(groupPk); - const lastPushResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - revokeSubRequest: null, - unrevokeSubRequest: null, - supplementKeys: [], - deleteAllMessagesSubRequest, - }); - if (lastPushResult !== RunJobResult.Success) { - throw new Error(`Failed to destroyGroupDetails for pk ${ed25519Str(groupPk)}`); + try { + const us = UserUtils.getOurPubKeyStrFromCache(); + const allMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); + const otherAdminsCount = allMembers + .filter(m => m.admin || m.promoted) + .filter(m => m.pubkeyHex !== us).length; + const weAreLastAdmin = otherAdminsCount === 0; + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + const fromUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); + if (!infos || !fromUserGroup || isEmpty(infos) || isEmpty(fromUserGroup)) { + throw new Error('deleteGroup: some required data not present'); + } + const { secretKey } = fromUserGroup; + + // check if we are the last admin + if (secretKey && !isEmpty(secretKey) && (weAreLastAdmin || forceDestroyForAllMembers)) { + const deleteAllMessagesSubRequest = deleteAllMessagesOnSwarm + ? new DeleteAllFromGroupMsgNodeSubRequest({ + groupPk, + secretKey, + }) + : null; + + // this marks the group info as deleted. We need to push those details + await MetaGroupWrapperActions.infoDestroy(groupPk); + const lastPushResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + revokeSubRequest: null, + unrevokeSubRequest: null, + encryptedSupplementKeys: [], + deleteAllMessagesSubRequest, + }); + if (lastPushResult !== RunJobResult.Success) { + throw new Error(`Failed to destroyGroupDetails for pk ${ed25519Str(groupPk)}`); + } } + } catch (e) { + // if that group was already freed this will happen. + // we still want to delete it entirely though + window.log.warn(`deleteGroup: MetaGroupWrapperActions failed with: ${e.message}`); } // this deletes the secretKey if we had it. If we need it for something, it has to be done before this call. @@ -612,28 +621,46 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM } if (PubKey.is03Pubkey(groupPk)) { + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (!group) { + throw new Error('leaveClosedGroup: group from UserGroupsWrapperActions is null '); + } + const createAtNetworkTimestamp = GetNetworkTime.now(); // Send the update to the 03 group const ourLeavingMessage = new GroupUpdateMemberLeftMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp, groupPk, expirationType: null, // we keep that one **not** expiring expireTimer: null, }); + const ourLeavingNotificationMessage = new GroupUpdateMemberLeftNotificationMessage({ + createAtNetworkTimestamp, + groupPk, + ...DisappearingMessages.getExpireDetailsForOutgoingMesssage(convo, createAtNetworkTimestamp), // this one should be expiring with the convo expiring details + }); + window?.log?.info( - `We are leaving the group ${ed25519Str(groupPk)}. Sending our leaving message.` + `We are leaving the group ${ed25519Str(groupPk)}. Sending our leaving messages.` ); - // We might not be able to send our leaving messages (no encryption keypair, we were already removed, no network, etc). // If that happens, we should just remove everything from our current user. - const wasSent = await getMessageQueue().sendToGroupV2NonDurably({ - message: ourLeavingMessage, - }); - if (!wasSent) { - throw new Error( - `Even with the retries, leaving message for group ${ed25519Str( - groupPk - )} failed to be sent...` + try { + const results = await MessageSender.sendUnencryptedDataToSnode({ + destination: groupPk, + messages: [ourLeavingNotificationMessage, ourLeavingMessage], + }); + + if (results?.[0].code !== 200) { + throw new Error( + `Even with the retries, leaving message for group ${ed25519Str( + groupPk + )} failed to be sent...` + ); + } + } catch (e) { + window?.log?.warn( + `failed to send our leaving messages for ${ed25519Str(groupPk)}:${e.message}` ); } diff --git a/ts/session/disappearing_messages/index.ts b/ts/session/disappearing_messages/index.ts index 931eb85f98..9138c7b954 100644 --- a/ts/session/disappearing_messages/index.ts +++ b/ts/session/disappearing_messages/index.ts @@ -24,6 +24,7 @@ import { DisappearingMessageUpdate, ReadyToDisappearMsgUpdate, } from './types'; +import { PubKey } from '../types'; export async function destroyMessagesAndUpdateRedux( messages: Array<{ @@ -456,7 +457,7 @@ function checkForExpiringOutgoingMessage(message: MessageModel, location?: strin expirationType && expireTimer > 0 && !message.getExpirationStartTimestamp() && - !(isGroupConvo && isControlMessage) + !(isGroupConvo && isControlMessage && !PubKey.is03Pubkey(convo.id)) ) { const expirationMode = changeToDisappearingConversationMode(convo, expirationType, expireTimer); @@ -700,12 +701,32 @@ async function updateMessageExpiriesOnSwarm(messages: Array) { } } +function getExpireDetailsForOutgoingMesssage( + convo: ConversationModel, + createAtNetworkTimestamp: number +) { + const expireTimer = convo.getExpireTimer(); + const expireDetails = { + expirationType: DisappearingMessages.changeToDisappearingMessageType( + convo, + expireTimer, + convo.getExpirationMode() + ), + expireTimer, + expirationTimer: expireTimer, + messageExpirationFromRetrieve: expireTimer > 0 ? createAtNetworkTimestamp + expireTimer : null, + }; + + return expireDetails; +} + export const DisappearingMessages = { destroyMessagesAndUpdateRedux, initExpiringMessageListener, updateExpiringMessagesCheck, setExpirationStartTimestamp, changeToDisappearingMessageType, + getExpireDetailsForOutgoingMesssage, changeToDisappearingConversationMode, forcedDeleteAfterReadMsgSetting, forcedDeleteAfterSendMsgSetting, diff --git a/ts/session/disappearing_messages/types.ts b/ts/session/disappearing_messages/types.ts index 39c5574cd7..da671c52e2 100644 --- a/ts/session/disappearing_messages/types.ts +++ b/ts/session/disappearing_messages/types.ts @@ -36,6 +36,8 @@ export type DisappearingMessageUpdate = { messageExpirationFromRetrieve: number | null; }; +export type WithDisappearingMessageUpdate = { expireUpdate: DisappearingMessageUpdate | null }; + export type ReadyToDisappearMsgUpdate = Pick< DisappearingMessageUpdate, 'expirationType' | 'expirationTimer' | 'messageExpirationFromRetrieve' diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index efd3f63927..0b102c1642 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -20,7 +20,10 @@ import { ConvoHub } from '../conversations'; import { generateCurve25519KeyPairWithoutPrefix } from '../crypto'; import { MessageEncrypter } from '../crypto/MessageEncrypter'; import { DisappearingMessages } from '../disappearing_messages'; -import { DisappearAfterSendOnly, DisappearingMessageUpdate } from '../disappearing_messages/types'; +import { + DisappearAfterSendOnly, + WithDisappearingMessageUpdate, +} from '../disappearing_messages/types'; import { ClosedGroupAddedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupAddedMembersMessage'; import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairMessage'; import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage'; @@ -162,9 +165,8 @@ export async function addUpdateMessage({ diff: GroupDiff; sender: string; sentAt: number; - expireUpdate: DisappearingMessageUpdate | null; markAlreadySent: boolean; -}): Promise { +} & WithDisappearingMessageUpdate): Promise { const groupUpdate: MessageGroupUpdate = {}; if (diff.type === 'name' && diff.newName) { @@ -263,12 +265,11 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) { // const { id, expireTimer } = details; const { id } = details; - const isV3 = PubKey.is03Pubkey(id); + if (PubKey.is03Pubkey(id)) { + throw new Error('updateOrCreateClosedGroup is only for legacy groups, not 03 groups'); + } - const conversation = await ConvoHub.use().getOrCreateAndWait( - id, - isV3 ? ConversationTypeEnum.GROUPV2 : ConversationTypeEnum.GROUP - ); + const conversation = await ConvoHub.use().getOrCreateAndWait(id, ConversationTypeEnum.GROUP); const updates: Pick< ConversationAttributes, @@ -276,7 +277,7 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) { > = { displayNameInProfile: details.name, members: details.members, - type: isV3 ? ConversationTypeEnum.GROUPV2 : ConversationTypeEnum.GROUP, + type: ConversationTypeEnum.GROUP, active_at: details.activeAt ? details.activeAt : 0, left: !details.activeAt, }; @@ -289,18 +290,6 @@ export async function updateOrCreateClosedGroup(details: GroupInfo) { } await conversation.commit(); - - console.warn('groupv2 TODO or part of libsession entirely?'); - // if (isNumber(expireTimer) && isFinite(expireTimer)) { - // await conversation.updateExpireTimer({} - // expireTimer, - // UserUtils.getOurPubKeyStrFromCache(), - // Date.now(), - // { - // fromSync: true, - // } - // ); - // } } async function sendNewName(convo: ConversationModel, name: string, messageId: string) { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftNotificationMessage.ts new file mode 100644 index 0000000000..a218029b95 --- /dev/null +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftNotificationMessage.ts @@ -0,0 +1,26 @@ +import { SignalService } from '../../../../../../protobuf'; +import { SnodeNamespaces } from '../../../../../apis/snode_api/namespaces'; +import { GroupUpdateMessage } from '../GroupUpdateMessage'; + +/** + * GroupUpdateMemberLeftNotificationMessage is sent to the group's swarm. + * Our pubkey, as the leaving member is part of the encryption of libsession for the new groups + * + */ +export class GroupUpdateMemberLeftNotificationMessage extends GroupUpdateMessage { + public readonly namespace = SnodeNamespaces.ClosedGroupMessages; + + public dataProto(): SignalService.DataMessage { + const memberLeftNotificationMessage = + new SignalService.GroupUpdateMemberLeftNotificationMessage({}); + + return new SignalService.DataMessage({ groupUpdateMessage: { memberLeftNotificationMessage } }); + } + + public isForGroupSwarm(): boolean { + return true; + } + public isFor1o1Swarm(): boolean { + return false; + } +} diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index ef35da7ae8..29c35f098f 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -68,18 +68,15 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage { } type WithDestinationGroupPk = { destination: GroupPubkeyType }; -type WithGroupMessageNamespace = { namespace: SnodeNamespaces.ClosedGroupMessages }; // TODO audric debugger This will need to extend ExpirableMessage after Disappearing Messages V2 is merged and checkd still working export class ClosedGroupV2VisibleMessage extends DataMessage { private readonly chatMessage: VisibleMessage; public readonly destination: GroupPubkeyType; - public readonly namespace: SnodeNamespaces.ClosedGroupMessages; + public readonly namespace = SnodeNamespaces.ClosedGroupMessages; constructor( - params: Pick & - WithDestinationGroupPk & - WithGroupMessageNamespace + params: Pick & WithDestinationGroupPk ) { super(params.chatMessage); this.chatMessage = params.chatMessage; @@ -94,7 +91,6 @@ export class ClosedGroupV2VisibleMessage extends DataMessage { throw new Error('ClosedGroupV2VisibleMessage only work with 03-groups destination'); } this.destination = params.destination; - this.namespace = params.namespace; } public dataProto(): SignalService.DataMessage { diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index d16f859e1f..0afc306572 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -343,16 +343,11 @@ export class MessageQueue { isSyncMessage: boolean; }) { try { - const { wrappedEnvelope, effectiveTimestamp } = await MessageSender.sendSingleMessage({ + const { effectiveTimestamp } = await MessageSender.sendSingleMessage({ message: rawMessage, isSyncMessage, }); - await MessageSentHandler.handleSwarmMessageSentSuccess( - rawMessage, - effectiveTimestamp, - wrappedEnvelope - ); const cb = this.pendingMessageCache.callbacks.get(rawMessage.identifier); if (cb) { diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 1b8d435cca..b924c1f2dd 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -30,7 +30,8 @@ import { RetrieveGroupSubRequest, RetrieveLegacyClosedGroupSubRequest, RetrieveUserSubRequest, - StoreGroupConfigOrMessageSubRequest, + StoreGroupConfigSubRequest, + StoreGroupMessageSubRequest, StoreLegacyGroupMessageSubRequest, StoreUserConfigSubRequest, StoreUserMessageSubRequest, @@ -53,16 +54,19 @@ import { SnodePool } from '../apis/snode_api/snodePool'; import { WithRevokeSubRequest } from '../apis/snode_api/types'; import { TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; -import { MessageEncrypter } from '../crypto/MessageEncrypter'; import { addMessagePadding } from '../crypto/BufferPadding'; +import { MessageEncrypter } from '../crypto/MessageEncrypter'; import { ContentMessage } from '../messages/outgoing'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; +import { GroupUpdateMemberLeftMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage'; +import { GroupUpdateMemberLeftNotificationMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftNotificationMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; import { PubKey } from '../types'; import { OutgoingRawMessage } from '../types/RawMessage'; import { UserUtils } from '../utils'; import { ed25519Str, fromUInt8ArrayToBase64 } from '../utils/String'; +import { MessageSentHandler } from './MessageSentHandler'; // ================ SNODE STORE ================ @@ -81,6 +85,138 @@ function isContentSyncMessage(message: ContentMessage) { return false; } +type StoreRequest05 = + | StoreUserConfigSubRequest + | StoreUserMessageSubRequest + | StoreLegacyGroupMessageSubRequest; +type StoreRequest03 = StoreGroupConfigSubRequest | StoreGroupMessageSubRequest; + +type PubkeyToRequestType = T extends PubkeyType + ? StoreRequest05 + : StoreRequest03; + +type StoreRequestsPerPubkey = Array>; + +async function messageToRequest05({ + destination, + encryptedAndWrapped: { namespace, encryptedAndWrappedData, identifier, ttl, networkTimestamp }, +}: { + destination: PubkeyType; + encryptedAndWrapped: Pick< + EncryptAndWrapMessageResults, + 'namespace' | 'encryptedAndWrappedData' | 'identifier' | 'ttl' | 'networkTimestamp' + >; +}): Promise { + const shared05Arguments = { + encryptedData: encryptedAndWrappedData, + dbMessageIdentifier: identifier || null, + ttlMs: ttl, + destination, + namespace, + createdAtNetworkTimestamp: networkTimestamp, + }; + if (namespace === SnodeNamespaces.Default || namespace === SnodeNamespaces.LegacyClosedGroup) { + return new StoreUserMessageSubRequest(shared05Arguments); + } + if (SnodeNamespace.isUserConfigNamespace(namespace)) { + return new StoreUserConfigSubRequest(shared05Arguments); + } + + window.log.error( + `unhandled messageToRequest05 case with details: ${ed25519Str(destination)},namespace: ${namespace}` + ); + throw new Error( + `unhandled messageToRequest05 case for 05 ${ed25519Str(destination)} and namespace ${namespace}` + ); +} + +async function messageToRequest03({ + destination, + encryptedAndWrapped: { namespace, encryptedAndWrappedData, identifier, ttl, networkTimestamp }, +}: { + destination: GroupPubkeyType; + encryptedAndWrapped: Pick< + EncryptAndWrapMessageResults, + 'namespace' | 'encryptedAndWrappedData' | 'identifier' | 'ttl' | 'networkTimestamp' + >; +}): Promise { + const group = await UserGroupsWrapperActions.getGroup(destination); + if (!group) { + window.log.warn( + `messageToRequest03: no such group found in wrapper: ${ed25519Str(destination)}` + ); + throw new Error('messageToRequest03: no such group found in wrapper'); + } + const shared03Arguments = { + encryptedData: encryptedAndWrappedData, + namespace, + ttlMs: ttl, + groupPk: destination, + dbMessageIdentifier: identifier || null, + createdAtNetworkTimestamp: networkTimestamp, + ...group, + }; + if ( + SnodeNamespace.isGroupConfigNamespace(namespace) || + namespace === SnodeNamespaces.ClosedGroupMessages + ) { + return new StoreGroupMessageSubRequest(shared03Arguments); + } + window.log.error( + `unhandled messageToRequest03 case with details: ${ed25519Str(destination)},namespace: ${namespace}` + ); + throw new Error( + `unhandled messageToRequest03 case for 03 ${ed25519Str(destination)} and namespace ${namespace}` + ); +} + +async function messageToRequest({ + destination, + encryptedAndWrapped, +}: { + destination: T; + encryptedAndWrapped: Pick< + EncryptAndWrapMessageResults, + 'namespace' | 'encryptedAndWrappedData' | 'identifier' | 'ttl' | 'networkTimestamp' + >; +}): Promise> { + if (PubKey.is03Pubkey(destination)) { + const req = await messageToRequest03({ destination, encryptedAndWrapped }); + return req as PubkeyToRequestType; // this is mandatory, sadly + } + if (PubKey.is05Pubkey(destination)) { + const req = await messageToRequest05({ + destination, + encryptedAndWrapped, + }); + return req as PubkeyToRequestType; // this is mandatory, sadly + } + + throw new Error('messageToRequest: unhandled case'); +} + +async function messagesToRequests({ + destination, + encryptedAndWrappedArr, +}: { + destination: T; + encryptedAndWrappedArr: Array< + Pick< + EncryptAndWrapMessageResults, + 'namespace' | 'encryptedAndWrappedData' | 'identifier' | 'ttl' | 'networkTimestamp' + > + >; +}): Promise>> { + const subRequests: Array> = []; + for (let index = 0; index < encryptedAndWrappedArr.length; index++) { + const encryptedAndWrapped = encryptedAndWrappedArr[index]; + // eslint-disable-next-line no-await-in-loop + const req = await messageToRequest({ destination, encryptedAndWrapped }); + subRequests.push(req); + } + return subRequests; +} + /** * Send a single message via service nodes. * @@ -143,98 +279,10 @@ async function sendSingleMessage({ overridenTtl = asMs; } - const subRequests: Array = []; - if (PubKey.is05Pubkey(destination)) { - if (encryptedAndWrapped.namespace === SnodeNamespaces.Default) { - subRequests.push( - new StoreUserMessageSubRequest({ - encryptedData: encryptedAndWrapped.encryptedAndWrappedData, - dbMessageIdentifier: encryptedAndWrapped.identifier || null, - ttlMs: overridenTtl, - destination, - }) - ); - } else if (SnodeNamespace.isUserConfigNamespace(encryptedAndWrapped.namespace)) { - subRequests.push( - new StoreUserConfigSubRequest({ - encryptedData: encryptedAndWrapped.encryptedAndWrappedData, - namespace: encryptedAndWrapped.namespace, - ttlMs: overridenTtl, - }) - ); - } else if (encryptedAndWrapped.namespace === SnodeNamespaces.LegacyClosedGroup) { - subRequests.push( - new StoreUserMessageSubRequest({ - encryptedData: encryptedAndWrapped.encryptedAndWrappedData, - dbMessageIdentifier: encryptedAndWrapped.identifier || null, - ttlMs: overridenTtl, - destination, - }) - ); - } else { - window.log.error( - `unhandled sendSingleMessage case with details: ${ed25519Str(destination)},namespace: ${ - encryptedAndWrapped.namespace - }` - ); - throw new Error( - `unhandled sendSingleMessage case for 05 ${ed25519Str(destination)} and namespace ${ - encryptedAndWrapped.namespace - }` - ); - } - } else if (PubKey.is03Pubkey(destination)) { - const group = await UserGroupsWrapperActions.getGroup(destination); - if (!group) { - window.log.warn( - `sendSingleMessage: no such group found in wrapper: ${ed25519Str(destination)}` - ); - throw new Error('sendSingleMessage: no such group found in wrapper'); - } - if (SnodeNamespace.isGroupConfigNamespace(encryptedAndWrapped.namespace)) { - subRequests.push( - new StoreGroupConfigOrMessageSubRequest({ - encryptedData: encryptedAndWrapped.encryptedAndWrappedData, - namespace: encryptedAndWrapped.namespace, - ttlMs: overridenTtl, - groupPk: destination, - dbMessageIdentifier: encryptedAndWrapped.identifier || null, - ...group, - }) - ); - } else if (encryptedAndWrapped.namespace === SnodeNamespaces.ClosedGroupMessages) { - subRequests.push( - new StoreGroupConfigOrMessageSubRequest({ - encryptedData: encryptedAndWrapped.encryptedAndWrappedData, - namespace: encryptedAndWrapped.namespace, - ttlMs: overridenTtl, - groupPk: destination, - dbMessageIdentifier: encryptedAndWrapped.identifier || null, - ...group, - }) - ); - } else { - window.log.error( - `unhandled sendSingleMessage case with details: ${ed25519Str(destination)},namespace: ${ - encryptedAndWrapped.namespace - }` - ); - throw new Error( - `unhandled sendSingleMessage case for 03 ${ed25519Str(destination)} and namespace ${ - encryptedAndWrapped.namespace - }` - ); - } - } else { - window.log.error( - `unhandled sendSingleMessage case with details: ${ed25519Str(destination)},namespace: ${ - encryptedAndWrapped.namespace - }` - ); - throw new Error( - `unhandled sendSingleMessage case unsupported destination ${ed25519Str(destination)}` - ); - } + const subRequests = await messagesToRequests({ + encryptedAndWrappedArr: [{ ...encryptedAndWrapped, ttl: overridenTtl }], + destination, + }); const targetNode = await SnodePool.getNodeFromSwarmOrThrow(destination); const batchResult = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( @@ -310,7 +358,8 @@ async function signSubRequests( p instanceof DeleteHashesFromUserNodeSubRequest || p instanceof DeleteHashesFromGroupNodeSubRequest || p instanceof DeleteAllFromUserNodeSubRequest || - p instanceof StoreGroupConfigOrMessageSubRequest || + p instanceof StoreGroupConfigSubRequest || + p instanceof StoreGroupMessageSubRequest || p instanceof StoreLegacyGroupMessageSubRequest || p instanceof StoreUserConfigSubRequest || p instanceof StoreUserMessageSubRequest || @@ -347,13 +396,12 @@ async function signSubRequests( return signedRequests; } +type DeleteHashesRequestPerPubkey = T extends PubkeyType + ? DeleteHashesFromUserNodeSubRequest + : DeleteHashesFromGroupNodeSubRequest; + async function sendMessagesDataToSnode( - storeRequests: Array< - | StoreGroupConfigOrMessageSubRequest - | StoreUserConfigSubRequest - | StoreUserMessageSubRequest - | StoreLegacyGroupMessageSubRequest - >, + storeRequests: StoreRequestsPerPubkey, asssociatedWith: T, { revokeSubRequest, @@ -362,11 +410,7 @@ async function sendMessagesDataToSnode( deleteAllMessagesSubRequest, }: WithRevokeSubRequest & { deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; - deleteHashesSubRequest: - | (T extends PubkeyType - ? DeleteHashesFromUserNodeSubRequest - : DeleteHashesFromGroupNodeSubRequest) - | null; + deleteHashesSubRequest: DeleteHashesRequestPerPubkey | null; }, method: MethodBatchType ): Promise { @@ -428,13 +472,13 @@ async function sendMessagesDataToSnode( window?.log?.info( `sendMessagesDataToSnode - Successfully stored messages to ${ed25519Str( asssociatedWith - )} via ${targetNode.ip}:${targetNode.port}` + )} via ${ed25519Str(targetNode.pubkey_ed25519)} to namespaces: ${storeRequests.map(m => SnodeNamespace.toRole(m.namespace)).join(', ')}` ); } return storeResults; } catch (e) { - const snodeStr = targetNode ? `${targetNode.ip}:${targetNode.port}` : 'null'; + const snodeStr = targetNode ? `${ed25519Str(targetNode.pubkey_ed25519)}` : 'null'; window?.log?.warn( `sendMessagesDataToSnode - "${e.code}:${e.message}" to ${asssociatedWith} via snode:${snodeStr}` ); @@ -577,13 +621,9 @@ async function sendEncryptedDataToSnode( unrevokeSubRequest, deleteAllMessagesSubRequest, }: WithRevokeSubRequest & { - storeRequests: Array; + storeRequests: StoreRequestsPerPubkey; // keeping those as an array because the order needs to be enforced for some (groupkeys for instance) destination: T; - deleteHashesSubRequest: - | (T extends PubkeyType - ? DeleteHashesFromUserNodeSubRequest - : DeleteHashesFromGroupNodeSubRequest) - | null; + deleteHashesSubRequest: DeleteHashesRequestPerPubkey | null; deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; }): Promise { try { @@ -620,6 +660,67 @@ async function sendEncryptedDataToSnode( } } +/** + * Send an array of **not** preencrypted data to the corresponding swarm. + * WARNING: + * This does not handle result of messages and marking messages as read, syncing them currently. + * For this, use the `MessageQueue.sendSingleMessage()` for now. + * + * @param messages the data to deposit (after encryption) + * @param destination the pubkey we should deposit those message to + */ +async function sendUnencryptedDataToSnode({ + destination, + messages, +}: { + // keeping those as an array because the order needs to be enforced for some (groupkeys for instance) + destination: T; + messages: Array< + T extends GroupPubkeyType + ? GroupUpdateMemberLeftMessage | GroupUpdateMemberLeftNotificationMessage + : never + >; +}) { + const rawMessages: Array = messages.map(m => { + return { + networkTimestamp: m.createAtNetworkTimestamp, + plainTextBuffer: m.plainTextBuffer(), + ttl: m.ttl(), + destination: m.destination, + identifier: m.identifier, + namespace: m.namespace, + isSyncMessage: false, + }; + }); + + const encryptedAndWrappedArr = await encryptMessagesAndWrap( + rawMessages.map(message => { + return { + destination, + plainTextBuffer: message.plainTextBuffer, + namespace: message.namespace, + ttl: message.ttl, + identifier: message.identifier, + networkTimestamp: message.networkTimestamp, + isSyncMessage: false, + }; + }) + ); + + const storeRequests = await messagesToRequests({ + encryptedAndWrappedArr, + destination, + }); + + return sendEncryptedDataToSnode({ + destination, + deleteHashesSubRequest: null, + revokeSubRequest: null, + unrevokeSubRequest: null, + storeRequests, + }); +} + function wrapContentIntoEnvelope( type: SignalService.Envelope.Type, sskSource: string | undefined, @@ -724,6 +825,8 @@ export const MessageSender = { wrapContentIntoEnvelope, getSignatureParamsFromNamespace, signSubRequests, + encryptMessagesAndWrap, + sendUnencryptedDataToSnode, }; /** @@ -752,14 +855,13 @@ async function handleBatchResultWithSubRequests({ // there are some stuff we need to do when storing a message (for a group/legacy group or user, but no config messages) if ( - subRequest instanceof StoreGroupConfigOrMessageSubRequest || + subRequest instanceof StoreGroupMessageSubRequest || subRequest instanceof StoreLegacyGroupMessageSubRequest || subRequest instanceof StoreUserMessageSubRequest ) { const storedAt = batchResult?.[index]?.body?.t; const storedHash = batchResult?.[index]?.body?.hash; const subRequestStatusCode = batchResult?.[index]?.code; - // TODO: the expiration is due to be returned by the storage server on "store" soon, we will then be able to use it instead of doing the storedAt + ttl logic below // if we have a hash and a storedAt, mark it as seen so we don't reprocess it on the next retrieve @@ -781,29 +883,19 @@ async function handleBatchResultWithSubRequests({ subRequest.dbMessageIdentifier && (subRequest.destination === us || isDestinationClosedGroup) ) { - // get a fresh copy of the message from the DB - /* eslint-disable no-await-in-loop */ - const foundMessage = await Data.getMessageById(subRequest.dbMessageIdentifier); - if (foundMessage) { - await foundMessage.updateMessageHash(storedHash); - // - a message pushed to a group is always synced - // - a message sent to ourself when it was a marked as sentSync is a synced message to ourself - if ( - isDestinationClosedGroup || - (subRequest.destination === us && foundMessage.get('sentSync')) - ) { - foundMessage.set({ synced: true }); - } - foundMessage.set({ - sent_to: [subRequest.destination], - sent: true, - sent_at: storedAt, - }); - await foundMessage.commit(); - await foundMessage.getConversation()?.updateLastMessage(); - window?.log?.info(`updated message ${foundMessage.get('id')} with hash: ${storedHash}`); - } - /* eslint-enable no-await-in-loop */ + // eslint-disable-next-line no-await-in-loop + await MessageSentHandler.handleSwarmMessageSentSuccess( + { + device: subRequest.destination, + encryption: isDestinationClosedGroup + ? SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE + : SignalService.Envelope.Type.SESSION_MESSAGE, + identifier: subRequest.dbMessageIdentifier, + plainTextBuffer: null, + }, + subRequest.createdAtNetworkTimestamp, + storedHash + ); } } } diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts index 7bd3aa415a..d129989a02 100644 --- a/ts/session/sending/MessageSentHandler.ts +++ b/ts/session/sending/MessageSentHandler.ts @@ -1,10 +1,9 @@ import { union } from 'lodash'; import { Data } from '../../data/data'; import { SignalService } from '../../protobuf'; -import { PnServer } from '../apis/push_notification_api'; import { DisappearingMessages } from '../disappearing_messages'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; -import { OutgoingRawMessage } from '../types'; +import { OutgoingRawMessage, PubKey } from '../types'; import { UserUtils } from '../utils'; async function handlePublicMessageSentSuccess( @@ -62,9 +61,15 @@ async function handlePublicMessageSentFailure(sentMessage: OpenGroupVisibleMessa } async function handleSwarmMessageSentSuccess( - sentMessage: OutgoingRawMessage, + sentMessage: Pick & { + /** + * plainTextBuffer is only required when sending a message to a 1o1, + * as we need it to encrypt it again for our linked devices (synced messages) + */ + plainTextBuffer: Uint8Array | null; + }, effectiveTimestamp: number, - wrappedEnvelope?: Uint8Array + storedHash: string | null ) { // The wrappedEnvelope will be set only if the message is not one of OpenGroupV2Message type. let fetchedMessage = await fetchHandleMessageSentData(sentMessage.identifier); @@ -80,7 +85,8 @@ async function handleSwarmMessageSentSuccess( // At this point the only way to check for medium // group is by comparing the encryption type const isClosedGroupMessage = - sentMessage.encryption === SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE; + sentMessage.encryption === SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE || + PubKey.is03Pubkey(sentMessage.device); // We trigger a sync message only when the message is not to one of our devices, AND // the message is not for an open group (there is no sync for opengroups, each device pulls all messages), AND @@ -95,45 +101,38 @@ async function handleSwarmMessageSentSuccess( // and the current message was sent to our device (so a sync message) const shouldMarkMessageAsSynced = isOurDevice && fetchedMessage.get('sentSync'); - const contentDecoded = SignalService.Content.decode(sentMessage.plainTextBuffer); - const { dataMessage } = contentDecoded; - - /** - * We should hit the notify endpoint for push notification only if: - * • It's a one-to-one chat or a closed group - * • The message has either text or attachments - */ - const hasBodyOrAttachments = Boolean( - dataMessage && (dataMessage.body || (dataMessage.attachments && dataMessage.attachments.length)) - ); - - if (hasBodyOrAttachments && !isOurDevice && wrappedEnvelope) { - // we do not really care about the result, neither of waiting for it - void PnServer.notifyPnServer(wrappedEnvelope, sentMessage.device); - } - // Handle the sync logic here - if (shouldTriggerSyncMessage) { - if (dataMessage) { - try { - await fetchedMessage.sendSyncMessage(contentDecoded, effectiveTimestamp); - const tempFetchMessage = await fetchHandleMessageSentData(sentMessage.identifier); - if (!tempFetchMessage) { - window?.log?.warn( - 'Got an error while trying to sendSyncMessage(): fetchedMessage is null' - ); - return; + if (shouldTriggerSyncMessage && sentMessage && sentMessage.plainTextBuffer) { + try { + const contentDecoded = SignalService.Content.decode(sentMessage.plainTextBuffer); + if (contentDecoded && contentDecoded.dataMessage) { + try { + await fetchedMessage.sendSyncMessage(contentDecoded, effectiveTimestamp); + const tempFetchMessage = await fetchHandleMessageSentData(sentMessage.identifier); + if (!tempFetchMessage) { + window?.log?.warn( + 'Got an error while trying to sendSyncMessage(): fetchedMessage is null' + ); + return; + } + fetchedMessage = tempFetchMessage; + } catch (e) { + window?.log?.warn('Got an error while trying to sendSyncMessage():', e); } - fetchedMessage = tempFetchMessage; - } catch (e) { - window?.log?.warn('Got an error while trying to sendSyncMessage():', e); } + } catch (e) { + window.log.info( + 'failed to decode content (excpected except if message was for a 1o1 as we need it to send the sync message' + ); } } else if (shouldMarkMessageAsSynced) { fetchedMessage.set({ synced: true }); } sentTo = union(sentTo, [sentMessage.device]); + if (storedHash) { + fetchedMessage.updateMessageHash(storedHash); + } fetchedMessage.set({ sent_to: sentTo, diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index ba14067f31..e2aad78636 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -13,7 +13,6 @@ import { MultiEncryptWrapperActions, UserGroupsWrapperActions, } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { StoreGroupConfigOrMessageSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; import { RevokeChanges, SnodeAPIRevoke } from '../../../apis/snode_api/revokeSubaccount'; @@ -30,6 +29,7 @@ import { RunJobResult, } from '../PersistedJob'; import { GroupSync } from './GroupSyncJob'; +import { StoreGroupConfigSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; export type WithAddWithoutHistoryMembers = { withoutHistory: Array }; export type WithAddWithHistoryMembers = { withHistory: Array }; @@ -154,10 +154,9 @@ class GroupPendingRemovalsJob extends PersistedJob { - return new StoreGroupConfigOrMessageSubRequest({ + return new StoreGroupMessageSubRequest({ encryptedData: m.data, groupPk, - namespace: m.namespace, ttlMs: m.ttl, dbMessageIdentifier: m.dbMessageIdentifier, ...group, + createdAtNetworkTimestamp: m.networkTimestamp, }); }); @@ -165,11 +167,11 @@ async function pushChangesToGroupSwarmIfNeeded({ revokeSubRequest, unrevokeSubRequest, groupPk, - supplementKeys, + encryptedSupplementKeys, deleteAllMessagesSubRequest, }: WithGroupPubkey & WithRevokeSubRequest & { - supplementKeys: Array; + encryptedSupplementKeys: Array; deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; }): Promise { // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc @@ -180,7 +182,7 @@ async function pushChangesToGroupSwarmIfNeeded({ // is updated we want to try and run immediately so don't schedule another run in this case) if ( isEmpty(pendingConfigData) && - !supplementKeys.length && + !encryptedSupplementKeys.length && !revokeSubRequest && !unrevokeSubRequest && !deleteAllMessagesSubRequest @@ -195,6 +197,14 @@ async function pushChangesToGroupSwarmIfNeeded({ return RunJobResult.Success; } + if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { + const dumps = await MetaGroupWrapperActions.metaMakeDump(groupPk); + window.log.info( + `pushChangesToGroupSwarmIfNeeded: current metadump: ${ed25519Str(groupPk)}:`, + to_hex(dumps) + ); + } + const networkTimestamp = GetNetworkTime.now(); const pendingConfigMsgs = pendingConfigData.map(item => { @@ -207,7 +217,8 @@ async function pushChangesToGroupSwarmIfNeeded({ }; }); - const keysMessagesToEncrypt: Array = supplementKeys.map(key => ({ + // supplementKeys are already encrypted by libsession + const keysEncryptedMessages: Array = encryptedSupplementKeys.map(key => ({ namespace: SnodeNamespaces.ClosedGroupKeys, pubkey: groupPk, ttl: TTL_DEFAULT.CONFIG_MESSAGE, @@ -216,20 +227,8 @@ async function pushChangesToGroupSwarmIfNeeded({ dbMessageIdentifier: null, })); - const keysEncrypted = keysMessagesToEncrypt - ? await MetaGroupWrapperActions.encryptMessages( - groupPk, - keysMessagesToEncrypt.map(m => m.data) - ) - : []; - - const keysEncryptedmessage = keysMessagesToEncrypt.map((requestDetails, index) => ({ - ...requestDetails, - data: keysEncrypted[index], - })); - - let pendingConfigRequests: Array = []; - let keysEncryptedRequests: Array = []; + let pendingConfigRequests: Array = []; + let keysEncryptedRequests: Array = []; if (pendingConfigMsgs.length) { if (!group.secretKey || isEmpty(group.secretKey)) { @@ -243,19 +242,20 @@ async function pushChangesToGroupSwarmIfNeeded({ } pendingConfigRequests = pendingConfigMsgs.map(m => { - return new StoreGroupConfigOrMessageSubRequest({ + return new StoreGroupConfigSubRequest({ encryptedData: m.data, groupPk, namespace: m.namespace, ttlMs: m.ttl, - dbMessageIdentifier: null, // those are config messages only, they have no dbMessageIdentifier secretKey: group.secretKey, authData: null, }); }); } - if (keysEncryptedmessage.length) { + if (keysEncryptedMessages.length) { + // supplementalKeys are already encrypted, but we still need the secretKey to sign the request + if (!group.secretKey || isEmpty(group.secretKey)) { window.log.debug( `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: keysEncryptedmessage not empty but we do not have the secretKey` @@ -265,13 +265,12 @@ async function pushChangesToGroupSwarmIfNeeded({ 'pushChangesToGroupSwarmIfNeeded: keysEncryptedmessage not empty but we do not have the secretKey' ); } - keysEncryptedRequests = keysEncryptedmessage.map(m => { - return new StoreGroupConfigOrMessageSubRequest({ + keysEncryptedRequests = keysEncryptedMessages.map(m => { + return new StoreGroupConfigSubRequest({ encryptedData: m.data, groupPk, - namespace: m.namespace, + namespace: SnodeNamespaces.ClosedGroupKeys, ttlMs: m.ttl, - dbMessageIdentifier: null, // those are supplemental keys messages only, they have no dbMessageIdentifier secretKey: group.secretKey, authData: null, }); @@ -394,7 +393,7 @@ class GroupSyncJob extends PersistedJob { groupPk: thisJobDestination, revokeSubRequest: null, unrevokeSubRequest: null, - supplementKeys: [], + encryptedSupplementKeys: [], }); // eslint-disable-next-line no-useless-catch diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index 86fef80cbd..4ebfa93d3d 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -109,12 +109,16 @@ async function pushChangesToUserSwarmIfNeeded() { } } + const deleteHashesSubRequest = changesToPush.allOldHashes.size + ? new DeleteHashesFromUserNodeSubRequest({ + messagesHashes: [...changesToPush.allOldHashes], + }) + : null; + const result = await MessageSender.sendEncryptedDataToSnode({ storeRequests, destination: us, - deleteHashesSubRequest: new DeleteHashesFromUserNodeSubRequest({ - messagesHashes: [...changesToPush.allOldHashes], - }), + deleteHashesSubRequest, revokeSubRequest: null, unrevokeSubRequest: null, }); diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index ba978b05d4..177cd78137 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -182,7 +182,7 @@ const initNewGroupInWrapper = createAsyncThunk( groupPk, revokeSubRequest: null, unrevokeSubRequest: null, - supplementKeys: [], + encryptedSupplementKeys: [], deleteAllMessagesSubRequest: null, }); if (result !== RunJobResult.Success) { @@ -498,10 +498,10 @@ async function handleWithHistoryMembers({ const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); } - const supplementKeys = withHistory.length + const encryptedSupplementKeys = withHistory.length ? await MetaGroupWrapperActions.generateSupplementKeys(groupPk, withHistory) : []; - return supplementKeys; + return encryptedSupplementKeys; } /** @@ -523,19 +523,6 @@ async function handleWithoutHistoryMembers({ } } -function getConvoExpireDetailsForMsg(convo: ConversationModel) { - const expireTimer = convo.getExpireTimer(); - const expireDetails = { - expirationType: DisappearingMessages.changeToDisappearingMessageType( - convo, - expireTimer, - convo.getExpirationMode() - ), - expireTimer, - }; - return expireDetails; -} - /** * Return the control messages to be pushed to the group's swarm. * Those are not going to change the state, they are just here as a "notification". @@ -571,7 +558,7 @@ async function getRemovedControlMessage({ createAtNetworkTimestamp, secretKey: adminSecretKey, sodium, - ...getConvoExpireDetailsForMsg(convo), + ...DisappearingMessages.getExpireDetailsForOutgoingMesssage(convo, createAtNetworkTimestamp), }); } @@ -603,7 +590,7 @@ async function getWithoutHistoryControlMessage({ createAtNetworkTimestamp, secretKey: adminSecretKey, sodium, - ...getConvoExpireDetailsForMsg(convo), + ...DisappearingMessages.getExpireDetailsForOutgoingMesssage(convo, createAtNetworkTimestamp), }); } @@ -635,7 +622,7 @@ async function getWithHistoryControlMessage({ createAtNetworkTimestamp, secretKey: adminSecretKey, sodium, - ...getConvoExpireDetailsForMsg(convo), + ...DisappearingMessages.getExpireDetailsForOutgoingMesssage(convo, createAtNetworkTimestamp), }); } @@ -670,7 +657,7 @@ async function handleMemberAddedFromUI({ // then, handle the addition with history of messages by generating supplement keys. // this adds them to the members wrapper etc - const supplementKeys = await handleWithHistoryMembers({ groupPk, withHistory }); + const encryptedSupplementKeys = await handleWithHistoryMembers({ groupPk, withHistory }); // then handle the addition without history of messages (full rotation of keys). // this adds them to the members wrapper etc @@ -682,7 +669,7 @@ async function handleMemberAddedFromUI({ // push new members & key supplement in a single batch call const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementKeys, + encryptedSupplementKeys, ...revokeUnrevokeParams, deleteAllMessagesSubRequest: null, }); @@ -700,20 +687,15 @@ async function handleMemberAddedFromUI({ active_at: createAtNetworkTimestamp, }); - const expiringDetails = getConvoExpireDetailsForMsg(convo); - + const expireDetails = DisappearingMessages.getExpireDetailsForOutgoingMesssage( + convo, + createAtNetworkTimestamp + ); const shared = { convo, sender: us, sentAt: createAtNetworkTimestamp, - expireUpdate: { - expirationTimer: expiringDetails.expireTimer, - expirationType: expiringDetails.expirationType, - messageExpirationFromRetrieve: - expiringDetails.expireTimer > 0 - ? createAtNetworkTimestamp + expiringDetails.expireTimer - : null, - }, + expireUpdate: expireDetails, markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier }; @@ -792,7 +774,7 @@ async function handleMemberRemovedFromUI({ // Send the groupUpdateDeleteMessage that can still be decrypted by those removed members to namespace ClosedGroupRevokedRetrievableMessages. (not when handling a MEMBER_LEFT message) // Then, rekey the wrapper, but don't push the changes yet, we want to batch all of the requests to be made together in the `pushChangesToGroupSwarmIfNeeded` below. - if (removed.length && !fromMemberLeftMessage) { + if (removed.length) { await MetaGroupWrapperActions.membersMarkPendingRemoval(groupPk, removed, alsoRemoveMessages); } await GroupPendingRemovals.addJob({ groupPk }); @@ -800,10 +782,10 @@ async function handleMemberRemovedFromUI({ const createAtNetworkTimestamp = GetNetworkTime.now(); await LibSessionUtil.saveDumpsToDb(groupPk); - // revoked pubkeys, update messages, and libsession groups config in a single batchcall + // revoked pubkeys, update messages, and libsession groups config in a single batch call const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementKeys: [], + encryptedSupplementKeys: [], revokeSubRequest: null, unrevokeSubRequest: null, deleteAllMessagesSubRequest: null, @@ -820,7 +802,10 @@ async function handleMemberRemovedFromUI({ active_at: createAtNetworkTimestamp, }); - const expiringDetails = getConvoExpireDetailsForMsg(convo); + const expiringDetails = DisappearingMessages.getExpireDetailsForOutgoingMesssage( + convo, + createAtNetworkTimestamp + ); const shared = { convo, @@ -837,7 +822,7 @@ async function handleMemberRemovedFromUI({ }; await convo.commit(); - if (removed.length) { + if (removed.length && !fromMemberLeftMessage) { const msgModel = await ClosedGroup.addUpdateMessage({ diff: { type: 'kicked', kicked: removed }, ...shared, @@ -897,7 +882,10 @@ async function handleNameChangeFromUI({ diff: { type: 'name', newName }, sender: us, sentAt: createAtNetworkTimestamp, - expireUpdate: null, + expireUpdate: DisappearingMessages.getExpireDetailsForOutgoingMesssage( + convo, + createAtNetworkTimestamp + ), markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier }); @@ -910,12 +898,12 @@ async function handleNameChangeFromUI({ createAtNetworkTimestamp, secretKey: group.secretKey, sodium: await getSodiumRenderer(), - ...getConvoExpireDetailsForMsg(convo), + ...DisappearingMessages.getExpireDetailsForOutgoingMesssage(convo, createAtNetworkTimestamp), }); const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementKeys: [], + encryptedSupplementKeys: [], revokeSubRequest: null, unrevokeSubRequest: null, deleteAllMessagesSubRequest: null, @@ -984,6 +972,59 @@ const currentDeviceGroupMembersChange = createAsyncThunk( } ); +const triggerFakeAvatarUpdate = createAsyncThunk( + 'group/triggerFakeAvatarUpdate', + async ( + { + groupPk, + }: { + groupPk: GroupPubkeyType; + }, + payloadCreator + ): Promise => { + const state = payloadCreator.getState() as StateType; + if (!state.groups.infos[groupPk]) { + throw new PreConditionFailed('triggerFakeAvatarUpdate group not present in redux slice'); + } + const convo = ConvoHub.use().get(groupPk); + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (!convo || !group || !group.secretKey || isEmpty(group.secretKey)) { + throw new Error( + 'triggerFakeAvatarUpdate: tried to make change to group but we do not have the admin secret key' + ); + } + + const createAtNetworkTimestamp = GetNetworkTime.now(); + const expireUpdate = DisappearingMessages.getExpireDetailsForOutgoingMesssage( + convo, + createAtNetworkTimestamp + ); + const msgModel = await ClosedGroup.addUpdateMessage({ + diff: { type: 'avatarChange' }, + expireUpdate, + sender: UserUtils.getOurPubKeyStrFromCache(), + sentAt: createAtNetworkTimestamp, + convo, + markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier + }); + + await msgModel.commit(); + const updateMsg = new GroupUpdateInfoChangeMessage({ + createAtNetworkTimestamp, + typeOfChange: SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR, + ...expireUpdate, + groupPk, + identifier: msgModel.id, + secretKey: group.secretKey, + sodium: await getSodiumRenderer(), + }); + await GroupSync.storeGroupUpdateMessages({ + groupPk, + updateMessages: [updateMsg], + }); + } +); + /** * This action is used to trigger a change when the local user does a change to a group v2 members list. * GroupV2 added members can be added two ways: with and without the history of messages. @@ -1365,6 +1406,14 @@ const metaGroupSlice = createSlice({ builder.addCase(inviteResponseReceived.rejected, (_state, action) => { window.log.error('a inviteResponseReceived was rejected', action.error); }); + + // triggerFakeAvatarUpdate + builder.addCase(triggerFakeAvatarUpdate.fulfilled, () => { + window.log.error('a triggerFakeAvatarUpdate was fulfilled'); + }); + builder.addCase(triggerFakeAvatarUpdate.rejected, (_state, action) => { + window.log.error('a triggerFakeAvatarUpdate was rejected', action.error); + }); }, }); @@ -1378,6 +1427,7 @@ export const groupInfoActions = { inviteResponseReceived, handleMemberLeftMessage, currentDeviceGroupNameChange, + triggerFakeAvatarUpdate, ...metaGroupSlice.actions, }; diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index d4297e4629..8605632997 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -277,7 +277,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { groupPk, revokeSubRequest: null, unrevokeSubRequest: null, - supplementKeys: [], + encryptedSupplementKeys: [], }); expect(result).to.be.eq(RunJobResult.Success); expect(sendStub.callCount).to.be.eq(0); @@ -302,7 +302,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { groupPk, revokeSubRequest: null, unrevokeSubRequest: null, - supplementKeys: [], + encryptedSupplementKeys: [], }); sendStub.resolves(undefined); @@ -376,7 +376,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { groupPk, revokeSubRequest: null, unrevokeSubRequest: null, - supplementKeys: [], + encryptedSupplementKeys: [], }); expect(sendStub.callCount).to.be.eq(1); From e42be002a6119f7449c2ee0901c9cbf3abfe6122 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 11 Jun 2024 11:02:03 +1000 Subject: [PATCH 119/302] feat: cleaned up accept/block/decline logic --- _locales/en/messages.json | 4 +- .../overlay/OverlayMessageRequest.tsx | 5 +- ts/interactions/conversationInteractions.ts | 6 +++ .../apis/snode_api/SnodeRequestTypes.ts | 11 ++++ ts/session/sending/MessageSender.ts | 54 +++++++++++-------- ts/session/sending/MessageSentHandler.ts | 3 +- ts/session/utils/String.ts | 3 +- ts/types/LocalizerKeys.ts | 1 - 8 files changed, 58 insertions(+), 29 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index e7d08665cf..745dea7778 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -572,7 +572,7 @@ "messageRequestAcceptedOursNoName": "You have accepted the message request", "declineRequestMessage": "Are you sure you want to decline this message request?", "deleteGroupRequest": "Are you sure you want to delete this group invite?", - "deleteGroupRequestAndBlock": "Are you sure you want to block $name$? Blocked users cannot send you message requests, group invites or call you.", + "deleteGroupRequestAndBlock": "Are you sure you want to block $name$?
Blocked users cannot send you message requests, group invites or call you.", "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.", "respondingToGroupRequestWarning": "Sending a message to this group will automatically accept the group invite.", "userInvitedYouToGroup": "$name$ invited you to join $groupName$.", @@ -584,7 +584,7 @@ "mustBeApproved": "This conversation must be accepted to use this feature", "youHaveANewFriendRequest": "You have a new friend request", "clearAllConfirmationTitle": "Clear All Message Requests", - "clearAllConfirmationBody": "Are you sure you want to clear all message and group requests?", + "clearAllConfirmationBody": "Are you sure you want to clear all message requests and group invites?", "thereAreNoMessagesIn": "There are no messages in $name$.", "noMessagesInBlindedDisabledMsgRequests": "$name$ has message requests from Community conversations turned off, so you cannot send them a message.", "noMessagesInNoteToSelf": "You have no messages in $name$.", diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx index 77e2cd33d2..dd810027fc 100644 --- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx +++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx @@ -59,7 +59,7 @@ export const OverlayMessageRequest = () => { */ function handleClearAllRequestsClick() { const { i18n } = window; - const title = i18n('clearAllConfirmationTitle'); + const title = i18n('clearAll'); const message = i18n('clearAllConfirmationBody'); const onClose = dispatch(updateConfirmModal(null)); @@ -68,6 +68,9 @@ export const OverlayMessageRequest = () => { title, message, onClose, + okTheme: SessionButtonColor.Danger, + closeTheme: SessionButtonColor.Primary, + okText: window.i18n('clear'), onClickOk: async () => { window?.log?.info('Blocking all message requests'); if (!hasRequests) { diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 4f52b41b29..8dd2d0fdec 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -197,6 +197,9 @@ export async function declineConversationWithoutConfirm({ window?.log?.info('No conversation to decline.'); return; } + window.log.debug( + `declineConversationWithoutConfirm of ${ed25519Str(conversationId)}, alsoBlock:${alsoBlock}, conversationIdOrigin:${conversationIdOrigin ? ed25519Str(conversationIdOrigin) : ''}` + ); // Note: do not set the active_at undefined as this would make that conversation not synced with the libsession wrapper await conversationToDecline.setIsApproved(false, false); @@ -288,7 +291,10 @@ export const declineConversationWithConfirm = ({ updateConfirmModal({ okText: window.i18n(okKey), cancelText: window.i18n('cancel'), + title: window.i18n(okKey), message, + okTheme: SessionButtonColor.Danger, + closeTheme: SessionButtonColor.Primary, onClickOk: async () => { await declineConversationWithoutConfirm({ conversationId, diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 155a5ae7ba..edf978261d 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -973,24 +973,35 @@ export class StoreUserMessageSubRequest extends SnodeAPISubRequest { public readonly dbMessageIdentifier: string | null; public readonly createdAtNetworkTimestamp: number; + public readonly plainTextBuffer: Uint8Array | null; + constructor( args: WithCreatedAtNetworkTimestamp & { ttlMs: number; encryptedData: Uint8Array; destination: PubkeyType; dbMessageIdentifier: string | null; + /** + * When we send a message to a 1o1 recipient, we then need to send the same message to our own swarm as a synced message. + * To forward that message, we need the original message data, which is the plainTextBuffer field here. + */ + plainTextBuffer: Uint8Array | null; } ) { super(); this.ttlMs = args.ttlMs; this.destination = args.destination; this.encryptedData = args.encryptedData; + this.plainTextBuffer = args.plainTextBuffer; this.dbMessageIdentifier = args.dbMessageIdentifier; this.createdAtNetworkTimestamp = args.createdAtNetworkTimestamp; if (isEmpty(this.encryptedData)) { throw new Error('this.encryptedData cannot be empty'); } + if (this.plainTextBuffer && !this.plainTextBuffer.length) { + throw new Error('this.plainTextBuffer can be either null or non-empty'); + } } public async buildAndSignParameters(): Promise<{ diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index b924c1f2dd..8a6daa9646 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -97,15 +97,29 @@ type PubkeyToRequestType = T extends Pub type StoreRequestsPerPubkey = Array>; +type EncryptedMessageDetails = Pick< + EncryptAndWrapMessageResults, + | 'namespace' + | 'encryptedAndWrappedData' + | 'identifier' + | 'ttl' + | 'networkTimestamp' + | 'plainTextBuffer' +>; + async function messageToRequest05({ destination, - encryptedAndWrapped: { namespace, encryptedAndWrappedData, identifier, ttl, networkTimestamp }, + encryptedAndWrapped: { + namespace, + encryptedAndWrappedData, + identifier, + ttl, + networkTimestamp, + plainTextBuffer, + }, }: { destination: PubkeyType; - encryptedAndWrapped: Pick< - EncryptAndWrapMessageResults, - 'namespace' | 'encryptedAndWrappedData' | 'identifier' | 'ttl' | 'networkTimestamp' - >; + encryptedAndWrapped: EncryptedMessageDetails; }): Promise { const shared05Arguments = { encryptedData: encryptedAndWrappedData, @@ -114,6 +128,7 @@ async function messageToRequest05({ destination, namespace, createdAtNetworkTimestamp: networkTimestamp, + plainTextBuffer, }; if (namespace === SnodeNamespaces.Default || namespace === SnodeNamespaces.LegacyClosedGroup) { return new StoreUserMessageSubRequest(shared05Arguments); @@ -175,10 +190,7 @@ async function messageToRequest({ encryptedAndWrapped, }: { destination: T; - encryptedAndWrapped: Pick< - EncryptAndWrapMessageResults, - 'namespace' | 'encryptedAndWrappedData' | 'identifier' | 'ttl' | 'networkTimestamp' - >; + encryptedAndWrapped: EncryptedMessageDetails; }): Promise> { if (PubKey.is03Pubkey(destination)) { const req = await messageToRequest03({ destination, encryptedAndWrapped }); @@ -200,12 +212,7 @@ async function messagesToRequests({ encryptedAndWrappedArr, }: { destination: T; - encryptedAndWrappedArr: Array< - Pick< - EncryptAndWrapMessageResults, - 'namespace' | 'encryptedAndWrappedData' | 'identifier' | 'ttl' | 'networkTimestamp' - > - >; + encryptedAndWrappedArr: Array; }): Promise>> { const subRequests: Array> = []; for (let index = 0; index < encryptedAndWrappedArr.length; index++) { @@ -260,6 +267,7 @@ async function sendSingleMessage({ // before we return from the await below. // and the isDuplicate messages relies on sent_at timestamp to be valid. const found = await Data.getMessageById(encryptedAndWrapped.identifier); + // make sure to not update the sent timestamp if this a currently syncing message if (found && !found.get('sentSync')) { found.set({ sent_at: encryptedAndWrapped.networkTimestamp }); @@ -497,10 +505,10 @@ type SharedEncryptAndWrap = { ttl: number; identifier: string; isSyncMessage: boolean; + plainTextBuffer: Uint8Array; }; type EncryptAndWrapMessage = { - plainTextBuffer: Uint8Array; destination: string; namespace: number; networkTimestamp: number; @@ -549,6 +557,7 @@ async function encryptForGroupV2( ttl, identifier, isSyncMessage: syncMessage, + plainTextBuffer, }; } @@ -594,6 +603,7 @@ async function encryptMessageAndWrap( ttl, identifier, isSyncMessage: syncMessage, + plainTextBuffer, }; } @@ -847,7 +857,6 @@ async function handleBatchResultWithSubRequests({ window.log.error('handleBatchResultWithSubRequests: invalid batch result '); return; } - const us = UserUtils.getOurPubKeyStrFromCache(); const seenHashes: Array = []; for (let index = 0; index < subRequests.length; index++) { @@ -878,11 +887,7 @@ async function handleBatchResultWithSubRequests({ // We need to store the hash of our synced message when for a 1o1. (as this is the one stored on our swarm) // For groups, we can just store that hash directly as the group's swarm is hosting all of the group messages - - if ( - subRequest.dbMessageIdentifier && - (subRequest.destination === us || isDestinationClosedGroup) - ) { + if (subRequest.dbMessageIdentifier) { // eslint-disable-next-line no-await-in-loop await MessageSentHandler.handleSwarmMessageSentSuccess( { @@ -891,7 +896,10 @@ async function handleBatchResultWithSubRequests({ ? SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE : SignalService.Envelope.Type.SESSION_MESSAGE, identifier: subRequest.dbMessageIdentifier, - plainTextBuffer: null, + plainTextBuffer: + subRequest instanceof StoreUserMessageSubRequest + ? subRequest.plainTextBuffer + : null, }, subRequest.createdAtNetworkTimestamp, storedHash diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts index d129989a02..7a32804394 100644 --- a/ts/session/sending/MessageSentHandler.ts +++ b/ts/session/sending/MessageSentHandler.ts @@ -99,7 +99,8 @@ async function handleSwarmMessageSentSuccess( // A message is synced if we triggered a sync message (sentSync) // and the current message was sent to our device (so a sync message) - const shouldMarkMessageAsSynced = isOurDevice && fetchedMessage.get('sentSync'); + const shouldMarkMessageAsSynced = + isOurDevice && fetchedMessage.get('sentSync') && isClosedGroupMessage; // Handle the sync logic here if (shouldTriggerSyncMessage && sentMessage && sentMessage.plainTextBuffer) { diff --git a/ts/session/utils/String.ts b/ts/session/utils/String.ts index 68713e5e5d..68576fde6e 100644 --- a/ts/session/utils/String.ts +++ b/ts/session/utils/String.ts @@ -72,4 +72,5 @@ export const sanitizeSessionUsername = (inputName: string) => { return validChars; }; -export const ed25519Str = (ed25519Key: string) => `(...${ed25519Key.substr(58)})`; +export const ed25519Str = (ed25519Key: string) => + `(...${ed25519Key.length > 58 ? ed25519Key.substr(58) : ed25519Key})`; diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 369aa218ed..57da8ff1e5 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -71,7 +71,6 @@ export type LocalizerKeys = | 'clear' | 'clearAll' | 'clearAllConfirmationBody' - | 'clearAllConfirmationTitle' | 'clearAllData' | 'clearAllReactions' | 'clearDataSettingsTitle' From 1aa90910261440a87c64336a3bb962cfb32d298c Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 11 Jun 2024 12:07:24 +1000 Subject: [PATCH 120/302] feat: call swarm_verify_subaccount when receiving an invite --- ts/receiver/groupv2/handleGroupV2Message.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index bd69cb6023..7f9f77abbd 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -159,6 +159,17 @@ async function handleGroupInviteMessage({ groupEd25519Pubkey: toFixedUint8ArrayOfLength(HexString.fromHexStringNoPrefix(groupPk), 32) .buffer, }); + try { + const verified = await MetaGroupWrapperActions.swarmVerifySubAccount( + groupPk, + inviteMessage.memberAuthData + ); + if (!verified) { + throw new Error('subaccount failed to verify'); + } + } catch (e) { + window.log.warn(`swarmVerifySubAccount failed with: ${e.message}`); + } await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); await UserSync.queueNewJobIfNeeded(); From 8ce5f6f4292cbe982ad1f0793dc20748da497b5f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 12 Jun 2024 08:39:48 +1000 Subject: [PATCH 121/302] fix: don't drop groupUpdateMessages from a blocked user because we still need to process some things even if he is blocked (getting promoted, etc). If the message needs to be dropped, we should not have that group at all, so that message will be dropped nevertheless --- .../conversation/SubtleNotification.tsx | 1 - .../dialog/UpdateGroupMembersDialog.tsx | 18 ++++- ts/models/conversation.ts | 1 + ts/receiver/contentMessage.ts | 73 +++++++++++-------- ts/receiver/groupv2/handleGroupV2Message.ts | 4 - .../ClosedGroupVisibleMessage.ts | 1 - 6 files changed, 58 insertions(+), 40 deletions(-) diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index 56719dcec1..ca7c55adc5 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -33,7 +33,6 @@ const Container = styled.div` display: flex; flex-direction: row; justify-content: center; - padding: var(--margins-lg); background-color: var(--background-secondary-color); `; diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index ef135d8614..f8624e628e 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -1,5 +1,5 @@ import _, { difference } from 'lodash'; -import React, { useMemo } from 'react'; +import React, { useMemo, useState } from 'react'; import { useDispatch } from 'react-redux'; import useKey from 'react-use/lib/useKey'; import styled from 'styled-components'; @@ -31,6 +31,8 @@ import { groupInfoActions } from '../../state/ducks/metaGroups'; import { useMemberGroupChangePending } from '../../state/selectors/groups'; import { useSelectedIsGroupV2 } from '../../state/selectors/selectedConversation'; import { SessionSpinner } from '../basic/SessionSpinner'; +import { SessionToggle } from '../basic/SessionToggle'; +import { isDevProd, isTestIntegration } from '../../shared/env_vars'; type Props = { conversationId: string; @@ -193,6 +195,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { const displayName = useConversationUsername(conversationId); const groupAdmins = useGroupAdmins(conversationId); const isProcessingUIChange = useMemberGroupChangePending(); + const [alsoRemoveMessages, setAlsoRemoveMessages] = useState(false); const { addTo, @@ -217,7 +220,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { addMembersWithHistory: [], addMembersWithoutHistory: [], removeMembers: difference(existingMembers, membersToKeepWithUpdate) as Array, - alsoRemoveMessages: false, // FIXME audric debugger we need this to be a toggle for QA + alsoRemoveMessages, }); dispatch(groupv2Action as any); @@ -272,6 +275,17 @@ export const UpdateGroupMembersDialog = (props: Props) => { return ( + {isDevProd() || isTestIntegration() ? ( + <> + Also remove messages: + { + setAlsoRemoveMessages(!alsoRemoveMessages); + }} + /> + + ) : null} key !== 'dataMessage' && key !== 'toJSON' - ); - msgWithoutDataMessage = pickBy(msgWithoutDataMessage, identity); + const data = content.dataMessage as SignalService.DataMessage; // forcing it as we do know this field is set based on last line - const isMessageDataMessageOnly = isEmpty(msgWithoutDataMessage); - if (!isMessageDataMessageOnly) { + if (convo.isPrivate()) { + const isGroupV2PromoteMessage = !isEmpty( + content.dataMessage?.groupUpdateMessage?.promoteMessage + ); + if (isGroupV2PromoteMessage) { + // we want to allow a group v2 promote message sent by a blocked user (because that user is an admin of a group) + return false; + } + } + + if (!convo.isClosedGroup()) { + // 1o1 messages are handled above. + // if we get here and it's not part a closed group, we should drop that message. + // it might be a message sent to a community from a user we've blocked return true; } - const data = content.dataMessage as SignalService.DataMessage; // forcing it as we do know this field is set based on last line - const isControlDataMessageOnly = - !data.body && - !data.preview?.length && - !data.attachments?.length && - !data.openGroupInvitation && - !data.quote; - - return !isControlDataMessageOnly; + const isLegacyGroupUpdateMessage = !isEmpty(data.closedGroupControlMessage); + + const isGroupV2UpdateMessage = !isEmpty(data.groupUpdateMessage); + + return !isLegacyGroupUpdateMessage && !isGroupV2UpdateMessage; } async function dropIncomingGroupMessage(envelope: EnvelopePlus, sentAtTimestamp: number) { @@ -466,10 +472,14 @@ export async function innerHandleSwarmContentMessage({ const envelopeSource = envelope.source; // We want to allow a blocked user message if that's a control message for a known group and the group is not blocked if (shouldDropBlockedUserMessage(content, envelopeSource)) { - window?.log?.info('Dropping blocked user message'); + window?.log?.info( + `Dropping blocked user message ${ed25519Str(envelope.senderIdentity || envelope.source)}` + ); return; } - window?.log?.info('Allowing group-control message only from blocked user'); + window?.log?.info( + `Allowing control/update message only from blocked user ${ed25519Str(envelope.senderIdentity)} in group: ${ed25519Str(envelope.source)}` + ); } if (await dropIncomingGroupMessage(envelope, sentAtTimestamp)) { @@ -513,12 +523,11 @@ export async function innerHandleSwarmContentMessage({ * For a private conversation message, this is just the conversation with that user */ if (!isPrivateConversationMessage) { - console.info('conversationModelForUIUpdate might need to be checked for groupv2 case'); // debugger - // this is a closed group message, we have a second conversation to make sure exists - conversationModelForUIUpdate = await ConvoHub.use().getOrCreateAndWait( - envelope.source, - ConversationTypeEnum.GROUP - ); + // this is a group message, + // we have a second conversation to make sure exists: the group conversation + conversationModelForUIUpdate = PubKey.is03Pubkey(envelope.source) + ? await ConvoHub.use().getOrCreateAndWait(envelope.source, ConversationTypeEnum.GROUPV2) + : await ConvoHub.use().getOrCreateAndWait(envelope.source, ConversationTypeEnum.GROUP); } const expireUpdate = await DisappearingMessages.checkForExpireUpdateInContentMessage( diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 7f9f77abbd..9bd838563a 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -356,7 +356,6 @@ async function handleGroupMemberLeftMessage({ }) ); - // TODO We should process this message type even if the sender is blocked } async function handleGroupUpdateMemberLeftNotificationMessage({ @@ -469,7 +468,6 @@ async function handleGroupDeleteMemberContentMessage({ ) ); convo.updateLastMessage(); - // TODO we should process this message type even if the sender is blocked } async function handleGroupUpdateInviteResponseMessage({ @@ -494,7 +492,6 @@ async function handleGroupUpdateInviteResponseMessage({ window.inboxStore.dispatch(groupInfoActions.inviteResponseReceived({ groupPk, member: author })); - // TODO We should process this message type even if the sender is blocked } async function handleGroupUpdatePromoteMessage({ @@ -535,7 +532,6 @@ async function handleGroupUpdatePromoteMessage({ }) ); - // TODO we should process this even if the sender is blocked } async function handle1o1GroupUpdateMessage( diff --git a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts index 29c35f098f..7e60bc8f57 100644 --- a/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/ClosedGroupVisibleMessage.ts @@ -69,7 +69,6 @@ export class ClosedGroupVisibleMessage extends ClosedGroupMessage { type WithDestinationGroupPk = { destination: GroupPubkeyType }; -// TODO audric debugger This will need to extend ExpirableMessage after Disappearing Messages V2 is merged and checkd still working export class ClosedGroupV2VisibleMessage extends DataMessage { private readonly chatMessage: VisibleMessage; public readonly destination: GroupPubkeyType; From 7826dff0f73c5f77650a079ced8213106710a0be Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 12 Jun 2024 08:40:48 +1000 Subject: [PATCH 122/302] fix: use values from db and not libsession when inserting into wrappers this is just another reason to get rid of the duplication between the DB and libsession. We should be able to trust what we get from libsession, but currently we have to trust that we update the DB with what we get from libsession. --- ts/receiver/contentMessage.ts | 2 +- .../libsession/libsession_utils_contacts.ts | 24 ++++++++++++------- .../libsession_utils_user_groups.ts | 19 ++++++++------- .../libsession_utils_user_profile.ts | 2 +- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index f07ea19464..bb1bfb9bc1 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -1,4 +1,4 @@ -import { compact, flatten, identity, isEmpty, isFinite, pickBy, toNumber } from 'lodash'; +import { compact, flatten, isEmpty, isFinite, toNumber } from 'lodash'; import { handleSwarmDataMessage } from './dataMessage'; import { EnvelopePlus } from './types'; diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts index 490c4517cb..aed810baf3 100644 --- a/ts/session/utils/libsession/libsession_utils_contacts.ts +++ b/ts/session/utils/libsession/libsession_utils_contacts.ts @@ -4,6 +4,7 @@ import { getContactInfoFromDBValues } from '../../../types/sqlSharedTypes'; import { ContactsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { ConvoHub } from '../../conversations'; import { PubKey } from '../../types'; +import { CONVERSATION_PRIORITIES } from '../../../models/conversationAttributes'; /** * This file is centralizing the management of data from the Contacts Wrapper of libsession. @@ -53,17 +54,22 @@ async function insertContactFromDBIntoWrapperAndRefresh( if (!SessionUtilContact.isContactToStoreInWrapper(foundConvo)) { return null; } - + // Note: We NEED those to come from the convo itself as .get() calls directly + // and not from the isApproved(), didApproveMe() functions. + // + // The reason is that when we make a change, we need to save it to the DB to update the libsession state (on commit()). + // But, if we use isApproved() instead of .get('isApproved'), we get the value from libsession which is not up to date with a change made in the convo yet! const dbName = foundConvo.getRealSessionUsername() || undefined; - const dbNickname = foundConvo.getNickname(); - const dbProfileUrl = foundConvo.getAvatarPointer() || undefined; - const dbProfileKey = foundConvo.getProfileKey() || undefined; - const dbApproved = foundConvo.isApproved(); - const dbApprovedMe = foundConvo.didApproveMe(); + const dbNickname = foundConvo.get('nickname'); + const dbProfileUrl = foundConvo.get('avatarPointer') || undefined; + const dbProfileKey = foundConvo.get('profileKey') || undefined; + const dbApproved = !!foundConvo.get('isApproved'); + const dbApprovedMe = !!foundConvo.get('didApproveMe'); const dbBlocked = foundConvo.isBlocked(); - const priority = foundConvo.getPriority() || 0; - const expirationMode = foundConvo.getExpirationMode() || undefined; - const expireTimer = foundConvo.getExpireTimer() || 0; + const priority = foundConvo.get('priority') || CONVERSATION_PRIORITIES.default; + const expirationMode = foundConvo.get('expirationMode') || undefined; + const expireTimer = foundConvo.get('expireTimer') || 0; + const wrapperContact = getContactInfoFromDBValues({ id, diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts index a8bd2f108f..fd132d09f0 100644 --- a/ts/session/utils/libsession/libsession_utils_user_groups.ts +++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts @@ -12,6 +12,7 @@ import { import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { ConvoHub } from '../../conversations'; import { PubKey } from '../../types'; +import { CONVERSATION_PRIORITIES } from '../../../models/conversationAttributes'; /** * Returns true if that conversation is an active group @@ -38,7 +39,7 @@ function isLegacyGroupToStoreInWrapper(convo: ConversationModel): boolean { } function isGroupToStoreInWrapper(convo: ConversationModel): boolean { - return convo.isGroup() && PubKey.is03Pubkey(convo.id) && convo.isActive(); // debugger TODO should we filter by left/kicked or they are on the wrapper itself? + return convo.isGroup() && PubKey.is03Pubkey(convo.id) && convo.isActive(); } /** @@ -104,7 +105,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh( ); const wrapperComm = getCommunityInfoFromDBValues({ - priority: foundConvo.getPriority(), + priority: foundConvo.get('priority') || CONVERSATION_PRIORITIES.default, // this has to be a direct call to .get fullUrl, }); @@ -129,13 +130,15 @@ async function insertGroupsFromDBIntoWrapperAndRefresh( case 'LegacyGroup': const encryptionKeyPair = await Data.getLatestClosedGroupEncryptionKeyPair(convoId); + // Note: For any fields stored in both the DB and libsession, + // we have to make direct calls to.get() and NOT the wrapped getPriority(), etc... const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({ id: foundConvo.id, - priority: foundConvo.getPriority(), - members: foundConvo.getGroupMembers() || [], - groupAdmins: foundConvo.getGroupAdmins(), - expirationMode: foundConvo.getExpirationMode() || 'off', - expireTimer: foundConvo.getExpireTimer() || 0, + priority: foundConvo.get('priority') || CONVERSATION_PRIORITIES.default, + members: foundConvo.get('members') || [], + groupAdmins: foundConvo.getGroupAdmins(), // cannot be changed for legacy groups, so we don't care + expirationMode: foundConvo.get('expirationMode') || 'off', + expireTimer: foundConvo.get('expireTimer') || 0, displayNameInProfile: foundConvo.getRealSessionUsername(), encPubkeyHex: encryptionKeyPair?.publicHex || '', encSeckeyHex: encryptionKeyPair?.privateHex || '', @@ -171,7 +174,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh( name: null, // not updated except when we process an invite/create a group secretKey: null, // not updated except when we process an promote/create a group kicked: foundConvo.isKickedFromGroup() ?? null, - priority: foundConvo.getPriority() ?? null, + priority: foundConvo.getPriority() ?? null, // for 03 group, the priority is only tracked with libsession, so this is fine }; try { window.log.debug( diff --git a/ts/session/utils/libsession/libsession_utils_user_profile.ts b/ts/session/utils/libsession/libsession_utils_user_profile.ts index 56f3b212e3..9875b16089 100644 --- a/ts/session/utils/libsession/libsession_utils_user_profile.ts +++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts @@ -22,7 +22,7 @@ async function insertUserProfileIntoWrapper(convoId: string) { const dbName = ourConvo.getRealSessionUsername() || ''; const dbProfileUrl = ourConvo.getAvatarPointer() || ''; const dbProfileKey = fromHexToArray(ourConvo.getProfileKey() || ''); - const priority = ourConvo.getPriority() || CONVERSATION_PRIORITIES.default; + const priority = ourConvo.get('priority') || CONVERSATION_PRIORITIES.default; // this has to be a direct call to .get() and not getPriority() const areBlindedMsgRequestEnabled = !!Storage.get(SettingsKey.hasBlindedMsgRequestsEnabled); From 9b124d384e014502d8a03e0364cf378614f8eb8f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 12 Jun 2024 09:40:48 +1000 Subject: [PATCH 123/302] fix: featureFlag to show some buttons/toggle for QA of group chunk3 --- preload.js | 3 ++- ts/components/MemberListItem.tsx | 2 +- .../overlay/OverlayRightPanelSettings.tsx | 10 +++++----- .../dialog/UpdateGroupMembersDialog.tsx | 4 ++-- ts/interactions/conversationInteractions.ts | 2 +- ts/models/conversation.ts | 5 ----- ts/react.d.ts | 18 +++++++++--------- ts/shared/env_vars.ts | 4 ++++ ts/window.d.ts | 1 + 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/preload.js b/preload.js index 248e71054e..14050ccf23 100644 --- a/preload.js +++ b/preload.js @@ -30,7 +30,8 @@ window.getNodeVersion = () => configAny.node_version; window.sessionFeatureFlags = { useOnionRequests: true, useTestNet: isTestNet() || isTestIntegration(), - useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA debugger + useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA + useClosedGroupV2QAButtons: true, // TODO DO NOT MERGE Remove after QA debug: { debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), debugLibsessionDumps: !_.isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS), diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 4cc5e1d59b..44cfa2b971 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -202,7 +202,7 @@ const ResendInviteButton = ({ buttonType={SessionButtonType.Solid} text={window.i18n('resend')} onClick={() => { - void GroupInvite.addJob({ groupPk, member: pubkey }); // TODO audric: do we need to take care if that user was invited withHistory or not + void GroupInvite.addJob({ groupPk, member: pubkey }); }} /> ); diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 94646a220f..e4901091a5 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -25,8 +25,9 @@ import { import { Constants } from '../../../../session'; import { ConvoHub } from '../../../../session/conversations'; import { PubKey } from '../../../../session/types'; -import { isDevProd, isTestIntegration } from '../../../../shared/env_vars'; +import { hasClosedGroupV2QAButtons } from '../../../../shared/env_vars'; import { closeRightPanel } from '../../../../state/ducks/conversations'; +import { groupInfoActions } from '../../../../state/ducks/metaGroups'; import { updateConfirmModal } from '../../../../state/ducks/modalDialog'; import { resetRightOverlayMode, setRightOverlayMode } from '../../../../state/ducks/section'; import { @@ -52,7 +53,6 @@ import { PanelButtonGroup, PanelIconButton } from '../../../buttons'; import { MediaItemType } from '../../../lightbox/LightboxGallery'; import { MediaGallery } from '../../media-gallery/MediaGallery'; import { Header, StyledScrollContainer } from './components'; -import { groupInfoActions } from '../../../../state/ducks/metaGroups'; async function getMediaGalleryProps(conversationId: string): Promise<{ documents: Array; @@ -199,7 +199,7 @@ const StyledName = styled.h4` const DestroyGroupForAllMembersButton = () => { const dispatch = useDispatch(); const groupPk = useSelectedConversationKey(); - if (groupPk && PubKey.is03Pubkey(groupPk) && (isDevProd() || isTestIntegration())) { + if (groupPk && PubKey.is03Pubkey(groupPk) && hasClosedGroupV2QAButtons()) { return ( { /> )} - {isDevProd() && isGroupV2 ? ( + {hasClosedGroupV2QAButtons() && isGroupV2 ? ( { if (!PubKey.is03Pubkey(selectedConvoKey)) { throw new Error('triggerFakeAvatarUpdate needs a 03 pubkey'); diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index f8624e628e..04ef32f2fe 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -27,12 +27,12 @@ import { useSet } from '../../hooks/useSet'; import { ConvoHub } from '../../session/conversations'; import { ClosedGroup } from '../../session/group/closed-group'; import { PubKey } from '../../session/types'; +import { hasClosedGroupV2QAButtons } from '../../shared/env_vars'; import { groupInfoActions } from '../../state/ducks/metaGroups'; import { useMemberGroupChangePending } from '../../state/selectors/groups'; import { useSelectedIsGroupV2 } from '../../state/selectors/selectedConversation'; import { SessionSpinner } from '../basic/SessionSpinner'; import { SessionToggle } from '../basic/SessionToggle'; -import { isDevProd, isTestIntegration } from '../../shared/env_vars'; type Props = { conversationId: string; @@ -275,7 +275,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { return ( - {isDevProd() || isTestIntegration() ? ( + {hasClosedGroupV2QAButtons() ? ( <> Also remove messages: { // /* TODO */ // }; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index da7e9f7bed..0198d91198 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1122,10 +1122,6 @@ export class ConversationModel extends Backbone.Model { updatedExpirationSeconds: expireUpdate.expireTimer, }); - // TODO audric debugger, make pushChangesToGroupSwarmIfNeeded take extraStoreRequests - // but we'd also need to add a way to make a store subrequest from a v2groupMessage. - // we should be able to simplify a fair bit the GroupSyncJob file. - // i.e. we need an easy way (separate file) to wrap a message into a subrequest await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk: this.id, revokeSubRequest: null, @@ -2705,7 +2701,6 @@ async function commitConversationAndRefreshWrapper(id: string) { const savedDetails = await Data.saveConversation(convo.attributes); await convo.refreshInMemoryDetails(savedDetails); - // Performance impact on this is probably to be pretty bad. We might want to push for that DB refactor to be done sooner so we do not need to fetch info from the DB anymore for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) { const variant = LibSessionUtil.requiredUserVariants[index]; diff --git a/ts/react.d.ts b/ts/react.d.ts index abfbdb49ae..4777cef098 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -67,15 +67,15 @@ declare module 'react' { | 'privacy-section' // settings menu item types - | 'messageRequests-settings-menu-item' // needs to be tweaked - | 'recoveryPhrase-settings-menu-item' // needs to be tweaked - | 'privacy-settings-menu-item' // needs to be tweaked - | 'notifications-settings-menu-item' // needs to be tweaked - | 'conversations-settings-menu-item' // needs to be tweaked - | 'appearance-settings-menu-item' // needs to be tweaked - | 'help-settings-menu-item' // needs to be tweaked - | 'permissions-settings-menu-item' // needs to be tweaked - | 'clearData-settings-menu-item' // TODO AUDRIC needs to be tweaked + | 'messageRequests-settings-menu-item' + | 'recoveryPhrase-settings-menu-item' + | 'privacy-settings-menu-item' + | 'notifications-settings-menu-item' + | 'conversations-settings-menu-item' + | 'appearance-settings-menu-item' + | 'help-settings-menu-item' + | 'permissions-settings-menu-item' + | 'clearData-settings-menu-item' // timer options | 'time-option-0' diff --git a/ts/shared/env_vars.ts b/ts/shared/env_vars.ts index 83538bc5a8..8cfb2c64b2 100644 --- a/ts/shared/env_vars.ts +++ b/ts/shared/env_vars.ts @@ -25,3 +25,7 @@ export function isTestNet() { export function isTestIntegration() { return envAppInstanceIncludes('test-integration') || isCI(); // when running on CI, we always want the 'test-integration' behavior } + +export function hasClosedGroupV2QAButtons() { + return !!window.sessionFeatureFlags.useClosedGroupV2QAButtons +} \ No newline at end of file diff --git a/ts/window.d.ts b/ts/window.d.ts index 1958719401..06b052c3c7 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -30,6 +30,7 @@ declare global { useOnionRequests: boolean; useTestNet: boolean; useClosedGroupV2: boolean; + useClosedGroupV2QAButtons: boolean; debug: { debugLogging: boolean; debugLibsessionDumps: boolean; From cd122c72528aad94fea38b80ea4f2a3eaf3ca8f1 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 13 Jun 2024 09:36:12 +1000 Subject: [PATCH 124/302] fix: make pushChangesToGroupSwarm take an extraStoreRequest --- ts/components/MemberListItem.tsx | 4 + ts/models/conversation.ts | 14 +- ts/receiver/groupv2/handleGroupV2Message.ts | 3 - .../apis/snode_api/SnodeRequestTypes.ts | 77 ++++-- .../DeleteGroupHashesRequestFactory.ts | 35 +++ .../factories/StoreGroupRequestFactory.ts | 184 ++++++++++++++ .../conversations/ConversationController.ts | 3 +- ts/session/sending/MessageSender.ts | 17 +- .../jobs/GroupPendingRemovalsJob.ts | 9 +- .../utils/job_runners/jobs/GroupSyncJob.ts | 234 +++--------------- .../libsession/libsession_utils_contacts.ts | 1 - ts/shared/env_vars.ts | 4 +- ts/state/ducks/metaGroups.ts | 222 +++++++++-------- .../group_sync_job/GroupSyncJob_test.ts | 9 +- 14 files changed, 467 insertions(+), 349 deletions(-) create mode 100644 ts/session/apis/snode_api/factories/DeleteGroupHashesRequestFactory.ts create mode 100644 ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 44cfa2b971..f92440f5fc 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -24,6 +24,7 @@ import { SessionButtonType, } from './basic/SessionButton'; import { SessionRadio } from './basic/SessionRadio'; +import { hasClosedGroupV2QAButtons } from '../shared/env_vars'; const AvatarContainer = styled.div` position: relative; @@ -215,6 +216,9 @@ const ResendPromoteButton = ({ pubkey: PubkeyType; groupPk: GroupPubkeyType; }) => { + if (!hasClosedGroupV2QAButtons()) { + return null; + } return ( { updatedExpirationSeconds: expireUpdate.expireTimer, }); + const extraStoreRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest( + [v2groupMessage], + group + ); + await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk: this.id, revokeSubRequest: null, unrevokeSubRequest: null, deleteAllMessagesSubRequest: null, - encryptedSupplementKeys: [], - }); - await GroupSync.storeGroupUpdateMessages({ - groupPk: this.id, - updateMessages: [v2groupMessage], + supplementalKeysSubRequest: [], + extraStoreRequests, }); + await GroupSync.queueNewJobIfNeeded(this.id); return true; } diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 9bd838563a..89274f7eb9 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -355,7 +355,6 @@ async function handleGroupMemberLeftMessage({ memberLeft: author, }) ); - } async function handleGroupUpdateMemberLeftNotificationMessage({ @@ -491,7 +490,6 @@ async function handleGroupUpdateInviteResponseMessage({ } window.inboxStore.dispatch(groupInfoActions.inviteResponseReceived({ groupPk, member: author })); - } async function handleGroupUpdatePromoteMessage({ @@ -531,7 +529,6 @@ async function handleGroupUpdatePromoteMessage({ secret: groupKeypair.privateKey, }) ); - } async function handle1o1GroupUpdateMessage( diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index edf978261d..caf06623e5 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -25,6 +25,7 @@ import { WithSignature, WithTimestamp, } from './types'; +import { TTL_DEFAULT } from '../../constants'; type WithMaxSize = { max_size?: number }; export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; @@ -818,32 +819,29 @@ export class StoreGroupMessageSubRequest extends SnodeAPISubRequest { } } -export class StoreGroupConfigSubRequest extends SnodeAPISubRequest { +abstract class StoreGroupConfigSubRequest< + T extends SnodeNamespacesGroupConfig | SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, +> extends SnodeAPISubRequest { public method = 'store' as const; - public readonly namespace: - | SnodeNamespacesGroupConfig - | SnodeNamespaces.ClosedGroupRevokedRetrievableMessages; + public readonly namespace: T; public readonly destination: GroupPubkeyType; public readonly ttlMs: number; public readonly encryptedData: Uint8Array; + // this is mandatory for a group config store, if it is null, we throw public readonly secretKey: Uint8Array | null; - public readonly authData: Uint8Array | null; constructor( args: WithGroupPubkey & { - namespace: SnodeNamespacesGroupConfig | SnodeNamespaces.ClosedGroupRevokedRetrievableMessages; - ttlMs: number; + namespace: T; encryptedData: Uint8Array; - authData: Uint8Array | null; secretKey: Uint8Array | null; } ) { super(); this.namespace = args.namespace; this.destination = args.groupPk; - this.ttlMs = args.ttlMs; + this.ttlMs = TTL_DEFAULT.CONFIG_MESSAGE; this.encryptedData = args.encryptedData; - this.authData = args.authData; this.secretKey = args.secretKey; if (isEmpty(this.encryptedData)) { @@ -852,13 +850,8 @@ export class StoreGroupConfigSubRequest extends SnodeAPISubRequest { if (!PubKey.is03Pubkey(this.destination)) { throw new Error('StoreGroupConfigSubRequest: groupconfig namespace required a 03 pubkey'); } - if (isEmpty(this.secretKey) && isEmpty(this.authData)) { - throw new Error('StoreGroupConfigSubRequest needs either authData or secretKey to be set'); - } - if (SnodeNamespace.isGroupConfigNamespace(this.namespace) && isEmpty(this.secretKey)) { - throw new Error( - `StoreGroupConfigSubRequest: groupconfig namespace [${this.namespace}] requires an adminSecretKey` - ); + if (isEmpty(this.secretKey)) { + throw new Error('StoreGroupConfigSubRequest needs secretKey to be set'); } } @@ -872,7 +865,7 @@ export class StoreGroupConfigSubRequest extends SnodeAPISubRequest { const signDetails = await SnodeGroupSignature.getSnodeGroupSignature({ method: this.method, namespace: this.namespace, - group: { authData: this.authData, pubkeyHex: this.destination, secretKey: this.secretKey }, + group: { authData: null, pubkeyHex: this.destination, secretKey: this.secretKey }, }); if (!signDetails) { @@ -897,6 +890,36 @@ export class StoreGroupConfigSubRequest extends SnodeAPISubRequest { } } +export class StoreGroupInfoSubRequest extends StoreGroupConfigSubRequest { + constructor( + args: Omit[0], 'namespace'> + ) { + super({ ...args, namespace: SnodeNamespaces.ClosedGroupInfo }); + } +} +export class StoreGroupMembersSubRequest extends StoreGroupConfigSubRequest { + constructor( + args: Omit[0], 'namespace'> + ) { + super({ ...args, namespace: SnodeNamespaces.ClosedGroupMembers }); + } +} +export class StoreGroupKeysSubRequest extends StoreGroupConfigSubRequest { + constructor( + args: Omit[0], 'namespace'> + ) { + super({ ...args, namespace: SnodeNamespaces.ClosedGroupKeys }); + } +} + +export class StoreGroupRevokedRetrievableSubRequest extends StoreGroupConfigSubRequest { + constructor( + args: Omit[0], 'namespace'> + ) { + super({ ...args, namespace: SnodeNamespaces.ClosedGroupRevokedRetrievableMessages }); + } +} + export class StoreUserConfigSubRequest extends SnodeAPISubRequest { public method = 'store' as const; public readonly namespace: SnodeNamespacesUserConfig; @@ -1136,8 +1159,11 @@ export type RawSnodeSubRequests = | RetrieveLegacyClosedGroupSubRequest | RetrieveUserSubRequest | RetrieveGroupSubRequest - | StoreGroupConfigSubRequest + | StoreGroupInfoSubRequest + | StoreGroupMembersSubRequest + | StoreGroupKeysSubRequest | StoreGroupMessageSubRequest + | StoreGroupRevokedRetrievableSubRequest | StoreUserConfigSubRequest | SwarmForSubRequest | OnsResolveSubRequest @@ -1159,13 +1185,16 @@ export type BuiltSnodeSubRequests = | ReturnType | AwaitedReturn | AwaitedReturn - | AwaitedReturn + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn | AwaitedReturn + | AwaitedReturn | AwaitedReturn - | ReturnType - | ReturnType - | ReturnType - | ReturnType + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn + | AwaitedReturn | AwaitedReturn | AwaitedReturn | AwaitedReturn diff --git a/ts/session/apis/snode_api/factories/DeleteGroupHashesRequestFactory.ts b/ts/session/apis/snode_api/factories/DeleteGroupHashesRequestFactory.ts new file mode 100644 index 0000000000..9c2b921650 --- /dev/null +++ b/ts/session/apis/snode_api/factories/DeleteGroupHashesRequestFactory.ts @@ -0,0 +1,35 @@ +import { UserGroupsGet } from 'libsession_util_nodejs'; +import { isEmpty } from 'lodash'; +import { ed25519Str } from '../../../utils/String'; +import { DeleteHashesFromGroupNodeSubRequest } from '../SnodeRequestTypes'; + +function makeGroupHashesToDeleteSubRequest({ + allOldHashes, + group, +}: { + group: Pick; + allOldHashes: Set; +}) { + const groupPk = group.pubkeyHex; + const allOldHashesArray = [...allOldHashes]; + if (allOldHashesArray.length) { + if (!group.secretKey || isEmpty(group.secretKey)) { + window.log.debug( + `makeGroupHashesToDeleteSubRequest: ${ed25519Str(groupPk)}: allOldHashesArray not empty but we do not have the secretKey` + ); + + throw new Error( + 'makeGroupHashesToDeleteSubRequest: allOldHashesArray not empty but we do not have the secretKey' + ); + } + + return new DeleteHashesFromGroupNodeSubRequest({ + messagesHashes: [...allOldHashes], + groupPk, + secretKey: group.secretKey, + }); + } + return null; +} + +export const DeleteGroupHashesFactory = { makeGroupHashesToDeleteSubRequest }; diff --git a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts new file mode 100644 index 0000000000..e8bd8ff791 --- /dev/null +++ b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts @@ -0,0 +1,184 @@ +import { UserGroupsGet } from 'libsession_util_nodejs'; +import { compact, isEmpty } from 'lodash'; +import { SignalService } from '../../../../protobuf'; +import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { GroupUpdateInfoChangeMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; +import { GroupUpdateMemberChangeMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; +import { MessageSender } from '../../../sending'; +import { ed25519Str } from '../../../utils/String'; +import { PendingChangesForGroup } from '../../../utils/libsession/libsession_utils'; +import { + StoreGroupExtraData, + StoreGroupInfoSubRequest, + StoreGroupKeysSubRequest, + StoreGroupMembersSubRequest, + StoreGroupMessageSubRequest, +} from '../SnodeRequestTypes'; +import { SnodeNamespaces } from '../namespaces'; + +export type StoreMessageToSubRequestType = + | GroupUpdateMemberChangeMessage + | GroupUpdateInfoChangeMessage; + +async function makeGroupMessageSubRequest( + updateMessages: Array, + group: Pick +) { + const compactedMessages = compact(updateMessages); + if (isEmpty(compactedMessages)) { + return []; + } + const groupPk = compactedMessages[0].destination; + const allForSameDestination = compactedMessages.every(m => m.destination === groupPk); + if (!allForSameDestination) { + throw new Error('makeGroupMessageSubRequest: not all messages are for the same destination'); + } + + const messagesToEncrypt: Array = compactedMessages.map(updateMessage => { + const wrapped = MessageSender.wrapContentIntoEnvelope( + SignalService.Envelope.Type.SESSION_MESSAGE, + undefined, + updateMessage.createAtNetworkTimestamp, // message is signed with this timestmap + updateMessage.plainTextBuffer() + ); + + return { + namespace: SnodeNamespaces.ClosedGroupMessages, + pubkey: updateMessage.destination, + ttl: updateMessage.ttl(), + networkTimestamp: updateMessage.createAtNetworkTimestamp, + data: SignalService.Envelope.encode(wrapped).finish(), + dbMessageIdentifier: updateMessage.identifier, + }; + }); + + const encryptedContent = messagesToEncrypt.length + ? await MetaGroupWrapperActions.encryptMessages( + groupPk, + messagesToEncrypt.map(m => m.data) + ) + : []; + if (encryptedContent.length !== messagesToEncrypt.length) { + throw new Error( + 'makeGroupMessageSubRequest: MetaGroupWrapperActions.encryptMessages did not return the right count of items' + ); + } + + const updateMessagesEncrypted = messagesToEncrypt.map((requestDetails, index) => ({ + ...requestDetails, + data: encryptedContent[index], + })); + + const updateMessagesRequests = updateMessagesEncrypted.map(m => { + return new StoreGroupMessageSubRequest({ + encryptedData: m.data, + groupPk, + ttlMs: m.ttl, + dbMessageIdentifier: m.dbMessageIdentifier, + ...group, + createdAtNetworkTimestamp: m.networkTimestamp, + }); + }); + + return updateMessagesRequests; +} + +function makeStoreGroupKeysSubRequest({ + encryptedSupplementKeys, + group, +}: { + group: Pick; + encryptedSupplementKeys: Array; +}) { + const groupPk = group.pubkeyHex; + if (!encryptedSupplementKeys.length) { + return []; + } + + // supplementalKeys are already encrypted, but we still need the secretKey to sign the request + + if (!group.secretKey || isEmpty(group.secretKey)) { + window.log.debug( + `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: keysEncryptedmessage not empty but we do not have the secretKey` + ); + + throw new Error( + 'pushChangesToGroupSwarmIfNeeded: keysEncryptedmessage not empty but we do not have the secretKey' + ); + } + return encryptedSupplementKeys.map(encryptedData => { + return new StoreGroupKeysSubRequest({ + encryptedData, + groupPk, + secretKey: group.secretKey, + }); + }); +} + +function makeStoreGroupConfigSubRequest({ + group, + pendingConfigData, +}: { + group: Pick; + pendingConfigData: Array; +}) { + if (!pendingConfigData.length) { + return []; + } + const groupPk = group.pubkeyHex; + + if (!group.secretKey || isEmpty(group.secretKey)) { + window.log.debug( + `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: pendingConfigMsgs not empty but we do not have the secretKey` + ); + + throw new Error( + 'pushChangesToGroupSwarmIfNeeded: pendingConfigMsgs not empty but we do not have the secretKey' + ); + } + + const groupInfoSubRequests = compact( + pendingConfigData.map(m => + m.namespace === SnodeNamespaces.ClosedGroupInfo + ? new StoreGroupInfoSubRequest({ + encryptedData: m.ciphertext, + groupPk, + secretKey: group.secretKey, + }) + : null + ) + ); + + const groupMembersSubRequests = compact( + pendingConfigData.map(m => + m.namespace === SnodeNamespaces.ClosedGroupMembers + ? new StoreGroupMembersSubRequest({ + encryptedData: m.ciphertext, + groupPk, + secretKey: group.secretKey, + }) + : null + ) + ); + + const groupKeysSubRequests = compact( + pendingConfigData.map(m => + m.namespace === SnodeNamespaces.ClosedGroupKeys + ? new StoreGroupKeysSubRequest({ + encryptedData: m.ciphertext, + groupPk, + secretKey: group.secretKey, + }) + : null + ) + ); + + // we want to store first the keys (as the info and members might already be encrypted with them) + return [...groupKeysSubRequests, ...groupInfoSubRequests, ...groupMembersSubRequests]; +} + +export const StoreGroupRequestFactory = { + makeGroupMessageSubRequest, + makeStoreGroupConfigSubRequest, + makeStoreGroupKeysSubRequest, +}; diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 439f22ee43..198fa6fb47 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -329,8 +329,9 @@ class ConvoController { groupPk, revokeSubRequest: null, unrevokeSubRequest: null, - encryptedSupplementKeys: [], + supplementalKeysSubRequest: [], deleteAllMessagesSubRequest, + extraStoreRequests: [], }); if (lastPushResult !== RunJobResult.Success) { throw new Error(`Failed to destroyGroupDetails for pk ${ed25519Str(groupPk)}`); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 8a6daa9646..7687476543 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -30,8 +30,11 @@ import { RetrieveGroupSubRequest, RetrieveLegacyClosedGroupSubRequest, RetrieveUserSubRequest, - StoreGroupConfigSubRequest, + StoreGroupInfoSubRequest, + StoreGroupKeysSubRequest, + StoreGroupMembersSubRequest, StoreGroupMessageSubRequest, + StoreGroupRevokedRetrievableSubRequest, StoreLegacyGroupMessageSubRequest, StoreUserConfigSubRequest, StoreUserMessageSubRequest, @@ -89,7 +92,12 @@ type StoreRequest05 = | StoreUserConfigSubRequest | StoreUserMessageSubRequest | StoreLegacyGroupMessageSubRequest; -type StoreRequest03 = StoreGroupConfigSubRequest | StoreGroupMessageSubRequest; +type StoreRequest03 = + | StoreGroupInfoSubRequest + | StoreGroupMembersSubRequest + | StoreGroupKeysSubRequest + | StoreGroupRevokedRetrievableSubRequest + | StoreGroupMessageSubRequest; type PubkeyToRequestType = T extends PubkeyType ? StoreRequest05 @@ -366,7 +374,10 @@ async function signSubRequests( p instanceof DeleteHashesFromUserNodeSubRequest || p instanceof DeleteHashesFromGroupNodeSubRequest || p instanceof DeleteAllFromUserNodeSubRequest || - p instanceof StoreGroupConfigSubRequest || + p instanceof StoreGroupInfoSubRequest || + p instanceof StoreGroupMembersSubRequest || + p instanceof StoreGroupKeysSubRequest || + p instanceof StoreGroupRevokedRetrievableSubRequest || p instanceof StoreGroupMessageSubRequest || p instanceof StoreLegacyGroupMessageSubRequest || p instanceof StoreUserConfigSubRequest || diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index e2aad78636..9fdf9f831f 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -13,11 +13,10 @@ import { MultiEncryptWrapperActions, UserGroupsWrapperActions, } from '../../../../webworker/workers/browser/libsession_worker_interface'; +import { StoreGroupRevokedRetrievableSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; -import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; import { RevokeChanges, SnodeAPIRevoke } from '../../../apis/snode_api/revokeSubaccount'; import { WithSecretKey } from '../../../apis/snode_api/types'; -import { TTL_DEFAULT } from '../../../constants'; import { concatUInt8Array } from '../../../crypto'; import { MessageSender } from '../../../sending'; import { fromHexToArray } from '../../String'; @@ -29,7 +28,6 @@ import { RunJobResult, } from '../PersistedJob'; import { GroupSync } from './GroupSyncJob'; -import { StoreGroupConfigSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; export type WithAddWithoutHistoryMembers = { withoutHistory: Array }; export type WithAddWithHistoryMembers = { withHistory: Array }; @@ -154,13 +152,10 @@ class GroupPendingRemovalsJob extends PersistedJob; -}) { - if (!updateMessages.length) { - return true; - } - - const group = await UserGroupsWrapperActions.getGroup(groupPk); - if (!group) { - window.log.warn( - `storeGroupUpdateMessages for ${ed25519Str(groupPk)}: no group found in wrapper` - ); - return false; - } - - const updateMessagesToEncrypt: Array = updateMessages.map(updateMessage => { - const wrapped = MessageSender.wrapContentIntoEnvelope( - SignalService.Envelope.Type.SESSION_MESSAGE, - undefined, - updateMessage.createAtNetworkTimestamp, // message is signed with this timestmap - updateMessage.plainTextBuffer() - ); - - return { - namespace: SnodeNamespaces.ClosedGroupMessages, - pubkey: groupPk, - ttl: updateMessage.ttl(), - networkTimestamp: updateMessage.createAtNetworkTimestamp, - data: SignalService.Envelope.encode(wrapped).finish(), - dbMessageIdentifier: updateMessage.identifier, - }; - }); - - const encryptedUpdate = updateMessagesToEncrypt - ? await MetaGroupWrapperActions.encryptMessages( - groupPk, - updateMessagesToEncrypt.map(m => m.data) - ) - : []; - - const updateMessagesEncrypted = updateMessagesToEncrypt.map((requestDetails, index) => ({ - ...requestDetails, - data: encryptedUpdate[index], - })); - - const updateMessagesRequests = updateMessagesEncrypted.map(m => { - return new StoreGroupMessageSubRequest({ - encryptedData: m.data, - groupPk, - ttlMs: m.ttl, - dbMessageIdentifier: m.dbMessageIdentifier, - ...group, - createdAtNetworkTimestamp: m.networkTimestamp, - }); - }); - - const result = await MessageSender.sendEncryptedDataToSnode({ - storeRequests: [...updateMessagesRequests], - destination: groupPk, - deleteHashesSubRequest: null, - revokeSubRequest: null, - unrevokeSubRequest: null, - deleteAllMessagesSubRequest: null, - }); - - const expectedReplyLength = updateMessagesRequests.length; // each of those messages are sent as a subrequest - - // we do a sequence call here. If we do not have the right expected number of results, consider it a failure - if (!isArray(result) || result.length !== expectedReplyLength) { - window.log.info( - `GroupSyncJob: unexpected result length: expected ${expectedReplyLength} but got ${result?.length}` - ); - - // this might be a 421 error (already handled) so let's retry this request a little bit later - return false; - } - return true; -} - async function pushChangesToGroupSwarmIfNeeded({ revokeSubRequest, unrevokeSubRequest, groupPk, - encryptedSupplementKeys, + supplementalKeysSubRequest, deleteAllMessagesSubRequest, + extraStoreRequests, }: WithGroupPubkey & WithRevokeSubRequest & { - encryptedSupplementKeys: Array; + supplementalKeysSubRequest: Array; deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; + extraStoreRequests: Array; }): Promise { // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc await LibSessionUtil.saveDumpsToDb(groupPk); @@ -182,10 +97,11 @@ async function pushChangesToGroupSwarmIfNeeded({ // is updated we want to try and run immediately so don't schedule another run in this case) if ( isEmpty(pendingConfigData) && - !encryptedSupplementKeys.length && - !revokeSubRequest && - !unrevokeSubRequest && - !deleteAllMessagesSubRequest + isEmpty(supplementalKeysSubRequest) && + isEmpty(revokeSubRequest) && + isEmpty(unrevokeSubRequest) && + isEmpty(deleteAllMessagesSubRequest) && + isEmpty(extraStoreRequests) ) { window.log.debug(`pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: nothing to push`); return RunJobResult.Success; @@ -205,109 +121,20 @@ async function pushChangesToGroupSwarmIfNeeded({ ); } - const networkTimestamp = GetNetworkTime.now(); - - const pendingConfigMsgs = pendingConfigData.map(item => { - return { - namespace: item.namespace, - pubkey: groupPk, - networkTimestamp, - ttl: TTL_DEFAULT.CONFIG_MESSAGE, - data: item.ciphertext, - }; + const pendingConfigRequests = StoreGroupRequestFactory.makeStoreGroupConfigSubRequest({ + group, + pendingConfigData, }); - // supplementKeys are already encrypted by libsession - const keysEncryptedMessages: Array = encryptedSupplementKeys.map(key => ({ - namespace: SnodeNamespaces.ClosedGroupKeys, - pubkey: groupPk, - ttl: TTL_DEFAULT.CONFIG_MESSAGE, - networkTimestamp, - data: key, - dbMessageIdentifier: null, - })); - - let pendingConfigRequests: Array = []; - let keysEncryptedRequests: Array = []; - - if (pendingConfigMsgs.length) { - if (!group.secretKey || isEmpty(group.secretKey)) { - window.log.debug( - `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: pendingConfigMsgs not empty but we do not have the secretKey` - ); - - throw new Error( - 'pushChangesToGroupSwarmIfNeeded: pendingConfigMsgs not empty but we do not have the secretKey' - ); - } - - pendingConfigRequests = pendingConfigMsgs.map(m => { - return new StoreGroupConfigSubRequest({ - encryptedData: m.data, - groupPk, - namespace: m.namespace, - ttlMs: m.ttl, - secretKey: group.secretKey, - authData: null, - }); - }); - } - - if (keysEncryptedMessages.length) { - // supplementalKeys are already encrypted, but we still need the secretKey to sign the request - - if (!group.secretKey || isEmpty(group.secretKey)) { - window.log.debug( - `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: keysEncryptedmessage not empty but we do not have the secretKey` - ); - - throw new Error( - 'pushChangesToGroupSwarmIfNeeded: keysEncryptedmessage not empty but we do not have the secretKey' - ); - } - keysEncryptedRequests = keysEncryptedMessages.map(m => { - return new StoreGroupConfigSubRequest({ - encryptedData: m.data, - groupPk, - namespace: SnodeNamespaces.ClosedGroupKeys, - ttlMs: m.ttl, - secretKey: group.secretKey, - authData: null, - }); - }); - } - - let deleteHashesSubRequest: DeleteHashesFromGroupNodeSubRequest | null = null; - const allOldHashesArray = [...allOldHashes]; - if (allOldHashesArray.length) { - if (!group.secretKey || isEmpty(group.secretKey)) { - window.log.debug( - `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: allOldHashesArray not empty but we do not have the secretKey` - ); - - throw new Error( - 'pushChangesToGroupSwarmIfNeeded: allOldHashesArray not empty but we do not have the secretKey' - ); - } - - deleteHashesSubRequest = new DeleteHashesFromGroupNodeSubRequest({ - messagesHashes: [...allOldHashes], - groupPk, - secretKey: group.secretKey, - }); - } - - if ( - revokeSubRequest?.revokeTokenHex.length === 0 || - unrevokeSubRequest?.revokeTokenHex.length === 0 - ) { - throw new Error( - 'revokeSubRequest and unrevoke request must be null when not doing token change' - ); - } + const deleteHashesSubRequest = DeleteGroupHashesFactory.makeGroupHashesToDeleteSubRequest({ + group, + allOldHashes, + }); const result = await MessageSender.sendEncryptedDataToSnode({ - storeRequests: [...pendingConfigRequests, ...keysEncryptedRequests], + // Note: this is on purpose that supplementalKeysSubRequest is before pendingConfigRequests + // as this is to avoid a race condition where a device polls while we are posting the configs (already encrypted with the new keys) + storeRequests: [...supplementalKeysSubRequest, ...pendingConfigRequests, ...extraStoreRequests], destination: groupPk, deleteHashesSubRequest, revokeSubRequest, @@ -316,12 +143,13 @@ async function pushChangesToGroupSwarmIfNeeded({ }); const expectedReplyLength = - pendingConfigRequests.length + // each of those messages are sent as a subrequest - keysEncryptedRequests.length + // each of those messages are sent as a subrequest + pendingConfigRequests.length + // each of those are sent as a subrequest + supplementalKeysSubRequest.length + // each of those are sent as a subrequest (allOldHashes.size ? 1 : 0) + // we are sending all hashes changes as a single subrequest (revokeSubRequest ? 1 : 0) + // we are sending all revoke updates as a single subrequest (unrevokeSubRequest ? 1 : 0) + // we are sending all revoke updates as a single subrequest - (deleteAllMessagesSubRequest ? 1 : 0); // a delete_all sub request is a single subrequest + (deleteAllMessagesSubRequest ? 1 : 0) + // a delete_all sub request is a single subrequest + (extraStoreRequests ? 1 : 0); // each of those are sent as a subrequest // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { @@ -341,9 +169,9 @@ async function pushChangesToGroupSwarmIfNeeded({ if (isEmpty(changes)) { return RunJobResult.RetryJobIfPossible; } + // Now that we have the successful changes, we need to mark them as pushed and // generate any config dumps which need to be stored - await confirmPushedAndDump(changes, groupPk); return RunJobResult.Success; } @@ -393,7 +221,8 @@ class GroupSyncJob extends PersistedJob { groupPk: thisJobDestination, revokeSubRequest: null, unrevokeSubRequest: null, - encryptedSupplementKeys: [], + supplementalKeysSubRequest: [], + extraStoreRequests: [], }); // eslint-disable-next-line no-useless-catch @@ -473,7 +302,6 @@ async function queueNewJobIfNeeded(groupPk: GroupPubkeyType) { export const GroupSync = { GroupSyncJob, pushChangesToGroupSwarmIfNeeded, - storeGroupUpdateMessages, queueNewJobIfNeeded: (groupPk: GroupPubkeyType) => allowOnlyOneAtATime(`GroupSyncJob-oneAtAtTime-${groupPk}`, () => queueNewJobIfNeeded(groupPk)), }; diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts index aed810baf3..f1301f269e 100644 --- a/ts/session/utils/libsession/libsession_utils_contacts.ts +++ b/ts/session/utils/libsession/libsession_utils_contacts.ts @@ -70,7 +70,6 @@ async function insertContactFromDBIntoWrapperAndRefresh( const expirationMode = foundConvo.get('expirationMode') || undefined; const expireTimer = foundConvo.get('expireTimer') || 0; - const wrapperContact = getContactInfoFromDBValues({ id, dbApproved, diff --git a/ts/shared/env_vars.ts b/ts/shared/env_vars.ts index 8cfb2c64b2..0851fa9c72 100644 --- a/ts/shared/env_vars.ts +++ b/ts/shared/env_vars.ts @@ -27,5 +27,5 @@ export function isTestIntegration() { } export function hasClosedGroupV2QAButtons() { - return !!window.sessionFeatureFlags.useClosedGroupV2QAButtons -} \ No newline at end of file + return !!window.sessionFeatureFlags.useClosedGroupV2QAButtons; +} diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 177cd78137..c736024aa2 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -17,6 +17,7 @@ import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; +import { StoreGroupRequestFactory } from '../../session/apis/snode_api/factories/StoreGroupRequestFactory'; import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../../session/conversations'; import { getSodiumRenderer } from '../../session/crypto'; @@ -51,6 +52,7 @@ import { import { StateType } from '../reducer'; import { openConversationWithMessages } from './conversations'; import { resetLeftOverlayMode } from './section'; +import { ed25519Str } from '../../session/utils/String'; type WithFromMemberLeftMessage = { fromMemberLeftMessage: boolean }; // there are some changes we want to skip when doing changes triggered from a memberLeft message. export type GroupState = { @@ -177,19 +179,7 @@ const initNewGroupInWrapper = createAsyncThunk( const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); await convo.setIsApproved(true, false); await convo.commit(); // commit here too, as the poll needs it to be approved - - const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - revokeSubRequest: null, - unrevokeSubRequest: null, - encryptedSupplementKeys: [], - deleteAllMessagesSubRequest: null, - }); - if (result !== RunJobResult.Success) { - window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); - throw new Error('failed to pushChangesToGroupSwarmIfNeeded'); - } - + let groupMemberChange: GroupUpdateMemberChangeMessage | null = null; // push one group change message were initial members are added to the group if (membersFromWrapper.length) { const membersHex = uniq(membersFromWrapper.map(m => m.pubkeyHex)); @@ -202,7 +192,7 @@ const initNewGroupInWrapper = createAsyncThunk( convo, markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier }); - const groupChange = await getWithoutHistoryControlMessage({ + groupMemberChange = await getWithoutHistoryControlMessage({ adminSecretKey: groupSecretKey, convo, groupPk, @@ -210,12 +200,24 @@ const initNewGroupInWrapper = createAsyncThunk( createAtNetworkTimestamp: sentAt, dbMsgIdentifier: msgModel.id, }); - if (groupChange) { - await GroupSync.storeGroupUpdateMessages({ - groupPk, - updateMessages: [groupChange], - }); - } + } + + const extraStoreRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest( + [groupMemberChange], + { authData: null, secretKey: newGroup.secretKey } + ); + + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + revokeSubRequest: null, + unrevokeSubRequest: null, + supplementalKeysSubRequest: [], + deleteAllMessagesSubRequest: null, + extraStoreRequests, + }); + if (result !== RunJobResult.Success) { + window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); + throw new Error('failed to pushChangesToGroupSwarmIfNeeded'); } await convo.commit(); @@ -647,18 +649,24 @@ async function handleMemberAddedFromUI({ groupPk, }); // first, get the unrevoke requests for people who are added - const revokeUnrevokeParams = await GroupPendingRemovals.getPendingRevokeParams({ - groupPk, - withHistory, - withoutHistory, - removed: [], - secretKey: group.secretKey, - }); + const { revokeSubRequest, unrevokeSubRequest } = + await GroupPendingRemovals.getPendingRevokeParams({ + groupPk, + withHistory, + withoutHistory, + removed: [], + secretKey: group.secretKey, + }); // then, handle the addition with history of messages by generating supplement keys. // this adds them to the members wrapper etc const encryptedSupplementKeys = await handleWithHistoryMembers({ groupPk, withHistory }); + const supplementalKeysSubRequest = StoreGroupRequestFactory.makeStoreGroupKeysSubRequest({ + group, + encryptedSupplementKeys, + }); + // then handle the addition without history of messages (full rotation of keys). // this adds them to the members wrapper etc await handleWithoutHistoryMembers({ groupPk, withoutHistory }); @@ -666,27 +674,6 @@ async function handleMemberAddedFromUI({ await LibSessionUtil.saveDumpsToDb(groupPk); - // push new members & key supplement in a single batch call - const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - encryptedSupplementKeys, - ...revokeUnrevokeParams, - deleteAllMessagesSubRequest: null, - }); - if (sequenceResult !== RunJobResult.Success) { - throw new Error( - 'handleMemberAddedFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' - ); - } - - // schedule send invite details, auth signature, etc. to the new users - await scheduleGroupInviteJobs(groupPk, withHistory, withoutHistory); - await LibSessionUtil.saveDumpsToDb(groupPk); - - convo.set({ - active_at: createAtNetworkTimestamp, - }); - const expireDetails = DisappearingMessages.getExpireDetailsForOutgoingMesssage( convo, createAtNetworkTimestamp @@ -698,7 +685,6 @@ async function handleMemberAddedFromUI({ expireUpdate: expireDetails, markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier }; - const updateMessagesToPush: Array = []; if (withHistory.length) { const msgModel = await ClosedGroup.addUpdateMessage({ @@ -735,8 +721,35 @@ async function handleMemberAddedFromUI({ } } + const extraStoreRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest( + updateMessagesToPush, + group + ); + + // push new members & key supplement in a single batch call + const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + supplementalKeysSubRequest, + revokeSubRequest, + unrevokeSubRequest, + deleteAllMessagesSubRequest: null, + extraStoreRequests, + }); + if (sequenceResult !== RunJobResult.Success) { + throw new Error( + 'handleMemberAddedFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' + ); + } + + // schedule send invite details, auth signature, etc. to the new users + await scheduleGroupInviteJobs(groupPk, withHistory, withoutHistory); + await LibSessionUtil.saveDumpsToDb(groupPk); + + convo.set({ + active_at: createAtNetworkTimestamp, + }); + await convo.commit(); - await GroupSync.storeGroupUpdateMessages({ groupPk, updateMessages: updateMessagesToPush }); } /** @@ -782,13 +795,51 @@ async function handleMemberRemovedFromUI({ const createAtNetworkTimestamp = GetNetworkTime.now(); await LibSessionUtil.saveDumpsToDb(groupPk); + const expiringDetails = DisappearingMessages.getExpireDetailsForOutgoingMesssage( + convo, + createAtNetworkTimestamp + ); + let removedControlMessage: GroupUpdateMemberChangeMessage | null = null; + if (removed.length && !fromMemberLeftMessage) { + const msgModel = await ClosedGroup.addUpdateMessage({ + diff: { type: 'kicked', kicked: removed }, + convo, + sender: us, + sentAt: createAtNetworkTimestamp, + expireUpdate: { + expirationTimer: expiringDetails.expireTimer, + expirationType: expiringDetails.expirationType, + messageExpirationFromRetrieve: + expiringDetails.expireTimer > 0 + ? createAtNetworkTimestamp + expiringDetails.expireTimer + : null, + }, + markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier + }); + removedControlMessage = await getRemovedControlMessage({ + adminSecretKey: group.secretKey, + convo, + groupPk, + removed, + createAtNetworkTimestamp, + fromMemberLeftMessage, + dbMsgIdentifier: msgModel.id, + }); + } + + const extraStoreRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest( + [removedControlMessage], + group + ); + // revoked pubkeys, update messages, and libsession groups config in a single batch call const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - encryptedSupplementKeys: [], + supplementalKeysSubRequest: [], revokeSubRequest: null, unrevokeSubRequest: null, deleteAllMessagesSubRequest: null, + extraStoreRequests, }); if (sequenceResult !== RunJobResult.Success) { throw new Error( @@ -801,49 +852,7 @@ async function handleMemberRemovedFromUI({ convo.set({ active_at: createAtNetworkTimestamp, }); - - const expiringDetails = DisappearingMessages.getExpireDetailsForOutgoingMesssage( - convo, - createAtNetworkTimestamp - ); - - const shared = { - convo, - sender: us, - sentAt: createAtNetworkTimestamp, - expireUpdate: { - expirationTimer: expiringDetails.expireTimer, - expirationType: expiringDetails.expirationType, - messageExpirationFromRetrieve: - expiringDetails.expireTimer > 0 - ? createAtNetworkTimestamp + expiringDetails.expireTimer - : null, - }, - }; await convo.commit(); - - if (removed.length && !fromMemberLeftMessage) { - const msgModel = await ClosedGroup.addUpdateMessage({ - diff: { type: 'kicked', kicked: removed }, - ...shared, - markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier - }); - const removedControlMessage = await getRemovedControlMessage({ - adminSecretKey: group.secretKey, - convo, - groupPk, - removed, - createAtNetworkTimestamp, - fromMemberLeftMessage, - dbMsgIdentifier: msgModel.id, - }); - if (removedControlMessage) { - await GroupSync.storeGroupUpdateMessages({ - groupPk, - updateMessages: [removedControlMessage], - }); - } - } } async function handleNameChangeFromUI({ @@ -901,12 +910,18 @@ async function handleNameChangeFromUI({ ...DisappearingMessages.getExpireDetailsForOutgoingMesssage(convo, createAtNetworkTimestamp), }); + const extraStoreRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest( + [nameChangeMsg], + group + ); + const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - encryptedSupplementKeys: [], + supplementalKeysSubRequest: [], revokeSubRequest: null, unrevokeSubRequest: null, deleteAllMessagesSubRequest: null, + extraStoreRequests, }); if (batchResult !== RunJobResult.Success) { @@ -916,7 +931,6 @@ async function handleNameChangeFromUI({ } await UserSync.queueNewJobIfNeeded(); - await GroupSync.storeGroupUpdateMessages({ groupPk, updateMessages: [nameChangeMsg] }); convo.set({ active_at: createAtNetworkTimestamp, @@ -1018,10 +1032,24 @@ const triggerFakeAvatarUpdate = createAsyncThunk( secretKey: group.secretKey, sodium: await getSodiumRenderer(), }); - await GroupSync.storeGroupUpdateMessages({ + + const extraStoreRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest( + [updateMsg], + group + ); + + const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - updateMessages: [updateMsg], + supplementalKeysSubRequest: [], + revokeSubRequest: null, + unrevokeSubRequest: null, + deleteAllMessagesSubRequest: null, + extraStoreRequests, }); + if (!batchResult) { + window.log.warn(`failed to send avatarChange message for group ${ed25519Str(groupPk)}`); + throw new Error('failed to send avatarChange message'); + } } ); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 8605632997..b0dd18a3c5 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -277,7 +277,8 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { groupPk, revokeSubRequest: null, unrevokeSubRequest: null, - encryptedSupplementKeys: [], + supplementalKeysSubRequest: [], + extraStoreRequests: [], }); expect(result).to.be.eq(RunJobResult.Success); expect(sendStub.callCount).to.be.eq(0); @@ -302,7 +303,8 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { groupPk, revokeSubRequest: null, unrevokeSubRequest: null, - encryptedSupplementKeys: [], + supplementalKeysSubRequest: [], + extraStoreRequests: [], }); sendStub.resolves(undefined); @@ -376,7 +378,8 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { groupPk, revokeSubRequest: null, unrevokeSubRequest: null, - encryptedSupplementKeys: [], + supplementalKeysSubRequest: [], + extraStoreRequests: [], }); expect(sendStub.callCount).to.be.eq(1); From 816f29d682464ac7f5004a356e510953a2b1d329 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 13 Jun 2024 09:52:03 +1000 Subject: [PATCH 125/302] chore: moved outgoing message wrapper functions to MessagWrapper.ts --- ts/models/conversation.ts | 2 - .../factories/StoreGroupRequestFactory.ts | 4 +- ts/session/apis/snode_api/revokeSubaccount.ts | 4 +- ts/session/apis/snode_api/types.ts | 4 +- .../conversations/ConversationController.ts | 2 - ts/session/sending/MessageSender.ts | 49 ++----------------- ts/session/sending/MessageWrapper.ts | 41 ++++++++++++++++ .../utils/job_runners/jobs/GroupSyncJob.ts | 2 - .../utils/job_runners/jobs/UserSyncJob.ts | 2 - ts/state/ducks/metaGroups.ts | 8 --- .../group_sync_job/GroupSyncJob_test.ts | 8 --- .../user_sync_job/UserSyncJob_test.ts | 2 - 12 files changed, 51 insertions(+), 77 deletions(-) create mode 100644 ts/session/sending/MessageWrapper.ts diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 8ca671b9fe..9d4ddd7777 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1130,8 +1130,6 @@ export class ConversationModel extends Backbone.Model { await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk: this.id, - revokeSubRequest: null, - unrevokeSubRequest: null, deleteAllMessagesSubRequest: null, supplementalKeysSubRequest: [], extraStoreRequests, diff --git a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts index e8bd8ff791..bcca72ac83 100644 --- a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts +++ b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts @@ -4,7 +4,7 @@ import { SignalService } from '../../../../protobuf'; import { MetaGroupWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { GroupUpdateInfoChangeMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage'; import { GroupUpdateMemberChangeMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; -import { MessageSender } from '../../../sending'; +import { MessageWrapper } from '../../../sending/MessageWrapper'; import { ed25519Str } from '../../../utils/String'; import { PendingChangesForGroup } from '../../../utils/libsession/libsession_utils'; import { @@ -35,7 +35,7 @@ async function makeGroupMessageSubRequest( } const messagesToEncrypt: Array = compactedMessages.map(updateMessage => { - const wrapped = MessageSender.wrapContentIntoEnvelope( + const wrapped = MessageWrapper.wrapContentIntoEnvelope( SignalService.Envelope.Type.SESSION_MESSAGE, undefined, updateMessage.createAtNetworkTimestamp, // message is signed with this timestmap diff --git a/ts/session/apis/snode_api/revokeSubaccount.ts b/ts/session/apis/snode_api/revokeSubaccount.ts index 5572692e9a..5a846c5e96 100644 --- a/ts/session/apis/snode_api/revokeSubaccount.ts +++ b/ts/session/apis/snode_api/revokeSubaccount.ts @@ -28,7 +28,7 @@ async function getRevokeSubaccountParams( timestamp: GetNetworkTime.now(), secretKey, }) - : null; + : undefined; const unrevokeSubRequest = unrevokeChanges.length ? new SubaccountUnrevokeSubRequest({ groupPk, @@ -36,7 +36,7 @@ async function getRevokeSubaccountParams( timestamp: GetNetworkTime.now(), secretKey, }) - : null; + : undefined; return { revokeSubRequest, diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index f569863a2f..729769b239 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -37,8 +37,8 @@ export type ShortenOrExtend = 'extend' | 'shorten' | ''; export type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; export type WithRevokeSubRequest = { - revokeSubRequest: SubaccountRevokeSubRequest | null; - unrevokeSubRequest: SubaccountUnrevokeSubRequest | null; + revokeSubRequest?: SubaccountRevokeSubRequest; + unrevokeSubRequest?: SubaccountUnrevokeSubRequest; }; export type SignedHashesParams = WithSignature & { diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 198fa6fb47..407c683847 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -327,8 +327,6 @@ class ConvoController { await MetaGroupWrapperActions.infoDestroy(groupPk); const lastPushResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - revokeSubRequest: null, - unrevokeSubRequest: null, supplementalKeysSubRequest: [], deleteAllMessagesSubRequest, extraStoreRequests: [], diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 7687476543..b3eab85c8b 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -70,6 +70,7 @@ import { OutgoingRawMessage } from '../types/RawMessage'; import { UserUtils } from '../utils'; import { ed25519Str, fromUInt8ArrayToBase64 } from '../utils/String'; import { MessageSentHandler } from './MessageSentHandler'; +import { MessageWrapper } from './MessageWrapper'; // ================ SNODE STORE ================ @@ -546,7 +547,7 @@ async function encryptForGroupV2( networkTimestamp, } = params; - const envelope = wrapContentIntoEnvelope( + const envelope = MessageWrapper.wrapContentIntoEnvelope( SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, destination, networkTimestamp, @@ -599,13 +600,13 @@ async function encryptMessageAndWrap( encryptionBasedOnConversation(recipient) ); - const envelope = wrapContentIntoEnvelope( + const envelope = MessageWrapper.wrapContentIntoEnvelope( envelopeType, recipient.key, networkTimestamp, cipherText ); - const data = wrapEnvelopeInWebSocketMessage(envelope); + const data = MessageWrapper.wrapEnvelopeInWebSocketMessage(envelope); return { encryptedAndWrappedData: data, @@ -736,51 +737,10 @@ async function sendUnencryptedDataToSnode { // return await so we catch exceptions in here return await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk: thisJobDestination, - revokeSubRequest: null, - unrevokeSubRequest: null, supplementalKeysSubRequest: [], extraStoreRequests: [], }); diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index 4ebfa93d3d..c182341248 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -119,8 +119,6 @@ async function pushChangesToUserSwarmIfNeeded() { storeRequests, destination: us, deleteHashesSubRequest, - revokeSubRequest: null, - unrevokeSubRequest: null, }); const expectedReplyLength = diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index c736024aa2..4a1c018fce 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -209,8 +209,6 @@ const initNewGroupInWrapper = createAsyncThunk( const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - revokeSubRequest: null, - unrevokeSubRequest: null, supplementalKeysSubRequest: [], deleteAllMessagesSubRequest: null, extraStoreRequests, @@ -836,8 +834,6 @@ async function handleMemberRemovedFromUI({ const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementalKeysSubRequest: [], - revokeSubRequest: null, - unrevokeSubRequest: null, deleteAllMessagesSubRequest: null, extraStoreRequests, }); @@ -918,8 +914,6 @@ async function handleNameChangeFromUI({ const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementalKeysSubRequest: [], - revokeSubRequest: null, - unrevokeSubRequest: null, deleteAllMessagesSubRequest: null, extraStoreRequests, }); @@ -1041,8 +1035,6 @@ const triggerFakeAvatarUpdate = createAsyncThunk( const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementalKeysSubRequest: [], - revokeSubRequest: null, - unrevokeSubRequest: null, deleteAllMessagesSubRequest: null, extraStoreRequests, }); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index b0dd18a3c5..d05a6870e7 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -275,8 +275,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - revokeSubRequest: null, - unrevokeSubRequest: null, supplementalKeysSubRequest: [], extraStoreRequests: [], }); @@ -301,8 +299,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - revokeSubRequest: null, - unrevokeSubRequest: null, supplementalKeysSubRequest: [], extraStoreRequests: [], }); @@ -335,8 +331,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { storeRequests: [expectedInfo, expectedMember], destination: groupPk, messagesHashesToDelete: new Set('123'), - unrevokeSubRequest: null, - revokeSubRequest: null, }; expect(callArgs).to.be.deep.eq(expectedArgs); }); @@ -376,8 +370,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { ]); const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - revokeSubRequest: null, - unrevokeSubRequest: null, supplementalKeysSubRequest: [], extraStoreRequests: [], }); diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index d04f02456f..23b38218c4 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -315,8 +315,6 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { storeRequests: [expectedProfile, expectedContact], destination: sessionId, messagesHashesToDelete: new Set('123'), - unrevokeSubRequest: null, - revokeSubRequest: null, }; // callArgs.storeRequests = callArgs.storeRequests.map(_m => null) as any; expect(callArgs).to.be.deep.eq(expectedArgs); From a49a65c92b8075ebd09ab781b39f0c193047cf1d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 13 Jun 2024 11:11:23 +1000 Subject: [PATCH 126/302] chore: cleaned up the batch sender --- .../conversations/unsendingInteractions.ts | 7 ++-- ts/models/conversation.ts | 1 - ts/session/apis/snode_api/SNodeAPI.ts | 42 ++++++++++++------- .../apis/snode_api/SnodeRequestTypes.ts | 2 +- .../DeleteGroupHashesRequestFactory.ts | 16 +++---- .../DeleteUserHashesRequestFactory.ts | 13 ++++++ .../conversations/ConversationController.ts | 2 +- ts/session/sending/MessageSender.ts | 16 ++++--- ts/session/sending/MessageSentHandler.ts | 34 ++++++++------- .../jobs/GroupPendingRemovalsJob.ts | 1 - .../utils/job_runners/jobs/GroupSyncJob.ts | 12 +++--- .../utils/job_runners/jobs/UserSyncJob.ts | 2 +- ts/state/ducks/metaGroups.ts | 5 --- 13 files changed, 87 insertions(+), 66 deletions(-) create mode 100644 ts/session/apis/snode_api/factories/DeleteUserHashesRequestFactory.ts diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 875f63ba3e..e51a3e3fd7 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -189,7 +189,7 @@ export async function deleteMessagesFromSwarmOnly( ) { const deletionMessageHashes = isStringArray(messages) ? messages : getMessageHashes(messages); try { - if (messages.length === 0) { + if (isEmpty(messages)) { return false; } @@ -199,10 +199,11 @@ export async function deleteMessagesFromSwarmOnly( ); return false; } + const hashesAsSet = new Set(deletionMessageHashes); if (PubKey.is03Pubkey(pubkey)) { - return await SnodeAPI.networkDeleteMessagesForGroup(deletionMessageHashes, pubkey); + return await SnodeAPI.networkDeleteMessagesForGroup(hashesAsSet, pubkey); } - return await SnodeAPI.networkDeleteMessageOurSwarm(deletionMessageHashes, pubkey); + return await SnodeAPI.networkDeleteMessageOurSwarm(hashesAsSet, pubkey); } catch (e) { window.log?.error( `deleteMessagesFromSwarmOnly: Error deleting message from swarm of ${ed25519Str(pubkey)}, hashes: ${deletionMessageHashes}`, diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 9d4ddd7777..cbc93446f7 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1130,7 +1130,6 @@ export class ConversationModel extends Backbone.Model { await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk: this.id, - deleteAllMessagesSubRequest: null, supplementalKeysSubRequest: [], extraStoreRequests, }); diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 47d053a76f..81b38464e7 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -3,18 +3,16 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { compact, isEmpty } from 'lodash'; import pRetry from 'p-retry'; +import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { getSodiumRenderer } from '../../crypto'; import { PubKey } from '../../types'; -import { - DeleteAllFromUserNodeSubRequest, - DeleteHashesFromGroupNodeSubRequest, - DeleteHashesFromUserNodeSubRequest, -} from './SnodeRequestTypes'; -import { BatchRequests } from './batchRequest'; -import { SnodePool } from './snodePool'; import { StringUtils, UserUtils } from '../../utils'; import { ed25519Str, fromBase64ToArray, fromHexToArray } from '../../utils/String'; -import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; +import { DeleteAllFromUserNodeSubRequest } from './SnodeRequestTypes'; +import { BatchRequests } from './batchRequest'; +import { DeleteGroupHashesFactory } from './factories/DeleteGroupHashesRequestFactory'; +import { DeleteUserHashesFactory } from './factories/DeleteUserHashesRequestFactory'; +import { SnodePool } from './snodePool'; export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.'; @@ -158,14 +156,22 @@ const TEST_getMinTimeout = () => 500; * Note: legacy group did not support removing messages from the swarm. */ const networkDeleteMessageOurSwarm = async ( - messagesHashes: Array, + messagesHashes: Set, pubkey: PubkeyType ): Promise => { const sodium = await getSodiumRenderer(); if (!PubKey.is05Pubkey(pubkey) || pubkey !== UserUtils.getOurPubKeyStrFromCache()) { throw new Error('networkDeleteMessageOurSwarm with 05 pk can only for our own swarm'); } - const request = new DeleteHashesFromUserNodeSubRequest({ messagesHashes }); + if (isEmpty(messagesHashes)) { + window.log.info('networkDeleteMessageOurSwarm: messageHashes is empty'); + return true; + } + const messageHashesArr = [...messagesHashes]; + const request = DeleteUserHashesFactory.makeUserHashesToDeleteSubRequest({ messagesHashes }); + if (!request) { + throw new Error('makeUserHashesToDeleteSubRequest returned invalid subrequest'); + } try { const success = await pRetry( @@ -237,7 +243,7 @@ const networkDeleteMessageOurSwarm = async ( const responseHashes = snodeJson.deleted as Array; const signatureSnode = snodeJson.signature as string; // The signature looks like ( PUBKEY_HEX || RMSG[0] || ... || RMSG[N] || DMSG[0] || ... || DMSG[M] ) - const dataToVerify = `${request.pubkey}${messagesHashes.join( + const dataToVerify = `${request.pubkey}${messageHashesArr.join( '' )}${responseHashes.join('')}`; const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8'); @@ -292,7 +298,7 @@ const networkDeleteMessageOurSwarm = async ( * - if the request failed too many times */ const networkDeleteMessagesForGroup = async ( - messagesHashes: Array, + messagesHashes: Set, groupPk: GroupPubkeyType ): Promise => { if (!PubKey.is03Pubkey(groupPk)) { @@ -301,17 +307,21 @@ const networkDeleteMessagesForGroup = async ( const group = await UserGroupsWrapperActions.getGroup(groupPk); if (!group || !group.secretKey || isEmpty(group.secretKey)) { window.log.warn( - `networkDeleteMessagesForGroup: not deleting from swarm of 03-group ${messagesHashes.length} hashes as we do not the adminKey` + `networkDeleteMessagesForGroup: not deleting from swarm of 03-group ${messagesHashes.size} hashes as we do not the adminKey` ); return false; } try { - const request = new DeleteHashesFromGroupNodeSubRequest({ + const request = DeleteGroupHashesFactory.makeGroupHashesToDeleteSubRequest({ messagesHashes, - groupPk, - secretKey: group.secretKey, + group, }); + if (!request) { + throw new Error( + 'DeleteGroupHashesFactory.makeGroupHashesToDeleteSubRequest failed to build a request ' + ); + } await pRetry( async () => { diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index caf06623e5..317fe1f55b 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -39,7 +39,7 @@ abstract class SnodeAPISubRequest { * Retrieve for legacy was not authenticated */ export class RetrieveLegacyClosedGroupSubRequest extends SnodeAPISubRequest { - public method = 'retrieve' as const; + method = 'retrieve' as const; public readonly legacyGroupPk: PubkeyType; public readonly last_hash: string; public readonly max_size: number | undefined; diff --git a/ts/session/apis/snode_api/factories/DeleteGroupHashesRequestFactory.ts b/ts/session/apis/snode_api/factories/DeleteGroupHashesRequestFactory.ts index 9c2b921650..033db8c480 100644 --- a/ts/session/apis/snode_api/factories/DeleteGroupHashesRequestFactory.ts +++ b/ts/session/apis/snode_api/factories/DeleteGroupHashesRequestFactory.ts @@ -4,32 +4,32 @@ import { ed25519Str } from '../../../utils/String'; import { DeleteHashesFromGroupNodeSubRequest } from '../SnodeRequestTypes'; function makeGroupHashesToDeleteSubRequest({ - allOldHashes, + messagesHashes, group, }: { group: Pick; - allOldHashes: Set; + messagesHashes: Set; }) { const groupPk = group.pubkeyHex; - const allOldHashesArray = [...allOldHashes]; - if (allOldHashesArray.length) { + const messagesHashesArr = [...messagesHashes]; + if (messagesHashesArr.length) { if (!group.secretKey || isEmpty(group.secretKey)) { window.log.debug( - `makeGroupHashesToDeleteSubRequest: ${ed25519Str(groupPk)}: allOldHashesArray not empty but we do not have the secretKey` + `makeGroupHashesToDeleteSubRequest: ${ed25519Str(groupPk)}: messagesHashesArr not empty but we do not have the secretKey` ); throw new Error( - 'makeGroupHashesToDeleteSubRequest: allOldHashesArray not empty but we do not have the secretKey' + 'makeGroupHashesToDeleteSubRequest: messagesHashesArr not empty but we do not have the secretKey' ); } return new DeleteHashesFromGroupNodeSubRequest({ - messagesHashes: [...allOldHashes], + messagesHashes: messagesHashesArr, groupPk, secretKey: group.secretKey, }); } - return null; + return undefined; } export const DeleteGroupHashesFactory = { makeGroupHashesToDeleteSubRequest }; diff --git a/ts/session/apis/snode_api/factories/DeleteUserHashesRequestFactory.ts b/ts/session/apis/snode_api/factories/DeleteUserHashesRequestFactory.ts new file mode 100644 index 0000000000..441638aa4e --- /dev/null +++ b/ts/session/apis/snode_api/factories/DeleteUserHashesRequestFactory.ts @@ -0,0 +1,13 @@ +import { DeleteHashesFromUserNodeSubRequest } from '../SnodeRequestTypes'; + +function makeUserHashesToDeleteSubRequest({ messagesHashes }: { messagesHashes: Set }) { + const messagesHashesArr = [...messagesHashes]; + if (messagesHashesArr.length) { + return new DeleteHashesFromUserNodeSubRequest({ + messagesHashes: messagesHashesArr, + }); + } + return undefined; +} + +export const DeleteUserHashesFactory = { makeUserHashesToDeleteSubRequest }; diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 407c683847..a908490d9a 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -321,7 +321,7 @@ class ConvoController { groupPk, secretKey, }) - : null; + : undefined; // this marks the group info as deleted. We need to push those details await MetaGroupWrapperActions.infoDestroy(groupPk); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index b3eab85c8b..a0c2c5b794 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -429,8 +429,8 @@ async function sendMessagesDataToSnode( deleteHashesSubRequest, deleteAllMessagesSubRequest, }: WithRevokeSubRequest & { - deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; - deleteHashesSubRequest: DeleteHashesRequestPerPubkey | null; + deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest; + deleteHashesSubRequest?: DeleteHashesRequestPerPubkey; }, method: MethodBatchType ): Promise { @@ -645,8 +645,8 @@ async function sendEncryptedDataToSnode( }: WithRevokeSubRequest & { storeRequests: StoreRequestsPerPubkey; // keeping those as an array because the order needs to be enforced for some (groupkeys for instance) destination: T; - deleteHashesSubRequest: DeleteHashesRequestPerPubkey | null; - deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; + deleteHashesSubRequest?: DeleteHashesRequestPerPubkey; + deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest; }): Promise { try { const batchResults = await pRetry( @@ -736,7 +736,6 @@ async function sendUnencryptedDataToSnode & { + { + device: destination, + identifier, + isDestinationClosedGroup, + plainTextBuffer, + }: Pick & { /** * plainTextBuffer is only required when sending a message to a 1o1, * as we need it to encrypt it again for our linked devices (synced messages) */ plainTextBuffer: Uint8Array | null; + /** + * We must not sync a message when it was sent to a closed group + */ + isDestinationClosedGroup: boolean; }, effectiveTimestamp: number, storedHash: string | null ) { // The wrappedEnvelope will be set only if the message is not one of OpenGroupV2Message type. - let fetchedMessage = await fetchHandleMessageSentData(sentMessage.identifier); + let fetchedMessage = await fetchHandleMessageSentData(identifier); if (!fetchedMessage) { return; } let sentTo = fetchedMessage.get('sent_to') || []; - const isOurDevice = UserUtils.isUsFromCache(sentMessage.device); + const isOurDevice = UserUtils.isUsFromCache(destination); - // FIXME this is not correct and will cause issues with syncing - // At this point the only way to check for medium - // group is by comparing the encryption type - const isClosedGroupMessage = - sentMessage.encryption === SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE || - PubKey.is03Pubkey(sentMessage.device); + const isClosedGroupMessage = isDestinationClosedGroup || PubKey.is03Pubkey(destination); // We trigger a sync message only when the message is not to one of our devices, AND - // the message is not for an open group (there is no sync for opengroups, each device pulls all messages), AND + // the message is not for a group (there is no sync for groups, each device pulls all messages), AND // if we did not sync or trigger a sync message for this specific message already const shouldTriggerSyncMessage = !isOurDevice && @@ -100,16 +104,16 @@ async function handleSwarmMessageSentSuccess( // A message is synced if we triggered a sync message (sentSync) // and the current message was sent to our device (so a sync message) const shouldMarkMessageAsSynced = - isOurDevice && fetchedMessage.get('sentSync') && isClosedGroupMessage; + (isOurDevice && fetchedMessage.get('sentSync')) || isClosedGroupMessage; // Handle the sync logic here - if (shouldTriggerSyncMessage && sentMessage && sentMessage.plainTextBuffer) { + if (shouldTriggerSyncMessage && plainTextBuffer) { try { - const contentDecoded = SignalService.Content.decode(sentMessage.plainTextBuffer); + const contentDecoded = SignalService.Content.decode(plainTextBuffer); if (contentDecoded && contentDecoded.dataMessage) { try { await fetchedMessage.sendSyncMessage(contentDecoded, effectiveTimestamp); - const tempFetchMessage = await fetchHandleMessageSentData(sentMessage.identifier); + const tempFetchMessage = await fetchHandleMessageSentData(identifier); if (!tempFetchMessage) { window?.log?.warn( 'Got an error while trying to sendSyncMessage(): fetchedMessage is null' @@ -130,7 +134,7 @@ async function handleSwarmMessageSentSuccess( fetchedMessage.set({ synced: true }); } - sentTo = union(sentTo, [sentMessage.device]); + sentTo = union(sentTo, [destination]); if (storedHash) { fetchedMessage.updateMessageHash(storedHash); } diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 9fdf9f831f..44535bfc86 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -161,7 +161,6 @@ class GroupPendingRemovalsJob extends PersistedJob; - deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest | null; + deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest; extraStoreRequests: Array; }): Promise { // save the dumps to DB even before trying to push them, so at least we have an up to date dumps in the DB in case of crash, no network etc await LibSessionUtil.saveDumpsToDb(groupPk); const { allOldHashes, messages: pendingConfigData } = await LibSessionUtil.pendingChangesForGroup(groupPk); - // If there are no pending changes then the job can just complete (next time something - // is updated we want to try and run immediately so don't schedule another run in this case) + // If there are no pending changes nor any requests to be made, + // then the job can just complete (next time something is updated we want + // to try and run immediately so don't schedule another run in this case) if ( isEmpty(pendingConfigData) && isEmpty(supplementalKeysSubRequest) && @@ -128,12 +129,13 @@ async function pushChangesToGroupSwarmIfNeeded({ const deleteHashesSubRequest = DeleteGroupHashesFactory.makeGroupHashesToDeleteSubRequest({ group, - allOldHashes, + messagesHashes: allOldHashes, }); const result = await MessageSender.sendEncryptedDataToSnode({ // Note: this is on purpose that supplementalKeysSubRequest is before pendingConfigRequests - // as this is to avoid a race condition where a device polls while we are posting the configs (already encrypted with the new keys) + // as this is to avoid a race condition where a device is polling right + // while we are posting the configs (already encrypted with the new keys) storeRequests: [...supplementalKeysSubRequest, ...pendingConfigRequests, ...extraStoreRequests], destination: groupPk, deleteHashesSubRequest, diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index c182341248..f1bc48e898 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -113,7 +113,7 @@ async function pushChangesToUserSwarmIfNeeded() { ? new DeleteHashesFromUserNodeSubRequest({ messagesHashes: [...changesToPush.allOldHashes], }) - : null; + : undefined; const result = await MessageSender.sendEncryptedDataToSnode({ storeRequests, diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 4a1c018fce..74a5b97771 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -210,7 +210,6 @@ const initNewGroupInWrapper = createAsyncThunk( const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementalKeysSubRequest: [], - deleteAllMessagesSubRequest: null, extraStoreRequests, }); if (result !== RunJobResult.Success) { @@ -730,7 +729,6 @@ async function handleMemberAddedFromUI({ supplementalKeysSubRequest, revokeSubRequest, unrevokeSubRequest, - deleteAllMessagesSubRequest: null, extraStoreRequests, }); if (sequenceResult !== RunJobResult.Success) { @@ -834,7 +832,6 @@ async function handleMemberRemovedFromUI({ const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementalKeysSubRequest: [], - deleteAllMessagesSubRequest: null, extraStoreRequests, }); if (sequenceResult !== RunJobResult.Success) { @@ -914,7 +911,6 @@ async function handleNameChangeFromUI({ const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementalKeysSubRequest: [], - deleteAllMessagesSubRequest: null, extraStoreRequests, }); @@ -1035,7 +1031,6 @@ const triggerFakeAvatarUpdate = createAsyncThunk( const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, supplementalKeysSubRequest: [], - deleteAllMessagesSubRequest: null, extraStoreRequests, }); if (!batchResult) { From 59a4048323fe440e5274dc1b80cfcd16ed502315 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 13 Jun 2024 14:01:17 +1000 Subject: [PATCH 127/302] fix: cleaned up SnodeRequestTypes and made sup_keys a single item --- ts/models/conversation.ts | 1 - ts/session/apis/snode_api/SNodeAPI.ts | 2 +- .../apis/snode_api/SnodeRequestTypes.ts | 58 ++++++------------- .../factories/StoreGroupRequestFactory.ts | 16 +++-- .../conversations/ConversationController.ts | 1 - ts/session/sending/MessageSender.ts | 56 +----------------- .../utils/job_runners/jobs/GroupSyncJob.ts | 15 +++-- ts/state/ducks/metaGroups.ts | 6 +- .../ExpireRequest_test.ts | 6 +- .../GetExpiriesRequest_test.ts | 6 +- .../group_sync_job/GroupSyncJob_test.ts | 3 - 11 files changed, 43 insertions(+), 127 deletions(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index cbc93446f7..4860e1c613 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1130,7 +1130,6 @@ export class ConversationModel extends Backbone.Model { await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk: this.id, - supplementalKeysSubRequest: [], extraStoreRequests, }); diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 81b38464e7..10a9795419 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -27,7 +27,7 @@ const forceNetworkDeletion = async (): Promise | null> => { const maliciousSnodes = await pRetry( async () => { const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(usPk); - const builtRequest = await request.buildAndSignParameters(); // we need the timestamp to verify the signature below + const builtRequest = await request.build(); const ret = await BatchRequests.doSnodeBatchRequestNoRetries( [builtRequest], snodeToMakeRequestTo, diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 317fe1f55b..b4e6aeef60 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -120,7 +120,7 @@ export class RetrieveUserSubRequest extends SnodeAPISubRequest { this.namespace = namespace; } - public async buildAndSignParameters() { + public async build() { const { pubkey, pubkey_ed25519, signature, timestamp } = await SnodeSignature.getSnodeSignatureParamsUs({ method: this.method, @@ -173,7 +173,7 @@ export class RetrieveGroupSubRequest extends SnodeAPISubRequest { this.groupDetailsNeededForSignature = groupDetailsNeededForSignature; } - public async buildAndSignParameters() { + public async build() { /** * This will return the signature details we can use with the admin secretKey if we have it, * or with the subaccount details if we don't. @@ -351,7 +351,7 @@ abstract class AbstractRevokeSubRequest extends SnodeAPISubRequest { export class SubaccountRevokeSubRequest extends AbstractRevokeSubRequest { public method = 'revoke_subaccount' as const; - public async buildAndSignParameters() { + public async build() { const signature = await this.signWithAdminSecretKey(); return { method: this.method, @@ -371,7 +371,7 @@ export class SubaccountUnrevokeSubRequest extends AbstractRevokeSubRequest { /** * For Revoke/unrevoke, this needs an admin signature */ - public async buildAndSignParameters() { + public async build() { const signature = await this.signWithAdminSecretKey(); return { @@ -405,7 +405,7 @@ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { /** * For Revoke/unrevoke, this needs an admin signature */ - public async buildAndSignParameters() { + public async build() { const timestamp = GetNetworkTime.now(); const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); @@ -445,7 +445,7 @@ export class DeleteAllFromUserNodeSubRequest extends SnodeAPISubRequest { public method = 'delete_all' as const; public readonly namespace = 'all'; // we can only delete_all for all namespaces currently, but the backend allows more - public async buildAndSignParameters() { + public async build() { const signResult = await SnodeSignature.getSnodeSignatureParamsUs({ method: this.method, namespace: this.namespace, @@ -492,7 +492,7 @@ export class DeleteAllFromGroupMsgNodeSubRequest extends SnodeAPISubRequest { } } - public async buildAndSignParameters() { + public async build() { const signDetails = await SnodeGroupSignature.getSnodeGroupSignature({ method: this.method, namespace: this.namespace, @@ -534,7 +534,7 @@ export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { } } - public async buildAndSignParameters() { + public async build() { const signResult = await SnodeSignature.getSnodeSignatureByHashesParams({ method: this.method, messagesHashes: this.messageHashes, @@ -588,7 +588,7 @@ export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { } } - public async buildAndSignParameters() { + public async build() { // Note: this request can only be made by an admin and will be denied otherwise, so we make the secretKey mandatory in the constructor. const signResult = await SnodeGroupSignature.getGroupSignatureByHashesParams({ method: this.method, @@ -631,7 +631,7 @@ export class UpdateExpiryOnNodeUserSubRequest extends SnodeAPISubRequest { } } - public async buildAndSignParameters() { + public async build() { const signResult = await SnodeSignature.generateUpdateExpiryOurSignature({ shortenOrExtend: this.shortenOrExtend, messagesHashes: this.messageHashes, @@ -698,7 +698,7 @@ export class UpdateExpiryOnNodeGroupSubRequest extends SnodeAPISubRequest { } } - public async buildAndSignParameters() { + public async build() { const signResult = await SnodeGroupSignature.generateUpdateExpiryGroupSignature({ shortenOrExtend: this.shortenOrExtend, messagesHashes: this.messageHashes, @@ -784,7 +784,7 @@ export class StoreGroupMessageSubRequest extends SnodeAPISubRequest { } } - public async buildAndSignParameters(): Promise<{ + public async build(): Promise<{ method: 'store'; params: StoreOnNodeNormalParams; }> { @@ -855,7 +855,7 @@ abstract class StoreGroupConfigSubRequest< } } - public async buildAndSignParameters(): Promise<{ + public async build(): Promise<{ method: 'store'; params: StoreOnNodeNormalParams; }> { @@ -947,7 +947,7 @@ export class StoreUserConfigSubRequest extends SnodeAPISubRequest { } } - public async buildAndSignParameters(): Promise<{ + public async build(): Promise<{ method: 'store'; params: StoreOnNodeNormalParams; }> { @@ -1027,7 +1027,7 @@ export class StoreUserMessageSubRequest extends SnodeAPISubRequest { } } - public async buildAndSignParameters(): Promise<{ + public async build(): Promise<{ method: 'store'; params: StoreOnNodeNormalParams; }> { @@ -1086,7 +1086,7 @@ export class StoreLegacyGroupMessageSubRequest extends SnodeAPISubRequest { } } - public async buildAndSignParameters(): Promise<{ + public async build(): Promise<{ method: 'store'; params: StoreOnNodeNormalParams; }> { @@ -1181,29 +1181,7 @@ export type RawSnodeSubRequests = | GetExpiriesFromNodeSubRequest | DeleteAllFromGroupMsgNodeSubRequest; -export type BuiltSnodeSubRequests = - | ReturnType - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn - | AwaitedReturn; +export type BuiltSnodeSubRequests = AwaitedReturn; export function builtRequestToLoggingId(request: BuiltSnodeSubRequests): string { const { method, params } = request; @@ -1242,7 +1220,7 @@ export function builtRequestToLoggingId(request: BuiltSnodeSubRequests): string } // eslint-disable-next-line @typescript-eslint/array-type -export type NonEmptyArray = [T, ...T[]]; +type NonEmptyArray = [T, ...T[]]; export type BatchResultEntry = { code: number; diff --git a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts index bcca72ac83..5289490b82 100644 --- a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts +++ b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts @@ -88,11 +88,11 @@ function makeStoreGroupKeysSubRequest({ group, }: { group: Pick; - encryptedSupplementKeys: Array; + encryptedSupplementKeys: Uint8Array | null; }) { const groupPk = group.pubkeyHex; - if (!encryptedSupplementKeys.length) { - return []; + if (!encryptedSupplementKeys?.length) { + return undefined; } // supplementalKeys are already encrypted, but we still need the secretKey to sign the request @@ -106,12 +106,10 @@ function makeStoreGroupKeysSubRequest({ 'pushChangesToGroupSwarmIfNeeded: keysEncryptedmessage not empty but we do not have the secretKey' ); } - return encryptedSupplementKeys.map(encryptedData => { - return new StoreGroupKeysSubRequest({ - encryptedData, - groupPk, - secretKey: group.secretKey, - }); + return new StoreGroupKeysSubRequest({ + encryptedData: encryptedSupplementKeys, + groupPk, + secretKey: group.secretKey, }); } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index a908490d9a..efcb20ab24 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -327,7 +327,6 @@ class ConvoController { await MetaGroupWrapperActions.infoDestroy(groupPk); const lastPushResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementalKeysSubRequest: [], deleteAllMessagesSubRequest, extraStoreRequests: [], }); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index a0c2c5b794..243928c990 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -6,7 +6,6 @@ import { compact, isArray, isEmpty, isNumber, isString } from 'lodash'; import pRetry from 'p-retry'; import { Data, SeenMessageHashes } from '../../data/data'; import { SignalService } from '../../protobuf'; -import { assertUnreachable } from '../../types/sqlSharedTypes'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil'; import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2'; @@ -17,19 +16,11 @@ import { import { BuiltSnodeSubRequests, DeleteAllFromGroupMsgNodeSubRequest, - DeleteAllFromUserNodeSubRequest, DeleteHashesFromGroupNodeSubRequest, DeleteHashesFromUserNodeSubRequest, - GetExpiriesFromNodeSubRequest, - GetServiceNodesSubRequest, MethodBatchType, - NetworkTimeSubRequest, NotEmptyArrayOfBatchResults, - OnsResolveSubRequest, RawSnodeSubRequests, - RetrieveGroupSubRequest, - RetrieveLegacyClosedGroupSubRequest, - RetrieveUserSubRequest, StoreGroupInfoSubRequest, StoreGroupKeysSubRequest, StoreGroupMembersSubRequest, @@ -38,11 +29,6 @@ import { StoreLegacyGroupMessageSubRequest, StoreUserConfigSubRequest, StoreUserMessageSubRequest, - SubaccountRevokeSubRequest, - SubaccountUnrevokeSubRequest, - SwarmForSubRequest, - UpdateExpiryOnNodeGroupSubRequest, - UpdateExpiryOnNodeUserSubRequest, } from '../apis/snode_api/SnodeRequestTypes'; import { BatchRequests } from '../apis/snode_api/batchRequest'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; @@ -369,47 +355,7 @@ async function signSubRequests( ): Promise> { const signedRequests: Array = await Promise.all( params.map(p => { - if ( - p instanceof SubaccountRevokeSubRequest || - p instanceof SubaccountUnrevokeSubRequest || - p instanceof DeleteHashesFromUserNodeSubRequest || - p instanceof DeleteHashesFromGroupNodeSubRequest || - p instanceof DeleteAllFromUserNodeSubRequest || - p instanceof StoreGroupInfoSubRequest || - p instanceof StoreGroupMembersSubRequest || - p instanceof StoreGroupKeysSubRequest || - p instanceof StoreGroupRevokedRetrievableSubRequest || - p instanceof StoreGroupMessageSubRequest || - p instanceof StoreLegacyGroupMessageSubRequest || - p instanceof StoreUserConfigSubRequest || - p instanceof StoreUserMessageSubRequest || - p instanceof RetrieveUserSubRequest || - p instanceof RetrieveGroupSubRequest || - p instanceof UpdateExpiryOnNodeUserSubRequest || - p instanceof UpdateExpiryOnNodeGroupSubRequest || - p instanceof GetExpiriesFromNodeSubRequest || - p instanceof DeleteAllFromGroupMsgNodeSubRequest - ) { - return p.buildAndSignParameters(); - } - - if ( - p instanceof RetrieveLegacyClosedGroupSubRequest || - p instanceof SwarmForSubRequest || - p instanceof OnsResolveSubRequest || - p instanceof GetServiceNodesSubRequest || - p instanceof NetworkTimeSubRequest - ) { - return p.build(); - } - - assertUnreachable( - p, - 'If you see this error, you need to add the handling of the rawRequest above' - ); - throw new Error( - 'If you see this error, you need to add the handling of the rawRequest above' - ); + return p.build(); }) ); diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index fe184a7f4f..c05e333d53 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -1,7 +1,7 @@ /* eslint-disable no-await-in-loop */ import { GroupPubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; import { to_hex } from 'libsodium-wrappers-sumo'; -import { isArray, isEmpty, isNumber } from 'lodash'; +import { compact, isArray, isEmpty, isNumber } from 'lodash'; import { UserUtils } from '../..'; import { assertUnreachable } from '../../../../types/sqlSharedTypes'; import { isSignInByLinking } from '../../../../util/storage'; @@ -85,7 +85,7 @@ async function pushChangesToGroupSwarmIfNeeded({ extraStoreRequests, }: WithGroupPubkey & WithRevokeSubRequest & { - supplementalKeysSubRequest: Array; + supplementalKeysSubRequest?: StoreGroupKeysSubRequest; deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest; extraStoreRequests: Array; }): Promise { @@ -136,7 +136,11 @@ async function pushChangesToGroupSwarmIfNeeded({ // Note: this is on purpose that supplementalKeysSubRequest is before pendingConfigRequests // as this is to avoid a race condition where a device is polling right // while we are posting the configs (already encrypted with the new keys) - storeRequests: [...supplementalKeysSubRequest, ...pendingConfigRequests, ...extraStoreRequests], + storeRequests: compact([ + supplementalKeysSubRequest, + ...pendingConfigRequests, + ...extraStoreRequests, + ]), destination: groupPk, deleteHashesSubRequest, revokeSubRequest, @@ -146,8 +150,8 @@ async function pushChangesToGroupSwarmIfNeeded({ const expectedReplyLength = pendingConfigRequests.length + // each of those are sent as a subrequest - supplementalKeysSubRequest.length + // each of those are sent as a subrequest - (allOldHashes.size ? 1 : 0) + // we are sending all hashes changes as a single subrequest + (supplementalKeysSubRequest ? 1 : 0) + // we are sending all the supplemental keys as a single subrequest + (deleteHashesSubRequest ? 1 : 0) + // we are sending all hashes changes as a single subrequest (revokeSubRequest ? 1 : 0) + // we are sending all revoke updates as a single subrequest (unrevokeSubRequest ? 1 : 0) + // we are sending all revoke updates as a single subrequest (deleteAllMessagesSubRequest ? 1 : 0) + // a delete_all sub request is a single subrequest @@ -221,7 +225,6 @@ class GroupSyncJob extends PersistedJob { // return await so we catch exceptions in here return await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk: thisJobDestination, - supplementalKeysSubRequest: [], extraStoreRequests: [], }); diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 74a5b97771..92e997806e 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -209,7 +209,6 @@ const initNewGroupInWrapper = createAsyncThunk( const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementalKeysSubRequest: [], extraStoreRequests, }); if (result !== RunJobResult.Success) { @@ -499,7 +498,7 @@ async function handleWithHistoryMembers({ } const encryptedSupplementKeys = withHistory.length ? await MetaGroupWrapperActions.generateSupplementKeys(groupPk, withHistory) - : []; + : null; return encryptedSupplementKeys; } @@ -831,7 +830,6 @@ async function handleMemberRemovedFromUI({ // revoked pubkeys, update messages, and libsession groups config in a single batch call const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementalKeysSubRequest: [], extraStoreRequests, }); if (sequenceResult !== RunJobResult.Success) { @@ -910,7 +908,6 @@ async function handleNameChangeFromUI({ const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementalKeysSubRequest: [], extraStoreRequests, }); @@ -1030,7 +1027,6 @@ const triggerFakeAvatarUpdate = createAsyncThunk( const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementalKeysSubRequest: [], extraStoreRequests, }); if (!batchResult) { diff --git a/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts b/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts index f8f036fb24..a6b4b8eaca 100644 --- a/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts +++ b/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts @@ -55,7 +55,7 @@ describe('ExpireRequest', () => { throw Error('nothing was returned when building the request'); } - const signedReq = await request.buildAndSignParameters(); + const signedReq = await request.build(); expect(signedReq, "method should be 'expire'").to.have.property('method', 'expire'); expect(signedReq.params.pubkey, 'should have a matching pubkey').to.equal(ourNumber); @@ -83,7 +83,7 @@ describe('ExpireRequest', () => { if (!request) { throw Error('nothing was returned when building the request'); } - const signedReq = await request.buildAndSignParameters(); + const signedReq = await request.build(); expect(signedReq, "method should be 'expire'").to.have.property('method', 'expire'); expect(signedReq.params.pubkey, 'should have a matching pubkey').to.equal(ourNumber); @@ -111,7 +111,7 @@ describe('ExpireRequest', () => { if (!request) { throw Error('nothing was returned when building the request'); } - const signedReq = await request.buildAndSignParameters(); + const signedReq = await request.build(); expect(signedReq, "method should be 'expire'").to.have.property('method', 'expire'); expect(signedReq.params.pubkey, 'should have a matching pubkey').to.equal(ourNumber); diff --git a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts index fc4e131d1c..15c5f38b05 100644 --- a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts +++ b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts @@ -52,7 +52,7 @@ describe('GetExpiriesRequest', () => { it('builds a valid request given the messageHashes and valid timestamp for now', async () => { const unsigned = new GetExpiriesFromNodeSubRequest(props); - const request = await unsigned.buildAndSignParameters(); + const request = await unsigned.build(); expect(request, 'should not return null').to.not.be.null; expect(request, 'should not return undefined').to.not.be.undefined; @@ -77,7 +77,7 @@ describe('GetExpiriesRequest', () => { let errorStr = 'fakeerror'; try { const unsigned = new GetExpiriesFromNodeSubRequest(props); - const request = await unsigned.buildAndSignParameters(); + const request = await unsigned.build(); if (request) { throw new Error('we should not have been able to build a request'); } @@ -93,7 +93,7 @@ describe('GetExpiriesRequest', () => { const unsigned = new GetExpiriesFromNodeSubRequest(props); try { - const request = await unsigned.buildAndSignParameters(); + const request = await unsigned.build(); if (request) { throw new Error('should not be able to build the request'); } diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index d05a6870e7..068fdf4527 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -275,7 +275,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementalKeysSubRequest: [], extraStoreRequests: [], }); expect(result).to.be.eq(RunJobResult.Success); @@ -299,7 +298,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { }); const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementalKeysSubRequest: [], extraStoreRequests: [], }); @@ -370,7 +368,6 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { ]); const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, - supplementalKeysSubRequest: [], extraStoreRequests: [], }); From a9122be2f1c43af19fe5ace471b2f28c4bf99592 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 17 Jun 2024 13:39:28 +1000 Subject: [PATCH 128/302] fix: clean up sending pipeline with a single array of requests --- ts/session/apis/snode_api/SNodeAPI.ts | 14 +- .../apis/snode_api/SnodeRequestTypes.ts | 160 +++++++++++++++--- .../factories/StoreGroupRequestFactory.ts | 5 + .../snode_api/signature/groupSignature.ts | 2 +- .../conversations/ConversationController.ts | 1 + ts/session/sending/MessageSender.ts | 150 ++++++++-------- .../jobs/GroupPendingRemovalsJob.ts | 11 +- .../utils/job_runners/jobs/GroupSyncJob.ts | 20 ++- .../utils/job_runners/jobs/UserSyncJob.ts | 6 +- 9 files changed, 253 insertions(+), 116 deletions(-) diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 10a9795419..257f57726b 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -176,13 +176,13 @@ const networkDeleteMessageOurSwarm = async ( try { const success = await pRetry( async () => { - const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.pubkey); + const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.destination); const ret = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [request], snodeToMakeRequestTo, 10000, - request.pubkey, + request.destination, false ); @@ -190,7 +190,7 @@ const networkDeleteMessageOurSwarm = async ( throw new Error( `networkDeleteMessageOurSwarm: Empty response got for ${request.method} on snode ${ed25519Str( snodeToMakeRequestTo.pubkey_ed25519 - )} about pk: ${ed25519Str(request.pubkey)}` + )} about pk: ${ed25519Str(request.destination)}` ); } @@ -243,7 +243,7 @@ const networkDeleteMessageOurSwarm = async ( const responseHashes = snodeJson.deleted as Array; const signatureSnode = snodeJson.signature as string; // The signature looks like ( PUBKEY_HEX || RMSG[0] || ... || RMSG[N] || DMSG[0] || ... || DMSG[M] ) - const dataToVerify = `${request.pubkey}${messageHashesArr.join( + const dataToVerify = `${request.destination}${messageHashesArr.join( '' )}${responseHashes.join('')}`; const dataToVerifyUtf8 = StringUtils.encode(dataToVerify, 'utf8'); @@ -325,13 +325,13 @@ const networkDeleteMessagesForGroup = async ( await pRetry( async () => { - const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.pubkey); + const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.destination); const ret = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [request], snodeToMakeRequestTo, 10000, - request.pubkey, + request.destination, false ); @@ -339,7 +339,7 @@ const networkDeleteMessagesForGroup = async ( throw new Error( `networkDeleteMessagesForGroup: Empty response got for ${request.method} on snode ${ed25519Str( snodeToMakeRequestTo.pubkey_ed25519 - )} about pk: ${ed25519Str(request.pubkey)}` + )} about pk: ${ed25519Str(request.destination)}` ); } }, diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index b4e6aeef60..e174c6aa8f 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -30,9 +30,22 @@ import { TTL_DEFAULT } from '../../constants'; type WithMaxSize = { max_size?: number }; export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; +/** + * This is the base sub request class that every other type of request has to extend. + */ abstract class SnodeAPISubRequest { public abstract method: string; + public abstract loggingId(): string; + public abstract getDestination(): PubkeyType | GroupPubkeyType | ''; + /** + * When batch sending an array of requests, we will sort them by this number (the smallest will be put in front and the largest at the end). + * This is needed for sending and polling for 03-group keys for instance. + */ + + public requestOrder() { + return 0; + } } /** @@ -69,6 +82,10 @@ export class RetrieveLegacyClosedGroupSubRequest extends SnodeAPISubRequest { }; } + public getDestination() { + return this.legacyGroupPk; + } + public loggingId(): string { return `${this.method}-${SnodeNamespace.toRole(this.namespace)}`; } @@ -141,6 +158,10 @@ export class RetrieveUserSubRequest extends SnodeAPISubRequest { }; } + public getDestination() { + return UserUtils.getOurPubKeyStrFromCache(); + } + public loggingId(): string { return `${this.method}-${SnodeNamespace.toRole(this.namespace)}`; } @@ -154,7 +175,7 @@ export class RetrieveGroupSubRequest extends SnodeAPISubRequest { public readonly last_hash: string; public readonly max_size: number | undefined; public readonly namespace: SnodeNamespacesGroup; - public readonly groupDetailsNeededForSignature: GroupDetailsNeededForSignature | null; + public readonly groupDetailsNeededForSignature: GroupDetailsNeededForSignature; constructor({ last_hash, @@ -170,6 +191,9 @@ export class RetrieveGroupSubRequest extends SnodeAPISubRequest { this.last_hash = last_hash; this.max_size = max_size; this.namespace = namespace; + if (isEmpty(groupDetailsNeededForSignature)) { + throw new Error('groupDetailsNeededForSignature is required'); + } this.groupDetailsNeededForSignature = groupDetailsNeededForSignature; } @@ -196,9 +220,22 @@ export class RetrieveGroupSubRequest extends SnodeAPISubRequest { }; } + public getDestination() { + return this.groupDetailsNeededForSignature.pubkeyHex; + } + public loggingId(): string { return `${this.method}-${SnodeNamespace.toRole(this.namespace)}`; } + + public override requestOrder() { + if (this.namespace === SnodeNamespaces.ClosedGroupKeys) { + // we want to retrieve the groups keys last + return 10; + } + + return super.requestOrder(); + } } export class OnsResolveSubRequest extends SnodeAPISubRequest { @@ -226,6 +263,10 @@ export class OnsResolveSubRequest extends SnodeAPISubRequest { public loggingId(): string { return `${this.method}`; } + + public getDestination() { + return '' as const; + } } export class GetServiceNodesSubRequest extends SnodeAPISubRequest { @@ -257,22 +298,26 @@ export class GetServiceNodesSubRequest extends SnodeAPISubRequest { public loggingId(): string { return `${this.method}`; } + + public getDestination() { + return '' as const; + } } export class SwarmForSubRequest extends SnodeAPISubRequest { public method = 'get_swarm' as const; - public readonly pubkey; + public readonly destination; constructor(pubkey: PubkeyType | GroupPubkeyType) { super(); - this.pubkey = pubkey; + this.destination = pubkey; } public build() { return { method: this.method, params: { - pubkey: this.pubkey, + pubkey: this.destination, params: { active_only: true, fields: { @@ -289,6 +334,10 @@ export class SwarmForSubRequest extends SnodeAPISubRequest { public loggingId(): string { return `${this.method}`; } + + public getDestination() { + return this.destination; + } } export class NetworkTimeSubRequest extends SnodeAPISubRequest { @@ -304,10 +353,14 @@ export class NetworkTimeSubRequest extends SnodeAPISubRequest { public loggingId(): string { return `${this.method}`; } + + public getDestination() { + return '' as const; + } } abstract class AbstractRevokeSubRequest extends SnodeAPISubRequest { - public readonly groupPk: GroupPubkeyType; + public readonly destination: GroupPubkeyType; public readonly timestamp: number; public readonly revokeTokenHex: Array; protected readonly adminSecretKey: Uint8Array; @@ -319,7 +372,7 @@ abstract class AbstractRevokeSubRequest extends SnodeAPISubRequest { secretKey, }: WithGroupPubkey & WithTimestamp & WithSecretKey & { revokeTokenHex: Array }) { super(); - this.groupPk = groupPk; + this.destination = groupPk; this.timestamp = timestamp; this.revokeTokenHex = revokeTokenHex; this.adminSecretKey = secretKey; @@ -344,7 +397,11 @@ abstract class AbstractRevokeSubRequest extends SnodeAPISubRequest { } public loggingId(): string { - return `${this.method}-${ed25519Str(this.groupPk)}`; + return `${this.method}-${ed25519Str(this.destination)}`; + } + + public getDestination() { + return this.destination; } } @@ -356,7 +413,7 @@ export class SubaccountRevokeSubRequest extends AbstractRevokeSubRequest { return { method: this.method, params: { - pubkey: this.groupPk, + pubkey: this.destination, signature, revoke: this.revokeTokenHex, timestamp: this.timestamp, @@ -377,13 +434,17 @@ export class SubaccountUnrevokeSubRequest extends AbstractRevokeSubRequest { return { method: this.method, params: { - pubkey: this.groupPk, + pubkey: this.destination, signature, unrevoke: this.revokeTokenHex, timestamp: this.timestamp, }, }; } + + public getDestination() { + return this.destination; + } } /** @@ -438,6 +499,10 @@ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { public loggingId(): string { return `${this.method}-us`; } + + public getDestination() { + return UserUtils.getOurPubKeyStrFromCache(); + } } // todo: to use where delete_all is currently manually called @@ -472,6 +537,10 @@ export class DeleteAllFromUserNodeSubRequest extends SnodeAPISubRequest { public loggingId(): string { return `${this.method}-${this.namespace}`; } + + public getDestination() { + return UserUtils.getOurPubKeyStrFromCache(); + } } /** @@ -481,11 +550,11 @@ export class DeleteAllFromGroupMsgNodeSubRequest extends SnodeAPISubRequest { public method = 'delete_all' as const; public readonly namespace = SnodeNamespaces.ClosedGroupMessages; public readonly adminSecretKey: Uint8Array; - public readonly groupPk: GroupPubkeyType; + public readonly destination: GroupPubkeyType; constructor(args: WithGroupPubkey & WithSecretKey) { super(); - this.groupPk = args.groupPk; + this.destination = args.groupPk; this.adminSecretKey = args.secretKey; if (isEmpty(this.adminSecretKey)) { throw new Error('DeleteAllFromGroupMsgNodeSubRequest needs an adminSecretKey'); @@ -496,7 +565,7 @@ export class DeleteAllFromGroupMsgNodeSubRequest extends SnodeAPISubRequest { const signDetails = await SnodeGroupSignature.getSnodeGroupSignature({ method: this.method, namespace: this.namespace, - group: { authData: null, pubkeyHex: this.groupPk, secretKey: this.adminSecretKey }, + group: { authData: null, pubkeyHex: this.destination, secretKey: this.adminSecretKey }, }); if (!signDetails) { @@ -514,19 +583,23 @@ export class DeleteAllFromGroupMsgNodeSubRequest extends SnodeAPISubRequest { } public loggingId(): string { - return `${this.method}-${ed25519Str(this.groupPk)}-${this.namespace}`; + return `${this.method}-${ed25519Str(this.destination)}-${this.namespace}`; + } + + public getDestination() { + return this.destination; } } export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { public method = 'delete' as const; public readonly messageHashes: Array; - public readonly pubkey: PubkeyType; + public readonly destination: PubkeyType; constructor(args: WithMessagesHashes) { super(); this.messageHashes = args.messagesHashes; - this.pubkey = UserUtils.getOurPubKeyStrFromCache(); + this.destination = UserUtils.getOurPubKeyStrFromCache(); if (this.messageHashes.length === 0) { window.log.warn(`DeleteHashesFromUserNodeSubRequest given empty list of messageHashes`); @@ -538,7 +611,7 @@ export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { const signResult = await SnodeSignature.getSnodeSignatureByHashesParams({ method: this.method, messagesHashes: this.messageHashes, - pubkey: this.pubkey, + pubkey: this.destination, }); if (!signResult) { @@ -562,18 +635,22 @@ export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { public loggingId(): string { return `${this.method}-us`; } + + public getDestination() { + return this.destination; + } } export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { public method = 'delete' as const; public readonly messageHashes: Array; - public readonly pubkey: GroupPubkeyType; + public readonly destination: GroupPubkeyType; public readonly secretKey: Uint8Array; constructor(args: WithMessagesHashes & WithGroupPubkey & WithSecretKey) { super(); this.messageHashes = args.messagesHashes; - this.pubkey = args.groupPk; + this.destination = args.groupPk; this.secretKey = args.secretKey; if (!this.secretKey || isEmpty(this.secretKey)) { throw new Error('DeleteHashesFromGroupNodeSubRequest needs a secretKey'); @@ -581,7 +658,7 @@ export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { if (this.messageHashes.length === 0) { window.log.warn( - `DeleteHashesFromGroupNodeSubRequest given empty list of messageHashes for ${ed25519Str(this.pubkey)}` + `DeleteHashesFromGroupNodeSubRequest given empty list of messageHashes for ${ed25519Str(this.destination)}` ); throw new Error('DeleteHashesFromGroupNodeSubRequest given empty list of messageHashes'); @@ -593,8 +670,8 @@ export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { const signResult = await SnodeGroupSignature.getGroupSignatureByHashesParams({ method: this.method, messagesHashes: this.messageHashes, - groupPk: this.pubkey, - group: { authData: null, pubkeyHex: this.pubkey, secretKey: this.secretKey }, + groupPk: this.destination, + group: { authData: null, pubkeyHex: this.destination, secretKey: this.secretKey }, }); return { @@ -608,7 +685,11 @@ export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { } public loggingId(): string { - return `${this.method}-${ed25519Str(this.pubkey)}`; + return `${this.method}-${ed25519Str(this.destination)}`; + } + + public getDestination() { + return this.destination; } } @@ -667,6 +748,10 @@ export class UpdateExpiryOnNodeUserSubRequest extends SnodeAPISubRequest { public loggingId(): string { return `${this.method}-us`; } + + public getDestination() { + return UserUtils.getOurPubKeyStrFromCache(); + } } export class UpdateExpiryOnNodeGroupSubRequest extends SnodeAPISubRequest { @@ -734,6 +819,10 @@ export class UpdateExpiryOnNodeGroupSubRequest extends SnodeAPISubRequest { public loggingId(): string { return `${this.method}-${ed25519Str(this.groupDetailsNeededForSignature.pubkeyHex)}`; } + + public getDestination() { + return this.groupDetailsNeededForSignature.pubkeyHex; + } } type WithCreatedAtNetworkTimestamp = { createdAtNetworkTimestamp: number }; @@ -817,6 +906,10 @@ export class StoreGroupMessageSubRequest extends SnodeAPISubRequest { this.namespace )}`; } + + public getDestination() { + return this.destination; + } } abstract class StoreGroupConfigSubRequest< @@ -883,11 +976,22 @@ abstract class StoreGroupConfigSubRequest< }; } + public getDestination() { + return this.destination; + } + public loggingId(): string { return `${this.method}-${ed25519Str(this.destination)}-${SnodeNamespace.toRole( this.namespace )}`; } + + public requestOrder(): number { + if (this.namespace === SnodeNamespaces.ClosedGroupKeys) { + return 10; + } + return super.requestOrder(); + } } export class StoreGroupInfoSubRequest extends StoreGroupConfigSubRequest { @@ -982,6 +1086,10 @@ export class StoreUserConfigSubRequest extends SnodeAPISubRequest { this.namespace )}`; } + + public getDestination() { + return this.destination; + } } /** @@ -1050,6 +1158,10 @@ export class StoreUserMessageSubRequest extends SnodeAPISubRequest { this.namespace )}`; } + + public getDestination() { + return this.destination; + } } /** @@ -1110,6 +1222,10 @@ export class StoreLegacyGroupMessageSubRequest extends SnodeAPISubRequest { this.namespace )}`; } + + public getDestination() { + return this.destination; + } } /** diff --git a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts index 5289490b82..84513ee766 100644 --- a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts +++ b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts @@ -113,6 +113,11 @@ function makeStoreGroupKeysSubRequest({ }); } +/** + * Make the requests needed to store that group config details. + * Note: the groupKeys request is always returned first, as it needs to be stored first on the swarm. + * This is to avoid a race condition where some clients get a groupInfo encrypted with a new key, when the new groupKeys was not stored yet. + */ function makeStoreGroupConfigSubRequest({ group, pendingConfigData, diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 9512d11385..efee04473a 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -151,7 +151,7 @@ async function getSnodeGroupSignature({ SigResultSubAccount | SigResultAdmin > { if (!group) { - throw new Error(`getSnodeGroupSignature: did not find group in wrapper`); + throw new Error(`getSnodeGroupSignature: we need GroupDetailsNeededForSignature`); } const { pubkeyHex: groupPk, secretKey, authData } = group; diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index efcb20ab24..4884810a07 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -647,6 +647,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM const results = await MessageSender.sendUnencryptedDataToSnode({ destination: groupPk, messages: [ourLeavingNotificationMessage, ourLeavingMessage], + method: 'sequence', }); if (results?.[0].code !== 200) { diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 243928c990..f2ea279363 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -2,7 +2,7 @@ import { AbortController } from 'abort-controller'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import { compact, isArray, isEmpty, isNumber, isString } from 'lodash'; +import { isArray, isEmpty, isNumber, isString } from 'lodash'; import pRetry from 'p-retry'; import { Data, SeenMessageHashes } from '../../data/data'; import { SignalService } from '../../protobuf'; @@ -29,6 +29,8 @@ import { StoreLegacyGroupMessageSubRequest, StoreUserConfigSubRequest, StoreUserMessageSubRequest, + SubaccountRevokeSubRequest, + SubaccountUnrevokeSubRequest, } from '../apis/snode_api/SnodeRequestTypes'; import { BatchRequests } from '../apis/snode_api/batchRequest'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; @@ -40,7 +42,6 @@ import { } from '../apis/snode_api/signature/groupSignature'; import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/signature/snodeSignatures'; import { SnodePool } from '../apis/snode_api/snodePool'; -import { WithRevokeSubRequest } from '../apis/snode_api/types'; import { TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; import { addMessagePadding } from '../crypto/BufferPadding'; @@ -86,12 +87,10 @@ type StoreRequest03 = | StoreGroupRevokedRetrievableSubRequest | StoreGroupMessageSubRequest; -type PubkeyToRequestType = T extends PubkeyType +type StoreRequestPerPubkey = T extends PubkeyType ? StoreRequest05 : StoreRequest03; -type StoreRequestsPerPubkey = Array>; - type EncryptedMessageDetails = Pick< EncryptAndWrapMessageResults, | 'namespace' @@ -186,17 +185,17 @@ async function messageToRequest({ }: { destination: T; encryptedAndWrapped: EncryptedMessageDetails; -}): Promise> { +}): Promise> { if (PubKey.is03Pubkey(destination)) { const req = await messageToRequest03({ destination, encryptedAndWrapped }); - return req as PubkeyToRequestType; // this is mandatory, sadly + return req as StoreRequestPerPubkey; // this is mandatory, sadly } if (PubKey.is05Pubkey(destination)) { const req = await messageToRequest05({ destination, encryptedAndWrapped, }); - return req as PubkeyToRequestType; // this is mandatory, sadly + return req as StoreRequestPerPubkey; // this is mandatory, sadly } throw new Error('messageToRequest: unhandled case'); @@ -208,8 +207,8 @@ async function messagesToRequests({ }: { destination: T; encryptedAndWrappedArr: Array; -}): Promise>> { - const subRequests: Array> = []; +}): Promise>> { + const subRequests: Array> = []; for (let index = 0; index < encryptedAndWrappedArr.length; index++) { const encryptedAndWrapped = encryptedAndWrappedArr[index]; // eslint-disable-next-line no-await-in-loop @@ -366,42 +365,59 @@ type DeleteHashesRequestPerPubkey = T ex ? DeleteHashesFromUserNodeSubRequest : DeleteHashesFromGroupNodeSubRequest; -async function sendMessagesDataToSnode( - storeRequests: StoreRequestsPerPubkey, - asssociatedWith: T, - { - revokeSubRequest, - unrevokeSubRequest, - deleteHashesSubRequest, - deleteAllMessagesSubRequest, - }: WithRevokeSubRequest & { - deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest; - deleteHashesSubRequest?: DeleteHashesRequestPerPubkey; - }, - method: MethodBatchType -): Promise { +/** + * Make sure that all the subrequests have been given in their sendingOrder, or throw an error. + */ +function assertRequestsAreSorted({ subRequests }: { subRequests: Array }) { + const allSorted = subRequests.every((current, index) => { + const currentOrder = current.requestOrder(); + const previousOrder = + index > 0 ? subRequests[index - 1].requestOrder() : Number.MIN_SAFE_INTEGER; + return currentOrder >= previousOrder; + }); + if (!allSorted) { + throw new Error( + 'assertRequestsAreSorted: Some sub requests are not correctly sorted by requestOrder().' + ); + } +} + +type SortedSubRequestsType = Array< + | StoreRequestPerPubkey + | DeleteHashesRequestPerPubkey + | DeleteAllFromGroupMsgNodeSubRequest + | SubaccountRevokeSubRequest + | SubaccountUnrevokeSubRequest +>; + +async function sendMessagesDataToSnode({ + asssociatedWith, + sortedSubRequests, + method, +}: { + sortedSubRequests: SortedSubRequestsType; + asssociatedWith: T; + method: MethodBatchType; +}): Promise { if (!asssociatedWith) { throw new Error('sendMessagesDataToSnode first subrequest pubkey needs to be set'); } - if (storeRequests.some(m => m.destination !== asssociatedWith)) { + if (sortedSubRequests.some(m => m.destination !== asssociatedWith)) { throw new Error( 'sendMessagesDataToSnode tried to send batchrequest containing subrequest not for the right destination' ); } - const rawRequests = compact([ - ...storeRequests, - deleteHashesSubRequest, - revokeSubRequest, - unrevokeSubRequest, - deleteAllMessagesSubRequest, - ]); + // Note: we want to make sure the caller sorted those subrequests, as it might try to handle the batch result based on the index. + // If we sorted the requests here, we'd need to make sure the caller knows that the results are not in order he sent them. + assertRequestsAreSorted({ subRequests: sortedSubRequests }); + const targetNode = await SnodePool.getNodeFromSwarmOrThrow(asssociatedWith); try { - const storeResults = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - rawRequests, + const responses = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( + sortedSubRequests, targetNode, 6000, asssociatedWith, @@ -409,20 +425,20 @@ async function sendMessagesDataToSnode( method ); - if (!storeResults || !storeResults.length) { + if (!responses || !responses.length) { window?.log?.warn( `SessionSnodeAPI::doUnsignedSnodeBatchRequestNoRetries on ${targetNode.ip}:${targetNode.port} returned falsish value`, - storeResults + responses ); throw new Error('doUnsignedSnodeBatchRequestNoRetries: Invalid result'); } await handleBatchResultWithSubRequests({ - batchResult: storeResults, - subRequests: rawRequests, + batchResult: responses, + subRequests: sortedSubRequests, destination: asssociatedWith, }); - const firstResult = storeResults[0]; + const firstResult = responses[0]; if (firstResult.code !== 200) { window?.log?.warn( @@ -434,15 +450,15 @@ async function sendMessagesDataToSnode( GetNetworkTime.handleTimestampOffsetFromNetwork('store', firstResult.body.t); - if (!isEmpty(storeResults)) { + if (!isEmpty(responses)) { window?.log?.info( - `sendMessagesDataToSnode - Successfully stored messages to ${ed25519Str( + `sendMessagesDataToSnode - Successfully sent requests to ${ed25519Str( asssociatedWith - )} via ${ed25519Str(targetNode.pubkey_ed25519)} to namespaces: ${storeRequests.map(m => SnodeNamespace.toRole(m.namespace)).join(', ')}` + )} via ${ed25519Str(targetNode.pubkey_ed25519)} (requests: ${sortedSubRequests.map(m => m.loggingId()).join(', ')})` ); } - return storeResults; + return responses; } catch (e) { const snodeStr = targetNode ? `${ed25519Str(targetNode.pubkey_ed25519)}` : 'null'; window?.log?.warn( @@ -573,41 +589,29 @@ async function encryptMessagesAndWrap( /** * Send an array of preencrypted data to the corresponding swarm. - * Warning: - * This does not handle result of messages and marking messages as read, syncing them currently. - * For this, use the `MessageQueue.sendSingleMessage()` for now. + * Note: also handles the result of each subrequests with `handleBatchResultWithSubRequests` * * @param params the data to deposit * @param destination the pubkey we should deposit those message to - * @returns the hashes of successful deposit + * @returns the batch/sequence results if further processing is needed */ async function sendEncryptedDataToSnode({ destination, - storeRequests, - deleteHashesSubRequest, - revokeSubRequest, - unrevokeSubRequest, - deleteAllMessagesSubRequest, -}: WithRevokeSubRequest & { - storeRequests: StoreRequestsPerPubkey; // keeping those as an array because the order needs to be enforced for some (groupkeys for instance) + sortedSubRequests, + method, +}: { + sortedSubRequests: SortedSubRequestsType; // keeping those as an array because the order needs to be enforced for some (groupkeys for instance) destination: T; - deleteHashesSubRequest?: DeleteHashesRequestPerPubkey; - deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest; + method: MethodBatchType; }): Promise { try { const batchResults = await pRetry( async () => { - return MessageSender.sendMessagesDataToSnode( - storeRequests, - destination, - { - deleteHashesSubRequest, - revokeSubRequest, - unrevokeSubRequest, - deleteAllMessagesSubRequest, - }, - 'sequence' - ); + return MessageSender.sendMessagesDataToSnode({ + sortedSubRequests, + asssociatedWith: destination, + method, + }); }, { retries: 2, @@ -630,9 +634,7 @@ async function sendEncryptedDataToSnode( /** * Send an array of **not** preencrypted data to the corresponding swarm. - * WARNING: - * This does not handle result of messages and marking messages as read, syncing them currently. - * For this, use the `MessageQueue.sendSingleMessage()` for now. + * Note: the messages order is not changed when sending them, but if they are not correctly sorted an exception will be thrown. * * @param messages the data to deposit (after encryption) * @param destination the pubkey we should deposit those message to @@ -640,6 +642,7 @@ async function sendEncryptedDataToSnode( async function sendUnencryptedDataToSnode({ destination, messages, + method, }: { // keeping those as an array because the order needs to be enforced for some (groupkeys for instance) destination: T; @@ -648,6 +651,7 @@ async function sendUnencryptedDataToSnode; + method: MethodBatchType; }) { const rawMessages: Array = messages.map(m => { return { @@ -675,14 +679,15 @@ async function sendUnencryptedDataToSnode Date: Tue, 25 Jun 2024 14:54:50 +1000 Subject: [PATCH 129/302] chore: matched designs better for the NoticeBanner --- ts/components/NoticeBanner.tsx | 2 +- ts/components/conversation/SessionConversation.tsx | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx index 592f113dbf..4e257ee49b 100644 --- a/ts/components/NoticeBanner.tsx +++ b/ts/components/NoticeBanner.tsx @@ -19,7 +19,7 @@ const StyledNoticeBanner = styled(Flex)` `; const StyledText = styled.span` - margin-right: var(--margins-lg); + margin-right: var(--margins-xl); `; type NoticeBannerProps = { diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index 13c16c0d4a..60fe629c0b 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -671,6 +671,7 @@ function OutdatedLegacyGroupBanner(props: { selectedConversation: Pick; }) { const { selectedConversation } = props; + // const dispatch = useDispatch(); const isLegacyGroup = !selectedConversation.isPrivate && @@ -681,6 +682,7 @@ function OutdatedLegacyGroupBanner(props: { { + // showLinkVisitWarningDialog('', dispatch); throw new Error('TODO'); // fixme audric }} icon="externalLink" From 102e05d924547ef922b55979c1bbc0bcb32db206 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 25 Jun 2024 16:43:43 +1000 Subject: [PATCH 130/302] fix: small padding inconsistency between TextNotification usage --- .../conversation/SubtleNotification.tsx | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index ca7c55adc5..be4e50bf83 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -29,11 +29,12 @@ import { import { LocalizerKeys } from '../../types/LocalizerKeys'; import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; -const Container = styled.div` +const Container = styled.div<{ noExtraPadding: boolean }>` display: flex; flex-direction: row; justify-content: center; background-color: var(--background-secondary-color); + padding: ${props => (props.noExtraPadding ? '' : 'var(--margins-lg)')}; `; const TextInner = styled.div` @@ -42,9 +43,17 @@ const TextInner = styled.div` max-width: 390px; `; -function TextNotification({ html, dataTestId }: { html: string; dataTestId: SessionDataTestId }) { +function TextNotification({ + html, + dataTestId, + noExtraPadding, +}: { + html: string; + dataTestId: SessionDataTestId; + noExtraPadding: boolean; +}) { return ( - + @@ -73,6 +82,7 @@ const ConversationRequestExplanation = () => { ); }; @@ -93,6 +103,7 @@ const GroupRequestExplanation = () => { ); }; @@ -123,7 +134,13 @@ export const InvitedToGroupControlMessage = () => { ? window.i18n('userInvitedYouToGroup', [adminNameInvitedUs, groupName]) : window.i18n('youWereInvitedToGroup', [groupName]); - return ; + return ( + + ); }; export const NoMessageInConversation = () => { @@ -168,6 +185,10 @@ export const NoMessageInConversation = () => { } return ( - + ); }; From d2af48f6fc9515378c6ffeee9c949a0689fe228e Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 25 Jun 2024 16:44:27 +1000 Subject: [PATCH 131/302] fix: groupKeys needs to be sent first, so with an negative requestOrder --- ts/session/apis/snode_api/SnodeRequestTypes.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index e174c6aa8f..c200a089c7 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -988,7 +988,8 @@ abstract class StoreGroupConfigSubRequest< public requestOrder(): number { if (this.namespace === SnodeNamespaces.ClosedGroupKeys) { - return 10; + // -10 means that we need this request to be sent before something with an order of 0 for instance + return -10; } return super.requestOrder(); } From 95cd940948f671381217d217a386a94a0af19d1d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 25 Jun 2024 16:45:00 +1000 Subject: [PATCH 132/302] fix: make the UI more responsive to GroupInvite retries --- .../utils/job_runners/jobs/GroupInviteJob.ts | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 1fdafd537a..b24687c93f 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -51,7 +51,18 @@ async function addJob({ groupPk, member }: JobExtraArgs) { nextAttemptTimestamp: Date.now(), }); window.log.debug(`addGroupInviteJob: adding group invite for ${groupPk}:${member} `); + try { + updateFailedStateForMember(groupPk, member, false); + + // we have to reset the error state so that the UI shows "sending" even if the last try failed. + await MetaGroupWrapperActions.memberSetInvited(groupPk, member, false); + } catch (e) { + window.log.warn('GroupInviteJob memberSetInvited (before) failed with', e.message); + } + window?.inboxStore?.dispatch(groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk })); + await runners.groupInviteJobRunner.addJob(groupInviteJob); + window?.inboxStore?.dispatch( groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: true }) ); @@ -154,17 +165,19 @@ class GroupInviteJob extends PersistedJob { if (storedAt !== null) { failed = false; } - } finally { - window?.inboxStore?.dispatch( - groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: false }) + } catch (e) { + window.log.warn( + `${jobType} with groupPk:"${groupPk}" member: ${member} id:"${identifier}" failed with ${e.message}` ); - - updateFailedStateForMember(groupPk, member, failed); + } finally { try { await MetaGroupWrapperActions.memberSetInvited(groupPk, member, failed); } catch (e) { window.log.warn('GroupInviteJob memberSetInvited failed with', e.message); } + + updateFailedStateForMember(groupPk, member, failed); + window?.inboxStore?.dispatch(groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk })); } // return true so this job is marked as a success and we don't need to retry it return RunJobResult.Success; From 9963287193f960e6828141927f902051011d1bb0 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 5 Jul 2024 11:08:36 +1000 Subject: [PATCH 133/302] fix: a few issues with group invite job/refresh state --- package.json | 4 +- patches/@types+backbone+1.4.2.patch | 2 +- ts/components/MemberListItem.tsx | 26 ++++++---- .../dialog/UpdateGroupMembersDialog.tsx | 49 +------------------ ts/receiver/configMessage.ts | 12 +++-- ts/session/apis/snode_api/onions.ts | 43 +++++----------- ts/session/apis/snode_api/sessionRpc.ts | 2 +- ts/session/utils/Toast.tsx | 17 +++++-- .../utils/job_runners/jobs/GroupInviteJob.ts | 31 ++++++++---- .../utils/job_runners/jobs/GroupSyncJob.ts | 16 ++++-- .../utils/libsession/libsession_utils.ts | 4 +- 11 files changed, 89 insertions(+), 117 deletions(-) diff --git a/package.json b/package.json index ca047dd094..5823f6b4ec 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "sedtoAppImage": "sed -i 's/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/\"target\": \"AppImage\"/g' package.json", "sedtoDeb": "sed -i 's/\"target\": \"AppImage\"/\"target\": \\[\"deb\", \"rpm\", \"freebsd\"\\]/g' package.json", "ready": "yarn build-everything && yarn lint-full && yarn test", - "postinstall": "yarn patch-package", + "postinstall": "yarn patch-package && yarn electron-builder install-app-deps", "update-git-info": "node ./build/updateLocalConfig.js", "worker:utils": "webpack --config=./utils.worker.config.js", "worker:libsession": "rimraf 'ts/webworker/workers/node/libsession/*.node' && webpack --config=./libsession.worker.config.js", @@ -95,7 +95,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "link:../libsession-util-nodejs", + "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.19/libsession_util_nodejs-v0.3.19.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/patches/@types+backbone+1.4.2.patch b/patches/@types+backbone+1.4.2.patch index 6491b4554e..e4aab4d54c 100644 --- a/patches/@types+backbone+1.4.2.patch +++ b/patches/@types+backbone+1.4.2.patch @@ -32,4 +32,4 @@ index da53a62..4db8b56 100644 + id: string; idAttribute: string; validationError: any; - + diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index f92440f5fc..8d01c9c0fc 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -145,14 +145,18 @@ const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Gro const groupPromotionSent = useMemberPromotionSent(pubkey, groupPk); const groupInviteSending = useMemberInviteSending(groupPk, pubkey); - const statusText = groupPromotionFailed - ? window.i18n('promotionFailed') - : groupInviteFailed - ? window.i18n('inviteFailed') - : groupInviteSending - ? window.i18n('inviteSending') - : groupPromotionSending - ? window.i18n('promotionSending') + /** + * Note: Keep the "sending" checks here first, as we might be "sending" when we've previously failed. + * If we were to have the "failed" checks first, we'd hide the "sending" state when we are retrying. + */ + const statusText = groupInviteSending + ? window.i18n('inviteSending') + : groupPromotionSending + ? window.i18n('promotionSending') + : groupPromotionFailed + ? window.i18n('promotionFailed') + : groupInviteFailed + ? window.i18n('inviteFailed') : groupInviteSent ? window.i18n('inviteSent') : groupPromotionSent @@ -165,7 +169,7 @@ const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Gro return ( {statusText} @@ -196,6 +200,10 @@ const ResendInviteButton = ({ pubkey: PubkeyType; groupPk: GroupPubkeyType; }) => { + const inviteFailed = useMemberInviteFailed(pubkey, groupPk); + if (!inviteFailed) { + return null; + } return ( { - const weAreAdmin = useWeAreAdmin(convoId); - const zombies = useZombies(convoId); - - function onZombieClicked() { - if (!weAreAdmin) { - ToastUtils.pushOnlyAdminCanRemove(); - } - } - if (!zombies?.length) { - return null; - } - - const zombieElements = zombies.map((zombie: string) => { - const isSelected = weAreAdmin || false; // && !member.checkmarked; - return ( - - ); - }); - return ( - <> - - {weAreAdmin && ( - - )} - {zombieElements} - - ); -}; - async function onSubmit(convoId: string, membersAfterUpdate: Array) { const convoFound = ConvoHub.use().get(convoId); if (!convoFound || !convoFound.isGroup()) { @@ -275,7 +231,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { return ( - {hasClosedGroupV2QAButtons() ? ( + {hasClosedGroupV2QAButtons() && weAreAdmin ? ( <> Also remove messages: { selectedMembers={membersToKeepWithUpdate} /> - {showNoMembersMessage &&

{window.i18n('noMembersInThisGroup')}

} diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index cad2b845f2..c00c3404d9 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -582,11 +582,13 @@ async function handleLegacyGroupUpdate(latestEnvelopeTimestamp: number) { toLeave.id ); const toLeaveFromDb = ConvoHub.use().get(toLeave.id); - // the wrapper told us that this group is not tracked, so even if we left/got kicked from it, remove it from the DB completely - await ConvoHub.use().deleteLegacyGroup(toLeaveFromDb.id, { - fromSyncMessage: true, - sendLeaveMessage: false, // this comes from the wrapper, so we must have left/got kicked from that group already and our device already handled it. - }); + if (PubKey.is05Pubkey(toLeaveFromDb.id)) { + // the wrapper told us that this group is not tracked, so even if we left/got kicked from it, remove it from the DB completely + await ConvoHub.use().deleteLegacyGroup(toLeaveFromDb.id, { + fromSyncMessage: true, + sendLeaveMessage: false, // this comes from the wrapper, so we must have left/got kicked from that group already and our device already handled it. + }); + } } for (let index = 0; index < legacyGroupsToJoinInDB.length; index++) { diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index 2fe7410d0d..30243aa359 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -1135,10 +1135,7 @@ function getPathString(pathObjArr: Array<{ ip: string; port: number }>): string return pathObjArr.map(node => `${node.ip}:${node.port}`).join(', '); } -/** - * If the fetch throws a retryable error we retry this call with a new path at most 3 times. If another error happens, we return it. If we have a result we just return it. - */ -async function lokiOnionFetchWithRetries({ +async function lokiOnionFetchNoRetries({ targetNode, associatedWith, body, @@ -1152,33 +1149,17 @@ async function lokiOnionFetchWithRetries({ allow401s: boolean; }): Promise { try { - const retriedResult = await pRetry( - async () => { - // Get a path excluding `targetNode`: - const path = await OnionPaths.getOnionPath({ toExclude: targetNode }); - const result = await sendOnionRequestSnodeDestNoRetries( - path, - targetNode, - headers, - body, - allow401s, - associatedWith - ); - return result; - }, - { - retries: 3, - factor: 1, - minTimeout: 100, - onFailedAttempt: e => { - window?.log?.warn( - `onionFetchRetryable attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left...` - ); - }, - } + // Get a path excluding `targetNode`: + const path = await OnionPaths.getOnionPath({ toExclude: targetNode }); + const result = await sendOnionRequestSnodeDestNoRetries( + path, + targetNode, + headers, + body, + allow401s, + associatedWith ); - - return retriedResult as SnodeResponse | undefined; + return result as SnodeResponse | undefined; } catch (e) { window?.log?.warn('onionFetchRetryable failed ', e.message); if (e?.errno === 'ENETUNREACH') { @@ -1197,7 +1178,7 @@ export const Onions = { sendOnionRequestHandlingSnodeEjectNoRetries, incrementBadSnodeCountOrDrop, decodeOnionResult, - lokiOnionFetchWithRetries, + lokiOnionFetchNoRetries, getPathString, sendOnionRequestSnodeDestNoRetries, processOnionResponse, diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index 82c6818b87..56d1b57463 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -54,7 +54,7 @@ async function doRequestNoRetries({ ? true : window.sessionFeatureFlags?.useOnionRequests; if (useOnionRequests && targetNode) { - const fetchResult = await Onions.lokiOnionFetchWithRetries({ + const fetchResult = await Onions.lokiOnionFetchNoRetries({ targetNode, body: fetchOptions.body, headers: fetchOptions.headers, diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx index 6c6225ff57..4793f93634 100644 --- a/ts/session/utils/Toast.tsx +++ b/ts/session/utils/Toast.tsx @@ -11,11 +11,18 @@ export function pushToastError(id: string, description: string) { }); } -export function pushToastWarning(id: string, description: string) { - toast.warning(, { - toastId: id, - updateId: id, - }); +export function pushToastWarning(id: string, description: string, onToastClick?: () => void) { + toast.warning( + , + { + toastId: id, + updateId: id, + } + ); } export function pushToastInfo( diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index b24687c93f..9fb8aba109 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -18,6 +18,8 @@ import { PersistedJob, RunJobResult, } from '../PersistedJob'; +import { LibSessionUtil } from '../../libsession/libsession_utils'; +import { showUpdateGroupMembersByConvoId } from '../../../../interactions/conversationInteractions'; const defaultMsBetweenRetries = 10000; const defaultMaxAttemps = 1; @@ -51,15 +53,9 @@ async function addJob({ groupPk, member }: JobExtraArgs) { nextAttemptTimestamp: Date.now(), }); window.log.debug(`addGroupInviteJob: adding group invite for ${groupPk}:${member} `); - try { - updateFailedStateForMember(groupPk, member, false); - // we have to reset the error state so that the UI shows "sending" even if the last try failed. - await MetaGroupWrapperActions.memberSetInvited(groupPk, member, false); - } catch (e) { - window.log.warn('GroupInviteJob memberSetInvited (before) failed with', e.message); - } window?.inboxStore?.dispatch(groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk })); + await LibSessionUtil.saveDumpsToDb(groupPk); await runners.groupInviteJobRunner.addJob(groupInviteJob); @@ -71,21 +67,27 @@ async function addJob({ groupPk, member }: JobExtraArgs) { function displayFailedInvitesForGroup(groupPk: GroupPubkeyType) { const thisGroupFailures = invitesFailed.get(groupPk); + if (!thisGroupFailures || thisGroupFailures.failedMembers.length === 0) { return; } + const onToastClick = () => { + void showUpdateGroupMembersByConvoId(groupPk); + }; const count = thisGroupFailures.failedMembers.length; switch (count) { case 1: ToastUtils.pushToastWarning( `invite-failed${groupPk}`, - window.i18n('groupInviteFailedOne', [...thisGroupFailures.failedMembers, groupPk]) + window.i18n('groupInviteFailedOne', [...thisGroupFailures.failedMembers, groupPk]), + onToastClick ); break; case 2: ToastUtils.pushToastWarning( `invite-failed${groupPk}`, - window.i18n('groupInviteFailedTwo', [...thisGroupFailures.failedMembers, groupPk]) + window.i18n('groupInviteFailedTwo', [...thisGroupFailures.failedMembers, groupPk]), + onToastClick ); break; default: @@ -95,7 +97,8 @@ function displayFailedInvitesForGroup(groupPk: GroupPubkeyType) { thisGroupFailures.failedMembers[0], `${thisGroupFailures.failedMembers.length - 1}`, groupPk, - ]) + ]), + onToastClick ); } // toast was displayed empty the list @@ -169,7 +172,11 @@ class GroupInviteJob extends PersistedJob { window.log.warn( `${jobType} with groupPk:"${groupPk}" member: ${member} id:"${identifier}" failed with ${e.message}` ); + failed = true; } finally { + window.log.info( + `${jobType} with groupPk:"${groupPk}" member: ${member} id:"${identifier}" finished. failed:${failed}` + ); try { await MetaGroupWrapperActions.memberSetInvited(groupPk, member, failed); } catch (e) { @@ -177,7 +184,11 @@ class GroupInviteJob extends PersistedJob { } updateFailedStateForMember(groupPk, member, failed); + window?.inboxStore?.dispatch( + groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: false }) + ); window?.inboxStore?.dispatch(groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk })); + await LibSessionUtil.saveDumpsToDb(groupPk); } // return true so this job is marked as a success and we don't need to retry it return RunJobResult.Success; diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index e8066ad947..5dd00b59dd 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -13,6 +13,8 @@ import { DeleteAllFromGroupMsgNodeSubRequest, StoreGroupKeysSubRequest, StoreGroupMessageSubRequest, + SubaccountRevokeSubRequest, + SubaccountUnrevokeSubRequest, } from '../../../apis/snode_api/SnodeRequestTypes'; import { DeleteGroupHashesFactory } from '../../../apis/snode_api/factories/DeleteGroupHashesRequestFactory'; import { StoreGroupRequestFactory } from '../../../apis/snode_api/factories/StoreGroupRequestFactory'; @@ -138,6 +140,13 @@ async function pushChangesToGroupSwarmIfNeeded({ deleteAllMessagesSubRequest, ]); + const extraRequestWithExpectedResults = extraRequests.filter( + m => + m instanceof SubaccountRevokeSubRequest || + m instanceof SubaccountUnrevokeSubRequest || + m instanceof DeleteAllFromGroupMsgNodeSubRequest + ); + const result = await MessageSender.sendEncryptedDataToSnode({ // Note: this is on purpose that supplementalKeysSubRequest is before pendingConfigRequests // as this is to avoid a race condition where a device is polling right @@ -155,11 +164,8 @@ async function pushChangesToGroupSwarmIfNeeded({ const expectedReplyLength = pendingConfigRequests.length + // each of those are sent as a subrequest (supplementalKeysSubRequest ? 1 : 0) + // we are sending all the supplemental keys as a single subrequest - (deleteHashesSubRequest ? 1 : 0) + // we are sending all hashes changes as a single subrequest - (revokeSubRequest ? 1 : 0) + // we are sending all revoke updates as a single subrequest - (unrevokeSubRequest ? 1 : 0) + // we are sending all revoke updates as a single subrequest - (deleteAllMessagesSubRequest ? 1 : 0) + // a delete_all sub request is a single subrequest - (extraStoreRequests ? 1 : 0); // each of those are sent as a subrequest + (extraStoreRequests ? 1 : 0) + // each of those are sent as a subrequest + extraRequestWithExpectedResults.length; // each of those are sent as a subrequest, but they don't all return something... // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 944f875e57..0712c1ddb5 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -351,6 +351,8 @@ async function saveDumpsToDb(pubkey: PubkeyType | GroupPubkeyType) { const metaNeedsDump = await MetaGroupWrapperActions.needsDump(pubkey); // save the concatenated dumps as a single entry in the DB if any of the dumps had a need for dump if (metaNeedsDump) { + window.log.debug(`About to make and save dumps for metagroup ${ed25519Str(pubkey)}`); + const dump = await MetaGroupWrapperActions.metaDump(pubkey); await ConfigDumpData.saveConfigDump({ data: dump, @@ -358,7 +360,7 @@ async function saveDumpsToDb(pubkey: PubkeyType | GroupPubkeyType) { variant: `MetaGroupConfig-${pubkey}`, }); - window.log.debug(`Saved dumps for metagroup ${ed25519Str(pubkey)}`); + window.log.info(`Saved dumps for metagroup ${ed25519Str(pubkey)}`); } else { window.log.debug(`No need to update local dumps for metagroup ${ed25519Str(pubkey)}`); } From 40d3ddb2442e01987ba136e4f0a52d14903110c3 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 10 Jul 2024 13:41:37 +1000 Subject: [PATCH 134/302] fix: cleaned up pending removal job with tech design --- ts/components/MemberListItem.tsx | 5 +- .../factories/StoreGroupRequestFactory.ts | 6 +- .../conversations/ConversationController.ts | 14 +++- ts/session/sending/MessageSender.ts | 62 -------------- .../jobs/GroupPendingRemovalsJob.ts | 81 +++++++++++++------ ts/state/ducks/metaGroups.ts | 30 ++++--- .../session/unit/onion/SnodeNamespace_test.ts | 20 ++++- ts/webworker/worker_interface.ts | 6 +- 8 files changed, 119 insertions(+), 105 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 8d01c9c0fc..be664b461c 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -169,7 +169,10 @@ const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Gro return ( {statusText} diff --git a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts index 84513ee766..d5b01d06c5 100644 --- a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts +++ b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts @@ -15,10 +15,14 @@ import { StoreGroupMessageSubRequest, } from '../SnodeRequestTypes'; import { SnodeNamespaces } from '../namespaces'; +import { GroupUpdateDeleteMemberContentMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage'; +import { GroupUpdateMemberLeftNotificationMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftNotificationMessage'; export type StoreMessageToSubRequestType = | GroupUpdateMemberChangeMessage - | GroupUpdateInfoChangeMessage; + | GroupUpdateInfoChangeMessage + | GroupUpdateDeleteMemberContentMessage + | GroupUpdateMemberLeftNotificationMessage; async function makeGroupMessageSubRequest( updateMessages: Array, diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 4884810a07..1006355f97 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -46,6 +46,7 @@ import { SessionUtilContact } from '../utils/libsession/libsession_utils_contact import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile'; import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user_groups'; import { DisappearingMessages } from '../disappearing_messages'; +import { StoreGroupRequestFactory } from '../apis/snode_api/factories/StoreGroupRequestFactory'; let instance: ConvoController | null; @@ -620,7 +621,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM if (PubKey.is03Pubkey(groupPk)) { const group = await UserGroupsWrapperActions.getGroup(groupPk); - if (!group) { + if (!group || (!group.secretKey && !group.authData)) { throw new Error('leaveClosedGroup: group from UserGroupsWrapperActions is null '); } const createAtNetworkTimestamp = GetNetworkTime.now(); @@ -644,9 +645,16 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM // We might not be able to send our leaving messages (no encryption keypair, we were already removed, no network, etc). // If that happens, we should just remove everything from our current user. try { - const results = await MessageSender.sendUnencryptedDataToSnode({ + const storeRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest( + [ourLeavingNotificationMessage, ourLeavingMessage], + { + authData: group.authData, + secretKey: group.secretKey, + } + ); + const results = await MessageSender.sendEncryptedDataToSnode({ destination: groupPk, - messages: [ourLeavingNotificationMessage, ourLeavingMessage], + sortedSubRequests: storeRequests, method: 'sequence', }); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index f2ea279363..f45e012fa5 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -49,8 +49,6 @@ import { MessageEncrypter } from '../crypto/MessageEncrypter'; import { ContentMessage } from '../messages/outgoing'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; -import { GroupUpdateMemberLeftMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage'; -import { GroupUpdateMemberLeftNotificationMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftNotificationMessage'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; import { PubKey } from '../types'; import { OutgoingRawMessage } from '../types/RawMessage'; @@ -632,65 +630,6 @@ async function sendEncryptedDataToSnode( } } -/** - * Send an array of **not** preencrypted data to the corresponding swarm. - * Note: the messages order is not changed when sending them, but if they are not correctly sorted an exception will be thrown. - * - * @param messages the data to deposit (after encryption) - * @param destination the pubkey we should deposit those message to - */ -async function sendUnencryptedDataToSnode({ - destination, - messages, - method, -}: { - // keeping those as an array because the order needs to be enforced for some (groupkeys for instance) - destination: T; - messages: Array< - T extends GroupPubkeyType - ? GroupUpdateMemberLeftMessage | GroupUpdateMemberLeftNotificationMessage - : never - >; - method: MethodBatchType; -}) { - const rawMessages: Array = messages.map(m => { - return { - networkTimestamp: m.createAtNetworkTimestamp, - plainTextBuffer: m.plainTextBuffer(), - ttl: m.ttl(), - destination: m.destination, - identifier: m.identifier, - namespace: m.namespace, - isSyncMessage: false, - }; - }); - - const encryptedAndWrappedArr = await encryptMessagesAndWrap( - rawMessages.map(message => { - return { - destination, - plainTextBuffer: message.plainTextBuffer, - namespace: message.namespace, - ttl: message.ttl, - identifier: message.identifier, - networkTimestamp: message.networkTimestamp, - isSyncMessage: false, - }; - }) - ); - - const sortedSubRequests = await messagesToRequests({ - encryptedAndWrappedArr, - destination, - }); - - return sendEncryptedDataToSnode({ - destination, - sortedSubRequests, - method, - }); -} - // ================ Open Group ================ /** * Send a message to an open group v2. @@ -756,7 +695,6 @@ export const MessageSender = { getSignatureParamsFromNamespace, signSubRequests, encryptMessagesAndWrap, - sendUnencryptedDataToSnode, messagesToRequests, }; diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 4b78efcd0a..796a08dfb6 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -4,20 +4,22 @@ import { compact, isEmpty, isNumber } from 'lodash'; import { v4 } from 'uuid'; import { StringUtils } from '../..'; import { Data } from '../../../../data/data'; -import { - deleteMessagesFromSwarmOnly, - unsendMessagesForEveryoneGroupV2, -} from '../../../../interactions/conversations/unsendingInteractions'; +import { deleteMessagesFromSwarmOnly } from '../../../../interactions/conversations/unsendingInteractions'; import { MetaGroupWrapperActions, MultiEncryptWrapperActions, UserGroupsWrapperActions, } from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { StoreGroupRevokedRetrievableSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; +import { + StoreGroupMessageSubRequest, + StoreGroupRevokedRetrievableSubRequest, +} from '../../../apis/snode_api/SnodeRequestTypes'; +import { StoreGroupRequestFactory } from '../../../apis/snode_api/factories/StoreGroupRequestFactory'; import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { RevokeChanges, SnodeAPIRevoke } from '../../../apis/snode_api/revokeSubaccount'; import { WithSecretKey } from '../../../apis/snode_api/types'; -import { concatUInt8Array } from '../../../crypto'; +import { concatUInt8Array, getSodiumRenderer } from '../../../crypto'; +import { GroupUpdateDeleteMemberContentMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage'; import { MessageSender } from '../../../sending'; import { fromHexToArray } from '../../String'; import { runners } from '../JobRunner'; @@ -41,7 +43,7 @@ type JobExtraArgs = Pick; async function addJob({ groupPk }: JobExtraArgs) { const pendingRemovalJob = new GroupPendingRemovalsJob({ groupPk, - nextAttemptTimestamp: Date.now(), + nextAttemptTimestamp: Date.now() + 1000, // postpone by 1s }); window.log.debug(`addGroupPendingRemovalJob: adding group pending removal for ${groupPk} `); await runners.groupPendingRemovalJobRunner.addJob(pendingRemovalJob); @@ -130,6 +132,10 @@ class GroupPendingRemovalsJob extends PersistedJob m.removedStatus === 2) + .map(m => m.pubkeyHex); + const sessionIdsHex = pendingRemovals.map(m => m.pubkeyHex); const sessionIds = sessionIdsHex.map(m => fromHexToArray(m).slice(1)); const currentGen = await MetaGroupWrapperActions.keyGetCurrentGen(groupPk); @@ -162,44 +168,69 @@ class GroupPendingRemovalsJob extends PersistedJob = []; + if (deleteMessagesOfMembers.length) { + const deleteContentMsg = new GroupUpdateDeleteMemberContentMessage({ + createAtNetworkTimestamp: GetNetworkTime.now(), + expirationType: 'unknown', // this is not displayed so not expiring. + expireTimer: 0, + groupPk, + memberSessionIds: deleteMessagesOfMembers, + messageHashes: [], + sodium: await getSodiumRenderer(), + secretKey: group.secretKey, + }); + storeRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest( + [deleteContentMsg], + { authData: null, secretKey: group.secretKey } + ); + } + const sortedSubRequests = compact([multiEncryptRequest, ...revokeRequests, ...storeRequests]); const result = await MessageSender.sendEncryptedDataToSnode({ - sortedSubRequests: [multiEncryptRequest, ...revokeRequests], + sortedSubRequests, destination: groupPk, method: 'sequence', }); - if (result?.length === 2 && result[0].code === 200 && result[1].code === 200) { - // both requests success, remove the members from the group member entirely and sync - await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, sessionIdsHex); - await GroupSync.queueNewJobIfNeeded(groupPk); - const deleteMessagesOf = pendingRemovals - .filter(m => m.removedStatus === 2) - .map(m => m.pubkeyHex); - if (deleteMessagesOf.length) { + if ( + !result || + result.length !== sortedSubRequests.length || + result.some(m => m.code !== 200) + ) { + window.log.warn( + 'GroupPendingRemovalsJob: sendEncryptedDataToSnode unexpected result length or content. Scheduling retry if possible' + ); + return RunJobResult.RetryJobIfPossible; + } + + // both requests success, remove the members from the group member entirely and sync + await MetaGroupWrapperActions.memberEraseAndRekey(groupPk, sessionIdsHex); + await GroupSync.queueNewJobIfNeeded(groupPk); + + try { + if (deleteMessagesOfMembers.length) { const msgHashesToDeleteOnGroupSwarm = await Data.deleteAllMessageFromSendersInConversation({ groupPk, - toRemove: sessionIdsHex, + toRemove: deleteMessagesOfMembers, signatureTimestamp: GetNetworkTime.now(), }); - await unsendMessagesForEveryoneGroupV2({ - allMessagesFrom: deleteMessagesOf, - groupPk, - msgsToDelete: [], - }); if (msgHashesToDeleteOnGroupSwarm.length) { await deleteMessagesFromSwarmOnly(msgHashesToDeleteOnGroupSwarm, groupPk); } } + } catch (e) { + window.log.warn('GroupPendingRemovalsJob failable part failed with:', e.message); } + + // return true so this job is marked as a success and we don't need to retry it + return RunJobResult.Success; } catch (e) { - window.log.warn('PendingRemovalJob failed with', e.message); + window.log.warn('GroupPendingRemovalsJob failed with', e.message); return RunJobResult.RetryJobIfPossible; } - // return true so this job is marked as a success and we don't need to retry it - return RunJobResult.Success; } public serializeJob() { diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 92e997806e..e1604105eb 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -770,6 +770,8 @@ async function handleMemberRemovedFromUI({ await checkWeAreAdminOrThrow(groupPk, 'handleMemberRemovedFromUI'); if (removeMembers.length === 0) { + window.log.debug('handleMemberRemovedFromUI: removeMembers is empty'); + return; } @@ -778,24 +780,31 @@ async function handleMemberRemovedFromUI({ removed: removeMembers, }); - // Note: We don't revoke members from here, instead we schedule a GroupPendingRemovals which will deal with the revokes of all of them together + if (removed.length === 0) { + window.log.debug('handleMemberRemovedFromUI: removeMembers after validation is empty'); - // Send the groupUpdateDeleteMessage that can still be decrypted by those removed members to namespace ClosedGroupRevokedRetrievableMessages. (not when handling a MEMBER_LEFT message) - // Then, rekey the wrapper, but don't push the changes yet, we want to batch all of the requests to be made together in the `pushChangesToGroupSwarmIfNeeded` below. - if (removed.length) { - await MetaGroupWrapperActions.membersMarkPendingRemoval(groupPk, removed, alsoRemoveMessages); + return; } - await GroupPendingRemovals.addJob({ groupPk }); - const createAtNetworkTimestamp = GetNetworkTime.now(); + // We need to mark the member as "pending removal" so any admins (including us) can deal with it as soon as possible + await MetaGroupWrapperActions.membersMarkPendingRemoval(groupPk, removed, alsoRemoveMessages); await LibSessionUtil.saveDumpsToDb(groupPk); + // We don't revoke the member's token right away. Instead we schedule a `GroupPendingRemovals` + // which will deal with the revokes of all of them together. + await GroupPendingRemovals.addJob({ groupPk }); + + // Build a GroupUpdateMessage to be sent if that member was kicked by us. + const createAtNetworkTimestamp = GetNetworkTime.now(); const expiringDetails = DisappearingMessages.getExpireDetailsForOutgoingMesssage( convo, createAtNetworkTimestamp ); let removedControlMessage: GroupUpdateMemberChangeMessage | null = null; - if (removed.length && !fromMemberLeftMessage) { + + // We only add/send a message if that user didn't leave but was explicitely kicked. + // When we leaves by himself, he sends a GroupUpdateMessage. + if (!fromMemberLeftMessage) { const msgModel = await ClosedGroup.addUpdateMessage({ diff: { type: 'kicked', kicked: removed }, convo, @@ -809,7 +818,7 @@ async function handleMemberRemovedFromUI({ ? createAtNetworkTimestamp + expiringDetails.expireTimer : null, }, - markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier + markAlreadySent: false, // the store below will mark the message as sent using dbMsgIdentifier }); removedControlMessage = await getRemovedControlMessage({ adminSecretKey: group.secretKey, @@ -822,12 +831,13 @@ async function handleMemberRemovedFromUI({ }); } + // build the request for that GroupUpdateMessage if needed const extraStoreRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest( [removedControlMessage], group ); - // revoked pubkeys, update messages, and libsession groups config in a single batch call + // Send the updated config (with changes to pending_removal) and that GroupUpdateMessage request (if any) as a sequence. const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, extraStoreRequests, diff --git a/ts/test/session/unit/onion/SnodeNamespace_test.ts b/ts/test/session/unit/onion/SnodeNamespace_test.ts index 8e6a8cc822..6d491c5510 100644 --- a/ts/test/session/unit/onion/SnodeNamespace_test.ts +++ b/ts/test/session/unit/onion/SnodeNamespace_test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import Sinon from 'sinon'; -import { SnodeNamespace } from '../../../../session/apis/snode_api/namespaces'; +import { SnodeNamespace, SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; describe('maxSizeMap', () => { afterEach(() => { @@ -24,4 +24,22 @@ describe('maxSizeMap', () => { { namespace: 5, maxSize: -8 }, ]); }); + + it('multiple namespaces config for is correct', () => { + expect( + SnodeNamespace.maxSizeMap([ + SnodeNamespaces.ClosedGroupMessages, + SnodeNamespaces.ClosedGroupInfo, + SnodeNamespaces.ClosedGroupMembers, + SnodeNamespaces.ClosedGroupKeys, + SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, + ]) + ).to.be.deep.eq([ + { namespace: SnodeNamespaces.ClosedGroupMessages, maxSize: -2 }, // message has a priority of 10 so takes its own bucket + { namespace: SnodeNamespaces.ClosedGroupInfo, maxSize: -8 }, // the other ones are sharing the next bucket + { namespace: SnodeNamespaces.ClosedGroupMembers, maxSize: -8 }, + { namespace: SnodeNamespaces.ClosedGroupKeys, maxSize: -8 }, + { namespace: SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, maxSize: -8 }, + ]); + }); }); diff --git a/ts/webworker/worker_interface.ts b/ts/webworker/worker_interface.ts index 6c3836f545..496d8b2006 100644 --- a/ts/webworker/worker_interface.ts +++ b/ts/webworker/worker_interface.ts @@ -117,9 +117,11 @@ export class WorkerInterface { private _removeJob(id: number) { if (this._DEBUG) { this._jobs[id].complete = true; - } else { - delete this._jobs[id]; + return this._jobs[id]; } + const job = this._jobs[id]; + delete this._jobs[id]; + return job; } private _getJob(id: number) { From 2bed60665117b5d1f39b47a5bea917b308ce0f99 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 10 Jul 2024 14:00:01 +1000 Subject: [PATCH 135/302] fix: update group name in usergroup when getting kicked --- .../libsession/handleLibSessionMessage.ts | 10 ++++--- .../conversations/ConversationController.ts | 30 ++++++++++++++----- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ts/receiver/libsession/handleLibSessionMessage.ts b/ts/receiver/libsession/handleLibSessionMessage.ts index b24c06ea9d..4e862f9683 100644 --- a/ts/receiver/libsession/handleLibSessionMessage.ts +++ b/ts/receiver/libsession/handleLibSessionMessage.ts @@ -1,15 +1,15 @@ import { EncryptionDomain, GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { isNumber, toNumber } from 'lodash'; +import { ConvoHub } from '../../session/conversations'; import { LibSodiumWrappers } from '../../session/crypto'; import { PubKey } from '../../session/types'; +import { WithLibSodiuMWrappers } from '../../session/types/with'; import { DecryptionFailed, InvalidMessage } from '../../session/utils/errors'; import { assertUnreachable } from '../../types/sqlSharedTypes'; -import { WithLibSodiuMWrappers } from '../../session/types/with'; import { MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; -import { ConvoHub } from '../../session/conversations'; /** * Logic for handling the `groupKicked` `LibSessionMessage`, this message should only be processed if it was @@ -48,8 +48,10 @@ async function handleLibSessionKickedMessage({ if (currentGenEmbedded < currentGenFromWrapper) { throw new InvalidMessage('currentgen in wrapper is higher than the one in the message '); } - const inviteWasPending = - (await UserGroupsWrapperActions.getGroup(groupPk))?.invitePending || false; + + const groupInUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); + const inviteWasPending = groupInUserGroup?.invitePending || false; + await ConvoHub.use().deleteGroup(groupPk, { sendLeaveMessage: false, fromSyncMessage: false, diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 1006355f97..b2c15c5b2c 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -280,11 +280,11 @@ class ConvoController { // we don't need to keep polling anymore. getSwarmPollingInstance().removePubkey(groupPk, 'deleteGroup'); - const group = await UserGroupsWrapperActions.getGroup(groupPk); + const groupInUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); // send the leave message before we delete everything for this group (including the key!) // Note: if we were kicked, we already lost the authdata/secretKey for it, so no need to try to send our message. - if (sendLeaveMessage && !group?.kicked) { + if (sendLeaveMessage && !groupInUserGroup?.kicked) { await leaveClosedGroup(groupPk, fromSyncMessage); } // a group 03 can be removed fully or kept empty as kicked. @@ -293,12 +293,26 @@ class ConvoController { // Note: the pendingInvite=true case cannot really happen as we wouldn't be polling from that group (and so, not get the message kicking us) if (emptyGroupButKeepAsKicked) { // delete the secretKey/authData if we had it. If we need it for something, it has to be done before this call. - if (group) { - group.authData = null; - group.secretKey = null; - group.disappearingTimerSeconds = undefined; - group.kicked = true; - await UserGroupsWrapperActions.setGroup(group); + if (groupInUserGroup) { + groupInUserGroup.authData = null; + groupInUserGroup.secretKey = null; + groupInUserGroup.disappearingTimerSeconds = undefined; + groupInUserGroup.kicked = true; + // we want to update the groupName in usergroup with whatever is in the groupInfo, + // so even if the group is not polled anymore, we have an up to date name on restore. + let nameInMetagroup: string | undefined; + try { + const metagroup = await MetaGroupWrapperActions.infoGet(groupPk); + if (metagroup && metagroup.name && !isEmpty(metagroup.name)) { + nameInMetagroup = metagroup.name; + } + } catch (e) { + // nothing to do + } + if (groupInUserGroup && nameInMetagroup && groupInUserGroup.name !== nameInMetagroup) { + groupInUserGroup.name = nameInMetagroup; + } + await UserGroupsWrapperActions.setGroup(groupInUserGroup); } } else { try { From c4e9aab66c1e3ac03f21250327f05a10542570a1 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 10 Jul 2024 16:57:19 +1000 Subject: [PATCH 136/302] fix: remove invite/promote to group message once processed --- ts/receiver/callMessage.ts | 3 ++- ts/receiver/dataMessage.ts | 1 + ts/receiver/groupv2/handleGroupV2Message.ts | 18 ++++++++++++++++-- .../libsession/handleLibSessionMessage.ts | 5 ++--- ts/session/crypto/index.ts | 4 ++++ ts/session/types/with.ts | 7 +++---- ts/session/utils/calling/CallManager.ts | 2 +- ts/state/ducks/metaGroups.ts | 16 ++++++++-------- .../browser/libsession_worker_interface.ts | 7 +++++++ 9 files changed, 44 insertions(+), 19 deletions(-) diff --git a/ts/receiver/callMessage.ts b/ts/receiver/callMessage.ts index 9a9d86dda6..d54d41a2a7 100644 --- a/ts/receiver/callMessage.ts +++ b/ts/receiver/callMessage.ts @@ -3,9 +3,10 @@ import { SignalService } from '../protobuf'; import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { TTL_DEFAULT } from '../session/constants'; import { CallManager, UserUtils } from '../session/utils'; -import { WithMessageHash, WithOptExpireUpdate } from '../session/utils/calling/CallManager'; +import { WithOptExpireUpdate } from '../session/utils/calling/CallManager'; import { IncomingMessageCache } from './cache'; import { EnvelopePlus } from './types'; +import { WithMessageHash } from '../session/types/with'; // messageHash & messageHash are only needed for actions adding a callMessage to the database (so they expire) export async function handleCallMessage( diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index 42bf4cb646..e653210a6f 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -173,6 +173,7 @@ export async function handleSwarmDataMessage({ source: envelope.source, senderIdentity: envelope.senderIdentity, expireUpdate, + messageHash, }); // Groups update should always be able to be decrypted as we get the keys before trying to decrypt them. // If decryption failed once, it will keep failing, so no need to keep it in the cache. diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 89274f7eb9..537f241b7f 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -29,6 +29,7 @@ import { MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; +import { WithMessageHash } from '../../session/types/with'; type WithSignatureTimestamp = { signatureTimestamp: number }; type WithAuthor = { author: PubkeyType }; @@ -535,7 +536,8 @@ async function handle1o1GroupUpdateMessage( details: GroupUpdateDetails & WithUncheckedSource & WithUncheckedSenderIdentity & - WithDisappearingMessageUpdate + WithDisappearingMessageUpdate & + WithMessageHash ) { // the message types below are received from our own swarm, so source is the sender, and senderIdentity is empty @@ -558,6 +560,17 @@ async function handle1o1GroupUpdateMessage( author: details.source, }); } + if (details.messageHash && !isEmpty(details.messageHash)) { + const deleted = await deleteMessagesFromSwarmOnly( + [details.messageHash], + UserUtils.getOurPubKeyStrFromCache() + ); + if (!deleted) { + window.log.warn( + `failed to delete invite/promote while processing it in handle1o1GroupUpdateMessage. hash:${details.messageHash}` + ); + } + } // returns true for all cases where this message was expected to be a 1o1 message, even if not processed return true; @@ -570,7 +583,8 @@ async function handleGroupUpdateMessage( details: GroupUpdateDetails & WithUncheckedSource & WithUncheckedSenderIdentity & - WithDisappearingMessageUpdate + WithDisappearingMessageUpdate & + WithMessageHash ) { const was1o1Message = await handle1o1GroupUpdateMessage(details); if (was1o1Message) { diff --git a/ts/receiver/libsession/handleLibSessionMessage.ts b/ts/receiver/libsession/handleLibSessionMessage.ts index 4e862f9683..ba537e8a34 100644 --- a/ts/receiver/libsession/handleLibSessionMessage.ts +++ b/ts/receiver/libsession/handleLibSessionMessage.ts @@ -1,9 +1,8 @@ import { EncryptionDomain, GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { isNumber, toNumber } from 'lodash'; import { ConvoHub } from '../../session/conversations'; -import { LibSodiumWrappers } from '../../session/crypto'; +import { LibSodiumWrappers, WithLibSodiumWrappers } from '../../session/crypto'; import { PubKey } from '../../session/types'; -import { WithLibSodiuMWrappers } from '../../session/types/with'; import { DecryptionFailed, InvalidMessage } from '../../session/utils/errors'; import { assertUnreachable } from '../../types/sqlSharedTypes'; import { @@ -67,7 +66,7 @@ async function handleLibSessionMessage( domain: EncryptionDomain; ourPk: PubkeyType; groupPk: GroupPubkeyType; - } & WithLibSodiuMWrappers + } & WithLibSodiumWrappers ) { switch (opts.domain) { case 'SessionGroupKickedMessage': diff --git a/ts/session/crypto/index.ts b/ts/session/crypto/index.ts index 287d630dbe..be2d461f0d 100644 --- a/ts/session/crypto/index.ts +++ b/ts/session/crypto/index.ts @@ -6,6 +6,10 @@ import { toHex } from '../utils/String'; export type LibSodiumWrappers = typeof libsodiumwrappers; +export type WithLibSodiumWrappers = { + sodium: LibSodiumWrappers; +}; + export async function getSodiumRenderer(): Promise { await libsodiumwrappers.ready; return libsodiumwrappers; diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index 2b17bb54cd..e0c805293f 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -1,5 +1,4 @@ -import { LibSodiumWrappers } from '../crypto'; -export type WithLibSodiuMWrappers = { - sodium: LibSodiumWrappers; -}; + + +export type WithMessageHash = { messageHash: string }; \ No newline at end of file diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 2cb83f1bc3..a281e50644 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -35,13 +35,13 @@ import { MessageSender } from '../../sending'; import { getIsRinging } from '../RingingManager'; import { getBlackSilenceMediaStream } from './Silence'; import { ed25519Str } from '../String'; +import { WithMessageHash } from '../../types/with'; export type InputItem = { deviceId: string; label: string }; export const callTimeoutMs = 60000; export type WithOptExpireUpdate = { expireDetails: ReadyToDisappearMsgUpdate | undefined }; -export type WithMessageHash = { messageHash: string }; /** * This uuid is set only once we accepted a call or started one. diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index e1604105eb..6dfc12cc34 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -151,11 +151,11 @@ const initNewGroupInWrapper = createAsyncThunk( for (let index = 0; index < uniqMembers.length; index++) { const member = uniqMembers[index]; - const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); - if (created.pubkeyHex === us) { - await MetaGroupWrapperActions.memberSetAdmin(groupPk, created.pubkeyHex); + await MetaGroupWrapperActions.memberConstructAndSet(groupPk, member); + if (member === us) { + await MetaGroupWrapperActions.memberSetAdmin(groupPk, member); } else { - await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); + await MetaGroupWrapperActions.memberSetInvited(groupPk, member, false); } } @@ -493,8 +493,8 @@ async function handleWithHistoryMembers({ }) { for (let index = 0; index < withHistory.length; index++) { const member = withHistory[index]; - const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); - await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); + await MetaGroupWrapperActions.memberConstructAndSet(groupPk, member); + await MetaGroupWrapperActions.memberSetInvited(groupPk, member, false); } const encryptedSupplementKeys = withHistory.length ? await MetaGroupWrapperActions.generateSupplementKeys(groupPk, withHistory) @@ -512,8 +512,8 @@ async function handleWithoutHistoryMembers({ }: WithGroupPubkey & WithAddWithoutHistoryMembers) { for (let index = 0; index < withoutHistory.length; index++) { const member = withoutHistory[index]; - const created = await MetaGroupWrapperActions.memberGetOrConstruct(groupPk, member); - await MetaGroupWrapperActions.memberSetInvited(groupPk, created.pubkeyHex, false); + await MetaGroupWrapperActions.memberConstructAndSet(groupPk, member); + await MetaGroupWrapperActions.memberSetInvited(groupPk, member, false); } if (!isEmpty(withoutHistory)) { diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 349dc41ab4..886c278354 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -514,6 +514,13 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { 'memberGetOrConstruct', pubkeyHex, ]) as Promise>, + memberConstructAndSet: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberConstructAndSet', + pubkeyHex, + ]) as Promise>, + memberGetAll: async (groupPk: GroupPubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberGetAll']) as Promise< ReturnType From a8c674c07a5dcb2068fcc69d1875cb17bc663cdf Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 11 Jul 2024 10:35:13 +1000 Subject: [PATCH 137/302] feat: use details from GROUP_MEMBERS when we don't know him --- ts/receiver/callMessage.ts | 2 +- .../SwarmPollingGroupConfig.ts | 21 +++++++++ ts/session/types/with.ts | 5 +-- .../utils/libsession/libsession_utils.ts | 36 +++++++++++++++- ts/state/ducks/metaGroups.ts | 43 +++++++++++++++++-- 5 files changed, 97 insertions(+), 10 deletions(-) diff --git a/ts/receiver/callMessage.ts b/ts/receiver/callMessage.ts index d54d41a2a7..0db111887b 100644 --- a/ts/receiver/callMessage.ts +++ b/ts/receiver/callMessage.ts @@ -3,7 +3,7 @@ import { SignalService } from '../protobuf'; import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { TTL_DEFAULT } from '../session/constants'; import { CallManager, UserUtils } from '../session/utils'; -import { WithOptExpireUpdate } from '../session/utils/calling/CallManager'; +import { WithOptExpireUpdate } from '../session/utils/calling/CallManager'; import { IncomingMessageCache } from './cache'; import { EnvelopePlus } from './types'; import { WithMessageHash } from '../session/types/with'; diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 0e78581382..0d2e9c220f 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -14,6 +14,7 @@ import { LibSessionUtil } from '../../../utils/libsession/libsession_utils'; import { SnodeNamespaces } from '../namespaces'; import { RetrieveMessageItemWithNamespace } from '../types'; import { ConvoHub } from '../../../conversations'; +import { ProfileManager } from '../../../profile_manager/ProfileManager'; /** * This is a basic optimization to avoid running the logic when the `deleteBeforeSeconds` @@ -127,6 +128,26 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { await convo.commit(); } } + + const members = await MetaGroupWrapperActions.memberGetAll(groupPk); + for (let index = 0; index < members.length; index++) { + const member = members[index]; + // if our DB doesn't have details about this user, set them. Otherwise we don't want to overwrite our changes with those + // because they are most likely out of date from what we get from the user himself. + const memberConvo = ConvoHub.use().get(member.pubkeyHex); + if (!memberConvo) { + continue; + } + if (member.name && member.name !== memberConvo.getRealSessionUsername()) { + // eslint-disable-next-line no-await-in-loop + await ProfileManager.updateProfileOfContact( + member.pubkeyHex, + member.name, + member.profilePicture?.url || null, + member.profilePicture?.key || null + ); + } + } } async function handleGroupSharedConfigMessages( diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index e0c805293f..50f16911ab 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -1,4 +1 @@ - - - -export type WithMessageHash = { messageHash: string }; \ No newline at end of file +export type WithMessageHash = { messageHash: string }; diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 0712c1ddb5..f649e94d6e 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -2,6 +2,7 @@ /* eslint-disable import/extensions */ /* eslint-disable import/no-unresolved */ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { from_hex } from 'libsodium-wrappers-sumo'; import { compact, difference, isString, omit } from 'lodash'; import Long from 'long'; import { UserUtils } from '..'; @@ -16,11 +17,11 @@ import { GenericWrapperActions, MetaGroupWrapperActions, } from '../../../webworker/workers/browser/libsession_worker_interface'; +import { SnodeNamespaces, SnodeNamespacesUserConfig } from '../../apis/snode_api/namespaces'; import { BatchResultEntry, NotEmptyArrayOfBatchResults, } from '../../apis/snode_api/SnodeRequestTypes'; -import { SnodeNamespaces, SnodeNamespacesUserConfig } from '../../apis/snode_api/namespaces'; import { PubKey } from '../../types'; import { UserSync } from '../job_runners/jobs/UserSyncJob'; import { ed25519Str } from '../String'; @@ -387,6 +388,38 @@ async function saveDumpsToDb(pubkey: PubkeyType | GroupPubkeyType) { } } +/** + * Creates the specified member in the specified group wrapper and sets the details provided. + * Note: no checks are done, so if the member existed already it's name/profile picture are overriden. + * + * This should only be used when the current device is explicitely inviting a new member to the group. + */ +async function createMemberAndSetDetails({ + displayName, + memberPubkey, + groupPk, + avatarUrl, + profileKeyHex, +}: { + memberPubkey: PubkeyType; + displayName: string | null; + groupPk: GroupPubkeyType; + profileKeyHex: string | null; + avatarUrl: string | null; +}) { + await MetaGroupWrapperActions.memberConstructAndSet(groupPk, memberPubkey); + + if (displayName) { + await MetaGroupWrapperActions.memberSetName(groupPk, memberPubkey, displayName); + } + if (profileKeyHex && avatarUrl) { + await MetaGroupWrapperActions.memberSetProfilePicture(groupPk, memberPubkey, { + url: avatarUrl, + key: from_hex(profileKeyHex), + }); + } +} + export const LibSessionUtil = { initializeLibSessionUtilWrappers, userNamespaceToVariant, @@ -396,4 +429,5 @@ export const LibSessionUtil = { saveDumpsToDb, batchResultsToGroupSuccessfulChange, batchResultsToUserSuccessfulChange, + createMemberAndSetDetails, }; diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 6dfc12cc34..a4477bfb21 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -39,6 +39,7 @@ import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; +import { ed25519Str } from '../../session/utils/String'; import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { @@ -52,7 +53,6 @@ import { import { StateType } from '../reducer'; import { openConversationWithMessages } from './conversations'; import { resetLeftOverlayMode } from './section'; -import { ed25519Str } from '../../session/utils/String'; type WithFromMemberLeftMessage = { fromMemberLeftMessage: boolean }; // there are some changes we want to skip when doing changes triggered from a memberLeft message. export type GroupState = { @@ -151,7 +151,19 @@ const initNewGroupInWrapper = createAsyncThunk( for (let index = 0; index < uniqMembers.length; index++) { const member = uniqMembers[index]; - await MetaGroupWrapperActions.memberConstructAndSet(groupPk, member); + const convoMember = ConvoHub.use().get(member); + const displayName = convoMember?.getRealSessionUsername() || null; + const profileKeyHex = convoMember?.getProfileKey() || null; + const avatarUrl = convoMember?.getAvatarPointer() || null; + + await LibSessionUtil.createMemberAndSetDetails({ + avatarUrl, + displayName, + groupPk, + memberPubkey: member, + profileKeyHex, + }); + if (member === us) { await MetaGroupWrapperActions.memberSetAdmin(groupPk, member); } else { @@ -493,7 +505,19 @@ async function handleWithHistoryMembers({ }) { for (let index = 0; index < withHistory.length; index++) { const member = withHistory[index]; - await MetaGroupWrapperActions.memberConstructAndSet(groupPk, member); + + const convoMember = ConvoHub.use().get(member); + const displayName = convoMember?.getRealSessionUsername() || null; + const profileKeyHex = convoMember?.getProfileKey() || null; + const avatarUrl = convoMember?.getAvatarPointer() || null; + + await LibSessionUtil.createMemberAndSetDetails({ + avatarUrl, + displayName, + groupPk, + memberPubkey: member, + profileKeyHex, + }); await MetaGroupWrapperActions.memberSetInvited(groupPk, member, false); } const encryptedSupplementKeys = withHistory.length @@ -512,7 +536,18 @@ async function handleWithoutHistoryMembers({ }: WithGroupPubkey & WithAddWithoutHistoryMembers) { for (let index = 0; index < withoutHistory.length; index++) { const member = withoutHistory[index]; - await MetaGroupWrapperActions.memberConstructAndSet(groupPk, member); + const convoMember = ConvoHub.use().get(member); + const displayName = convoMember?.getRealSessionUsername() || null; + const profileKeyHex = convoMember?.getProfileKey() || null; + const avatarUrl = convoMember?.getAvatarPointer() || null; + + await LibSessionUtil.createMemberAndSetDetails({ + groupPk, + memberPubkey: member, + avatarUrl, + displayName, + profileKeyHex, + }); await MetaGroupWrapperActions.memberSetInvited(groupPk, member, false); } From c476ad1704cb0b053c4bc9a2f1d388986fa62dd8 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 11 Jul 2024 10:50:34 +1000 Subject: [PATCH 138/302] fix: bug not refreshing the contacts map value on commit --- ts/session/utils/libsession/libsession_utils_contacts.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ts/session/utils/libsession/libsession_utils_contacts.ts b/ts/session/utils/libsession/libsession_utils_contacts.ts index f1301f269e..0da59511e9 100644 --- a/ts/session/utils/libsession/libsession_utils_contacts.ts +++ b/ts/session/utils/libsession/libsession_utils_contacts.ts @@ -87,15 +87,15 @@ async function insertContactFromDBIntoWrapperAndRefresh( try { window.log.debug('inserting into contact wrapper: ', JSON.stringify(wrapperContact)); await ContactsWrapperActions.set(wrapperContact); - // returned for testing purposes only - return wrapperContact; } catch (e) { window.log.warn(`ContactsWrapperActions.set of ${id} failed with ${e.message}`); // we still let this go through + } finally { + await refreshMappedValue(id); } - await refreshMappedValue(id); - return null; + // returned for testing purposes only + return wrapperContact; } /** From aa6d39c2700b4d23452e75a53ccc021ae2ee4a32 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 11 Jul 2024 16:30:52 +1000 Subject: [PATCH 139/302] fix: delete member + content from the admin side --- preload.js | 1 + ts/data/sharedDataTypes.ts | 6 +- .../conversations/unsendingInteractions.ts | 1 + ts/node/sql.ts | 34 ++++++----- ts/receiver/groupv2/handleGroupV2Message.ts | 10 ++-- ts/session/apis/snode_api/swarmPolling.ts | 2 +- ts/session/sending/MessageSender.ts | 16 ++++++ .../jobs/GroupPendingRemovalsJob.ts | 18 +++++- .../utils/job_runners/jobs/GroupSyncJob.ts | 22 +++++--- ts/state/ducks/conversations.ts | 56 +++++++++++++++---- ts/types/sqlSharedTypes.ts | 18 +++--- ts/window.d.ts | 1 + 12 files changed, 132 insertions(+), 53 deletions(-) diff --git a/preload.js b/preload.js index 14050ccf23..72f1e600c7 100644 --- a/preload.js +++ b/preload.js @@ -35,6 +35,7 @@ window.sessionFeatureFlags = { debug: { debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), debugLibsessionDumps: !_.isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS), + debugBuiltSnodeRequests: !_.isEmpty(process.env.SESSION_DEBUG_BUILT_SNODE_REQUEST), debugFileServerRequests: false, debugNonSnodeRequests: false, debugOnionRequests: false, diff --git a/ts/data/sharedDataTypes.ts b/ts/data/sharedDataTypes.ts index 881a0c4861..2f9c92e3cd 100644 --- a/ts/data/sharedDataTypes.ts +++ b/ts/data/sharedDataTypes.ts @@ -1,7 +1,5 @@ import { PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; -type PrArrayMsgIds = Promise>; - export type DataCallArgs any> = Parameters[0]; export type DeleteAllMessageFromSendersInConversationType = ( @@ -9,14 +7,14 @@ export type DeleteAllMessageFromSendersInConversationType = ( toRemove: Array; signatureTimestamp: number; } -) => PrArrayMsgIds; +) => Promise<{ messageHashes: Array }>; export type DeleteAllMessageHashesInConversationType = ( args: WithGroupPubkey & { messageHashes: Array; signatureTimestamp: number; } -) => PrArrayMsgIds; +) => Promise<{ messageHashes: Array }>; export type DeleteAllMessageHashesInConversationMatchingAuthorType = ( args: WithGroupPubkey & { diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index e51a3e3fd7..7e982c4c41 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -188,6 +188,7 @@ export async function deleteMessagesFromSwarmOnly( pubkey: PubkeyType | GroupPubkeyType ) { const deletionMessageHashes = isStringArray(messages) ? messages : getMessageHashes(messages); + try { if (isEmpty(messages)) { return false; diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 5a886cb66a..2d308d8007 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1095,14 +1095,17 @@ function deleteAllMessageFromSendersInConversation( instance?: BetterSqlite3.Database ): AwaitedReturn { if (!groupPk || !toRemove.length) { - return []; + return { messageHashes: [] }; } - return assertGlobalInstanceOrInstance(instance) - .prepare( - `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND sent_at <= ? AND source IN ( ${toRemove.map(() => '?').join(', ')} ) RETURNING id` - ) - .all(groupPk, signatureTimestamp, ...toRemove) - .map(m => m.id); + const messageHashes = compact( + assertGlobalInstanceOrInstance(instance) + .prepare( + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND sent_at <= ? AND source IN ( ${toRemove.map(() => '?').join(', ')} ) RETURNING messageHash` + ) + .all(groupPk, signatureTimestamp, ...toRemove) + .map(m => m.messageHash) + ); + return { messageHashes }; } function deleteAllMessageHashesInConversation( @@ -1114,14 +1117,17 @@ function deleteAllMessageHashesInConversation( instance?: BetterSqlite3.Database ): AwaitedReturn { if (!groupPk || !messageHashes.length) { - return []; + return { messageHashes: [] }; } - return assertGlobalInstanceOrInstance(instance) - .prepare( - `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND sent_at <= ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING id` - ) - .all(groupPk, signatureTimestamp, ...messageHashes) - .map(m => m.id); + const deletedMessageHashes = compact( + assertGlobalInstanceOrInstance(instance) + .prepare( + `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND sent_at <= ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING messageHash` + ) + .all(groupPk, signatureTimestamp, ...messageHashes) + .map(m => m.messageHash) + ); + return { messageHashes: deletedMessageHashes }; } function deleteAllMessageHashesInConversationMatchingAuthor( diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 537f241b7f..bbb05a9102 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -1,5 +1,5 @@ import { GroupPubkeyType, PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; -import { isEmpty, isFinite, isNumber } from 'lodash'; +import { compact, isEmpty, isFinite, isNumber } from 'lodash'; import { Data } from '../../data/data'; import { deleteMessagesFromSwarmOnly } from '../../interactions/conversations/unsendingInteractions'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; @@ -21,7 +21,7 @@ import { PreConditionFailed } from '../../session/utils/errors'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; import { SessionUtilConvoInfoVolatile } from '../../session/utils/libsession/libsession_utils_convo_info_volatile'; -import { messagesExpired } from '../../state/ducks/conversations'; +import { messageHashesExpired, messagesExpired } from '../../state/ducks/conversations'; import { groupInfoActions } from '../../state/ducks/metaGroups'; import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { BlockedNumberController } from '../../util'; @@ -460,10 +460,10 @@ async function handleGroupDeleteMemberContentMessage({ }); // this is step 3. window.inboxStore.dispatch( - messagesExpired( - [...deletedByHashes, ...deletedBySenders].map(m => ({ + messageHashesExpired( + compact([...deletedByHashes.messageHashes, ...deletedBySenders.messageHashes]).map(m => ({ conversationKey: groupPk, - messageId: m, + messageHash: m, })) ) ); diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 8f9bc8367b..af8efd5594 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -565,7 +565,7 @@ export class SwarmPolling { } if (type === ConversationTypeEnum.GROUPV2 && PubKey.is03Pubkey(pubkey)) { const toBump = await MetaGroupWrapperActions.currentHashes(pubkey); - window.log.debug(`configHashesToBump group count: ${toBump.length}`); + window.log.debug(`configHashesToBump group(${ed25519Str(pubkey)}) count: ${toBump.length}`); return toBump; } return []; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index f45e012fa5..78ac7ad1f6 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -56,6 +56,7 @@ import { UserUtils } from '../utils'; import { ed25519Str, fromUInt8ArrayToBase64 } from '../utils/String'; import { MessageSentHandler } from './MessageSentHandler'; import { MessageWrapper } from './MessageWrapper'; +import { stringify } from '../../types/sqlSharedTypes'; // ================ SNODE STORE ================ @@ -347,6 +348,19 @@ async function getSignatureParamsFromNamespace( return {}; } +function logBuildSubRequests(subRequests: Array) { + if (!window.sessionFeatureFlags.debug.debugBuiltSnodeRequests) { + return; + } + window.log.debug( + `\n========================================\nsubRequests: [\n\t${subRequests + .map(m => { + return stringify(m); + }) + .join(',\n\t')}]\n========================================` + ); +} + async function signSubRequests( params: Array ): Promise> { @@ -356,6 +370,8 @@ async function signSubRequests( }) ); + logBuildSubRequests(signedRequests); + return signedRequests; } diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 796a08dfb6..84adaf0af5 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -5,6 +5,7 @@ import { v4 } from 'uuid'; import { StringUtils } from '../..'; import { Data } from '../../../../data/data'; import { deleteMessagesFromSwarmOnly } from '../../../../interactions/conversations/unsendingInteractions'; +import { messageHashesExpired } from '../../../../state/ducks/conversations'; import { MetaGroupWrapperActions, MultiEncryptWrapperActions, @@ -217,8 +218,21 @@ class GroupPendingRemovalsJob extends PersistedJob ({ + conversationKey: groupPk, + messageHash, + })) + ) + ); + } } } } catch (e) { diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index 5dd00b59dd..e846513cfa 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -11,6 +11,7 @@ import { } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { DeleteAllFromGroupMsgNodeSubRequest, + DeleteHashesFromGroupNodeSubRequest, StoreGroupKeysSubRequest, StoreGroupMessageSubRequest, SubaccountRevokeSubRequest, @@ -144,27 +145,30 @@ async function pushChangesToGroupSwarmIfNeeded({ m => m instanceof SubaccountRevokeSubRequest || m instanceof SubaccountUnrevokeSubRequest || - m instanceof DeleteAllFromGroupMsgNodeSubRequest + m instanceof DeleteAllFromGroupMsgNodeSubRequest || + m instanceof DeleteHashesFromGroupNodeSubRequest ); + const sortedSubRequests = compact([ + supplementalKeysSubRequest, // this needs to be stored first + ...pendingConfigRequests, // groupKeys are first in this array, so all good, then groupInfos are next + ...extraStoreRequests, // this can be stored anytime + ...extraRequests, + ]); + const result = await MessageSender.sendEncryptedDataToSnode({ // Note: this is on purpose that supplementalKeysSubRequest is before pendingConfigRequests // as this is to avoid a race condition where a device is polling right // while we are posting the configs (already encrypted with the new keys) - sortedSubRequests: compact([ - supplementalKeysSubRequest, // this needs to be stored first - ...pendingConfigRequests, // groupKeys are first in this array, so all good, then groupInfos are next - ...extraStoreRequests, // this can be stored anytime - ...extraRequests, - ]), + sortedSubRequests, destination: groupPk, method: 'sequence', }); const expectedReplyLength = - pendingConfigRequests.length + // each of those are sent as a subrequest (supplementalKeysSubRequest ? 1 : 0) + // we are sending all the supplemental keys as a single subrequest - (extraStoreRequests ? 1 : 0) + // each of those are sent as a subrequest + pendingConfigRequests.length + // each of those are sent as a subrequest + extraStoreRequests.length + // each of those are sent as a subrequest extraRequestWithExpectedResults.length; // each of those are sent as a subrequest, but they don't all return something... // we do a sequence call here. If we do not have the right expected number of results, consider it a failure diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index a193daf8c3..0c9dbad635 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -601,18 +601,32 @@ function handleMessagesChangedOrAdded( function handleMessageExpiredOrDeleted( state: ConversationsStateType, - payload: { - messageId: string; - conversationKey: string; - } + payload: { conversationKey: string } & ( + | { + messageId: string; + } + | { + messageHash: string; + } + ) ) { - const { conversationKey, messageId } = payload; + const { conversationKey } = payload; + const messageId = (payload as any).messageId as string | undefined; + const messageHash = (payload as any).messageHash as string | undefined; + if (conversationKey === state.selectedConversation) { // search if we find this message id. // we might have not loaded yet, so this case might not happen - const messageInStoreIndex = state?.messages.findIndex(m => m.propsForMessage.id === messageId); + const messageInStoreIndex = state?.messages.findIndex( + m => + (messageId && m.propsForMessage.id === messageId) || + (messageHash && m.propsForMessage.messageHash === messageHash) + ); const editedQuotes = { ...state.quotes }; if (messageInStoreIndex >= 0) { + const msgToRemove = state.messages[messageInStoreIndex]; + const extractedMessageId = msgToRemove.propsForMessage.id; + // we cannot edit the array directly, so slice the first part, and slice the second part, // keeping the index removed out const editedMessages = [ @@ -637,7 +651,9 @@ function handleMessageExpiredOrDeleted( messages: editedMessages, quotes: editedQuotes, firstUnreadMessageId: - state.firstUnreadMessageId === messageId ? undefined : state.firstUnreadMessageId, + state.firstUnreadMessageId === extractedMessageId + ? undefined + : state.firstUnreadMessageId, }; } @@ -649,10 +665,16 @@ function handleMessageExpiredOrDeleted( function handleMessagesExpiredOrDeleted( state: ConversationsStateType, action: PayloadAction< - Array<{ - messageId: string; - conversationKey: string; - }> + Array< + { conversationKey: string } & ( + | { + messageId: string; + } + | { + messageHash: string; + } + ) + > > ): ConversationsStateType { let stateCopy = state; @@ -797,6 +819,17 @@ const conversationsSlice = createSlice({ ) { return handleMessagesExpiredOrDeleted(state, action); }, + messageHashesExpired( + state: ConversationsStateType, + action: PayloadAction< + Array<{ + messageHash: string; + conversationKey: string; + }> + > + ) { + return handleMessagesExpiredOrDeleted(state, action); + }, messagesDeleted( state: ConversationsStateType, @@ -1139,6 +1172,7 @@ export const { conversationRemoved, removeAllConversations, messagesExpired, + messageHashesExpired, messagesDeleted, conversationReset, messagesChanged, diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 36b8a7c6c8..413ff8f4ac 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -308,11 +308,15 @@ export function toFixedUint8ArrayOfLength( } export function stringify(obj: unknown) { - return JSON.stringify(obj, (_key, value) => { - return value instanceof Uint8Array - ? `Uint8Array(${value.length}): ${toHex(value)}` - : value?.type === 'Buffer' && value?.data - ? `Buffer: ${toHex(value.data)}` - : value; - }); + return JSON.stringify( + obj, + (_key, value) => { + return value instanceof Uint8Array + ? `Uint8Array(${value.length}): ${toHex(value)}` + : value?.type === 'Buffer' && value?.data + ? `Buffer: ${toHex(value.data)}` + : value; + }, + 2 + ); } diff --git a/ts/window.d.ts b/ts/window.d.ts index 06b052c3c7..9a7dc27d9a 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -34,6 +34,7 @@ declare global { debug: { debugLogging: boolean; debugLibsessionDumps: boolean; + debugBuiltSnodeRequests: boolean; debugFileServerRequests: boolean; debugNonSnodeRequests: boolean; debugOnionRequests: boolean; From 522d82d7643bc5f7d73a353e350b68f5bf4132a3 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 11 Jul 2024 16:54:23 +1000 Subject: [PATCH 140/302] chore: cleanup logs --- ts/state/ducks/metaGroups.ts | 51 +++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index a4477bfb21..aaee96d39f 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -1346,9 +1346,10 @@ const metaGroupSlice = createSlice({ if (infos && members) { state.infos[groupPk] = infos; state.members[groupPk] = members; - - // window.log.debug(`groupInfo after merge: ${stringify(infos)}`); - // window.log.debug(`groupMembers after merge: ${stringify(members)}`); + if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { + window.log.info(`groupInfo after merge: ${stringify(infos)}`); + window.log.info(`groupMembers after merge: ${stringify(members)}`); + } refreshConvosModelProps([groupPk]); } else { window.log.debug( @@ -1369,9 +1370,10 @@ const metaGroupSlice = createSlice({ state.infos[groupPk] = infos; state.members[groupPk] = members; refreshConvosModelProps([groupPk]); - - window.log.debug(`groupInfo after handleUserGroupUpdate: ${stringify(infos)}`); - window.log.debug(`groupMembers after handleUserGroupUpdate: ${stringify(members)}`); + if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { + window.log.info(`groupInfo after handleUserGroupUpdate: ${stringify(infos)}`); + window.log.info(`groupMembers after handleUserGroupUpdate: ${stringify(members)}`); + } } else { window.log.debug( `handleUserGroupUpdate no details found, removing from slice: ${groupPk}}` @@ -1390,9 +1392,12 @@ const metaGroupSlice = createSlice({ state.infos[groupPk] = infos; state.members[groupPk] = members; refreshConvosModelProps([groupPk]); - - window.log.debug(`groupInfo after currentDeviceGroupMembersChange: ${stringify(infos)}`); - window.log.debug(`groupMembers after currentDeviceGroupMembersChange: ${stringify(members)}`); + if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { + window.log.info(`groupInfo after currentDeviceGroupMembersChange: ${stringify(infos)}`); + window.log.info( + `groupMembers after currentDeviceGroupMembersChange: ${stringify(members)}` + ); + } }); builder.addCase(currentDeviceGroupMembersChange.rejected, (state, action) => { window.log.error('a currentDeviceGroupMembersChange was rejected', action.error); @@ -1410,9 +1415,10 @@ const metaGroupSlice = createSlice({ state.infos[groupPk] = infos; state.members[groupPk] = members; refreshConvosModelProps([groupPk]); - - window.log.debug(`groupInfo after currentDeviceGroupNameChange: ${stringify(infos)}`); - window.log.debug(`groupMembers after currentDeviceGroupNameChange: ${stringify(members)}`); + if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { + window.log.info(`groupInfo after currentDeviceGroupNameChange: ${stringify(infos)}`); + window.log.info(`groupMembers after currentDeviceGroupNameChange: ${stringify(members)}`); + } }); builder.addCase(currentDeviceGroupNameChange.rejected, (state, action) => { window.log.error(`a ${currentDeviceGroupNameChange.name} was rejected`, action.error); @@ -1428,9 +1434,10 @@ const metaGroupSlice = createSlice({ state.infos[groupPk] = infos; state.members[groupPk] = members; refreshConvosModelProps([groupPk]); - - window.log.debug(`groupInfo after handleMemberLeftMessage: ${stringify(infos)}`); - window.log.debug(`groupMembers after handleMemberLeftMessage: ${stringify(members)}`); + if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { + window.log.info(`groupInfo after handleMemberLeftMessage: ${stringify(infos)}`); + window.log.info(`groupMembers after handleMemberLeftMessage: ${stringify(members)}`); + } }); builder.addCase(handleMemberLeftMessage.rejected, (_state, action) => { window.log.error('a handleMemberLeftMessage was rejected', action.error); @@ -1442,9 +1449,10 @@ const metaGroupSlice = createSlice({ state.infos[groupPk] = infos; state.members[groupPk] = members; refreshConvosModelProps([groupPk]); - - window.log.debug(`groupInfo after markUsAsAdmin: ${stringify(infos)}`); - window.log.debug(`groupMembers after markUsAsAdmin: ${stringify(members)}`); + if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { + window.log.info(`groupInfo after markUsAsAdmin: ${stringify(infos)}`); + window.log.info(`groupMembers after markUsAsAdmin: ${stringify(members)}`); + } }); builder.addCase(markUsAsAdmin.rejected, (_state, action) => { window.log.error('a markUsAsAdmin was rejected', action.error); @@ -1455,9 +1463,10 @@ const metaGroupSlice = createSlice({ state.infos[groupPk] = infos; state.members[groupPk] = members; refreshConvosModelProps([groupPk]); - - window.log.debug(`groupInfo after inviteResponseReceived: ${stringify(infos)}`); - window.log.debug(`groupMembers after inviteResponseReceived: ${stringify(members)}`); + if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { + window.log.info(`groupInfo after inviteResponseReceived: ${stringify(infos)}`); + window.log.info(`groupMembers after inviteResponseReceived: ${stringify(members)}`); + } }); builder.addCase(inviteResponseReceived.rejected, (_state, action) => { window.log.error('a inviteResponseReceived was rejected', action.error); From 79aca9c2313e01613a7775fd861fb891db35f707 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 15 Jul 2024 11:41:00 +1000 Subject: [PATCH 141/302] fix: open url confirm is Primary color and not destructive also delete all messages when reinvited to a group we were kicked from --- _locales/en/messages.json | 3 ++- ts/components/conversation/SessionConversation.tsx | 6 ++++-- ts/components/dialog/SessionConfirm.tsx | 8 +++++++- ts/interactions/conversations/unsendingInteractions.ts | 2 +- ts/models/conversation.ts | 2 +- ts/receiver/closedGroups.ts | 2 +- ts/receiver/groupv2/handleGroupV2Message.ts | 10 +++++++++- .../utils/job_runners/jobs/GroupPendingRemovalsJob.ts | 2 +- ts/types/LocalizerKeys.ts | 2 ++ 9 files changed, 28 insertions(+), 9 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 745dea7778..d498763cd0 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -494,8 +494,9 @@ "device": "Device", "destination": "Destination", "learnMore": "Learn more", - "linkVisitWarningTitle": "Open this link in your browser?", + "linkVisitWarningTitle": "Open URL", "linkVisitWarningMessage": "Are you sure you want to open $url$ in your browser?", + "copyUrl": "Copy URL", "open": "Open", "audioMessageAutoplayTitle": "Autoplay Audio Messages", "audioMessageAutoplayDescription": "Autoplay consecutive audio messages.", diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index 60fe629c0b..73b789059f 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -59,6 +59,8 @@ import { NoticeBanner } from '../NoticeBanner'; import { SessionSpinner } from '../basic/SessionSpinner'; import { ConversationMessageRequestButtons } from './MessageRequestButtons'; import { RightPanel, StyledRightPanelContainer } from './right-panel/RightPanel'; +import { showLinkVisitWarningDialog } from '../dialog/SessionConfirm'; +import { useDispatch } from 'react-redux'; const DEFAULT_JPEG_QUALITY = 0.85; interface State { @@ -671,7 +673,7 @@ function OutdatedLegacyGroupBanner(props: { selectedConversation: Pick; }) { const { selectedConversation } = props; - // const dispatch = useDispatch(); + const dispatch = useDispatch(); const isLegacyGroup = !selectedConversation.isPrivate && @@ -682,7 +684,7 @@ function OutdatedLegacyGroupBanner(props: { { - // showLinkVisitWarningDialog('', dispatch); + showLinkVisitWarningDialog('', dispatch); throw new Error('TODO'); // fixme audric }} icon="externalLink" diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx index 229a905ffe..32e0d8a2b5 100644 --- a/ts/components/dialog/SessionConfirm.tsx +++ b/ts/components/dialog/SessionConfirm.tsx @@ -219,18 +219,24 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => { ); }; + + + + export const showLinkVisitWarningDialog = (urlToOpen: string, dispatch: Dispatch) => { function onClickOk() { void shell.openExternal(urlToOpen); } + + dispatch( updateConfirmModal({ title: window.i18n('linkVisitWarningTitle'), message: window.i18n('linkVisitWarningMessage', [urlToOpen]), okText: window.i18n('open'), okTheme: SessionButtonColor.Primary, - cancelText: window.i18n('editMenuCopy'), + cancelText: window.i18n('copyUrl'), showExitIcon: true, onClickOk, onClickClose: () => { diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 7e982c4c41..76b03c3414 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -87,7 +87,7 @@ export async function unsendMessagesForEveryoneGroupV2({ await getMessageQueue().sendToGroupV2NonDurably({ message: new GroupUpdateDeleteMemberContentMessage({ createAtNetworkTimestamp: GetNetworkTime.now(), - expirationType: 'unknown', // this is not displayed so not expiring. + expirationType: 'unknown', // GroupUpdateDeleteMemberContentMessage is not displayed so not expiring. expireTimer: 0, groupPk, memberSessionIds: allMessagesFrom, diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 4860e1c613..7e86e73870 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1101,7 +1101,7 @@ export class ConversationModel extends Backbone.Model { if (this.isClosedGroup()) { if (this.isAdmin(UserUtils.getOurPubKeyStrFromCache())) { if (this.isClosedGroupV2()) { - if (!PubKey.is03Pubkey(this.id)) { + if (!PubKey.is03Pubkey(this.id)) { throw new Error('updateExpireTimer v2 group requires a 03 key'); } const group = await UserGroupsWrapperActions.getGroup(this.id); diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 049c53af7a..b1b6490682 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -357,7 +357,7 @@ export async function handleNewClosedGroup( members, admins, activeAt: envelopeTimestamp, - expirationType: 'unknown', + expirationType: 'unknown', // group creation message, is not expiring expireTimer: 0, }; diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index bbb05a9102..32b44ef70c 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -30,6 +30,7 @@ import { UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; import { WithMessageHash } from '../../session/types/with'; +import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; type WithSignatureTimestamp = { signatureTimestamp: number }; type WithAuthor = { author: PubkeyType }; @@ -66,7 +67,7 @@ async function sendInviteResponseToGroup({ groupPk }: { groupPk: GroupPubkeyType groupPk, isApproved: true, createAtNetworkTimestamp: GetNetworkTime.now(), - expirationType: 'unknown', // an invite should not expire + expirationType: 'unknown', // an invite response should not expire expireTimer: 0, }), }); @@ -124,6 +125,7 @@ async function handleGroupInviteMessage({ const userEd25519Secretkey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes; let found = await UserGroupsWrapperActions.getGroup(groupPk); + const wasKicked = found?.kicked || false; if (!found) { found = { authData: null, @@ -153,6 +155,12 @@ async function handleGroupInviteMessage({ await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id); + if (wasKicked && !found.kicked) { + // we have been reinvited to a group which we had been kicked from. + // Let's empty the conversation again to remove any "you were removed from the group" control message + await deleteAllMessagesByConvoIdNoConfirmation(groupPk); + } + await MetaGroupWrapperActions.init(groupPk, { metaDumped: null, groupEd25519Secretkey: null, diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 84adaf0af5..b8cb17aa80 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -173,7 +173,7 @@ class GroupPendingRemovalsJob extends PersistedJob Date: Mon, 15 Jul 2024 15:53:51 +1000 Subject: [PATCH 142/302] fix: add name property to GroupPromoteMessage --- protos/SignalService.proto | 1 + ts/receiver/groupv2/handleGroupV2Message.ts | 4 ++-- ts/session/apis/snode_api/signature/groupSignature.ts | 3 +++ .../group_v2/to_user/GroupUpdatePromoteMessage.ts | 7 +++++++ ts/session/utils/job_runners/jobs/GroupPromoteJob.ts | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 010513269d..5242d158e7 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -115,6 +115,7 @@ message GroupUpdateMemberChangeMessage { message GroupUpdatePromoteMessage { required bytes groupIdentitySeed = 1; + required string name = 2; } message GroupUpdateMemberLeftMessage { diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 32b44ef70c..38d2c5a7d2 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -73,7 +73,7 @@ async function sendInviteResponseToGroup({ groupPk }: { groupPk: GroupPubkeyType }); } -async function handleGroupInviteMessage({ +async function handleGroupUpdateInviteMessage({ inviteMessage, author, signatureTimestamp, @@ -555,7 +555,7 @@ async function handle1o1GroupUpdateMessage( throw new PreConditionFailed('received group invite/promote with invalid author'); } if (details.updateMessage.inviteMessage) { - await handleGroupInviteMessage({ + await handleGroupUpdateInviteMessage({ inviteMessage: details.updateMessage .inviteMessage as SignalService.GroupUpdateInviteMessage, ...details, diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index efee04473a..3264dafd5b 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -61,10 +61,12 @@ async function getGroupPromoteMessage({ member, secretKey, groupPk, + name, }: { member: PubkeyType; secretKey: Uint8ArrayLen64; // len 64 groupPk: GroupPubkeyType; + name: string; }) { const createAtNetworkTimestamp = GetNetworkTime.now(); @@ -78,6 +80,7 @@ async function getGroupPromoteMessage({ groupIdentitySeed: secretKey.slice(0, 32), // the seed is the first 32 bytes of the secretkey expirationType: 'unknown', // a promote message is not expiring expireTimer: 0, + name, }); return msg; } diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts index 84782223da..5c5c202830 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts @@ -5,6 +5,7 @@ import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMess interface Params extends GroupUpdateMessageParams { groupPk: GroupPubkeyType; groupIdentitySeed: Uint8Array; + name: string; } /** @@ -12,19 +13,25 @@ interface Params extends GroupUpdateMessageParams { */ export class GroupUpdatePromoteMessage extends GroupUpdateMessage { public readonly groupIdentitySeed: Params['groupIdentitySeed']; + public readonly name: Params['name']; constructor(params: Params) { super(params); this.groupIdentitySeed = params.groupIdentitySeed; + this.name = params.name; if (!this.groupIdentitySeed || this.groupIdentitySeed.length !== 32) { throw new Error('groupIdentitySeed must be set'); } + if (!this.name) { + throw new Error('name must be set and not empty'); + } } public dataProto(): SignalService.DataMessage { const promoteMessage = new SignalService.GroupUpdatePromoteMessage({ groupIdentitySeed: this.groupIdentitySeed, + name: this.name, }); return new SignalService.DataMessage({ diff --git a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts index 0fb9fde3e3..9ae1675d2d 100644 --- a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts @@ -102,6 +102,7 @@ class GroupPromoteJob extends PersistedJob { member, secretKey: group.secretKey, groupPk, + name: group.name, }); const storedAt = await getMessageQueue().sendTo1o1NonDurably({ From 74aa4486311a220260bdd014284ebf96c336a8d0 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 24 Jul 2024 14:23:32 +1000 Subject: [PATCH 143/302] chore: commit before merge unstable --- _locales/en/messages.json | 2 + package.json | 2 +- .../conversation/SessionConversation.tsx | 2 +- .../conversation/SubtleNotification.tsx | 11 +- .../composition/CompositionBox.tsx | 2 +- ts/components/dialog/InviteContactsDialog.tsx | 5 +- ts/components/dialog/SessionConfirm.tsx | 6 - ts/components/leftpane/ActionsPanel.tsx | 1 + .../leftpane/overlay/OverlayClosedGroup.tsx | 20 +++ ts/models/conversation.ts | 2 +- ts/receiver/groupv2/handleGroupV2Message.ts | 110 +++++++++--- .../snode_api/signature/groupSignature.ts | 6 +- .../SwarmPollingGroupConfig.ts | 157 +++++++++++------- .../conversations/ConversationController.ts | 2 +- .../to_user/GroupUpdatePromoteMessage.ts | 10 +- ts/session/onions/onionSend.ts | 7 - .../utils/job_runners/jobs/GroupInviteJob.ts | 19 ++- .../jobs/GroupPendingRemovalsJob.ts | 2 +- .../utils/job_runners/jobs/GroupPromoteJob.ts | 8 +- .../utils/libsession/libsession_utils.ts | 2 +- ts/state/ducks/metaGroups.ts | 65 +------- ts/state/selectors/conversations.ts | 1 + ts/state/selectors/userGroups.ts | 7 + .../libsession_wrapper_metagroup_test.ts | 29 ++-- ts/types/LocalizerKeys.ts | 2 + .../browser/libsession_worker_interface.ts | 38 +++-- ts/window.d.ts | 1 + yarn.lock | 62 ++++--- 28 files changed, 349 insertions(+), 232 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index d498763cd0..36ebc52399 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -578,6 +578,8 @@ "respondingToGroupRequestWarning": "Sending a message to this group will automatically accept the group invite.", "userInvitedYouToGroup": "$name$ invited you to join $groupName$.", "youWereInvitedToGroup": "You were invited to join $groupName$.", + "userInvitedYouToGroupAsAdmin": "$name$ invited you to join $groupName$, where you are an Admin.", + "youWereInvitedToGroupAsAdmin": "You were invited to join $groupName$, where you are an Admin.", "hideRequestBanner": "Hide Message Request Banner", "openMessageRequestInbox": "Message Requests", "noMessageRequestsPending": "No pending message requests", diff --git a/package.json b/package.json index 5823f6b4ec..0f481a6a58 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.19/libsession_util_nodejs-v0.3.19.tar.gz", + "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.21/libsession_util_nodejs-v0.3.21.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index 73b789059f..1f58320fee 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -6,6 +6,7 @@ import { blobToArrayBuffer } from 'blob-util'; import loadImage from 'blueimp-load-image'; import classNames from 'classnames'; import styled from 'styled-components'; +import { useDispatch } from 'react-redux'; import { CompositionBox, SendMessageType, @@ -60,7 +61,6 @@ import { SessionSpinner } from '../basic/SessionSpinner'; import { ConversationMessageRequestButtons } from './MessageRequestButtons'; import { RightPanel, StyledRightPanelContainer } from './right-panel/RightPanel'; import { showLinkVisitWarningDialog } from '../dialog/SessionConfirm'; -import { useDispatch } from 'react-redux'; const DEFAULT_JPEG_QUALITY = 0.85; interface State { diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index be4e50bf83..02840cb98d 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -25,6 +25,7 @@ import { useLibGroupInviteGroupName, useLibGroupInvitePending, useLibGroupKicked, + useLibGroupWeHaveSecretKey, } from '../../state/selectors/userGroups'; import { LocalizerKeys } from '../../types/LocalizerKeys'; import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; @@ -119,6 +120,8 @@ export const InvitedToGroupControlMessage = () => { const adminNameInvitedUs = useNicknameOrProfileNameOrShortenedPubkey(conversationOrigin) || window.i18n('unknown'); const isGroupPendingInvite = useLibGroupInvitePending(selectedConversation); + const weHaveSecretKey = useLibGroupWeHaveSecretKey(selectedConversation); + if ( !selectedConversation || isApproved || @@ -131,8 +134,12 @@ export const InvitedToGroupControlMessage = () => { } // when restoring from seed we might not have the pubkey of who invited us, in that case, we just use a fallback const html = conversationOrigin - ? window.i18n('userInvitedYouToGroup', [adminNameInvitedUs, groupName]) - : window.i18n('youWereInvitedToGroup', [groupName]); + ? weHaveSecretKey + ? window.i18n('userInvitedYouToGroupAsAdmin', [adminNameInvitedUs, groupName]) + : window.i18n('userInvitedYouToGroup', [adminNameInvitedUs, groupName]) + : weHaveSecretKey + ? window.i18n('youWereInvitedToGroupAsAdmin', [groupName]) + : window.i18n('youWereInvitedToGroup', [groupName]); return ( { data-testid="message-input-text-area" style={style} suggestionsPortalHost={this.container as any} - forceSuggestionsAboveCursor={true} // force mentions to be rendered on top of the cursor, this is working with a fork of react-mentions for now + forceSuggestionsAboveCursor={true} > { {hasContacts && isGroupV2 && } - {isGroupV2 && ( + + {/* TODO: localize those strings once out releasing those buttons for real */} + {isGroupV2 && isDevProd() && ( <> Share History?{' '} diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx index 32e0d8a2b5..c171dfd551 100644 --- a/ts/components/dialog/SessionConfirm.tsx +++ b/ts/components/dialog/SessionConfirm.tsx @@ -219,17 +219,11 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => { ); }; - - - - export const showLinkVisitWarningDialog = (urlToOpen: string, dispatch: Dispatch) => { function onClickOk() { void shell.openExternal(urlToOpen); } - - dispatch( updateConfirmModal({ title: window.i18n('linkVisitWarningTitle'), diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index cbd1f3fcb9..fef26e3b5b 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -1,3 +1,4 @@ +/* eslint-disable no-await-in-loop */ import { ipcRenderer } from 'electron'; import React, { useEffect, useState } from 'react'; diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index fe8db6d1b1..03569a6dd8 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -5,6 +5,7 @@ import useKey from 'react-use/lib/useKey'; import styled from 'styled-components'; import { concat } from 'lodash'; +import useUpdate from 'react-use/lib/useUpdate'; import { MemberListItem } from '../../MemberListItem'; import { SessionButton } from '../../basic/SessionButton'; import { SessionIdEditable } from '../../basic/SessionIdEditable'; @@ -24,6 +25,8 @@ import { useOurPkStr } from '../../../state/selectors/user'; import { SessionSearchInput } from '../../SessionSearchInput'; import { SpacerLG } from '../../basic/Text'; import { GroupInviteRequiredVersionBanner } from '../../NoticeBanner'; +import { isDevProd } from '../../../shared/env_vars'; +import { SessionToggle } from '../../basic/SessionToggle'; const StyledMemberListNoContacts = styled.div` font-family: var(--font-mono), var(--font-default); @@ -100,6 +103,7 @@ export const OverlayClosedGroupV2 = () => { const privateContactsPubkeys = useContactsToInviteToGroup(); const isCreatingGroup = useIsCreatingGroupFromUIPending(); const [groupName, setGroupName] = useState(''); + const forceUpdate = useUpdate(); const { uniqueValues: members, addTo: addToSelected, @@ -177,6 +181,22 @@ export const OverlayClosedGroupV2 = () => { />
+ {/* TODO: localize those strings once out releasing those buttons for real */} + {isDevProd() && ( + <> + + Invite as admin?{' '} + { + window.sessionFeatureFlags.useGroupV2InviteAsAdmin = + !window.sessionFeatureFlags.useGroupV2InviteAsAdmin; + forceUpdate(); + }} + /> + + + )} {!noContactsForClosedGroup && window.sessionFeatureFlags.useClosedGroupV2 && ( diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 7e86e73870..4860e1c613 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1101,7 +1101,7 @@ export class ConversationModel extends Backbone.Model { if (this.isClosedGroup()) { if (this.isAdmin(UserUtils.getOurPubKeyStrFromCache())) { if (this.isClosedGroupV2()) { - if (!PubKey.is03Pubkey(this.id)) { + if (!PubKey.is03Pubkey(this.id)) { throw new Error('updateExpireTimer v2 group requires a 03 key'); } const group = await UserGroupsWrapperActions.getGroup(this.id); diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 38d2c5a7d2..88f45c170c 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -1,6 +1,7 @@ import { GroupPubkeyType, PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; import { compact, isEmpty, isFinite, isNumber } from 'lodash'; import { Data } from '../../data/data'; +import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; import { deleteMessagesFromSwarmOnly } from '../../interactions/conversations/unsendingInteractions'; import { ConversationTypeEnum } from '../../models/conversationAttributes'; import { HexString } from '../../node/hexStrings'; @@ -14,6 +15,7 @@ import { WithDisappearingMessageUpdate } from '../../session/disappearing_messag import { ClosedGroup } from '../../session/group/closed-group'; import { GroupUpdateInviteResponseMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage'; import { PubKey } from '../../session/types'; +import { WithMessageHash } from '../../session/types/with'; import { UserUtils } from '../../session/utils'; import { sleepFor } from '../../session/utils/Promise'; import { ed25519Str, stringToUint8Array } from '../../session/utils/String'; @@ -29,8 +31,6 @@ import { MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; -import { WithMessageHash } from '../../session/types/with'; -import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; type WithSignatureTimestamp = { signatureTimestamp: number }; type WithAuthor = { author: PubkeyType }; @@ -503,41 +503,109 @@ async function handleGroupUpdateInviteResponseMessage({ async function handleGroupUpdatePromoteMessage({ change, + author, + signatureTimestamp, }: Omit, 'groupPk'>) { const seed = change.groupIdentitySeed; const sodium = await getSodiumRenderer(); const groupKeypair = sodium.crypto_sign_seed_keypair(seed); const groupPk = `03${HexString.toHexString(groupKeypair.publicKey)}` as GroupPubkeyType; + // we can be invited via a GroupUpdatePromoteMessage as an admin right away, + // so we potentially need to deal with part of the invite process here too. - const convo = ConvoHub.use().get(groupPk); - if (!convo) { + if (BlockedNumberController.isBlocked(author)) { + window.log.info( + `received promote to group ${ed25519Str(groupPk)} by blocked user:${ed25519Str( + author + )}... dropping it` + ); return; } - window.log.info(`handleGroupUpdatePromoteMessage for ${ed25519Str(groupPk)}`); - // no group update message here, another message is sent to the group's swarm for the update message. - // this message is just about the keys that we need to save, and accepting the promotion. + const authorIsApproved = ConvoHub.use().get(author)?.isApproved() || false; + window.log.info( + `received promote to group ${ed25519Str(groupPk)} by author:${ed25519Str(author)}. authorIsApproved:${authorIsApproved} ` + ); - const found = await UserGroupsWrapperActions.getGroup(groupPk); + const convo = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); + convo.set({ + active_at: signatureTimestamp, + didApproveMe: true, + conversationIdOrigin: author, + }); + + if (change.name && isEmpty(convo.getRealSessionUsername())) { + convo.set({ + displayNameInProfile: change.name, + }); + } + const userEd25519Secretkey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes; + + let found = await UserGroupsWrapperActions.getGroup(groupPk); + const wasKicked = found?.kicked || false; if (!found) { - // could have been removed by the user already so let's not force create it - window.log.info( - 'received group promote message but that group is not in the usergroups wrapper' - ); - return; + found = { + authData: null, + joinedAtSeconds: Date.now(), + name: change.name, + priority: 0, + pubkeyHex: groupPk, + secretKey: groupKeypair.privateKey, + kicked: false, + invitePending: true, + }; + } else { + found.kicked = false; + found.name = change.name; + found.secretKey = groupKeypair.privateKey; + } + if (authorIsApproved) { + // pre approve invite to groups when we've already approved the person who invited us + found.invitePending = false; } - found.secretKey = groupKeypair.privateKey; + await UserGroupsWrapperActions.setGroup(found); - await UserSync.queueNewJobIfNeeded(); + // force markedAsUnread to be true so it shows the unread banner (we only show the banner if there are unread messages on at least one msg/group request) + await convo.markAsUnread(true, false); + await convo.commit(); - window.inboxStore.dispatch( - groupInfoActions.markUsAsAdmin({ - groupPk, - secret: groupKeypair.privateKey, - }) - ); + await SessionUtilConvoInfoVolatile.insertConvoFromDBIntoWrapperAndRefresh(convo.id); + + if (wasKicked) { + // we have been reinvited to a group which we had been kicked from. + // Let's empty the conversation again to remove any "you were removed from the group" control message + await deleteAllMessagesByConvoIdNoConfirmation(groupPk); + } + try { + await MetaGroupWrapperActions.init(groupPk, { + metaDumped: null, + groupEd25519Secretkey: groupKeypair.privateKey, + userEd25519Secretkey: toFixedUint8ArrayOfLength(userEd25519Secretkey, 64).buffer, + groupEd25519Pubkey: toFixedUint8ArrayOfLength(HexString.fromHexStringNoPrefix(groupPk), 32) + .buffer, + }); + } catch (e) { + window.log.warn( + `handleGroupUpdatePromoteMessage: init of ${ed25519Str(groupPk)} failed with ${e.message}. Trying to just load admin keys` + ); + try { + await MetaGroupWrapperActions.loadAdminKeys(groupPk, groupKeypair.privateKey); + } catch (e2) { + window.log.warn( + `handleGroupUpdatePromoteMessage: loadAdminKeys of ${ed25519Str(groupPk)} failed with ${e.message}` + ); + } + } + + await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); + await UserSync.queueNewJobIfNeeded(); + if (!found.invitePending) { + // This group should already be polling based on if that author is pre-approved or we've already approved that group from another device. + // Start polling from it, we will mark ourselves as admin once we get the first merge result, if needed. + getSwarmPollingInstance().addGroupId(groupPk); + } } async function handle1o1GroupUpdateMessage( diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 3264dafd5b..30ac61e712 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -61,12 +61,12 @@ async function getGroupPromoteMessage({ member, secretKey, groupPk, - name, + groupName, }: { member: PubkeyType; secretKey: Uint8ArrayLen64; // len 64 groupPk: GroupPubkeyType; - name: string; + groupName: string; }) { const createAtNetworkTimestamp = GetNetworkTime.now(); @@ -80,7 +80,7 @@ async function getGroupPromoteMessage({ groupIdentitySeed: secretKey.slice(0, 32), // the seed is the first 32 bytes of the secretkey expirationType: 'unknown', // a promote message is not expiring expireTimer: 0, - name, + groupName, }); return msg; } diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 0d2e9c220f..6911bf2eed 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -15,6 +15,8 @@ import { SnodeNamespaces } from '../namespaces'; import { RetrieveMessageItemWithNamespace } from '../types'; import { ConvoHub } from '../../../conversations'; import { ProfileManager } from '../../../profile_manager/ProfileManager'; +import { UserUtils } from '../../../utils'; +import { GroupSync } from '../../../utils/job_runners/jobs/GroupSyncJob'; /** * This is a basic optimization to avoid running the logic when the `deleteBeforeSeconds` @@ -36,74 +38,105 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { to_hex(dumps) ); } - if (infos) { - if (infos.isDestroyed) { - window.log.info(`${ed25519Str(groupPk)} is marked as destroyed after merge. Removing it.`); - await ConvoHub.use().deleteGroup(groupPk, { - sendLeaveMessage: false, - fromSyncMessage: false, - emptyGroupButKeepAsKicked: true, // we just got something from the group's swarm, so it is not pendingInvite - deleteAllMessagesOnSwarm: false, - forceDestroyForAllMembers: false, + if (infos.isDestroyed) { + window.log.info(`${ed25519Str(groupPk)} is marked as destroyed after merge. Removing it.`); + await ConvoHub.use().deleteGroup(groupPk, { + sendLeaveMessage: false, + fromSyncMessage: false, + emptyGroupButKeepAsKicked: true, // we just got something from the group's swarm, so it is not pendingInvite + deleteAllMessagesOnSwarm: false, + forceDestroyForAllMembers: false, + }); + } else { + if ( + isNumber(infos.deleteBeforeSeconds) && + isFinite(infos.deleteBeforeSeconds) && + infos.deleteBeforeSeconds > 0 && + (lastAppliedRemoveMsgSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > + infos.deleteBeforeSeconds + ) { + // delete any messages in this conversation sent before that timestamp (in seconds) + const deletedMsgIds = await Data.removeAllMessagesInConversationSentBefore({ + deleteBeforeSeconds: infos.deleteBeforeSeconds, + conversationId: groupPk, }); - } else { - if ( - isNumber(infos.deleteBeforeSeconds) && - isFinite(infos.deleteBeforeSeconds) && - infos.deleteBeforeSeconds > 0 && - (lastAppliedRemoveMsgSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > - infos.deleteBeforeSeconds - ) { - // delete any messages in this conversation sent before that timestamp (in seconds) - const deletedMsgIds = await Data.removeAllMessagesInConversationSentBefore({ - deleteBeforeSeconds: infos.deleteBeforeSeconds, - conversationId: groupPk, - }); - window.log.info( - `removeAllMessagesInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteBeforeSeconds}: `, - deletedMsgIds - ); - window.inboxStore.dispatch( - messagesExpired(deletedMsgIds.map(messageId => ({ conversationKey: groupPk, messageId }))) - ); - lastAppliedRemoveMsgSentBeforeSeconds.set(groupPk, infos.deleteBeforeSeconds); - } + window.log.info( + `removeAllMessagesInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteBeforeSeconds}: `, + deletedMsgIds + ); + window.inboxStore.dispatch( + messagesExpired(deletedMsgIds.map(messageId => ({ conversationKey: groupPk, messageId }))) + ); + lastAppliedRemoveMsgSentBeforeSeconds.set(groupPk, infos.deleteBeforeSeconds); + } + + if ( + isNumber(infos.deleteAttachBeforeSeconds) && + isFinite(infos.deleteAttachBeforeSeconds) && + infos.deleteAttachBeforeSeconds > 0 && + (lastAppliedRemoveAttachmentSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > + infos.deleteAttachBeforeSeconds + ) { + // delete any attachments in this conversation sent before that timestamp (in seconds) + const impactedMsgModels = await Data.getAllMessagesWithAttachmentsInConversationSentBefore({ + deleteAttachBeforeSeconds: infos.deleteAttachBeforeSeconds, + conversationId: groupPk, + }); + window.log.info( + `getAllMessagesWithAttachmentsInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteAttachBeforeSeconds}: impactedMsgModelsIds `, + impactedMsgModels.map(m => m.id) + ); - if ( - isNumber(infos.deleteAttachBeforeSeconds) && - isFinite(infos.deleteAttachBeforeSeconds) && - infos.deleteAttachBeforeSeconds > 0 && - (lastAppliedRemoveAttachmentSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > - infos.deleteAttachBeforeSeconds - ) { - // delete any attachments in this conversation sent before that timestamp (in seconds) - const impactedMsgModels = await Data.getAllMessagesWithAttachmentsInConversationSentBefore({ - deleteAttachBeforeSeconds: infos.deleteAttachBeforeSeconds, - conversationId: groupPk, - }); - window.log.info( - `getAllMessagesWithAttachmentsInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteAttachBeforeSeconds}: impactedMsgModelsIds `, - impactedMsgModels.map(m => m.id) - ); - - for (let index = 0; index < impactedMsgModels.length; index++) { - const msg = impactedMsgModels[index]; - - // eslint-disable-next-line no-await-in-loop - await msg?.cleanup(); - } - lastAppliedRemoveAttachmentSentBeforeSeconds.set(groupPk, infos.deleteAttachBeforeSeconds); + for (let index = 0; index < impactedMsgModels.length; index++) { + const msg = impactedMsgModels[index]; + + // eslint-disable-next-line no-await-in-loop + await msg?.cleanup(); } + lastAppliedRemoveAttachmentSentBeforeSeconds.set(groupPk, infos.deleteAttachBeforeSeconds); } - const membersWithPendingRemovals = - await MetaGroupWrapperActions.memberGetAllPendingRemovals(groupPk); - if (membersWithPendingRemovals.length) { - const group = await UserGroupsWrapperActions.getGroup(groupPk); - if (group && group.secretKey && !isEmpty(group.secretKey)) { - await GroupPendingRemovals.addJob({ groupPk }); - } + } + const membersWithPendingRemovals = + await MetaGroupWrapperActions.memberGetAllPendingRemovals(groupPk); + if (membersWithPendingRemovals.length) { + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (group && group.secretKey && !isEmpty(group.secretKey)) { + await GroupPendingRemovals.addJob({ groupPk }); } } + + const us = UserUtils.getOurPubKeyStrFromCache(); + const usMember = await MetaGroupWrapperActions.memberGet(groupPk, us); + let keysAlreadyHaveAdmin = await MetaGroupWrapperActions.keysAdmin(groupPk); + const secretKeyInUserWrapper = (await UserGroupsWrapperActions.getGroup(groupPk))?.secretKey; + + // load admin keys if needed + if ( + usMember && + secretKeyInUserWrapper && + !isEmpty(secretKeyInUserWrapper) && + !keysAlreadyHaveAdmin + ) { + try { + await MetaGroupWrapperActions.loadAdminKeys(groupPk, secretKeyInUserWrapper); + keysAlreadyHaveAdmin = await MetaGroupWrapperActions.keysAdmin(groupPk); + } catch (e) { + window.log.warn( + `tried to update our adminKeys/state for group ${ed25519Str(groupPk)} but failed with, ${e.message}` + ); + } + } + // mark ourselves as accepting the invite if needed + if (usMember?.invitePending && keysAlreadyHaveAdmin) { + await MetaGroupWrapperActions.memberSetAccepted(groupPk, us); + } + // mark ourselves as accepting the promotion if needed + if (usMember?.promotionPending && keysAlreadyHaveAdmin) { + await MetaGroupWrapperActions.memberSetPromotionAccepted(groupPk, us); + } + // this won't do anything if there is no need for a sync, so we can safely plan one + await GroupSync.queueNewJobIfNeeded(groupPk); + const convo = ConvoHub.use().get(groupPk); const refreshedInfos = await MetaGroupWrapperActions.infoGet(groupPk); diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index b2c15c5b2c..9892cdd946 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -319,7 +319,7 @@ class ConvoController { const us = UserUtils.getOurPubKeyStrFromCache(); const allMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); const otherAdminsCount = allMembers - .filter(m => m.admin || m.promoted) + .filter(m => m.promoted) .filter(m => m.pubkeyHex !== us).length; const weAreLastAdmin = otherAdminsCount === 0; const infos = await MetaGroupWrapperActions.infoGet(groupPk); diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts index 5c5c202830..312af61a39 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_user/GroupUpdatePromoteMessage.ts @@ -5,7 +5,7 @@ import { GroupUpdateMessage, GroupUpdateMessageParams } from '../GroupUpdateMess interface Params extends GroupUpdateMessageParams { groupPk: GroupPubkeyType; groupIdentitySeed: Uint8Array; - name: string; + groupName: string; } /** @@ -13,17 +13,17 @@ interface Params extends GroupUpdateMessageParams { */ export class GroupUpdatePromoteMessage extends GroupUpdateMessage { public readonly groupIdentitySeed: Params['groupIdentitySeed']; - public readonly name: Params['name']; + public readonly groupName: Params['groupName']; constructor(params: Params) { super(params); this.groupIdentitySeed = params.groupIdentitySeed; - this.name = params.name; + this.groupName = params.groupName; if (!this.groupIdentitySeed || this.groupIdentitySeed.length !== 32) { throw new Error('groupIdentitySeed must be set'); } - if (!this.name) { + if (!this.groupName) { throw new Error('name must be set and not empty'); } } @@ -31,7 +31,7 @@ export class GroupUpdatePromoteMessage extends GroupUpdateMessage { public dataProto(): SignalService.DataMessage { const promoteMessage = new SignalService.GroupUpdatePromoteMessage({ groupIdentitySeed: this.groupIdentitySeed, - name: this.name, + name: this.groupName, }); return new SignalService.DataMessage({ diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts index ccef16b06b..20c57e73a9 100644 --- a/ts/session/onions/onionSend.ts +++ b/ts/session/onions/onionSend.ts @@ -17,7 +17,6 @@ import { FinalRelayOptions, Onions, STATUS_NO_STATUS, - SnodeResponse, buildErrorMessageWithFailedCode, } from '../apis/snode_api/onions'; import { PROTOCOLS } from '../constants'; @@ -75,12 +74,6 @@ const getOnionPathForSending = async () => { return pathNodes; }; -export type OnionSnodeResponse = { - result: SnodeResponse; - txtResponse: string; - response: string; -}; - export type OnionV4SnodeResponse = { body: string | object | null; // if the content can be decoded as string bodyBinary: Uint8Array | null; // otherwise we return the raw content (could be an image data or file from sogs/fileserver) diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 9fb8aba109..f26de93a30 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -153,12 +153,19 @@ class GroupInviteJob extends PersistedJob { } let failed = true; try { - const inviteDetails = await SnodeGroupSignature.getGroupInviteMessage({ - groupName: group.name, - member, - secretKey: group.secretKey, - groupPk, - }); + const inviteDetails = window.sessionFeatureFlags.useGroupV2InviteAsAdmin + ? await SnodeGroupSignature.getGroupPromoteMessage({ + groupName: group.name, + member, + secretKey: group.secretKey, + groupPk, + }) + : await SnodeGroupSignature.getGroupInviteMessage({ + groupName: group.name, + member, + secretKey: group.secretKey, + groupPk, + }); const storedAt = await getMessageQueue().sendTo1o1NonDurably({ message: inviteDetails, diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index b8cb17aa80..b40d6d42e9 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -134,7 +134,7 @@ class GroupPendingRemovalsJob extends PersistedJob m.removedStatus === 2) + .filter(m => m.shouldRemoveMessages) .map(m => m.pubkeyHex); const sessionIdsHex = pendingRemovals.map(m => m.pubkeyHex); diff --git a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts index 9ae1675d2d..0c8ccd4e7f 100644 --- a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts @@ -102,7 +102,7 @@ class GroupPromoteJob extends PersistedJob { member, secretKey: group.secretKey, groupPk, - name: group.name, + groupName: group.name, }); const storedAt = await getMessageQueue().sendTo1o1NonDurably({ @@ -118,7 +118,11 @@ class GroupPromoteJob extends PersistedJob { groupInfoActions.setPromotionPending({ groupPk, pubkey: member, sending: false }) ); try { - await MetaGroupWrapperActions.memberSetPromoted(groupPk, member, failed); + if (failed) { + await MetaGroupWrapperActions.memberSetPromotionFailed(groupPk, member); + } else { + await MetaGroupWrapperActions.memberSetPromotionSent(groupPk, member); + } } catch (e) { window.log.warn('GroupPromoteJob memberSetPromoted failed with', e.message); } diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index f649e94d6e..0244705963 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -410,7 +410,7 @@ async function createMemberAndSetDetails({ await MetaGroupWrapperActions.memberConstructAndSet(groupPk, memberPubkey); if (displayName) { - await MetaGroupWrapperActions.memberSetName(groupPk, memberPubkey, displayName); + await MetaGroupWrapperActions.memberSetNameTruncated(groupPk, memberPubkey, displayName); } if (profileKeyHex && avatarUrl) { await MetaGroupWrapperActions.memberSetProfilePicture(groupPk, memberPubkey, { diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index aaee96d39f..bb3259c6ef 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -156,6 +156,8 @@ const initNewGroupInWrapper = createAsyncThunk( const profileKeyHex = convoMember?.getProfileKey() || null; const avatarUrl = convoMember?.getAvatarPointer() || null; + // we just create the members in the state. Their invite state defaults to NOT_SENT, + // which will make our logic kick in to send them an invite in the `GroupInviteJob` await LibSessionUtil.createMemberAndSetDetails({ avatarUrl, displayName, @@ -165,9 +167,8 @@ const initNewGroupInWrapper = createAsyncThunk( }); if (member === us) { - await MetaGroupWrapperActions.memberSetAdmin(groupPk, member); - } else { - await MetaGroupWrapperActions.memberSetInvited(groupPk, member, false); + // we need to excplicitely mark us as having accepted the promotion + await MetaGroupWrapperActions.memberSetPromotionAccepted(groupPk, member); } } @@ -1122,48 +1123,6 @@ const handleMemberLeftMessage = createAsyncThunk( } ); -const markUsAsAdmin = createAsyncThunk( - 'group/markUsAsAdmin', - async ( - { - groupPk, - secret, - }: { - groupPk: GroupPubkeyType; - secret: Uint8ArrayLen64; - }, - payloadCreator - ): Promise => { - const state = payloadCreator.getState() as StateType; - if (!state.groups.infos[groupPk] || !state.groups.members[groupPk]) { - throw new PreConditionFailed('markUsAsAdmin group not present in redux slice'); - } - if (secret.length !== 64) { - throw new PreConditionFailed('markUsAsAdmin secret needs to be 64'); - } - await MetaGroupWrapperActions.loadAdminKeys(groupPk, secret); - const us = UserUtils.getOurPubKeyStrFromCache(); - - if (state.groups.members[groupPk].find(m => m.pubkeyHex === us)?.admin) { - // we are already an admin, nothing to do - return { - groupPk, - infos: await MetaGroupWrapperActions.infoGet(groupPk), - members: await MetaGroupWrapperActions.memberGetAll(groupPk), - }; - } - await MetaGroupWrapperActions.memberSetAdmin(groupPk, us); - - await GroupSync.queueNewJobIfNeeded(groupPk); - - return { - groupPk, - infos: await MetaGroupWrapperActions.infoGet(groupPk), - members: await MetaGroupWrapperActions.memberGetAll(groupPk), - }; - } -); - const inviteResponseReceived = createAsyncThunk( 'group/inviteResponseReceived', async ( @@ -1443,21 +1402,6 @@ const metaGroupSlice = createSlice({ window.log.error('a handleMemberLeftMessage was rejected', action.error); }); - /** markUsAsAdmin */ - builder.addCase(markUsAsAdmin.fulfilled, (state, action) => { - const { infos, members, groupPk } = action.payload; - state.infos[groupPk] = infos; - state.members[groupPk] = members; - refreshConvosModelProps([groupPk]); - if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { - window.log.info(`groupInfo after markUsAsAdmin: ${stringify(infos)}`); - window.log.info(`groupMembers after markUsAsAdmin: ${stringify(members)}`); - } - }); - builder.addCase(markUsAsAdmin.rejected, (_state, action) => { - window.log.error('a markUsAsAdmin was rejected', action.error); - }); - builder.addCase(inviteResponseReceived.fulfilled, (state, action) => { const { infos, members, groupPk } = action.payload; state.infos[groupPk] = infos; @@ -1488,7 +1432,6 @@ export const groupInfoActions = { refreshGroupDetailsFromWrapper, handleUserGroupUpdate, currentDeviceGroupMembersChange, - markUsAsAdmin, inviteResponseReceived, handleMemberLeftMessage, currentDeviceGroupNameChange, diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 7f70a6fd6b..a747f12e95 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -1,4 +1,5 @@ /* eslint-disable no-restricted-syntax */ + import { createSelector } from '@reduxjs/toolkit'; import { filter, isEmpty, isFinite, isNumber, pick, sortBy, toNumber } from 'lodash'; diff --git a/ts/state/selectors/userGroups.ts b/ts/state/selectors/userGroups.ts index 42c3b59a79..1c2b337048 100644 --- a/ts/state/selectors/userGroups.ts +++ b/ts/state/selectors/userGroups.ts @@ -1,4 +1,5 @@ import { useSelector } from 'react-redux'; +import { isEmpty } from 'lodash'; import { PubKey } from '../../session/types'; import { UserGroupState } from '../ducks/userGroups'; import { StateType } from '../reducer'; @@ -11,6 +12,12 @@ const getGroupById = (state: StateType, convoId?: string) => { : undefined; }; +export function useLibGroupWeHaveSecretKey(convoId?: string) { + return useSelector((state: StateType) => { + return !isEmpty(getGroupById(state, convoId)?.secretKey); + }); +} + export function useLibGroupInvitePending(convoId?: string) { return useSelector((state: StateType) => getGroupById(state, convoId)?.invitePending); } diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 52bab12b28..6e756ee9c6 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -28,8 +28,11 @@ function emptyMember(pubkeyHex: PubkeyType): GroupMemberGet { promoted: false, promotionFailed: false, promotionPending: false, - admin: false, - removedStatus: 0, + inviteAccepted: false, + inviteNotSent: false, + isRemoved: false, + promotionNotSent: false, + shouldRemoveMessages: false, pubkeyHex, }; } @@ -166,7 +169,7 @@ describe('libsession_metagroup', () => { }); it('can add member by setting its promoted state, both ok and nok', () => { - metaGroupWrapper.memberSetPromoted(member, false); + metaGroupWrapper.memberSetPromotionSent(member); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ ...emptyMember(member), @@ -176,7 +179,7 @@ describe('libsession_metagroup', () => { admin: false, }); - metaGroupWrapper.memberSetPromoted(member2, true); + metaGroupWrapper.memberSetPromotionFailed(member2); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); // the list is sorted by member pk, which means that index based test do not work expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ @@ -224,7 +227,7 @@ describe('libsession_metagroup', () => { it('can erase member', () => { metaGroupWrapper.memberSetAccepted(member); - metaGroupWrapper.memberSetPromoted(member2, false); + metaGroupWrapper.memberSetPromoted(member2); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); expect(metaGroupWrapper.memberGet(member)).to.be.deep.eq({ @@ -245,7 +248,7 @@ describe('libsession_metagroup', () => { }); it('can add via name set', () => { - metaGroupWrapper.memberSetName(member, 'member name'); + metaGroupWrapper.memberSetNameTruncated(member, 'member name'); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ ...emptyMember(member), @@ -263,14 +266,14 @@ describe('libsession_metagroup', () => { }); it('can add via admin set', () => { - metaGroupWrapper.memberSetAdmin(member); + metaGroupWrapper.memberSetPromotionAccepted(member); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); const expected: GroupMemberGet = { ...emptyMember(member), - admin: true, promoted: true, promotionFailed: false, promotionPending: false, + promotionNotSent: false, }; expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); @@ -281,7 +284,8 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); const expected: GroupMemberGet = { ...emptyMember(member), - removedStatus: 2, + shouldRemoveMessages: true, + isRemoved: true, }; expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); @@ -292,7 +296,8 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); const expected: GroupMemberGet = { ...emptyMember(member), - removedStatus: 1, + shouldRemoveMessages: false, + isRemoved: true, }; expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); @@ -319,8 +324,8 @@ describe('libsession_metagroup', () => { }); // mark current user as admin - metaGroupWrapper.memberSetPromoted(us.x25519KeyPair.pubkeyHex, false); - metaGroupWrapper2.memberSetPromoted(us.x25519KeyPair.pubkeyHex, false); + metaGroupWrapper.memberSetPromotionAccepted(us.x25519KeyPair.pubkeyHex); + metaGroupWrapper2.memberSetPromotionAccepted(us.x25519KeyPair.pubkeyHex); // add 2 normal members to each of those wrappers const m1 = TestUtils.generateFakePubKeyStr(); diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index b27eea432b..653dfe0c05 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -582,6 +582,7 @@ export type LocalizerKeys = | 'userBanFailed' | 'userBanned' | 'userInvitedYouToGroup' + | 'userInvitedYouToGroupAsAdmin' | 'userRemovedFromModerators' | 'userUnbanFailed' | 'userUnbanned' @@ -609,6 +610,7 @@ export type LocalizerKeys = | 'youLeftTheGroup' | 'youSetYourDisappearingMessages' | 'youWereInvitedToGroup' + | 'youWereInvitedToGroupAsAdmin' | 'youWereRemovedFrom' | 'yourSessionID' | 'yourUniqueSessionID' diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 886c278354..0cfe2e5367 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -548,17 +548,29 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberSetAccepted', pubkeyHex]) as Promise< ReturnType >, - memberSetPromoted: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, failed: boolean) => + memberSetPromoted: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberSetPromoted', pubkeyHex]) as Promise< + ReturnType + >, + memberSetPromotionAccepted: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, - 'memberSetPromoted', + 'memberSetPromotionAccepted', pubkeyHex, - failed, - ]) as Promise>, - memberSetAdmin: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => - callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberSetAdmin', pubkeyHex]) as Promise< - ReturnType - >, + ]) as Promise>, + memberSetPromotionFailed: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberSetPromotionFailed', + pubkeyHex, + ]) as Promise>, + memberSetPromotionSent: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberSetPromotionSent', + pubkeyHex, + ]) as Promise>, + memberSetInvited: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, failed: boolean) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, @@ -566,13 +578,13 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { pubkeyHex, failed, ]) as Promise>, - memberSetName: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, name: string) => + memberSetNameTruncated: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, name: string) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, - 'memberSetName', + 'memberSetNameTruncated', pubkeyHex, name, - ]) as Promise>, + ]) as Promise>, memberSetProfilePicture: async ( groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, @@ -617,6 +629,10 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { data, timestampMs, ]) as Promise>, + keysAdmin: async (groupPk: GroupPubkeyType) => + callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'keysAdmin']) as Promise< + ReturnType + >, keyGetCurrentGen: async (groupPk: GroupPubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'keyGetCurrentGen']) as Promise< ReturnType diff --git a/ts/window.d.ts b/ts/window.d.ts index 9a7dc27d9a..7dd7558109 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -31,6 +31,7 @@ declare global { useTestNet: boolean; useClosedGroupV2: boolean; useClosedGroupV2QAButtons: boolean; + useGroupV2InviteAsAdmin: boolean; debug: { debugLogging: boolean; debugLibsessionDumps: boolean; diff --git a/yarn.lock b/yarn.lock index 518c90deff..28a346a7ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2906,7 +2906,7 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -axios@^1.3.2: +axios@^1.6.5: version "1.7.2" resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621" integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw== @@ -3527,24 +3527,24 @@ clsx@^1.0.4, clsx@^1.1.1, clsx@^1.2.1: resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== -cmake-js@7.2.1: - version "7.2.1" - resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.2.1.tgz#757c0d39994121b084bab96290baf115ee7712cd" - integrity sha512-AdPSz9cSIJWdKvm0aJgVu3X8i0U3mNTswJkSHzZISqmYVjZk7Td4oDFg0mCBA383wO+9pG5Ix7pEP1CZH9x2BA== +cmake-js@^7.2.1: + version "7.3.0" + resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.3.0.tgz#6fd6234b7aeec4545c1c806f9e3f7ffacd9798b2" + integrity sha512-dXs2zq9WxrV87bpJ+WbnGKv8WUBXDw8blNiwNHoRe/it+ptscxhQHKB1SJXa1w+kocLMeP28Tk4/eTCezg4o+w== dependencies: - axios "^1.3.2" + axios "^1.6.5" debug "^4" - fs-extra "^10.1.0" + fs-extra "^11.2.0" lodash.isplainobject "^4.0.6" memory-stream "^1.0.0" - node-api-headers "^0.0.2" + node-api-headers "^1.1.0" npmlog "^6.0.2" rc "^1.2.7" - semver "^7.3.8" - tar "^6.1.11" + semver "^7.5.4" + tar "^6.2.0" url-join "^4.0.1" which "^2.0.2" - yargs "^17.6.0" + yargs "^17.7.2" color-convert@^1.9.0: version "1.9.3" @@ -3966,7 +3966,14 @@ debug@2.6.9, debug@^2.2.0, debug@^2.6.8, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: + version "4.3.5" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e" + integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== + dependencies: + ms "2.1.2" + +debug@4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -3981,9 +3988,9 @@ debug@^3.2.7: ms "^2.1.1" debug@^4: - version "4.3.5" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e" - integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== + version "4.3.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" + integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== dependencies: ms "2.1.2" @@ -5177,7 +5184,7 @@ fs-extra@^10.0.0, fs-extra@^10.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^11.0.0: +fs-extra@^11.0.0, fs-extra@^11.2.0: version "11.2.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== @@ -6599,9 +6606,12 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@link:../libsession-util-nodejs": - version "0.0.0" - uid "" +"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.21/libsession_util_nodejs-v0.3.21.tar.gz": + version "0.3.21" + resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.21/libsession_util_nodejs-v0.3.21.tar.gz#64705b1f7c934ca32f929ea8127370cc82bab97a" + dependencies: + cmake-js "^7.2.1" + node-addon-api "^6.1.0" libsodium-sumo@^0.7.13: version "0.7.13" @@ -7483,10 +7493,10 @@ node-addon-api@^6.1.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76" integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA== -node-api-headers@^0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-0.0.2.tgz#31f4c6c2750b63e598128e76a60aefca6d76ac5d" - integrity sha512-YsjmaKGPDkmhoNKIpkChtCsPVaRE0a274IdERKnuc/E8K1UJdBZ4/mvI006OijlQZHCfpRNOH3dfHQs92se8gg== +node-api-headers@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-1.2.0.tgz#b717cd420aec79031f8dc83a50eb0a8bdf24c70d" + integrity sha512-L9AiEkBfgupC0D/LsudLPOhzy/EdObsp+FHyL1zSK0kKv5FDA9rJMoRz8xd+ojxzlqfg0tTZm2h8ot2nS7bgRA== node-dir@^0.1.17: version "0.1.17" @@ -9112,7 +9122,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.4: +semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.2, semver@^7.5.4: version "7.6.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w== @@ -9707,7 +9717,7 @@ tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -tar@^6.1.0, tar@^6.1.11: +tar@^6.1.0, tar@^6.1.11, tar@^6.2.0: version "6.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== @@ -10695,7 +10705,7 @@ yargs@^15.1.0: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^17.0.0, yargs@^17.0.1, yargs@^17.6.0, yargs@^17.6.2: +yargs@^17.0.0, yargs@^17.0.1, yargs@^17.6.2, yargs@^17.7.2: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== From e5724da28c1a66045e526508c2e52a65292c7861 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 22 Oct 2024 19:11:50 +1100 Subject: [PATCH 144/302] chore: fixed a bunch of compilation errors after merge commit before fetching latest strings from crowdin --- ts/components/NoticeBanner.tsx | 2 +- ts/components/SessionInboxView.tsx | 4 +- ts/components/basic/SessionToast.tsx | 2 +- .../conversation/SessionConversation.tsx | 12 ++-- .../conversation/SubtleNotification.tsx | 69 ++++++++++--------- .../composition/CompositionTextArea.tsx | 5 -- .../overlay/OverlayRightPanelSettings.tsx | 10 +-- ts/components/dialog/DeleteAccountModal.tsx | 4 +- .../dialog/HideRecoveryPasswordDialog.tsx | 8 +-- .../blockOrUnblock/BlockOrUnblockDialog.tsx | 2 +- ts/components/inputs/SessionInput.tsx | 22 ++++-- .../leftpane/overlay/OverlayClosedGroup.tsx | 30 ++++---- .../overlay/choose-action/ActionRow.tsx | 3 +- .../section/CategoryConversations.tsx | 8 +-- ts/hooks/useParamSelector.ts | 2 +- ts/node/sql.ts | 10 +-- ts/notifications/formatNotifications.ts | 7 +- ts/react.d.ts | 29 +++++++- ts/receiver/configMessage.ts | 33 +++++---- ts/receiver/groupv2/handleGroupV2Message.ts | 16 +++-- .../apis/open_group_api/sogsv3/sogsApiV3.ts | 46 ++++++------- .../open_group_api/sogsv3/sogsCapabilities.ts | 22 +++--- .../open_group_api/sogsv3/sogsV3BatchPoll.ts | 26 ++++--- .../open_group_api/sogsv3/sogsV3ClearInbox.ts | 2 +- ts/session/apis/snode_api/getNetworkTime.ts | 10 +-- .../apis/snode_api/getServiceNodesList.ts | 5 +- ts/session/apis/snode_api/pollingTypes.ts | 2 +- ts/session/apis/snode_api/swarmPolling.ts | 20 +++--- .../SwarmPollingGroupConfig.ts | 8 +-- .../conversations/ConversationController.ts | 4 +- ts/session/conversations/createClosedGroup.ts | 4 +- .../disappearing_messages/timerOptions.ts | 50 +++++++++----- ts/session/onions/onionPath.ts | 18 ++--- ts/session/sending/MessageSender.ts | 4 +- ts/session/types/PubKey.ts | 2 +- ts/session/utils/User.ts | 2 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 16 +++-- .../jobs/GroupPendingRemovalsJob.ts | 8 +-- .../libsession/libsession_utils_contacts.ts | 2 +- .../libsession_utils_user_groups.ts | 10 +-- ts/state/ducks/conversations.ts | 5 +- .../libsession_wrapper_usergroups_test.ts | 5 +- .../session/unit/onion/OnionErrors_test.ts | 15 ++-- ts/test/session/unit/onion/OnionPaths_test.ts | 4 +- .../SwarmPolling_getPollingTimeout_test.ts | 2 +- .../SwarmPolling_pollForAllKeys_test.ts | 2 +- .../SwarmPolling_pollingDetails_test.ts | 2 +- .../unit/swarm_polling/SwarmPolling_test.ts | 21 +++--- 48 files changed, 326 insertions(+), 269 deletions(-) diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx index c1e154c3a7..8bd13b690c 100644 --- a/ts/components/NoticeBanner.tsx +++ b/ts/components/NoticeBanner.tsx @@ -74,7 +74,7 @@ const StyledGroupInviteBanner = styled(Flex)` export const GroupInviteRequiredVersionBanner = () => { return ( - {window.i18n('versionRequiredForNewGroupDescription')} + {window.i18n('groupInviteVersion')} ); }; diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index a1c479de49..e17a25d176 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -98,7 +98,7 @@ async function setupLeftPane(forceUpdateInboxComponent: () => void) { window.inboxStore = await createSessionInboxStore(); - window.inboxStore.dispatch( + window.inboxStore?.dispatch( updateAllOnStorageReady({ hasBlindedMsgRequestsEnabled: Storage.getBoolOrFalse( SettingsKey.hasBlindedMsgRequestsEnabled @@ -110,7 +110,7 @@ async function setupLeftPane(forceUpdateInboxComponent: () => void) { hideRecoveryPassword: Storage.getBoolOrFalse(SettingsKey.hideRecoveryPassword), }) ); - window.inboxStore.dispatch(groupInfoActions.loadMetaDumpsFromDB()); // this loads the dumps from DB and fills the 03-groups slice with the corresponding details + window.inboxStore?.dispatch(groupInfoActions.loadMetaDumpsFromDB() as any); // this loads the dumps from DB and fills the 03-groups slice with the corresponding details forceUpdateInboxComponent(); window.getState = window.inboxStore.getState; } diff --git a/ts/components/basic/SessionToast.tsx b/ts/components/basic/SessionToast.tsx index d1773d258b..2f710c8b9a 100644 --- a/ts/components/basic/SessionToast.tsx +++ b/ts/components/basic/SessionToast.tsx @@ -41,7 +41,7 @@ const IconDiv = styled.div` `; function useReplacePkInTextWithNames(description: string) { - const pubkeysToLookup = [...description.matchAll(/0[3,5][0-9a-fA-F]{64}/g)] || []; + const pubkeysToLookup = [...description.matchAll(/0[3,5][0-9a-fA-F]{64}/g)]; const memberNames = useConversationsUsernameWithQuoteOrShortPk(pubkeysToLookup.map(m => m[0])); let replacedWithNames = clone(description); diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index 761a4f2336..c6f675334b 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -117,7 +117,7 @@ export class SessionConversation extends Component { } // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // ~~~~~~~~~~~~~~~~ LIFECYCLES ~~~~~~~~~~~~~~~~ + // ~~~~~~~~~~~~~~~~ LIFE CYCLES ~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ public componentDidUpdate(prevProps: Props, _prevState: State) { @@ -199,7 +199,7 @@ export class SessionConversation extends Component { const recoveryPhrase = getCurrentRecoveryPhrase(); - // string replace to fix case where pasted text contains invis characters causing false negatives + // string replace to fix case where pasted text contains invisible characters causing false negatives if (msg.body.replace(/\s/g, '').includes(recoveryPhrase.replace(/\s/g, ''))) { window.inboxStore?.dispatch( updateConfirmModal({ @@ -257,7 +257,7 @@ export class SessionConversation extends Component { ) : ( <>
{ ); const allMembers = allPubKeys.map((pubKey: string) => { - const conv = ConvoHub.use().get(pubKey); - const profileName = conv?.getNicknameOrRealUsernameOrPlaceholder(); + const convo = ConvoHub.use().get(pubKey); + const profileName = convo?.getNicknameOrRealUsernameOrPlaceholder(); return { id: pubKey, @@ -662,7 +662,7 @@ function OutdatedLegacyGroupBanner(props: { return isLegacyGroup ? ( { showLinkVisitWarningDialog('', dispatch); throw new Error('TODO'); // fixme audric diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index f554e067d9..e5a9e63aef 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -1,12 +1,13 @@ import { SessionDataTestId } from 'react'; import { useSelector } from 'react-redux'; import styled from 'styled-components'; -import { useIsIncomingRequest, useIsOutgoingRequest } from '../../hooks/useParamSelector'; -import { SessionUtilContact } from '../../session/utils/libsession/libsession_utils_contacts'; import { - useNicknameOrProfileNameOrShortenedPubkey + useIsIncomingRequest, + useIsOutgoingRequest, + useNicknameOrProfileNameOrShortenedPubkey, } from '../../hooks/useParamSelector'; import { PubKey } from '../../session/types'; +import { SessionUtilContact } from '../../session/utils/libsession/libsession_utils_contacts'; import { hasSelectedConversationIncomingMessages, hasSelectedConversationOutgoingMessages, @@ -29,8 +30,8 @@ import { useLibGroupKicked, useLibGroupWeHaveSecretKey, } from '../../state/selectors/userGroups'; -import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; import { localize } from '../../util/i18n/localizedString'; +import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; const Container = styled.div<{ noExtraPadding: boolean }>` display: flex; @@ -64,8 +65,6 @@ function TextNotification({ ); } - - /** * This component is used to display a warning when the user is sending a message request. * @@ -90,7 +89,11 @@ export const ConversationOutgoingRequestExplanation = () => { // This works because a blinded conversation is not saved in libsession currently, and will only be once approved_me is true if (!contactFromLibsession || !contactFromLibsession.approvedMe) { return ( - + {window.i18n('messageRequestPendingDescription')} ); @@ -98,7 +101,6 @@ export const ConversationOutgoingRequestExplanation = () => { return null; }; - /** * This component is used to display a warning when the user is responding to a message request. * @@ -170,10 +172,16 @@ export const InvitedToGroupControlMessage = () => { // when restoring from seed we might not have the pubkey of who invited us, in that case, we just use a fallback const html = conversationOrigin ? weHaveSecretKey - ? window.i18n('userInvitedYouToGroupAsAdmin', {group_name: groupName, name: adminNameInvitedUs}]) - : window.i18n('messageRequestGroupInvite', {group_name: groupName, name: adminNameInvitedUs}) + ? window.i18n('userInvitedYouToGroupAsAdmin', { + group_name: groupName, + name: adminNameInvitedUs, + }) + : window.i18n('messageRequestGroupInvite', { + group_name: groupName, + name: adminNameInvitedUs, + }) : weHaveSecretKey - ? window.i18n('youWereInvitedToGroupAsAdmin', {group_name: groupName}) + ? window.i18n('youWereInvitedToGroupAsAdmin', { group_name: groupName }) : window.i18n('groupInviteYou'); return ( @@ -195,43 +203,42 @@ export const NoMessageInConversation = () => { const canWrite = useSelector(getSelectedCanWrite); const privateBlindedAndBlockingMsgReqs = useSelectedHasDisabledBlindedMsgRequests(); -const isPrivate = useSelectedIsPrivate(); -const isIncomingRequest = useIsIncomingRequest(selectedConversation); -const isKickedFromGroup = useLibGroupKicked(selectedConversation); + const isPrivate = useSelectedIsPrivate(); + const isIncomingRequest = useIsIncomingRequest(selectedConversation); + const isKickedFromGroup = useLibGroupKicked(selectedConversation); const name = useSelectedNicknameOrProfileNameOrShortenedPubkey(); const getHtmlToRender = () => { if (isMe) { - return localize("noteToSelfEmpty").toString(); + return localize('noteToSelfEmpty').toString(); } if (canWrite) { - return localize("groupNoMessages").withArgs({ group_name: name }).toString(); + return localize('groupNoMessages').withArgs({ group_name: name }).toString(); } if (privateBlindedAndBlockingMsgReqs) { - return localize("messageRequestsTurnedOff").withArgs({ name }).toString(); + return localize('messageRequestsTurnedOff').withArgs({ name }).toString(); } if (isGroupV2 && isKickedFromGroup) { - return localize("groupRemovedYou").withArgs({group_name: name}).toString(); + return localize('groupRemovedYou').withArgs({ group_name: name }).toString(); } - return localize("conversationsEmpty").withArgs({conversation_name: name}).toString(); + return localize('conversationsEmpty').withArgs({ conversation_name: name }).toString(); }; + // groupV2 use its own invite logic as part of + if ( + !selectedConversation || + hasMessages || + (isGroupV2 && isInvitePending) || + (isPrivate && isIncomingRequest) + ) { + return null; + } - // groupV2 use its own invite logic as part of - if ( - !selectedConversation || - hasMessages || - (isGroupV2 && isInvitePending) || - (isPrivate && isIncomingRequest) - ) { - return null; - } - - const dataTestId: SessionDataTestId = isGroupV2 && isKickedFromGroup ? 'empty-conversation-notification' : 'group-control-message'; - + const dataTestId: SessionDataTestId = + isGroupV2 && isKickedFromGroup ? 'empty-conversation-notification' : 'group-control-message'; return ( { const selectedConversationKey = useSelectedConversationKey(); const htmlDirection = useHTMLDirection(); const isKickedFromGroup = useSelectedIsKickedFromGroup(); - const left = useSelectedIsLeft(); const isBlocked = useSelectedIsBlocked(); const groupName = useSelectedNicknameOrProfileNameOrShortenedPubkey(); @@ -68,9 +66,6 @@ export const CompositionTextArea = (props: Props) => { if (isKickedFromGroup) { return window.i18n('groupRemovedYou', { group_name: groupName }); } - if (left) { - return window.i18n('groupMemberYouLeft'); - } if (isBlocked) { return window.i18n('blockBlockedDescription'); } diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 25eeed18b9..a2b91f4de2 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -208,14 +208,14 @@ const DestroyGroupForAllMembersButton = () => { dataTestId="delete-group-button" iconType="delete" color={'var(--danger-color)'} - text={window.i18n('editMenuDeleteGroup')} + text={window.i18n('groupDelete')} onClick={() => { dispatch( // TODO build the right UI for this (just adding buttons for QA for now) updateConfirmModal({ okText: window.i18n('delete'), okTheme: SessionButtonColor.Danger, - title: window.i18n('editMenuDeleteGroup'), + title: window.i18n('groupDelete'), conversationId: groupPk, onClickOk: () => { void ConvoHub.use().deleteGroup(groupPk, { @@ -315,7 +315,7 @@ export const OverlayRightPanelSettings = () => { ? window.i18n('groupRemovedYou', { group_name: selectedUsername || window.i18n('groupUnknown'), }) - : window.i18n('groupLeave'); + : window.i18n('groupLeave'); const showUpdateGroupNameButton = isGroup && weAreAdmin && !commonNoShow; // legacy groups non-admin cannot change groupname anymore const showAddRemoveModeratorsButton = weAreAdmin && !commonNoShow && isPublic; @@ -349,8 +349,8 @@ export const OverlayRightPanelSettings = () => { if (!PubKey.is03Pubkey(selectedConvoKey)) { throw new Error('triggerFakeAvatarUpdate needs a 03 pubkey'); } - window.inboxStore.dispatch( - groupInfoActions.triggerFakeAvatarUpdate({ groupPk: selectedConvoKey }) + window.inboxStore?.dispatch( + groupInfoActions.triggerFakeAvatarUpdate({ groupPk: selectedConvoKey }) as any ); }} dataTestId="edit-group-name" diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx index 7a4c8f2165..126643916d 100644 --- a/ts/components/dialog/DeleteAccountModal.tsx +++ b/ts/components/dialog/DeleteAccountModal.tsx @@ -35,8 +35,8 @@ const DescriptionBeforeAskingConfirmation = (props: { }, ].map(m => ({ ...m, - inputDatatestId: `input-${m.value}` as const, - labelDatatestId: `label-${m.value}` as const, + inputDataTestId: `input-${m.value}` as const, + labelDataTestId: `label-${m.value}` as const, })); return ( diff --git a/ts/components/dialog/HideRecoveryPasswordDialog.tsx b/ts/components/dialog/HideRecoveryPasswordDialog.tsx index 5a34300b15..c88d582e9e 100644 --- a/ts/components/dialog/HideRecoveryPasswordDialog.tsx +++ b/ts/components/dialog/HideRecoveryPasswordDialog.tsx @@ -46,12 +46,12 @@ export function HideRecoveryPasswordDialog(props: HideRecoveryPasswordDialogProp onClick: () => { dispatch(updateHideRecoveryPasswordModal({ state: 'secondWarning' })); }, - dataTestId: 'session-confirm-ok-button', + dataTestId: 'session-confirm-ok-button' as const, } : { text: window.i18n('cancel'), onClick: onClose, - dataTestId: 'session-confirm-cancel-button', + dataTestId: 'session-confirm-cancel-button' as const, }; const rightButtonProps = @@ -59,7 +59,7 @@ export function HideRecoveryPasswordDialog(props: HideRecoveryPasswordDialogProp ? { text: window.i18n('cancel'), onClick: onClose, - dataTestId: 'session-confirm-cancel-button', + dataTestId: 'session-confirm-cancel-button' as const, } : { text: window.i18n('yes'), @@ -67,7 +67,7 @@ export function HideRecoveryPasswordDialog(props: HideRecoveryPasswordDialogProp onClick: () => { void onConfirmation(); }, - dataTestId: 'session-confirm-ok-button', + dataTestId: 'session-confirm-ok-button' as const, }; return ( diff --git a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx index 394be05fb8..f24ea0969c 100644 --- a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx +++ b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx @@ -106,7 +106,7 @@ export const BlockOrUnblockDialog = ({ pubkeys, action, onConfirmed }: NonNullab buttonColor={SessionButtonColor.White} onClick={closeModal} text={window.i18n('cancel')} - dataTestId="session-cancel-ok-button" + dataTestId="session-confirm-cancel-button" />
diff --git a/ts/components/inputs/SessionInput.tsx b/ts/components/inputs/SessionInput.tsx index b7ef7c1dde..59c2c469db 100644 --- a/ts/components/inputs/SessionInput.tsx +++ b/ts/components/inputs/SessionInput.tsx @@ -1,4 +1,12 @@ -import { ChangeEvent, ReactNode, RefObject, useEffect, useRef, useState } from 'react'; +import { + ChangeEvent, + ReactNode, + RefObject, + SessionDataTestId, + useEffect, + useRef, + useState, +} from 'react'; import { motion } from 'framer-motion'; import { isEmpty, isEqual } from 'lodash'; @@ -185,13 +193,13 @@ const ErrorItem = (props: { id: string; error: string }) => { ); }; -type ShowHideButtonStrings = { hide: string; show: string }; +type ShowHideButtonStrings = { hide: T; show: T }; type ShowHideButtonProps = { forceShow: boolean; toggleForceShow: () => void; error: boolean; - ariaLabels?: ShowHideButtonStrings; - dataTestIds?: ShowHideButtonStrings; + ariaLabels?: ShowHideButtonStrings; + dataTestIds?: ShowHideButtonStrings; }; const ShowHideButton = (props: ShowHideButtonProps) => { @@ -255,11 +263,11 @@ type Props = { autoFocus?: boolean; disableOnBlurEvent?: boolean; inputRef?: RefObject; - inputDataTestId?: string; + inputDataTestId?: SessionDataTestId; id?: string; enableShowHideButton?: boolean; - showHideButtonAriaLabels?: ShowHideButtonStrings; - showHideButtonDataTestIds?: ShowHideButtonStrings; + showHideButtonAriaLabels?: ShowHideButtonStrings; + showHideButtonDataTestIds?: ShowHideButtonStrings; ctaButton?: ReactNode; monospaced?: boolean; textSize?: TextSizes; diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index f61d62e9c2..d5ae2730c4 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -9,8 +9,7 @@ import useUpdate from 'react-use/lib/useUpdate'; import { MemberListItem } from '../../MemberListItem'; import { SessionButton } from '../../basic/SessionButton'; import { SessionIdEditable } from '../../basic/SessionIdEditable'; -import { SessionSpinner } from '../../basic/SessionSpinner'; -import { OverlayHeader } from './OverlayHeader'; + import { useSet } from '../../../hooks/useSet'; import { VALIDATION } from '../../../session/constants'; @@ -23,7 +22,11 @@ import { clearSearch } from '../../../state/ducks/search'; import { resetLeftOverlayMode } from '../../../state/ducks/section'; import { useContactsToInviteToGroup } from '../../../state/selectors/conversations'; import { useIsCreatingGroupFromUIPending } from '../../../state/selectors/groups'; -import { getSearchResultsContactOnly, getSearchTerm, useIsSearching } from '../../../state/selectors/search'; +import { + getSearchResultsContactOnly, + getSearchTerm, + useIsSearching, +} from '../../../state/selectors/search'; import { useOurPkStr } from '../../../state/selectors/user'; import { GroupInviteRequiredVersionBanner } from '../../NoticeBanner'; import { SessionSearchInput } from '../../SessionSearchInput'; @@ -33,6 +36,8 @@ import { SessionToggle } from '../../basic/SessionToggle'; import { SpacerLG, SpacerMD } from '../../basic/Text'; import { SessionInput } from '../../inputs'; import { StyledLeftPaneOverlay } from './OverlayMessage'; +import { Header } from '../../conversation/right-panel/overlay/components'; +import { SessionSpinner } from '../../loading'; const StyledMemberListNoContacts = styled.div` text-align: center; @@ -134,11 +139,11 @@ export const OverlayClosedGroupV2 = () => { } // Validate groupName and groupMembers length if (groupName.length === 0) { - ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooShort')); + ToastUtils.pushToastError('invalidGroupName', window.i18n('groupNameEnterPlease')); return; } - if (groupName.length > VALIDATION.MAX_GROUP_NAME_LENGTH) { - ToastUtils.pushToastError('invalidGroupName', window.i18n('invalidGroupNameTooLong')); + if (groupName.length > LIBSESSION_CONSTANTS.BASE_GROUP_MAX_NAME_LENGTH) { + ToastUtils.pushToastError('invalidGroupName', window.i18n('groupNameEnterShorter')); return; } @@ -146,11 +151,11 @@ export const OverlayClosedGroupV2 = () => { // the same is valid with groups count < 1 if (members.length < 1) { - ToastUtils.pushToastError('pickClosedGroupMember', window.i18n('pickClosedGroupMember')); + ToastUtils.pushToastError('pickClosedGroupMember', window.i18n('groupCreateErrorNoMembers')); return; } if (members.length >= VALIDATION.CLOSED_GROUP_SIZE_LIMIT) { - ToastUtils.pushToastError('closedGroupMaxSize', window.i18n('closedGroupMaxSize')); + ToastUtils.pushToastError('closedGroupMaxSize', window.i18n('groupAddMemberMaximum')); return; } // trigger the add through redux. @@ -165,10 +170,9 @@ export const OverlayClosedGroupV2 = () => { useKey('Escape', closeOverlay); - const title = window.i18n('createGroup'); + const title = window.i18n('groupCreate'); const buttonText = window.i18n('create'); const subtitle = window.i18n('createClosedGroupNamePrompt'); - const placeholder = window.i18n('createClosedGroupPlaceholder'); const noContactsForClosedGroup = privateContactsPubkeys.length === 0; @@ -178,14 +182,14 @@ export const OverlayClosedGroupV2 = () => { return (
- +
void; - dataTestId: string; + dataTestId: SessionDataTestId; }; export function ActionRow(props: ActionRowProps) { diff --git a/ts/components/settings/section/CategoryConversations.tsx b/ts/components/settings/section/CategoryConversations.tsx index 7872bbc1b8..f59d2cd38e 100644 --- a/ts/components/settings/section/CategoryConversations.tsx +++ b/ts/components/settings/section/CategoryConversations.tsx @@ -91,14 +91,14 @@ const EnterKeyFunctionSetting = () => { { label: window.i18n('conversationsEnterSends'), value: 'enterForSend', - inputDatatestId: 'input-enterForSend', - labelDatatestId: 'label-enterForSend', + inputDataTestId: 'input-enterForSend', + labelDataTestId: 'label-enterForSend', }, { label: window.i18n('conversationsEnterNewLine'), value: selectedWithSettingTrue, - inputDatatestId: `input-${selectedWithSettingTrue}`, - labelDatatestId: `label-${selectedWithSettingTrue}`, + inputDataTestId: `input-${selectedWithSettingTrue}`, + labelDataTestId: `label-${selectedWithSettingTrue}`, }, ]; diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 3219b3db4f..a1df6e1617 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -7,7 +7,7 @@ import { hasValidIncomingRequestValues, hasValidOutgoingRequestValues, } from '../models/conversation'; -import { ConversationTypeEnum } from '../models/conversationAttributes'; +import { ConversationTypeEnum } from '../models/types'; import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; import { TimerOptions, TimerOptionsArray } from '../session/disappearing_messages/timerOptions'; import { PubKey } from '../session/types'; diff --git a/ts/node/sql.ts b/ts/node/sql.ts index a41bdae388..afa119b942 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -2342,7 +2342,7 @@ function getV2OpenGroupRoom(conversationId: string, db?: BetterSqlite3.Database) return jsonToObject(row.json); } -function saveV2OpenGroupRoom({ serverUrl, roomId, conversationId } : OpenGroupV2Room, instance?: BetterSqlite3.Database) { +function saveV2OpenGroupRoom(opengroupsV2Room: OpenGroupV2Room, instance?: BetterSqlite3.Database) { assertGlobalInstanceOrInstance(instance) .prepare( `INSERT OR REPLACE INTO ${OPEN_GROUP_ROOMS_V2_TABLE} ( @@ -2358,10 +2358,10 @@ function saveV2OpenGroupRoom({ serverUrl, roomId, conversationId } : OpenGroupV2 )` ) .run({ - serverUrl, - roomId, - conversationId, - json: objectToJSON(opengroupsv2Room), + serverUrl: opengroupsV2Room.serverUrl, + roomId: opengroupsV2Room.roomId, + conversationId: opengroupsV2Room.conversationId, + json: objectToJSON(opengroupsV2Room), }); } diff --git a/ts/notifications/formatNotifications.ts b/ts/notifications/formatNotifications.ts index 9736a58126..63c518e534 100644 --- a/ts/notifications/formatNotifications.ts +++ b/ts/notifications/formatNotifications.ts @@ -16,6 +16,7 @@ function formatInteractionNotification( if (convo) { const isGroup = !convo.isPrivate(); const isCommunity = convo.isPublic(); + const conversationName = convo?.getRealSessionUsername() || window.i18n('unknown'); switch (interactionType) { case ConversationInteractionType.Hide: @@ -23,10 +24,10 @@ function formatInteractionNotification( return ''; case ConversationInteractionType.Leave: return isCommunity - ? window.i18n('leaveCommunityFailed') + ? window.i18n('communityLeaveError', { community_name: conversationName }) : isGroup - ? window.i18n('leaveGroupFailed') - : window.i18n('deleteConversationFailed'); + ? window.i18n('groupLeaveErrorFailed', { group_name: conversationName }) + : null; default: assertUnreachable( interactionType, diff --git a/ts/react.d.ts b/ts/react.d.ts index 050e7c1ec9..dd20601224 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -19,7 +19,8 @@ declare module 'react' { | 'message-request-banner' | 'leftpane-section-container' | 'group-name-input' - | 'recovery-phrase-seed-modal' + | 'open-url' + | 'recovery-password-seed-modal' | 'password-input-reconfirm' | 'conversation-header-subtitle' | 'password-input' @@ -163,20 +164,43 @@ declare module 'react' { | 'input-count' | 'label-count' + // links + | 'session-website-link' + | 'session-link-helpdesk' + | 'session-faq-link' + // to sort | 'restore-using-recovery' | 'link-device' | 'continue-session-button' | 'next-new-conversation-button' | 'reveal-recovery-phrase' + | 'existing-account-button' + | 'create-account-button' | 'resend-invite-button' | 'session-confirm-cancel-button' | 'session-confirm-ok-button' | 'confirm-nickname' + | 'context-menu-item' + | 'view-qr-code-button' + | 'hide-recovery-password-button' + | 'copy-button-account-id' | 'path-light-svg' | 'group-member-name' + | 'privacy-policy-button' + | 'terms-of-service-button' + | 'chooser-invite-friend' + | 'your-account-id' + | 'hide-recovery-phrase-toggle' + | 'reveal-recovery-phrase-toggle' | 'resend-promote-button' | 'next-button' + | 'continue-button' + | 'back-button' + | 'empty-conversation' + | 'session-error-message' + | 'hide-input-text-toggle' + | 'show-input-text-toggle' | 'save-button-profile-update' | 'save-button-profile-update' | 'copy-button-profile-update' @@ -193,6 +217,9 @@ declare module 'react' { | 'leftpane-primary-avatar' | 'img-leftpane-primary-avatar' | 'conversation-options-avatar' + | 'copy-sender-from-details' + | 'copy-msg-from-details' + | 'block-unblock-modal-description' // modules profile name | 'module-conversation__user__profile-name' | 'module-message-search-result__header__name__profile-name' diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index b44c7339e6..1c63f47474 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -39,6 +39,7 @@ import { ConfigWrapperObjectTypesMeta, ConfigWrapperUser, getGroupPubkeyFromWrapperType, + isBlindingWrapperType, isMultiEncryptWrapperType, isUserConfigWrapperType, } from '../webworker/workers/browser/libsession_worker_functions'; @@ -70,11 +71,9 @@ type IncomingUserResult = { namespace: SnodeNamespacesUserConfig; }; - - function byUserNamespace(incomingConfigs: Array) { const groupedByVariant: Map< - SnodeNamespacesUserConfig, + SnodeNamespacesUserConfig, Array > = new Map(); @@ -98,7 +97,7 @@ async function printDumpForDebug(prefix: string, variant: ConfigWrapperObjectTyp window.log.info(prefix, StringUtils.toHex(await GenericWrapperActions.makeDump(variant))); return; } - if (isMultiEncryptWrapperType(variant)) { + if (isMultiEncryptWrapperType(variant) || isBlindingWrapperType(variant)) { return; // nothing to print for this one } const metaGroupDumps = await MetaGroupWrapperActions.metaMakeDump( @@ -239,7 +238,11 @@ async function handleUserProfileUpdate(result: IncomingUserResult): Promise m.id) .filter(PubKey.is03Pubkey); - const allGoupsIdsInWrapper = allGroupsInWrapper.map(m => m.pubkeyHex); - window.log.debug('allGoupsIdsInWrapper', stringify(allGoupsIdsInWrapper)); - window.log.debug('allGoupsIdsInDb', stringify(allGoupsIdsInDb)); + const allGroupsIdsInWrapper = allGroupsInWrapper.map(m => m.pubkeyHex); + window.log.debug('allGroupsIdsInWrapper', stringify(allGroupsIdsInWrapper)); + window.log.debug('allGroupsIdsInDb', stringify(allGroupsIdsInDb)); const userEdKeypair = await UserUtils.getUserED25519KeyPairBytes(); if (!userEdKeypair) { @@ -784,12 +787,12 @@ async function handleGroupUpdate(latestEnvelopeTimestamp: number) { for (let index = 0; index < allGroupsInWrapper.length; index++) { const groupInWrapper = allGroupsInWrapper[index]; - window.inboxStore?.dispatch(groupInfoActions.handleUserGroupUpdate(groupInWrapper)); + window.inboxStore?.dispatch(groupInfoActions.handleUserGroupUpdate(groupInWrapper) as any); await handleSingleGroupUpdate({ groupInWrapper, latestEnvelopeTimestamp, userEdKeypair }); } - const groupsInDbButNotInWrapper = difference(allGoupsIdsInDb, allGoupsIdsInWrapper); + const groupsInDbButNotInWrapper = difference(allGroupsIdsInDb, allGroupsIdsInWrapper); window.log.info( `we have to leave ${groupsInDbButNotInWrapper.length} 03 groups in DB compared to what is in the wrapper` ); @@ -896,9 +899,9 @@ async function handleConvoInfoVolatileUpdate() { break; case 'Community': try { - const wrapperComms = await ConvoInfoVolatileWrapperActions.getAllCommunities(); - for (let index = 0; index < wrapperComms.length; index++) { - const fromWrapper = wrapperComms[index]; + const wrapperCommunities = await ConvoInfoVolatileWrapperActions.getAllCommunities(); + for (let index = 0; index < wrapperCommunities.length; index++) { + const fromWrapper = wrapperCommunities[index]; const convoId = getOpenGroupV2ConversationId( fromWrapper.baseUrl, diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 88f45c170c..5a55f35c08 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -3,7 +3,7 @@ import { compact, isEmpty, isFinite, isNumber } from 'lodash'; import { Data } from '../../data/data'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; import { deleteMessagesFromSwarmOnly } from '../../interactions/conversations/unsendingInteractions'; -import { ConversationTypeEnum } from '../../models/conversationAttributes'; +import { ConversationTypeEnum } from '../../models/types'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; import { getMessageQueue } from '../../session'; @@ -302,7 +302,7 @@ async function handleGroupMemberChangeMessage({ const filteredMemberChange = change.memberSessionIds.filter(PubKey.is05Pubkey); if (!filteredMemberChange) { - window.log.info('returning groupupdate of member change without associated members...'); + window.log.info('returning groupUpdate of member change without associated members...'); return; } @@ -358,11 +358,11 @@ async function handleGroupMemberLeftMessage({ window.log.info(`handleGroupMemberLeftMessage for ${ed25519Str(groupPk)}`); // this does nothing if we are not an admin - window.inboxStore.dispatch( + window.inboxStore?.dispatch( groupInfoActions.handleMemberLeftMessage({ groupPk, memberLeft: author, - }) + }) as any ); } @@ -424,7 +424,7 @@ async function handleGroupDeleteMemberContentMessage({ signatureTimestamp, }); - window.inboxStore.dispatch( + window.inboxStore?.dispatch( messagesExpired(msgIdsDeleted.map(m => ({ conversationKey: groupPk, messageId: m }))) ); @@ -467,7 +467,7 @@ async function handleGroupDeleteMemberContentMessage({ signatureTimestamp, }); // this is step 3. - window.inboxStore.dispatch( + window.inboxStore?.dispatch( messageHashesExpired( compact([...deletedByHashes.messageHashes, ...deletedBySenders.messageHashes]).map(m => ({ conversationKey: groupPk, @@ -498,7 +498,9 @@ async function handleGroupUpdateInviteResponseMessage({ return; } - window.inboxStore.dispatch(groupInfoActions.inviteResponseReceived({ groupPk, member: author })); + window.inboxStore?.dispatch( + groupInfoActions.inviteResponseReceived({ groupPk, member: author }) as any + ); } async function handleGroupUpdatePromoteMessage({ diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts index 4c649a98ff..9b63cd47a3 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts @@ -25,7 +25,7 @@ import { } from './knownBlindedkeys'; import { SogsBlinding } from './sogsBlinding'; import { handleCapabilities } from './sogsCapabilities'; -import { BatchSogsReponse, OpenGroupBatchRow, SubRequestMessagesType } from './sogsV3BatchPoll'; +import { BatchSogsResponse, OpenGroupBatchRow, SubRequestMessagesType } from './sogsV3BatchPoll'; import { Data } from '../../../../data/data'; import { createSwarmMessageSentFromUs } from '../../../../models/messageFactory'; @@ -70,8 +70,8 @@ function getSogsConvoOrReturnEarly(serverUrl: string, roomId: string): Conversat /** * - * Handle the pollinfo from the response of a pysogs. - * Pollinfos contains the subscriberCount (active users), the read, upload and write things we as a user can do. + * Handle the poll info from the response of a pysogs. + * Poll infos contains the subscriberCount (active users), the read, upload and write things we as a user can do. */ async function handlePollInfoResponse( statusCode: number, @@ -198,15 +198,15 @@ const handleSogsV3DeletedMessages = async ( const handleMessagesResponseV4 = async ( messages: Array, serverUrl: string, - subrequestOption: SubRequestMessagesType + subRequestOption: SubRequestMessagesType ) => { - if (!subrequestOption || !subrequestOption.messages) { - window?.log?.error('handleBatchPollResults - missing fields required for message subresponse'); + if (!subRequestOption || !subRequestOption.messages) { + window?.log?.error('handleBatchPollResults - missing fields required for message subResponse'); return; } try { - const { roomId } = subrequestOption.messages; + const { roomId } = subRequestOption.messages; const stillPolledRooms = OpenGroupData.getV2OpenGroupRoomsByServerUrl(serverUrl); @@ -219,7 +219,7 @@ const handleMessagesResponseV4 = async ( const roomInfos = await getRoomAndUpdateLastFetchTimestamp( convoId, messages, - subrequestOption.messages + subRequestOption.messages ); if (!roomInfos || !roomInfos.conversationId) { return; @@ -243,7 +243,7 @@ const handleMessagesResponseV4 = async ( return true; }); - // Incoming messages from sogvs v3 are returned in descending order from the latest seqno, we need to sort it chronologically + // Incoming messages from sogs v3 are returned in descending order from the latest seqno, we need to sort it chronologically // Incoming messages for sogs v3 have a timestamp in seconds and not ms. // Session works with timestamp in ms, for a lot of things, so first, lets fix this. const messagesWithMsTimestamp = messagesWithoutReactionOnlyUpdates @@ -256,7 +256,7 @@ const handleMessagesResponseV4 = async ( const messagesWithoutDeleted = await handleSogsV3DeletedMessages( messagesWithMsTimestamp, serverUrl, - subrequestOption.messages.roomId + subRequestOption.messages.roomId ); const messagesWithValidSignature = @@ -347,7 +347,7 @@ type InboxOutboxResponseObject = { id: number; // that specific inbox message id sender: string; // blindedPubkey of the sender, the unblinded one is inside message content, encrypted only for our blinded pubkey recipient: string; // blindedPubkey of the recipient, used for outbox messages only - posted_at: number; // timestamp as seconds.microsec + posted_at: number; // timestamp as seconds.microseconds message: string; // base64 data }; @@ -374,7 +374,7 @@ async function handleInboxOutboxMessages( const serverPubkey = roomInfos[0].serverPublicKey; const sodium = await getSodiumRenderer(); - // make sure to add our blindedpubkey to this server in the cache, if it's not already there + // make sure to add our blinded pubkey to this server in the cache, if it's not already there await findCachedOurBlindedPubkeyOrLookItUp(serverPubkey, sodium); for (let index = 0; index < inboxOutboxResponse.length; index++) { @@ -470,7 +470,7 @@ async function handleInboxOutboxMessages( }); await findCachedBlindedMatchOrLookItUp(sender, serverPubkey, sodium); } catch (e) { - window.log.warn('tryMatchBlindWithStandardKey could not veriyfy'); + window.log.warn('tryMatchBlindWithStandardKey could not verify'); } await innerHandleSwarmContentMessage({ @@ -495,7 +495,7 @@ async function handleInboxOutboxMessages( const maxInboxOutboxId = inboxOutboxResponse.length ? Math.max(...inboxOutboxResponse.map(inboxOutboxItem => inboxOutboxItem.id)) - : undefined || undefined; + : undefined; // we should probably extract the inboxId & outboxId fetched to another table, as it is server wide and not room specific if (isNumber(maxInboxOutboxId)) { @@ -509,9 +509,9 @@ async function handleInboxOutboxMessages( export const handleBatchPollResults = async ( serverUrl: string, - batchPollResults: BatchSogsReponse, + batchPollResults: BatchSogsResponse, /** using this as explicit way to ensure order */ - subrequestOptionsLookup: Array + subRequestOptionsLookup: Array ) => { // @@: Might not need the explicit type field. // pro: prevents cases where accidentally two fields for the opt. e.g. capability and message fields truthy. @@ -519,7 +519,7 @@ export const handleBatchPollResults = async ( // note: handling capabilities first before handling anything else as it affects how things are handled. - await handleCapabilities(subrequestOptionsLookup, batchPollResults, serverUrl); + await handleCapabilities(subRequestOptionsLookup, batchPollResults, serverUrl); if (batchPollResults && isArray(batchPollResults.body)) { /** @@ -529,10 +529,10 @@ export const handleBatchPollResults = async ( */ for (let index = 0; index < batchPollResults.body.length; index++) { const subResponse = batchPollResults.body[index] as any; - // using subreqOptions as request type lookup, - // assumes batch subresponse order matches the subrequest order - const subrequestOption = subrequestOptionsLookup[index]; - const responseType = subrequestOption.type; + // using subReqOptions as request type lookup, + // assumes batch subResponse order matches the subRequest order + const subRequestOption = subRequestOptionsLookup[index]; + const responseType = subRequestOption.type; switch (responseType) { case 'capabilities': @@ -540,7 +540,7 @@ export const handleBatchPollResults = async ( break; case 'messages': // this will also include deleted messages explicitly with `data: null` & edited messages with a new data field & react changes with data not existing - await handleMessagesResponseV4(subResponse.body, serverUrl, subrequestOption); + await handleMessagesResponseV4(subResponse.body, serverUrl, subRequestOption); break; case 'pollInfo': await handlePollInfoResponse(subResponse.code, subResponse.body, serverUrl); @@ -565,7 +565,7 @@ export const handleBatchPollResults = async ( default: assertUnreachable( responseType, - `No matching subrequest response body for type: "${responseType}"` + `No matching subRequest response body for type: "${responseType}"` ); } } diff --git a/ts/session/apis/open_group_api/sogsv3/sogsCapabilities.ts b/ts/session/apis/open_group_api/sogsv3/sogsCapabilities.ts index 030b0148da..8831cdbe29 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsCapabilities.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsCapabilities.ts @@ -1,21 +1,21 @@ import { findIndex } from 'lodash'; import { OpenGroupData } from '../../../../data/opengroups'; import { DecodedResponseBodiesV4 } from '../../../onions/onionv4'; -import { BatchSogsReponse, OpenGroupBatchRow } from './sogsV3BatchPoll'; +import { BatchSogsResponse, OpenGroupBatchRow } from './sogsV3BatchPoll'; import { parseCapabilities } from './sogsV3Capabilities'; /** - * @param subrequestOptionsLookup list of subrequests used for the batch request (order sensitive) + * @param subRequestOptionsLookup list of subRequests used for the batch request (order sensitive) * @param batchPollResults The result from the batch request (order sensitive) */ export const getCapabilitiesFromBatch = ( - subrequestOptionsLookup: Array, + subRequestOptionsLookup: Array, bodies: DecodedResponseBodiesV4 ): Array | null => { const capabilitiesBatchIndex = findIndex( - subrequestOptionsLookup, - (subrequest: OpenGroupBatchRow) => { - return subrequest.type === 'capabilities'; + subRequestOptionsLookup, + (subRequest: OpenGroupBatchRow) => { + return subRequest.type === 'capabilities'; } ); const capabilities: Array | null = @@ -25,25 +25,25 @@ export const getCapabilitiesFromBatch = ( /** using this as explicit way to ensure order */ export const handleCapabilities = async ( - subrequestOptionsLookup: Array, - batchPollResults: BatchSogsReponse, + subRequestOptionsLookup: Array, + batchPollResults: BatchSogsResponse, serverUrl: string // roomId: string ): Promise> => { if (!batchPollResults.body) { return null; } - const capabilities = getCapabilitiesFromBatch(subrequestOptionsLookup, batchPollResults.body); + const capabilities = getCapabilitiesFromBatch(subRequestOptionsLookup, batchPollResults.body); if (!capabilities) { window?.log?.error( - 'Failed capabilities subrequest - cancelling capabilities response handling' + 'Failed capabilities subRequest - cancelling capabilities response handling' ); return null; } // get all v2OpenGroup rooms with the matching serverUrl and set the capabilities. - // TODOLATER: capabilities are shared accross a server, not a room. We should probably move this to the server but we do not a server level currently, just rooms + // TODOLATER: capabilities are shared across a server, not a room. We should probably move this to the server but we do not a server level currently, just rooms const rooms = OpenGroupData.getV2OpenGroupRoomsByServerUrl(serverUrl); diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts index 047d20c112..45ade16e39 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts @@ -27,11 +27,11 @@ type BatchBodyRequestSharedOptions = { headers?: any; }; -interface BatchJsonSubrequestOptions extends BatchBodyRequestSharedOptions { +interface BatchJsonSubRequestOptions extends BatchBodyRequestSharedOptions { json: object; } -type BatchBodyRequest = BatchJsonSubrequestOptions; +type BatchBodyRequest = BatchJsonSubRequestOptions; type BatchSubRequest = BatchBodyRequest | BatchFetchRequestOptions; @@ -46,7 +46,7 @@ type BatchRequest = { headers: OpenGroupRequestHeaders; }; -export type BatchSogsReponse = { +export type BatchSogsResponse = { status_code: number; body?: Array<{ body: object; code: number; headers?: Record }>; }; @@ -57,7 +57,7 @@ export const sogsBatchSend = async ( abortSignal: AbortSignal, batchRequestOptions: Array, batchType: MethodBatchType -): Promise => { +): Promise => { // getting server pk for room const [roomId] = roomInfos; const fetchedRoomInfo = OpenGroupData.getV2OpenGroupRoomByRoomId({ @@ -65,7 +65,7 @@ export const sogsBatchSend = async ( roomId, }); if (!fetchedRoomInfo || !fetchedRoomInfo?.serverPublicKey) { - window?.log?.warn('Couldnt get fetched info or server public key -- aborting batch request'); + window?.log?.warn("Couldn't get fetched info or server public key -- aborting batch request"); return null; } const { serverPublicKey } = fetchedRoomInfo; @@ -99,29 +99,27 @@ export const sogsBatchSend = async ( }; export function parseBatchGlobalStatusCode( - response?: BatchSogsReponse | OnionV4JSONSnodeResponse | null + response?: BatchSogsResponse | OnionV4JSONSnodeResponse | null ): number | undefined { return response?.status_code; } export function batchGlobalIsSuccess( - response?: BatchSogsReponse | OnionV4JSONSnodeResponse | null + response?: BatchSogsResponse | OnionV4JSONSnodeResponse | null ): boolean { const status = parseBatchGlobalStatusCode(response); return Boolean(status && isNumber(status) && status >= 200 && status <= 300); } -function parseBatchFirstSubStatusCode(response?: BatchSogsReponse | null): number | undefined { +function parseBatchFirstSubStatusCode(response?: BatchSogsResponse | null): number | undefined { return response?.body?.[0].code; } -export function batchFirstSubIsSuccess(response?: BatchSogsReponse | null): boolean { +export function batchFirstSubIsSuccess(response?: BatchSogsResponse | null): boolean { const status = parseBatchFirstSubStatusCode(response); return Boolean(status && isNumber(status) && status >= 200 && status <= 300); } -export type SubrequestOptionType = 'capabilities' | 'messages' | 'pollInfo' | 'inbox'; - export type SubRequestCapabilitiesType = { type: 'capabilities' }; export type SubRequestMessagesObjectType = @@ -233,7 +231,7 @@ export type OpenGroupBatchRow = /** * - * @param options Array of subrequest options to be made. + * @param options Array of subRequest options to be made. */ const makeBatchRequestPayload = ( options: OpenGroupBatchRow @@ -399,7 +397,7 @@ const sendSogsBatchRequestOnionV4 = async ( serverPubkey: string, request: BatchRequest, abortSignal: AbortSignal -): Promise => { +): Promise => { const { endpoint, headers, method, body } = request; if (!endpoint.startsWith('/')) { throw new Error('endpoint needs a leading /'); @@ -429,7 +427,7 @@ const sendSogsBatchRequestOnionV4 = async ( return null; } if (isObject(batchResponse.body)) { - return batchResponse as BatchSogsReponse; + return batchResponse as BatchSogsResponse; } window?.log?.warn('sogsbatch: batch response decoded body is not object. Returning null'); diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts index 28248d0b73..e097009d18 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts @@ -1,6 +1,5 @@ import AbortController from 'abort-controller'; import { ConvoHub } from '../../../conversations'; -import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil'; import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils'; import { batchFirstSubIsSuccess, @@ -9,6 +8,7 @@ import { sogsBatchSend, } from './sogsV3BatchPoll'; import { PromiseUtils } from '../../../utils'; +import { OpenGroupRequestCommonType } from '../../../../data/types'; type OpenGroupClearInboxResponse = { deleted: number; diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index 371ff4764c..e5e8dbbd38 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -1,5 +1,5 @@ /** - * Makes a post to a node to receive the timestamp info. If non-existant, returns -1 + * Makes a post to a node to receive the timestamp info. If non-existent, returns -1 * @param snode Snode to send request to * @returns timestamp of the response from snode */ @@ -12,17 +12,17 @@ import { NetworkTimeSubRequest } from './SnodeRequestTypes'; const getNetworkTime = async (snode: Snode): Promise => { - const subrequest = new NetworkTimeSubRequest(); + const subRequest = new NetworkTimeSubRequest(); const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [subrequest], + [subRequest], snode, 10000, null, false ); if (!result || !result.length) { - window?.log?.warn(`getNetworkTime on ${snode.ip}:${snode.port} returned falsish value`, result); + window?.log?.warn(`getNetworkTime on ${snode.ip}:${snode.port} returned falsy value`, result); throw new Error('getNetworkTime: Invalid result'); } @@ -76,7 +76,7 @@ function now() { function getNowWithNetworkOffsetSeconds() { // make sure to call exports here, as we stub the exported one for testing. - return Math.floor(GetNetworkTime.getNowWithNetworkOffset() / 1000); + return Math.floor(GetNetworkTime.now() / 1000); } export const GetNetworkTime = { diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index 66e4a63446..f85c724283 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -5,17 +5,16 @@ import { SnodePool } from './snodePool'; import { Snode } from '../../../data/types'; import { GetServiceNodesSubRequest } from './SnodeRequestTypes'; - /** * Returns a list of unique snodes got from the specified targetNode. * This function won't try to rebuild a path if at some point we don't have enough snodes. * This is exported for testing purpose only. */ async function getSnodePoolFromSnode(targetNode: Snode): Promise> { - const subrequest = new GetServiceNodesSubRequest(); + const subRequest = new GetServiceNodesSubRequest(); const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [subrequest], + [subRequest], targetNode, 10000, null, diff --git a/ts/session/apis/snode_api/pollingTypes.ts b/ts/session/apis/snode_api/pollingTypes.ts index 44374f2627..0735b14ed5 100644 --- a/ts/session/apis/snode_api/pollingTypes.ts +++ b/ts/session/apis/snode_api/pollingTypes.ts @@ -1,7 +1,7 @@ // That named-tuple syntax breaks prettier linting and formatting on the whole file it is used currently, so we keep it separately. import { GroupPubkeyType } from 'libsession_util_nodejs'; -import { ConversationTypeEnum } from '../../../models/conversationAttributes'; +import { ConversationTypeEnum } from '../../../models/types'; export type PollForUs = [pubkey: string, type: ConversationTypeEnum.PRIVATE]; export type PollForLegacy = [pubkey: string, type: ConversationTypeEnum.GROUP]; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index f787715a34..46c7319e88 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -53,7 +53,6 @@ import { RetrieveMessageItem, RetrieveMessageItemWithNamespace, RetrieveMessagesResultsBatched, - RetrieveRequestResult, } from './types'; import { ConversationTypeEnum } from '../../../models/types'; @@ -61,8 +60,6 @@ import { Snode } from '../../../data/types'; const minMsgCountShouldRetry = 95; - - function extractWebSocketContent( message: string, messageHash: string @@ -157,7 +154,6 @@ export class SwarmPolling { this.resetSwarmPolling(); } - public forcePolledTimestamp(pubkey: string, lastPoll: number) { const foundAt = this.groupPolling.findIndex(group => { return PubKey.isEqual(pubkey, group.pubkey); @@ -458,7 +454,7 @@ export class SwarmPolling { resultsFromAllNamespaces ); window.log.debug( - `received confMessages:${confMessages?.length ||0}, revokedMessages:${revokedMessages?.length ||0}, ` + `received confMessages:${confMessages?.length || 0}, revokedMessages:${revokedMessages?.length || 0}, ` ); // We always handle the config messages first (for groups 03 or our own messages) await this.handleUserOrGroupConfMessages({ confMessages, pubkey, type }); @@ -490,6 +486,9 @@ export class SwarmPolling { `handleSeenMessages: ${newMessages.length} out of ${uniqOtherMsgs.length} are not seen yet. snode: ${toPollFrom ? ed25519Str(toPollFrom.pubkey_ed25519) : 'undefined'}` ); if (type === ConversationTypeEnum.GROUPV2) { + if (!PubKey.is03Pubkey(pubkey)) { + throw new Error('groupv2 expects a 03 key'); + } // groupv2 messages are not stored in the cache, so for each that we process, we also add it as seen message. // this is to take care of a crash half way through processing messages. We'd get the same 100 messages back, and we'd skip up to the first not seen message await handleMessagesForGroupV2(newMessages, pubkey); @@ -837,9 +836,10 @@ export class SwarmPolling { const resultsFromUserProfile = await SnodeAPIRetrieve.retrieveNextMessagesNoRetries( toPollFrom, pubkey.key, - [{lastHash: '',namespace: SnodeNamespaces.UserProfile}], + [{ lastHash: '', namespace: SnodeNamespaces.UserProfile }], pubkey.key, - null, false + null, + false ); // Note: always print something so we know if the polling is hanging @@ -862,7 +862,7 @@ export class SwarmPolling { const userConfigMessagesWithNamespace: Array> = resultsFromUserProfile.map(r => { return (r.messages.messages || []).map(m => { - return { ...m, namespace: SnodeNamespaces.UserProfile}; + return { ...m, namespace: SnodeNamespaces.UserProfile }; }); }); @@ -890,11 +890,11 @@ export class SwarmPolling { await UserConfigWrapperActions.init(privateKeyEd25519, null); await UserConfigWrapperActions.merge(incomingConfigMessages); - const foundName = await UserConfigWrapperActions.getName(); + const foundName = await UserConfigWrapperActions.getName(); if (!foundName) { throw new Error('UserInfo not found or name is empty'); } - displayNameFound =foundName + displayNameFound = foundName; } catch (e) { window.log.warn('LibSessionUtil.initializeLibSessionUtilWrappers failed with', e.message); } finally { diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 6911bf2eed..56563c3d90 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -34,7 +34,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { const dumps = await MetaGroupWrapperActions.metaMakeDump(groupPk); window.log.info( - `pushChangesToGroupSwarmIfNeeded: current metadump: ${ed25519Str(groupPk)}:`, + `pushChangesToGroupSwarmIfNeeded: current meta dump: ${ed25519Str(groupPk)}:`, to_hex(dumps) ); } @@ -64,7 +64,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { `removeAllMessagesInConversationSentBefore of ${ed25519Str(groupPk)} before ${infos.deleteBeforeSeconds}: `, deletedMsgIds ); - window.inboxStore.dispatch( + window.inboxStore?.dispatch( messagesExpired(deletedMsgIds.map(messageId => ({ conversationKey: groupPk, messageId }))) ); lastAppliedRemoveMsgSentBeforeSeconds.set(groupPk, infos.deleteBeforeSeconds); @@ -236,10 +236,10 @@ async function handleGroupSharedConfigMessages( await LibSessionUtil.saveDumpsToDb(groupPk); // refresh the redux slice with the merged result - window.inboxStore.dispatch( + window.inboxStore?.dispatch( groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk, - }) + })as any ); } catch (e) { window.log.warn( diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index c283233bd8..f7d0d911bf 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -370,7 +370,7 @@ class ConvoController { await ConfigDumpData.deleteDumpFor(groupPk); getSwarmPollingInstance().removePubkey(groupPk, 'deleteGroup'); - window.inboxStore.dispatch(groupInfoActions.removeGroupDetailsFromSlice({ groupPk })); + window.inboxStore?.dispatch(groupInfoActions.removeGroupDetailsFromSlice({ groupPk })); await UserSync.queueNewJobIfNeeded(); } @@ -563,7 +563,7 @@ class ConvoController { // not a private conversation, so not a contact for the ContactWrapper await Data.removeConversation(convoId); - // remove the data from the opengrouprooms table too if needed + // remove the data from the opengroup rooms table too if needed if (convoId && OpenGroupUtils.isOpenGroupV2(convoId)) { // remove the roomInfos locally for this open group room including the pubkey try { diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index 2f05ee8b4b..b3aae235e6 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -16,6 +16,8 @@ import { PubKey } from '../types'; import { UserUtils } from '../utils'; import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils'; import { ConvoHub } from './ConversationController'; +import { ConversationTypeEnum } from '../../models/types'; +import { getMessageQueue } from '../sending'; /** * Creates a brand new closed group from user supplied details. This function generates a new identityKeyPair so cannot be used to restore a closed group. @@ -172,7 +174,7 @@ async function sendToGroupMembers( inviteResults.forEach((result, index) => { const member = listOfMembers[index]; // group invite must always contain the admin member. - if (result !== true || admins.includes(member)) { + if (!result || admins.includes(member)) { membersToResend.push(member); } }); diff --git a/ts/session/disappearing_messages/timerOptions.ts b/ts/session/disappearing_messages/timerOptions.ts index aece39d571..856c95f6bc 100644 --- a/ts/session/disappearing_messages/timerOptions.ts +++ b/ts/session/disappearing_messages/timerOptions.ts @@ -3,39 +3,54 @@ import { formatAbbreviatedExpireTimer, formatNonAbbreviatedExpireTimer, } from '../../util/i18n/formatting/expirationTimer'; -import { DURATION_SECONDS } from '../constants'; -type TimerOptionsEntry = { name: string; value: number }; -export type TimerOptionsArray = Array +type TimerSeconds = + | 0 + | 5 + | 10 + | 30 + | 60 + | 300 + | 1800 + | 3600 + | 21600 + | 43200 + | 86400 + | 604800 + | 1209600; -const VALUES: Array = [ +type TimerOptionsEntry = { name: string; value: TimerSeconds }; +export type TimerOptionsArray = Array; + +// prettier-ignore +const VALUES: Array = [ /** off */ 0, /** 5 seconds */ - 5 * DURATION_SECONDS.SECONDS, + 5, /** 10 seconds */ - 10 * DURATION_SECONDS.SECONDS, + 10, /** 30 seconds */ - 30 * DURATION_SECONDS.SECONDS, + 30, /** 1 minute */ - 1 * DURATION_SECONDS.MINUTES, + 60, /** 5 minutes */ - 5 * DURATION_SECONDS.MINUTES, + 300, /** 30 minutes */ - 30 * DURATION_SECONDS.MINUTES, + 1800, /** 1 hour */ - 1 * DURATION_SECONDS.HOURS, + 3600, /** 6 hours */ - 6 * DURATION_SECONDS.HOURS, + 21600, /** 12 hours */ - 12 * DURATION_SECONDS.HOURS, + 43200, /** 1 day */ - 1 * DURATION_SECONDS.DAYS, + 86400, /** 1 week */ - 1 * DURATION_SECONDS.WEEKS, + 604800, /** 2 weeks */ - 2 * DURATION_SECONDS.WEEKS, -]; + 1209600, +] as const; function getName(seconds = 0) { if (seconds === 0) { @@ -56,7 +71,6 @@ function getAbbreviated(seconds: number) { return [seconds, 's'].join(''); } - const filterOutDebugValues = (option: number) => { return isDevProd() || option > 60; // when not a dev build, filter out options with less than 60s }; diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index d870fec6c8..141445abc8 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -14,11 +14,11 @@ import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI'; import { Onions, snodeHttpsAgent } from '../apis/snode_api/onions'; -import * as SnodePool from '../apis/snode_api/snodePool'; import { DURATION } from '../constants'; import { UserUtils } from '../utils'; import { allowOnlyOneAtATime } from '../utils/Promise'; import { ed25519Str } from '../utils/String'; +import { SnodePool } from '../apis/snode_api/snodePool'; export const desiredGuardCount = 2; export const minimumGuardCount = 1; @@ -111,23 +111,23 @@ export async function dropSnodeFromPath(snodeEd25519: string) { // make a copy now so we don't alter the real one while doing stuff here const oldPaths = _.cloneDeep(onionPaths); - let pathtoPatchUp = oldPaths[pathWithSnodeIndex]; + let pathToPatchUp = oldPaths[pathWithSnodeIndex]; // remove the snode causing issue from this path - const nodeToRemoveIndex = pathtoPatchUp.findIndex(snode => snode.pubkey_ed25519 === snodeEd25519); + const nodeToRemoveIndex = pathToPatchUp.findIndex(snode => snode.pubkey_ed25519 === snodeEd25519); // this should not happen, but well... if (nodeToRemoveIndex === -1) { return; } - pathtoPatchUp = pathtoPatchUp.filter(snode => snode.pubkey_ed25519 !== snodeEd25519); + pathToPatchUp = pathToPatchUp.filter(snode => snode.pubkey_ed25519 !== snodeEd25519); const ed25519KeysToExclude = _.flattenDeep(oldPaths).map(m => m.pubkey_ed25519); // this call throws if it cannot return a valid snode. const snodeToAppendToPath = await SnodePool.getRandomSnode(ed25519KeysToExclude); // Don't test the new snode as this would reveal the user's IP - pathtoPatchUp.push(snodeToAppendToPath); - onionPaths[pathWithSnodeIndex] = pathtoPatchUp; + pathToPatchUp.push(snodeToAppendToPath); + onionPaths[pathWithSnodeIndex] = pathToPatchUp; } export async function getOnionPath({ toExclude }: { toExclude?: Snode }): Promise> { @@ -318,7 +318,7 @@ export async function testGuardNode(snode: Snode) { response = await insecureNodeFetch(url, fetchOptions); } catch (e) { if (e.type === 'request-timeout') { - window?.log?.warn('testGuardNode request timedout for:', ed25519Str(snode.pubkey_ed25519)); + window?.log?.warn('testGuardNode request timed out for:', ed25519Str(snode.pubkey_ed25519)); } if (e.code === 'ENETUNREACH') { window?.log?.warn('no network on node,', snode); @@ -394,8 +394,8 @@ export async function selectGuardNodes(): Promise> { guardNodes = selectedGuardNodes.slice(0, desiredGuardCount); if (guardNodes.length < desiredGuardCount) { - window?.log?.error(`Cound't get enough guard nodes, only have: ${guardNodes.length}`); - throw new Error(`Cound't get enough guard nodes, only have: ${guardNodes.length}`); + window?.log?.error(`Couldn't get enough guard nodes, only have: ${guardNodes.length}`); + throw new Error(`Couldn't get enough guard nodes, only have: ${guardNodes.length}`); } await internalUpdateGuardNodes(guardNodes); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index ece1e717df..1574049449 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -7,7 +7,6 @@ import pRetry from 'p-retry'; import { Data, SeenMessageHashes } from '../../data/data'; import { SignalService } from '../../protobuf'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; -import { OpenGroupRequestCommonType } from '../apis/open_group_api/opengroupV2/ApiUtil'; import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2'; import { sendMessageOnionV4BlindedRequest, @@ -57,6 +56,7 @@ import { ed25519Str, fromUInt8ArrayToBase64 } from '../utils/String'; import { MessageSentHandler } from './MessageSentHandler'; import { MessageWrapper } from './MessageWrapper'; import { stringify } from '../../types/sqlSharedTypes'; +import { OpenGroupRequestCommonType } from '../../data/types'; // ================ SNODE STORE ================ @@ -405,7 +405,7 @@ type SortedSubRequestsType = Array< >; async function sendMessagesDataToSnode({ - associatedWith: associatedWith, + associatedWith, sortedSubRequests, method, }: { diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index aee96c308c..563f1a6bc6 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -88,7 +88,7 @@ export class PubKey { const pk = value instanceof PubKey ? valAny.key : value; if (!pk || pk.length < 8) { - throw new Error('PubkKey.shorten was given an invalid PubKey to shorten.'); + throw new Error('PubKey.shorten was given an invalid PubKey to shorten.'); } return `(${pk.substring(0, 4)}...${pk.substring(pk.length - 4)})`; diff --git a/ts/session/utils/User.ts b/ts/session/utils/User.ts index 3f5b8b4f69..fdad4cde3b 100644 --- a/ts/session/utils/User.ts +++ b/ts/session/utils/User.ts @@ -3,11 +3,11 @@ import _ from 'lodash'; import { UserUtils } from '.'; import { Data } from '../../data/data'; import { SessionKeyPair } from '../../receiver/keypairs'; -import { LokiProfile } from '../../types/Message'; import { ConvoHub } from '../conversations'; import { getOurPubKeyStrFromStorage } from '../../util/storage'; import { PubKey } from '../types'; import { fromHexToArray, toHex } from './String'; +import { LokiProfile } from '../../types/message'; export type HexKeyPair = { pubKey: string; diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index f26de93a30..cfd9ac0a7a 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -22,7 +22,7 @@ import { LibSessionUtil } from '../../libsession/libsession_utils'; import { showUpdateGroupMembersByConvoId } from '../../../../interactions/conversationInteractions'; const defaultMsBetweenRetries = 10000; -const defaultMaxAttemps = 1; +const defaultMaxAttempts = 1; type JobExtraArgs = { groupPk: GroupPubkeyType; @@ -54,7 +54,9 @@ async function addJob({ groupPk, member }: JobExtraArgs) { }); window.log.debug(`addGroupInviteJob: adding group invite for ${groupPk}:${member} `); - window?.inboxStore?.dispatch(groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk })); + window?.inboxStore?.dispatch( + groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any + ); await LibSessionUtil.saveDumpsToDb(groupPk); await runners.groupInviteJobRunner.addJob(groupInviteJob); @@ -79,7 +81,7 @@ function displayFailedInvitesForGroup(groupPk: GroupPubkeyType) { case 1: ToastUtils.pushToastWarning( `invite-failed${groupPk}`, - window.i18n('groupInviteFailedOne', [...thisGroupFailures.failedMembers, groupPk]), + window.i18n('groupInviteFailedUser', [...thisGroupFailures.failedMembers, groupPk]), onToastClick ); break; @@ -93,7 +95,7 @@ function displayFailedInvitesForGroup(groupPk: GroupPubkeyType) { default: ToastUtils.pushToastWarning( `invite-failed${groupPk}`, - window.i18n('groupInviteFailedOthers', [ + window.i18n('groupInviteFailedMultiple', [ thisGroupFailures.failedMembers[0], `${thisGroupFailures.failedMembers.length - 1}`, groupPk, @@ -130,7 +132,7 @@ class GroupInviteJob extends PersistedJob { member, groupPk, delayBetweenRetries: defaultMsBetweenRetries, - maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttemps, + maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts, nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries, currentRetry: isNumber(currentRetry) ? currentRetry : 0, }); @@ -194,7 +196,9 @@ class GroupInviteJob extends PersistedJob { window?.inboxStore?.dispatch( groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: false }) ); - window?.inboxStore?.dispatch(groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk })); + window?.inboxStore?.dispatch( + groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any + ); await LibSessionUtil.saveDumpsToDb(groupPk); } // return true so this job is marked as a success and we don't need to retry it diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index b40d6d42e9..7df2087b75 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -37,7 +37,7 @@ export type WithAddWithHistoryMembers = { withHistory: Array }; export type WithRemoveMembers = { removed: Array }; const defaultMsBetweenRetries = 10000; -const defaultMaxAttemps = 1; +const defaultMaxAttempts = 1; type JobExtraArgs = Pick; @@ -109,7 +109,7 @@ class GroupPendingRemovalsJob extends PersistedJob ({ conversationKey: groupPk, @@ -236,7 +236,7 @@ class GroupPendingRemovalsJob extends PersistedJob { const getFakeResponseOnDestination = (statusCode?: number, body?: string) => { return { - status: 200 || 0, + status: 200, text: async () => { return JSON.stringify({ status: statusCode, body: body || '' }); }, @@ -111,12 +111,13 @@ describe('OnionPathsErrors', () => { await OnionPaths.getOnionPath({}); oldOnionPaths = OnionPaths.TEST_getTestOnionPath(); - Sinon.stub(Onions, 'decodeOnionResult').callsFake((_symmetricKey: ArrayBuffer, plaintext: string) => - Promise.resolve({ - plaintext, - ciphertextBuffer: new Uint8Array(), - plaintextBuffer: Buffer.alloc(0), - }) + Sinon.stub(Onions, 'decodeOnionResult').callsFake( + (_symmetricKey: ArrayBuffer, plaintext: string) => + Promise.resolve({ + plaintext, + ciphertextBuffer: new Uint8Array(), + plaintextBuffer: Buffer.alloc(0), + }) ); }); diff --git a/ts/test/session/unit/onion/OnionPaths_test.ts b/ts/test/session/unit/onion/OnionPaths_test.ts index 8bbec24d13..c525c4ea32 100644 --- a/ts/test/session/unit/onion/OnionPaths_test.ts +++ b/ts/test/session/unit/onion/OnionPaths_test.ts @@ -16,7 +16,7 @@ import { } from '../../../test-utils/utils'; import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList'; -import { TEST_resetState } from '../../../../session/apis/snode_api/snodePool'; +import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; chai.use(chaiAsPromised as any); chai.should(); @@ -134,7 +134,7 @@ describe('OnionPaths', () => { TestUtils.stubWindow('getSeedNodeList', () => ['seednode1']); TestUtils.stubWindowLog(); - TEST_resetState(); + SnodePool.TEST_resetState(); fetchSnodePoolFromSeedNodeWithRetries = Sinon.stub( SeedNodeAPI, diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts index d23dc079f1..4b2673db68 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_getPollingTimeout_test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import Sinon from 'sinon'; -import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; +import { ConversationTypeEnum } from '../../../../models/types'; import { SwarmPolling, getSwarmPollingInstance, diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts index 53d1440ac8..11fa98c893 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollForAllKeys_test.ts @@ -9,7 +9,7 @@ import { UserGroupsGet, } from 'libsession_util_nodejs'; import { ConversationModel, Convo } from '../../../../models/conversation'; -import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; +import { ConversationTypeEnum } from '../../../../models/types'; import { getSwarmPollingInstance } from '../../../../session/apis/snode_api'; import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling'; import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest'; diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts index d8d488d1f1..fd5db020ba 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_pollingDetails_test.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; import { LegacyGroupInfo, UserGroupsGet } from 'libsession_util_nodejs'; import Sinon from 'sinon'; -import { ConversationTypeEnum } from '../../../../models/conversationAttributes'; import { getSwarmPollingInstance } from '../../../../session/apis/snode_api'; import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling'; import { SwarmPolling } from '../../../../session/apis/snode_api/swarmPolling'; @@ -10,6 +9,7 @@ import { PubKey } from '../../../../session/types'; import { UserUtils } from '../../../../session/utils'; import { TestUtils } from '../../../test-utils'; import { stubData } from '../../../test-utils/utils'; +import { ConversationTypeEnum } from '../../../../models/types'; describe('getPollingDetails', () => { // Initialize new stubbed cache diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts index 3a603e9b26..be6114d2ed 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts @@ -4,20 +4,21 @@ import Sinon, * as sinon from 'sinon'; import chaiAsPromised from 'chai-as-promised'; import { ConversationModel } from '../../../../models/conversation'; -import { getSwarmPollingInstance, SnodePool } from '../../../../session/apis/snode_api'; +import { getSwarmPollingInstance } from '../../../../session/apis/snode_api'; import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling'; import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest'; import { SwarmPolling } from '../../../../session/apis/snode_api/swarmPolling'; import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants'; import { PubKey } from '../../../../session/types'; import { UserUtils } from '../../../../session/utils'; -import { ConfigurationSync } from '../../../../session/utils/job_runners/jobs/ConfigurationSyncJob'; +import { UserSync } from '../../../../session/utils/job_runners/jobs/UserSyncJob'; import { sleepFor } from '../../../../session/utils/Promise'; import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { TestUtils } from '../../../test-utils'; import { generateFakeSnodes, stubData } from '../../../test-utils/utils'; import { ConversationTypeEnum } from '../../../../models/types'; import { ConvoHub } from '../../../../session/conversations'; +import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; chai.use(chaiAsPromised as any); chai.should(); @@ -26,8 +27,8 @@ const { expect } = chai; describe('SwarmPolling', () => { // Initialize new stubbed cache - const ourPubkey = TestUtils.generateFakePubKey(); - const ourNumber = ourPubkey.key; + const ourNumber = TestUtils.generateFakePubKeyStr(); + const ourPubkey = PubKey.cast(ourNumber); let pollOnceForKeySpy: Sinon.SinonSpy; @@ -38,7 +39,7 @@ describe('SwarmPolling', () => { beforeEach(async () => { ConvoHub.use().reset(); TestUtils.stubWindowFeatureFlags(); - Sinon.stub(ConfigurationSync, 'queueNewJobIfNeeded').resolves(); + Sinon.stub(UserSync, 'queueNewJobIfNeeded').resolves(); // Utils Stubs Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); @@ -194,10 +195,7 @@ describe('SwarmPolling', () => { Sinon.restore(); }); it('does run for our pubkey even if activeAt is really old ', async () => { - const convo = ConvoHub.use().getOrCreate( - ourNumber, - ConversationTypeEnum.PRIVATE - ); + const convo = ConvoHub.use().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE); convo.set('active_at', Date.now() - 1000 * 3600 * 25); await swarmPolling.start(true); @@ -206,10 +204,7 @@ describe('SwarmPolling', () => { }); it('does run for our pubkey even if activeAt is recent ', async () => { - const convo = ConvoHub.use().getOrCreate( - ourNumber, - ConversationTypeEnum.PRIVATE - ); + const convo = ConvoHub.use().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE); convo.set('active_at', Date.now()); await swarmPolling.start(true); From 745a20d1bc4f4856ae9d6a8e67877916a9ddc838 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 22 Oct 2024 19:57:09 +1100 Subject: [PATCH 145/302] fix: fetched latest strings. app starts --- _locales/af/messages.json | 6 -- _locales/ar/messages.json | 7 +-- _locales/az/messages.json | 14 +++-- _locales/bal/messages.json | 6 -- _locales/be/messages.json | 8 +-- _locales/bg/messages.json | 6 -- _locales/bn/messages.json | 6 -- _locales/ca/messages.json | 6 -- _locales/cs/messages.json | 25 +++++--- _locales/cy/messages.json | 6 -- _locales/da/messages.json | 6 -- _locales/de/messages.json | 24 +++----- _locales/el/messages.json | 6 -- _locales/en/messages.json | 19 ++++-- _locales/eo/messages.json | 6 -- _locales/es-419/messages.json | 6 -- _locales/es/messages.json | 6 -- _locales/et/messages.json | 6 -- _locales/eu/messages.json | 6 -- _locales/fa/messages.json | 6 -- _locales/fi/messages.json | 6 -- _locales/fil/messages.json | 6 -- _locales/fr/messages.json | 6 -- _locales/gl/messages.json | 6 -- _locales/ha/messages.json | 6 -- _locales/he/messages.json | 6 -- _locales/hi/messages.json | 20 +++---- _locales/hr/messages.json | 6 -- _locales/hu/messages.json | 10 +--- _locales/hy-AM/messages.json | 6 -- _locales/id/messages.json | 6 -- _locales/it/messages.json | 9 +-- _locales/ja/messages.json | 60 ++++++++++--------- _locales/ka/messages.json | 6 -- _locales/km/messages.json | 6 -- _locales/kmr/messages.json | 17 ++---- _locales/kn/messages.json | 6 -- _locales/ko/messages.json | 6 -- _locales/ku/messages.json | 6 -- _locales/lg/messages.json | 6 -- _locales/lo/messages.json | 4 -- _locales/lt/messages.json | 11 ++-- _locales/lv/messages.json | 10 ++-- _locales/mk/messages.json | 6 -- _locales/mn/messages.json | 6 -- _locales/ms/messages.json | 6 -- _locales/my/messages.json | 6 -- _locales/nb/messages.json | 6 -- _locales/ne/messages.json | 6 -- _locales/nl/messages.json | 6 -- _locales/nn/messages.json | 6 -- _locales/no/messages.json | 6 -- _locales/ny/messages.json | 6 -- _locales/pa/messages.json | 6 -- _locales/pl/messages.json | 6 -- _locales/ps/messages.json | 6 -- _locales/pt-BR/messages.json | 6 -- _locales/pt-PT/messages.json | 6 -- _locales/ro/messages.json | 6 -- _locales/ru/messages.json | 8 +-- _locales/sh/messages.json | 6 -- _locales/si/messages.json | 6 -- _locales/sk/messages.json | 9 +-- _locales/sl/messages.json | 6 -- _locales/sq/messages.json | 6 -- _locales/sr-CS/messages.json | 6 -- _locales/sr-SP/messages.json | 6 -- _locales/sv/messages.json | 6 -- _locales/sw/messages.json | 6 -- _locales/ta/messages.json | 6 -- _locales/te/messages.json | 6 -- _locales/th/messages.json | 6 -- _locales/tl/messages.json | 6 -- _locales/tr/messages.json | 6 -- _locales/uk/messages.json | 12 +--- _locales/ur/messages.json | 6 -- _locales/uz/messages.json | 58 ++++++++---------- _locales/vi/messages.json | 6 -- _locales/xh/messages.json | 6 -- _locales/zh-CN/messages.json | 10 +--- _locales/zh-TW/messages.json | 6 -- ts/components/MemberListItem.tsx | 10 ++-- .../conversation/SessionConversation.tsx | 6 +- .../conversation/SubtleNotification.tsx | 4 +- .../leftpane/overlay/OverlayClosedGroup.tsx | 54 ++++++++--------- ts/models/groupUpdate.ts | 51 ++++++++-------- ts/receiver/configMessage.ts | 2 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 26 +++++--- 88 files changed, 222 insertions(+), 638 deletions(-) diff --git a/_locales/af/messages.json b/_locales/af/messages.json index 15d920fd83..f60b4a5638 100644 --- a/_locales/af/messages.json +++ b/_locales/af/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} is as Admin verwyder", "adminRemovedUserMultiple": "{name} en {count} ander is verwyder as Admin.", "adminRemovedUserOther": "{name} en {other_name} is verwyder as Admin.", - "adminSendingPromotion": "Bevordering van admin word gestuur", "adminSettings": "Admin-instellings", "adminTwoPromotedToAdmin": "{name} en {other_name} is bevorder tot Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Kon nie die groep bywerk nie", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Jy het nie toestemming om ander se boodskappe te verwyder nie", "deleteMessage": "{count, plural, one [Skrap Boodskap] other [Skrap Boodskappe]}", - "deleteMessageConfirm": "Is jy seker jy wil hierdie boodskap skrap?", "deleteMessageDeleted": "{count, plural, one [Boodskap verwyder] other [Boodskappe verwyder]}", "deleteMessageDeletedGlobally": "Hierdie boodskap is verwyder", "deleteMessageDeletedLocally": "Hierdie boodskap is op hierdie toestel verwyder", - "deleteMessageDescriptionDevice": "Is jy seker jy wil hierdie boodskap slegs van hierdie toestel skrap?", "deleteMessageDescriptionEveryone": "Is jy seker jy wil hierdie boodskap vir almal skrap?", "deleteMessageDeviceOnly": "Skrap net op hierdie toestel", "deleteMessageDevicesAll": "Skrap op al my toestelle", "deleteMessageEveryone": "Skrap vir Almal", "deleteMessageFailed": "{count, plural, one [Kon nie boodskap uitvee nie] other [Kon nie boodskappe uitvee nie]}", - "deleteMessagesConfirm": "Is jy seker jy wil hierdie boodskappe skrap?", - "deleteMessagesDescriptionDevice": "Is jy seker jy wil hierdie boodskappe net van hierdie toestel verwyder?", "deleteMessagesDescriptionEveryone": "Is jy seker jy wil hierdie boodskappe vir almal verwyder?", "deleting": "Skrap...", "developerToolsToggle": "Skakel Ontwikkelaarhulpmiddels aan/af", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Kon nie {name} en {count} ander na {group_name} nooi nie", "groupInviteFailedTwo": "Kon nie {name} en {other_name} na {group_name} nooi nie", "groupInviteFailedUser": "Kon nie {name} na {group_name} nooi nie", - "groupInviteSending": "Uitnodiging word gestuur", "groupInviteSent": "Nooi gestuur", "groupInviteSuccessful": "Groepuitnodiging suksesvol", "groupInviteVersion": "Gebruikers moet die nuutste weergawe hê om uitnodigings te ontvang", diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json index c5ff2403f6..62b45dfdef 100644 --- a/_locales/ar/messages.json +++ b/_locales/ar/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} تم إزالته كمشرف.", "adminRemovedUserMultiple": "تمت إزالة {name} و{count} آخرين من منصبهم كمسؤولين.", "adminRemovedUserOther": "تمت إزالة {name} و{other_name} من منصبي المسؤول.", - "adminSendingPromotion": "إرسال ترقية المشرف", "adminSettings": "اعدادات المسؤول", "adminTwoPromotedToAdmin": "{name} و {other_name} تم ترقيتهم إلى مشرف.", "andMore": "+{count}", @@ -273,17 +272,13 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "فشل في تحديث المجموعة", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "ليس لديك صلاحيات حذف رسائل الاخرين", "deleteMessage": "{count, plural, zero [حذف الرسائل] one [حذف الرسالة] two [حذف الرسائل] few [حذف الرسائل] many [حذف الرسائل] other [حذف الرسائل]}", - "deleteMessageConfirm": "هل أنت متأكد من أنك تريد حذف هذه الرسالة؟", "deleteMessageDeleted": "{count, plural, zero [تم حذف الرسائل] one [تم حذف الرسالة] two [تم حذف الرسائل] few [تم حذف الرسائل] many [تم حذف الرسائل] other [تم حذف الرسائل]}", "deleteMessageDeletedGlobally": "تم حذف هذه الرسالة", "deleteMessageDeletedLocally": "تم حذف هذه الرسالة على هذا الجهاز", - "deleteMessageDescriptionDevice": "هل أنت متأكد من أنك تريد حذف هذه الرسالة من هذا الجهاز فقط؟", "deleteMessageDescriptionEveryone": "هل أنت متأكد من أنك تريد حذف هذه الرسالة للجميع؟", "deleteMessageDeviceOnly": "حذف على هذا الجهاز فقط", "deleteMessageDevicesAll": "حذف على جميع أجهزتي", "deleteMessageEveryone": "حذف للجميع", - "deleteMessagesConfirm": "هل أنت متأكد من أنك تريد حذف هذه الرسائل؟", - "deleteMessagesDescriptionDevice": "هل أنت متيقِّن من أنك تريد مسح هذه الرسائل من هذا الجهاز فقط؟", "deleteMessagesDescriptionEveryone": "هل أنت متيقِّن من أنك تريد مسح هذه الرسائل لدى الجميع؟", "deleting": "حذف", "developerToolsToggle": "تحويل أدوات المطور", @@ -386,7 +381,6 @@ "groupInviteFailedMultiple": "فشل دعوة {name} و {count} آخرين إلى {group_name}", "groupInviteFailedTwo": "فشل دعوة {name} و {other_name} إلى {group_name}", "groupInviteFailedUser": "فشل دعوة {name} إلى {group_name}", - "groupInviteSending": "إرسال دعوة", "groupInviteSent": "تم إرسال الدعوة", "groupInviteSuccessful": "الدعوة إلى المجموعة ناجحة", "groupInviteVersion": "يجب أن يمتلك المستخدمون الإصدار الأحدث لتلقي الدعوات", @@ -512,6 +506,7 @@ "messageNew": "{count, plural, zero [رسائل جديدة] one [رسالة جديدة] two [رسائل جديدة] few [رسائل جديدة] many [رسائل جديدة] other [رسائل جديدة]}", "messageNewDescriptionDesktop": "ابدأ محادثة جديدة عن طريق إدخال معرف حساب صديقك أو ONS.", "messageNewDescriptionMobile": "ابدأ محادثة جديدة عن طريق إدخال معرف حساب صديقك، ONS أو مسح رمزه QR.", + "messageNewYouveGot": "{count, plural, zero [لديك # رسائل جديدة.] one [لديك رسالة جديدة.] two [لديك رسالتين # جدد.] few [لديك # رسائل جديدة.] many [لديك # رسائل جديدة.] other [لديك # رسائل جديدة.]}", "messageReplyingTo": "الرد على", "messageRequestGroupInvite": "{name} دعاك للانضمام إلى {group_name}.", "messageRequestGroupInviteDescription": "إرسال رسالة إلى هذه المجموعة سوف يقبل تلقائيًا دعوة المجموعة.", diff --git a/_locales/az/messages.json b/_locales/az/messages.json index e503e76f1b..1f983e8ac4 100644 --- a/_locales/az/messages.json +++ b/_locales/az/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} artıq Admin deyil.", "adminRemovedUserMultiple": "{name} və digər {count} nəfər Adminlikdən çıxarıldı.", "adminRemovedUserOther": "{name} və {other_name} Adminlikdən çıxarıldı.", - "adminSendingPromotion": "Admin təyinatı göndərilir", "adminSettings": "Admin ayarları", "adminTwoPromotedToAdmin": "{name} və {other_name} Admin olaraq yüksəldildi.", "andMore": "+{count}", @@ -142,6 +141,7 @@ "callsInProgress": "Zəng davam edir", "callsIncoming": "{name} sizə zəng edir", "callsIncomingUnknown": "Gələn zəng", + "callsMicrophonePermissionsRequired": "Mikrofon müraciətinə icazə vermədiyiniz üçün {name} edən zəngi buraxdınız.", "callsMissed": "Buraxılmış zəng", "callsMissedCallFrom": "{name} kontaktından buraxılmış zəng", "callsNotificationsRequired": "Səsli və görüntülü zənglər, cihazınızın sistem ayarlarında bildirişlərin fəallaşdırılmasını tələb edir.", @@ -198,6 +198,7 @@ "communityInvitation": "İcma dəvəti", "communityJoin": "İcmaya qoşul", "communityJoinDescription": "{community_name} icmasına qoşulmaq istədiyinizə əminsiniz?", + "communityJoinError": "İcmaya qoşulma uğursuz oldu", "communityJoinOfficial": "Ya da bunlardan birinə qoşulun...", "communityJoined": "İcmaya qoşuldu", "communityJoinedAlready": "Artıq bu icmanın üzvüsünüz.", @@ -273,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Qrup güncəlləmə uğursuz oldu", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Başqalarının mesajlarını silmə icazəniz yoxdur", "deleteMessage": "{count, plural, one [Mesajı sil] other [Mesajları sil]}", - "deleteMessageConfirm": "Bu mesajı silmək istədiyinizə əminsiniz?", "deleteMessageDeleted": "{count, plural, one [Mesaj silindi] other [Mesajlar silindi]}", "deleteMessageDeletedGlobally": "Bu mesaj silindi", "deleteMessageDeletedLocally": "Bu mesaj bu cihazda silindi", - "deleteMessageDescriptionDevice": "Bu mesajı yalnız bu cihazdan silmək istədiyinizə əminsiniz?", "deleteMessageDescriptionEveryone": "Bu mesajı hamı üçün silmək istədiyinizə əminsiniz?", "deleteMessageDeviceOnly": "Yalnız bu cihazda sil", "deleteMessageDevicesAll": "Bütün cihazlarımda sil", "deleteMessageEveryone": "Hər kəs üçün sil", "deleteMessageFailed": "{count, plural, one [Mesajın silinməsi uğursuz oldu] other [Mesajların silinməsi uğursuz oldu]}", - "deleteMessagesConfirm": "Bu mesajları silmək istədiyinizə əminsiniz?", - "deleteMessagesDescriptionDevice": "Bu mesajları yalnız bu cihazdan silmək istədiyinizə əminsiniz?", "deleteMessagesDescriptionEveryone": "Bu mesajları hər kəs üçün silmək istədiyinizə əminsiniz?", "deleting": "Silinir", "developerToolsToggle": "Tərtibatçı Alətlərini aç/bağla", @@ -297,6 +294,7 @@ "disappearingMessagesDeleteType": "Silmə növü", "disappearingMessagesDescription": "Bu ayar, bu danışıqda hər kəsə aiddir.", "disappearingMessagesDescription1": "Bu ayar, bu danışıqda göndərdiyiniz mesajlara aiddir.", + "disappearingMessagesDescriptionGroup": "Bu ayar, bu danışıqdakı hər kəsə tətbiq olunur.
Yalnız qrup adminləri bu ayarı dəyişdirə bilər.", "disappearingMessagesDisappear": "{disappearing_messages_type} olduqdan {time} sonra yox olur", "disappearingMessagesDisappearAfterRead": "Oxunduqdan sonra yox olur", "disappearingMessagesDisappearAfterReadDescription": "Mesajlar oxunduqdan sonra silinir.", @@ -387,9 +385,9 @@ "groupInviteFailedMultiple": "{name} və digər {count} nəfəri {group_name} qrupuna dəvət etmə uğursuz oldu", "groupInviteFailedTwo": "{name} və {other_name} istifadəçilərini {group_name} qrupuna dəvət etmə uğursuz oldu", "groupInviteFailedUser": "{name} istifadəçisini {group_name} qrupuna dəvət etmə uğursuz oldu", - "groupInviteSending": "Dəvət göndərilir", "groupInviteSent": "Dəvət göndərildi", "groupInviteSuccessful": "Qrup dəvəti uğurludur", + "groupInviteVersion": "İstifadəçilər dəvətləri qəbul etmək üçün ən son versiyaya sahib olmalıdırlar", "groupInviteYou": "Siz qrupa qoşulmağa dəvət edildiniz.", "groupInviteYouAndMoreNew": "Siz və digər {count} nəfər qrupa qoşulmaq üçün dəvət edildiniz.", "groupInviteYouAndOtherNew": "Siz və {other_name} qrupa qoşulmaq üçün dəvət edildiniz.", @@ -636,9 +634,11 @@ "passwordSet": "Parol təyin et", "passwordSetDescription": "Parolunuz təyin edildi. Lütfən, onu güvəndə saxlayın.", "paste": "Yapışdır", + "permissionMusicAudioDenied": "Fayl, musiqi və səs göndərə bilməyiniz üçün {app_name} musiqi və səslərə müraciət etməlidir, ancaq bu icazəyə birdəfəlik rədd cavabı verilib. Ayarlar → \"İcazələr\"ə toxunun və \"Musiqi və səs\"i işə salın.", "permissionsAppleMusic": "{app_name} media qoşmalarını oxutmaq üçün Apple Music-i istifadə etməlidir.", "permissionsAutoUpdate": "Avto-güncəlləmə", "permissionsAutoUpdateDescription": "Açılışda güncəlləmələri avto-yoxla", + "permissionsCameraDenied": "Foto və video göndərə bilməyiniz üçün {app_name} kameraya müraciət etməlidir, ancaq bu icazəyə birdəfəlik rədd cavabı verilib. Ayarlar → \"İcazələr\"ə toxunun və \"Kamera\"nı işə salın.", "permissionsFaceId": "{app_name} tətbiqinin ekran kilidi özəlliyi Face ID istifadə edir.", "permissionsKeepInSystemTray": "Sistem çubuğunda tut", "permissionsKeepInSystemTrayDescription": "Pəncərəni bağladıqda {app_name} arxaplanda işləməyə davam edir", @@ -648,7 +648,9 @@ "permissionsMicrophoneAccessRequiredDesktop": "{app_name} gizlilik ayarlarında mikrofona müraciəti fəallaşdıra bilərsiniz", "permissionsMicrophoneAccessRequiredIos": "{app_name} zəng etmək və səsli mesajlar yazmaq üçün mikrofona müraciət etməlidir.", "permissionsMicrophoneDescription": "Mikrofona müraciətə icazə verin.", + "permissionsMusicAudio": "Fayl, musiqi və səs göndərə bilməyiniz üçün {app_name} musiqi və səslərə müraciət etməlidir.", "permissionsRequired": "İcazə tələb edilir", + "permissionsStorageDenied": "Foto və video göndərə bilməyiniz üçün {app_name} foto kitabxanasına müraciət etməlidir, ancaq bu icazəyə birdəfəlik rədd cavabı verilib. Ayarlar → \"İcazələr\"ə toxunun və \"Foto və videolar\"ı işə salın.", "permissionsStorageDeniedLegacy": "{app_name}, qoşmaları göndərə və saxlaya bilməyiniz üçün anbara müraciət etməlidir. Ayarlar → İcazələr bölməsinə gedin və \"Anbar\"ı işə salın.", "permissionsStorageSave": "{app_name} qoşmaları və medianı saxlamaq üçün anbara müraciət etməlidir.", "permissionsStorageSaveDenied": "{app_name} foto və videoları saxlamaq üçün anbara müraciət etməlidir, ancaq bu icazəyə həmişəlik rədd cavabı verilib. Lütfən tətbiq ayarlarına gedin, \"İcazələr\"i seçin və \"Anbar\" icazəsini fəallaşdırın.", diff --git a/_locales/bal/messages.json b/_locales/bal/messages.json index c89a11030f..05472f6001 100644 --- a/_locales/bal/messages.json +++ b/_locales/bal/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} gōra Admin.", "adminRemovedUserMultiple": "{name} a {count} drīg gōra Admin.", "adminRemovedUserOther": "{name} a {other_name} gōra Admin.", - "adminSendingPromotion": "بھیج رہا ہے ایڈمن پروموشن", "adminSettings": "ایڈمن تنظیم", "adminTwoPromotedToAdmin": "{name} a {other_name} rīhīyā Admin šumār.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "گروپ اَپڈیٹ ناکام بوت", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "تہءِ اِسپی اجازت نَہ بوت کہ بروچنئے پیغامانی ماني ڈون", "deleteMessage": "{count, plural, one [Delete Message] other [Delete Messages]}", - "deleteMessageConfirm": "دم کی لحاظ انت کہ ایی میسج ھذب بکنی؟", "deleteMessageDeleted": "{count, plural, one [Message deleted] other [Messages deleted]}", "deleteMessageDeletedGlobally": "یہ پیغام حذف کر دی گئی", "deleteMessageDeletedLocally": "یہ پیغام حذف کر دی گئی", - "deleteMessageDescriptionDevice": "دم کی لحاظ انت کہ ایی امیسج صرف ھملڑی ژ ایی ڈیوائیس ھذب بکنی؟", "deleteMessageDescriptionEveryone": "دم کی لحاظ انت کہ ایی امیسج ھذب بکنی؟؟", "deleteMessageDeviceOnly": "صرف اس آلے پر حذف کریں", "deleteMessageDevicesAll": "میرے تمام آلات پر حذف کریں", "deleteMessageEveryone": "سب کے لیے حذف کریں", "deleteMessageFailed": "{count, plural, one [پیگام مٹ بوت ناکام بِئن] other [پیغامانی مٹ بوت ناکام بِئن]}", - "deleteMessagesConfirm": "دم کی لحاظ انت که ایی امیسجات ھذب بکنی؟", - "deleteMessagesDescriptionDevice": "کیا آپ یقیناً یہ پیغامات صرف اس ڈیوائس سے حذف کرنا چاہتے ہیں؟", "deleteMessagesDescriptionEveryone": "کیا آپ یقیناً یہ پیغامات سب کے لیے حذف کرنا چاہتے ہیں؟", "deleting": "حذف کر رہا ہے", "developerToolsToggle": "ڈیولوپر ٹولز کو ٹوگل کر", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "{name} اور {count} دیگر افراد کو {group_name} میں مدعو کرنے میں ناکامی", "groupInviteFailedTwo": "{name} اور {other_name} کو {group_name} میں مدعو کرنے میں ناکامی", "groupInviteFailedUser": "{name} کو {group_name} میں مدعو کرنے میں ناکامی", - "groupInviteSending": "بھیج رہا ہے دعوت", "groupInviteSent": "دعوت بھیجی", "groupInviteSuccessful": "گروپ دعوت کامیاب", "groupInviteVersion": "صارفین کو دعوتیں وصول کرنے کیلئے نیا ورژن ہونا ضروری ہے", diff --git a/_locales/be/messages.json b/_locales/be/messages.json index 050e68779e..d39e29a841 100644 --- a/_locales/be/messages.json +++ b/_locales/be/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} быў выдалены як Адміністратар.", "adminRemovedUserMultiple": "{name} і яшчэ {count} іншых былі паніжаны на пасадзе адміністратара.", "adminRemovedUserOther": "{name} і {other_name} былі паніжаны на пасадзе адміністратара.", - "adminSendingPromotion": "Адпраўка прасоўвання адміністратара", "adminSettings": "Налады адміністратара", "adminTwoPromotedToAdmin": "{name} і {other_name} былі павышаны да адміністратараў.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Не ўдалося абнавіць групу", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "У вас няма дазволу выдаляць чужыя паведамленні", "deleteMessage": "{count, plural, one [Выдаліць паведамленне] few [Выдаліць паведамленні] many [Выдаліць паведамленні] other [Выдаліць паведамленні]}", - "deleteMessageConfirm": "Вы ўпэўненыя, што жадаеце выдаліць гэтае паведамленне?", "deleteMessageDeleted": "{count, plural, one [Паведамленне выдалена] few [Паведамленні выдалены] many [Паведамленні выдалены] other [Паведамленні выдалены]}", "deleteMessageDeletedGlobally": "Гэта паведамленне было выдалена", "deleteMessageDeletedLocally": "Гэта паведамленне было выдалена на гэтай прыладзе", - "deleteMessageDescriptionDevice": "Вы ўпэўненыя, што жадаеце выдаліць гэтае паведамленне толькі з гэтай прылады?", "deleteMessageDescriptionEveryone": "Вы ўпэўненыя, што жадаеце выдаліць гэтае паведамленне для ўсіх?", "deleteMessageDeviceOnly": "Выдаліць толькі на гэтай прыладзе", "deleteMessageDevicesAll": "Выдаліць на ўсіх маіх прыладах", "deleteMessageEveryone": "Выдаліць для ўсіх", "deleteMessageFailed": "{count, plural, one [Не атрымалася выдаліць паведамленне] few [Не атрымалася выдаліць паведамленні] many [Не атрымалася выдаліць паведамленні] other [Не атрымалася выдаліць паведамленні]}", - "deleteMessagesConfirm": "Вы ўпэўненыя, што жадаеце выдаліць гэтыя паведамленні?", - "deleteMessagesDescriptionDevice": "Вы ўпэўнены, што жадаеце выдаліць гэтыя паведамленні толькі з гэтай прылады?", "deleteMessagesDescriptionEveryone": "Вы ўпэўнены, што жадаеце выдаліць гэтыя паведамленні для ўсіх?", "deleting": "Выдаленне", "developerToolsToggle": "Пераключыць інструменты распрацоўшчыка", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Не ўдалося запрасіць {name}, {count} і іншых у {group_name}", "groupInviteFailedTwo": "Не ўдалося запрасіць {name} і {other_name} у {group_name}", "groupInviteFailedUser": "Не ўдалося запрасіць {name} у {group_name}", - "groupInviteSending": "Адпраўка запрашэння", "groupInviteSent": "Запрашэнне адпраўлена", "groupInviteSuccessful": "Запрашэнне ў групу паспяхова", "groupInviteVersion": "Карыстальнікі павінны мець апошнюю версію для атрымання запрашэнняў", @@ -694,7 +688,7 @@ "recoveryPasswordErrorMessageIncorrect": "Некаторыя з слоў у вашым Recovery password няправільныя. Калі ласка, праверце і паспрабуйце яшчэ раз.", "recoveryPasswordErrorMessageShort": "The Recovery Password you entered is not long enough. Please check and try again.", "recoveryPasswordErrorTitle": "Няправільны Recovery Password", - "recoveryPasswordExplanation": "Для загрузкі вашага акаўнта ўвядзіце ваш Recovery Password.", + "recoveryPasswordExplanation": "Для загрузкі вашага ўліковага запісу ўвядзіце Recovery Password.", "recoveryPasswordHidePermanently": "Схаваць Recovery Password назусім", "recoveryPasswordHidePermanentlyDescription1": "Без вашага Recovery password вы не зможаце загрузіць свой уліковы запіс на новыя прылады.

Мы настойліва рэкамендуем захаваць ваш Recovery password у надзейным і бяспечным месцы перад прадаўжэннем.", "recoveryPasswordHidePermanentlyDescription2": "Вы ўпэўненыя, што жадаеце пастаянна схаваць ваш канчатковы пароль аднаўлення на гэтай прыладзе? Гэта немагчыма адмяніць.", diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json index 05be247fb9..a97249eac3 100644 --- a/_locales/bg/messages.json +++ b/_locales/bg/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} беше премахнат като Администратор.", "adminRemovedUserMultiple": "{name} и {count} други бяха премахнати като администратори.", "adminRemovedUserOther": "{name} и {other_name} бяха премахнати като администратори.", - "adminSendingPromotion": "Изпращане на администраторска промоция", "adminSettings": "Администраторски настройки", "adminTwoPromotedToAdmin": "{name} и {other_name} бяха повишени в Администратор.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Неуспешно обновяване на групата", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Нямате право да изтривате съобщенията на другите", "deleteMessage": "{count, plural, one [Изтрий съобщението] other [Изтрий съобщенията]}", - "deleteMessageConfirm": "Сигурен ли си, че желаеш да изтриеш това съобщение?", "deleteMessageDeleted": "{count, plural, one [Съобщението е изтрито] other [Съобщенията са изтрити]}", "deleteMessageDeletedGlobally": "Това съобщение беше изтрито", "deleteMessageDeletedLocally": "Това съобщение беше изтрито на това устройство", - "deleteMessageDescriptionDevice": "Сигурен ли си, че искаш да изтриеш това съобщение само от това устройство?", "deleteMessageDescriptionEveryone": "Сигурен ли си, че искаш да изтриеш това съобщение за всички?", "deleteMessageDeviceOnly": "Изтрий само на това устройство", "deleteMessageDevicesAll": "Изтрий на всички мои устройства", "deleteMessageEveryone": "Изтрий за всички", "deleteMessageFailed": "{count, plural, one [Неуспешно изтриване на съобщение] other [Неуспешно изтриване на съобщения]}", - "deleteMessagesConfirm": "Сигурен ли си, че искаш да изтриеш тези съобщения?", - "deleteMessagesDescriptionDevice": "Сигурен ли/ли сте, че искате да изтриете тези съобщения само от това устройство?", "deleteMessagesDescriptionEveryone": "Сигурен ли/ли сте, че искате да изтриете тези съобщения за всички?", "deleting": "Изтриване", "developerToolsToggle": "Превключване на инструменти за разработчици", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Неуспешно поканване на {name} и {count} други в {group_name}", "groupInviteFailedTwo": "Неуспешно поканване на {name} и {other_name} в {group_name}", "groupInviteFailedUser": "Неуспешно поканване на {name} в {group_name}", - "groupInviteSending": "Изпращане на покана", "groupInviteSent": "Поканата изпратена", "groupInviteSuccessful": "Поканата в групата е успешна", "groupInviteVersion": "Потребителите трябва да имат последната версия, за да получават покани", diff --git a/_locales/bn/messages.json b/_locales/bn/messages.json index 85e0690ea7..1065f28c71 100644 --- a/_locales/bn/messages.json +++ b/_locales/bn/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} অ্যাডমিন হিসেবে থেকে সরিয়ে দেওয়া হয়েছে।", "adminRemovedUserMultiple": "{name} এবং {count} জন অন্য সদস্য অ্যাডমিন হিসেবে সরিয়ে দেওয়া হয়েছে।", "adminRemovedUserOther": "{name} এবং {other_name} অ্যাডমিন হিসেবে সরিয়ে দেওয়া হয়েছে।", - "adminSendingPromotion": "এডমিন পদোন্নতি প্রেরণ করা হচ্ছে", "adminSettings": "অ্যাডমিন সেটিংস", "adminTwoPromotedToAdmin": "{name} এবং {other_name} অ্যাডমিন হিসেবে উন্নীত হয়েছে।", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "গ্রুপ আপডেট করতে ব্যর্থ হয়েছে", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "আপনি অন্যদের বার্তা মুছে ফেলার অনুমতি নেই", "deleteMessage": "{count, plural, one [বার্তা মুছুন] other [বার্তাগুলি মুছুন]}", - "deleteMessageConfirm": "আপনি কি এই বার্তাটি মুছে দিতে নিশ্চিত?", "deleteMessageDeleted": "{count, plural, one [বার্তা মুছে ফেলা হয়েছে] other [বার্তাগুলি মুছে ফেলা হয়েছে]}", "deleteMessageDeletedGlobally": "এই মেসেজটি মুছে ফেলা হয়েছে", "deleteMessageDeletedLocally": "এই মেসেজটি এই ডিভাইসে মুছে ফেলা হয়েছে", - "deleteMessageDescriptionDevice": "আপনি কি এই বার্তাটি শুধু এই যন্ত্র থেকে মুছে ফেলতে চান?", "deleteMessageDescriptionEveryone": "আপনি কি এই বার্তা সবাই জন্য মুছে ফেলতে চান?", "deleteMessageDeviceOnly": "শুধু এই ডিভাইস থেকে মুছে ফেলুন", "deleteMessageDevicesAll": "সমস্ত ডিভাইসে মুছে ফেলুন", "deleteMessageEveryone": "সকলের জন্য মুছে ফেলুন", "deleteMessageFailed": "{count, plural, one [Failed to delete message] other [Failed to delete messages]}", - "deleteMessagesConfirm": "আপনি কি এই বার্তাগুলি মুছে ফেলতে চান?", - "deleteMessagesDescriptionDevice": "আপনি কি নিশ্চিত যে আপনি এই বার্তাগুলি শুধুমাত্র এই ডিভাইস থেকে মুছে ফেলতে চান?", "deleteMessagesDescriptionEveryone": "আপনি কি নিশ্চিত যে আপনি এইবার্তাগুলো সবাইকে জন্য মুছে ফেলতে চান?", "deleting": "মুছে ফেলা হচ্ছে", "developerToolsToggle": "ডেভেলপার টুলগুলি টগল করুন", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "{name} এবং {count} অন্যান্যকে {group_name} তে আমন্ত্রণ জানাতে ব্যর্থ হয়েছে", "groupInviteFailedTwo": "{name} এবং {other_name} কে {group_name} তে আমন্ত্রণ জানাতে ব্যর্থ হয়েছে", "groupInviteFailedUser": "{name} কে {group_name} তে আমন্ত্রণ জানাতে ব্যর্থ হয়েছে", - "groupInviteSending": "আমন্ত্রণ পাঠানো হচ্ছে", "groupInviteSent": "আমন্ত্রণ পাঠানো হয়েছে", "groupInviteSuccessful": "গ্রুপ আমন্ত্রণ সফল", "groupInviteVersion": "ইউজারদের আপডেট অথবা উচ্চতর ভার্সন থাকতে হবে ইনভাইটেশন গ্রহণ করার জন্য", diff --git a/_locales/ca/messages.json b/_locales/ca/messages.json index a9b893e018..829678e577 100644 --- a/_locales/ca/messages.json +++ b/_locales/ca/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} ha estat eliminat com a Admin.", "adminRemovedUserMultiple": "{name} i {count} altres han estat eliminats com a administradors.", "adminRemovedUserOther": "{name} i {other_name} han estat eliminats com a administradors.", - "adminSendingPromotion": "Enviant promoció d'administrador", "adminSettings": "Configuració d'Admins", "adminTwoPromotedToAdmin": "{name} i {other_name} han estat ascendits a Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "No s'ha pogut actualitzar el grup", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "No teniu autorització per esborrar els missatges d'altres", "deleteMessage": "{count, plural, one [Suprimeix el missatge] other [Suprimeix els missatges]}", - "deleteMessageConfirm": "Esteu segur que voleu suprimir aquest missatge?", "deleteMessageDeleted": "{count, plural, one [Missatge suprimit] other [Missatges suprimits]}", "deleteMessageDeletedGlobally": "Aquest missatge s'ha suprimit", "deleteMessageDeletedLocally": "Aquest missatge s'ha suprimit en aquest dispositiu", - "deleteMessageDescriptionDevice": "Esteu segur que voleu suprimir aquest missatge només d'aquest dispositiu?", "deleteMessageDescriptionEveryone": "Esteu segur que voleu suprimir aquest missatge per a tothom?", "deleteMessageDeviceOnly": "Suprimeix només en aquest dispositiu", "deleteMessageDevicesAll": "Suprimeix als meus dispositius", "deleteMessageEveryone": "Suprimeix per a tothom", "deleteMessageFailed": "{count, plural, one [Error en eliminar el missatge] other [Error en eliminar els missatges]}", - "deleteMessagesConfirm": "Esteu segur que voleu suprimir aquests missatges?", - "deleteMessagesDescriptionDevice": "Esteu segur que voleu esborrar aquests missatges només d'aquest dispositiu?", "deleteMessagesDescriptionEveryone": "Esteu segur que voleu suprimir aquests missatges per a tothom?", "deleting": "Suprimint", "developerToolsToggle": "Activa o desactiva les eines de desenvolupament", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Error al convidar {name} i {count} altres a {group_name}", "groupInviteFailedTwo": "Error al convidar {name} i {other_name} a {group_name}", "groupInviteFailedUser": "Error al convidar {name} a {group_name}", - "groupInviteSending": "Enviant invitació", "groupInviteSent": "Invitació enviada", "groupInviteSuccessful": "Invitació al grup amb èxit", "groupInviteVersion": "Els usuaris han de tenir la versió més recent per rebre invitacions", diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json index 4602ee74eb..3c7a4a6973 100644 --- a/_locales/cs/messages.json +++ b/_locales/cs/messages.json @@ -35,7 +35,7 @@ "adminRemovedUser": "{name} byl/a odebrán/a jako správce.", "adminRemovedUserMultiple": "{name} a {count} dalším bylo odebráno správcovství.", "adminRemovedUserOther": "{name} a {other_name} bylo odebráno správcovství.", - "adminSendingPromotion": "Odesílání povýšení na správce", + "adminSendingPromotion": "{count, plural, one [Odesílání povýšení na správce] few [Odesílání povýšení na správce] many [Odesílání povýšení na správce] other [Odesílání povýšení na správce]}", "adminSettings": "Nastavení správce", "adminTwoPromotedToAdmin": "{name} a {other_name} byli povýšeni na správce.", "andMore": "+{count}", @@ -275,18 +275,18 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Aktualizace skupiny selhala", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Nemáte oprávnění k mazání zpráv ostatních", "deleteMessage": "{count, plural, one [Smazat zprávu] few [Smazat zprávy] many [Smazat zprávy] other [Smazat zprávy]}", - "deleteMessageConfirm": "Opravdu chcete smazat tuto zprávu?", + "deleteMessageConfirm": "{count, plural, one [Opravdu chcete smazat tuto zprávu?] few [Opravdu chcete smazat tyto zprávy?] many [Opravdu chcete smazat tyto zprávy?] other [Opravdu chcete smazat tyto zprávy?]}", "deleteMessageDeleted": "{count, plural, one [Zpráva smazána] few [Zprávy smazány] many [Zprávy smazány] other [Zprávy smazány]}", "deleteMessageDeletedGlobally": "Tato zpráva byla odstraněna.", "deleteMessageDeletedLocally": "Tato zpráva byla odstraněna na tomto zařízení.", - "deleteMessageDescriptionDevice": "Jste si jisti, že chcete smazat tuto zprávu pouze z tohoto zařízení?", + "deleteMessageDescriptionDevice": "{count, plural, one [Opravdu chcete smazat tuto zprávu pouze z tohoto zařízení?] few [Opravdu chcete smazat tyto zprávy pouze z tohoto zařízení?] many [Opravdu chcete smazat tyto zprávy pouze z tohoto zařízení?] other [Opravdu chcete smazat tyto zprávy pouze z tohoto zařízení?]}", "deleteMessageDescriptionEveryone": "Jste si jisti, že chcete smazat tuto zprávu pro všechny?", "deleteMessageDeviceOnly": "Smazat pouze na tomto zařízení", "deleteMessageDevicesAll": "Smazat ze všech mých zařízení", "deleteMessageEveryone": "Smazat pro všechny", "deleteMessageFailed": "{count, plural, one [Nepodařilo se smazat zprávu] few [Nepodařilo se smazat zprávy] many [Nepodařilo se smazat zprávy] other [Nepodařilo se smazat zprávy]}", - "deleteMessagesConfirm": "Opravdu chcete smazat tyto zprávy?", - "deleteMessagesDescriptionDevice": "Jste si jisti, že chcete smazat tyto zprávy pouze z tohoto zařízení?", + "deleteMessageNoteToSelfWarning": "{count, plural, one [Tuto zprávu nelze smazat ze všech vašich zařízení] few [Některé z vybraných zpráv nelze smazat ze všech vašich zařízení] many [Některé z vybraných zpráv nelze smazat ze všech vašich zařízení] other [Některé z vybraných zpráv nelze smazat ze všech vašich zařízení]}", + "deleteMessageWarning": "{count, plural, one [Tuto zprávu nelze smazat pro všechny] few [Některé z vybraných zpráv nelze smazat pro všechny] many [Některé z vybraných zpráv nelze smazat pro všechny] other [Některé z vybraných zpráv nelze smazat pro všechny]}", "deleteMessagesDescriptionEveryone": "Jste si jisti, že chcete smazat tyto zprávy pro všechny?", "deleting": "Mazání", "developerToolsToggle": "Přepnout nástroje vývojáře", @@ -333,6 +333,7 @@ "displayNameNew": "Vyberte nové zobrazované jméno", "displayNamePick": "Vyberte zobrazované jméno", "displayNameSet": "Nastavte zobrazované jméno", + "displayNameVisible": "Vaše zobrazované jméno je viditelné pro uživatele, skupiny a komunity, se kterými jste ve spojení.", "document": "Dokument", "done": "Hotovo", "download": "Stáhnout", @@ -390,13 +391,16 @@ "groupInviteFailedMultiple": "Nepodařilo se pozvat {name} a {count} další do {group_name}", "groupInviteFailedTwo": "Nepodařilo se pozvat {name} a {other_name} do {group_name}", "groupInviteFailedUser": "Nepodařilo se pozvat {name} do {group_name}", - "groupInviteSending": "Odesílání pozvánky", + "groupInviteReinvite": "{name} vás pozval(a), abyste se znovu připojili k {group_name}, kde jste správcem.", + "groupInviteReinviteYou": "Byli jste pozváni, abyste se znovu připojili k {group_name}, kde jste správcem.", + "groupInviteSending": "{count, plural, one [Odesílání pozvánky] few [Odeslání pozvánek] many [Odeslání pozvánek] other [Odeslání pozvánek]}", "groupInviteSent": "Pozvánka odeslána", "groupInviteSuccessful": "Pozvánka do skupiny byla úspěšná", "groupInviteVersion": "Uživatelé musí používat nejnovější verzi, aby mohli přijímat pozvánky", "groupInviteYou": "Byli jste pozváni k připojení do skupiny.", "groupInviteYouAndMoreNew": "Vy a {count} dalších bylo pozváno do skupiny.", "groupInviteYouAndOtherNew": "Vy a {other_name} jste byli pozváni do skupiny.", + "groupInviteYouHistory": "Byli jste pozváni do skupiny. Historie konverzace byla sdílena.", "groupLeave": "Opustit skupinu", "groupLeaveDescription": "Opravdu chcete opustit {group_name}?", "groupLeaveDescriptionAdmin": "Jste si jisti, že chcete opustit {group_name}?

Tímto odeberete všechny členy a smažete veškerý obsah skupiny.", @@ -422,6 +426,7 @@ "groupNameEnterShorter": "Prosím zadejte kratší název skupiny.", "groupNameNew": "Název skupiny je nyní {group_name}.", "groupNameUpdated": "Název skupiny aktualizován.", + "groupNameVisible": "Název skupiny je viditelný pro všechny členy skupiny.", "groupNoMessages": "Nemáte žádné zprávy od {group_name}. Pošlete zprávu pro zahájení konverzace!", "groupOnlyAdmin": "Jste jediný správce ve skupině {group_name}.

Členové skupiny a nastavení nelze změnit bez správce.", "groupPromotedYou": "Byli jste povýšeni na správce.", @@ -436,6 +441,7 @@ "groupRemovedMultiple": "{name} a {count} dalších byli odebráni ze skupiny.", "groupRemovedTwo": "{name} a {other_name} byli odebráni ze skupiny.", "groupRemovedYou": "Byli jste odebráni z {group_name}.", + "groupRemovedYouGeneral": "Byli jste odebráni ze skupiny.", "groupRemovedYouMultiple": "Vy a {count} dalších bylo odebráno ze skupiny.", "groupRemovedYouTwo": "Vy a {other_name} byli odebráni ze skupiny.", "groupSetDisplayPicture": "Nastavit zobrazovaný obrázek skupiny", @@ -549,6 +555,7 @@ "next": "Další", "nicknameDescription": "Vyberte přezdívku pro {name}. Tato přezdívka se vám zobrazí ve vašich 1-1 a skupinových konverzacích.", "nicknameEnter": "Zadejte přezdívku", + "nicknameErrorShorter": "Zadejte prosím kratší přezdívku", "nicknameRemove": "Odstranit přezdívku", "nicknameSet": "Nastavit přezdívku", "no": "Ne", @@ -592,7 +599,7 @@ "notificationsSystem": "{message_count} nových zpráv v {conversation_count} konverzacích", "notificationsVibrate": "Vibrace", "off": "Vypnuto", - "okay": "Okay", + "okay": "OK", "on": "Zap.", "onboardingAccountCreate": "Vytvořit účet", "onboardingAccountCreated": "Účet vytvořen", @@ -740,7 +747,7 @@ "sessionClearData": "Vyčistit data", "sessionConversations": "Konverzace", "sessionHelp": "Nápověda", - "sessionInviteAFriend": "Pozvat přítele", + "sessionInviteAFriend": "Pozvat přátele", "sessionMessageRequests": "Žádosti o komunikaci", "sessionNotifications": "Upozornění", "sessionPermissions": "Oprávnění", @@ -750,7 +757,7 @@ "set": "Nastavit", "settingsRestartDescription": "Pro použití nových nastavení musíte restartovat {app_name}.", "share": "Sdílet", - "shareAccountIdDescription": "Pozvěte svého přítele nebo přítelkyni ke komunikaci pomocí {app_name} sdílením svého ID účtu.", + "shareAccountIdDescription": "Pozvěte své přátele ke komunikaci pomocí {app_name} sdílením svého ID účtu.", "shareAccountIdDescriptionCopied": "Sdílejte se svými přáteli tam, kde s nimi obvykle mluvíte — a pak konverzaci přesuňte sem.", "shareExtensionDatabaseError": "Při otevírání databáze se vyskytl problém. Prosím, restartujte aplikaci a zkuste to znovu.", "shareToSession": "Sdílet do {app_name}", diff --git a/_locales/cy/messages.json b/_locales/cy/messages.json index 5e35b1cdc3..3294ef5e7e 100644 --- a/_locales/cy/messages.json +++ b/_locales/cy/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} y wedi cael ei dynnu fel admin.", "adminRemovedUserMultiple": "{name} y a {count} eraill wedi cael eu symud o'r grŵp.", "adminRemovedUserOther": "{name} y a {other_name} wedi cael eu symud o'r grŵp fel Admin.", - "adminSendingPromotion": "Anfon dyrchafiad gweinyddol", "adminSettings": "Gosodiadau Gweinyddwr", "adminTwoPromotedToAdmin": "{name} y a {other_name} penodwyd i admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Methwyd diweddaru'r grŵp", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Nid oes gennych ganiatâd i ddileu negeseuon pobl eraill", "deleteMessage": "{count, plural, zero [Dileu Negeseuon] one [Dileu Neges] two [Dileu Negeseuon] few [Dileu Negeseuon] many [Dileu Negeseuon] other [Dileu Negeseuon]}", - "deleteMessageConfirm": "Ydych chi'n siŵr eich bod am ddileu'r neges hon?", "deleteMessageDeleted": "{count, plural, zero [Negeseuon wedi'u dileu] one [Neges wedi'i dileu] two [Negeseuon wedi'u dileu] few [Negeseuon wedi'u dileu] many [Negeseuon wedi'u dileu] other [Negeseuon wedi'u dileu]}", "deleteMessageDeletedGlobally": "Dilewyd y neges hon", "deleteMessageDeletedLocally": "Dilewyd y neges hon ar y ddyfais hon", - "deleteMessageDescriptionDevice": "Ydych chi'n siŵr eich bod am ddileu'r neges hon oddi ar y ddyfais hon yn unig?", "deleteMessageDescriptionEveryone": "Ydych chi'n siŵr eich bod am ddileu'r neges hon i bawb?", "deleteMessageDeviceOnly": "Dileu ar y ddyfais hon yn unig", "deleteMessageDevicesAll": "Dileu ar fy holl ddyfeisiau", "deleteMessageEveryone": "Dileu i bawb", "deleteMessageFailed": "{count, plural, zero [Methu dileu neges] one [Methu dileu neges] two [Methu dileu negeseuon] few [Methu dileu negeseuon] many [Methwyd dileu negeseuon] other [Methu dileu negeseuon]}", - "deleteMessagesConfirm": "Ydych chi'n siŵr eich bod am ddileu'r neges(au) hyn?", - "deleteMessagesDescriptionDevice": "Ydych chi'n siŵr eich bod am ddileu'r negeseuon hyn o'r ddyfais hon yn unig?", "deleteMessagesDescriptionEveryone": "Ydych chi'n siŵr eich bod am ddileu'r negeseuon hyn i bawb?", "deleting": "Wrthi'n dileu", "developerToolsToggle": "Toglo Offeryn Datblygwr", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Methu gwahodd {name} a {count} arall i {group_name}", "groupInviteFailedTwo": "Methu gwahodd {name} a {other_name} i {group_name}", "groupInviteFailedUser": "Methu gwahodd {name} i {group_name}", - "groupInviteSending": "Anfon gwahoddiad", "groupInviteSent": "Anfonwyd gwahoddiad", "groupInviteSuccessful": "Gwahoddiad grŵp llwyddiannus", "groupInviteVersion": "Rhaid i'r defnyddwyr fod â'r rhyddhad diweddaraf i dderbyn gwahoddiadau", diff --git a/_locales/da/messages.json b/_locales/da/messages.json index 756e4c373a..2b0e3490e2 100644 --- a/_locales/da/messages.json +++ b/_locales/da/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} blev fjernet som Admin.", "adminRemovedUserMultiple": "{name} og {count} andre blev fjernet som Admin.", "adminRemovedUserOther": "{name} og {other_name} blev fjernet som Admin.", - "adminSendingPromotion": "Sender admin forfremmelse", "adminSettings": "Admin indstillinger", "adminTwoPromotedToAdmin": "{name} og {other_name} blev forfremmet til Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Kunne ikke opdatere gruppe", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Du har ikke tilladelse til at slette andres beskeder", "deleteMessage": "{count, plural, one [Slet besked] other [Slet beskeder]}", - "deleteMessageConfirm": "Er du sikker på, at du vil slette denne besked?", "deleteMessageDeleted": "{count, plural, one [Besked slettet] other [Beskeder slettet]}", "deleteMessageDeletedGlobally": "Denne besked er slettet", "deleteMessageDeletedLocally": "Denne besked blev slettet på denne enhed", - "deleteMessageDescriptionDevice": "Er du sikker på, at du vil slette denne besked kun fra denne enhed?", "deleteMessageDescriptionEveryone": "Er du sikker på, at du vil slette denne besked for alle?", "deleteMessageDeviceOnly": "Slet kun på denne enhed", "deleteMessageDevicesAll": "Slet på alle mine enheder", "deleteMessageEveryone": "Slet for alle", "deleteMessageFailed": "{count, plural, one [Kunne ikke slette besked] other [Kunne ikke slette beskeder]}", - "deleteMessagesConfirm": "Er du sikker på, at du vil slette disse beskeder?", - "deleteMessagesDescriptionDevice": "Er du sikker på, at du vil slette disse beskeder kun fra denne enhed?", "deleteMessagesDescriptionEveryone": "Er du sikker på, at du vil slette disse beskeder for alle?", "deleting": "Sletter", "developerToolsToggle": "Vis udviklerværktøjer", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Kunne ikke invitere {name} og {count} andre til {group_name}", "groupInviteFailedTwo": "Kunne ikke invitere {name} og {other_name} til {group_name}", "groupInviteFailedUser": "Kunne ikke invitere {name} til {group_name}", - "groupInviteSending": "Sender invitation", "groupInviteSent": "Invitation afsendt", "groupInviteSuccessful": "Gruppeinvite vellykket", "groupInviteVersion": "Brugerne skal have den nyeste version for at modtage invitationer", diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 48bbaf1e14..b166cbb2b3 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} wurde als Admin entfernt.", "adminRemovedUserMultiple": "{name} und {count} andere wurden als Admin entfernt.", "adminRemovedUserOther": "{name} und {other_name} wurden als Administrator entfernt.", - "adminSendingPromotion": "Administratorenbeförderung wird gesendet", "adminSettings": "Admin-Einstellungen", "adminTwoPromotedToAdmin": "{name} und {other_name} wurden zu Admin befördert.", "andMore": "+{count}", @@ -145,7 +144,7 @@ "callsMicrophonePermissionsRequired": "Du hast einen Anruf von {name} verpasst, weil Du keinen Mikrofonzugriff gewährt hast.", "callsMissed": "Verpasster Anruf", "callsMissedCallFrom": "Verpasster Anruf von {name}", - "callsNotificationsRequired": "Sprach- und Videoanrufe erfordern Benachrichtigungen, die in den Systemeinstellungen Ihres Geräts aktiviert sind.", + "callsNotificationsRequired": "Sprach- und Videoanrufe erfordern Benachrichtigungen, die in den Systemeinstellungen deines Geräts aktiviert werden können.", "callsPermissionsRequired": "Anrufberechtigung erforderlich", "callsPermissionsRequiredDescription": "Du kannst die Berechtigung für \"Sprach- und Videoanrufe\" in den Datenschutzeinstellungen aktivieren.", "callsReconnecting": "Wiederverbinden…", @@ -172,7 +171,7 @@ "clearDataAllDescription": "Du bist dabei, deine Nachrichten und Kontakte dauerhaft zu löschen. Möchtest du nur dieses Gerät löschen oder deine Daten auch aus dem Netzwerk löschen?", "clearDataError": "Daten nicht gelöscht", "clearDataErrorDescription": "{count, plural, one [Daten konnten nicht von # Serviceknoten gelöscht werden. Service Node ID: {service_node_id}.] other [Daten konnten nicht von # Serviceknoten gelöscht werden. Service Node IDs: {service_node_id}.]}", - "clearDataErrorDescriptionGeneric": "Ein unbekannter Fehler ist aufgetreten und deine Daten wurden nicht gelöscht. Möchtest du stattdessen Ihre Daten nur von diesem Gerät löschen?", + "clearDataErrorDescriptionGeneric": "Ein unbekannter Fehler ist aufgetreten, und deine Daten wurden nicht gelöscht. Möchtest du stattdessen deine Daten nur von diesem Gerät entfernen?", "clearDevice": "Gerät entfernen", "clearDeviceAndNetwork": "Geräte- und Netzwerkdaten löschen", "clearDeviceAndNetworkConfirm": "Bist du sicher, dass du deine Daten aus dem Netzwerk löschen möchtest? Wenn du fortfährst, kannst du deine Nachrichten oder Kontakte nicht wiederherstellen.", @@ -239,7 +238,7 @@ "conversationsGroups": "Gruppen", "conversationsMessageTrimming": "Nachrichtenkürzung", "conversationsMessageTrimmingTrimCommunities": "Communities kürzen", - "conversationsMessageTrimmingTrimCommunitiesDescription": "Löschen Sie Nachrichten aus Community-Gesprächen, die älter als 6 Monate sind und bei denen es mehr als 2.000 Nachrichten gibt.", + "conversationsMessageTrimmingTrimCommunitiesDescription": "Lösche Nachrichten von Community-Konversationen, die älter als 6 Monate sind, und wo es über 2.000 Nachrichten gibt.", "conversationsNew": "Neue Unterhaltung", "conversationsNone": "Du hast noch keine Unterhaltungen", "conversationsSendWithEnterKey": "Mit Eingabetaste senden", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Fehler beim Aktualisieren der Gruppe", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Du hast nicht die Berechtigung, Nachrichten anderer Teilnehmer zu löschen", "deleteMessage": "{count, plural, one [Nachricht löschen] other [Nachrichten löschen]}", - "deleteMessageConfirm": "Möchtest du diese Nachricht wirklich löschen?", "deleteMessageDeleted": "{count, plural, one [Nachricht gelöscht] other [Nachrichten gelöscht]}", "deleteMessageDeletedGlobally": "Diese Nachricht wurde gelöscht", "deleteMessageDeletedLocally": "Diese Nachricht wurde auf diesem Gerät gelöscht", - "deleteMessageDescriptionDevice": "Möchtest du diese Nachricht nur von diesem Gerät löschen?", "deleteMessageDescriptionEveryone": "Möchtest du diese Nachricht wirklich für alle löschen?", "deleteMessageDeviceOnly": "Nur auf diesem Gerät löschen", "deleteMessageDevicesAll": "Von allen meinen Geräten löschen", "deleteMessageEveryone": "Für alle löschen", "deleteMessageFailed": "{count, plural, one [Die Nachricht konnte nicht gelöscht werden] other [Die Nachrichten konnten nicht gelöscht werden]}", - "deleteMessagesConfirm": "Möchtest du diese Nachrichten wirklich löschen?", - "deleteMessagesDescriptionDevice": "Möchtest du diese Nachrichten wirklich nur von diesem Gerät löschen?", "deleteMessagesDescriptionEveryone": "Möchtest du diese Nachrichten wirklich für alle löschen?", "deleting": "Wird gelöscht", "developerToolsToggle": "Entwicklertools ein-/ausblenden", @@ -318,7 +313,7 @@ "disappearingMessagesTimer": "Zeitraum", "disappearingMessagesTurnedOff": "{name} hat verschwindende Nachrichten deaktiviert. Nachrichten verschwinden nicht mehr.", "disappearingMessagesTurnedOffGroup": "{name} hat verschwindende Nachrichten deaktiviert.", - "disappearingMessagesTurnedOffYou": "Sie haben verschwindende Nachrichten deaktiviert. Nachrichten, die Sie senden, verschwinden nicht mehr.", + "disappearingMessagesTurnedOffYou": "Du hast verschwindende Nachrichten deaktiviert. Die von dir gesendeten Nachrichten verschwinden nicht mehr.", "disappearingMessagesTurnedOffYouGroup": "Du hast verschwindende Nachrichten deaktiviert.", "disappearingMessagesTypeRead": "gelesen", "disappearingMessagesTypeSent": "gesendet", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Fehler bei der Einladung von {name} und {count} anderen zu {group_name}", "groupInviteFailedTwo": "Fehler bei der Einladung von {name} und {other_name} zu {group_name}", "groupInviteFailedUser": "Fehler bei der Einladung von {name} zu {group_name}", - "groupInviteSending": "Einladung wird gesendet", "groupInviteSent": "Einladung gesendet", "groupInviteSuccessful": "Gruppeneinladung erfolgreich", "groupInviteVersion": "Die Empfänger müssen die neueste App-Version haben, um Gruppeneinladungen zu erhalten", @@ -456,7 +450,7 @@ "hideOthers": "Andere ausblenden", "image": "Bild", "incognitoKeyboard": "Inkognito-Tastatur", - "incognitoKeyboardDescription": "Fordere den Inkognito-Modus an, wenn verfügbar. Dies hängt von der Tastatur ab, die du verwendest, deine Tastatur könnte diese Anfrage ignorieren.", + "incognitoKeyboardDescription": "Fordere den Inkognito-Modus an, wenn verfügbar. Abhängig von der Tastatur, die du verwendest, kann deine Tastatur diese Anfrage ignorieren.", "info": "Info", "invalidShortcut": "Ungültige Verknüpfung", "join": "Beitreten", @@ -509,7 +503,7 @@ "messageEmpty": "Diese Nachricht ist leer.", "messageErrorDelivery": "Nachrichtenübermittlung gescheitert", "messageErrorLimit": "Nachrichtenlimit erreicht", - "messageErrorOld": "Eine Nachricht verschlüsselt mit einer alten Version von {app_name} erhalten, die nicht mehr unterstützt wird. Bitte fragen Sie den Absender, auf die neueste Version zu aktualisieren und die Nachricht erneut zu senden.", + "messageErrorOld": "Eine Nachricht wurde mit einer alten Version von {app_name} verschlüsselt, die nicht mehr unterstützt wird. Bitte den Absender, auf die neueste Version zu aktualisieren und die Nachricht erneut zu senden.", "messageErrorOriginal": "Originalnachricht nicht gefunden", "messageInfo": "Nachrichten-Info", "messageMarkRead": "Als gelesen markieren", @@ -519,14 +513,14 @@ "messageNewDescriptionMobile": "Beginne eine neue Unterhaltung durch Eingabe der Account-ID, des ONS oder Scannen des QR-Codes deines Kontakts.", "messageNewYouveGot": "{count, plural, one [Du hast eine neue Nachricht.] other [Du hast # neue Nachrichten.]}", "messageReplyingTo": "Antwort auf", - "messageRequestGroupInvite": "{name} hat Sie eingeladen, der Gruppe {group_name} beizutreten.", + "messageRequestGroupInvite": "{name} hat dich eingeladen, der Gruppe {group_name} beizutreten.", "messageRequestGroupInviteDescription": "Das Senden einer Nachricht an diese Gruppe bestätigt automatisch die Gruppeneinladung.", "messageRequestPending": "Deine Nachrichtenanfrage ist derzeit ausstehend.", "messageRequestPendingDescription": "Du kannst Sprachnachrichten und Anhänge senden, sobald der Empfänger diese Nachrichtenanfrage genehmigt hat.", "messageRequestYouHaveAccepted": "Du hast die Nachrichtenanfrage von {name} angenommen.", "messageRequestsAcceptDescription": "Das Senden einer Nachricht an dieser Person bestätigt automatisch die Nachrichtenanfrage und gibt deine Account-ID bekannt.", "messageRequestsAccepted": "Deine Nachrichtenanfrage wurde akzeptiert.", - "messageRequestsClearAllExplanation": "Sind Sie sich sicher, dass Sie alle Nachrichtenanforderungen und Gruppeneinladungen löschen möchten?", + "messageRequestsClearAllExplanation": "Bist du sich sicher, dass du alle Nachrichtenanforderungen und Gruppeneinladungen löschen möchtest?", "messageRequestsCommunities": "Community-Nachrichtenanfragen", "messageRequestsCommunitiesDescription": "Erlaube Nachrichtenanfragen von Community-Unterhaltungen.", "messageRequestsDelete": "Bist du sicher, dass du diese Nachrichtenanfrage löschen möchten?", @@ -720,7 +714,7 @@ "scan": "Scannen", "screenSecurity": "Bildschirmschutz", "screenshotNotifications": "Bildschirmfoto-Benachrichtigungen", - "screenshotNotificationsDescription": "Erhalte eine Benachrichtigung, wenn ein Kontakt ein Bildschirmfoto eines Eins-zu-eins-Chats erstellt.", + "screenshotNotificationsDescription": "Erhalte eine Benachrichtigung, wenn ein Kontakt ein Bildschirmfoto in einer Unterhaltung macht.", "screenshotTaken": "{name} hat einen Screenshot gemacht.", "search": "Suchen", "searchContacts": "Kontakte durchsuchen", diff --git a/_locales/el/messages.json b/_locales/el/messages.json index 561350d041..a503717063 100644 --- a/_locales/el/messages.json +++ b/_locales/el/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} αφαιρέθηκε ως Διαχειριστής.", "adminRemovedUserMultiple": "{name} και {count} άλλοι αφαιρέθηκαν ως Διαχειριστές.", "adminRemovedUserOther": "{name} και {other_name} αφαιρέθηκαν ως Διαχειριστές.", - "adminSendingPromotion": "Γίνεται αποστολή προαγωγής διαχειριστή", "adminSettings": "Ρυθμίσεις Διαχειριστή", "adminTwoPromotedToAdmin": "{name} και {other_name} προωθήθηκαν στο Admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Αποτυχία Ενημέρωσης Ομάδας", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Δεν έχετε άδεια να διαγράψετε τα μηνύματα άλλων", "deleteMessage": "{count, plural, one [Διαγραφή Μηνύματος] other [Διαγραφή Μηνυμάτων]}", - "deleteMessageConfirm": "Σίγουρα θέλετε να διαγράψετε αυτό το μήνυμα;", "deleteMessageDeleted": "{count, plural, one [Το μήνυμα διαγράφηκε] other [Τα μηνύματα διαγράφηκαν]}", "deleteMessageDeletedGlobally": "Αυτό το μήνυμα έχει διαγραφεί", "deleteMessageDeletedLocally": "Αυτό το μήνυμα έχει διαγραφεί σε αυτή τη συσκευή", - "deleteMessageDescriptionDevice": "Σίγουρα θέλετε να διαγράψετε αυτό το μήνυμα μόνο από αυτή τη συσκευή;", "deleteMessageDescriptionEveryone": "Σίγουρα θέλετε να διαγράψετε αυτό το μήνυμα για όλους;", "deleteMessageDeviceOnly": "Διαγραφή μόνο σε αυτή τη συσκευή", "deleteMessageDevicesAll": "Διαγραφή από όλες τις συσκευές μου", "deleteMessageEveryone": "Διαγραφή για όλους", "deleteMessageFailed": "{count, plural, one [Αποτυχία διαγραφής μηνύματος] other [Αποτυχία διαγραφής μηνύματος]}", - "deleteMessagesConfirm": "Σίγουρα θέλετε να διαγράψετε αυτά τα μηνύματα;", - "deleteMessagesDescriptionDevice": "Σίγουρα θέλετε να διαγράψετε αυτά τα μηνύματα μόνο από αυτή τη συσκευή;", "deleteMessagesDescriptionEveryone": "Σίγουρα θέλετε να διαγράψετε αυτά τα μηνύματα για όλους;", "deleting": "Γίνεται διαγραφή", "developerToolsToggle": "Εναλλαγή Εργαλείων Προγραμματιστή", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Αποτυχία πρόσκλησης {name} και {count} άλλων στο {group_name}", "groupInviteFailedTwo": "Αποτυχία πρόσκλησης {name} και {other_name} στο {group_name}", "groupInviteFailedUser": "Αποτυχία πρόσκλησης {name} στο {group_name}", - "groupInviteSending": "Γίνεται αποστολή πρόσκλησης", "groupInviteSent": "Η πρόσκληση στάλθηκε", "groupInviteSuccessful": "Η πρόσκληση στην ομάδα ήταν επιτυχής", "groupInviteVersion": "Οι χρήστες πρέπει να έχουν την τελευταία έκδοση για να λάβουν προσκλήσεις", diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 1d8da80e6a..6b830b49be 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -35,7 +35,7 @@ "adminRemovedUser": "{name} was removed as Admin.", "adminRemovedUserMultiple": "{name} and {count} others were removed as Admin.", "adminRemovedUserOther": "{name} and {other_name} were removed as Admin.", - "adminSendingPromotion": "Sending admin promotion", + "adminSendingPromotion": "{count, plural, one [Sending admin promotion] other [Sending admin promotions]}", "adminSettings": "Admin Settings", "adminTwoPromotedToAdmin": "{name} and {other_name} were promoted to Admin.", "andMore": "+{count}", @@ -275,18 +275,18 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Failed to Update Group", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "You don’t have permission to delete others’ messages", "deleteMessage": "{count, plural, one [Delete Message] other [Delete Messages]}", - "deleteMessageConfirm": "Are you sure you want to delete this message?", + "deleteMessageConfirm": "{count, plural, one [Are you sure you want to delete this message?] other [Are you sure you want to delete these messages?]}", "deleteMessageDeleted": "{count, plural, one [Message deleted] other [Messages deleted]}", "deleteMessageDeletedGlobally": "This message was deleted", "deleteMessageDeletedLocally": "This message was deleted on this device", - "deleteMessageDescriptionDevice": "Are you sure you want to delete this message from this device only?", + "deleteMessageDescriptionDevice": "{count, plural, one [Are you sure you want to delete this message from this device only?] other [Are you sure you want to delete these messages from this device only?]}", "deleteMessageDescriptionEveryone": "Are you sure you want to delete this message for everyone?", "deleteMessageDeviceOnly": "Delete on this device only", "deleteMessageDevicesAll": "Delete on all my devices", "deleteMessageEveryone": "Delete for everyone", "deleteMessageFailed": "{count, plural, one [Failed to delete message] other [Failed to delete messages]}", - "deleteMessagesConfirm": "Are you sure you want to delete these messages?", - "deleteMessagesDescriptionDevice": "Are you sure you want to delete these messages from this device only?", + "deleteMessageNoteToSelfWarning": "{count, plural, one [This message cannot be deleted from all your devices] other [Some of the messages you have selected cannot be deleted from all your devices]}", + "deleteMessageWarning": "{count, plural, one [This message cannot be deleted for everyone] other [Some of the messages you have selected cannot be deleted for everyone]}", "deleteMessagesDescriptionEveryone": "Are you sure you want to delete these messages for everyone?", "deleting": "Deleting", "developerToolsToggle": "Toggle Developer Tools", @@ -333,6 +333,7 @@ "displayNameNew": "Pick a new display name", "displayNamePick": "Pick your display name", "displayNameSet": "Set Display Name", + "displayNameVisible": "Your Display Name is visible to users, groups and communities you interact with.", "document": "Document", "done": "Done", "download": "Download", @@ -390,13 +391,16 @@ "groupInviteFailedMultiple": "Failed to invite {name} and {count} others to {group_name}", "groupInviteFailedTwo": "Failed to invite {name} and {other_name} to {group_name}", "groupInviteFailedUser": "Failed to invite {name} to {group_name}", - "groupInviteSending": "Sending invite", + "groupInviteReinvite": "{name} invited you to rejoin {group_name}, where you are an Admin.", + "groupInviteReinviteYou": "You were invited to rejoin {group_name}, where you are an Admin.", + "groupInviteSending": "{count, plural, one [Sending invite] other [Sending invites]}", "groupInviteSent": "Invite sent", "groupInviteSuccessful": "Group invite successful", "groupInviteVersion": "Users must have the latest release to receive invitations", "groupInviteYou": "You were invited to join the group.", "groupInviteYouAndMoreNew": "You and {count} others were invited to join the group.", "groupInviteYouAndOtherNew": "You and {other_name} were invited to join the group.", + "groupInviteYouHistory": "You were invited to join the group. Chat history was shared.", "groupLeave": "Leave Group", "groupLeaveDescription": "Are you sure you want to leave {group_name}?", "groupLeaveDescriptionAdmin": "Are you sure you want to leave {group_name}?

This will remove all members and delete all group content.", @@ -422,6 +426,7 @@ "groupNameEnterShorter": "Please enter a shorter group name.", "groupNameNew": "Group name is now {group_name}.", "groupNameUpdated": "Group name updated.", + "groupNameVisible": "Group name is visible to all group members.", "groupNoMessages": "You have no messages from {group_name}. Send a message to start the conversation!", "groupOnlyAdmin": "You are the only admin in {group_name}.

Group members and settings cannot be changed without an admin.", "groupPromotedYou": "You were promoted to Admin.", @@ -436,6 +441,7 @@ "groupRemovedMultiple": "{name} and {count} others were removed from the group.", "groupRemovedTwo": "{name} and {other_name} were removed from the group.", "groupRemovedYou": "You were removed from {group_name}.", + "groupRemovedYouGeneral": "You were removed from the group.", "groupRemovedYouMultiple": "You and {count} others were removed from the group.", "groupRemovedYouTwo": "You and {other_name} were removed from the group.", "groupSetDisplayPicture": "Set Group Display Picture", @@ -549,6 +555,7 @@ "next": "Next", "nicknameDescription": "Choose a nickname for {name}. This will appear to you in your one-to-one and group conversations.", "nicknameEnter": "Enter nickname", + "nicknameErrorShorter": "Please enter a shorter nickname", "nicknameRemove": "Remove Nickname", "nicknameSet": "Set Nickname", "no": "No", diff --git a/_locales/eo/messages.json b/_locales/eo/messages.json index d6db9db210..b7edd6df4d 100644 --- a/_locales/eo/messages.json +++ b/_locales/eo/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} estis deprenita kiel Admin.", "adminRemovedUserMultiple": "{name} kaj {count} aliaj estis forigitaj kiel Admoj.", "adminRemovedUserOther": "{name} kaj {other_name} estis forigitaj kiel Admoj.", - "adminSendingPromotion": "Sendante administran promocion", "adminSettings": "Administraj Agordoj", "adminTwoPromotedToAdmin": "{name} kaj {other_name} estis promociitaj al Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Malsukcesis ĝisdatigi la grupon", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Vi ne permesiĝas forigi la mesaĝojn de aliuloj", "deleteMessage": "{count, plural, one [Forigi mesaĝon] other [Forigi mesaĝojn]}", - "deleteMessageConfirm": "Ĉu vi certas, ke vi volas forigi ĉi tiun mesaĝon?", "deleteMessageDeleted": "{count, plural, one [Mesaĝo forigita] other [Mesaĝoj forigitaj]}", "deleteMessageDeletedGlobally": "Ĉi tiu mesaĝo forigitis", "deleteMessageDeletedLocally": "Ĉi tiu mesaĝo estis forigita sur ĉi tiu aparato", - "deleteMessageDescriptionDevice": "Ĉu vi certas, ke vi volas forigi ĉi tiun mesaĝon nur de ĉi tiu aparato?", "deleteMessageDescriptionEveryone": "Ĉu vi certas, ke vi volas forigi ĉi tiun mesaĝon por ĉiuj?", "deleteMessageDeviceOnly": "Forigi sole sur ĉi tiu aparato", "deleteMessageDevicesAll": "Forigi sur ĉiuj miaj aparatoj", "deleteMessageEveryone": "Forigi por ĉiuj", "deleteMessageFailed": "{count, plural, one [Malsukcesis forigi mesaĝon] other [Malsukcesis forigi mesaĝojn]}", - "deleteMessagesConfirm": "Ĉu vi certas forigi tiujn mesaĝojn?", - "deleteMessagesDescriptionDevice": "Ĉu vi certas, ke vi volas forigi ĉi tiujn mesaĝojn nur el ĉi tiu aparato?", "deleteMessagesDescriptionEveryone": "Ĉu vi certas, ke vi volas forigi ĉi tiujn mesaĝojn por ĉiuj?", "deleting": "Forviŝante", "developerToolsToggle": "Baskuligi programistajn ilojn", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Malsukcesis inviti {name} kaj {count} aliajn al {group_name}", "groupInviteFailedTwo": "Malsukcesis inviti {name} kaj {other_name} al {group_name}", "groupInviteFailedUser": "Malsukcesis inviti {name} al {group_name}", - "groupInviteSending": "Sendante invito", "groupInviteSent": "Invito sendita", "groupInviteSuccessful": "Invito de grupo sukcesis", "groupInviteVersion": "Uzantoj devas havi la plej novan version por ricevi invitojn", diff --git a/_locales/es-419/messages.json b/_locales/es-419/messages.json index 3d98c12427..bd04463bc8 100644 --- a/_locales/es-419/messages.json +++ b/_locales/es-419/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} fue removido como Admin.", "adminRemovedUserMultiple": "{name} y {count} más fueron removidos como Admins.", "adminRemovedUserOther": "{name} y {other_name} fueron removidos como Admins.", - "adminSendingPromotion": "Enviando promoción a admin", "adminSettings": "Configuración del administrador", "adminTwoPromotedToAdmin": "{name} y {other_name} fueron promovidos a Admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Error al actualizar el grupo", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "No tienes permiso para borrar los mensajes de otros", "deleteMessage": "{count, plural, one [Eliminar el mensaje] other [Eliminar el mensaje]}", - "deleteMessageConfirm": "¿Estás seguro de que deseas eliminar este mensaje?", "deleteMessageDeleted": "{count, plural, one [Mensaje eliminado] other [Mensajes eliminados]}", "deleteMessageDeletedGlobally": "Este mensaje ha sido eliminado", "deleteMessageDeletedLocally": "Este mensaje ha sido eliminado en este dispositivo", - "deleteMessageDescriptionDevice": "¿Estás seguro de que deseas eliminar este mensaje solo de este dispositivo?", "deleteMessageDescriptionEveryone": "¿Estás seguro de que deseas eliminar este mensaje para todos?", "deleteMessageDeviceOnly": "Eliminar solo en este dispositivo", "deleteMessageDevicesAll": "Eliminar en todos mis dispositivos", "deleteMessageEveryone": "Eliminar para todos", "deleteMessageFailed": "{count, plural, one [Error al eliminar el mensaje] other [Error al eliminar los mensajes]}", - "deleteMessagesConfirm": "¿Estás seguro de que deseas eliminar estos mensajes?", - "deleteMessagesDescriptionDevice": "¿Estás seguro de que quieres eliminar estos mensajes solo de este dispositivo?", "deleteMessagesDescriptionEveryone": "¿Estás seguro de que quieres eliminar estos mensajes para todos?", "deleting": "Eliminando", "developerToolsToggle": "Activar herramientas de desarrollador", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "No se pudo invitar a {name} y {count} otros a {group_name}", "groupInviteFailedTwo": "No se pudo invitar a {name} y {other_name} a {group_name}", "groupInviteFailedUser": "No se pudo invitar a {name} a {group_name}", - "groupInviteSending": "Enviando invitación", "groupInviteSent": "Invitación enviada", "groupInviteSuccessful": "Invitación al grupo exitosa", "groupInviteVersion": "Los usuarios deben tener la última versión para recibir invitaciones.", diff --git a/_locales/es/messages.json b/_locales/es/messages.json index 89714205ea..0dd1e03e19 100644 --- a/_locales/es/messages.json +++ b/_locales/es/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} fue destituido como Administrador.", "adminRemovedUserMultiple": "{name} y otros {count} fueron eliminados como moderadores.", "adminRemovedUserOther": "{name} y {other_name} fueron eliminados como moderadores.", - "adminSendingPromotion": "Enviando promoción de administrador", "adminSettings": "Configuración de administrador", "adminTwoPromotedToAdmin": "{name} y {other_name} fueron promovidos a Administradores.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Error al actualizar el grupo", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "No tienes permiso de borrar mensajes de otros", "deleteMessage": "{count, plural, one [Eliminar Mensaje] other [Eliminar Mensajes]}", - "deleteMessageConfirm": "¿Estás seguro de que quieres eliminar este mensaje?", "deleteMessageDeleted": "{count, plural, one [Mensaje borrado] other [Mensajes borrados]}", "deleteMessageDeletedGlobally": "Este mensaje se ha eliminado", "deleteMessageDeletedLocally": "Este mensaje se ha eliminado en este dispositivo", - "deleteMessageDescriptionDevice": "¿Estás seguro de que quieres eliminar este mensaje solo de este dispositivo?", "deleteMessageDescriptionEveryone": "¿Estás seguro de que quieres eliminar este mensaje para todos?", "deleteMessageDeviceOnly": "Eliminar solo en este dispositivo", "deleteMessageDevicesAll": "Eliminar en todos mis dispositivos", "deleteMessageEveryone": "Eliminar para todos", "deleteMessageFailed": "{count, plural, one [Fallo al eliminar el mensaje] other [Fallo al eliminar los mensajes]}", - "deleteMessagesConfirm": "¿Estás seguro de que quieres eliminar estos mensajes?", - "deleteMessagesDescriptionDevice": "¿Estás seguro de querer eliminar estos mensajes solamente de este dispositivo?", "deleteMessagesDescriptionEveryone": "¿Estás seguro de querer eliminar estos mensajes para todos?", "deleting": "Eliminando", "developerToolsToggle": "Activar herramientas de desarrollador", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "No se pudo invitar a {name} y a {count} otros a {group_name}", "groupInviteFailedTwo": "No se pudo invitar a {name} y {other_name} a {group_name}", "groupInviteFailedUser": "Falló la invitación de {name} a {group_name}", - "groupInviteSending": "Enviando invitación", "groupInviteSent": "Invitación enviada", "groupInviteSuccessful": "Grupo invitado con éxito", "groupInviteVersion": "Los usuarios deben tener la última versión para recibir invitaciones", diff --git a/_locales/et/messages.json b/_locales/et/messages.json index dbde02a729..5242040b5e 100644 --- a/_locales/et/messages.json +++ b/_locales/et/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} eemaldati administraatorina.", "adminRemovedUserMultiple": "{name} ja {count} teist eemaldati Administraatori kohalt.", "adminRemovedUserOther": "{name} ja {other_name} eemaldati Administraatori kohalt.", - "adminSendingPromotion": "Administraatori edutamine", "adminSettings": "Admini seaded", "adminTwoPromotedToAdmin": "{name} ja {other_name} määrati adminiks.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Grupi uuendamine ebaõnnestus", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Sul ei ole õiguseid teiste sõnumeid kustutada", "deleteMessage": "{count, plural, one [Kustuta sõnum] other [Kustuta sõnumid]}", - "deleteMessageConfirm": "Kas soovite selle sõnumi kustutada?", "deleteMessageDeleted": "{count, plural, one [Sõnum kustutatud] other [Sõnumid kustutatud]}", "deleteMessageDeletedGlobally": "See sõnum on kustutatud", "deleteMessageDeletedLocally": "See sõnum on sellest seadmest kustutatud", - "deleteMessageDescriptionDevice": "Kas soovite selle sõnumi ainult sellest seadmest kustutada?", "deleteMessageDescriptionEveryone": "Kas soovite selle sõnumi kõigi jaoks kustutada?", "deleteMessageDeviceOnly": "Kustuta ainult sellest seadmest", "deleteMessageDevicesAll": "Kustuta kõigis minu seadmetes", "deleteMessageEveryone": "Kustuta kõigi jaoks", "deleteMessageFailed": "{count, plural, one [Sõnumi kustutamine ebaõnnestus] other [Sõnumite kustutamine ebaõnnestus]}", - "deleteMessagesConfirm": "Kas soovite need sõnumid kustutada?", - "deleteMessagesDescriptionDevice": "Kas olete kindel, et soovite need sõnumid kustutada ainult sellest seadmest?", "deleteMessagesDescriptionEveryone": "Kas olete kindel, et soovite need sõnumid kõigi jaoks kustutada?", "deleting": "Kustutan", "developerToolsToggle": "Lülita arendusvahendid sisse/välja", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Ebaõnnestus kutsuda {name} ja {count} teisi kasutajaid gruppi {group_name}", "groupInviteFailedTwo": "Ebaõnnestus kutsuda {name} ja {other_name} gruppi {group_name}", "groupInviteFailedUser": "Ebaõnnestus kutsuda {name} gruppi {group_name}", - "groupInviteSending": "Kutsekirja saatmine", "groupInviteSent": "Kutse saadetud", "groupInviteSuccessful": "Grupi kutse oli edukas", "groupInviteVersion": "Kasutajatel peab olema uusim versioon kutsete saamiseks", diff --git a/_locales/eu/messages.json b/_locales/eu/messages.json index 98b007f827..d4b9b16df7 100644 --- a/_locales/eu/messages.json +++ b/_locales/eu/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} Admin izateko kendu dute.", "adminRemovedUserMultiple": "{name} eta {count} beste Admin moduan kendu dituzte.", "adminRemovedUserOther": "{name} eta {other_name} Admin moduan kendu dituzte.", - "adminSendingPromotion": "Admin promozioa bidaltzen", "adminSettings": "Administratzailearen Ezarpenak", "adminTwoPromotedToAdmin": "{name} eta {other_name} Admin izendatu dira.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Hutsa izan da talde eguneratzean", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Ez duzu besteek bidalitako mezuak ezabatzeko baimenik", "deleteMessage": "{count, plural, one [Mezua Ezabatu] other [Mezuak Ezabatu]}", - "deleteMessageConfirm": "Ziur zaude mezu hau ezabatu nahi duzula?", "deleteMessageDeleted": "{count, plural, one [Mezua ezabatuta] other [Mezuak ezabatuta]}", "deleteMessageDeletedGlobally": "Mezu hau ezabatu da.", "deleteMessageDeletedLocally": "Mezu hau tokian tokiko gailu honetan ezabatu da.", - "deleteMessageDescriptionDevice": "Ziur zaude mezu hau gailu honetatik bakarrik ezabatu nahi duzula?", "deleteMessageDescriptionEveryone": "Ziur zaude mezu hau guztiontzat ezabatu nahi duzula?", "deleteMessageDeviceOnly": "Gailu honetan bakarrik ezabatu", "deleteMessageDevicesAll": "Nire gailu guztietan ezabatu", "deleteMessageEveryone": "Denontzat ezabatu", "deleteMessageFailed": "{count, plural, one [Ezin izan da mezua ezabatu] other [Ezin izan dira mezuak ezabatu]}", - "deleteMessagesConfirm": "Ziur zaude mezu hauek ezabatu nahi dituzula?", - "deleteMessagesDescriptionDevice": "Ziur zaude mezu hauek gailu honetatik soilik ezabatu nahi dituzula?", "deleteMessagesDescriptionEveryone": "Ziur zaude mezu hauek denentzat ezabatu nahi dituzula?", "deleting": "Ezabatzen", "developerToolsToggle": "Garatu Tresna Aldaketa", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Hutsa izan da {name} eta {count} beste batzuk {group_name} Gonbidatzeko", "groupInviteFailedTwo": "Hutsa izan da {name} eta {other_name} {group_name} Gonbidatzeko", "groupInviteFailedUser": "Hutsa izan da {name} {group_name} Gonbidatzeko", - "groupInviteSending": "Gonbidapena bidaltzen", "groupInviteSent": "Gonbidapena bidalita", "groupInviteSuccessful": "Talde gonbidapena arrakastatsua", "groupInviteVersion": "Erabiltzaileek azken bertsioa izan behar dute gonbidapenak jasotzeko", diff --git a/_locales/fa/messages.json b/_locales/fa/messages.json index 7a5f7c98d7..9c9b4c7454 100644 --- a/_locales/fa/messages.json +++ b/_locales/fa/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} از مدیریت حذف شد.", "adminRemovedUserMultiple": "{name} و{count} سایرین از مدیریت حذف شدند.", "adminRemovedUserOther": "{name} و {other_name} از مدیریت حذف شدند.", - "adminSendingPromotion": "ارسال ترفیع ادمین", "adminSettings": "تنظیمات ادمین", "adminTwoPromotedToAdmin": "{name} و {other_name} به مدیر ارتقاء یافتند.", "andMore": "+{count}", @@ -272,18 +271,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "خطا در به‌روزرسانی گروه", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "شما اجازه حذف پیام‌های دیگران را ندارید", "deleteMessage": "{count, plural, one [پیام را پاک کنید] other [پیام ها را پاک کنید]}", - "deleteMessageConfirm": "آیا مطمئن هستید که می‌خواهید این پیام را حذف کنید؟", "deleteMessageDeleted": "{count, plural, one [پیام پاک شد] other [پبام ها حذف شدند]}", "deleteMessageDeletedGlobally": "این پیام حذف شده است", "deleteMessageDeletedLocally": "این پیام در این دستگاه پاک شد", - "deleteMessageDescriptionDevice": "آیا مطمئن هستید که می‌خواهید این پیام را فقط از این دستگاه حذف کنید؟", "deleteMessageDescriptionEveryone": "آیا مطمئن هستید که می‌خواهید این پیام را برای همه حذف کنید؟", "deleteMessageDeviceOnly": "حذف فقط از این دستگاه", "deleteMessageDevicesAll": "حذف از تمام دستگاه‌هایم", "deleteMessageEveryone": "حذف برای همه", "deleteMessageFailed": "{count, plural, one [خطا در حذف پیام] other [خطا در حذف پیام ها]}", - "deleteMessagesConfirm": "آیا مطمئن هستید که می‌خواهید این پیام‌ها را حذف کنید؟", - "deleteMessagesDescriptionDevice": "آیا مطمئن هستید می‌خواهید این پیام‌ها را فقط از این دستگاه حذف کنید؟", "deleteMessagesDescriptionEveryone": "آیا مطمئن هستید می‌خواهید این پیام‌ها را برای همه حذف کنید؟", "deleting": "در حال حذف", "developerToolsToggle": "تاگل ابزار های توسعه دهنده", @@ -387,7 +382,6 @@ "groupInviteFailedMultiple": "دعوت از {name} و {count} نفر دیگر به {group_name} انجام نشد", "groupInviteFailedTwo": "دعوت از {name} و {other_name} به {group_name} انجام نشد", "groupInviteFailedUser": "دعوت از {name} به {group_name} انجام نشد", - "groupInviteSending": "ارسال دعوت نامه", "groupInviteSent": "دعوت نامه ارسال شد", "groupInviteSuccessful": "دعوت به گروه موفقیت‌آمیز بود", "groupInviteVersion": "کاربران باید آخرین نسخه را داشته باشند تا دعوت‌نامه دریافت کنند", diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json index 99bd3b7f41..b8b13520a0 100644 --- a/_locales/fi/messages.json +++ b/_locales/fi/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} poistettiin ylläpitäjänä.", "adminRemovedUserMultiple": "{name} ja {count} muuta poistettiin ylläpitäjästä.", "adminRemovedUserOther": "{name} ja {other_name} poistettiin ylläpitäjästä.", - "adminSendingPromotion": "Ylläpitoylennystä lähetetään", "adminSettings": "Admin-asetukset", "adminTwoPromotedToAdmin": "{name} ja {other_name} ylennettiin ylläpitäjiksi.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Ryhmän päivitys epäonnistui", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Sinulla ei ole oikeutta poistaa muiden viestejä", "deleteMessage": "{count, plural, one [Poista viesti] other [Poista viestit]}", - "deleteMessageConfirm": "Haluatko varmasti poistaa tämän viestin?", "deleteMessageDeleted": "{count, plural, one [Viesti poistettu] other [Viestit poistettu]}", "deleteMessageDeletedGlobally": "Tämä viesti on poistettu", "deleteMessageDeletedLocally": "Tämä viesti on poistettu tästä laitteesta", - "deleteMessageDescriptionDevice": "Oletko varma, että haluat poistaa tämän viestin ainoastaan tästä laitteesta?", "deleteMessageDescriptionEveryone": "Haluatko varmasti poistaa tämän viestin kaikilta?", "deleteMessageDeviceOnly": "Poista vain tältä laitteelta", "deleteMessageDevicesAll": "Poista kaikilta laitteiltani", "deleteMessageEveryone": "Poista kaikilta", "deleteMessageFailed": "{count, plural, one [Viestin poisto epäonnistui] other [Viestien poisto epäonnistui]}", - "deleteMessagesConfirm": "Haluatko varmasti poistaa nämä viestit?", - "deleteMessagesDescriptionDevice": "Haluatko varmasti poistaa nämä viestit vain tästä laitteesta?", "deleteMessagesDescriptionEveryone": "Haluatko varmasti poistaa nämä viestit kaikilta?", "deleting": "Poistetaan", "developerToolsToggle": "Näytä/piilota kehittäjätyökalut", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Käyttäjien {name} ja {count} muun kutsuminen ryhmään {group_name} epäonnistui", "groupInviteFailedTwo": "Käyttäjien {name} ja {other_name} kutsuminen ryhmään {group_name} epäonnistui", "groupInviteFailedUser": "Käyttäjän {name} kutsuminen ryhmään {group_name} epäonnistui", - "groupInviteSending": "Kutsua lähetetään", "groupInviteSent": "Kutsu on lähetetty", "groupInviteSuccessful": "Ryhmän kutsu onnistui", "groupInviteVersion": "Käyttäjillä on oltava uusin versio vastaanottaakseen kutsuja", diff --git a/_locales/fil/messages.json b/_locales/fil/messages.json index f87440e4b9..ee3fa42ee1 100644 --- a/_locales/fil/messages.json +++ b/_locales/fil/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "Tinanggal si {name} bilang Admin.", "adminRemovedUserMultiple": "{name} at {count} iba pa ay tinanggal bilang Admin.", "adminRemovedUserOther": "{name} at {other_name} ay tinanggal bilang Admin.", - "adminSendingPromotion": "Sending admin promotion", "adminSettings": "Mga Setting ng Admin", "adminTwoPromotedToAdmin": "{name} at {other_name} na-promote sa Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Nabigong I-update ang Grupo", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Wala kang pahintulot para tangalin ang mensahe ng iba", "deleteMessage": "{count, plural, one [Burahin ang Mensahe] other [Burahin ang mga Mensahe]}", - "deleteMessageConfirm": "Sigurado ka bang gusto mong burahin ang mensaheng ito?", "deleteMessageDeleted": "{count, plural, one [Mensahe nabura] other [Mga mensahe nabura]}", "deleteMessageDeletedGlobally": "Ang mensaheng ito ay nabura na", "deleteMessageDeletedLocally": "Ang mensaheng ito ay nabura sa device na ito", - "deleteMessageDescriptionDevice": "Sigurado ka bang gusto mong burahin ang mensaheng ito mula sa device lamang na ito?", "deleteMessageDescriptionEveryone": "Sigurado ka bang gusto mong burahin ang mensaheng ito para sa lahat?", "deleteMessageDeviceOnly": "Burahin sa aparatong ito lamang", "deleteMessageDevicesAll": "Burahin sa lahat ng aking mga aparato", "deleteMessageEveryone": "Burahin para sa lahat", "deleteMessageFailed": "{count, plural, one [Nabigong tanggalin ang mensahe] other [Nabigong tanggalin ang mga mensahe]}", - "deleteMessagesConfirm": "Sigurado ka bang gusto mong burahin ang mga mensaheng ito?", - "deleteMessagesDescriptionDevice": "Sigurado ka bang gusto mong tanggalin ang mga mensaheng ito mula sa device na ito lamang?", "deleteMessagesDescriptionEveryone": "Sigurado ka bang gusto mong tanggalin ang mga mensaheng ito para sa lahat?", "deleting": "Binubura", "developerToolsToggle": "I-toggle ang Mga Tool ng Developer", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Nabigo sa pag-imbita kay {name} at {count} iba pa sa {group_name}", "groupInviteFailedTwo": "Nabigo sa pag-imbita kay {name} at {other_name} sa {group_name}", "groupInviteFailedUser": "Nabigo sa pag-imbita kay {name} sa {group_name}", - "groupInviteSending": "Sending invite", "groupInviteSent": "Naipadala ang imbitasyon", "groupInviteSuccessful": "Matagumpay ang paanyaya ng grupo", "groupInviteVersion": "Mga user ay dapat may pinakabagong bersyon upang makatanggap ng mga imbitasyon", diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index 79f7cd3b7e..0953d2d2e2 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} a été retiré en tant qu'administrateur.", "adminRemovedUserMultiple": "{name} et {count} autres ont été supprimé·e·s en tant qu'administrateur.", "adminRemovedUserOther": "{name} et {other_name}ont été supprimé·e·s en tant qu'administrateur.", - "adminSendingPromotion": "Envoi de la promotion administrateur", "adminSettings": "Paramètres d’administrateur", "adminTwoPromotedToAdmin": "{name} et {other_name} ont été promus en tant qu'administrateurs.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Échec de la mise à jour du groupe", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Vous n'êtes pas autorisé à supprimer les messages des autres utilisateurs", "deleteMessage": "{count, plural, one [Supprimer le message] other [Supprimer les messages]}", - "deleteMessageConfirm": "Êtes-vous sûr de vouloir supprimer ce message ?", "deleteMessageDeleted": "{count, plural, one [Message supprimé] other [Messages supprimés]}", "deleteMessageDeletedGlobally": "Ce message a été supprimé", "deleteMessageDeletedLocally": "Ce message a été supprimé sur cet appareil", - "deleteMessageDescriptionDevice": "Êtes-vous sûr de vouloir supprimer ce message uniquement de cet appareil ?", "deleteMessageDescriptionEveryone": "Êtes-vous sûr de vouloir supprimer ce message pour tout le monde ?", "deleteMessageDeviceOnly": "Supprimer uniquement sur cet appareil", "deleteMessageDevicesAll": "Supprimer sur tous mes appareils", "deleteMessageEveryone": "Supprimer pour tous", "deleteMessageFailed": "{count, plural, one [Échec de suppression du message] other [Échec de suppression des messages]}", - "deleteMessagesConfirm": "Êtes-vous sûr de vouloir supprimer ces messages ?", - "deleteMessagesDescriptionDevice": "Êtes-vous certain·e de vouloir supprimer ces messages seulement sur cet appareil?", "deleteMessagesDescriptionEveryone": "Êtes-vous certain·e de vouloir supprimer ces messages pour tout le monde?", "deleting": "Suppression", "developerToolsToggle": "Afficher/masquer les outils pour développeurs", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Échec d'inviter {name} et {count} autres à {group_name}", "groupInviteFailedTwo": "Échec d'inviter {name} et {other_name} à {group_name}", "groupInviteFailedUser": "Échec d'inviter {name} à {group_name}", - "groupInviteSending": "Envoi de l'invitation", "groupInviteSent": "Invitation envoyée", "groupInviteSuccessful": "Invitation de groupe réussie", "groupInviteVersion": "Les utilisateurs doivent avoir la dernière version pour recevoir des invitations", diff --git a/_locales/gl/messages.json b/_locales/gl/messages.json index bb6f57e0e7..2b4281d454 100644 --- a/_locales/gl/messages.json +++ b/_locales/gl/messages.json @@ -30,7 +30,6 @@ "adminRemoveCommunityNone": "Non hai Admins nesta Comunidade.", "adminRemoveFailed": "Non se puido eliminar a {name} como Admin.", "adminRemovedUser": "{name} foi eliminado como Admin.", - "adminSendingPromotion": "A enviar a promoción a administrador", "adminSettings": "Axustes de Admin", "adminTwoPromotedToAdmin": "{name} e {other_name} foron ascendidos a Admin.", "andMore": "+{count}", @@ -256,17 +255,13 @@ "deleteAfterLegacyDisappearingMessagesLegacy": "Ancestral", "deleteAfterLegacyDisappearingMessagesOriginal": "Versión orixinal das mensaxes que desaparecen.", "deleteAfterLegacyDisappearingMessagesTheyChangedTimer": "{name} estableceu o temporizador de desaparición das mensaxes a {time}", - "deleteMessageConfirm": "Tes a certeza de querer borrar esta mensaxe?", "deleteMessageDeletedGlobally": "Esta mensaxe foi eliminada", "deleteMessageDeletedLocally": "Esta mensaxe foi eliminada neste dispositivo", - "deleteMessageDescriptionDevice": "Tes a certeza de querer borrar esta mensaxe só deste dispositivo?", "deleteMessageDescriptionEveryone": "Tes a certeza de querer borrar esta mensaxe para todos?", "deleteMessageDeviceOnly": "Borrar só neste dispositivo", "deleteMessageDevicesAll": "Borrar en todos os meus dispositivos", "deleteMessageEveryone": "Borrar para todos", "deleteMessageFailed": "{count, plural, one [Erro ao borrar a mensaxe] other [Erro ao borrar as mensaxes]}", - "deleteMessagesConfirm": "Tes a certeza de querer borrar estas mensaxes?", - "deleteMessagesDescriptionDevice": "Tes a certeza de querer eliminar estas mensaxes só deste dispositivo?", "deleteMessagesDescriptionEveryone": "Tes a certeza de querer eliminar estas mensaxes para todos?", "deleting": "Borrando", "developerToolsToggle": "Alternar ferramentas de desenvolvedor", @@ -360,7 +355,6 @@ "groupInviteFailedMultiple": "Non se puido invitar a {name} e {count} máis a {group_name}", "groupInviteFailedTwo": "Non se puido invitar a {name} e {other_name} a {group_name}", "groupInviteFailedUser": "Non se puido invitar a {name} a {group_name}", - "groupInviteSending": "Enviando convite", "groupInviteSent": "Convite enviado", "groupInviteSuccessful": "Convite ao grupo enviado con éxito", "groupInviteYou": "Ti foste invitado a unirte ao grupo.", diff --git a/_locales/ha/messages.json b/_locales/ha/messages.json index b728bd063b..d4680edc30 100644 --- a/_locales/ha/messages.json +++ b/_locales/ha/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} an cire shi a matsayin Admin.", "adminRemovedUserMultiple": "{name} da {count} wasu an cire su daga zama Admin.", "adminRemovedUserOther": "{name} da {other_name} an cire su daga zama Admin.", - "adminSendingPromotion": "Ana aika ƙara wa girma", "adminSettings": "Saitunan Admin", "adminTwoPromotedToAdmin": "{name} da {other_name} an tayar musu zuwa Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "An kasa Sabunta Ƙungiya", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Ba ku da izinin share saƙonnin wasu", "deleteMessage": "{count, plural, one [Goge Saƙo] other [Goge Saƙonni]}", - "deleteMessageConfirm": "Ka tabbata kana so ka goge wannan saƙon?", "deleteMessageDeleted": "{count, plural, one [An goge saƙo] other [An goge Saƙonni]}", "deleteMessageDeletedGlobally": "An goge wannan saƙo", "deleteMessageDeletedLocally": "An share wannan saƙo a wannan na'ura", - "deleteMessageDescriptionDevice": "Ka tabbata kana so ka goge wannan saƙon daga wannan na'urar kawai?", "deleteMessageDescriptionEveryone": "Ka tabbata kana so ka goge wannan saƙon ga kowa?", "deleteMessageDeviceOnly": "Goge a wannan na'ura kawai", "deleteMessageDevicesAll": "Goge akan dukkan na'urorina", "deleteMessageEveryone": "Goge ga kowa", "deleteMessageFailed": "{count, plural, one [An kasa share saƙo] other [An kasa share saƙonni]}", - "deleteMessagesConfirm": "Ka tabbata kana so ka goge waɗannan saƙonnin?", - "deleteMessagesDescriptionDevice": "Kana tabbata kana so ka share waɗannan saƙonnin daga wannan na'urar kawai?", "deleteMessagesDescriptionEveryone": "Kana tabbata kana so ka share waɗannan saƙonnin don kowa?", "deleting": "Ana gogewa", "developerToolsToggle": "Sauya Kayan Koya na Developer", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "An kasa gayyatar {name} da {count} wasu zuwa {group_name}", "groupInviteFailedTwo": "An kasa gayyatar {name} da {other_name} zuwa {group_name}", "groupInviteFailedUser": "An kasa gayyatar {name} zuwa {group_name}", - "groupInviteSending": "Ana aika da gayyata", "groupInviteSent": "Gayyatar an aika", "groupInviteSuccessful": "Gayyatar rukuni ta yi nasara", "groupInviteVersion": "Masu amfani dole su kasance da sigar na karshe don su sami gayyata", diff --git a/_locales/he/messages.json b/_locales/he/messages.json index 4a79967bee..08f109a459 100644 --- a/_locales/he/messages.json +++ b/_locales/he/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name}‏ הוסר/ה כמנהל.", "adminRemovedUserMultiple": "{name}‏ ו{count} אחרים‏ הוסרו מניהול.", "adminRemovedUserOther": "{name}‏ ו{other_name}‏ הוסרו מניהול.", - "adminSendingPromotion": "שליחת קידום למנהל", "adminSettings": "הגדרות מנהל", "adminTwoPromotedToAdmin": "{name}‏ ו{other_name}‏ קודמו למנהלים.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "נכשל בעדכון הקבוצה", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "אין לך הרשאה למחוק הודעות של אחרים", "deleteMessage": "{count, plural, one [מחק הודעה] two [מחק הודעות] many [מחק הודעות] other [מחק הודעות]}", - "deleteMessageConfirm": "האם אתה בטוח שברצונך למחוק את ההודעה הזו?", "deleteMessageDeleted": "{count, plural, one [הודעה נמחקה] two [הודעות נמחקו] many [הודעות נמחקו] other [הודעות נמחקו]}", "deleteMessageDeletedGlobally": "הודעה זו נמחקה", "deleteMessageDeletedLocally": "הודעה זו נמחקה במכשיר זה", - "deleteMessageDescriptionDevice": "אתה בטוח שברצונך למחוק את ההודעה הזו רק מהמכשיר הזה?", "deleteMessageDescriptionEveryone": "אתה בטוח שברצונך למחוק את ההודעה הזו לכולם?", "deleteMessageDeviceOnly": "מחק במכשיר זה בלבד", "deleteMessageDevicesAll": "מחק בכל המכשירים שלי", "deleteMessageEveryone": "מחק לכולם", "deleteMessageFailed": "{count, plural, one [נכשל במחיקת הודעה] two [נכשל במחיקת הודעות] many [נכשל במחיקת הודעות] other [נכשל במחיקת הודעות]}", - "deleteMessagesConfirm": "אתה בטוח שברצונך למחוק הודעות אלה?", - "deleteMessagesDescriptionDevice": "האם אתה בטוח שברצונך למחוק את ההודעות האלו מהמכשיר הזה בלבד?", "deleteMessagesDescriptionEveryone": "האם אתה בטוח שברצונך למחוק את ההודעות האלה לכולם?", "deleting": "מוחק", "developerToolsToggle": "עורר כלי מפתחים", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "נכשל להזמין את {name} ו-{count} אחרים ל-{group_name}", "groupInviteFailedTwo": "נכשל להזמין את {name} ו-{other_name} ל-{group_name}", "groupInviteFailedUser": "נכשל להזמין את {name} ל-{group_name}", - "groupInviteSending": "שולח הזמנה", "groupInviteSent": "הזמנה נשלחה", "groupInviteSuccessful": "הזמנת הקבוצה הצליחה", "groupInviteVersion": "משתמשים חייבים להיות בגרסה האחרונה כדי לקבל הזמנות", diff --git a/_locales/hi/messages.json b/_locales/hi/messages.json index fce800a057..6f10c7d2fb 100644 --- a/_locales/hi/messages.json +++ b/_locales/hi/messages.json @@ -20,7 +20,7 @@ "adminPromoteMoreDescription": "क्या आप वाकई {name} और {count} अन्य को एडमिन के रूप में बढ़ावा देना चाहते हैं? एडमिन्स को हटाया नहीं जा सकता है।", "adminPromoteToAdmin": "एडमिन में पदोन्नत करें", "adminPromoteTwoDescription": "क्या आप वाकई {name} और {other_name} को एडमिन के रूप में बढ़ावा देना चाहते हैं? एडमिन्स को हटाया नहीं जा सकता है।", - "adminPromotedToAdmin": "{name} को Admin बनाया गया।", + "adminPromotedToAdmin": "{name} को एडमिन बनाया गया।", "adminPromotionFailed": "एडमिन पदोन्नति विफल रही", "adminPromotionFailedDescription": "{name} को {group_name} में पदोन्नत करने में विफल", "adminPromotionFailedDescriptionMultiple": "{name} और {count} अन्य को {group_name} में पदोन्नत करने में विफल", @@ -32,10 +32,9 @@ "adminRemoveFailed": "{name} को एडमिन के रूप में हटाने में विफल।", "adminRemoveFailedMultiple": "{name} और {count} अन्य को व्यवस्थापक पद से हटाने में विफल |", "adminRemoveFailedOther": "{name} और {other_name} व्यवस्थापक पद से हटाने में विफल |", - "adminRemovedUser": "{name} को Admin से हटा दिया गया।", + "adminRemovedUser": "{name} को एडमिन से हटा दिया गया।", "adminRemovedUserMultiple": "{name} और {count} अन्य को व्यवस्थापक पद से हटा दिया गया |", "adminRemovedUserOther": "{name} and {other_name} को व्यवस्थापक पद से हटा दिया गया |", - "adminSendingPromotion": "एडमिन प्रमोशन भेजा जा रहा है", "adminSettings": "एडमिन सेटिंग्स", "adminTwoPromotedToAdmin": "{name} और {other_name} को Admin बनाया गया।", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "समूह अपडेट करने में विफल", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "आपको दूसरों के संदेशों को हटाने की अनुमति नहीं है", "deleteMessage": "{count, plural, one [संदेश मिटाएं] other [संदेश मिटाएं]}", - "deleteMessageConfirm": "क्या आप वाकई इस संदेश को हटाना चाहते हैं?", "deleteMessageDeleted": "{count, plural, one [संदेश मिटाया गया] other [संदेश मिटाये गए]}", "deleteMessageDeletedGlobally": "यह संदेश हटा दिया गया है", "deleteMessageDeletedLocally": "यह संदेश इस डिवाइस पर हटा दिया गया है", - "deleteMessageDescriptionDevice": "क्या आप वाकई केवल इस डिवाइस से इस संदेश को हटाना चाहते हैं?", "deleteMessageDescriptionEveryone": "क्या आप वाकई इस संदेश को सभी के लिए हटाना चाहते हैं?", "deleteMessageDeviceOnly": "केवल इस डिवाइस पर मिटाएँ", "deleteMessageDevicesAll": "सभी उपकरणों पर मिटाएँ", "deleteMessageEveryone": "सभी के लिए मिटायें |", - "deleteMessageFailed": "{count, plural, one [संदेश को हटाने में विफल रहा] other [संदेशों को हटाने में विफल रहा]}", - "deleteMessagesConfirm": "क्या आप वाकई इन संदेशों को मिटाना चाहते हैं?", - "deleteMessagesDescriptionDevice": "क्या आप वाकई केवल इस डिवाइस से इन संदेशों को हटाना चाहते हैं?", + "deleteMessageFailed": "{count, plural, one [संदेश हटाने में विफल] other [संदेशों को हटाने में विफल रहा]}", "deleteMessagesDescriptionEveryone": "क्या आप वाकई सभी के लिए इन संदेशों को हटाना चाहते हैं?", "deleting": "हटाया जा रहा है", "developerToolsToggle": "डेवलपर टूल टॉगल करें", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "{name} और {count} अन्य को {group_name} में आमंत्रित करने में विफल", "groupInviteFailedTwo": "{name} और {other_name} को {group_name} में आमंत्रित करने में विफल", "groupInviteFailedUser": "{name} को {group_name} में आमंत्रित करने में विफल", - "groupInviteSending": "निमंत्रण भेजा जा रहा है", "groupInviteSent": "आमंत्रण भेजा गया", "groupInviteSuccessful": "समूह आमंत्रण सफल", "groupInviteVersion": "निमंत्रण प्राप्त करने के लिए उपयोगकर्ताओं के पास नवीनतम रिलीज़ होनी चाहिए", @@ -405,7 +399,7 @@ "groupMemberLeft": "{name} ने समूह छोड़ दिया।", "groupMemberLeftMultiple": "{name} और {count} अन्य समूह से निकल गए।", "groupMemberLeftTwo": "{name} और {other_name} समूह से निकल गए।", - "groupMemberNew": "{name} समूह में शामिल हो गए।", + "groupMemberNew": "{name} समूह में शामिल के लिए आमंत्रित किया है।", "groupMemberNewHistory": "{name} को समूह में शामिल होने के लिए आमंत्रित किया गया। चैट इतिहास साझा किया गया।", "groupMemberNewHistoryMultiple": "{name} और {count} अन्य को समूह में शामिल होने के लिए आमंत्रित किया गया। चैट इतिहास साझा किया गया।", "groupMemberNewHistoryTwo": "{name} और {other_name} को समूह में शामिल होने के लिए आमंत्रित किया गया। चैट इतिहास साझा किया गया।", @@ -498,7 +492,7 @@ "membersActive": "{count, plural, one [# सक्रिय सदस्य] other [# सक्रिय सदस्य]}", "membersAddAccountIdOrOns": "खाता आईडी या ONS जोड़ें", "membersInvite": "मित्रों को आमंत्रित करें", - "membersInviteSend": "{count, plural, one [आमंत्रण सेंड करें] other [आमंत्रण सेंड करें]}", + "membersInviteSend": "{count, plural, one [आमंत्रण भेजे] other [आमंत्रण सेंड करें]}", "membersInviteShareDescription": "क्या आप {name} के साथ समूह संदेश इतिहास साझा करना चाहेंगे?", "membersInviteShareDescriptionMultiple": "क्या आप {name} और {count} अन्य के साथ समूह संदेश इतिहास साझा करना चाहेंगे?", "membersInviteShareDescriptionTwo": "क्या आप {name} और {other_name} के साथ समूह संदेश इतिहास साझा करना चाहेंगे?", @@ -647,7 +641,7 @@ "permissionsCameraDenied": "{app_name} को फ़ोटो और वीडियो लेने के लिए कैमरा अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से मना कर दिया गया है। सेटिंग्स → अनुमतियां पर टैप करें और \"कैमरा\" चालू करें।", "permissionsFaceId": "{app_name} पर स्क्रीन लॉक फीचर Face ID का उपयोग करता है।", "permissionsKeepInSystemTray": "सिस्टम ट्रे में रखें", - "permissionsKeepInSystemTrayDescription": "{app_name} तब भी पृष्ठभूमि में चलता रहता है जब आप विंडो बंद करते हैं", + "permissionsKeepInSystemTrayDescription": "जब आप विंडो बंद करते हैं तो {app_name} पृष्ठभूमि में चलता रहता है", "permissionsLibrary": "{app_name} को जारी रखने के लिए फ़ोटो लाइब्रेरी पहुंच की आवश्यकता है। आप iOS सेटिंग्स में पहुंच सक्षम कर सकते हैं।", "permissionsMicrophone": "माइक्रोफ़ोन", "permissionsMicrophoneAccessRequired": "{app_name} को कॉल करने और ऑडियो संदेश भेजने के लिए माइक्रोफ़ोन अनुमति की आवश्यकता है, लेकिन इसे स्थायी रूप से मना कर दिया गया है। सेटिंग्स → अनुमतियां पर टैप करें, और \"माइक्रोफ़ोन\" चालू करें।", @@ -772,7 +766,7 @@ "updateDownloaded": "अपडेट इंस्टॉल हो गया, पुनः प्रारंभ करने के लिए क्लिक करें", "updateDownloading": "अपडेट डाउनलोड हो रहा है: {percent_loader}%", "updateError": "अद्यतन नहीं हो रहा", - "updateErrorDescription": "{app_name} अपडेट होने में विफल. कृपया {session_download_url} पर जाएं और नए संस्करण को मैन्युअल रूप से इंस्टॉल करें, फिर इस समस्या के बारे में हमें बताने के लिए हमारे सहायता केंद्र से संपर्क करें |", + "updateErrorDescription": "{app_name} अपडेट होने में विफल. कृपया {session_download_url} पर जाएं और नए संस्करण को मैन्युअल रूप से इंस्टॉल करें, फिर इस समस्या के बारे में हमें हमारे सहायता केंद्र से संपर्क करें |", "updateNewVersion": "{app_name} का एक नया संस्करण उपलब्ध है, अपडेट करने के लिए टैप करें", "updateNewVersionDescription": "{app_name} का एक नया संस्करण उपलब्ध है।", "updateReleaseNotes": "रिलीज़ नोट्स पे जाइए", diff --git a/_locales/hr/messages.json b/_locales/hr/messages.json index 9c0886fb21..e2d0f44efb 100644 --- a/_locales/hr/messages.json +++ b/_locales/hr/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} je uklonjen kao Admin.", "adminRemovedUserMultiple": "{name} i {count} drugi su uklonjeni kao administratori.", "adminRemovedUserOther": "{name} i {other_name} su uklonjeni kao administratori.", - "adminSendingPromotion": "Slanje promocije administracije", "adminSettings": "Postavke za administratore", "adminTwoPromotedToAdmin": "{name} i {other_name} promovirani su u Admina.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Neuspjelo ažuriranje grupe", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Nemate dozvolu za brisanje poruka drugih korisnika", "deleteMessage": "{count, plural, one [Izbriši poruku] few [Izbriši poruku] other [Izbriši poruku]}", - "deleteMessageConfirm": "Jeste li sigurni da želite izbrisati ovu poruku?", "deleteMessageDeleted": "{count, plural, one [Poruka izbrisana] few [Poruke obrisane] other [Poruke obrisane]}", "deleteMessageDeletedGlobally": "Ova poruka je izbrisana", "deleteMessageDeletedLocally": "Ova poruka je izbrisana na ovom uređaju", - "deleteMessageDescriptionDevice": "Jeste li sigurni da želite izbrisati ovu poruku samo s ovog uređaja?", "deleteMessageDescriptionEveryone": "Jeste li sigurni da želite izbrisati ovu poruku za sve?", "deleteMessageDeviceOnly": "Obriši samo na ovom uređaju", "deleteMessageDevicesAll": "Obriši na svim uređajima", "deleteMessageEveryone": "Izbriši za sve", "deleteMessageFailed": "{count, plural, one [Neuspješno brisanje poruke] few [Neuspješno brisanje poruka] other [Neuspješno brisanje poruka]}", - "deleteMessagesConfirm": "Jeste li sigurni da želite izbrisati ove poruke?", - "deleteMessagesDescriptionDevice": "Jeste li sigurni da želite izbrisati ove poruke samo s ovog uređaja?", "deleteMessagesDescriptionEveryone": "Jeste li sigurni da želite izbrisati ove poruke za sve?", "deleting": "Brisanje", "developerToolsToggle": "Uključi razvojne alate", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Pozivanje {name} i {count} drugih u {group_name} nije uspjelo", "groupInviteFailedTwo": "Pozivanje {name} i {other_name} u {group_name} nije uspjelo", "groupInviteFailedUser": "Pozivanje {name} u {group_name} nije uspjelo", - "groupInviteSending": "Slanje pozivnice", "groupInviteSent": "Poziv poslan", "groupInviteSuccessful": "Poziv u grupu uspješan", "groupInviteVersion": "Korisnici moraju imati najnoviju verziju za primanje pozivnica", diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json index 75680a9f82..5b9ff1bd43 100644 --- a/_locales/hu/messages.json +++ b/_locales/hu/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} el lett távolítva mint adminisztrátor.", "adminRemovedUserMultiple": "{name} és {count} másik személy el lettek távolítva adminisztrátorként.", "adminRemovedUserOther": "{name} és {other_name} el lettek távolítva adminisztrátorként.", - "adminSendingPromotion": "Adminisztrátori előléptetés küldése", "adminSettings": "Adminisztrátor beállítások", "adminTwoPromotedToAdmin": "{name} és {other_name} adminisztrátorrá lettek előléptetve.", "andMore": "+{count}", @@ -59,7 +58,7 @@ "attachment": "Melléklet", "attachmentsAdd": "Melléklet hozzáadása", "attachmentsAlbumUnnamed": "Névtelen album", - "attachmentsAutoDownload": "Csatolmányok automatikus letöltése", + "attachmentsAutoDownload": "Mellékletek automatikus letöltése", "attachmentsAutoDownloadDescription": "Média és fájlok automatikus letötltése ebből a beszélgetésből.", "attachmentsAutoDownloadModalDescription": "Szeretnéd automatikusan letölteni az összes fájlt a {conversation_name} beszélgetésből?", "attachmentsAutoDownloadModalTitle": "Automatikus letöltés", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Nem sikerült frissíteni a csoportot", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Nincs jogod mások üzeneteit törölni", "deleteMessage": "{count, plural, one [Üzenet törlése] other [Üzenetek törlése]}", - "deleteMessageConfirm": "Biztos, hogy törölni szeretnéd ezt az üzenetet?", "deleteMessageDeleted": "{count, plural, one [Üzenet törölve] other [Üzenetek törölve]}", "deleteMessageDeletedGlobally": "Ez az üzenet törölve lett", "deleteMessageDeletedLocally": "Ez az üzenet törölve lett ezen az eszközön", - "deleteMessageDescriptionDevice": "Biztos, hogy törölni szeretnéd ezt az üzenetet csak erről az eszközről?", "deleteMessageDescriptionEveryone": "Biztos, hogy törölni szeretnéd ezt az üzenetet mindenki számára?", "deleteMessageDeviceOnly": "Törlés csak ezen az eszközön", "deleteMessageDevicesAll": "Törlés minden eszközömön", "deleteMessageEveryone": "Törlés mindenkinek", "deleteMessageFailed": "{count, plural, one [Nem sikerült az üzenet törlése] other [Nem sikerült az üzenetek törlése]}", - "deleteMessagesConfirm": "Biztos, hogy törölni szeretnéd ezeket az üzeneteket?", - "deleteMessagesDescriptionDevice": "Biztos, hogy törölni szeretnéd ezeket az üzeneteket csak ebből az eszközről?", "deleteMessagesDescriptionEveryone": "Biztos, hogy törölni szeretnéd ezeket az üzeneteket mindenki számára?", "deleting": "Törlés", "developerToolsToggle": "Fejlesztői eszközök be-/kikapcsolása", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Nem sikerült meghívni {name}-t és {count} másik személyt a {group_name} csoportba", "groupInviteFailedTwo": "Nem sikerült meghívni {name}-t és {other_name}-t a {group_name} csoportba", "groupInviteFailedUser": "Nem sikerült meghívni {name}-t a {group_name} csoportba", - "groupInviteSending": "Meghívás küldése", "groupInviteSent": "Meghívás elküldve", "groupInviteSuccessful": "A meghívás sikeres volt.", "groupInviteVersion": "A felhasználóknak a legújabb verzióval kell rendelkezniük, hogy meghívásokat kaphassanak", @@ -526,7 +520,7 @@ "messageRequestYouHaveAccepted": "Elfogadtad {name} üzenetkérését.", "messageRequestsAcceptDescription": "Ha üzenetet küld ennek a felhasználónak, akkor automatikusan elfogadja az üzenetkérelmét és a Felhasználó ID megosztásra kerül.", "messageRequestsAccepted": "Az üzenetkérelmedet elfogadták.", - "messageRequestsClearAllExplanation": "Biztos, hogy törölni akarja az összes üzenetkérelmet és csoportmeghívót?", + "messageRequestsClearAllExplanation": "Biztos, hogy törölni szeretnéd az összes üzenetkérelmet és csoportmeghívót?", "messageRequestsCommunities": "Közösségi üzenetkérelmek", "messageRequestsCommunitiesDescription": "A közösségi beszélgetésekből származó üzenetek engedélyezése.", "messageRequestsDelete": "Biztos, hogy törölni szeretnéd ezt az üzenetkérelmet?", diff --git a/_locales/hy-AM/messages.json b/_locales/hy-AM/messages.json index fd3bdbbc88..dc3c91c031 100644 --- a/_locales/hy-AM/messages.json +++ b/_locales/hy-AM/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name}֊ը հեռացվել է ադմինից:", "adminRemovedUserMultiple": "{name}֊ը և {count} ուրիշներ հեռացվել են որպես ադմին՝ Administrator:", "adminRemovedUserOther": "{name}֊ը և {other_name}֊ը հեռացվել են որպես ադմին՝ Administrator:", - "adminSendingPromotion": "Ուղարկվում է ադմինիստրատորի առաջխաղացումը", "adminSettings": "Admin Settings", "adminTwoPromotedToAdmin": "{name}֊ը և {other_name} բարձրացվել են որպես ադմին:", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Չհաջողվեց թարմացնել խումբը", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Դուք ուրիշների հաղորդագրությունները ջնջելու թույլտվություն չունեք", "deleteMessage": "{count, plural, one [Ջնջել հաղորդագրությունը] other [Ջնջել հաղորդագրությունները]}", - "deleteMessageConfirm": "Վստա՞հ եք, որ ուզում եք ջնջել այս հաղորդագրությունը:", "deleteMessageDeleted": "{count, plural, one [Հաղորդագրությունը ջնջված է] other [Հաղորդագրությունները ջնջված են]}", "deleteMessageDeletedGlobally": "Այս հաղորդագրությունը ջնջվել է", "deleteMessageDeletedLocally": "Այս հաղորդագրությունը ջնջվել է այս սարքում", - "deleteMessageDescriptionDevice": "Վստա՞հ եք, որ ցանկանում եք ջնջել այս հաղորդագրությունը միայն այս սարքավորումից:", "deleteMessageDescriptionEveryone": "Վստա՞հ եք, որ ցանկանում եք ջնջել այս հաղորդագրությունը բոլորի համար:", "deleteMessageDeviceOnly": "Ջնջել այս սարքում միայն", "deleteMessageDevicesAll": "Ջնջել բոլոր իմ սարքերում", "deleteMessageEveryone": "Ջնջել բոլորի համար", "deleteMessageFailed": "{count, plural, one [Չհաջողվեց ջնջել հաղորդագրությունը] other [Չհաջողվեց ջնջել հաղորդագրությունները]}", - "deleteMessagesConfirm": "Վստա՞հ եք, որ ուզում եք ջնջել այս հաղորդագրություններն:", - "deleteMessagesDescriptionDevice": "Իսկապե՞ս ուզում եք ջնջել այս հաղորդագրությունները միայն այս սարքից:", "deleteMessagesDescriptionEveryone": "Իսկապե՞ս ուզում եք ջնջել այս հաղորդագրությունները բոլորի համար:", "deleting": "Ջնջվում է", "developerToolsToggle": "Միացնել ծրագրավորողի գործիքները", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Չհաջողվեց հրավիրել {name} և ևս {count}-ին {group_name} խմբին", "groupInviteFailedTwo": "Չհաջողվեց հրավիրել {name} և {other_name}-ին {group_name} խմբին", "groupInviteFailedUser": "Չհաջողվեց հրավիրել {name}-ին {group_name} խմբին", - "groupInviteSending": "Ուղարկվում է հրավերը", "groupInviteSent": "Հրավիրումը ուղարկված է", "groupInviteSuccessful": "Խմբի հրավերը հաջողությամբ ուղարկված է", "groupInviteVersion": "Օգտատերերը պետք է ունենան վերջին տարբերակը՝ հրավերներ ստանալու համար", diff --git a/_locales/id/messages.json b/_locales/id/messages.json index 3545b001c6..810d631764 100644 --- a/_locales/id/messages.json +++ b/_locales/id/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} dihapus sebagai Admin.", "adminRemovedUserMultiple": "{name} dan {count} lainnya telah dihapus sebagai Admin.", "adminRemovedUserOther": "{name} dan {other_name} telah dihapus sebagai Admin.", - "adminSendingPromotion": "Mengirim promosi admin", "adminSettings": "Pengaturan Admin", "adminTwoPromotedToAdmin": "{name} dan {other_name} dipromosikan menjadi Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Gagal Memperbarui Grup", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Anda tidak diizinkan untuk menghapus pesan orang lain", "deleteMessage": "{count, plural, other [Hapus Pesan]}", - "deleteMessageConfirm": "Apakah Anda yakin ingin menghapus pesan ini?", "deleteMessageDeleted": "{count, plural, other [Pesan dihapus]}", "deleteMessageDeletedGlobally": "Pesan ini telah dihapus", "deleteMessageDeletedLocally": "Pesan ini dihapus pada perangkat ini", - "deleteMessageDescriptionDevice": "Apakah Anda yakin ingin menghapus pesan ini hanya dari perangkat ini?", "deleteMessageDescriptionEveryone": "Apakah Anda yakin ingin menghapus pesan ini untuk semua orang?", "deleteMessageDeviceOnly": "Hapus hanya di perangkat ini", "deleteMessageDevicesAll": "Hapus di semua perangkat saya", "deleteMessageEveryone": "Hapus untuk semua orang", "deleteMessageFailed": "{count, plural, other [Gagal menghapus pesan]}", - "deleteMessagesConfirm": "Apakah Anda yakin ingin menghapus pesan-pesan ini?", - "deleteMessagesDescriptionDevice": "Anda yakin ingin menghapus pesan ini hanya dari perangkat ini?", "deleteMessagesDescriptionEveryone": "Anda yakin ingin menghapus pesan-pesan ini untuk semua orang?", "deleting": "Menghapus", "developerToolsToggle": "Toggle perangkat pengembangan", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Gagal mengundang {name} dan {count} lainnya ke {group_name}", "groupInviteFailedTwo": "Gagal mengundang {name} dan {other_name} ke {group_name}", "groupInviteFailedUser": "Gagal mengundang {name} ke {group_name}", - "groupInviteSending": "Mengirim undangan", "groupInviteSent": "Undangan terkirim", "groupInviteSuccessful": "Undangan grup berhasil", "groupInviteVersion": "Pengguna harus memiliki rilis terbaru untuk menerima undangan", diff --git a/_locales/it/messages.json b/_locales/it/messages.json index 371409fc99..afafb77502 100644 --- a/_locales/it/messages.json +++ b/_locales/it/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} è stato rimosso come amministratore.", "adminRemovedUserMultiple": "{name} e altri {count} sono stati rimossi come Amministratori.", "adminRemovedUserOther": "{name} e {other_name} sono stati rimossi come amministratori.", - "adminSendingPromotion": "Invio promozione ad amministratore", "adminSettings": "Impostazioni amministratore", "adminTwoPromotedToAdmin": "{name} e {other_name} sono ora amministratori.", "andMore": "+{count}", @@ -142,6 +141,7 @@ "callsInProgress": "Chiamata in corso", "callsIncoming": "Chiamata in arrivo da {name}", "callsIncomingUnknown": "Chiamata in arrivo", + "callsMicrophonePermissionsRequired": "Hai perso una chiamata da {name} perché non hai concesso l'accesso al microfono.", "callsMissed": "Chiamata persa", "callsMissedCallFrom": "Chiamata persa da {name}", "callsNotificationsRequired": "Le chiamate vocali e video richiedono che le notifiche siano abilitate nelle impostazioni di sistema del dispositivo.", @@ -198,6 +198,7 @@ "communityInvitation": "Invito a una Comunità", "communityJoin": "Unisciti alla Comunità", "communityJoinDescription": "Sei sicuro di voler unirti a {community_name}?", + "communityJoinError": "Impossibile unirsi alla community", "communityJoinOfficial": "Oppure unisciti a uno di questi...", "communityJoined": "Sei entrato nella Comunità", "communityJoinedAlready": "Fai già parte di questa Comunità.", @@ -273,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "C'è stato un problema con l'aggiornamento del gruppo", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Non hai il permesso di eliminare i messaggi altrui", "deleteMessage": "{count, plural, one [Elimina Messaggio] other [Elimina Messaggi]}", - "deleteMessageConfirm": "Sei sicuro di voler eliminare questo messaggio?", "deleteMessageDeleted": "{count, plural, one [Messaggio eliminato] other [Messaggi eliminati]}", "deleteMessageDeletedGlobally": "Questo messaggio è stato eliminato", "deleteMessageDeletedLocally": "Questo messaggio è stato eliminato su questo dispositivo", - "deleteMessageDescriptionDevice": "Sei sicuro di voler eliminare questo messaggio solo da questo dispositivo?", "deleteMessageDescriptionEveryone": "Sei sicuro di voler eliminare questo messaggio per tutti?", "deleteMessageDeviceOnly": "Elimina solo da questo dispositivo", "deleteMessageDevicesAll": "Elimina da tutti i miei dispositivi", "deleteMessageEveryone": "Elimina per tutti", "deleteMessageFailed": "{count, plural, one [Impossibile eliminare il messaggio] other [Impossibile eliminare i messaggi]}", - "deleteMessagesConfirm": "Sei sicuro di voler eliminare questi messaggi?", - "deleteMessagesDescriptionDevice": "Sei sicuro di voler eliminare questi messaggi solo da questo dispositivo?", "deleteMessagesDescriptionEveryone": "Sei sicuro di voler eliminare questi messaggi per tutti?", "deleting": "Eliminazione", "developerToolsToggle": "Apri gli strumenti di sviluppo", @@ -388,9 +385,9 @@ "groupInviteFailedMultiple": "Impossibile invitare {name} e altri {count} su {group_name}", "groupInviteFailedTwo": "Impossibile invitare {name} e {other_name} su {group_name}", "groupInviteFailedUser": "Impossibile invitare {name} su {group_name}", - "groupInviteSending": "Invio invito", "groupInviteSent": "Invito inviato", "groupInviteSuccessful": "Invito al gruppo riuscito", + "groupInviteVersion": "Gli utenti devono disporre della versione più recente per ricevere gli inviti", "groupInviteYou": "Sei stata invitato a unirti al gruppo.", "groupInviteYouAndMoreNew": "Tu e {count} altri vi siete uniti al gruppo.", "groupInviteYouAndOtherNew": "Tu e {other_name} fate ora parte del gruppo.", diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json index 55fac246f0..9424e9b078 100644 --- a/_locales/ja/messages.json +++ b/_locales/ja/messages.json @@ -35,8 +35,8 @@ "adminRemovedUser": "{name} はアドミンから削除されました", "adminRemovedUserMultiple": "{name} と {count}名 がAdminから削除されました。", "adminRemovedUserOther": "{name} と {other_name} がAdminに昇格しました。", - "adminSendingPromotion": "管理者への昇進を送信中", "adminSettings": "アドミン設定", + "adminTwoPromotedToAdmin": "{name} と {other_name} がアドミンに昇格しました", "andMore": "+{count}", "anonymous": "匿名", "appearanceAutoDarkMode": "オートダークモード", @@ -149,7 +149,7 @@ "callsPermissionsRequiredDescription": "プライバシー設定で「音声とビデオ通話」の許可を有効にできます。", "callsReconnecting": "再接続しています...", "callsRinging": "呼び出し中...", - "callsSessionCall": "{app_name} Call", + "callsSessionCall": "{app_name} 電話", "callsSettings": "通話 (ベータ版)", "callsVoiceAndVideo": "音声とビデオ通話", "callsVoiceAndVideoBeta": "音声通話とビデオ通話 (ベータ版)", @@ -233,7 +233,7 @@ "conversationsEmpty": "{conversation_name} にはメッセージがありません。", "conversationsEnter": "キーを入力", "conversationsEnterDescription": "会話中のEnterキーの機能", - "conversationsEnterNewLine": "SHIFT + ENTER 送信, ENTER 改行", + "conversationsEnterNewLine": "シフト + エンター 送信、エンター 改行", "conversationsEnterSends": "エンターでメッセージを送信、シフト + エンターで改行を開始", "conversationsGroups": "グループ", "conversationsMessageTrimming": "メッセージの削減", @@ -241,10 +241,11 @@ "conversationsMessageTrimmingTrimCommunitiesDescription": "6ヶ月以上のコミュニティと2,000以上のメッセージがあるコミュニティからメッセージを削除します。", "conversationsNew": "新しい会話", "conversationsNone": "まだ通知はありません", - "conversationsSendWithEnterKey": "Enter キーで送信", + "conversationsSendWithEnterKey": "エンターキーで送信", "conversationsSendWithEnterKeyDescription": "Enterキーをタップすると、改行ではなく、メッセージが送信されます。", "conversationsSettingsAllMedia": "すべてのメディア", "conversationsSpellCheck": "スペルチェック", + "conversationsSpellCheckDescription": "メッセージを入力するときにスペルチェックを有効にします", "conversationsStart": "会話を開始する", "copied": "コピーしました", "copy": "コピーする", @@ -273,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "グループの更新ができませんでした", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "他のユーザーの投稿を削除する権限はありません", "deleteMessage": "{count, plural, other [メッセージを削除]}", - "deleteMessageConfirm": "本当にこのメッセージを削除しますか？", "deleteMessageDeleted": "{count, plural, other [メッセージが削除されました]}", "deleteMessageDeletedGlobally": "このメッセージは削除されました", "deleteMessageDeletedLocally": "このメッセージはこのデバイス上で削除されました", - "deleteMessageDescriptionDevice": "本当にこのメッセージをこのデバイスのみから削除しますか？", "deleteMessageDescriptionEveryone": "本当にこのメッセージを全員に対して削除しますか？", "deleteMessageDeviceOnly": "このデバイスのみを削除", "deleteMessageDevicesAll": "すべてのデバイスから削除", "deleteMessageEveryone": "全員から削除", "deleteMessageFailed": "{count, plural, other [メッセージの削除に失敗しました]}", - "deleteMessagesConfirm": "本当にこれらのメッセージを削除しますか？", - "deleteMessagesDescriptionDevice": "このデバイスからのみメッセージを削除してもよろしいですか？", "deleteMessagesDescriptionEveryone": "すべてのユーザーのメッセージを削除してもよろしいですか？", "deleting": "削除中", "developerToolsToggle": "開発者ツールを切り替える", @@ -307,8 +304,9 @@ "disappearingMessagesDisappearAfterSendState": "送信後に消えます - {time}", "disappearingMessagesFollowSetting": "設定をフォロー", "disappearingMessagesFollowSettingOff": "送信したメッセージはもう消滅しません。消滅メッセージをオフにしてもよろしいですか？", - "disappearingMessagesFollowSettingOn": "あなたのメッセージを{time}後に{disappearing_messages_type}消えるように設定しますか？", + "disappearingMessagesFollowSettingOn": "メッセージを{time}後に{disappearing_messages_type}消えるようにセットしますか？", "disappearingMessagesLegacy": "{name}は古いクライアントを使用しています。消えるメッセージが期待通りに動作しない場合があります。", + "disappearingMessagesOnlyAdmins": "この設定はグループアドミンのみ変更可能です", "disappearingMessagesSent": "送信済み", "disappearingMessagesSet": "{name} が {time} になった後、{disappearing_messages_type}メッセージが消えるように設定しました。", "disappearingMessagesSetYou": "You は {time} になった後、{disappearing_messages_type}メッセージが消えるように設定しました。", @@ -318,7 +316,7 @@ "disappearingMessagesTurnedOffYou": "You は消えるメッセージをオフにしました。送信されたメッセージは消えなくなります。", "disappearingMessagesTurnedOffYouGroup": "あなた は消えているメッセージを オフにしました。", "disappearingMessagesTypeRead": "既読", - "disappearingMessagesTypeSent": "送信", + "disappearingMessagesTypeSent": "送信済み", "disappearingMessagesUpdated": "{admin_name}が消えるメッセージの設定を更新しました", "disappearingMessagesUpdatedYou": "You は消えるメッセージの設定を更新しました", "dismiss": "キャンセル", @@ -329,7 +327,7 @@ "displayNameErrorNew": "表示名を読み込めませんでした。続行するには新しい表示名を入力してください。", "displayNameNew": "新しい表示名を選択してください", "displayNamePick": "表示名を選択してください", - "displayNameSet": "表示名を設定", + "displayNameSet": "表示名をセット", "document": "ドキュメント", "done": "完了", "download": "ダウンロード", @@ -342,11 +340,13 @@ "emojiCategoryFlags": "フラグ", "emojiCategoryFood": "食べ物・飲み物", "emojiCategoryObjects": "オブジェクト", - "emojiCategorySmileys": "スマイル & 人", + "emojiCategoryRecentlyUsed": "最近使用", + "emojiCategorySmileys": "スマイリーと人", "emojiCategorySymbols": "記号", "emojiCategoryTravel": "旅行&場所", "emojiReactsClearAll": "すべての項目の{emoji}を削除してもよろしいですか？", - "emojiReactsCoolDown": "スローダウンしました。絵文字リアクターが多すぎます。しばらくしてからもう一度試してください。", + "emojiReactsCoolDown": "スローダウンしてください。絵文字リアクションが多すぎます。しばらくしてからもう一度試してください。", + "emojiReactsCountOthers": "{count, plural, other [# が {emoji} をこのメッセージに反応しました]}", "emojiReactsHoverNameDesktop": "{name}が{emoji_name}でリアクションしました", "emojiReactsHoverNameTwoDesktop": "{name}と{other_name}が{emoji_name}でリアクションしました", "emojiReactsHoverTwoNameMultipleDesktop": "{name}と{count}その他が{emoji_name}で反応しました", @@ -379,13 +379,12 @@ "groupError": "グループエラー", "groupErrorCreate": "グループの作成に失敗しました。インターネット接続を確認して、もう一度やり直してください。", "groupErrorJoin": "{group_name} への参加に失敗しました", - "groupInformationSet": "Set Group Information", + "groupInformationSet": "グループの詳細をセット", "groupInviteDelete": "本当にこのグループ招待を削除しますか？", "groupInviteFailed": "招待に失敗しました", "groupInviteFailedMultiple": "{name} と他 {count} 人を {group_name} に招待できませんでした", "groupInviteFailedTwo": "{name} と {other_name} を {group_name} に招待できませんでした", "groupInviteFailedUser": "{name} を {group_name} に招待できませんでした", - "groupInviteSending": "招待状を送信中", "groupInviteSent": "招待を送信しました", "groupInviteSuccessful": "グループの招待が成功しました", "groupInviteVersion": "ユーザーは最新のリリースを持っている必要があります", @@ -433,13 +432,13 @@ "groupRemovedYou": "{group_name}から削除されました。", "groupRemovedYouMultiple": "あなた と {count}名 がグループから削除されました。", "groupRemovedYouTwo": "あなた と {other_name} がグループから削除されました。", - "groupSetDisplayPicture": "グループのアイコン画像を設定", + "groupSetDisplayPicture": "グループのアイコン画像をセット", "groupUnknown": "不明なグループ", "groupUpdated": "グループが更新されました", "helpFAQ": "よくある質問", "helpHelpUsTranslateSession": "{app_name}の翻訳にご協力ください", "helpReportABug": "バグを報告", - "helpReportABugDescription": "詳細を共有して、私たちが問題を解決するのを手伝ってください。ログをエクスポートし、{app_name}のヘルプデスクを通じてファイルをアップロードしてください。", + "helpReportABugDescription": "詳細を共有して問題解決にご協力ください。ログをエクスポートして、{app_name}のヘルプデスクからファイルをアップロードしてください", "helpReportABugExportLogs": "ログのエクスポート", "helpReportABugExportLogsDescription": "ログをエクスポートし、{app_name} のヘルプデスクにてファイルをアップロードします。", "helpReportABugExportLogsSaveToDesktop": "デスクトップに保存", @@ -466,12 +465,12 @@ "legacyGroupMemberTwoNew": "{name} と {other_name} がグループに加わりました", "legacyGroupMemberYouNew": "あなたがグループに加わりました", "linkPreviews": "リンクプレビュー", - "linkPreviewsDescription": "サポートされている URL のリンクプレビューを表示します。", + "linkPreviewsDescription": "サポートされている URL のリンクプレビューを表示します", "linkPreviewsEnable": "リンクプレビューを有効にする", "linkPreviewsErrorLoad": "リンクプレビューを読み込めません", "linkPreviewsErrorUnsecure": "セキュアでないリンクのプレビューは読み込めません", "linkPreviewsFirstDescription": "送受信する URL のプレビューを表示します。これは便利ですが、{app_name} はプレビューを生成するためにリンクされた サイトにアクセスする必要があります。 {app_name} の設定でいつでもリンクのプレビューをオフにできます。", - "linkPreviewsSend": "リンクプレビューを送る", + "linkPreviewsSend": "リンクプレビューを表示", "linkPreviewsSendModalDescription": "リンクのプレビューを送信するとき、完全なメタデータ保護はありません。", "linkPreviewsTurnedOff": "リンクプレビューが無効です", "linkPreviewsTurnedOffDescription": "{app_name}は、送受信するリンクのプレビューを生成するためにリンクされたウェブサイトに接続する必要があります。

{app_name}の設定でプレビューをオンにできます。", @@ -497,8 +496,8 @@ "membersInviteShareDescription": "{name}にグループメッセージ履歴を共有しますか？", "membersInviteShareDescriptionMultiple": "{name}と{count}人にグループメッセージ履歴を共有しますか？", "membersInviteShareDescriptionTwo": "{name}と{other_name}にグループメッセージ履歴を共有しますか？", - "membersInviteShareMessageHistory": "Share message history", - "membersInviteShareNewMessagesOnly": "Share new messages only", + "membersInviteShareMessageHistory": "メッセージ履歴を共有", + "membersInviteShareNewMessagesOnly": "新しいメッセージのみを共有", "membersInviteTitle": "招待", "message": "メッセージ", "messageEmpty": "このメッセージは空です。", @@ -519,7 +518,7 @@ "messageRequestPending": "メッセージ・リクエストは現在承認待ちです。", "messageRequestPendingDescription": "受信者がこのメッセージリクエストを承認すると、音声メッセージと添付ファイルを送信できます.", "messageRequestYouHaveAccepted": "{name}さんのメッセージリクエストを承認しました", - "messageRequestsAcceptDescription": "このユーザーにメッセージを送信すると、自動的にメッセージリクエストが承認され、あなたのAccount IDが公開されます。", + "messageRequestsAcceptDescription": "このユーザーにメッセージを送ると、メッセージリクエストが自動的に承認され、アカウントIDが公開されます。", "messageRequestsAccepted": "メッセージ・リクエストが承認されました。", "messageRequestsClearAllExplanation": "本当に全てのメッセージリクエストとグループ招待を消去しますか？", "messageRequestsCommunities": "コミュニティメッセージリクエスト", @@ -545,7 +544,7 @@ "nicknameDescription": "{name}のニックネームを選んでください。これが1対1およびグループ会話で表示されます。", "nicknameEnter": "ニックネームを入力してください", "nicknameRemove": "ニックネームを削除", - "nicknameSet": "Set Nickname", + "nicknameSet": "ニックネームをセット", "no": "いいえ", "noSuggestions": "候補はありません", "none": "なし", @@ -571,6 +570,7 @@ "notificationsIosRestart": "{device}の再起動中にメッセージが届いたかもしれません", "notificationsLedColor": "LED色", "notificationsMentionsOnly": "メンションのみ", + "notificationsMessage": "メッセージ通知", "notificationsMostRecent": "最新の受信: {name}", "notificationsMute": "ミュート", "notificationsMuteFor": "{time_large}間ミュート", @@ -607,7 +607,7 @@ "onionRoutingPathDescription": "{app_name}は、{app_name}の分散型ネットワークの複数のService Nodeを介してメッセージをバウンスすることにより、IPアドレスを隠します。これが現在の経路です:", "onionRoutingPathDestination": "目的先", "onionRoutingPathEntryNode": "エントリーノード", - "onionRoutingPathServiceNode": "Service Node", + "onionRoutingPathServiceNode": "サービスノード", "onionRoutingPathUnknownCountry": "国名が不明", "onsErrorNotRecognized": "このONSを認識できませんでした。内容を確認して再度お試しください。", "onsErrorUnableToSearch": "このONSを検索できませんでした。後でもう一度お試しください。", @@ -619,6 +619,7 @@ "passwordConfirm": "パスワードを再確認", "passwordCreate": "パスワードを作成してください", "passwordCurrentIncorrect": "現在のパスワードが間違っています。", + "passwordDescription": "{app_name} のロックを解除するにはパスワードが必要です", "passwordEnter": "パスワードを入力してください", "passwordEnterCurrent": "現在のパスワードを入力してください", "passwordEnterNew": "新しいパスワードを入力してください", @@ -630,7 +631,7 @@ "passwordRemove": "パスワードを削除", "passwordRemoveDescription": "{app_name} のロックを解除するために必要なパスワードを削除します", "passwordRemovedDescription": "パスワードを削除しました。", - "passwordSet": "パスワードを設定", + "passwordSet": "パスワードをセット", "passwordSetDescription": "パスワードが設定されました。安全に保管してください。", "paste": "貼り付け", "permissionMusicAudioDenied": "{app_name} は、ファイル、音楽、およびオーディオを送信するために音楽およびオーディオアクセスが必要ですが、それが恒久的に拒否されています。設定に移動して、「権限」を選択し、「音楽およびオーディオ」を有効にしてください。", @@ -662,7 +663,7 @@ "profile": "プロフィール", "profileDisplayPicture": "ディスプレイの画像", "profileDisplayPictureRemoveError": "表示画像の削除に失敗しました。", - "profileDisplayPictureSet": "ディスプレイの画像を設定", + "profileDisplayPictureSet": "ディスプレイの画像をセット", "profileDisplayPictureSizeError": "小さいファイルを選んでください", "profileErrorUpdate": "プロフィールを更新できませんでした", "promote": "昇格", @@ -671,11 +672,12 @@ "qrNotRecoveryPassword": "このQRコードにはリカバリーパスワードが含まれていません", "qrScan": "QRコードをスキャン", "qrView": "QRコードを表示", + "qrYoursDescription": "友達があなたのQRコードをスキャンすることでメッセージを送信できます", "quit": "{app_name} を終了", "quitButton": "終了", "read": "既読", "readReceipts": "既読通知", - "readReceiptsDescription": "送信したすべてのメッセージに対する既読通知を表示します。", + "readReceiptsDescription": "送信したすべてのメッセージに対する既読通知を表示します", "received": "受信:", "recommended": "オススメ", "recoveryPasswordBannerDescription": "リカバリーパスワードを保存して、アカウントにアクセスできなくならないようにしてください", @@ -743,12 +745,12 @@ "settingsRestartDescription": "新しい設定を適用するために {app_name} を再起動する必要があります.", "share": "共有", "shareAccountIdDescription": "友達を{app_name} に招待して、チャットを始めましょう。アカウントIDを共有して招待できます。", - "shareAccountIdDescriptionCopied": "いつもどこでも友達と共有してください — ここで会話を移動します。", + "shareAccountIdDescriptionCopied": "いつでもどこでも友達と共有 — ここで会話を始めましょう", "shareExtensionDatabaseError": "データベースを開く際に問題が発生しました。アプリを再起動して再度お試しください。", "shareToSession": "{app_name}に共有", "show": "表示", "showAll": "すべて表示", - "showLess": "最小化", + "showLess": "少なく表示", "stickers": "ステッカー", "supportGoTo": "サポートページへ", "systemInformationDesktop": "システム情報: {information}", diff --git a/_locales/ka/messages.json b/_locales/ka/messages.json index 73149a1575..c7b753f31e 100644 --- a/_locales/ka/messages.json +++ b/_locales/ka/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name}ს აღარ არის ადმინისტრატორი.", "adminRemovedUserMultiple": "{name} და {count} სხვა წაიშალნენ ადმინისტრატორის როლიდან.", "adminRemovedUserOther": "{name} და {other_name} წაიშალნენ ადმინისტრატორის როლიდან.", - "adminSendingPromotion": "ადმინად დაწინაურების გაგზავნა", "adminSettings": "ადმინის პარამეტრები", "adminTwoPromotedToAdmin": "{name}ს და {other_name}ს მიენიჭათ ადმინისტრატორის როლი.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "ჯგუფის განახლება ვერ მოხერხდა", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "თქვენ არ გაქვთ იმის უფლება რომ წაშალოთ სხვისი შეტყობინებები", "deleteMessage": "{count, plural, one [შეტყობინების წაშლა] other [შეტყობინებების წაშლა]}", - "deleteMessageConfirm": "დარწმუნებული ხართ, რომ გსურთ ამ შეტყობინების წაშლა?", "deleteMessageDeleted": "{count, plural, one [შეტყობინება წაშლილია] other [შეტყობინებები წაშლილია]}", "deleteMessageDeletedGlobally": "ეს შეტყობინება წაშლილია", "deleteMessageDeletedLocally": "ეს შეტყობინება წაშლილია ამ მოწყობილობაზე", - "deleteMessageDescriptionDevice": "დარწმუნებული ხართ, რომ გსურთ ამ შეტყობინების წაშლა მხოლოდ ამ მოწყობილობიდან?", "deleteMessageDescriptionEveryone": "დარწმუნებული ხართ, რომ გსურთ ამ შეტყობინების წაშლა ყველასთვის?", "deleteMessageDeviceOnly": "მხოლოდ ამ მოწყობილობაზე წაშლა", "deleteMessageDevicesAll": "წაშლა ყველა ჩემს მოწყობილობაზე", "deleteMessageEveryone": "წაშლა ყველასთვის", "deleteMessageFailed": "{count, plural, one [შეტყობინების წაშლა ვერ მოხერხდა] other [შეტყობინებების წაშლა ვერ მოხერხდა]}", - "deleteMessagesConfirm": "დარწმუნებული ხართ, რომ გსურთ ამ შეტყობინებების წაშლა?", - "deleteMessagesDescriptionDevice": "დარწმუნებული ხართ, რომ გსურთ ამ შეტყობინებების წაშლა მხოლოდ ამ მოწყობილობიდან?", "deleteMessagesDescriptionEveryone": "დარწმუნებული ხართ, რომ გსურთ ამ შეტყობინებების წაშლა ყველასთვის?", "deleting": "წაშლა მიმდინარეობს", "developerToolsToggle": "დეველოპერის ხელსაწყოების გადართვა", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "ვერ შევძელიში {name} და {count} სხვა პირი ჯგუფში {group_name} მიიწვია", "groupInviteFailedTwo": "ვერ შევძელიში {name} და {other_name} ჯგუფში {group_name} მიიწვია", "groupInviteFailedUser": "ვერ შევძელიში {name} ჯგუფში {group_name} მიიწვია", - "groupInviteSending": "მოწვევის გაგზავნა", "groupInviteSent": "მოწვევა გაგზავნილია", "groupInviteSuccessful": "ჯგუფის მოწვევა წარმატებული იყო", "groupInviteVersion": "მომხმარებელმა უნდა ჰქონდეს უახლესი ვერსია მიწვევების მისაღებად", diff --git a/_locales/km/messages.json b/_locales/km/messages.json index 5ced6261fe..2dc26aeb3d 100644 --- a/_locales/km/messages.json +++ b/_locales/km/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name}‍ ត្រូវបានដកចេញពីការកាន់តំណែងជា Admin។", "adminRemovedUserMultiple": "{name} និង {count} គេផ្សេងទៀត ត្រូវបានដកចេញពីតួនាទី Admin។", "adminRemovedUserOther": "{name} និង {other_name} ត្រូវបានដកចេញពីតួនាទី Admin។", - "adminSendingPromotion": "កំពុងផ្ញើការផ្សព្វផ្សាយរបស់អ្នកគ្រប់គ្រង", "adminSettings": "ការកំណត់អ្នកគ្រប់គ្រង", "adminTwoPromotedToAdmin": "{name}‍ និង {other_name}‍ ត្រូវណានបិស្មីជា Admin។", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "បរាជ័យក្នុងការធ្វើបច្ចុប្បន្នភាពក្រុម", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "អ្នកគ្មានសិទ្ធដើម្បីលុបសារអ្នកផ្សេងៗទេ", "deleteMessage": "{count, plural, other [លុបសារ]}", - "deleteMessageConfirm": "តើអ្នកប្រាកដទេថាចង់លុបសារនេះ?", "deleteMessageDeleted": "{count, plural, other [សារត្រូវបានលុបហើយ]}", "deleteMessageDeletedGlobally": "This message was deleted", "deleteMessageDeletedLocally": "This message was deleted on this device", - "deleteMessageDescriptionDevice": "តើអ្នកប្រាកដទេថាចង់លុបសារនេះចេញពីឧបករណ៍នេះតែប៉ុណ្ណោះ?", "deleteMessageDescriptionEveryone": "តើអ្នកប្រាកដទេថាចង់លុបសារនេះចេញពីទាំងអស់គ្នា?", "deleteMessageDeviceOnly": "លុបតែឧបករណ៍នេះប៉ុណ្ណោះ", "deleteMessageDevicesAll": "លុបចេញពីឧបករណ៍របស់ខ្ញុំទាំងអស់", "deleteMessageEveryone": "លុបចេញពីទាំងអស់គ្នា", "deleteMessageFailed": "{count, plural, other [បរាជ័យក្នុងការលុបសារ]}", - "deleteMessagesConfirm": "តើអ្នកប្រាកដទេថាចង់លុបសារទាំងនេះ?", - "deleteMessagesDescriptionDevice": "តើអ្នកប្រាកដទេថាអ្នកចង់លុបសារទាំងនេះពីឧបករណ៍នេះតែប៉ុណ្ណោះ?", "deleteMessagesDescriptionEveryone": "តើអ្នកប្រាកដទេថាអ្នកចង់លុបសារទាំងនេះសម្រាប់ចោល?", "deleting": "កំពុងលុប", "developerToolsToggle": "Toggle Developer Tools", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "បរាជ័យក្នុងការអញ្ជើញ {name} និង {count} នាក់ផ្សេងទៀតចូល {group_name}", "groupInviteFailedTwo": "បរាជ័យក្នុងការអញ្ជើញ {name} និង {other_name} ទៅ {group_name}", "groupInviteFailedUser": "បរាជ័យក្នុងការអញ្ជើញ {name} ទៅ {group_name}", - "groupInviteSending": "ការផ្ញើការអញ្ជើញ", "groupInviteSent": "ការអញ្ជើញបានផ្ញើទៅហើយ", "groupInviteSuccessful": "ការអញ្ជើញក្រុមដោយជោគជ័យ", "groupInviteVersion": "អ្នកប្រើត្រូវមានកំណែចុងក្រោយដើម្បីទទួលបានការអញ្ជើញ", diff --git a/_locales/kmr/messages.json b/_locales/kmr/messages.json index 0059ab0864..de00519fe3 100644 --- a/_locales/kmr/messages.json +++ b/_locales/kmr/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} wekî admîn hate rakirin.", "adminRemovedUserMultiple": "{name} û {count} yên din wekî admîn hatine rakirin.", "adminRemovedUserOther": "{name} û {other_name} wekî admîn hatine rakirin.", - "adminSendingPromotion": "Şandina pêşkeftina admin", "adminSettings": "Mîhengên Admin", "adminTwoPromotedToAdmin": "{name} û {other_name} wekî admîn hatin xwepêşandin.", "andMore": "+{count}", @@ -142,6 +141,7 @@ "callsInProgress": "Bangê Bejeziyene", "callsIncoming": "Gerîna hatî ji {name}", "callsIncomingUnknown": "Gerîna habe", + "callsMicrophonePermissionsRequired": "Te ji telefona ji {name} hatî ma, ji ber ku te destûra gihîna mîkrofonê nedaye.", "callsMissed": "Gerîna negerîl", "callsMissedCallFrom": "Gerîna nececawdayî ji {name}", "callsNotificationsRequired": "Lêgerînên Dengî û Vîdeoyî div têgehin Navigationda dê system tê bikeviya nizanaran divê Troll karibe binšiyan", @@ -273,19 +273,15 @@ "deleteAfterLegacyGroupsGroupCreation": "Ji kerema xwe li benda were dema ku komê vê bikin...", "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Bi ser neket ku komê biguherînin", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Îzna te tine ye ku mesajên kesên din jê bibî", - "deleteMessage": "{count, plural, one [Peyama Jê Bibe] other [Peyaman Jê Bibe]}", - "deleteMessageConfirm": "Tu piştrast î ku tu dixwazî vê peyamê jê bibî?", + "deleteMessage": "{count, plural, one [Peyamê Jê Bibe] other [Peyaman Jê Bibe]}", "deleteMessageDeleted": "{count, plural, one [Peyam hate rakirin] other [Peyamên hate rakirin]}", "deleteMessageDeletedGlobally": "Ev peyam hatiye jêbirin", "deleteMessageDeletedLocally": "Ev peyam di vî berdan dema tesfîr hatî jêbirin.", - "deleteMessageDescriptionDevice": "Tu piştrast î ku tu dixwazî tenê vê peyamê ji vê amacakê jê bibî?", "deleteMessageDescriptionEveryone": "Tu piştrast î ku tu dixwazî vê peyamê ji bo tevan jê bibî?", "deleteMessageDeviceOnly": "Peyama Tenê di vî cîhazê de jê bibe", "deleteMessageDevicesAll": "Peymaneyan di ser hemû amêrakên min de jê bibe", "deleteMessageEveryone": "Ji bo tevan jê bibe", - "deleteMessageFailed": "{count, plural, one [Bi ser neket ku peyama jê derbike.] other [Bi ser neket ku peyam nebe derbike.]}", - "deleteMessagesConfirm": "Tu piştrast î ku tu dixwazî peyamên van jê bibî?", - "deleteMessagesDescriptionDevice": "Tu piştrast î ku tu dixwazî vê peyaman tenê li ser cîhaza vê peyaman jê bibî?", + "deleteMessageFailed": "{count, plural, one [Bi ser neket ku peyama jê derbike.] other [Bi ser neket ku peyaman jê bibe.]}", "deleteMessagesDescriptionEveryone": "Tu piştrast î ku tu dixwazî vê peyaman ji kuran jê bike?", "deleting": "Jêbibin", "developerToolsToggle": "Amûrên Pêşvebiran Veke/Bigire", @@ -389,7 +385,6 @@ "groupInviteFailedMultiple": "Bi ser neket ku {name} û {count} yên din feriq bikevînin {group_name}", "groupInviteFailedTwo": "Bi ser neket ku {name} û {other_name} feriq bikevînin {group_name}", "groupInviteFailedUser": "Bi ser neket ku {name} feriq bikeve {group_name}", - "groupInviteSending": "Daxwaza Komê bi şandin", "groupInviteSent": "Daxwazê şande", "groupInviteSuccessful": "Dawetkirina Grûpa Serkeftî", "groupInviteVersion": "Bikarhêner divê herî dawî versiyonê bikar bînin ku dawetên bigirin", @@ -494,7 +489,7 @@ "max": "Max", "media": "Medya", "members": "{count, plural, one [# endam] other [# endam]}", - "membersActive": "{count, plural, one [# endamê aktîf] other [# endamên aktîf]}", + "membersActive": "{count, plural, one [# endamê aktîv] other [# endamên aktîf]}", "membersAddAccountIdOrOns": "Add Account ID or ONS", "membersInvite": "Kontaktan dawet bike", "membersInviteSend": "{count, plural, one [Şandina Davetnameyek] other [Şandina Davetan]}", @@ -516,7 +511,7 @@ "messageNew": "{count, plural, one [Peyama nû] other [Peyamên nû]}", "messageNewDescriptionDesktop": "Bi navê hesabê hevalê xwe Account ID an ONS-ê têlepeqîne.", "messageNewDescriptionMobile": "Bi navê hesabê hevalê xwe Account ID, ONS an scanê QR code-yê têlepeqîne.", - "messageNewYouveGot": "{count, plural, one [Tu peyama nûyeke hatî gotandî hiştî.] other [# peyama nû hîn tuneyê.]}", + "messageNewYouveGot": "{count, plural, one [Peyameke te yê nû heye.] other [# peyama nû hîn tuneyê.]}", "messageReplyingTo": "Cewab didî", "messageRequestGroupInvite": "{name} ew {group_name} da te dawet kir ku te tevî wê bibî.", "messageRequestGroupInviteDescription": "Şandina mesajeyek ji vî kobîberekê wê bi otomatîkî davetnameya koma qebûl bike.", @@ -725,7 +720,7 @@ "searchContacts": "Li kontaktekî bigerrin", "searchConversation": "Li söylek bigerrin", "searchEnter": "Kerem bike tu li ser Giphy ne girêdane - ne têketina gêrê, usbikirina tambûra têkeve", - "searchMatches": "{count, plural, one [{found_count} ji # lihevhatû] other [{found_count} li li # yên din]}", + "searchMatches": "{count, plural, one [{found_count} ji # li hev tê] other [{found_count} li li # yên din]}", "searchMatchesNone": "Encam peyda nebû", "searchMatchesNoneSpecific": "Encam peyda nebû ji bo {query}", "searchMembers": "Li angoştek bigerrin", diff --git a/_locales/kn/messages.json b/_locales/kn/messages.json index 419c246502..6d74623447 100644 --- a/_locales/kn/messages.json +++ b/_locales/kn/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} ಅವರು ನಿರ್ವಾಹಕರನ್ನಾಗಿ ತೆಗೆದುಹಾಕಲ್ಪಟ್ಟಿದ್ದಾರೆ.", "adminRemovedUserMultiple": "{name} ಮತ್ತು {count} ಇತರರನ್ನು ನಿರ್ವಾಹಕರಾಗಿ ತೆಗೆದುಹಾಕಲಾಗಿದೆ.", "adminRemovedUserOther": "{name} ಮತ್ತು {other_name} ಅವರಿಗೆ ನಿರ್ವಾಹಕರಾಗಿ ತೆಗೆದುಹಾಕಲಾಗಿದೆ.", - "adminSendingPromotion": "ನಿರ್ವಹಣಾ ಪ್ರಚಾರವನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ", "adminSettings": "ನಿರ್ವಾಹಕ ಸೆಟ್ಟಿಂಗ್ಗಳು", "adminTwoPromotedToAdmin": "{name} ಪ್ರ ಮತ್ತು {other_name} ಪ್ರ ನಿರ್ವಾಹಕರಾಗಿ ಬಡ್ತಿ ಪಡೆದಿದ್ದಾರೆ.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "ಗುಂಪಿನ ನವೀಕರಣ ವಿಫಲವಾಗಿದೆ", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "ನಿಮಗೆ ಇತರರ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಲು ಅನುಮತಿ ಇಲ್ಲ", "deleteMessage": "{count, plural, one [ಸಂದೇಶವನ್ನು ಅಳಿಸಿ] other [ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ]}", - "deleteMessageConfirm": "ನೀವು ಈ ಸಂದೇಶವನ್ನು ಅಳಿಸಲು ಖಚಿತವಾಗಿದ್ದೀರಾ?", "deleteMessageDeleted": "{count, plural, one [ಸಂದೇಶವನ್ನು ಅಳಿಸಲಾಗಿದೆ] other [ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ]}", "deleteMessageDeletedGlobally": "ಈ ಸಂದೇಶವನ್ನು ಅಳಿಸಲಾಗಿದೆ", "deleteMessageDeletedLocally": "ಈ ಸಂದೇಶವನ್ನು ಈ ಪ್ಲಾಟ್‌ಫಾರ್ಮ್ ಮೇಲೆ ಅಳಿಸಲಾಗಿದೆ", - "deleteMessageDescriptionDevice": "ನೀವು ಈ ಸಂದೇಶವನ್ನು ಈ ಸಾಧನದಿಂದ ಮಾತ್ರ ಅಳಿಸಲು ಖಚಿತವಾಗಿದ್ದೀರಾ?", "deleteMessageDescriptionEveryone": "ನೀವು ಈ ಸಂದೇಶವನ್ನು ಎಲ್ಲರಿಗಾಗಿ ಅಳಿಸಲು ಖಚಿತವಾಗಿದ್ದೀರಾ?", "deleteMessageDeviceOnly": "ಈ ಯಂತ್ರದಲ್ಲಿ ಮಾತ್ರ ಅಳಿಸಿ", "deleteMessageDevicesAll": "ಎಲ್ಲಾ ಡಿವೈಸ್‌ಗಳಲ್ಲಿ ಅಳಿಸಿ", "deleteMessageEveryone": "ಎಲ್ಲರಿಗಾಗಿ ಅಳಿಸಿ", "deleteMessageFailed": "{count, plural, one [ಸಂದೇಶವನ್ನು ಅಳಿಸಲು ವಿಫಲವಾಯಿತು] other [ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಲು ವಿಫಲವಾಯಿತು]}", - "deleteMessagesConfirm": "ನೀವು ಈ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಲು ಖಚಿತವಾಗಿದ್ದೀರಾ?", - "deleteMessagesDescriptionDevice": "ನೀವು ಈ ಸಂದೇಶಗಳನ್ನು ಈ ಸಾಧನದಿಂದ ಮಾತ್ರ ಅಳಿಸಲು ಖಚಿತವಾಗಿದ್ದೀರಾ?", "deleteMessagesDescriptionEveryone": "ನೀವು ಈ ಸಂದೇಶಗಳನ್ನು ಎಲ್ಲರಿಗಾಗಿ ಅಳಿಸಲು ಖಚಿತವಾಗಿದ್ದೀರಾ?", "deleting": "ಅಳಿಸಲಾಗುತ್ತಿದೆ", "developerToolsToggle": "ಡೇವಲಪರ್ ಟೂಲ್ ಬಗ್ಗೆ ಟಾಗಲ್ ಮಾಡಿ", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "{name} ಮತ್ತು {count} ಇತರರನ್ನು {group_name} ಗೆ ಆಹ್ವಾನಿಸಲು ವಿಫಲವಾಗಿದೆ", "groupInviteFailedTwo": "{name} ಮತ್ತು {other_name} ಅನ್ನು {group_name} ಗೆ ಆಹ್ವಾನಿಸಲು ವಿಫಲವಾಗಿದೆ", "groupInviteFailedUser": "{name} ಅನ್ನು {group_name} ಗೆ ಆಹ್ವಾನಿಸಲು ವಿಫಲವಾಗಿದೆ", - "groupInviteSending": "ಆಹ್ವಾನ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ", "groupInviteSent": "ಆಮಂತ್ರಣೆ ಕಳುಹಿಸಲಾಗಿದೆ", "groupInviteSuccessful": "ಗುಂಪಿನ ಆಹ್ವಾನ ಯಶಸ್ವಿ", "groupInviteVersion": "ಬಳಕೆದಾರರು ಆವೃತ್ತಿಯ ಆವೃತ್ತಿಯ ಅಥವಾ ಹೆಚ್ಚಿನ ಆವೃತ್ತಿಯನ್ನು ಹೊಂದಿರಬೇಕು ಆಹ್ವಾನಗಳನ್ನು ಸ್ವೀಕರಿಸಲು", diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json index f99c224f24..0132695cd2 100644 --- a/_locales/ko/messages.json +++ b/_locales/ko/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name}님이 관리자에서 제거되었습니다.", "adminRemovedUserMultiple": "{name}님과 {count} 명의 사람들의 관리자 직책이 제거되었습니다", "adminRemovedUserOther": "{name}님과 {other_name}님의 관리자 직책이 제거되었습니다.", - "adminSendingPromotion": "관리자 권한 전송 중", "adminSettings": "Admin Settings", "adminTwoPromotedToAdmin": "{name}님과 {other_name}님이 관리자(Admin)로 승격되었습니다.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "그룹 업데이트 실패", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "다른 사람의 메시지를 삭제할 수 있는 권한이 없습니다", "deleteMessage": "{count, plural, other [메시지 삭제]}", - "deleteMessageConfirm": "정말 이 메시지를 삭제하시겠습니까?", "deleteMessageDeleted": "{count, plural, other [메시지가 삭제되었습니다.]}", "deleteMessageDeletedGlobally": "이 메시지는 삭제되었습니다.", "deleteMessageDeletedLocally": "이 장치에서 이 메시지가 삭제되었습니다.", - "deleteMessageDescriptionDevice": "정말 이 메시지를 이 장치에서만 삭제하시겠습니까?", "deleteMessageDescriptionEveryone": "정말 이 메시지를 모두에게서 삭제하시겠습니까?", "deleteMessageDeviceOnly": "이 기기에서만 삭제", "deleteMessageDevicesAll": "모든 기기에서 삭제", "deleteMessageEveryone": "모두에게서 삭제", "deleteMessageFailed": "{count, plural, other [메시지를 삭제하지 못했습니다]}", - "deleteMessagesConfirm": "정말 이 메시지를 삭제하시겠습니까?", - "deleteMessagesDescriptionDevice": "Are you sure you want to delete these messages from this device only?", "deleteMessagesDescriptionEveryone": "Are you sure you want to delete these messages for everyone?", "deleting": "삭제 중…", "developerToolsToggle": "Toggle Developer Tools", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "{name}님 및 {count}명의 다른 사람들을 {group_name}에 초대하지 못했습니다.", "groupInviteFailedTwo": "{name}님과 {other_name}님을 {group_name}에 초대하지 못했습니다.", "groupInviteFailedUser": "{name}님을 {group_name}에 초대하지 못했습니다.", - "groupInviteSending": "초대 전송 중", "groupInviteSent": "초대 전송됨", "groupInviteSuccessful": "그룹 초대 성공", "groupInviteVersion": "사용자는 초대를 받으려면 최신 버전을 보유하고 있어야 합니다", diff --git a/_locales/ku/messages.json b/_locales/ku/messages.json index ac508601fc..5dbed26adc 100644 --- a/_locales/ku/messages.json +++ b/_locales/ku/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} لە بەڕێوەبەری لابرا.", "adminRemovedUserMultiple": "{name} و {count} کەس دیکە وەرگیندران وەک بەڕێوەبەر.", "adminRemovedUserOther": "{name} و {other_name} وەرگیندران وەک بەڕێوەبەر.", - "adminSendingPromotion": "ناردنی تەبنی بەڕێوەبەری", "adminSettings": "ڕێکخستنەکانی بەڕێوەبەر", "adminTwoPromotedToAdmin": "{name} و {other_name} بە بەڕێوەبەر هەڵبژێردران.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "شکستی گەڕانەوەی گروپ", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "بڕیارەکانت ناکرێ کە پەیامەکانی تر لەبێریت", "deleteMessage": "{count, plural, one [سڕینەوەی پەیام] other [سڕینەوەی پەیامەکان]}", - "deleteMessageConfirm": "دڵنیایت دەتەوێت ئەم پەیامە بسڕیتەوە؟", "deleteMessageDeleted": "{count, plural, one [نامە سڕا] other [نامەکان بسڕانەوە]}", "deleteMessageDeletedGlobally": "ئەم پەیامە سڕاوە", "deleteMessageDeletedLocally": "ئەم پەیامە سڕاوە لەسەر ئەم ئامێرەیە", - "deleteMessageDescriptionDevice": "دڵنیایت دەتەوێت ئەم پەیامە بسڕیتەوە تەنها لەسەر ئەم ئاگاداریە؟", "deleteMessageDescriptionEveryone": "دڵنیایت دەتەوێت ئەم پەیامە بسڕیتەوە بۆ هەموو کەسان؟", "deleteMessageDeviceOnly": "تەنها لەسەر ئەم ئامێرەدا سڕینەوە", "deleteMessageDevicesAll": "سڕینەوە لە هەموو ئاڵاتەکانم", "deleteMessageEveryone": "سڕینەوە بۆ هەمووان", "deleteMessageFailed": "{count, plural, one [شکستی هەندەڵکردنی پەیام] other [شکستی هەندەڵکردنی پەیامەکان]}", - "deleteMessagesConfirm": "دڵنیایت دەتەوێت ئەم پەیامانە بسڕیتەوە؟", - "deleteMessagesDescriptionDevice": "دڵنیایت بۆ سڕینەوەی هەموو پەیام دەتێنا زاتیە؟", "deleteMessagesDescriptionEveryone": "دڵنیایت بۆ سڕینەوەی ئەم پەیامەکان بۆ هەموو ؟", "deleting": "سڕینەوە", "developerToolsToggle": "گۆڕینی ئامرازە پەرەساکان", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "{name} و {count} هاڕاوەکانت و هاووپەیوانەت بۆ {group_name} بانگخستند شکستی هێنا", "groupInviteFailedTwo": "{name} و {other_name} بۆ {group_name} بانگخستند شکستی هێنا", "groupInviteFailedUser": "{name} بۆ {group_name} بانگخستند شکستی هێنا", - "groupInviteSending": "بانگکردن دەکرێت", "groupInviteSent": "بانێ ناردکراوە", "groupInviteSuccessful": "دعوتنامەی گروپ سەرکەوتوو بوو", "groupInviteVersion": "بەکارهێنەران پێویستە نوێترین وەشانی بەکار بیهنە بۆ وەرگرتنی بانگەشەکان", diff --git a/_locales/lg/messages.json b/_locales/lg/messages.json index b57064e818..b4175f77f9 100644 --- a/_locales/lg/messages.json +++ b/_locales/lg/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} yasasulwa okuva ku kifo kya Admin.", "adminRemovedUserMultiple": "{name} ne {count} abalala basasulwa nga Admin.", "adminRemovedUserOther": "{name} ne {other_name} basasulwa nga Admin.", - "adminSendingPromotion": "Okusindika okuwagira", "adminSettings": "Ebijjukizo bya Bannannyini Byebibuzibwako", "adminTwoPromotedToAdmin": "{name} ne {other_name} baakyusibwa okufuuka Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Kibiina kya Update Kilememye", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Tolina busobozi kusazaamu obubaka bwa balala", "deleteMessage": "{count, plural, one [Jjamu Olukome ngaleerake] other [Jjamu Ente]}", - "deleteMessageConfirm": "Oli mukakafu nti oyagala okusazaamu obubaka buno?", "deleteMessageDeleted": "{count, plural, one [Obubaka bukyusiddwako] other [Obubaka obwokutorera obukyusiddwako]}", "deleteMessageDeletedGlobally": "Obubaka buno buno bwasaziddwa.", "deleteMessageDeletedLocally": "Obubaka buno bwasaziddwajo ku kifaananyi kino.", - "deleteMessageDescriptionDevice": "Oli mukakafu nti oyagala okusazaamu obubaka buno okuva ku kidirisa kino kyokka?", "deleteMessageDescriptionEveryone": "Oli mukakafu nti oyagala okusazaamu obubaka buno ku bantu bonna?", "deleteMessageDeviceOnly": "Nsongera ekubamu ekyange ekijja okulondebwa", "deleteMessageDevicesAll": "Jjamu era e biwedde Doubiti ze Zzinyi", "deleteMessageEveryone": "Jjamu omumekolero", "deleteMessageFailed": "{count, plural, one [Kusazaamu obubaka kugaanye] other [Kusazaamu obubaka kugaanye]}", - "deleteMessagesConfirm": "Oli mukakafu nti oyagala okusazaamu obubaka buno?", - "deleteMessagesDescriptionDevice": "Oli mbanankubye kusula ebubaka bino ku kyuma kino kyokka?", "deleteMessagesDescriptionEveryone": "Oli mbanankubye kusula ebubaka bino byonna ku buli omu?", "deleting": "Okuggya", "developerToolsToggle": "Guliko Developer Tools", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Ensobi okuzaako okuweereza {name} ne {count} abalala mu {group_name}", "groupInviteFailedTwo": "Ensobi okuzaako okuweereza {name} ne {other_name} mu {group_name}", "groupInviteFailedUser": "Ensobi okuzaako okuweereza {name} mu {group_name}", - "groupInviteSending": "Okusindika envitto", "groupInviteSent": "Kuyita kukisibwako", "groupInviteSuccessful": "Okuyita mu kibinja kkyalibukira", "groupInviteVersion": "Abakozesa balina okubeera n'ekitundu ekipya okufuna obulambuzi.", diff --git a/_locales/lo/messages.json b/_locales/lo/messages.json index ff3d27be30..7f982b14ae 100644 --- a/_locales/lo/messages.json +++ b/_locales/lo/messages.json @@ -135,14 +135,10 @@ "deleteAfterGroupPR1BlockUser": "ຫ້າມຜູ້ນັກ", "deleteAfterGroupPR3GroupErrorLeave": "ບໍ່ສາມາດອອກໄດ້ໃນຂະນະນີ້ທ່ານກໍາລັງເພີ່ມຫຼຶລົບສະມາຊິກ.", "deleteAfterLegacyDisappearingMessagesTheyChangedTimer": "{name}ໄດ້ກຳນົດລະຍະເວລາໃນການຂໍແກ້ຂອງຂໍ້ຄາບຊ່ວງທ່ານ{time}", - "deleteMessageConfirm": "ທ່ານແນ່ໃຈບໍ່ວ່າທ່ານຕ້ອງການລຶບຂໍ້ຄວາມນີ້?", - "deleteMessageDescriptionDevice": "ທ່ານແນ່ໃຈບໍ່ວ່າທ່ານຕ້ອງການລຶບຂໍ້ຄວາມນີ້ຂອງຕ່າງອຸປະກອນນີ້ເທົ່ານັ້ນ?", "deleteMessageDescriptionEveryone": "ທ່ານແນ່ໃຈບໍ່ວ່າທ່ານຕ້ອງການລຶບຂໍ້ຄວາມນີ້ກັບທຸກຄົນ?", "deleteMessageDeviceOnly": "ລຶບແຕ່ອຸປະກອນນີ້ເທົ່ານັ້ນ", "deleteMessageDevicesAll": "ລຶບເທິງທຸກອຸປະກອນຂອງຂ້ອຍ", "deleteMessageEveryone": "ລຶບໃຫ້ແກ່ທຸກຄົນ", - "deleteMessagesConfirm": "ທ່ານແນ່ໃຈບໍ່ວ່າທ່ານຕ້ອງການລຶບຂໍ້ຄວາມເຫົານີ້?", - "deleteMessagesDescriptionDevice": "ທ່ານແນ່ໃຈບໍ່ວ່າທ່ານຕ້ອງການລຶບຂໍ້ຄວາມເຫົານີ້ຂອງຕ່າງອຸປະກອນນີ້ເທົ່ານັ້ນ?", "deleteMessagesDescriptionEveryone": "ທ່ານແນ່ໃຈບໍ່ວ່າທ່ານຕ້ອງການລຶບຂໍ້ຄວາມເຫົານີ້ສຳລັບທຸກຄົນ?", "deleting": "ລາຍການລຶບ", "disappearingMessages": "ຂໍ້ຄວາມສະບາຍພັງ", diff --git a/_locales/lt/messages.json b/_locales/lt/messages.json index 43c407c9f3..c5c38c9162 100644 --- a/_locales/lt/messages.json +++ b/_locales/lt/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} buvo pašalintas kaip adminas.", "adminRemovedUserMultiple": "{name} ir dar {count} buvo pašalinti iš administratorių.", "adminRemovedUserOther": "{name} ir {other_name} buvo pašalinti iš administratorių.", - "adminSendingPromotion": "Siunčiama administratoriams", "adminSettings": "Administratoriaus nustatymai", "adminTwoPromotedToAdmin": "{name} ir {other_name} buvo paskirti adminais.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Nepavyko atnaujinti grupės", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Jūs neturite leidimo trinti kitų žmonių žinučių", "deleteMessage": "{count, plural, one [Ištrinti žinutę] few [Ištrinti žinutes] many [Ištrinti žinutes] other [Ištrinti žinutes]}", - "deleteMessageConfirm": "Ar tikrai norite ištrinti šią žinutę?", "deleteMessageDeleted": "{count, plural, one [Žinutė ištrinta] few [Žinutės ištrintos] many [Žinutės ištrintos] other [Žinutės ištrintos]}", "deleteMessageDeletedGlobally": "Ši žinutė ištrinta", "deleteMessageDeletedLocally": "Ši žinutė ištrinta šiame įrenginyje", - "deleteMessageDescriptionDevice": "Ar tikrai norite ištrinti šią žinutę tik iš šio įrenginio?", "deleteMessageDescriptionEveryone": "Ar tikrai norite ištrinti šią žinutę visiems?", "deleteMessageDeviceOnly": "Ištrinti tik šiame įrenginyje", "deleteMessageDevicesAll": "Ištrinti visuose mano įrenginiuose", "deleteMessageEveryone": "Ištrinti visiems", "deleteMessageFailed": "{count, plural, one [Nepavyko ištrinti žinutės] few [Nepavyko ištrinti žinučių] many [Nepavyko ištrinti žinučių] other [Nepavyko ištrinti žinučių]}", - "deleteMessagesConfirm": "Ar tikrai norite ištrinti šias žinutes?", - "deleteMessagesDescriptionDevice": "Ar tikrai norite ištrinti šias žinutes tik iš šio įrenginio?", "deleteMessagesDescriptionEveryone": "Ar tikrai norite ištrinti šias žinutes visiems?", "deleting": "Ištrinama", "developerToolsToggle": "Perjungti kūrėjo įrankius", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Nepavyko pakviesti {name} ir {count} kitų į {group_name}", "groupInviteFailedTwo": "Nepavyko pakviesti {name} ir {other_name} į {group_name}", "groupInviteFailedUser": "Nepavyko pakviesti {name} į {group_name}", - "groupInviteSending": "Siunčiamas kvietimas", "groupInviteSent": "Pakvietimas išsiųstas", "groupInviteSuccessful": "Grupės kvietimas sėkmingas", "groupInviteVersion": "Norint gauti kvietimus, vartotojai privalo turėti naujausią versiją", @@ -421,6 +415,7 @@ "groupNameEnterShorter": "Įveskite trumpesnį grupės pavadinimą.", "groupNameNew": "Dabar, grupės pavadinimas yra \"{group_name}\".", "groupNameUpdated": "Grupės pavadinimas atnaujintas.", + "groupNameVisible": "Grupės pavadinimas yra matomas visiems grupės nariams.", "groupNoMessages": "Neturite žinučių iš {group_name}. Parašykite žinutę, kad pradėtumėte pokalbį!", "groupOnlyAdmin": "Jūs esate vienintelis administratorius grupėje {group_name}.

Grupės nariai ir nustatymai negali būti keičiami be administratoriaus.", "groupPromotedYou": "Jūs buvote paskirti adminu.", @@ -435,6 +430,7 @@ "groupRemovedMultiple": "{name} ir {count} kiti buvo pašalinti iš grupės.", "groupRemovedTwo": "{name} ir {other_name} buvo pašalinti iš grupės.", "groupRemovedYou": "Jūs buvote pašalinti iš {group_name}.", + "groupRemovedYouGeneral": "Jūs buvote pašalinti iš grupės.", "groupRemovedYouMultiple": "Jūs ir dar {count} buvo pašalinti iš grupės.", "groupRemovedYouTwo": "Jūs ir {other_name} buvo pašalinti iš grupės.", "groupSetDisplayPicture": "Nustatyti grupės rodomą paveikslėlį", @@ -493,7 +489,7 @@ "lockAppUnlocked": "{app_name} atrakinta", "max": "Maksimali", "media": "Medija", - "members": "{count, plural, one [# narys] few [# nariai] many [# narių] other [# nariai]}", + "members": "{count, plural, one [# narys] few [# nariai] many [# narių] other [# narys]}", "membersActive": "{count, plural, one [# aktyvus narys] few [# aktyvūs nariai] many [# aktyvūs nariai] other [# aktyvūs nariai]}", "membersAddAccountIdOrOns": "Pridėti paskyros ID arba ONS", "membersInvite": "Pakviesti draugus", @@ -548,6 +544,7 @@ "next": "Kitas", "nicknameDescription": "Pasirinkite slapyvardį {name}. Jis bus matomas jums pokalbiuose vienas prieš vieną ir grupinėse diskusijose.", "nicknameEnter": "Įveskite slapyvardį", + "nicknameErrorShorter": "Įveskite trumpesnį slapyvardį", "nicknameRemove": "Šalinti slapyvardį", "nicknameSet": "Nustatyti pravardę", "no": "Ne", diff --git a/_locales/lv/messages.json b/_locales/lv/messages.json index 3d10b9f2c4..7997ebaa12 100644 --- a/_locales/lv/messages.json +++ b/_locales/lv/messages.json @@ -31,7 +31,6 @@ "adminRemoveCommunityNone": "Šajā Kopienā nav administratoru.", "adminRemoveFailed": "Neizdevās noņemt {name} kā administratoru.", "adminRemovedUser": "{name} tika noņemts no administrēšanas.", - "adminSendingPromotion": "Sūta administratora paaugstinājumu", "adminSettings": "Administratora iestatījumi", "adminTwoPromotedToAdmin": "{name} un {other_name} tika paaugstināti par administrētāju.", "andMore": "+{count}", @@ -261,17 +260,13 @@ "deleteAfterLegacyDisappearingMessagesLegacy": "Mantojums", "deleteAfterLegacyDisappearingMessagesOriginal": "Gaistošo ziņojumu oriģinālā versija.", "deleteAfterLegacyDisappearingMessagesTheyChangedTimer": "{name} iestatīja pazūdošo ziņu taimeri uz {time}", - "deleteMessageConfirm": "Vai jūs esat pārliecināti ka vēlaties dzēst šo ziņu?", "deleteMessageDeletedGlobally": "Šis ziņojums tika izdzēsts", "deleteMessageDeletedLocally": "Šis ziņojums tika izdzēsts šajā ierīcē", - "deleteMessageDescriptionDevice": "Vai jūs esat pārliecināti ka vēlaties dzēst šo ziņu tikai no šīs ierīces?", "deleteMessageDescriptionEveryone": "Vai jūs esat pārliecināti ka vēlaties dzēst šo ziņu visiem?", "deleteMessageDeviceOnly": "Dzēst tikai šajā ierīcē", "deleteMessageDevicesAll": "Dzēst visās manās ierīcēs", "deleteMessageEveryone": "Dzēst visiem", "deleteMessageFailed": "{count, plural, zero [Neizdevās dzēst ziņas] one [Neizdevās dzēst ziņu] other [Neizdevās dzēst ziņas]}", - "deleteMessagesConfirm": "Vai jūs esat pārliecināti, ka vēlaties dzēst šos ziņojumus?", - "deleteMessagesDescriptionDevice": "Vai esat pārliecināts, ka vēlaties dzēst šos ziņojumus tikai no šīs ierīces?", "deleteMessagesDescriptionEveryone": "Vai esat pārliecināts, ka vēlaties dzēst šos ziņojumus visiem?", "deleting": "Dzēšana", "developerToolsToggle": "Pārslēgt izstrādātāja rīkus", @@ -370,7 +365,6 @@ "groupInviteFailedMultiple": "Neizdevās uzaicināt {name} un {count} citus uz {group_name}", "groupInviteFailedTwo": "Neizdevās uzaicināt {name} un {other_name} uz {group_name}", "groupInviteFailedUser": "Neizdevās uzaicināt {name} uz {group_name}", - "groupInviteSending": "Sūta ielūgumu", "groupInviteSent": "Uzaicinājums nosūtīts", "groupInviteSuccessful": "Grupas ielūgums ir veiksmīgs", "groupInviteVersion": "Lietotājiem jābūt jaunākajai izlaiduma versijai, lai saņemtu ielūgumus", @@ -384,6 +378,9 @@ "groupMemberLeftMultiple": "{name} un {count} citi atstāja grupu.", "groupMemberLeftTwo": "{name} un {other_name} atstāja grupu.", "groupMemberNew": "Grupai pievienojās {name}.", + "groupMemberNewHistory": "{name} uzaicināts pievienoties grupai un sarakstes vēsture tam pieejama.", + "groupMemberNewMultiple": "{name} un {count} others uzaicināti pievienoties grupai.", + "groupMemberNewTwo": "{name} un {other_name} uzaicināti pievienoties grupai.", "groupMemberYouLeft": "Tu atstāji grupu.", "groupMembers": "Grupas dalībnieki", "groupMembersNone": "Šajā grupā nav citu dalībnieku.", @@ -473,6 +470,7 @@ "messageInfo": "Ziņas informācija", "messageMarkRead": "Atzīmēt kā izlasītu", "messageMarkUnread": "Atzīmēt kā nelasītu", + "messageNew": "{count, plural, zero [Jauna ziņa] one [Jauna ziņa] other [Jauna ziņa]}", "messageNewDescriptionDesktop": "Sāc jaunu sarunu, ievadot drauga Konta ID vai ONS.", "messageNewDescriptionMobile": "Sāc jaunu sarunu, ievadot drauga Konta ID, ONS vai skenējot viņu QR kodu.", "messageNewYouveGot": "{count, plural, zero [Jums ir # jaunas ziņas.] one [Jums ir # jaunas ziņas.] other [Jums ir # jaunas ziņas.]}", diff --git a/_locales/mk/messages.json b/_locales/mk/messages.json index 0ffbac50ed..e637a949e8 100644 --- a/_locales/mk/messages.json +++ b/_locales/mk/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} беше отстранет како Админ.", "adminRemovedUserMultiple": "{name} и {count} други беа отстранети како Админ.", "adminRemovedUserOther": "{name} и {other_name} беа отстранени како администратори.", - "adminSendingPromotion": "Се испраќа унапредување на администратор", "adminSettings": "Администраторски поставки", "adminTwoPromotedToAdmin": "{name} и {other_name} беа промовирани во Админ.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Неуспешно ажурирање на групата", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Немате дозвола да ги бришете пораките на другите", "deleteMessage": "{count, plural, one [Избриши порака] other [Избриши пораки]}", - "deleteMessageConfirm": "Дали сте сигурни дека сакате да ја избришете оваа порака?", "deleteMessageDeleted": "{count, plural, one [Пораката е избришана] other [Пораките се избришани]}", "deleteMessageDeletedGlobally": "Оваа порака беше избришана", "deleteMessageDeletedLocally": "Оваа порака беше избришана на овој уред", - "deleteMessageDescriptionDevice": "Дали сте сигурни дека сакате да ја избришете оваа порака само од овој уред?", "deleteMessageDescriptionEveryone": "Дали сте сигурни дека сакате да ја избришете оваа порака за сите?", "deleteMessageDeviceOnly": "Избриши само на овој уред", "deleteMessageDevicesAll": "Избриши на сите мои уреди", "deleteMessageEveryone": "Избриши за сите", "deleteMessageFailed": "{count, plural, one [Не успеа да ја избришете пораката] other [Не успеа да ги избришете пораките]}", - "deleteMessagesConfirm": "Дали сте сигурни дека сакате да ги избришете овие пораки?", - "deleteMessagesDescriptionDevice": "Дали сте сигурни дека сакате да ги избришете овие пораки само од овој уред?", "deleteMessagesDescriptionEveryone": "Дали сте сигурни дека сакате да ги избришете овие пораки за сите?", "deleting": "Бришење...", "developerToolsToggle": "Префрли на алатки за развивачи", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Неуспешно поканување на {name} и {count} други лица во {group_name}", "groupInviteFailedTwo": "Неуспешно поканување на {name} и {other_name} во {group_name}", "groupInviteFailedUser": "Неуспешно поканување на {name} во {group_name}", - "groupInviteSending": "Испраќање на покана", "groupInviteSent": "Поканата е испратена", "groupInviteSuccessful": "Поканата за група е успешна", "groupInviteVersion": "Корисниците мора да имаат најнова верзија за да добијат покани", diff --git a/_locales/mn/messages.json b/_locales/mn/messages.json index 50496c49de..ba11c7d66c 100644 --- a/_locales/mn/messages.json +++ b/_locales/mn/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} Админ зургаас хасагдлаа.", "adminRemovedUserMultiple": "{name} болон {count} бусад Админ эрхээс хасагдлаа.", "adminRemovedUserOther": "{name} болон {other_name} Админ эрхээс хасагдлаа.", - "adminSendingPromotion": "Админ түвшний дахин томилгоо илгээж байна", "adminSettings": "Админы тохиргоо", "adminTwoPromotedToAdmin": "{name} болон {other_name} Админ боллоо.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Бүлгийг шинэчлэхэд алдаа гарлаа", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Та бусдын зурвас устгах эрхгүй байна", "deleteMessage": "{count, plural, one [Мессеж устгах] other [Мессежүүдийг устгах]}", - "deleteMessageConfirm": "Та энэ зурвасыг устгахдаа итгэлтэй байна уу?", "deleteMessageDeleted": "{count, plural, one [Мессеж устгагдсан] other [Мессежүүд устгагдсан]}", "deleteMessageDeletedGlobally": "Энэ мессеж устгагдсан", "deleteMessageDeletedLocally": "Энэ мессеж энэ төхөөрөмж дээр устгагдсан", - "deleteMessageDescriptionDevice": "Та энэ зурвасыг зөвхөн энэ төхөөрөмжөөс устгахдаа итгэлтэй байна уу?", "deleteMessageDescriptionEveryone": "Та энэ зурвасыг бүгдэд устгахдаа итгэлтэй байна уу?", "deleteMessageDeviceOnly": "Энэ төхөөрөмжөөс л устгах", "deleteMessageDevicesAll": "Миний бүх төхөөрөмжөөс устгах", "deleteMessageEveryone": "Бүгдийг нь устгах", "deleteMessageFailed": "{count, plural, one [Мессеж устгах амжилтгүй боллоо] other [Мессежүүд устгах амжилтгүй боллоо]}", - "deleteMessagesConfirm": "Та эдгээр зурвасуудыг устгахдаа итгэлтэй байна уу?", - "deleteMessagesDescriptionDevice": "Та эдгээр мессежүүдийг зөвхөн энэ төхөөрөмжөөс л устгахыг хүсэж байна уу?", "deleteMessagesDescriptionEveryone": "Та эдгээр мессежүүдийг бүгдэд зориулж устгахыг хүсэж байна уу?", "deleting": "Устгаж байна", "developerToolsToggle": "Хөгжүүлэгчний багаж хэрэгслийг соль", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "{name} болон {count} бусад хүмүүсийг {group_name} руу урьж авахад алдаа гарлаа", "groupInviteFailedTwo": "{name} болон {other_name} хүмүүсийг {group_name} руу урьж авахад алдаа гарлаа", "groupInviteFailedUser": "{name} хүнийг {group_name} руу урьж авахад алдаа гарлаа", - "groupInviteSending": "Урилга илгээж байна", "groupInviteSent": "Урилга илгээгдсэн", "groupInviteSuccessful": "Бүлгийн урилга амжилттай", "groupInviteVersion": "Хэрэглэгчид урилга хүлээн авахын тулд хамгийн сүүлийн хувилбар байх хэрэгтэй", diff --git a/_locales/ms/messages.json b/_locales/ms/messages.json index 8bf0207a7e..c7e0f5761a 100644 --- a/_locales/ms/messages.json +++ b/_locales/ms/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} dikeluarkan sebagai Admin.", "adminRemovedUserMultiple": "{name} dan {count} lainnya dikeluarkan sebagai Admin.", "adminRemovedUserOther": "{name} dan {other_name} dikeluarkan sebagai Admin.", - "adminSendingPromotion": "Menghantar promosi admin", "adminSettings": "Tetapan Pentadbir", "adminTwoPromotedToAdmin": "{name} dan {other_name} dinaikkan ke Admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Gagal Mengemas Kini Kumpulan", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Anda tidak mempunyai kebenaran untuk memadam mesej orang lain", "deleteMessage": "{count, plural, other [Padam Mesej]}", - "deleteMessageConfirm": "Adakah anda yakin anda mahu memadamkan mesej ini?", "deleteMessageDeleted": "{count, plural, other [Mesej dipadam]}", "deleteMessageDeletedGlobally": "Mesej ini telah dipadam", "deleteMessageDeletedLocally": "Mesej ini telah dipadam pada peranti ini", - "deleteMessageDescriptionDevice": "Adakah anda yakin anda mahu memadamkan mesej ini hanya dari peranti ini?", "deleteMessageDescriptionEveryone": "Adakah anda yakin anda mahu memadamkan mesej ini untuk semua orang?", "deleteMessageDeviceOnly": "Padam pada peranti ini sahaja", "deleteMessageDevicesAll": "Padam pada semua peranti saya", "deleteMessageEveryone": "Padam untuk semua orang", "deleteMessageFailed": "{count, plural, other [Gagal untuk memadam mesej]}", - "deleteMessagesConfirm": "Adakah anda yakin anda mahu memadamkan mesej-mesej ini?", - "deleteMessagesDescriptionDevice": "Adakah anda pasti mahu memadamkan mesej ini daripada peranti ini sahaja?", "deleteMessagesDescriptionEveryone": "Adakah anda pasti mahu memadamkan mesej ini untuk semua orang?", "deleting": "Memadam", "developerToolsToggle": "Togol Alat Pembangun", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Gagal menjemput {name} dan {count} lain ke {group_name}", "groupInviteFailedTwo": "Gagal menjemput {name} dan {other_name} ke {group_name}", "groupInviteFailedUser": "Gagal menjemput {name} ke {group_name}", - "groupInviteSending": "Menghantar jemputan", "groupInviteSent": "Jemputan dihantar", "groupInviteSuccessful": "Jemputan kumpulan berjaya", "groupInviteVersion": "Pengguna mesti mempunyai keluaran terkini untuk menerima jemputan", diff --git a/_locales/my/messages.json b/_locales/my/messages.json index 2cb3978a23..ab9cf34242 100644 --- a/_locales/my/messages.json +++ b/_locales/my/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} ကို အုပ်ချုပ်ရေးမှူးအဖြစ်မှ ဖယ်ရှားခဲ့သည်။", "adminRemovedUserMultiple": "{name} နှင့် {count} ဦး အုပ်ချုပ်ရေးမှူးအဖြစ် တန်းမြင့်နေသည်။", "adminRemovedUserOther": "{name}နှင့် {other_name} အုပ်ချုပ်ရေးမှူးအဖြစ် တန်းမြင့်နေသည်။", - "adminSendingPromotion": "အုပ်ချုပ်ရေးမတက္ကသိုလ် သတင်းပေးမည်", "adminSettings": "Admin ဆက်တင်များ", "adminTwoPromotedToAdmin": "{name} နှင့် {other_name} အုပ်ချုပ်ရေးမှူး အဖြစ်တိုးတက်လာသည်။", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "အုပ်စုအား အပ်ဒိတ်မလုပ်နိုင်ပါ", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "သင်သည် အခြားလူများ၏ မက်ဆေ့ချ်များ ဖျက်ပစ်ရန် ခွင့်မရှိပါ", "deleteMessage": "{count, plural, other [မက်ဆေ့ချ် ဖျက်မည်]}", - "deleteMessageConfirm": "ဤမက်ဆေ့ချ်ကို ဖျက်လိုသည်မှာ သေချာပါသလား။", "deleteMessageDeleted": "{count, plural, other [မက်ဆေ့ချ်များ ဖျက်ထားသည်]}", "deleteMessageDeletedGlobally": "ဤမက်ဆေ့ခ်ျကို ဖျက်သိမ်းပြီးပါပြီ။", "deleteMessageDeletedLocally": "ဤမက်ဆေ့ခ်ျကို ဤကိရိယာတွင် ဖျက်သိမ်းပြီးပါပြီ။", - "deleteMessageDescriptionDevice": "ဤမက်ဆေ့ချ်ကို ဤစက်ကိရိယာမှသာ ဖျက်လိုသည်မှာ သေချာပါသလား။", "deleteMessageDescriptionEveryone": "ဤမက်ဆေ့ချ်ကို အားလုံးအတွက်ဖျက်လိုသည်မှာ သေချာပါသလား။", "deleteMessageDeviceOnly": "ဤ deviceတွင်သာ ဖျက်မည်", "deleteMessageDevicesAll": "ကျွန်ုပ်၏ devices များတွင်အားလုံးကို ဖျက်မည်", "deleteMessageEveryone": "အားလုံးအတွက် ဖျက်မည်", "deleteMessageFailed": "{count, plural, other [မက်ဆေ့ခ်ျဖျက်ရန် မအောင်မြင်ပါ]}", - "deleteMessagesConfirm": "ဤမက်ဆေ့ချ်များကို ဖျက်လိုသည်မှာ သေချာပါသလား။", - "deleteMessagesDescriptionDevice": "ဤစက်ကိရိယာ မှသာ မက်ဆေ့ချ်များဖျက်လိုပါသလား။", "deleteMessagesDescriptionEveryone": "မက်ဆေ့ဂျ်တွေ အားလုံး ကိုဖျက်လိုပါသလား?", "deleting": "ဖျက်နေသည်", "developerToolsToggle": "အဖွဲ့အတွက် ထုတ်ဖော် အခြေအနေ တွင် Developer Tools ကို ခလုတ်ဖွင့်ပါ။", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "အဖွဲ့ {group_name} သို့ {name} နှင့် {count} ဦးကိုဖိတ်ချက်ပေးမည်သည် မအောင်မြင်ပါ", "groupInviteFailedTwo": "အဖွဲ့ {group_name} သို့ {name} နှင့် {other_name} ကိုဖိတ်ချက်ပေးမည်သည် မအောင်မြင်ပါ", "groupInviteFailedUser": "အဖွဲ့ {group_name} သို့ {name} ကိုဖိတ်ချက်ပေးမည်သည် မအောင်မြင်ပါ", - "groupInviteSending": "ဖိတ်ကြားချက် ပို့နေသည်", "groupInviteSent": "ဖိတ်ကြားမှု ပို့ထားပါသည်", "groupInviteSuccessful": "အုပ်စုဖိတ်ကြားမှုအောင်မြင်", "groupInviteVersion": "ဖိတ်ကြားပေးရန်အတွက် အသုံးပြုသူများသည် နောက်ဆုံးထွက်ရှိပါ", diff --git a/_locales/nb/messages.json b/_locales/nb/messages.json index 4e7f47811e..61851ab2c1 100644 --- a/_locales/nb/messages.json +++ b/_locales/nb/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} ble fjernet som Admin.", "adminRemovedUserMultiple": "{name} og {count} andre ble fjernet som Admin.", "adminRemovedUserOther": "{name} og {other_name} ble fjernet som Admin.", - "adminSendingPromotion": "Sender adminpromotering", "adminSettings": "Admin Innstillinger", "adminTwoPromotedToAdmin": "{name} og {other_name} ble forfremmet til Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Kunne ikke oppdatere gruppen", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Du har ikke tillatelse til å slette andres beskjeder", "deleteMessage": "{count, plural, one [Slett melding] other [Slett meldinger]}", - "deleteMessageConfirm": "Er du sikker på at du vil slette denne meldingen?", "deleteMessageDeleted": "{count, plural, one [Melding slettet] other [Meldinger slettet]}", "deleteMessageDeletedGlobally": "Denne meldingen har blitt slettet", "deleteMessageDeletedLocally": "Denne meldingen ble slettet på denne enheten", - "deleteMessageDescriptionDevice": "Er du sikker på at du vil slette denne meldingen kun fra denne enheten?", "deleteMessageDescriptionEveryone": "Er du sikker på at du vil slette denne meldingen for alle?", "deleteMessageDeviceOnly": "Slett kun på denne enheten", "deleteMessageDevicesAll": "Slett på alle enheter", "deleteMessageEveryone": "Slett hos alle", "deleteMessageFailed": "{count, plural, one [Kunne ikke slette meldingen] other [Kunne ikke slette meldinger]}", - "deleteMessagesConfirm": "Er du sikker på at du vil slette disse meldingene?", - "deleteMessagesDescriptionDevice": "Er du sikker på at du vil slette disse meldingene fra bare denne enheten?", "deleteMessagesDescriptionEveryone": "Er du sikker på at du vil slette disse meldingene for alle?", "deleting": "Sletter", "developerToolsToggle": "Skru av/på Utviklerverktøy", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Kunne ikke invitere {name} og {count} andre til {group_name}", "groupInviteFailedTwo": "Kunne ikke invitere {name} og {other_name} til {group_name}", "groupInviteFailedUser": "Kunne ikke invitere {name} til {group_name}", - "groupInviteSending": "Sender innbydelse", "groupInviteSent": "Invitasjon sendt", "groupInviteSuccessful": "Gruppeinvitasjonen vellykket", "groupInviteVersion": "Brukere må ha den nyeste versjonen for å motta invitasjoner", diff --git a/_locales/ne/messages.json b/_locales/ne/messages.json index cc63e7ffc9..e32bdc041e 100644 --- a/_locales/ne/messages.json +++ b/_locales/ne/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name}लाई Admin बाट हटाइएको थियो।.", "adminRemovedUserMultiple": "{name} र {count} अन्यलाई प्रशासकबाट हटाइयो।", "adminRemovedUserOther": "{name} र {other_name}लाईप्रशासकबाट हटाइयो।", - "adminSendingPromotion": "प्रशासन प्रमोशन पठाउने", "adminSettings": "प्रशासक सेटिङहरू", "adminTwoPromotedToAdmin": "{name} र {other_name}लाई Admin मा बढुवा गरियो।.", "andMore": "+{count}", @@ -274,17 +273,13 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "समूह अद्यावधिक गर्न असफल भयो", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "तपाईंलाई अरूसँग सन्देश मेट्नको अनुमति छैन।", "deleteMessage": "{count, plural, one [सन्देशहरू मेट्नुहोस्] other [सन्देशहरू मेट्नुहोस्]}", - "deleteMessageConfirm": "तपाईं यो सन्देश मेटाउन निश्चित हुनुहुन्छ?", "deleteMessageDeletedGlobally": "यो सन्देश मेटिएको थियो।", "deleteMessageDeletedLocally": "यो सन्देश यस उपकरणमा मेटिएको थियो।", - "deleteMessageDescriptionDevice": "तपाईं यो सन्देश यो उपकरणबाट मात्र मेटाउन निश्चित हुनुहुन्छ?", "deleteMessageDescriptionEveryone": "तपाईं यो सन्देश सबैलाई मेटाउन निश्चित हुनुहुन्छ?", "deleteMessageDeviceOnly": "यो उपकरणमा मात्र मेटाउनुहोस्", "deleteMessageDevicesAll": "मेरो सबै उपकरणमा मेटाउनुहोस्", "deleteMessageEveryone": "सर्वजनका लागि मेटाउनुहोस्", "deleteMessageFailed": "{count, plural, one [सन्देश मेट्न असफल भयो।] other [सन्देशहरू मेट्न असफल भयो।]}", - "deleteMessagesConfirm": "तपाईं यी सन्देशहरू मेटाउन निश्चित हुनुहुन्छ?", - "deleteMessagesDescriptionDevice": "के तपाई पक्का हुनुहुन्छ कि तपाई यी सन्देशहरू यो उपकरणबाट मात्र मेटाउन चाहनुहुन्छ?", "deleteMessagesDescriptionEveryone": "के तपाई पक्का हुनुहुन्छ कि तपाई यी सन्देशहरू सबैको लागि मेटाउन चाहनुहुन्छ?", "deleting": "मेटाइएको बेला", "developerToolsToggle": "डेभलपर उपकरणहरू टगल गर्नुहोस्", @@ -388,7 +383,6 @@ "groupInviteFailedMultiple": "{name} र {count} अरूलाई {group_name} मा आमन्त्रित गर्न असफल भयो।", "groupInviteFailedTwo": "{name} र {other_name} लाई {group_name} मा आमन्त्रित गर्न असफल भयो।", "groupInviteFailedUser": "{name} लाई {group_name} मा आमन्त्रित गर्न असफल भयो।", - "groupInviteSending": "निमन्त्रणा पठाउँदै", "groupInviteSent": "निमन्त्रणा पठाइयो", "groupInviteSuccessful": "समूह निमन्त्रणा सफल", "groupInviteVersion": "प्रयोगकर्ताहरूले निमन्त्रणाहरू प्राप्त गर्नका लागि सबैभन्दा हालको रिलीज हुनु आवश्यक छ", diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json index f8b4d942e7..3fad75ef77 100644 --- a/_locales/nl/messages.json +++ b/_locales/nl/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} is verwijderd als Admin.", "adminRemovedUserMultiple": "{name} en {count} anderen zijn verwijderd als beheerder.", "adminRemovedUserOther": "{name} en {other_name} zijn verwijderd als beheerder.", - "adminSendingPromotion": "Beheerder promotie versturen", "adminSettings": "Admin instellingen", "adminTwoPromotedToAdmin": "{name} en {other_name} zijn gepromoveerd tot Admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Het is mislukt om de groep bij te werken", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Je hebt geen toestemming om andermans berichten te verwijderen", "deleteMessage": "{count, plural, one [Verwijder bericht] other [Verwijder berichten]}", - "deleteMessageConfirm": "Weet u zeker dat u dit bericht wilt verwijderen?", "deleteMessageDeleted": "{count, plural, one [Bericht verwijderd] other [Berichten verwijderd]}", "deleteMessageDeletedGlobally": "Dit bericht is verwijderd", "deleteMessageDeletedLocally": "Dit bericht is op dit apparaat verwijderd", - "deleteMessageDescriptionDevice": "Weet u zeker dat u dit bericht alleen van dit apparaat wilt verwijderen?", "deleteMessageDescriptionEveryone": "Weet u zeker dat u dit bericht voor iedereen wilt verwijderen?", "deleteMessageDeviceOnly": "Alleen verwijderen op dit apparaat", "deleteMessageDevicesAll": "Verwijder op al mijn apparaten", "deleteMessageEveryone": "Verwijder voor iedereen", "deleteMessageFailed": "{count, plural, one [Bericht verwijderen mislukt] other [Berichten verwijderen mislukt]}", - "deleteMessagesConfirm": "Weet u zeker dat u deze berichten wilt verwijderen?", - "deleteMessagesDescriptionDevice": "Weet u zeker dat u deze berichten alleen van dit apparaat wilt wissen?", "deleteMessagesDescriptionEveryone": "Weet u zeker dat u deze berichten voor iedereen wilt wissen?", "deleting": "Aan het verwijderen", "developerToolsToggle": "Ontwikkelopties weergeven", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Het uitnodigen van {name} en {count} anderen naar {group_name} is mislukt", "groupInviteFailedTwo": "Het uitnodigen van {name} en {other_name} naar {group_name} is mislukt", "groupInviteFailedUser": "Het uitnodigen van {name} naar {group_name} is mislukt", - "groupInviteSending": "Uitnodiging versturen", "groupInviteSent": "Uitnodiging verzonden", "groupInviteSuccessful": "Groepsuitnodiging succesvol", "groupInviteVersion": "Gebruikers moeten de nieuwste versie hebben om uitnodigingen te ontvangen", diff --git a/_locales/nn/messages.json b/_locales/nn/messages.json index 08f242b487..9bd7b05efe 100644 --- a/_locales/nn/messages.json +++ b/_locales/nn/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} vart fjerna som admin.", "adminRemovedUserMultiple": "{name} og {count} andre vart fjerna som Admin.", "adminRemovedUserOther": "{name} og {other_name} vart fjerna som Admin.", - "adminSendingPromotion": "Sender admin promotering", "adminSettings": "Administratorinnstillingar", "adminTwoPromotedToAdmin": "{name} og {other_name} vart promoterte til admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Klarte ikkje å oppdatera gruppa", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Du har ikke tillatelse til å slette andres beskjeder", "deleteMessage": "{count, plural, one [Slett beskjed] other [Slett beskjeder]}", - "deleteMessageConfirm": "Er du sikker på at du ønskjer å slette denne meldinga?", "deleteMessageDeleted": "{count, plural, one [Beskjed slettet] other [Beskjeder slettet]}", "deleteMessageDeletedGlobally": "Denne meldingen har blitt slettet", "deleteMessageDeletedLocally": "Denne meldingen ble slettet på denne enheten", - "deleteMessageDescriptionDevice": "Er du sikker på at du ønskjer å slette denne meldinga frå berre denne eininga?", "deleteMessageDescriptionEveryone": "Er du sikker på at du ønskjer å slette denne meldinga for alle?", "deleteMessageDeviceOnly": "Slett berre på denne eininga", "deleteMessageDevicesAll": "Slett på alle einingane mine", "deleteMessageEveryone": "Slett for alle", "deleteMessageFailed": "{count, plural, one [Klarte ikkje sletta meldinga] other [Klarte ikkje sletta meldingane]}", - "deleteMessagesConfirm": "Er du sikker på at du ønskjer å slette desse meldingane?", - "deleteMessagesDescriptionDevice": "Er du sikker på at du vil slette desse meldingane frå berre denne eininga?", "deleteMessagesDescriptionEveryone": "Er du sikker på at du vil slette desse meldingane for alle?", "deleting": "Slettar", "developerToolsToggle": "Skru av/på Utviklerverktøy", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Klarte ikkje invitera {name} og {count} andre til {group_name}", "groupInviteFailedTwo": "Klarte ikkje invitera {name} og {other_name} til {group_name}", "groupInviteFailedUser": "Klarte ikkje invitera {name} til {group_name}", - "groupInviteSending": "Sender invitasjon", "groupInviteSent": "Invitasjon sendt", "groupInviteSuccessful": "Gruppeinnbydelse var vellukka", "groupInviteVersion": "Brukarar må ha den nyaste versjonen for å ta imot invitasjonar", diff --git a/_locales/no/messages.json b/_locales/no/messages.json index f530d72232..9e8a9c5815 100644 --- a/_locales/no/messages.json +++ b/_locales/no/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} ble fjernet som Admin.", "adminRemovedUserMultiple": "{name} og {count} andre ble fjernet som Admin.", "adminRemovedUserOther": "{name} og {other_name} ble fjernet som Admin.", - "adminSendingPromotion": "Sender admin-forfremmelse", "adminSettings": "Admin-innstillinger", "adminTwoPromotedToAdmin": "{name} og {other_name} ble forfremmet til Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Kunne ikke oppdatere gruppen", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Du har ikke tillatelse til å slette andres beskjeder", "deleteMessage": "{count, plural, one [Slett melding] other [Slett meldinger]}", - "deleteMessageConfirm": "Er du sikker på at du ønsker å slette denne meldingen?", "deleteMessageDeleted": "{count, plural, one [Beskjed slettet] other [Beskjeder slettet]}", "deleteMessageDeletedGlobally": "Denne meldingen er slettet", "deleteMessageDeletedLocally": "Denne meldingen ble slettet på denne enheten", - "deleteMessageDescriptionDevice": "Er du sikker på at du ønsker å slette denne meldingen kun fra denne enheten?", "deleteMessageDescriptionEveryone": "Er du sikker på at du ønsker å slette denne meldingen for alle?", "deleteMessageDeviceOnly": "Slett bare på denne enheten", "deleteMessageDevicesAll": "Slett på alle mine enheter", "deleteMessageEveryone": "Slett for alle", "deleteMessageFailed": "{count, plural, one [Klarte ikke å slette melding] other [Klarte ikke å slette meldinger]}", - "deleteMessagesConfirm": "Er du sikker på at du ønsker å slette disse meldingene?", - "deleteMessagesDescriptionDevice": "Er du sikker på at du vil slette disse meldingene kun fra denne enheten?", "deleteMessagesDescriptionEveryone": "Er du sikker på at du vil slette disse meldingene for alle?", "deleting": "Sletter", "developerToolsToggle": "Veksle utviklerverktøy", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Kunne ikke invitere {name} og {count} andre til {group_name}", "groupInviteFailedTwo": "Kunne ikke invitere {name} og {other_name} til {group_name}", "groupInviteFailedUser": "Kunne ikke invitere {name} til {group_name}", - "groupInviteSending": "Sender invitasjon", "groupInviteSent": "Invitasjon sendt", "groupInviteSuccessful": "Gruppeinvitasjon vellykket", "groupInviteVersion": "Brukere må ha den nyeste versjonen for å motta invitasjoner", diff --git a/_locales/ny/messages.json b/_locales/ny/messages.json index 2b6be62590..8d2ceac2d8 100644 --- a/_locales/ny/messages.json +++ b/_locales/ny/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} achotsedwa monga Admin.", "adminRemovedUserMultiple": "{name} ndi {count} ena adachotsedwa monga Admin.", "adminRemovedUserOther": "{name} ndi {other_name} adachotsedwa monga Admin.", - "adminSendingPromotion": "Sending admin promotion", "adminSettings": "Zokonda za Boma", "adminTwoPromotedToAdmin": "{name} ndi {other_name} akwezedwa kukhala Admin.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Zalephera Kusintha Gulu", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Simuli ndi chilolezo chothetsa mauthenga ena", "deleteMessage": "{count, plural, one [Chotsani Uthenga] other [Chotsani Mauthenga]}", - "deleteMessageConfirm": "Mukutsimikizika kuti mukufuna kufufuta uthenga umenewu?", "deleteMessageDeleted": "{count, plural, one [Uthenga wachotsedwa] other [Mauthenga omwe achotsedwa]}", "deleteMessageDeletedGlobally": "Uthengawu unachotsedwa", "deleteMessageDeletedLocally": "Uthengawu unachotsedwa pa chipangizochi", - "deleteMessageDescriptionDevice": "Mukutsimikizika kuti mukufuna kufufuta uthenga umenewu pa chipangizo ichi chokha?", "deleteMessageDescriptionEveryone": "Mukutsimikizika kuti mukufuna kufufuta uthenga umenewu kwa aliyense?", "deleteMessageDeviceOnly": "Chotsani pa chida ichi chokha", "deleteMessageDevicesAll": "Chotsani pa zida zanga zonse", "deleteMessageEveryone": "Chotsani kwa aliyense", "deleteMessageFailed": "{count, plural, one [Zalephera kuchotsa uthenga] other [Zalephera kuchotsa mauthenga]}", - "deleteMessagesConfirm": "Mukutsimikizika kuti mukufuna kufufuta uthenga umenewu?", - "deleteMessagesDescriptionDevice": "Mukutsimikiza kuti mukufuna kufufuta mauthenga awa kuchokera pa chipangizochi chokha?", "deleteMessagesDescriptionEveryone": "Mukutsimikiza kuti mukufuna kufufuta mauthenga awa kwa aliyense?", "deleting": "Kuchotsa", "developerToolsToggle": "Sinthanani Zida Zopanga", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Zalephera kuyitana {name} ndi {count} ena kupita ku {group_name}", "groupInviteFailedTwo": "Zalephera kuyitana {name} ndi {other_name} kupita ku {group_name}", "groupInviteFailedUser": "Zalephera kuyitana {name} kupita ku {group_name}", - "groupInviteSending": "Sending invite", "groupInviteSent": "Kayachina Yatumidwa", "groupInviteSuccessful": "Kuitana kwa gulu kwakwaniritsidwa", "groupInviteVersion": "Ogwiritsa asanalembe mtundu watsopano kuti alandire maitanidwe", diff --git a/_locales/pa/messages.json b/_locales/pa/messages.json index ba9bf85657..03216df372 100644 --- a/_locales/pa/messages.json +++ b/_locales/pa/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name}ਨੂੰ ਪ੍ਰਸ਼ਾਸਕ ਵਜੋਂ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।", "adminRemovedUserMultiple": "{name} ਅਤੇ {count} ਹੋਰ ਨੂੰ ਐਡਮਿਨ ਤੋਂ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।", "adminRemovedUserOther": "{name} ਤੇ {other_name} ਨੂੰ ਐਡਮਿਨ ਤੋਂ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।", - "adminSendingPromotion": "ਐਡਮਿਨ ਪ੍ਰੋਮੋਸ਼ਨ ਭੇਜ ਰਿਹਾ ਹੈ", "adminSettings": "ਸੰਚਾਲਕ ਸੈਟਿੰਗਜ਼", "adminTwoPromotedToAdmin": "{name}ਅਤੇ{other_name}ਨੂੰ ਪ੍ਰਸ਼ਾਸਕ ਬਣਾ ਦਿੱਤਾ ਗਿਆ ਹੈ।", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "ਗਰੁੱਪ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਵਿੱਚ ਨਾਕਾਮ", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "ਤੁਹਾਨੂੰ ਦੂਜਿਆਂ ਦੇ ਸਨੇਹੇ ਮਿਟਾਉਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।", "deleteMessage": "{count, plural, one [ਸੁਨੇਹਾ ਮਿਟਾਓ] other [ਸੁਨੇਹੇ ਮਿਟਾਓ]}", - "deleteMessageConfirm": "ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਹ ਸੁਨੇਹਾ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?", "deleteMessageDeleted": "{count, plural, one [ਸੁਨੇਹਾ ਹਟਾਇਆ ਗਿਆ] other [ਸੁਨੇਹੇ ਹਟਾਏ ਗਏ]}", "deleteMessageDeletedGlobally": "ਇਹ ਸੁਨੇਹਾ ਮਿਟਾਇਆ ਗਿਆ", "deleteMessageDeletedLocally": "ਇਹ ਸੁਨੇਹਾ ਇਸ ਡਿਵਾਈਸ ਤੇ ਮਿਟਾਇਆ ਗਿਆ", - "deleteMessageDescriptionDevice": "ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਹ ਸੁਨੇਹਾ ਸਿਰਫ਼ ਇਸ ਜੰਤਰ ਤੋਂ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?", "deleteMessageDescriptionEveryone": "ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਹ ਸੁਨੇਹਾ ਸਭ ਲਈ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?", "deleteMessageDeviceOnly": "ਸਿਰਫ ਇਸ ਯੰਤਰ ਤੇ ਹਟਾਓ", "deleteMessageDevicesAll": "ਮੇਰੇ ਸਾਰੇ ਯੰਤਰਾਂ ਤੇ ਹਟਾਓ", "deleteMessageEveryone": "ਸਭ ਲਈ ਹਟਾਓ", "deleteMessageFailed": "{count, plural, one [ਸੁਨੇਹਾ ਮਿਟਾਉਣ ਵਿੱਚ ਅਸਫਲ] other [ਸੁਨੇਹੇ ਮਿਟਾਉਣ ਵਿੱਚ ਅਸਫਲ]}", - "deleteMessagesConfirm": "ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਹਨਾਂ ਸੁਨੇਹਿਆਂ ਨੂੰ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?", - "deleteMessagesDescriptionDevice": "ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਹ ਸੁਨੇਹੇ ਸਿਰਫ਼ ਇਸ ਸੰਦ ਤੋਂ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?", "deleteMessagesDescriptionEveryone": "ਕੀ ਤੁਸੀਂ ਯਕੀਨਨ ਇਹ ਸੁਨੇਹੇ ਸਾਰੇ ਲਈ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?", "deleting": "ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ", "developerToolsToggle": "ਡਿਵੈਲਪਰ ਟੂਲਜ਼ ਅਨਲਾਕ ਕਰੋ", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "{name} ਅਤੇ {count} ਹੋਰਾਂ ਨੂੰ {group_name} ਤੇ ਸੱਦਾ ਦੇਣ ਵਿੱਚ ਅਸਫਲ", "groupInviteFailedTwo": "{name} ਅਤੇ {other_name} ਨੂੰ {group_name} ਤੇ ਸੱਦਾ ਦੇਣ ਵਿੱਚ ਅਸਫਲ ਹੋਇਆ", "groupInviteFailedUser": "{name} ਨੂੰ {group_name} ਤੇ ਸੱਦਾ ਦੇਣ ਵਿੱਚ ਅਸਫਲ", - "groupInviteSending": "ਨਿਮਿੰਤਰਣ ਭੇਜ ਰਿਹਾ ਹੈ", "groupInviteSent": "ਸੱਦਾ ਭੇਜਿਆ", "groupInviteSuccessful": "ਗਰੁੱਪ ਨਿਮੰਤ੍ਰਣ ਸਫਲ", "groupInviteVersion": "ਨਿਮੰਤਰਣ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਉਪਭੋਗਤਾਵਾਂ ਕੋਲ ਸਭ ਤੋਂ ਨਵਾਂ ਰਿਲੀਜ਼ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।", diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json index 46062e25dc..8924039f87 100644 --- a/_locales/pl/messages.json +++ b/_locales/pl/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "\"Usunięto z roli administratora: {name}", "adminRemovedUserMultiple": "{name} i {count} innych użytkowników nie są już administratorami.", "adminRemovedUserOther": "Użytkownicy {name} i {other_name} nie są już administratorami.", - "adminSendingPromotion": "Wysyłanie awansu na administratora", "adminSettings": "Ustawienia administratora", "adminTwoPromotedToAdmin": "Użytkownicy {name} i {other_name} zostali administratorami.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Nie udało się zaktualizować grupy", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Nie masz uprawnień do usuwania wiadomości innych osób", "deleteMessage": "{count, plural, one [Usuń wiadomość] few [Usuń wiadomości] many [Usuń wiadomości] other [Usuń wiadomości]}", - "deleteMessageConfirm": "Czy na pewno chcesz usunąć tę wiadomość?", "deleteMessageDeleted": "{count, plural, one [Wiadomość usunięta] few [Usunięto wiadomości] many [Usunięto wiadomości] other [Usunięto wiadomości]}", "deleteMessageDeletedGlobally": "Wiadomość została usunięta", "deleteMessageDeletedLocally": "Wiadomość została usunięta na tym urządzeniu", - "deleteMessageDescriptionDevice": "Czy na pewno chcesz usunąć tę wiadomość tylko z tego urządzenia?", "deleteMessageDescriptionEveryone": "Czy na pewno chcesz usunąć tę wiadomość u wszystkich?", "deleteMessageDeviceOnly": "Usuń tylko na tym urządzeniu", "deleteMessageDevicesAll": "Usuń na wszystkich moich urządzeniach", "deleteMessageEveryone": "Usuń u wszystkich", "deleteMessageFailed": "{count, plural, one [Nie udało się usunąć wiadomości] few [Nie udało się usunąć wiadomości] many [Nie udało się usunąć wiadomości] other [Nie udało się usunąć wiadomości]}", - "deleteMessagesConfirm": "Czy na pewno chcesz usunąć te wiadomości?", - "deleteMessagesDescriptionDevice": "Czy na pewno chcesz usunąć te wiadomości tylko z tego urządzenia?", "deleteMessagesDescriptionEveryone": "Czy na pewno chcesz usunąć te wiadomości u wszystkich?", "deleting": "Usuwanie", "developerToolsToggle": "Narzędzia dla programistów", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Nie udało się zaprosić użytkownika {name} i {count} innych użytkowników do grupy {group_name}", "groupInviteFailedTwo": "Nie udało się zaprosić użytkowników {name} i {other_name} do grupy {group_name}", "groupInviteFailedUser": "Nie udało się zaprosić użytkownika {name} do grupy {group_name}", - "groupInviteSending": "Wysyłanie zaproszenia", "groupInviteSent": "Zaproszenie zostało wysłane", "groupInviteSuccessful": "Zaproszenie do grupy zakończone sukcesem", "groupInviteVersion": "Aby otrzymywać zaproszenia, użytkownicy muszą mieć najnowszą wersję", diff --git a/_locales/ps/messages.json b/_locales/ps/messages.json index d0ff04881b..3c8a0f9cdb 100644 --- a/_locales/ps/messages.json +++ b/_locales/ps/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} د اډمین په توګه لرې کړل شوی.", "adminRemovedUserMultiple": "{name} او {count} نور د ایډمین څخه لرې کړل شوی دی.", "adminRemovedUserOther": "{name} او {other_name} د ایډمین څخه لرې کړل شوی دی.", - "adminSendingPromotion": "د مدیر پرمختګ لیږل", "adminSettings": "د اډمین تنظیمات", "adminTwoPromotedToAdmin": "{name} او {other_name} مدیر ته وده ورکړه.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "ګروپ تازه کولو کې پاتې راغی", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "تاسو د نورو پیغامونه ړنګولو اجازه نلرئ", "deleteMessage": "{count, plural, one [پیغام ړنګول] other [پیغامونه ړنګول]}", - "deleteMessageConfirm": "آیا تاسو ډاډه یاست چې غواړئ دا پیغام حذف کړئ؟", "deleteMessageDeleted": "{count, plural, one [پیغام حذف شوی] other [پیغامونه حذف شوي]}", "deleteMessageDeletedGlobally": "دا پیغام پاک شو", "deleteMessageDeletedLocally": "دا پیغام په دې وسیله په دې ځای کې پاک شو", - "deleteMessageDescriptionDevice": "آیا تاسو ډاډه یاست چې غواړئ دا پیغام یوازې د دې وسیلې څخه حذف کړئ؟", "deleteMessageDescriptionEveryone": "آیا تاسو ډاډه یاست چې غواړئ دا پیغام د ټولو لپاره حذف کړئ؟", "deleteMessageDeviceOnly": "یوازې په دې وسیله ړنګ کړئ", "deleteMessageDevicesAll": "په ټولو زما وسایلو کې ړنګ کړئ", "deleteMessageEveryone": "د ټولو لپاره ړنګ کړئ", "deleteMessageFailed": "{count, plural, one [پیغام حذف ناکام شو] other [پیغامونه حذف ناکام شول]}", - "deleteMessagesConfirm": "آیا تاسو ډاډه یاست چې غواړئ دا پیغامونه حذف کړئ؟", - "deleteMessagesDescriptionDevice": "ته ډاډه يې چې دا پیغامونه یوازې له دې وسیلې څخه حذفول غواړې؟", "deleteMessagesDescriptionEveryone": "ته ډاډه يې چې دا پیغامونه د ټولو لپاره حذفول غواړې؟", "deleting": "ښکته کول", "developerToolsToggle": "ډېوېلپر وسیلې ټوګل کړئ", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "د {name} او نورو {count} بلنه ناکامه شوه چې {group_name} ته ګډون وکړي", "groupInviteFailedTwo": "د {name} او {other_name} بلنه ناکامه شوه چې {group_name} ته ګډون وکړي", "groupInviteFailedUser": "د {name} بلنه ناکامه شوه چې {group_name} ته ګډون وکړي", - "groupInviteSending": "بلنه لیږل", "groupInviteSent": "بلنه واستول شوه", "groupInviteSuccessful": "د ډلې بلنه بریالۍ", "groupInviteVersion": "کارنان باید وروستۍ نسخه ولري ترڅو بلنې ترلاسه کړي", diff --git a/_locales/pt-BR/messages.json b/_locales/pt-BR/messages.json index 2e9ce05c51..a123f7bf4a 100644 --- a/_locales/pt-BR/messages.json +++ b/_locales/pt-BR/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} foi removido como Administrador.", "adminRemovedUserMultiple": "{name} e {count} outros foram removidos como Admin.", "adminRemovedUserOther": "{name} e {other_name} foram removidos como Admin.", - "adminSendingPromotion": "Enviando promoção do administrador", "adminSettings": "Configurações do Administrador", "adminTwoPromotedToAdmin": "{name} e {other_name} foram promovidos a Administrador.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Falha ao atualizar o grupo", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Você não tem permissão para excluir as mensagens de outros", "deleteMessage": "{count, plural, one [Excluir Mensagem] other [Excluir mensagens]}", - "deleteMessageConfirm": "Você tem certeza que deseja excluir esta mensagem?", "deleteMessageDeleted": "{count, plural, one [Mensagem excluída] other [Mensagens excluídas]}", "deleteMessageDeletedGlobally": "Essa mensagem foi deletada", "deleteMessageDeletedLocally": "Esta mensagem foi deletada neste dispositivo", - "deleteMessageDescriptionDevice": "Você tem certeza que deseja excluir esta mensagem apenas deste dispositivo?", "deleteMessageDescriptionEveryone": "Você tem certeza que deseja excluir esta mensagem para todos?", "deleteMessageDeviceOnly": "Excluir apenas neste dispositivo", "deleteMessageDevicesAll": "Excluir em todos os meus dispositivos", "deleteMessageEveryone": "Excluir para todos", "deleteMessageFailed": "{count, plural, one [Falha ao deletar mensagem] other [Falha ao deletar mensagens]}", - "deleteMessagesConfirm": "Você tem certeza que deseja excluir estas mensagens?", - "deleteMessagesDescriptionDevice": "Tem certeza de que deseja excluir essas mensagens apenas deste dispositivo?", "deleteMessagesDescriptionEveryone": "Tem certeza de que deseja excluir essas mensagens para todos?", "deleting": "Deletando", "developerToolsToggle": "Ferramentas de desenvolvimento", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Falha ao convidar {name} e {count} outros para {group_name}", "groupInviteFailedTwo": "Falha ao convidar {name} e {other_name} para {group_name}", "groupInviteFailedUser": "Falha ao convidar {name} para {group_name}", - "groupInviteSending": "Enviando convite", "groupInviteSent": "Convite enviado", "groupInviteSuccessful": "Convite para grupo bem-sucedido", "groupInviteVersion": "Usuários devem ter a versão mais recente para receber convites", diff --git a/_locales/pt-PT/messages.json b/_locales/pt-PT/messages.json index 524cdd1264..f6e261aa43 100644 --- a/_locales/pt-PT/messages.json +++ b/_locales/pt-PT/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} foi removido(a) como Admin.", "adminRemovedUserMultiple": "{name} e {count} outros foram removidos de Admin.", "adminRemovedUserOther": "{name} e {other_name} foram removidos de Admin.", - "adminSendingPromotion": "A enviar promoção de administrador", "adminSettings": "Definições Admin", "adminTwoPromotedToAdmin": "{name} e {other_name} foram promovidos a Admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Falha ao Atualizar Grupo", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Você não tem permissão para eliminar mensagens de outros", "deleteMessage": "{count, plural, one [Eliminar Mensagem] other [Eliminar Mensagens]}", - "deleteMessageConfirm": "Tem certeza de que deseja apagar esta mensagem?", "deleteMessageDeleted": "{count, plural, one [Mensagem eliminada] other [Mensagens eliminadas]}", "deleteMessageDeletedGlobally": "Esta mensagem foi apagada", "deleteMessageDeletedLocally": "Esta mensagem foi apagada neste dispositivo", - "deleteMessageDescriptionDevice": "Tem certeza de que deseja apagar esta mensagem apenas deste dispositivo?", "deleteMessageDescriptionEveryone": "Tem certeza de que deseja eliminar esta mensagem para todos?", "deleteMessageDeviceOnly": "Apagar apenas neste dispositivo", "deleteMessageDevicesAll": "Eliminar de todos os meus dispositivos", "deleteMessageEveryone": "Apagar para todos", "deleteMessageFailed": "{count, plural, one [Falha ao eliminar mensagem] other [Falha ao eliminar mensagens]}", - "deleteMessagesConfirm": "Tem certeza de que deseja apagar essas mensagens?", - "deleteMessagesDescriptionDevice": "Tem a certeza que pretende eliminar estas mensagens apenas deste dispositivo?", "deleteMessagesDescriptionEveryone": "Tem a certeza que pretende eliminar estas mensagens para todos?", "deleting": "A eliminar", "developerToolsToggle": "Ativar ferramentas do programador", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Falha ao convidar {name} e {count} outros para {group_name}", "groupInviteFailedTwo": "Falha ao convidar {name} e {other_name} para {group_name}", "groupInviteFailedUser": "Falha ao convidar {name} para {group_name}", - "groupInviteSending": "Enviando convite", "groupInviteSent": "Convite enviado", "groupInviteSuccessful": "Convite para grupo enviado com sucesso", "groupInviteVersion": "Os utilizadores devem ter a versão mais recente para receber convites", diff --git a/_locales/ro/messages.json b/_locales/ro/messages.json index 39313cb2e4..6c1deffcbd 100644 --- a/_locales/ro/messages.json +++ b/_locales/ro/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} a fost eliminat ca administrator.", "adminRemovedUserMultiple": "{name} și alți {count} au fost eliminați ca administratori.", "adminRemovedUserOther": "{name} și {other_name} au fost eliminați ca administratori.", - "adminSendingPromotion": "Se trimite promovarea la nivel de administrator", "adminSettings": "Setări administrator", "adminTwoPromotedToAdmin": "{name} și {other_name} au fost promovați la nivel de administrator.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Eroare la actualizarea grupului", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Nu aveți permisiunea de a șterge mesajele altora", "deleteMessage": "{count, plural, one [Șterge mesajul] few [Șterge mesajele] other [Șterge mesajele]}", - "deleteMessageConfirm": "Ești sigur/ă că dorești să ștergi acest mesaj?", "deleteMessageDeleted": "{count, plural, one [Mesaj șters] few [Mesaje șterse] other [Mesaje șterse]}", "deleteMessageDeletedGlobally": "Acest mesaj a fost șters.", "deleteMessageDeletedLocally": "Acest mesaj a fost șters pe acest dispozitiv.", - "deleteMessageDescriptionDevice": "Ești sigur/ă că dorești să ștergi acest mesaj doar de pe acest dispozitiv?", "deleteMessageDescriptionEveryone": "Ești sigur/ă că dorești să ștergi acest mesaj pentru toată lumea?", "deleteMessageDeviceOnly": "Șterge doar pe acest dispozitiv", "deleteMessageDevicesAll": "Șterge pe toate dispozitivele mele", "deleteMessageEveryone": "Șterge pentru toată lumea", "deleteMessageFailed": "{count, plural, one [Eroare la ștergerea mesajului] few [Eroare la ștergerea mesajelor] other [Eroare la ștergerea mesajelor]}", - "deleteMessagesConfirm": "Ești sigur/ă că dorești să ștergi aceste mesaje?", - "deleteMessagesDescriptionDevice": "Ești sigur că vrei să ștergi aceste mesaje doar de pe acest dispozitiv?", "deleteMessagesDescriptionEveryone": "Ești sigur că vrei să ștergi aceste mesaje pentru toată lumea?", "deleting": "Se șterge", "developerToolsToggle": "Comutare unelte dezvoltator", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Nu s-a putut invita {name} și {count} alții la {group_name}", "groupInviteFailedTwo": "Nu s-a putut invita {name} și {other_name} la {group_name}", "groupInviteFailedUser": "Nu s-a putut invita {name} la {group_name}", - "groupInviteSending": "Trimitere invitație", "groupInviteSent": "Invitația a fost trimisă", "groupInviteSuccessful": "Invitație grup reușită", "groupInviteVersion": "Utilizatorii trebuie să aibă versiunea cea mai recentă pentru a primi invitații", diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index 78d0c9ef7c..4b44f9e6a4 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} был(а) снят(а) с должности администратора.", "adminRemovedUserMultiple": "{name} и {count} других пользователей были удалены админом.", "adminRemovedUserOther": "Пользователи {name} и {other_name} были удалены админом.", - "adminSendingPromotion": "Изменение статуса до уровня администратора", "adminSettings": "Настройки администратора", "adminTwoPromotedToAdmin": "{name} и {other_name} назначены администраторами.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Ошибка при обновлении группы", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "У вас недостаточно прав для удаления других сообщений", "deleteMessage": "{count, plural, one [Удалить Сообщение] few [Удалить сообщения] many [Удалить сообщения] other [Удалить сообщения]}", - "deleteMessageConfirm": "Вы уверены, что хотите удалить это сообщение?", "deleteMessageDeleted": "{count, plural, one [Сообщение удалено] few [Сообщения удалены] many [Сообщения удалены] other [Сообщения удалены]}", "deleteMessageDeletedGlobally": "Это сообщение было удалено", "deleteMessageDeletedLocally": "Это сообщение было удалено на этом устройстве", - "deleteMessageDescriptionDevice": "Вы уверены, что хотите удалить это сообщение (оно будет удалено только с этого устройства)?", "deleteMessageDescriptionEveryone": "Вы уверены, что хотите удалить это сообщение для всех?", "deleteMessageDeviceOnly": "Удалить только на этом устройстве", "deleteMessageDevicesAll": "Удалить на всех моих устройствах", "deleteMessageEveryone": "Удалить для всех", "deleteMessageFailed": "{count, plural, one [Не удалось удалить сообщение] few [Не удалось удалить сообщения] many [Не удалось удалить сообщения] other [Не удалось удалить сообщения]}", - "deleteMessagesConfirm": "Вы уверены, что хотите удалить эти сообщения?", - "deleteMessagesDescriptionDevice": "Вы уверены, что хотите удалить эти сообщения (они будут удалены только с этого устройства)?", "deleteMessagesDescriptionEveryone": "Вы уверены, что хотите удалить эти сообщения для всех?", "deleting": "Удаление", "developerToolsToggle": "Включить инструменты разработчика", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Не удалось пригласить {name} и {count} других в {group_name}", "groupInviteFailedTwo": "Не удалось пригласить {name} и {other_name} в {group_name}", "groupInviteFailedUser": "Не удалось пригласить {name} в {group_name}", - "groupInviteSending": "Отправка приглашения", "groupInviteSent": "Приглашение отправлено", "groupInviteSuccessful": "Приглашение в группу успешно", "groupInviteVersion": "Пользователи должны иметь последнюю версию приложения для получения приглашений", @@ -494,7 +488,7 @@ "lockAppUnlocked": "Приложение {app_name} разблокировано", "max": "Максимальный", "media": "Медиа", - "members": "{count, plural, one [# участник] few [# участника] many [# участников] other [# участников]}", + "members": "{count, plural, one [# Участник] few [# участника] many [# участников] other [# участников]}", "membersActive": "{count, plural, one [# активный участник] few [# активных участника] many [# активных участников] other [# активных участников]}", "membersAddAccountIdOrOns": "Добавить Account ID или ONS", "membersInvite": "Пригласить друзей в Session", diff --git a/_locales/sh/messages.json b/_locales/sh/messages.json index 052c53063c..36b84bc9c4 100644 --- a/_locales/sh/messages.json +++ b/_locales/sh/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} je uklonjen kao Admin.", "adminRemovedUserMultiple": "{name} i {count} drugih su uklonjeni kao Admin.", "adminRemovedUserOther": "{name} i {other_name} su uklonjeni kao Admin.", - "adminSendingPromotion": "Slanje promaknuća u administratora", "adminSettings": "Postavke Administratora", "adminTwoPromotedToAdmin": "{name} i {other_name} su unaprijeđeni u Admina.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Nije moguće ažurirati grupu", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Nemaš dozvolu da brišeš tuđe poruke", "deleteMessage": "{count, plural, one [Obriši poruku] few [Obriši poruke] many [Obriši poruke] other [Obriši poruke]}", - "deleteMessageConfirm": "Jesi li siguran da želiš obrisati ovu poruku?", "deleteMessageDeleted": "{count, plural, one [Poruka obrisana] few [Poruke obrisane] many [Poruke obrisane] other [Poruke obrisane]}", "deleteMessageDeletedGlobally": "Ova poruka je izbrisana", "deleteMessageDeletedLocally": "Ova poruka je izbrisana na ovom uređaju", - "deleteMessageDescriptionDevice": "Jesi li siguran da želiš obrisati ovu poruku samo sa ovog uređaja?", "deleteMessageDescriptionEveryone": "Jesi li siguran da želiš obrisati ovu poruku za sve?", "deleteMessageDeviceOnly": "Obriši samo na ovom uređaju", "deleteMessageDevicesAll": "Obriši na svim mojim uređajima", "deleteMessageEveryone": "Obriši za sve", "deleteMessageFailed": "{count, plural, one [Brisanje poruke nije uspjelo] few [Brisanje poruka nije uspjelo] many [Brisanje poruka nije uspjelo] other [Brisanje poruka nije uspjelo]}", - "deleteMessagesConfirm": "Jesi li siguran da želiš obrisati ove poruke?", - "deleteMessagesDescriptionDevice": "Jesi li siguran da želiš izbrisati ove poruke samo s ovog uređaja?", "deleteMessagesDescriptionEveryone": "Jesi li siguran da želiš izbrisati ove poruke za sve?", "deleting": "Brisanje", "developerToolsToggle": "Prebaci alate za programere", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Nije uspjelo pozivanje {name} i {count} drugih u {group_name}", "groupInviteFailedTwo": "Nije uspjelo pozivanje {name} i {other_name} u {group_name}", "groupInviteFailedUser": "Nije uspjelo pozivanje {name} u {group_name}", - "groupInviteSending": "Slanje pozivnice", "groupInviteSent": "Poziv poslat", "groupInviteSuccessful": "Pozivnica za grupu je uspješno poslata", "groupInviteVersion": "Korisnici moraju imati najnovije izdanje kako bi primili pozivnice", diff --git a/_locales/si/messages.json b/_locales/si/messages.json index 2a97dca882..ca12d437d6 100644 --- a/_locales/si/messages.json +++ b/_locales/si/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} පරිපාලක ආධිකාරීත්වයෙන් ඉවත් කරන ලදී.", "adminRemovedUserMultiple": "{name} සහ {count} වෙනත් අය පරිපාලක තනතුරින් ඉවත් කරන ලදී.", "adminRemovedUserOther": "{name} සහ {other_name} පරිපාලක තනතුරින් ඉවත් කරන ලදී.", - "adminSendingPromotion": "පරිපාලක උසස්වීම යවන ලදී", "adminSettings": "පරිපාලන සැකසුම්", "adminTwoPromotedToAdmin": "{name} සහ {other_name} පරිපාලක (Admin) තනතුරට උසස් කරන ලදී.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "කණ්ඩායම යාවත්කාලීන කිරීමට අසමත් විය", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "ඔබට අන් අයගේ පණිවිඩ මැකීමට අවසර නැත", "deleteMessage": "{count, plural, one [පණිවිඩය මකන්න] other [පණිවිඩ මකන්න]}", - "deleteMessageConfirm": "ඔබට මෙම පණිවිඩය මකීමට අවශ්‍ය බව විශ්වාසද?", "deleteMessageDeleted": "{count, plural, one [පණිවිඩය මැකිණි] other [පණිවිඩ මැකිණි]}", "deleteMessageDeletedGlobally": "මෙම පණිවිඩය මකා ඇත", "deleteMessageDeletedLocally": "මෙම පණිවිඩය මෙම උපකරණයේ මකා ඇත", - "deleteMessageDescriptionDevice": "ඔබට මෙය පරිගණකයෙන් පමණක්ම මැකීමට අවශ්‍ය බව විශ්වාසද?", "deleteMessageDescriptionEveryone": "ඔබට මෙම පණිවිඩය සියලු දෙනා සඳහා මකීමට අවශ්‍ය බව විශ්වාසද?", "deleteMessageDeviceOnly": "මෙම උපාංගයේ පමණක් මකන්න", "deleteMessageDevicesAll": "මගේ සියලුම උපාංගවල පණිවිඩ මකන්න", "deleteMessageEveryone": "සියලු දෙනා සඳහා මකන්න", "deleteMessageFailed": "{count, plural, one [පණිවිඩය මකා දැමීමට අසමත් විය] other [පණිවිඩ මකා දැමීමට අසමත් විය]}", - "deleteMessagesConfirm": "ඔබට මෙම පණිවිඩ මකීමට අවශ්‍ය බව විශ්වාසද?", - "deleteMessagesDescriptionDevice": "ඔබට මෙම පණිවිඩ මේ උපකරණයෙන් පමණක් මැකීමට අවශ්‍ය බව විශ්වාසද?", "deleteMessagesDescriptionEveryone": "ඔබට මේ පණිවුඩ සියලු දෙනා වෙනුවෙන් මැකීමට අවශ්‍ය බව විශ්වාසද?", "deleting": "මකා දැමීම", "developerToolsToggle": "සංවර්ධක මෙවලම් ටොගල් කරන්න", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "{name} සහ {count} තවත් අය {group_name} වෙත ආරාධනා කිරීමට අසමත් විය", "groupInviteFailedTwo": "{name} සහ {other_name} {group_name} වෙත ආරාධනා කිරීමට අසමත් විය", "groupInviteFailedUser": "{name} {group_name} වෙත ආරාධනා කිරීමට අසමත් විය", - "groupInviteSending": "ආරාධනාව යවමින්", "groupInviteSent": "ආරාධනය යවා ඇත", "groupInviteSuccessful": "සමූහය ආරාධනා සාර්ථකයි", "groupInviteVersion": "ආරාධනාවන් ලැබීමට භාවිතාකරුවන්ට නවතම අනුවාදය තිබිය යුතුයි", diff --git a/_locales/sk/messages.json b/_locales/sk/messages.json index 58c5e524b9..b41e3654d8 100644 --- a/_locales/sk/messages.json +++ b/_locales/sk/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} bol/a odstránený/á ako správca.", "adminRemovedUserMultiple": "{name} a {count} ďalší boli odstránení ako správcovia.", "adminRemovedUserOther": "{name} a {other_name} boli odstránení ako správcovia.", - "adminSendingPromotion": "Odosiela sa povýšenie správcu", "adminSettings": "Nastavenia správcu", "adminTwoPromotedToAdmin": "{name} a {other_name} boli povýšení na správcov.", "andMore": "+{count}", @@ -142,6 +141,7 @@ "callsInProgress": "Prebiehajúci hovor", "callsIncoming": "Prichádzajúci hovor od {name}", "callsIncomingUnknown": "Prichádzajúci hovor", + "callsMicrophonePermissionsRequired": "Zmeškali ste hovor od {name}, pretože ste neudelili prístup k mikrofónu.", "callsMissed": "Zmeškaný hovor", "callsMissedCallFrom": "Zmeškaný hovor od {name}", "callsNotificationsRequired": "Hlasové a video hovory vyžadujú povolenie upozornení v systémových nastaveniach vášho zariadenia.", @@ -236,7 +236,7 @@ "conversationsEnterNewLine": "SHIFT + ENTER odošle správu, ENTER začne nový riadok", "conversationsEnterSends": "ENTER odosiela správu, SHIFT + ENTER začína nový riadok", "conversationsGroups": "Skupiny", - "conversationsMessageTrimming": "Premazávanie správ", + "conversationsMessageTrimming": "Prečistenie správ", "conversationsMessageTrimmingTrimCommunities": "Prečistiť komunity", "conversationsMessageTrimmingTrimCommunitiesDescription": "Vymazať správy z Community konverzácií starších ako 6 mesiacov, a kde je viac ako 2,000 správ.", "conversationsNew": "Nová konverzácia", @@ -274,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Nepodarilo sa aktualizovať skupinu", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Nemáte právo vymazať správy ostatných", "deleteMessage": "{count, plural, one [Vymazať správu] few [Vymazať správy] many [Vymazať správy] other [Vymazať správy]}", - "deleteMessageConfirm": "Naozaj chcete vymazať túto správu?", "deleteMessageDeleted": "{count, plural, one [Správa vymazaná] few [Správy vymazané] many [Správy vymazané] other [Správy vymazané]}", "deleteMessageDeletedGlobally": "Táto správa bola vymazaná", "deleteMessageDeletedLocally": "Táto správa bola vymazaná na tomto zariadení", - "deleteMessageDescriptionDevice": "Naozaj chcete vymazať túto správu len z tohto zariadenia?", "deleteMessageDescriptionEveryone": "Naozaj chcete túto správu vymazať u všetkých?", "deleteMessageDeviceOnly": "Vymazať iba na tomto zariadení", "deleteMessageDevicesAll": "Vymazať na všetkých mojich zariadeniach", "deleteMessageEveryone": "Vymazať pre všetkých", "deleteMessageFailed": "{count, plural, one [Správu sa nepodarilo vymazať] few [Správy sa nepodarilo vymazať] many [Správy sa nepodarilo vymazať] other [Správy sa nepodarilo vymazať]}", - "deleteMessagesConfirm": "Naozaj chcete vymazať tieto správy?", - "deleteMessagesDescriptionDevice": "Naozaj chcete odstrániť tieto správy iba z tohto zariadenia?", "deleteMessagesDescriptionEveryone": "Naozaj chcete odstrániť tieto správy pre všetkých?", "deleting": "Mazanie", "developerToolsToggle": "Nástroje pre vývojárov", @@ -389,7 +385,6 @@ "groupInviteFailedMultiple": "Nepodarilo sa pozvať používateľa {name} a {count} ďalších do {group_name}", "groupInviteFailedTwo": "Nepodarilo sa pozvať používateľa {name} a {other_name} do {group_name}", "groupInviteFailedUser": "Zlyhalo pozvanie používateľa {name} do {group_name}", - "groupInviteSending": "Odosiela sa pozvánka", "groupInviteSent": "Pozvánka bola odoslaná", "groupInviteSuccessful": "Pozvanie do skupiny úspešné", "groupInviteVersion": "Používatelia musia mať najnovšiu verziu na prijatie pozvánok", diff --git a/_locales/sl/messages.json b/_locales/sl/messages.json index a62a1dfb58..3cf170c693 100644 --- a/_locales/sl/messages.json +++ b/_locales/sl/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} ni več administrator.", "adminRemovedUserMultiple": "{name} in {count} drugi so bili odstranjeni kot administratorji.", "adminRemovedUserOther": "{name} in {other_name} sta bila odstranjena kot administratorja.", - "adminSendingPromotion": "Pošiljanje promocije skrbnika", "adminSettings": "Nastavitve skrbnika", "adminTwoPromotedToAdmin": "{name} in {other_name} sta bila promovirana v administratorja.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Ni uspelo posodobiti skupine", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Nimate dovoljenja za brisanje sporočil drugih", "deleteMessage": "{count, plural, one [Izbriši sporočilo] two [Izbriši sporočili] few [Izbriši sporočila] other [Izbriši sporočila]}", - "deleteMessageConfirm": "Ali ste prepričani, da želite izbrisati to sporočilo?", "deleteMessageDeleted": "{count, plural, one [Sporočilo izbrisano] two [Sporočili sta izbrisani] few [Sporočila so izbrisana] other [Sporočila so izbrisana]}", "deleteMessageDeletedGlobally": "To sporočilo je bilo izbrisano", "deleteMessageDeletedLocally": "To sporočilo je bilo izbrisano na tej napravi", - "deleteMessageDescriptionDevice": "Ali ste prepričani, da želite izbrisati to sporočilo samo s te naprave?", "deleteMessageDescriptionEveryone": "Ali ste prepričani, da želite izbrisati to sporočilo za vse?", "deleteMessageDeviceOnly": "Izbriši samo na tej napravi", "deleteMessageDevicesAll": "Izbriši na vseh mojih napravah", "deleteMessageEveryone": "Izbriši za vse", "deleteMessageFailed": "{count, plural, one [Neuspešna odstranitev sporočila] two [Neuspešna odstranitev sporočil] few [Neuspešna odstranitev sporočil] other [Neuspešna odstranitev sporočil]}", - "deleteMessagesConfirm": "Ali ste prepričani, da želite izbrisati ta sporočila?", - "deleteMessagesDescriptionDevice": "Ali ste prepričani, da želite ta sporočila izbrisati samo iz te naprave?", "deleteMessagesDescriptionEveryone": "Ali ste prepričani, da želite izbrisati ta sporočila za vse?", "deleting": "Brisanje", "developerToolsToggle": "Preklopi orodja za razvijalce", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Ni uspelo povabiti {name} in {count} drugih v {group_name}", "groupInviteFailedTwo": "Ni uspelo povabiti {name} and {other_name} v {group_name}", "groupInviteFailedUser": "Ni uspelo povabiti {name} v {group_name}", - "groupInviteSending": "Pošiljanje povabila", "groupInviteSent": "Povabilo poslano", "groupInviteSuccessful": "Povabilo v skupino je bilo uspešno", "groupInviteVersion": "Uporabniki morajo imeti najnovejšo različico za prejemanje povabil", diff --git a/_locales/sq/messages.json b/_locales/sq/messages.json index 519a50c6a3..11eebf4d83 100644 --- a/_locales/sq/messages.json +++ b/_locales/sq/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} u largua si Administrator.", "adminRemovedUserMultiple": "{name} dhe {count} të tjerë u larguan nga roli i Admin.", "adminRemovedUserOther": "{name} dhe {other_name} u larguan nga roli i Admin.", - "adminSendingPromotion": "Dërgimi i promovimit të administratorit", "adminSettings": "Rregullimet e Administratorit", "adminTwoPromotedToAdmin": "{name} dhe {other_name} u promovuan në Administratorë.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Dështoi përditësimi i grupit", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Ju nuk keni leje për të fshirë mesazhet e të tjerëve", "deleteMessage": "{count, plural, one [Fshije Mesazhin] other [Fshini mesazhe]}", - "deleteMessageConfirm": "A jeni të sigurt që doni ta fshini këtë mesazh?", "deleteMessageDeleted": "{count, plural, one [Mesazhi u fshi]}", "deleteMessageDeletedGlobally": "Ky mesazh u fshi", "deleteMessageDeletedLocally": "Ky mesazh u fshi në këtë pajisje", - "deleteMessageDescriptionDevice": "A jeni të sigurt që doni ta fshini këtë mesazh vetëm nga kjo pajisje?", "deleteMessageDescriptionEveryone": "A jeni të sigurt që doni ta fshini këtë mesazh për të gjithë?", "deleteMessageDeviceOnly": "Fshije vetëm në këtë pajisje", "deleteMessageDevicesAll": "Fshije në të gjitha pajisjet e mia", "deleteMessageEveryone": "Fshije Mesazhin për të gjithë", "deleteMessageFailed": "{count, plural, one [Dështoi të fshihej mesazhi] other [Dështoi të fshihen mesazhet]}", - "deleteMessagesConfirm": "A jeni të sigurt që doni të fshini këto mesazhe?", - "deleteMessagesDescriptionDevice": "A jeni të sigurt që doni t'i fshini këto mesazhe vetëm nga kjo pajisje?", "deleteMessagesDescriptionEveryone": "A jeni të sigurt që doni t'i fshini këto mesazhe për të gjithë?", "deleting": "Po fshihet", "developerToolsToggle": "Shfaq/Fshih Mjete Zhvilluesi", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Dështoi ftesa e {name} dhe {count} të tjerëve në {group_name}", "groupInviteFailedTwo": "Dështoi ftesa e {name} dhe {other_name} në {group_name}", "groupInviteFailedUser": "Dështoi ftesa e {name} në {group_name}", - "groupInviteSending": "Dërgimi i ftesës", "groupInviteSent": "Ftesa dërguar", "groupInviteSuccessful": "Ftesa për grupin ishte e suksesshme", "groupInviteVersion": "Përdoruesit duhet të kenë versionin më të ri për të marrë ftesa", diff --git a/_locales/sr-CS/messages.json b/_locales/sr-CS/messages.json index d73ade0465..058783c03c 100644 --- a/_locales/sr-CS/messages.json +++ b/_locales/sr-CS/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} je uklonjen kao admin.", "adminRemovedUserMultiple": "{name} i {count} drugih su uklonjeni kao admini.", "adminRemovedUserOther": "{name} i {other_name} su uklonjeni kao admini.", - "adminSendingPromotion": "Slanje unapređenja na administratora", "adminSettings": "Postavke administratora", "adminTwoPromotedToAdmin": "{name} i {other_name} su unapredjeni u admina.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Nije uspelo ažuriranje grupe", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Nemate dozvolu da brišete tuđe poruke", "deleteMessage": "{count, plural, one [Obriši poruku] few [Ukloni poruke] other [Ukloni poruke]}", - "deleteMessageConfirm": "Da li ste sigurni da želite da izbrišete ovu poruku?", "deleteMessageDeleted": "{count, plural, one [Poruka obrisana] few [Poruke obrisane] other [Poruke obrisane]}", "deleteMessageDeletedGlobally": "Poruka je izbrisana", "deleteMessageDeletedLocally": "Poruka je izbrisana na ovom uređaju", - "deleteMessageDescriptionDevice": "Da li ste sigurni da želite da izbrišete ovu poruku samo sa ovog uređaja?", "deleteMessageDescriptionEveryone": "Da li ste sigurni da želite da izbrišete ovu poruku za sve?", "deleteMessageDeviceOnly": "Obriši samo na ovom uređaju", "deleteMessageDevicesAll": "Obriši na svim mojim uređajima", "deleteMessageEveryone": "Obriši za sve", "deleteMessageFailed": "{count, plural, one [Nije uspelo brisanje poruke] few [Nije uspelo brisanje poruka] other [Nije uspelo brisanje poruka]}", - "deleteMessagesConfirm": "Da li ste sigurni da želite da izbrišete ove poruke?", - "deleteMessagesDescriptionDevice": "Da li ste sigurni da želite da obrišete ove poruke samo sa ovog uređaja?", "deleteMessagesDescriptionEveryone": "Da li ste sigurni da želite da obrišete ove poruke za sve?", "deleting": "Brisanje", "developerToolsToggle": "Uključi/isključi programerski mod", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Neuspelo pozivanje {name} i {count} drugih u {group_name}", "groupInviteFailedTwo": "Neuspelo pozivanje {name} i {other_name} u {group_name}", "groupInviteFailedUser": "Neuspelo pozivanje {name} u {group_name}", - "groupInviteSending": "Slanje pozivnice", "groupInviteSent": "Poziv je poslat", "groupInviteSuccessful": "Poziv u grupu je bio uspešan", "groupInviteVersion": "Korisnici moraju imati najnoviju verziju da bi primili pozivnice", diff --git a/_locales/sr-SP/messages.json b/_locales/sr-SP/messages.json index f9a576ac8d..92603f402a 100644 --- a/_locales/sr-SP/messages.json +++ b/_locales/sr-SP/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} је уклоњен као администратор.", "adminRemovedUserMultiple": "{name} и {count} осталих су уклоњени као администратори.", "adminRemovedUserOther": "{name} и {other_name} су уклоњени као администратори.", - "adminSendingPromotion": "Слање унапређења администратора", "adminSettings": "Админ подешавања", "adminTwoPromotedToAdmin": "{name} и {other_name} су унапређени у администраторе.", "andMore": "+{count}", @@ -274,18 +273,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Неуспешно ажурирање групе", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Немате дозволу да бришете туђе поруке", "deleteMessage": "{count, plural, one [Обриши поруку] few [Обриши поруке] other [Обриши поруке]}", - "deleteMessageConfirm": "Да ли сте сигурни да желите да обришете ову поруку?", "deleteMessageDeleted": "{count, plural, one [Порука је обрисана] few [Поруке су обрисане] other [Поруке су обрисане]}", "deleteMessageDeletedGlobally": "Ова порука је обрисана", "deleteMessageDeletedLocally": "Ова порука је обрисана на овом уређају", - "deleteMessageDescriptionDevice": "Да ли сте сигурни да желите да обришете ову поруку само са овог уређаја?", "deleteMessageDescriptionEveryone": "Да ли сте сигурни да желите да обришете ову поруку за све?", "deleteMessageDeviceOnly": "Обриши само на овом уређају", "deleteMessageDevicesAll": "Обриши на свим мојим уређајима", "deleteMessageEveryone": "Обриши за све", "deleteMessageFailed": "{count, plural, one [Неуспешно брисање поруке] few [Неуспешно брисање порука] other [Неуспешно брисање порука]}", - "deleteMessagesConfirm": "Да ли сте сигурни да желите да обришете ове поруке?", - "deleteMessagesDescriptionDevice": "Да ли сте сигурни да желите да обришете ове поруке само са овог уређаја?", "deleteMessagesDescriptionEveryone": "Да ли сте сигурни да желите да обришете ове поруке за све?", "deleting": "Брисање", "developerToolsToggle": "Пребаците Developer Tools", @@ -389,7 +384,6 @@ "groupInviteFailedMultiple": "Позивање {name} и {count} других у {group_name} није успело", "groupInviteFailedTwo": "Позивање {name} и {other_name} у {group_name} није успело", "groupInviteFailedUser": "Позивање {name} у {group_name} није успело", - "groupInviteSending": "Слање позивнице", "groupInviteSent": "Позив је послат", "groupInviteSuccessful": "Позивање групе је успешно", "groupInviteVersion": "Корисници морају имати најновије издање да би примали позивнице", diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json index 810d2ddb33..6bb91ce0e9 100644 --- a/_locales/sv/messages.json +++ b/_locales/sv/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} blev borttagen som Admin.", "adminRemovedUserMultiple": "{name} och {count} andra togs bort som Admin.", "adminRemovedUserOther": "{name} och {other_name} togs bort som Admin.", - "adminSendingPromotion": "Sänder administratörsbefordran", "adminSettings": "Admin Settings", "adminTwoPromotedToAdmin": "{name} och {other_name} blev befordrade till Admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Misslyckades att uppdatera grupp", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Du har inte behörighet att ta bort andras meddelanden", "deleteMessage": "{count, plural, one [Radera meddelande] other [Radera meddelanden]}", - "deleteMessageConfirm": "Är du säker på att du vill radera detta meddelande?", "deleteMessageDeleted": "{count, plural, one [Meddelande raderat] other [Meddelanden raderade]}", "deleteMessageDeletedGlobally": "Detta meddelande har raderats", "deleteMessageDeletedLocally": "Detta meddelande har tagits bort på denna enhet", - "deleteMessageDescriptionDevice": "Är du säker på att du vill radera detta meddelande från denna enhet?", "deleteMessageDescriptionEveryone": "Är du säker på att du vill radera detta meddelande för alla?", "deleteMessageDeviceOnly": "Radera endast på denna enhet", "deleteMessageDevicesAll": "Radera på alla mina enheter", "deleteMessageEveryone": "Radera för alla", "deleteMessageFailed": "{count, plural, one [Misslyckades med att radera meddelandet] other [Misslyckades med att radera meddelanden]}", - "deleteMessagesConfirm": "Är du säker på att du vill radera dessa meddelanden?", - "deleteMessagesDescriptionDevice": "Är du säker på att du vill radera dessa meddelanden endast från denna enhet?", "deleteMessagesDescriptionEveryone": "Är du säker på att du vill radera dessa meddelanden för alla?", "deleting": "Raderar", "developerToolsToggle": "Slå på utvecklingsverktyg", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Misslyckades med att bjuda in {name} och {count} andra till {group_name}", "groupInviteFailedTwo": "Misslyckades med att bjuda in {name} och {other_name} till {group_name}", "groupInviteFailedUser": "Misslyckades med att bjuda in {name} till {group_name}", - "groupInviteSending": "Skickar inbjudan", "groupInviteSent": "Inbjudan skickad", "groupInviteSuccessful": "Grupinbjudan lyckades", "groupInviteVersion": "Användare måste ha den senaste versionen för att ta emot inbjudningar", diff --git a/_locales/sw/messages.json b/_locales/sw/messages.json index 663e29fe2c..5bde17485c 100644 --- a/_locales/sw/messages.json +++ b/_locales/sw/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} ameondolewa kama Admin.", "adminRemovedUserMultiple": "{name} na {count} wengine wameondolewa kama Admin.", "adminRemovedUserOther": "{name} na {other_name} wameondolewa kama Admin.", - "adminSendingPromotion": "Inatuma msimamizi kutumwa", "adminSettings": "Mipangilio ya Msimamizi", "adminTwoPromotedToAdmin": "{name} na {other_name} wamepandishwa cheo kuwa Admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Imeshindikana Kusasisha Kundi", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Huna ruhusa ya kufuta jumbe za wengine", "deleteMessage": "{count, plural, one [Futa Ujumbe] other [Futa Jumbe]}", - "deleteMessageConfirm": "Je, una uhakika unataka kufuta ujumbe huu?", "deleteMessageDeleted": "{count, plural, one [Ujumbe umefutwa] other [Jumbe zimefutwa]}", "deleteMessageDeletedGlobally": "Ujumbe huu umefutwa", "deleteMessageDeletedLocally": "Ujumbe huu umefutwa kwenye kifaa hiki", - "deleteMessageDescriptionDevice": "Je, una uhakika unataka kufuta ujumbe huu kutoka kifaa hiki pekee?", "deleteMessageDescriptionEveryone": "Je, una uhakika unataka kufuta ujumbe huu kwa kila mtu?", "deleteMessageDeviceOnly": "Futa kwenye kifaa hiki pekee", "deleteMessageDevicesAll": "Futa kwenye vifaa vyangu vyote", "deleteMessageEveryone": "Futa kwa kila mtu", "deleteMessageFailed": "{count, plural, one [Imeshindikana kufuta ujumbe] other [Imeshindikana kufuta jumbe]}", - "deleteMessagesConfirm": "Je, una uhakika unataka kufuta jumbe hizi?", - "deleteMessagesDescriptionDevice": "Una uhakika unataka kufuta jumbe hizi kwenye kifaa hiki pekee?", "deleteMessagesDescriptionEveryone": "Una uhakika unataka kufuta jumbe hizi kwa kila mtu?", "deleting": "Kufuta", "developerToolsToggle": "Geuza Zana za Usanidi", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Imeshindikana kualika {name} na wengine {count} kwa {group_name}", "groupInviteFailedTwo": "Imeshindikana kualika {name} na {other_name} kwa {group_name}", "groupInviteFailedUser": "Imeshindikana kualika {name} kwa {group_name}", - "groupInviteSending": "Inatuma mwaliko", "groupInviteSent": "Kualika kumewekwa", "groupInviteSuccessful": "Mwaliko wa kikundi umefanikiwa", "groupInviteVersion": "Watumiaji lazima wawe na toleo jipya zaidi kupokea mialiko", diff --git a/_locales/ta/messages.json b/_locales/ta/messages.json index ef194ffdf0..5f8a97695b 100644 --- a/_locales/ta/messages.json +++ b/_locales/ta/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} நிர்வாகி பதவியில் இருந்து நீக்கப்பட்டார்.", "adminRemovedUserMultiple": "{name} மற்றும் {count} பிறர் நிர்வாகியிலிருந்து நீக்கப்பட்டனர்.", "adminRemovedUserOther": "{name} மற்றும் {other_name} நிர்வாகியிலிருந்து நீக்கப்பட்டனர்.", - "adminSendingPromotion": "நிர்வாக முன்னேற்றம் அனுப்புகிறது", "adminSettings": "நிர்வாகி அமைப்புகள்", "adminTwoPromotedToAdmin": "{name} மற்றும் {other_name} நிர்வாகியாக உயர்த்தப்பட்டனர்.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "குழுவைப் புதுப்பிக்க முடியவில்லை", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "மற்றவர்களின் செய்திகளை நீக்க உங்களுக்கு அனுமதி இல்லை", "deleteMessage": "{count, plural, one [தகவலை நீக்கு] other [தகவலைகளை நீக்கு]}", - "deleteMessageConfirm": "இந்த செய்தியை நீக்க விரும்புகிறீர்களா?", "deleteMessageDeleted": "{count, plural, one [செய்தி நீக்கப்பட்டது] other [செய்திகள் அகற்றப்பட்டது]}", "deleteMessageDeletedGlobally": "இந்த செய்தி நீக்கப்பட்டுள்ளது", "deleteMessageDeletedLocally": "இந்த செய்தி இந்த சாதனத்தில் நீக்கப்பட்டது", - "deleteMessageDescriptionDevice": "இந்த செய்தியை இந்த சாதனத்தில் மட்டும் நீக்க விரும்புகிறீர்களா?", "deleteMessageDescriptionEveryone": "இந்த செய்தியை எல்லோருக்கும் நீக்க விரும்புகிறீர்களா?", "deleteMessageDeviceOnly": "இந்த சாதனத்தில் மட்டுமே நீக்கு", "deleteMessageDevicesAll": "எனது அனைத்து சாதனங்களிலும் நீக்கு", "deleteMessageEveryone": "எல்லோருக்கும் தகவலை நீக்கு", "deleteMessageFailed": "{count, plural, one [செய்தியை நீக்க முடியவில்லை] other [செய்திகளை நீக்க முடியவில்லை]}", - "deleteMessagesConfirm": "இந்த செய்திகளை நீக்க விரும்புகிறீர்களா?", - "deleteMessagesDescriptionDevice": "நீங்கள் நிச்சயமாக இந்த தகவல்களை இந்த கருவியிலிருந்து மட்டுமே நீக்க விரும்புகிறீர்களா?", "deleteMessagesDescriptionEveryone": "நீங்கள் நிச்சயமாக இந்த தகவல்களை அனைவருக்கும் நீக்க விரும்புகிறீர்களா?", "deleting": "நீக்குகிறது", "developerToolsToggle": "டெவலப்பர் கருவிகளாக மாற்றவும்", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "{group_name} க்கு {name} மற்றும் {count} பிறரை அழைக்க தவறிவிட்டது", "groupInviteFailedTwo": "{group_name} க்கு {name} மற்றும் {other_name} அழைக்க தவறிவிட்டது", "groupInviteFailedUser": "{group_name} க்கு {name} அழைக்க தவறிவிட்டது", - "groupInviteSending": "அழைப்பை அனுப்புகிறது", "groupInviteSent": "அழைப்பு அனுப்பப்பட்டது", "groupInviteSuccessful": "குழு அழைப்பு வெற்றி", "groupInviteVersion": "பயனர்கள் பரிந்துரை பெறவேண்டுமெனில் சமீபத்திய பதிப்பைக் கட்டாயம் மேற்கொள்ள வேண்டும்", diff --git a/_locales/te/messages.json b/_locales/te/messages.json index 6b0958d4ce..9a2d73c0d2 100644 --- a/_locales/te/messages.json +++ b/_locales/te/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} అడ్మిన్ గా తొలగించబడ్డారు.", "adminRemovedUserMultiple": "{name} మరియు {count} ఇతరులు అడ్మిన్ స్థాయి నుండి తొలగించబడ్డారు.", "adminRemovedUserOther": "{name} మరియు {other_name} అడ్మిన్ స్థాయి నుండి తొలగించబడ్డారు.", - "adminSendingPromotion": "అడ్మిన్ ప్రమోషన్‌ను పంపుతోంది", "adminSettings": "ప్రశాసక సెట్టింగ్‌లు", "adminTwoPromotedToAdmin": "{name} మరియు {other_name} అడ్మిన్ కీ ప్రమోట్ చేయబడ్డారు.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "సమూహాన్ని అప్‌డేట్ చేయడంలో విఫలమైంది", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "మీరు ఇతరుల సందేశాలను తొలగించే అనుమతి కలిగి లేరు", "deleteMessage": "{count, plural, one [సందేశాన్ని తొలగించు] other [సందేశాలను తొలగించండి]}", - "deleteMessageConfirm": "మీరు ఈ సందేశాన్ని తొలగించాలనుకుంటున్నారా?", "deleteMessageDeleted": "{count, plural, one [సందేశం తొలగించబడింది] other [సందేశాలు తొలగించబడ్డాయి]}", "deleteMessageDeletedGlobally": "ఈ సందేశం తొలగించబడింది", "deleteMessageDeletedLocally": "ఈ సందేశం ఈ పరికరంలో తొలగించబడింది", - "deleteMessageDescriptionDevice": "మీరు ఈ సందేశాన్ని కేవలం ఈ పరికరం నుండి తీసివేయాలనుకుంటున్నారా?", "deleteMessageDescriptionEveryone": "మీరు ఈ సందేశాన్ని అందరికీ తీసివేయాలనుకుంటున్నారా?", "deleteMessageDeviceOnly": "ఈ పరికరంలో మాత్రమే తొలగించు", "deleteMessageDevicesAll": "నా పరికరాలన్నింటిలో కూడా తొలగించండి", "deleteMessageEveryone": "అందరికీ తొలగించు", "deleteMessageFailed": "{count, plural, one [సందేశం తొలగించడం విఫలమైంది] other [సందేశాలు తొలగించడం విఫలమైంది]}", - "deleteMessagesConfirm": "మీరు ఈ సందేశాలను తొలగించాలనుకుంటున్నారా?", - "deleteMessagesDescriptionDevice": "మీరు ఈ సందేశాలను కేవలం ఈ పరికరం నుండి మాత్రమే తొలగించాలనుకుంటున్నారా?", "deleteMessagesDescriptionEveryone": "మీరు ఈ సందేశాలను అందరికీ తొలగించాలనుకుంటున్నారా?", "deleting": "సందేశాలను తొలగిస్తోంది", "developerToolsToggle": "డెవలపర్ టూల్స్ ని మారుస్తుంది", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "{name} మరియు {count} ఇతరులను {group_name} ఆహ్వానించడంలో విఫలమైంది", "groupInviteFailedTwo": "{name} మరియు {other_name} {group_name}కు ఆహ్వానించడంలో విఫలమైంది", "groupInviteFailedUser": "{name} ను {group_name}కు ఆహ్వానించడంలో విఫలమైంది", - "groupInviteSending": "ఆహ్వానాన్ని పంపుతోంది", "groupInviteSent": "ఆహ్వానం పంపబడింది", "groupInviteSuccessful": "సమూహ ఆహ్వానం విజయవంతం అయ్యింది", "groupInviteVersion": "ఆహ్వానాలు అందుకోవడానికి వినియోగదారులు తాజా వెర్షన్ కలిగి ఉండాలి", diff --git a/_locales/th/messages.json b/_locales/th/messages.json index 96498ce907..5635daad06 100644 --- a/_locales/th/messages.json +++ b/_locales/th/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} ถูกปลดออกจากผู้ดูแลระบบ", "adminRemovedUserMultiple": "{name} และ {count} คนอื่นๆ ถูกลบออกจากสถานะ Admin.", "adminRemovedUserOther": "{name} และ {other_name} ถูกลบออกจากสถานะ Admin.", - "adminSendingPromotion": "การส่งโปรโมชันผู้ดูแลระบบ", "adminSettings": "การตั้งค่าผู้ดูแล", "adminTwoPromotedToAdmin": "{name} และ {other_name} ได้รับการเลื่อนตำแหน่งเป็นผู้ดูแลระบบ", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "ไม่สามารถอัปเดตกลุ่มได้", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "คุณไม่มีสิทธิ์ในการลบข้อความของผู้อื่น", "deleteMessage": "{count, plural, other [ลบข้อความ]}", - "deleteMessageConfirm": "คุณแน่ใจหรือไม่ว่าต้องการลบข้อความนี้?", "deleteMessageDeleted": "{count, plural, other [ข้อความถูกลบ]}", "deleteMessageDeletedGlobally": "ข้อความนี้ถูกลบ", "deleteMessageDeletedLocally": "ข้อความนี้ถูกลบบนอุปกรณ์นี้", - "deleteMessageDescriptionDevice": "คุณแน่ใจหรือไม่ว่าต้องการลบข้อความนี้เฉพาะในอุปกรณ์นี้?", "deleteMessageDescriptionEveryone": "คุณแน่ใจหรือไม่ว่าต้องการลบข้อความนี้สำหรับทุกคน?", "deleteMessageDeviceOnly": "ลบเฉพาะบนอุปกรณ์นี้", "deleteMessageDevicesAll": "ลบบนอุปกรณ์ของฉันทั้งหมด", "deleteMessageEveryone": "ลบสำหรับทุกคน", "deleteMessageFailed": "{count, plural, other [ลบข้อความล้มเหลว]}", - "deleteMessagesConfirm": "คุณแน่ใจหรือไม่ว่าต้องการลบข้อความเหล่านี้?", - "deleteMessagesDescriptionDevice": "คุณแน่ใจหรือไม่ว่าต้องการลบข้อความเหล่านี้จากอุปกรณ์นี้เท่านั้น?", "deleteMessagesDescriptionEveryone": "คุณแน่ใจหรือไม่ว่าต้องการลบข้อความเหล่านี้สำหรับทุกคน?", "deleting": "กำลังลบ", "developerToolsToggle": "สลับไปที่เครื่องมือสำหรับผู้พัฒนา", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "ไม่สามารถเชิญ {name} และอีก {count} คนเข้าร่วม {group_name} ได้", "groupInviteFailedTwo": "ไม่สามารถเชิญ {name} และ {other_name} เข้าร่วม {group_name} ได้", "groupInviteFailedUser": "ไม่สามารถเชิญ {name} เข้าร่วม {group_name} ได้", - "groupInviteSending": "การส่งคำเชิญ", "groupInviteSent": "เชิญแล้ว", "groupInviteSuccessful": "เชิญเข้าร่วมกลุ่มสำเร็จ", "groupInviteVersion": "ผู้ใช้ต้องมีเวอร์ชันล่าสุดเพื่อรับคำเชิญ", diff --git a/_locales/tl/messages.json b/_locales/tl/messages.json index 837a78c242..f477bf7f91 100644 --- a/_locales/tl/messages.json +++ b/_locales/tl/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} ay tinanggal bilang Admin.", "adminRemovedUserMultiple": "{name} at {count} iba pa ay tinanggal bilang Admin.", "adminRemovedUserOther": "{name} at {other_name} ay tinanggal bilang Admin.", - "adminSendingPromotion": "Sining-promote na admin", "adminSettings": "Admin Settings", "adminTwoPromotedToAdmin": "{name} at {other_name} ay na-promote na Admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Nabigong Mag-update ng Grupo", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Wala kang pahintulot na i-delete ang mga mensahe ng iba", "deleteMessage": "{count, plural, one [I-delete ang Mensahe] other [I-delete ang mga Mensahe]}", - "deleteMessageConfirm": "Sigurado ka bang gusto mong i-delete ang mensaheng ito?", "deleteMessageDeleted": "{count, plural, one [Na-delete ang mensahe] other [Na-delete ang mga mensahe]}", "deleteMessageDeletedGlobally": "Ang mensaheng ito ay na-delete na", "deleteMessageDeletedLocally": "Ang mensaheng ito ay na-delete sa device na ito", - "deleteMessageDescriptionDevice": "Sigurado ka bang gusto mong i-delete ang mensaheng ito mula sa aparatong ito lamang?", "deleteMessageDescriptionEveryone": "Sigurado ka bang gusto mong i-delete ang mensaheng ito para sa lahat?", "deleteMessageDeviceOnly": "Alisin lamang sa device na ito", "deleteMessageDevicesAll": "Alisin sa lahat ng mga device ko", "deleteMessageEveryone": "I-delete para sa lahat", "deleteMessageFailed": "{count, plural, one [Nabigong i-delete ang mensahe] other [Nabigong i-delete ang mga mensahe]}", - "deleteMessagesConfirm": "Sigurado ka bang gusto mong i-delete ang mga mensaheng ito?", - "deleteMessagesDescriptionDevice": "Sigurado ka bang gusto mong burahin ang mga mensaheng ito mula sa device na ito lamang?", "deleteMessagesDescriptionEveryone": "Sigurado ka bang gusto mong burahin ang mga mensaheng ito para sa lahat?", "deleting": "Ina-aalis", "developerToolsToggle": "I-toggle ang Mga Tool ng Developer", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Nabigong imbitahan si {name} at {count} (na) iba pa sa {group_name}", "groupInviteFailedTwo": "Nabigong imbitahan si {name} at si {other_name} sa {group_name}", "groupInviteFailedUser": "Nabigong imbitahan si {name} sa {group_name}", - "groupInviteSending": "Sini-send ang imbitasyon", "groupInviteSent": "Naipadala ang imbitasyon", "groupInviteSuccessful": "Matagumpay ang imbitasyon sa grupo", "groupInviteVersion": "Dapat ay may pinakabagong release ang mga user upang makatanggap ng mga paanyaya", diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json index bc6b86ae35..660b51c5c3 100644 --- a/_locales/tr/messages.json +++ b/_locales/tr/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} yönetici olarak kaldırıldı.", "adminRemovedUserMultiple": "{name} ve {count} üye Yönetici seviyesinden düşürüldü.", "adminRemovedUserOther": "{name} ve {other_name} Yönetici seviyesinden düşürüldü.", - "adminSendingPromotion": "Yönetici terfisi gönderiliyor", "adminSettings": "Yönetici Ayarları", "adminTwoPromotedToAdmin": "{name} ve {other_name} yönetici olarak terfi etti.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Grup güncellenemedi", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Başkalarının mesajlarını silmek için yetkiniz bulunmamaktadır", "deleteMessage": "{count, plural, one [Mesajı Sil] other [Mesajları Sil]}", - "deleteMessageConfirm": "Bu mesajı silmek istediğinizden emin misiniz?", "deleteMessageDeleted": "{count, plural, one [Mesaj silindi] other [Mesajlar silindi]}", "deleteMessageDeletedGlobally": "Bu mesaj silindi", "deleteMessageDeletedLocally": "Bu mesaj bu cihazda silinmiş", - "deleteMessageDescriptionDevice": "Bu mesajı sadece bu cihazdan silmek istediğinizden emin misiniz?", "deleteMessageDescriptionEveryone": "Bu mesajı herkes için silmek istediğinizden emin misiniz?", "deleteMessageDeviceOnly": "Yalnızca bu cihazda sil", "deleteMessageDevicesAll": "Tüm cihazlarımda sil", "deleteMessageEveryone": "Herkes için sil", "deleteMessageFailed": "{count, plural, one [İleti teslim edilemedi] other [İleti teslim edilemedi]}", - "deleteMessagesConfirm": "Bu iletileri silmek istediğinizden emin misiniz?", - "deleteMessagesDescriptionDevice": "Mesajları sadece bu cihazdan silmek istediğinizden emin misiniz?", "deleteMessagesDescriptionEveryone": "Mesajları herkes için silmek istediğinizden emin misiniz?", "deleting": "Siliniyor", "developerToolsToggle": "Geliştirici Araçlarını Aç/Kapat", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "{name} ve {count} diğerleri {group_name} davet edilemedi", "groupInviteFailedTwo": "{name} ve {other_name} {group_name} davet edilemedi", "groupInviteFailedUser": "{name} {group_name} davet edilemedi", - "groupInviteSending": "Davet gönderiliyor", "groupInviteSent": "Davet gönderildi", "groupInviteSuccessful": "Grup daveti başarılı", "groupInviteVersion": "Kullanıcıların davetleri alabilmesi için en son sürüme sahip olmaları gerekiyor", diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json index 35c41ee4a8..4c4319d23b 100644 --- a/_locales/uk/messages.json +++ b/_locales/uk/messages.json @@ -9,7 +9,7 @@ "accountIdOrOnsEnter": "Введіть Account ID або ONS", "accountIdOrOnsInvite": "Запросити Account ID або ONS", "accountIdShare": "Привіт, я використовую {app_name} задля повністю приватного та безпечного спілкування. Долучайтесь! Мій Account ID

{account_id}

Завантажуйте на {session_download_url}", - "accountIdYours": "Ваш ідентифікатор облікового запису", + "accountIdYours": "Ідентифікатор вашого облікового запису", "accountIdYoursDescription": "Це ваш Account ID. Інші користувачі можуть просканувати його, щоб почати розмову з вами.", "actualSize": "Актуальний розмір", "add": "Додати", @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} було вилучено із групи.", "adminRemovedUserMultiple": "{name} та ще {count} інших було вилучено з переліку адміністраторів.", "adminRemovedUserOther": "{name} та {other_name} було вилучено з переліку адміністраторів.", - "adminSendingPromotion": "Надсилання прав адміністратора", "adminSettings": "Адміністраторські налаштування", "adminTwoPromotedToAdmin": "{name} та {other_name} було підвищено до адміністраторів.", "andMore": "+{count}", @@ -132,7 +131,7 @@ "blockUnblockNameTwo": "Ви впевнені, що бажаєте розблокувати {name} і ще одного?", "blockUnblockedUser": "{name} розблоковано", "call": "Дзвінок", - "callsCalledYou": "{name} телефонував(-ла)/дзвонив вам", + "callsCalledYou": "{name} дзвонив вам", "callsCannotStart": "Не можна розпочати новий дзвінок. Спочатку закінчіть поточний дзвінок.", "callsConnecting": "Підключення...", "callsEnd": "Завершити дзвінок", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Не вдалося оновити групу", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "У вас немає прав на видалення інших повідомлень", "deleteMessage": "{count, plural, one [Видалити повідомлення] few [Видалити повідомлення] many [Видалити повідомлення] other [Видалити повідомлення]}", - "deleteMessageConfirm": "Ви дійсно хочете видалити це повідомлення?", "deleteMessageDeleted": "{count, plural, one [Повідомлення видалено] few [Повідомлення видалені] many [Повідомлення видалені] other [Повідомлення видалені]}", "deleteMessageDeletedGlobally": "Це повідомлення було видалено", "deleteMessageDeletedLocally": "Це повідомлення було видалено на цьому пристрої", - "deleteMessageDescriptionDevice": "Ви впевнені, що хочете видалити це повідомлення лише з цього пристрою?", "deleteMessageDescriptionEveryone": "Ви впевнені, що бажаєте видалити це повідомлення для всіх?", "deleteMessageDeviceOnly": "Видалити тільки на цьому пристрої", "deleteMessageDevicesAll": "Видалити на всіх моїх пристроях", "deleteMessageEveryone": "Видалити для всіх", "deleteMessageFailed": "{count, plural, one [Не вдалося видалити повідомлення] few [Не вдалося видалити повідомлення] many [Не вдалося видалити повідомлення] other [Не вдалося видалити повідомлення]}", - "deleteMessagesConfirm": "Ви дійсно хочете видалити ці повідомлення?", - "deleteMessagesDescriptionDevice": "Ви впевнені, що хочете видалити ці повідомлення лише з цього пристрою?", "deleteMessagesDescriptionEveryone": "Ви впевнені, що хочете видалити ці повідомлення для всіх?", "deleting": "Видалення", "developerToolsToggle": "Відкрити засоби розробника", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Не вдалося запросити {name} та ще {count} інших до {group_name}", "groupInviteFailedTwo": "Не вдалося запросити {name} та {other_name} до {group_name}", "groupInviteFailedUser": "Не вдалося запросити {name} до {group_name}", - "groupInviteSending": "Надсилання запрошення", "groupInviteSent": "Запрошення надіслано", "groupInviteSuccessful": "Запрошення до групи успішне", "groupInviteVersion": "Користувачі мають мати останню версію, щоб отримувати запрошення", @@ -524,7 +518,7 @@ "messageRequestPending": "Ваш запит на повідомлення зараз очікує на розгляд.", "messageRequestPendingDescription": "Ви зможете надсилати голосові повідомлення і вкладення, після того як одержувач схвалить цей запит на повідомлення.", "messageRequestYouHaveAccepted": "Ви прийняли запит на повідомлення від {name}.", - "messageRequestsAcceptDescription": "Надсилання повідомлення цьому користувачеві автоматично прийме його запит на повідомлення та розкриє ваш ідентифікатор сеансу.", + "messageRequestsAcceptDescription": "Надсилання повідомлення цьому користувачеві автоматично прийме його запит на повідомлення та розкриє ідентифікатор вашого облікового запису.", "messageRequestsAccepted": "Ваш запит на повідомлення прийнято.", "messageRequestsClearAllExplanation": "Ви впевнені, що бажаєте очистити всі запити на повідомлення та запрошення до груп?", "messageRequestsCommunities": "Запити на повідомлення зі спільнот", diff --git a/_locales/ur/messages.json b/_locales/ur/messages.json index 4f9e74ea85..529e44182b 100644 --- a/_locales/ur/messages.json +++ b/_locales/ur/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} کو ایڈمن کے عہدہ سے ہٹا دیا گیا۔", "adminRemovedUserMultiple": "{name} اور {count} دیگر کو ایڈمن کے طور پر ہٹا دیا گیا۔", "adminRemovedUserOther": "{name} اور {other_name} کو ایڈمن کے طور پر ہٹا دیا گیا۔", - "adminSendingPromotion": "ایڈمن کی پروموشن بھیجی جا رہی ہے", "adminSettings": "ایڈمن سیٹنگز", "adminTwoPromotedToAdmin": "{name} اور {other_name} کو ایڈمن مقرر کیا گیا۔", "andMore": "+{count}", @@ -272,18 +271,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "گروپ اپ ڈیٹ کرنے میں ناکامی ہوئی", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "آپ کو دوسروں کے پیغامات حذف کرنے کی اجازت نہیں ہے", "deleteMessage": "{count, plural, one [پیغام حذف کریں] other [پیغامات حذف کریں]}", - "deleteMessageConfirm": "کیا آپ واقعی اس پیغام کو حذف کرنا چاہتے ہیں؟", "deleteMessageDeleted": "{count, plural, one [پیغام حذف ہو گیا] other [پیغامات حذف ہو گئے]}", "deleteMessageDeletedGlobally": "یہ پیغام حذف کردیا گیا", "deleteMessageDeletedLocally": "یہ پیغام اس ڈیوائس پر حذف کیا گیا", - "deleteMessageDescriptionDevice": "کیا آپ واقعی صرف اس ڈیوائس سے اس پیغام کو حذف کرنا چاہتے ہیں؟", "deleteMessageDescriptionEveryone": "کیا آپ واقعی اس پیغام کو سب کے لیے حذف کرنا چاہتے ہیں؟", "deleteMessageDeviceOnly": "صرف اس آلہ پر حذف کریں", "deleteMessageDevicesAll": "میرے تمام آلات پر حذف کریں", "deleteMessageEveryone": "سب کے لئے حذف کریں", "deleteMessageFailed": "{count, plural, one [پیغام حذف کرنے میں ناکام] other [پیغامات حذف کرنے میں ناکام]}", - "deleteMessagesConfirm": "کیا آپ واقعی ان پیغامات کو حذف کرنا چاہتے ہیں؟", - "deleteMessagesDescriptionDevice": "کیا آپ واقعی یہ پیغامات صرف اس ڈیوائس سے حذف کرنا چاہتے ہیں؟", "deleteMessagesDescriptionEveryone": "کیا آپ واقعی یہ پیغامات سب کے لئے حذف کرنا چاہتے ہیں؟", "deleting": "حذف کرنے کا عمل جاری ہے", "developerToolsToggle": "ڈویلپر ٹولز ٹوگل کریں", @@ -387,7 +382,6 @@ "groupInviteFailedMultiple": "{name} اور مزید {count} اراکین کو {group_name} میں مدعو کرنے میں ناکام رہا", "groupInviteFailedTwo": "{name} اور {other_name} کو {group_name} میں مدعو کرنے میں ناکام رہا", "groupInviteFailedUser": "{name} کو {group_name} میں مدعو کرنے میں ناکام رہا", - "groupInviteSending": "دعوت نامہ بھیجا جا رہا ہے", "groupInviteSent": "دعوت بھیج دی گئی", "groupInviteSuccessful": "گروپ کی دعوت کامیاب رہی", "groupInviteVersion": "دعوت نامے وصول کرنے کے لیے صارفین کو تازہ ترین ریلیز رکھنی ہوگی", diff --git a/_locales/uz/messages.json b/_locales/uz/messages.json index fa417482db..7d28d0edb6 100644 --- a/_locales/uz/messages.json +++ b/_locales/uz/messages.json @@ -14,7 +14,7 @@ "actualSize": "Hozirgi Hajmi", "add": "Qo'shish", "adminCannotBeRemoved": "Administratorlarni olib tashlash mumkin emas.", - "adminMorePromotedToAdmin": "{name} va {count} boshqa Administrator sifatida ko'tarildi.", + "adminMorePromotedToAdmin": "{name} va {count} boshqalar Administrator darajasiga ko'tarildi.", "adminPromote": "Administratorlarni ko'tarish", "adminPromoteDescription": "Haqiqatan ham {name} ni administrator sifatida ko'tarish xohlaysizmi? Administratorlarni olib tashlash mumkin emas.", "adminPromoteMoreDescription": "Haqiqatan ham {name} va {count} boshqa ni administrator sifatida ko'tarish xohlaysizmi? Administratorlarni olib tashlash mumkin emas.", @@ -35,9 +35,8 @@ "adminRemovedUser": "{name} Administrator sifatida olib tashlandi.", "adminRemovedUserMultiple": "{name} va {count} boshqalar Administrator sifatida olib tashlandi.", "adminRemovedUserOther": "{name} va {other_name} Administrator sifatida olib tashlandi.", - "adminSendingPromotion": "Admin lavozimiga yuborish", "adminSettings": "Administrator Sozlamalari", - "adminTwoPromotedToAdmin": "{name} va {other_name} Administrator sifatida ko'tarildi.", + "adminTwoPromotedToAdmin": "{name} va {other_name} Administrator darajasiga ko'tarildi.", "andMore": "+{count}", "anonymous": "Anonim", "appearanceAutoDarkMode": "Avtomatik qorong'u rejim", @@ -161,9 +160,9 @@ "cameraErrorNotFound": "Kamera topilmadi", "cameraErrorUnavailable": "Kamera foydalanishga yaroqsiz.", "cameraGrantAccess": "Kamera tarnov acceso qilish", - "cameraGrantAccessDenied": "{app_name} fotosuratlar va videolarni olish uchun kamera kirishini talab qiladi, ammo bu abadiy rad etilgan. Iltimos, ilova sozlamalariga o'ting, \"Ruxsatlar\" ni tanlang va \"Kamera\" ni yoqing.", - "cameraGrantAccessDescription": "{app_name} fotosuratlar va videolarni olish yoki QR kodlarni skanerlash uchun kamera kirishini talab qiladi.", - "cameraGrantAccessQr": "{app_name} QR kodlarini skanerlash uchun kamera kirishini talab qiladi", + "cameraGrantAccessDenied": "{app_name} fotosuratlar va videolarni olish uchun kameraga kirishga ruxsat talab qiladi, ammo bu abadiy rad etilgan. Iltimos, ilova sozlamalariga o'ting, \"Ruxsatlar\" qismini tanlang va \"Kamera\" ni yoqing.", + "cameraGrantAccessDescription": "{app_name} fotosuratlar va videolarni olish yoki QR kodlarni skanerlash uchun kameraga kirishga ruxsat talab qiladi.", + "cameraGrantAccessQr": "{app_name} QR kodlarni skanerlash uchun kamera kirishga ruxsat talab qiladi", "cancel": "Bekor qilish", "changePasswordFail": "Parolni o'zgartirishda xatolik", "clear": "Tozalamoq", @@ -171,7 +170,7 @@ "clearDataAll": "Barcha hujjatlarni o'chir", "clearDataAllDescription": "Bu sizning xabarlaringiz va kontaktlaringizni doimiy o‘chirib tashlaydi. Faqat ushbu qurilmani tozalashni yoki tarmoqdagi ma'lumotlaringizni ham o'chirishni tanlaysizmi?", "clearDataError": "Ma'lumotlar o'chirib bo'lmadi", - "clearDataErrorDescription": "{count, plural, one [Service Node tomonidan # ta ma'lumot o'chirilmadi. Service Node ID: {service_node_id}.] other [Service Node tomonidan # ta ma'lumotlar o'chirilmadi. Service Node ID: {service_node_id}.]}", + "clearDataErrorDescription": "{count, plural, one [Servis Nod tomonidan # ta ma'lumot o'chirilmadi. Servis Nod ID'si: {service_node_id}.] other [Servis Nod tomonidan # ta ma'lumotlar o'chirilmadi. Servis Nod ID'si: {service_node_id}.]}", "clearDataErrorDescriptionGeneric": "Noma'lum xato yuz berdi va sizning ma'lumotlaringiz o'chirilmaydi. O'z ma'lumotlaringizni faqat bu qurilmadan o'chirishni xohlaysizmi?", "clearDevice": "Qurilmani tozalash", "clearDeviceAndNetwork": "Qurilma va tarmoqni tozalash", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Guruhni yangilashda xatolik", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Siz boshqalarning xabarlarini oʻchira olmaysiz", "deleteMessage": "{count, plural, one [Xabarni o'chirish] other [Xabarlarni o'chirish]}", - "deleteMessageConfirm": "Haqiqatan ham bu xabarni o'chirmoqchimisiz?", "deleteMessageDeleted": "{count, plural, one [Xabar o'chirildi] other [Xabarlar oʻchirildi]}", "deleteMessageDeletedGlobally": "Bu xabar oʻchirilgan", "deleteMessageDeletedLocally": "Bu xabar ushbu qurilmada oʻchirilgan", - "deleteMessageDescriptionDevice": "Haqiqatan ham bu xabarni faqat ushbu qurilmadan o'chirmoqchimisiz?", "deleteMessageDescriptionEveryone": "Haqiqatan ham bu xabarni hammadan o'chirmoqchimisiz?", "deleteMessageDeviceOnly": "Faqat ushbu qurilmani o'chirish", "deleteMessageDevicesAll": "Barcha qurilmalarda o'chirish", "deleteMessageEveryone": "Hammadan oʻchirish", - "deleteMessageFailed": "{count, plural, one [Xabarni o'chirishda muammo chiqdi] other [Xabarlarni o'chirishda muammo chiqdi]}", - "deleteMessagesConfirm": "Haqiqatan ham bu xabarlarni o'chirmoqchimisiz?", - "deleteMessagesDescriptionDevice": "Haqiqatan ham bu xabarlarni faqat ushbu qurilma o'chirishmoqchimisiz?", + "deleteMessageFailed": "{count, plural, one [Xabarni o'chirishda xatolik yuz berdi] other [Xabarlarni o'chirishda xatolik yuz berdi]}", "deleteMessagesDescriptionEveryone": "Haqiqatan ham bu xabarlarni hammadan o'chirmoqchimisiz?", "deleting": "O'chirilmoqda", "developerToolsToggle": "Dasturchi asboblari", @@ -310,7 +305,7 @@ "disappearingMessagesFollowSetting": "Sozlamalarga ergashing", "disappearingMessagesFollowSettingOff": "Yuborgan xabarlaringiz endi yo‘qolmaydi. Yo'qoladigan xabarlarni o‘chirib qo‘yishni bas qilishga aminmisiz?", "disappearingMessagesFollowSettingOn": "Xabarlaringizni {time} dan keyin {disappearing_messages_type} qilib yo'q qilishni belgilang?", - "disappearingMessagesLegacy": "{name} eskirgan mijozi ishlatmoqda. Yo'qoladigan xabarlar kutilganidek ishlamasligi mumkin.", + "disappearingMessagesLegacy": "{name} eskirgan programma kliyentini ishlatmoqda. O'chib ketadigan xabarlar kutilganidek ishlamasligi mumkin.", "disappearingMessagesOnlyAdmins": "Faqat guruh administratorlari ushbu sozlamani o'zgartirishi mumkin.", "disappearingMessagesSent": "Jo'natildi", "disappearingMessagesSet": "{name} yo'qolgan xabarlar {time} da {disappearing_messages_type} qilib belgilanishini o'rnatdi.", @@ -322,7 +317,7 @@ "disappearingMessagesTurnedOffYouGroup": "Siz yo'qoladigan xabarlarni oʻchirdingiz.", "disappearingMessagesTypeRead": "o'qilgan", "disappearingMessagesTypeSent": "jo'natildi", - "disappearingMessagesUpdated": "{admin_name} yo'qoladigan xabar sozlamalarini yangiladi.", + "disappearingMessagesUpdated": "{admin_name} o'chib ketadigan xabar sozlamalarini yangiladi.", "disappearingMessagesUpdatedYou": "Siz yo'qolgan xabar sozlamalarini yangiladingiz.", "dismiss": "Rad etish", "displayNameDescription": "Bu sizning haqiqiy ismingiz, taxallus yoki boshqasi bo'lishi mumkin — va siz uni istalgan vaqtda o'zgartirishingiz mumkin.", @@ -352,9 +347,9 @@ "emojiReactsClearAll": "Barcha {emoji} ni tozalashni xohlaysizmi?", "emojiReactsCoolDown": "To'xtang! Siz juda ko'p emoji reaksiyalarni yubordingiz. Keyinroq urinib ko'ring", "emojiReactsCountOthers": "{count, plural, one [Va # xabarga ushbu reaksiyani berdi: {emoji}.] other [Va # xabarga ushbu reaksiyani berdi: {emoji}.]}", - "emojiReactsHoverNameDesktop": "{name} {emoji_name} bilan reaksiyaga kirdi", - "emojiReactsHoverNameTwoDesktop": "{name} va {other_name} {emoji_name} bilan reaksiyaga kirdilar", - "emojiReactsHoverTwoNameMultipleDesktop": "{name} va {count} boshqalar {emoji_name} bilan reaksiyaga kirdilar", + "emojiReactsHoverNameDesktop": "{name} {emoji_name} bilan reaksiya qoldirdi", + "emojiReactsHoverNameTwoDesktop": "{name} va {other_name} {emoji_name} bilan reaksiya qoldirdilar", + "emojiReactsHoverTwoNameMultipleDesktop": "{name} va {count} boshqalar {emoji_name} bilan reaksiya qoldirdilar", "emojiReactsHoverYouNameDesktop": "{emoji_name} bilan reaksiyaga kirdi", "emojiReactsHoverYouNameMultipleDesktop": "Siz va {count} boshqalar {emoji_name} bilan reaksiyaga kirdilar", "emojiReactsHoverYouNameTwoDesktop": "Siz va {name} {emoji_name} bilan reaksiyaga kirdilar", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "{name} va {count} a'zoni {group_name} ga taklif qilishda muammo chiqdi", "groupInviteFailedTwo": "{name} va {other_name}ni {group_name} ga taklif qilishda muammo chiqdi", "groupInviteFailedUser": "{name}ni {group_name} ga taklif qilishda muammo chiqdi", - "groupInviteSending": "Taklif yuborilmoqda", "groupInviteSent": "Taklif yuborildi", "groupInviteSuccessful": "Muvaffaqiyatli guruh tizimiga taklif qilingan", "groupInviteVersion": "A'zolarga taklifnomalar olish uchun oxirgi versiyasini yangilangan bo'lishi kerak", @@ -403,7 +397,7 @@ "groupLeaveErrorFailed": "{group_name} dan chiqish vaqtida muammo chiqdi", "groupLegacyBanner": "Guruhlar yangilandi, yangilanish uchun yangi guruh yarating. Eski guruh qobiliyatlari {date} dan pastga ketadi.", "groupMemberLeft": "{name} guruhni tark etdi.", - "groupMemberLeftMultiple": "{name} va {count} boshqa guruhni tark etishdi.", + "groupMemberLeftMultiple": "{name} va {count} boshqalar guruhni tark etishdi.", "groupMemberLeftTwo": "{name} va {other_name} guruhni tark etdi.", "groupMemberNew": "{name} guruhga qo'shildi.", "groupMemberNewHistory": "{name} guruhga taklif qilindi. Suhbat tarixini ko'rish imkoniyati berilgan.", @@ -431,9 +425,9 @@ "groupRemoveDescriptionMultiple": "{name} va {count} boshqalarni {group_name}dan o'chirmoqchimisiz?", "groupRemoveDescriptionTwo": "{name} va {other_name}ni {group_name}dan o'chirmoqchimisiz?", "groupRemoveMessages": "{count, plural, one [Foydalanuvchi va ularning xabarlarini olib tashlash] other [Foydalanuvchilar va ularning xabarlarini olib tashlash]}", - "groupRemoveUserOnly": "{count, plural, one [Foydalanuvchini olib tashlash] other [Foydalanuvchilarni olib tashlash]}", + "groupRemoveUserOnly": "{count, plural, one [Foydalanuvchini chiqarib yuborish] other [Foydalanuvchilarni chiqarib yuborish]}", "groupRemoved": "{name} guruhdan chiqarib yuborildi.", - "groupRemovedMultiple": "{name} va {count} boshqa guruhdan chiqarib yuborildi.", + "groupRemovedMultiple": "{name} va {count} boshqalar guruhdan chiqarib yuborildi.", "groupRemovedTwo": "{name} va {other_name} guruhdan chiqarib yuborildi.", "groupRemovedYou": "Siz {group_name} dan chiqarib yuborildingiz.", "groupRemovedYouMultiple": "Siz va {count} boshqalar guruhdan chiqarib yuborildi.", @@ -465,7 +459,7 @@ "leave": "Chiqish", "leaving": "Chiqmoqda...", "legacyGroupMemberNew": "{name} guruhga qo'shildi.", - "legacyGroupMemberNewMultiple": "{name} va {count} boshqa guruhga qo'shildilar.", + "legacyGroupMemberNewMultiple": "{name} va {count} boshqalar guruhga qo'shildilar.", "legacyGroupMemberNewYouMultiple": "Siz va {count} boshqalar guruhga qo'shildilar.", "legacyGroupMemberNewYouOther": "Siz va {other_name} guruhga qo'shildilar.", "legacyGroupMemberTwoNew": "{name} va {other_name} guruhga qo'shildilar.", @@ -491,11 +485,11 @@ "lockAppQuickResponse": "Tez javob {app_name} qulflanganda mavjud emas!", "lockAppStatus": "Qulflanish holati", "lockAppUnlock": "Qulflashni ochish uchun bosing", - "lockAppUnlocked": "{app_name} qulfi ochiq", + "lockAppUnlocked": "{app_name} ning qulfi ochiq", "max": "Eng yuqori", "media": "Media", - "members": "{count, plural, one [# ta aʼzo] other [# ta aʼzo]}", - "membersActive": "{count, plural, one [# ta aʼzo] other [# aktiv aʼzo]}", + "members": "{count, plural, one [# aʼzo] other [# aʼzolar]}", + "membersActive": "{count, plural, one [# aktiv aʼzo] other [# aktiv aʼzolar]}", "membersAddAccountIdOrOns": "Akkaunt ID yoki ONS qo'shish", "membersInvite": "Kontaktlarni taklif qilish", "membersInviteSend": "{count, plural, one [Taklif yuborish] other [Takliflarni yuborish]}", @@ -517,7 +511,7 @@ "messageNew": "{count, plural, one [Yangi xabar] other [Yangi xabarlar]}", "messageNewDescriptionDesktop": "Do'stingizning hisob ID yoki ONS ni kiriting va yangi suhbatni boshlang.", "messageNewDescriptionMobile": "Do'stingizning hisob ID, ONS ni kiriting yoki QR kodini skanerla va yangi suhbatni boshlang.", - "messageNewYouveGot": "{count, plural, one [Sizga yangi xabar keldi.] other [Sizga # yangi xabar keldi.]}", + "messageNewYouveGot": "{count, plural, one [Sizga yangi xabar keldi.] other [Sizga # ta yangi xabarlar keldi.]}", "messageReplyingTo": "Bunga javob", "messageRequestGroupInvite": "{name} sizni {group_name} ga qo'shilishga taklif qildi.", "messageRequestGroupInviteDescription": "Ushbu guruhga xabar yuborish avtomatik ravishda guruh taklifini qabul qiladi.", @@ -602,7 +596,7 @@ "onboardingBubbleCreatingAnAccountIsEasy": "Hisob yaratish bir zumda, bepul va anonimdir {emoji}", "onboardingBubbleNoPhoneNumber": "Ro'yxatdan o'tish uchun sizga telefon raqami kerak emas.", "onboardingBubblePrivacyInYourPocket": "Xavfsizlik - sizning cho`ntagingizda.", - "onboardingBubbleSessionIsEngineered": "{app_name} sizning maxfiyligingizni himoya qilish uchun ishlab chiqilgan.", + "onboardingBubbleSessionIsEngineered": "{app_name} sizning maxfiyligingizni himoya qilish uchun ishlab chiqarilgan.", "onboardingBubbleWelcomeToSession": "{app_name} ga xush kelibsiz {emoji}", "onboardingHitThePlusButton": "Suhbatni boshlash, guruh yaratish yoki rasmiy Community ga qo'shilish uchun plus tugmasini bosing!", "onboardingMessageNotificationExplanation": "{app_name} yangi xabarlar xaqida sizni ikki xil usulda xabardor qilishi mumkin.", @@ -610,7 +604,7 @@ "onboardingTos": "Foydalanish shartlari", "onboardingTosPrivacy": "Ushbu xizmatdan foydalanganingiz uchun, siz bizning Foydalanish Shartlari va Maxfiylik Siyosati ga rozilik bildirasiz", "onionRoutingPath": "Yo‘l", - "onionRoutingPathDescription": "{app_name} sizning IP-ingizni {app_name}ning markazlashmagan tarmog'i orqali xabarlaringizni bir necha xizmat tugunlari orqali o'tkazish orqali yashiradi. Bu sizning joriy yo'lingiz:", + "onionRoutingPathDescription": "{app_name} sizning IP-ingizni {app_name}ning markazlashmagan tarmog'i, xabarlaringizni bir necha xizmat tarmoqlaridan o'tkazish orqali yashiradi. Bu sizning joriy yo'lingiz:", "onionRoutingPathDestination": "Manzil", "onionRoutingPathEntryNode": "Kirish tugmasi", "onionRoutingPathServiceNode": "Service Node", @@ -647,12 +641,12 @@ "permissionsCameraDenied": "{app_name} fotosuratlar va videolarni olish uchun kamera kirishini talab qiladi, ammo bu abadiy rad etilgan. Sozlamalar → Ruxsatlar, va \"Kamera\"ni yoqing.", "permissionsFaceId": "{app_name} dagi ekran blokirovkasi funksiyasi Face ID dan foydalanadi.", "permissionsKeepInSystemTray": "Tizim trayidka saqlash", - "permissionsKeepInSystemTrayDescription": "{app_name} oynani yopinganda fon rejimida ishlashda davom etadi", + "permissionsKeepInSystemTrayDescription": "{app_name} oyna yopilganda ham fon rejimida ishlashda davom etadi", "permissionsLibrary": "{app_name} davom etish uchun foto kutubxonaga kirishni talab qiladi. Siz kirishni iOS sozlamalarida yoqishingiz mumkin.", "permissionsMicrophone": "Mikrofon", - "permissionsMicrophoneAccessRequired": "{app_name} qo'ng'iroq qilish va ovozli xabarlar yuborish uchun mikrofon kirishini talab qiladi, ammo bu abadiy rad etilgan. Sozlamalar → Ruxsatlar ni bosing va \"Mikrofon\" ni yoqing.", + "permissionsMicrophoneAccessRequired": "{app_name} qo'ng'iroq qilish va ovozli xabarlar yuborish uchun mikrofonga kirishga ruxsat talab qiladi, ammo bu abadiy rad etilgan. Sozlamalar → Ruxsatlar ni bosing va \"Mikrofon\" ni yoqing.", "permissionsMicrophoneAccessRequiredDesktop": "{app_name}ning maxfiylik sozlamalarida mikrofon kirish huquqini yoqishingiz mumkin", - "permissionsMicrophoneAccessRequiredIos": "{app_name} qo'ng'iroq qilish va audio xabarlarni yozish uchun mikrofon kirishini talab qiladi.", + "permissionsMicrophoneAccessRequiredIos": "{app_name} qo'ng'iroqlar va audio xabarlarni yozish uchun mikrofonga kirishga ruxsat talab qiladi.", "permissionsMicrophoneDescription": "Mikrofonga kirishga ruxsat bering.", "permissionsMusicAudio": "{app_name} fayllar, musiqa va audioni jo'natish uchun musiqa va audio kirishiga ehtiyoj bor.", "permissionsRequired": "Ruxsat kerak", @@ -772,7 +766,7 @@ "updateDownloaded": "Yangilanish o‘rnatildi, qayta yuklash uchun bosing", "updateDownloading": "Yuklanmoqda: {percent_loader}%", "updateError": "Yangilanmadi", - "updateErrorDescription": "{app_name} yangilanmadi. Iltimos, {session_download_url} ga o'ting va yangi versiyasini qo'lda o'rnating, keyin bu muammo haqida bizga xabar berish uchun yordam markazimizga murojaat qiling.", + "updateErrorDescription": "{app_name} yangilanishida xatolik yuz berdi. Iltimos, {session_download_url} ga o'ting va yangi versiyasini qo'lda o'rnating, keyin bu muammo haqida bizga xabar berish uchun yordam markazimizga murojaat qiling.", "updateNewVersion": "{app_name} ning yangi versiyasi mavjud, yangilanish uchun bosing", "updateNewVersionDescription": "{app_name} ning yangi versiyasi mavjud.", "updateReleaseNotes": "Qaydlarni och", diff --git a/_locales/vi/messages.json b/_locales/vi/messages.json index 89090c62f9..5c81235990 100644 --- a/_locales/vi/messages.json +++ b/_locales/vi/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} đã bị loại khỏi Admin.", "adminRemovedUserMultiple": "{name} và {count} người khác đã bị xoá khỏi vai trò Quản trị viên.", "adminRemovedUserOther": "{name} và {other_name} đã bị xoá khỏi vai trò Quản trị viên.", - "adminSendingPromotion": "Đang gửi khuyến mại quản trị viên", "adminSettings": "Cài đặt quản trị viên", "adminTwoPromotedToAdmin": "{name} và {other_name} được thăng lên làm Admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Không thể Cập nhật Nhóm", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Bạn không có quyền để xoá các tin nhắn của người khác", "deleteMessage": "{count, plural, other [Xóa tin nhắn]}", - "deleteMessageConfirm": "Bạn có chắc chắn rằng bạn muốn xoá tin nhắn này không?", "deleteMessageDeleted": "{count, plural, other [Các tin nhắn đã bị xoá]}", "deleteMessageDeletedGlobally": "Tin nhắn này đã bị xóa", "deleteMessageDeletedLocally": "Tin nhắn sẽ chỉ được xoá trên thiết bị này", - "deleteMessageDescriptionDevice": "Bạn có chắc chắn rằng bạn muốn xoá tin nhắn này chỉ trên thiết bị này không?", "deleteMessageDescriptionEveryone": "Bạn có chắc chắn rằng bạn muốn xoá tin nhắn này cho mọi người không?", "deleteMessageDeviceOnly": "Chỉ xóa trên thiết bị này", "deleteMessageDevicesAll": "Xóa trên tất cả thiết bị của tôi", "deleteMessageEveryone": "Xoá cho mọi người", "deleteMessageFailed": "{count, plural, other [Không thể xóa tin nhắn]}", - "deleteMessagesConfirm": "Bạn có chắc chắn rằng bạn muốn xoá các tin nhắn này không?", - "deleteMessagesDescriptionDevice": "Bạn có chắc rằng bạn muốn xoá những tin nhắn này chỉ từ thiết bị này?", "deleteMessagesDescriptionEveryone": "Bạn có chắc rằng bạn muốn xoá những tin nhắn này cho tất cả mọi người?", "deleting": "Đang xóa", "developerToolsToggle": "Bật/Tắt Công Cụ Nhà Phát Triển", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Mời {name} và {count} người khác vào nhóm {group_name} thất bại", "groupInviteFailedTwo": "Mời {name} và {other_name} vào nhóm {group_name} thất bại", "groupInviteFailedUser": "Mời {name} vào nhóm {group_name} thất bại", - "groupInviteSending": "Đang gửi lời mời", "groupInviteSent": "Đã gửi lời mời", "groupInviteSuccessful": "Mời tham gia nhóm thành công", "groupInviteVersion": "Người dùng phải có phiên bản mới nhất để nhận được lời mời", diff --git a/_locales/xh/messages.json b/_locales/xh/messages.json index f17be13d6c..940c6e5871 100644 --- a/_locales/xh/messages.json +++ b/_locales/xh/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} ikhutshelwe ngaphandle kwindawo ye-Admin.", "adminRemovedUserMultiple": "{name} kunye {count} abanye abantu basusiwe kubu-Admin.", "adminRemovedUserOther": "{name} kunye {other_name} basusiwe kubu-Admin.", - "adminSendingPromotion": "Ukuthumela ukuqina komlawuli", "adminSettings": "Izilungiselelo zabaAdmin", "adminTwoPromotedToAdmin": "{name} kunye {other_name} banyuselwe kubu-Admin.", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Koyekile ukuhlaziya iqela", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Awunamvume yokucima imiyalezo yabanye", "deleteMessage": "{count, plural, one [Sangula Umphumela] other [Sangula Imiphumela]}", - "deleteMessageConfirm": "Uqinisekile ukuba ufuna ukususa lo myalezo?", "deleteMessageDeleted": "{count, plural, one [Umyalezo ucinyiwe] other [Imiyalezo icinyiwe]}", "deleteMessageDeletedGlobally": "Lo myalezo ususiwe", "deleteMessageDeletedLocally": "Lo myalezo ususiwe kweli sixhobo", - "deleteMessageDescriptionDevice": "Uqinisekile ukuba ufuna ukususa lo myalezo kule sixhobo kuphela?", "deleteMessageDescriptionEveryone": "Uqinisekile ukuba ufuna ukususa lo myalezo kubo bonke?", "deleteMessageDeviceOnly": "Sangula kwisixhobo esi kuphela", "deleteMessageDevicesAll": "Sangula kuzo zonke izixhobo zam", "deleteMessageEveryone": "Sangula kubo bonke", "deleteMessageFailed": "{count, plural, one [Biganye okusindika obubaka] other [Biganye okusindika obubaka]}", - "deleteMessagesConfirm": "Uqinisekile ukuba ufuna ukususa le miyalezo?", - "deleteMessagesDescriptionDevice": "Uqinisekile ukuba ufuna ukucima le miyalezo kweli sixhobo kuphela?", "deleteMessagesDescriptionEveryone": "Uqinisekile ukuba ufuna ukucima le miyalezo kubo bonke?", "deleting": "Kisangulwa", "developerToolsToggle": "Guqula izixhobo zoMphuhlisi", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "Koyekile ukumema {name} kunye {count} nabanye {group_name}", "groupInviteFailedTwo": "Koyekile ukumema {name} kunye {other_name} ku {group_name}", "groupInviteFailedUser": "Koyekile ukumema {name} ku {group_name}", - "groupInviteSending": "Ukuthumela isimemo", "groupInviteSent": "Umemi uthunyelwe", "groupInviteSuccessful": "Isimemo seqela siphumelele", "groupInviteVersion": "Abasebenzisi kufuneka babe ngohlelo lwamva ukufumana izimemo", diff --git a/_locales/zh-CN/messages.json b/_locales/zh-CN/messages.json index 236403cf21..60c3354578 100644 --- a/_locales/zh-CN/messages.json +++ b/_locales/zh-CN/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name}被移除了管理员身份。", "adminRemovedUserMultiple": "{name}和其他{count}人的管理身份被移除。", "adminRemovedUserOther": "{name}和{other_name}的管理身份被移除。", - "adminSendingPromotion": "管理员授权中", "adminSettings": "管理员设置", "adminTwoPromotedToAdmin": "{name}和{other_name}被设置为管理员。", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "更新群组失败", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "您无权删除他人的消息", "deleteMessage": "{count, plural, other [删除消息]}", - "deleteMessageConfirm": "您确定要删除此消息吗？", "deleteMessageDeleted": "{count, plural, other [消息已删除]}", "deleteMessageDeletedGlobally": "此消息已被删除", "deleteMessageDeletedLocally": "此消息在此设备上已被删除", - "deleteMessageDescriptionDevice": "您确定只从此设备删除此消息吗？", "deleteMessageDescriptionEveryone": "您确定要为所有人删除此消息吗？", "deleteMessageDeviceOnly": "仅从此设备上删除", "deleteMessageDevicesAll": "从我的所有设备删除", "deleteMessageEveryone": "为所有人删除", "deleteMessageFailed": "{count, plural, other [未能删除消息。]}", - "deleteMessagesConfirm": "您确定要删除这些消息吗？", - "deleteMessagesDescriptionDevice": "您确定要只从此设备中删除这些消息吗？", "deleteMessagesDescriptionEveryone": "您确定要为所有人删除这些消息吗？", "deleting": "正在删除", "developerToolsToggle": "开发者工具", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "邀请{name}和其他{count}位成员加入{group_name}失败", "groupInviteFailedTwo": "邀请{name}和{other_name}加入{group_name}失败", "groupInviteFailedUser": "邀请{name}加入{group_name}失败", - "groupInviteSending": "邀请发送中", "groupInviteSent": "邀请已发送", "groupInviteSuccessful": "群组邀请成功", "groupInviteVersion": "用户必须使用最新版本才能接受邀请", @@ -448,9 +442,9 @@ "helpReportABugExportLogs": "导出日志", "helpReportABugExportLogsDescription": "导出您的日志，然后通过{app_name}的帮助服务台上传日志。", "helpReportABugExportLogsSaveToDesktop": "保存到桌面", - "helpReportABugExportLogsSaveToDesktopDescription": "将此文件保存到您的桌面，然后与{app_name}开发者分享。", + "helpReportABugExportLogsSaveToDesktopDescription": "将此文件保存到您的桌面，然后与{app_name}开发者分享", "helpSupport": "支持", - "helpWedLoveYourFeedback": "感谢您的反馈。", + "helpWedLoveYourFeedback": "感谢您的反馈", "hide": "隐藏", "hideMenuBarDescription": "切换系统菜单栏可见性", "hideOthers": "隐藏其它", diff --git a/_locales/zh-TW/messages.json b/_locales/zh-TW/messages.json index dbba0e9f13..a9d2b39ba2 100644 --- a/_locales/zh-TW/messages.json +++ b/_locales/zh-TW/messages.json @@ -35,7 +35,6 @@ "adminRemovedUser": "{name} 被撤下管理員的身份。", "adminRemovedUserMultiple": "{name} 和 {count} 位其他成員 被移除管理員身份。", "adminRemovedUserOther": "{name} 和 {other_name} 被移除管理員身份。", - "adminSendingPromotion": "晉升中", "adminSettings": "管理員設定", "adminTwoPromotedToAdmin": "{name} 和 {other_name} 被設置為管理員", "andMore": "+{count}", @@ -275,18 +274,14 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "無法更新群組", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "您無權刪除他人訊息", "deleteMessage": "{count, plural, other [刪除訊息]}", - "deleteMessageConfirm": "您確定要刪除此訊息嗎？", "deleteMessageDeleted": "{count, plural, other [訊息已刪除]}", "deleteMessageDeletedGlobally": "這則訊息已經刪除", "deleteMessageDeletedLocally": "此段訊息已在本設備中刪除", - "deleteMessageDescriptionDevice": "您確定只從本設備上刪除此訊息嗎？", "deleteMessageDescriptionEveryone": "您確定要為所有人刪除此訊息嗎？", "deleteMessageDeviceOnly": "只在這個裝置上刪除", "deleteMessageDevicesAll": "在所有的裝置上刪除", "deleteMessageEveryone": "為所有人刪除", "deleteMessageFailed": "{count, plural, other [無法刪除訊息]}", - "deleteMessagesConfirm": "您確定要刪除這些訊息嗎？", - "deleteMessagesDescriptionDevice": "您確定只從此設備上刪除這些訊息嗎？", "deleteMessagesDescriptionEveryone": "您確定要為所有人刪除這些訊息嗎？", "deleting": "刪除中", "developerToolsToggle": "切換開發者工具", @@ -390,7 +385,6 @@ "groupInviteFailedMultiple": "無法邀請 {name} 和 {count} 位其他成員加入 {group_name}", "groupInviteFailedTwo": "無法邀請 {name} 和 {other_name} 加入 {group_name}", "groupInviteFailedUser": "無法邀請 {name} 加入 {group_name}", - "groupInviteSending": "傳送邀請", "groupInviteSent": "邀請已發送", "groupInviteSuccessful": "群組邀請成功", "groupInviteVersion": "用戶必須擁有最新版本才能接收邀請", diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index c023a11951..38bcf782e3 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -160,9 +160,9 @@ const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Gro * If we were to have the "failed" checks first, we'd hide the "sending" state when we are retrying. */ const statusText = groupInviteSending - ? window.i18n('groupInviteSending') + ? window.i18n('groupInviteSending', { count: 1 }) : groupPromotionSending - ? window.i18n('adminSendingPromotion') + ? window.i18n('adminSendingPromotion', { count: 1 }) : groupPromotionFailed ? window.i18n('adminPromotionFailed') : groupInviteFailed @@ -294,13 +294,15 @@ export const MemberListItem = ({ margin="0 var(--margins-md)" alignItems="flex-start" > - {memberName} + + {memberName} + - + diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index c6f675334b..a5066e39aa 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -632,8 +632,8 @@ function OutdatedClientBanner(props: { const bannerText = selectedConversation.hasOutdatedClient && selectedConversation.hasOutdatedClient !== ourDisplayNameInProfile - ? window.i18n('deleteAfterGroupFirstReleaseConfigOutdated', [selectedConversation.hasOutdatedClient]) - : window.i18n('disappearingMessagesLegacy'); + ? window.i18n('disappearingMessagesLegacy', { name: selectedConversation.hasOutdatedClient }) + : window.i18n('deleteAfterGroupFirstReleaseConfigOutdated'); return selectedConversation.hasOutdatedClient?.length ? ( { showLinkVisitWarningDialog('', dispatch); throw new Error('TODO'); // fixme audric diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index e5a9e63aef..488a5af0a3 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -172,7 +172,7 @@ export const InvitedToGroupControlMessage = () => { // when restoring from seed we might not have the pubkey of who invited us, in that case, we just use a fallback const html = conversationOrigin ? weHaveSecretKey - ? window.i18n('userInvitedYouToGroupAsAdmin', { + ? window.i18n('groupInviteReinvite', { group_name: groupName, name: adminNameInvitedUs, }) @@ -181,7 +181,7 @@ export const InvitedToGroupControlMessage = () => { name: adminNameInvitedUs, }) : weHaveSecretKey - ? window.i18n('youWereInvitedToGroupAsAdmin', { group_name: groupName }) + ? window.i18n('groupInviteReinviteYou', { group_name: groupName }) : window.i18n('groupInviteYou'); return ( diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index d5ae2730c4..14238ecd73 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -8,8 +8,6 @@ import { concat, isEmpty } from 'lodash'; import useUpdate from 'react-use/lib/useUpdate'; import { MemberListItem } from '../../MemberListItem'; import { SessionButton } from '../../basic/SessionButton'; -import { SessionIdEditable } from '../../basic/SessionIdEditable'; - import { useSet } from '../../../hooks/useSet'; import { VALIDATION } from '../../../session/constants'; @@ -35,9 +33,8 @@ import { Localizer } from '../../basic/Localizer'; import { SessionToggle } from '../../basic/SessionToggle'; import { SpacerLG, SpacerMD } from '../../basic/Text'; import { SessionInput } from '../../inputs'; -import { StyledLeftPaneOverlay } from './OverlayMessage'; -import { Header } from '../../conversation/right-panel/overlay/components'; import { SessionSpinner } from '../../loading'; +import { StyledLeftPaneOverlay } from './OverlayMessage'; const StyledMemberListNoContacts = styled.div` text-align: center; @@ -170,10 +167,6 @@ export const OverlayClosedGroupV2 = () => { useKey('Escape', closeOverlay); - const title = window.i18n('groupCreate'); - const buttonText = window.i18n('create'); - const subtitle = window.i18n('createClosedGroupNamePrompt'); - const noContactsForClosedGroup = privateContactsPubkeys.length === 0; const contactsToRender = isSearch ? searchResultContactsOnly : privateContactsPubkeys; @@ -182,17 +175,22 @@ export const OverlayClosedGroupV2 = () => { return (
-
-
@@ -200,7 +198,7 @@ export const OverlayClosedGroupV2 = () => { {isDevProd() && ( <> - Invite as admin?{' '} + Invite as admin Plop?{' '} { @@ -222,23 +220,21 @@ export const OverlayClosedGroupV2 = () => { {noContactsForClosedGroup ? ( ) : ( - - {contactsToRender.map((memberPubkey: string) => ( - m === memberPubkey)} - key={memberPubkey} - onSelect={addToSelected} - onUnselect={removeFromSelected} - disableBg={true} - /> - ))} - + contactsToRender.map((memberPubkey: string) => ( + m === memberPubkey)} + key={memberPubkey} + onSelect={addToSelected} + onUnselect={removeFromSelected} + disableBg={true} + /> + )) )} , -):LocalizerComponentPropsObject { +export function getLeftGroupUpdateChangeStr(left: Array): LocalizerComponentPropsObject { const { others, us } = usAndXOthers(left); if (left.length !== 1) { @@ -78,7 +74,7 @@ export function getLeftGroupUpdateChangeStr( args: { name: ConvoHub.use().getContactProfileNameOrShortenedPubKey(others[0]), }, - } ; + }; } export function getJoinedGroupUpdateChangeStr( @@ -88,33 +84,43 @@ export function getJoinedGroupUpdateChangeStr( _groupName: string ): LocalizerComponentPropsObject { const { others, us } = usAndXOthers(joined); - const othersNames = others.map( - ConvoHub.use().getContactProfileNameOrShortenedPubKey - ); + const othersNames = others.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey); if (groupv2) { if (us) { switch (othersNames.length) { case 0: - return { token: addedWithHistory ? 'groupMemberNewYou' : 'groupInviteYou' } ; + return { token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou' }; case 1: - return addedWithHistory ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } } : {token: 'legacyGroupMemberNewYouOther', args: {other_name: othersNames[0]}}; + return addedWithHistory + ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } } + : { token: 'legacyGroupMemberNewYouOther', args: { other_name: othersNames[0] } }; default: - return addedWithHistory ? { token: 'groupMemberNewYouHistoryMultiple', args: { count: othersNames.length } } : {token: 'groupInviteYouAndMoreNew', args: {count: othersNames.length}}; + return addedWithHistory + ? { token: 'groupMemberNewYouHistoryMultiple', args: { count: othersNames.length } } + : { token: 'groupInviteYouAndMoreNew', args: { count: othersNames.length } }; } } switch (othersNames.length) { case 0: - return { token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou' } ; + return { token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou' }; case 1: - return addedWithHistory ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } } : {token: 'legacyGroupMemberNewYouOther', args: {other_name: othersNames[0]}}; + return addedWithHistory + ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } } + : { token: 'legacyGroupMemberNewYouOther', args: { other_name: othersNames[0] } }; default: - return addedWithHistory ? { token: 'groupMemberNewHistoryMultiple', args: { name: othersNames[0], count: othersNames.length -1 } } : {token: 'groupMemberNewMultiple', args: { name: othersNames[0], count: othersNames.length -1 }}; + return addedWithHistory + ? { + token: 'groupMemberNewHistoryMultiple', + args: { name: othersNames[0], count: othersNames.length - 1 }, + } + : { + token: 'groupMemberNewMultiple', + args: { name: othersNames[0], count: othersNames.length - 1 }, + }; } - } - if (us) { switch (othersNames.length) { case 0: @@ -149,14 +155,11 @@ export function getJoinedGroupUpdateChangeStr( } } - export function getPromotedGroupUpdateChangeStr( - joined: Array, + joined: Array ): LocalizerComponentPropsObject { const { others, us } = usAndXOthers(joined); - const othersNames = others.map( - ConvoHub.use().getContactProfileNameOrShortenedPubKey - ); + const othersNames = others.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey); if (us) { switch (othersNames.length) { diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 1c63f47474..7edc62ad0d 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -144,7 +144,7 @@ async function mergeUserConfigsWithIncomingUpdates( const needsPush = await GenericWrapperActions.needsPush(variant); const mergedTimestamps = sameVariant .filter(m => hashesMerged.includes(m.hash)) - .map(m => m.timestamp); + .map(m => m.storedAt); const latestEnvelopeTimestamp = Math.max(...mergedTimestamps); window.log.debug( diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index cfd9ac0a7a..8ce6161690 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -20,6 +20,7 @@ import { } from '../PersistedJob'; import { LibSessionUtil } from '../../libsession/libsession_utils'; import { showUpdateGroupMembersByConvoId } from '../../../../interactions/conversationInteractions'; +import { ConvoHub } from '../../../conversations'; const defaultMsBetweenRetries = 10000; const defaultMaxAttempts = 1; @@ -77,29 +78,40 @@ function displayFailedInvitesForGroup(groupPk: GroupPubkeyType) { void showUpdateGroupMembersByConvoId(groupPk); }; const count = thisGroupFailures.failedMembers.length; + const groupName = ConvoHub.use().get(groupPk)?.getRealSessionUsername() || window.i18n('unknown'); + const firstUserName = + ConvoHub.use().get(thisGroupFailures.failedMembers?.[0])?.getRealSessionUsername() || + window.i18n('unknown'); + const secondUserName = + ConvoHub.use().get(thisGroupFailures.failedMembers?.[1])?.getRealSessionUsername() || + window.i18n('unknown'); switch (count) { case 1: ToastUtils.pushToastWarning( `invite-failed${groupPk}`, - window.i18n('groupInviteFailedUser', [...thisGroupFailures.failedMembers, groupPk]), + window.i18n('groupInviteFailedUser', { group_name: groupName, name: firstUserName }), onToastClick ); break; case 2: ToastUtils.pushToastWarning( `invite-failed${groupPk}`, - window.i18n('groupInviteFailedTwo', [...thisGroupFailures.failedMembers, groupPk]), + window.i18n('groupInviteFailedTwo', { + group_name: groupName, + name: firstUserName, + other_name: secondUserName, + }), onToastClick ); break; default: ToastUtils.pushToastWarning( `invite-failed${groupPk}`, - window.i18n('groupInviteFailedMultiple', [ - thisGroupFailures.failedMembers[0], - `${thisGroupFailures.failedMembers.length - 1}`, - groupPk, - ]), + window.i18n('groupInviteFailedMultiple', { + group_name: groupName, + name: firstUserName, + count: thisGroupFailures.failedMembers.length - 1, + }), onToastClick ); } From 3cd7d3272bf7b78fb475dd2d55a834516025f75e Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 22 Oct 2024 20:25:42 +1100 Subject: [PATCH 146/302] fix: able to send 1o1 messages back --- ts/models/conversation.ts | 14 ++--- .../apis/snode_api/getServiceNodesList.ts | 7 ++- ts/session/apis/snode_api/getSwarmFor.ts | 6 +- ts/session/apis/snode_api/sessionRpc.ts | 1 + ts/session/apis/snode_api/snodePool.ts | 59 +++++++------------ .../apis/snode_api/snodePoolConstants.ts | 34 +++++++++++ ts/session/onions/onionPath.ts | 15 ++--- ts/session/onions/onionPathConstants.ts | 3 + ts/test/session/unit/onion/GuardNodes_test.ts | 5 +- 9 files changed, 82 insertions(+), 62 deletions(-) create mode 100644 ts/session/apis/snode_api/snodePoolConstants.ts create mode 100644 ts/session/onions/onionPathConstants.ts diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 5492567755..b8f210ec39 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -20,7 +20,6 @@ import { import { DisappearingMessageConversationModeType } from 'libsession_util_nodejs'; import { v4 } from 'uuid'; import { SignalService } from '../protobuf'; -import { getMessageQueue } from '../session'; import { ConvoHub } from '../session/conversations'; import { ClosedGroupV2VisibleMessage, @@ -139,6 +138,7 @@ import { markAttributesAsReadIfNeeded } from './messageFactory'; import { StoreGroupRequestFactory } from '../session/apis/snode_api/factories/StoreGroupRequestFactory'; import { OpenGroupRequestCommonType } from '../data/types'; import { ConversationTypeEnum, CONVERSATION_PRIORITIES } from './types'; +import { getMessageQueue } from '../session/sending'; type InMemoryConvoInfos = { mentionedUs: boolean; @@ -921,15 +921,15 @@ export class ConversationModel extends Backbone.Model { * - ignores a off setting for a legacy group (as we can get a setting from restored from configMessage, and a new group can still be in the swarm when linking a device */ const shouldAddExpireUpdateMsgLegacyGroup = - fromCurrentDevice || ( - isLegacyGroup && - !fromConfigMessage && - (expirationMode !== this.get('expirationMode') || expireTimer !== this.get('expireTimer')) && - expirationMode !== 'off'); + fromCurrentDevice || + (isLegacyGroup && + !fromConfigMessage && + (expirationMode !== this.get('expirationMode') || + expireTimer !== this.get('expireTimer')) && + expirationMode !== 'off'); const shouldAddExpireUpdateMsgGroupV2 = this.isClosedGroupV2() && !fromConfigMessage; - const shouldAddExpireUpdateMessage = shouldAddExpireUpdateMsgPrivate || shouldAddExpireUpdateMsgLegacyGroup || diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index f85c724283..cc3f11a901 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -4,6 +4,7 @@ import { GetNetworkTime } from './getNetworkTime'; import { SnodePool } from './snodePool'; import { Snode } from '../../../data/types'; import { GetServiceNodesSubRequest } from './SnodeRequestTypes'; +import { SnodePoolConstants } from './snodePoolConstants'; /** * Returns a list of unique snodes got from the specified targetNode. @@ -64,7 +65,7 @@ async function getSnodePoolFromSnode(targetNode: Snode): Promise> { */ async function getSnodePoolFromSnodes() { const existingSnodePool = await SnodePool.getSnodePoolFromDBOrFetchFromSeed(); - if (existingSnodePool.length <= SnodePool.minSnodePoolCount) { + if (existingSnodePool.length <= SnodePoolConstants.minSnodePoolCount) { window?.log?.warn( 'getSnodePoolFromSnodes: Cannot get snodes list from snodes; not enough snodes', existingSnodePool.length @@ -101,9 +102,9 @@ async function getSnodePoolFromSnodes() { } ); // We want the snodes to agree on at least this many snodes - if (commonSnodes.length < SnodePool.requiredSnodesForAgreement) { + if (commonSnodes.length < SnodePoolConstants.requiredSnodesForAgreement) { throw new Error( - `Inconsistent snode pools. We did not get at least ${SnodePool.requiredSnodesForAgreement} in common` + `Inconsistent snode pools. We did not get at least ${SnodePoolConstants.requiredSnodesForAgreement} in common` ); } return commonSnodes; diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index ff647e3850..50f1035cbf 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -7,8 +7,6 @@ import { SnodePool } from './snodePool'; import { Snode } from '../../../data/types'; import { SwarmForSubRequest } from './SnodeRequestTypes'; - - /** * get snodes for pubkey from random snode. Uses an existing snode */ @@ -97,6 +95,10 @@ async function requestSnodesForPubkeyRetryable(pubKey: string): Promise { const targetNode = await SnodePool.getRandomSnode(); + if (!targetNode) { + debugger; + } + return requestSnodesForPubkeyWithTargetNode(pubKey, targetNode); }, { diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index b568ed6eb9..a233314909 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -130,6 +130,7 @@ async function snodeRpcNoRetries( allow401s: boolean; } // the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance ): Promise { + const url = `https://${targetNode.ip}:${targetNode.port}/storage_rpc/v1`; const body = { diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts index a8292f4d4f..3aafab6a06 100644 --- a/ts/session/apis/snode_api/snodePool.ts +++ b/ts/session/apis/snode_api/snodePool.ts @@ -10,32 +10,8 @@ import { ServiceNodesList } from './getServiceNodesList'; import { requestSnodesForPubkeyFromNetwork } from './getSwarmFor'; import { Onions } from '.'; import { ed25519Str } from '../../utils/String'; -import { minimumGuardCount, ONION_REQUEST_HOPS } from '../../onions/onionPath'; +import { SnodePoolConstants } from './snodePoolConstants'; -/** - * If we get less than this snode in a swarm, we fetch new snodes for this pubkey - */ -const minSwarmSnodeCount = 3; - -/** - * If we get less than minSnodePoolCount we consider that we need to fetch the new snode pool from a seed node - * and not from those snodes. - */ - -export const minSnodePoolCount = minimumGuardCount * (ONION_REQUEST_HOPS + 1) * 2; - -/** - * If we get less than this amount of snodes (24), lets try to get an updated list from those while we can - */ -const minSnodePoolCountBeforeRefreshFromSnodes = minSnodePoolCount * 2; - -/** - * If we do a request to fetch nodes from snodes and they don't return at least - * the same `requiredSnodesForAgreement` snodes we consider that this is not a valid return. - * - * Too many nodes are not shared for this call to be trustworthy - */ -const requiredSnodesForAgreement = 24; let randomSnodePool: Array = []; @@ -72,7 +48,8 @@ async function dropSnodeFromSnodePool(snodeEd25519: string) { */ async function getRandomSnode(excludingEd25519Snode?: Array): Promise { // make sure we have a few snodes in the pool excluding the one passed as args - const requiredCount = SnodePool.minSnodePoolCount + (excludingEd25519Snode?.length || 0); + const requiredCount = SnodePoolConstants.minSnodePoolCount + (excludingEd25519Snode?.length || 0); + debugger; if (randomSnodePool.length < requiredCount) { await SnodePool.getSnodePoolFromDBOrFetchFromSeed(excludingEd25519Snode?.length); @@ -88,7 +65,12 @@ async function getRandomSnode(excludingEd25519Snode?: Array): Promise): Promise> { // this function throws if it does not have enough snodes to do it await tryToGetConsensusWithSnodesWithRetries(); - if (randomSnodePool.length < SnodePool.minSnodePoolCountBeforeRefreshFromSnodes) { + if (randomSnodePool.length < SnodePoolConstants.minSnodePoolCountBeforeRefreshFromSnodes) { throw new Error('forceRefreshRandomSnodePool still too small after refetching from snodes'); } } catch (e) { @@ -148,7 +134,7 @@ async function getSnodePoolFromDBOrFetchFromSeed( ): Promise> { if ( randomSnodePool && - randomSnodePool.length > SnodePool.minSnodePoolCount + countToAddToRequirement + randomSnodePool.length > SnodePoolConstants.minSnodePoolCount + countToAddToRequirement ) { return randomSnodePool; } @@ -156,7 +142,7 @@ async function getSnodePoolFromDBOrFetchFromSeed( if ( !fetchedFromDb || - fetchedFromDb.length <= SnodePool.minSnodePoolCount + countToAddToRequirement + fetchedFromDb.length <= SnodePoolConstants.minSnodePoolCount + countToAddToRequirement ) { window?.log?.warn( `getSnodePoolFromDBOrFetchFromSeed: not enough snodes in db (${fetchedFromDb?.length}), Fetching from seed node instead... ` @@ -174,7 +160,7 @@ async function getSnodePoolFromDBOrFetchFromSeed( } async function getRandomSnodePool(): Promise> { - if (randomSnodePool.length <= SnodePool.minSnodePoolCount) { + if (randomSnodePool.length <= SnodePoolConstants.minSnodePoolCount) { await SnodePool.getSnodePoolFromDBOrFetchFromSeed(); } return randomSnodePool; @@ -238,7 +224,7 @@ async function tryToGetConsensusWithSnodesWithRetries() { async () => { const commonNodes = await ServiceNodesList.getSnodePoolFromSnodes(); - if (!commonNodes || commonNodes.length < SnodePool.requiredSnodesForAgreement) { + if (!commonNodes || commonNodes.length < SnodePoolConstants.requiredSnodesForAgreement) { // throwing makes trigger a retry if we have some left. window?.log?.info( `tryToGetConsensusWithSnodesWithRetries: Not enough common nodes ${commonNodes?.length}` @@ -329,7 +315,7 @@ async function getSwarmFor(pubkey: string): Promise> { // See how many are actually still reachable // the nodes still reachable are the one still present in the snode pool const goodNodes = randomSnodePool.filter((n: Snode) => nodes.indexOf(n.pubkey_ed25519) !== -1); - if (goodNodes.length >= minSwarmSnodeCount) { + if (goodNodes.length >= SnodePoolConstants.minSwarmSnodeCount) { return goodNodes; } @@ -373,11 +359,6 @@ async function getSwarmFromNetworkAndSave(pubkey: string) { } export const SnodePool = { - // constants - minSnodePoolCount, - minSnodePoolCountBeforeRefreshFromSnodes, - requiredSnodesForAgreement, - // snode pool dropSnodeFromSnodePool, forceRefreshRandomSnodePool, diff --git a/ts/session/apis/snode_api/snodePoolConstants.ts b/ts/session/apis/snode_api/snodePoolConstants.ts new file mode 100644 index 0000000000..1058278ebb --- /dev/null +++ b/ts/session/apis/snode_api/snodePoolConstants.ts @@ -0,0 +1,34 @@ +import { minimumGuardCount, ONION_REQUEST_HOPS } from '../../onions/onionPathConstants'; + +/** + * If we get less than this snode in a swarm, we fetch new snodes for this pubkey + */ +const minSwarmSnodeCount = 3; + +/** + * If we get less than minSnodePoolCount we consider that we need to fetch the new snode pool from a seed node + * and not from those snodes. + */ + +export const minSnodePoolCount = minimumGuardCount * (ONION_REQUEST_HOPS + 1) * 2; + +/** + * If we get less than this amount of snodes (24), lets try to get an updated list from those while we can + */ +const minSnodePoolCountBeforeRefreshFromSnodes = minSnodePoolCount * 2; + +/** + * If we do a request to fetch nodes from snodes and they don't return at least + * the same `requiredSnodesForAgreement` snodes we consider that this is not a valid return. + * + * Too many nodes are not shared for this call to be trustworthy + */ +const requiredSnodesForAgreement = 24; + +export const SnodePoolConstants = { + // constants + minSnodePoolCount, + minSnodePoolCountBeforeRefreshFromSnodes, + requiredSnodesForAgreement, + minSwarmSnodeCount, +}; diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index 141445abc8..a7b792153c 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -13,16 +13,13 @@ import { APPLICATION_JSON } from '../../types/MIME'; import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI'; import { Onions, snodeHttpsAgent } from '../apis/snode_api/onions'; - import { DURATION } from '../constants'; import { UserUtils } from '../utils'; import { allowOnlyOneAtATime } from '../utils/Promise'; import { ed25519Str } from '../utils/String'; import { SnodePool } from '../apis/snode_api/snodePool'; - -export const desiredGuardCount = 2; -export const minimumGuardCount = 1; -export const ONION_REQUEST_HOPS = 3; +import { SnodePoolConstants } from '../apis/snode_api/snodePoolConstants'; +import { desiredGuardCount, minimumGuardCount, ONION_REQUEST_HOPS } from './onionPathConstants'; export function getOnionPathMinTimeout() { return DURATION.SECONDS; @@ -345,7 +342,7 @@ export async function selectGuardNodes(): Promise> { const nodePool = await SnodePool.getSnodePoolFromDBOrFetchFromSeed(); window.log.info(`selectGuardNodes snodePool length: ${nodePool.length}`); - if (nodePool.length < SnodePool.minSnodePoolCount) { + if (nodePool.length < SnodePoolConstants.minSnodePoolCount) { window?.log?.error( `Could not select guard nodes. Not enough nodes in the pool: ${nodePool.length}` ); @@ -451,7 +448,7 @@ async function buildNewOnionPathsWorker() { // get an up to date list of snodes from cache, from db, or from the a seed node. let allNodes = await SnodePool.getSnodePoolFromDBOrFetchFromSeed(); - if (allNodes.length <= SnodePool.minSnodePoolCount) { + if (allNodes.length <= SnodePoolConstants.minSnodePoolCount) { throw new Error(`Cannot rebuild path as we do not have enough snodes: ${allNodes.length}`); } @@ -465,7 +462,7 @@ async function buildNewOnionPathsWorker() { `SessionSnodeAPI::buildNewOnionPaths, snodePool length: ${allNodes.length}` ); // get all snodes minus the selected guardNodes - if (allNodes.length <= SnodePool.minSnodePoolCount) { + if (allNodes.length <= SnodePoolConstants.minSnodePoolCount) { throw new Error('Too few nodes to build an onion path. Even after fetching from seed.'); } @@ -479,7 +476,7 @@ async function buildNewOnionPathsWorker() { return _.fill(Array(group.length), _.sample(group) as Snode); }) ); - if (oneNodeForEachSubnet24KeepingRatio.length <= SnodePool.minSnodePoolCount) { + if (oneNodeForEachSubnet24KeepingRatio.length <= SnodePoolConstants.minSnodePoolCount) { throw new Error( 'Too few nodes "unique by ip" to build an onion path. Even after fetching from seed.' ); diff --git a/ts/session/onions/onionPathConstants.ts b/ts/session/onions/onionPathConstants.ts new file mode 100644 index 0000000000..d40d8485b0 --- /dev/null +++ b/ts/session/onions/onionPathConstants.ts @@ -0,0 +1,3 @@ +export const desiredGuardCount = 2; +export const minimumGuardCount = 1; +export const ONION_REQUEST_HOPS = 3; diff --git a/ts/test/session/unit/onion/GuardNodes_test.ts b/ts/test/session/unit/onion/GuardNodes_test.ts index 224ee90ec5..8dd694580f 100644 --- a/ts/test/session/unit/onion/GuardNodes_test.ts +++ b/ts/test/session/unit/onion/GuardNodes_test.ts @@ -5,7 +5,7 @@ import Sinon, * as sinon from 'sinon'; import { TestUtils } from '../../../test-utils'; import { Onions } from '../../../../session/apis/snode_api/'; -import { minSnodePoolCount, SnodePool } from '../../../../session/apis/snode_api/snodePool'; +import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; import * as OnionPaths from '../../../../session/onions/onionPath'; @@ -15,6 +15,7 @@ import { stubData, } from '../../../test-utils/utils'; import { Snode } from '../../../../data/types'; +import { SnodePoolConstants } from '../../../../session/apis/snode_api/snodePoolConstants'; chai.use(chaiAsPromised as any); chai.should(); @@ -172,7 +173,7 @@ describe('GuardNodes', () => { }); it('throws if we have to fetch from seed, fetch from seed but not have enough fetched snodes', async () => { - const invalidLength = minSnodePoolCount - 1; + const invalidLength = SnodePoolConstants.minSnodePoolCount - 1; const invalidSnodePool = fakeSnodePool.slice(0, invalidLength); stubData('getSnodePoolFromDb').resolves(invalidSnodePool); TestUtils.stubWindow('getSeedNodeList', () => [{ url: 'whatever' }]); From 487e418f733d209c274e39cdcfd89e19d7d4f03c Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 23 Oct 2024 16:17:30 +1100 Subject: [PATCH 147/302] test: fixed a few unit tests --- .../conversation/MessageRequestButtons.tsx | 37 ++++++++++--------- .../SessionMessagesListContainer.tsx | 2 - .../conversation/SubtleNotification.tsx | 6 +++ ts/node/logging.ts | 1 + ts/session/apis/snode_api/snodePool.ts | 2 - ts/session/apis/snode_api/swarmPolling.ts | 4 ++ .../crypto/DecryptedAttachmentsManager.ts | 3 +- .../decryptedAttachmentsManager_test.ts | 7 +--- .../libsession_wrapper_metagroup_test.ts | 1 + .../unit/swarm_polling/SwarmPolling_test.ts | 25 +++++++++---- .../session/unit/utils/OpenGroupUtils_test.ts | 12 +++--- ts/util/logging.ts | 6 +++ 12 files changed, 64 insertions(+), 42 deletions(-) diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index 0f22d88b96..4547696079 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -98,6 +98,25 @@ export const ConversationMessageRequestButtons = () => { return ( + + { + void handleAcceptConversationRequest({ convoId: selectedConvoId }); + }} + text={window.i18n('accept')} + dataTestId="accept-message-request" + /> + { + handleDeclineConversationRequest(selectedConvoId, selectedConvoId, convoOrigin); + }} + dataTestId="decline-message-request" + /> + + + {isOutgoingRequest ? ( ) : ( @@ -116,24 +135,6 @@ export const ConversationMessageRequestButtons = () => { {window.i18n('block')} ) : null} - - - { - void handleAcceptConversationRequest({ convoId: selectedConvoId }); - }} - text={window.i18n('accept')} - dataTestId="accept-message-request" - /> - { - handleDeclineConversationRequest(selectedConvoId, selectedConvoId, convoOrigin); - }} - dataTestId="decline-message-request" - /> - )} diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx index 5c48f47ce2..c8deb3f199 100644 --- a/ts/components/conversation/SessionMessagesListContainer.tsx +++ b/ts/components/conversation/SessionMessagesListContainer.tsx @@ -27,7 +27,6 @@ import { import { getSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { SessionMessagesList } from './SessionMessagesList'; import { TypingBubble } from './TypingBubble'; -import { ConversationMessageRequestButtons } from './MessageRequestButtons'; export type SessionMessageListProps = { messageContainerRef: RefObject; @@ -126,7 +125,6 @@ class SessionMessagesListContainerInner extends Component { key="typing-bubble" /> - { const showMsgRequestUI = selectedConversation && isIncomingMessageRequest; const hasOutgoingMessages = useSelector(hasSelectedConversationOutgoingMessages); + const isGroupV2 = useSelectedIsGroupV2() + + if (isGroupV2) { + return + } + if (!showMsgRequestUI || hasOutgoingMessages) { return null; } diff --git a/ts/node/logging.ts b/ts/node/logging.ts index 80bd5f7d82..e229014422 100644 --- a/ts/node/logging.ts +++ b/ts/node/logging.ts @@ -197,6 +197,7 @@ async function fetchLogFile(logFile: string) { } function logAtLevel(level: string, ...args: any) { + if (logger) { // To avoid [Object object] in our log since console.log handles non-strings smoothly const str = args.map((item: any) => { diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts index 3aafab6a06..ab9b94bd44 100644 --- a/ts/session/apis/snode_api/snodePool.ts +++ b/ts/session/apis/snode_api/snodePool.ts @@ -49,7 +49,6 @@ async function dropSnodeFromSnodePool(snodeEd25519: string) { async function getRandomSnode(excludingEd25519Snode?: Array): Promise { // make sure we have a few snodes in the pool excluding the one passed as args const requiredCount = SnodePoolConstants.minSnodePoolCount + (excludingEd25519Snode?.length || 0); - debugger; if (randomSnodePool.length < requiredCount) { await SnodePool.getSnodePoolFromDBOrFetchFromSeed(excludingEd25519Snode?.length); @@ -67,7 +66,6 @@ async function getRandomSnode(excludingEd25519Snode?: Array): Promise { TestUtils.stubCreateObjectUrl(); }); - it('url starts with attachment path but is not already decrypted', () => { - expect( - DecryptedAttachmentsManager.getAlreadyDecryptedMediaUrl('/local/attachment/attachment1') - ).to.be.eq(null); - }); - it('url starts with attachment path but is not already decrypted', async () => { expect( DecryptedAttachmentsManager.getAlreadyDecryptedMediaUrl('/local/attachment/attachment1') ).to.be.eq(null); + expect(readFileContent.callCount).to.be.eq(0); expect(decryptAttachmentBufferNode.callCount).to.be.eq(0); expect(getItemById.callCount).to.be.eq(0); diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 6e756ee9c6..3da57731e9 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -169,6 +169,7 @@ describe('libsession_metagroup', () => { }); it('can add member by setting its promoted state, both ok and nok', () => { + metaGroupWrapper.memberConstructAndSet(member); metaGroupWrapper.memberSetPromotionSent(member); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts index be6114d2ed..98c028a8a5 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts @@ -15,7 +15,7 @@ import { UserSync } from '../../../../session/utils/job_runners/jobs/UserSyncJob import { sleepFor } from '../../../../session/utils/Promise'; import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { TestUtils } from '../../../test-utils'; -import { generateFakeSnodes, stubData } from '../../../test-utils/utils'; +import { generateFakeSnodes, stubData, stubLibSessionWorker } from '../../../test-utils/utils'; import { ConversationTypeEnum } from '../../../../models/types'; import { ConvoHub } from '../../../../session/conversations'; import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; @@ -135,7 +135,7 @@ describe('SwarmPolling', () => { }); }); - describe('groupv3', () => { + describe('groupv2', () => { it('returns ACTIVE for convo with less than two days old activeAt', () => { const convo = ConvoHub.use().getOrCreate( TestUtils.generateFakeClosedGroupV2PkStr(), @@ -189,36 +189,47 @@ describe('SwarmPolling', () => { describe('pollForAllKeys', () => { beforeEach(() => { + stubData('createOrUpdateItem').resolves(); }); afterEach(() => { Sinon.restore(); }); it('does run for our pubkey even if activeAt is really old ', async () => { + stubLibSessionWorker([]); + const convo = ConvoHub.use().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE); convo.set('active_at', Date.now() - 1000 * 3600 * 25); await swarmPolling.start(true); expect(pollOnceForKeySpy.callCount).to.eq(1); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args[0]).to.deep.eq([ourPubkey.key, 'private']); }); it('does run for our pubkey even if activeAt is recent ', async () => { + stubLibSessionWorker([]); + const convo = ConvoHub.use().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE); convo.set('active_at', Date.now()); await swarmPolling.start(true); expect(pollOnceForKeySpy.callCount).to.eq(1); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); + expect(pollOnceForKeySpy.firstCall.args[0]).to.deep.eq([ourPubkey.key, 'private']); }); describe('legacy group', () => { it('does run for group pubkey on start no matter the recent timestamp', async () => { + const convo = ConvoHub.use().getOrCreate( TestUtils.generateFakePubKeyStr(), ConversationTypeEnum.GROUP ); - TestUtils.stubLibSessionWorker(undefined); + TestUtils.stubLibSessionWorker([]); + stubData('removeAllMessagesInConversation').resolves() + stubData('getLatestClosedGroupEncryptionKeyPair').resolves() + stubData('removeAllClosedGroupEncryptionKeyPairs').resolves() + stubData('removeConversation').resolves() + stubData('fetchConvoMemoryDetails').resolves() convo.set('active_at', Date.now()); const groupConvoPubkey = PubKey.cast(convo.id as string); swarmPolling.addGroupId(groupConvoPubkey); @@ -226,8 +237,8 @@ describe('SwarmPolling', () => { // our pubkey will be polled for, hence the 2 expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); + expect(pollOnceForKeySpy.firstCall.args[0]).to.deep.eq([ourPubkey.key, 'private']); + expect(pollOnceForKeySpy.secondCall.args[0]).to.deep.eq([groupConvoPubkey.key, 'private']); }); it('does only poll from -10 for closed groups if HF >= 19.1 ', async () => { diff --git a/ts/test/session/unit/utils/OpenGroupUtils_test.ts b/ts/test/session/unit/utils/OpenGroupUtils_test.ts index a86cd4b744..0dc372ffd9 100644 --- a/ts/test/session/unit/utils/OpenGroupUtils_test.ts +++ b/ts/test/session/unit/utils/OpenGroupUtils_test.ts @@ -96,7 +96,7 @@ describe('OpenGroupUtils', () => { serverPublicKey: '', serverUrl: 'https://example.org', }) - ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomid and serverUrl to be set'); + ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomId and serverUrl to be set'); }); it('throws if serverUrl is empty', () => { @@ -106,7 +106,7 @@ describe('OpenGroupUtils', () => { serverPublicKey: '05123456789', serverUrl: '', }) - ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomid and serverUrl to be set'); + ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomId and serverUrl to be set'); }); it('throws if roomId is empty', () => { @@ -116,7 +116,7 @@ describe('OpenGroupUtils', () => { serverPublicKey: '05123456789', serverUrl: 'https://example.org', }) - ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomid and serverUrl to be set'); + ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomId and serverUrl to be set'); }); it('throws if pubkey is null', () => { expect(() => @@ -125,7 +125,7 @@ describe('OpenGroupUtils', () => { serverPublicKey: null as any, serverUrl: 'https://example.org', }) - ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomid and serverUrl to be set'); + ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomId and serverUrl to be set'); }); it('throws if serverUrl is null', () => { @@ -135,7 +135,7 @@ describe('OpenGroupUtils', () => { serverPublicKey: '05123456789', serverUrl: null as any, }) - ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomid and serverUrl to be set'); + ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomId and serverUrl to be set'); }); it('throws if roomId is null', () => { @@ -145,7 +145,7 @@ describe('OpenGroupUtils', () => { serverPublicKey: '05123456789', serverUrl: 'https://example.org', }) - ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomid and serverUrl to be set'); + ).to.throw('getCompleteUrlFromRoom needs serverPublicKey, roomId and serverUrl to be set'); }); }); }); diff --git a/ts/util/logging.ts b/ts/util/logging.ts index c281f73637..add76b2aeb 100644 --- a/ts/util/logging.ts +++ b/ts/util/logging.ts @@ -110,6 +110,12 @@ const development = window && window?.getEnvironment && window?.getEnvironment() // The Bunyan API: https://github.com/trentm/node-bunyan#log-method-api function logAtLevel(level: string, prefix: string, ...args: any) { + // when unit testing with mocha, we just log whatever we get to the console.log + if (typeof (global as any).it === 'function') { + (console as any)._log(prefix, now(), ...args); + return + } + if (prefix === 'DEBUG' && !window.sessionFeatureFlags.debug.debugLogging) { return; } From c1fd66d4e9376ad7e945365ce55fccd34860ef9d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 23 Oct 2024 19:01:28 +1100 Subject: [PATCH 148/302] fix: break down index files to avoid circular deps --- ts/components/leftpane/ActionsPanel.tsx | 4 +- ts/interactions/conversationInteractions.ts | 26 ++-- .../conversations/unsendingInteractions.ts | 24 +-- ts/models/conversation.ts | 56 +++---- ts/models/groupUpdate.ts | 22 +-- ts/models/message.ts | 145 ++++++------------ ts/receiver/callMessage.ts | 4 +- ts/receiver/closedGroups.ts | 10 +- ts/receiver/groupv2/handleGroupV2Message.ts | 24 +-- .../apis/file_server_api/FileServerApi.ts | 4 +- .../opengroupV2/OpenGroupPollingUtils.ts | 4 +- .../apis/snode_api/SnodeRequestTypes.ts | 8 +- ts/session/apis/snode_api/getNetworkTime.ts | 37 +---- ts/session/apis/snode_api/retrieveRequest.ts | 31 ++-- ts/session/apis/snode_api/revokeSubaccount.ts | 6 +- .../snode_api/signature/groupSignature.ts | 8 +- .../snode_api/signature/signatureShared.ts | 4 +- .../snode_api/signature/snodeSignatures.ts | 4 +- .../conversations/ConversationController.ts | 11 +- ts/session/conversations/createClosedGroup.ts | 12 +- ts/session/disappearing_messages/index.ts | 6 +- ts/session/group/closed-group.ts | 24 +-- ts/session/index.ts | 4 +- .../DataExtractionNotificationMessage.ts | 8 +- ts/session/sending/MessageQueue.ts | 20 ++- ts/session/sending/MessageSender.ts | 7 +- .../sending/group/GroupInviteResponse.ts | 24 +++ ts/session/utils/calling/CallManager.ts | 35 ++--- .../utils/job_runners/jobs/GroupInviteJob.ts | 4 +- .../jobs/GroupPendingRemovalsJob.ts | 6 +- .../utils/job_runners/jobs/GroupPromoteJob.ts | 4 +- ts/state/ducks/metaGroups.ts | 12 +- .../unit/crypto/SnodeSignatures_test.ts | 24 +-- .../DisappearingMessage_test.ts | 14 +- .../ExpireRequest_test.ts | 4 +- .../GetExpiriesRequest_test.ts | 4 +- .../libsession_util/libsession_utils_test.ts | 8 +- .../libsession_wrapper_contacts_test.ts | 4 +- .../libsession_wrapper_user_groups_test.ts | 4 +- .../libsession_wrapper_user_profile_test.ts | 4 +- .../session/unit/sending/MessageQueue_test.ts | 6 +- .../unit/sending/MessageSender_test.ts | 4 +- .../snode_api/retrieveNextMessages_test.ts | 6 +- .../group_sync_job/GroupSyncJob_test.ts | 4 +- .../user_sync_job/UserSyncJob_test.ts | 4 +- ts/util/NetworkTime.ts | 41 +++++ ts/util/releaseFeature.ts | 4 +- 47 files changed, 353 insertions(+), 380 deletions(-) create mode 100644 ts/session/sending/group/GroupInviteResponse.ts create mode 100644 ts/util/NetworkTime.ts diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index 58ab12ee61..edf18e16b8 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -7,7 +7,6 @@ import useTimeoutFn from 'react-use/lib/useTimeoutFn'; import { Data } from '../../data/data'; import { ConvoHub } from '../../session/conversations'; -import { getMessageQueue } from '../../session/sending'; import { clearSearch } from '../../state/ducks/search'; import { resetLeftOverlayMode, SectionType, showLeftPaneSection } from '../../state/ducks/section'; @@ -47,6 +46,7 @@ import { useHotkey } from '../../hooks/useHotkey'; import { getIsModalVisible } from '../../state/selectors/modal'; import { ReleasedFeatures } from '../../util/releaseFeature'; +import { MessageQueue } from '../../session/sending'; const Section = (props: { type: SectionType }) => { const ourNumber = useSelector(getOurNumber); @@ -207,7 +207,7 @@ const doAppStartUp = async () => { global.setTimeout(() => { // 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(); + void MessageQueue.use().processAllPending(); }, 3000); global.setTimeout(() => { diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 108871ae9f..ea741cdd68 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -9,12 +9,10 @@ import { SessionButtonColor } from '../components/basic/SessionButton'; import { getCallMediaPermissionsSettings } from '../components/settings/SessionSettings'; import { Data } from '../data/data'; import { SettingsKey } from '../data/settings-key'; -import { GroupV2Receiver } from '../receiver/groupv2/handleGroupV2Message'; import { ConversationTypeEnum } from '../models/types'; import { uploadFileToFsWithOnionV4 } from '../session/apis/file_server_api/FileServerApi'; import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; import { getSwarmPollingInstance } from '../session/apis/snode_api'; -import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../session/conversations'; import { getSodiumRenderer } from '../session/crypto'; import { DecryptedAttachmentsManager } from '../session/crypto/DecryptedAttachmentsManager'; @@ -53,6 +51,8 @@ import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsessio import { ConversationInteractionStatus, ConversationInteractionType } from './types'; import { BlockedNumberController } from '../util'; import { LocalizerComponentProps, LocalizerToken } from '../types/localizer'; +import { sendInviteResponseToGroup } from '../session/sending/group/GroupInviteResponse'; +import { NetworkTime } from '../util/NetworkTime'; export async function copyPublicKeyByConvoId(convoId: string) { if (OpenGroupUtils.isOpenGroupV2(convoId)) { @@ -130,7 +130,7 @@ export const handleAcceptConversationRequest = async ({ convoId }: { convoId: st // this is pretty hacky, but also an admin seeing a message from that user in the group will mark it as not pending anymore await sleepFor(2000); if (!previousIsApproved) { - await GroupV2Receiver.sendInviteResponseToGroup({ groupPk: convoId }); + await sendInviteResponseToGroup({ groupPk: convoId }); } window.log.info( `handleAcceptConversationRequest: first poll for group ${ed25519Str(convoId)} happened, we should have encryption keys now` @@ -243,17 +243,15 @@ export const declineConversationWithConfirm = ({ ? ConvoHub.use().get(conversationIdOrigin)?.getContactProfileNameOrShortenedPubKey() : null; - const convoName = - ConvoHub.use().get(conversationId)?.getNicknameOrRealUsernameOrPlaceholder(); - -const i18nMessage: LocalizerComponentProps = isGroupV2 - ? alsoBlock && originNameToBlock - ? { token: 'blockDescription', args: { name: originNameToBlock }}: // groupv2, and blocking by sender name - { token: 'groupInviteDelete' } // groupv2, and no info about the sender, falling back to delete only - : alsoBlock - ? { token: 'blockDescription', args: { name: convoName } } - : { token: 'messageRequestsDelete' }; + const convoName = ConvoHub.use().get(conversationId)?.getNicknameOrRealUsernameOrPlaceholder(); + const i18nMessage: LocalizerComponentProps = isGroupV2 + ? alsoBlock && originNameToBlock + ? { token: 'blockDescription', args: { name: originNameToBlock } } // groupv2, and blocking by sender name + : { token: 'groupInviteDelete' } // groupv2, and no info about the sender, falling back to delete only + : alsoBlock + ? { token: 'blockDescription', args: { name: convoName } } + : { token: 'messageRequestsDelete' }; window?.inboxStore?.dispatch( updateConfirmModal({ @@ -943,7 +941,7 @@ async function saveConversationInteractionErrorAsMessage({ // Add an error message to the database so we can view it in the message history await conversation?.addSingleIncomingMessage({ - source: GetNetworkTime.now().toString(), + source: NetworkTime.now().toString(), sent_at: Date.now(), interactionNotification: { interactionType, diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index eb1382ca96..d5d59daf2a 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -4,10 +4,8 @@ import { SessionButtonColor } from '../../components/basic/SessionButton'; import { Data } from '../../data/data'; import { ConversationModel } from '../../models/conversation'; import { MessageModel } from '../../models/message'; -import { getMessageQueue } from '../../session'; import { deleteSogsMessageByServerIds } from '../../session/apis/open_group_api/sogsv3/sogsV3DeleteMessages'; import { SnodeAPI } from '../../session/apis/snode_api/SNodeAPI'; -import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../session/apis/snode_api/namespaces'; import { ConvoHub } from '../../session/conversations'; import { getSodiumRenderer } from '../../session/crypto'; @@ -21,6 +19,8 @@ import { resetRightOverlayMode } from '../../state/ducks/section'; import { ed25519Str } from '../../session/utils/String'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; +import { NetworkTime } from '../../util/NetworkTime'; +import { MessageQueue } from '../../session/sending'; async function unsendMessagesForEveryone1o1AndLegacy( conversation: ConversationModel, @@ -37,14 +37,14 @@ async function unsendMessagesForEveryone1o1AndLegacy( // sending to recipient all the messages separately for now await Promise.all( unsendMsgObjects.map(unsendObject => - getMessageQueue() + MessageQueue.use() .sendToPubKey(new PubKey(destination), unsendObject, SnodeNamespaces.Default) .catch(window?.log?.error) ) ); await Promise.all( unsendMsgObjects.map(unsendObject => - getMessageQueue() + MessageQueue.use() .sendSyncMessage({ namespace: SnodeNamespaces.Default, message: unsendObject }) .catch(window?.log?.error) ) @@ -55,7 +55,7 @@ async function unsendMessagesForEveryone1o1AndLegacy( // sending to recipient all the messages separately for now await Promise.all( unsendMsgObjects.map(unsendObject => { - return getMessageQueue() + return MessageQueue.use() .sendToGroup({ message: unsendObject, namespace: SnodeNamespaces.LegacyClosedGroup, @@ -84,9 +84,9 @@ export async function unsendMessagesForEveryoneGroupV2({ return; } - await getMessageQueue().sendToGroupV2NonDurably({ + await MessageQueue.use().sendToGroupV2NonDurably({ message: new GroupUpdateDeleteMemberContentMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), expirationType: 'unknown', // GroupUpdateDeleteMemberContentMessage is not displayed so not expiring. expireTimer: 0, groupPk, @@ -352,7 +352,7 @@ async function unsendMessageJustForThisUser( // sending to our other devices all the messages separately for now await Promise.all( unsendMsgObjects.map(unsendObject => - getMessageQueue() + MessageQueue.use() .sendSyncMessage({ namespace: SnodeNamespaces.Default, message: unsendObject }) .catch(window?.log?.error) ) @@ -513,9 +513,13 @@ export async function deleteMessagesByIdForEveryone( window.inboxStore?.dispatch( updateConfirmModal({ - title: isMe ? window.i18n('deleteMessageDevicesAll') : window.i18n('clearMessagesForEveryone'), + title: isMe + ? window.i18n('deleteMessageDevicesAll') + : window.i18n('clearMessagesForEveryone'), i18nMessage: { token: 'deleteMessage', args: { count: selectedMessages.length } }, - okText: isMe ? window.i18n('deleteMessageDevicesAll') :window.i18n('clearMessagesForEveryone'), + okText: isMe + ? window.i18n('deleteMessageDevicesAll') + : window.i18n('clearMessagesForEveryone'), okTheme: SessionButtonColor.Danger, onClickOk: async () => { await doDeleteSelectedMessages({ selectedMessages, conversation, deleteForEveryone: true }); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index b8f210ec39..fd944fca5c 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -66,7 +66,6 @@ import { } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; import { SogsBlinding } from '../session/apis/open_group_api/sogsv3/sogsBlinding'; import { sogsV3FetchPreviewAndSaveIt } from '../session/apis/open_group_api/sogsv3/sogsV3FetchFile'; -import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../session/apis/snode_api/namespaces'; import { getSodiumRenderer } from '../session/crypto'; import { addMessagePadding } from '../session/crypto/BufferPadding'; @@ -138,7 +137,8 @@ import { markAttributesAsReadIfNeeded } from './messageFactory'; import { StoreGroupRequestFactory } from '../session/apis/snode_api/factories/StoreGroupRequestFactory'; import { OpenGroupRequestCommonType } from '../data/types'; import { ConversationTypeEnum, CONVERSATION_PRIORITIES } from './types'; -import { getMessageQueue } from '../session/sending'; +import { NetworkTime } from '../util/NetworkTime'; +import { MessageQueue } from '../session/sending'; type InMemoryConvoInfos = { mentionedUs: boolean; @@ -606,7 +606,7 @@ export class ConversationModel extends Backbone.Model { const chatMessageParams: VisibleMessageParams = { body: '', // we need to use a new timestamp here, otherwise android&iOS will consider this message as a duplicate and drop the synced reaction - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), reaction, lokiProfile: UserUtils.getOurProfile(), expirationType, @@ -638,7 +638,7 @@ export class ConversationModel extends Backbone.Model { const blinded = Boolean(roomHasBlindEnabled(openGroup)); // send with blinding if we need to - await getMessageQueue().sendToOpenGroupV2({ + await MessageQueue.use().sendToOpenGroupV2({ message: chatMessageOpenGroupV2, roomInfos, blinded, @@ -654,14 +654,14 @@ export class ConversationModel extends Backbone.Model { ...chatMessageParams, syncTarget: this.id, }); - await getMessageQueue().sendSyncMessage({ + await MessageQueue.use().sendSyncMessage({ namespace: SnodeNamespaces.Default, message: chatMessageMe, }); const chatMessagePrivate = new VisibleMessage(chatMessageParams); - await getMessageQueue().sendToPubKey( + await MessageQueue.use().sendToPubKey( destinationPubkey, chatMessagePrivate, SnodeNamespaces.Default @@ -680,7 +680,7 @@ export class ConversationModel extends Backbone.Model { groupId: destinationPubkey.key, }); // we need the return await so that errors are caught in the catch {} - await getMessageQueue().sendToGroup({ + await MessageQueue.use().sendToGroup({ message: closedGroupVisibleMessage, namespace: SnodeNamespaces.LegacyClosedGroup, }); @@ -778,13 +778,13 @@ export class ConversationModel extends Backbone.Model { } const messageRequestResponseParams: MessageRequestResponseParams = { - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), lokiProfile: UserUtils.getOurProfile(), }; const messageRequestResponse = new MessageRequestResponse(messageRequestResponseParams); const pubkeyForSending = new PubKey(this.id); - await getMessageQueue() + await MessageQueue.use() .sendToPubKey(pubkeyForSending, messageRequestResponse, SnodeNamespaces.Default) .catch(window?.log?.error); } @@ -792,7 +792,7 @@ export class ConversationModel extends Backbone.Model { public async sendMessage(msg: SendMessageType) { const { attachments, body, groupInvitation, preview, quote } = msg; this.clearTypingTimers(); - const networkTimestamp = GetNetworkTime.now(); + const networkTimestamp = NetworkTime.now(); window?.log?.info( 'Sending message to conversation', @@ -937,7 +937,7 @@ export class ConversationModel extends Backbone.Model { // When we add a disappearing messages notification to the conversation, we want it // to be above the message that initiated that change, hence the subtraction. - const createAtNetworkTimestamp = (sentAt || GetNetworkTime.now()) - 1; + const createAtNetworkTimestamp = (sentAt || NetworkTime.now()) - 1; // NOTE when we turn the disappearing setting to off, we don't want it to expire with the previous expiration anymore const isV2DisappearReleased = ReleasedFeatures.isDisappearMessageV2FeatureReleasedCached(); @@ -1095,7 +1095,11 @@ export class ConversationModel extends Backbone.Model { const expirationTimerMessage = new ExpirationTimerUpdateMessage(expireUpdate); const pubkey = new PubKey(this.get('id')); - await getMessageQueue().sendToPubKey(pubkey, expirationTimerMessage, SnodeNamespaces.Default); + await MessageQueue.use().sendToPubKey( + pubkey, + expirationTimerMessage, + SnodeNamespaces.Default + ); return true; } @@ -1148,7 +1152,7 @@ export class ConversationModel extends Backbone.Model { const expirationTimerMessage = new ExpirationTimerUpdateMessage(expireUpdateForGroup); - await getMessageQueue().sendToGroup({ + await MessageQueue.use().sendToGroup({ message: expirationTimerMessage, namespace: SnodeNamespaces.LegacyClosedGroup, }); @@ -1298,12 +1302,12 @@ export class ConversationModel extends Backbone.Model { window?.log?.info(`Sending ${timestamps.length} read receipts.`); const receiptMessage = new ReadReceiptMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), timestamps, }); const device = new PubKey(this.id); - await getMessageQueue().sendToPubKey(device, receiptMessage, SnodeNamespaces.Default); + await MessageQueue.use().sendToPubKey(device, receiptMessage, SnodeNamespaces.Default); } public async setNickname(nickname: string | null, shouldCommit = false) { @@ -2065,7 +2069,7 @@ export class ConversationModel extends Backbone.Model { if (!sentAt) { throw new Error('sendMessageJob() sent_at is not set.'); } - const networkTimestamp = GetNetworkTime.now(); + const networkTimestamp = NetworkTime.now(); // we are trying to send a message to someone. Make sure this convo is not hidden await this.unhideIfNeeded(true); @@ -2103,7 +2107,7 @@ export class ConversationModel extends Backbone.Model { } const openGroup = OpenGroupData.getV2OpenGroupRoom(this.id); // send with blinding if we need to - await getMessageQueue().sendToOpenGroupV2({ + await MessageQueue.use().sendToOpenGroupV2({ message: chatMessageOpenGroupV2, roomInfos, blinded: Boolean(roomHasBlindEnabled(openGroup)), @@ -2122,7 +2126,7 @@ export class ConversationModel extends Backbone.Model { chatMessageParams.syncTarget = this.id; const chatMessageMe = new VisibleMessage(chatMessageParams); - await getMessageQueue().sendSyncMessage({ + await MessageQueue.use().sendSyncMessage({ namespace: SnodeNamespaces.Default, message: chatMessageMe, }); @@ -2141,7 +2145,7 @@ export class ConversationModel extends Backbone.Model { expireTimer: chatMessageParams.expireTimer, }); // we need the return await so that errors are caught in the catch {} - await getMessageQueue().sendToPubKey( + await MessageQueue.use().sendToPubKey( destinationPubkey, groupInviteMessage, SnodeNamespaces.Default @@ -2149,7 +2153,7 @@ export class ConversationModel extends Backbone.Model { return; } const chatMessagePrivate = new VisibleMessage(chatMessageParams); - await getMessageQueue().sendToPubKey( + await MessageQueue.use().sendToPubKey( destinationPubkey, chatMessagePrivate, SnodeNamespaces.Default @@ -2175,7 +2179,7 @@ export class ConversationModel extends Backbone.Model { }); // we need the return await so that errors are caught in the catch {} - await getMessageQueue().sendToGroup({ + await MessageQueue.use().sendToGroup({ message: closedGroupVisibleMessage, namespace: SnodeNamespaces.LegacyClosedGroup, }); @@ -2199,7 +2203,7 @@ export class ConversationModel extends Backbone.Model { }); // we need the return await so that errors are caught in the catch {} - await getMessageQueue().sendToGroupV2({ + await MessageQueue.use().sendToGroupV2({ message: groupVisibleMessage, }); } @@ -2258,7 +2262,7 @@ export class ConversationModel extends Backbone.Model { this.set({ active_at: Date.now(), isApproved: true }); // TODO we need to add support for sending blinded25 message request in addition to the legacy blinded15 - await getMessageQueue().sendToOpenGroupV2BlindedRequest({ + await MessageQueue.use().sendToOpenGroupV2BlindedRequest({ encryptedContent: encryptedMsg, roomInfos: roomInfo, message: sogsVisibleMessage, @@ -2544,14 +2548,14 @@ export class ConversationModel extends Backbone.Model { } const typingParams = { - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), isTyping, - typingTimestamp: GetNetworkTime.now(), + typingTimestamp: NetworkTime.now(), }; const typingMessage = new TypingMessage(typingParams); const pubkey = new PubKey(recipientId); - void getMessageQueue() + void MessageQueue.use() .sendTo1o1NonDurably({ pubkey, message: typingMessage, diff --git a/ts/models/groupUpdate.ts b/ts/models/groupUpdate.ts index 385f207b32..3384e67e3d 100644 --- a/ts/models/groupUpdate.ts +++ b/ts/models/groupUpdate.ts @@ -32,7 +32,7 @@ export function getKickedGroupUpdateStr( switch (othersNames.length) { case 0: - throw new Error('kicked without anyone in it.'); + return { token: 'groupUpdated' } case 1: return { token: 'groupRemoved', args: { name: othersNames[0] } }; case 2: @@ -54,12 +54,6 @@ export function getKickedGroupUpdateStr( } } -export function getGroupNameChangeStr(newName: string): LocalizerComponentPropsObject { - return newName - ? { token: 'groupNameNew', args: { group_name: newName } } - : { token: 'groupNameUpdated' }; -} - export function getLeftGroupUpdateChangeStr(left: Array): LocalizerComponentPropsObject { const { others, us } = usAndXOthers(left); @@ -133,7 +127,7 @@ export function getJoinedGroupUpdateChangeStr( } switch (othersNames.length) { case 0: - throw new Error('joined without anyone in it.'); + return { token: 'groupUpdated' } case 1: return { token: 'legacyGroupMemberNew', args: { name: othersNames[0] } }; case 2: @@ -173,7 +167,7 @@ export function getPromotedGroupUpdateChangeStr( } switch (othersNames.length) { case 0: - throw new Error('joined without anyone in it.'); + return { token: 'groupUpdated' } case 1: return { token: 'adminPromotedToAdmin', args: { name: othersNames[0] } }; case 2: @@ -194,3 +188,13 @@ export function getPromotedGroupUpdateChangeStr( }; } } + +export function getGroupNameChangeStr(newName: string | undefined): LocalizerComponentPropsObject { + return newName + ? { token: 'groupNameNew', args: { group_name: newName } } + : { token: 'groupNameUpdated' }; +} + +export function getGroupDisplayPictureChangeStr(): LocalizerComponentPropsObject { + return { token: 'groupDisplayPictureUpdated' }; +} diff --git a/ts/models/message.ts b/ts/models/message.ts index 060e34ba62..7c11fe7572 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -5,7 +5,6 @@ import filesize from 'filesize'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { cloneDeep, debounce, isEmpty, size as lodashSize, partition, pick, uniq } from 'lodash'; import { SignalService } from '../protobuf'; -import { getMessageQueue } from '../session'; import { ConvoHub } from '../session/conversations'; import { ContentMessage } from '../session/messages/outgoing'; import { @@ -34,7 +33,6 @@ import { Data } from '../data/data'; import { OpenGroupData } from '../data/opengroups'; import { SettingsKey } from '../data/settings-key'; import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; -import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../session/apis/snode_api/namespaces'; import { DURATION } from '../session/constants'; import { DisappearingMessages } from '../session/disappearing_messages'; @@ -91,7 +89,16 @@ import { READ_MESSAGE_STATE } from './conversationAttributes'; import { ConversationInteractionStatus, ConversationInteractionType } from '../interactions/types'; import { LastMessageStatusType } from '../state/ducks/types'; import { GetMessageArgs, LocalizerToken } from '../types/localizer'; -import { getGroupNameChangeStr } from './groupUpdate'; +import { + getGroupDisplayPictureChangeStr, + getGroupNameChangeStr, + getJoinedGroupUpdateChangeStr, + getKickedGroupUpdateStr, + getLeftGroupUpdateChangeStr, + getPromotedGroupUpdateChangeStr, +} from './groupUpdate'; +import { NetworkTime } from '../util/NetworkTime'; +import { MessageQueue } from '../session/sending'; // tslint:disable: cyclomatic-complexity @@ -253,92 +260,10 @@ export class MessageModel extends Backbone.Model { return this.get('interactionNotification'); } - public getNotificationText() { + public getNotificationText(): string { const groupUpdate = this.getGroupUpdateAsArray(); - // FIXME this needs to deal with group v2 messages too - console.error('FormatNotifications.formatGroupUpdateNotification'); - /** - * -function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { - const us = UserUtils.getOurPubKeyStrFromCache(); - if (groupUpdate.name) { - return window.i18n('titleIsNow', [groupUpdate.name]); - } - if (groupUpdate.avatarChange) { - return window.i18n('groupAvatarChange'); - } - if (groupUpdate.left) { - if (groupUpdate.left.length !== 1) { - return null; - } - if (arrayContainsUsOnly(groupUpdate.left)) { - return window.i18n('youLeftTheGroup'); - } - // no more than one can send a leave message at a time - return window.i18n('leftTheGroup', [ - ConvoHub.use().getContactProfileNameOrShortenedPubKey(groupUpdate.left[0]), - ]); - } - - if (groupUpdate.joined) { - if (!groupUpdate.joined.length) { - return null; - } - return changeOfMembersV2({ - type: 'added', - us, - changedWithNames: mapIdsWithNames( - groupUpdate.joined, - groupUpdate.joined.map(usernameForQuoteOrFullPkOutsideRedux) - ), - }); - } - if (groupUpdate.joinedWithHistory) { - if (!groupUpdate.joinedWithHistory.length) { - return null; - } - return changeOfMembersV2({ - type: 'addedWithHistory', - us, - changedWithNames: mapIdsWithNames( - groupUpdate.joinedWithHistory, - groupUpdate.joinedWithHistory.map(usernameForQuoteOrFullPkOutsideRedux) - ), - }); - } - if (groupUpdate.kicked) { - if (!groupUpdate.kicked.length) { - return null; - } - if (arrayContainsUsOnly(groupUpdate.kicked)) { - return window.i18n('youGotKickedFromGroup'); - } - return changeOfMembersV2({ - type: 'removed', - us, - changedWithNames: mapIdsWithNames( - groupUpdate.kicked, - groupUpdate.kicked.map(usernameForQuoteOrFullPkOutsideRedux) - ), - }); - } - if (groupUpdate.promoted) { - if (!groupUpdate.promoted.length) { - return null; - } - return changeOfMembersV2({ - type: 'promoted', - us, - changedWithNames: mapIdsWithNames( - groupUpdate.promoted, - groupUpdate.promoted.map(usernameForQuoteOrFullPkOutsideRedux) - ), - }); - } - throw new Error('group_update getDescription() case not taken care of'); -} - */ if (groupUpdate) { + const isGroupV2 = PubKey.is03Pubkey(this.get('conversationId')); const groupName = this.getConversation()?.getNicknameOrRealUsernameOrPlaceholder() || window.i18n('unknown'); @@ -360,9 +285,31 @@ function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { return window.i18n.stripped(...([result.token] as GetMessageArgs)); } + if (groupUpdate.avatarChange) { + const result = getGroupDisplayPictureChangeStr(); + return window.i18n.stripped(...([result.token] as GetMessageArgs)); + } + if (groupUpdate.joined?.length) { // @ts-expect-error -- TODO: Fix by using new i18n builder - const { token, args } = getJoinedGroupUpdateChangeStr(groupUpdate.joined, groupName); + const { token, args } = getJoinedGroupUpdateChangeStr( + groupUpdate.joined, + isGroupV2, + false, + groupName + ); + // TODO: clean up this typing + return window.i18n.stripped(...([token, args] as GetMessageArgs)); + } + + if (groupUpdate.joinedWithHistory?.length) { + // @ts-expect-error -- TODO: Fix by using new i18n builder + const { token, args } = getJoinedGroupUpdateChangeStr( + groupUpdate.joinedWithHistory, + true, + true, + groupName + ); // TODO: clean up this typing return window.i18n.stripped(...([token, args] as GetMessageArgs)); } @@ -373,6 +320,12 @@ function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { // TODO: clean up this typing return window.i18n.stripped(...([token, args] as GetMessageArgs)); } + if (groupUpdate.promoted) { + // @ts-expect-error -- TODO: Fix by using new i18n builder + const { token, args } = getPromotedGroupUpdateChangeStr(groupUpdate.kicked, groupName); + // TODO: clean up this typing + return window.i18n.stripped(...([token, args] as GetMessageArgs)); + } window.log.warn('did not build a specific change for getDescription of ', groupUpdate); return window.i18n.stripped('groupUpdated'); @@ -1093,7 +1046,7 @@ function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { if (conversation.isPublic()) { const openGroupParams: OpenGroupVisibleMessageParams = { identifier: this.id, - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), lokiProfile: UserUtils.getOurProfile(), body, attachments, @@ -1108,7 +1061,7 @@ function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { const openGroupMessage = new OpenGroupVisibleMessage(openGroupParams); const openGroup = OpenGroupData.getV2OpenGroupRoom(conversation.id); - return getMessageQueue().sendToOpenGroupV2({ + return MessageQueue.use().sendToOpenGroupV2({ message: openGroupMessage, roomInfos, blinded: roomHasBlindEnabled(openGroup), @@ -1116,7 +1069,7 @@ function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { }); } - const createAtNetworkTimestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = NetworkTime.now(); const chatParams: VisibleMessageParams = { identifier: this.id, @@ -1143,7 +1096,7 @@ function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { } if (conversation.isPrivate()) { - return getMessageQueue().sendToPubKey( + return MessageQueue.use().sendToPubKey( PubKey.cast(conversation.id), chatMessage, SnodeNamespaces.Default @@ -1165,7 +1118,7 @@ function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { chatMessage, }); // we need the return await so that errors are caught in the catch {} - return await getMessageQueue().sendToGroupV2({ + return await MessageQueue.use().sendToGroupV2({ message: groupV2VisibleMessage, }); } @@ -1175,7 +1128,7 @@ function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { chatMessage, }); - return getMessageQueue().sendToGroup({ + return MessageQueue.use().sendToGroup({ message: closedGroupVisibleMessage, namespace: SnodeNamespaces.LegacyClosedGroup, }); @@ -1249,7 +1202,7 @@ function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { } public async sendSyncMessageOnly(contentMessage: ContentMessage) { - const now = GetNetworkTime.now(); + const now = NetworkTime.now(); this.set({ sent_to: [UserUtils.getOurPubKeyStrFromCache()], @@ -1295,7 +1248,7 @@ function formatGroupUpdateNotification(groupUpdate: MessageGroupUpdate) { ); if (syncMessage) { - await getMessageQueue().sendSyncMessage({ + await MessageQueue.use().sendSyncMessage({ namespace: SnodeNamespaces.Default, message: syncMessage, }); diff --git a/ts/receiver/callMessage.ts b/ts/receiver/callMessage.ts index 0db111887b..2ff072fba9 100644 --- a/ts/receiver/callMessage.ts +++ b/ts/receiver/callMessage.ts @@ -1,12 +1,12 @@ import { toNumber } from 'lodash'; import { SignalService } from '../protobuf'; -import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { TTL_DEFAULT } from '../session/constants'; import { CallManager, UserUtils } from '../session/utils'; import { WithOptExpireUpdate } from '../session/utils/calling/CallManager'; import { IncomingMessageCache } from './cache'; import { EnvelopePlus } from './types'; import { WithMessageHash } from '../session/types/with'; +import { NetworkTime } from '../util/NetworkTime'; // messageHash & messageHash are only needed for actions adding a callMessage to the database (so they expire) export async function handleCallMessage( @@ -45,7 +45,7 @@ export async function handleCallMessage( } if (type === Type.OFFER) { - if (Math.max(sentTimestamp - GetNetworkTime.now()) > TTL_DEFAULT.CALL_MESSAGE) { + if (Math.max(sentTimestamp - NetworkTime.now()) > TTL_DEFAULT.CALL_MESSAGE) { window?.log?.info('Dropping incoming OFFER callMessage sent a while ago: ', sentTimestamp); await IncomingMessageCache.removeFromCache(envelope); diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 0a6b0c87d8..8324f09bb9 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -2,7 +2,6 @@ import _, { isEmpty, isNumber, toNumber } from 'lodash'; import { Data } from '../data/data'; import { SignalService } from '../protobuf'; -import { getMessageQueue } from '../session'; import { ConvoHub } from '../session/conversations'; import { PubKey } from '../session/types'; import { toHex } from '../session/utils/String'; @@ -13,7 +12,6 @@ import { EnvelopePlus } from './types'; import { ConversationModel } from '../models/conversation'; import { getSwarmPollingInstance } from '../session/apis/snode_api'; -import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../session/apis/snode_api/namespaces'; import { DisappearingMessageUpdate } from '../session/disappearing_messages/types'; import { ClosedGroupEncryptionPairReplyMessage } from '../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage'; @@ -30,6 +28,8 @@ import { getSettingsKeyFromLibsessionWrapper } from './configMessage'; import { ECKeyPair, HexKeyPair } from './keypairs'; import { queueAllCachedFromSource } from './receiver'; import { ConversationTypeEnum } from '../models/types'; +import { NetworkTime } from '../util/NetworkTime'; +import { MessageQueue } from '../session/sending'; export const distributingClosedGroupEncryptionKeyPairs = new Map(); @@ -323,7 +323,7 @@ export async function handleNewClosedGroup( : 'legacy', providedExpireTimer: expireTimer, providedSource: sender, - sentAt: GetNetworkTime.now(), + sentAt: NetworkTime.now(), fromSync: false, fromCurrentDevice: false, fromConfigMessage: false, @@ -973,14 +973,14 @@ async function sendLatestKeyPairToUsers( const keypairsMessage = new ClosedGroupEncryptionPairReplyMessage({ groupId: groupPubKey, - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), encryptedKeyPairs: wrappers, expirationType: null, // we keep that one **not** expiring (not rendered in the clients, and we need it to be as available as possible on the swarm) expireTimer: null, }); // the encryption keypair is sent using established channels - await getMessageQueue().sendToPubKey( + await MessageQueue.use().sendToPubKey( PubKey.cast(member), keypairsMessage, SnodeNamespaces.Default diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 5a55f35c08..4d13630901 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -6,14 +6,11 @@ import { deleteMessagesFromSwarmOnly } from '../../interactions/conversations/un import { ConversationTypeEnum } from '../../models/types'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; -import { getMessageQueue } from '../../session'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; -import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../../session/conversations'; import { getSodiumRenderer } from '../../session/crypto'; import { WithDisappearingMessageUpdate } from '../../session/disappearing_messages/types'; import { ClosedGroup } from '../../session/group/closed-group'; -import { GroupUpdateInviteResponseMessage } from '../../session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage'; import { PubKey } from '../../session/types'; import { WithMessageHash } from '../../session/types/with'; import { UserUtils } from '../../session/utils'; @@ -31,6 +28,7 @@ import { MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../../webworker/workers/browser/libsession_worker_interface'; +import { sendInviteResponseToGroup } from '../../session/sending/group/GroupInviteResponse'; type WithSignatureTimestamp = { signatureTimestamp: number }; type WithAuthor = { author: PubkeyType }; @@ -54,25 +52,6 @@ type GroupUpdateDetails = { updateMessage: SignalService.GroupUpdateMessage; } & WithSignatureTimestamp; -/** - * Send the invite response to the group's swarm. An admin will handle it and update our invite pending state to not pending. - * NOTE: - * This message can only be sent once we got the keys for the group, through a poll of the swarm. - */ -async function sendInviteResponseToGroup({ groupPk }: { groupPk: GroupPubkeyType }) { - window.log.info(`sendInviteResponseToGroup for group ${ed25519Str(groupPk)}`); - - await getMessageQueue().sendToGroupV2({ - message: new GroupUpdateInviteResponseMessage({ - groupPk, - isApproved: true, - createAtNetworkTimestamp: GetNetworkTime.now(), - expirationType: 'unknown', // an invite response should not expire - expireTimer: 0, - }), - }); -} - async function handleGroupUpdateInviteMessage({ inviteMessage, author, @@ -734,6 +713,5 @@ async function handleGroupUpdateMessage( export const GroupV2Receiver = { handleGroupUpdateMessage, - sendInviteResponseToGroup, handleGroupUpdateInviteResponseMessage, }; diff --git a/ts/session/apis/file_server_api/FileServerApi.ts b/ts/session/apis/file_server_api/FileServerApi.ts index f9dee5bf96..b2af3b8d75 100644 --- a/ts/session/apis/file_server_api/FileServerApi.ts +++ b/ts/session/apis/file_server_api/FileServerApi.ts @@ -5,8 +5,8 @@ import { batchGlobalIsSuccess, parseBatchGlobalStatusCode, } from '../open_group_api/sogsv3/sogsV3BatchPoll'; -import { GetNetworkTime } from '../snode_api/getNetworkTime'; import { fromUInt8ArrayToBase64 } from '../../utils/String'; +import { NetworkTime } from '../../../util/NetworkTime'; export const fileServerHost = 'filev2.getsession.org'; export const fileServerURL = `http://${fileServerHost}`; @@ -129,7 +129,7 @@ const parseStatusCodeFromOnionRequestV4 = ( export const getLatestReleaseFromFileServer = async ( userEd25519SecretKey: Uint8Array ): Promise => { - const sigTimestampSeconds = GetNetworkTime.getNowWithNetworkOffsetSeconds(); + const sigTimestampSeconds = NetworkTime.getNowWithNetworkOffsetSeconds(); const blindedPkHex = await BlindingActions.blindVersionPubkey({ ed25519SecretKey: userEd25519SecretKey, }); diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts index 919d344515..66a9c0c7d3 100644 --- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts +++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils.ts @@ -4,10 +4,10 @@ import { getSodiumRenderer } from '../../../crypto'; import { OpenGroupData } from '../../../../data/opengroups'; import { UserUtils } from '../../../utils'; import { fromHexToArray } from '../../../utils/String'; -import { GetNetworkTime } from '../../snode_api/getNetworkTime'; import { SogsBlinding } from '../sogsv3/sogsBlinding'; import { OpenGroupMessageV2 } from './OpenGroupMessageV2'; import { OpenGroupV2Room } from '../../../../data/types'; +import { NetworkTime } from '../../../../util/NetworkTime'; export type OpenGroupRequestHeaders = { 'X-SOGS-Pubkey': string; @@ -43,7 +43,7 @@ const getOurOpenGroupHeaders = async ( const nonce = (await getSodiumRenderer()).randombytes_buf(16); - const timestamp = Math.floor(GetNetworkTime.now() / 1000); + const timestamp = Math.floor(NetworkTime.now() / 1000); return SogsBlinding.getOpenGroupHeaders({ signingKeys, serverPK: fromHexToArray(serverPublicKey), diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 9d5dcfb637..b37014a862 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -7,7 +7,6 @@ import { concatUInt8Array } from '../../crypto'; import { PubKey } from '../../types'; import { StringUtils, UserUtils } from '../../utils'; import { ed25519Str } from '../../utils/String'; -import { GetNetworkTime } from './getNetworkTime'; import { SnodeNamespace, SnodeNamespaces, @@ -26,6 +25,7 @@ import { WithTimestamp, } from './types'; import { TTL_DEFAULT } from '../../constants'; +import { NetworkTime } from '../../../util/NetworkTime'; type WithMaxSize = { max_size?: number }; export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; @@ -468,7 +468,7 @@ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { * For Revoke/unrevoke, this needs an admin signature */ public async build() { - const timestamp = GetNetworkTime.now(); + const timestamp = NetworkTime.now(); const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); if (!ourPubKey) { @@ -1147,7 +1147,7 @@ export class StoreUserMessageSubRequest extends SnodeAPISubRequest { method: this.method, params: { pubkey: this.destination, - timestamp: GetNetworkTime.now(), + timestamp: NetworkTime.now(), namespace: this.namespace, ttl: this.ttlMs, data: encryptedDataBase64, @@ -1211,7 +1211,7 @@ export class StoreLegacyGroupMessageSubRequest extends SnodeAPISubRequest { params: { // no signature required for a legacy group retrieve/store of message to namespace -10 pubkey: this.destination, - timestamp: GetNetworkTime.now(), + timestamp: NetworkTime.now(), namespace: this.namespace, ttl: this.ttlMs, data: encryptedDataBase64, diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index e5e8dbbd38..102334358f 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -9,7 +9,7 @@ import { isNumber } from 'lodash'; import { BatchRequests } from './batchRequest'; import { Snode } from '../../../data/types'; import { NetworkTimeSubRequest } from './SnodeRequestTypes'; - +import { NetworkTime } from '../../../util/NetworkTime'; const getNetworkTime = async (snode: Snode): Promise => { const subRequest = new NetworkTimeSubRequest(); @@ -41,48 +41,15 @@ const getNetworkTime = async (snode: Snode): Promise => { return timestamp; }; -let latestTimestampOffset = Number.MAX_SAFE_INTEGER; - function handleTimestampOffsetFromNetwork(_request: string, snodeTimestamp: number) { if (snodeTimestamp && isNumber(snodeTimestamp) && snodeTimestamp > 1609419600 * 1000) { // first january 2021. Arbitrary, just want to make sure the return timestamp is somehow valid and not some crazy low value const clockTime = Date.now(); - if (latestTimestampOffset === Number.MAX_SAFE_INTEGER) { - window?.log?.info(`first timestamp offset received: ${clockTime - snodeTimestamp}ms`); - } - latestTimestampOffset = clockTime - snodeTimestamp; - } -} - -/** - * This function has no use to be called except during tests. - * @returns the current offset we have with the rest of the network. - */ -function getLatestTimestampOffset() { - if (latestTimestampOffset === Number.MAX_SAFE_INTEGER) { - window.log.debug('latestTimestampOffset is not set yet'); - return 0; + NetworkTime.setLatestTimestampOffset(clockTime - snodeTimestamp) } - // window.log.info('latestTimestampOffset is ', latestTimestampOffset); - - return latestTimestampOffset; -} - -function now() { - // make sure to call exports here, as we stub the exported one for testing. - return Date.now() - GetNetworkTime.getLatestTimestampOffset(); -} - -function getNowWithNetworkOffsetSeconds() { - // make sure to call exports here, as we stub the exported one for testing. - - return Math.floor(GetNetworkTime.now() / 1000); } export const GetNetworkTime = { getNetworkTime, handleTimestampOffsetFromNetwork, - getNowWithNetworkOffsetSeconds, - getLatestTimestampOffset, - now, }; diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 84dca11bc2..f01ac4c23d 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -19,6 +19,7 @@ import { import { BatchRequests } from './batchRequest'; import { RetrieveMessagesResultsBatched, RetrieveMessagesResultsContent } from './types'; import { ed25519Str } from '../../utils/String'; +import { NetworkTime } from '../../../util/NetworkTime'; type RetrieveParams = { pubkey: string; @@ -129,7 +130,7 @@ async function buildRetrieveRequest( ) { const isUs = pubkey === ourPubkey; const maxSizeMap = SnodeNamespace.maxSizeMap(namespacesAndLastHashes.map(m => m.namespace)); - const now = GetNetworkTime.now(); + const now = NetworkTime.now(); const retrieveRequestsParams: Array = await Promise.all( namespacesAndLastHashes.map(async ({ lastHash, namespace }) => { @@ -159,7 +160,7 @@ async function buildRetrieveRequest( }) ); - const expiryMs = GetNetworkTime.now() + TTL_DEFAULT.CONFIG_MESSAGE; + const expiryMs = NetworkTime.now() + TTL_DEFAULT.CONFIG_MESSAGE; if (configHashesToBump?.length && isUs) { const request = new UpdateExpiryOnNodeUserSubRequest({ @@ -248,12 +249,12 @@ async function retrieveNextMessagesNoRetries( } // the +1 is to take care of the extra `expire` method added once user config is released - if ( - results.length !== namespacesAndLastHashes.length && - results.length !== namespacesAndLastHashes.length + 1 - ) { + if ( + results.length !== namespacesAndLastHashes.length && + results.length !== namespacesAndLastHashes.length + 1 + ) { throw new Error( - `We asked for updates about ${namespacesAndLastHashes.length} messages but got results of length ${results.length}` + `We asked for updates about ${namespacesAndLastHashes.length} messages but got results of length ${results.length}` ); } @@ -266,15 +267,15 @@ async function retrieveNextMessagesNoRetries( `_retrieveNextMessages - retrieve result is not 200 with ${targetNode.ip}:${targetNode.port} but ${firstResult.code}` ); } - if (configHashesToBump?.length) { - const lastResult = results[results.length - 1]; - if (lastResult?.code !== 200) { - // the update expiry of our config messages didn't work. - window.log.warn( - `the update expiry of our tracked config hashes didn't work: ${JSON.stringify(lastResult)}` - ); + if (configHashesToBump?.length) { + const lastResult = results[results.length - 1]; + if (lastResult?.code !== 200) { + // the update expiry of our config messages didn't work. + window.log.warn( + `the update expiry of our tracked config hashes didn't work: ${JSON.stringify(lastResult)}` + ); + } } - } // we rely on the code of the first one to check for online status const bodyFirstResult = firstResult.body; diff --git a/ts/session/apis/snode_api/revokeSubaccount.ts b/ts/session/apis/snode_api/revokeSubaccount.ts index 5a846c5e96..5a296a66ec 100644 --- a/ts/session/apis/snode_api/revokeSubaccount.ts +++ b/ts/session/apis/snode_api/revokeSubaccount.ts @@ -2,7 +2,7 @@ import { GroupPubkeyType } from 'libsession_util_nodejs'; import { PubKey } from '../../types'; import { SubaccountRevokeSubRequest, SubaccountUnrevokeSubRequest } from './SnodeRequestTypes'; -import { GetNetworkTime } from './getNetworkTime'; +import { NetworkTime } from '../../../util/NetworkTime'; export type RevokeChanges = Array<{ action: 'revoke_subaccount' | 'unrevoke_subaccount'; @@ -25,7 +25,7 @@ async function getRevokeSubaccountParams( ? new SubaccountRevokeSubRequest({ groupPk, revokeTokenHex: revokeChanges.map(m => m.tokenToRevokeHex), - timestamp: GetNetworkTime.now(), + timestamp: NetworkTime.now(), secretKey, }) : undefined; @@ -33,7 +33,7 @@ async function getRevokeSubaccountParams( ? new SubaccountUnrevokeSubRequest({ groupPk, revokeTokenHex: unrevokeChanges.map(m => m.tokenToRevokeHex), - timestamp: GetNetworkTime.now(), + timestamp: NetworkTime.now(), secretKey, }) : undefined; diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 30ac61e712..6d4c0851ac 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -13,12 +13,12 @@ import { GroupUpdatePromoteMessage } from '../../../messages/outgoing/controlMes import { StringUtils, UserUtils } from '../../../utils'; import { fromUInt8ArrayToBase64, stringToUint8Array } from '../../../utils/String'; import { PreConditionFailed } from '../../../utils/errors'; -import { GetNetworkTime } from '../getNetworkTime'; import { SnodeNamespacesGroup } from '../namespaces'; import { SignedGroupHashesParams, WithMessagesHashes, WithShortenOrExtend } from '../types'; import { SignatureShared } from './signatureShared'; import { SnodeSignatureResult } from './snodeSignatures'; import { getSodiumRenderer } from '../../../crypto'; +import { NetworkTime } from '../../../../util/NetworkTime'; async function getGroupInviteMessage({ groupName, @@ -32,7 +32,7 @@ async function getGroupInviteMessage({ groupPk: GroupPubkeyType; }) { const sodium = await getSodiumRenderer(); - const createAtNetworkTimestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = NetworkTime.now(); if (UserUtils.isUsFromCache(member)) { throw new Error('getGroupInviteMessage: we cannot invite ourselves'); @@ -68,7 +68,7 @@ async function getGroupPromoteMessage({ groupPk: GroupPubkeyType; groupName: string; }) { - const createAtNetworkTimestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = NetworkTime.now(); if (UserUtils.isUsFromCache(member)) { throw new Error('getGroupPromoteMessage: we cannot promote ourselves'); @@ -293,7 +293,7 @@ async function getGroupSignatureByHashesParams({ }): Promise { const verificationString = `${method}${messagesHashes.join('')}`; const message = new Uint8Array(StringUtils.encode(verificationString, 'utf8')); - const signatureTimestamp = GetNetworkTime.now(); + const signatureTimestamp = NetworkTime.now(); const sodium = await getSodiumRenderer(); try { diff --git a/ts/session/apis/snode_api/signature/signatureShared.ts b/ts/session/apis/snode_api/signature/signatureShared.ts index 7f6cc2f705..e9d1df41e8 100644 --- a/ts/session/apis/snode_api/signature/signatureShared.ts +++ b/ts/session/apis/snode_api/signature/signatureShared.ts @@ -4,7 +4,7 @@ import { getSodiumRenderer } from '../../../crypto'; import { PubKey } from '../../../types'; import { StringUtils } from '../../../utils'; import { fromUInt8ArrayToBase64 } from '../../../utils/String'; -import { GetNetworkTime } from '../getNetworkTime'; +import { NetworkTime } from '../../../../util/NetworkTime'; export type SnodeSigParamsShared = { namespace: number | null | 'all'; // 'all' can be used to clear all namespaces (during account deletion) @@ -27,7 +27,7 @@ export type SnodeSigParamsUs = SnodeSigParamsShared & { }; function getVerificationDataForStoreRetrieve(params: SnodeSigParamsShared) { - const signatureTimestamp = GetNetworkTime.now(); + const signatureTimestamp = NetworkTime.now(); const verificationString = `${params.method}${ params.namespace === 0 ? '' : params.namespace }${signatureTimestamp}`; diff --git a/ts/session/apis/snode_api/signature/snodeSignatures.ts b/ts/session/apis/snode_api/signature/snodeSignatures.ts index 5ee4b6ed14..027aeadb8f 100644 --- a/ts/session/apis/snode_api/signature/snodeSignatures.ts +++ b/ts/session/apis/snode_api/signature/snodeSignatures.ts @@ -11,7 +11,6 @@ import { PubKey } from '../../../types'; import { StringUtils, UserUtils } from '../../../utils'; import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../../utils/String'; import { PreConditionFailed } from '../../../utils/errors'; -import { GetNetworkTime } from '../getNetworkTime'; import { SignedHashesParams, WithMessagesHashes, @@ -19,6 +18,7 @@ import { WithSignature, WithTimestamp, } from '../types'; +import { NetworkTime } from '../../../../util/NetworkTime'; export type SnodeSignatureResult = WithSignature & WithTimestamp & { @@ -90,7 +90,7 @@ function isSigParamsForGroupAdmin( } function getVerificationData(params: SnodeSigParamsShared) { - const signatureTimestamp = GetNetworkTime.now(); + const signatureTimestamp = NetworkTime.now(); const verificationData = StringUtils.encode( `${params.method}${params.namespace === 0 ? '' : params.namespace}${signatureTimestamp}`, 'utf8' diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index f7d0d911bf..fbd2e4df9b 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -14,7 +14,6 @@ import { BlockedNumberController } from '../../util'; import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGroupManagerV2'; import { PubKey } from '../types'; -import { getMessageQueue } from '..'; import { ConfigDumpData } from '../../data/configDump/configDump'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; import { removeAllClosedGroupEncryptionKeyPairs } from '../../receiver/closedGroups'; @@ -28,12 +27,11 @@ import { import { OpenGroupUtils } from '../apis/open_group_api/utils'; import { getSwarmPollingInstance } from '../apis/snode_api'; import { DeleteAllFromGroupMsgNodeSubRequest } from '../apis/snode_api/SnodeRequestTypes'; -import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { ClosedGroupMemberLeftMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupMemberLeftMessage'; import { GroupUpdateMemberLeftMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftMessage'; import { GroupUpdateMemberLeftNotificationMessage } from '../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftNotificationMessage'; -import { MessageSender } from '../sending'; +import { MessageQueue, MessageSender } from '../sending'; import { UserUtils } from '../utils'; import { ed25519Str } from '../utils/String'; import { PreConditionFailed } from '../utils/errors'; @@ -47,6 +45,7 @@ import { SessionUtilUserGroups } from '../utils/libsession/libsession_utils_user import { DisappearingMessages } from '../disappearing_messages'; import { StoreGroupRequestFactory } from '../apis/snode_api/factories/StoreGroupRequestFactory'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/types'; +import { NetworkTime } from '../../util/NetworkTime'; let instance: ConvoController | null; @@ -639,7 +638,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM if (!group || (!group.secretKey && !group.authData)) { throw new Error('leaveClosedGroup: group from UserGroupsWrapperActions is null '); } - const createAtNetworkTimestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = NetworkTime.now(); // Send the update to the 03 group const ourLeavingMessage = new GroupUpdateMemberLeftMessage({ createAtNetworkTimestamp, @@ -701,7 +700,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM // Send the update to the group const ourLeavingMessage = new ClosedGroupMemberLeftMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), groupId: groupPk, expirationType: null, // we keep that one **not** expiring expireTimer: null, @@ -710,7 +709,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM window?.log?.info(`We are leaving the legacy group ${groupPk}. Sending our leaving message.`); // if we do not have a keyPair for that group, we can't send our leave message, so just skip the message sending part - const wasSent = await getMessageQueue().sendToLegacyGroupNonDurably({ + const wasSent = await MessageQueue.use().sendToLegacyGroupNonDurably({ message: ourLeavingMessage, namespace: SnodeNamespaces.LegacyClosedGroup, destination: groupPk, diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index b3aae235e6..dc9378ccfc 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -4,7 +4,6 @@ import { ECKeyPair } from '../../receiver/keypairs'; import { openConversationWithMessages } from '../../state/ducks/conversations'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; import { getSwarmPollingInstance } from '../apis/snode_api'; -import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { generateClosedGroupPublicKey, generateCurve25519KeyPairWithoutPrefix } from '../crypto'; import { ClosedGroup, GroupInfo } from '../group/closed-group'; @@ -17,7 +16,8 @@ import { UserUtils } from '../utils'; import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils'; import { ConvoHub } from './ConversationController'; import { ConversationTypeEnum } from '../../models/types'; -import { getMessageQueue } from '../sending'; +import { NetworkTime } from '../../util/NetworkTime'; +import { MessageQueue } from '../sending'; /** * Creates a brand new closed group from user supplied details. This function generates a new identityKeyPair so cannot be used to restore a closed group. @@ -179,9 +179,7 @@ async function sendToGroupMembers( } }); const namesOfMembersToResend = membersToResend.map( - m => - ConvoHub.use().get(m)?.getNicknameOrRealUsernameOrPlaceholder() || - window.i18n('unknown') + m => ConvoHub.use().get(m)?.getNicknameOrRealUsernameOrPlaceholder() || window.i18n('unknown') ); if (membersToResend.length < 1) { @@ -222,7 +220,7 @@ function createInvitePromises( admins: Array, encryptionKeyPair: ECKeyPair ) { - const createAtNetworkTimestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = NetworkTime.now(); return listOfMembers.map(async m => { const messageParams: ClosedGroupNewMessageParams = { @@ -236,7 +234,7 @@ function createInvitePromises( expireTimer: 0, }; const message = new ClosedGroupNewMessage(messageParams); - return getMessageQueue().sendTo1o1NonDurably({ + return MessageQueue.use().sendTo1o1NonDurably({ pubkey: PubKey.cast(m), message, namespace: SnodeNamespaces.Default, diff --git a/ts/session/disappearing_messages/index.ts b/ts/session/disappearing_messages/index.ts index 11f2e0a458..24de18e061 100644 --- a/ts/session/disappearing_messages/index.ts +++ b/ts/session/disappearing_messages/index.ts @@ -9,7 +9,6 @@ import { MessageModel } from '../../models/message'; import { SignalService } from '../../protobuf'; import { ReleasedFeatures } from '../../util/releaseFeature'; import { ExpiringDetails, expireMessagesOnSnode } from '../apis/snode_api/expireRequest'; -import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { ConvoHub } from '../conversations'; import { isValidUnixTimestamp } from '../utils/Timestamps'; import { UpdateMsgExpirySwarm } from '../utils/job_runners/jobs/UpdateMsgExpirySwarmJob'; @@ -25,6 +24,7 @@ import { ReadyToDisappearMsgUpdate, } from './types'; import { PubKey } from '../types'; +import { NetworkTime } from '../../util/NetworkTime'; export async function destroyMessagesAndUpdateRedux( messages: Array<{ @@ -172,7 +172,7 @@ function setExpirationStartTimestamp( callLocation?: string, messageId?: string ): number | undefined { - let expirationStartTimestamp: number | undefined = GetNetworkTime.now(); + let expirationStartTimestamp: number | undefined = NetworkTime.now(); if (callLocation) { // window.log.debug( @@ -549,7 +549,7 @@ function getMessageReadyToDisappear( * The way we do it, is by checking that the swarm expiration is before (now + expireTimer). * If it looks like this expiration was not updated yet, we need to trigger a UpdateExpiryJob for that message. */ - const now = GetNetworkTime.now(); + const now = NetworkTime.now(); const expirationNowPlusTimer = now + expireTimer * 1000; const msgExpirationWasAlreadyUpdated = messageExpirationFromRetrieve <= expirationNowPlusTimer; // Note: a message might be added even when it expired, but the periodic cleaning of expired message will pick it up and remove it soon enough diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index fd855a44d2..bf89c4a5be 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -1,7 +1,6 @@ import _ from 'lodash'; import { v4 as uuidv4 } from 'uuid'; -import { getMessageQueue } from '..'; import { Data } from '../../data/data'; import { ConversationModel } from '../../models/conversation'; import { ConversationAttributes } from '../../models/conversationAttributes'; @@ -14,7 +13,6 @@ import { } from '../../receiver/closedGroups'; import { ECKeyPair } from '../../receiver/keypairs'; import { PropsForGroupUpdateType } from '../../state/ducks/conversations'; -import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../apis/snode_api/namespaces'; import { ConvoHub } from '../conversations'; import { generateCurve25519KeyPairWithoutPrefix } from '../crypto'; @@ -34,6 +32,8 @@ import { UserUtils } from '../utils'; import { fromHexToArray, toHex } from '../utils/String'; import { PreConditionFailed } from '../utils/errors'; import { ConversationTypeEnum } from '../../models/types'; +import { NetworkTime } from '../../util/NetworkTime'; +import { MessageQueue } from '../sending'; export type GroupInfo = { id: string; @@ -303,14 +303,14 @@ async function sendNewName(convo: ConversationModel, name: string, messageId: st // Send the update to the group const nameChangeMessage = new ClosedGroupNameChangeMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), groupId, identifier: messageId, name, expirationType: null, // we keep that one **not** expiring expireTimer: 0, }); - await getMessageQueue().sendToGroup({ + await MessageQueue.use().sendToGroup({ message: nameChangeMessage, namespace: SnodeNamespaces.LegacyClosedGroup, }); @@ -339,21 +339,21 @@ async function sendAddedMembers( const encryptionKeyPair = ECKeyPair.fromHexKeyPair(hexEncryptionKeyPair); // Send the Added Members message to the group (only members already in the group will get it) const closedGroupControlMessage = new ClosedGroupAddedMembersMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), groupId, addedMembers, identifier: messageId, expirationType: null, // we keep that one **not** expiring expireTimer: 0, }); - await getMessageQueue().sendToGroup({ + await MessageQueue.use().sendToGroup({ message: closedGroupControlMessage, namespace: SnodeNamespaces.LegacyClosedGroup, }); // Send closed group update messages to any new members individually const newClosedGroupUpdate = new ClosedGroupNewMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), name: groupName, groupId, admins, @@ -367,7 +367,7 @@ async function sendAddedMembers( const promises = addedMembers.map(async m => { await ConvoHub.use().getOrCreateAndWait(m, ConversationTypeEnum.PRIVATE); const memberPubKey = PubKey.cast(m); - await getMessageQueue().sendToPubKey( + await MessageQueue.use().sendToPubKey( memberPubKey, newClosedGroupUpdate, SnodeNamespaces.Default @@ -400,7 +400,7 @@ async function sendRemovedMembers( } // Send the update to the group and generate + distribute a new encryption key pair if needed const mainClosedGroupControlMessage = new ClosedGroupRemovedMembersMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), groupId, removedMembers, identifier: messageId, @@ -408,7 +408,7 @@ async function sendRemovedMembers( expireTimer: 0, }); // Send the group update, and only once sent, generate and distribute a new encryption key pair if needed - await getMessageQueue().sendToGroup({ + await MessageQueue.use().sendToGroup({ message: mainClosedGroupControlMessage, namespace: SnodeNamespaces.LegacyClosedGroup, sentCb: async () => { @@ -464,7 +464,7 @@ async function generateAndSendNewEncryptionKeyPair( const keypairsMessage = new ClosedGroupEncryptionPairMessage({ groupId: toHex(groupId), - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), encryptedKeyPairs: wrappers, expirationType: null, // we keep that one **not** expiring expireTimer: 0, @@ -484,7 +484,7 @@ async function generateAndSendNewEncryptionKeyPair( }; // this is to be sent to the group pubkey address - await getMessageQueue().sendToGroup({ + await MessageQueue.use().sendToGroup({ message: keypairsMessage, namespace: SnodeNamespaces.LegacyClosedGroup, sentCb: messageSentCallback, diff --git a/ts/session/index.ts b/ts/session/index.ts index 3804544466..20ac68fbe4 100644 --- a/ts/session/index.ts +++ b/ts/session/index.ts @@ -6,6 +6,4 @@ import * as Sending from './sending'; import * as Constants from './constants'; import * as ClosedGroup from './group/closed-group'; -const getMessageQueue = Sending.getMessageQueue; - -export { Conversations, Messages, Utils, Types, Sending, Constants, ClosedGroup, getMessageQueue }; +export { Conversations, Messages, Utils, Types, Sending, Constants, ClosedGroup }; diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts index ee8bd51c66..c2cc384e4e 100644 --- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts @@ -1,14 +1,14 @@ import { v4 as uuid } from 'uuid'; -import { getMessageQueue } from '../../..'; import { SignalService } from '../../../../protobuf'; -import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; import { ConvoHub } from '../../../conversations'; import { DisappearingMessages } from '../../../disappearing_messages'; import { PubKey } from '../../../types'; import { UserUtils } from '../../../utils'; import { ExpirableMessage, ExpirableMessageParams } from '../ExpirableMessage'; +import { NetworkTime } from '../../../../util/NetworkTime'; +import { MessageQueue } from '../../../sending'; interface DataExtractionNotificationMessageParams extends ExpirableMessageParams { referencedAttachmentTimestamp: number; @@ -65,7 +65,7 @@ export const sendDataExtractionNotification = async ( const dataExtractionNotificationMessage = new DataExtractionNotificationMessage({ referencedAttachmentTimestamp, identifier: uuid(), - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), expirationType, expireTimer, }); @@ -76,7 +76,7 @@ export const sendDataExtractionNotification = async ( ); try { - await getMessageQueue().sendTo1o1NonDurably({ + await MessageQueue.use().sendTo1o1NonDurably({ pubkey, message: dataExtractionNotificationMessage, namespace: SnodeNamespaces.Default, diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 26040449d3..7a588f6543 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -44,7 +44,7 @@ import { OpenGroupRequestCommonType } from '../../data/types'; // ClosedGroupEncryptionPairReplyMessage must be sent to a user pubkey. Not a group. -export class MessageQueue { +export class MessageQueueCl { private readonly jobQueues: Map = new Map(); private readonly pendingMessageCache: PendingMessageCache; @@ -261,7 +261,7 @@ export class MessageQueue { destination: PubkeyType; }) { if (!destination || !PubKey.is05Pubkey(destination)) { - throw new Error('Invalid legacygroup message passed in sendToLegacyGroupNonDurably.'); + throw new Error('Invalid legacy group message passed in sendToLegacyGroupNonDurably.'); } return this.sendToPubKeyNonDurably({ @@ -396,7 +396,7 @@ export class MessageQueue { } /** - * This method should be called when the app is started and the user loggedin to fetch + * This method should be called when the app is started and the user logged in to fetch * existing message waiting to be sent in the cache of message */ public async processAllPending() { @@ -446,11 +446,15 @@ export class MessageQueue { } } -let messageQueue: MessageQueue; +let messageQueueSingleton: MessageQueueCl; -export function getMessageQueue(): MessageQueue { - if (!messageQueue) { - messageQueue = new MessageQueue(); +function use(): MessageQueueCl { + if (!messageQueueSingleton) { + messageQueueSingleton = new MessageQueueCl(); } - return messageQueue; + return messageQueueSingleton; } + +export const MessageQueue = { + use, +}; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 1574049449..fab2cb0499 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -57,6 +57,7 @@ import { MessageSentHandler } from './MessageSentHandler'; import { MessageWrapper } from './MessageWrapper'; import { stringify } from '../../types/sqlSharedTypes'; import { OpenGroupRequestCommonType } from '../../data/types'; +import { NetworkTime } from '../../util/NetworkTime'; // ================ SNODE STORE ================ @@ -660,7 +661,7 @@ async function sendToOpenGroupV2( // we agreed to pad message for opengroup v2 const paddedBody = addMessagePadding(rawMessage.plainTextBuffer()); const v2Message = new OpenGroupMessageV2({ - sentTimestamp: GetNetworkTime.now(), + sentTimestamp: NetworkTime.now(), base64EncodedData: fromUInt8ArrayToBase64(paddedBody), filesToLink, }); @@ -685,7 +686,7 @@ async function sendToOpenGroupV2BlindedRequest( recipientBlindedId: string ): Promise<{ serverId: number; serverTimestamp: number }> { const v2Message = new OpenGroupMessageV2({ - sentTimestamp: GetNetworkTime.now(), + sentTimestamp: NetworkTime.now(), base64EncodedData: fromUInt8ArrayToBase64(encryptedContent), }); @@ -757,7 +758,7 @@ async function handleBatchResultWithSubRequests({ isNumber(storedAt) ) { seenHashes.push({ - expiresAt: GetNetworkTime.now() + TTL_DEFAULT.CONTENT_MESSAGE, // non config msg expire at CONTENT_MESSAGE at most + expiresAt: NetworkTime.now() + TTL_DEFAULT.CONTENT_MESSAGE, // non config msg expire at CONTENT_MESSAGE at most hash: storedHash, }); diff --git a/ts/session/sending/group/GroupInviteResponse.ts b/ts/session/sending/group/GroupInviteResponse.ts new file mode 100644 index 0000000000..16570ee316 --- /dev/null +++ b/ts/session/sending/group/GroupInviteResponse.ts @@ -0,0 +1,24 @@ +import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { GroupUpdateInviteResponseMessage } from '../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInviteResponseMessage'; +import { ed25519Str } from '../../utils/String'; +import { NetworkTime } from '../../../util/NetworkTime'; +import { MessageQueue } from '../MessageQueue'; + +/** + * Send the invite response to the group's swarm. An admin will handle it and update our invite pending state to not pending. + * NOTE: + * This message can only be sent once we got the keys for the group, through a poll of the swarm. + */ +export async function sendInviteResponseToGroup({ groupPk }: { groupPk: GroupPubkeyType }) { + window.log.info(`sendInviteResponseToGroup for group ${ed25519Str(groupPk)}`); + + await MessageQueue.use().sendToGroupV2({ + message: new GroupUpdateInviteResponseMessage({ + groupPk, + isApproved: true, + createAtNetworkTimestamp: NetworkTime.now(), + expirationType: 'unknown', // an invite response should not expire + expireTimer: 0, + }), + }); +} diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 8c7ee58c2b..925ec2f882 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -20,22 +20,21 @@ import { ConvoHub } from '../../conversations'; import { CallMessage } from '../../messages/outgoing/controlMessage/CallMessage'; import { PubKey } from '../../types'; -import { getMessageQueue } from '../..'; import { getCallMediaPermissionsSettings } from '../../../components/settings/SessionSettings'; import { Data } from '../../../data/data'; import { handleAcceptConversationRequest } from '../../../interactions/conversationInteractions'; import { READ_MESSAGE_STATE } from '../../../models/conversationAttributes'; import { PnServer } from '../../apis/push_notification_api'; -import { GetNetworkTime } from '../../apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../apis/snode_api/namespaces'; import { DURATION } from '../../constants'; import { DisappearingMessages } from '../../disappearing_messages'; import { ReadyToDisappearMsgUpdate } from '../../disappearing_messages/types'; -import { MessageSender } from '../../sending'; +import { MessageQueue, MessageSender } from '../../sending'; import { getIsRinging } from '../RingingManager'; import { getBlackSilenceMediaStream } from './Silence'; import { ed25519Str } from '../String'; import { WithMessageHash } from '../../types/with'; +import { NetworkTime } from '../../../util/NetworkTime'; export type InputItem = { deviceId: string; label: string }; @@ -432,7 +431,7 @@ async function createOfferAndSendIt(recipient: string, msgIdentifier: string | n DisappearingMessages.forcedDeleteAfterReadMsgSetting(convo); const offerMessage = new CallMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), identifier: msgIdentifier || undefined, type: SignalService.CallMessage.Type.OFFER, sdps: [overridenSdps], @@ -442,7 +441,7 @@ async function createOfferAndSendIt(recipient: string, msgIdentifier: string | n }); window.log.info(`sending '${offer.type}'' with callUUID: ${currentCallUUID}`); - const negotiationOfferSendResult = await getMessageQueue().sendTo1o1NonDurably({ + const negotiationOfferSendResult = await MessageQueue.use().sendTo1o1NonDurably({ pubkey: PubKey.cast(recipient), message: offerMessage, namespace: SnodeNamespaces.Default, @@ -522,7 +521,7 @@ export async function USER_callRecipient(recipient: string) { peerConnection = createOrGetPeerConnection(recipient); // send a pre offer just to wake up the device on the remote side const preOfferMsg = new CallMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), type: SignalService.CallMessage.Type.PRE_OFFER, uuid: currentCallUUID, expirationType: null, // Note: Preoffer messages are not added to the DB, so no need to make them expire @@ -612,7 +611,7 @@ const iceSenderDebouncer = _.debounce(async (recipient: string) => { return; } const callIceCandicates = new CallMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), type: SignalService.CallMessage.Type.ICE_CANDIDATES, sdpMLineIndexes: validCandidates.map(c => c.sdpMLineIndex), sdpMids: validCandidates.map(c => c.sdpMid), @@ -626,7 +625,7 @@ const iceSenderDebouncer = _.debounce(async (recipient: string) => { `sending ICE CANDIDATES MESSAGE to ${ed25519Str(recipient)} about call ${currentCallUUID}` ); - await getMessageQueue().sendTo1o1NonDurably({ + await MessageQueue.use().sendTo1o1NonDurably({ pubkey: PubKey.cast(recipient), message: callIceCandicates, namespace: SnodeNamespaces.Default, @@ -912,7 +911,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) { await peerConnection.addIceCandidate(candicate); } } - const networkTimestamp = GetNetworkTime.now(); + const networkTimestamp = NetworkTime.now(); const callerConvo = ConvoHub.use().get(fromSender); callerConvo.set('active_at', networkTimestamp); await callerConvo.unhideIfNeeded(false); @@ -954,7 +953,7 @@ export async function rejectCallAlreadyAnotherCall(fromSender: string, forcedUUI const rejectCallMessage = new CallMessage({ type: SignalService.CallMessage.Type.END_CALL, - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), uuid: forcedUUID, expirationType, expireTimer, @@ -987,7 +986,7 @@ export async function USER_rejectIncomingCallRequest(fromSender: string) { const endCallMessage = new CallMessage({ type: SignalService.CallMessage.Type.END_CALL, - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), uuid: aboutCallUUID, expirationType, expireTimer, @@ -1008,12 +1007,12 @@ export async function USER_rejectIncomingCallRequest(fromSender: string) { async function sendCallMessageAndSync(callmessage: CallMessage, user: string) { await Promise.all([ - getMessageQueue().sendTo1o1NonDurably({ + MessageQueue.use().sendTo1o1NonDurably({ pubkey: PubKey.cast(user), message: callmessage, namespace: SnodeNamespaces.Default, }), - getMessageQueue().sendTo1o1NonDurably({ + MessageQueue.use().sendTo1o1NonDurably({ pubkey: UserUtils.getOurPubKeyFromCache(), message: callmessage, namespace: SnodeNamespaces.Default, @@ -1038,12 +1037,12 @@ export async function USER_hangup(fromSender: string) { rejectedCallUUIDS.add(currentCallUUID); const endCallMessage = new CallMessage({ type: SignalService.CallMessage.Type.END_CALL, - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), uuid: currentCallUUID, expirationType, expireTimer, }); - void getMessageQueue().sendTo1o1NonDurably({ + void MessageQueue.use().sendTo1o1NonDurably({ pubkey: PubKey.cast(fromSender), message: endCallMessage, namespace: SnodeNamespaces.Default, @@ -1121,7 +1120,7 @@ async function buildAnswerAndSendIt(sender: string, msgIdentifier: string | null DisappearingMessages.forcedDeleteAfterReadMsgSetting(convo); const answerSdp = answer.sdp; const callAnswerMessage = new CallMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), identifier: msgIdentifier || undefined, type: SignalService.CallMessage.Type.ANSWER, sdps: [answerSdp], @@ -1318,7 +1317,7 @@ async function addMissedCallMessage( const incomingCallConversation = ConvoHub.use().get(callerPubkey); if (incomingCallConversation.isActive() || incomingCallConversation.isHidden()) { - incomingCallConversation.set('active_at', GetNetworkTime.now()); + incomingCallConversation.set('active_at', NetworkTime.now()); await incomingCallConversation.unhideIfNeeded(false); } @@ -1329,7 +1328,7 @@ async function addMissedCallMessage( callNotificationType: 'missed-call', source: callerPubkey, sent_at: sentAt, - received_at: GetNetworkTime.now(), + received_at: NetworkTime.now(), expireTimer: 0, unread: READ_MESSAGE_STATE.unread, messageHash: details?.messageHash, diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 8ce6161690..c339eeb60f 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -9,7 +9,6 @@ import { } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; import { SnodeGroupSignature } from '../../../apis/snode_api/signature/groupSignature'; -import { getMessageQueue } from '../../../sending'; import { PubKey } from '../../../types'; import { runners } from '../JobRunner'; import { @@ -21,6 +20,7 @@ import { import { LibSessionUtil } from '../../libsession/libsession_utils'; import { showUpdateGroupMembersByConvoId } from '../../../../interactions/conversationInteractions'; import { ConvoHub } from '../../../conversations'; +import { MessageQueue } from '../../../sending'; const defaultMsBetweenRetries = 10000; const defaultMaxAttempts = 1; @@ -181,7 +181,7 @@ class GroupInviteJob extends PersistedJob { groupPk, }); - const storedAt = await getMessageQueue().sendTo1o1NonDurably({ + const storedAt = await MessageQueue.use().sendTo1o1NonDurably({ message: inviteDetails, namespace: SnodeNamespaces.Default, pubkey: PubKey.cast(member), diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 7df2087b75..81a0f332c4 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -16,7 +16,6 @@ import { StoreGroupRevokedRetrievableSubRequest, } from '../../../apis/snode_api/SnodeRequestTypes'; import { StoreGroupRequestFactory } from '../../../apis/snode_api/factories/StoreGroupRequestFactory'; -import { GetNetworkTime } from '../../../apis/snode_api/getNetworkTime'; import { RevokeChanges, SnodeAPIRevoke } from '../../../apis/snode_api/revokeSubaccount'; import { WithSecretKey } from '../../../apis/snode_api/types'; import { concatUInt8Array, getSodiumRenderer } from '../../../crypto'; @@ -31,6 +30,7 @@ import { RunJobResult, } from '../PersistedJob'; import { GroupSync } from './GroupSyncJob'; +import { NetworkTime } from '../../../../util/NetworkTime'; export type WithAddWithoutHistoryMembers = { withoutHistory: Array }; export type WithAddWithHistoryMembers = { withHistory: Array }; @@ -172,7 +172,7 @@ class GroupPendingRemovalsJob extends PersistedJob = []; if (deleteMessagesOfMembers.length) { const deleteContentMsg = new GroupUpdateDeleteMemberContentMessage({ - createAtNetworkTimestamp: GetNetworkTime.now(), + createAtNetworkTimestamp: NetworkTime.now(), expirationType: 'unknown', // GroupUpdateDeleteMemberContentMessage this is not displayed so not expiring. expireTimer: 0, groupPk, @@ -215,7 +215,7 @@ class GroupPendingRemovalsJob extends PersistedJob { groupName: group.name, }); - const storedAt = await getMessageQueue().sendTo1o1NonDurably({ + const storedAt = await MessageQueue.use().sendTo1o1NonDurably({ message, namespace: SnodeNamespaces.Default, pubkey: PubKey.cast(member), diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 473d5d7380..1d9c5805af 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -17,7 +17,6 @@ import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; import { StoreGroupRequestFactory } from '../../session/apis/snode_api/factories/StoreGroupRequestFactory'; -import { GetNetworkTime } from '../../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../../session/conversations'; import { getSodiumRenderer } from '../../session/crypto'; import { DisappearingMessages } from '../../session/disappearing_messages'; @@ -53,6 +52,7 @@ import { StateType } from '../reducer'; import { openConversationWithMessages } from './conversations'; import { resetLeftOverlayMode } from './section'; import { ConversationTypeEnum } from '../../models/types'; +import { NetworkTime } from '../../util/NetworkTime'; type WithFromMemberLeftMessage = { fromMemberLeftMessage: boolean }; // there are some changes we want to skip when doing changes triggered from a memberLeft message. export type GroupState = { @@ -196,7 +196,7 @@ const initNewGroupInWrapper = createAsyncThunk( // push one group change message were initial members are added to the group if (membersFromWrapper.length) { const membersHex = uniq(membersFromWrapper.map(m => m.pubkeyHex)); - const sentAt = GetNetworkTime.now(); + const sentAt = NetworkTime.now(); const msgModel = await ClosedGroup.addUpdateMessage({ diff: { type: 'add', added: membersHex, withHistory: false }, expireUpdate: null, @@ -702,7 +702,7 @@ async function handleMemberAddedFromUI({ // then handle the addition without history of messages (full rotation of keys). // this adds them to the members wrapper etc await handleWithoutHistoryMembers({ groupPk, withoutHistory }); - const createAtNetworkTimestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = NetworkTime.now(); await LibSessionUtil.saveDumpsToDb(groupPk); @@ -831,7 +831,7 @@ async function handleMemberRemovedFromUI({ await GroupPendingRemovals.addJob({ groupPk }); // Build a GroupUpdateMessage to be sent if that member was kicked by us. - const createAtNetworkTimestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = NetworkTime.now(); const expiringDetails = DisappearingMessages.getExpireDetailsForOutgoingMessage( convo, createAtNetworkTimestamp @@ -920,7 +920,7 @@ async function handleNameChangeFromUI({ infos.name = newName; await UserGroupsWrapperActions.setGroup(group); await MetaGroupWrapperActions.infoSet(groupPk, infos); - const createAtNetworkTimestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = NetworkTime.now(); // we want to add an update message even if the change was done remotely const msg = await ClosedGroup.addUpdateMessage({ @@ -1041,7 +1041,7 @@ const triggerFakeAvatarUpdate = createAsyncThunk( ); } - const createAtNetworkTimestamp = GetNetworkTime.now(); + const createAtNetworkTimestamp = NetworkTime.now(); const expireUpdate = DisappearingMessages.getExpireDetailsForOutgoingMessage( convo, createAtNetworkTimestamp diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts index dbfa8a7bea..b8bac771fb 100644 --- a/ts/test/session/unit/crypto/SnodeSignatures_test.ts +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -4,7 +4,6 @@ import { UserGroupsGet } from 'libsession_util_nodejs'; import Sinon from 'sinon'; import { HexString } from '../../../../node/hexStrings'; import { getSodiumNode } from '../../../../node/sodiumNode'; -import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { SnodeGroupSignature } from '../../../../session/apis/snode_api/signature/groupSignature'; import { SnodeSignature } from '../../../../session/apis/snode_api/signature/snodeSignatures'; @@ -12,6 +11,7 @@ import { WithSignature } from '../../../../session/apis/snode_api/types'; import { concatUInt8Array } from '../../../../session/crypto'; import { UserUtils } from '../../../../session/utils'; import { fromBase64ToArray, fromHexToArray } from '../../../../session/utils/String'; +import { NetworkTime } from '../../../../util/NetworkTime'; use(chaiAsPromised); @@ -71,7 +71,7 @@ describe('SnodeSignature', () => { describe('getSnodeGroupAdminSignatureParams', () => { beforeEach(() => { - Sinon.stub(GetNetworkTime, 'now').returns(hardcodedTimestamp); + Sinon.stub(NetworkTime, 'now').returns(hardcodedTimestamp); }); describe('retrieve', () => { @@ -183,7 +183,7 @@ describe('SnodeSignature', () => { describe('getGroupSignatureByHashesParams', () => { beforeEach(() => { - Sinon.stub(GetNetworkTime, 'now').returns(hardcodedTimestamp); + Sinon.stub(NetworkTime, 'now').returns(hardcodedTimestamp); }); describe('delete', () => { @@ -270,7 +270,7 @@ describe('SnodeSignature', () => { ); }); - it('works with valid pubkey and privkey', async () => { + it('works with valid pubkey and priv key', async () => { const hashes = ['hash4321', 'hash4221']; const expiryMs = hardcodedTimestamp; const shortenOrExtend = ''; @@ -318,9 +318,9 @@ describe('SnodeSignature', () => { expect(ret.pubkey).to.be.eq(validGroupPk); - const overridenHash = hashes.slice(); - overridenHash[0] = '1111'; - const verificationData = `expire${shortenOrExtend}${expiryMs}${overridenHash.join('')}`; + const overriddenHash = hashes.slice(); + overriddenHash[0] = '1111'; + const verificationData = `expire${shortenOrExtend}${expiryMs}${overriddenHash.join('')}`; const func = async () => verifySig(ret, verificationData); await expect(func()).rejectedWith('sig failed to be verified'); }); @@ -338,8 +338,8 @@ describe('SnodeSignature', () => { expect(ret.pubkey).to.be.eq(validGroupPk); - const overridenHash = [hashes[0]]; - const verificationData = `expire${shortenOrExtend}${expiryMs}${overridenHash.join('')}`; + const overriddenHash = [hashes[0]]; + const verificationData = `expire${shortenOrExtend}${expiryMs}${overriddenHash.join('')}`; const func = async () => verifySig(ret, verificationData); await expect(func()).rejectedWith('sig failed to be verified'); }); @@ -374,8 +374,8 @@ describe('SnodeSignature', () => { shortenOrExtend, timestamp: hardcodedTimestamp, }); - const overridenHash = [hashes[0]]; - const verificationData = `expire${shortenOrExtend}${hardcodedTimestamp}${overridenHash.join( + const overriddenHash = [hashes[0]]; + const verificationData = `expire${shortenOrExtend}${hardcodedTimestamp}${overriddenHash.join( '' )}`; @@ -403,7 +403,7 @@ describe('SnodeSignature', () => { await expect(func()).to.be.rejectedWith('sig failed to be verified'); }); - it('works with valid pubkey and privkey', async () => { + it('works with valid pubkey and priv key', async () => { Sinon.stub(UserUtils, 'getUserED25519KeyPair').resolves(userEd25519Keypair); const hashes = ['hash4321', 'hash4221']; diff --git a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts index d1bfbbe123..993f0e29c0 100644 --- a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts +++ b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts @@ -3,7 +3,6 @@ import chaiAsPromised from 'chai-as-promised'; import Sinon from 'sinon'; import { Conversation, ConversationModel } from '../../../../models/conversation'; import { ConversationAttributes } from '../../../../models/conversationAttributes'; -import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { DisappearingMessages } from '../../../../session/disappearing_messages'; import { DisappearingMessageConversationModeType, @@ -21,6 +20,7 @@ import { generateVisibleMessage, } from '../../../test-utils/utils'; import { ConversationTypeEnum } from '../../../../models/types'; +import { NetworkTime } from '../../../../util/NetworkTime'; chai.use(chaiAsPromised as any); @@ -38,7 +38,7 @@ describe('DisappearingMessage', () => { } as ConversationAttributes; beforeEach(() => { - Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); + Sinon.stub(NetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); }); @@ -465,7 +465,7 @@ describe('DisappearingMessage', () => { message.set({ expirationType: 'deleteAfterRead', expireTimer: 300, - sent_at: GetNetworkTime.now(), + sent_at: NetworkTime.now(), }); Sinon.stub(message, 'getConversation').returns(conversation); @@ -488,7 +488,7 @@ describe('DisappearingMessage', () => { const message = generateFakeOutgoingPrivateMessage(conversation.get('id')); message.set({ expirationType: 'deleteAfterRead', - sent_at: GetNetworkTime.now(), + sent_at: NetworkTime.now(), }); Sinon.stub(message, 'getConversation').returns(conversation); @@ -504,7 +504,7 @@ describe('DisappearingMessage', () => { const message = generateFakeOutgoingPrivateMessage(conversation.get('id')); message.set({ expireTimer: 300, - sent_at: GetNetworkTime.now(), + sent_at: NetworkTime.now(), }); Sinon.stub(message, 'getConversation').returns(conversation); @@ -513,7 +513,7 @@ describe('DisappearingMessage', () => { expect(message.getExpirationStartTimestamp(), 'it should be undefined').to.be.undefined; }); it('if expirationStartTimestamp is already defined then it should not have changed', async () => { - const now = GetNetworkTime.now(); + const now = NetworkTime.now(); const conversation = new ConversationModel({ ...conversationArgs, id: ourNumber, @@ -605,7 +605,7 @@ describe('DisappearingMessage', () => { providedDisappearingMode: 'deleteAfterSend', providedExpireTimer: 600, providedSource: testPubkey, - sentAt: GetNetworkTime.now(), + sentAt: NetworkTime.now(), fromSync: true, shouldCommitConvo: false, existingMessage: undefined, diff --git a/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts b/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts index a6b4b8eaca..56ad2f2931 100644 --- a/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts +++ b/ts/test/session/unit/disappearing_messages/ExpireRequest_test.ts @@ -11,10 +11,10 @@ import { verifyExpireMsgsResponseSignature, verifyExpireMsgsResponseSignatureProps, } from '../../../../session/apis/snode_api/expireRequest'; -import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { UserUtils } from '../../../../session/utils'; import { isValidUnixTimestamp } from '../../../../session/utils/Timestamps'; import { generateFakeSnode } from '../../../test-utils/utils'; +import { NetworkTime } from '../../../../util/NetworkTime'; chai.use(chaiAsPromised as any); @@ -29,7 +29,7 @@ describe('ExpireRequest', () => { }; beforeEach(() => { - Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); + Sinon.stub(NetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); Sinon.stub(UserUtils, 'getUserED25519KeyPair').resolves(ourUserEd25516Keypair); }); diff --git a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts index 15c5f38b05..f4865b1647 100644 --- a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts +++ b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts @@ -10,12 +10,12 @@ import { GetExpiriesRequestResponseResults, processGetExpiriesRequestResponse, } from '../../../../session/apis/snode_api/getExpiriesRequest'; -import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { SnodeSignature } from '../../../../session/apis/snode_api/signature/snodeSignatures'; import { WithMessagesHashes } from '../../../../session/apis/snode_api/types'; import { UserUtils } from '../../../../session/utils'; import { isValidUnixTimestamp } from '../../../../session/utils/Timestamps'; import { TypedStub, generateFakeSnode, stubWindowLog } from '../../../test-utils/utils'; +import { NetworkTime } from '../../../../util/NetworkTime'; chai.use(chaiAsPromised as any); @@ -34,7 +34,7 @@ describe('GetExpiriesRequest', () => { let getOurPubKeyStrFromCacheStub: TypedStub; beforeEach(() => { - Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); + Sinon.stub(NetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); getOurPubKeyStrFromCacheStub = Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns( ourNumber ); diff --git a/ts/test/session/unit/libsession_util/libsession_utils_test.ts b/ts/test/session/unit/libsession_util/libsession_utils_test.ts index 6c4dc3cc76..3c65e9bf6b 100644 --- a/ts/test/session/unit/libsession_util/libsession_utils_test.ts +++ b/ts/test/session/unit/libsession_util/libsession_utils_test.ts @@ -4,7 +4,6 @@ import { randombytes_buf } from 'libsodium-wrappers-sumo'; import Long from 'long'; import Sinon from 'sinon'; import { ConfigDumpData } from '../../../../data/configDump/configDump'; -import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { UserUtils } from '../../../../session/utils'; import { LibSessionUtil } from '../../../../session/utils/libsession/libsession_utils'; @@ -13,6 +12,7 @@ import { MetaGroupWrapperActions, } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { TestUtils } from '../../../test-utils'; +import { NetworkTime } from '../../../../util/NetworkTime'; describe('LibSessionUtil saveDumpsToDb', () => { describe('for group', () => { @@ -164,7 +164,7 @@ describe('LibSessionUtil pendingChangesForGroup', () => { }; Sinon.stub(MetaGroupWrapperActions, 'needsPush').resolves(true); Sinon.stub(MetaGroupWrapperActions, 'push').resolves(pushResults); - Sinon.stub(GetNetworkTime, 'now').returns(1234); + Sinon.stub(NetworkTime, 'now').returns(1234); const result = await LibSessionUtil.pendingChangesForGroup(groupPk); expect(result.allOldHashes.size).to.be.equal(4); // check that all of the hashes are there @@ -245,7 +245,7 @@ describe('LibSessionUtil pendingChangesForUs', () => { .withArgs('ConvoInfoVolatileConfig') .resolves(pushResultsConvo); - Sinon.stub(GetNetworkTime, 'now').returns(1234); + Sinon.stub(NetworkTime, 'now').returns(1234); const result = await LibSessionUtil.pendingChangesForUs(); expect(needsPush.callCount).to.be.eq(4); expect(needsPush.getCalls().map(m => m.args)).to.be.deep.eq([ @@ -313,7 +313,7 @@ describe('LibSessionUtil pendingChangesForUs', () => { .withArgs('ConvoInfoVolatileConfig') .resolves(pushConvo); - Sinon.stub(GetNetworkTime, 'now').returns(1234); + Sinon.stub(NetworkTime, 'now').returns(1234); const result = await LibSessionUtil.pendingChangesForUs(); expect(needsPush.callCount).to.be.eq(4); expect(needsPush.getCalls().map(m => m.args)).to.be.deep.eq([ diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts index d2f4639b4c..763bbd8198 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_contacts_test.ts @@ -3,13 +3,13 @@ import { expect } from 'chai'; import Sinon from 'sinon'; import { ConversationModel } from '../../../../models/conversation'; import { ConversationAttributes } from '../../../../models/conversationAttributes'; -import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../../../../session/conversations'; import { UserUtils } from '../../../../session/utils'; import { SessionUtilContact } from '../../../../session/utils/libsession/libsession_utils_contacts'; import { TestUtils } from '../../../test-utils'; import { stubWindowLog } from '../../../test-utils/utils/stubbing'; import { ConversationTypeEnum, CONVERSATION_PRIORITIES } from '../../../../models/types'; +import { NetworkTime } from '../../../../util/NetworkTime'; describe('libsession_contacts', () => { stubWindowLog(); @@ -26,7 +26,7 @@ describe('libsession_contacts', () => { } as ConversationAttributes; beforeEach(() => { - Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); + Sinon.stub(NetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); TestUtils.stubLibSessionWorker(undefined); }); diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts index 4cc5aac75b..b917742fdb 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts @@ -5,7 +5,6 @@ import { describe } from 'mocha'; import Sinon from 'sinon'; import { ConversationModel } from '../../../../models/conversation'; import { ConversationAttributes } from '../../../../models/conversationAttributes'; -import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../../../../session/conversations'; import { UserUtils } from '../../../../session/utils'; import { toHex } from '../../../../session/utils/String'; @@ -13,6 +12,7 @@ import { SessionUtilUserGroups } from '../../../../session/utils/libsession/libs import { TestUtils } from '../../../test-utils'; import { generateFakeECKeyPair, stubWindowLog } from '../../../test-utils/utils'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../../../models/types'; +import { NetworkTime } from '../../../../util/NetworkTime'; describe('libsession_user_groups', () => { stubWindowLog(); @@ -27,7 +27,7 @@ describe('libsession_user_groups', () => { } as ConversationAttributes; beforeEach(() => { - Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); + Sinon.stub(NetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); TestUtils.stubLibSessionWorker(undefined); }); diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile_test.ts index 63a6c5dbc9..c0cd21453f 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_profile_test.ts @@ -4,13 +4,13 @@ import Sinon from 'sinon'; import { ConversationModel } from '../../../../models/conversation'; import { ConversationAttributes } from '../../../../models/conversationAttributes'; -import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { ConvoHub } from '../../../../session/conversations'; import { UserUtils } from '../../../../session/utils'; import { SessionUtilUserProfile } from '../../../../session/utils/libsession/libsession_utils_user_profile'; import { TestUtils } from '../../../test-utils'; import { stubWindowLog } from '../../../test-utils/utils'; import { ConversationTypeEnum } from '../../../../models/types'; +import { NetworkTime } from '../../../../util/NetworkTime'; describe('libsession_user_profile', () => { stubWindowLog(); @@ -26,7 +26,7 @@ describe('libsession_user_profile', () => { } as ConversationAttributes; beforeEach(() => { - Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); + Sinon.stub(NetworkTime, 'getLatestTimestampOffset').returns(getLatestTimestampOffset); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); TestUtils.stubLibSessionWorker(undefined); }); diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index 0e4cc6d334..6184b40e43 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -17,7 +17,7 @@ import { PubkeyType } from 'libsession_util_nodejs'; import { ContentMessage } from '../../../../session/messages/outgoing'; import { ClosedGroupMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupMessage'; import { MessageSender } from '../../../../session/sending'; -import { MessageQueue } from '../../../../session/sending/MessageQueue'; +import { MessageQueueCl } from '../../../../session/sending/MessageQueue'; import { PubKey } from '../../../../session/types'; import { PromiseUtils, UserUtils } from '../../../../session/utils'; import { TestUtils } from '../../../test-utils'; @@ -56,7 +56,7 @@ describe('MessageQueue', () => { 'handlePublicMessageSentFailure' >; - let messageQueueStub: MessageQueue; + let messageQueueStub: MessageQueueCl; // Message Sender Stubs let sendStub: sinon.SinonStub; @@ -86,7 +86,7 @@ describe('MessageQueue', () => { // Init Queue pendingMessageCache = new PendingMessageCacheStub(); - messageQueueStub = new MessageQueue(pendingMessageCache); + messageQueueStub = new MessageQueueCl(pendingMessageCache); TestUtils.stubWindowLog(); }); diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index 7eb5d8aa2c..a8d21944a0 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -8,7 +8,6 @@ import { OpenGroupMessageV2 } from '../../../../session/apis/open_group_api/open import { OpenGroupPollingUtils } from '../../../../session/apis/open_group_api/opengroupV2/OpenGroupPollingUtils'; import { SogsBlinding } from '../../../../session/apis/open_group_api/sogsv3/sogsBlinding'; import { BatchRequests } from '../../../../session/apis/snode_api/batchRequest'; -import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { Onions } from '../../../../session/apis/snode_api/onions'; import { ConvoHub } from '../../../../session/conversations/ConversationController'; @@ -29,6 +28,7 @@ import { } from '../../../test-utils/utils'; import { TEST_identityKeyPair } from '../crypto/MessageEncrypter_test'; import { MessageEncrypter } from '../../../../session/crypto/MessageEncrypter'; +import { NetworkTime } from '../../../../util/NetworkTime'; describe('MessageSender', () => { afterEach(() => { @@ -195,7 +195,7 @@ describe('MessageSender', () => { SnodeNamespaces.Default ); const offset = 200000; - Sinon.stub(GetNetworkTime, 'getLatestTimestampOffset').returns(offset); + Sinon.stub(NetworkTime, 'getLatestTimestampOffset').returns(offset); await MessageSender.sendSingleMessage({ message: rawMessage, attempts: 3, diff --git a/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts b/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts index 8eaba3f551..597640a744 100644 --- a/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts +++ b/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts @@ -10,12 +10,12 @@ import { UpdateExpiryOnNodeGroupSubRequest, UpdateExpiryOnNodeUserSubRequest, } from '../../../../session/apis/snode_api/SnodeRequestTypes'; -import { GetNetworkTime } from '../../../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest'; import { WithShortenOrExtend } from '../../../../session/apis/snode_api/types'; import { TestUtils } from '../../../test-utils'; import { expectAsyncToThrow, stubLibSessionWorker } from '../../../test-utils/utils'; +import { NetworkTime } from '../../../../util/NetworkTime'; const { expect } = chai; @@ -45,8 +45,8 @@ function expectExpireWith({ } & WithShortenOrExtend) { expect(request.messageHashes).to.be.deep.eq(hashes); expect(request.shortenOrExtend).to.be.eq(shortenOrExtend); - expect(request.expiryMs).to.be.above(GetNetworkTime.now() + 14 * 24 * 3600 * 1000 - 100); - expect(request.expiryMs).to.be.above(GetNetworkTime.now() + 14 * 24 * 3600 * 1000 + 100); + expect(request.expiryMs).to.be.above(NetworkTime.now() + 14 * 24 * 3600 * 1000 - 100); + expect(request.expiryMs).to.be.above(NetworkTime.now() + 14 * 24 * 3600 * 1000 + 100); } describe('SnodeAPI:buildRetrieveRequest', () => { diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 068fdf4527..3a574e31ef 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -5,7 +5,6 @@ import Long from 'long'; import Sinon from 'sinon'; import { getSodiumNode } from '../../../../../../node/sodiumNode'; import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/SnodeRequestTypes'; -import { GetNetworkTime } from '../../../../../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces } from '../../../../../../session/apis/snode_api/namespaces'; import { TTL_DEFAULT } from '../../../../../../session/constants'; import { ConvoHub } from '../../../../../../session/conversations'; @@ -23,6 +22,7 @@ import { import { MetaGroupWrapperActions } from '../../../../../../webworker/workers/browser/libsession_worker_interface'; import { TestUtils } from '../../../../../test-utils'; import { TypedStub } from '../../../../../test-utils/utils'; +import { NetworkTime } from '../../../../../../util/NetworkTime'; function validInfo(sodium: LibSodiumWrappers) { return { @@ -291,7 +291,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { const member = validMembers(sodium); const networkTimestamp = 4444; const ttl = TTL_DEFAULT.CONFIG_MESSAGE; - Sinon.stub(GetNetworkTime, 'now').returns(networkTimestamp); + Sinon.stub(NetworkTime, 'now').returns(networkTimestamp); pendingChangesForGroupStub.resolves({ messages: [info, member], allOldHashes: new Set('123'), diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index 23b38218c4..36ed430a13 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -5,7 +5,6 @@ import Long from 'long'; import Sinon from 'sinon'; import { getSodiumNode } from '../../../../../../node/sodiumNode'; import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/SnodeRequestTypes'; -import { GetNetworkTime } from '../../../../../../session/apis/snode_api/getNetworkTime'; import { SnodeNamespaces, SnodeNamespacesUserConfig, @@ -26,6 +25,7 @@ import { import { GenericWrapperActions } from '../../../../../../webworker/workers/browser/libsession_worker_interface'; import { TestUtils } from '../../../../../test-utils'; import { TypedStub, stubConfigDumpData } from '../../../../../test-utils/utils'; +import { NetworkTime } from '../../../../../../util/NetworkTime'; function userChange( sodium: LibSodiumWrappers, @@ -281,7 +281,7 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); const networkTimestamp = 4444; const ttl = TTL_DEFAULT.CONFIG_MESSAGE; - Sinon.stub(GetNetworkTime, 'now').returns(networkTimestamp); + Sinon.stub(NetworkTime, 'now').returns(networkTimestamp); pendingChangesForUsStub.resolves({ messages: [profile, contact], diff --git a/ts/util/NetworkTime.ts b/ts/util/NetworkTime.ts new file mode 100644 index 0000000000..eb3298ed82 --- /dev/null +++ b/ts/util/NetworkTime.ts @@ -0,0 +1,41 @@ +let latestTimestampOffset = Number.MAX_SAFE_INTEGER; + +/** + * This function has no use to be called except during tests. + * @returns the current offset we have with the rest of the network. + */ +function getLatestTimestampOffset() { + if (latestTimestampOffset === Number.MAX_SAFE_INTEGER) { + window.log.debug('latestTimestampOffset is not set yet'); + return 0; + } + // window.log.info('latestTimestampOffset is ', latestTimestampOffset); + + return latestTimestampOffset; +} + +function setLatestTimestampOffset(newOffset: number) { + latestTimestampOffset = newOffset; + if (latestTimestampOffset === Number.MAX_SAFE_INTEGER) { + window?.log?.info(`first timestamp offset received: ${newOffset}ms`); + } + latestTimestampOffset = newOffset; +} + +function now() { + // make sure to call exports here, as we stub the exported one for testing. + return Date.now() - NetworkTime.getLatestTimestampOffset(); +} + +function getNowWithNetworkOffsetSeconds() { + // make sure to call exports here, as we stub the exported one for testing. + + return Math.floor(NetworkTime.now() / 1000); +} + +export const NetworkTime = { + getNowWithNetworkOffsetSeconds, + getLatestTimestampOffset, + now, + setLatestTimestampOffset, +}; diff --git a/ts/util/releaseFeature.ts b/ts/util/releaseFeature.ts index 4643bbc075..76be916033 100644 --- a/ts/util/releaseFeature.ts +++ b/ts/util/releaseFeature.ts @@ -1,7 +1,7 @@ -import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime'; import { FEATURE_RELEASE_TIMESTAMPS } from '../session/constants'; import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { assertUnreachable } from '../types/sqlSharedTypes'; +import { NetworkTime } from './NetworkTime'; import { Storage } from './storage'; let isDisappearingMessageFeatureReleased: boolean | undefined; @@ -77,7 +77,7 @@ async function checkIsFeatureReleased(featureName: FeatureNameTracked): Promise< const featureAlreadyReleased = await getIsFeatureReleased(featureName); // Is it time to release the feature based on the network timestamp? - if (!featureAlreadyReleased && GetNetworkTime.now() >= getFeatureReleaseTimestamp(featureName)) { + if (!featureAlreadyReleased && NetworkTime.now() >= getFeatureReleaseTimestamp(featureName)) { window.log.info(`[releaseFeature]: It is time to release ${featureName}. Releasing it now`); await Storage.put(featureStorageItemId(featureName), true); setIsFeatureReleasedCached(featureName, true); From 07930d4e5e029b855e7faef647dad3e3463cfa77 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 23 Oct 2024 20:19:12 +1100 Subject: [PATCH 149/302] fix: mark promote accepted on invite via promote-> accept --- ts/interactions/conversationInteractions.ts | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index ea741cdd68..2b069fc719 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -1,4 +1,4 @@ -import { isNil } from 'lodash'; +import { isEmpty, isNil } from 'lodash'; import { ConversationNotificationSettingType, READ_MESSAGE_STATE, @@ -47,12 +47,16 @@ import { urlToBlob } from '../types/attachments/VisualAttachment'; import { encryptProfile } from '../util/crypto/profileEncrypter'; import { ReleasedFeatures } from '../util/releaseFeature'; import { Storage, setLastProfileUpdateTimestamp } from '../util/storage'; -import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../webworker/workers/browser/libsession_worker_interface'; import { ConversationInteractionStatus, ConversationInteractionType } from './types'; import { BlockedNumberController } from '../util'; import { LocalizerComponentProps, LocalizerToken } from '../types/localizer'; import { sendInviteResponseToGroup } from '../session/sending/group/GroupInviteResponse'; import { NetworkTime } from '../util/NetworkTime'; +import { GroupSync } from '../session/utils/job_runners/jobs/GroupSyncJob'; export async function copyPublicKeyByConvoId(convoId: string) { if (OpenGroupUtils.isOpenGroupV2(convoId)) { @@ -132,6 +136,18 @@ export const handleAcceptConversationRequest = async ({ convoId }: { convoId: st if (!previousIsApproved) { await sendInviteResponseToGroup({ groupPk: convoId }); } + const refreshed = await UserGroupsWrapperActions.getGroup(convoId); + + // if we are admin, we also need to accept it and mark ourselves as such + const weAreAdmin = refreshed && !isEmpty(refreshed.secretKey); + if (weAreAdmin) { + await MetaGroupWrapperActions.memberSetPromotionAccepted( + convoId, + UserUtils.getOurPubKeyStrFromCache() + ); + await GroupSync.queueNewJobIfNeeded(convoId); + } + window.log.info( `handleAcceptConversationRequest: first poll for group ${ed25519Str(convoId)} happened, we should have encryption keys now` ); From 8644db64bc1fe1e4fd7bab44b41542ce793863a6 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 24 Oct 2024 16:12:07 +1100 Subject: [PATCH 150/302] fix: allow invite to be promote, and handle recipient side too --- ts/components/MemberListItem.tsx | 6 ++++- .../dialog/UpdateGroupMembersDialog.tsx | 2 +- ts/interactions/conversationInteractions.ts | 19 ++------------ ts/session/utils/job_runners/PersistedJob.ts | 1 + .../utils/job_runners/jobs/GroupInviteJob.ts | 26 ++++++++++++++----- ts/state/ducks/metaGroups.ts | 20 ++++++++++---- 6 files changed, 44 insertions(+), 30 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 38bcf782e3..bf164ced89 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -224,7 +224,11 @@ const ResendInviteButton = ({ buttonType={SessionButtonType.Solid} text={window.i18n('resend')} onClick={() => { - void GroupInvite.addJob({ groupPk, member: pubkey }); + void GroupInvite.addJob({ + groupPk, + member: pubkey, + inviteAsAdmin: window.sessionFeatureFlags.useGroupV2InviteAsAdmin, + }); }} /> ); diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index bfa9eab960..3affeadcd3 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -206,7 +206,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { } if (groupAdmins?.includes(member)) { if (PubKey.is03Pubkey(conversationId)) { - window?.log?.warn(`User ${member} cannot be removed as they are adn admin.`); + window?.log?.warn(`User ${member} cannot be removed as they are an admin.`); return; } ToastUtils.pushCannotRemoveCreatorFromGroup(); diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 2b069fc719..6107ee36a6 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -1,4 +1,4 @@ -import { isEmpty, isNil } from 'lodash'; +import { isNil } from 'lodash'; import { ConversationNotificationSettingType, READ_MESSAGE_STATE, @@ -47,16 +47,12 @@ import { urlToBlob } from '../types/attachments/VisualAttachment'; import { encryptProfile } from '../util/crypto/profileEncrypter'; import { ReleasedFeatures } from '../util/releaseFeature'; import { Storage, setLastProfileUpdateTimestamp } from '../util/storage'; -import { - MetaGroupWrapperActions, - UserGroupsWrapperActions, -} from '../webworker/workers/browser/libsession_worker_interface'; +import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; import { ConversationInteractionStatus, ConversationInteractionType } from './types'; import { BlockedNumberController } from '../util'; import { LocalizerComponentProps, LocalizerToken } from '../types/localizer'; import { sendInviteResponseToGroup } from '../session/sending/group/GroupInviteResponse'; import { NetworkTime } from '../util/NetworkTime'; -import { GroupSync } from '../session/utils/job_runners/jobs/GroupSyncJob'; export async function copyPublicKeyByConvoId(convoId: string) { if (OpenGroupUtils.isOpenGroupV2(convoId)) { @@ -136,17 +132,6 @@ export const handleAcceptConversationRequest = async ({ convoId }: { convoId: st if (!previousIsApproved) { await sendInviteResponseToGroup({ groupPk: convoId }); } - const refreshed = await UserGroupsWrapperActions.getGroup(convoId); - - // if we are admin, we also need to accept it and mark ourselves as such - const weAreAdmin = refreshed && !isEmpty(refreshed.secretKey); - if (weAreAdmin) { - await MetaGroupWrapperActions.memberSetPromotionAccepted( - convoId, - UserUtils.getOurPubKeyStrFromCache() - ); - await GroupSync.queueNewJobIfNeeded(convoId); - } window.log.info( `handleAcceptConversationRequest: first poll for group ${ed25519Str(convoId)} happened, we should have encryption keys now` diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts index c6a9ef652d..290f285d49 100644 --- a/ts/session/utils/job_runners/PersistedJob.ts +++ b/ts/session/utils/job_runners/PersistedJob.ts @@ -42,6 +42,7 @@ export interface GroupInvitePersistedData extends PersistedJobData { jobType: 'GroupInviteJobType'; groupPk: GroupPubkeyType; member: PubkeyType; + inviteAsAdmin: boolean; } export interface GroupPromotePersistedData extends PersistedJobData { diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index c339eeb60f..747e8e284c 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -28,6 +28,7 @@ const defaultMaxAttempts = 1; type JobExtraArgs = { groupPk: GroupPubkeyType; member: PubkeyType; + inviteAsAdmin: boolean; }; export function shouldAddJob(args: JobExtraArgs) { @@ -46,11 +47,12 @@ const invitesFailed = new Map< } >(); -async function addJob({ groupPk, member }: JobExtraArgs) { - if (shouldAddJob({ groupPk, member })) { +async function addJob({ groupPk, member, inviteAsAdmin }: JobExtraArgs) { + if (shouldAddJob({ groupPk, member, inviteAsAdmin })) { const groupInviteJob = new GroupInviteJob({ groupPk, member, + inviteAsAdmin, nextAttemptTimestamp: Date.now(), }); window.log.debug(`addGroupInviteJob: adding group invite for ${groupPk}:${member} `); @@ -123,11 +125,12 @@ class GroupInviteJob extends PersistedJob { constructor({ groupPk, member, + inviteAsAdmin, nextAttemptTimestamp, maxAttempts, currentRetry, identifier, - }: Pick & + }: Pick & Partial< Pick< GroupInvitePersistedData, @@ -143,6 +146,7 @@ class GroupInviteJob extends PersistedJob { identifier: identifier || v4(), member, groupPk, + inviteAsAdmin, delayBetweenRetries: defaultMsBetweenRetries, maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts, nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries, @@ -151,10 +155,10 @@ class GroupInviteJob extends PersistedJob { } public async run(): Promise { - const { groupPk, member, jobType, identifier } = this.persistedData; + const { groupPk, member, inviteAsAdmin, jobType, identifier } = this.persistedData; window.log.info( - `running job ${jobType} with groupPk:"${groupPk}" member: ${member} id:"${identifier}" ` + `running job ${jobType} with groupPk:"${groupPk}" member:${member} inviteAsAdmin:${inviteAsAdmin} id:"${identifier}" ` ); const group = await UserGroupsWrapperActions.getGroup(groupPk); if (!group || !group.secretKey || !group.name) { @@ -167,7 +171,7 @@ class GroupInviteJob extends PersistedJob { } let failed = true; try { - const inviteDetails = window.sessionFeatureFlags.useGroupV2InviteAsAdmin + const inviteDetails = inviteAsAdmin ? await SnodeGroupSignature.getGroupPromoteMessage({ groupName: group.name, member, @@ -200,6 +204,16 @@ class GroupInviteJob extends PersistedJob { ); try { await MetaGroupWrapperActions.memberSetInvited(groupPk, member, failed); + // Depending on this field, we either send an invite or an invite-as-admin message. + // When we do send an invite-as-admin we also need to update the promoted state, so that the invited members + // knows he needs to accept the promotion when accepting the invite + if (inviteAsAdmin) { + if (failed) { + await MetaGroupWrapperActions.memberSetPromotionFailed(groupPk, member); + } else { + await MetaGroupWrapperActions.memberSetPromotionSent(groupPk, member); + } + } } catch (e) { window.log.warn('GroupInviteJob memberSetInvited failed with', e.message); } diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 1d9c5805af..928101a426 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -245,7 +245,11 @@ const initNewGroupInWrapper = createAsyncThunk( // can update the group wrapper with a failed state if a message fails to be sent. for (let index = 0; index < membersFromWrapper.length; index++) { const member = membersFromWrapper[index]; - await GroupInvite.addJob({ member: member.pubkeyHex, groupPk }); + await GroupInvite.addJob({ + member: member.pubkeyHex, + groupPk, + inviteAsAdmin: window.sessionFeatureFlags.useGroupV2InviteAsAdmin, + }); } await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); @@ -773,7 +777,12 @@ async function handleMemberAddedFromUI({ } // schedule send invite details, auth signature, etc. to the new users - await scheduleGroupInviteJobs(groupPk, withHistory, withoutHistory); + await scheduleGroupInviteJobs( + groupPk, + withHistory, + withoutHistory, + window.sessionFeatureFlags.useGroupV2InviteAsAdmin + ); await LibSessionUtil.saveDumpsToDb(groupPk); convo.set({ @@ -1444,14 +1453,15 @@ export const groupReducer = metaGroupSlice.reducer; async function scheduleGroupInviteJobs( groupPk: GroupPubkeyType, withHistory: Array, - withoutHistory: Array + withoutHistory: Array, + inviteAsAdmin: boolean ) { for (let index = 0; index < withoutHistory.length; index++) { const member = withoutHistory[index]; - await GroupInvite.addJob({ groupPk, member }); + await GroupInvite.addJob({ groupPk, member, inviteAsAdmin }); } for (let index = 0; index < withHistory.length; index++) { const member = withHistory[index]; - await GroupInvite.addJob({ groupPk, member }); + await GroupInvite.addJob({ groupPk, member, inviteAsAdmin }); } } From 88a9a489916ec1b21bbf49a9abb3f8f6c3c2de30 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 24 Oct 2024 17:33:00 +1100 Subject: [PATCH 151/302] fix: update name and pics on invite response received --- .../utils/libsession/libsession_utils.ts | 2 -- ts/state/ducks/metaGroups.ts | 22 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index d1a9079d30..eda71af775 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -33,8 +33,6 @@ const requiredUserVariants: Array = [ 'ConvoInfoVolatileConfig', ]; - - /** * Initializes the libsession wrappers for the required user variants if the dumps are not already in the database. It will use an empty dump if the dump is not found. */ diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 928101a426..8ad2bc9cfa 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -53,6 +53,7 @@ import { openConversationWithMessages } from './conversations'; import { resetLeftOverlayMode } from './section'; import { ConversationTypeEnum } from '../../models/types'; import { NetworkTime } from '../../util/NetworkTime'; +import { from_hex } from 'libsodium-wrappers-sumo'; type WithFromMemberLeftMessage = { fromMemberLeftMessage: boolean }; // there are some changes we want to skip when doing changes triggered from a memberLeft message. export type GroupState = { @@ -1152,6 +1153,27 @@ const inviteResponseReceived = createAsyncThunk( await checkWeAreAdminOrThrow(groupPk, 'inviteResponseReceived'); await MetaGroupWrapperActions.memberSetAccepted(groupPk, member); + try { + const memberConvo = ConvoHub.use().get(member); + if (memberConvo) { + const memberName = memberConvo.getRealSessionUsername(); + if (memberName) { + await MetaGroupWrapperActions.memberSetNameTruncated(groupPk, member, memberName); + } + const profilePicUrl = memberConvo.getAvatarPointer(); + const profilePicKey = memberConvo.getProfileKey(); + if (profilePicUrl && profilePicKey) { + await MetaGroupWrapperActions.memberSetProfilePicture(groupPk, member, { + key: from_hex(profilePicKey), + url: profilePicUrl, + }); + } + } + } catch (eMemberUpdate) { + window.log.warn( + `failed to update member details on inviteResponse received in group:${ed25519Str(groupPk)}, member:${ed25519Str(member)}, error:${eMemberUpdate.message}` + ); + } await GroupSync.queueNewJobIfNeeded(groupPk); } catch (e) { window.log.info('inviteResponseReceived failed with', e.message); From eff4d13b9acd8e89983db98670dfc6533370226a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 24 Oct 2024 18:50:35 +1100 Subject: [PATCH 152/302] fix: unapproved contact inving to kicked group moves it to msg requests --- ts/receiver/groupv2/handleGroupV2Message.ts | 106 ++++++++++++-------- ts/session/apis/snode_api/getSwarmFor.ts | 4 - 2 files changed, 62 insertions(+), 48 deletions(-) diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 4d13630901..90b79ae4f8 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -52,6 +52,55 @@ type GroupUpdateDetails = { updateMessage: SignalService.GroupUpdateMessage; } & WithSignatureTimestamp; +async function getInitializedGroupObject({ + groupPk, + groupName, + inviterIsApproved, + groupSecretKey, +}: { + groupPk: GroupPubkeyType; + groupName: string; + inviterIsApproved: boolean; + groupSecretKey: Uint8Array | null; +}) { + let found = await UserGroupsWrapperActions.getGroup(groupPk); + const wasKicked = found?.kicked || false; + + if (!found) { + found = { + authData: null, + joinedAtSeconds: Date.now(), + name: groupName, + priority: 0, + pubkeyHex: groupPk, + secretKey: null, + kicked: false, + invitePending: true, + }; + } + + found.kicked = false; + found.name = groupName; + if (groupSecretKey && !isEmpty(groupSecretKey)) { + found.secretKey = groupSecretKey; + } + + if (inviterIsApproved) { + // pre approve invite to groups when we've already approved the person who invited us + found.invitePending = false; + } else if (wasKicked) { + // when we were kicked and reinvited by someone we do not trust, this conversation should go in the message request. + found.invitePending = true; + } + + if (found.invitePending) { + // we also need to update the DB model, because we like duplicating things + await ConvoHub.use().get(groupPk)?.setIsApproved(false, true); + } + + return { found, wasKicked }; +} + async function handleGroupUpdateInviteMessage({ inviteMessage, author, @@ -103,27 +152,13 @@ async function handleGroupUpdateInviteMessage({ } const userEd25519Secretkey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes; - let found = await UserGroupsWrapperActions.getGroup(groupPk); - const wasKicked = found?.kicked || false; - if (!found) { - found = { - authData: null, - joinedAtSeconds: Date.now(), - name: inviteMessage.name, - priority: 0, - pubkeyHex: groupPk, - secretKey: null, - kicked: false, - invitePending: true, - }; - } else { - found.kicked = false; - found.name = inviteMessage.name; - } - if (authorIsApproved) { - // pre approve invite to groups when we've already approved the person who invited us - found.invitePending = false; - } + const { found, wasKicked } = await getInitializedGroupObject({ + groupPk, + groupName: inviteMessage.name, + groupSecretKey: null, + inviterIsApproved: authorIsApproved, + }); + // not sure if we should drop it, or set it again? They should be the same anyway found.authData = inviteMessage.memberAuthData; @@ -523,29 +558,12 @@ async function handleGroupUpdatePromoteMessage({ } const userEd25519Secretkey = (await UserUtils.getUserED25519KeyPairBytes()).privKeyBytes; - let found = await UserGroupsWrapperActions.getGroup(groupPk); - const wasKicked = found?.kicked || false; - - if (!found) { - found = { - authData: null, - joinedAtSeconds: Date.now(), - name: change.name, - priority: 0, - pubkeyHex: groupPk, - secretKey: groupKeypair.privateKey, - kicked: false, - invitePending: true, - }; - } else { - found.kicked = false; - found.name = change.name; - found.secretKey = groupKeypair.privateKey; - } - if (authorIsApproved) { - // pre approve invite to groups when we've already approved the person who invited us - found.invitePending = false; - } + const { found, wasKicked } = await getInitializedGroupObject({ + groupPk, + groupName: change.name, + groupSecretKey: groupKeypair.privateKey, + inviterIsApproved: authorIsApproved, + }); await UserGroupsWrapperActions.setGroup(found); // force markedAsUnread to be true so it shows the unread banner (we only show the banner if there are unread messages on at least one msg/group request) diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index 50f1035cbf..3c38ce78c7 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -95,10 +95,6 @@ async function requestSnodesForPubkeyRetryable(pubKey: string): Promise { const targetNode = await SnodePool.getRandomSnode(); - if (!targetNode) { - debugger; - } - return requestSnodesForPubkeyWithTargetNode(pubKey, targetNode); }, { From 9c098ff3a8e1f9b1a5bfd1b7aa3f25d140fcea2e Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 24 Oct 2024 19:19:33 +1100 Subject: [PATCH 153/302] fix: group member list is all unselected by default --- .../dialog/UpdateGroupMembersDialog.tsx | 60 +++++++++---------- .../leftpane/overlay/OverlayClosedGroup.tsx | 2 +- .../crypto/OpenGroupAuthentication_test.ts | 1 - 3 files changed, 29 insertions(+), 34 deletions(-) diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 3affeadcd3..e71170c794 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -18,7 +18,7 @@ import { useIsPrivate, useIsPublic, useSortedGroupMembers, - useWeAreAdmin + useWeAreAdmin, } from '../../hooks/useParamSelector'; import { useSet } from '../../hooks/useSet'; @@ -151,11 +151,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { const isProcessingUIChange = useMemberGroupChangePending(); const [alsoRemoveMessages, setAlsoRemoveMessages] = useState(false); - const { - addTo, - removeFrom, - uniqueValues: membersToKeepWithUpdate, - } = useSet(existingMembers); + const { addTo, removeFrom, uniqueValues: membersToRemove } = useSet([]); const dispatch = useDispatch(); @@ -173,7 +169,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { groupPk: conversationId, addMembersWithHistory: [], addMembersWithoutHistory: [], - removeMembers: difference(existingMembers, membersToKeepWithUpdate) as Array, + removeMembers: membersToRemove as Array, alsoRemoveMessages, }); dispatch(groupv2Action as any); @@ -181,7 +177,10 @@ export const UpdateGroupMembersDialog = (props: Props) => { return; // keeping the dialog open until the async thunk is done } - await onSubmit(conversationId, membersToKeepWithUpdate); + await onSubmit( + conversationId, + difference(existingMembers, membersToRemove) as Array + ); closeDialog(); }; @@ -190,44 +189,41 @@ export const UpdateGroupMembersDialog = (props: Props) => { return event.key === 'Esc' || event.key === 'Escape'; }, closeDialog); - const onAdd = (member: string) => { + const onSelect = (member: string) => { if (!weAreAdmin) { - window?.log?.warn('Only group admin can add members!'); + window?.log?.warn('Only group admin can select!'); return; } - addTo(member); - }; - - const onRemove = (member: string) => { - if (!weAreAdmin) { - window?.log?.warn('Only group admin can remove members!'); - return; - } if (groupAdmins?.includes(member)) { if (PubKey.is03Pubkey(conversationId)) { - window?.log?.warn(`User ${member} cannot be removed as they are an admin.`); + window?.log?.warn(`User ${member} cannot be selected as they are an admin.`); return; } ToastUtils.pushCannotRemoveCreatorFromGroup(); window?.log?.warn( - `User ${member} cannot be removed as they are the creator of the closed group.` + `User ${member} cannot be selected as they are the creator of the closed group.` ); return; } + addTo(member); + }; + + const onUnselect = (member: string) => { + if (!weAreAdmin) { + window?.log?.warn('Only group admin can unselect members!'); + return; + } + removeFrom(member); }; const showNoMembersMessage = existingMembers.length === 0; - const okText = window.i18n('okay'); - const cancelText = window.i18n('cancel'); - - const titleText = window.i18n('groupMembers'); return ( - - {hasClosedGroupV2QAButtons() && weAreAdmin ? ( + + {hasClosedGroupV2QAButtons() && weAreAdmin ? ( <> Also remove messages: { {showNoMembersMessage &&

{window.i18n('groupMembersNone')}

} @@ -255,16 +251,16 @@ export const UpdateGroupMembersDialog = (props: Props) => {
{weAreAdmin && ( )} { {isDevProd() && ( <> - Invite as admin Plop?{' '} + Invite as admin?{' '} { diff --git a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts index b48f628e10..389c8a1bd7 100644 --- a/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts +++ b/ts/test/session/unit/crypto/OpenGroupAuthentication_test.ts @@ -299,7 +299,6 @@ const decryptBlindedMessage = async ( const version = data[0]; if (version !== 0) { - console.warn('decryptBlindedMessage - Dropping message due to unsupported encryption version'); return undefined; } From 6c945a173d819f04f34f0d457b11a91916984175 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 24 Oct 2024 19:46:53 +1100 Subject: [PATCH 154/302] fix: groupv2 control message join/remove are now correctly used --- ts/models/groupUpdate.ts | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ts/models/groupUpdate.ts b/ts/models/groupUpdate.ts index 3384e67e3d..dc04e60520 100644 --- a/ts/models/groupUpdate.ts +++ b/ts/models/groupUpdate.ts @@ -32,7 +32,7 @@ export function getKickedGroupUpdateStr( switch (othersNames.length) { case 0: - return { token: 'groupUpdated' } + return { token: 'groupUpdated' }; case 1: return { token: 'groupRemoved', args: { name: othersNames[0] } }; case 2: @@ -88,7 +88,7 @@ export function getJoinedGroupUpdateChangeStr( case 1: return addedWithHistory ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } } - : { token: 'legacyGroupMemberNewYouOther', args: { other_name: othersNames[0] } }; + : { token: 'groupInviteYouAndOtherNew', args: { other_name: othersNames[0] } }; default: return addedWithHistory ? { token: 'groupMemberNewYouHistoryMultiple', args: { count: othersNames.length } } @@ -97,11 +97,15 @@ export function getJoinedGroupUpdateChangeStr( } switch (othersNames.length) { case 0: - return { token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou' }; + return { token: 'groupUpdated' }; // this is an invalid case, but well. case 1: return addedWithHistory - ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } } - : { token: 'legacyGroupMemberNewYouOther', args: { other_name: othersNames[0] } }; + ? { token: 'groupMemberNewHistory', args: { name: othersNames[0] } } + : { token: 'groupMemberNew', args: { name: othersNames[0] } }; + case 2: + return addedWithHistory + ? { token: 'groupMemberNewHistoryTwo', args: { name: othersNames[0], other_name: othersNames[1] } } + : { token: 'groupMemberNewTwo', args: { name: othersNames[0], other_name: othersNames[1] } }; default: return addedWithHistory ? { @@ -115,6 +119,7 @@ export function getJoinedGroupUpdateChangeStr( } } + // legacy groups if (us) { switch (othersNames.length) { case 0: @@ -127,7 +132,7 @@ export function getJoinedGroupUpdateChangeStr( } switch (othersNames.length) { case 0: - return { token: 'groupUpdated' } + return { token: 'groupUpdated' }; case 1: return { token: 'legacyGroupMemberNew', args: { name: othersNames[0] } }; case 2: @@ -167,7 +172,7 @@ export function getPromotedGroupUpdateChangeStr( } switch (othersNames.length) { case 0: - return { token: 'groupUpdated' } + return { token: 'groupUpdated' }; case 1: return { token: 'adminPromotedToAdmin', args: { name: othersNames[0] } }; case 2: From f4d0e369c9f6d725b1c0fb8d4c78416e2d3feaaa Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 25 Oct 2024 16:19:55 +1100 Subject: [PATCH 155/302] fix: send group update promote message and display them --- ts/components/MemberListItem.tsx | 13 +- ts/components/dialog/InviteContactsDialog.tsx | 2 +- .../leftpane/overlay/OverlayClosedGroup.tsx | 2 +- ts/components/menu/Menu.tsx | 9 +- ts/interactions/conversationInteractions.ts | 84 +++++++++- ts/models/message.ts | 10 +- .../apis/snode_api/SnodeRequestTypes.ts | 9 +- .../snode_api/signature/snodeSignatures.ts | 9 +- ts/session/apis/snode_api/types.ts | 7 +- .../group/groupUpdateMessageFactory.ts | 155 ++++++++++++++++++ ts/session/types/with.ts | 12 ++ .../jobs/GroupPendingRemovalsJob.ts | 13 +- .../utils/job_runners/jobs/GroupPromoteJob.ts | 4 +- .../utils/job_runners/jobs/GroupSyncJob.ts | 11 +- .../utils/libsession/libsession_utils.ts | 1 - ts/state/ducks/metaGroups.ts | 132 ++------------- .../unit/crypto/SnodeSignatures_test.ts | 2 +- 17 files changed, 307 insertions(+), 168 deletions(-) create mode 100644 ts/session/messages/message_factory/group/groupUpdateMessageFactory.ts diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index bf164ced89..3252852a5d 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -1,10 +1,12 @@ import styled from 'styled-components'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { useNicknameOrProfileNameOrShortenedPubkey } from '../hooks/useParamSelector'; +import { promoteUsersInGroup } from '../interactions/conversationInteractions'; import { PubKey } from '../session/types'; import { UserUtils } from '../session/utils'; import { GroupInvite } from '../session/utils/job_runners/jobs/GroupInviteJob'; -import { GroupPromote } from '../session/utils/job_runners/jobs/GroupPromoteJob'; +import { hasClosedGroupV2QAButtons } from '../shared/env_vars'; import { useMemberInviteFailed, useMemberInviteSending, @@ -13,6 +15,7 @@ import { useMemberPromotionFailed, useMemberPromotionSent, } from '../state/selectors/groups'; +import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar'; import { Flex } from './basic/Flex'; import { SessionButton, @@ -20,10 +23,7 @@ import { SessionButtonShape, SessionButtonType, } from './basic/SessionButton'; -import { useNicknameOrProfileNameOrShortenedPubkey } from '../hooks/useParamSelector'; -import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar'; import { SessionRadio } from './basic/SessionRadio'; -import { hasClosedGroupV2QAButtons } from '../shared/env_vars'; const AvatarContainer = styled.div` position: relative; @@ -252,7 +252,10 @@ const ResendPromoteButton = ({ buttonColor={SessionButtonColor.Danger} text="PrOmOtE" onClick={() => { - void GroupPromote.addJob({ groupPk, member: pubkey }); + void promoteUsersInGroup({ + groupPk, + toPromote: [pubkey], + }); }} /> ); diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index 5c25a99eb4..5f7b95ecfc 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -187,7 +187,7 @@ const InviteContactsDialogInner = (props: Props) => { - {/* TODO: localize those strings once out releasing those buttons for real */} + {/* TODO: localize those strings once out releasing those buttons for real Remove after QA */} {isGroupV2 && isDevProd() && ( <> diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index 9c77225322..fd7e66cd10 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -194,7 +194,7 @@ export const OverlayClosedGroupV2 = () => { />
- {/* TODO: localize those strings once out releasing those buttons for real */} + {/* TODO: localize those strings once out releasing those buttons for real Remove after QA */} {isDevProd() && ( <> diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index b33aa1c6d6..d8bba60f4b 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -32,7 +32,7 @@ import { showBanUserByConvoId, showInviteContactByConvoId, showLeaveGroupByConvoId, - showLeavePrivateConversationbyConvoId, + showLeavePrivateConversationByConvoId, showRemoveModeratorsByConvoId, showUnbanUserByConvoId, showUpdateGroupNameByConvoId, @@ -58,7 +58,10 @@ import { useSelectedConversationKey } from '../../state/selectors/selectedConver import type { LocalizerToken } from '../../types/localizer'; import { SessionButtonColor } from '../basic/SessionButton'; import { ItemWithDataTestId } from './items/MenuItemWithDataTestId'; -import { ConversationInteractionStatus, ConversationInteractionType } from '../../interactions/types'; +import { + ConversationInteractionStatus, + ConversationInteractionType, +} from '../../interactions/types'; /** Menu items standardized */ @@ -420,7 +423,7 @@ export const DeletePrivateConversationMenuItem = () => { return ( { - showLeavePrivateConversationbyConvoId(convoId); + showLeavePrivateConversationByConvoId(convoId); }} > {isMe ? window.i18n('noteToSelfHide') : window.i18n('conversationsDelete')} diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 6107ee36a6..5a51726600 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -1,4 +1,5 @@ -import { isNil } from 'lodash'; +import { isEmpty, isNil, uniq } from 'lodash'; +import { PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; import { ConversationNotificationSettingType, READ_MESSAGE_STATE, @@ -53,6 +54,11 @@ import { BlockedNumberController } from '../util'; import { LocalizerComponentProps, LocalizerToken } from '../types/localizer'; import { sendInviteResponseToGroup } from '../session/sending/group/GroupInviteResponse'; import { NetworkTime } from '../util/NetworkTime'; +import { ClosedGroup } from '../session'; +import { GroupUpdateMessageFactory } from '../session/messages/message_factory/group/groupUpdateMessageFactory'; +import { GroupPromote } from '../session/utils/job_runners/jobs/GroupPromoteJob'; +import { MessageSender } from '../session/sending'; +import { StoreGroupRequestFactory } from '../session/apis/snode_api/factories/StoreGroupRequestFactory'; export async function copyPublicKeyByConvoId(convoId: string) { if (OpenGroupUtils.isOpenGroupV2(convoId)) { @@ -114,7 +120,7 @@ export const handleAcceptConversationRequest = async ({ convoId }: { convoId: st if (PubKey.is03Pubkey(convoId)) { const found = await UserGroupsWrapperActions.getGroup(convoId); if (!found) { - window.log.warn('cannot approve a non existing group in usergroup'); + window.log.warn('cannot approve a non existing group in user group'); return null; } // this updates the wrapper and refresh the redux slice @@ -307,7 +313,7 @@ export async function showUpdateGroupMembersByConvoId(conversationId: string) { window.inboxStore?.dispatch(updateGroupMembersModal({ conversationId })); } -export function showLeavePrivateConversationbyConvoId(conversationId: string) { +export function showLeavePrivateConversationByConvoId(conversationId: string) { const conversation = ConvoHub.use().get(conversationId); const isMe = conversation.isMe(); @@ -334,7 +340,7 @@ export function showLeavePrivateConversationbyConvoId(conversationId: string) { }); await clearConversationInteractionState({ conversationId }); } catch (err) { - window.log.warn(`showLeavePrivateConversationbyConvoId error: ${err}`); + window.log.warn(`showLeavePrivateConversationByConvoId error: ${err}`); await saveConversationInteractionErrorAsMessage({ conversationId, interactionType: isMe @@ -954,3 +960,73 @@ async function saveConversationInteractionErrorAsMessage({ conversation.updateLastMessage(); } + +export async function promoteUsersInGroup({ + groupPk, + toPromote, +}: { toPromote: Array } & WithGroupPubkey) { + if (!toPromote.length) { + window.log.debug('promoteUsersInGroup: no users to promote'); + return; + } + + const convo = ConvoHub.use().get(groupPk); + if (!convo) { + window.log.debug('promoteUsersInGroup: group convo not found'); + return; + } + + const groupInWrapper = await UserGroupsWrapperActions.getGroup(groupPk); + if (!groupInWrapper || !groupInWrapper.secretKey || isEmpty(groupInWrapper.secretKey)) { + window.log.debug('promoteUsersInGroup: groupInWrapper not found or no secretkey'); + return; + } + + // push one group change message were initial members are added to the group + const membersHex = uniq(toPromote); + const sentAt = NetworkTime.now(); + const us = UserUtils.getOurPubKeyStrFromCache(); + const msgModel = await ClosedGroup.addUpdateMessage({ + diff: { type: 'promoted', promoted: membersHex }, + expireUpdate: null, + sender: us, + sentAt, + convo, + markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier + }); + const groupMemberChange = await GroupUpdateMessageFactory.getPromotedControlMessage({ + adminSecretKey: groupInWrapper.secretKey, + convo, + groupPk, + promoted: membersHex, + createAtNetworkTimestamp: sentAt, + dbMsgIdentifier: msgModel.id, + }); + + if (!groupMemberChange) { + window.log.warn('promoteUsersInGroup: failed to build group change'); + throw new Error('promoteUsersInGroup: failed to build group change'); + } + + const storeRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest( + [groupMemberChange], + groupInWrapper + ); + + const result = await MessageSender.sendEncryptedDataToSnode({ + destination: groupPk, + method: 'batch', + sortedSubRequests: storeRequests, + }); + + if (result?.[0].code !== 200) { + window.log.warn('promoteUsersInGroup: failed to store change'); + throw new Error('promoteUsersInGroup: failed to store change'); + } + + for (let index = 0; index < membersHex.length; index++) { + const member = membersHex[index]; + // eslint-disable-next-line no-await-in-loop + await GroupPromote.addJob({ groupPk, member }); + } +} diff --git a/ts/models/message.ts b/ts/models/message.ts index 7c11fe7572..5791d1629b 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -320,9 +320,9 @@ export class MessageModel extends Backbone.Model { // TODO: clean up this typing return window.i18n.stripped(...([token, args] as GetMessageArgs)); } - if (groupUpdate.promoted) { + if (groupUpdate.promoted?.length) { // @ts-expect-error -- TODO: Fix by using new i18n builder - const { token, args } = getPromotedGroupUpdateChangeStr(groupUpdate.kicked, groupName); + const { token, args } = getPromotedGroupUpdateChangeStr(groupUpdate.promoted, groupName); // TODO: clean up this typing return window.i18n.stripped(...([token, args] as GetMessageArgs)); } @@ -1455,6 +1455,12 @@ export class MessageModel extends Backbone.Model { ? [groupUpdate.kicked] : undefined; + forcedArrayUpdate.promoted = Array.isArray(groupUpdate.promoted) + ? groupUpdate.promoted + : groupUpdate.promoted + ? [groupUpdate.promoted] + : undefined; + forcedArrayUpdate.left = Array.isArray(groupUpdate.left) ? groupUpdate.left : groupUpdate.left diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index b37014a862..1f849e2c06 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -17,15 +17,10 @@ import { } from './namespaces'; import { GroupDetailsNeededForSignature, SnodeGroupSignature } from './signature/groupSignature'; import { SnodeSignature } from './signature/snodeSignatures'; -import { - ShortenOrExtend, - WithMessagesHashes, - WithSecretKey, - WithSignature, - WithTimestamp, -} from './types'; +import { ShortenOrExtend, WithMessagesHashes } from './types'; import { TTL_DEFAULT } from '../../constants'; import { NetworkTime } from '../../../util/NetworkTime'; +import { WithSecretKey, WithSignature, WithTimestamp } from '../../types/with'; type WithMaxSize = { max_size?: number }; export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; diff --git a/ts/session/apis/snode_api/signature/snodeSignatures.ts b/ts/session/apis/snode_api/signature/snodeSignatures.ts index 027aeadb8f..fd49eb36fe 100644 --- a/ts/session/apis/snode_api/signature/snodeSignatures.ts +++ b/ts/session/apis/snode_api/signature/snodeSignatures.ts @@ -11,14 +11,9 @@ import { PubKey } from '../../../types'; import { StringUtils, UserUtils } from '../../../utils'; import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../../utils/String'; import { PreConditionFailed } from '../../../utils/errors'; -import { - SignedHashesParams, - WithMessagesHashes, - WithShortenOrExtend, - WithSignature, - WithTimestamp, -} from '../types'; +import { SignedHashesParams, WithMessagesHashes, WithShortenOrExtend } from '../types'; import { NetworkTime } from '../../../../util/NetworkTime'; +import { WithSignature, WithTimestamp } from '../../../types/with'; export type SnodeSignatureResult = WithSignature & WithTimestamp & { diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index 127ce6d2cd..e3eeae5873 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -2,6 +2,7 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { SnodeNamespaces } from './namespaces'; import { SubaccountRevokeSubRequest, SubaccountUnrevokeSubRequest } from './SnodeRequestTypes'; +import { WithSignature, WithTimestamp } from '../../types/with'; export type RetrieveMessageItem = { hash: string; @@ -10,10 +11,9 @@ export type RetrieveMessageItem = { storedAt: number; // **not** the envelope timestamp, but when the message was effectively stored on the snode }; - export type RetrieveMessageItemWithNamespace = RetrieveMessageItem & { namespace: SnodeNamespaces; // the namespace from which this message was fetched -} +}; export type RetrieveMessagesResultsContent = { hf?: Array; @@ -31,9 +31,6 @@ export type WithMessagesHashes = { messagesHashes: Array }; export type RetrieveMessagesResultsBatched = Array; -export type WithTimestamp = { timestamp: number }; -export type WithSignature = { signature: string }; -export type WithSecretKey = { secretKey: Uint8Array }; export type ShortenOrExtend = 'extend' | 'shorten' | ''; export type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; diff --git a/ts/session/messages/message_factory/group/groupUpdateMessageFactory.ts b/ts/session/messages/message_factory/group/groupUpdateMessageFactory.ts new file mode 100644 index 0000000000..97da4af52d --- /dev/null +++ b/ts/session/messages/message_factory/group/groupUpdateMessageFactory.ts @@ -0,0 +1,155 @@ +import { Uint8ArrayLen64, WithGroupPubkey } from 'libsession_util_nodejs'; +import { getSodiumRenderer } from '../../../crypto'; +import { DisappearingMessages } from '../../../disappearing_messages'; + +import { GroupUpdateMemberChangeMessage } from '../../outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage'; +import { ConversationModel } from '../../../../models/conversation'; +import { + WithAddWithHistoryMembers, + WithAddWithoutHistoryMembers, + WithFromMemberLeftMessage, + WithPromotedMembers, + WithRemoveMembers, +} from '../../../types/with'; + +/** + * Return the control messages to be pushed to the group's swarm. + * Those are not going to change the state, they are just here as a "notification". + * i.e. "Alice was removed from the group" + */ +async function getRemovedControlMessage({ + convo, + groupPk, + removed, + adminSecretKey, + createAtNetworkTimestamp, + fromMemberLeftMessage, + dbMsgIdentifier, +}: WithFromMemberLeftMessage & + WithRemoveMembers & + WithGroupPubkey & { + convo: ConversationModel; + adminSecretKey: Uint8ArrayLen64; + createAtNetworkTimestamp: number; + dbMsgIdentifier: string; + }) { + const sodium = await getSodiumRenderer(); + + if (fromMemberLeftMessage || !removed.length) { + return null; + } + + return new GroupUpdateMemberChangeMessage({ + identifier: dbMsgIdentifier, + removed, + groupPk, + typeOfChange: 'removed', + createAtNetworkTimestamp, + secretKey: adminSecretKey, + sodium, + ...DisappearingMessages.getExpireDetailsForOutgoingMessage(convo, createAtNetworkTimestamp), + }); +} + +async function getWithoutHistoryControlMessage({ + convo, + withoutHistory, + groupPk, + adminSecretKey, + createAtNetworkTimestamp, + dbMsgIdentifier, +}: WithAddWithoutHistoryMembers & + WithGroupPubkey & { + dbMsgIdentifier: string; + convo: ConversationModel; + adminSecretKey: Uint8ArrayLen64; + createAtNetworkTimestamp: number; + }) { + const sodium = await getSodiumRenderer(); + + if (!withoutHistory.length) { + return null; + } + + return new GroupUpdateMemberChangeMessage({ + identifier: dbMsgIdentifier, + added: withoutHistory, + groupPk, + typeOfChange: 'added', + createAtNetworkTimestamp, + secretKey: adminSecretKey, + sodium, + ...DisappearingMessages.getExpireDetailsForOutgoingMessage(convo, createAtNetworkTimestamp), + }); +} + +async function getWithHistoryControlMessage({ + convo, + withHistory, + groupPk, + adminSecretKey, + createAtNetworkTimestamp, + dbMsgIdentifier, +}: WithAddWithHistoryMembers & + WithGroupPubkey & { + dbMsgIdentifier: string; + convo: ConversationModel; + adminSecretKey: Uint8ArrayLen64; + createAtNetworkTimestamp: number; + }) { + const sodium = await getSodiumRenderer(); + + if (!withHistory.length) { + return null; + } + + return new GroupUpdateMemberChangeMessage({ + identifier: dbMsgIdentifier, + added: withHistory, + groupPk, + typeOfChange: 'addedWithHistory', + createAtNetworkTimestamp, + secretKey: adminSecretKey, + sodium, + ...DisappearingMessages.getExpireDetailsForOutgoingMessage(convo, createAtNetworkTimestamp), + }); +} + +async function getPromotedControlMessage({ + convo, + promoted, + groupPk, + adminSecretKey, + createAtNetworkTimestamp, + dbMsgIdentifier, +}: WithPromotedMembers & + WithGroupPubkey & { + dbMsgIdentifier: string; + convo: ConversationModel; + adminSecretKey: Uint8ArrayLen64; + createAtNetworkTimestamp: number; + }) { + const sodium = await getSodiumRenderer(); + + if (!promoted.length) { + return null; + } + + return new GroupUpdateMemberChangeMessage({ + identifier: dbMsgIdentifier, + promoted, + groupPk, + typeOfChange: 'promoted', + createAtNetworkTimestamp, + secretKey: adminSecretKey, + sodium, + ...DisappearingMessages.getExpireDetailsForOutgoingMessage(convo, createAtNetworkTimestamp), + }); +} + +export const GroupUpdateMessageFactory = { + getRemovedControlMessage, + getWithoutHistoryControlMessage, + getWithHistoryControlMessage, + getPromotedControlMessage, +}; diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index 50f16911ab..bd5cebcbb0 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -1 +1,13 @@ +import { PubkeyType } from 'libsession_util_nodejs'; + export type WithMessageHash = { messageHash: string }; +export type WithTimestamp = { timestamp: number }; +export type WithSignature = { signature: string }; +export type WithSecretKey = { secretKey: Uint8Array }; + +export type WithFromMemberLeftMessage = { fromMemberLeftMessage: boolean }; // there are some changes we want to skip when doing changes triggered from a memberLeft message. + +export type WithAddWithoutHistoryMembers = { withoutHistory: Array }; +export type WithAddWithHistoryMembers = { withHistory: Array }; +export type WithRemoveMembers = { removed: Array }; +export type WithPromotedMembers = { promoted: Array }; diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 81a0f332c4..f250e23979 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -1,5 +1,5 @@ /* eslint-disable no-await-in-loop */ -import { PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; +import { WithGroupPubkey } from 'libsession_util_nodejs'; import { compact, isEmpty, isNumber } from 'lodash'; import { v4 } from 'uuid'; import { StringUtils } from '../..'; @@ -17,7 +17,6 @@ import { } from '../../../apis/snode_api/SnodeRequestTypes'; import { StoreGroupRequestFactory } from '../../../apis/snode_api/factories/StoreGroupRequestFactory'; import { RevokeChanges, SnodeAPIRevoke } from '../../../apis/snode_api/revokeSubaccount'; -import { WithSecretKey } from '../../../apis/snode_api/types'; import { concatUInt8Array, getSodiumRenderer } from '../../../crypto'; import { GroupUpdateDeleteMemberContentMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage'; import { MessageSender } from '../../../sending'; @@ -31,10 +30,12 @@ import { } from '../PersistedJob'; import { GroupSync } from './GroupSyncJob'; import { NetworkTime } from '../../../../util/NetworkTime'; - -export type WithAddWithoutHistoryMembers = { withoutHistory: Array }; -export type WithAddWithHistoryMembers = { withHistory: Array }; -export type WithRemoveMembers = { removed: Array }; +import { + WithAddWithHistoryMembers, + WithAddWithoutHistoryMembers, + WithRemoveMembers, + WithSecretKey, +} from '../../../types/with'; const defaultMsBetweenRetries = 10000; const defaultMaxAttempts = 1; diff --git a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts index f4b60acbb4..d36f6306ee 100644 --- a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts @@ -20,7 +20,7 @@ import { import { MessageQueue } from '../../../sending'; const defaultMsBetweenRetries = 10000; -const defaultMaxAttemps = 1; +const defaultMaxAttempts = 1; type JobExtraArgs = { groupPk: GroupPubkeyType; @@ -75,7 +75,7 @@ class GroupPromoteJob extends PersistedJob { member, groupPk, delayBetweenRetries: defaultMsBetweenRetries, - maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttemps, + maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts, nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries, currentRetry: isNumber(currentRetry) ? currentRetry : 0, }); diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index 571974146f..74d7dbd81f 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -120,7 +120,7 @@ async function pushChangesToGroupSwarmIfNeeded({ if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { const dumps = await MetaGroupWrapperActions.metaMakeDump(groupPk); window.log.info( - `pushChangesToGroupSwarmIfNeeded: current metadump: ${ed25519Str(groupPk)}:`, + `pushChangesToGroupSwarmIfNeeded: current meta dump: ${ed25519Str(groupPk)}:`, to_hex(dumps) ); } @@ -166,10 +166,10 @@ async function pushChangesToGroupSwarmIfNeeded({ }); const expectedReplyLength = - (supplementalKeysSubRequest ? 1 : 0) + // we are sending all the supplemental keys as a single subrequest - pendingConfigRequests.length + // each of those are sent as a subrequest - extraStoreRequests.length + // each of those are sent as a subrequest - extraRequestWithExpectedResults.length; // each of those are sent as a subrequest, but they don't all return something... + (supplementalKeysSubRequest ? 1 : 0) + // we are sending all the supplemental keys as a single sub request + pendingConfigRequests.length + // each of those are sent as a sub request + extraStoreRequests.length + // each of those are sent as a sub request + extraRequestWithExpectedResults.length; // each of those are sent as a sub request, but they don't all return something... // we do a sequence call here. If we do not have the right expected number of results, consider it a failure if (!isArray(result) || result.length !== expectedReplyLength) { @@ -184,6 +184,7 @@ async function pushChangesToGroupSwarmIfNeeded({ const changes = LibSessionUtil.batchResultsToGroupSuccessfulChange(result, { allOldHashes, messages: pendingConfigData, + }); if (isEmpty(changes)) { diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index eda71af775..9af909b4f8 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -284,7 +284,6 @@ function batchResultsToGroupSuccessfulChange( * As it is a sequence, the delete might have failed but the new config message might still be posted. * So we need to check which request failed, and if it is the delete by hashes, we need to add the hash of the posted message to the list of hashes */ - if (!result?.length) { return successfulChanges; } diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 8ad2bc9cfa..65ee714510 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -5,14 +5,13 @@ import { GroupMemberGet, GroupPubkeyType, PubkeyType, - Uint8ArrayLen64, UserGroupsGet, WithGroupPubkey, WithPubkey, } from 'libsession_util_nodejs'; import { intersection, isEmpty, uniq } from 'lodash'; +import { from_hex } from 'libsodium-wrappers-sumo'; import { ConfigDumpData } from '../../data/configDump/configDump'; -import { ConversationModel } from '../../models/conversation'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; @@ -27,12 +26,7 @@ import { PubKey } from '../../session/types'; import { UserUtils } from '../../session/utils'; import { PreConditionFailed } from '../../session/utils/errors'; import { GroupInvite } from '../../session/utils/job_runners/jobs/GroupInviteJob'; -import { - GroupPendingRemovals, - WithAddWithHistoryMembers, - WithAddWithoutHistoryMembers, - WithRemoveMembers, -} from '../../session/utils/job_runners/jobs/GroupPendingRemovalsJob'; +import { GroupPendingRemovals } from '../../session/utils/job_runners/jobs/GroupPendingRemovalsJob'; import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; @@ -53,9 +47,14 @@ import { openConversationWithMessages } from './conversations'; import { resetLeftOverlayMode } from './section'; import { ConversationTypeEnum } from '../../models/types'; import { NetworkTime } from '../../util/NetworkTime'; -import { from_hex } from 'libsodium-wrappers-sumo'; +import { GroupUpdateMessageFactory } from '../../session/messages/message_factory/group/groupUpdateMessageFactory'; +import { + WithAddWithHistoryMembers, + WithAddWithoutHistoryMembers, + WithFromMemberLeftMessage, + WithRemoveMembers, +} from '../../session/types/with'; -type WithFromMemberLeftMessage = { fromMemberLeftMessage: boolean }; // there are some changes we want to skip when doing changes triggered from a memberLeft message. export type GroupState = { infos: Record; members: Record>; @@ -206,7 +205,7 @@ const initNewGroupInWrapper = createAsyncThunk( convo, markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier }); - groupMemberChange = await getWithoutHistoryControlMessage({ + groupMemberChange = await GroupUpdateMessageFactory.getWithoutHistoryControlMessage({ adminSecretKey: groupSecretKey, convo, groupPk, @@ -343,7 +342,7 @@ const handleUserGroupUpdate = createAsyncThunk( /** * Called only when the app just loaded the SessionInbox (i.e. user logged in and fully loaded). - * This function populates the slice with any meta-dumps we have in the DB, if they also are part of what is the usergroup wrapper tracking. + * This function populates the slice with any meta-dumps we have in the DB, if they also are part of what is the user group wrapper tracking. * */ const loadMetaDumpsFromDB = createAsyncThunk( @@ -562,109 +561,6 @@ async function handleWithoutHistoryMembers({ } } -/** - * Return the control messages to be pushed to the group's swarm. - * Those are not going to change the state, they are just here as a "notification". - * i.e. "Alice was removed from the group" - */ -async function getRemovedControlMessage({ - convo, - groupPk, - removed, - adminSecretKey, - createAtNetworkTimestamp, - fromMemberLeftMessage, - dbMsgIdentifier, -}: WithFromMemberLeftMessage & - WithRemoveMembers & - WithGroupPubkey & { - convo: ConversationModel; - adminSecretKey: Uint8ArrayLen64; - createAtNetworkTimestamp: number; - dbMsgIdentifier: string; - }) { - const sodium = await getSodiumRenderer(); - - if (fromMemberLeftMessage || !removed.length) { - return null; - } - - return new GroupUpdateMemberChangeMessage({ - identifier: dbMsgIdentifier, - removed, - groupPk, - typeOfChange: 'removed', - createAtNetworkTimestamp, - secretKey: adminSecretKey, - sodium, - ...DisappearingMessages.getExpireDetailsForOutgoingMessage(convo, createAtNetworkTimestamp), - }); -} - -async function getWithoutHistoryControlMessage({ - convo, - withoutHistory, - groupPk, - adminSecretKey, - createAtNetworkTimestamp, - dbMsgIdentifier, -}: WithAddWithoutHistoryMembers & - WithGroupPubkey & { - dbMsgIdentifier: string; - convo: ConversationModel; - adminSecretKey: Uint8ArrayLen64; - createAtNetworkTimestamp: number; - }) { - const sodium = await getSodiumRenderer(); - - if (!withoutHistory.length) { - return null; - } - - return new GroupUpdateMemberChangeMessage({ - identifier: dbMsgIdentifier, - added: withoutHistory, - groupPk, - typeOfChange: 'added', - createAtNetworkTimestamp, - secretKey: adminSecretKey, - sodium, - ...DisappearingMessages.getExpireDetailsForOutgoingMessage(convo, createAtNetworkTimestamp), - }); -} - -async function getWithHistoryControlMessage({ - convo, - withHistory, - groupPk, - adminSecretKey, - createAtNetworkTimestamp, - dbMsgIdentifier, -}: WithAddWithHistoryMembers & - WithGroupPubkey & { - dbMsgIdentifier: string; - convo: ConversationModel; - adminSecretKey: Uint8ArrayLen64; - createAtNetworkTimestamp: number; - }) { - const sodium = await getSodiumRenderer(); - - if (!withHistory.length) { - return null; - } - - return new GroupUpdateMemberChangeMessage({ - identifier: dbMsgIdentifier, - added: withHistory, - groupPk, - typeOfChange: 'addedWithHistory', - createAtNetworkTimestamp, - secretKey: adminSecretKey, - sodium, - ...DisappearingMessages.getExpireDetailsForOutgoingMessage(convo, createAtNetworkTimestamp), - }); -} - async function handleMemberAddedFromUI({ addMembersWithHistory, addMembersWithoutHistory, @@ -728,7 +624,7 @@ async function handleMemberAddedFromUI({ diff: { type: 'add', added: withHistory, withHistory: true }, ...shared, }); - const groupChange = await getWithHistoryControlMessage({ + const groupChange = await GroupUpdateMessageFactory.getWithHistoryControlMessage({ adminSecretKey: group.secretKey, convo, groupPk, @@ -745,7 +641,7 @@ async function handleMemberAddedFromUI({ diff: { type: 'add', added: withoutHistory, withHistory: false }, ...shared, }); - const groupChange = await getWithoutHistoryControlMessage({ + const groupChange = await GroupUpdateMessageFactory.getWithoutHistoryControlMessage({ adminSecretKey: group.secretKey, convo, groupPk, @@ -866,7 +762,7 @@ async function handleMemberRemovedFromUI({ }, markAlreadySent: false, // the store below will mark the message as sent using dbMsgIdentifier }); - removedControlMessage = await getRemovedControlMessage({ + removedControlMessage = await GroupUpdateMessageFactory.getRemovedControlMessage({ adminSecretKey: group.secretKey, convo, groupPk, diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts index b8bac771fb..c28ff1902d 100644 --- a/ts/test/session/unit/crypto/SnodeSignatures_test.ts +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -7,11 +7,11 @@ import { getSodiumNode } from '../../../../node/sodiumNode'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { SnodeGroupSignature } from '../../../../session/apis/snode_api/signature/groupSignature'; import { SnodeSignature } from '../../../../session/apis/snode_api/signature/snodeSignatures'; -import { WithSignature } from '../../../../session/apis/snode_api/types'; import { concatUInt8Array } from '../../../../session/crypto'; import { UserUtils } from '../../../../session/utils'; import { fromBase64ToArray, fromHexToArray } from '../../../../session/utils/String'; import { NetworkTime } from '../../../../util/NetworkTime'; +import { WithSignature } from '../../../../session/types/with'; use(chaiAsPromised); From c8c7308000ad4483a8662e6ae8e4e588680a65cc Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 25 Oct 2024 17:26:40 +1100 Subject: [PATCH 156/302] fix: decline group request does not show up shortly in main convolist --- ts/components/MemberListItem.tsx | 2 +- ts/interactions/conversationInteractions.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 3252852a5d..efcc63c197 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -250,7 +250,7 @@ const ResendPromoteButton = ({ buttonShape={SessionButtonShape.Square} buttonType={SessionButtonType.Solid} buttonColor={SessionButtonColor.Danger} - text="PrOmOtE" + text="PrOmOtE" // TODO DO NOT MERGE Remove after QA onClick={() => { void promoteUsersInGroup({ groupPk, diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 5a51726600..eae5f3a2c0 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -220,6 +220,14 @@ export async function declineConversationWithoutConfirm({ if (PubKey.is03Pubkey(conversationId)) { await UserGroupsWrapperActions.eraseGroup(conversationId); + // when deleting a 03 group message request, we also need to remove the conversation altogether + await ConvoHub.use().deleteGroup(conversationId, { + deleteAllMessagesOnSwarm: false, + emptyGroupButKeepAsKicked: false, + forceDestroyForAllMembers: false, + fromSyncMessage: false, + sendLeaveMessage: false, + }); } if (syncToDevices) { From c9cd6a974f16a8f0e499062b2f9cc45d0ee60afb Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 25 Oct 2024 20:30:10 +1100 Subject: [PATCH 157/302] fix: centralised localized string for disappearing messages strings --- protos/SignalService.proto | 1 - ts/components/NoticeBanner.tsx | 21 ++-- ts/components/SessionInboxView.tsx | 2 +- .../conversation/SessionConversation.tsx | 6 +- .../conversation/TimerNotification.tsx | 99 +++-------------- ts/models/message.ts | 48 +++------ ts/models/timerNotifications.ts | 100 ++++++++++++++++++ 7 files changed, 147 insertions(+), 130 deletions(-) create mode 100644 ts/models/timerNotifications.ts diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 5242d158e7..853cef89be 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -146,7 +146,6 @@ message GroupUpdateMessage { optional GroupUpdateInviteResponseMessage inviteResponse = 6; optional GroupUpdateDeleteMemberContentMessage deleteMemberContent = 7; optional GroupUpdateMemberLeftNotificationMessage memberLeftNotificationMessage = 8; - } diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx index 8bd13b690c..659870166a 100644 --- a/ts/components/NoticeBanner.tsx +++ b/ts/components/NoticeBanner.tsx @@ -12,9 +12,12 @@ const StyledNoticeBanner = styled(Flex)` padding: var(--margins-xs) var(--margins-sm); text-align: center; flex-shrink: 0; + cursor: pointer; + .session-icon-button { position: absolute; right: var(--margins-sm); + pointer-events: none; } `; @@ -25,12 +28,12 @@ const StyledText = styled.span` type NoticeBannerProps = { text: string; icon: SessionIconType; - onButtonClick: () => void; + onBannerClick: () => void; dataTestId: SessionDataTestId; }; export const NoticeBanner = (props: NoticeBannerProps) => { - const { text, onButtonClick, icon, dataTestId } = props; + const { text, onBannerClick, icon, dataTestId } = props; return ( { justifyContent={'center'} alignItems={'center'} data-testid={dataTestId} + onClick={event => { + event?.preventDefault(); + onBannerClick(); + }} > {text} - { - event?.preventDefault(); - onButtonClick(); - }} - /> + ); }; diff --git a/ts/components/SessionInboxView.tsx b/ts/components/SessionInboxView.tsx index e17a25d176..bff9301b2c 100644 --- a/ts/components/SessionInboxView.tsx +++ b/ts/components/SessionInboxView.tsx @@ -128,7 +128,7 @@ const SomeDeviceOutdatedSyncingNotice = () => { return ( diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index a5066e39aa..8a28b137d6 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -638,7 +638,7 @@ function OutdatedClientBanner(props: { return selectedConversation.hasOutdatedClient?.length ? ( { + onBannerClick={() => { const conversation = ConvoHub.use().get(selectedConversation.id); conversation.set({ hasOutdatedClient: undefined }); void conversation.commit(); @@ -662,8 +662,8 @@ function OutdatedLegacyGroupBanner(props: { return isLegacyGroup ? ( { + text={window.i18n('groupLegacyBanner', { date: 'FIXME AUDRIC' })} // Remove after QA + onBannerClick={() => { showLinkVisitWarningDialog('', dispatch); throw new Error('TODO'); // fixme audric }} diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index 0f0bdf232e..c768245dbd 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -1,8 +1,8 @@ import { useDispatch } from 'react-redux'; import styled from 'styled-components'; +import { PubkeyType } from 'libsession_util_nodejs'; import { PropsForExpirationTimer } from '../../state/ducks/conversations'; -import { isLegacyDisappearingModeEnabled } from '../../session/disappearing_messages/legacy'; import { UserUtils } from '../../session/utils'; import { useSelectedConversationDisappearingMode, @@ -10,7 +10,6 @@ import { useSelectedExpireTimer, useSelectedIsGroupOrCommunity, useSelectedIsGroupV2, - useSelectedIsLegacyGroup, useSelectedIsPrivateFriend, useSelectedIsPublic, } from '../../state/selectors/selectedConversation'; @@ -26,6 +25,7 @@ import type { LocalizerComponentProps, LocalizerToken } from '../../types/locali import { Localizer } from '../basic/Localizer'; import { SessionButtonColor } from '../basic/SessionButton'; import { SessionIcon } from '../icon'; +import { getTimerNotificationStr } from '../../models/timerNotifications'; const FollowSettingButton = styled.button` color: var(--primary-color); @@ -142,90 +142,25 @@ const FollowSettingsButton = (props: PropsForExpirationTimer) => { ); }; -function useTextToRenderI18nProps( - props: PropsForExpirationTimer -): LocalizerComponentProps { - const { pubkey: authorPk, profileName, expirationMode, timespanText: time, disabled } = props; - - const isLegacyGroup = useSelectedIsLegacyGroup(); - - const authorIsUs = authorPk === UserUtils.getOurPubKeyStrFromCache(); - - const name = profileName ?? authorPk; - - // TODO: legacy messages support will be removed in a future release - if (isLegacyDisappearingModeEnabled(expirationMode)) { - return { - token: 'deleteAfterLegacyDisappearingMessagesTheyChangedTimer', - args: { - name: authorIsUs ? window.i18n('you') : name, - time, - }, - }; - } - - const disappearing_messages_type = - expirationMode === 'deleteAfterRead' - ? window.i18n('disappearingMessagesTypeRead') - : window.i18n('disappearingMessagesTypeSent'); - - if (isLegacyGroup) { - if (disabled) { - return authorIsUs - ? { - token: 'disappearingMessagesTurnedOffYouGroup', - } - : { - token: 'disappearingMessagesTurnedOffGroup', - args: { - name, - }, - }; - } - } - - if (disabled) { - return authorIsUs - ? { - token: isLegacyGroup - ? 'disappearingMessagesTurnedOffYouGroup' - : 'disappearingMessagesTurnedOffYou', - } - : { - token: isLegacyGroup - ? 'disappearingMessagesTurnedOffGroup' - : 'disappearingMessagesTurnedOff', - args: { - name, - }, - }; - } - - return authorIsUs - ? { - token: 'disappearingMessagesSetYou', - args: { - time, - disappearing_messages_type, - }, - } - : { - token: 'disappearingMessagesSet', - args: { - time, - disappearing_messages_type, - name, - }, - }; -} - export const TimerNotification = (props: PropsForExpirationTimer) => { - const { messageId } = props; - - const i18nProps = useTextToRenderI18nProps(props); + const { messageId, expirationMode, pubkey, timespanSeconds } = props; + const convoId = useSelectedConversationKey(); const isGroupOrCommunity = useSelectedIsGroupOrCommunity(); const isGroupV2 = useSelectedIsGroupV2(); const isPublic = useSelectedIsPublic(); + + if (!convoId) { + return null; + } + + const i18nProps = getTimerNotificationStr({ + convoId, + author: pubkey as PubkeyType, + expirationMode, + isGroup: isGroupOrCommunity, + timespanSeconds, + }); + // renderOff is true when the update is put to off, or when we have a legacy group control message (as they are not expiring at all) const renderOffIcon = props.disabled || (isGroupOrCommunity && isPublic && !isGroupV2); diff --git a/ts/models/message.ts b/ts/models/message.ts index 5791d1629b..f196042c52 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -99,6 +99,8 @@ import { } from './groupUpdate'; import { NetworkTime } from '../util/NetworkTime'; import { MessageQueue } from '../session/sending'; +import { getTimerNotificationStr } from './timerNotifications'; +import { ExpirationTimerUpdate } from '../session/disappearing_messages/types'; // tslint:disable: cyclomatic-complexity @@ -408,8 +410,8 @@ export class MessageModel extends Backbone.Model { } } if (this.isExpirationTimerUpdate()) { - const expireTimerUpdate = this.getExpirationTimerUpdate(); - const expireTimer = expireTimerUpdate?.expireTimer; + const expireTimerUpdate = this.getExpirationTimerUpdate() as ExpirationTimerUpdate; // the isExpirationTimerUpdate above enforces this + const expireTimer = expireTimerUpdate.expireTimer; const convo = this.getConversation(); if (!convo) { return ''; @@ -422,39 +424,21 @@ export class MessageModel extends Backbone.Model { ); const source = expireTimerUpdate?.source; - const isUs = UserUtils.isUsFromCache(source); - - const authorName = - ConvoHub.use() - .get(source || '') - ?.getNicknameOrRealUsernameOrPlaceholder() || window.i18n.stripped('unknown'); - - if (!expireTimerUpdate || expirationMode === 'off' || !expireTimer || expireTimer === 0) { - if (isUs) { - return window.i18n.stripped('disappearingMessagesTurnedOffYou'); - } - return window.i18n.stripped('disappearingMessagesTurnedOff', { - name: authorName, - }); - } - - const localizedMode = - expirationMode === 'deleteAfterRead' - ? window.i18n.stripped('disappearingMessagesTypeRead') - : window.i18n.stripped('disappearingMessagesTypeSent'); + const i18nProps = getTimerNotificationStr({ + convoId: convo.id, + author: source as PubkeyType, + expirationMode, + isGroup: convo.isGroup(), + timespanSeconds: expireTimer, + }); - if (isUs) { - return window.i18n.stripped('disappearingMessagesSetYou', { - time: TimerOptions.getAbbreviated(expireTimerUpdate.expireTimer || 0), - disappearing_messages_type: localizedMode, - }); + if ('args' in i18nProps) { + return window.i18n.stripped( + ...([i18nProps.token, i18nProps.args] as GetMessageArgs) + ); } + return window.i18n.stripped(...([i18nProps.token] as GetMessageArgs)); - return window.i18n.stripped('disappearingMessagesSet', { - time: TimerOptions.getAbbreviated(expireTimerUpdate.expireTimer || 0), - name: authorName, - disappearing_messages_type: localizedMode, - }); } const body = this.get('body'); if (body) { diff --git a/ts/models/timerNotifications.ts b/ts/models/timerNotifications.ts new file mode 100644 index 0000000000..ae529f7cd3 --- /dev/null +++ b/ts/models/timerNotifications.ts @@ -0,0 +1,100 @@ +import { PubkeyType } from 'libsession_util_nodejs'; +import { ConvoHub } from '../session/conversations'; +import { PropsForExpirationTimer } from '../state/ducks/conversations'; +import { PubKey } from '../session/types'; +import { UserUtils } from '../session/utils'; +import { TimerOptions } from '../session/disappearing_messages/timerOptions'; +import { isLegacyDisappearingModeEnabled } from '../session/disappearing_messages/legacy'; +import { LocalizerComponentPropsObject } from '../types/localizer'; + +export function getTimerNotificationStr({ + expirationMode, + timespanSeconds, + convoId, + author, + isGroup, +}: Pick & { + author: PubkeyType; + convoId: string; + isGroup: boolean; +}): LocalizerComponentPropsObject { + const is03group = PubKey.is03Pubkey(convoId); + const authorIsUs = author === UserUtils.getOurPubKeyStrFromCache(); + const isLegacyGroup = isGroup && !is03group; + const timespanText = TimerOptions.getName(timespanSeconds || 0); + const disabled = !timespanSeconds || timespanSeconds <= 0; + + const authorName = ConvoHub.use().getContactProfileNameOrShortenedPubKey(author); + + // TODO: legacy messages support will be removed in a future release + if (isLegacyDisappearingModeEnabled(expirationMode)) { + return { + token: 'deleteAfterLegacyDisappearingMessagesTheyChangedTimer', + args: { + name: authorIsUs ? window.i18n('you') : authorName, + time: timespanText, + }, + } as const; + } + + const disappearing_messages_type = + expirationMode === 'deleteAfterRead' + ? window.i18n('disappearingMessagesTypeRead') + : window.i18n('disappearingMessagesTypeSent'); + + if (isLegacyGroup || isGroup) { + if (disabled) { + return authorIsUs + ? { + token: 'disappearingMessagesTurnedOffYouGroup', + } + : { + token: 'disappearingMessagesTurnedOffGroup', + args: { + name: authorName, + }, + }; + } + return authorIsUs + ? { + token: 'disappearingMessagesSetYou', + args: { time: timespanText, disappearing_messages_type }, + } + : { + token: 'disappearingMessagesSet', + args: { name: authorName, time: timespanText, disappearing_messages_type }, + }; + } + + // legacy groups and groups are handled above. + // This can only be a private chat or Note to Self. + if (disabled) { + return authorIsUs + ? { + token: 'disappearingMessagesTurnedOffYou', + } + : { + token: 'disappearingMessagesTurnedOff', + args: { + name: authorName, + }, + }; + } + + return authorIsUs + ? { + token: 'disappearingMessagesSetYou', + args: { + time: timespanText, + disappearing_messages_type, + }, + } + : { + token: 'disappearingMessagesSet', + args: { + time: timespanText, + disappearing_messages_type, + name: authorName, + }, + }; +} From c2e5c358f1f5459db7eca219db2b615c82f9c23c Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 28 Oct 2024 19:33:20 +1100 Subject: [PATCH 158/302] fix: fixed a bug with delete attachments before not working locally --- .../overlay/OverlayRightPanelSettings.tsx | 60 +++++++++++++++---- .../SwarmPollingGroupConfig.ts | 16 +++-- ts/state/ducks/metaGroups.ts | 52 ++++++++++++++++ 3 files changed, 106 insertions(+), 22 deletions(-) diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index a2b91f4de2..04cefd52fb 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -342,19 +342,53 @@ export const OverlayRightPanelSettings = () => { )} {hasClosedGroupV2QAButtons() && isGroupV2 ? ( - { - if (!PubKey.is03Pubkey(selectedConvoKey)) { - throw new Error('triggerFakeAvatarUpdate needs a 03 pubkey'); - } - window.inboxStore?.dispatch( - groupInfoActions.triggerFakeAvatarUpdate({ groupPk: selectedConvoKey }) as any - ); - }} - dataTestId="edit-group-name" - /> + <> + { + if (!PubKey.is03Pubkey(selectedConvoKey)) { + throw new Error('triggerFakeAvatarUpdate needs a 03 pubkey'); + } + window.inboxStore?.dispatch( + groupInfoActions.triggerFakeAvatarUpdate({ groupPk: selectedConvoKey }) as any + ); + }} + dataTestId="edit-group-name" + /> + { + if (!PubKey.is03Pubkey(selectedConvoKey)) { + throw new Error('We need a 03 pubkey'); + } + window.inboxStore?.dispatch( + groupInfoActions.triggerFakeDeleteMsgBeforeNow({ + groupPk: selectedConvoKey, + messagesWithAttachmentsOnly: false, + }) as any + ); + }} + dataTestId="edit-group-name" + /> + { + if (!PubKey.is03Pubkey(selectedConvoKey)) { + throw new Error('We need a 03 pubkey'); + } + window.inboxStore?.dispatch( + groupInfoActions.triggerFakeDeleteMsgBeforeNow({ + groupPk: selectedConvoKey, + messagesWithAttachmentsOnly: true, + }) as any + ); + }} + dataTestId="edit-group-name" + /> + ) : null} {showAddRemoveModeratorsButton && ( diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 56563c3d90..94995ee54c 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -17,6 +17,7 @@ import { ConvoHub } from '../../../conversations'; import { ProfileManager } from '../../../profile_manager/ProfileManager'; import { UserUtils } from '../../../utils'; import { GroupSync } from '../../../utils/job_runners/jobs/GroupSyncJob'; +import { destroyMessagesAndUpdateRedux } from '../../../disappearing_messages'; /** * This is a basic optimization to avoid running the logic when the `deleteBeforeSeconds` @@ -52,8 +53,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { isNumber(infos.deleteBeforeSeconds) && isFinite(infos.deleteBeforeSeconds) && infos.deleteBeforeSeconds > 0 && - (lastAppliedRemoveMsgSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > - infos.deleteBeforeSeconds + (lastAppliedRemoveMsgSentBeforeSeconds.get(groupPk) || 0) < infos.deleteBeforeSeconds ) { // delete any messages in this conversation sent before that timestamp (in seconds) const deletedMsgIds = await Data.removeAllMessagesInConversationSentBefore({ @@ -74,7 +74,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { isNumber(infos.deleteAttachBeforeSeconds) && isFinite(infos.deleteAttachBeforeSeconds) && infos.deleteAttachBeforeSeconds > 0 && - (lastAppliedRemoveAttachmentSentBeforeSeconds.get(groupPk) || Number.MAX_SAFE_INTEGER) > + (lastAppliedRemoveAttachmentSentBeforeSeconds.get(groupPk) || 0) < infos.deleteAttachBeforeSeconds ) { // delete any attachments in this conversation sent before that timestamp (in seconds) @@ -87,12 +87,10 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { impactedMsgModels.map(m => m.id) ); - for (let index = 0; index < impactedMsgModels.length; index++) { - const msg = impactedMsgModels[index]; + await destroyMessagesAndUpdateRedux( + impactedMsgModels.map(m => ({ conversationKey: groupPk, messageId: m.id })) + ); - // eslint-disable-next-line no-await-in-loop - await msg?.cleanup(); - } lastAppliedRemoveAttachmentSentBeforeSeconds.set(groupPk, infos.deleteAttachBeforeSeconds); } } @@ -239,7 +237,7 @@ async function handleGroupSharedConfigMessages( window.inboxStore?.dispatch( groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk, - })as any + }) as any ); } catch (e) { window.log.warn( diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 65ee714510..370fa0705d 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -988,6 +988,57 @@ const triggerFakeAvatarUpdate = createAsyncThunk( } ); +const triggerFakeDeleteMsgBeforeNow = createAsyncThunk( + 'group/triggerFakeDeleteMsgBeforeNow', + async ( + { + groupPk, + messagesWithAttachmentsOnly, + }: { + groupPk: GroupPubkeyType; + messagesWithAttachmentsOnly: boolean; + }, + payloadCreator + ): Promise => { + const state = payloadCreator.getState() as StateType; + if (!state.groups.infos[groupPk]) { + throw new PreConditionFailed( + 'triggerFakeDeleteMsgBeforeNow group not present in redux slice' + ); + } + const convo = ConvoHub.use().get(groupPk); + const group = await UserGroupsWrapperActions.getGroup(groupPk); + if (!convo || !group || !group.secretKey || isEmpty(group.secretKey)) { + throw new Error( + 'triggerFakeDeleteMsgBeforeNow: tried to make change to group but we do not have the admin secret key' + ); + } + + const nowSeconds = Math.floor(NetworkTime.now() / 1000); + const infoGet = await MetaGroupWrapperActions.infoGet(groupPk); + if (messagesWithAttachmentsOnly) { + infoGet.deleteAttachBeforeSeconds = nowSeconds; + } else { + infoGet.deleteBeforeSeconds = nowSeconds; + } + + await MetaGroupWrapperActions.infoSet(groupPk, infoGet); + + const extraStoreRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest([], group); + + const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + extraStoreRequests, + }); + if (!batchResult) { + window.log.warn( + `failed to send deleteBeforeSeconds/deleteAttachBeforeSeconds message for group ${ed25519Str(groupPk)}` + ); + throw new Error('failed to send deleteBeforeSeconds/deleteAttachBeforeSeconds message'); + } + } +); + /** * This action is used to trigger a change when the local user does a change to a group v2 members list. * GroupV2 added members can be added two ways: with and without the history of messages. @@ -1363,6 +1414,7 @@ export const groupInfoActions = { handleMemberLeftMessage, currentDeviceGroupNameChange, triggerFakeAvatarUpdate, + triggerFakeDeleteMsgBeforeNow, ...metaGroupSlice.actions, }; From 038e08ed3d2a2f036c71868d3585ea26714b2831 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 29 Oct 2024 16:27:15 +1100 Subject: [PATCH 159/302] fix: unrevoke on resend invite --- ts/components/MemberListItem.tsx | 41 ++++++++++++++++++++++++++++---- ts/receiver/queuedJob.ts | 3 ++- ts/state/ducks/metaGroups.ts | 11 ++++----- 3 files changed, 43 insertions(+), 12 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index efcc63c197..892e69fb84 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -24,6 +24,15 @@ import { SessionButtonType, } from './basic/SessionButton'; import { SessionRadio } from './basic/SessionRadio'; +import { GroupSync } from '../session/utils/job_runners/jobs/GroupSyncJob'; +import { RunJobResult } from '../session/utils/job_runners/PersistedJob'; +import { SubaccountUnrevokeSubRequest } from '../session/apis/snode_api/SnodeRequestTypes'; +import { NetworkTime } from '../util/NetworkTime'; +import { + MetaGroupWrapperActions, + UserGroupsWrapperActions, +} from '../webworker/workers/browser/libsession_worker_interface'; +import { isEmpty } from 'lodash'; const AvatarContainer = styled.div` position: relative; @@ -223,11 +232,35 @@ const ResendInviteButton = ({ buttonShape={SessionButtonShape.Square} buttonType={SessionButtonType.Solid} text={window.i18n('resend')} - onClick={() => { - void GroupInvite.addJob({ + onClick={async () => { + const group = await UserGroupsWrapperActions.getGroup(groupPk); + const member = await MetaGroupWrapperActions.memberGet(groupPk, pubkey); + if (!group || !group.secretKey || isEmpty(group.secretKey) || !member) { + window.log.warn('tried to resend invite but we do not have correct details'); + return; + } + const unrevokeSubRequest = new SubaccountUnrevokeSubRequest({ + groupPk, + revokeTokenHex: [pubkey], + timestamp: NetworkTime.now(), + secretKey: group.secretKey, + }); + const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + unrevokeSubRequest, + extraStoreRequests: [], + }); + if (sequenceResult !== RunJobResult.Success) { + throw new Error('resend invite: pushChangesToGroupSwarmIfNeeded did not return success'); + } + + // if we tried to invite that member as admin right away, let's retry it as such. + const inviteAsAdmin = + member.promotionNotSent || member.promotionFailed || member.promotionPending; + await GroupInvite.addJob({ groupPk, member: pubkey, - inviteAsAdmin: window.sessionFeatureFlags.useGroupV2InviteAsAdmin, + inviteAsAdmin, }); }} /> @@ -250,7 +283,7 @@ const ResendPromoteButton = ({ buttonShape={SessionButtonShape.Square} buttonType={SessionButtonType.Solid} buttonColor={SessionButtonColor.Danger} - text="PrOmOtE" // TODO DO NOT MERGE Remove after QA + text={window.i18n('promote')} // TODO DO NOT MERGE Remove after QA onClick={() => { void promoteUsersInGroup({ groupPk, diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index 6c5810f81e..fe38120303 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -8,6 +8,7 @@ import { ConvoHub } from '../session/conversations'; import { Quote } from './types'; import { MessageDirection } from '../models/messageType'; +import { ConversationTypeEnum } from '../models/types'; import { SignalService } from '../protobuf'; import { DisappearingMessages } from '../session/disappearing_messages'; import { ProfileManager } from '../session/profile_manager/ProfileManager'; @@ -24,7 +25,6 @@ import { getHideMessageRequestBannerOutsideRedux } from '../state/selectors/user import { GoogleChrome } from '../util'; import { LinkPreviews } from '../util/linkPreviews'; import { GroupV2Receiver } from './groupv2/handleGroupV2Message'; -import { ConversationTypeEnum } from '../models/types'; function contentTypeSupported(type: string): boolean { const Chrome = GoogleChrome; @@ -422,6 +422,7 @@ export async function handleMessageJob( source, ConversationTypeEnum.PRIVATE ); + try { messageModel.set({ flags: regularDataMessage.flags }); diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 370fa0705d..f0ec700134 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -9,7 +9,7 @@ import { WithGroupPubkey, WithPubkey, } from 'libsession_util_nodejs'; -import { intersection, isEmpty, uniq } from 'lodash'; +import { concat, intersection, isEmpty, uniq } from 'lodash'; import { from_hex } from 'libsodium-wrappers-sumo'; import { ConfigDumpData } from '../../data/configDump/configDump'; import { HexString } from '../../node/hexStrings'; @@ -1426,12 +1426,9 @@ async function scheduleGroupInviteJobs( withoutHistory: Array, inviteAsAdmin: boolean ) { - for (let index = 0; index < withoutHistory.length; index++) { - const member = withoutHistory[index]; - await GroupInvite.addJob({ groupPk, member, inviteAsAdmin }); - } - for (let index = 0; index < withHistory.length; index++) { - const member = withHistory[index]; + const merged = uniq(concat(withHistory, withoutHistory)); + for (let index = 0; index < merged.length; index++) { + const member = merged[index]; await GroupInvite.addJob({ groupPk, member, inviteAsAdmin }); } } From c30fcfd01387fa8011c4814339623c78e1963c5d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 30 Oct 2024 18:24:46 +1100 Subject: [PATCH 160/302] fix: bunch of changes to match acceptance criteria --- ts/components/MemberListItem.tsx | 65 ++++++++++++------- .../dialog/UpdateGroupMembersDialog.tsx | 12 ++-- .../conversations/unsendingInteractions.ts | 3 +- ts/session/utils/Toast.tsx | 4 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 25 +++++-- .../utils/job_runners/jobs/GroupSyncJob.ts | 3 +- ts/state/selectors/groups.ts | 26 ++++++++ 7 files changed, 94 insertions(+), 44 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 892e69fb84..cd7c96c181 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -8,11 +8,14 @@ import { UserUtils } from '../session/utils'; import { GroupInvite } from '../session/utils/job_runners/jobs/GroupInviteJob'; import { hasClosedGroupV2QAButtons } from '../shared/env_vars'; import { + useMemberHasAcceptedInvite, useMemberInviteFailed, useMemberInviteSending, useMemberInviteSent, + useMemberIsPromoted, useMemberPromoteSending, useMemberPromotionFailed, + useMemberPromotionNotSent, useMemberPromotionSent, } from '../state/selectors/groups'; import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar'; @@ -118,6 +121,7 @@ type MemberListItemProps = { displayGroupStatus?: boolean; groupPk?: string; disabled?: boolean; + hideRadioButton?: boolean; }; const ResendContainer = ({ @@ -139,8 +143,8 @@ const ResendContainer = ({ padding="0 var(--margins-lg)" gap="var(--margins-sm)" > - - + + ); } @@ -215,15 +219,24 @@ const GroupStatusContainer = ({ return null; }; -const ResendInviteButton = ({ - groupPk, - pubkey, -}: { - pubkey: PubkeyType; - groupPk: GroupPubkeyType; -}) => { - const inviteFailed = useMemberInviteFailed(pubkey, groupPk); - if (!inviteFailed) { +const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupPubkeyType }) => { + const acceptedInvite = useMemberHasAcceptedInvite(pubkey, groupPk); + const promotionFailed = useMemberPromotionFailed(pubkey, groupPk); + const promotionSent = useMemberPromotionSent(pubkey, groupPk); + const promotionNotSent = useMemberPromotionNotSent(pubkey, groupPk); + const promoted = useMemberIsPromoted(pubkey, groupPk); + + // as soon as the `admin` flag is set in the group for that member, we should be able to resend a promote as we cannot remove an admin. + const canResendPromotion = + hasClosedGroupV2QAButtons() && + (promotionFailed || promotionSent || promotionNotSent || promoted); + + // we can always remove/and readd a non-admin member. So we consider that a member who accepted the invite cannot be resent an invite. + const canResendInvite = !acceptedInvite; + + const shouldShowResendButton = canResendInvite || canResendPromotion; + + if (!shouldShowResendButton) { return null; } return ( @@ -239,9 +252,10 @@ const ResendInviteButton = ({ window.log.warn('tried to resend invite but we do not have correct details'); return; } + const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, pubkey); const unrevokeSubRequest = new SubaccountUnrevokeSubRequest({ groupPk, - revokeTokenHex: [pubkey], + revokeTokenHex: [token], timestamp: NetworkTime.now(), secretKey: group.secretKey, }); @@ -256,7 +270,10 @@ const ResendInviteButton = ({ // if we tried to invite that member as admin right away, let's retry it as such. const inviteAsAdmin = - member.promotionNotSent || member.promotionFailed || member.promotionPending; + member.promotionNotSent || + member.promotionFailed || + member.promotionPending || + member.promoted; await GroupInvite.addJob({ groupPk, member: pubkey, @@ -267,14 +284,13 @@ const ResendInviteButton = ({ ); }; -const ResendPromoteButton = ({ - groupPk, - pubkey, -}: { - pubkey: PubkeyType; - groupPk: GroupPubkeyType; -}) => { - if (!hasClosedGroupV2QAButtons()) { +const PromoteButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupPubkeyType }) => { + const memberAcceptedInvite = useMemberHasAcceptedInvite(pubkey, groupPk); + const memberIsPromoted = useMemberIsPromoted(pubkey, groupPk); + // When invite-as-admin was used to invite that member, the resend button is available to resend the promote message. + // We want to show that button only to promote a normal member who accepted a normal invite but wasn't promoted yet. + // ^ this is only the case for testing. The UI will be different once we release the promotion process + if (!hasClosedGroupV2QAButtons() || !memberAcceptedInvite || memberIsPromoted) { return null; } return ( @@ -309,8 +325,11 @@ export const MemberListItem = ({ disabled, withBorder, maxNameWidth, + hideRadioButton, }: MemberListItemProps) => { const memberName = useNicknameOrProfileNameOrShortenedPubkey(pubkey); + const isUs = UserUtils.isUsFromCache(pubkey); + const ourName = isUs ? window.i18n('you') : null; return ( - {memberName} + {ourName || memberName} - {!inMentions && ( + {!inMentions && !hideRadioButton && ( diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index e71170c794..27ba8be619 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -76,6 +76,7 @@ const ClassicMemberList = (props: { onSelect={onSelect} onUnselect={onUnselect} isAdmin={isAdmin} + hideRadioButton={isAdmin} // we want to hide the toggle for admins are they are not selectable disableBg={true} displayGroupStatus={isV2Group && weAreAdmin} groupPk={convoId} @@ -196,14 +197,9 @@ export const UpdateGroupMembersDialog = (props: Props) => { } if (groupAdmins?.includes(member)) { - if (PubKey.is03Pubkey(conversationId)) { - window?.log?.warn(`User ${member} cannot be selected as they are an admin.`); - return; - } - ToastUtils.pushCannotRemoveCreatorFromGroup(); - window?.log?.warn( - `User ${member} cannot be selected as they are the creator of the closed group.` - ); + ToastUtils.pushCannotRemoveGroupAdmin(); + window?.log?.warn(`User ${member} cannot be selected as they are an admin.`); + return; } diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index d5d59daf2a..0da8697fd5 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -547,8 +547,7 @@ export async function deleteMessagesById(messageIds: Array, conversation window.inboxStore?.dispatch( updateConfirmModal({ - title: window.i18n('clearMessagesForMe'), - i18nMessage: { token: 'deleteMessage', args: { count: selectedMessages.length } }, + title: window.i18n('deleteMessage', { count: selectedMessages.length }), radioOptions: !isMe ? [ { diff --git a/ts/session/utils/Toast.tsx b/ts/session/utils/Toast.tsx index ff5fb9fd28..43d6ee767b 100644 --- a/ts/session/utils/Toast.tsx +++ b/ts/session/utils/Toast.tsx @@ -60,7 +60,6 @@ export function pushLoadAttachmentFailure(message?: string) { // TODOLATER pushToast functions should take I18nArgs and then run strip in the function itself. - export function pushFileSizeErrorAsByte() { pushToastError('fileSizeWarning', window.i18n.stripped('attachmentsErrorSize')); } @@ -114,7 +113,6 @@ export function pushMessageDeleteForbidden() { export function pushUnableToCall() { pushToastError('unableToCall', window.i18n.stripped('callsCannotStart')); - } export function pushedMissedCall(userName: string) { @@ -184,7 +182,7 @@ export function pushDeleted(count: number) { pushToastSuccess('deleted', window.i18n.stripped('deleteMessageDeleted', { count })); } -export function pushCannotRemoveCreatorFromGroup() { +export function pushCannotRemoveGroupAdmin() { pushToastWarning('adminCannotBeRemoved', window.i18n.stripped('adminCannotBeRemoved')); } diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 747e8e284c..5fed2d3ed2 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -64,9 +64,15 @@ async function addJob({ groupPk, member, inviteAsAdmin }: JobExtraArgs) { await runners.groupInviteJobRunner.addJob(groupInviteJob); - window?.inboxStore?.dispatch( - groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: true }) - ); + if (inviteAsAdmin) { + window?.inboxStore?.dispatch( + groupInfoActions.setPromotionPending({ groupPk, pubkey: member, sending: true }) + ); + } else { + window?.inboxStore?.dispatch( + groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: true }) + ); + } } } @@ -219,9 +225,16 @@ class GroupInviteJob extends PersistedJob { } updateFailedStateForMember(groupPk, member, failed); - window?.inboxStore?.dispatch( - groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: false }) - ); + + if (inviteAsAdmin) { + window?.inboxStore?.dispatch( + groupInfoActions.setPromotionPending({ groupPk, pubkey: member, sending: false }) + ); + } else { + window?.inboxStore?.dispatch( + groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: true }) + ); + } window?.inboxStore?.dispatch( groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any ); diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index 74d7dbd81f..c782d642d5 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -184,10 +184,9 @@ async function pushChangesToGroupSwarmIfNeeded({ const changes = LibSessionUtil.batchResultsToGroupSuccessfulChange(result, { allOldHashes, messages: pendingConfigData, - }); - if (isEmpty(changes)) { + if ((allOldHashes.size || pendingConfigData.length) && isEmpty(changes)) { return RunJobResult.RetryJobIfPossible; } diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index 049361a830..e1e7d6bb0b 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -52,6 +52,11 @@ function getMemberInviteFailed(state: StateType, pubkey: PubkeyType, convo?: Gro return findMemberInMembers(members, pubkey)?.inviteFailed || false; } +function getMemberInviteNotSent(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.inviteNotSent || false; +} + function getMemberInviteSent(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); @@ -63,6 +68,11 @@ function getMemberIsPromoted(state: StateType, pubkey: PubkeyType, convo?: Group return findMemberInMembers(members, pubkey)?.promoted || false; } +function getMemberHasAcceptedInvite(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.inviteAccepted || false; +} + function getMemberPromotionFailed(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); return findMemberInMembers(members, pubkey)?.promotionFailed || false; @@ -73,6 +83,11 @@ function getMemberPromotionSent(state: StateType, pubkey: PubkeyType, convo?: Gr return findMemberInMembers(members, pubkey)?.promotionPending || false; } +function getMemberPromotionNotSent(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.promotionNotSent || false; +} + export function getLibMembersCount(state: StateType, convo?: GroupPubkeyType): Array { return getLibMembersPubkeys(state, convo); } @@ -136,9 +151,16 @@ export function useMemberInviteSent(member: PubkeyType, groupPk: GroupPubkeyType return useSelector((state: StateType) => getMemberInviteSent(state, member, groupPk)); } +export function useMemberInviteNotSent(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberInviteNotSent(state, member, groupPk)); +} + export function useMemberIsPromoted(member: PubkeyType, groupPk: GroupPubkeyType) { return useSelector((state: StateType) => getMemberIsPromoted(state, member, groupPk)); } +export function useMemberHasAcceptedInvite(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberHasAcceptedInvite(state, member, groupPk)); +} export function useMemberPromotionFailed(member: PubkeyType, groupPk: GroupPubkeyType) { return useSelector((state: StateType) => getMemberPromotionFailed(state, member, groupPk)); @@ -148,6 +170,10 @@ export function useMemberPromotionSent(member: PubkeyType, groupPk: GroupPubkeyT return useSelector((state: StateType) => getMemberPromotionSent(state, member, groupPk)); } +export function useMemberPromotionNotSent(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberPromotionNotSent(state, member, groupPk)); +} + export function useMemberGroupChangePending() { return useSelector(getIsMemberGroupChangePendingFromUI); } From 0dd0869348e5cedc45aec9dd1776d5f369fb3bb5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 30 Oct 2024 19:28:43 +1100 Subject: [PATCH 161/302] fix: add interactionNotification when we fail to leave 03 group --- ts/interactions/conversationInteractions.ts | 5 ++++- .../conversations/ConversationController.ts | 19 ++++++++++++++----- .../utils/job_runners/jobs/GroupInviteJob.ts | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index eae5f3a2c0..0a427c7bdc 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -444,6 +444,9 @@ export async function showLeaveGroupByConvoId(conversationId: string, name: stri const admins = conversation.getGroupAdmins(); const isAdmin = admins.includes(UserUtils.getOurPubKeyStrFromCache()); const showOnlyGroupAdminWarning = isClosedGroup && isAdmin; + const weAreLastAdmin = + PubKey.is05Pubkey(conversationId) || + (PubKey.is03Pubkey(conversationId) && isAdmin && admins.length === 1); const lastMessageInteractionType = conversation.get('lastMessageInteractionType'); const lastMessageInteractionStatus = conversation.get('lastMessageInteractionStatus'); @@ -466,7 +469,7 @@ export async function showLeaveGroupByConvoId(conversationId: string, name: stri await leaveGroupOrCommunityByConvoId({ conversationId, isPublic, - sendLeaveMessage: true, + sendLeaveMessage: !weAreLastAdmin, // we don't need to send a leave message when we are the last admin: the group is removed. onClickClose, }); }; diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index fbd2e4df9b..83c5bdfc08 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -284,7 +284,11 @@ class ConvoController { // send the leave message before we delete everything for this group (including the key!) // Note: if we were kicked, we already lost the authData/secretKey for it, so no need to try to send our message. if (sendLeaveMessage && !groupInUserGroup?.kicked) { - await leaveClosedGroup(groupPk, fromSyncMessage); + const failedToSendLeaveMessage = await leaveClosedGroup(groupPk, fromSyncMessage); + if (PubKey.is03Pubkey(groupPk) && failedToSendLeaveMessage) { + // this is caught and is adding an interaction notification message + throw new Error('Failed to send our leaving message to 03 group'); + } } // a group 03 can be removed fully or kept empty as kicked. // when it was pendingInvite, we delete it fully, @@ -595,13 +599,15 @@ class ConvoController { * * Note: `fromSyncMessage` is used to know if we need to send a leave group message to the group first. * So if the user made the action on this device, fromSyncMessage should be false, but if it happened from a linked device polled update, set this to true. + * + * @returns true if the message failed to be sent. */ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncMessage: boolean) { const convo = ConvoHub.use().get(groupPk); if (!convo || !convo.isClosedGroup()) { window?.log?.error('Cannot leave non-existing group'); - return; + return false; } const ourNumber = UserUtils.getOurPubKeyStrFromCache(); @@ -630,7 +636,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM if (fromSyncMessage) { // no need to send our leave message as our other device should already have sent it. - return; + return false; } if (PubKey.is03Pubkey(groupPk)) { @@ -656,6 +662,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM window?.log?.info( `We are leaving the group ${ed25519Str(groupPk)}. Sending our leaving messages.` ); + let failedToSent03LeaveMessage = false; // We might not be able to send our leaving messages (no encryption key pair, we were already removed, no network, etc). // If that happens, we should just remove everything from our current user. try { @@ -683,11 +690,12 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM window?.log?.warn( `failed to send our leaving messages for ${ed25519Str(groupPk)}:${e.message}` ); + failedToSent03LeaveMessage = true; } // the rest of the cleaning of that conversation is done in the `deleteClosedGroup()` - return; + return failedToSent03LeaveMessage; } // TODO remove legacy group support @@ -695,7 +703,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM if (!keyPair || isEmpty(keyPair) || isEmpty(keyPair.publicHex) || isEmpty(keyPair.privateHex)) { // if we do not have a keyPair, we won't be able to send our leaving message neither, so just skip sending it. // this can happen when getting a group from a broken libsession user group wrapper, but not only. - return; + return false; } // Send the update to the group @@ -727,6 +735,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM )}. But still removing everything related to this group....` ); } + return wasSent; } async function removeLegacyGroupFromWrappers(groupId: string) { diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 5fed2d3ed2..d9413e805a 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -232,7 +232,7 @@ class GroupInviteJob extends PersistedJob { ); } else { window?.inboxStore?.dispatch( - groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: true }) + groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: false }) ); } window?.inboxStore?.dispatch( From d958543a675e168322fbff0ee30d11905fe4e313 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 30 Oct 2024 21:38:11 +1100 Subject: [PATCH 162/302] chore: match datatestid with figma --- ts/components/MemberListItem.tsx | 14 ++++++++++---- ts/components/NoticeBanner.tsx | 2 +- ts/components/dialog/InviteContactsDialog.tsx | 2 +- ts/components/dialog/OpenUrlModal.tsx | 2 +- ts/react.d.ts | 5 +++++ 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index cd7c96c181..6cdd70a947 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -1,6 +1,7 @@ import styled from 'styled-components'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { isEmpty } from 'lodash'; import { useNicknameOrProfileNameOrShortenedPubkey } from '../hooks/useParamSelector'; import { promoteUsersInGroup } from '../interactions/conversationInteractions'; import { PubKey } from '../session/types'; @@ -35,7 +36,6 @@ import { MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../webworker/workers/browser/libsession_worker_interface'; -import { isEmpty } from 'lodash'; const AvatarContainer = styled.div` position: relative; @@ -191,7 +191,7 @@ const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Gro } return ( - + {ourName || memberName} - + )} diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx index 659870166a..a8d1e432e7 100644 --- a/ts/components/NoticeBanner.tsx +++ b/ts/components/NoticeBanner.tsx @@ -72,7 +72,7 @@ const StyledGroupInviteBanner = styled(Flex)` export const GroupInviteRequiredVersionBanner = () => { return ( - + {window.i18n('groupInviteVersion')} ); diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index 5f7b95ecfc..883a9a938c 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -14,7 +14,7 @@ import { useIsPrivate, useIsPublic, useSortedGroupMembers, - useZombies + useZombies, } from '../../hooks/useParamSelector'; import { useSet } from '../../hooks/useSet'; import { ClosedGroup } from '../../session/group/closed-group'; diff --git a/ts/components/dialog/OpenUrlModal.tsx b/ts/components/dialog/OpenUrlModal.tsx index db5ff30f9a..e1eef56470 100644 --- a/ts/components/dialog/OpenUrlModal.tsx +++ b/ts/components/dialog/OpenUrlModal.tsx @@ -57,7 +57,7 @@ export function OpenUrlModal(props: OpenUrlModalState) { buttonColor={SessionButtonColor.Danger} buttonType={SessionButtonType.Simple} onClick={onClickOpen} - dataTestId="session-confirm-ok-button" + dataTestId="open-url-confirm-button" /> Date: Wed, 6 Nov 2024 14:57:39 +1100 Subject: [PATCH 163/302] fix: legacy groups are kind of working again at least as much as they ever did --- preload.js | 2 +- ts/components/conversation/SessionConversation.tsx | 5 ++--- ts/components/dialog/UpdateGroupMembersDialog.tsx | 2 +- ts/models/conversation.ts | 2 +- ts/receiver/contentMessage.ts | 10 ++++++---- ts/session/apis/snode_api/swarmPolling.ts | 2 +- ts/session/sending/MessageSender.ts | 5 ++++- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/preload.js b/preload.js index 5507a32164..c59a6e34e8 100644 --- a/preload.js +++ b/preload.js @@ -40,7 +40,7 @@ window.saveLog = additionalText => ipc.send('save-debug-log', additionalText); window.sessionFeatureFlags = { useOnionRequests: true, useTestNet: isTestNet() || isTestIntegration(), - useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA + useClosedGroupV2: false, // TODO DO NOT MERGE Remove after QA useClosedGroupV2QAButtons: true, // TODO DO NOT MERGE Remove after QA replaceLocalizedStringsWithKeys: false, debug: { diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index 8a28b137d6..6ca1d35b6b 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -662,10 +662,9 @@ function OutdatedLegacyGroupBanner(props: { return isLegacyGroup ? ( { - showLinkVisitWarningDialog('', dispatch); - throw new Error('TODO'); // fixme audric + showLinkVisitWarningDialog('https://getsession.org/blog/session-groups-v2', dispatch); }} icon="externalLink" dataTestId="legacy-group-banner" diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 27ba8be619..3558fad20c 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -219,7 +219,7 @@ export const UpdateGroupMembersDialog = (props: Props) => { return ( - {hasClosedGroupV2QAButtons() && weAreAdmin ? ( + {hasClosedGroupV2QAButtons() && weAreAdmin && PubKey.is03Pubkey(conversationId) ? ( <> Also remove messages: { if (this.isClosedGroup()) { if (this.matchesDisappearingMode('deleteAfterRead')) { - throw new Error('Group disappearing messages must be deleteAterSend'); + throw new Error('Group disappearing messages must be deleteAfterSend'); } const chatMessageMediumGroup = new VisibleMessage(chatMessageParams); const closedGroupVisibleMessage = new ClosedGroupVisibleMessage({ diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 39b0be5ae7..8e227327bc 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -10,8 +10,8 @@ import { IncomingMessageCache } from './cache'; import { Data } from '../data/data'; import { SettingsKey } from '../data/settings-key'; import { - deleteMessagesFromSwarmAndCompletelyLocally, - deleteMessagesFromSwarmAndMarkAsDeletedLocally, + deleteMessagesFromSwarmAndCompletelyLocally, + deleteMessagesFromSwarmAndMarkAsDeletedLocally, } from '../interactions/conversations/unsendingInteractions'; import { findCachedBlindedMatchOrLookupOnAllServers } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys'; import { ConvoHub } from '../session/conversations'; @@ -29,8 +29,8 @@ import { BlockedNumberController } from '../util'; import { ReadReceipts } from '../util/readReceipts'; import { Storage } from '../util/storage'; import { - ContactsWrapperActions, - MetaGroupWrapperActions, + ContactsWrapperActions, + MetaGroupWrapperActions, } from '../webworker/workers/browser/libsession_worker_interface'; import { handleCallMessage } from './callMessage'; import { getAllCachedECKeyPair, sentAtMoreRecentThanWrapper } from './closedGroups'; @@ -103,6 +103,8 @@ async function decryptForClosedGroup( true ); if (res?.decryptedContent.byteLength) { + decryptedContent = res.decryptedContent; + break; } decryptedContent = res.decryptedContent; diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 785b0e11b2..47a022221d 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -454,7 +454,7 @@ export class SwarmPolling { resultsFromAllNamespaces ); window.log.debug( - `received confMessages:${confMessages?.length || 0}, revokedMessages:${revokedMessages?.length || 0}, ` + `received confMessages:${confMessages?.length || 0}, revokedMessages:${revokedMessages?.length || 0}, , otherMessages:${otherMessages?.length || 0}, ` ); // We always handle the config messages first (for groups 03 or our own messages) await this.handleUserOrGroupConfMessages({ confMessages, pubkey, type }); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index fab2cb0499..1143c907c1 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -124,9 +124,12 @@ async function messageToRequest05({ createdAtNetworkTimestamp: networkTimestamp, plainTextBuffer, }; - if (namespace === SnodeNamespaces.Default || namespace === SnodeNamespaces.LegacyClosedGroup) { + if (namespace === SnodeNamespaces.Default) { return new StoreUserMessageSubRequest(shared05Arguments); } + if (namespace === SnodeNamespaces.LegacyClosedGroup) { + return new StoreLegacyGroupMessageSubRequest(shared05Arguments); + } if (SnodeNamespace.isUserConfigNamespace(namespace)) { return new StoreUserConfigSubRequest(shared05Arguments); } From 4c4806df4742d2e5ffa579858d044c5ab5cfc76a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 7 Nov 2024 15:13:22 +1100 Subject: [PATCH 164/302] chore: latest crowdin fetch --- _locales/en/messages.json | 2 ++ _locales/fa/messages.json | 2 ++ _locales/nl/messages.json | 4 +++ _locales/ru/messages.json | 3 +++ .../overlay/OverlayRightPanelSettings.tsx | 2 +- ts/interactions/conversationInteractions.ts | 4 +-- ts/receiver/configMessage.ts | 2 +- ts/receiver/groupv2/handleGroupV2Message.ts | 1 + .../libsession/handleLibSessionMessage.ts | 2 +- ts/session/apis/snode_api/swarmPolling.ts | 2 +- .../SwarmPollingGroupConfig.ts | 2 +- .../conversations/ConversationController.ts | 15 +++++++---- ts/state/ducks/metaGroups.ts | 2 +- .../unit/crypto/SnodeSignatures_test.ts | 1 + .../browser/libsession_worker_interface.ts | 25 +++++++++++++++++-- 15 files changed, 54 insertions(+), 15 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 6b830b49be..8a925c8415 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -148,6 +148,7 @@ "callsNotificationsRequired": "Voice and Video Calls require notifications to be enabled in your device system settings.", "callsPermissionsRequired": "Call Permissions Required", "callsPermissionsRequiredDescription": "You can enable the \"Voice and Video Calls\" permission in Privacy Settings.", + "callsPermissionsRequiredDescription1": "You can enable the \"Voice and Video Calls\" permission in Permissions Settings.", "callsReconnecting": "Reconnecting…", "callsRinging": "Ringing...", "callsSessionCall": "{app_name} Call", @@ -379,6 +380,7 @@ "groupCreateErrorNoMembers": "Please pick at least one other group member.", "groupDelete": "Delete Group", "groupDeleteDescription": "Are you sure you want to delete {group_name}? This will remove all members and delete all group content.", + "groupDeletedMemberDescription": "{group_name} has been deleted by a group admin. You will not be able to send any more messages.", "groupDescriptionEnter": "Enter a group description", "groupDisplayPictureUpdated": "Group display picture updated.", "groupEdit": "Edit Group", diff --git a/_locales/fa/messages.json b/_locales/fa/messages.json index 9c9b4c7454..52b9a51508 100644 --- a/_locales/fa/messages.json +++ b/_locales/fa/messages.json @@ -279,6 +279,7 @@ "deleteMessageDevicesAll": "حذف از تمام دستگاه‌هایم", "deleteMessageEveryone": "حذف برای همه", "deleteMessageFailed": "{count, plural, one [خطا در حذف پیام] other [خطا در حذف پیام ها]}", + "deleteMessageWarning": "{count, plural, one [این پیام قابل حذف برای همه نیست] other [برخی از پیام هایی که انتخاب کرده اید را نمیتوان برای همه حذف کرد]}", "deleteMessagesDescriptionEveryone": "آیا مطمئن هستید می‌خواهید این پیام‌ها را برای همه حذف کنید؟", "deleting": "در حال حذف", "developerToolsToggle": "تاگل ابزار های توسعه دهنده", @@ -382,6 +383,7 @@ "groupInviteFailedMultiple": "دعوت از {name} و {count} نفر دیگر به {group_name} انجام نشد", "groupInviteFailedTwo": "دعوت از {name} و {other_name} به {group_name} انجام نشد", "groupInviteFailedUser": "دعوت از {name} به {group_name} انجام نشد", + "groupInviteSending": "{count, plural, one [ارسال دعوت نامه] other [ارسال دعوت نامه ها]}", "groupInviteSent": "دعوت نامه ارسال شد", "groupInviteSuccessful": "دعوت به گروه موفقیت‌آمیز بود", "groupInviteVersion": "کاربران باید آخرین نسخه را داشته باشند تا دعوت‌نامه دریافت کنند", diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json index 3fad75ef77..67928b2d15 100644 --- a/_locales/nl/messages.json +++ b/_locales/nl/messages.json @@ -35,6 +35,7 @@ "adminRemovedUser": "{name} is verwijderd als Admin.", "adminRemovedUserMultiple": "{name} en {count} anderen zijn verwijderd als beheerder.", "adminRemovedUserOther": "{name} en {other_name} zijn verwijderd als beheerder.", + "adminSendingPromotion": "{count, plural, one [Beheerder promotie versturen] other [Beheerder promoties versturen]}", "adminSettings": "Admin instellingen", "adminTwoPromotedToAdmin": "{name} en {other_name} zijn gepromoveerd tot Admin.", "andMore": "+{count}", @@ -274,9 +275,11 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Het is mislukt om de groep bij te werken", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Je hebt geen toestemming om andermans berichten te verwijderen", "deleteMessage": "{count, plural, one [Verwijder bericht] other [Verwijder berichten]}", + "deleteMessageConfirm": "{count, plural, one [Weet u zeker dat u dit bericht wilt verwijderen?] other [Weet u zeker dat u deze berichten wilt verwijderen?]}", "deleteMessageDeleted": "{count, plural, one [Bericht verwijderd] other [Berichten verwijderd]}", "deleteMessageDeletedGlobally": "Dit bericht is verwijderd", "deleteMessageDeletedLocally": "Dit bericht is op dit apparaat verwijderd", + "deleteMessageDescriptionDevice": "{count, plural, one [Weet u zeker dat u dit bericht enkel van dit apparaat wilt verwijderen?] other [Weet u zeker dat u deze berichten enkel van dit apparaat wilt verwijderen?]}", "deleteMessageDescriptionEveryone": "Weet u zeker dat u dit bericht voor iedereen wilt verwijderen?", "deleteMessageDeviceOnly": "Alleen verwijderen op dit apparaat", "deleteMessageDevicesAll": "Verwijder op al mijn apparaten", @@ -385,6 +388,7 @@ "groupInviteFailedMultiple": "Het uitnodigen van {name} en {count} anderen naar {group_name} is mislukt", "groupInviteFailedTwo": "Het uitnodigen van {name} en {other_name} naar {group_name} is mislukt", "groupInviteFailedUser": "Het uitnodigen van {name} naar {group_name} is mislukt", + "groupInviteSending": "{count, plural, one [Uitnodiging versturen] other [Uitnodigingen versturen]}", "groupInviteSent": "Uitnodiging verzonden", "groupInviteSuccessful": "Groepsuitnodiging succesvol", "groupInviteVersion": "Gebruikers moeten de nieuwste versie hebben om uitnodigingen te ontvangen", diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index 4b44f9e6a4..d1d61fd053 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -274,9 +274,11 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Ошибка при обновлении группы", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "У вас недостаточно прав для удаления других сообщений", "deleteMessage": "{count, plural, one [Удалить Сообщение] few [Удалить сообщения] many [Удалить сообщения] other [Удалить сообщения]}", + "deleteMessageConfirm": "{count, plural, one [Вы уверены, что хотите удалить это сообщение?] few [Вы уверены, что хотите удалить эти сообщения?] many [Вы уверены, что хотите удалить эти сообщения?] other [Вы уверены, что хотите удалить эти сообщения?]}", "deleteMessageDeleted": "{count, plural, one [Сообщение удалено] few [Сообщения удалены] many [Сообщения удалены] other [Сообщения удалены]}", "deleteMessageDeletedGlobally": "Это сообщение было удалено", "deleteMessageDeletedLocally": "Это сообщение было удалено на этом устройстве", + "deleteMessageDescriptionDevice": "{count, plural, one [Вы уверены, что хотите удалить это сообщение только с этого устройства?] few [Вы уверены, что хотите удалить эти сообщения только с этого устройства?] many [Вы уверены, что хотите удалить эти сообщения только с этого устройства?] other [Вы уверены, что хотите удалить эти сообщения только с этого устройства?]}", "deleteMessageDescriptionEveryone": "Вы уверены, что хотите удалить это сообщение для всех?", "deleteMessageDeviceOnly": "Удалить только на этом устройстве", "deleteMessageDevicesAll": "Удалить на всех моих устройствах", @@ -385,6 +387,7 @@ "groupInviteFailedMultiple": "Не удалось пригласить {name} и {count} других в {group_name}", "groupInviteFailedTwo": "Не удалось пригласить {name} и {other_name} в {group_name}", "groupInviteFailedUser": "Не удалось пригласить {name} в {group_name}", + "groupInviteSending": "{count, plural, one [Отправка приглашения] few [Отправка приглашений] many [Отправка приглашений] other [Отправка приглашений]}", "groupInviteSent": "Приглашение отправлено", "groupInviteSuccessful": "Приглашение в группу успешно", "groupInviteVersion": "Пользователи должны иметь последнюю версию приложения для получения приглашений", diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 04cefd52fb..efbfb4ef9f 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -220,7 +220,7 @@ const DestroyGroupForAllMembersButton = () => { onClickOk: () => { void ConvoHub.use().deleteGroup(groupPk, { deleteAllMessagesOnSwarm: true, - emptyGroupButKeepAsKicked: false, + deletionType: 'doNotKeep', fromSyncMessage: false, sendLeaveMessage: false, forceDestroyForAllMembers: true, diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 0a427c7bdc..e4f4d42d5c 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -223,7 +223,7 @@ export async function declineConversationWithoutConfirm({ // when deleting a 03 group message request, we also need to remove the conversation altogether await ConvoHub.use().deleteGroup(conversationId, { deleteAllMessagesOnSwarm: false, - emptyGroupButKeepAsKicked: false, + deletionType: 'doNotKeep', forceDestroyForAllMembers: false, fromSyncMessage: false, sendLeaveMessage: false, @@ -418,7 +418,7 @@ async function leaveGroupOrCommunityByConvoId({ fromSyncMessage: false, sendLeaveMessage, deleteAllMessagesOnSwarm: false, - emptyGroupButKeepAsKicked: false, + deletionType: 'doNotKeep', forceDestroyForAllMembers: false, }); } diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 7edc62ad0d..e89ff7a948 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -756,7 +756,7 @@ async function handleSingleGroupUpdateToLeave(toLeave: GroupPubkeyType) { await ConvoHub.use().deleteGroup(toLeave, { fromSyncMessage: true, sendLeaveMessage: false, - emptyGroupButKeepAsKicked: false, + deletionType: 'doNotKeep', deleteAllMessagesOnSwarm: false, forceDestroyForAllMembers: false, }); diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 90b79ae4f8..47a4868c44 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -76,6 +76,7 @@ async function getInitializedGroupObject({ secretKey: null, kicked: false, invitePending: true, + destroyed: false, }; } diff --git a/ts/receiver/libsession/handleLibSessionMessage.ts b/ts/receiver/libsession/handleLibSessionMessage.ts index ba537e8a34..e7975c5f3b 100644 --- a/ts/receiver/libsession/handleLibSessionMessage.ts +++ b/ts/receiver/libsession/handleLibSessionMessage.ts @@ -54,7 +54,7 @@ async function handleLibSessionKickedMessage({ await ConvoHub.use().deleteGroup(groupPk, { sendLeaveMessage: false, fromSyncMessage: false, - emptyGroupButKeepAsKicked: !inviteWasPending, + deletionType: inviteWasPending ? 'doNotKeep' : 'keepAsKicked', deleteAllMessagesOnSwarm: false, forceDestroyForAllMembers: false, }); diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 47a022221d..74be4a403b 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -681,7 +681,7 @@ export class SwarmPolling { await ConvoHub.use().deleteGroup(pubkey, { fromSyncMessage: true, sendLeaveMessage: false, - emptyGroupButKeepAsKicked: false, + deletionType: 'doNotKeep', deleteAllMessagesOnSwarm: false, forceDestroyForAllMembers: false, }); diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 94995ee54c..b102826f2d 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -44,7 +44,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { await ConvoHub.use().deleteGroup(groupPk, { sendLeaveMessage: false, fromSyncMessage: false, - emptyGroupButKeepAsKicked: true, // we just got something from the group's swarm, so it is not pendingInvite + deletionType: 'keepAsDestroyed', // we just got something from the group's swarm, so it is not pendingInvite deleteAllMessagesOnSwarm: false, forceDestroyForAllMembers: false, }); diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 83c5bdfc08..4a5a312d7c 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -253,12 +253,12 @@ class ConvoController { { sendLeaveMessage, fromSyncMessage, - emptyGroupButKeepAsKicked, + deletionType, deleteAllMessagesOnSwarm, forceDestroyForAllMembers, }: DeleteOptions & { sendLeaveMessage: boolean; - emptyGroupButKeepAsKicked: boolean; + deletionType: 'doNotKeep' | 'keepAsKicked' | 'keepAsDestroyed'; deleteAllMessagesOnSwarm: boolean; forceDestroyForAllMembers: boolean; } @@ -268,7 +268,7 @@ class ConvoController { } window.log.info( - `deleteGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, emptyGroupButKeepAsKicked:${emptyGroupButKeepAsKicked}, deleteAllMessagesOnSwarm:${deleteAllMessagesOnSwarm}, forceDestroyForAllMembers:${forceDestroyForAllMembers}` + `deleteGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, deletionType:${deletionType}, deleteAllMessagesOnSwarm:${deleteAllMessagesOnSwarm}, forceDestroyForAllMembers:${forceDestroyForAllMembers}` ); // this deletes all messages in the conversation @@ -294,13 +294,13 @@ class ConvoController { // when it was pendingInvite, we delete it fully, // when it was not, we empty the group but keep it with the "you have been kicked" message // Note: the pendingInvite=true case cannot really happen as we wouldn't be polling from that group (and so, not get the message kicking us) - if (emptyGroupButKeepAsKicked) { + if (deletionType === 'keepAsKicked' || deletionType === 'keepAsDestroyed') { // delete the secretKey/authData if we had it. If we need it for something, it has to be done before this call. if (groupInUserGroup) { groupInUserGroup.authData = null; groupInUserGroup.secretKey = null; groupInUserGroup.disappearingTimerSeconds = undefined; - groupInUserGroup.kicked = true; + // we want to update the groupName in user group with whatever is in the groupInfo, // so even if the group is not polled anymore, we have an up to date name on restore. let nameInMetaGroup: string | undefined; @@ -316,6 +316,11 @@ class ConvoController { groupInUserGroup.name = nameInMetaGroup; } await UserGroupsWrapperActions.setGroup(groupInUserGroup); + if (deletionType === 'keepAsKicked') { + await UserGroupsWrapperActions.setGroupKicked(groupPk); + } else { + await UserGroupsWrapperActions.setGroupDestroyed(groupPk); + } } } else { try { diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index f0ec700134..ef57e4a319 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -264,7 +264,7 @@ const initNewGroupInWrapper = createAsyncThunk( await ConvoHub.use().deleteGroup(groupPk, { fromSyncMessage: false, sendLeaveMessage: false, - emptyGroupButKeepAsKicked: false, + deletionType: 'doNotKeep', deleteAllMessagesOnSwarm: false, forceDestroyForAllMembers: false, }); diff --git a/ts/test/session/unit/crypto/SnodeSignatures_test.ts b/ts/test/session/unit/crypto/SnodeSignatures_test.ts index c28ff1902d..469dda2c9d 100644 --- a/ts/test/session/unit/crypto/SnodeSignatures_test.ts +++ b/ts/test/session/unit/crypto/SnodeSignatures_test.ts @@ -43,6 +43,7 @@ function getEmptyUserGroup() { name: '1243', priority: 0, pubkeyHex: validGroupPk, + destroyed: false, } as UserGroupsGet; } diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 07c62a2994..97ae9412ec 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -62,7 +62,7 @@ type GenericWrapperActionsCalls = { ed25519Key: Uint8Array, dump: Uint8Array | null ) => Promise; - free: ( wrapperId: ConfigWrapperUser ) => Promise; + free: (wrapperId: ConfigWrapperUser) => Promise; confirmPushed: GenericWrapperActionsCall; dump: GenericWrapperActionsCall; makeDump: GenericWrapperActionsCall; @@ -83,7 +83,6 @@ export const GenericWrapperActions: GenericWrapperActionsCalls = { GenericWrapperActionsCalls['init'] >, - /** This function is used to free wrappers from memory only. * * See freeUserWrapper() in libsession.worker.ts */ @@ -346,6 +345,28 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls & { return cloneDeep(group); }, + setGroupKicked: async (pubkeyHex: GroupPubkeyType) => { + const group = (await callLibSessionWorker([ + 'UserGroupsConfig', + 'setGroupKicked', + pubkeyHex, + ])) as Awaited>; + groups.set(group.pubkeyHex, group); + dispatchCachedGroupsToRedux(); + return cloneDeep(group); + }, + + setGroupDestroyed: async (pubkeyHex: GroupPubkeyType) => { + const group = (await callLibSessionWorker([ + 'UserGroupsConfig', + 'setGroupDestroyed', + pubkeyHex, + ])) as Awaited>; + groups.set(group.pubkeyHex, group); + dispatchCachedGroupsToRedux(); + return cloneDeep(group); + }, + eraseGroup: async (pubkeyHex: GroupPubkeyType) => { const ret = (await callLibSessionWorker([ 'UserGroupsConfig', From db22094898ac5ca5842ac16f7d9e4016dedd53e7 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 11 Nov 2024 13:46:12 +1100 Subject: [PATCH 165/302] fix: delete messages for groups by admin are marked as deleted --- preload.js | 3 +- .../conversation/SubtleNotification.tsx | 10 ++- .../composition/CompositionTextArea.tsx | 5 ++ .../message/message-content/MessageText.tsx | 2 +- .../overlay/OverlayRightPanelSettings.tsx | 46 +--------- ts/components/menu/Menu.tsx | 8 +- ts/data/data.ts | 55 +++++++----- ts/data/dataInit.ts | 6 +- ts/data/sharedDataTypes.ts | 29 +++---- ts/hooks/useParamSelector.ts | 14 ++- ts/interactions/conversationInteractions.ts | 2 +- .../conversations/unsendingInteractions.ts | 11 --- ts/localization/constants.ts | 1 + ts/models/message.ts | 8 +- ts/node/sql.ts | 84 +++++++++--------- ts/receiver/groupv2/handleGroupV2Message.ts | 85 ++++++++++++------- ts/session/apis/snode_api/swarmPolling.ts | 9 +- .../conversations/ConversationController.ts | 4 +- .../jobs/GroupPendingRemovalsJob.ts | 40 ++++----- .../utils/job_runners/jobs/GroupSyncJob.ts | 3 +- .../libsession_utils_user_groups.ts | 1 - ts/state/selectors/selectedConversation.ts | 17 +++- ts/state/selectors/userGroups.ts | 8 ++ .../browser/libsession_worker_interface.ts | 26 ++++-- 24 files changed, 262 insertions(+), 215 deletions(-) diff --git a/preload.js b/preload.js index c59a6e34e8..30a43299f2 100644 --- a/preload.js +++ b/preload.js @@ -40,7 +40,7 @@ window.saveLog = additionalText => ipc.send('save-debug-log', additionalText); window.sessionFeatureFlags = { useOnionRequests: true, useTestNet: isTestNet() || isTestIntegration(), - useClosedGroupV2: false, // TODO DO NOT MERGE Remove after QA + useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA useClosedGroupV2QAButtons: true, // TODO DO NOT MERGE Remove after QA replaceLocalizedStringsWithKeys: false, debug: { @@ -261,7 +261,6 @@ data.initData(); const { ConvoHub } = require('./ts/session/conversations/ConversationController'); window.getConversationController = ConvoHub.use; - // Linux seems to periodically let the event loop stop, so this is a global workaround setInterval(() => { window.nodeSetImmediate(() => {}); diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index bb721e29a3..a0a9eab4bd 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -25,6 +25,7 @@ import { useSelectedNicknameOrProfileNameOrShortenedPubkey, } from '../../state/selectors/selectedConversation'; import { + useLibGroupDestroyed, useLibGroupInviteGroupName, useLibGroupInvitePending, useLibGroupKicked, @@ -112,10 +113,10 @@ export const ConversationIncomingRequestExplanation = () => { const showMsgRequestUI = selectedConversation && isIncomingMessageRequest; const hasOutgoingMessages = useSelector(hasSelectedConversationOutgoingMessages); - const isGroupV2 = useSelectedIsGroupV2() + const isGroupV2 = useSelectedIsGroupV2(); if (isGroupV2) { - return + return ; } if (!showMsgRequestUI || hasOutgoingMessages) { @@ -212,6 +213,7 @@ export const NoMessageInConversation = () => { const isPrivate = useSelectedIsPrivate(); const isIncomingRequest = useIsIncomingRequest(selectedConversation); const isKickedFromGroup = useLibGroupKicked(selectedConversation); + const isGroupDestroyed = useLibGroupDestroyed(selectedConversation); const name = useSelectedNicknameOrProfileNameOrShortenedPubkey(); const getHtmlToRender = () => { @@ -227,6 +229,10 @@ export const NoMessageInConversation = () => { return localize('messageRequestsTurnedOff').withArgs({ name }).toString(); } + if (isGroupV2 && isGroupDestroyed) { + return localize('groupDeletedMemberDescription').withArgs({ group_name: name }).toString(); + } + if (isGroupV2 && isKickedFromGroup) { return localize('groupRemovedYou').withArgs({ group_name: name }).toString(); } diff --git a/ts/components/conversation/composition/CompositionTextArea.tsx b/ts/components/conversation/composition/CompositionTextArea.tsx index 82b4fba76e..7439900bec 100644 --- a/ts/components/conversation/composition/CompositionTextArea.tsx +++ b/ts/components/conversation/composition/CompositionTextArea.tsx @@ -3,6 +3,7 @@ import { Mention, MentionsInput } from 'react-mentions'; import { useSelectedConversationKey, useSelectedIsBlocked, + useSelectedIsGroupDestroyed, useSelectedIsKickedFromGroup, useSelectedNicknameOrProfileNameOrShortenedPubkey, } from '../../../state/selectors/selectedConversation'; @@ -55,6 +56,7 @@ export const CompositionTextArea = (props: Props) => { const selectedConversationKey = useSelectedConversationKey(); const htmlDirection = useHTMLDirection(); const isKickedFromGroup = useSelectedIsKickedFromGroup(); + const isGroupDestroyed = useSelectedIsGroupDestroyed(); const isBlocked = useSelectedIsBlocked(); const groupName = useSelectedNicknameOrProfileNameOrShortenedPubkey(); @@ -63,6 +65,9 @@ export const CompositionTextArea = (props: Props) => { } const makeMessagePlaceHolderText = () => { + if (isGroupDestroyed) { + return window.i18n('groupDeletedMemberDescription', { group_name: groupName }); + } if (isKickedFromGroup) { return window.i18n('groupRemovedYou', { group_name: groupName }); } diff --git a/ts/components/conversation/message/message-content/MessageText.tsx b/ts/components/conversation/message/message-content/MessageText.tsx index 29ba158de6..4eaf838577 100644 --- a/ts/components/conversation/message/message-content/MessageText.tsx +++ b/ts/components/conversation/message/message-content/MessageText.tsx @@ -29,7 +29,7 @@ export const MessageText = (props: Props) => { } const { text, isDeleted, conversationType } = selected; - const contents = isDeleted ? window.i18n('deleteMessageDeleted', { count: 1 }) : text?.trim(); + const contents = isDeleted ? window.i18n('deleteMessageDeletedGlobally') : text?.trim(); if (!contents) { return null; diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index efbfb4ef9f..6db70ec2a7 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -21,18 +21,17 @@ import { showUpdateGroupNameByConvoId, } from '../../../../interactions/conversationInteractions'; import { Constants } from '../../../../session'; -import { ConvoHub } from '../../../../session/conversations'; import { PubKey } from '../../../../session/types'; import { hasClosedGroupV2QAButtons } from '../../../../shared/env_vars'; import { closeRightPanel } from '../../../../state/ducks/conversations'; import { groupInfoActions } from '../../../../state/ducks/metaGroups'; -import { updateConfirmModal } from '../../../../state/ducks/modalDialog'; import { resetRightOverlayMode, setRightOverlayMode } from '../../../../state/ducks/section'; import { useSelectedConversationKey, useSelectedDisplayNameInProfile, useSelectedIsActive, useSelectedIsBlocked, + useSelectedIsGroupDestroyed, useSelectedIsGroupOrCommunity, useSelectedIsGroupV2, useSelectedIsKickedFromGroup, @@ -45,7 +44,6 @@ import { AttachmentTypeWithPath } from '../../../../types/Attachment'; import { getAbsoluteAttachmentPath } from '../../../../types/MessageAttachment'; import { Avatar, AvatarSize } from '../../../avatar/Avatar'; import { Flex } from '../../../basic/Flex'; -import { SessionButtonColor } from '../../../basic/SessionButton'; import { SpacerLG, SpacerMD, SpacerXL } from '../../../basic/Text'; import { PanelButtonGroup, PanelIconButton } from '../../../buttons'; import { MediaItemType } from '../../../lightbox/LightboxGallery'; @@ -134,6 +132,7 @@ const HeaderItem = () => { const dispatch = useDispatch(); const isBlocked = useSelectedIsBlocked(); const isKickedFromGroup = useSelectedIsKickedFromGroup(); + const isGroupDestroyed = useSelectedIsGroupDestroyed(); const isGroup = useSelectedIsGroupOrCommunity(); const isGroupV2 = useSelectedIsGroupV2(); const isPublic = useSelectedIsPublic(); @@ -146,7 +145,8 @@ const HeaderItem = () => { const showInviteLegacyGroup = !isPublic && !isGroupV2 && isGroup && !isKickedFromGroup && !isBlocked; - const showInviteGroupV2 = isGroupV2 && !isKickedFromGroup && !isBlocked && weAreAdmin; + const showInviteGroupV2 = + isGroupV2 && !isKickedFromGroup && !isBlocked && weAreAdmin && !isGroupDestroyed; const showInviteContacts = isPublic || showInviteLegacyGroup || showInviteGroupV2; const showMemberCount = !!(subscriberCount && subscriberCount > 0); @@ -199,43 +199,6 @@ const StyledName = styled.h4` font-size: var(--font-size-md); `; -const DestroyGroupForAllMembersButton = () => { - const dispatch = useDispatch(); - const groupPk = useSelectedConversationKey(); - if (groupPk && PubKey.is03Pubkey(groupPk) && hasClosedGroupV2QAButtons()) { - return ( - { - dispatch( - // TODO build the right UI for this (just adding buttons for QA for now) - updateConfirmModal({ - okText: window.i18n('delete'), - okTheme: SessionButtonColor.Danger, - title: window.i18n('groupDelete'), - conversationId: groupPk, - onClickOk: () => { - void ConvoHub.use().deleteGroup(groupPk, { - deleteAllMessagesOnSwarm: true, - deletionType: 'doNotKeep', - fromSyncMessage: false, - sendLeaveMessage: false, - forceDestroyForAllMembers: true, - }); - }, - }) - ); - }} - /> - ); - } - - return null; -}; - export const OverlayRightPanelSettings = () => { const [documents, setDocuments] = useState>([]); const [media, setMedia] = useState>([]); @@ -447,7 +410,6 @@ export const OverlayRightPanelSettings = () => { color={'var(--danger-color)'} iconType={'delete'} /> - )} diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index d8bba60f4b..7da4e79b89 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -62,6 +62,7 @@ import { ConversationInteractionStatus, ConversationInteractionType, } from '../../interactions/types'; +import { useLibGroupDestroyed } from '../../state/selectors/userGroups'; /** Menu items standardized */ @@ -213,9 +214,10 @@ export const ShowUserDetailsMenuItem = () => { export const UpdateGroupNameMenuItem = () => { const convoId = useConvoIdFromContext(); const isKickedFromGroup = useIsKickedFromGroup(convoId); + const isDestroyed = useLibGroupDestroyed(convoId); const weAreAdmin = useWeAreAdmin(convoId); - if (!isKickedFromGroup && weAreAdmin) { + if (!isKickedFromGroup && weAreAdmin && !isDestroyed) { return ( { @@ -232,6 +234,7 @@ export const UpdateGroupNameMenuItem = () => { export const RemoveModeratorsMenuItem = (): JSX.Element | null => { const convoId = useConvoIdFromContext(); const isPublic = useIsPublic(convoId); + const isKickedFromGroup = useIsKickedFromGroup(convoId); const weAreAdmin = useWeAreAdmin(convoId); @@ -517,6 +520,8 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => { const isBlocked = useIsBlocked(convoId); const isActive = useIsActive(convoId); const isKickedFromGroup = useIsKickedFromGroup(convoId); + const isGroupDestroyed = useLibGroupDestroyed(convoId); + const isFriend = useIsPrivateAndFriend(convoId); const isPrivate = useIsPrivate(convoId); const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); @@ -525,6 +530,7 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => { !convoId || isMessageRequestShown || isKickedFromGroup || + isGroupDestroyed || isBlocked || !isActive || (isPrivate && !isFriend) diff --git a/ts/data/data.ts b/ts/data/data.ts index 45bdd57402..7ee9441429 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -27,10 +27,9 @@ import * as dataInit from './dataInit'; import { cleanData } from './dataUtils'; import { SNODE_POOL_ITEM_ID } from './settings-key'; import { - DataCallArgs, - DeleteAllMessageFromSendersInConversationType, - DeleteAllMessageHashesInConversationMatchingAuthorType, - DeleteAllMessageHashesInConversationType, + FindAllMessageFromSendersInConversationTypeArgs, + FindAllMessageHashesInConversationMatchingAuthorTypeArgs, + FindAllMessageHashesInConversationTypeArgs, } from './sharedDataTypes'; import { GuardNode, Snode } from './types'; @@ -574,22 +573,40 @@ async function removeAllMessagesInConversation(conversationId: string): Promise< ); } -async function deleteAllMessageFromSendersInConversation( - args: DataCallArgs -): ReturnType { - return channels.deleteAllMessageFromSendersInConversation(args); +async function findAllMessageFromSendersInConversation( + args: FindAllMessageFromSendersInConversationTypeArgs +): Promise> { + const msgAttrs = await channels.findAllMessageFromSendersInConversation(args); + + if (!msgAttrs || isEmpty(msgAttrs)) { + return []; + } + + return msgAttrs.map((msg: any) => new MessageModel(msg)); } -async function deleteAllMessageHashesInConversation( - args: DataCallArgs -): ReturnType { - return channels.deleteAllMessageHashesInConversation(args); +async function findAllMessageHashesInConversation( + args: FindAllMessageHashesInConversationTypeArgs +): Promise> { + const msgAttrs = await channels.findAllMessageHashesInConversation(args); + + if (!msgAttrs || isEmpty(msgAttrs)) { + return []; + } + + return msgAttrs.map((msg: any) => new MessageModel(msg)); } -async function deleteAllMessageHashesInConversationMatchingAuthor( - args: DataCallArgs -): ReturnType { - return channels.deleteAllMessageHashesInConversationMatchingAuthor(args); +async function findAllMessageHashesInConversationMatchingAuthor( + args: FindAllMessageHashesInConversationMatchingAuthorTypeArgs +): Promise> { + const msgAttrs = await channels.findAllMessageHashesInConversationMatchingAuthor(args); + + if (!msgAttrs || isEmpty(msgAttrs)) { + return []; + } + + return msgAttrs.map((msg: any) => new MessageModel(msg)); } async function getMessagesBySentAt(sentAt: number): Promise { @@ -873,9 +890,9 @@ export const Data = { getLastHashBySnode, getSeenMessagesByHashList, removeAllMessagesInConversation, - deleteAllMessageFromSendersInConversation, - deleteAllMessageHashesInConversation, - deleteAllMessageHashesInConversationMatchingAuthor, + findAllMessageFromSendersInConversation, + findAllMessageHashesInConversation, + findAllMessageHashesInConversationMatchingAuthor, getMessagesBySentAt, getExpiredMessages, getOutgoingWithoutExpiresAt, diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts index d253d50940..44de6f867c 100644 --- a/ts/data/dataInit.ts +++ b/ts/data/dataInit.ts @@ -51,9 +51,9 @@ const channelsToMake = new Set([ 'getUnreadCountByConversation', 'getMessageCountByType', 'removeAllMessagesInConversation', - 'deleteAllMessageFromSendersInConversation', - 'deleteAllMessageHashesInConversation', - 'deleteAllMessageHashesInConversationMatchingAuthor', + 'findAllMessageFromSendersInConversation', + 'findAllMessageHashesInConversation', + 'findAllMessageHashesInConversationMatchingAuthor', 'getMessageCount', 'filterAlreadyFetchedOpengroupMessage', 'getMessagesBySenderAndSentAt', diff --git a/ts/data/sharedDataTypes.ts b/ts/data/sharedDataTypes.ts index 2f9c92e3cd..2fa9b9017b 100644 --- a/ts/data/sharedDataTypes.ts +++ b/ts/data/sharedDataTypes.ts @@ -1,25 +1,18 @@ import { PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; -export type DataCallArgs any> = Parameters[0]; -export type DeleteAllMessageFromSendersInConversationType = ( - args: WithGroupPubkey & { +export type FindAllMessageFromSendersInConversationTypeArgs = WithGroupPubkey & { toRemove: Array; signatureTimestamp: number; - } -) => Promise<{ messageHashes: Array }>; + }; -export type DeleteAllMessageHashesInConversationType = ( - args: WithGroupPubkey & { - messageHashes: Array; - signatureTimestamp: number; - } -) => Promise<{ messageHashes: Array }>; +export type FindAllMessageHashesInConversationTypeArgs = WithGroupPubkey & { + messageHashes: Array; + signatureTimestamp: number; +}; -export type DeleteAllMessageHashesInConversationMatchingAuthorType = ( - args: WithGroupPubkey & { - messageHashes: Array; - author: PubkeyType; - signatureTimestamp: number; - } -) => Promise<{ msgIdsDeleted: Array; msgHashesDeleted: Array }>; +export type FindAllMessageHashesInConversationMatchingAuthorTypeArgs = WithGroupPubkey & { + messageHashes: Array; + author: PubkeyType; + signatureTimestamp: number; +}; diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index a1df6e1617..3ce69a42f9 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -21,7 +21,11 @@ import { import { useLibGroupAdmins, useLibGroupMembers, useLibGroupName } from '../state/selectors/groups'; import { isPrivateAndFriend } from '../state/selectors/selectedConversation'; import { useOurPkStr } from '../state/selectors/user'; -import { useLibGroupInvitePending, useLibGroupKicked } from '../state/selectors/userGroups'; +import { + useLibGroupDestroyed, + useLibGroupInvitePending, + useLibGroupKicked, +} from '../state/selectors/userGroups'; export function useAvatarPath(convoId: string | undefined) { const convoProps = useConversationPropsById(convoId); @@ -217,6 +221,14 @@ export function useIsKickedFromGroup(convoId?: string) { return Boolean(convoProps && (convoProps.isKickedFromGroup || libIsKicked)); // not ideal, but until we trust what we get from libsession for all cases, we have to either trust what we have in the DB } +export function useIsGroupDestroyed(convoId?: string) { + const libIsDestroyed = useLibGroupDestroyed(convoId); + if (convoId && PubKey.is03Pubkey(convoId)) { + return libIsDestroyed; + } + return false; +} + export function useWeAreAdmin(convoId?: string) { const groupAdmins = useGroupAdmins(convoId); const us = useOurPkStr(); diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index e4f4d42d5c..2f7a353818 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -445,7 +445,7 @@ export async function showLeaveGroupByConvoId(conversationId: string, name: stri const isAdmin = admins.includes(UserUtils.getOurPubKeyStrFromCache()); const showOnlyGroupAdminWarning = isClosedGroup && isAdmin; const weAreLastAdmin = - PubKey.is05Pubkey(conversationId) || + (PubKey.is05Pubkey(conversationId) && isAdmin && admins.length === 1) || (PubKey.is03Pubkey(conversationId) && isAdmin && admins.length === 1); const lastMessageInteractionType = conversation.get('lastMessageInteractionType'); const lastMessageInteractionStatus = conversation.get('lastMessageInteractionStatus'); diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 0da8697fd5..06995fdd1b 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -280,17 +280,6 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( ); return; } - if (conversation.isClosedGroupV2() && PubKey.is03Pubkey(conversation.id)) { - window.log.info( - 'Cannot delete messages from a legacy closed group swarm, so we just markDeleted.' - ); - await Promise.all( - messages.map(async message => { - return deleteMessageLocallyOnly({ conversation, message, deletionType: 'markDeleted' }); - }) - ); - return; - } // we can only delete messages on the swarm when they are on our own swarm, or it is a groupv2 that we are the admin off const pubkeyToDeleteFrom = PubKey.is03Pubkey(conversation.id) diff --git a/ts/localization/constants.ts b/ts/localization/constants.ts index 6455960756..38ba2b6fd4 100644 --- a/ts/localization/constants.ts +++ b/ts/localization/constants.ts @@ -92,3 +92,4 @@ export const crowdinLocales = [ ] as const; export type CrowdinLocale = (typeof crowdinLocales)[number]; + diff --git a/ts/models/message.ts b/ts/models/message.ts index f196042c52..ed7975f925 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -438,7 +438,6 @@ export class MessageModel extends Backbone.Model { ); } return window.i18n.stripped(...([i18nProps.token] as GetMessageArgs)); - } const body = this.get('body'); if (body) { @@ -986,7 +985,7 @@ export class MessageModel extends Backbone.Model { public async markAsDeleted() { this.set({ isDeleted: true, - body: window.i18n('deleteMessageDeleted', { count: 1 }), + body: window.i18n('deleteMessageDeletedGlobally'), quote: undefined, groupInvitation: undefined, dataExtractionNotification: undefined, @@ -997,6 +996,11 @@ export class MessageModel extends Backbone.Model { preview: undefined, reacts: undefined, reactsIndex: undefined, + flags: undefined, + callNotificationType: undefined, + interactionNotification: undefined, + reaction: undefined, + messageRequestResponse: undefined, }); // we can ignore the result of that markMessageReadNoCommit as it would only be used // to refresh the expiry of it(but it is already marked as "deleted", so we don't care) diff --git a/ts/node/sql.ts b/ts/node/sql.ts index afa119b942..f27cd387b4 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -54,7 +54,6 @@ import type { SetupI18nReturnType } from '../types/localizer'; // checked - only import { StorageItem } from './storage_item'; // checked - only node import { - AwaitedReturn, CONFIG_DUMP_TABLE, MsgDuplicateSearchOpenGroup, roomHasBlindEnabled, @@ -66,10 +65,9 @@ import { import { KNOWN_BLINDED_KEYS_ITEM, SettingsKey } from '../data/settings-key'; import { - DataCallArgs, - DeleteAllMessageFromSendersInConversationType, - DeleteAllMessageHashesInConversationMatchingAuthorType, - DeleteAllMessageHashesInConversationType, + FindAllMessageFromSendersInConversationTypeArgs, + FindAllMessageHashesInConversationMatchingAuthorTypeArgs, + FindAllMessageHashesInConversationTypeArgs, } from '../data/sharedDataTypes'; import { MessageAttributes } from '../models/messageType'; import { SignalService } from '../protobuf'; @@ -1097,72 +1095,68 @@ function removeAllMessagesInConversation( .run({ conversationId }); } -function deleteAllMessageFromSendersInConversation( - { - groupPk, - toRemove, - signatureTimestamp, - }: DataCallArgs, +function findAllMessageFromSendersInConversation( + { groupPk, toRemove, signatureTimestamp }: FindAllMessageFromSendersInConversationTypeArgs, instance?: BetterSqlite3.Database -): AwaitedReturn { +) { if (!groupPk || !toRemove.length) { return { messageHashes: [] }; } - const messageHashes = compact( - assertGlobalInstanceOrInstance(instance) - .prepare( - `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND sent_at <= ? AND source IN ( ${toRemove.map(() => '?').join(', ')} ) RETURNING messageHash` - ) - .all(groupPk, signatureTimestamp, ...toRemove) - .map(m => m.messageHash) - ); - return { messageHashes }; + const rows = assertGlobalInstanceOrInstance(instance) + .prepare( + `SELECT json FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND sent_at <= ? AND source IN ( ${toRemove.map(() => '?').join(', ')} )` + ) + .all(groupPk, signatureTimestamp, ...toRemove); + + if (!rows || isEmpty(rows)) { + return []; + } + return map(rows, row => jsonToObject(row.json)); } -function deleteAllMessageHashesInConversation( - { - groupPk, - messageHashes, - signatureTimestamp, - }: DataCallArgs, +function findAllMessageHashesInConversation( + { groupPk, messageHashes, signatureTimestamp }: FindAllMessageHashesInConversationTypeArgs, instance?: BetterSqlite3.Database -): AwaitedReturn { +) { if (!groupPk || !messageHashes.length) { - return { messageHashes: [] }; + return []; } - const deletedMessageHashes = compact( + const rows = compact( assertGlobalInstanceOrInstance(instance) .prepare( - `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND sent_at <= ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING messageHash` + `SELECT json FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND sent_at <= ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} )` ) .all(groupPk, signatureTimestamp, ...messageHashes) - .map(m => m.messageHash) ); - return { messageHashes: deletedMessageHashes }; + + if (!rows || isEmpty(rows)) { + return []; + } + return map(rows, row => jsonToObject(row.json)); } -function deleteAllMessageHashesInConversationMatchingAuthor( +function findAllMessageHashesInConversationMatchingAuthor( { author, groupPk, messageHashes, signatureTimestamp, - }: DataCallArgs, + }: FindAllMessageHashesInConversationMatchingAuthorTypeArgs, instance?: BetterSqlite3.Database -): AwaitedReturn { +) { if (!groupPk || !author || !messageHashes.length) { return { msgHashesDeleted: [], msgIdsDeleted: [] }; } - const results = assertGlobalInstanceOrInstance(instance) + const rows = assertGlobalInstanceOrInstance(instance) .prepare( - `DELETE FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND source = ? AND sent_at <= ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} ) RETURNING id, messageHash;` + `SELECT json FROM ${MESSAGES_TABLE} WHERE conversationId = ? AND source = ? AND sent_at <= ? AND messageHash IN ( ${messageHashes.map(() => '?').join(', ')} );` ) .all(groupPk, author, signatureTimestamp, ...messageHashes); - return { - msgHashesDeleted: results.map(m => m.messageHash), - msgIdsDeleted: results.map(m => m.id), - }; + if (!rows || isEmpty(rows)) { + return null; + } + return map(rows, row => jsonToObject(row.json)); } function cleanUpExpirationTimerUpdateHistory( @@ -2661,9 +2655,9 @@ export const sqlNode = { getAllMessagesWithAttachmentsInConversationSentBefore, cleanUpExpirationTimerUpdateHistory, removeAllMessagesInConversation, - deleteAllMessageFromSendersInConversation, - deleteAllMessageHashesInConversation, - deleteAllMessageHashesInConversationMatchingAuthor, + findAllMessageFromSendersInConversation, + findAllMessageHashesInConversation, + findAllMessageHashesInConversationMatchingAuthor, getUnreadByConversation, getUnreadDisappearingByConversation, markAllAsReadByConversationNoExpiration, diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 47a4868c44..12cb5704e8 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -1,5 +1,5 @@ import { GroupPubkeyType, PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; -import { compact, isEmpty, isFinite, isNumber } from 'lodash'; +import { isEmpty, isFinite, isNumber } from 'lodash'; import { Data } from '../../data/data'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; import { deleteMessagesFromSwarmOnly } from '../../interactions/conversations/unsendingInteractions'; @@ -20,7 +20,6 @@ import { PreConditionFailed } from '../../session/utils/errors'; import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; import { SessionUtilConvoInfoVolatile } from '../../session/utils/libsession/libsession_utils_convo_info_volatile'; -import { messageHashesExpired, messagesExpired } from '../../state/ducks/conversations'; import { groupInfoActions } from '../../state/ducks/metaGroups'; import { toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { BlockedNumberController } from '../../util'; @@ -80,7 +79,6 @@ async function getInitializedGroupObject({ }; } - found.kicked = false; found.name = groupName; if (groupSecretKey && !isEmpty(groupSecretKey)) { found.secretKey = groupSecretKey; @@ -164,6 +162,7 @@ async function handleGroupUpdateInviteMessage({ found.authData = inviteMessage.memberAuthData; await UserGroupsWrapperActions.setGroup(found); + await UserGroupsWrapperActions.markGroupInvited(groupPk); // force markedAsUnread to be true so it shows the unread banner (we only show the banner if there are unread messages on at least one msg/group request) await convo.markAsUnread(true, false); await convo.commit(); @@ -427,35 +426,45 @@ async function handleGroupDeleteMemberContentMessage({ * When `adminSignature` is not empty and valid, * 2. we delete all the messages in the group sent by any of change.memberSessionIds AND * 3. we delete all the messageHashes in the conversation matching the change.messageHashes (even if not from the right sender) + * + * Note: we never fully delete those messages locally, but only empty them and mark them as deleted with the + * "This message was deleted" placeholder. + * Eventually, we will be able to delete those "deleted by kept locally" messages with placeholders. */ - if (isEmpty(change.adminSignature)) { + // no adminSignature: this was sent by a non-admin user + if (!change.adminSignature || isEmpty(change.adminSignature)) { // this is step 1. - const { msgIdsDeleted, msgHashesDeleted } = - await Data.deleteAllMessageHashesInConversationMatchingAuthor({ - author, - groupPk, - messageHashes: change.messageHashes, - signatureTimestamp, - }); - - window.inboxStore?.dispatch( - messagesExpired(msgIdsDeleted.map(m => ({ conversationKey: groupPk, messageId: m }))) - ); + const messageModels = await Data.findAllMessageHashesInConversationMatchingAuthor({ + author, + groupPk, + messageHashes: change.messageHashes, + signatureTimestamp, + }); - if (msgIdsDeleted.length) { - // Note: we `void` it because we don't want to hang while - // processing the handleGroupDeleteMemberContentMessage itself - // (we are running on the receiving pipeline here) - void deleteMessagesFromSwarmOnly(msgHashesDeleted, groupPk).catch(e => { - // we retry a bunch of times already, so if it still fails, there is not much we can do. - window.log.warn('deleteMessagesFromSwarmOnly failed with', e.message); - }); + // we don't want to hang while for too long here + // processing the handleGroupDeleteMemberContentMessage itself + // (we are running on the receiving pipeline here) + // so network calls are not allowed. + for (let index = 0; index < messageModels.length; index++) { + const messageModel = messageModels[index]; + try { + // eslint-disable-next-line no-await-in-loop + await messageModel.markAsDeleted(); + } catch (e) { + window.log.warn( + `handleGroupDeleteMemberContentMessage markAsDeleted non-admin of ${messageModel.getMessageHash()} failed with`, + e.message + ); + } } convo.updateLastMessage(); + return; } + // else case: we have an admin signature to verify + const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), signature: change.adminSignature, @@ -471,26 +480,36 @@ async function handleGroupDeleteMemberContentMessage({ const toRemove = change.memberSessionIds.filter(PubKey.is05Pubkey); - const deletedBySenders = await Data.deleteAllMessageFromSendersInConversation({ + const modelsBySenders = await Data.findAllMessageFromSendersInConversation({ groupPk, toRemove, signatureTimestamp, }); // this is step 2. - const deletedByHashes = await Data.deleteAllMessageHashesInConversation({ + const modelsByHashes = await Data.findAllMessageHashesInConversation({ groupPk, messageHashes: change.messageHashes, signatureTimestamp, }); // this is step 3. - window.inboxStore?.dispatch( - messageHashesExpired( - compact([...deletedByHashes.messageHashes, ...deletedBySenders.messageHashes]).map(m => ({ - conversationKey: groupPk, - messageHash: m, - })) - ) - ); + // we don't want to hang while for too long here + // processing the handleGroupDeleteMemberContentMessage itself + // (we are running on the receiving pipeline here) + // so network calls are not allowed. + const mergedModels = modelsByHashes.concat(modelsBySenders); + for (let index = 0; index < mergedModels.length; index++) { + const messageModel = mergedModels[index]; + try { + // eslint-disable-next-line no-await-in-loop + await messageModel.markAsDeleted(); + } catch (e) { + window.log.warn( + `handleGroupDeleteMemberContentMessage markAsDeleted non-admin of ${messageModel.getMessageHash()} failed with`, + e.message + ); + } + } convo.updateLastMessage(); + } async function handleGroupUpdateInviteResponseMessage({ diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 74be4a403b..bfdd22a81b 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -57,6 +57,7 @@ import { } from './types'; import { ConversationTypeEnum } from '../../../models/types'; import { Snode } from '../../../data/types'; +import { isDevProd } from '../../../shared/env_vars'; const minMsgCountShouldRetry = 95; @@ -289,7 +290,9 @@ export class SwarmPolling { if (!window.getGlobalOnlineStatus()) { window?.log?.error('pollForAllKeys: offline'); // Very important to set up a new polling call so we do retry at some point - timeouts.push(setTimeout(this.pollForAllKeys.bind(this), SWARM_POLLING_TIMEOUT.ACTIVE)); + timeouts.push( + setTimeout(this.pollForAllKeys.bind(this), isDevProd() ? 500 : SWARM_POLLING_TIMEOUT.ACTIVE) + ); return; } @@ -309,7 +312,9 @@ export class SwarmPolling { window?.log?.warn('pollForAllKeys exception: ', e); throw e; } finally { - timeouts.push(setTimeout(this.pollForAllKeys.bind(this), SWARM_POLLING_TIMEOUT.ACTIVE)); + timeouts.push( + setTimeout(this.pollForAllKeys.bind(this), isDevProd() ? 500 : SWARM_POLLING_TIMEOUT.ACTIVE) + ); } } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 4a5a312d7c..197763c17e 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -317,9 +317,9 @@ class ConvoController { } await UserGroupsWrapperActions.setGroup(groupInUserGroup); if (deletionType === 'keepAsKicked') { - await UserGroupsWrapperActions.setGroupKicked(groupPk); + await UserGroupsWrapperActions.markGroupKicked(groupPk); } else { - await UserGroupsWrapperActions.setGroupDestroyed(groupPk); + await UserGroupsWrapperActions.markGroupDestroyed(groupPk); } } } else { diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index f250e23979..cfd03bdc35 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -5,7 +5,6 @@ import { v4 } from 'uuid'; import { StringUtils } from '../..'; import { Data } from '../../../../data/data'; import { deleteMessagesFromSwarmOnly } from '../../../../interactions/conversations/unsendingInteractions'; -import { messageHashesExpired } from '../../../../state/ducks/conversations'; import { MetaGroupWrapperActions, MultiEncryptWrapperActions, @@ -212,26 +211,27 @@ class GroupPendingRemovalsJob extends PersistedJob ({ - conversationKey: groupPk, - messageHash, - })) - ) + const messageHashes = compact(models.map(m => m.getMessageHash())); + + if (messageHashes.length) { + await deleteMessagesFromSwarmOnly(messageHashes, groupPk); + } + for (let index = 0; index < models.length; index++) { + const messageModel = models[index]; + try { + // eslint-disable-next-line no-await-in-loop + await messageModel.markAsDeleted(); + } catch (e) { + window.log.warn( + `GroupPendingRemoval markAsDeleted of ${messageModel.getMessageHash()} failed with`, + e.message ); } } diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index c782d642d5..bbdfa16996 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -244,7 +244,8 @@ class GroupSyncJob extends PersistedJob { // eslint-disable-next-line no-useless-catch } catch (e) { - throw e; + window.log.warn('GroupSyncJob failed with', e.message); + return RunJobResult.RetryJobIfPossible; } finally { window.log.debug( `GroupSyncJob ${ed25519Str(thisJobDestination)} run() took ${Date.now() - start}ms` diff --git a/ts/session/utils/libsession/libsession_utils_user_groups.ts b/ts/session/utils/libsession/libsession_utils_user_groups.ts index 1ece555f65..caf46a466f 100644 --- a/ts/session/utils/libsession/libsession_utils_user_groups.ts +++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts @@ -173,7 +173,6 @@ async function insertGroupsFromDBIntoWrapperAndRefresh( joinedAtSeconds: null, // no need to update this one except when we process an invite, maybe name: null, // not updated except when we process an invite/create a group secretKey: null, // not updated except when we process an promote/create a group - kicked: foundConvo.isKickedFromGroup() ?? null, priority: foundConvo.getPriority() ?? null, // for 03 group, the priority is only tracked with libsession, so this is fine }; try { diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index bdbb87d5f9..b981bc04ec 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -17,6 +17,7 @@ import { } from './conversations'; import { getLibMembersPubkeys, useLibGroupName } from './groups'; import { getCanWrite, getModerators, getSubscriberCount } from './sogsRoomInfo'; +import { getLibGroupDestroyed, useLibGroupDestroyed } from './userGroups'; const getIsSelectedPrivate = (state: StateType): boolean => { return Boolean(getSelectedConversation(state)?.isPrivate) || false; @@ -57,6 +58,7 @@ export const getSelectedConversationIsPublic = (state: StateType): boolean => { */ export function getSelectedCanWrite(state: StateType) { const selectedConvoPubkey = getSelectedConversationKey(state); + const isSelectedGroupDestroyed = getLibGroupDestroyed(state, selectedConvoPubkey); if (!selectedConvoPubkey) { return false; } @@ -69,9 +71,15 @@ export function getSelectedCanWrite(state: StateType) { const readOnlySogs = isPublic && !canWriteSogs; - const isBlindedAndDisabledMsgRequests = getSelectedBlindedDisabledMsgRequests(state); // true if isPrivate, blinded and explicitely disabled msgreq + const isBlindedAndDisabledMsgRequests = getSelectedBlindedDisabledMsgRequests(state); // true if isPrivate, blinded and explicitly disabled msgreq - return !(isBlocked || isKickedFromGroup || readOnlySogs || isBlindedAndDisabledMsgRequests); + return !( + isBlocked || + isKickedFromGroup || + isSelectedGroupDestroyed || + readOnlySogs || + isBlindedAndDisabledMsgRequests + ); } function getSelectedBlindedDisabledMsgRequests(state: StateType) { @@ -328,6 +336,11 @@ export function useSelectedIsKickedFromGroup() { ); } +export function useSelectedIsGroupDestroyed() { + const convoKey = useSelectedConversationKey(); + return useLibGroupDestroyed(convoKey); +} + export function useSelectedExpireTimer(): number | undefined { return useSelector((state: StateType) => getSelectedConversation(state)?.expireTimer); } diff --git a/ts/state/selectors/userGroups.ts b/ts/state/selectors/userGroups.ts index 1c2b337048..6d3b3db12d 100644 --- a/ts/state/selectors/userGroups.ts +++ b/ts/state/selectors/userGroups.ts @@ -39,3 +39,11 @@ export function getLibGroupKickedOutsideRedux(convoId?: string) { return state ? getLibGroupKicked(state, convoId) : undefined; } + +export function getLibGroupDestroyed(state: StateType, convoId?: string) { + return getGroupById(state, convoId)?.destroyed; +} + +export function useLibGroupDestroyed(convoId?: string) { + return useSelector((state: StateType) => getLibGroupDestroyed(state, convoId)); +} diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 97ae9412ec..4cae67f801 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -341,28 +341,42 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls & { ReturnType >; groups.set(group.pubkeyHex, group); + dispatchCachedGroupsToRedux(); return cloneDeep(group); }, - setGroupKicked: async (pubkeyHex: GroupPubkeyType) => { + markGroupKicked: async (pubkeyHex: GroupPubkeyType) => { const group = (await callLibSessionWorker([ 'UserGroupsConfig', - 'setGroupKicked', + 'markGroupKicked', pubkeyHex, - ])) as Awaited>; + ])) as Awaited>; groups.set(group.pubkeyHex, group); dispatchCachedGroupsToRedux(); return cloneDeep(group); }, - setGroupDestroyed: async (pubkeyHex: GroupPubkeyType) => { + markGroupInvited: async (pubkeyHex: GroupPubkeyType) => { const group = (await callLibSessionWorker([ 'UserGroupsConfig', - 'setGroupDestroyed', + 'markGroupInvited', pubkeyHex, - ])) as Awaited>; + ])) as Awaited>; groups.set(group.pubkeyHex, group); + + dispatchCachedGroupsToRedux(); + return cloneDeep(group); + }, + + markGroupDestroyed: async (pubkeyHex: GroupPubkeyType) => { + const group = (await callLibSessionWorker([ + 'UserGroupsConfig', + 'markGroupDestroyed', + pubkeyHex, + ])) as Awaited>; + groups.set(group.pubkeyHex, group); + dispatchCachedGroupsToRedux(); return cloneDeep(group); }, From cf899ee18c0f001d5664273c7313d90bde2587b5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 12 Nov 2024 16:34:51 +1100 Subject: [PATCH 166/302] fix: add group members sorting not good but hopefully we won't have to keep for too long --- ts/components/MemberListItem.tsx | 43 +---- .../dialog/UpdateGroupMembersDialog.tsx | 20 ++- .../SwarmPollingGroupConfig.ts | 4 +- .../conversations/ConversationController.ts | 2 +- ts/session/utils/job_runners/PersistedJob.ts | 1 + .../utils/job_runners/jobs/GroupInviteJob.ts | 38 +++- ts/state/ducks/metaGroups.ts | 20 +-- ts/state/selectors/groups.ts | 167 ++++++++++++++++-- .../libsession_wrapper_metagroup_test.ts | 16 +- 9 files changed, 223 insertions(+), 88 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 6cdd70a947..4db539d7b1 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -13,11 +13,10 @@ import { useMemberInviteFailed, useMemberInviteSending, useMemberInviteSent, - useMemberIsPromoted, useMemberPromoteSending, useMemberPromotionFailed, - useMemberPromotionNotSent, useMemberPromotionSent, + useMemberIsNominatedAdmin, } from '../state/selectors/groups'; import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar'; import { Flex } from './basic/Flex'; @@ -28,10 +27,6 @@ import { SessionButtonType, } from './basic/SessionButton'; import { SessionRadio } from './basic/SessionRadio'; -import { GroupSync } from '../session/utils/job_runners/jobs/GroupSyncJob'; -import { RunJobResult } from '../session/utils/job_runners/PersistedJob'; -import { SubaccountUnrevokeSubRequest } from '../session/apis/snode_api/SnodeRequestTypes'; -import { NetworkTime } from '../util/NetworkTime'; import { MetaGroupWrapperActions, UserGroupsWrapperActions, @@ -221,15 +216,10 @@ const GroupStatusContainer = ({ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupPubkeyType }) => { const acceptedInvite = useMemberHasAcceptedInvite(pubkey, groupPk); - const promotionFailed = useMemberPromotionFailed(pubkey, groupPk); - const promotionSent = useMemberPromotionSent(pubkey, groupPk); - const promotionNotSent = useMemberPromotionNotSent(pubkey, groupPk); - const promoted = useMemberIsPromoted(pubkey, groupPk); + const nominatedAdmin = useMemberIsNominatedAdmin(pubkey, groupPk); // as soon as the `admin` flag is set in the group for that member, we should be able to resend a promote as we cannot remove an admin. - const canResendPromotion = - hasClosedGroupV2QAButtons() && - (promotionFailed || promotionSent || promotionNotSent || promoted); + const canResendPromotion = hasClosedGroupV2QAButtons() && nominatedAdmin; // we can always remove/and readd a non-admin member. So we consider that a member who accepted the invite cannot be resent an invite. const canResendInvite = !acceptedInvite; @@ -252,32 +242,13 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP window.log.warn('tried to resend invite but we do not have correct details'); return; } - const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, pubkey); - const unrevokeSubRequest = new SubaccountUnrevokeSubRequest({ - groupPk, - revokeTokenHex: [token], - timestamp: NetworkTime.now(), - secretKey: group.secretKey, - }); - const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - unrevokeSubRequest, - extraStoreRequests: [], - }); - if (sequenceResult !== RunJobResult.Success) { - throw new Error('resend invite: pushChangesToGroupSwarmIfNeeded did not return success'); - } - // if we tried to invite that member as admin right away, let's retry it as such. - const inviteAsAdmin = - member.promotionNotSent || - member.promotionFailed || - member.promotionPending || - member.promoted; + const inviteAsAdmin = member.nominatedAdmin; await GroupInvite.addJob({ groupPk, member: pubkey, inviteAsAdmin, + forceUnrevoke: true, }); }} /> @@ -286,11 +257,11 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP const PromoteButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupPubkeyType }) => { const memberAcceptedInvite = useMemberHasAcceptedInvite(pubkey, groupPk); - const memberIsPromoted = useMemberIsPromoted(pubkey, groupPk); + const memberIsNominatedAdmin = useMemberIsNominatedAdmin(pubkey, groupPk); // When invite-as-admin was used to invite that member, the resend button is available to resend the promote message. // We want to show that button only to promote a normal member who accepted a normal invite but wasn't promoted yet. // ^ this is only the case for testing. The UI will be different once we release the promotion process - if (!hasClosedGroupV2QAButtons() || !memberAcceptedInvite || memberIsPromoted) { + if (!hasClosedGroupV2QAButtons() || !memberAcceptedInvite || memberIsNominatedAdmin) { return null; } return ( diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 3558fad20c..63081243dc 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -27,7 +27,10 @@ import { ClosedGroup } from '../../session/group/closed-group'; import { PubKey } from '../../session/types'; import { hasClosedGroupV2QAButtons } from '../../shared/env_vars'; import { groupInfoActions } from '../../state/ducks/metaGroups'; -import { useMemberGroupChangePending } from '../../state/selectors/groups'; +import { + useMemberGroupChangePending, + useStateOf03GroupMembers, +} from '../../state/selectors/groups'; import { useSelectedIsGroupV2 } from '../../state/selectors/selectedConversation'; import { SessionSpinner } from '../loading'; import { SessionToggle } from '../basic/SessionToggle'; @@ -36,7 +39,7 @@ type Props = { conversationId: string; }; -const StyledClassicMemberList = styled.div` +const StyledMemberList = styled.div` max-height: 240px; `; @@ -44,7 +47,7 @@ const StyledClassicMemberList = styled.div` * Admins are always put first in the list of group members. * Also, admins have a little crown on their avatar. */ -const ClassicMemberList = (props: { +const MemberList = (props: { convoId: string; selectedMembers: Array; onSelect: (m: string) => void; @@ -56,12 +59,15 @@ const ClassicMemberList = (props: { const groupAdmins = useGroupAdmins(convoId); const groupMembers = useSortedGroupMembers(convoId); + const groupMembers03Group = useStateOf03GroupMembers(convoId); - const sortedMembers = useMemo( + const sortedMembersNon03 = useMemo( () => [...groupMembers].sort(m => (groupAdmins?.includes(m) ? -1 : 0)), [groupMembers, groupAdmins] ); + const sortedMembers = isV2Group ? groupMembers03Group.map(m => m.pubkeyHex) : sortedMembersNon03; + return ( <> {sortedMembers.map(member => { @@ -230,14 +236,14 @@ export const UpdateGroupMembersDialog = (props: Props) => { /> ) : null} - - + - + {showNoMembersMessage &&

{window.i18n('groupMembersNone')}

} diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index b102826f2d..36207386a2 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -125,11 +125,11 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { } } // mark ourselves as accepting the invite if needed - if (usMember?.invitePending && keysAlreadyHaveAdmin) { + if (usMember?.memberStatus === 'INVITE_SENT' && keysAlreadyHaveAdmin) { await MetaGroupWrapperActions.memberSetAccepted(groupPk, us); } // mark ourselves as accepting the promotion if needed - if (usMember?.promotionPending && keysAlreadyHaveAdmin) { + if (usMember?.memberStatus === 'PROMOTION_SENT' && keysAlreadyHaveAdmin) { await MetaGroupWrapperActions.memberSetPromotionAccepted(groupPk, us); } // this won't do anything if there is no need for a sync, so we can safely plan one diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 197763c17e..a11f372ad2 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -327,7 +327,7 @@ class ConvoController { const us = UserUtils.getOurPubKeyStrFromCache(); const allMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); const otherAdminsCount = allMembers - .filter(m => m.promoted) + .filter(m => m.nominatedAdmin) .filter(m => m.pubkeyHex !== us).length; const weAreLastAdmin = otherAdminsCount === 0; const infos = await MetaGroupWrapperActions.infoGet(groupPk); diff --git a/ts/session/utils/job_runners/PersistedJob.ts b/ts/session/utils/job_runners/PersistedJob.ts index 290f285d49..c52a4ccc5a 100644 --- a/ts/session/utils/job_runners/PersistedJob.ts +++ b/ts/session/utils/job_runners/PersistedJob.ts @@ -43,6 +43,7 @@ export interface GroupInvitePersistedData extends PersistedJobData { groupPk: GroupPubkeyType; member: PubkeyType; inviteAsAdmin: boolean; + forceUnrevoke: boolean; } export interface GroupPromotePersistedData extends PersistedJobData { diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index d9413e805a..ed2b413e67 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -21,6 +21,9 @@ import { LibSessionUtil } from '../../libsession/libsession_utils'; import { showUpdateGroupMembersByConvoId } from '../../../../interactions/conversationInteractions'; import { ConvoHub } from '../../../conversations'; import { MessageQueue } from '../../../sending'; +import { NetworkTime } from '../../../../util/NetworkTime'; +import { SubaccountUnrevokeSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; +import { GroupSync } from './GroupSyncJob'; const defaultMsBetweenRetries = 10000; const defaultMaxAttempts = 1; @@ -29,6 +32,12 @@ type JobExtraArgs = { groupPk: GroupPubkeyType; member: PubkeyType; inviteAsAdmin: boolean; + /** + * When inviting a member, we usually only want to sent a message to his swarm. + * In the case of a invitation resend process though, we also want to make sure his token is unrevoked from the group's swarm. + * + */ + forceUnrevoke: boolean; }; export function shouldAddJob(args: JobExtraArgs) { @@ -47,12 +56,13 @@ const invitesFailed = new Map< } >(); -async function addJob({ groupPk, member, inviteAsAdmin }: JobExtraArgs) { - if (shouldAddJob({ groupPk, member, inviteAsAdmin })) { +async function addJob({ groupPk, member, inviteAsAdmin, forceUnrevoke }: JobExtraArgs) { + if (shouldAddJob({ groupPk, member, inviteAsAdmin, forceUnrevoke })) { const groupInviteJob = new GroupInviteJob({ groupPk, member, inviteAsAdmin, + forceUnrevoke, nextAttemptTimestamp: Date.now(), }); window.log.debug(`addGroupInviteJob: adding group invite for ${groupPk}:${member} `); @@ -135,8 +145,9 @@ class GroupInviteJob extends PersistedJob { nextAttemptTimestamp, maxAttempts, currentRetry, + forceUnrevoke, identifier, - }: Pick & + }: Pick & Partial< Pick< GroupInvitePersistedData, @@ -153,6 +164,7 @@ class GroupInviteJob extends PersistedJob { member, groupPk, inviteAsAdmin, + forceUnrevoke, delayBetweenRetries: defaultMsBetweenRetries, maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts, nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries, @@ -177,6 +189,26 @@ class GroupInviteJob extends PersistedJob { } let failed = true; try { + if (this.persistedData.forceUnrevoke) { + const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, member); + const unrevokeSubRequest = new SubaccountUnrevokeSubRequest({ + groupPk, + revokeTokenHex: [token], + timestamp: NetworkTime.now(), + secretKey: group.secretKey, + }); + const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + unrevokeSubRequest, + extraStoreRequests: [], + }); + if (sequenceResult !== RunJobResult.Success) { + throw new Error( + 'GroupInviteJob: SubaccountUnrevokeSubRequest push() did not return success' + ); + } + } + const inviteDetails = inviteAsAdmin ? await SnodeGroupSignature.getGroupPromoteMessage({ groupName: group.name, diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index ef57e4a319..b2cac4c71f 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -87,7 +87,7 @@ async function checkWeAreAdmin(groupPk: GroupPubkeyType) { const usInGroup = await MetaGroupWrapperActions.memberGet(groupPk, us); const inUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); // if the secretKey is not empty AND we are a member of the group, we are a current admin - return Boolean(!isEmpty(inUserGroup?.secretKey) && usInGroup?.promoted); + return Boolean(!isEmpty(inUserGroup?.secretKey) && usInGroup?.nominatedAdmin); } async function checkWeAreAdminOrThrow(groupPk: GroupPubkeyType, context: string) { @@ -243,14 +243,12 @@ const initNewGroupInWrapper = createAsyncThunk( // privately and asynchronously, and gracefully handle errors with toasts. // Let's do all of this part of a job to handle app crashes and make sure we // can update the group wrapper with a failed state if a message fails to be sent. - for (let index = 0; index < membersFromWrapper.length; index++) { - const member = membersFromWrapper[index]; - await GroupInvite.addJob({ - member: member.pubkeyHex, - groupPk, - inviteAsAdmin: window.sessionFeatureFlags.useGroupV2InviteAsAdmin, - }); - } + await scheduleGroupInviteJobs( + groupPk, + membersFromWrapper.map(m => m.pubkeyHex), + [], + window.sessionFeatureFlags.useGroupV2InviteAsAdmin + ); await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); @@ -1429,6 +1427,8 @@ async function scheduleGroupInviteJobs( const merged = uniq(concat(withHistory, withoutHistory)); for (let index = 0; index < merged.length; index++) { const member = merged[index]; - await GroupInvite.addJob({ groupPk, member, inviteAsAdmin }); + // Note: forceUnrevoke is false, because `scheduleGroupInviteJobs` is always called after we've done + // a batch unrevoke of all the members' pk + await GroupInvite.addJob({ groupPk, member, inviteAsAdmin, forceUnrevoke: false }); } } diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index e1e7d6bb0b..dc1f8a3129 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -1,8 +1,17 @@ -import { GroupMemberGet, GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { + GroupMemberGet, + GroupPubkeyType, + MemberStateGroupV2, + PubkeyType, +} from 'libsession_util_nodejs'; import { useSelector } from 'react-redux'; +import { compact, concat, differenceBy, sortBy, uniqBy } from 'lodash'; import { PubKey } from '../../session/types'; import { GroupState } from '../ducks/metaGroups'; import { StateType } from '../reducer'; +import { assertUnreachable } from '../../types/sqlSharedTypes'; +import { UserUtils } from '../../session/utils'; +import { useConversationsNicknameRealNameOrShortenPubkey } from '../../hooks/useParamSelector'; const getLibGroupsState = (state: StateType): GroupState => state.groups; const getInviteSendingState = (state: StateType) => getLibGroupsState(state).membersInviteSending; @@ -44,48 +53,57 @@ function getGroupNameChangeFromUIPending(state: StateType): boolean { export function getLibAdminsPubkeys(state: StateType, convo?: string): Array { const members = getMembersOfGroup(state, convo); - return members.filter(m => m.promoted).map(m => m.pubkeyHex); + return members.filter(m => m.nominatedAdmin).map(m => m.pubkeyHex); } function getMemberInviteFailed(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); - return findMemberInMembers(members, pubkey)?.inviteFailed || false; + return findMemberInMembers(members, pubkey)?.memberStatus === 'INVITE_FAILED' || false; } function getMemberInviteNotSent(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); - return findMemberInMembers(members, pubkey)?.inviteNotSent || false; + return findMemberInMembers(members, pubkey)?.memberStatus === 'INVITE_NOT_SENT' || false; } function getMemberInviteSent(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); - return findMemberInMembers(members, pubkey)?.invitePending || false; + return findMemberInMembers(members, pubkey)?.memberStatus === 'INVITE_SENT' || false; } -function getMemberIsPromoted(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { +function getMemberHasAcceptedPromotion( + state: StateType, + pubkey: PubkeyType, + convo?: GroupPubkeyType +) { const members = getMembersOfGroup(state, convo); - return findMemberInMembers(members, pubkey)?.promoted || false; + return findMemberInMembers(members, pubkey)?.memberStatus === 'PROMOTION_ACCEPTED' || false; +} + +function getMemberIsNominatedAdmin(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.nominatedAdmin || false; } function getMemberHasAcceptedInvite(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); - return findMemberInMembers(members, pubkey)?.inviteAccepted || false; + return findMemberInMembers(members, pubkey)?.memberStatus === 'INVITE_ACCEPTED' || false; } function getMemberPromotionFailed(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); - return findMemberInMembers(members, pubkey)?.promotionFailed || false; + return findMemberInMembers(members, pubkey)?.memberStatus === 'PROMOTION_FAILED' || false; } function getMemberPromotionSent(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); - return findMemberInMembers(members, pubkey)?.promotionPending || false; + return findMemberInMembers(members, pubkey)?.memberStatus === 'PROMOTION_SENT' || false; } function getMemberPromotionNotSent(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); - return findMemberInMembers(members, pubkey)?.promotionNotSent || false; + return findMemberInMembers(members, pubkey)?.memberStatus === 'PROMOTION_NOT_SENT' || false; } export function getLibMembersCount(state: StateType, convo?: GroupPubkeyType): Array { @@ -155,9 +173,14 @@ export function useMemberInviteNotSent(member: PubkeyType, groupPk: GroupPubkeyT return useSelector((state: StateType) => getMemberInviteNotSent(state, member, groupPk)); } -export function useMemberIsPromoted(member: PubkeyType, groupPk: GroupPubkeyType) { - return useSelector((state: StateType) => getMemberIsPromoted(state, member, groupPk)); +export function useMemberHasAcceptedPromotion(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberHasAcceptedPromotion(state, member, groupPk)); +} + +export function useMemberIsNominatedAdmin(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberIsNominatedAdmin(state, member, groupPk)); } + export function useMemberHasAcceptedInvite(member: PubkeyType, groupPk: GroupPubkeyType) { return useSelector((state: StateType) => getMemberHasAcceptedInvite(state, member, groupPk)); } @@ -188,18 +211,128 @@ export function useGroupNameChangeFromUIPending() { * An example is the "sending invite" or "sending promote" state of a member in a group. */ -function useMembersInviteSending(groupPk: GroupPubkeyType) { - return useSelector((state: StateType) => getInviteSendingState(state)[groupPk] || []); +function useMembersInviteSending(groupPk?: string) { + return useSelector((state: StateType) => + groupPk && PubKey.is03Pubkey(groupPk) ? getInviteSendingState(state)[groupPk] || [] : [] + ); } export function useMemberInviteSending(groupPk: GroupPubkeyType, memberPk: PubkeyType) { return useMembersInviteSending(groupPk).includes(memberPk); } -function useMembersPromoteSending(groupPk: GroupPubkeyType) { - return useSelector((state: StateType) => getPromoteSendingState(state)[groupPk] || []); +function useMembersPromoteSending(groupPk?: string) { + return useSelector((state: StateType) => + groupPk && PubKey.is03Pubkey(groupPk) ? getPromoteSendingState(state)[groupPk] || [] : [] + ); } export function useMemberPromoteSending(groupPk: GroupPubkeyType, memberPk: PubkeyType) { return useMembersPromoteSending(groupPk).includes(memberPk); } + +type MemberStateGroupV2WithSending = MemberStateGroupV2 | 'INVITE_SENDING' | 'PROMOTION_SENDING'; + +export function useStateOf03GroupMembers(convoId?: string) { + const us = UserUtils.getOurPubKeyStrFromCache(); + let unsortedMembers = useSelector((state: StateType) => getMembersOfGroup(state, convoId)); + const invitesSendingPk = useMembersInviteSending(convoId); + const promotionsSendingPk = useMembersPromoteSending(convoId); + let invitesSending = compact( + invitesSendingPk.map(sending => unsortedMembers.find(m => m.pubkeyHex === sending)) + ); + const promotionSending = compact( + promotionsSendingPk.map(sending => unsortedMembers.find(m => m.pubkeyHex === sending)) + ); + + // promotionSending has priority against invitesSending, so removing anything in invitesSending found in promotionSending + invitesSending = differenceBy(invitesSending, promotionSending, value => value.pubkeyHex); + + const bothSending = concat(promotionSending, invitesSending); + + // promotionSending and invitesSending has priority against anything else, so remove anything found in one of those two + // from the unsorted list of members + unsortedMembers = differenceBy(unsortedMembers, bothSending, value => value.pubkeyHex); + + // at this point, merging invitesSending, promotionSending and unsortedMembers should create an array of unique members + const sortedByPriorities = concat(bothSending, unsortedMembers); + if (sortedByPriorities.length !== uniqBy(sortedByPriorities, m => m.pubkeyHex).length) { + throw new Error( + 'merging invitesSending, promotionSending and unsortedMembers should create an array of unique members' + ); + } + + // This could have been done now with a `sortedByPriorities.map()` call, + // but we don't want the order as sorted by `sortedByPriorities`, **only** to respect the priorities from it. + // What that means is that a member with a state as inviteSending, should have that state, but not be sorted first. + + // The order we (for now) want is: + // - (Invite failed + Invite Not Sent) merged together, sorted as NameSortingOrder + // - Sending invite, sorted as NameSortingOrder + // - Invite sent, sorted as NameSortingOrder + // - (Promotion failed + Promotion Not Sent) merged together, sorted as NameSortingOrder + // - Sending invite, sorted as NameSortingOrder + // - Invite sent, sorted as NameSortingOrder + // - Admin, sorted as NameSortingOrder + // - Accepted Member, sorted as NameSortingOrder + // NameSortingOrder: You first, then "nickname || name || pubkey -> aA-zZ" + + const unsortedWithStatuses: Array< + Pick & { memberStatus: MemberStateGroupV2WithSending } + > = []; + unsortedWithStatuses.push(...promotionSending); + unsortedWithStatuses.push(...differenceBy(invitesSending, promotionSending)); + unsortedWithStatuses.push(...differenceBy(unsortedMembers, invitesSending, promotionSending)); + + const names = useConversationsNicknameRealNameOrShortenPubkey( + unsortedWithStatuses.map(m => m.pubkeyHex) + ); + + // needing an index like this outside of lodash is not pretty, + // but sortBy doesn't provide the index in the callback + let index = 0; + + const sorted = sortBy(unsortedWithStatuses, item => { + let stateSortingOrder = 0; + switch (item.memberStatus) { + case 'INVITE_FAILED': + case 'INVITE_NOT_SENT': + stateSortingOrder = -5; + break; + case 'INVITE_SENDING': + stateSortingOrder = -4; + break; + case 'INVITE_SENT': + stateSortingOrder = -3; + break; + case 'PROMOTION_FAILED': + case 'PROMOTION_NOT_SENT': + stateSortingOrder = -2; + break; + case 'PROMOTION_SENDING': + stateSortingOrder = -1; + break; + case 'PROMOTION_SENT': + stateSortingOrder = 0; + break; + case 'PROMOTION_ACCEPTED': + stateSortingOrder = 1; + break; + case 'INVITE_ACCEPTED': + stateSortingOrder = 2; + break; + + default: + assertUnreachable(item.memberStatus, 'Unhandled switch case'); + } + const sortingOrder = [ + stateSortingOrder, + // per section, we want "us first", then "nickname || displayName || pubkey" + item.pubkeyHex === us ? -1 : names[index]?.toLocaleLowerCase(), + ]; + index++; + return sortingOrder; + }); + + return sorted; +} diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 3da57731e9..830ff031b9 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -18,20 +18,14 @@ function profilePicture() { function emptyMember(pubkeyHex: PubkeyType): GroupMemberGet { return { - inviteFailed: false, - invitePending: false, + memberStatus: 'INVITE_NOT_SENT', name: '', profilePicture: { key: null, url: null, }, - promoted: false, - promotionFailed: false, - promotionPending: false, - inviteAccepted: false, - inviteNotSent: false, isRemoved: false, - promotionNotSent: false, + nominatedAdmin: false, shouldRemoveMessages: false, pubkeyHex, }; @@ -271,10 +265,8 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); const expected: GroupMemberGet = { ...emptyMember(member), - promoted: true, - promotionFailed: false, - promotionPending: false, - promotionNotSent: false, + nominatedAdmin: true, + memberStatus: 'PROMOTION_ACCEPTED', }; expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); From f17fcfabe0e2f362106c9ce73482a726e690bce0 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 14 Nov 2024 11:02:22 +1100 Subject: [PATCH 167/302] fix: move a bunch of deps and urls to session-foundation repo --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 ++-- .github/PULL_REQUEST_TEMPLATE.md | 6 +++--- CONTRIBUTING.md | 6 +++--- README.md | 4 ++-- package.json | 4 ++-- ts/components/settings/SessionSettings.tsx | 2 +- ts/mains/main_node.ts | 2 +- ts/node/locale.ts | 2 +- yarn.lock | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 5a679a3151..9cc2082b09 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -6,9 +6,9 @@ body: - type: checkboxes attributes: label: Code of conduct - description: I have read and agree to adhere to the [Code of Conduct](https://github.com/oxen-io/session-desktop/blob/master/CODE_OF_CONDUCT.md). + description: I have read and agree to adhere to the [Code of Conduct](https://github.com/session-foundation/session-desktop/blob/master/CODE_OF_CONDUCT.md). options: - - label: I have read and agree to adhere to the [Code of Conduct](https://github.com/oxen-io/session-desktop/blob/master/CODE_OF_CONDUCT.md) + - label: I have read and agree to adhere to the [Code of Conduct](https://github.com/session-foundation/session-desktop/blob/master/CODE_OF_CONDUCT.md) required: true - type: checkboxes diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2e219d7354..7e731a3409 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,13 +9,13 @@ Remember, you can preview this before saving it. ### First time contributor checklist: -- [ ] I have read the [README](https://github.com/oxen-io/session-desktop/blob/master/README.md) and [Contributor Guidelines](https://github.com/oxen-io/session-desktop/blob/master/CONTRIBUTING.md) +- [ ] I have read the [README](https://github.com/session-foundation/session-desktop/blob/master/README.md) and [Contributor Guidelines](https://github.com/session-foundation/session-desktop/blob/master/CONTRIBUTING.md) ### Contributor checklist: - [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/) -- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`clearnet`](https://github.com/oxen-io/session-desktop/tree/clearnet) branch -- [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/oxen-io/session-desktop/blob/master/CONTRIBUTING.md#tests)) +- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`clearnet`](https://github.com/session-foundation/session-desktop/tree/clearnet) branch +- [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/session-foundation/session-desktop/blob/master/CONTRIBUTING.md#tests)) - [ ] My changes are ready to be shipped to users ### Description diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fc2c480492..40ec8e3d2e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,7 +10,7 @@ It's a good idea to gauge interest in your intended work by finding the current for it or creating a new one yourself. Use Github issues as a place to signal your intentions and get feedback from the users most likely to appreciate your changes. -You're most likely to have your pull request accepted if it addresses an existing Github issue marked with the [good-first-issue](https://github.com/oxen-io/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag, these issues are specifically tagged, because they are generally features/bug fixes which can be cleanly merged on a single platform without requiring cross platform work, are generally of lower complexity than larger features and are non contentious, meaning that the core team doesn't need to try and assess the community desire for such a feature before merging. +You're most likely to have your pull request accepted if it addresses an existing Github issue marked with the [good-first-issue](https://github.com/session-foundation/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag, these issues are specifically tagged, because they are generally features/bug fixes which can be cleanly merged on a single platform without requiring cross platform work, are generally of lower complexity than larger features and are non contentious, meaning that the core team doesn't need to try and assess the community desire for such a feature before merging. Of course we encourage community developers to work on ANY issue filed on our Github regardless of how it’s tagged, however if you pick up or create an issue without the “Good first issue” tag it would be best if you leave a comment on the issue so that the core team can give you any guidance required, especially around UI heavy features or issues which require cross platform integration. @@ -18,7 +18,7 @@ Of course we encourage community developers to work on ANY issue filed on our Gi ## Node.js -You'll need a [Node.js](https://nodejs.org/) version which matches our current version. You can check [`.nvmrc` in the `unstable` branch](https://github.com/oxen-io/session-desktop/blob/unstable/.nvmrc) to see what the current version is. +You'll need a [Node.js](https://nodejs.org/) version which matches our current version. You can check [`.nvmrc` in the `unstable` branch](https://github.com/session-foundation/session-desktop/blob/unstable/.nvmrc) to see what the current version is. If you use other node versions you might have or need a node version manager. @@ -139,7 +139,7 @@ sudo dnf install make automake gcc gcc-c++ kernel-devel Now, run these commands in your preferred terminal in a good directory for development: ``` -git clone https://github.com/oxen-io/session-desktop.git +git clone https://github.com/session-foundation/session-desktop.git cd session-desktop npm install --global yarn # (only if you don’t already have `yarn`) yarn install --frozen-lockfile # Install and build dependencies (this will take a while) diff --git a/README.md b/README.md index f33e765d1d..34dd4fa681 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Session integrates directly with [Oxen Service Nodes](https://docs.oxen.io/about ## Want to Contribute? Found a Bug or Have a feature request? -Please search for any [existing issues](https://github.com/oxen-io/session-desktop/issues) that describe your bug in order to avoid duplicate submissions.

Submissions can be made by making a pull request to our development branch.If you don't know where to start contributing please read [Contributing.md](CONTRIBUTING.md) and refer to issues tagged with the [Good-first-issue](https://github.com/oxen-io/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag. +Please search for any [existing issues](https://github.com/session-foundation/session-desktop/issues) that describe your bug in order to avoid duplicate submissions.

Submissions can be made by making a pull request to our development branch.If you don't know where to start contributing please read [Contributing.md](CONTRIBUTING.md) and refer to issues tagged with the [Good-first-issue](https://github.com/session-foundation/session-desktop/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) tag. ## Supported platforms @@ -33,7 +33,7 @@ Get the signed hash for this release, the SESSION_VERSION needs to be updated fo ``` export SESSION_VERSION=1.6.1 -wget https://github.com/oxen-io/session-desktop/releases/download/v$SESSION_VERSION/signatures.asc +wget https://github.com/session-foundation/session-desktop/releases/download/v$SESSION_VERSION/signatures.asc ``` Verify the signature of the hashes of the files diff --git a/package.json b/package.json index 656468f9f0..35aaafdb03 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/oxen-io/session-desktop.git" + "url": "https://github.com/session-foundation/session-desktop.git" }, "main": "ts/mains/main_node.js", "resolutions": { @@ -79,7 +79,7 @@ "bytebuffer": "^5.0.1", "classnames": "2.2.5", "config": "1.28.1", - "curve25519-js": "https://github.com/oxen-io/curve25519-js", + "curve25519-js": "https://github.com/session-foundation/curve25519-js", "date-fns": "^3.6.0", "dompurify": "^2.0.7", "electron-localshortcut": "^3.2.1", diff --git a/ts/components/settings/SessionSettings.tsx b/ts/components/settings/SessionSettings.tsx index 86f913b2a0..fee434e4d0 100644 --- a/ts/components/settings/SessionSettings.tsx +++ b/ts/components/settings/SessionSettings.tsx @@ -73,7 +73,7 @@ const SessionInfo = () => { { void shell.openExternal( - `https://github.com/oxen-io/session-desktop/releases/tag/v${window.versionInfo.version}` + `https://github.com/session-foundation/session-desktop/releases/tag/v${window.versionInfo.version}` ); }} > diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts index 9c120bf783..359f286104 100644 --- a/ts/mains/main_node.ts +++ b/ts/mains/main_node.ts @@ -527,7 +527,7 @@ setTimeout(readyForUpdates, TEN_MINUTES); function openReleaseNotes() { void shell.openExternal( - `https://github.com/oxen-io/session-desktop/releases/tag/v${app.getVersion()}` + `https://github.com/session-foundation/session-desktop/releases/tag/v${app.getVersion()}` ); } diff --git a/ts/node/locale.ts b/ts/node/locale.ts index 7acf1527ab..9363b67965 100644 --- a/ts/node/locale.ts +++ b/ts/node/locale.ts @@ -11,7 +11,7 @@ export function normalizeLocaleName(locale: string) { const dashedLocale = locale.replaceAll('_', '-'); // Note: this is a pain, but we somehow needs to keep in sync this logic and the LOCALE_PATH_MAPPING from - // https://github.com/oxen-io/session-shared-scripts/blob/main/crowdin/generate_desktop_strings.py + // https://github.com/session-foundation/session-shared-scripts/blob/main/crowdin/generate_desktop_strings.py // What we do, is keep as is, anything given in LOCALE_PATH_MAPPING, but otherwise, keep only the first part of the locale. // So `es-419` is allowed, but `es-es` is hardcoded to es, fr_FR is hardcoded to fr, and so on. if ( diff --git a/yarn.lock b/yarn.lock index 8ab514c389..14a0ef0537 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2596,9 +2596,9 @@ csstype@3.1.3, csstype@^3.0.2, csstype@^3.1.2: resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== -"curve25519-js@https://github.com/oxen-io/curve25519-js": +"curve25519-js@https://github.com/session-foundation/curve25519-js": version "0.0.4" - resolved "https://github.com/oxen-io/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6" + resolved "https://github.com/session-foundation/curve25519-js#102f8c0a31b5c58bad8606979036cf763be9f4f6" dargs@^7.0.0: version "7.0.0" From 8e2741349df2ebd0ec62da763c371ec9e39c3151 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 14 Nov 2024 11:02:50 +1100 Subject: [PATCH 168/302] chore: lint --- .../composition/CompositionBox.tsx | 6 ++-- .../conversation/media-gallery/EmptyState.tsx | 2 -- .../dialog/ModeratorsRemoveDialog.tsx | 9 ++---- ts/components/dialog/SessionConfirm.tsx | 2 +- .../dialog/SessionSetPasswordDialog.tsx | 1 - .../leftpane/LeftPaneSettingSection.tsx | 19 ++++++------ .../InteractionItem.tsx | 4 +-- .../SessionNotificationGroupSettings.tsx | 10 +++++-- ts/data/sharedDataTypes.ts | 7 ++--- ts/hooks/useEncryptedFileFetch.ts | 6 +++- ts/interactions/messageInteractions.ts | 8 ++--- ts/localization/constants.ts | 1 - ts/models/groupUpdate.ts | 10 +++++-- ts/models/types.ts | 1 - ts/node/logging.ts | 1 - ts/node/migration/sessionMigrations.ts | 1 - ts/receiver/groupv2/handleGroupV2Message.ts | 1 - ts/session/apis/snode_api/getNetworkTime.ts | 2 +- ts/session/apis/snode_api/sessionRpc.ts | 2 -- ts/session/apis/snode_api/snodePool.ts | 1 - ts/session/utils/Groups.ts | 1 - ts/session/utils/errors.ts | 4 +-- .../jobs/GroupPendingRemovalsJob.ts | 1 - ts/state/selectors/conversations.ts | 2 -- .../decryptedAttachmentsManager_test.ts | 1 - ts/test/session/unit/onion/GuardNodes_test.ts | 4 +-- .../unit/swarm_polling/SwarmPolling_test.ts | 12 ++++---- ts/test/test-utils/utils/message.ts | 2 +- ts/util/logging.ts | 2 +- .../node/libsession/libsession.worker.ts | 30 +++++++++---------- 30 files changed, 69 insertions(+), 84 deletions(-) diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx index d2fd2bcb6a..99ec3ee9a5 100644 --- a/ts/components/conversation/composition/CompositionBox.tsx +++ b/ts/components/conversation/composition/CompositionBox.tsx @@ -518,7 +518,7 @@ class CompositionBoxInner extends Component { const allMembers = allPubKeys.map(pubKey => { const convo = ConvoHub.use().get(pubKey); const profileName = - convo?.getNicknameOrRealUsernameOrPlaceholder() || window.i18n('anonymous'); + convo?.getNicknameOrRealUsernameOrPlaceholder() || window.i18n('anonymous'); return { id: pubKey, @@ -826,9 +826,7 @@ class CompositionBoxInner extends Component { return; } - if ( - !selectedConversation.isPrivate && selectedConversation.isKickedFromGroup - ) { + if (!selectedConversation.isPrivate && selectedConversation.isKickedFromGroup) { ToastUtils.pushYouLeftTheGroup(); return; } diff --git a/ts/components/conversation/media-gallery/EmptyState.tsx b/ts/components/conversation/media-gallery/EmptyState.tsx index e1b1392ccd..20bf1f6556 100644 --- a/ts/components/conversation/media-gallery/EmptyState.tsx +++ b/ts/components/conversation/media-gallery/EmptyState.tsx @@ -2,12 +2,10 @@ * @prettier */ - interface Props { label: string; } - export const EmptyState = (props: Props) => { const { label } = props; diff --git a/ts/components/dialog/ModeratorsRemoveDialog.tsx b/ts/components/dialog/ModeratorsRemoveDialog.tsx index cc23ecbf54..a7ebc96bfd 100644 --- a/ts/components/dialog/ModeratorsRemoveDialog.tsx +++ b/ts/components/dialog/ModeratorsRemoveDialog.tsx @@ -7,11 +7,7 @@ import { PubKey } from '../../session/types'; import { ToastUtils } from '../../session/utils'; import { Flex } from '../basic/Flex'; -import { - useGroupAdmins, - useIsPublic, - useWeAreAdmin -} from '../../hooks/useParamSelector'; +import { useGroupAdmins, useIsPublic, useWeAreAdmin } from '../../hooks/useParamSelector'; import { sogsV3RemoveAdmins } from '../../session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods'; import { updateRemoveModeratorsModal } from '../../state/ducks/modalDialog'; import { MemberListItem } from '../MemberListItem'; @@ -33,8 +29,7 @@ async function removeMods(convoId: string, modsToRemove: Array) { const modsToRemovePubkey = compact(modsToRemove.map(m => PubKey.from(m))); const modsToRemoveNames = modsToRemovePubkey.map( m => - ConvoHub.use().get(m.key)?.getNicknameOrRealUsernameOrPlaceholder() || - window.i18n('unknown') + ConvoHub.use().get(m.key)?.getNicknameOrRealUsernameOrPlaceholder() || window.i18n('unknown') ); try { const convo = ConvoHub.use().get(convoId); diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx index d0701f51e3..969e8ff072 100644 --- a/ts/components/dialog/SessionConfirm.tsx +++ b/ts/components/dialog/SessionConfirm.tsx @@ -173,4 +173,4 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
); -}; \ No newline at end of file +}; diff --git a/ts/components/dialog/SessionSetPasswordDialog.tsx b/ts/components/dialog/SessionSetPasswordDialog.tsx index d5178f5bc9..68cfef2348 100644 --- a/ts/components/dialog/SessionSetPasswordDialog.tsx +++ b/ts/components/dialog/SessionSetPasswordDialog.tsx @@ -1,6 +1,5 @@ /* eslint-disable @typescript-eslint/no-misused-promises */ - import autoBind from 'auto-bind'; import { isEmpty } from 'lodash'; import { Component } from 'react'; diff --git a/ts/components/leftpane/LeftPaneSettingSection.tsx b/ts/components/leftpane/LeftPaneSettingSection.tsx index 3d3ef5b4e4..2bd4a509c9 100644 --- a/ts/components/leftpane/LeftPaneSettingSection.tsx +++ b/ts/components/leftpane/LeftPaneSettingSection.tsx @@ -43,11 +43,10 @@ const StyledIconContainer = styled.div` width: 38px; `; - type Categories = { id: SessionSettingCategory; title: string; - dataTestId: SessionDataTestId + dataTestId: SessionDataTestId; icon: { type: SessionIconType; size: number; @@ -61,7 +60,7 @@ const getCategories = (): Array => { { id: 'privacy' as const, title: window.i18n('sessionPrivacy'), - icon: { type: 'padlock' as const, ...forcedSize } , + icon: { type: 'padlock' as const, ...forcedSize }, }, { id: 'notifications' as const, @@ -81,33 +80,33 @@ const getCategories = (): Array => { { id: 'appearance' as const, title: window.i18n('sessionAppearance'), - icon: { type: 'paintbrush'as const, ...forcedSize }, + icon: { type: 'paintbrush' as const, ...forcedSize }, }, { id: 'permissions' as const, title: window.i18n('sessionPermissions'), - icon: { type: 'checkCircle'as const, ...forcedSize }, + icon: { type: 'checkCircle' as const, ...forcedSize }, }, { id: 'help' as const, title: window.i18n('sessionHelp'), - icon: { type: 'question'as const, ...forcedSize }, + icon: { type: 'question' as const, ...forcedSize }, }, { id: 'recoveryPassword' as const, title: window.i18n('sessionRecoveryPassword'), - icon: { type: 'recoveryPasswordFill'as const, ...forcedSize }, + icon: { type: 'recoveryPasswordFill' as const, ...forcedSize }, }, { id: 'clearData' as const, title: window.i18n('sessionClearData'), - icon: { type: 'delete'as const, ...forcedSize, color: 'var(--danger-color)' }, + icon: { type: 'delete' as const, ...forcedSize, color: 'var(--danger-color)' }, }, ].map(m => ({ ...m, dataTestId: `${m.id}-settings-menu-item` as const })); }; -const LeftPaneSettingsCategoryRow = ({item}: { item: Categories }) => { - const { id, title, icon,dataTestId } = item; +const LeftPaneSettingsCategoryRow = ({ item }: { item: Categories }) => { + const { id, title, icon, dataTestId } = item; const dispatch = useDispatch(); const focusedSettingsSection = useSelector(getFocusedSettingsSection); diff --git a/ts/components/leftpane/conversation-list-item/InteractionItem.tsx b/ts/components/leftpane/conversation-list-item/InteractionItem.tsx index 9cffd911db..fa977225a8 100644 --- a/ts/components/leftpane/conversation-list-item/InteractionItem.tsx +++ b/ts/components/leftpane/conversation-list-item/InteractionItem.tsx @@ -60,9 +60,7 @@ export const InteractionItem = (props: InteractionItemProps) => { let text = storedLastMessageText || ''; let errorText = ''; - const name = ConvoHub.use() - .get(conversationId) - ?.getNicknameOrRealUsernameOrPlaceholder(); + const name = ConvoHub.use().get(conversationId)?.getNicknameOrRealUsernameOrPlaceholder(); switch (interactionType) { case ConversationInteractionType.Hide: diff --git a/ts/components/settings/SessionNotificationGroupSettings.tsx b/ts/components/settings/SessionNotificationGroupSettings.tsx index dfc0a4c2a1..e74d3c3b66 100644 --- a/ts/components/settings/SessionNotificationGroupSettings.tsx +++ b/ts/components/settings/SessionNotificationGroupSettings.tsx @@ -32,9 +32,15 @@ export const SessionNotificationGroupSettings = () => { initialNotificationEnabled && initialNotificationEnabled !== NotificationType.off; const options = [ - { label: window.i18n('notificationsContentShowNameAndContent'), value: NotificationType.message }, + { + label: window.i18n('notificationsContentShowNameAndContent'), + value: NotificationType.message, + }, { label: window.i18n('notificationsContentShowNameOnly'), value: NotificationType.name }, - { label: window.i18n('notificationsContentShowNoNameOrContent'), value: NotificationType.count }, + { + label: window.i18n('notificationsContentShowNoNameOrContent'), + value: NotificationType.count, + }, ] as const; const items: SessionRadioItems = options.map(m => ({ diff --git a/ts/data/sharedDataTypes.ts b/ts/data/sharedDataTypes.ts index 2fa9b9017b..42083d210d 100644 --- a/ts/data/sharedDataTypes.ts +++ b/ts/data/sharedDataTypes.ts @@ -1,10 +1,9 @@ import { PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; - export type FindAllMessageFromSendersInConversationTypeArgs = WithGroupPubkey & { - toRemove: Array; - signatureTimestamp: number; - }; + toRemove: Array; + signatureTimestamp: number; +}; export type FindAllMessageHashesInConversationTypeArgs = WithGroupPubkey & { messageHashes: Array; diff --git a/ts/hooks/useEncryptedFileFetch.ts b/ts/hooks/useEncryptedFileFetch.ts index de1909c77c..23eb9f9357 100644 --- a/ts/hooks/useEncryptedFileFetch.ts +++ b/ts/hooks/useEncryptedFileFetch.ts @@ -30,7 +30,11 @@ export const useEncryptedFileFetch = ( try { perfStart(`getDecryptedMediaUrl-${mediaUrl}-${timestamp}`); - const decryptedUrl = await DecryptedAttachmentsManager.getDecryptedMediaUrl(mediaUrl, contentType, isAvatar); + const decryptedUrl = await DecryptedAttachmentsManager.getDecryptedMediaUrl( + mediaUrl, + contentType, + isAvatar + ); perfEnd( `getDecryptedMediaUrl-${mediaUrl}-${timestamp}`, `getDecryptedMediaUrl-${mediaUrl}-${timestamp}` diff --git a/ts/interactions/messageInteractions.ts b/ts/interactions/messageInteractions.ts index a99359dd0f..c67a4ec28e 100644 --- a/ts/interactions/messageInteractions.ts +++ b/ts/interactions/messageInteractions.ts @@ -1,11 +1,11 @@ import { joinOpenGroupV2WithUIEvents } from '../session/apis/open_group_api/opengroupV2/JoinOpenGroupV2'; import { - sogsV3AddAdmin, - sogsV3RemoveAdmins, + sogsV3AddAdmin, + sogsV3RemoveAdmins, } from '../session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods'; import { - isOpenGroupV2, - openGroupV2CompleteURLRegex, + isOpenGroupV2, + openGroupV2CompleteURLRegex, } from '../session/apis/open_group_api/utils/OpenGroupUtils'; import { ConvoHub } from '../session/conversations'; import { PubKey } from '../session/types'; diff --git a/ts/localization/constants.ts b/ts/localization/constants.ts index 38ba2b6fd4..6455960756 100644 --- a/ts/localization/constants.ts +++ b/ts/localization/constants.ts @@ -92,4 +92,3 @@ export const crowdinLocales = [ ] as const; export type CrowdinLocale = (typeof crowdinLocales)[number]; - diff --git a/ts/models/groupUpdate.ts b/ts/models/groupUpdate.ts index dc04e60520..e2f3194fba 100644 --- a/ts/models/groupUpdate.ts +++ b/ts/models/groupUpdate.ts @@ -104,8 +104,14 @@ export function getJoinedGroupUpdateChangeStr( : { token: 'groupMemberNew', args: { name: othersNames[0] } }; case 2: return addedWithHistory - ? { token: 'groupMemberNewHistoryTwo', args: { name: othersNames[0], other_name: othersNames[1] } } - : { token: 'groupMemberNewTwo', args: { name: othersNames[0], other_name: othersNames[1] } }; + ? { + token: 'groupMemberNewHistoryTwo', + args: { name: othersNames[0], other_name: othersNames[1] }, + } + : { + token: 'groupMemberNewTwo', + args: { name: othersNames[0], other_name: othersNames[1] }, + }; default: return addedWithHistory ? { diff --git a/ts/models/types.ts b/ts/models/types.ts index 5824ff6373..159c36934a 100644 --- a/ts/models/types.ts +++ b/ts/models/types.ts @@ -1,4 +1,3 @@ - /** * Private chats have always the type `Private` * Open groups have always the type `Group` diff --git a/ts/node/logging.ts b/ts/node/logging.ts index e229014422..80bd5f7d82 100644 --- a/ts/node/logging.ts +++ b/ts/node/logging.ts @@ -197,7 +197,6 @@ async function fetchLogFile(logFile: string) { } function logAtLevel(level: string, ...args: any) { - if (logger) { // To avoid [Object object] in our log since console.log handles non-strings smoothly const str = args.map((item: any) => { diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts index 1a324a129e..158a5f38d3 100644 --- a/ts/node/migration/sessionMigrations.ts +++ b/ts/node/migration/sessionMigrations.ts @@ -1952,7 +1952,6 @@ function updateToSessionSchemaVersion36(currentVersion: number, db: BetterSqlite console.log(`updateToSessionSchemaVersion${targetVersion}: success!`); } - function updateToSessionSchemaVersion37(currentVersion: number, db: BetterSqlite3.Database) { const targetVersion = 37; if (currentVersion >= targetVersion) { diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 12cb5704e8..1ea912b581 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -509,7 +509,6 @@ async function handleGroupDeleteMemberContentMessage({ } } convo.updateLastMessage(); - } async function handleGroupUpdateInviteResponseMessage({ diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index 102334358f..aa052003e0 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -45,7 +45,7 @@ function handleTimestampOffsetFromNetwork(_request: string, snodeTimestamp: numb if (snodeTimestamp && isNumber(snodeTimestamp) && snodeTimestamp > 1609419600 * 1000) { // first january 2021. Arbitrary, just want to make sure the return timestamp is somehow valid and not some crazy low value const clockTime = Date.now(); - NetworkTime.setLatestTimestampOffset(clockTime - snodeTimestamp) + NetworkTime.setLatestTimestampOffset(clockTime - snodeTimestamp); } } diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index a233314909..f27f244303 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -4,7 +4,6 @@ import { clone } from 'lodash'; import { default as insecureNodeFetch } from 'node-fetch'; import pRetry from 'p-retry'; - import { Snode } from '../../../data/types'; import { HTTPError, NotFoundError } from '../../utils/errors'; @@ -130,7 +129,6 @@ async function snodeRpcNoRetries( allow401s: boolean; } // the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance ): Promise { - const url = `https://${targetNode.ip}:${targetNode.port}/storage_rpc/v1`; const body = { diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts index ab9b94bd44..14de241a8a 100644 --- a/ts/session/apis/snode_api/snodePool.ts +++ b/ts/session/apis/snode_api/snodePool.ts @@ -12,7 +12,6 @@ import { Onions } from '.'; import { ed25519Str } from '../../utils/String'; import { SnodePoolConstants } from './snodePoolConstants'; - let randomSnodePool: Array = []; function TEST_resetState(snodePoolForTest: Array = []) { diff --git a/ts/session/utils/Groups.ts b/ts/session/utils/Groups.ts index 25a84b853d..191a490878 100644 --- a/ts/session/utils/Groups.ts +++ b/ts/session/utils/Groups.ts @@ -1,7 +1,6 @@ import { PubKey } from '../types'; import { fromHexToArray } from './String'; - export function encodeGroupPubKeyFromHex(hexGroupPublicKey: string | PubKey) { const pubkey = PubKey.cast(hexGroupPublicKey); return fromHexToArray(pubkey.key); diff --git a/ts/session/utils/errors.ts b/ts/session/utils/errors.ts index d1716ae35a..4115157e27 100644 --- a/ts/session/utils/errors.ts +++ b/ts/session/utils/errors.ts @@ -71,8 +71,8 @@ class BaseError extends Error { constructor(message: string) { super(message); this.name = this.constructor.name; - // restore prototype chain - Object.setPrototypeOf(this, SnodeResponseError.prototype); + // restore prototype chain + Object.setPrototypeOf(this, SnodeResponseError.prototype); } } diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index cfd03bdc35..08ee513fb6 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -211,7 +211,6 @@ class GroupPendingRemovalsJob extends PersistedJob { const contacts = useSelector(getPrivateContactsPubkeys); return contacts; diff --git a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts index 5f9fcb6554..a421517374 100644 --- a/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts +++ b/ts/test/session/unit/decrypted_attachments/decryptedAttachmentsManager_test.ts @@ -69,7 +69,6 @@ describe('DecryptedAttachmentsManager', () => { DecryptedAttachmentsManager.getAlreadyDecryptedMediaUrl('/local/attachment/attachment1') ).to.be.eq(null); - expect(readFileContent.callCount).to.be.eq(0); expect(decryptAttachmentBufferNode.callCount).to.be.eq(0); expect(getItemById.callCount).to.be.eq(0); diff --git a/ts/test/session/unit/onion/GuardNodes_test.ts b/ts/test/session/unit/onion/GuardNodes_test.ts index 8dd694580f..caeae97d60 100644 --- a/ts/test/session/unit/onion/GuardNodes_test.ts +++ b/ts/test/session/unit/onion/GuardNodes_test.ts @@ -4,8 +4,8 @@ import { describe } from 'mocha'; import Sinon, * as sinon from 'sinon'; import { TestUtils } from '../../../test-utils'; -import { Onions } from '../../../../session/apis/snode_api/'; -import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; +import { Onions } from '../../../../session/apis/snode_api'; +import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; import * as OnionPaths from '../../../../session/onions/onionPath'; diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts index 98c028a8a5..da33fb7136 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts @@ -189,7 +189,6 @@ describe('SwarmPolling', () => { describe('pollForAllKeys', () => { beforeEach(() => { - stubData('createOrUpdateItem').resolves(); }); afterEach(() => { @@ -219,17 +218,16 @@ describe('SwarmPolling', () => { describe('legacy group', () => { it('does run for group pubkey on start no matter the recent timestamp', async () => { - const convo = ConvoHub.use().getOrCreate( TestUtils.generateFakePubKeyStr(), ConversationTypeEnum.GROUP ); TestUtils.stubLibSessionWorker([]); - stubData('removeAllMessagesInConversation').resolves() - stubData('getLatestClosedGroupEncryptionKeyPair').resolves() - stubData('removeAllClosedGroupEncryptionKeyPairs').resolves() - stubData('removeConversation').resolves() - stubData('fetchConvoMemoryDetails').resolves() + stubData('removeAllMessagesInConversation').resolves(); + stubData('getLatestClosedGroupEncryptionKeyPair').resolves(); + stubData('removeAllClosedGroupEncryptionKeyPairs').resolves(); + stubData('removeConversation').resolves(); + stubData('fetchConvoMemoryDetails').resolves(); convo.set('active_at', Date.now()); const groupConvoPubkey = PubKey.cast(convo.id as string); swarmPolling.addGroupId(groupConvoPubkey); diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts index ba4832b88a..578e57f43b 100644 --- a/ts/test/test-utils/utils/message.ts +++ b/ts/test/test-utils/utils/message.ts @@ -20,7 +20,7 @@ import { OpenGroupReaction } from '../../../types/Reaction'; import { generateFakePubKeyStr } from './pubkey'; import { OpenGroupRequestCommonType } from '../../../data/types'; -const loremIpsum = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit' +const loremIpsum = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit'; export function generateVisibleMessage({ identifier, diff --git a/ts/util/logging.ts b/ts/util/logging.ts index add76b2aeb..007097cbea 100644 --- a/ts/util/logging.ts +++ b/ts/util/logging.ts @@ -113,7 +113,7 @@ function logAtLevel(level: string, prefix: string, ...args: any) { // when unit testing with mocha, we just log whatever we get to the console.log if (typeof (global as any).it === 'function') { (console as any)._log(prefix, now(), ...args); - return + return; } if (prefix === 'DEBUG' && !window.sessionFeatureFlags.debug.debugLogging) { diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index 53fafc53ef..e8f8fe753b 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -78,7 +78,6 @@ function getGroupWrapper(type: ConfigWrapperGroup): MetaGroupWrapperNode | undef assertUnreachable(type, `getGroupWrapper: Missing case error "${type}"`); } - function getCorrespondingUserWrapper(wrapperType: ConfigWrapperUser): BaseConfigWrapperNode { if (isUserConfigWrapperType(wrapperType)) { switch (wrapperType) { @@ -133,7 +132,6 @@ function getBlindingWrapper(wrapperType: BlindingConfig): BlindingWrapperNode { assertUnreachable(wrapperType, `getBlindingWrapper missing global handling for "${wrapperType}"`); } - function isUInt8Array(value: any) { return value.constructor === Uint8Array; } @@ -262,12 +260,12 @@ function initGroupWrapper(options: Array, wrapperType: ConfigWrapperGroup) assertUnreachable(groupType, `initGroupWrapper: Missing case error "${groupType}"`); } -onmessage = async (e: { data: [number, ConfigWrapperObjectTypesMeta| 'Blinding', string, ...any] }) => { - +onmessage = async (e: { + data: [number, ConfigWrapperObjectTypesMeta | 'Blinding', string, ...any]; +}) => { const [jobId, config, action, ...args] = e.data; try { - if (action === 'init') { if (config === 'Blinding' || config === 'MultiEncrypt') { // nothing to do for the blinding/multiEncrypt wrapper, all functions are static @@ -284,7 +282,7 @@ onmessage = async (e: { data: [number, ConfigWrapperObjectTypesMeta| 'Blinding', postMessage([jobId, null, null]); return; } - assertUnreachable(config, `Unhandled init wrapper type: ${config}`) + assertUnreachable(config, `Unhandled init wrapper type: ${config}`); } if (action === 'free') { if (config === 'Blinding' || config === 'MultiEncrypt') { @@ -303,7 +301,7 @@ onmessage = async (e: { data: [number, ConfigWrapperObjectTypesMeta| 'Blinding', postMessage([jobId, null, null]); return; } - assertUnreachable(config, `Unhandled free wrapper type: ${config}`) + assertUnreachable(config, `Unhandled free wrapper type: ${config}`); } const wrapper = isUserConfigWrapperType(config) @@ -312,20 +310,20 @@ onmessage = async (e: { data: [number, ConfigWrapperObjectTypesMeta| 'Blinding', ? getCorrespondingGroupWrapper(config) : isMultiEncryptWrapperType(config) ? getMultiEncryptWrapper(config) - : isBlindingWrapperType(config) ? getBlindingWrapper(config) : undefined; + : isBlindingWrapperType(config) + ? getBlindingWrapper(config) + : undefined; if (!wrapper) { throw new Error(`did not find an already built (or static) wrapper for config: "${config}"`); } const fn = (wrapper as any)[action]; - - - if (!fn) { - throw new Error( - `Worker: job "${jobId}" did not find function "${action}" on config "${config}"` - ); - } - const result = await (wrapper as any)[action](...args); + if (!fn) { + throw new Error( + `Worker: job "${jobId}" did not find function "${action}" on config "${config}"` + ); + } + const result = await (wrapper as any)[action](...args); postMessage([jobId, null, result]); } catch (error) { From 13aca18f14f792bdbe88e6292fed3ed2c436497d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 14 Nov 2024 11:06:24 +1100 Subject: [PATCH 169/302] chore: localizer is imported as type to avoid compilation errors --- ts/interactions/conversationInteractions.ts | 2 +- ts/models/message.ts | 2 +- ts/models/timerNotifications.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 2f7a353818..365ce475bb 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -51,7 +51,7 @@ import { Storage, setLastProfileUpdateTimestamp } from '../util/storage'; import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; import { ConversationInteractionStatus, ConversationInteractionType } from './types'; import { BlockedNumberController } from '../util'; -import { LocalizerComponentProps, LocalizerToken } from '../types/localizer'; +import type { LocalizerComponentProps, LocalizerToken } from '../types/localizer'; import { sendInviteResponseToGroup } from '../session/sending/group/GroupInviteResponse'; import { NetworkTime } from '../util/NetworkTime'; import { ClosedGroup } from '../session'; diff --git a/ts/models/message.ts b/ts/models/message.ts index ed7975f925..aa971348fa 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -88,7 +88,7 @@ import { ConversationModel } from './conversation'; import { READ_MESSAGE_STATE } from './conversationAttributes'; import { ConversationInteractionStatus, ConversationInteractionType } from '../interactions/types'; import { LastMessageStatusType } from '../state/ducks/types'; -import { GetMessageArgs, LocalizerToken } from '../types/localizer'; +import type { GetMessageArgs, LocalizerToken } from '../types/localizer'; import { getGroupDisplayPictureChangeStr, getGroupNameChangeStr, diff --git a/ts/models/timerNotifications.ts b/ts/models/timerNotifications.ts index ae529f7cd3..94199e9cd6 100644 --- a/ts/models/timerNotifications.ts +++ b/ts/models/timerNotifications.ts @@ -5,7 +5,7 @@ import { PubKey } from '../session/types'; import { UserUtils } from '../session/utils'; import { TimerOptions } from '../session/disappearing_messages/timerOptions'; import { isLegacyDisappearingModeEnabled } from '../session/disappearing_messages/legacy'; -import { LocalizerComponentPropsObject } from '../types/localizer'; +import type { LocalizerComponentPropsObject } from '../types/localizer'; export function getTimerNotificationStr({ expirationMode, From 7eb6cec78513249fb6515afb7fd9bce8a0760357 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 18 Nov 2024 11:11:03 +1100 Subject: [PATCH 170/302] fix: fix unit test with groups --- ts/session/sending/MessageSender.ts | 142 +-------- ts/session/sending/MessageWrapper.ts | 128 +++++++- .../jobs/GroupPendingRemovalsJob.ts | 2 +- ts/state/selectors/groups.ts | 3 + .../libsession_wrapper_metagroup_test.ts | 84 ++++-- .../session/unit/sending/MessageQueue_test.ts | 31 +- .../snode_api/retrieveNextMessages_test.ts | 7 +- .../unit/swarm_polling/SwarmPolling_test.ts | 277 +----------------- .../group_sync_job/GroupSyncJob_test.ts | 61 ++-- .../user_sync_job/UserSyncJob_test.ts | 30 +- ts/test/test-utils/utils/pubkey.ts | 2 +- 11 files changed, 262 insertions(+), 505 deletions(-) diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 1143c907c1..47c035224f 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -5,7 +5,6 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { isArray, isEmpty, isNumber, isString } from 'lodash'; import pRetry from 'p-retry'; import { Data, SeenMessageHashes } from '../../data/data'; -import { SignalService } from '../../protobuf'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2'; import { @@ -44,7 +43,6 @@ import { SnodePool } from '../apis/snode_api/snodePool'; import { TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; import { addMessagePadding } from '../crypto/BufferPadding'; -import { MessageEncrypter } from '../crypto/MessageEncrypter'; import { ContentMessage } from '../messages/outgoing'; import { UnsendMessage } from '../messages/outgoing/controlMessage/UnsendMessage'; import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; @@ -54,7 +52,7 @@ import { OutgoingRawMessage } from '../types/RawMessage'; import { UserUtils } from '../utils'; import { ed25519Str, fromUInt8ArrayToBase64 } from '../utils/String'; import { MessageSentHandler } from './MessageSentHandler'; -import { MessageWrapper } from './MessageWrapper'; +import { EncryptAndWrapMessageResults, MessageWrapper } from './MessageWrapper'; import { stringify } from '../../types/sqlSharedTypes'; import { OpenGroupRequestCommonType } from '../../data/types'; import { NetworkTime } from '../../util/NetworkTime'; @@ -246,9 +244,8 @@ async function sendSingleMessage({ return pRetry( async () => { const recipient = PubKey.cast(message.device); - // we can only have a single message in this send function for now - const [encryptedAndWrapped] = await encryptMessagesAndWrap([ + const [encryptedAndWrapped] = await MessageWrapper.encryptMessagesAndWrap([ { destination: message.device, plainTextBuffer: message.plainTextBuffer, @@ -260,6 +257,7 @@ async function sendSingleMessage({ }, ]); + // make sure to update the local sent_at timestamp, because sometimes, we will get the just pushed message in the receiver side // before we return from the await below. // and the isDuplicate messages relies on sent_at timestamp to be valid. @@ -297,9 +295,7 @@ async function sendSingleMessage({ destination, false ); - await handleBatchResultWithSubRequests({ batchResult, subRequests, destination }); - return { wrappedEnvelope: encryptedAndWrapped.encryptedAndWrappedData, effectiveTimestamp: encryptedAndWrapped.networkTimestamp, @@ -309,6 +305,7 @@ async function sendSingleMessage({ retries: Math.max(attempts - 1, 0), factor: 1, minTimeout: retryMinTimeout || MessageSender.getMinRetryTimeout(), + } ); } @@ -486,125 +483,6 @@ async function sendMessagesDataToSnode({ } } -function encryptionBasedOnConversation(destination: PubKey) { - if (ConvoHub.use().get(destination.key)?.isClosedGroup()) { - return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE; - } - return SignalService.Envelope.Type.SESSION_MESSAGE; -} - -type SharedEncryptAndWrap = { - ttl: number; - identifier: string; - isSyncMessage: boolean; - plainTextBuffer: Uint8Array; -}; - -type EncryptAndWrapMessage = { - destination: string; - namespace: number; - networkTimestamp: number; -} & SharedEncryptAndWrap; - -type EncryptAndWrapMessageResults = { - networkTimestamp: number; - encryptedAndWrappedData: Uint8Array; - namespace: number; -} & SharedEncryptAndWrap; - -async function encryptForGroupV2( - params: EncryptAndWrapMessage -): Promise { - // Group v2 encryption works a bit differently: we encrypt the envelope itself through libsession. - // We essentially need to do the opposite of the usual encryption which is send envelope unencrypted with content encrypted. - const { - destination, - identifier, - isSyncMessage: syncMessage, - namespace, - plainTextBuffer, - ttl, - networkTimestamp, - } = params; - - const envelope = MessageWrapper.wrapContentIntoEnvelope( - SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, - destination, - networkTimestamp, - plainTextBuffer - ); - - const recipient = PubKey.cast(destination); - - const { cipherText } = await MessageEncrypter.encrypt( - recipient, - SignalService.Envelope.encode(envelope).finish(), - encryptionBasedOnConversation(recipient) - ); - - return { - networkTimestamp, - encryptedAndWrappedData: cipherText, - namespace, - ttl, - identifier, - isSyncMessage: syncMessage, - plainTextBuffer, - }; -} - -async function encryptMessageAndWrap( - params: EncryptAndWrapMessage -): Promise { - const { - destination, - identifier, - isSyncMessage: syncMessage, - namespace, - plainTextBuffer, - ttl, - networkTimestamp, - } = params; - - if (PubKey.is03Pubkey(destination)) { - return encryptForGroupV2(params); - } - - // can only be legacy group or 1o1 chats here - - const recipient = PubKey.cast(destination); - - const { envelopeType, cipherText } = await MessageEncrypter.encrypt( - recipient, - plainTextBuffer, - encryptionBasedOnConversation(recipient) - ); - - const envelope = MessageWrapper.wrapContentIntoEnvelope( - envelopeType, - recipient.key, - networkTimestamp, - cipherText - ); - const data = MessageWrapper.wrapEnvelopeInWebSocketMessage(envelope); - - return { - encryptedAndWrappedData: data, - networkTimestamp, - namespace, - ttl, - identifier, - isSyncMessage: syncMessage, - plainTextBuffer, - }; -} - -async function encryptMessagesAndWrap( - messages: Array -): Promise> { - return Promise.all(messages.map(encryptMessageAndWrap)); -} - /** * Send an array of pre-encrypted data to the corresponding swarm. * Note: also handles the result of each sub requests with `handleBatchResultWithSubRequests` @@ -714,10 +592,14 @@ export const MessageSender = { isContentSyncMessage, getSignatureParamsFromNamespace, signSubRequests, - encryptMessagesAndWrap, messagesToRequests, + destinationIsClosedGroup, }; +function destinationIsClosedGroup(destination: string) { + return ConvoHub.use().get(destination)?.isClosedGroup(); +} + /** * Note: this function does not handle the syncing logic of messages yet. * Use it to push message to group, to note to self, or with user messages which do not require a syncing logic @@ -731,13 +613,13 @@ async function handleBatchResultWithSubRequests({ subRequests: Array; destination: string; }) { - const isDestinationClosedGroup = ConvoHub.use().get(destination)?.isClosedGroup(); if (!batchResult || !isArray(batchResult) || isEmpty(batchResult)) { window.log.error('handleBatchResultWithSubRequests: invalid batch result '); return; } const seenHashes: Array = []; + for (let index = 0; index < subRequests.length; index++) { const subRequest = subRequests[index]; @@ -753,13 +635,13 @@ async function handleBatchResultWithSubRequests({ const subRequestStatusCode = batchResult?.[index]?.code; // TODO: the expiration is due to be returned by the storage server on "store" soon, we will then be able to use it instead of doing the storedAt + ttl logic below // if we have a hash and a storedAt, mark it as seen so we don't reprocess it on the next retrieve - if ( subRequestStatusCode === 200 && !isEmpty(storedHash) && isString(storedHash) && isNumber(storedAt) ) { + seenHashes.push({ expiresAt: NetworkTime.now() + TTL_DEFAULT.CONTENT_MESSAGE, // non config msg expire at CONTENT_MESSAGE at most hash: storedHash, @@ -772,7 +654,7 @@ async function handleBatchResultWithSubRequests({ await MessageSentHandler.handleSwarmMessageSentSuccess( { device: subRequest.destination, - isDestinationClosedGroup, + isDestinationClosedGroup: MessageSender.destinationIsClosedGroup(destination), identifier: subRequest.dbMessageIdentifier, plainTextBuffer: subRequest instanceof StoreUserMessageSubRequest diff --git a/ts/session/sending/MessageWrapper.ts b/ts/session/sending/MessageWrapper.ts index 35bb540caf..f519b478f1 100644 --- a/ts/session/sending/MessageWrapper.ts +++ b/ts/session/sending/MessageWrapper.ts @@ -1,4 +1,74 @@ import { SignalService } from '../../protobuf'; +import { ConvoHub } from '../conversations'; +import { MessageEncrypter } from '../crypto/MessageEncrypter'; +import { PubKey } from '../types'; + +function encryptionBasedOnConversation(destination: PubKey) { + if (ConvoHub.use().get(destination.key)?.isClosedGroup()) { + return SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE; + } + return SignalService.Envelope.Type.SESSION_MESSAGE; +} + +type SharedEncryptAndWrap = { + ttl: number; + identifier: string; + isSyncMessage: boolean; + plainTextBuffer: Uint8Array; +}; + +type EncryptAndWrapMessage = { + destination: string; + namespace: number; + networkTimestamp: number; +} & SharedEncryptAndWrap; + +export type EncryptAndWrapMessageResults = { + networkTimestamp: number; + encryptedAndWrappedData: Uint8Array; + namespace: number; +} & SharedEncryptAndWrap; + +async function encryptForGroupV2( + params: EncryptAndWrapMessage +): Promise { + // Group v2 encryption works a bit differently: we encrypt the envelope itself through libsession. + // We essentially need to do the opposite of the usual encryption which is send envelope unencrypted with content encrypted. + const { + destination, + identifier, + isSyncMessage: syncMessage, + namespace, + plainTextBuffer, + ttl, + networkTimestamp, + } = params; + + const envelope = MessageWrapper.wrapContentIntoEnvelope( + SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, + destination, + networkTimestamp, + plainTextBuffer + ); + + const recipient = PubKey.cast(destination); + + const { cipherText } = await MessageEncrypter.encrypt( + recipient, + SignalService.Envelope.encode(envelope).finish(), + encryptionBasedOnConversation(recipient) + ); + + return { + networkTimestamp, + encryptedAndWrappedData: cipherText, + namespace, + ttl, + identifier, + isSyncMessage: syncMessage, + plainTextBuffer, + }; +} function wrapContentIntoEnvelope( type: SignalService.Envelope.Type, @@ -38,4 +108,60 @@ function wrapEnvelopeInWebSocketMessage(envelope: SignalService.Envelope): Uint8 return SignalService.WebSocketMessage.encode(websocket).finish(); } -export const MessageWrapper = { wrapEnvelopeInWebSocketMessage, wrapContentIntoEnvelope }; +async function encryptMessageAndWrap( + params: EncryptAndWrapMessage +): Promise { + const { + destination, + identifier, + isSyncMessage: syncMessage, + namespace, + plainTextBuffer, + ttl, + networkTimestamp, + } = params; + + if (PubKey.is03Pubkey(destination)) { + return encryptForGroupV2(params); + } + + // can only be legacy group or 1o1 chats here + + const recipient = PubKey.cast(destination); + + const { envelopeType, cipherText } = await MessageEncrypter.encrypt( + recipient, + plainTextBuffer, + encryptionBasedOnConversation(recipient) + ); + + const envelope = MessageWrapper.wrapContentIntoEnvelope( + envelopeType, + recipient.key, + networkTimestamp, + cipherText + ); + const data = MessageWrapper.wrapEnvelopeInWebSocketMessage(envelope); + + return { + encryptedAndWrappedData: data, + networkTimestamp, + namespace, + ttl, + identifier, + isSyncMessage: syncMessage, + plainTextBuffer, + }; +} + +async function encryptMessagesAndWrap( + messages: Array +): Promise> { + return Promise.all(messages.map(encryptMessageAndWrap)); +} + +export const MessageWrapper = { + wrapEnvelopeInWebSocketMessage, + wrapContentIntoEnvelope, + encryptMessagesAndWrap, +}; diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 08ee513fb6..7005d9c887 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -134,7 +134,7 @@ class GroupPendingRemovalsJob extends PersistedJob m.shouldRemoveMessages) + .filter(m => m.removedStatus === 'REMOVED_MEMBER_AND_MESSAGES') .map(m => m.pubkeyHex); const sessionIdsHex = pendingRemovals.map(m => m.pubkeyHex); diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index dc1f8a3129..904adb4574 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -321,6 +321,9 @@ export function useStateOf03GroupMembers(convoId?: string) { case 'INVITE_ACCEPTED': stateSortingOrder = 2; break; + case 'UNKNOWN': + stateSortingOrder = 5; // just a fallback, hopefully won't happen in production + break; default: assertUnreachable(item.memberStatus, 'Unhandled switch case'); diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 830ff031b9..a05c2bfe3d 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -24,9 +24,8 @@ function emptyMember(pubkeyHex: PubkeyType): GroupMemberGet { key: null, url: null, }, - isRemoved: false, nominatedAdmin: false, - shouldRemoveMessages: false, + removedStatus: 'NOT_REMOVED', pubkeyHex, }; } @@ -157,7 +156,7 @@ describe('libsession_metagroup', () => { const memberCreated = metaGroupWrapper.memberGetOrConstruct(member); console.info('Object.keys(memberCreated) ', JSON.stringify(Object.keys(memberCreated))); expect(Object.keys(memberCreated).length).to.be.eq( - 10, // if you change this value, also make sure you add a test, testing that new field, below + 6, // if you change this value, also make sure you add a test, testing that new field, below 'this test is designed to fail if you need to add tests to test a new field of libsession' ); }); @@ -165,73 +164,85 @@ describe('libsession_metagroup', () => { it('can add member by setting its promoted state, both ok and nok', () => { metaGroupWrapper.memberConstructAndSet(member); metaGroupWrapper.memberSetPromotionSent(member); - expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); - expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ - ...emptyMember(member), - promoted: true, - promotionPending: true, - promotionFailed: false, - admin: false, - }); - + expect(metaGroupWrapper.memberGetAll()).to.be.deep.eq([ + { + ...emptyMember(member), + nominatedAdmin: true, + memberStatus: 'PROMOTION_SENT', + }, + ]); + + metaGroupWrapper.memberConstructAndSet(member2); metaGroupWrapper.memberSetPromotionFailed(member2); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); // the list is sorted by member pk, which means that index based test do not work expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ ...emptyMember(member2), - promoted: true, - promotionFailed: true, - promotionPending: true, - admin: false, + nominatedAdmin: true, + memberStatus: 'PROMOTION_FAILED', }); // we test the admin: true case below }); it('can add member by setting its invited state, both ok and nok', () => { + metaGroupWrapper.memberConstructAndSet(member); + metaGroupWrapper.memberSetInvited(member, false); // with invite success expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); - expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ - ...emptyMember(member), - invitePending: true, - inviteFailed: false, - }); + expect(metaGroupWrapper.memberGetAll()).to.be.deep.eq([ + { + ...emptyMember(member), + memberStatus: 'INVITE_SENT', + }, + ]); + + metaGroupWrapper.memberConstructAndSet(member2); metaGroupWrapper.memberSetInvited(member2, true); // with invite failed expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ ...emptyMember(member2), - invitePending: true, - inviteFailed: true, + memberStatus: 'INVITE_FAILED', }); }); it('can add member by setting its accepted state', () => { + metaGroupWrapper.memberConstructAndSet(member); + metaGroupWrapper.memberSetAccepted(member); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ ...emptyMember(member), + memberStatus: 'INVITE_ACCEPTED', }); + metaGroupWrapper.memberConstructAndSet(member2); + metaGroupWrapper.memberSetAccepted(member2); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ ...emptyMember(member2), + memberStatus: 'INVITE_ACCEPTED', }); }); it('can erase member', () => { + metaGroupWrapper.memberConstructAndSet(member); + metaGroupWrapper.memberConstructAndSet(member2); + metaGroupWrapper.memberSetAccepted(member); metaGroupWrapper.memberSetPromoted(member2); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); expect(metaGroupWrapper.memberGet(member)).to.be.deep.eq({ ...emptyMember(member), + memberStatus: 'INVITE_ACCEPTED', }); expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ ...emptyMember(member2), - promoted: true, - promotionPending: true, + memberStatus: 'PROMOTION_SENT', + nominatedAdmin: true, }); const rekeyed = metaGroupWrapper.memberEraseAndRekey([member2]); @@ -239,10 +250,12 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ ...emptyMember(member), + memberStatus: 'INVITE_ACCEPTED', }); }); it('can add via name set', () => { + metaGroupWrapper.memberConstructAndSet(member); metaGroupWrapper.memberSetNameTruncated(member, 'member name'); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ @@ -253,6 +266,7 @@ describe('libsession_metagroup', () => { it('can add via profile picture set', () => { const pic = profilePicture(); + metaGroupWrapper.memberConstructAndSet(member); metaGroupWrapper.memberSetProfilePicture(member, pic); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); const expected = { ...emptyMember(member), profilePicture: pic }; @@ -261,6 +275,7 @@ describe('libsession_metagroup', () => { }); it('can add via admin set', () => { + metaGroupWrapper.memberConstructAndSet(member); metaGroupWrapper.memberSetPromotionAccepted(member); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); const expected: GroupMemberGet = { @@ -272,28 +287,35 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); }); + it('can simply add, and has the correct default', () => { + expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(0); + metaGroupWrapper.memberConstructAndSet(member); + expect(metaGroupWrapper.memberGetAll()).to.be.deep.eq([emptyMember(member)]); + }); + it('can mark as removed with messages', () => { + metaGroupWrapper.memberConstructAndSet(member); metaGroupWrapper.membersMarkPendingRemoval([member], true); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); const expected: GroupMemberGet = { ...emptyMember(member), - shouldRemoveMessages: true, - isRemoved: true, + removedStatus: 'REMOVED_MEMBER_AND_MESSAGES', + memberStatus: 'INVITE_ACCEPTED', // marking a member as pending removal auto-marks him as accepted (so we don't retry sending an invite) }; expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); }); it('can mark as removed without messages', () => { + metaGroupWrapper.memberConstructAndSet(member); metaGroupWrapper.membersMarkPendingRemoval([member], false); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); const expected: GroupMemberGet = { ...emptyMember(member), - shouldRemoveMessages: false, - isRemoved: true, + removedStatus: 'REMOVED_MEMBER', + memberStatus: 'INVITE_ACCEPTED', // marking a member as pending removal auto-marks him as accepted (so we don't retry sending an invite) }; - expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); - expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); + expect(metaGroupWrapper.memberGetAll()).to.be.deep.eq([expected]); }); }); diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index 6184b40e43..8d129e020e 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -6,7 +6,6 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable no-unreachable-loop */ /* eslint-disable no-restricted-syntax */ -import { randomBytes } from 'crypto'; import chai from 'chai'; import chaiAsPromised from 'chai-as-promised'; @@ -14,6 +13,7 @@ import { describe } from 'mocha'; import Sinon, * as sinon from 'sinon'; import { PubkeyType } from 'libsession_util_nodejs'; +import { randombytes_buf } from 'libsodium-wrappers-sumo'; import { ContentMessage } from '../../../../session/messages/outgoing'; import { ClosedGroupMessage } from '../../../../session/messages/outgoing/controlMessage/group/ClosedGroupMessage'; import { MessageSender } from '../../../../session/sending'; @@ -25,7 +25,10 @@ import { PendingMessageCacheStub } from '../../../test-utils/stubs'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { MessageSentHandler } from '../../../../session/sending/MessageSentHandler'; -import { TypedStub, stubData } from '../../../test-utils/utils'; +import { TypedStub, generateFakeSnode, stubData } from '../../../test-utils/utils'; +import { MessageWrapper } from '../../../../session/sending/MessageWrapper'; +import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; +import { BatchRequests } from '../../../../session/apis/snode_api/batchRequest'; chai.use(chaiAsPromised as any); chai.should(); @@ -144,11 +147,32 @@ describe('MessageQueue', () => { describe('events', () => { it('should send a success event if message was sent', done => { stubData('getMessageById').resolves(); + TestUtils.stubWindowLog(); const message = TestUtils.generateVisibleMessage(); - sendStub.resolves({ effectiveTimestamp: Date.now(), wrappedEnvelope: randomBytes(10) }); + sendStub.restore(); const device = TestUtils.generateFakePubKey(); + stubData('saveSeenMessageHashes').resolves(); Sinon.stub(MessageSender, 'getMinRetryTimeout').returns(10); + Sinon.stub(MessageSender, 'destinationIsClosedGroup').returns(false); + Sinon.stub(SnodePool, 'getNodeFromSwarmOrThrow').resolves(generateFakeSnode()); + Sinon.stub(BatchRequests, 'doUnsignedSnodeBatchRequestNoRetries').resolves([ + { + body: { t: message.createAtNetworkTimestamp, hash: 'whatever', code: 200 }, + code: 200, + }, + ]); + Sinon.stub(MessageWrapper, 'encryptMessagesAndWrap').resolves([ + { + encryptedAndWrappedData: randombytes_buf(100), + identifier: message.identifier, + isSyncMessage: false, + namespace: SnodeNamespaces.Default, + networkTimestamp: message.createAtNetworkTimestamp, + plainTextBuffer: message.plainTextBuffer(), + ttl: message.ttl(), + }, + ]); const waitForMessageSentEvent = async () => new Promise(resolve => { resolve(); @@ -159,6 +183,7 @@ describe('MessageQueue', () => { ); done(); } catch (e) { + console.warn('messageSentHandlerSuccessStub was not called, but should have been'); done(e); } }); diff --git a/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts b/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts index 597640a744..01f69feb21 100644 --- a/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts +++ b/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts @@ -2,7 +2,7 @@ import chai from 'chai'; import { beforeEach, describe } from 'mocha'; import Sinon from 'sinon'; -import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType, PubkeyType, UserGroupsGet } from 'libsession_util_nodejs'; import { RetrieveGroupSubRequest, RetrieveLegacyClosedGroupSubRequest, @@ -297,6 +297,8 @@ describe('SnodeAPI:buildRetrieveRequest', () => { stubLibSessionWorker({}); }); it('with single namespace and lasthash, no hashesToBump ', async () => { + TestUtils.stubUserGroupWrapper('getGroup', { whatever: '' } as any as UserGroupsGet); + const requests = await SnodeAPIRetrieve.buildRetrieveRequest( [{ lastHash: 'lasthash', namespace: SnodeNamespaces.ClosedGroupInfo }], groupPk, @@ -318,6 +320,8 @@ describe('SnodeAPI:buildRetrieveRequest', () => { }); it('with two namespace and lasthashes, no hashesToBump ', async () => { + TestUtils.stubUserGroupWrapper('getGroup', { whatever: '' } as any as UserGroupsGet); + const requests = await SnodeAPIRetrieve.buildRetrieveRequest( [ { lastHash: 'lasthash1', namespace: SnodeNamespaces.ClosedGroupInfo }, @@ -351,6 +355,7 @@ describe('SnodeAPI:buildRetrieveRequest', () => { }); it('with two namespace and lasthashes, 2 hashesToBump ', async () => { + TestUtils.stubUserGroupWrapper('getGroup', { whatever: '' } as any as UserGroupsGet); const requests = await SnodeAPIRetrieve.buildRetrieveRequest( [ { lastHash: 'lasthash1', namespace: SnodeNamespaces.ClosedGroupInfo }, diff --git a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts index da33fb7136..da3062033d 100644 --- a/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts +++ b/ts/test/session/unit/swarm_polling/SwarmPolling_test.ts @@ -3,7 +3,6 @@ import { describe } from 'mocha'; import Sinon, * as sinon from 'sinon'; import chaiAsPromised from 'chai-as-promised'; -import { ConversationModel } from '../../../../models/conversation'; import { getSwarmPollingInstance } from '../../../../session/apis/snode_api'; import { resetHardForkCachedValues } from '../../../../session/apis/snode_api/hfHandling'; import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest'; @@ -12,10 +11,8 @@ import { SWARM_POLLING_TIMEOUT } from '../../../../session/constants'; import { PubKey } from '../../../../session/types'; import { UserUtils } from '../../../../session/utils'; import { UserSync } from '../../../../session/utils/job_runners/jobs/UserSyncJob'; -import { sleepFor } from '../../../../session/utils/Promise'; -import { UserGroupsWrapperActions } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { TestUtils } from '../../../test-utils'; -import { generateFakeSnodes, stubData, stubLibSessionWorker } from '../../../test-utils/utils'; +import { generateFakeSnodes, stubData } from '../../../test-utils/utils'; import { ConversationTypeEnum } from '../../../../models/types'; import { ConvoHub } from '../../../../session/conversations'; import { SnodePool } from '../../../../session/apis/snode_api/snodePool'; @@ -30,11 +27,7 @@ describe('SwarmPolling', () => { const ourNumber = TestUtils.generateFakePubKeyStr(); const ourPubkey = PubKey.cast(ourNumber); - let pollOnceForKeySpy: Sinon.SinonSpy; - let swarmPolling: SwarmPolling; - let getItemByIdStub: Sinon.SinonStub; - let clock: Sinon.SinonFakeTimers; beforeEach(async () => { ConvoHub.use().reset(); @@ -45,7 +38,6 @@ describe('SwarmPolling', () => { Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(ourNumber); stubData('getAllConversations').resolves([]); - getItemByIdStub = TestUtils.stubData('getItemById'); stubData('saveConversation').resolves(); stubData('getSwarmNodesForPubkey').resolves(); stubData('getLastHashBySnode').resolves(); @@ -62,7 +54,6 @@ describe('SwarmPolling', () => { swarmPolling = getSwarmPollingInstance(); swarmPolling.resetSwarmPolling(); - pollOnceForKeySpy = Sinon.spy(swarmPolling, 'pollOnceForKey'); clock = sinon.useFakeTimers({ now: Date.now(), shouldAdvanceTime: true }); }); @@ -186,270 +177,4 @@ describe('SwarmPolling', () => { }); }); }); - - describe('pollForAllKeys', () => { - beforeEach(() => { - stubData('createOrUpdateItem').resolves(); - }); - afterEach(() => { - Sinon.restore(); - }); - it('does run for our pubkey even if activeAt is really old ', async () => { - stubLibSessionWorker([]); - - const convo = ConvoHub.use().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE); - convo.set('active_at', Date.now() - 1000 * 3600 * 25); - await swarmPolling.start(true); - - expect(pollOnceForKeySpy.callCount).to.eq(1); - expect(pollOnceForKeySpy.firstCall.args[0]).to.deep.eq([ourPubkey.key, 'private']); - }); - - it('does run for our pubkey even if activeAt is recent ', async () => { - stubLibSessionWorker([]); - - const convo = ConvoHub.use().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE); - convo.set('active_at', Date.now()); - await swarmPolling.start(true); - - expect(pollOnceForKeySpy.callCount).to.eq(1); - expect(pollOnceForKeySpy.firstCall.args[0]).to.deep.eq([ourPubkey.key, 'private']); - }); - - describe('legacy group', () => { - it('does run for group pubkey on start no matter the recent timestamp', async () => { - const convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - TestUtils.stubLibSessionWorker([]); - stubData('removeAllMessagesInConversation').resolves(); - stubData('getLatestClosedGroupEncryptionKeyPair').resolves(); - stubData('removeAllClosedGroupEncryptionKeyPairs').resolves(); - stubData('removeConversation').resolves(); - stubData('fetchConvoMemoryDetails').resolves(); - convo.set('active_at', Date.now()); - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - await swarmPolling.start(true); - - // our pubkey will be polled for, hence the 2 - expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args[0]).to.deep.eq([ourPubkey.key, 'private']); - expect(pollOnceForKeySpy.secondCall.args[0]).to.deep.eq([groupConvoPubkey.key, 'private']); - }); - - it('does only poll from -10 for closed groups if HF >= 19.1 ', async () => { - const convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - TestUtils.stubLibSessionWorker(undefined); - getItemByIdStub.restore(); - getItemByIdStub = TestUtils.stubData('getItemById'); - getItemByIdStub - .withArgs('hasSeenHardfork190') - .resolves({ id: 'hasSeenHardfork190', value: true }) - .withArgs('hasSeenHardfork191') - .resolves({ id: 'hasSeenHardfork191', value: true }); - - convo.set('active_at', 1); - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - - await swarmPolling.start(true); - - // our pubkey will be polled for, hence the 2 - expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - getItemByIdStub.restore(); - getItemByIdStub = TestUtils.stubData('getItemById'); - - getItemByIdStub.resolves(); - }); - - it('does run for group pubkey on start but not another time if activeAt is old ', async () => { - const convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - TestUtils.stubLibSessionWorker(undefined); - - convo.set('active_at', 1); // really old, but active - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - - // this calls the stub 2 times, one for our direct pubkey and one for the group - await swarmPolling.start(true); - - // this should only call the stub one more time: for our direct pubkey but not for the group pubkey - await swarmPolling.pollForAllKeys(); - - expect(pollOnceForKeySpy.callCount).to.eq(3); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - }); - - it('does run twice if activeAt less than one hour ', async () => { - const convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - - // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event - Sinon.stub(UserGroupsWrapperActions, 'getLegacyGroup').resolves({} as any); - - convo.set('active_at', Date.now()); - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - await swarmPolling.start(true); - expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - pollOnceForKeySpy.resetHistory(); - clock.tick(9000); - - // no need to do that as the tick will trigger a call in all cases after 5 secs await swarmPolling.pollForAllKeys(); - /** this is not easy to explain, but - * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group id) - * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails. - * the only fix is to restore the clock and force the a small sleep to let the thing run in bg - */ - - await sleepFor(10); - - expect(pollOnceForKeySpy.callCount).to.eq(2); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - }); - - it('does run twice if activeAt is inactive and we tick longer than 2 minutes', async () => { - const convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event - Sinon.stub(UserGroupsWrapperActions, 'getLegacyGroup').resolves({} as any); - pollOnceForKeySpy.resetHistory(); - convo.set('active_at', Date.now()); - const groupConvoPubkey = convo.id; - swarmPolling.addGroupId(groupConvoPubkey); - // this call the stub two times already, one for our direct pubkey and one for the group - await swarmPolling.start(true); - const timeToTick = 3 * 60 * 1000; - swarmPolling.forcePolledTimestamp(groupConvoPubkey, Date.now() - timeToTick); - // more than week old, so inactive group but we have to tick after more than 2 min - convo.set('active_at', Date.now() - 7 * 25 * 3600 * 1000); - clock.tick(timeToTick); - /** this is not easy to explain, but - * - during the swarmPolling.start, we get two calls to pollOnceForKeySpy (one for our id and one for group od) - * - the clock ticks 9sec, and another call of pollOnceForKeySpy get started, but as we do not await them, this test fails. - * the only fix is to restore the clock and force the a small sleep to let the thing run in bg - */ - await sleepFor(10); - // we should have two more calls here, so 4 total. - expect(pollOnceForKeySpy.callCount).to.eq(4); - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]); - }); - - it('does run once only if group is inactive and we tick less than 2 minutes ', async () => { - const convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - pollOnceForKeySpy.resetHistory(); - TestUtils.stubLibSessionWorker(undefined); - convo.set('active_at', Date.now()); - const groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - await swarmPolling.start(true); - - // more than a week old, we should not tick after just 5 seconds - convo.set('active_at', Date.now() - 7 * 24 * 3600 * 1000 - 3600 * 1000); - - clock.tick(1 * 60 * 1000); - await sleepFor(10); - - // we should have only one more call here, the one for our direct pubkey fetch - expect(pollOnceForKeySpy.callCount).to.eq(3); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); // this one comes from the swarmPolling.start - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - }); - - describe('multiple runs', () => { - let convo: ConversationModel; - let groupConvoPubkey: PubKey; - - beforeEach(async () => { - convo = ConvoHub.use().getOrCreate( - TestUtils.generateFakePubKeyStr(), - ConversationTypeEnum.GROUP - ); - TestUtils.stubLibSessionWorker({}); - - convo.set('active_at', Date.now()); - groupConvoPubkey = PubKey.cast(convo.id as string); - swarmPolling.addGroupId(groupConvoPubkey); - await swarmPolling.start(true); - }); - - afterEach(() => { - Sinon.restore(); - ConvoHub.use().reset(); - clock.restore(); - resetHardForkCachedValues(); - }); - - it('does run twice if activeAt is less than 2 days', async () => { - pollOnceForKeySpy.resetHistory(); - // less than 2 days old, this is an active group - convo.set('active_at', Date.now() - 2 * 24 * 3600 * 1000 - 3600 * 1000); - - const timeToTick = 6 * 1000; - - swarmPolling.forcePolledTimestamp(convo.id, timeToTick); - // we tick more than 5 sec - clock.tick(timeToTick); - - await swarmPolling.pollForAllKeys(); - // we have 4 calls total. 2 for our direct promises run each 5 seconds, and 2 for the group pubkey active (so run every 5 sec too) - expect(pollOnceForKeySpy.callCount).to.eq(4); - // first two calls are our pubkey - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]); - }); - - it('does run twice if activeAt is more than 2 days old and we tick more than one minute', async () => { - pollOnceForKeySpy.resetHistory(); - TestUtils.stubWindowLog(); - convo.set('active_at', Date.now() - 2 * 25 * 3600 * 1000); // medium active - // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event - - const timeToTick = 65 * 1000; // more than one minute - swarmPolling.forcePolledTimestamp(convo.id, timeToTick); - clock.tick(timeToTick); // should tick twice more (one more our direct pubkey and one for the group) - - // fake that the group is part of the wrapper otherwise we stop tracking it after the first polling event - - await swarmPolling.pollForAllKeys(); - - expect(pollOnceForKeySpy.callCount).to.eq(4); - - // first two calls are our pubkey - expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, [-10]]); - expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([ourPubkey, false, [0, 2, 3, 5, 4]]); - expect(pollOnceForKeySpy.getCalls()[3].args).to.deep.eq([groupConvoPubkey, true, [-10]]); - }); - }); - }); - }); }); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 3a574e31ef..bb7951f2ae 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -1,12 +1,11 @@ import { expect } from 'chai'; -import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType, UserGroupsGet } from 'libsession_util_nodejs'; import { omit } from 'lodash'; import Long from 'long'; import Sinon from 'sinon'; import { getSodiumNode } from '../../../../../../node/sodiumNode'; import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/SnodeRequestTypes'; import { SnodeNamespaces } from '../../../../../../session/apis/snode_api/namespaces'; -import { TTL_DEFAULT } from '../../../../../../session/constants'; import { ConvoHub } from '../../../../../../session/conversations'; import { LibSodiumWrappers } from '../../../../../../session/crypto'; import { MessageSender } from '../../../../../../session/sending'; @@ -21,7 +20,7 @@ import { } from '../../../../../../session/utils/libsession/libsession_utils'; import { MetaGroupWrapperActions } from '../../../../../../webworker/workers/browser/libsession_worker_interface'; import { TestUtils } from '../../../../../test-utils'; -import { TypedStub } from '../../../../../test-utils/utils'; +import { stubWindowFeatureFlags, stubWindowLog, TypedStub } from '../../../../../test-utils/utils'; import { NetworkTime } from '../../../../../../util/NetworkTime'; function validInfo(sodium: LibSodiumWrappers) { @@ -52,17 +51,34 @@ function validKeys(sodium: LibSodiumWrappers) { } as const; } +function validUserGroup03WithSecKey(pubkey?: GroupPubkeyType) { + const group: UserGroupsGet = { + authData: new Uint8Array(30), + secretKey: new Uint8Array(30), + destroyed: false, + invitePending: false, + joinedAtSeconds: Date.now(), + kicked: false, + priority: 0, + pubkeyHex: pubkey || TestUtils.generateFakeClosedGroupV2PkStr(), + name: 'Valid usergroup 03', + disappearingTimerSeconds: 0, + }; + return group; +} + describe('GroupSyncJob run()', () => { afterEach(() => { Sinon.restore(); }); - it('throws if no user keys', async () => { + it('does not throw if no user keys', async () => { const job = new GroupSync.GroupSyncJob({ identifier: TestUtils.generateFakeClosedGroupV2PkStr(), }); const func = async () => job.run(); - await expect(func()).to.be.eventually.rejected; + // Note: the run() function should never throw, at most it should return "permanent failure" + await expect(func()).to.be.not.eventually.rejected; }); it('permanent failure if group is not a 03 one', async () => { @@ -259,6 +275,8 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { sodium = await getSodiumNode(); groupPk = TestUtils.generateFakeClosedGroupV2PkStr(); userkeys = await TestUtils.generateUserKeyPairs(); + + stubWindowLog(); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(userkeys.x25519KeyPair.pubkeyHex); Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves(userkeys.ed25519KeyPair); @@ -286,16 +304,18 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { it('calls sendEncryptedDataToSnode with the right data and retry if network returned nothing', async () => { TestUtils.stubLibSessionWorker(undefined); + stubWindowFeatureFlags(); + TestUtils.stubUserGroupWrapper('getGroup', validUserGroup03WithSecKey()); const info = validInfo(sodium); const member = validMembers(sodium); const networkTimestamp = 4444; - const ttl = TTL_DEFAULT.CONFIG_MESSAGE; Sinon.stub(NetworkTime, 'now').returns(networkTimestamp); pendingChangesForGroupStub.resolves({ messages: [info, member], allOldHashes: new Set('123'), }); + const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, extraStoreRequests: [], @@ -307,34 +327,11 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { expect(pendingChangesForGroupStub.callCount).to.be.eq(1); expect(saveDumpsToDbStub.callCount).to.be.eq(1); expect(saveDumpsToDbStub.firstCall.args).to.be.deep.eq([groupPk]); - - function expected(details: any) { - return { - dbMessageIdentifier: null, - namespace: details.namespace, - encryptedData: details.ciphertext, - ttlMs: ttl, - destination: groupPk, - method: 'store', - }; - } - - const expectedInfo = expected(info); - const expectedMember = expected(member); - - const callArgs = sendStub.firstCall.args[0]; - // we don't want to check the content of the request in this unit test, just the structure/count of them - // callArgs.storeRequests = callArgs.storeRequests.map(_m => null) as any; - const expectedArgs = { - storeRequests: [expectedInfo, expectedMember], - destination: groupPk, - messagesHashesToDelete: new Set('123'), - }; - expect(callArgs).to.be.deep.eq(expectedArgs); }); - it('calls sendEncryptedDataToSnode with the right data (and keys) and retry if network returned nothing', async () => { - TestUtils.stubLibSessionWorker(undefined); + it('calls sendEncryptedDataToSnode and retry if network returned nothing', async () => { + stubWindowFeatureFlags(); + TestUtils.stubUserGroupWrapper('getGroup', validUserGroup03WithSecKey(groupPk)); const info = validInfo(sodium); const member = validMembers(sodium); diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index 36ed430a13..68368715bf 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -1,5 +1,4 @@ import { expect } from 'chai'; -import { PubkeyType } from 'libsession_util_nodejs'; import { omit } from 'lodash'; import Long from 'long'; import Sinon from 'sinon'; @@ -9,7 +8,6 @@ import { SnodeNamespaces, SnodeNamespacesUserConfig, } from '../../../../../../session/apis/snode_api/namespaces'; -import { TTL_DEFAULT } from '../../../../../../session/constants'; import { ConvoHub } from '../../../../../../session/conversations'; import { LibSodiumWrappers } from '../../../../../../session/crypto'; import { MessageSender } from '../../../../../../session/sending'; @@ -228,7 +226,6 @@ describe('UserSyncJob batchResultsToUserSuccessfulChange', () => { }); describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { - let sessionId: PubkeyType; let userkeys: TestUtils.TestUserKeyPairs; let sodium: LibSodiumWrappers; @@ -239,7 +236,6 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { beforeEach(async () => { sodium = await getSodiumNode(); userkeys = await TestUtils.generateUserKeyPairs(); - sessionId = userkeys.x25519KeyPair.pubkeyHex; Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(userkeys.x25519KeyPair.pubkeyHex); Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves(userkeys.ed25519KeyPair); @@ -274,13 +270,12 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { ]); }); - it('calls sendEncryptedDataToSnode with the right data x2 and retry if network returned nothing', async () => { + it('calls sendEncryptedDataToSnode and retry if network returned nothing', async () => { Sinon.stub(GenericWrapperActions, 'needsDump').resolves(false).onSecondCall().resolves(true); const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); const networkTimestamp = 4444; - const ttl = TTL_DEFAULT.CONFIG_MESSAGE; Sinon.stub(NetworkTime, 'now').returns(networkTimestamp); pendingChangesForUsStub.resolves({ @@ -295,29 +290,6 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { expect(pendingChangesForUsStub.callCount).to.be.eq(1); expect(dump.callCount).to.be.eq(1); expect(dump.firstCall.args).to.be.deep.eq(['ContactsConfig']); - - function expected(details: any) { - return { - namespace: details.namespace, - encryptedData: details.ciphertext, - ttlMs: ttl, - destination: sessionId, - method: 'store', - }; - } - - const expectedProfile = expected(profile); - const expectedContact = expected(contact); - - const callArgs = sendStub.firstCall.args[0]; - // we don't want to check the content of the request in this unit test, just the structure/count of them - const expectedArgs = { - storeRequests: [expectedProfile, expectedContact], - destination: sessionId, - messagesHashesToDelete: new Set('123'), - }; - // callArgs.storeRequests = callArgs.storeRequests.map(_m => null) as any; - expect(callArgs).to.be.deep.eq(expectedArgs); }); it('calls sendEncryptedDataToSnode with the right data x3 and retry if network returned nothing then success', async () => { diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index 6c7ea3cf73..be58d9247e 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -129,7 +129,7 @@ export function generateFakeSnodes(amount: number): Array { } /** - * this function can be used to setup unit test which relies on fetching a snodepool + * this function can be used to setup unit test which relies on fetching a snode pool */ export function setupTestWithSending() { const snodes = generateFakeSnodes(20); From 7296d4dc56dba4ed246b3f161a9aaaa7f5474d5f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 18 Nov 2024 11:36:52 +1100 Subject: [PATCH 171/302] chore: bump libsession-util-nodejs to 0.4.4 --- package.json | 2 +- patches/@types+backbone+1.4.2.patch | 2 +- yarn.lock | 62 ++++++++++++++--------------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index 35aaafdb03..c5b4290630 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.23/libsession_util_nodejs-v0.3.23.tar.gz", + "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.4/libsession_util_nodejs-v0.4.4.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/patches/@types+backbone+1.4.2.patch b/patches/@types+backbone+1.4.2.patch index e4aab4d54c..6491b4554e 100644 --- a/patches/@types+backbone+1.4.2.patch +++ b/patches/@types+backbone+1.4.2.patch @@ -32,4 +32,4 @@ index da53a62..4db8b56 100644 + id: string; idAttribute: string; validationError: any; - + diff --git a/yarn.lock b/yarn.lock index 14a0ef0537..407d0a01c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1790,7 +1790,7 @@ available-typed-arrays@^1.0.7: dependencies: possible-typed-array-names "^1.0.0" -axios@^1.6.5: +axios@^1.3.2: version "1.7.7" resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f" integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q== @@ -2296,24 +2296,24 @@ clsx@^1.0.4, clsx@^1.1.1, clsx@^1.2.1: resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== -cmake-js@^7.2.1: - version "7.3.0" - resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.3.0.tgz#6fd6234b7aeec4545c1c806f9e3f7ffacd9798b2" - integrity sha512-dXs2zq9WxrV87bpJ+WbnGKv8WUBXDw8blNiwNHoRe/it+ptscxhQHKB1SJXa1w+kocLMeP28Tk4/eTCezg4o+w== +cmake-js@7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/cmake-js/-/cmake-js-7.2.1.tgz#757c0d39994121b084bab96290baf115ee7712cd" + integrity sha512-AdPSz9cSIJWdKvm0aJgVu3X8i0U3mNTswJkSHzZISqmYVjZk7Td4oDFg0mCBA383wO+9pG5Ix7pEP1CZH9x2BA== dependencies: - axios "^1.6.5" + axios "^1.3.2" debug "^4" - fs-extra "^11.2.0" + fs-extra "^10.1.0" lodash.isplainobject "^4.0.6" memory-stream "^1.0.0" - node-api-headers "^1.1.0" + node-api-headers "^0.0.2" npmlog "^6.0.2" rc "^1.2.7" - semver "^7.5.4" - tar "^6.2.0" + semver "^7.3.8" + tar "^6.1.11" url-join "^4.0.1" which "^2.0.2" - yargs "^17.7.2" + yargs "^17.6.0" color-convert@^1.9.0: version "1.9.3" @@ -2647,11 +2647,11 @@ date-fns@^3.6.0: integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww== debug@4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: - version "4.3.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" - integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== + version "4.3.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" + integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== dependencies: - ms "2.1.2" + ms "^2.1.3" debug@4.3.4: version "4.3.4" @@ -3714,9 +3714,9 @@ focus-trap@^7.5.4: tabbable "^6.2.0" follow-redirects@^1.15.6: - version "1.15.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" - integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== + version "1.15.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" + integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== for-each@^0.3.3: version "0.3.3" @@ -3768,7 +3768,7 @@ fs-extra@^10.0.0, fs-extra@^10.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^11.0.0, fs-extra@^11.2.0: +fs-extra@^11.0.0: version "11.2.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== @@ -4944,11 +4944,11 @@ 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.3.23/libsession_util_nodejs-v0.3.23.tar.gz": - version "0.3.23" - resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.3.23/libsession_util_nodejs-v0.3.23.tar.gz#fed0e0e7c087a4eb49552d7ac7da4086df79bcd4" +"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.4/libsession_util_nodejs-v0.4.4.tar.gz": + version "0.4.4" + resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.4/libsession_util_nodejs-v0.4.4.tar.gz#52d36a0c22c2a33aa44dbbc58831ecd795f2e69a" dependencies: - cmake-js "^7.2.1" + cmake-js "7.2.1" node-addon-api "^6.1.0" libsodium-sumo@^0.7.13: @@ -5481,7 +5481,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.1.1: +ms@2.1.3, ms@^2.1.1, ms@^2.1.3: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -5560,10 +5560,10 @@ node-addon-api@^6.1.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76" integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA== -node-api-headers@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-1.2.0.tgz#b717cd420aec79031f8dc83a50eb0a8bdf24c70d" - integrity sha512-L9AiEkBfgupC0D/LsudLPOhzy/EdObsp+FHyL1zSK0kKv5FDA9rJMoRz8xd+ojxzlqfg0tTZm2h8ot2nS7bgRA== +node-api-headers@^0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/node-api-headers/-/node-api-headers-0.0.2.tgz#31f4c6c2750b63e598128e76a60aefca6d76ac5d" + integrity sha512-YsjmaKGPDkmhoNKIpkChtCsPVaRE0a274IdERKnuc/E8K1UJdBZ4/mvI006OijlQZHCfpRNOH3dfHQs92se8gg== node-fetch@^2.6.7: version "2.7.0" @@ -6858,7 +6858,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.4: +semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4: version "7.6.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== @@ -7331,7 +7331,7 @@ tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -tar@^6.1.0, tar@^6.1.11, tar@^6.2.0: +tar@^6.1.0, tar@^6.1.11: version "6.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== @@ -8137,7 +8137,7 @@ yargs@16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^17.0.0, yargs@^17.0.1, yargs@^17.7.2: +yargs@^17.0.0, yargs@^17.0.1, yargs@^17.6.0: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== From 6b1a628d13579e47e3bfec0526c6ad3c8dd86329 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 18 Nov 2024 13:58:09 +1100 Subject: [PATCH 172/302] chore: fetch latest strings --- _locales/sv/messages.json | 1 + 1 file changed, 1 insertion(+) diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json index 6bb91ce0e9..29714c97d7 100644 --- a/_locales/sv/messages.json +++ b/_locales/sv/messages.json @@ -274,6 +274,7 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Misslyckades att uppdatera grupp", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "Du har inte behörighet att ta bort andras meddelanden", "deleteMessage": "{count, plural, one [Radera meddelande] other [Radera meddelanden]}", + "deleteMessageConfirm": "{count, plural, one [Är du säker på att du vill radera detta meddelande?] other [Är du säker på att du vill radera dessa meddelanden?]}", "deleteMessageDeleted": "{count, plural, one [Meddelande raderat] other [Meddelanden raderade]}", "deleteMessageDeletedGlobally": "Detta meddelande har raderats", "deleteMessageDeletedLocally": "Detta meddelande har tagits bort på denna enhet", From 3b4d68e0a10221b1a6d075a30eb8c9f6455a2f2b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 18 Nov 2024 16:52:45 +1100 Subject: [PATCH 173/302] chore: lint --- .eslintrc.js | 3 -- patches/@types+backbone+1.4.2.patch | 35 ------------------- .../message-content/MessageContent.tsx | 19 +--------- ts/session/sending/MessageSender.ts | 3 -- ts/session/utils/TaskWithTimeout.ts | 5 --- 5 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 patches/@types+backbone+1.4.2.patch diff --git a/.eslintrc.js b/.eslintrc.js index c248be821c..43cbfc9ef6 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -58,9 +58,6 @@ module.exports = { // it helps readability to put public API at top, 'no-use-before-define': 'off', - // we need them with code in WIP sometimes, and it doesn't do any harm - 'no-useless-return': 'off', - // useful for unused or internal fields 'no-underscore-dangle': 'off', diff --git a/patches/@types+backbone+1.4.2.patch b/patches/@types+backbone+1.4.2.patch deleted file mode 100644 index 6491b4554e..0000000000 --- a/patches/@types+backbone+1.4.2.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/node_modules/@types/backbone/README.md b/node_modules/@types/backbone/README.md -deleted file mode 100644 -index b353b41..0000000 ---- a/node_modules/@types/backbone/README.md -+++ /dev/null -@@ -1,16 +0,0 @@ --# Installation --> `npm install --save @types/backbone` -- --# Summary --This package contains type definitions for Backbone (http://backbonejs.org/). -- --# Details --Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/backbone. -- --### Additional Details -- * Last updated: Thu, 30 Apr 2020 23:00:14 GMT -- * Dependencies: [@types/underscore](https://npmjs.com/package/@types/underscore), [@types/jquery](https://npmjs.com/package/@types/jquery) -- * Global values: `Backbone` -- --# Credits --These definitions were written by [Boris Yankov](https://github.com/borisyankov), [Natan Vivo](https://github.com/nvivo), [kenjiru](https://github.com/kenjiru), [jjoekoullas](https://github.com/jjoekoullas), [Julian Gonggrijp](https://github.com/jgonggrijp), [Kyle Scully](https://github.com/zieka), and [Robert Kesterson](https://github.com/rkesters). -diff --git a/node_modules/@types/backbone/index.d.ts b/node_modules/@types/backbone/index.d.ts -index da53a62..4db8b56 100644 ---- a/node_modules/@types/backbone/index.d.ts -+++ b/node_modules/@types/backbone/index.d.ts -@@ -225,7 +225,7 @@ declare namespace Backbone { - * That works only if you set it in the constructor or the initialize method. - **/ - defaults(): ObjectHash; -- id: any; -+ id: string; - idAttribute: string; - validationError: any; - diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx index b4ebccb6b2..6878645e45 100644 --- a/ts/components/conversation/message/message-content/MessageContent.tsx +++ b/ts/components/conversation/message/message-content/MessageContent.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames'; import { isEmpty } from 'lodash'; -import { MouseEvent, useCallback, useLayoutEffect, useState } from 'react'; +import { useCallback, useLayoutEffect, useState } from 'react'; import { InView } from 'react-intersection-observer'; import { useSelector } from 'react-redux'; import styled from 'styled-components'; @@ -37,22 +37,6 @@ type Props = { messageId: string; }; -// TODO not too sure what is this doing? It is not preventDefault() -// or stopPropagation() so I think this is never cancelling a click event? -function onClickOnMessageInnerContainer(event: MouseEvent) { - const selection = window.getSelection(); - // Text is being selected - if (selection && selection.type === 'Range') { - return; - } - - // User clicked on message body - const target = event.target as HTMLDivElement; - if (target.className === 'text-selectable' || window.contextMenuShown) { - return; - } -} - const StyledMessageContent = styled.div<{ msgDirection: MessageModelType }>` display: flex; align-self: ${props => (props.msgDirection === 'incoming' ? 'flex-start' : 'flex-end')}; @@ -155,7 +139,6 @@ export const MessageContent = (props: Props) => { diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 47c035224f..2f446cc556 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -257,7 +257,6 @@ async function sendSingleMessage({ }, ]); - // make sure to update the local sent_at timestamp, because sometimes, we will get the just pushed message in the receiver side // before we return from the await below. // and the isDuplicate messages relies on sent_at timestamp to be valid. @@ -305,7 +304,6 @@ async function sendSingleMessage({ retries: Math.max(attempts - 1, 0), factor: 1, minTimeout: retryMinTimeout || MessageSender.getMinRetryTimeout(), - } ); } @@ -641,7 +639,6 @@ async function handleBatchResultWithSubRequests({ isString(storedHash) && isNumber(storedAt) ) { - seenHashes.push({ expiresAt: NetworkTime.now() + TTL_DEFAULT.CONTENT_MESSAGE, // non config msg expire at CONTENT_MESSAGE at most hash: storedHash, diff --git a/ts/session/utils/TaskWithTimeout.ts b/ts/session/utils/TaskWithTimeout.ts index 1e77199e31..9bf7770878 100644 --- a/ts/session/utils/TaskWithTimeout.ts +++ b/ts/session/utils/TaskWithTimeout.ts @@ -16,10 +16,7 @@ export const createTaskWithTimeout = (task: any, id: string, givenTimeout?: numb window?.log?.error(message); reject(new Error(message)); - return; } - - return; }, timeout); const clearTimer = () => { try { @@ -41,13 +38,11 @@ export const createTaskWithTimeout = (task: any, id: string, givenTimeout?: numb clearTimer(); complete = true; resolve(result); - return; }; const failure = (error: any) => { clearTimer(); complete = true; reject(error); - return; }; let promise; From bb820eff38d25a939c498cc9a35766df3835fe32 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 20 Nov 2024 13:40:44 +1100 Subject: [PATCH 174/302] chore: bump to 1.15.0 --- package.json | 4 ++-- yarn.lock | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f7ad60b0dd..062d3a405c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "session-desktop", "productName": "Session", "description": "Private messaging from your desktop", - "version": "1.14.2", + "version": "1.15.0", "license": "GPL-3.0", "author": { "name": "Oxen Labs", @@ -91,7 +91,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.4/libsession_util_nodejs-v0.4.4.tar.gz", + "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.5/libsession_util_nodejs-v0.4.5.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index 407d0a01c9..c04ef63ffd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4944,9 +4944,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.4/libsession_util_nodejs-v0.4.4.tar.gz": - version "0.4.4" - resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.4/libsession_util_nodejs-v0.4.4.tar.gz#52d36a0c22c2a33aa44dbbc58831ecd795f2e69a" +"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.5/libsession_util_nodejs-v0.4.5.tar.gz": + version "0.4.5" + resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.5/libsession_util_nodejs-v0.4.5.tar.gz#e5b62009b9af277201f1c61dbc10bda4bb8e757b" dependencies: cmake-js "7.2.1" node-addon-api "^6.1.0" From 143759ff92921444b91068acfca7796080bf555a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 20 Nov 2024 17:35:37 +1100 Subject: [PATCH 175/302] fix: we want the sorting order to be jumpy for groups apparently --- ts/components/MemberListItem.tsx | 1 + .../conversation/composition/UserMentions.tsx | 1 + ts/components/dialog/InviteContactsDialog.tsx | 1 + .../dialog/ModeratorsRemoveDialog.tsx | 1 + .../dialog/UpdateGroupMembersDialog.tsx | 1 + .../leftpane/overlay/OverlayClosedGroup.tsx | 2 ++ ts/components/settings/BlockedList.tsx | 1 + ts/data/data.ts | 11 ++++++---- ts/models/conversation.ts | 12 +++++++++++ ts/state/selectors/conversations.ts | 5 +++-- ts/state/selectors/groups.ts | 21 ++++++++++++------- 11 files changed, 44 insertions(+), 13 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 4db539d7b1..bc3501b676 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -323,6 +323,7 @@ export const MemberListItem = ({ flexDirection="column" margin="0 var(--margins-md)" alignItems="flex-start" + minWidth="0" > {ourName || memberName} diff --git a/ts/components/conversation/composition/UserMentions.tsx b/ts/components/conversation/composition/UserMentions.tsx index 7fabf1b422..fab6047e9c 100644 --- a/ts/components/conversation/composition/UserMentions.tsx +++ b/ts/components/conversation/composition/UserMentions.tsx @@ -44,6 +44,7 @@ export const renderUserMentionRow = (suggestion: SuggestionDataItem) => { pubkey={`${suggestion.id}`} inMentions={true} dataTestId="mentions-popup-row" + maxNameWidth="100%" /> ); }; diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index 883a9a938c..0e0669ac05 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -206,6 +206,7 @@ const InviteContactsDialogInner = (props: Props) => { onSelect={addTo} onUnselect={removeFrom} disableBg={true} + maxNameWidth="100%" /> )) ) : ( diff --git a/ts/components/dialog/ModeratorsRemoveDialog.tsx b/ts/components/dialog/ModeratorsRemoveDialog.tsx index a7ebc96bfd..4b058d31e1 100644 --- a/ts/components/dialog/ModeratorsRemoveDialog.tsx +++ b/ts/components/dialog/ModeratorsRemoveDialog.tsx @@ -104,6 +104,7 @@ export const RemoveModeratorsDialog = (props: Props) => { setModsToRemove(updatedList); }} disableBg={true} + maxNameWidth="100%" /> ))}
diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 63081243dc..29540f5019 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -86,6 +86,7 @@ const MemberList = (props: { disableBg={true} displayGroupStatus={isV2Group && weAreAdmin} groupPk={convoId} + maxNameWidth="100%" /> ); })} diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index fd7e66cd10..8ef59b4a12 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -228,6 +228,7 @@ export const OverlayClosedGroupV2 = () => { onSelect={addToSelected} onUnselect={removeFromSelected} disableBg={true} + maxNameWidth="100%" /> )) )} @@ -345,6 +346,7 @@ export const OverlayLegacyClosedGroup = () => { onUnselect={removeFromSelected} withBorder={false} disabled={loading} + maxNameWidth="100%" /> )) )} diff --git a/ts/components/settings/BlockedList.tsx b/ts/components/settings/BlockedList.tsx index 0e68199742..4cfeaef6d4 100644 --- a/ts/components/settings/BlockedList.tsx +++ b/ts/components/settings/BlockedList.tsx @@ -64,6 +64,7 @@ const BlockedEntries = (props: { onSelect={addToSelected} onUnselect={removeFromSelected} disableBg={true} + maxNameWidth="100%" /> ); })} diff --git a/ts/data/data.ts b/ts/data/data.ts index 7ee9441429..623e683068 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -1,7 +1,7 @@ // eslint:disable: no-require-imports no-var-requires one-variable-per-declaration no-void-expression function-name import { GroupPubkeyType } from 'libsession_util_nodejs'; -import _, { isEmpty } from 'lodash'; +import _, { isArray, isEmpty } from 'lodash'; import { ConversationModel } from '../models/conversation'; import { ConversationAttributes } from '../models/conversationAttributes'; import { MessageCollection, MessageModel } from '../models/message'; @@ -285,6 +285,9 @@ async function getAllMessagesWithAttachmentsInConversationSentBefore(args: { }): Promise> { const msgAttrs = await channels.getAllMessagesWithAttachmentsInConversationSentBefore(args); + if (!msgAttrs || isEmpty(msgAttrs) || !isArray(msgAttrs)) { + return []; + } return msgAttrs.map((msg: any) => new MessageModel(msg)); } @@ -578,7 +581,7 @@ async function findAllMessageFromSendersInConversation( ): Promise> { const msgAttrs = await channels.findAllMessageFromSendersInConversation(args); - if (!msgAttrs || isEmpty(msgAttrs)) { + if (!msgAttrs || isEmpty(msgAttrs) || !isArray(msgAttrs)) { return []; } @@ -590,7 +593,7 @@ async function findAllMessageHashesInConversation( ): Promise> { const msgAttrs = await channels.findAllMessageHashesInConversation(args); - if (!msgAttrs || isEmpty(msgAttrs)) { + if (!msgAttrs || isEmpty(msgAttrs) || !isArray(msgAttrs)) { return []; } @@ -602,7 +605,7 @@ async function findAllMessageHashesInConversationMatchingAuthor( ): Promise> { const msgAttrs = await channels.findAllMessageHashesInConversationMatchingAuthor(args); - if (!msgAttrs || isEmpty(msgAttrs)) { + if (!msgAttrs || isEmpty(msgAttrs) || !isArray(msgAttrs)) { return []; } diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 0f5d57332e..6bbda4f524 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -673,6 +673,18 @@ export class ConversationModel extends Backbone.Model { }); return; } + + if (this.isClosedGroupV2()) { + // we need the return await so that errors are caught in the catch {} + await this.sendMessageToGroupV2(chatMessageParams); + await Reactions.handleMessageReaction({ + reaction, + sender: UserUtils.getOurPubKeyStrFromCache(), + you: true, + }); + return; + } + if (this.isClosedGroup()) { const chatMessageMediumGroup = new VisibleMessage(chatMessageParams); const closedGroupVisibleMessage = new ClosedGroupVisibleMessage({ diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 5c9c2c4803..40d1f2a426 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -316,7 +316,8 @@ const _getContacts = ( ): Array => { return sortedConversations.filter(convo => { // a private conversation not approved is a message request. Include them in the list of contacts - return !convo.isBlocked && convo.isPrivate && !convo.isMe; + // Note: we filter out non 05-pubkeys as we don't want blinded message request to be part of this list + return !convo.isBlocked && convo.isPrivate && !convo.isMe && PubKey.is05Pubkey(convo.id); }); }; @@ -481,7 +482,7 @@ export type DirectContactsByNameType = { }; // make sure that createSelector is called here so this function is memoized -export const getSortedContacts = createSelector( +const getSortedContacts = createSelector( getContacts, (contacts: Array): Array => { const us = UserUtils.getOurPubKeyStrFromCache(); diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index 904adb4574..6c1a700442 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -232,18 +232,27 @@ export function useMemberPromoteSending(groupPk: GroupPubkeyType, memberPk: Pubk } type MemberStateGroupV2WithSending = MemberStateGroupV2 | 'INVITE_SENDING' | 'PROMOTION_SENDING'; +type MemberWithV2Sending = Pick & { + memberStatus: MemberStateGroupV2WithSending; +}; export function useStateOf03GroupMembers(convoId?: string) { const us = UserUtils.getOurPubKeyStrFromCache(); let unsortedMembers = useSelector((state: StateType) => getMembersOfGroup(state, convoId)); const invitesSendingPk = useMembersInviteSending(convoId); const promotionsSendingPk = useMembersPromoteSending(convoId); - let invitesSending = compact( - invitesSendingPk.map(sending => unsortedMembers.find(m => m.pubkeyHex === sending)) - ); - const promotionSending = compact( - promotionsSendingPk.map(sending => unsortedMembers.find(m => m.pubkeyHex === sending)) + let invitesSending: Array = compact( + invitesSendingPk + .map(sending => unsortedMembers.find(m => m.pubkeyHex === sending)) + .map(m => { + return m ? { ...m, memberStatus: 'INVITE_SENDING' as const } : null; + }) ); + const promotionSending: Array = compact( promotionsSendingPk + .map(sending => unsortedMembers.find(m => m.pubkeyHex === sending)) + .map(m => { + return m ? { ...m, memberStatus: 'PROMOTION_SENDING' as const } : null; + })); // promotionSending has priority against invitesSending, so removing anything in invitesSending found in promotionSending invitesSending = differenceBy(invitesSending, promotionSending, value => value.pubkeyHex); @@ -283,7 +292,6 @@ export function useStateOf03GroupMembers(convoId?: string) { unsortedWithStatuses.push(...promotionSending); unsortedWithStatuses.push(...differenceBy(invitesSending, promotionSending)); unsortedWithStatuses.push(...differenceBy(unsortedMembers, invitesSending, promotionSending)); - const names = useConversationsNicknameRealNameOrShortenPubkey( unsortedWithStatuses.map(m => m.pubkeyHex) ); @@ -336,6 +344,5 @@ export function useStateOf03GroupMembers(convoId?: string) { index++; return sortingOrder; }); - return sorted; } From 3087604c1a7ce951b766a136600069509d5a0089 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 22 Nov 2024 15:44:30 +1100 Subject: [PATCH 176/302] fix: address most PR reviews --- ts/components/MemberListItem.tsx | 17 +++- .../dialog/UpdateGroupMembersDialog.tsx | 10 ++- .../leftpane/overlay/OverlayClosedGroup.tsx | 6 +- ts/receiver/configMessage.ts | 12 +-- ts/receiver/groupv2/handleGroupV2Message.ts | 5 +- ts/session/apis/snode_api/SNodeAPI.ts | 6 +- .../apis/snode_api/SnodeRequestTypes.ts | 31 ++++--- ts/session/apis/snode_api/batchRequest.ts | 4 +- ts/session/apis/snode_api/expireRequest.ts | 11 ++- .../factories/StoreGroupRequestFactory.ts | 2 +- ts/session/apis/snode_api/namespaces.ts | 8 +- ts/session/apis/snode_api/onions.ts | 6 +- ts/session/apis/snode_api/pollingTypes.ts | 6 +- .../snode_api/signature/groupSignature.ts | 10 ++- .../snode_api/signature/signatureShared.ts | 19 ++-- .../snode_api/signature/snodeSignatures.ts | 16 ++-- ts/session/apis/snode_api/swarmPolling.ts | 87 ++++++++++++------- .../SwarmPollingGroupConfig.ts | 6 +- ts/session/apis/snode_api/types.ts | 31 +++++-- ts/session/constants.ts | 2 + ts/session/types/utility.ts | 2 + ts/session/types/with.ts | 4 + .../jobs/GroupPendingRemovalsJob.ts | 5 ++ .../utils/job_runners/jobs/UserSyncJob.ts | 10 +-- .../utils/libsession/libsession_utils.ts | 16 ++-- ts/state/ducks/metaGroups.ts | 4 +- ts/state/selectors/groups.ts | 22 +++-- .../libsession_util/libsession_utils_test.ts | 24 ++--- .../user_sync_job/UserSyncJob_test.ts | 17 ++-- .../browser/libsession_worker_functions.ts | 4 +- .../browser/libsession_worker_interface.ts | 86 +++++++++--------- .../node/libsession/libsession.worker.ts | 30 ++++--- 32 files changed, 311 insertions(+), 208 deletions(-) create mode 100644 ts/session/types/utility.ts diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index bc3501b676..a7ab0ba24b 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -2,7 +2,10 @@ import styled from 'styled-components'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; -import { useNicknameOrProfileNameOrShortenedPubkey } from '../hooks/useParamSelector'; +import { + useNicknameOrProfileNameOrShortenedPubkey, + useWeAreAdmin, +} from '../hooks/useParamSelector'; import { promoteUsersInGroup } from '../interactions/conversationInteractions'; import { PubKey } from '../session/types'; import { UserUtils } from '../session/utils'; @@ -17,6 +20,7 @@ import { useMemberPromotionFailed, useMemberPromotionSent, useMemberIsNominatedAdmin, + useMemberPendingRemoval, } from '../state/selectors/groups'; import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar'; import { Flex } from './basic/Flex'; @@ -124,7 +128,10 @@ const ResendContainer = ({ groupPk, pubkey, }: Pick) => { + const weAreAdmin = useWeAreAdmin(groupPk); + if ( + weAreAdmin && displayGroupStatus && groupPk && PubKey.is03Pubkey(groupPk) && @@ -258,10 +265,16 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP const PromoteButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupPubkeyType }) => { const memberAcceptedInvite = useMemberHasAcceptedInvite(pubkey, groupPk); const memberIsNominatedAdmin = useMemberIsNominatedAdmin(pubkey, groupPk); + const memberIsPendingRemoval = useMemberPendingRemoval(pubkey, groupPk); // When invite-as-admin was used to invite that member, the resend button is available to resend the promote message. // We want to show that button only to promote a normal member who accepted a normal invite but wasn't promoted yet. // ^ this is only the case for testing. The UI will be different once we release the promotion process - if (!hasClosedGroupV2QAButtons() || !memberAcceptedInvite || memberIsNominatedAdmin) { + if ( + !hasClosedGroupV2QAButtons() || + !memberAcceptedInvite || + memberIsNominatedAdmin || + memberIsPendingRemoval + ) { return null; } return ( diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index 29540f5019..c5b25dcdb2 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -72,7 +72,9 @@ const MemberList = (props: { <> {sortedMembers.map(member => { const isSelected = (weAreAdmin && selectedMembers.includes(member)) || false; - const isAdmin = groupAdmins?.includes(member); + const memberIsAdmin = groupAdmins?.includes(member); + // we want to hide the toggle for admins are they are not selectable + const showRadioButton = !memberIsAdmin && weAreAdmin; return ( diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index 8ef59b4a12..6454a56e0e 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -91,7 +91,7 @@ async function createClosedGroupWithErrorHandling( return false; } - // >= because we add ourself as a member AFTER this. so a 10 group is already invalid as it will be 11 when we are included + // >= because we add ourself as a member AFTER this. so a 10 member group is already invalid as it will be 11 with us // the same is valid with groups count < 1 if (groupMemberIds.length < 1) { @@ -109,7 +109,7 @@ async function createClosedGroupWithErrorHandling( return true; } -// duplicated form the legacy one below because this one is a lot more tightly linked with redux async thunks logic +// duplicated from the legacy one below because this one is a lot more tightly linked with redux async thunks logic export const OverlayClosedGroupV2 = () => { const dispatch = useDispatch(); const us = useOurPkStr(); @@ -144,7 +144,7 @@ export const OverlayClosedGroupV2 = () => { return; } - // >= because we add ourself as a member AFTER this. so a 10 group is already invalid as it will be 11 with ourself + // >= because we add ourself as a member AFTER this. so a 10 member group is already invalid as it will be 11 with us // the same is valid with groups count < 1 if (members.length < 1) { diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index e89ff7a948..e70c0378d7 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -51,7 +51,7 @@ import { ReleasedFeatures } from '../util/releaseFeature'; import { ContactsWrapperActions, ConvoInfoVolatileWrapperActions, - GenericWrapperActions, + UserGenericWrapperActions, MetaGroupWrapperActions, UserConfigWrapperActions, UserGroupsWrapperActions, @@ -94,7 +94,7 @@ function byUserNamespace(incomingConfigs: Array hashesMerged.includes(m.hash)) .map(m => m.storedAt); @@ -1024,7 +1024,7 @@ async function processUserMergingResults(results: Map | null> => { const TEST_getMinTimeout = () => 500; /** - * Delete the specified message hashes from the our own swarm only. - * Note: legacy group did not support removing messages from the swarm. + * Delete the specified message hashes from our own swarm only. + * Note: legacy groups does not support this */ const networkDeleteMessageOurSwarm = async ( messagesHashes: Set, @@ -298,7 +298,7 @@ const networkDeleteMessageOurSwarm = async ( * Returns true when the hashes have been removed successfully. * Returns false when * - we don't have the secretKey - * - if one of the hash was already not present in the swarm, + * - if one of the hashes was already not found in the swarm, * - if the request failed too many times */ const networkDeleteMessagesForGroup = async ( diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 1f849e2c06..9bbacc97e3 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -17,13 +17,17 @@ import { } from './namespaces'; import { GroupDetailsNeededForSignature, SnodeGroupSignature } from './signature/groupSignature'; import { SnodeSignature } from './signature/snodeSignatures'; -import { ShortenOrExtend, WithMessagesHashes } from './types'; +import { ShortenOrExtend, WithMessagesHashes, WithShortenOrExtend } from './types'; import { TTL_DEFAULT } from '../../constants'; import { NetworkTime } from '../../../util/NetworkTime'; -import { WithSecretKey, WithSignature, WithTimestamp } from '../../types/with'; - -type WithMaxSize = { max_size?: number }; -export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; +import { + WithCreatedAtNetworkTimestamp, + WithMaxSize, + WithSecretKey, + WithSignature, + WithTimestamp, +} from '../../types/with'; +import { NonEmptyArray } from '../../types/utility'; /** * This is the base sub request class that every other type of request has to extend. @@ -68,10 +72,11 @@ export class RetrieveLegacyClosedGroupSubRequest extends SnodeAPISubRequest { return { method: this.method, params: { - namespace: this.namespace, // legacy closed groups retrieve are not authenticated because the clients do not have a shared key + namespace: this.namespace, pubkey: this.legacyGroupPk, last_hash: this.last_hash, max_size: this.max_size, + // legacy closed groups retrieve are not authenticated because the clients do not have a shared key // if we give a timestamp, a signature will be requested by the snode so this request for legacy does not take a timestamp }, }; @@ -501,7 +506,7 @@ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { } } -// todo: to use where delete_all is currently manually called +// TODO to use where delete_all is currently manually called export class DeleteAllFromUserNodeSubRequest extends SnodeAPISubRequest { public method = 'delete_all' as const; public readonly namespace = 'all'; // we can only delete_all for all namespaces currently, but the backend allows more @@ -661,8 +666,10 @@ export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { } } + /** + * This request can only be made by an admin and will be denied otherwise, so we make the secretKey mandatory in the constructor. + */ public async build() { - // Note: this request can only be made by an admin and will be denied otherwise, so we make the secretKey mandatory in the constructor. const signResult = await SnodeGroupSignature.getGroupSignatureByHashesParams({ method: this.method, messagesHashes: this.messageHashes, @@ -703,7 +710,6 @@ export class UpdateExpiryOnNodeUserSubRequest extends SnodeAPISubRequest { if (this.messageHashes.length === 0) { window.log.warn(`UpdateExpiryOnNodeUserSubRequest given empty list of messageHashes`); - throw new Error('UpdateExpiryOnNodeUserSubRequest given empty list of messageHashes'); } } @@ -821,8 +827,6 @@ export class UpdateExpiryOnNodeGroupSubRequest extends SnodeAPISubRequest { } } -type WithCreatedAtNetworkTimestamp = { createdAtNetworkTimestamp: number }; - export class StoreGroupMessageSubRequest extends SnodeAPISubRequest { public method = 'store' as const; public readonly namespace = SnodeNamespaces.ClosedGroupMessages; @@ -1302,7 +1306,6 @@ export function builtRequestToLoggingId(request: BuiltSnodeSubRequests): string case 'info': case 'oxend_request': return `${method}`; - case 'delete': case 'expire': case 'get_expiries': @@ -1318,7 +1321,6 @@ export function builtRequestToLoggingId(request: BuiltSnodeSubRequests): string isString(params.namespace) ? params.namespace : SnodeNamespace.toRole(params.namespace) }}`; } - case 'retrieve': case 'store': { const isUs = UserUtils.isUsFromCache(params.pubkey); @@ -1332,9 +1334,6 @@ export function builtRequestToLoggingId(request: BuiltSnodeSubRequests): string } } -// eslint-disable-next-line @typescript-eslint/array-type -type NonEmptyArray = [T, ...T[]]; - export type BatchResultEntry = { code: number; body: Record; diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index a5ef36392a..5496d84ea6 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -88,7 +88,7 @@ async function doSnodeBatchRequestNoRetries( } /** - * This function can be called to make the sign the subrequests and then call doSnodeBatchRequestNoRetries with the signed requests. + * This function can be called to sign subrequests and then call doSnodeBatchRequestNoRetries with them. * * Note: this function does not retry. * @@ -123,7 +123,6 @@ async function doUnsignedSnodeBatchRequestNoRetries( */ function decodeBatchRequest(snodeResponse: SnodeResponse): NotEmptyArrayOfBatchResults { try { - // console.error('decodeBatch: ', snodeResponse); if (snodeResponse.status !== 200) { throw new Error(`decodeBatchRequest invalid status code: ${snodeResponse.status}`); } @@ -142,7 +141,6 @@ function decodeBatchRequest(snodeResponse: SnodeResponse): NotEmptyArrayOfBatchR window.log.error('decodeBatchRequest failed with ', e.message); throw e; } - // "{"results":[{"body":"retrieve signature verification failed","code":401}]}" } export const BatchRequests = { diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index 8435a71898..da80e4aa0a 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -9,12 +9,15 @@ import { SeedNodeAPI } from '../seed_node_api'; import { MAX_SUBREQUESTS_COUNT, UpdateExpiryOnNodeUserSubRequest, - WithShortenOrExtend, fakeHash, } from './SnodeRequestTypes'; import { BatchRequests } from './batchRequest'; import { SnodePool } from './snodePool'; -import { ExpireMessageResultItem, ExpireMessagesResultsContent } from './types'; +import { + ExpireMessageResultItem, + ExpireMessagesResultsContent, + WithShortenOrExtend, +} from './types'; export type verifyExpireMsgsResponseSignatureProps = ExpireMessageResultItem & { pubkey: string; @@ -269,8 +272,8 @@ export type ExpireMessageWithExpiryOnSnodeProps = Pick< }; /** - * Exported for testing for testing only. Used to shorten/extend expiries of an array of array of messagehashes. - * @param expireDetails the subrequest to do + * Exported for testing for testing only. Used to shorten/extend expiries of an array of array of message hashes. + * @param expireDetails the sub-request to do * @returns */ export async function buildExpireRequestBatchExpiry( diff --git a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts index d5b01d06c5..89b6538f3e 100644 --- a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts +++ b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts @@ -42,7 +42,7 @@ async function makeGroupMessageSubRequest( const wrapped = MessageWrapper.wrapContentIntoEnvelope( SignalService.Envelope.Type.SESSION_MESSAGE, undefined, - updateMessage.createAtNetworkTimestamp, // message is signed with this timestmap + updateMessage.createAtNetworkTimestamp, // message is signed with this timestamp updateMessage.plainTextBuffer() ); diff --git a/ts/session/apis/snode_api/namespaces.ts b/ts/session/apis/snode_api/namespaces.ts index 377b706c55..1ed7a84249 100644 --- a/ts/session/apis/snode_api/namespaces.ts +++ b/ts/session/apis/snode_api/namespaces.ts @@ -42,17 +42,17 @@ export enum SnodeNamespaces { ClosedGroupMessages = 11, /** - * This is the namespace used to sync the closed group details for each closed group + * This is the namespace used to sync the keys for each closed group */ ClosedGroupKeys = 12, /** - * This is the namespace used to sync the members for each closed group + * This is the namespace used to sync the closed group details for each closed group */ ClosedGroupInfo = 13, /** - * This is the namespace used to sync the keys for each closed group + * This is the namespace used to sync the members for each closed group */ ClosedGroupMembers = 14, } @@ -105,7 +105,7 @@ function isUserConfigNamespace(namespace: SnodeNamespaces): namespace is SnodeNa case SnodeNamespaces.LegacyClosedGroup: case SnodeNamespaces.ClosedGroupRevokedRetrievableMessages: case SnodeNamespaces.Default: - // user messages is not hosting config based messages + // user messages are not hosting config based messages return false; default: diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index 60bbbd5656..475727d6ff 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -1,5 +1,4 @@ import https from 'https'; -// eslint-disable import/no-named-default import { AbortSignal } from 'abort-controller'; import ByteBuffer from 'bytebuffer'; import { to_string } from 'libsodium-wrappers-sumo'; @@ -263,6 +262,9 @@ function process406Or425Error(statusCode: number) { } } +/** + * 401 is a signature or forbidden error. + */ function process401Error(statusCode: number) { if (statusCode === 401) { throw new pRetry.AbortError( @@ -403,7 +405,7 @@ async function processAnyOtherErrorAtDestination( if ( status !== 400 && status !== 401 && // handled in process401Error - status !== 406 && // handled in process406Error + status !== 406 && // handled in process406Or425Error status !== 421 // handled in process421Error ) { window?.log?.warn(`[path] Got status at destination: ${status}`); diff --git a/ts/session/apis/snode_api/pollingTypes.ts b/ts/session/apis/snode_api/pollingTypes.ts index 0735b14ed5..ecc645295c 100644 --- a/ts/session/apis/snode_api/pollingTypes.ts +++ b/ts/session/apis/snode_api/pollingTypes.ts @@ -1,8 +1,8 @@ // That named-tuple syntax breaks prettier linting and formatting on the whole file it is used currently, so we keep it separately. -import { GroupPubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { ConversationTypeEnum } from '../../../models/types'; -export type PollForUs = [pubkey: string, type: ConversationTypeEnum.PRIVATE]; -export type PollForLegacy = [pubkey: string, type: ConversationTypeEnum.GROUP]; +export type PollForUs = [pubkey: PubkeyType, type: ConversationTypeEnum.PRIVATE]; +export type PollForLegacy = [pubkey: PubkeyType, type: ConversationTypeEnum.GROUP]; export type PollForGroup = [pubkey: GroupPubkeyType, type: ConversationTypeEnum.GROUPV2]; diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 6d4c0851ac..3ba7eea39e 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -28,7 +28,10 @@ async function getGroupInviteMessage({ }: { member: PubkeyType; groupName: string; - secretKey: Uint8ArrayLen64; // len 64 + /** + * secretKey, length of 64 bytes + */ + secretKey: Uint8ArrayLen64; groupPk: GroupPubkeyType; }) { const sodium = await getSodiumRenderer(); @@ -64,7 +67,10 @@ async function getGroupPromoteMessage({ groupName, }: { member: PubkeyType; - secretKey: Uint8ArrayLen64; // len 64 + /** + * secretKey, length of 64 bytes + */ + secretKey: Uint8ArrayLen64; groupPk: GroupPubkeyType; groupName: string; }) { diff --git a/ts/session/apis/snode_api/signature/signatureShared.ts b/ts/session/apis/snode_api/signature/signatureShared.ts index e9d1df41e8..9e89c55fcb 100644 --- a/ts/session/apis/snode_api/signature/signatureShared.ts +++ b/ts/session/apis/snode_api/signature/signatureShared.ts @@ -13,17 +13,26 @@ export type SnodeSigParamsShared = { export type SnodeSigParamsAdminGroup = SnodeSigParamsShared & { groupPk: GroupPubkeyType; - privKey: Uint8ArrayLen64; // len 64 + /** + * privKey, length of 64 bytes + */ + privKey: Uint8ArrayLen64; }; export type SnodeSigParamsSubAccount = SnodeSigParamsShared & { groupPk: GroupPubkeyType; - authData: Uint8ArrayLen100; // len 100 + /** + * authData, length of 100 bytes + */ + authData: Uint8ArrayLen100; }; export type SnodeSigParamsUs = SnodeSigParamsShared & { pubKey: string; - privKey: Uint8ArrayLen64; // len 64 + /** + * privKey, length of 64 bytes + */ + privKey: Uint8ArrayLen64; }; function getVerificationDataForStoreRetrieve(params: SnodeSigParamsShared) { @@ -41,8 +50,8 @@ function getVerificationDataForStoreRetrieve(params: SnodeSigParamsShared) { function isSigParamsForGroupAdmin( sigParams: SnodeSigParamsAdminGroup | SnodeSigParamsUs | SnodeSigParamsSubAccount ): sigParams is SnodeSigParamsAdminGroup { - const asGr = sigParams as SnodeSigParamsAdminGroup; - return PubKey.is03Pubkey(asGr.groupPk) && !isEmpty(asGr.privKey); + const toValidate = sigParams as SnodeSigParamsAdminGroup; + return PubKey.is03Pubkey(toValidate.groupPk) && !isEmpty(toValidate.privKey); } async function getSnodeSignatureShared(params: SnodeSigParamsAdminGroup | SnodeSigParamsUs) { diff --git a/ts/session/apis/snode_api/signature/snodeSignatures.ts b/ts/session/apis/snode_api/signature/snodeSignatures.ts index fd49eb36fe..ef61e872cd 100644 --- a/ts/session/apis/snode_api/signature/snodeSignatures.ts +++ b/ts/session/apis/snode_api/signature/snodeSignatures.ts @@ -64,7 +64,10 @@ type SnodeSigParamsShared = { type SnodeSigParamsAdminGroup = SnodeSigParamsShared & { groupPk: GroupPubkeyType; - privKey: Uint8ArrayLen64; // len 64 + /** + * privKey, length of 64 bytes + */ + privKey: Uint8ArrayLen64; }; type SnodeSigParamsSubAccount = SnodeSigParamsShared & { @@ -73,15 +76,18 @@ type SnodeSigParamsSubAccount = SnodeSigParamsShared & { }; type SnodeSigParamsUs = SnodeSigParamsShared & { - pubKey: string; - privKey: Uint8ArrayLen64; // len 64 + pubKey: PubkeyType; + /** + * privKey, length of 64 bytes + */ + privKey: Uint8ArrayLen64; }; function isSigParamsForGroupAdmin( sigParams: SnodeSigParamsAdminGroup | SnodeSigParamsUs | SnodeSigParamsSubAccount ): sigParams is SnodeSigParamsAdminGroup { - const asGr = sigParams as SnodeSigParamsAdminGroup; - return PubKey.is03Pubkey(asGr.groupPk) && !isEmpty(asGr.privKey); + const toValidate = sigParams as SnodeSigParamsAdminGroup; + return PubKey.is03Pubkey(toValidate.groupPk) && !isEmpty(toValidate.privKey); } function getVerificationData(params: SnodeSigParamsShared) { diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index bfdd22a81b..f62ea8e168 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -29,7 +29,7 @@ import { EnvelopePlus } from '../../../receiver/types'; import { updateIsOnline } from '../../../state/ducks/onion'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { - GenericWrapperActions, + UserGenericWrapperActions, MetaGroupWrapperActions, UserConfigWrapperActions, UserGroupsWrapperActions, @@ -147,7 +147,7 @@ export class SwarmPolling { } public stop(e?: Error) { - window.log.info('[swarmPolling] stopped swarm polling', e?.message || e || ''); + window.log.info('SwarmPolling: stopped swarm polling', e?.message || e || ''); for (let i = 0; i < timeouts.length; i++) { clearTimeout(timeouts[i]); @@ -168,7 +168,9 @@ export class SwarmPolling { public addGroupId(pubkey: PubKey | string, callbackFirstPoll?: () => Promise) { const pk = PubKey.cast(pubkey); if (this.groupPolling.findIndex(m => m.pubkey.key === pk.key) === -1) { - window?.log?.info('Swarm addGroupId: adding pubkey to polling', pk.key); + window?.log?.info( + `SwarmPolling: Swarm addGroupId: adding pubkey ${ed25519Str(pk.key)} to polling` + ); this.groupPolling.push({ pubkey: pk, lastPolledTimestamp: 0, callbackFirstPoll }); } else if (callbackFirstPoll) { // group is already polled. Hopefully we already have keys for it to decrypt messages? @@ -288,10 +290,13 @@ export class SwarmPolling { */ public async pollForAllKeys() { if (!window.getGlobalOnlineStatus()) { - window?.log?.error('pollForAllKeys: offline'); + window?.log?.error('SwarmPolling: pollForAllKeys: offline'); // Very important to set up a new polling call so we do retry at some point timeouts.push( - setTimeout(this.pollForAllKeys.bind(this), isDevProd() ? 500 : SWARM_POLLING_TIMEOUT.ACTIVE) + setTimeout( + this.pollForAllKeys.bind(this), + isDevProd() ? SWARM_POLLING_TIMEOUT.ACTIVE_DEV : SWARM_POLLING_TIMEOUT.ACTIVE + ) ); return; } @@ -309,11 +314,14 @@ export class SwarmPolling { try { await Promise.all(toPollDetails.map(toPoll => this.pollOnceForKey(toPoll))); } catch (e) { - window?.log?.warn('pollForAllKeys exception: ', e); + window?.log?.warn('SwarmPolling: pollForAllKeys exception: ', e); throw e; } finally { timeouts.push( - setTimeout(this.pollForAllKeys.bind(this), isDevProd() ? 500 : SWARM_POLLING_TIMEOUT.ACTIVE) + setTimeout( + this.pollForAllKeys.bind(this), + isDevProd() ? SWARM_POLLING_TIMEOUT.ACTIVE_DEV : SWARM_POLLING_TIMEOUT.ACTIVE + ) ); } } @@ -330,7 +338,7 @@ export class SwarmPolling { // if all snodes returned an error (null), no need to update the lastPolledTimestamp if (type === ConversationTypeEnum.GROUP || type === ConversationTypeEnum.GROUPV2) { window?.log?.debug( - `Polled for group${ed25519Str(pubkey)} got ${countMessages} messages back.` + `SwarmPolling: Polled for group${ed25519Str(pubkey)} got ${countMessages} messages back.` ); let lastPolledTimestamp = Date.now(); if (countMessages >= minMsgCountShouldRetry) { @@ -404,7 +412,7 @@ export class SwarmPolling { sodium, }); } catch (e) { - window.log.warn('handleLibSessionMessage failed with:', e.message); + window.log.warn('SwarmPolling: handleLibSessionMessage failed with:', e.message); } } } @@ -425,21 +433,23 @@ export class SwarmPolling { toPollFrom = sample(swarmSnodes); if (!toPollFrom) { - throw new Error(`pollOnceForKey: no snode in swarm for ${ed25519Str(pubkey)}`); + throw new Error( + `SwarmPolling: pollOnceForKey: no snode in swarm for ${ed25519Str(pubkey)}` + ); } // Note: always print something so we know if the polling is hanging window.log.info( - `about to pollNodeForKey of ${ed25519Str(pubkey)} from snode: ${ed25519Str(toPollFrom.pubkey_ed25519)} namespaces: ${namespaces} ` + `SwarmPolling: about to pollNodeForKey of ${ed25519Str(pubkey)} from snode: ${ed25519Str(toPollFrom.pubkey_ed25519)} namespaces: ${namespaces} ` ); resultsFromAllNamespaces = await this.pollNodeForKey(toPollFrom, pubkey, namespaces, type); // Note: always print something so we know if the polling is hanging window.log.info( - `pollNodeForKey of ${ed25519Str(pubkey)} from snode: ${ed25519Str(toPollFrom.pubkey_ed25519)} namespaces: ${namespaces} returned: ${resultsFromAllNamespaces?.length}` + `SwarmPolling: pollNodeForKey of ${ed25519Str(pubkey)} from snode: ${ed25519Str(toPollFrom.pubkey_ed25519)} namespaces: ${namespaces} returned: ${resultsFromAllNamespaces?.length}` ); } catch (e) { window.log.warn( - `pollNodeForKey of ${pubkey} namespaces: ${namespaces} failed with: ${e.message}` + `SwarmPolling: pollNodeForKey of ${pubkey} namespaces: ${namespaces} failed with: ${e.message}` ); resultsFromAllNamespaces = null; } @@ -459,7 +469,7 @@ export class SwarmPolling { resultsFromAllNamespaces ); window.log.debug( - `received confMessages:${confMessages?.length || 0}, revokedMessages:${revokedMessages?.length || 0}, , otherMessages:${otherMessages?.length || 0}, ` + `SwarmPolling: received confMessages:${confMessages?.length || 0}, revokedMessages:${revokedMessages?.length || 0}, , otherMessages:${otherMessages?.length || 0}, ` ); // We always handle the config messages first (for groups 03 or our own messages) await this.handleUserOrGroupConfMessages({ confMessages, pubkey, type }); @@ -468,7 +478,9 @@ export class SwarmPolling { // Merge results into one list of unique messages const uniqOtherMsgs = uniqBy(otherMessages, x => x.hash); if (uniqOtherMsgs.length) { - window.log.debug(`received uniqOtherMsgs: ${uniqOtherMsgs.length} for type: ${type}`); + window.log.debug( + `SwarmPolling: received uniqOtherMsgs: ${uniqOtherMsgs.length} for type: ${type}` + ); } await this.updateLastPollTimestampForPubkey({ countMessages: uniqOtherMsgs.length, @@ -479,7 +491,7 @@ export class SwarmPolling { const shouldDiscardMessages = await this.shouldLeaveNotPolledGroup({ type, pubkey }); if (shouldDiscardMessages) { window.log.info( - `polled a pk which should not be polled anymore: ${ed25519Str( + `SwarmPolling: polled a pk which should not be polled anymore: ${ed25519Str( pubkey )}. Discarding polling result` ); @@ -488,7 +500,7 @@ export class SwarmPolling { const newMessages = await this.handleSeenMessages(uniqOtherMsgs); window.log.info( - `handleSeenMessages: ${newMessages.length} out of ${uniqOtherMsgs.length} are not seen yet. snode: ${toPollFrom ? ed25519Str(toPollFrom.pubkey_ed25519) : 'undefined'}` + `SwarmPolling: handleSeenMessages: ${newMessages.length} out of ${uniqOtherMsgs.length} are not seen yet. snode: ${toPollFrom ? ed25519Str(toPollFrom.pubkey_ed25519) : 'undefined'}` ); if (type === ConversationTypeEnum.GROUPV2) { if (!PubKey.is03Pubkey(pubkey)) { @@ -569,21 +581,25 @@ export class SwarmPolling { for (let index = 0; index < LibSessionUtil.requiredUserVariants.length; index++) { const variant = LibSessionUtil.requiredUserVariants[index]; try { - const toBump = await GenericWrapperActions.currentHashes(variant); + const toBump = await UserGenericWrapperActions.currentHashes(variant); if (toBump?.length) { configHashesToBump.push(...toBump); } } catch (e) { - window.log.warn(`failed to get currentHashes for user variant ${variant}`); + window.log.warn(`SwarmPolling: failed to get currentHashes for user variant ${variant}`); } } - window.log.debug(`configHashesToBump private count: ${configHashesToBump.length}`); + window.log.debug( + `SwarmPolling: configHashesToBump private count: ${configHashesToBump.length}` + ); return configHashesToBump; } if (type === ConversationTypeEnum.GROUPV2 && PubKey.is03Pubkey(pubkey)) { const toBump = await MetaGroupWrapperActions.currentHashes(pubkey); - window.log.debug(`configHashesToBump group(${ed25519Str(pubkey)}) count: ${toBump.length}`); + window.log.debug( + `SwarmPolling: configHashesToBump group(${ed25519Str(pubkey)}) count: ${toBump.length}` + ); return toBump; } return []; @@ -599,7 +615,9 @@ export class SwarmPolling { ): Promise { const namespaceLength = namespaces.length; if (namespaceLength <= 0) { - throw new Error(`invalid number of retrieve namespace provided: ${namespaceLength}`); + throw new Error( + `SwarmPolling: invalid number of retrieve namespace provided: ${namespaceLength}` + ); } const snodeEdkey = node.pubkey_ed25519; @@ -635,7 +653,7 @@ export class SwarmPolling { }); window.log.info( - `updating last hashes for ${ed25519Str(pubkey)}: ${ed25519Str(snodeEdkey)} ${namespacesWithNewLastHashes.join(', ')}` + `SwarmPolling: updating last hashes for ${ed25519Str(pubkey)}: ${ed25519Str(snodeEdkey)} ${namespacesWithNewLastHashes.join(', ')}` ); await Promise.all( lastMessages.map(async (lastMessage, index) => { @@ -665,7 +683,7 @@ export class SwarmPolling { } else if (!window.inboxStore?.getState().onionPaths.isOnline) { window.inboxStore?.dispatch(updateIsOnline(true)); } - window?.log?.info('pollNodeForKey failed with:', e.message); + window?.log?.info('SwarmPolling: pollNodeForKey failed with:', e.message); return null; } } @@ -675,7 +693,7 @@ export class SwarmPolling { return; } window.log.debug( - `notPollingForGroupAsNotInWrapper ${ed25519Str(pubkey)} with reason:"${reason}"` + `SwarmPolling: notPollingForGroupAsNotInWrapper ${ed25519Str(pubkey)} with reason:"${reason}"` ); if (PubKey.is05Pubkey(pubkey)) { await ConvoHub.use().deleteLegacyGroup(pubkey, { @@ -922,10 +940,10 @@ export class SwarmPolling { // zod schema for retrieve items as returned by the snodes const retrieveItemSchema = z.object({ - hash: z.string(), - data: z.string(), - expiration: z.number(), - timestamp: z.number(), + hash: z.string().base64('retrieveItemSchema: hash was not base64'), + data: z.string().base64('retrieveItemSchema: data was not base64'), + expiration: z.number().finite(), + timestamp: z.number().finite().positive(), }); function retrieveItemWithNamespace( @@ -1015,7 +1033,7 @@ async function decryptForGroupV2(retrieveResult: { groupPk: string; content: Uint8Array; }): Promise { - window?.log?.info('received closed group message v2'); + window?.log?.debug('SwarmPolling: received closed group message v2'); try { const groupPk = retrieveResult.groupPk; if (!PubKey.is03Pubkey(groupPk)) { @@ -1040,7 +1058,7 @@ async function decryptForGroupV2(retrieveResult: { timestamp: parsedEnvelope.timestamp, }; } catch (e) { - window.log.warn('failed to decrypt message with error: ', e.message); + window.log.warn('SwarmPolling: failed to decrypt message with error: ', e.message); return null; } } @@ -1071,7 +1089,10 @@ async function handleMessagesForGroupV2( messageExpirationFromRetrieve: msg.expiration, }); } catch (e) { - window.log.warn('failed to handle groupv2 otherMessage because of: ', e.message); + window.log.warn( + 'SwarmPolling: failed to handle groupv2 otherMessage because of: ', + e.message + ); } finally { // that message was processed, add it to the seen messages list try { @@ -1082,7 +1103,7 @@ async function handleMessagesForGroupV2( }, ]); } catch (e) { - window.log.warn('failed saveSeenMessageHashes: ', e.message); + window.log.warn('SwarmPolling: failed saveSeenMessageHashes: ', e.message); } } } diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 36207386a2..c4562bc78b 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -144,14 +144,14 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { convo.set({ displayNameInProfile: refreshedInfos.name || undefined }); changes = true; } - const expectedMode = refreshedInfos.expirySeconds ? 'deleteAfterSend' : 'off'; + const expirationMode = refreshedInfos.expirySeconds ? 'deleteAfterSend' : 'off'; if ( refreshedInfos.expirySeconds !== convo.get('expireTimer') || - expectedMode !== convo.get('expirationMode') + expirationMode !== convo.get('expirationMode') ) { convo.set({ expireTimer: refreshedInfos.expirySeconds || undefined, - expirationMode: expectedMode, + expirationMode, }); changes = true; } diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index e3eeae5873..7fe1ab8267 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -5,10 +5,22 @@ import { SubaccountRevokeSubRequest, SubaccountUnrevokeSubRequest } from './Snod import { WithSignature, WithTimestamp } from '../../types/with'; export type RetrieveMessageItem = { + /** + * The message hash as stored on the snode + */ hash: string; + /** + * When the message is set to expire on the snode. + */ expiration: number; - data: string; // base64 encrypted content of the message - storedAt: number; // **not** the envelope timestamp, but when the message was effectively stored on the snode + /** + * base64 encrypted content of the message + */ + data: string; + /** + * **not** the envelope timestamp, but when the message was effectively stored on the snode + */ + storedAt: number; }; export type RetrieveMessageItemWithNamespace = RetrieveMessageItem & { @@ -51,16 +63,17 @@ export type SignedGroupHashesParams = WithTimestamp & messages: Array; }; -/** inherits from https://api.oxen.io/storage-rpc/#/recursive?id=recursive but we only care about these values */ +/** Inherits from https://api.oxen.io/storage-rpc/#/recursive?id=recursive but we only care about these values + * + * The signature uses the node's ed25519 pubkey. + *( PUBKEY_HEX || EXPIRY || RMSGs... || UMSGs... || CMSG_EXPs... ) + * where RMSGs are the requested expiry hashes, + * UMSGs are the actual updated hashes, and + * CMSG_EXPs are (HASH || EXPIRY) values, ascii-sorted by hash, for the unchanged message hashes included in the "unchanged" field. + */ export type ExpireMessageResultItem = WithSignature & { /** the expiry timestamp that was applied (which might be different from the request expiry */ expiry: number; - /** ( PUBKEY_HEX || EXPIRY || RMSGs... || UMSGs... || CMSG_EXPs... ) - where RMSGs are the requested expiry hashes, - UMSGs are the actual updated hashes, and - CMSG_EXPs are (HASH || EXPIRY) values, ascii-sorted by hash, for the unchanged message hashes included in the "unchanged" field. - The signature uses the node's ed25519 pubkey. - */ /** Record of , but did not get updated due to "shorten"/"extend" in the request. This field is only included when "shorten /extend" is explicitly given. */ unchanged?: Record; /** ascii-sorted list of hashes that had their expiries changed (messages that were not found, and messages excluded by the shorten/extend options, are not included) */ diff --git a/ts/session/constants.ts b/ts/session/constants.ts index 6f03bf9fd8..e0f3b8e1be 100644 --- a/ts/session/constants.ts +++ b/ts/session/constants.ts @@ -57,6 +57,8 @@ export const SWARM_POLLING_TIMEOUT = { MEDIUM_ACTIVE: DURATION.SECONDS * 60, /** 2 minutes */ INACTIVE: DURATION.SECONDS * 120, + /** 500 milliseconds */ + ACTIVE_DEV: 500, }; export const PROTOCOLS = { diff --git a/ts/session/types/utility.ts b/ts/session/types/utility.ts new file mode 100644 index 0000000000..c91cfdf9aa --- /dev/null +++ b/ts/session/types/utility.ts @@ -0,0 +1,2 @@ +// eslint-disable-next-line @typescript-eslint/array-type +export type NonEmptyArray = [T, ...T[]]; diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index bd5cebcbb0..6f1591f30c 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -11,3 +11,7 @@ export type WithAddWithoutHistoryMembers = { withoutHistory: Array } export type WithAddWithHistoryMembers = { withHistory: Array }; export type WithRemoveMembers = { removed: Array }; export type WithPromotedMembers = { promoted: Array }; + +export type WithMaxSize = { max_size?: number }; +export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; +export type WithCreatedAtNetworkTimestamp = { createdAtNetworkTimestamp: number }; diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 7005d9c887..4269a9056b 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -35,6 +35,7 @@ import { WithRemoveMembers, WithSecretKey, } from '../../../types/with'; +import { groupInfoActions } from '../../../../state/ducks/metaGroups'; const defaultMsBetweenRetries = 10000; const defaultMaxAttempts = 1; @@ -239,6 +240,10 @@ class GroupPendingRemovalsJob extends PersistedJob { for (let index = 0; index < userVariants.length; index++) { const variant = userVariants[index]; - const needsPush = await GenericWrapperActions.needsPush(variant); + const needsPush = await UserGenericWrapperActions.needsPush(variant); if (!needsPush) { continue; } - const { data, seqno, hashes, namespace } = await GenericWrapperActions.push(variant); + const { data, seqno, hashes, namespace } = await UserGenericWrapperActions.push(variant); variantsNeedingPush.add(variant); results.messages.push({ ciphertext: data, @@ -375,12 +375,12 @@ async function saveDumpsToDb(pubkey: PubkeyType | GroupPubkeyType) { for (let i = 0; i < LibSessionUtil.requiredUserVariants.length; i++) { const variant = LibSessionUtil.requiredUserVariants[i]; - const needsDump = await GenericWrapperActions.needsDump(variant); + const needsDump = await UserGenericWrapperActions.needsDump(variant); if (!needsDump) { continue; } - const dump = await GenericWrapperActions.dump(variant); + const dump = await UserGenericWrapperActions.dump(variant); await ConfigDumpData.saveConfigDump({ data: dump, publicKey: pubkey, diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index b2cac4c71f..a9225198c2 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -36,7 +36,7 @@ import { getUserED25519KeyPairBytes } from '../../session/utils/User'; import { stringify, toFixedUint8ArrayOfLength } from '../../types/sqlSharedTypes'; import { getGroupPubkeyFromWrapperType, - isMetaWrapperType, + isMetaGroupWrapperType, } from '../../webworker/workers/browser/libsession_worker_functions'; import { MetaGroupWrapperActions, @@ -356,7 +356,7 @@ const loadMetaDumpsFromDB = createAsyncThunk( const toReturn: Array = []; for (let index = 0; index < variantsWithData.length; index++) { const { variant, data } = variantsWithData[index]; - if (!isMetaWrapperType(variant)) { + if (!isMetaGroupWrapperType(variant)) { continue; } const groupPk = getGroupPubkeyFromWrapperType(variant); diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index 6c1a700442..bf896084df 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -106,6 +106,12 @@ function getMemberPromotionNotSent(state: StateType, pubkey: PubkeyType, convo?: return findMemberInMembers(members, pubkey)?.memberStatus === 'PROMOTION_NOT_SENT' || false; } +function getMemberPendingRemoval(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + const removedStatus = findMemberInMembers(members, pubkey)?.removedStatus; + return removedStatus !== 'NOT_REMOVED'; +} + export function getLibMembersCount(state: StateType, convo?: GroupPubkeyType): Array { return getLibMembersPubkeys(state, convo); } @@ -197,6 +203,10 @@ export function useMemberPromotionNotSent(member: PubkeyType, groupPk: GroupPubk return useSelector((state: StateType) => getMemberPromotionNotSent(state, member, groupPk)); } +export function useMemberPendingRemoval(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberPendingRemoval(state, member, groupPk)); +} + export function useMemberGroupChangePending() { return useSelector(getIsMemberGroupChangePendingFromUI); } @@ -248,11 +258,13 @@ export function useStateOf03GroupMembers(convoId?: string) { return m ? { ...m, memberStatus: 'INVITE_SENDING' as const } : null; }) ); - const promotionSending: Array = compact( promotionsSendingPk - .map(sending => unsortedMembers.find(m => m.pubkeyHex === sending)) - .map(m => { - return m ? { ...m, memberStatus: 'PROMOTION_SENDING' as const } : null; - })); + const promotionSending: Array = compact( + promotionsSendingPk + .map(sending => unsortedMembers.find(m => m.pubkeyHex === sending)) + .map(m => { + return m ? { ...m, memberStatus: 'PROMOTION_SENDING' as const } : null; + }) + ); // promotionSending has priority against invitesSending, so removing anything in invitesSending found in promotionSending invitesSending = differenceBy(invitesSending, promotionSending, value => value.pubkeyHex); diff --git a/ts/test/session/unit/libsession_util/libsession_utils_test.ts b/ts/test/session/unit/libsession_util/libsession_utils_test.ts index 3c65e9bf6b..b38d0276f4 100644 --- a/ts/test/session/unit/libsession_util/libsession_utils_test.ts +++ b/ts/test/session/unit/libsession_util/libsession_utils_test.ts @@ -8,7 +8,7 @@ import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { UserUtils } from '../../../../session/utils'; import { LibSessionUtil } from '../../../../session/utils/libsession/libsession_utils'; import { - GenericWrapperActions, + UserGenericWrapperActions, MetaGroupWrapperActions, } from '../../../../webworker/workers/browser/libsession_worker_interface'; import { TestUtils } from '../../../test-utils'; @@ -70,8 +70,8 @@ describe('LibSessionUtil saveDumpsToDb', () => { }); it('does not save to DB if all needsDump reports false', async () => { - Sinon.stub(GenericWrapperActions, 'needsDump').resolves(false); - const dump = Sinon.stub(GenericWrapperActions, 'dump').resolves(new Uint8Array()); + Sinon.stub(UserGenericWrapperActions, 'needsDump').resolves(false); + const dump = Sinon.stub(UserGenericWrapperActions, 'dump').resolves(new Uint8Array()); const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(sessionId); @@ -81,11 +81,11 @@ describe('LibSessionUtil saveDumpsToDb', () => { }); it('does save to DB if any needsDump reports true', async () => { - Sinon.stub(GenericWrapperActions, 'needsDump') + Sinon.stub(UserGenericWrapperActions, 'needsDump') .resolves(false) .withArgs('ConvoInfoVolatileConfig') .resolves(true); - const dump = Sinon.stub(GenericWrapperActions, 'dump').resolves(new Uint8Array()); + const dump = Sinon.stub(UserGenericWrapperActions, 'dump').resolves(new Uint8Array()); const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(sessionId); @@ -95,9 +95,9 @@ describe('LibSessionUtil saveDumpsToDb', () => { }); it('does save to DB if all needsDump reports true', async () => { - const needsDump = Sinon.stub(GenericWrapperActions, 'needsDump').resolves(true); + const needsDump = Sinon.stub(UserGenericWrapperActions, 'needsDump').resolves(true); const dumped = new Uint8Array([1, 2, 3]); - const dump = Sinon.stub(GenericWrapperActions, 'dump').resolves(dumped); + const dump = Sinon.stub(UserGenericWrapperActions, 'dump').resolves(dumped); const saveConfigDump = Sinon.stub(ConfigDumpData, 'saveConfigDump').resolves(); Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns(sessionId); @@ -223,7 +223,7 @@ describe('LibSessionUtil pendingChangesForUs', () => { }); it('empty results if all needsPush is false', async () => { - Sinon.stub(GenericWrapperActions, 'needsPush').resolves(false); + Sinon.stub(UserGenericWrapperActions, 'needsPush').resolves(false); const result = await LibSessionUtil.pendingChangesForUs(); expect(result.allOldHashes.size).to.be.equal(0); expect(result.messages.length).to.be.equal(0); @@ -237,10 +237,10 @@ describe('LibSessionUtil pendingChangesForUs', () => { hashes: ['123'], namespace: SnodeNamespaces.ConvoInfoVolatile, }; - const needsPush = Sinon.stub(GenericWrapperActions, 'needsPush'); + const needsPush = Sinon.stub(UserGenericWrapperActions, 'needsPush'); needsPush.resolves(false).withArgs('ConvoInfoVolatileConfig').resolves(true); - const push = Sinon.stub(GenericWrapperActions, 'push') + const push = Sinon.stub(UserGenericWrapperActions, 'push') .throws() .withArgs('ConvoInfoVolatileConfig') .resolves(pushResultsConvo); @@ -298,10 +298,10 @@ describe('LibSessionUtil pendingChangesForUs', () => { hashes: ['111'], namespace: SnodeNamespaces.UserProfile, }; - const needsPush = Sinon.stub(GenericWrapperActions, 'needsPush'); + const needsPush = Sinon.stub(UserGenericWrapperActions, 'needsPush'); needsPush.resolves(true); - const push = Sinon.stub(GenericWrapperActions, 'push'); + const push = Sinon.stub(UserGenericWrapperActions, 'push'); push .throws() .withArgs('ContactsConfig') diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index 68368715bf..944d57f248 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -20,7 +20,7 @@ import { UserDestinationChanges, UserSuccessfulChange, } from '../../../../../../session/utils/libsession/libsession_utils'; -import { GenericWrapperActions } from '../../../../../../webworker/workers/browser/libsession_worker_interface'; +import { UserGenericWrapperActions } from '../../../../../../webworker/workers/browser/libsession_worker_interface'; import { TestUtils } from '../../../../../test-utils'; import { TypedStub, stubConfigDumpData } from '../../../../../test-utils/utils'; import { NetworkTime } from '../../../../../../util/NetworkTime'; @@ -231,7 +231,7 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { let sendStub: TypedStub; let pendingChangesForUsStub: TypedStub; - let dump: TypedStub; + let dump: TypedStub; beforeEach(async () => { sodium = await getSodiumNode(); @@ -246,7 +246,7 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { stubConfigDumpData('saveConfigDump').resolves(); pendingChangesForUsStub = Sinon.stub(LibSessionUtil, 'pendingChangesForUs'); - dump = Sinon.stub(GenericWrapperActions, 'dump').resolves(new Uint8Array()); + dump = Sinon.stub(UserGenericWrapperActions, 'dump').resolves(new Uint8Array()); sendStub = Sinon.stub(MessageSender, 'sendEncryptedDataToSnode'); }); afterEach(() => { @@ -254,7 +254,7 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { }); it('call savesDumpToDb even if no changes are required on the serverside', async () => { - Sinon.stub(GenericWrapperActions, 'needsDump').resolves(true); + Sinon.stub(UserGenericWrapperActions, 'needsDump').resolves(true); const result = await UserSync.pushChangesToUserSwarmIfNeeded(); pendingChangesForUsStub.resolves(undefined); @@ -271,7 +271,10 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { }); it('calls sendEncryptedDataToSnode and retry if network returned nothing', async () => { - Sinon.stub(GenericWrapperActions, 'needsDump').resolves(false).onSecondCall().resolves(true); + Sinon.stub(UserGenericWrapperActions, 'needsDump') + .resolves(false) + .onSecondCall() + .resolves(true); const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); @@ -316,10 +319,10 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { }, ]; Sinon.stub(LibSessionUtil, 'batchResultsToUserSuccessfulChange').returns(changes); - const confirmPushed = Sinon.stub(GenericWrapperActions, 'confirmPushed').resolves(); + const confirmPushed = Sinon.stub(UserGenericWrapperActions, 'confirmPushed').resolves(); // all 4 need to be dumped - const needsDump = Sinon.stub(GenericWrapperActions, 'needsDump').resolves(true); + const needsDump = Sinon.stub(UserGenericWrapperActions, 'needsDump').resolves(true); // ============ 1st try, let's say we didn't get as much entries in the result as expected. This should be a fail sendStub.resolves([ diff --git a/ts/webworker/workers/browser/libsession_worker_functions.ts b/ts/webworker/workers/browser/libsession_worker_functions.ts index 783f08cd31..625bd6035f 100644 --- a/ts/webworker/workers/browser/libsession_worker_functions.ts +++ b/ts/webworker/workers/browser/libsession_worker_functions.ts @@ -81,7 +81,9 @@ export function isUserConfigWrapperType( ); } -export function isMetaWrapperType(config: ConfigWrapperObjectTypesMeta): config is MetaGroupConfig { +export function isMetaGroupWrapperType( + config: ConfigWrapperObjectTypesMeta +): config is MetaGroupConfig { return config.startsWith(MetaGroupConfigValue); } diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 4cae67f801..28320fe54d 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -5,7 +5,7 @@ import { ContactInfoSet, ContactsWrapperActionsCalls, ConvoInfoVolatileWrapperActionsCalls, - GenericWrapperActionsCall, + GenericWrapperActionsCall as UserGenericWrapperActionsCall, GroupInfoSet, GroupPubkeyType, GroupWrapperConstructor, @@ -56,31 +56,30 @@ const internalCallLibSessionWorker = async ([ return result; }; -type GenericWrapperActionsCalls = { +type UserGenericWrapperActionsCalls = { init: ( wrapperId: ConfigWrapperUser, ed25519Key: Uint8Array, dump: Uint8Array | null ) => Promise; free: (wrapperId: ConfigWrapperUser) => Promise; - confirmPushed: GenericWrapperActionsCall; - dump: GenericWrapperActionsCall; - makeDump: GenericWrapperActionsCall; - merge: GenericWrapperActionsCall; - needsDump: GenericWrapperActionsCall; - needsPush: GenericWrapperActionsCall; - push: GenericWrapperActionsCall; - currentHashes: GenericWrapperActionsCall; - storageNamespace: GenericWrapperActionsCall; + confirmPushed: UserGenericWrapperActionsCall; + dump: UserGenericWrapperActionsCall; + makeDump: UserGenericWrapperActionsCall; + merge: UserGenericWrapperActionsCall; + needsDump: UserGenericWrapperActionsCall; + needsPush: UserGenericWrapperActionsCall; + push: UserGenericWrapperActionsCall; + currentHashes: UserGenericWrapperActionsCall; + storageNamespace: UserGenericWrapperActionsCall; }; -// TODO rename this to a UserWrapperActions or UserGenericWrapperActions as those actions are only used for User Wrappers now -export const GenericWrapperActions: GenericWrapperActionsCalls = { +export const UserGenericWrapperActions: UserGenericWrapperActionsCalls = { /** base wrapper generic actions */ init: async (wrapperId: ConfigWrapperUser, ed25519Key: Uint8Array, dump: Uint8Array | null) => callLibSessionWorker([wrapperId, 'init', ed25519Key, dump]) as ReturnType< - GenericWrapperActionsCalls['init'] + UserGenericWrapperActionsCalls['init'] >, /** This function is used to free wrappers from memory only. @@ -90,59 +89,60 @@ export const GenericWrapperActions: GenericWrapperActionsCalls = { callLibSessionWorker([wrapperId, 'free']) as Promise, confirmPushed: async (wrapperId: ConfigWrapperUser, seqno: number, hash: string) => callLibSessionWorker([wrapperId, 'confirmPushed', seqno, hash]) as ReturnType< - GenericWrapperActionsCalls['confirmPushed'] + UserGenericWrapperActionsCalls['confirmPushed'] >, dump: async (wrapperId: ConfigWrapperUser) => - callLibSessionWorker([wrapperId, 'dump']) as ReturnType, + callLibSessionWorker([wrapperId, 'dump']) as ReturnType, makeDump: async (wrapperId: ConfigWrapperUser) => callLibSessionWorker([wrapperId, 'makeDump']) as ReturnType< - GenericWrapperActionsCalls['makeDump'] + UserGenericWrapperActionsCalls['makeDump'] >, merge: async (wrapperId: ConfigWrapperUser, toMerge: Array) => callLibSessionWorker([wrapperId, 'merge', toMerge]) as ReturnType< - GenericWrapperActionsCalls['merge'] + UserGenericWrapperActionsCalls['merge'] >, needsDump: async (wrapperId: ConfigWrapperUser) => callLibSessionWorker([wrapperId, 'needsDump']) as ReturnType< - GenericWrapperActionsCalls['needsDump'] + UserGenericWrapperActionsCalls['needsDump'] >, needsPush: async (wrapperId: ConfigWrapperUser) => callLibSessionWorker([wrapperId, 'needsPush']) as ReturnType< - GenericWrapperActionsCalls['needsPush'] + UserGenericWrapperActionsCalls['needsPush'] >, push: async (wrapperId: ConfigWrapperUser) => - callLibSessionWorker([wrapperId, 'push']) as ReturnType, + callLibSessionWorker([wrapperId, 'push']) as ReturnType, currentHashes: async (wrapperId: ConfigWrapperUser) => callLibSessionWorker([wrapperId, 'currentHashes']) as ReturnType< - GenericWrapperActionsCalls['currentHashes'] + UserGenericWrapperActionsCalls['currentHashes'] >, storageNamespace: async (wrapperId: ConfigWrapperUser) => callLibSessionWorker([wrapperId, 'storageNamespace']) as ReturnType< - GenericWrapperActionsCalls['storageNamespace'] + UserGenericWrapperActionsCalls['storageNamespace'] >, }; function createBaseActionsFor(wrapperType: ConfigWrapperUser) { return { - /* Reuse the GenericWrapperActions with the UserConfig argument */ + /* Reuse the UserConfigWrapperActions with the UserConfig argument */ init: async (ed25519Key: Uint8Array, dump: Uint8Array | null) => - GenericWrapperActions.init(wrapperType, ed25519Key, dump), - free: async () => GenericWrapperActions.free(wrapperType), + UserGenericWrapperActions.init(wrapperType, ed25519Key, dump), + free: async () => UserGenericWrapperActions.free(wrapperType), confirmPushed: async (seqno: number, hash: string) => - GenericWrapperActions.confirmPushed(wrapperType, seqno, hash), - dump: async () => GenericWrapperActions.dump(wrapperType), - makeDump: async () => GenericWrapperActions.makeDump(wrapperType), - needsDump: async () => GenericWrapperActions.needsDump(wrapperType), - needsPush: async () => GenericWrapperActions.needsPush(wrapperType), - push: async () => GenericWrapperActions.push(wrapperType), - currentHashes: async () => GenericWrapperActions.currentHashes(wrapperType), - merge: async (toMerge: Array) => GenericWrapperActions.merge(wrapperType, toMerge), - storageNamespace: async () => GenericWrapperActions.storageNamespace(wrapperType), + UserGenericWrapperActions.confirmPushed(wrapperType, seqno, hash), + dump: async () => UserGenericWrapperActions.dump(wrapperType), + makeDump: async () => UserGenericWrapperActions.makeDump(wrapperType), + needsDump: async () => UserGenericWrapperActions.needsDump(wrapperType), + needsPush: async () => UserGenericWrapperActions.needsPush(wrapperType), + push: async () => UserGenericWrapperActions.push(wrapperType), + currentHashes: async () => UserGenericWrapperActions.currentHashes(wrapperType), + merge: async (toMerge: Array) => + UserGenericWrapperActions.merge(wrapperType, toMerge), + storageNamespace: async () => UserGenericWrapperActions.storageNamespace(wrapperType), }; } export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = { - /* Reuse the GenericWrapperActions with the UserConfig argument */ + /* Reuse the UserConfigWrapperActions with the UserConfig argument */ ...createBaseActionsFor('UserConfig'), /** UserConfig wrapper specific actions */ @@ -195,7 +195,7 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = { }; export const ContactsWrapperActions: ContactsWrapperActionsCalls = { - /* Reuse the GenericWrapperActions with the ContactConfig argument */ + /* Reuse the UserConfigWrapperActions with the ContactConfig argument */ ...createBaseActionsFor('ContactsConfig'), /** ContactsConfig wrapper specific actions */ @@ -231,11 +231,11 @@ function dispatchCachedGroupsToRedux() { export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls & { getCachedGroup: (pubkeyHex: GroupPubkeyType) => UserGroupsGet | undefined; } = { - /* Reuse the GenericWrapperActions with the UserGroupsConfig argument */ + /* Reuse the UserConfigWrapperActions with the UserGroupsConfig argument */ ...createBaseActionsFor('UserGroupsConfig'), // override the merge() as we need to refresh the cached groups merge: async (toMerge: Array) => { - const mergeRet = await GenericWrapperActions.merge('UserGroupsConfig', toMerge); + const mergeRet = await UserGenericWrapperActions.merge('UserGroupsConfig', toMerge); await UserGroupsWrapperActions.getAllGroups(); // this refreshes the cached data after merge return mergeRet; }, @@ -395,7 +395,7 @@ export const UserGroupsWrapperActions: UserGroupsWrapperActionsCalls & { }; export const ConvoInfoVolatileWrapperActions: ConvoInfoVolatileWrapperActionsCalls = { - /* Reuse the GenericWrapperActions with the ConvoInfoVolatileConfig argument */ + /* Reuse the UserConfigWrapperActions with the ConvoInfoVolatileConfig argument */ ...createBaseActionsFor('ConvoInfoVolatileConfig'), /** ConvoInfoVolatile wrapper specific actions */ @@ -579,7 +579,6 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { 'memberConstructAndSet', pubkeyHex, ]) as Promise>, - memberGetAll: async (groupPk: GroupPubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberGetAll']) as Promise< ReturnType @@ -657,7 +656,6 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { ]) as Promise>, /** GroupKeys wrapper specific actions */ - keyRekey: async (groupPk: GroupPubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'keyRekey']) as Promise< ReturnType @@ -674,7 +672,6 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'currentHashes']) as Promise< ReturnType >, - loadKeyMessage: async ( groupPk: GroupPubkeyType, hash: string, @@ -727,7 +724,6 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { message, authData, ]) as Promise>, - swarmSubAccountToken: async (groupPk: GroupPubkeyType, memberPk: PubkeyType) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, @@ -748,7 +744,7 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { }; export const MultiEncryptWrapperActions: MultiEncryptActionsCalls = { - /* Reuse the GenericWrapperActions with the UserConfig argument */ + /* Reuse the UserConfigWrapperActions with the UserConfig argument */ ...createBaseActionsFor('UserConfig'), /** UserConfig wrapper specific actions */ diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index e8f8fe753b..a43ce11a95 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -12,7 +12,7 @@ import { UserConfigWrapperNode, UserGroupsWrapperNode, } from 'libsession_util_nodejs'; -import { isEmpty, isNull } from 'lodash'; +import { isEmpty, isNull, isObject } from 'lodash'; import { BlindingConfig, @@ -22,7 +22,7 @@ import { MetaGroupConfig, MultiEncryptConfig, isBlindingWrapperType, - isMetaWrapperType, + isMetaGroupWrapperType, isMultiEncryptWrapperType, isUserConfigWrapperType, } from '../../browser/libsession_worker_functions'; @@ -70,7 +70,7 @@ function getGroupPubkeyFromWrapperType(type: ConfigWrapperGroup): GroupPubkeyTyp function getGroupWrapper(type: ConfigWrapperGroup): MetaGroupWrapperNode | undefined { assertGroupWrapperType(type); - if (isMetaWrapperType(type)) { + if (isMetaGroupWrapperType(type)) { const pk = getGroupPubkeyFromWrapperType(type); return metaGroupWrappers.get(pk); @@ -105,7 +105,7 @@ function getCorrespondingUserWrapper(wrapperType: ConfigWrapperUser): BaseConfig } function getCorrespondingGroupWrapper(wrapperType: MetaGroupConfig): MetaGroupWrapperNode { - if (isMetaWrapperType(wrapperType)) { + if (isMetaGroupWrapperType(wrapperType)) { const wrapper = getGroupWrapper(wrapperType); if (!wrapper) { throw new Error(`GroupWrapper: ${wrapperType} is not init yet`); @@ -132,8 +132,8 @@ function getBlindingWrapper(wrapperType: BlindingConfig): BlindingWrapperNode { assertUnreachable(wrapperType, `getBlindingWrapper missing global handling for "${wrapperType}"`); } -function isUInt8Array(value: any) { - return value.constructor === Uint8Array; +function isUInt8Array(value: unknown): value is Uint8Array { + return isObject(value) && value.constructor === Uint8Array; } function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypesMeta): ConfigWrapperUser { @@ -144,7 +144,7 @@ function assertUserWrapperType(wrapperType: ConfigWrapperObjectTypesMeta): Confi } function assertGroupWrapperType(wrapperType: ConfigWrapperObjectTypesMeta): ConfigWrapperGroup { - if (!isMetaWrapperType(wrapperType)) { + if (!isMetaGroupWrapperType(wrapperType)) { throw new Error(`wrapperType "${wrapperType} is not of type Group"`); } return wrapperType; @@ -153,7 +153,7 @@ function assertGroupWrapperType(wrapperType: ConfigWrapperObjectTypesMeta): Conf /** * This function can be used to initialize a wrapper which takes the private ed25519 key of the user and a dump as argument. */ -function initUserWrapper(options: Array, wrapperType: ConfigWrapperUser) { +function initUserWrapper(options: Array, wrapperType: ConfigWrapperUser) { const userType = assertUserWrapperType(wrapperType); const wrapper = getUserWrapper(wrapperType); @@ -245,7 +245,7 @@ function initGroupWrapper(options: Array, wrapperType: ConfigWrapperGroup) userEd25519Secretkey, }: GroupWrapperConstructor = options[0]; - if (isMetaWrapperType(groupType)) { + if (isMetaGroupWrapperType(groupType)) { const pk = getGroupPubkeyFromWrapperType(groupType); const justCreated = new MetaGroupWrapperNode({ groupEd25519Pubkey, @@ -277,7 +277,7 @@ onmessage = async (e: { postMessage([jobId, null, null]); return; } - if (isMetaWrapperType(config)) { + if (isMetaGroupWrapperType(config)) { initGroupWrapper(args, config); postMessage([jobId, null, null]); return; @@ -295,7 +295,7 @@ onmessage = async (e: { postMessage([jobId, null, null]); return; } - if (isMetaWrapperType(config)) { + if (isMetaGroupWrapperType(config)) { const pk = getGroupPubkeyFromWrapperType(config); metaGroupWrappers.delete(pk); postMessage([jobId, null, null]); @@ -306,7 +306,7 @@ onmessage = async (e: { const wrapper = isUserConfigWrapperType(config) ? getCorrespondingUserWrapper(config) - : isMetaWrapperType(config) + : isMetaGroupWrapperType(config) ? getCorrespondingGroupWrapper(config) : isMultiEncryptWrapperType(config) ? getMultiEncryptWrapper(config) @@ -332,7 +332,7 @@ onmessage = async (e: { } }; -function prepareErrorForPostMessage(error: any) { +function prepareErrorForPostMessage(error: unknown) { if (!error) { return null; } @@ -341,5 +341,7 @@ function prepareErrorForPostMessage(error: any) { // return error.stack; // } - return error.message; + return isObject(error) && 'message' in error + ? error.message + : 'prepareErrorForPostMessage: unknown error'; } From 1035a1bae043ca01b203698bf8dba9a130896520 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 22 Nov 2024 15:44:46 +1100 Subject: [PATCH 177/302] chore: add generics to the subrequests to remove some duplication --- .../apis/snode_api/SnodeRequestTypes.ts | 159 ++++++++++-------- ts/session/types/with.ts | 1 + 2 files changed, 94 insertions(+), 66 deletions(-) diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 9bbacc97e3..8d1d2fd757 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -23,6 +23,7 @@ import { NetworkTime } from '../../../util/NetworkTime'; import { WithCreatedAtNetworkTimestamp, WithMaxSize, + WithMethod, WithSecretKey, WithSignature, WithTimestamp, @@ -32,11 +33,16 @@ import { NonEmptyArray } from '../../types/utility'; /** * This is the base sub request class that every other type of request has to extend. */ -abstract class SnodeAPISubRequest { - public abstract method: string; +abstract class SnodeAPISubRequest { + public method: T; public abstract loggingId(): string; public abstract getDestination(): PubkeyType | GroupPubkeyType | ''; + + constructor({ method }: WithMethod) { + this.method = method; + } + /** * When batch sending an array of requests, we will sort them by this number (the smallest will be put in front and the largest at the end). * This is needed for sending and polling for 03-group keys for instance. @@ -47,14 +53,52 @@ abstract class SnodeAPISubRequest { } } +abstract class RetrieveSubRequest extends SnodeAPISubRequest<'retrieve'> { + public readonly last_hash: string; + public readonly max_size: number | undefined; + + constructor({ last_hash, max_size }: WithMaxSize & { last_hash: string }) { + super({ method: 'retrieve' }); + this.last_hash = last_hash; + this.max_size = max_size; + } +} + +abstract class OxendSubRequest extends SnodeAPISubRequest<'oxend_request'> { + constructor() { + super({ method: 'oxend_request' }); + } +} + +abstract class DeleteAllSubRequest extends SnodeAPISubRequest<'delete_all'> { + constructor() { + super({ method: 'delete_all' }); + } +} + +abstract class DeleteSubRequest extends SnodeAPISubRequest<'delete'> { + constructor() { + super({ method: 'delete' }); + } +} + +abstract class ExpireSubRequest extends SnodeAPISubRequest<'expire'> { + constructor() { + super({ method: 'expire' }); + } +} + +abstract class StoreSubRequest extends SnodeAPISubRequest<'store'> { + constructor() { + super({ method: 'store' }); + } +} + /** * Retrieve for legacy was not authenticated */ -export class RetrieveLegacyClosedGroupSubRequest extends SnodeAPISubRequest { - method = 'retrieve' as const; +export class RetrieveLegacyClosedGroupSubRequest extends RetrieveSubRequest { public readonly legacyGroupPk: PubkeyType; - public readonly last_hash: string; - public readonly max_size: number | undefined; public readonly namespace = SnodeNamespaces.LegacyClosedGroup; constructor({ @@ -62,10 +106,8 @@ export class RetrieveLegacyClosedGroupSubRequest extends SnodeAPISubRequest { legacyGroupPk, max_size, }: WithMaxSize & { last_hash: string; legacyGroupPk: PubkeyType }) { - super(); + super({ last_hash, max_size }); this.legacyGroupPk = legacyGroupPk; - this.last_hash = last_hash; - this.max_size = max_size; } public build() { @@ -118,10 +160,7 @@ export type GetServicesNodesFromSeedRequest = { params: FetchSnodeListParams; }; -export class RetrieveUserSubRequest extends SnodeAPISubRequest { - public method = 'retrieve' as const; - public readonly last_hash: string; - public readonly max_size: number | undefined; +export class RetrieveUserSubRequest extends RetrieveSubRequest { public readonly namespace: SnodeNamespacesUser | SnodeNamespacesUserConfig; constructor({ @@ -132,9 +171,8 @@ export class RetrieveUserSubRequest extends SnodeAPISubRequest { last_hash: string; namespace: SnodeNamespacesUser | SnodeNamespacesUserConfig; }) { - super(); - this.last_hash = last_hash; - this.max_size = max_size; + super({ last_hash, max_size }); + this.namespace = namespace; } @@ -171,10 +209,7 @@ export class RetrieveUserSubRequest extends SnodeAPISubRequest { /** * Build and sign a request with either the admin key if we have it, or with our sub account details */ -export class RetrieveGroupSubRequest extends SnodeAPISubRequest { - public method = 'retrieve' as const; - public readonly last_hash: string; - public readonly max_size: number | undefined; +export class RetrieveGroupSubRequest extends RetrieveSubRequest { public readonly namespace: SnodeNamespacesGroup; public readonly groupDetailsNeededForSignature: GroupDetailsNeededForSignature; @@ -188,9 +223,7 @@ export class RetrieveGroupSubRequest extends SnodeAPISubRequest { namespace: SnodeNamespacesGroup; groupDetailsNeededForSignature: GroupDetailsNeededForSignature | null; }) { - super(); - this.last_hash = last_hash; - this.max_size = max_size; + super({ last_hash, max_size }); this.namespace = namespace; if (isEmpty(groupDetailsNeededForSignature)) { throw new Error('groupDetailsNeededForSignature is required'); @@ -239,8 +272,7 @@ export class RetrieveGroupSubRequest extends SnodeAPISubRequest { } } -export class OnsResolveSubRequest extends SnodeAPISubRequest { - public method = 'oxend_request' as const; +export class OnsResolveSubRequest extends OxendSubRequest { public readonly base64EncodedNameHash: string; constructor(base64EncodedNameHash: string) { @@ -270,9 +302,7 @@ export class OnsResolveSubRequest extends SnodeAPISubRequest { } } -export class GetServiceNodesSubRequest extends SnodeAPISubRequest { - public method = 'oxend_request' as const; - +export class GetServiceNodesSubRequest extends OxendSubRequest { public build() { return { method: this.method, @@ -305,12 +335,11 @@ export class GetServiceNodesSubRequest extends SnodeAPISubRequest { } } -export class SwarmForSubRequest extends SnodeAPISubRequest { - public method = 'get_swarm' as const; +export class SwarmForSubRequest extends SnodeAPISubRequest<'get_swarm'> { public readonly destination; constructor(pubkey: PubkeyType | GroupPubkeyType) { - super(); + super({ method: 'get_swarm' }); this.destination = pubkey; } @@ -341,8 +370,10 @@ export class SwarmForSubRequest extends SnodeAPISubRequest { } } -export class NetworkTimeSubRequest extends SnodeAPISubRequest { - public method = 'info' as const; +export class NetworkTimeSubRequest extends SnodeAPISubRequest<'info'> { + constructor() { + super({ method: 'info' }); + } public build() { return { @@ -360,7 +391,9 @@ export class NetworkTimeSubRequest extends SnodeAPISubRequest { } } -abstract class AbstractRevokeSubRequest extends SnodeAPISubRequest { +abstract class AbstractRevokeSubRequest< + T extends 'revoke_subaccount' | 'unrevoke_subaccount', +> extends SnodeAPISubRequest { public readonly destination: GroupPubkeyType; public readonly timestamp: number; public readonly revokeTokenHex: Array; @@ -371,8 +404,11 @@ abstract class AbstractRevokeSubRequest extends SnodeAPISubRequest { timestamp, revokeTokenHex, secretKey, - }: WithGroupPubkey & WithTimestamp & WithSecretKey & { revokeTokenHex: Array }) { - super(); + method, + }: WithGroupPubkey & + WithTimestamp & + WithSecretKey & { revokeTokenHex: Array; method: T }) { + super({ method }); this.destination = groupPk; this.timestamp = timestamp; this.revokeTokenHex = revokeTokenHex; @@ -406,8 +442,10 @@ abstract class AbstractRevokeSubRequest extends SnodeAPISubRequest { } } -export class SubaccountRevokeSubRequest extends AbstractRevokeSubRequest { - public method = 'revoke_subaccount' as const; +export class SubaccountRevokeSubRequest extends AbstractRevokeSubRequest<'revoke_subaccount'> { + constructor(args: Omit[0], 'method'>) { + super({ method: 'revoke_subaccount', ...args }); + } public async build() { const signature = await this.signWithAdminSecretKey(); @@ -423,9 +461,10 @@ export class SubaccountRevokeSubRequest extends AbstractRevokeSubRequest { } } -export class SubaccountUnrevokeSubRequest extends AbstractRevokeSubRequest { - public method = 'unrevoke_subaccount' as const; - +export class SubaccountUnrevokeSubRequest extends AbstractRevokeSubRequest<'unrevoke_subaccount'> { + constructor(args: Omit[0], 'method'>) { + super({ method: 'unrevoke_subaccount', ...args }); + } /** * For Revoke/unrevoke, this needs an admin signature */ @@ -452,12 +491,11 @@ export class SubaccountUnrevokeSubRequest extends AbstractRevokeSubRequest { * The getExpiries request can currently only be used for our own pubkey as we use it to fetch * the expiries updated by another of our devices. */ -export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { - public method = 'get_expiries' as const; +export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest<'get_expiries'> { public readonly messageHashes: Array; constructor(args: WithMessagesHashes) { - super(); + super({ method: 'get_expiries' }); this.messageHashes = args.messagesHashes; if (this.messageHashes.length === 0) { window.log.warn(`GetExpiriesFromNodeSubRequest given empty list of messageHashes`); @@ -507,8 +545,7 @@ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest { } // TODO to use where delete_all is currently manually called -export class DeleteAllFromUserNodeSubRequest extends SnodeAPISubRequest { - public method = 'delete_all' as const; +export class DeleteAllFromUserNodeSubRequest extends DeleteAllSubRequest { public readonly namespace = 'all'; // we can only delete_all for all namespaces currently, but the backend allows more public async build() { @@ -547,8 +584,7 @@ export class DeleteAllFromUserNodeSubRequest extends SnodeAPISubRequest { /** * Delete all the messages and not the config messages for that group 03. */ -export class DeleteAllFromGroupMsgNodeSubRequest extends SnodeAPISubRequest { - public method = 'delete_all' as const; +export class DeleteAllFromGroupMsgNodeSubRequest extends DeleteAllSubRequest { public readonly namespace = SnodeNamespaces.ClosedGroupMessages; public readonly adminSecretKey: Uint8Array; public readonly destination: GroupPubkeyType; @@ -592,8 +628,7 @@ export class DeleteAllFromGroupMsgNodeSubRequest extends SnodeAPISubRequest { } } -export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { - public method = 'delete' as const; +export class DeleteHashesFromUserNodeSubRequest extends DeleteSubRequest { public readonly messageHashes: Array; public readonly destination: PubkeyType; @@ -642,8 +677,7 @@ export class DeleteHashesFromUserNodeSubRequest extends SnodeAPISubRequest { } } -export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { - public method = 'delete' as const; +export class DeleteHashesFromGroupNodeSubRequest extends DeleteSubRequest { public readonly messageHashes: Array; public readonly destination: GroupPubkeyType; public readonly secretKey: Uint8Array; @@ -696,8 +730,7 @@ export class DeleteHashesFromGroupNodeSubRequest extends SnodeAPISubRequest { } } -export class UpdateExpiryOnNodeUserSubRequest extends SnodeAPISubRequest { - public method = 'expire' as const; +export class UpdateExpiryOnNodeUserSubRequest extends ExpireSubRequest { public readonly messageHashes: Array; public readonly expiryMs: number; public readonly shortenOrExtend: ShortenOrExtend; @@ -756,8 +789,7 @@ export class UpdateExpiryOnNodeUserSubRequest extends SnodeAPISubRequest { } } -export class UpdateExpiryOnNodeGroupSubRequest extends SnodeAPISubRequest { - public method = 'expire' as const; +export class UpdateExpiryOnNodeGroupSubRequest extends ExpireSubRequest { public readonly messageHashes: Array; public readonly expiryMs: number; public readonly shortenOrExtend: ShortenOrExtend; @@ -827,8 +859,7 @@ export class UpdateExpiryOnNodeGroupSubRequest extends SnodeAPISubRequest { } } -export class StoreGroupMessageSubRequest extends SnodeAPISubRequest { - public method = 'store' as const; +export class StoreGroupMessageSubRequest extends StoreSubRequest { public readonly namespace = SnodeNamespaces.ClosedGroupMessages; public readonly destination: GroupPubkeyType; public readonly ttlMs: number; @@ -914,8 +945,7 @@ export class StoreGroupMessageSubRequest extends SnodeAPISubRequest { abstract class StoreGroupConfigSubRequest< T extends SnodeNamespacesGroupConfig | SnodeNamespaces.ClosedGroupRevokedRetrievableMessages, -> extends SnodeAPISubRequest { - public method = 'store' as const; +> extends StoreSubRequest { public readonly namespace: T; public readonly destination: GroupPubkeyType; public readonly ttlMs: number; @@ -1025,8 +1055,7 @@ export class StoreGroupRevokedRetrievableSubRequest extends StoreGroupConfigSubR } } -export class StoreUserConfigSubRequest extends SnodeAPISubRequest { - public method = 'store' as const; +export class StoreUserConfigSubRequest extends StoreSubRequest { public readonly namespace: SnodeNamespacesUserConfig; public readonly ttlMs: number; public readonly encryptedData: Uint8Array; @@ -1096,8 +1125,7 @@ export class StoreUserConfigSubRequest extends SnodeAPISubRequest { /** * A request to send a message to the default namespace of another user (namespace 0 is not authenticated) */ -export class StoreUserMessageSubRequest extends SnodeAPISubRequest { - public method = 'store' as const; +export class StoreUserMessageSubRequest extends StoreSubRequest { public readonly ttlMs: number; public readonly encryptedData: Uint8Array; public readonly namespace = SnodeNamespaces.Default; @@ -1170,8 +1198,7 @@ export class StoreUserMessageSubRequest extends SnodeAPISubRequest { * * TODO: this is almost an exact match of `StoreUserMessageSubRequest` due to be removed once we get rid of legacy groups. */ -export class StoreLegacyGroupMessageSubRequest extends SnodeAPISubRequest { - public method = 'store' as const; +export class StoreLegacyGroupMessageSubRequest extends StoreSubRequest { public readonly ttlMs: number; public readonly encryptedData: Uint8Array; public readonly namespace = SnodeNamespaces.LegacyClosedGroup; diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index 6f1591f30c..5f63a9dc84 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -15,3 +15,4 @@ export type WithPromotedMembers = { promoted: Array }; export type WithMaxSize = { max_size?: number }; export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; export type WithCreatedAtNetworkTimestamp = { createdAtNetworkTimestamp: number }; +export type WithMethod = { method: T }; From c7995a05d284671fbf23cd524cdbd4d4e32b888c Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 25 Nov 2024 10:30:23 +1100 Subject: [PATCH 178/302] chore: remove min of 2 hash hack, we don't need it anymore --- ts/session/apis/snode_api/SnodeRequestTypes.ts | 3 --- ts/session/apis/snode_api/expireRequest.ts | 15 ++------------- ts/session/apis/snode_api/getExpiriesRequest.ts | 9 ++------- .../GetExpiriesRequest_test.ts | 8 ++------ 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 8d1d2fd757..af76dfd88e 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1296,9 +1296,6 @@ type StoreOnNodeParams = StoreOnNodeNormalParams | StoreOnNodeSubAccountParams; export type MethodBatchType = 'batch' | 'sequence'; -// Until the next storage server release is released, we need to have at least 2 hashes in the list for the `get_expiries` AND for the `update_expiries` -export const fakeHash = '///////////////////////////////////////////'; - export type RawSnodeSubRequests = | RetrieveLegacyClosedGroupSubRequest | RetrieveUserSubRequest diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index da80e4aa0a..3f13d51832 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -6,11 +6,7 @@ import { getSodiumRenderer } from '../../crypto'; import { StringUtils, UserUtils } from '../../utils'; import { fromBase64ToArray, fromHexToArray } from '../../utils/String'; import { SeedNodeAPI } from '../seed_node_api'; -import { - MAX_SUBREQUESTS_COUNT, - UpdateExpiryOnNodeUserSubRequest, - fakeHash, -} from './SnodeRequestTypes'; +import { MAX_SUBREQUESTS_COUNT, UpdateExpiryOnNodeUserSubRequest } from './SnodeRequestTypes'; import { BatchRequests } from './batchRequest'; import { SnodePool } from './snodePool'; import { @@ -224,7 +220,7 @@ async function updateExpiryOnNodesNoRetries( const hashesRequestedButNotInResults = difference( flatten(expireRequests.map(m => m.messageHashes)), - [...flatten(changesValid.map(c => c.messageHashes)), fakeHash] + [...flatten(changesValid.map(c => c.messageHashes))] ); if (!isEmpty(hashesRequestedButNotInResults)) { const now = Date.now(); @@ -347,13 +343,6 @@ function groupMsgByExpiry(expiringDetails: ExpiringDetails) { groupedBySameExpiry[expiryStr].push(messageHash); } - Object.keys(groupedBySameExpiry).forEach(k => { - if (groupedBySameExpiry[k].length === 1) { - // We need to have at least 2 hashes until the next storage server release - groupedBySameExpiry[k].push(fakeHash); - } - }); - return groupedBySameExpiry; } diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index ba4650af96..a8e5a3e28f 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -5,7 +5,7 @@ import pRetry from 'p-retry'; import { Snode } from '../../../data/types'; import { UserUtils } from '../../utils'; import { SeedNodeAPI } from '../seed_node_api'; -import { GetExpiriesFromNodeSubRequest, fakeHash } from './SnodeRequestTypes'; +import { GetExpiriesFromNodeSubRequest } from './SnodeRequestTypes'; import { BatchRequests } from './batchRequest'; import { SnodePool } from './snodePool'; import { GetExpiriesResultsContent, WithMessagesHashes } from './types'; @@ -104,14 +104,9 @@ async function getExpiriesFromNodesNoRetries( * The returned TTLs should be assigned to the given disappearing messages. * @param messageHashes the hashes of the messages we want the current expiries for * @param timestamp the time (ms) the request was initiated, must be within ±60s of the current time so using the server time is recommended. - * @returns an arrray of the expiry timestamps (TTL) for the given messages + * @returns an array of the expiry timestamps (TTL) for the given messages */ export async function getExpiriesFromSnode({ messagesHashes }: WithMessagesHashes) { - // FIXME There is a bug in the snode code that requires at least 2 messages to be requested. Will be fixed in next storage server release - if (messagesHashes.length === 1) { - messagesHashes.push(fakeHash); - } - const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); if (!ourPubKey) { window.log.error('[getExpiriesFromSnode] No pubkey found', messagesHashes); diff --git a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts index f4865b1647..3411f66eda 100644 --- a/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts +++ b/ts/test/session/unit/disappearing_messages/GetExpiriesRequest_test.ts @@ -2,10 +2,7 @@ import chai, { expect } from 'chai'; import chaiAsPromised from 'chai-as-promised'; import { PubkeyType } from 'libsession_util_nodejs'; import Sinon from 'sinon'; -import { - GetExpiriesFromNodeSubRequest, - fakeHash, -} from '../../../../session/apis/snode_api/SnodeRequestTypes'; +import { GetExpiriesFromNodeSubRequest } from '../../../../session/apis/snode_api/SnodeRequestTypes'; import { GetExpiriesRequestResponseResults, processGetExpiriesRequestResponse, @@ -110,8 +107,7 @@ describe('GetExpiriesRequest', () => { const props = { targetNode: generateFakeSnode(), expiries: { 'FLTUh/C/6E+sWRgNtrqWPXhQqKlIrpHVKJJtZsBMWKw': 1696983251624 }, - // FIXME There is a bug in the snode code that requires at least 2 messages to be requested. Will be fixed in next storage server release - messageHashes: ['FLTUh/C/6E+sWRgNtrqWPXhQqKlIrpHVKJJtZsBMWKw', fakeHash], + messageHashes: ['FLTUh/C/6E+sWRgNtrqWPXhQqKlIrpHVKJJtZsBMWKw'], }; it('returns valid results if the response is valid', async () => { From 93c451048a3bb1947883a2c20688015a1b005497 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 25 Nov 2024 10:39:28 +1100 Subject: [PATCH 179/302] fix: base64 zod doesn't work for us also fix delete in a private chat --- ts/interactions/conversations/unsendingInteractions.ts | 3 ++- ts/session/apis/snode_api/swarmPolling.ts | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 06995fdd1b..b7df6180d6 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -227,9 +227,10 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally( throw new Error('deleteMessagesFromSwarmAndCompletelyLocally needs a 03 or 05 pk'); } if (PubKey.is05Pubkey(pubkey) && pubkey !== UserUtils.getOurPubKeyStrFromCache()) { - throw new Error( + window.log.warn( 'deleteMessagesFromSwarmAndCompletelyLocally with 05 pk can only delete for ourself' ); + return; } // LEGACY GROUPS -- we cannot delete on the swarm (just unsend which is done separately) if (conversation.isClosedGroup() && PubKey.is05Pubkey(pubkey)) { diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index f62ea8e168..b9e40e3c45 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -940,8 +940,8 @@ export class SwarmPolling { // zod schema for retrieve items as returned by the snodes const retrieveItemSchema = z.object({ - hash: z.string().base64('retrieveItemSchema: hash was not base64'), - data: z.string().base64('retrieveItemSchema: data was not base64'), + hash: z.string(), + data: z.string(), expiration: z.number().finite(), timestamp: z.number().finite().positive(), }); From 89e2115f95e00cdf9f1719b7e3e9383390cb14b5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 25 Nov 2024 11:19:49 +1100 Subject: [PATCH 180/302] chore: fix datatestids --- ts/components/SessionSearchInput.tsx | 2 +- ts/components/conversation/MessageRequestButtons.tsx | 2 +- ts/components/conversation/SubtleNotification.tsx | 7 ++----- ts/components/dialog/InviteContactsDialog.tsx | 2 ++ ts/components/dialog/OpenUrlModal.tsx | 2 +- .../leftpane/overlay/OverlayClosedGroup.tsx | 4 ++-- ts/components/menu/Menu.tsx | 3 +++ ts/components/menu/items/MenuItemWithDataTestId.tsx | 9 +++++++-- ts/react.d.ts | 12 ++++++++---- 9 files changed, 27 insertions(+), 16 deletions(-) diff --git a/ts/components/SessionSearchInput.tsx b/ts/components/SessionSearchInput.tsx index 983cd2b503..27c81c7321 100644 --- a/ts/components/SessionSearchInput.tsx +++ b/ts/components/SessionSearchInput.tsx @@ -88,7 +88,7 @@ export const SessionSearchInput = () => { const placeholder = isGroupCreationSearch ? window.i18n('searchContacts') : window.i18n('search'); return ( - + { onClick={() => { handleDeclineConversationRequest(selectedConvoId, selectedConvoId, convoOrigin); }} - dataTestId="decline-message-request" + dataTestId="delete-message-request" /> diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index a0a9eab4bd..152cccfd6c 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -91,7 +91,7 @@ export const ConversationOutgoingRequestExplanation = () => { if (!contactFromLibsession || !contactFromLibsession.approvedMe) { return ( @@ -249,12 +249,9 @@ export const NoMessageInConversation = () => { return null; } - const dataTestId: SessionDataTestId = - isGroupV2 && isKickedFromGroup ? 'empty-conversation-notification' : 'group-control-message'; - return ( diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index 0e0669ac05..fe42943245 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -228,6 +228,7 @@ const InviteContactsDialogInner = (props: Props) => { buttonType={SessionButtonType.Simple} disabled={!hasContacts || isProcessingUIChange} onClick={onClickOK} + dataTestId="session-confirm-ok-button" /> { buttonType={SessionButtonType.Simple} onClick={closeDialog} disabled={isProcessingUIChange} + dataTestId="session-confirm-cancel-button" />
diff --git a/ts/components/dialog/OpenUrlModal.tsx b/ts/components/dialog/OpenUrlModal.tsx index 73ba6b663a..fe9353e854 100644 --- a/ts/components/dialog/OpenUrlModal.tsx +++ b/ts/components/dialog/OpenUrlModal.tsx @@ -63,7 +63,7 @@ export function OpenUrlModal(props: OpenUrlModalState) { text={window.i18n('urlCopy')} buttonType={SessionButtonType.Simple} onClick={onClickCopy} - dataTestId="session-confirm-cancel-button" + dataTestId="copy-url-button" />
diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index 6454a56e0e..e2ced226a4 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -238,7 +238,7 @@ export const OverlayClosedGroupV2 = () => { text={window.i18n('create')} disabled={disableCreateButton} onClick={onEnterPressed} - dataTestId="next-button" + dataTestId="create-group-button" margin="auto 0 var(--margins-lg) 0 " // just to keep that button at the bottom of the overlay (even with an empty list) />
@@ -358,7 +358,7 @@ export const OverlayLegacyClosedGroup = () => { text={window.i18n('create')} disabled={disableCreateButton} onClick={onEnterPressed} - dataTestId="next-button" + dataTestId="create-group-button" margin="auto 0 0" // just to keep that button at the bottom of the overlay (even with an empty list) /> diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index 7da4e79b89..2e20402f7c 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -448,6 +448,7 @@ export const AcceptMsgRequestMenuItem = () => { convoId, }); }} + dataTestId="accept-menu-item" > {window.i18n('accept')} @@ -474,6 +475,7 @@ export const DeclineMsgRequestMenuItem = () => { conversationIdOrigin: null, }); }} + dataTestId="delete-menu-item" > {window.i18n('delete')} @@ -503,6 +505,7 @@ export const DeclineAndBlockMsgRequestMenuItem = () => { conversationIdOrigin: convoOrigin ?? null, }); }} + dataTestId="block-menu-item" > {window.i18n('block')} diff --git a/ts/components/menu/items/MenuItemWithDataTestId.tsx b/ts/components/menu/items/MenuItemWithDataTestId.tsx index 9301dd5ba2..10f1200f57 100644 --- a/ts/components/menu/items/MenuItemWithDataTestId.tsx +++ b/ts/components/menu/items/MenuItemWithDataTestId.tsx @@ -1,8 +1,13 @@ +import React from 'react'; import { Item, ItemProps } from 'react-contexify'; -export function ItemWithDataTestId({ children, ...props }: ItemProps) { +export function ItemWithDataTestId({ + children, + dataTestId, + ...props +}: Omit & { dataTestId?: React.SessionDataTestId }) { return ( - + {children} ); diff --git a/ts/react.d.ts b/ts/react.d.ts index 43b7e429a3..6ef2e630d6 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -77,6 +77,9 @@ declare module 'react' { | 'help-settings-menu-item' | 'permissions-settings-menu-item' | 'clearData-settings-menu-item' + | 'block-menu-item' + | 'delete-menu-item' + | 'accept-menu-item' // timer options | 'time-option-0' @@ -107,8 +110,7 @@ declare module 'react' { | 'group-request-explanation' | 'conversation-request-explanation' | 'group-invite-control-message' - | 'empty-conversation-notification' - | 'group-control-message' + | 'empty-conversation-control-message' // call notification types | 'call-notification-missed-call' @@ -177,6 +179,7 @@ declare module 'react' { | 'contact-status' | 'version-warning' | 'open-url-confirm-button' + | 'copy-url-button' | 'continue-session-button' | 'next-new-conversation-button' | 'reveal-recovery-phrase' @@ -199,7 +202,6 @@ declare module 'react' { | 'hide-recovery-phrase-toggle' | 'reveal-recovery-phrase-toggle' | 'resend-promote-button' - | 'next-button' | 'continue-button' | 'back-button' | 'empty-conversation' @@ -210,10 +212,12 @@ declare module 'react' { | 'save-button-profile-update' | 'copy-button-profile-update' | 'disappear-set-button' - | 'decline-message-request' + | 'create-group-button' + | 'delete-message-request' | 'accept-message-request' | 'mentions-popup-row' | 'session-id-signup' + | 'search-contacts-field' | 'three-dot-loading-animation' | 'recovery-phrase-input' | 'display-name-input' From 08605a001153299db9baec80ddce6825fc21eace Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 25 Nov 2024 11:45:44 +1100 Subject: [PATCH 181/302] chore: initGroupWrapper checks for unknowns args --- .../node/libsession/libsession.worker.ts | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index a43ce11a95..95ab16c0ef 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -6,7 +6,6 @@ import { ContactsConfigWrapperNode, ConvoInfoVolatileWrapperNode, GroupPubkeyType, - GroupWrapperConstructor, MetaGroupWrapperNode, MultiEncryptWrapperNode, UserConfigWrapperNode, @@ -224,7 +223,7 @@ function freeUserWrapper(wrapperType: ConfigWrapperObjectTypesMeta) { /* * This function can be used to initialize a group wrapper */ -function initGroupWrapper(options: Array, wrapperType: ConfigWrapperGroup) { +function initGroupWrapper(options: Array, wrapperType: ConfigWrapperGroup) { const groupType = assertGroupWrapperType(wrapperType); const wrapper = getGroupWrapper(wrapperType); @@ -233,17 +232,33 @@ function initGroupWrapper(options: Array, wrapperType: ConfigWrapperGroup) return; } - if (options.length !== 1) { + if (options.length !== 1 || isObject(options[0])) { throw new Error(`group: "${wrapperType}" init needs 1 arguments`); } + const firstArg = options[0]; + if ( + !isObject(firstArg) || + !('groupEd25519Pubkey' in firstArg) || + !('groupEd25519Secretkey' in firstArg) || + !('metaDumped' in firstArg) || + !('userEd25519Secretkey' in firstArg) + ) { + throw new Error( + `group: "${wrapperType}" firstArg is not obj type, or missing some keys, or not the correct keys` + ); + } // we need all the fields defined in GroupWrapperConstructor, but the function in the wrapper will throw if we don't forward what's needed - const { - groupEd25519Pubkey, - groupEd25519Secretkey, - metaDumped, - userEd25519Secretkey, - }: GroupWrapperConstructor = options[0]; + const { groupEd25519Pubkey, groupEd25519Secretkey, metaDumped, userEd25519Secretkey } = firstArg; + + if ( + !isUInt8Array(groupEd25519Pubkey) || + (!isUInt8Array(groupEd25519Secretkey) && !isNull(groupEd25519Secretkey)) || + (!isUInt8Array(metaDumped) && !isNull(metaDumped)) || + !isUInt8Array(userEd25519Secretkey) + ) { + throw new Error(`group: "${wrapperType}" type of keys is not correct`); + } if (isMetaGroupWrapperType(groupType)) { const pk = getGroupPubkeyFromWrapperType(groupType); From 2d5d86b92d4154f3256fa5d985145b7d7ff7afd4 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 25 Nov 2024 15:02:23 +1100 Subject: [PATCH 182/302] chore: address PR reviews --- .../job_runners/jobs/AvatarDownloadJob.ts | 10 ++---- .../utils/job_runners/jobs/GroupInviteJob.ts | 13 +++----- .../jobs/GroupPendingRemovalsJob.ts | 11 +++---- .../utils/job_runners/jobs/GroupPromoteJob.ts | 9 ++---- .../utils/job_runners/jobs/GroupSyncJob.ts | 12 +++---- .../utils/job_runners/jobs/UserSyncJob.ts | 2 +- ts/state/selectors/groups.ts | 32 ++++++++++++------- .../libsession_wrapper_metagroup_test.ts | 7 ++-- 8 files changed, 44 insertions(+), 52 deletions(-) diff --git a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts index 3a0fd7dc4d..2f3e57c5c8 100644 --- a/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts +++ b/ts/session/utils/job_runners/jobs/AvatarDownloadJob.ts @@ -17,7 +17,7 @@ import { } from '../PersistedJob'; const defaultMsBetweenRetries = 10000; -const defaultMaxAttemps = 3; +const defaultMaxAttempts = 3; /** * Returns true if the provided conversationId is a private chat and that we should add an Avatar Download Job to the list of jobs to run. @@ -74,11 +74,7 @@ class AvatarDownloadJob extends PersistedJob { Partial< Pick< AvatarDownloadPersistedData, - | 'nextAttemptTimestamp' - | 'identifier' - | 'maxAttempts' - | 'delayBetweenRetries' - | 'currentRetry' + 'nextAttemptTimestamp' | 'identifier' | 'maxAttempts' | 'currentRetry' > >) { super({ @@ -86,7 +82,7 @@ class AvatarDownloadJob extends PersistedJob { identifier: identifier || v4(), conversationId, delayBetweenRetries: defaultMsBetweenRetries, - maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttemps, + maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts, nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries, currentRetry: isNumber(currentRetry) ? currentRetry : 0, }); diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index ed2b413e67..0ad040cdd2 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -24,6 +24,7 @@ import { MessageQueue } from '../../../sending'; import { NetworkTime } from '../../../../util/NetworkTime'; import { SubaccountUnrevokeSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; import { GroupSync } from './GroupSyncJob'; +import { DURATION } from '../../../constants'; const defaultMsBetweenRetries = 10000; const defaultMaxAttempts = 1; @@ -34,7 +35,7 @@ type JobExtraArgs = { inviteAsAdmin: boolean; /** * When inviting a member, we usually only want to sent a message to his swarm. - * In the case of a invitation resend process though, we also want to make sure his token is unrevoked from the group's swarm. + * In the case of an invitation resend process though, we also want to make sure his token is unrevoked from the group's swarm. * */ forceUnrevoke: boolean; @@ -151,11 +152,7 @@ class GroupInviteJob extends PersistedJob { Partial< Pick< GroupInvitePersistedData, - | 'nextAttemptTimestamp' - | 'identifier' - | 'maxAttempts' - | 'delayBetweenRetries' - | 'currentRetry' + 'nextAttemptTimestamp' | 'identifier' | 'maxAttempts' | 'currentRetry' > >) { super({ @@ -298,7 +295,7 @@ class GroupInviteJob extends PersistedJob { } public getJobTimeoutMs(): number { - return 15000; + return 15 * DURATION.SECONDS; } } @@ -321,7 +318,7 @@ function updateFailedStateForMember(groupPk: GroupPubkeyType, member: PubkeyType if (!thisGroupFailure) { thisGroupFailure = { failedMembers: [], - debouncedCall: debounce(displayFailedInvitesForGroup, 1000), // TODO change to 5000 + debouncedCall: debounce(displayFailedInvitesForGroup, 5 * DURATION.SECONDS), }; } diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 4269a9056b..9a4ec1492b 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -36,6 +36,7 @@ import { WithSecretKey, } from '../../../types/with'; import { groupInfoActions } from '../../../../state/ducks/metaGroups'; +import { DURATION } from '../../../constants'; const defaultMsBetweenRetries = 10000; const defaultMaxAttempts = 1; @@ -98,11 +99,7 @@ class GroupPendingRemovalsJob extends PersistedJob >) { super({ @@ -135,7 +132,7 @@ class GroupPendingRemovalsJob extends PersistedJob m.removedStatus === 'REMOVED_MEMBER_AND_MESSAGES') + .filter(m => m.memberStatus === 'REMOVED_MEMBER_AND_MESSAGES') .map(m => m.pubkeyHex); const sessionIdsHex = pendingRemovals.map(m => m.pubkeyHex); @@ -274,7 +271,7 @@ class GroupPendingRemovalsJob extends PersistedJob { Partial< Pick< GroupPromotePersistedData, - | 'nextAttemptTimestamp' - | 'identifier' - | 'maxAttempts' - | 'delayBetweenRetries' - | 'currentRetry' + 'nextAttemptTimestamp' | 'identifier' | 'maxAttempts' | 'currentRetry' > >) { super({ @@ -153,7 +150,7 @@ class GroupPromoteJob extends PersistedJob { } public getJobTimeoutMs(): number { - return 15000; + return 15 * DURATION.SECONDS; } } diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index bbdfa16996..57d88ed840 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -157,9 +157,9 @@ async function pushChangesToGroupSwarmIfNeeded({ ]); const result = await MessageSender.sendEncryptedDataToSnode({ - // Note: this is on purpose that supplementalKeysSubRequest is before pendingConfigRequests - // as this is to avoid a race condition where a device is polling right - // while we are posting the configs (already encrypted with the new keys) + // Note: this is on purpose that supplementalKeysSubRequest is before pendingConfigRequests. + // This is to avoid a race condition where a device is polling while we + // are posting the configs (already encrypted with the new keys) sortedSubRequests, destination: groupPk, method: 'sequence', @@ -198,7 +198,7 @@ async function pushChangesToGroupSwarmIfNeeded({ class GroupSyncJob extends PersistedJob { constructor({ - identifier, // this has to be the pubkey to which we + identifier, // this has to be the group's pubkey nextAttemptTimestamp, maxAttempts, currentRetry, @@ -241,8 +241,6 @@ class GroupSyncJob extends PersistedJob { groupPk: thisJobDestination, extraStoreRequests: [], }); - - // eslint-disable-next-line no-useless-catch } catch (e) { window.log.warn('GroupSyncJob failed with', e.message); return RunJobResult.RetryJobIfPossible; @@ -251,7 +249,7 @@ class GroupSyncJob extends PersistedJob { `GroupSyncJob ${ed25519Str(thisJobDestination)} run() took ${Date.now() - start}ms` ); - // this is a simple way to make sure whatever happens here, we update the lastest timestamp. + // this is a simple way to make sure whatever happens here, we update the latest timestamp. // (a finally statement is always executed (no matter if exception or returns in other try/catch block) this.updateLastTickTimestamp(); } diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index 545489e2a3..e0de293ee7 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -188,7 +188,7 @@ class UserSyncJob extends PersistedJob { } finally { window.log.debug(`UserSyncJob run() took ${Date.now() - start}ms`); - // this is a simple way to make sure whatever happens here, we update the lastest timestamp. + // this is a simple way to make sure whatever happens here, we update the latest timestamp. // (a finally statement is always executed (no matter if exception or returns in other try/catch block) this.updateLastTickTimestamp(); } diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index bf896084df..5bf75f9c35 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -108,8 +108,12 @@ function getMemberPromotionNotSent(state: StateType, pubkey: PubkeyType, convo?: function getMemberPendingRemoval(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { const members = getMembersOfGroup(state, convo); - const removedStatus = findMemberInMembers(members, pubkey)?.removedStatus; - return removedStatus !== 'NOT_REMOVED'; + const removedStatus = findMemberInMembers(members, pubkey)?.memberStatus; + return ( + removedStatus === 'REMOVED_UNKNOWN' || + removedStatus === 'REMOVED_MEMBER' || + removedStatus === 'REMOVED_MEMBER_AND_MESSAGES' + ); } export function getLibMembersCount(state: StateType, convo?: GroupPubkeyType): Array { @@ -317,32 +321,38 @@ export function useStateOf03GroupMembers(convoId?: string) { switch (item.memberStatus) { case 'INVITE_FAILED': case 'INVITE_NOT_SENT': - stateSortingOrder = -5; + stateSortingOrder = -50; break; case 'INVITE_SENDING': - stateSortingOrder = -4; + stateSortingOrder = -40; break; case 'INVITE_SENT': - stateSortingOrder = -3; + stateSortingOrder = -30; + break; + case 'REMOVED_UNKNOWN': // fallback, hopefully won't happen in production + case 'REMOVED_MEMBER': // we want pending removal members at the end + case 'REMOVED_MEMBER_AND_MESSAGES': + stateSortingOrder = -20; break; case 'PROMOTION_FAILED': case 'PROMOTION_NOT_SENT': - stateSortingOrder = -2; + stateSortingOrder = -15; break; case 'PROMOTION_SENDING': - stateSortingOrder = -1; + stateSortingOrder = -10; break; case 'PROMOTION_SENT': stateSortingOrder = 0; break; case 'PROMOTION_ACCEPTED': - stateSortingOrder = 1; + stateSortingOrder = 10; break; case 'INVITE_ACCEPTED': - stateSortingOrder = 2; + stateSortingOrder = 20; break; - case 'UNKNOWN': - stateSortingOrder = 5; // just a fallback, hopefully won't happen in production + case 'INVITE_UNKNOWN': // fallback, hopefully won't happen in production + case 'PROMOTION_UNKNOWN': // fallback, hopefully won't happen in production + stateSortingOrder = 50; break; default: diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index a05c2bfe3d..1899027008 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -25,7 +25,6 @@ function emptyMember(pubkeyHex: PubkeyType): GroupMemberGet { url: null, }, nominatedAdmin: false, - removedStatus: 'NOT_REMOVED', pubkeyHex, }; } @@ -299,8 +298,7 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); const expected: GroupMemberGet = { ...emptyMember(member), - removedStatus: 'REMOVED_MEMBER_AND_MESSAGES', - memberStatus: 'INVITE_ACCEPTED', // marking a member as pending removal auto-marks him as accepted (so we don't retry sending an invite) + memberStatus: 'REMOVED_MEMBER_AND_MESSAGES', }; expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); @@ -312,8 +310,7 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); const expected: GroupMemberGet = { ...emptyMember(member), - removedStatus: 'REMOVED_MEMBER', - memberStatus: 'INVITE_ACCEPTED', // marking a member as pending removal auto-marks him as accepted (so we don't retry sending an invite) + memberStatus: 'REMOVED_MEMBER', }; expect(metaGroupWrapper.memberGetAll()).to.be.deep.eq([expected]); }); From 10ec8306e5b2d248cc5c907acb873cf93772364a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 25 Nov 2024 16:34:25 +1100 Subject: [PATCH 183/302] fix: rename camelCase settingsCategories to kebab-case this is reused as is for the datatestids --- ts/components/leftpane/LeftPaneSectionHeader.tsx | 2 +- ts/components/leftpane/LeftPaneSettingSection.tsx | 14 +++++++------- ts/components/settings/SessionSettings.tsx | 6 +++--- ts/components/settings/SessionSettingsHeader.tsx | 6 +++--- ts/react.d.ts | 6 +++--- ts/types/ReduxTypes.d.ts | 6 +++--- .../workers/browser/libsession_worker_interface.ts | 10 ++++++++-- 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/ts/components/leftpane/LeftPaneSectionHeader.tsx b/ts/components/leftpane/LeftPaneSectionHeader.tsx index c1e26115e4..5cd421e050 100644 --- a/ts/components/leftpane/LeftPaneSectionHeader.tsx +++ b/ts/components/leftpane/LeftPaneSectionHeader.tsx @@ -130,7 +130,7 @@ export const LeftPaneBanner = () => { const showRecoveryPhraseModal = () => { dispatch(disableRecoveryPhrasePrompt()); dispatch(showLeftPaneSection(SectionType.Settings)); - dispatch(showSettingsSection('recoveryPassword')); + dispatch(showSettingsSection('recovery-password')); }; if (section !== SectionType.Message || isSignInWithRecoveryPhrase || hideRecoveryPassword) { diff --git a/ts/components/leftpane/LeftPaneSettingSection.tsx b/ts/components/leftpane/LeftPaneSettingSection.tsx index 2bd4a509c9..c47a6ea561 100644 --- a/ts/components/leftpane/LeftPaneSettingSection.tsx +++ b/ts/components/leftpane/LeftPaneSettingSection.tsx @@ -73,7 +73,7 @@ const getCategories = (): Array => { icon: { type: 'chatBubble' as const, ...forcedSize }, }, { - id: 'messageRequests' as const, + id: 'message-requests' as const, title: window.i18n('sessionMessageRequests'), icon: { type: 'messageRequest' as const, ...forcedSize }, }, @@ -93,12 +93,12 @@ const getCategories = (): Array => { icon: { type: 'question' as const, ...forcedSize }, }, { - id: 'recoveryPassword' as const, + id: 'recovery-password' as const, title: window.i18n('sessionRecoveryPassword'), icon: { type: 'recoveryPasswordFill' as const, ...forcedSize }, }, { - id: 'clearData' as const, + id: 'clear-data' as const, title: window.i18n('sessionClearData'), icon: { type: 'delete' as const, ...forcedSize, color: 'var(--danger-color)' }, }, @@ -110,7 +110,7 @@ const LeftPaneSettingsCategoryRow = ({ item }: { item: Categories }) => { const dispatch = useDispatch(); const focusedSettingsSection = useSelector(getFocusedSettingsSection); - const isClearData = id === 'clearData'; + const isClearData = id === 'clear-data'; return ( { padding={'0px var(--margins-md) 0 var(--margins-sm)'} onClick={() => { switch (id) { - case 'messageRequests': + case 'message-requests': dispatch(showLeftPaneSection(SectionType.Message)); dispatch(setLeftOverlayMode('message-requests')); dispatch(resetConversationExternal()); break; - case 'clearData': + case 'clear-data': dispatch(updateDeleteAccountModal({})); break; default: @@ -168,7 +168,7 @@ const LeftPaneSettingsCategories = () => { const hideRecoveryPassword = useHideRecoveryPasswordEnabled(); if (hideRecoveryPassword) { - categories = categories.filter(category => category.id !== 'recoveryPassword'); + categories = categories.filter(category => category.id !== 'recovery-password'); } return ( diff --git a/ts/components/settings/SessionSettings.tsx b/ts/components/settings/SessionSettings.tsx index fee434e4d0..e49151921b 100644 --- a/ts/components/settings/SessionSettings.tsx +++ b/ts/components/settings/SessionSettings.tsx @@ -116,12 +116,12 @@ const SettingInCategory = (props: { return ; case 'permissions': return ; - case 'recoveryPassword': + case 'recovery-password': return ; // these are just buttons and don't have screens - case 'clearData': - case 'messageRequests': + case 'clear-data': + case 'message-requests': default: return null; } diff --git a/ts/components/settings/SessionSettingsHeader.tsx b/ts/components/settings/SessionSettingsHeader.tsx index fb8a976419..5ff87abbdd 100644 --- a/ts/components/settings/SessionSettingsHeader.tsx +++ b/ts/components/settings/SessionSettingsHeader.tsx @@ -43,11 +43,11 @@ export const SettingsHeader = (props: Props) => { case 'privacy': categoryTitle = window.i18n('sessionPrivacy'); break; - case 'recoveryPassword': + case 'recovery-password': categoryTitle = window.i18n('sessionRecoveryPassword'); break; - case 'clearData': - case 'messageRequests': + case 'clear-data': + case 'message-requests': throw new Error(`no header for should be tried to be rendered for "${category}"`); default: diff --git a/ts/react.d.ts b/ts/react.d.ts index 6ef2e630d6..bb1859af31 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -68,15 +68,15 @@ declare module 'react' { | 'privacy-section' // settings menu item types - | 'messageRequests-settings-menu-item' - | 'recoveryPassword-settings-menu-item' + | 'message-requests-settings-menu-item' + | 'recovery-password-settings-menu-item' | 'privacy-settings-menu-item' | 'notifications-settings-menu-item' | 'conversations-settings-menu-item' | 'appearance-settings-menu-item' | 'help-settings-menu-item' | 'permissions-settings-menu-item' - | 'clearData-settings-menu-item' + | 'clear-data-settings-menu-item' | 'block-menu-item' | 'delete-menu-item' | 'accept-menu-item' diff --git a/ts/types/ReduxTypes.d.ts b/ts/types/ReduxTypes.d.ts index 327e4916aa..c3630e12dc 100644 --- a/ts/types/ReduxTypes.d.ts +++ b/ts/types/ReduxTypes.d.ts @@ -9,12 +9,12 @@ export type SessionSettingCategory = | 'privacy' | 'notifications' | 'conversations' - | 'messageRequests' + | 'message-requests' | 'appearance' | 'permissions' | 'help' - | 'recoveryPassword' - | 'clearData'; + | 'recovery-password' + | 'clear-data'; export type PasswordAction = 'set' | 'change' | 'remove' | 'enter'; diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 28320fe54d..19a08691a6 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -761,14 +761,20 @@ export const MultiEncryptWrapperActions: MultiEncryptActionsCalls = { export const EncryptionDomains = ['SessionGroupKickedMessage'] as const; export const BlindingActions: BlindingActionsCalls = { - blindVersionPubkey: async (opts: { ed25519SecretKey: Uint8Array }) => + blindVersionPubkey: async (opts: Parameters[0]) => callLibSessionWorker(['Blinding', 'blindVersionPubkey', opts]) as Promise< ReturnType >, - blindVersionSign: async (opts: { ed25519SecretKey: Uint8Array; sigTimestampSeconds: number }) => + blindVersionSign: async (opts: Parameters[0]) => callLibSessionWorker(['Blinding', 'blindVersionSign', opts]) as Promise< ReturnType >, + blindVersionSignRequest: async ( + opts: Parameters[0] + ) => + callLibSessionWorker(['Blinding', 'blindVersionSignRequest', opts]) as Promise< + ReturnType + >, }; export const callLibSessionWorker = async ( From d5f9b7a6f70cd17ac73cb8082972827b7af4ccfe Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 25 Nov 2024 16:35:16 +1100 Subject: [PATCH 184/302] chore: bump libsession-util-nodejs to 0.4.6 --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 062d3a405c..06a572a297 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.5/libsession_util_nodejs-v0.4.5.tar.gz", + "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.6/libsession_util_nodejs-v0.4.6.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index c04ef63ffd..352f4f5ca0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4944,9 +4944,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.5/libsession_util_nodejs-v0.4.5.tar.gz": - version "0.4.5" - resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.5/libsession_util_nodejs-v0.4.5.tar.gz#e5b62009b9af277201f1c61dbc10bda4bb8e757b" +"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.6/libsession_util_nodejs-v0.4.6.tar.gz": + version "0.4.6" + resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.6/libsession_util_nodejs-v0.4.6.tar.gz#8af92a58844bd4f1b4145371c62deb049266caaf" dependencies: cmake-js "7.2.1" node-addon-api "^6.1.0" From d2dd98cd9d9d9df96bb1bc2a1bc201ac48458afe Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 26 Nov 2024 10:03:19 +1100 Subject: [PATCH 185/302] fix: various PR reviews, fixes for integration tests --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- protos/SignalService.proto | 1 - ts/components/MemberListItem.tsx | 2 +- .../conversation/MessageRequestButtons.tsx | 6 ++++- .../overlay/OverlayRightPanelSettings.tsx | 18 ++++++------- .../disappearing-messages/TimeOptions.tsx | 2 +- ts/components/dialog/InviteContactsDialog.tsx | 4 +-- .../dialog/UpdateGroupNameDialog.tsx | 1 - .../leftpane/overlay/OverlayClosedGroup.tsx | 4 +-- ts/components/menu/Menu.tsx | 2 ++ ts/hooks/useParamSelector.ts | 2 +- ts/interactions/conversationInteractions.ts | 19 +++++++++++--- ts/models/conversation.ts | 2 ++ ts/node/hexStrings.ts | 4 +-- ts/react.d.ts | 26 +++++++++---------- .../SwarmPollingGroupConfig.ts | 10 +++---- ts/session/onions/onionPath.ts | 1 + ts/session/utils/calling/CallManager.ts | 6 ++++- .../libsession_utils_multi_encrypt.ts | 8 +++--- ts/state/ducks/metaGroups.ts | 2 +- .../browser/libsession_worker_interface.ts | 3 ++- 21 files changed, 73 insertions(+), 52 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7e731a3409..9bf0d6f2d1 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -14,7 +14,7 @@ Remember, you can preview this before saving it. ### Contributor checklist: - [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/) -- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`clearnet`](https://github.com/session-foundation/session-desktop/tree/clearnet) branch +- [ ] My changes are [rebased](https://blog.axosoft.com/golden-rule-of-rebasing-in-git/) on the latest [`unstable`](https://github.com/session-foundation/session-desktop/tree/clearnet) branch - [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/session-foundation/session-desktop/blob/master/CONTRIBUTING.md#tests)) - [ ] My changes are ready to be shipped to users diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 853cef89be..ed9535b506 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -148,7 +148,6 @@ message GroupUpdateMessage { optional GroupUpdateMemberLeftNotificationMessage memberLeftNotificationMessage = 8; } - message DataMessage { // 7 = timestamp unused and should not be used diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index a7ab0ba24b..6fafbf41ee 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -158,7 +158,7 @@ const StyledGroupStatusText = styled.span<{ isFailure: boolean }>` font-size: var(--font-size-xs); margin-top: var(--margins-xs); min-width: 100px; // min-width so that the dialog does not resize when the status change to sending - text-align: left; + text-align: start; `; const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupPubkeyType }) => { diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index 5cd21cae64..ea0afae94b 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -17,6 +17,7 @@ import { ConversationOutgoingRequestExplanation, InvitedToGroupControlMessage, } from './SubtleNotification'; +import { NetworkTime } from '../../util/NetworkTime'; const MessageRequestContainer = styled.div` display: flex; @@ -101,7 +102,10 @@ export const ConversationMessageRequestButtons = () => { { - void handleAcceptConversationRequest({ convoId: selectedConvoId }); + void handleAcceptConversationRequest({ + convoId: selectedConvoId, + approvalMessageTimestamp: NetworkTime.now(), + }); }} text={window.i18n('accept')} dataTestId="accept-message-request" diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 6db70ec2a7..33906be8d1 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -401,16 +401,14 @@ export const OverlayRightPanelSettings = () => { {isGroup && ( - <> - void deleteConvoAction()} - color={'var(--danger-color)'} - iconType={'delete'} - /> - + void deleteConvoAction()} + color={'var(--danger-color)'} + iconType={'delete'} + /> )} diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx index 3ffcb1bdfe..26e2698056 100644 --- a/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx +++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx @@ -39,7 +39,7 @@ export const TimeOptions = (props: TimerOptionsProps) => { setSelected(option.value); }} disabled={disabled} - dataTestId={`time-option-${option.value}`} // we want "time-option-3600", etc as accessibility id + dataTestId={`time-option-${option.value}-seconds`} // we want "time-option-3600-seconds", etc as accessibility id /> ); })} diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index fe42943245..f28f66f078 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -30,7 +30,7 @@ import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/S import { SessionSpinner } from '../loading'; import { SessionToggle } from '../basic/SessionToggle'; import { GroupInviteRequiredVersionBanner } from '../NoticeBanner'; -import { isDevProd } from '../../shared/env_vars'; +import { hasClosedGroupV2QAButtons } from '../../shared/env_vars'; import { ConversationTypeEnum } from '../../models/types'; import { Localizer } from '../basic/Localizer'; @@ -188,7 +188,7 @@ const InviteContactsDialogInner = (props: Props) => { {/* TODO: localize those strings once out releasing those buttons for real Remove after QA */} - {isGroupV2 && isDevProd() && ( + {isGroupV2 && hasClosedGroupV2QAButtons() && ( <> Share History?{' '} diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx index 8f3e23fd46..410b214b4f 100644 --- a/ts/components/dialog/UpdateGroupNameDialog.tsx +++ b/ts/components/dialog/UpdateGroupNameDialog.tsx @@ -153,7 +153,6 @@ export function UpdateGroupNameDialog(props: { conversationId: string }) { const cancelText = window.i18n('cancel'); const isAdmin = !isCommunity; - // return null; return ( {
{/* TODO: localize those strings once out releasing those buttons for real Remove after QA */} - {isDevProd() && ( + {hasClosedGroupV2QAButtons() && ( <> Invite as admin?{' '} diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index 2e20402f7c..64c1741d8c 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -63,6 +63,7 @@ import { ConversationInteractionType, } from '../../interactions/types'; import { useLibGroupDestroyed } from '../../state/selectors/userGroups'; +import { NetworkTime } from '../../util/NetworkTime'; /** Menu items standardized */ @@ -446,6 +447,7 @@ export const AcceptMsgRequestMenuItem = () => { onClick={async () => { await handleAcceptConversationRequest({ convoId, + approvalMessageTimestamp: NetworkTime.now(), }); }} dataTestId="accept-menu-item" diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 3ce69a42f9..a4003f0c6f 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -309,7 +309,7 @@ export function useIsOutgoingRequest(convoId?: string) { /** * Note: NOT to be exported: - * This selector is too generic and needs to be broken node in individual fields selectors. + * This selector is too generic and needs to be broken down into individual fields selectors. * Make sure when writing a selector that you fetch the data from libsession if needed. * (check useSortedGroupMembers() as an example) */ diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 365ce475bb..67b97e7d60 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -96,7 +96,20 @@ export async function unblockConvoById(conversationId: string) { ); } -export const handleAcceptConversationRequest = async ({ convoId }: { convoId: string }) => { +/** + * Accept if needed the message request from this user. + * Note: approvalMessageTimestamp is provided to be able to insert the "You've accepted the message request" at the right place. + * When accepting a message request by sending a message, we need to make sure the "You've accepted the message request" is before the + * message we are sending to the user. + * + */ +export const handleAcceptConversationRequest = async ({ + convoId, + approvalMessageTimestamp, +}: { + convoId: string; + approvalMessageTimestamp: number; +}) => { const convo = ConvoHub.use().get(convoId); if (!convo || (!convo.isPrivate() && !convo.isClosedGroupV2())) { return null; @@ -111,7 +124,7 @@ export const handleAcceptConversationRequest = async ({ convoId }: { convoId: st if (convo.isPrivate()) { // we only need the approval message (and sending a reply) when we are accepting a message request. i.e. someone sent us a message already and we didn't accept it yet. if (!previousIsApproved && previousDidApprovedMe) { - await convo.addOutgoingApprovalMessage(Date.now()); + await convo.addOutgoingApprovalMessage(approvalMessageTimestamp); await convo.sendMessageRequestResponse(); } @@ -993,7 +1006,7 @@ export async function promoteUsersInGroup({ return; } - // push one group change message were initial members are added to the group + // push one group change message where initial members are added to the group const membersHex = uniq(toPromote); const sentAt = NetworkTime.now(); const us = UserUtils.getOurPubKeyStrFromCache(); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 6bbda4f524..8efbcc4ffc 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -622,6 +622,7 @@ export class ConversationModel extends Backbone.Model { // handleAcceptConversationRequest will take care of sending response depending on the type of conversation, if needed await handleAcceptConversationRequest({ convoId: this.id, + approvalMessageTimestamp: NetworkTime.now() - 100, }); if (this.isOpenGroupV2()) { @@ -2109,6 +2110,7 @@ export class ConversationModel extends Backbone.Model { // handleAcceptConversationRequest will take care of sending response depending on the type of conversation await handleAcceptConversationRequest({ convoId: this.id, + approvalMessageTimestamp: NetworkTime.now() - 100, }); if (this.isOpenGroupV2()) { diff --git a/ts/node/hexStrings.ts b/ts/node/hexStrings.ts index 782da7a1de..bf907c509a 100644 --- a/ts/node/hexStrings.ts +++ b/ts/node/hexStrings.ts @@ -9,12 +9,12 @@ const isHexString = (maybeHex: string) => /** * Returns the Uint8Array corresponding to the given string. * Note: this is different than the libsodium.from_hex(). - * This takes a string like "0102" and converts it to an UIin8Array like [1, 2] whereare + * This takes a string like "0102" and converts it to an UInt8Array like [1, 2] where * the libsodium one returns [0, 1, 0, 2] * * Throws an error if this string is not a hex string. * @param hexString the string to convert from - * @returns the Uint8Arrat + * @returns the Uint8Array */ const fromHexString = (hexString: string): Uint8Array => { if (!isHexString(hexString)) { diff --git a/ts/react.d.ts b/ts/react.d.ts index bb1859af31..b94435bf3c 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -82,19 +82,19 @@ declare module 'react' { | 'accept-menu-item' // timer options - | 'time-option-0' - | 'time-option-5' - | 'time-option-10' - | 'time-option-30' - | 'time-option-60' - | 'time-option-300' - | 'time-option-1800' - | 'time-option-3600' - | 'time-option-21600' - | 'time-option-43200' - | 'time-option-86400' - | 'time-option-604800' - | 'time-option-1209600' + | 'time-option-0-seconds' + | 'time-option-5-seconds' + | 'time-option-10-seconds' + | 'time-option-30-seconds' + | 'time-option-60-seconds' + | 'time-option-300-seconds' + | 'time-option-1800-seconds' + | 'time-option-3600-seconds' + | 'time-option-21600-seconds' + | 'time-option-43200-seconds' + | 'time-option-86400-seconds' + | 'time-option-604800-seconds' + | 'time-option-1209600-seconds' // generic readably message (not control message) | 'message-content' diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index c4562bc78b..5ab2a9a607 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -124,12 +124,10 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { ); } } - // mark ourselves as accepting the invite if needed - if (usMember?.memberStatus === 'INVITE_SENT' && keysAlreadyHaveAdmin) { - await MetaGroupWrapperActions.memberSetAccepted(groupPk, us); - } - // mark ourselves as accepting the promotion if needed - if (usMember?.memberStatus === 'PROMOTION_SENT' && keysAlreadyHaveAdmin) { + // Note: this call won't change anything if we are already an "accepted" admin, but will + // overwrite any other states for promotion. + if (keysAlreadyHaveAdmin && usMember) { + // mark ourselves as accepting the promotion if needed. await MetaGroupWrapperActions.memberSetPromotionAccepted(groupPk, us); } // this won't do anything if there is no need for a sync, so we can safely plan one diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index a7b792153c..926a1f84c8 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -526,6 +526,7 @@ async function buildNewOnionPathsWorker() { } window?.log?.info(`Built ${onionPaths.length} onion paths`); + window?.log?.debug(`onionPaths:`, JSON.stringify(onionPaths)); }, { retries: 3, // 4 total diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 925ec2f882..ee8f738c32 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -535,7 +535,10 @@ export async function USER_callRecipient(recipient: string) { weAreCallerOnCurrentCall = true; // initiating a call is analogous to sending a message request - await handleAcceptConversationRequest({ convoId: recipient }); + await handleAcceptConversationRequest({ + convoId: recipient, + approvalMessageTimestamp: NetworkTime.now() - 100, + }); // Note: we do the sending of the preoffer manually as the sendTo1o1NonDurably rely on having a message saved to the db for MessageSentSuccess // which is not the case for a pre offer message (the message only exists in memory) @@ -936,6 +939,7 @@ export async function USER_acceptIncomingCallRequest(fromSender: string) { // consider the conversation completely approved await handleAcceptConversationRequest({ convoId: fromSender, + approvalMessageTimestamp: NetworkTime.now() - 100, }); } diff --git a/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts b/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts index efdf6b810c..cc75b22a3a 100644 --- a/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts +++ b/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts @@ -1,7 +1,7 @@ -import { EncryptionDomain } from 'libsession_util_nodejs'; -import { MultiEncryptWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; - -const allKnownEncryptionDomains: Array = ['SessionGroupKickedMessage']; +import { + allKnownEncryptionDomains, + MultiEncryptWrapperActions, +} from '../../../webworker/workers/browser/libsession_worker_interface'; /** * Try to decrypt the content with any type of encryption domains we know. diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index a9225198c2..3147dd894d 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -193,7 +193,7 @@ const initNewGroupInWrapper = createAsyncThunk( await convo.setIsApproved(true, false); await convo.commit(); // commit here too, as the poll needs it to be approved let groupMemberChange: GroupUpdateMemberChangeMessage | null = null; - // push one group change message were initial members are added to the group + // push one group change message where initial members are added to the group if (membersFromWrapper.length) { const membersHex = uniq(membersFromWrapper.map(m => m.pubkeyHex)); const sentAt = NetworkTime.now(); diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 19a08691a6..550799bee2 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -21,6 +21,7 @@ import { UserGroupsGet, UserGroupsSet, UserGroupsWrapperActionsCalls, + EncryptionDomain, } from 'libsession_util_nodejs'; // eslint-disable-next-line import/order import { join } from 'path'; @@ -758,7 +759,7 @@ export const MultiEncryptWrapperActions: MultiEncryptActionsCalls = { >, }; -export const EncryptionDomains = ['SessionGroupKickedMessage'] as const; +export const allKnownEncryptionDomains: Array = ['SessionGroupKickedMessage']; export const BlindingActions: BlindingActionsCalls = { blindVersionPubkey: async (opts: Parameters[0]) => From 7d81fd169eaf69c12958a2ccf543668b48e3b253 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 26 Nov 2024 13:59:22 +1100 Subject: [PATCH 186/302] fix: add datatestid for radio button in PanelIconButton --- ts/components/buttons/PanelRadioButton.tsx | 4 ++ .../DisappearingModes.tsx | 15 ++++--- .../disappearing-messages/TimeOptions.tsx | 6 ++- ts/react.d.ts | 43 +++++++++++-------- 4 files changed, 41 insertions(+), 27 deletions(-) diff --git a/ts/components/buttons/PanelRadioButton.tsx b/ts/components/buttons/PanelRadioButton.tsx index 26c477e0ef..1f381711d1 100644 --- a/ts/components/buttons/PanelRadioButton.tsx +++ b/ts/components/buttons/PanelRadioButton.tsx @@ -1,4 +1,5 @@ import styled from 'styled-components'; +import { SessionDataTestId } from 'react'; import { SessionRadio } from '../basic/SessionRadio'; import { PanelButton, PanelButtonProps, PanelButtonText, StyledContent } from './PanelButton'; @@ -20,6 +21,7 @@ interface PanelRadioButtonProps extends Omit) => void; onUnselect?: (...args: Array) => void; + radioInputDataTestId: SessionDataTestId; } export const PanelRadioButton = (props: PanelRadioButtonProps) => { @@ -32,6 +34,7 @@ export const PanelRadioButton = (props: PanelRadioButtonProps) => { onUnselect, disabled = false, dataTestId, + radioInputDataTestId, } = props; return ( @@ -51,6 +54,7 @@ export const PanelRadioButton = (props: PanelRadioButtonProps) => { inputName={value} label="" disabled={disabled} + inputDataTestId={radioInputDataTestId} /> diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx index 4ff48cdd4e..270803bafb 100644 --- a/ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx +++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx @@ -1,20 +1,19 @@ -import { SessionDataTestId } from 'react'; import { DisappearingMessageConversationModeType } from '../../../../../session/disappearing_messages/types'; import { Localizer } from '../../../../basic/Localizer'; import { PanelButtonGroup, PanelLabel } from '../../../../buttons/PanelButton'; import { PanelRadioButton } from '../../../../buttons/PanelRadioButton'; -function toDataTestId(mode: DisappearingMessageConversationModeType): SessionDataTestId { +function toDataTestId(mode: DisappearingMessageConversationModeType) { switch (mode) { case 'legacy': - return 'disappear-legacy-option'; + return 'disappear-legacy-option' as const; case 'deleteAfterRead': - return 'disappear-after-read-option'; + return 'disappear-after-read-option' as const; case 'deleteAfterSend': - return 'disappear-after-send-option'; + return 'disappear-after-send-option' as const; case 'off': default: - return 'disappear-off-option'; + return 'disappear-off-option' as const; } } @@ -57,6 +56,7 @@ export const DisappearingModes = (props: DisappearingModesProps) => { : mode === 'deleteAfterSend' ? window.i18n('disappearingMessagesDisappearAfterSendDescription') : undefined; + const parentDataTestId = toDataTestId(mode); return ( { setSelected(mode); }} disabled={options[mode]} - dataTestId={toDataTestId(mode)} + dataTestId={parentDataTestId} + radioInputDataTestId={`input-${parentDataTestId}`} /> ); })} diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx index 26e2698056..01e06f0e7b 100644 --- a/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx +++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx @@ -1,5 +1,6 @@ import { isEmpty } from 'lodash'; +import { DisappearTimeOptionDataTestId } from 'react'; import { TimerOptionsArray } from '../../../../../session/disappearing_messages/timerOptions'; import { PanelButtonGroup, PanelLabel } from '../../../../buttons/PanelButton'; import { PanelRadioButton } from '../../../../buttons/PanelRadioButton'; @@ -29,6 +30,8 @@ export const TimeOptions = (props: TimerOptionsProps) => { )} {options.map(option => { + // we want "time-option-3600-seconds", etc as accessibility id + const parentDataTestId: DisappearTimeOptionDataTestId = `time-option-${option.value}-seconds`; return ( { setSelected(option.value); }} disabled={disabled} - dataTestId={`time-option-${option.value}-seconds`} // we want "time-option-3600-seconds", etc as accessibility id + dataTestId={parentDataTestId} + radioInputDataTestId={`input-${parentDataTestId}`} /> ); })} diff --git a/ts/react.d.ts b/ts/react.d.ts index b94435bf3c..d61bbf7fb1 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -6,6 +6,26 @@ import 'react'; */ declare module 'react' { + // disappear options + type DisappearOptionDataTestId = + | 'disappear-after-send-option' + | 'disappear-after-read-option' + | 'disappear-legacy-option' + | 'disappear-off-option'; + type DisappearTimeOptionDataTestId = + | 'time-option-0-seconds' + | 'time-option-5-seconds' + | 'time-option-10-seconds' + | 'time-option-30-seconds' + | 'time-option-60-seconds' + | 'time-option-300-seconds' + | 'time-option-1800-seconds' + | 'time-option-3600-seconds' + | 'time-option-21600-seconds' + | 'time-option-43200-seconds' + | 'time-option-86400-seconds' + | 'time-option-604800-seconds' + | 'time-option-1209600-seconds'; type SessionDataTestId = | 'group-member-status-text' | 'loading-spinner' @@ -82,19 +102,10 @@ declare module 'react' { | 'accept-menu-item' // timer options - | 'time-option-0-seconds' - | 'time-option-5-seconds' - | 'time-option-10-seconds' - | 'time-option-30-seconds' - | 'time-option-60-seconds' - | 'time-option-300-seconds' - | 'time-option-1800-seconds' - | 'time-option-3600-seconds' - | 'time-option-21600-seconds' - | 'time-option-43200-seconds' - | 'time-option-86400-seconds' - | 'time-option-604800-seconds' - | 'time-option-1209600-seconds' + | DisappearTimeOptionDataTestId + | DisappearOptionDataTestId + | `input-${DisappearTimeOptionDataTestId}` + | `input-${DisappearOptionDataTestId}` // generic readably message (not control message) | 'message-content' @@ -117,12 +128,6 @@ declare module 'react' { | 'call-notification-started-call' | 'call-notification-answered-a-call' - // disappear options - | 'disappear-after-send-option' - | 'disappear-after-read-option' - | 'disappear-legacy-option' - | 'disappear-off-option' - // settings toggle and buttons | 'remove-password-settings-button' | 'change-password-settings-button' From bfafcaf446ba474747c7ec808420a2901f058ed5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 26 Nov 2024 15:05:48 +1100 Subject: [PATCH 187/302] fix: show unblock to send placeholder because **consistency** --- .../conversation/composition/CompositionBox.tsx | 13 +++++++++---- ts/state/selectors/selectedConversation.ts | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx index 99ec3ee9a5..303ce0c1a5 100644 --- a/ts/components/conversation/composition/CompositionBox.tsx +++ b/ts/components/conversation/composition/CompositionBox.tsx @@ -26,6 +26,7 @@ import { getSelectedConversation, } from '../../../state/selectors/conversations'; import { + getIsSelectedBlocked, getSelectedCanWrite, getSelectedConversationKey, } from '../../../state/selectors/selectedConversation'; @@ -102,6 +103,7 @@ interface Props { selectedConversationKey?: string; selectedConversation: ReduxConversationType | undefined; typingEnabled: boolean; + isBlocked: boolean; quotedMessageProps?: ReplyingToMessageProps; stagedAttachments: Array; onChoseAttachments: (newAttachments: Array) => void; @@ -389,7 +391,7 @@ class CompositionBoxInner extends Component { private renderCompositionView() { const { showEmojiPanel } = this.state; - const { typingEnabled } = this.props; + const { typingEnabled, isBlocked } = this.props; // we can only send a message if the conversation allows writing in it AND // - we've got a message body OR @@ -400,7 +402,9 @@ class CompositionBoxInner extends Component { /* eslint-disable @typescript-eslint/no-misused-promises */ // we completely hide the composition box when typing is not enabled now. - if (!typingEnabled) { + // Actually not anymore. We want the above, except when we can't write because that user is blocked. + // When that user is blocked, **and only then**, we want to show the composition box, disabled with the placeholder "unblock to send". + if (!typingEnabled && !isBlocked) { return null; } @@ -412,7 +416,7 @@ class CompositionBoxInner extends Component { alignItems={'center'} width={'100%'} > - + {typingEnabled && } { type="file" onChange={this.onChoseAttachment} /> - + {typingEnabled && } { selectedConversation: getSelectedConversation(state), selectedConversationKey: getSelectedConversationKey(state), typingEnabled: getSelectedCanWrite(state), + isBlocked: getIsSelectedBlocked(state), }; }; diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index b981bc04ec..3d52e8ed61 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -23,7 +23,7 @@ const getIsSelectedPrivate = (state: StateType): boolean => { return Boolean(getSelectedConversation(state)?.isPrivate) || false; }; -const getIsSelectedBlocked = (state: StateType): boolean => { +export const getIsSelectedBlocked = (state: StateType): boolean => { return Boolean(getSelectedConversation(state)?.isBlocked) || false; }; From c83bed4a30e8d3c57e37fdd48836ed0c664189aa Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 26 Nov 2024 15:10:33 +1100 Subject: [PATCH 188/302] chore: fix unit tests --- .../libsession_wrapper/libsession_wrapper_metagroup_test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 1899027008..365080678b 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -154,8 +154,8 @@ describe('libsession_metagroup', () => { it('all fields are accounted for', () => { const memberCreated = metaGroupWrapper.memberGetOrConstruct(member); console.info('Object.keys(memberCreated) ', JSON.stringify(Object.keys(memberCreated))); - expect(Object.keys(memberCreated).length).to.be.eq( - 6, // if you change this value, also make sure you add a test, testing that new field, below + expect(Object.keys(memberCreated).sort()).to.be.deep.eq( + ['pubkeyHex', 'name', 'profilePicture', 'memberStatus', 'nominatedAdmin'].sort(), // if you change this value, also make sure you add a test, testing that new field, below 'this test is designed to fail if you need to add tests to test a new field of libsession' ); }); @@ -231,7 +231,7 @@ describe('libsession_metagroup', () => { metaGroupWrapper.memberConstructAndSet(member2); metaGroupWrapper.memberSetAccepted(member); - metaGroupWrapper.memberSetPromoted(member2); + metaGroupWrapper.memberSetPromotionSent(member2); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); expect(metaGroupWrapper.memberGet(member)).to.be.deep.eq({ From cd49729779606d4fc85c9d0cc0342ed0498514f5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 26 Nov 2024 17:05:07 +1100 Subject: [PATCH 189/302] chore: make dataTestIds for timer options human readable --- .../disappearing-messages/TimeOptions.tsx | 61 ++++++++++++++++++- ts/react.d.ts | 16 ++--- .../disappearing_messages/timerOptions.ts | 2 +- 3 files changed, 67 insertions(+), 12 deletions(-) diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx index 01e06f0e7b..b8efb21763 100644 --- a/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx +++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/TimeOptions.tsx @@ -1,10 +1,14 @@ import { isEmpty } from 'lodash'; import { DisappearTimeOptionDataTestId } from 'react'; -import { TimerOptionsArray } from '../../../../../session/disappearing_messages/timerOptions'; +import { + TimerOptionsArray, + TimerSeconds, +} from '../../../../../session/disappearing_messages/timerOptions'; import { PanelButtonGroup, PanelLabel } from '../../../../buttons/PanelButton'; import { PanelRadioButton } from '../../../../buttons/PanelRadioButton'; import { Localizer } from '../../../../basic/Localizer'; +import { assertUnreachable } from '../../../../../types/sqlSharedTypes'; type TimerOptionsProps = { options: TimerOptionsArray | null; @@ -14,6 +18,56 @@ type TimerOptionsProps = { disabled?: boolean; }; +function toMinutes(seconds: Extract) { + const ret = Math.floor(seconds / 60); + if (ret !== 5 && ret !== 30) { + throw new Error('invalid toMinutes'); + } + return ret; +} + +function toHours(seconds: Extract) { + const ret = Math.floor(seconds / 3600); + if (ret !== 1 && ret !== 6 && ret !== 12) { + throw new Error('invalid toHours'); + } + return ret; +} + +function toDays(seconds: Extract) { + const ret = Math.floor(seconds / 86400); + if (ret !== 1 && ret !== 7 && ret !== 14) { + throw new Error('invalid toDays'); + } + return ret; +} + +function getDataTestIdFromTimerSeconds(seconds: TimerSeconds): DisappearTimeOptionDataTestId { + switch (seconds) { + case 0: + case 5: + case 10: + case 30: + case 60: + return `time-option-${seconds}-seconds`; + case 300: + case 1800: + return `time-option-${toMinutes(seconds)}-minutes`; + case 3600: + case 21600: + case 43200: + return `time-option-${toHours(seconds)}-hours`; + case 86400: + case 604800: + case 1209600: + return `time-option-${toDays(seconds)}-days`; + default: + assertUnreachable(seconds, 'getDataTestIdFromTimerSeconds: unhandled case'); + // tsc is a bit dumb sometimes and expects a return here + throw new Error('getDataTestIdFromTimerSeconds: unhandled case'); + } +} + export const TimeOptions = (props: TimerOptionsProps) => { const { options, selected, setSelected, hasOnlyOneMode, disabled } = props; @@ -30,8 +84,9 @@ export const TimeOptions = (props: TimerOptionsProps) => { )} {options.map(option => { - // we want "time-option-3600-seconds", etc as accessibility id - const parentDataTestId: DisappearTimeOptionDataTestId = `time-option-${option.value}-seconds`; + // we want "time-option-1-hours", etc as accessibility id + const parentDataTestId = getDataTestIdFromTimerSeconds(option.value); + return ( Date: Wed, 27 Nov 2024 09:55:18 +1100 Subject: [PATCH 190/302] chore: fix typo and update session foundation contact --- package.json | 4 +-- ts/receiver/dataMessage.ts | 3 +- ts/receiver/receiver.ts | 2 +- ts/session/apis/snode_api/getNetworkTime.ts | 34 ------------------- .../libsession_utils_multi_encrypt.ts | 2 +- ts/state/onboarding/ducks/registration.ts | 2 +- .../unit/sending/PendingMessageCache_test.ts | 2 +- 7 files changed, 7 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index 06a572a297..dedfd9009d 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "version": "1.15.0", "license": "GPL-3.0", "author": { - "name": "Oxen Labs", - "email": "team@oxen.io" + "name": "Session Foundation", + "email": "contact@session.foundation" }, "repository": { "type": "git", diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts index bc6c253dd3..5be3402acb 100644 --- a/ts/receiver/dataMessage.ts +++ b/ts/receiver/dataMessage.ts @@ -46,8 +46,7 @@ function cleanAttachments(decryptedDataMessage: SignalService.DataMessage) { // Here we go from binary to string/base64 in all AttachmentPointer digest/key fields - // we do not care about group on Session Desktop - + // we do not care about the group field on Session Desktop decryptedDataMessage.group = null; // when receiving a message we get keys of attachment as buffer, but we override the data with the decrypted string instead. diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts index 8816d8d061..0eb2b3828c 100644 --- a/ts/receiver/receiver.ts +++ b/ts/receiver/receiver.ts @@ -167,7 +167,7 @@ async function handleRequestDetail( envelope.messageHash = messageHash; try { - // NOTE: Annoyngly we add plaintext to the cache + // NOTE: Annoyingly we add plaintext to the cache // after we've already processed some of it (thus the // need to handle senderIdentity separately)... perfStart(`addToCache-${envelope.id}`); diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index aa052003e0..e22051787c 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -6,41 +6,8 @@ import { isNumber } from 'lodash'; -import { BatchRequests } from './batchRequest'; -import { Snode } from '../../../data/types'; -import { NetworkTimeSubRequest } from './SnodeRequestTypes'; import { NetworkTime } from '../../../util/NetworkTime'; -const getNetworkTime = async (snode: Snode): Promise => { - const subRequest = new NetworkTimeSubRequest(); - - const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [subRequest], - snode, - 10000, - null, - false - ); - if (!result || !result.length) { - window?.log?.warn(`getNetworkTime on ${snode.ip}:${snode.port} returned falsy value`, result); - throw new Error('getNetworkTime: Invalid result'); - } - - const firstResult = result[0]; - - if (firstResult.code !== 200) { - window?.log?.warn('Status is not 200 for getNetworkTime but: ', firstResult.code); - throw new Error('getNetworkTime: Invalid status code'); - } - - const timestamp = firstResult?.body?.timestamp; - if (!timestamp) { - throw new Error(`getNetworkTime returned invalid timestamp: ${timestamp}`); - } - GetNetworkTime.handleTimestampOffsetFromNetwork('getNetworkTime', timestamp); - return timestamp; -}; - function handleTimestampOffsetFromNetwork(_request: string, snodeTimestamp: number) { if (snodeTimestamp && isNumber(snodeTimestamp) && snodeTimestamp > 1609419600 * 1000) { // first january 2021. Arbitrary, just want to make sure the return timestamp is somehow valid and not some crazy low value @@ -50,6 +17,5 @@ function handleTimestampOffsetFromNetwork(_request: string, snodeTimestamp: numb } export const GetNetworkTime = { - getNetworkTime, handleTimestampOffsetFromNetwork, }; diff --git a/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts b/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts index cc75b22a3a..287359721e 100644 --- a/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts +++ b/ts/session/utils/libsession/libsession_utils_multi_encrypt.ts @@ -5,7 +5,7 @@ import { /** * Try to decrypt the content with any type of encryption domains we know. - * Does not throw, will return null if we couldn't decrypt it successfuly. + * Does not throw, will return null if we couldn't decrypt it successfully. */ async function multiDecryptAnyEncryptionDomain({ encoded, diff --git a/ts/state/onboarding/ducks/registration.ts b/ts/state/onboarding/ducks/registration.ts index ef52f4bacd..24dbeff6f7 100644 --- a/ts/state/onboarding/ducks/registration.ts +++ b/ts/state/onboarding/ducks/registration.ts @@ -27,7 +27,7 @@ export enum AccountRestoration { Finished, /** we failed to fetch account details in time, so we enter it manually */ DisplayName, - /** we have restored successfuly, show the conversation screen */ + /** we have restored successfully, show the conversation screen */ Complete, } diff --git a/ts/test/session/unit/sending/PendingMessageCache_test.ts b/ts/test/session/unit/sending/PendingMessageCache_test.ts index 4ade1eaa3b..ad9028ff8f 100644 --- a/ts/test/session/unit/sending/PendingMessageCache_test.ts +++ b/ts/test/session/unit/sending/PendingMessageCache_test.ts @@ -299,7 +299,7 @@ describe('PendingMessageCache', () => { Buffer.compare(message.plainTextBuffer, addedMessage.plainTextBuffer) === 0; expect(buffersCompare).to.equal(true, 'buffers were not loaded properly from database'); - // Compare all other valures + // Compare all other values const trimmedAdded = _.omit(addedMessage, ['plainTextBuffer', 'plainTextBufferHex']); const trimmedRebuilt = _.omit(message, ['plainTextBuffer', 'plainTextBufferHex']); From 2b44edeff44711efe3a76c7095f6ecb96619c737 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 27 Nov 2024 10:05:27 +1100 Subject: [PATCH 191/302] fix: type check cause crash on create new group --- ts/webworker/workers/node/libsession/libsession.worker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/webworker/workers/node/libsession/libsession.worker.ts b/ts/webworker/workers/node/libsession/libsession.worker.ts index 95ab16c0ef..7db1a16635 100644 --- a/ts/webworker/workers/node/libsession/libsession.worker.ts +++ b/ts/webworker/workers/node/libsession/libsession.worker.ts @@ -232,7 +232,7 @@ function initGroupWrapper(options: Array, wrapperType: ConfigWrapperGro return; } - if (options.length !== 1 || isObject(options[0])) { + if (options.length !== 1 || !isObject(options[0])) { throw new Error(`group: "${wrapperType}" init needs 1 arguments`); } const firstArg = options[0]; From ddd03899a0e49073d96b1c3d987eb38acad407ab Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 27 Nov 2024 10:14:48 +1100 Subject: [PATCH 192/302] chore: fetch latest strings --- _locales/af/messages.json | 2 +- _locales/ar/messages.json | 27 +++++++++++++++------------ _locales/az/messages.json | 2 +- _locales/bal/messages.json | 2 +- _locales/be/messages.json | 2 +- _locales/bg/messages.json | 2 +- _locales/bn/messages.json | 2 +- _locales/ca/messages.json | 2 +- _locales/cs/messages.json | 2 ++ _locales/da/messages.json | 2 +- _locales/de/messages.json | 1 + _locales/el/messages.json | 2 +- _locales/en/messages.json | 1 + _locales/et/messages.json | 2 +- _locales/eu/messages.json | 2 +- _locales/fi/messages.json | 2 +- _locales/fil/messages.json | 2 +- _locales/fr/messages.json | 2 +- _locales/gl/messages.json | 2 +- _locales/ha/messages.json | 2 +- _locales/hr/messages.json | 2 +- _locales/ka/messages.json | 2 +- _locales/my/messages.json | 2 +- _locales/nl/messages.json | 2 ++ _locales/ny/messages.json | 2 +- _locales/pl/messages.json | 2 +- _locales/uk/messages.json | 19 ++++++++++++------- 27 files changed, 54 insertions(+), 40 deletions(-) diff --git a/_locales/af/messages.json b/_locales/af/messages.json index f60b4a5638..3d79ce8e36 100644 --- a/_locales/af/messages.json +++ b/_locales/af/messages.json @@ -251,7 +251,7 @@ "create": "Skep", "cut": "Sny", "databaseErrorGeneric": "’n Databasisfout het voorgekom.

Voer jou toepassingslogboeke uit om te deel vir foutsporing. Indien dit onsuksesvol is, herinstalleer {app_name} en herstel jou rekening.

Waarskuwing: Dit sal lei tot die verlies van alle boodskappe, aanhegsels, en rekeningdata ouer as twee weke.", - "databaseErrorTimeout": "Ons het opgemerk {app_name} neem lank om te begin.

Jy kan aanhou wag, jou toestel logs uitvoer om te deel vir foutsporing, of probeer om Session te herbegin.", + "databaseErrorTimeout": "Ons het opgemerk {app_name} neem lank om te begin.

Jy kan aanhou wag, jou toestel logs uitvoer om te deel vir foutsporing, of probeer om {app_name} te herbegin.", "databaseErrorUpdate": "Jou app databasis is onversoenbaar met hierdie weergawe van {app_name}. Herinstalleer die app en herstel jou rekening om 'n nuwe databasis te genereer en voort te gaan met die gebruik van {app_name}.

Waarskuwing: Dit sal lei tot die verlies van alle boodskappe en aanhegsels ouer as twee weke.", "databaseOptimizing": "Optimalisering databasis", "debugLog": "Ontfout Log", diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json index 62b45dfdef..698db60456 100644 --- a/_locales/ar/messages.json +++ b/_locales/ar/messages.json @@ -30,11 +30,11 @@ "adminRemoveAsAdmin": "إزالة كمشرف", "adminRemoveCommunityNone": "لا يوجد مسؤولين في هذا المجتمع.", "adminRemoveFailed": "فشل في إزالة {name} كمدير.", - "adminRemoveFailedMultiple": "فشل في إزالة {name} و{count} آخرين كمسؤول.", - "adminRemoveFailedOther": "فشل في إزالة {name} و{other_name} كمسؤول.", + "adminRemoveFailedMultiple": "فشل في إزالة {name} و{count} آخرين كمشرف.", + "adminRemoveFailedOther": "فشل في إزالة {name} و{other_name} كمشرف.", "adminRemovedUser": "{name} تم إزالته كمشرف.", - "adminRemovedUserMultiple": "تمت إزالة {name} و{count} آخرين من منصبهم كمسؤولين.", - "adminRemovedUserOther": "تمت إزالة {name} و{other_name} من منصبي المسؤول.", + "adminRemovedUserMultiple": "تمت إزالة {name} و{count} آخرين من منصبهم كمشرفين.", + "adminRemovedUserOther": "تمت إزالة {name} و{other_name} من منصبي المشرف.", "adminSettings": "اعدادات المسؤول", "adminTwoPromotedToAdmin": "{name} و {other_name} تم ترقيتهم إلى مشرف.", "andMore": "+{count}", @@ -57,7 +57,7 @@ "appearanceZoomOut": "تصغير", "attachment": "مرفق", "attachmentsAdd": "إضافة مرفق", - "attachmentsAlbumUnnamed": "ألبوم بدون إسم", + "attachmentsAlbumUnnamed": "البوم بدون اسم", "attachmentsAutoDownload": "تنزيل المرفقات تلقائيًا", "attachmentsAutoDownloadDescription": "تنزيل الوسائط والملفات من هذه الدردشة تلقائيًا.", "attachmentsAutoDownloadModalDescription": "هل تود تنزيل كافة الملفات تلقائيًا من {conversation_name}؟", @@ -146,6 +146,7 @@ "callsNotificationsRequired": "المكالمات الصوتية والمرئية تتطلب تمكين الاشعارات في اعدادات نظامك.", "callsPermissionsRequired": "صلاحيات الاتصال مطلوبة", "callsPermissionsRequiredDescription": "يمكنك تفعيل صَلاحِيَة \"المكالمات الصوتية والمرئية\" في إعدادات الخصوصية.", + "callsPermissionsRequiredDescription1": "يمكنك تمكين إذن \"المكالمات الصوتية والفيديو\" في إعدادات الأذونات.", "callsReconnecting": "جار إعادة الاتصال…", "callsRinging": "يرن حاليا...", "callsSessionCall": "{app_name} Call", @@ -250,7 +251,7 @@ "create": "إنشاء", "cut": "قص", "databaseErrorGeneric": "حدث خطأ في قاعدة البيانات.

صدر سجلات التطبيق الخاصة بك للمشاركة في استكشاف الأخطاء وإصلاحها. إذا لم ينجح ذلك، أعد تثبيت {app_name} واستعد حسابك.

تحذير: سيؤدي ذلك إلى فقدان جميع الرسائل والمرفقات وبيانات الحساب التي يزيد عمرها عن أسبوعين.", - "databaseErrorTimeout": "لقد لاحظنا أن {app_name} يستغرق وقتًا طويلاً لبدء.

يمكنك مواصلة الانتظار، تصدير سجلات الجهاز للمشاركة في استكشاف الأخطاء وإصلاحها، أو محاولة إعادة تشغيل Session.", + "databaseErrorTimeout": "لقد لاحظنا أن {app_name} يستغرق وقتًا طويلاً لبدء.

يمكنك مواصلة الانتظار، تصدير سجلات الجهاز للمشاركة في استكشاف الأخطاء وإصلاحها، أو محاولة إعادة تشغيل {app_name}.", "databaseErrorUpdate": "قاعدة بيانات تطبيقك غير متوافقة مع هذا الإصدار من {app_name}. أعد تثبيت التطبيق واستعد حسابك لإنشاء قاعدة بيانات جديدة ومتابعة استخدام {app_name}.

تحذير: سيؤدي هذا إلى فقدان جميع الرسائل والمرفقات التي يزيد عمرها عن أسبوعين.", "databaseOptimizing": "تحسين قاعدة البيانات", "debugLog": "سجل تصحيح الأخطاء", @@ -275,10 +276,12 @@ "deleteMessageDeleted": "{count, plural, zero [تم حذف الرسائل] one [تم حذف الرسالة] two [تم حذف الرسائل] few [تم حذف الرسائل] many [تم حذف الرسائل] other [تم حذف الرسائل]}", "deleteMessageDeletedGlobally": "تم حذف هذه الرسالة", "deleteMessageDeletedLocally": "تم حذف هذه الرسالة على هذا الجهاز", + "deleteMessageDescriptionDevice": "{count, plural, zero [هل أنت متأكد من حذف الرسائل من هذا الجهاز فقط؟] one [هل أنت متأكد من حذف الرسالة من هذا الجهاز فقط؟] two [هل أنت متأكد من حذف الرسائل من هذا الجهاز فقط؟] few [هل أنت متأكد من حذف الرسائل من هذا الجهاز فقط؟] many [هل أنت متأكد من حذف الرسائل من هذا الجهاز فقط؟] other [هل أنت متأكد من حذف الرسائل من هذا الجهاز فقط؟]}", "deleteMessageDescriptionEveryone": "هل أنت متأكد من أنك تريد حذف هذه الرسالة للجميع؟", "deleteMessageDeviceOnly": "حذف على هذا الجهاز فقط", "deleteMessageDevicesAll": "حذف على جميع أجهزتي", "deleteMessageEveryone": "حذف للجميع", + "deleteMessageNoteToSelfWarning": "{count, plural, zero [لا يمكن حذف بعض الرسائل التي حددتها من جميع أجهزتك] one [لا يمكن حذف هذه الرسالة من جميع أجهزتك] two [لا يمكن حذف بعض الرسائل التي حددتها من جميع أجهزتك] few [لا يمكن حذف بعض الرسائل التي حددتها من جميع أجهزتك] many [لا يمكن حذف بعض الرسائل التي حددتها من جميع أجهزتك] other [لا يمكن حذف بعض الرسائل التي حددتها من جميع أجهزتك]}", "deleteMessagesDescriptionEveryone": "هل أنت متيقِّن من أنك تريد مسح هذه الرسائل لدى الجميع؟", "deleting": "حذف", "developerToolsToggle": "تحويل أدوات المطور", @@ -309,7 +312,7 @@ "disappearingMessagesSetYou": "أنت قمت بتعيين الرسائل لتختفي بعد {time} من {disappearing_messages_type}.", "disappearingMessagesTimer": "المؤقت", "disappearingMessagesTurnedOff": "{name} قام بإيقاف الرسائل المختفية. لن تختفي الرسائل التي يرسلها بعد الآن.", - "disappearingMessagesTurnedOffGroup": "{name} قام/ت بإيقاف تشغيل الرسائل المختفية إيقاف.", + "disappearingMessagesTurnedOffGroup": "{name} قام بإيقاف تشغيل الرسائل المختفية إيقاف.", "disappearingMessagesTurnedOffYou": "أنت أوقفت الرسائل المختفية. لم تعد الرسائل التي ترسلها تختفي.", "disappearingMessagesTurnedOffYouGroup": "قمت بإيقاف تشغيل الرسائل المختفية.", "disappearingMessagesTypeRead": "القراءة", @@ -441,7 +444,7 @@ "helpSupport": "الدعم", "helpWedLoveYourFeedback": "نتطلع لقراءة أراءك", "hide": "إخفاء", - "hideMenuBarDescription": "Toggle system menu bar visibility", + "hideMenuBarDescription": "تبديل رؤية شريط قائمة النظام", "hideOthers": "إخفاء الآخرين", "image": "صورة", "incognitoKeyboard": "لوحة المفاتيح في وضع التستّر", @@ -558,9 +561,9 @@ "notificationsFastModeDescription": "ستتم إعلامك بالرسائل الجديدة بشكل موثوق وفوري باستخدام خوادم إشعارات جوجل.", "notificationsFastModeDescriptionIos": "سوف يتم إعلامك برسائل جديدة بشكل موثوق وفوري باستخدام خوادم إشعارات Apple.", "notificationsGoToDevice": "اذهب إلى إعدادات تنبيهات الجهاز", - "notificationsHeaderAllMessages": "التنبيهات - الكل", - "notificationsHeaderMentionsOnly": "التنبيهات - الإشعارات فقط", - "notificationsHeaderMute": "التنبيهات - مكتومة", + "notificationsHeaderAllMessages": "الإشعارات - الكل", + "notificationsHeaderMentionsOnly": "الإشعارات- الإشارات فقط", + "notificationsHeaderMute": "الإشعارات - مكتومة", "notificationsIosGroup": "{name} إلى {conversation_name}", "notificationsIosRestart": "ربما تلقيت رسائل أثناء إعادة تشغيل {device} الخاص بك.", "notificationsLedColor": "لون ضوء التنبيه LED", @@ -748,7 +751,7 @@ "showLess": "عرض أقل", "stickers": "الملصقات", "supportGoTo": "اِذهب اِلى صفحة الدعم", - "systemInformationDesktop": "System Information: {information}", + "systemInformationDesktop": "معلومات النظام: {information}", "theContinue": "التالي", "theDefault": "افتراضي", "theError": "خطأ", diff --git a/_locales/az/messages.json b/_locales/az/messages.json index 1f983e8ac4..048e84b8c2 100644 --- a/_locales/az/messages.json +++ b/_locales/az/messages.json @@ -252,7 +252,7 @@ "create": "Yarat", "cut": "Kəs", "databaseErrorGeneric": "Bir databaza xətası baş verdi.

Problemin aradan qaldırılması üçün tətbiq jurnalınızı paylaşmaq məqsədilə xaricə köçürün. Bu uğursuz olsa, {app_name} tətbiqini təkrar quraşdırıb hesabınızı bərpa edin.

Xəbərdarlıq: Bu, iki həftədən köhnə olan bütün mesajların, qoşmaların və hesab datasının itməsi ilə nəticələnəcək.", - "databaseErrorTimeout": "{app_name} tətbiqinin başladılmasının çox vaxt apardığına fikir verdik.

Gözləməyə davam edə, problemin aradan qaldırılması üçün cihazınızın jurnallarını xaricə köçürə və ya Session-u yenidən başlatmağa çalışa bilərsiniz.", + "databaseErrorTimeout": "{app_name} tətbiqinin başladılmasının çox vaxt apardığına fikir verdik.

Gözləməyə davam edə, problemin aradan qaldırılması üçün cihazınızın jurnallarını xaricə köçürə və ya {app_name}-u yenidən başlatmağa çalışa bilərsiniz.", "databaseErrorUpdate": "Tətbiqinizin databazası {app_name} tətbiqinin versiyası ilə uyumlu deyil. Yeni bir databaza yaratmaq və {app_name} istifadə etməyə davam etmək üçün tətbiqi yenidən quraşdırın və hesabınızı bərpa edin.

Xəbərdarlıq: Bu, iki həftədən köhnə olan bütün mesajların və qoşmaların itkisi ilə nəticələnəcək.", "databaseOptimizing": "Databaza optimallaşdırılır", "debugLog": "Sazlama jurnalı", diff --git a/_locales/bal/messages.json b/_locales/bal/messages.json index 05472f6001..989e931b60 100644 --- a/_locales/bal/messages.json +++ b/_locales/bal/messages.json @@ -251,7 +251,7 @@ "create": "بناؤ", "cut": "کٹ", "databaseErrorGeneric": "Database error wajaht bravestā.

Apē application logs export ke troubleshooting bare. Agar u naęt, {app_name} reinstall ke a hare account still bāz ke.

Warning: Ē war result hōk wando messages attachment a all account data pur z du hafte purān gōh.", - "databaseErrorTimeout": "ما پٹِن گی اتہ {app_name} سرا کتن وقت گشتنت۔

باقی انتظار بکنت، سپاڈی بروک کردیا گزارش بکنت بیت ائی٬ گپچہ رفتارشت بار بکودنت بیت اتہ بھال دکنت۔", + "databaseErrorTimeout": "ما دیستگ کہ {app_name} ءِ بندات کنگ ءَ بازیں وھدے لگ اِیت۔

شما دیم ءَ اوشتات کن اِت، وتی ڈیوائس ءِ لاگاں پہ جیڑہ ءِ گیش ءُ گیوار ءَ شیئر کنگ ءِ ھاترا برآمد کن اِت یا {app_name} ءَ پدا بندات کنگ ءِ جُھد ءَ کن اِت۔", "databaseErrorUpdate": "{app_name} کس ای ورژنئے نکہ ایپ دیټابیس ناہم آهن. اِیپ نوک بزا من اَکاونٹ بازگری کن تا پن نوک دیټابیس پیدا بکن تا {app_name} دابی مرت استفاده بکن.

چیتپا: ماہیت زامبلاونکین دو ہفتہ ناہند، تمام پیامانءِ و اٹیچمنٹاں گم بیت.", "databaseOptimizing": "ڈیٹابیس شخصکورانی", "debugLog": "ڈیبگ لگ", diff --git a/_locales/be/messages.json b/_locales/be/messages.json index d39e29a841..d361c0e957 100644 --- a/_locales/be/messages.json +++ b/_locales/be/messages.json @@ -251,7 +251,7 @@ "create": "Стварыць", "cut": "Выразаць", "databaseErrorGeneric": "Адбылася памылка базы дадзеных.

Экспартаваць часопісы прыкладання для падзелу для ліквідацыі непаладак. Калі гэта не ўдасца, перавстанавіць {app_name} і аднавіць свой уліковы запіс.

Папярэджанне: гэта прывядзе да страты ўсіх паведамленняў, укладанняў і дадзеных уліковага запісу, старэйшых за два тыдні.", - "databaseErrorTimeout": "Мы заўважылі, што {app_name} патрабуе шмат часу для запуску.

Вы можаце працягваць чакаць, экспартаваць журналы вашай прылады для спагнання праблем, альбо паспрабаваць перазапусціць Session.", + "databaseErrorTimeout": "Мы заўважылі, што {app_name} патрабуе шмат часу для запуску.

Вы можаце працягваць чакаць, экспартаваць журналы вашай прылады для спагнання праблем, альбо паспрабаваць перазапусціць {app_name}.", "databaseErrorUpdate": "Ваша база даных прыкладання несумяшчальная з гэтай версіяй {app_name}. Пераўсталюйце прыкладанне і аднавіце ўліковы запіс, каб стварыць новую базу даных і працягнуць выкарыстанне {app_name}.

Увага: гэта прывядзе да страты ўсіх паведамленняў і ўкладанняў старэйшых за два тыдні.", "databaseOptimizing": "Аптымізацыя базы даных", "debugLog": "Логі адладкі", diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json index a97249eac3..85bac8bd6f 100644 --- a/_locales/bg/messages.json +++ b/_locales/bg/messages.json @@ -251,7 +251,7 @@ "create": "Създай", "cut": "Изрязване", "databaseErrorGeneric": "Възникна грешка в базата данни.

Експортирайте логовете на приложението, за да ги споделите за отстраняване на проблемите. Ако това не успее, преинсталирайте {app_name} и възстановете акаунта си.

Предупреждение: Това ще доведе до загуба на всички съобщения, прикачени файлове и данни за акаунта, по-стари от две седмици.", - "databaseErrorTimeout": "Забелязахме, че стартирането на {app_name} отнема много време.

Можете да продължите да чакате, да експортирате дневници на устройството си, за да ги споделите за отстраняване на неизправности, или да опитате да рестартирате Session.", + "databaseErrorTimeout": "Забелязахме, че стартирането на {app_name} отнема много време.

Можете да продължите да чакате, да експортирате дневници на устройството си, за да ги споделите за отстраняване на неизправности, или да опитате да рестартирате {app_name}.", "databaseErrorUpdate": "Вашата база данни на приложението е несъвместима с тази версия на {app_name}. Инсталирайте повторно приложението и възстановете своя акаунт, за да генерирате нова база данни и да продължите да използвате {app_name}.

Внимание: Това ще доведе до загуба на всички съобщения и прикачени файлове по-стари от две седмици.", "databaseOptimizing": "Опресняване на базата данни", "debugLog": "Debug Log", diff --git a/_locales/bn/messages.json b/_locales/bn/messages.json index 1065f28c71..f33744aedc 100644 --- a/_locales/bn/messages.json +++ b/_locales/bn/messages.json @@ -251,7 +251,7 @@ "create": "তৈরি করুন", "cut": "কাটুন", "databaseErrorGeneric": "একটি ডাটাবেস ত্রুটি ঘটেছে।

আপনার অ্যাপ্লিকেশন লগগুলি রপ্তানি করুন, সমস্যার সমাধানের জন্য শেয়ার করুন। এটি ব্যর্থ হলে, {app_name} পুনঃইনস্টল করুন এবং আপনার অ্যাকাউন্ট পুনরুদ্ধার করুন।

সতর্কতা: এটি সমস্ত মেসেজ, সংযুক্তি এবং দুই সপ্তাহের পুরানো অ্যাকাউন্ট ডেটার ক্ষতি করবে।", - "databaseErrorTimeout": "We've noticed {app_name} is taking a long time to start.

You can continue to wait, export your device logs to share for troubleshooting, or try restarting Session.", + "databaseErrorTimeout": "We've noticed {app_name} is taking a long time to start.

You can continue to wait, export your device logs to share for troubleshooting, or try restarting {app_name}.", "databaseErrorUpdate": "আপনার অ্যাপ্লিকেশন ডাটাবেস {app_name} এর এই সংস্করণের সাথে অসঙ্গতিপূর্ণ। অ্যাপ পুনরায় ইনস্টল করুন এবং আপনার অ্যাকাউন্ট পুনরুদ্ধার করুন একটি নতুন ডাটাবেস তৈরি করতে এবং {app_name} ব্যবহার করতে থাকুন।

সতর্কতা: এর ফলে আপনার সমস্ত বার্তা এবং সংযুক্তিগুলি দুই সপ্তাহের বেশি পুরানো হারিয়ে যাবে।", "databaseOptimizing": "ডাটাবেস অপ্টিমাইজ করা হচ্ছে", "debugLog": "ডিবাগ লগ", diff --git a/_locales/ca/messages.json b/_locales/ca/messages.json index 829678e577..5bf5146889 100644 --- a/_locales/ca/messages.json +++ b/_locales/ca/messages.json @@ -251,7 +251,7 @@ "create": "Crear", "cut": "Retalla", "databaseErrorGeneric": "S'ha produït un error de la base de dades.

Exporteu els registres de l'aplicació per compartir-los per a la resolució de problemes. Si no té èxit, reinstal·leu {app_name} i restaureu el vostre compte.

Advertència: Això suposarà la pèrdua de tots els missatges, fitxers adjunts i dades del compte anteriors a dues setmanes.", - "databaseErrorTimeout": "Hem notat que {app_name} està trigant molt a començar.

Podeu continuar esperant, exportar els registres del dispositiu per compartir-los per solucionar problemes, o intentar reiniciar Session.", + "databaseErrorTimeout": "Hem notat que {app_name} està trigant molt a començar.

Podeu continuar esperant, exportar els registres del dispositiu per compartir-los per solucionar problemes, o intentar reiniciar {app_name}.", "databaseErrorUpdate": "La base de dades de la vostra aplicació no és compatible amb aquesta versió de {app_name}. Reinstal·leu l'aplicació i restaureu el vostre compte per generar una nova base de dades i continuar utilitzant {app_name}.

Avís: Això donarà lloc a la pèrdua de tots els missatges i adjunts anteriors a dues setmanes.", "databaseOptimizing": "Optimitzant la base de dades", "debugLog": "Registre de depuració", diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json index 3c7a4a6973..8c1fa01f6b 100644 --- a/_locales/cs/messages.json +++ b/_locales/cs/messages.json @@ -148,6 +148,7 @@ "callsNotificationsRequired": "Pro používání hlasových a video hovorů je třeba povolit upozornění/oznámení v systémových nastaveních zařízení.", "callsPermissionsRequired": "Požaduje se oprávnění k volání", "callsPermissionsRequiredDescription": "Oprávnění pro \"Hlasové a video hovory\" můžete povolit v nastavení Soukromí.", + "callsPermissionsRequiredDescription1": "Oprávnění pro \"Hlasové a video hovory\" můžete povolit v nastavení Oprávnění.", "callsReconnecting": "Opětovné připojení…", "callsRinging": "Vyzvání...", "callsSessionCall": "{app_name} hovor", @@ -379,6 +380,7 @@ "groupCreateErrorNoMembers": "Prosím vyberte alespoň jednoho dalšího člena skupiny.", "groupDelete": "Smazat skupinu", "groupDeleteDescription": "Jste si jisti, že chcete smazat {group_name}? Tímto odstraníte všechny členy a smažete veškerý obsah skupiny.", + "groupDeletedMemberDescription": "Skupina {group_name} byla smazána správcem skupiny. Nebudete moci posílat další zprávy.", "groupDescriptionEnter": "Zadejte popis skupiny", "groupDisplayPictureUpdated": "Obrázek skupiny aktualizován.", "groupEdit": "Upravit skupinu", diff --git a/_locales/da/messages.json b/_locales/da/messages.json index 2b0e3490e2..e4e9a3fd81 100644 --- a/_locales/da/messages.json +++ b/_locales/da/messages.json @@ -251,7 +251,7 @@ "create": "Opret", "cut": "Klip", "databaseErrorGeneric": "Der opstod en databasefejl.

Eksportér dine applikationslogfiler for at dele til fejlfinding. Hvis dette ikke lykkes, geninstaller {app_name} og gendan din konto.

Advarsel: Dette vil resultere i tab af alle beskeder, vedhæftede filer og kontodata ældre end to uger.", - "databaseErrorTimeout": "Vi har bemærket, at {app_name} tager lang tid at starte.

Du kan fortsætte med at vente, eksportere dine enhedslogfiler for at dele dem til fejlfinding eller prøve at genstarte Session.", + "databaseErrorTimeout": "Vi har bemærket, at {app_name} tager lang tid at starte.

Du kan fortsætte med at vente, eksportere dine enhedslogfiler for at dele dem til fejlfinding eller prøve at genstarte {app_name}.", "databaseErrorUpdate": "Din app-database er inkompatibel med denne version af {app_name}. Geninstaller appen og gendan din konto for at generere en ny database og fortsætte med at bruge {app_name}.

Advarsel: Dette vil resultere i tab af alle beskeder og vedhæftninger, der er ældre end to uger.", "databaseOptimizing": "Optimerer Database", "debugLog": "Debug log", diff --git a/_locales/de/messages.json b/_locales/de/messages.json index b166cbb2b3..7e692a843e 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -277,6 +277,7 @@ "deleteMessageDeleted": "{count, plural, one [Nachricht gelöscht] other [Nachrichten gelöscht]}", "deleteMessageDeletedGlobally": "Diese Nachricht wurde gelöscht", "deleteMessageDeletedLocally": "Diese Nachricht wurde auf diesem Gerät gelöscht", + "deleteMessageDescriptionDevice": "{count, plural, one [Bist du sicher, du möchtest diese Nachrichten nur von diesem Gerät löschen?] other [Möchtest du diese Nachrichten wirklich nur von diesem Gerät löschen?]}", "deleteMessageDescriptionEveryone": "Möchtest du diese Nachricht wirklich für alle löschen?", "deleteMessageDeviceOnly": "Nur auf diesem Gerät löschen", "deleteMessageDevicesAll": "Von allen meinen Geräten löschen", diff --git a/_locales/el/messages.json b/_locales/el/messages.json index a503717063..d2468ca390 100644 --- a/_locales/el/messages.json +++ b/_locales/el/messages.json @@ -252,7 +252,7 @@ "create": "Δημιουργία", "cut": "Αποκοπή", "databaseErrorGeneric": "Παρουσιάστηκε σφάλμα στη βάση δεδομένων.

Εξάγετε τα αρχεία καταγραφής της εφαρμογής σας για να τα μοιραστείτε για αντιμετώπιση προβλημάτων. Αν αυτό δεν επιτύχει, επανεγκαταστήστε την εφαρμογή {app_name} και αποκαταστήστε το λογαριασμό σας.

Προειδοποίηση: Αυτό θα καταλήξει σε απώλεια όλων των μηνυμάτων, συνημμένων και δεδομένων λογαριασμού που είναι παλαιότερα από δύο εβδομάδες.", - "databaseErrorTimeout": "Παρατηρήσαμε ότι το {app_name} χρειάζεται πολύ χρόνο για να ξεκινήσει.

Μπορείτε να συνεχίσετε να περιμένετε, να εξάγετε τα αρχεία καταγραφής της συσκευής σας για να τα μοιραστείτε για την αντιμετώπιση προβλημάτων ή να επανεκκινήσετε το Session.", + "databaseErrorTimeout": "Παρατηρήσαμε ότι το {app_name} χρειάζεται πολύ χρόνο για να ξεκινήσει.

Μπορείτε να συνεχίσετε να περιμένετε, να εξάγετε τα αρχεία καταγραφής της συσκευής σας για να τα μοιραστείτε για την αντιμετώπιση προβλημάτων ή να επανεκκινήσετε το {app_name}.", "databaseErrorUpdate": "Η βάση δεδομένων της εφαρμογής σας δεν είναι συμβατή με αυτήν την έκδοση του {app_name}. Επανεγκαταστήστε την εφαρμογή και αποκαταστήστε τον λογαριασμό σας για να δημιουργήσετε μια νέα βάση δεδομένων και να συνεχίσετε να χρησιμοποιείτε το {app_name}.

Προειδοποίηση: Αυτό θα έχει ως αποτέλεσμα την απώλεια όλων των μηνυμάτων και των συνημμένων που είναι παλαιότερα των δύο εβδομάδων.", "databaseOptimizing": "Βελτιστοποίηση Βάσης Δεδομένων", "debugLog": "Αρχείο καταγραφής Αποσφαλμάτωσης", diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 8a925c8415..929f35a45a 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -431,6 +431,7 @@ "groupNameVisible": "Group name is visible to all group members.", "groupNoMessages": "You have no messages from {group_name}. Send a message to start the conversation!", "groupOnlyAdmin": "You are the only admin in {group_name}.

Group members and settings cannot be changed without an admin.", + "groupPendingRemoval": "Pending removal", "groupPromotedYou": "You were promoted to Admin.", "groupPromotedYouMultiple": "You and {count} others were promoted to Admin.", "groupPromotedYouTwo": "You and {name} were promoted to Admin.", diff --git a/_locales/et/messages.json b/_locales/et/messages.json index 5242040b5e..2f7758f933 100644 --- a/_locales/et/messages.json +++ b/_locales/et/messages.json @@ -251,7 +251,7 @@ "create": "Loo", "cut": "Lõika", "databaseErrorGeneric": "Andmebaasi viga.

Ekspordi oma rakenduslogid, et jagada tõrkeotsinguteks. Kui see ei õnnestu, installige {app_name} uuesti ja taastage oma konto.

Hoiatus: Selle tulemusel kaotate kõik kaks nädalat vanemad sõnumid, manused ja kontoandmed.", - "databaseErrorTimeout": "Oleme märganud, et {app_name} käivitamine võtab kaua aega.

Võite jätkata ootamist, eksportida oma seadme logisid tõrkeotsingu eesmärgil jagamiseks või proovida Session'i taaskäivitamist.", + "databaseErrorTimeout": "Oleme märganud, et {app_name} käivitamine võtab kaua aega.

Võite jätkata ootamist, eksportida oma seadme logisid tõrkeotsingu eesmärgil jagamiseks või proovida {app_name}'i taaskäivitamist.", "databaseErrorUpdate": "Teie rakenduse andmebaas ei ühildu selle {app_name} versiooniga. Installige rakendus uuesti ja taastage oma konto, et luua uus andmebaas ja jätkata {app_name} kasutamist.

Hoiatus: See kaotab kõik vanemad kui kaks nädalat sõnumid ja manused.", "databaseOptimizing": "Andmebaasi optimeerimine", "debugLog": "Silumislogi", diff --git a/_locales/eu/messages.json b/_locales/eu/messages.json index d4b9b16df7..a9f925dec6 100644 --- a/_locales/eu/messages.json +++ b/_locales/eu/messages.json @@ -251,7 +251,7 @@ "create": "Sortu", "cut": "Ebaki", "databaseErrorGeneric": "Datu-base errorea gertatu da.

Aplikazioaren egunkariak esportatu arakatzean partekatzeko. Honek huts egiten badu, {app_name} berriro instalatu eta zure kontua berreskuratu.

Abisua: Honek bi aste baino gehiagoko mezu, fitxategi eta kontu datu guztiak galduko ditu.", - "databaseErrorTimeout": "{app_name} martxan jartzeko denbora gehiegi hartzen ari dela nabaritu dugu.

Jarrai itzazu itxaroten, esportatu zure gailu-erregistroak konpontzeko partekatzeko edo saiatu Session berrabiarazten.", + "databaseErrorTimeout": "{app_name} martxan jartzeko denbora gehiegi hartzen ari dela nabaritu dugu.

Jarrai itzazu itxaroten, esportatu zure gailu-erregistroak konpontzeko partekatzeko edo saiatu {app_name} berrabiarazten.", "databaseErrorUpdate": "Zure aplikazio-datubasea ez da bateragarria {app_name} bertsio honekin. Berrinstalatu aplikazioa eta leheneratu zure kontua datubase berri bat sortzeko eta {app_name} erabiltzen jarraitzeko.

Abisua: Honek bi astetik gorako mezu eta eranskinen galera eragingo du.", "databaseOptimizing": "Datu Basea Optimizatzen", "debugLog": "Arazketa egunkaria", diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json index b8b13520a0..7b8145b64a 100644 --- a/_locales/fi/messages.json +++ b/_locales/fi/messages.json @@ -252,7 +252,7 @@ "create": "Luo", "cut": "Leikkaa", "databaseErrorGeneric": "Tapahtui tietokantavirhe.

Vie sovelluslokisi vianselvitystä varten. Jollei tämä onnistu, asenna {app_name} uudelleen ja palauta tilisi.

Varoitus: Tämän seurauksena kaikki kahta viikkoa vanhemmat viestit, liitteet ja tilitiedot menetetään.", - "databaseErrorTimeout": "Huomasimme, että {app_name} käynnistyy hitaasti.

Voit jatkaa odottamista, viedä laitteesi lokit jaettavaksi vianmäärityksessä tai yrittää käynnistää Sessionin uudelleen.", + "databaseErrorTimeout": "Huomasimme, että {app_name} käynnistyy hitaasti.

Voit jatkaa odottamista, viedä laitteesi lokit jaettavaksi vianmäärityksessä tai yrittää käynnistää {app_name} uudelleen.", "databaseErrorUpdate": "Sovellustietokanta ei ole yhteensopiva tämän {app_name} version kanssa. Asenna sovellus uudelleen ja palauta tilisi, jotta voit luoda uuden tietokannan ja jatkaa {app_name} käyttöä.

Varoitus: Tämä johtaa yli kaksi viikkoa vanhojen viestien ja liitteiden menetykseen.", "databaseOptimizing": "Optimoidaan tietokanta", "debugLog": "Virheenkorjausloki", diff --git a/_locales/fil/messages.json b/_locales/fil/messages.json index ee3fa42ee1..8abf9fc4cb 100644 --- a/_locales/fil/messages.json +++ b/_locales/fil/messages.json @@ -251,7 +251,7 @@ "create": "Lumikha", "cut": "I-cut", "databaseErrorGeneric": "Nagkaroon ng error sa database.

I-export ang mga log ng iyong application para i-share para sa pag-troubleshoot. Kung hindi ito matagumpay, muling i-install ang {app_name} at ibalik ang iyong account.

Babala: Magreresulta ito sa pagkawala ng lahat ng mga mensahe, attachment, at data ng account na mas matanda kaysa dalawang linggo.", - "databaseErrorTimeout": "Napansin naming matagal bago mag-start ang {app_name}.

Puwede kang maghintay nalang, i-export ang iyong device logs para i-share para sa troubleshooting, o subukan i-restart ang Session.", + "databaseErrorTimeout": "Napansin naming matagal bago mag-start ang {app_name}.

Puwede kang maghintay nalang, i-export ang iyong device logs para i-share para sa troubleshooting, o subukan i-restart ang {app_name}.", "databaseErrorUpdate": "Ang iyong app database ay hindi compatible sa bersyon na ito ng {app_name}. I-reinstall ang app at i-restore ang iyong account upang makabuo ng bagong database at ipagpatuloy ang paggamit ng {app_name}.

Babala: Ito ay magreresulta sa pagkawala ng lahat ng mensahe at attachments na higit sa dalawang linggo.", "databaseOptimizing": "Ina-optimize ang Database", "debugLog": "I-debug ang Log", diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index 0953d2d2e2..909a360024 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -252,7 +252,7 @@ "create": "Créer", "cut": "Couper", "databaseErrorGeneric": "Une erreur de base de données est survenue.

Exportez vos journaux d'application pour les partager pour le dépannage. Si cela échoue, réinstallez {app_name} et restaurez votre compte.

Attention: Cela entraînera la perte de tout les messages, pièces jointes et données de compte de plus de deux semaines.", - "databaseErrorTimeout": "Nous avons remarqué que {app_name} met beaucoup de temps à démarrer.

Vous pouvez continuer à attendre, exporter les journaux de votre appareil pour les partager pour le dépannage ou essayer de redémarrer Session.", + "databaseErrorTimeout": "Nous avons remarqué que {app_name} met beaucoup de temps à démarrer.

Vous pouvez continuer à attendre, exporter les journaux de votre appareil pour les partager pour le dépannage ou essayer de redémarrer {app_name}.", "databaseErrorUpdate": "La base de données de votre application est incompatible avec cette version de {app_name}. Réinstallez l'application et restaurez votre compte pour générer une nouvelle base de données et continuer à utiliser {app_name}.

Avertissement : Cela entraînera la perte de tous les messages et pièces jointes datant de plus de deux semaines.", "databaseOptimizing": "Optimisation de la base de données", "debugLog": "Journal de débogage", diff --git a/_locales/gl/messages.json b/_locales/gl/messages.json index 2b4281d454..a8a76c5a0f 100644 --- a/_locales/gl/messages.json +++ b/_locales/gl/messages.json @@ -237,7 +237,7 @@ "create": "Crear", "cut": "Cortar", "databaseErrorGeneric": "Produciuse un erro na base de datos.

Exporta os rexistros da túa aplicación para compartilos na resolución de problemas. Se non é exitoso, reinstala {app_name} e restaura a túa conta.

Advertencia: Isto resultará na perda de todas as mensaxes, anexos e datos de conta anteriores a dúas semanas.", - "databaseErrorTimeout": "Notamos que {app_name} está a tardar moito en iniciar.

Podes esperar, exportar os teus rexistros do dispositivo para compartir e solucionar problemas, ou tentar reiniciar Session.", + "databaseErrorTimeout": "Notamos que {app_name} está a tardar moito en iniciar.

Podes esperar, exportar os teus rexistros do dispositivo para compartir e solucionar problemas, ou tentar reiniciar {app_name}.", "databaseErrorUpdate": "A base de datos da túa aplicación non é compatible con esta versión de {app_name}. Reinstala a aplicación e restaura a túa conta para xerar unha nova base de datos e continuar usando {app_name}.

Advertencia: Isto resultará na perda de todas as mensaxes e adxuntos anteriores a dúas semanas.", "databaseOptimizing": "Optimizando a Base de Datos", "debugLog": "Rexistro de depuración", diff --git a/_locales/ha/messages.json b/_locales/ha/messages.json index d4680edc30..87dd4c9761 100644 --- a/_locales/ha/messages.json +++ b/_locales/ha/messages.json @@ -251,7 +251,7 @@ "create": "Ƙirƙiri", "cut": "Yanke", "databaseErrorGeneric": "An sami kuskuren bayanai.

Fitar da bayanan aikace-aikacen ku don rabawa don warware matsala. Idan wannan bai yi nasara ba, sake sanya {app_name} kuma dawo da asusunku.

Gargadi: Wannan zai haifar da asarar duk saƙonni, haɗe-haɗe, da bayanan asusu sama da sati biyu.", - "databaseErrorTimeout": "Mun lura cewa {app_name} yana ɗaukar dogon lokaci don farawa.

Za ku iya ci gaba da jira, fitar da log ɗin na'urarku don rabawa don magance matsaloli, ko sake farawa Session.", + "databaseErrorTimeout": "Mun lura cewa {app_name} yana ɗaukar dogon lokaci don farawa.

Za ku iya ci gaba da jira, fitar da log ɗin na'urarku don rabawa don magance matsaloli, ko sake farawa {app_name}.", "databaseErrorUpdate": "Bayanan aikace-aikacen ku ba su dace da wannan sigar {app_name}. Sake shigar da aikace-aikacen kuma dawo da asusunka don samar da sabon database kuma ci gaba da amfani da {app_name}.

Gargadi: Wannan zai haifar da rasa duk sakonni da fayiloli fiye da makonni biyu.", "databaseOptimizing": "Ƙarƙare Bayanai", "debugLog": "Kuskuren Tsari", diff --git a/_locales/hr/messages.json b/_locales/hr/messages.json index e2d0f44efb..2f2c3771e6 100644 --- a/_locales/hr/messages.json +++ b/_locales/hr/messages.json @@ -251,7 +251,7 @@ "create": "Stvori", "cut": "Izreži", "databaseErrorGeneric": "Došlo je do pogreške u bazi podataka.

Izvezite svoje zapisnike aplikacije kako biste ih podijelili za otklanjanje poteškoća. Ako to ne uspije, ponovo instalirajte {app_name} i vratite svoj račun.

Upozorenje: Ovo će rezultirati gubitkom svih poruka, privitaka i podataka računa starijih od dva tjedna.", - "databaseErrorTimeout": "Primijetili smo da pokretanje {app_name} traje dugo.

Možete nastaviti čekati, izvesti zapise uređaja za dijeljenje radi rješavanja problema ili pokušati ponovo pokrenuti Session.", + "databaseErrorTimeout": "Primijetili smo da pokretanje {app_name} traje dugo.

Možete nastaviti čekati, izvesti zapise uređaja za dijeljenje radi rješavanja problema ili pokušati ponovo pokrenuti {app_name}.", "databaseErrorUpdate": "Vaša aplikacijska baza podataka nije kompatibilna s ovom verzijom {app_name}. Ponovno instalirajte aplikaciju i vratite svoj račun kako biste generirali novu bazu podataka i nastavili koristiti {app_name}.

Upozorenje: Ovo će rezultirati gubitkom svih poruka i privitaka starijih od dva tjedna.", "databaseOptimizing": "Optimizacija Baze podataka", "debugLog": "Evidencija o otklanjanju grešaka", diff --git a/_locales/ka/messages.json b/_locales/ka/messages.json index c7b753f31e..27deeaf3b7 100644 --- a/_locales/ka/messages.json +++ b/_locales/ka/messages.json @@ -251,7 +251,7 @@ "create": "შექმნა", "cut": "ამოჭრა", "databaseErrorGeneric": "მოხდა მონაცემთა ბაზის შეცდომა.

გამოიტანეთ თქვენი აპლიკაციის ჟურნალები, რათა გააზიაროთ პრობლემების აღმოფხვრა. თუ ეს წარუმატებელია, ხელახლა დააინსტალირეთ {app_name} და აღადგინეთ თქვენი ანგარიში.

გაფრთხილება: ეს გამოიწვევს ყველა შეტყობინების, დანართის და ორ კვირაზე ძველი ანგარიშის მონაცემის დაკარგვას.", - "databaseErrorTimeout": "გავიგეთ {app_name}-ის გაშვება დიდ დროს იკავებს.

თქვენ შეგიძლიათ დაელოდოთ, ექსპორტირდეთ თქვენი მოწყობილობის ჟურნალები რათა გაუზიაროთ პრობლემების დიაგნოსტირებისთვის, ან სცადოთ Session-ის გადატვირთვა.", + "databaseErrorTimeout": "გავიგეთ {app_name}-ის გაშვება დიდ დროს იკავებს.

თქვენ შეგიძლიათ დაელოდოთ, ექსპორტირდეთ თქვენი მოწყობილობის ჟურნალები რათა გაუზიაროთ პრობლემების დიაგნოსტირებისთვის, ან სცადოთ {app_name}-ის გადატვირთვა.", "databaseErrorUpdate": "თქვენი აპლიკაციის მონაცემთა ბაზა არ შეესაბამება {app_name}-ის ამ ვერსიას. ხელახლა დააინსტალირეთ აპლიკაცია და აღადგინეთ თქვენი ანგარიში ახალი მონაცემთა ბაზის შესაქმნელად და {app_name} გამოყენების გაგრძელებისთვის.

გაფრთხილება: ეს გამოიწვევს ყველა მესიჯის და ფაილის დაკარგვას, რომლებიც ორ კვირაზე მეტი ხნისაა.", "databaseOptimizing": "მონაცემთა ბაზის ოპტიმიზაცია", "debugLog": "გამართვის ჟურნალი", diff --git a/_locales/my/messages.json b/_locales/my/messages.json index ab9cf34242..8d10c37d93 100644 --- a/_locales/my/messages.json +++ b/_locales/my/messages.json @@ -251,7 +251,7 @@ "create": "ဖန်တီးပါ", "cut": "ချည်းကုတ်", "databaseErrorGeneric": "ဒေတာဘေ့စ အမှားတစ်ခု ဖြစ်ပွားသည်။

သင့်အက်ပလီကေးရှင်း လော့ဂ်များကို ထုတ်လွှင့်ပြီး ပြဿနာရှင်းရန် မျှဝေပါ။ ဤအောင်မြင်မှုမရှိပါက {app_name} ကို ပြန်ထည့်သွင်းပြီး သင့်အကောင့်ကို ပြန်လည်ထူထောင်ပါ။

သတိပေးချက်- ဤလုပ်ဆောင်ချက်သည် သင့်မက်ဆေ့ချ်များ၊ ပူးတွဲချက်နှင့် သုံးလကြာသော အကောင့်ဒေတာအားလုံး ပျောက်ဆုံးစေနိုင်ပါသည်။", - "databaseErrorTimeout": "We've noticed {app_name} is taking a long time to start.

You can continue to wait, export your device logs to share for troubleshooting, or try restarting Session.", + "databaseErrorTimeout": "We've noticed {app_name} is taking a long time to start.

You can continue to wait, export your device logs to share for troubleshooting, or try restarting {app_name}.", "databaseErrorUpdate": "သင့်အက်ပ်ဒေတာဘေ့စ်သည် {app_name} ၏ ဤဗားရှင်းနှင့် မက်စ်ပေါ်နိုင်ပါ။ အက်ပ်ကို ပြန်ထည့်သွင်းပြီး သင့်အကောင့်ကို ပြန်လည်ထားပြီး {app_name} ကို ဆက်လက်သုံးဆောင်ရန် အချက်ပြပီးနောက် ငါးပတ်အတွင်းလက်ရှိမက်ဆေ့ခ်ျနှင့်လိုက်ဖက်မှုအတင်ပျောက်သွားနိုင်သည်။

သတိပေးချက်: ဤလုပ်ဆောင်ချက်ကြောင့် အဆိုပါကာလထက်ပိုကြာသော မက်ဆေ့ခ်ျများနှင့် ပျက်စီးပိုင်ဆိုင်မှုများ ပျောက်ဆုံးသွားမည်။", "databaseOptimizing": "ဒေတာဘေ့စ် ဖြည့်စွမ်းနေသည်", "debugLog": "Debug မှတ်တမ်း", diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json index 67928b2d15..82167ca939 100644 --- a/_locales/nl/messages.json +++ b/_locales/nl/messages.json @@ -148,6 +148,7 @@ "callsNotificationsRequired": "Spraak- en video-oproepen vereisen dat meldingen zijn ingeschakeld in de systeeminstellingen van uw apparaat.", "callsPermissionsRequired": "Oproepmachtigingen vereist", "callsPermissionsRequiredDescription": "U kunt de machtiging \"Spraak- en video-oproepen\" inschakelen in de privacy-instellingen.", + "callsPermissionsRequiredDescription1": "U kunt de machtiging voor \"Spraak- en video-oproepen\" inschakelen in de privacy-instellingen.", "callsReconnecting": "Herverbinden…", "callsRinging": "Gaat over...", "callsSessionCall": "{app_name} Gesprek", @@ -376,6 +377,7 @@ "groupCreateErrorNoMembers": "Kies ten minste één ander groepslid.", "groupDelete": "Verwijder groep", "groupDeleteDescription": "Weet je zeker dat je {group_name} wilt verwijderen? Dit zal alle leden verwijderen en alle groepsinhoud wissen.", + "groupDeletedMemberDescription": "{group_name} is verwijderd door een groepsbeheerder. U kunt geen berichten meer versturen.", "groupDescriptionEnter": "Voer een groepsbeschrijving in", "groupDisplayPictureUpdated": "Groepsafbeelding bijgewerkt.", "groupEdit": "Groep bewerken", diff --git a/_locales/ny/messages.json b/_locales/ny/messages.json index 8d2ceac2d8..9f52eb5efa 100644 --- a/_locales/ny/messages.json +++ b/_locales/ny/messages.json @@ -251,7 +251,7 @@ "create": "Yeretsani", "cut": "Dula", "databaseErrorGeneric": "Pakhala vuto la danga la data.

Tumizani zolembera zanu za mapulogalamu kuti mugawane ndi kukonza. Ngati izi sizichitika bwino, bwelersani {app_name} ndikubwezeretsanso akaunti yanu.

Chenjezo: Izi zidzakhudza kutayika kwa mauthenga onse, zolemba zomata, ndi data ya akaunti ya milungu iwiri.", - "databaseErrorTimeout": "Timazindikira {app_name} kutenga nthawi kuti ayambe.

Inu mungapitirize kudikira, kutulutsira chipangizo malipoti kuti azipeza mavuto, kapena yesani kuyambiranso Session.", + "databaseErrorTimeout": "Timazindikira {app_name} kutenga nthawi kuti ayambe.

Inu mungapitirize kudikira, kutulutsira chipangizo malipoti kuti azipeza mavuto, kapena yesani kuyambiranso {app_name}.", "databaseErrorUpdate": "Deta la pulogalamu yanu silikugwirizana ndi mtundu uwu wa {app_name}. Yikani pulogalamu yatsopanoyi ndikubwezerani akaunti yanu kuti mupange deta yatsopano ndikupitiriza kugwiritsa ntchito {app_name}.

Chenjezo: Izi zidzachititsa kuti mutaye mauthenga onse ndi zoyikapo zoposa masabata awo pafupifupi ziwiri.", "databaseOptimizing": "Kupanga bwino Database", "debugLog": "Lowani mu Debug Log", diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json index 8924039f87..fa6ada2653 100644 --- a/_locales/pl/messages.json +++ b/_locales/pl/messages.json @@ -463,7 +463,7 @@ "legacyGroupMemberNewYouOther": "Ty oraz użytkownik {other_name} dołączyliście do grupy.", "legacyGroupMemberTwoNew": "{name} i {other_name} dołączyli do grupy.", "legacyGroupMemberYouNew": "Dołączono do grupy.", - "linkPreviews": "Previzualizări ale linkurilor", + "linkPreviews": "Podgląd linków", "linkPreviewsDescription": "Pokaż podglądy linków dla obsługiwanych adresów URL.", "linkPreviewsEnable": "Włącz podgląd linków", "linkPreviewsErrorLoad": "Nie można wczytać podlągu linku", diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json index 4c4319d23b..680721c28f 100644 --- a/_locales/uk/messages.json +++ b/_locales/uk/messages.json @@ -147,6 +147,7 @@ "callsNotificationsRequired": "Для голосових та відеодзвінків необхідно увімкнути сповіщення в налаштуваннях системи вашого пристрою.", "callsPermissionsRequired": "Потрібні дозволи для дзвінків", "callsPermissionsRequiredDescription": "Ви можете увімкнути дозвіл «Голосові та відеодзвінки» в налаштуваннях конфіденційності.", + "callsPermissionsRequiredDescription1": "Ви можете увімкнути «Голосові та відеодзвінки» в налаштуваннях конфіденційності.", "callsReconnecting": "Повторне з'єднання…", "callsRinging": "Виклик...", "callsSessionCall": "{app_name} Дзвінок", @@ -154,9 +155,9 @@ "callsVoiceAndVideo": "Голосові та відеодзвінки", "callsVoiceAndVideoBeta": "Голосові та відеодзвінки (бета-версія)", "callsVoiceAndVideoModalDescription": "Ваша IP-адреса видима вашому партнеру по дзвінку та серверу Oxen Foundation при використанні бета-дзвінків.", - "callsVoiceAndVideoToggleDescription": "Дозволяє здійснювати голосові та відео виклики з іншими користувачами.", + "callsVoiceAndVideoToggleDescription": "Дозволяє голосові та відеодзвінки з іншими користувачами.", "callsYouCalled": "Ви дзвонили {name}", - "callsYouMissedCallPermissions": "Ви пропустили дзвінок від {name}, бо не увімкнули Голосові та Відеодзвінки у Налаштуваннях Приватності.", + "callsYouMissedCallPermissions": "Ви пропустили дзвінок від {name}, бо не увімкнули Голосові та відеодзвінки у налаштуваннях конфіденційності.", "cameraErrorNotFound": "Камеру не знайдено", "cameraErrorUnavailable": "Камера недоступна.", "cameraGrantAccess": "Дозволити доступ до камери", @@ -236,8 +237,8 @@ "conversationsEnterNewLine": "SHIFT + ENTER надсилає повідомлення, ENTER починає новий рядок", "conversationsEnterSends": "ENTER надсилає повідомлення, SHIFT + ENTER починає новий рядок", "conversationsGroups": "Групи", - "conversationsMessageTrimming": "Обрізка повідомлень", - "conversationsMessageTrimmingTrimCommunities": "Обрізати спільноти", + "conversationsMessageTrimming": "Автовидалення повідомлень", + "conversationsMessageTrimmingTrimCommunities": "Автовидалення повідомлень спільнот", "conversationsMessageTrimmingTrimCommunitiesDescription": "Видаляти повідомлення у спільнотах старше 6 місяців і де більше 2 000 повідомлень.", "conversationsNew": "Нова бесіда", "conversationsNone": "У вас ще немає жодних розмов", @@ -274,9 +275,11 @@ "deleteAfterLegacyGroupsGroupUpdateErrorTitle": "Не вдалося оновити групу", "deleteAfterMessageDeletionStandardisationMessageDeletionForbidden": "У вас немає прав на видалення інших повідомлень", "deleteMessage": "{count, plural, one [Видалити повідомлення] few [Видалити повідомлення] many [Видалити повідомлення] other [Видалити повідомлення]}", + "deleteMessageConfirm": "{count, plural, one [Ви дійсно хочете видалити це повідомлення?] few [Ви дійсно хочете видалити ці повідомлення?] many [Ви дійсно хочете видалити ці повідомлення?] other [Ви дійсно хочете видалити ці повідомлення?]}", "deleteMessageDeleted": "{count, plural, one [Повідомлення видалено] few [Повідомлення видалені] many [Повідомлення видалені] other [Повідомлення видалені]}", "deleteMessageDeletedGlobally": "Це повідомлення було видалено", "deleteMessageDeletedLocally": "Це повідомлення було видалено на цьому пристрої", + "deleteMessageDescriptionDevice": "{count, plural, one [Ви дійсно хочете видалити це повідомлення лише з цього пристрою?] few [Ви дійсно хочете видалити ці повідомлення лише з цього пристрою?] many [Ви дійсно хочете видалити ці повідомлення лише з цього пристрою?] other [Ви дійсно хочете видалити ці повідомлення лише з цього пристрою?]}", "deleteMessageDescriptionEveryone": "Ви впевнені, що бажаєте видалити це повідомлення для всіх?", "deleteMessageDeviceOnly": "Видалити тільки на цьому пристрої", "deleteMessageDevicesAll": "Видалити на всіх моїх пристроях", @@ -373,6 +376,7 @@ "groupCreateErrorNoMembers": "Будь ласка, виберіть принаймні 1 учасника групи.", "groupDelete": "Видалити групу", "groupDeleteDescription": "Ви впевнені, що хочете видалити {group_name}? Це видалить усіх учасників і всю інформацію групи.", + "groupDeletedMemberDescription": "{group_name} видалено адміністратором групи. Ви більше не зможете надсилати повідомлення.", "groupDescriptionEnter": "Введіть опис групи", "groupDisplayPictureUpdated": "Зображення групи для показу оновлено.", "groupEdit": "Редагувати групу", @@ -385,6 +389,7 @@ "groupInviteFailedMultiple": "Не вдалося запросити {name} та ще {count} інших до {group_name}", "groupInviteFailedTwo": "Не вдалося запросити {name} та {other_name} до {group_name}", "groupInviteFailedUser": "Не вдалося запросити {name} до {group_name}", + "groupInviteSending": "{count, plural, one [Надсилання запрошення] few [Надсилання запрошень] many [Надсилання запрошень] other [Надсилання запрошень]}", "groupInviteSent": "Запрошення надіслано", "groupInviteSuccessful": "Запрошення до групи успішне", "groupInviteVersion": "Користувачі мають мати останню версію, щоб отримувати запрошення", @@ -470,7 +475,7 @@ "linkPreviewsErrorLoad": "Не вдалося завантажити попередній перегляд посилання", "linkPreviewsErrorUnsecure": "Попередній перегляд не застосовується для незахищеного посилання", "linkPreviewsFirstDescription": "Відображати попередній перегляд посилань, які ви надсилаєте та отримуєте. Це може бути корисно, однак {app_name} має зв'язуватися з вебсайтами для генерації попереднього перегляду. Ви завжди можете вимкнути попередній перегляд посилань у налаштуваннях {app_name}.", - "linkPreviewsSend": "Надсилати попередній перегляд посилань", + "linkPreviewsSend": "Попередній перегляд надісланих посилань", "linkPreviewsSendModalDescription": "У вас не буде повного захисту метаданих при надсиланні попереднього перегляду посилань.", "linkPreviewsTurnedOff": "Попередній перегляд посилань вимкнено", "linkPreviewsTurnedOffDescription": "{app_name} повинен зв'язуватися з підключеними веб-сайтами, щоб створити попередній перегляд посилань, що ви надсилаєте і отримуєте.

Ви можете увімкнути їх у налаштуваннях {app_name}.", @@ -581,7 +586,7 @@ "notificationsSound": "Звук", "notificationsSoundDescription": "Звукові сповіщення у відкритому застосунку", "notificationsSoundDesktop": "Аудіосповіщення", - "notificationsStrategy": "Стратегія сповіщення", + "notificationsStrategy": "Принцип оповіщення", "notificationsStyle": "Стиль сповіщень", "notificationsSystem": "{message_count} нових повідомлень у {conversation_count} розмовах", "notificationsVibrate": "Вібрація", @@ -759,7 +764,7 @@ "theError": "Помилка", "tryAgain": "Спробуйте ще", "typingIndicators": "Індикатор введення тексту", - "typingIndicatorsDescription": "Бачити та надсилати індикатори набору тексту.", + "typingIndicatorsDescription": "Бачити та надсилати індикатори введення тексту.", "undo": "Назад", "unknown": "Невідомо", "updateApp": "Оновлення застосунку", From 9507cded103a1e6244785e255b2a6f77bf876741 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 27 Nov 2024 11:24:04 +1100 Subject: [PATCH 193/302] fix: refresh new Overlay of group with changes from unstable --- .../leftpane/overlay/OverlayClosedGroup.tsx | 117 +++++++++++------- 1 file changed, 71 insertions(+), 46 deletions(-) diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index 6bcac85604..88b75d08cc 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -116,49 +116,55 @@ export const OverlayClosedGroupV2 = () => { const privateContactsPubkeys = useContactsToInviteToGroup(); const isCreatingGroup = useIsCreatingGroupFromUIPending(); const [groupName, setGroupName] = useState(''); + const [groupNameError, setGroupNameError] = useState(); const forceUpdate = useUpdate(); const { - uniqueValues: members, + uniqueValues: selectedMemberIds, addTo: addToSelected, removeFrom: removeFromSelected, } = useSet([]); const isSearch = useIsSearching(); + const searchTerm = useSelector(getSearchTerm); const searchResultContactsOnly = useSelector(getSearchResultsContactOnly); function closeOverlay() { + dispatch(clearSearch()); dispatch(resetLeftOverlayMode()); } async function onEnterPressed() { + setGroupNameError(undefined); + setGroupName(''); if (isCreatingGroup) { window?.log?.warn('Closed group creation already in progress'); return; } + // Validate groupName and groupMembers length if (groupName.length === 0) { ToastUtils.pushToastError('invalidGroupName', window.i18n('groupNameEnterPlease')); return; } if (groupName.length > LIBSESSION_CONSTANTS.BASE_GROUP_MAX_NAME_LENGTH) { - ToastUtils.pushToastError('invalidGroupName', window.i18n('groupNameEnterShorter')); + setGroupNameError(window.i18n('groupNameEnterShorter')); return; } // >= because we add ourself as a member AFTER this. so a 10 member group is already invalid as it will be 11 with us // the same is valid with groups count < 1 - if (members.length < 1) { + if (selectedMemberIds.length < 1) { ToastUtils.pushToastError('pickClosedGroupMember', window.i18n('groupCreateErrorNoMembers')); return; } - if (members.length >= VALIDATION.CLOSED_GROUP_SIZE_LIMIT) { + if (selectedMemberIds.length >= VALIDATION.CLOSED_GROUP_SIZE_LIMIT) { ToastUtils.pushToastError('closedGroupMaxSize', window.i18n('groupAddMemberMaximum')); return; } // trigger the add through redux. dispatch( groupInfoActions.initNewGroupInWrapper({ - members: concat(members, [us]), + members: concat(selectedMemberIds, [us]), groupName, us, }) as any @@ -166,16 +172,26 @@ export const OverlayClosedGroupV2 = () => { } useKey('Escape', closeOverlay); - - const noContactsForClosedGroup = privateContactsPubkeys.length === 0; - const contactsToRender = isSearch ? searchResultContactsOnly : privateContactsPubkeys; - const disableCreateButton = !members.length && !groupName.length; + const noContactsForClosedGroup = isEmpty(searchTerm) && contactsToRender.length === 0; + + const disableCreateButton = isCreatingGroup || (!selectedMemberIds.length && !groupName.length); return ( -
-
+ + { value={groupName} onValueChanged={setGroupName} onEnterPressed={onEnterPressed} - // error={groupNameError} // TODO fix error handling with new groups (we are deprecating that UI soon) + error={groupNameError} maxLength={LIBSESSION_CONSTANTS.BASE_GROUP_MAX_NAME_LENGTH} textSize="md" centerText={true} monospaced={true} isTextArea={true} inputDataTestId="new-closed-group-name" - editable={!noContactsForClosedGroup} + editable={!noContactsForClosedGroup && !isCreatingGroup} /> -
- - {/* TODO: localize those strings once out releasing those buttons for real Remove after QA */} - {hasClosedGroupV2QAButtons() && ( - <> - - Invite as admin?{' '} - { - window.sessionFeatureFlags.useGroupV2InviteAsAdmin = - !window.sessionFeatureFlags.useGroupV2InviteAsAdmin; - forceUpdate(); - }} - /> - - - )} - + + {/* TODO: localize those strings once out releasing those buttons for real Remove after QA */} + {hasClosedGroupV2QAButtons() && ( + <> + + Invite as admin?{' '} + { + window.sessionFeatureFlags.useGroupV2InviteAsAdmin = + !window.sessionFeatureFlags.useGroupV2InviteAsAdmin; + forceUpdate(); + }} + /> + + + )} + + + + - {!noContactsForClosedGroup && window.sessionFeatureFlags.useClosedGroupV2 && ( - - )} + {!noContactsForClosedGroup && } {noContactsForClosedGroup ? ( + ) : searchTerm && !contactsToRender.length ? ( + + + ) : ( contactsToRender.map((memberPubkey: string) => ( m === memberPubkey)} - key={memberPubkey} + isSelected={selectedMemberIds.includes(memberPubkey)} onSelect={addToSelected} onUnselect={removeFromSelected} - disableBg={true} + withBorder={false} + disabled={isCreatingGroup} maxNameWidth="100%" /> )) )} + - -
+ + + + + ); }; From 3ab94a7e0080ee0b51ffbb48249d9a926ea38100 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 28 Nov 2024 15:54:15 +1100 Subject: [PATCH 194/302] feat: allow to not trigger toast on copyToClipboardButton because the about window doesn't have a full redux store setup, and the toasts need redux currently --- ts/components/AboutView.tsx | 4 ++++ ts/components/basic/SessionToast.tsx | 3 +-- ts/components/buttons/CopyToClipboardButton.tsx | 14 +++++++++----- .../overlay/OverlayRightPanelSettings.tsx | 8 ++++---- ts/components/dialog/UpdateGroupNameDialog.tsx | 6 ++++++ .../conversations/unsendingInteractions.ts | 3 ++- .../SwarmPollingGroupConfig.ts | 14 +++++++++++--- .../utils/job_runners/jobs/GroupInviteJob.ts | 1 + ts/state/ducks/metaGroups.ts | 2 ++ 9 files changed, 40 insertions(+), 15 deletions(-) diff --git a/ts/components/AboutView.tsx b/ts/components/AboutView.tsx index a42e8b5d53..58ae1ec989 100644 --- a/ts/components/AboutView.tsx +++ b/ts/components/AboutView.tsx @@ -95,22 +95,26 @@ export const AboutView = () => { className="version" text={versionInfo} buttonType={SessionButtonType.Simple} + showToast={false} /> {environmentStates.length ? ( ) : null} https://getsession.org diff --git a/ts/components/basic/SessionToast.tsx b/ts/components/basic/SessionToast.tsx index 2f710c8b9a..aed2bf3df1 100644 --- a/ts/components/basic/SessionToast.tsx +++ b/ts/components/basic/SessionToast.tsx @@ -18,7 +18,6 @@ export enum SessionToastType { type Props = { description: string; - id?: string; type?: SessionToastType; icon?: SessionIconType; @@ -28,7 +27,7 @@ type Props = { const DescriptionDiv = styled.div` font-size: var(--font-size-sm); - color: var(--text-secondary-color); + color: var(--text-primary-color); text-overflow: ellipsis; font-family: var(--font-default); padding-top: var(--margins-xs); diff --git a/ts/components/buttons/CopyToClipboardButton.tsx b/ts/components/buttons/CopyToClipboardButton.tsx index 943476f718..a9a308395e 100644 --- a/ts/components/buttons/CopyToClipboardButton.tsx +++ b/ts/components/buttons/CopyToClipboardButton.tsx @@ -11,12 +11,13 @@ type CopyProps = { copyContent?: string; onCopyComplete?: (copiedValue: string | undefined) => void; hotkey?: boolean; + showToast?: boolean; }; type CopyToClipboardButtonProps = Omit & CopyProps; export const CopyToClipboardButton = (props: CopyToClipboardButtonProps) => { - const { copyContent, onCopyComplete, hotkey = false, text } = props; + const { copyContent, onCopyComplete, hotkey = false, text, showToast = true } = props; const [copied, setCopied] = useState(false); const onClick = () => { @@ -27,8 +28,9 @@ export const CopyToClipboardButton = (props: CopyToClipboardButtonProps) => { } clipboard.writeText(toCopy); - - ToastUtils.pushCopiedToClipBoard(); + if (showToast) { + ToastUtils.pushCopiedToClipBoard(); + } setCopied(true); if (onCopyComplete) { onCopyComplete(text); @@ -54,11 +56,13 @@ type CopyToClipboardIconProps = Omit { - const { copyContent, onCopyComplete, hotkey = false } = props; + const { copyContent, onCopyComplete, hotkey = false, showToast = true } = props; const onClick = () => { clipboard.writeText(copyContent); - ToastUtils.pushCopiedToClipBoard(); + if (showToast) { + ToastUtils.pushCopiedToClipBoard(); + } if (onCopyComplete) { onCopyComplete(copyContent); } diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 33906be8d1..0e40c0a044 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -1,5 +1,5 @@ import { compact, flatten, isEqual } from 'lodash'; -import { useEffect, useState } from 'react'; +import { SessionDataTestId, useEffect, useState } from 'react'; import { useDispatch } from 'react-redux'; import useInterval from 'react-use/lib/useInterval'; @@ -317,7 +317,7 @@ export const OverlayRightPanelSettings = () => { groupInfoActions.triggerFakeAvatarUpdate({ groupPk: selectedConvoKey }) as any ); }} - dataTestId="edit-group-name" + dataTestId={'' as SessionDataTestId} /> { }) as any ); }} - dataTestId="edit-group-name" + dataTestId={'' as SessionDataTestId} /> { }) as any ); }} - dataTestId="edit-group-name" + dataTestId={'' as SessionDataTestId} /> ) : null} diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx index 410b214b4f..56835bf529 100644 --- a/ts/components/dialog/UpdateGroupNameDialog.tsx +++ b/ts/components/dialog/UpdateGroupNameDialog.tsx @@ -189,6 +189,12 @@ export function UpdateGroupNameDialog(props: { conversationId: string }) { type="text" value={newGroupName} placeholder={window.i18n('groupNameEnter')} + onKeyDown={e => { + if (e.key === 'Enter') { + onClickOK(); + e.preventDefault(); + } + }} onChange={e => setNewGroupName(e.target.value)} tabIndex={0} required={true} diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index b7df6180d6..d400bec5d5 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -222,7 +222,8 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally( conversation: ConversationModel, messages: Array ) { - const pubkey = conversation.id; + // If this is a private chat, we can only delete messages on our own swarm, so use our "side" of the conversation + const pubkey = conversation.isPrivate() ? UserUtils.getOurPubKeyStrFromCache() : conversation.id; if (!PubKey.is03Pubkey(pubkey) && !PubKey.is05Pubkey(pubkey)) { throw new Error('deleteMessagesFromSwarmAndCompletelyLocally needs a 03 or 05 pk'); } diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index 5ab2a9a607..e184ea310a 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -18,6 +18,7 @@ import { ProfileManager } from '../../../profile_manager/ProfileManager'; import { UserUtils } from '../../../utils'; import { GroupSync } from '../../../utils/job_runners/jobs/GroupSyncJob'; import { destroyMessagesAndUpdateRedux } from '../../../disappearing_messages'; +import { ConversationTypeEnum } from '../../../../models/types'; /** * This is a basic optimization to avoid running the logic when the `deleteBeforeSeconds` @@ -163,11 +164,18 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { const member = members[index]; // if our DB doesn't have details about this user, set them. Otherwise we don't want to overwrite our changes with those // because they are most likely out of date from what we get from the user himself. - const memberConvo = ConvoHub.use().get(member.pubkeyHex); - if (!memberConvo) { + let memberConvoInDB = ConvoHub.use().get(member.pubkeyHex); + if (memberConvoInDB) { continue; } - if (member.name && member.name !== memberConvo.getRealSessionUsername()) { + if (!memberConvoInDB) { + // eslint-disable-next-line no-await-in-loop + memberConvoInDB = await ConvoHub.use().getOrCreateAndWait( + member.pubkeyHex, + ConversationTypeEnum.PRIVATE + ); + } + if (member.name && member.name !== memberConvoInDB.getRealSessionUsername()) { // eslint-disable-next-line no-await-in-loop await ProfileManager.updateProfileOfContact( member.pubkeyHex, diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 0ad040cdd2..85139edd0c 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -303,6 +303,7 @@ export const GroupInvite = { GroupInviteJob, addJob, }; + function updateFailedStateForMember(groupPk: GroupPubkeyType, member: PubkeyType, failed: boolean) { let thisGroupFailure = invitesFailed.get(groupPk); diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 3147dd894d..f8afc823a4 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -54,6 +54,7 @@ import { WithFromMemberLeftMessage, WithRemoveMembers, } from '../../session/types/with'; +import { updateGroupNameModal } from './modalDialog'; export type GroupState = { infos: Record; @@ -1152,6 +1153,7 @@ const currentDeviceGroupNameChange = createAsyncThunk( await checkWeAreAdminOrThrow(groupPk, 'currentDeviceGroupNameChange'); await handleNameChangeFromUI({ groupPk, ...args }); + window.inboxStore?.dispatch(updateGroupNameModal(null)); return { groupPk, From 111757509a718fd449648736fca8cc64614a7379 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 29 Nov 2024 10:51:39 +1100 Subject: [PATCH 195/302] fix: always provide timeoutMs to requets, and enforce it --- .../apis/file_server_api/FileServerApi.ts | 4 + .../opengroupV2/OpenGroupServerPoller.ts | 3 +- .../sogsv3/sogsV3AddRemoveMods.ts | 7 +- .../open_group_api/sogsv3/sogsV3BanUnban.ts | 7 +- .../open_group_api/sogsv3/sogsV3BatchPoll.ts | 12 +- .../sogsv3/sogsV3Capabilities.ts | 2 + .../open_group_api/sogsv3/sogsV3ClearInbox.ts | 18 +-- .../sogsv3/sogsV3ClearReaction.ts | 4 +- .../sogsv3/sogsV3DeleteMessages.ts | 4 +- .../open_group_api/sogsv3/sogsV3FetchFile.ts | 4 +- .../open_group_api/sogsv3/sogsV3RoomImage.ts | 4 +- .../open_group_api/sogsv3/sogsV3RoomInfos.ts | 3 + .../open_group_api/sogsv3/sogsV3SendFile.ts | 2 + .../sogsv3/sogsV3SendMessage.ts | 3 + .../sogsv3/sogsV3SendReaction.ts | 2 + .../apis/push_notification_api/PnServer.ts | 2 + ts/session/apis/snode_api/SNodeAPI.ts | 5 +- ts/session/apis/snode_api/batchRequest.ts | 16 +- ts/session/apis/snode_api/expireRequest.ts | 3 +- .../apis/snode_api/getExpiriesRequest.ts | 3 +- .../apis/snode_api/getServiceNodesList.ts | 3 +- ts/session/apis/snode_api/getSwarmFor.ts | 3 +- ts/session/apis/snode_api/onions.ts | 118 ++++++++------ ts/session/apis/snode_api/onsResolve.ts | 3 +- ts/session/apis/snode_api/requestWith.ts | 8 + ts/session/apis/snode_api/retrieveRequest.ts | 20 +-- ts/session/apis/snode_api/sessionRpc.ts | 46 +++--- ts/session/onions/onionSend.ts | 149 +++++++++++------- ts/session/sending/MessageQueue.ts | 4 + ts/session/sending/MessageSender.ts | 11 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 11 +- ts/state/ducks/metaGroups.ts | 6 +- .../libsession_wrapper_metagroup_test.ts | 18 +-- .../session/unit/onion/OnionErrors_test.ts | 1 + .../browser/libsession_worker_interface.ts | 23 ++- 35 files changed, 331 insertions(+), 201 deletions(-) create mode 100644 ts/session/apis/snode_api/requestWith.ts diff --git a/ts/session/apis/file_server_api/FileServerApi.ts b/ts/session/apis/file_server_api/FileServerApi.ts index b2af3b8d75..3c3e27666a 100644 --- a/ts/session/apis/file_server_api/FileServerApi.ts +++ b/ts/session/apis/file_server_api/FileServerApi.ts @@ -7,6 +7,7 @@ import { } from '../open_group_api/sogsv3/sogsV3BatchPoll'; import { fromUInt8ArrayToBase64 } from '../../utils/String'; import { NetworkTime } from '../../../util/NetworkTime'; +import { DURATION } from '../../constants'; export const fileServerHost = 'filev2.getsession.org'; export const fileServerURL = `http://${fileServerHost}`; @@ -33,6 +34,7 @@ export const uploadFileToFsWithOnionV4 = async ( bodyBinary: new Uint8Array(fileContent), endpoint: POST_GET_FILE_ENDPOINT, method: 'POST', + timeoutMs: 30 * DURATION.SECONDS, // longer time for file upload }); if (!batchGlobalIsSuccess(result)) { @@ -88,6 +90,7 @@ export const downloadFileFromFileServer = async ( endpoint: urlToGet, method: 'GET', throwError: true, + timeoutMs: 30 * DURATION.SECONDS, // longer time for file download }); if (window.sessionFeatureFlags?.debug.debugFileServerRequests) { window.log.info(`download fsv2: "${urlToGet} got result:`, JSON.stringify(result)); @@ -149,6 +152,7 @@ export const getLatestReleaseFromFileServer = async ( method: 'GET', stringifiedBody: null, headers, + timeoutMs: 10 * DURATION.SECONDS, }); if (!batchGlobalIsSuccess(result) || parseStatusCodeFromOnionRequestV4(result) !== 200) { diff --git a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts index 59d5b981f1..5d61358880 100644 --- a/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts +++ b/ts/session/apis/open_group_api/opengroupV2/OpenGroupServerPoller.ts @@ -295,7 +295,8 @@ export class OpenGroupServerPoller { this.roomIdsToPoll, this.abortController.signal, subrequestOptions, - 'batch' + 'batch', + 10 * DURATION.SECONDS ); if (!batchPollResults) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods.ts index c6f63d5ff1..443e2850f3 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3AddRemoveMods.ts @@ -4,6 +4,7 @@ import AbortController from 'abort-controller'; import { PubKey } from '../../../types'; import { batchFirstSubIsSuccess, sogsBatchSend } from './sogsV3BatchPoll'; import { OpenGroupRequestCommonType } from '../../../../data/types'; +import { DURATION } from '../../../constants'; /** * Add those pubkeys as admins. @@ -27,7 +28,8 @@ export const sogsV3AddAdmin = async ( }, }, ], - 'batch' + 'batch', + 10 * DURATION.SECONDS ); const isSuccess = batchFirstSubIsSuccess(batchSendResponse); if (!isSuccess) { @@ -58,7 +60,8 @@ export const sogsV3RemoveAdmins = async ( }, }, ], - 'batch' + 'batch', + 10 * DURATION.SECONDS ); const isSuccess = batchSendResponse?.body?.every(m => m?.code === 200) || false; if (!isSuccess) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3BanUnban.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3BanUnban.ts index 15ccff03e0..f80cf7a87a 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3BanUnban.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3BanUnban.ts @@ -2,6 +2,7 @@ import AbortController from 'abort-controller'; import { PubKey } from '../../../types'; import { batchFirstSubIsSuccess, OpenGroupBatchRow, sogsBatchSend } from './sogsV3BatchPoll'; import { OpenGroupRequestCommonType } from '../../../../data/types'; +import { DURATION } from '../../../constants'; export const sogsV3BanUser = async ( userToBan: PubKey, @@ -31,7 +32,8 @@ export const sogsV3BanUser = async ( new Set([roomInfos.roomId]), new AbortController().signal, sequence, - 'sequence' + 'sequence', + 10 * DURATION.SECONDS ); return batchFirstSubIsSuccess(batchSendResponse); }; @@ -54,7 +56,8 @@ export const sogsV3UnbanUser = async ( }, }, ], - 'batch' + 'batch', + 10 * DURATION.SECONDS ); return batchFirstSubIsSuccess(batchSendResponse); }; diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts index 45ade16e39..82e6e62bc6 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts @@ -56,7 +56,8 @@ export const sogsBatchSend = async ( roomInfos: Set, abortSignal: AbortSignal, batchRequestOptions: Array, - batchType: MethodBatchType + batchType: MethodBatchType, + timeoutMs: number ): Promise => { // getting server pk for room const [roomId] = roomInfos; @@ -88,7 +89,8 @@ export const sogsBatchSend = async ( serverUrl, serverPublicKey, batchRequest, - abortSignal + abortSignal, + timeoutMs ); if (abortSignal.aborted) { window.log.info('sendSogsBatchRequestOnionV4 aborted.'); @@ -396,7 +398,8 @@ const sendSogsBatchRequestOnionV4 = async ( serverUrl: string, serverPubkey: string, request: BatchRequest, - abortSignal: AbortSignal + abortSignal: AbortSignal, + timeoutMs: number ): Promise => { const { endpoint, headers, method, body } = request; if (!endpoint.startsWith('/')) { @@ -415,7 +418,8 @@ const sendSogsBatchRequestOnionV4 = async ( useV4: true, }, false, - abortSignal + abortSignal, + timeoutMs ); if (abortSignal.aborted) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts index 2e99163d71..9818511dff 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3Capabilities.ts @@ -4,6 +4,7 @@ import { OpenGroupData } from '../../../../data/opengroups'; import { OnionSending } from '../../../onions/onionSend'; import { OpenGroupPollingUtils } from '../opengroupV2/OpenGroupPollingUtils'; import { batchGlobalIsSuccess } from './sogsV3BatchPoll'; +import { DURATION } from '../../../constants'; const capabilitiesFetchForServer = async ( serverUrl: string, @@ -36,6 +37,7 @@ const capabilitiesFetchForServer = async ( stringifiedBody: null, headers: null, throwErrors: false, + timeoutMs: 10 * DURATION.SECONDS, }); // not a batch call yet as we need to exclude headers for this call for now if (!batchGlobalIsSuccess(result)) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts index e097009d18..50d911a676 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts @@ -7,8 +7,8 @@ import { OpenGroupBatchRow, sogsBatchSend, } from './sogsV3BatchPoll'; -import { PromiseUtils } from '../../../utils'; import { OpenGroupRequestCommonType } from '../../../../data/types'; +import { DURATION } from '../../../constants'; type OpenGroupClearInboxResponse = { deleted: number; @@ -34,15 +34,13 @@ export const clearInbox = async (roomInfos: OpenGroupRequestCommonType): Promise const abortSignal = new AbortController(); - const result = await PromiseUtils.timeout( - sogsBatchSend( - roomInfos.serverUrl, - new Set([roomInfos.roomId]), - abortSignal.signal, - options, - 'batch' - ), - 10000 + const result = await sogsBatchSend( + roomInfos.serverUrl, + new Set([roomInfos.roomId]), + abortSignal.signal, + options, + 'batch', + 10 * DURATION.SECONDS ); if (!result) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts index b22b61dd35..d402707436 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearReaction.ts @@ -16,6 +16,7 @@ import { } from './sogsV3MutationCache'; import { hasReactionSupport } from './sogsV3SendReaction'; import { OpenGroupRequestCommonType } from '../../../../data/types'; +import { DURATION } from '../../../constants'; /** * Clears a reaction on open group server using onion v4 logic and batch send @@ -70,7 +71,8 @@ export const clearSogsReactionByServerId = async ( new Set([roomInfos.roomId]), new AbortController().signal, options, - 'batch' + 'batch', + 10 * DURATION.SECONDS ); if (!result) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3DeleteMessages.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3DeleteMessages.ts index bf5ced8f84..1a2b8a0574 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3DeleteMessages.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3DeleteMessages.ts @@ -6,6 +6,7 @@ import { sogsBatchSend, } from './sogsV3BatchPoll'; import { OpenGroupRequestCommonType } from '../../../../data/types'; +import { DURATION } from '../../../constants'; /** * Deletes messages on open group server using onion v4 logic and batch send @@ -23,7 +24,8 @@ export const deleteSogsMessageByServerIds = async ( new Set([roomInfos.roomId]), new AbortController().signal, options, - 'batch' + 'batch', + 10 * DURATION.SECONDS ); try { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts index ec9d354ebd..f602fd3cd5 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3FetchFile.ts @@ -11,6 +11,7 @@ import { allowOnlyOneAtATime } from '../../../utils/Promise'; import { OpenGroupPollingUtils } from '../opengroupV2/OpenGroupPollingUtils'; import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils'; import { OpenGroupV2Room } from '../../../../data/types'; +import { DURATION } from '../../../constants'; export async function fetchBinaryFromSogsWithOnionV4(sendOptions: { serverUrl: string; @@ -62,7 +63,8 @@ export async function fetchBinaryFromSogsWithOnionV4(sendOptions: { useV4: true, }, throwError, - abortSignal + abortSignal, + 30 * DURATION.SECONDS // longer time for binary fetch ); if (!res?.bodyBinary) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3RoomImage.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3RoomImage.ts index 9c493f243e..0f611915b5 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3RoomImage.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3RoomImage.ts @@ -3,6 +3,7 @@ import { isNumber } from 'lodash'; import { batchFirstSubIsSuccess, batchGlobalIsSuccess, sogsBatchSend } from './sogsV3BatchPoll'; import { uploadFileToRoomSogs3 } from './sogsV3SendFile'; import { OpenGroupRequestCommonType } from '../../../../data/types'; +import { DURATION } from '../../../constants'; /** * This function does a double request to the sogs. @@ -35,7 +36,8 @@ export const uploadImageForRoomSogsV3 = async ( new Set([roomInfos.roomId]), new AbortController().signal, [{ type: 'updateRoom', updateRoom: { roomId: roomInfos.roomId, imageId: fileId } }], - 'batch' + 'batch', + 30 * DURATION.SECONDS // longer time for image upload ); if (!batchGlobalIsSuccess(batchResult) || !batchFirstSubIsSuccess(batchResult)) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts index d53bea1782..0ffa8b261d 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3RoomInfos.ts @@ -6,6 +6,7 @@ import { OpenGroupV2Info } from '../opengroupV2/ApiUtil'; import { batchGlobalIsSuccess, parseBatchGlobalStatusCode } from './sogsV3BatchPoll'; import { fetchCapabilitiesAndUpdateRelatedRoomsOfServerUrl } from './sogsV3Capabilities'; import { OpenGroupV2Room } from '../../../../data/types'; +import { DURATION } from '../../../constants'; export const getAllRoomInfos = async (roomInfos: OpenGroupV2Room) => { const result = await OnionSending.sendJsonViaOnionV4ToSogs({ @@ -18,6 +19,7 @@ export const getAllRoomInfos = async (roomInfos: OpenGroupV2Room) => { serverUrl: roomInfos.serverUrl, headers: null, throwErrors: false, + timeoutMs: 10 * DURATION.SECONDS, }); // not a batch call yet as we need to exclude headers for this call for now @@ -89,6 +91,7 @@ export async function openGroupV2GetRoomInfoViaOnionV4({ serverPubkey, headers: null, throwErrors: false, + timeoutMs: 10 * DURATION.SECONDS, }); const room = result?.body as Record | undefined; if (room) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts index 0e07210c5d..e0b21a27b1 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendFile.ts @@ -4,6 +4,7 @@ import { roomHasBlindEnabled } from '../../../../types/sqlSharedTypes'; import { OnionSending } from '../../../onions/onionSend'; import { batchGlobalIsSuccess } from './sogsV3BatchPoll'; import { OpenGroupRequestCommonType } from '../../../../data/types'; +import { DURATION } from '../../../constants'; /** * Returns the id on which the file is saved, or null @@ -31,6 +32,7 @@ export const uploadFileToRoomSogs3 = async ( endpoint: `/room/${roomDetails.roomId}/file`, method: 'POST', serverUrl: roomDetails.serverUrl, + timeoutMs: 30 * DURATION.SECONDS, // longer time allowed for file upload }); if (!batchGlobalIsSuccess(result)) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts index 2938c86ba0..82685a6f14 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendMessage.ts @@ -9,6 +9,7 @@ import { OpenGroupRequestHeaders, } from '../opengroupV2/OpenGroupPollingUtils'; import { batchGlobalIsSuccess, parseBatchGlobalStatusCode } from './sogsV3BatchPoll'; +import { DURATION } from '../../../constants'; export function addJsonContentTypeToHeaders( headers: OpenGroupRequestHeaders @@ -61,6 +62,7 @@ export const sendSogsMessageOnionV4 = async ( stringifiedBody, headers: null, throwErrors: true, + timeoutMs: 10 * DURATION.SECONDS, }); if (!batchGlobalIsSuccess(result)) { @@ -123,6 +125,7 @@ export const sendMessageOnionV4BlindedRequest = async ( stringifiedBody, headers: null, throwErrors: true, + timeoutMs: 10 * DURATION.SECONDS, }); if (!batchGlobalIsSuccess(result)) { diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts index 936b1e0c8e..318b6766f1 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsV3SendReaction.ts @@ -9,6 +9,7 @@ import { ToastUtils, UserUtils } from '../../../utils'; import { OpenGroupPollingUtils } from '../opengroupV2/OpenGroupPollingUtils'; import { getOpenGroupV2ConversationId } from '../utils/OpenGroupUtils'; import { batchGlobalIsSuccess, parseBatchGlobalStatusCode } from './sogsV3BatchPoll'; +import { DURATION } from '../../../constants'; export const hasReactionSupport = async ( conversationId: string, @@ -95,6 +96,7 @@ export const sendSogsReactionOnionV4 = async ( stringifiedBody, headers: null, throwErrors: true, + timeoutMs: 10 * DURATION.SECONDS, }); if (!batchGlobalIsSuccess(result)) { diff --git a/ts/session/apis/push_notification_api/PnServer.ts b/ts/session/apis/push_notification_api/PnServer.ts index 9413d23101..23195b8623 100644 --- a/ts/session/apis/push_notification_api/PnServer.ts +++ b/ts/session/apis/push_notification_api/PnServer.ts @@ -1,6 +1,7 @@ import AbortController from 'abort-controller'; import { callUtilsWorker } from '../../../webworker/workers/browser/util_worker_interface'; import { OnionSending } from '../../onions/onionSend'; +import { DURATION } from '../../constants'; export const pnServerPubkeyHex = '642a6585919742e5a2d4dc51244964fbcd8bcab2b75612407de58b810740d049'; export const hrefPnServerProd = 'live.apns.getsession.org'; @@ -19,5 +20,6 @@ export async function notifyPnServer(wrappedEnvelope: ArrayBuffer, sentTo: strin data: wrappedEnvelopeBase64, send_to: sentTo, }), + timeoutMs: 10 * DURATION.SECONDS, }); } diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index cb7a4f2c9b..17d321ef7e 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -13,6 +13,7 @@ import { BatchRequests } from './batchRequest'; import { DeleteGroupHashesFactory } from './factories/DeleteGroupHashesRequestFactory'; import { DeleteUserHashesFactory } from './factories/DeleteUserHashesRequestFactory'; import { SnodePool } from './snodePool'; +import { DURATION } from '../../constants'; export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.'; @@ -185,7 +186,7 @@ const networkDeleteMessageOurSwarm = async ( const ret = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [request], snodeToMakeRequestTo, - 10000, + 10 * DURATION.SECONDS, request.destination, false ); @@ -334,7 +335,7 @@ const networkDeleteMessagesForGroup = async ( const ret = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [request], snodeToMakeRequestTo, - 10000, + 10 * DURATION.SECONDS, request.destination, false ); diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 5496d84ea6..5b287a870d 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -1,4 +1,6 @@ import { isArray } from 'lodash'; +import { AbortController } from 'abort-controller'; + import { MessageSender } from '../../sending'; import { Snode } from '../../../data/types'; import { SnodeResponseError } from '../../utils/errors'; @@ -12,6 +14,7 @@ import { NotEmptyArrayOfBatchResults, RawSnodeSubRequests, } from './SnodeRequestTypes'; +import { MergedAbortSignal } from './requestWith'; function logSubRequests(requests: Array) { return `[${requests.map(builtRequestToLoggingId).join(', ')}]`; @@ -32,9 +35,10 @@ function logSubRequests(requests: Array) { async function doSnodeBatchRequestNoRetries( subRequests: Array, targetNode: Snode, - timeout: number, + timeoutMs: number, associatedWith: string | null, allow401s: boolean, + abortSignal?: MergedAbortSignal, method: MethodBatchType = 'batch' ): Promise { window.log.debug( @@ -56,7 +60,8 @@ async function doSnodeBatchRequestNoRetries( targetNode, associatedWith, allow401s, - timeout, + timeoutMs, + abortSignal: abortSignal || new AbortController().signal, }); if (!result) { @@ -94,7 +99,7 @@ async function doSnodeBatchRequestNoRetries( * * @param unsignedSubRequests the unsigned sub requests to make * @param targetNode the snode to make the request to - * @param timeout the max timeout to wait for a reply + * @param timeoutMs the max timeout to wait for a reply * @param associatedWith the pubkey associated with this request (used to remove snode failing to reply from that users' swarm) * @param method the type of request to make batch or sequence * @returns @@ -102,7 +107,7 @@ async function doSnodeBatchRequestNoRetries( async function doUnsignedSnodeBatchRequestNoRetries( unsignedSubRequests: Array, targetNode: Snode, - timeout: number, + timeoutMs: number, associatedWith: string | null, allow401s: boolean, method: MethodBatchType = 'batch' @@ -111,9 +116,10 @@ async function doUnsignedSnodeBatchRequestNoRetries( return BatchRequests.doSnodeBatchRequestNoRetries( signedSubRequests, targetNode, - timeout, + timeoutMs, associatedWith, allow401s, + undefined, method ); } diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index 3f13d51832..470f90dc82 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -14,6 +14,7 @@ import { ExpireMessagesResultsContent, WithShortenOrExtend, } from './types'; +import { DURATION } from '../../constants'; export type verifyExpireMsgsResponseSignatureProps = ExpireMessageResultItem & { pubkey: string; @@ -148,7 +149,7 @@ async function updateExpiryOnNodesNoRetries( const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( expireRequests, targetNode, - 10000, + 10 * DURATION.SECONDS, ourPubKey, false, 'batch' diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index a8e5a3e28f..be573be397 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -9,6 +9,7 @@ import { GetExpiriesFromNodeSubRequest } from './SnodeRequestTypes'; import { BatchRequests } from './batchRequest'; import { SnodePool } from './snodePool'; import { GetExpiriesResultsContent, WithMessagesHashes } from './types'; +import { DURATION } from '../../constants'; export type GetExpiriesRequestResponseResults = Record; @@ -49,7 +50,7 @@ async function getExpiriesFromNodesNoRetries( const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [expireRequest], targetNode, - 10000, + 10 * DURATION.SECONDS, associatedWith, false, 'batch' diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index cc3f11a901..e6cf611a39 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -5,6 +5,7 @@ import { SnodePool } from './snodePool'; import { Snode } from '../../../data/types'; import { GetServiceNodesSubRequest } from './SnodeRequestTypes'; import { SnodePoolConstants } from './snodePoolConstants'; +import { DURATION } from '../../constants'; /** * Returns a list of unique snodes got from the specified targetNode. @@ -17,7 +18,7 @@ async function getSnodePoolFromSnode(targetNode: Snode): Promise> { const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [subRequest], targetNode, - 10000, + 10 * DURATION.SECONDS, null, false ); diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index 3c38ce78c7..44be0638c1 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -6,6 +6,7 @@ import { GetNetworkTime } from './getNetworkTime'; import { SnodePool } from './snodePool'; import { Snode } from '../../../data/types'; import { SwarmForSubRequest } from './SnodeRequestTypes'; +import { DURATION } from '../../constants'; /** * get snodes for pubkey from random snode. Uses an existing snode @@ -22,7 +23,7 @@ async function requestSnodesForPubkeyWithTargetNodeRetryable( const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [subrequest], targetNode, - 10000, + 10 * DURATION.SECONDS, pubkey, false ); diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index 475727d6ff..6ef56204a7 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -1,5 +1,4 @@ import https from 'https'; -import { AbortSignal } from 'abort-controller'; import ByteBuffer from 'bytebuffer'; import { to_string } from 'libsodium-wrappers-sumo'; import { cloneDeep, isEmpty, isString, omit } from 'lodash'; @@ -21,6 +20,7 @@ import { SnodeResponseError } from '../../utils/errors'; import { fileServerHost } from '../file_server_api/FileServerApi'; import { hrefPnServerProd } from '../push_notification_api/PnServer'; import { ERROR_CODE_NO_CONNECT } from './SNodeAPI'; +import { MergedAbortSignal, WithAbortSignal, WithTimeoutMs } from './requestWith'; // hold the ed25519 key of a snode against the time it fails. Used to remove a snode only after a few failures (snodeFailureThreshold failures) let snodeFailureCount: Record = {}; @@ -466,7 +466,7 @@ async function processOnionRequestErrorOnPath( ); } -function processAbortedRequest(abortSignal?: AbortSignal) { +function processAbortedRequest(abortSignal?: MergedAbortSignal) { if (abortSignal?.aborted) { window?.log?.warn('[path] Call aborted'); // this will make the pRetry stop @@ -526,12 +526,11 @@ async function processOnionResponse({ associatedWith, destinationSnodeEd25519, allow401s, -}: { +}: Partial & { response?: { text: () => Promise; status: number }; symmetricKey?: ArrayBuffer; guardNode: Snode; destinationSnodeEd25519?: string; - abortSignal?: AbortSignal; associatedWith?: string; allow401s: boolean; }): Promise { @@ -643,12 +642,11 @@ async function processOnionResponseV4({ guardNode, destinationSnodeEd25519, associatedWith, -}: { +}: Partial & { response?: Response; symmetricKey?: ArrayBuffer; guardNode: Snode; destinationSnodeEd25519?: string; - abortSignal?: AbortSignal; associatedWith?: string; }): Promise { processAbortedRequest(abortSignal); @@ -828,17 +826,18 @@ async function sendOnionRequestHandlingSnodeEjectNoRetries({ useV4, throwErrors, allow401s, -}: { - nodePath: Array; - destSnodeX25519: string; - finalDestOptions: FinalDestOptions; - finalRelayOptions?: FinalRelayOptions; - abortSignal?: AbortSignal; - associatedWith?: string; - useV4: boolean; - throwErrors: boolean; - allow401s: boolean; -}): Promise { + timeoutMs, +}: WithAbortSignal & + WithTimeoutMs & { + nodePath: Array; + destSnodeX25519: string; + finalDestOptions: FinalDestOptions; + finalRelayOptions?: FinalRelayOptions; + associatedWith?: string; + useV4: boolean; + throwErrors: boolean; + allow401s: boolean; + }): Promise { // this sendOnionRequestNoRetries() call has to be the only one like this. // If you need to call it, call it through sendOnionRequestHandlingSnodeEjectNoRetries because this is the one handling path rebuilding and known errors let response; @@ -852,6 +851,7 @@ async function sendOnionRequestHandlingSnodeEjectNoRetries({ finalRelayOptions, abortSignal, useV4, + timeoutMs, }); if (window.sessionFeatureFlags?.debug.debugOnionRequests) { @@ -876,7 +876,6 @@ async function sendOnionRequestHandlingSnodeEjectNoRetries({ decodingSymmetricKey = result.decodingSymmetricKey; } catch (e) { window?.log?.warn('sendOnionRequestNoRetries error message: ', e.message); - if (e.code === 'ENETUNREACH' || e.message === 'ENETUNREACH' || throwErrors) { throw e; } @@ -992,15 +991,16 @@ const sendOnionRequestNoRetries = async ({ finalDestOptions: finalDestOptionsOri, finalRelayOptions, abortSignal, + timeoutMs, useV4, -}: { - nodePath: Array; - destSnodeX25519: string; - finalDestOptions: FinalDestOptions; - finalRelayOptions?: FinalRelayOptions; // use only when the target is not a snode - abortSignal?: AbortSignal; - useV4: boolean; -}) => { +}: WithAbortSignal & + WithTimeoutMs & { + nodePath: Array; + destSnodeX25519: string; + finalDestOptions: FinalDestOptions; + finalRelayOptions?: FinalRelayOptions; // use only when the target is not a snode + useV4: boolean; + }) => { // Warning: be sure to do a copy otherwise the delete below creates issue with retries // we want to forward the destination_ed25519_hex explicitly so remove it from the copy directly const finalDestOptions = cloneDeep(omit(finalDestOptionsOri, ['destination_ed25519_hex'])); @@ -1049,7 +1049,7 @@ const sendOnionRequestNoRetries = async ({ encodeCiphertextPlusJson(bodyEncoded, finalDestOptions) )) as DestinationContext; } else { - // request to something else than a snode, fileserver or a sogs, we do support v4 for those (and actually only for those for now) + // request to something else than a snode, file server or a sogs, we do support v4 for those (and actually only for those for now) destCtx = useV4 ? await encryptOnionV4RequestForPubkey( destX25519hex, @@ -1096,13 +1096,10 @@ const sendOnionRequestNoRetries = async ({ 'User-Agent': 'WhatsApp', 'Accept-Language': 'en-us', }, - timeout: 25000, + timeout: timeoutMs, + signal: abortSignal as AbortSignalNode, }; - if (abortSignal) { - guardFetchOptions.signal = abortSignal as AbortSignalNode; - } - const guardUrl = `https://${guardNode.ip}:${guardNode.port}/onion_req/v2`; // no logs for that one insecureNodeFetch as we do need to call insecureNodeFetch to our guardNodes // window?.log?.info('insecureNodeFetch => plaintext for sendOnionRequestNoRetries'); @@ -1111,14 +1108,24 @@ const sendOnionRequestNoRetries = async ({ return { response, decodingSymmetricKey: destCtx.symmetricKey }; }; -async function sendOnionRequestSnodeDestNoRetries( - onionPath: Array, - targetNode: Snode, - headers: Record, - plaintext: string | null, - allow401s: boolean, - associatedWith?: string -) { +async function sendOnionRequestSnodeDestNoRetries({ + abortSignal, + allow401s, + headers, + onionPath, + plaintext, + targetNode, + timeoutMs, + associatedWith, +}: WithTimeoutMs & + WithAbortSignal & { + onionPath: Array; + targetNode: Snode; + headers: Record; + plaintext: string | null; + allow401s: boolean; + associatedWith?: string; + }) { return Onions.sendOnionRequestHandlingSnodeEjectNoRetries({ nodePath: onionPath, destSnodeX25519: targetNode.pubkey_x25519, @@ -1131,6 +1138,8 @@ async function sendOnionRequestSnodeDestNoRetries( useV4: false, // sadly, request to snode do not support v4 yet throwErrors: false, allow401s, + abortSignal, + timeoutMs, }); } @@ -1143,24 +1152,29 @@ async function lokiOnionFetchNoRetries({ body, headers, allow401s, -}: { - targetNode: Snode; - headers: Record; - body: string | null; - associatedWith?: string; - allow401s: boolean; -}): Promise { + abortSignal, + timeoutMs, +}: WithTimeoutMs & + WithAbortSignal & { + targetNode: Snode; + headers: Record; + body: string | null; + associatedWith?: string; + allow401s: boolean; + }): Promise { try { // Get a path excluding `targetNode`: const path = await OnionPaths.getOnionPath({ toExclude: targetNode }); - const result = await sendOnionRequestSnodeDestNoRetries( - path, + const result = await sendOnionRequestSnodeDestNoRetries({ + onionPath: path, targetNode, headers, - body, + plaintext: body, allow401s, - associatedWith - ); + associatedWith, + abortSignal, + timeoutMs, + }); return result as SnodeResponse | undefined; } catch (e) { window?.log?.warn('onionFetchRetryable failed ', e.message); diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts index ac152caa86..cc6a6adb5c 100644 --- a/ts/session/apis/snode_api/onsResolve.ts +++ b/ts/session/apis/snode_api/onsResolve.ts @@ -12,6 +12,7 @@ import { OnsResolveSubRequest } from './SnodeRequestTypes'; import { BatchRequests } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { SnodePool } from './snodePool'; +import { DURATION } from '../../constants'; // ONS name can have [a-zA-Z0-9_-] except that - is not allowed as start or end // do not define a regex but rather create it on the fly to avoid https://stackoverflow.com/questions/3891641/regex-test-only-works-every-other-time @@ -38,7 +39,7 @@ async function getSessionIDForOnsName(onsNameCase: string) { const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( [subRequest], targetNode, - 10000, + 10 * DURATION.SECONDS, null, false ); diff --git a/ts/session/apis/snode_api/requestWith.ts b/ts/session/apis/snode_api/requestWith.ts new file mode 100644 index 0000000000..7608c200c9 --- /dev/null +++ b/ts/session/apis/snode_api/requestWith.ts @@ -0,0 +1,8 @@ +import { AbortSignal } from 'abort-controller'; +// eslint-disable-next-line import/no-unresolved +import { AbortSignal as AbortSignalNode } from 'node-fetch/externals'; + +export type MergedAbortSignal = AbortSignal | AbortSignalNode + +export type WithTimeoutMs = { timeoutMs: number }; +export type WithAbortSignal = { abortSignal: MergedAbortSignal }; diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index f01ac4c23d..4c3b73fdc1 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -7,7 +7,6 @@ import { SnodeNamespace, SnodeNamespaces, SnodeNamespacesGroup } from './namespa import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { PubKey } from '../../types'; import { DURATION, TTL_DEFAULT } from '../../constants'; -import { sleepFor } from '../../utils/Promise'; import { SnodeResponseError } from '../../utils/errors'; import { RetrieveGroupSubRequest, @@ -225,19 +224,16 @@ async function retrieveNextMessagesNoRetries( // let exceptions bubble up // no retry for this one as this a call we do every few seconds while polling for messages - const timeOutMs = 10 * DURATION.SECONDS; // yes this is a long timeout for just messages, but 4s timeouts way to often... - const timeoutPromise = async () => sleepFor(timeOutMs); - const fetchPromise = async () => - BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - rawRequests, - targetNode, - timeOutMs, - associatedWith, - allow401s - ); // just to make sure that we don't hang for more than timeOutMs - const results = await Promise.race([timeoutPromise(), fetchPromise()]); + const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( + rawRequests, + targetNode, + // yes this is a long timeout for just messages, but 4s timeouts way to often... + 10 * DURATION.SECONDS, + associatedWith, + allow401s + ); try { if (!results || !isArray(results) || !results.length) { window?.log?.warn( diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index f27f244303..0303d1a7a4 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -9,6 +9,7 @@ import { HTTPError, NotFoundError } from '../../utils/errors'; import { APPLICATION_JSON } from '../../../types/MIME'; import { ERROR_421_HANDLED_RETRY_REQUEST, Onions, snodeHttpsAgent, SnodeResponse } from './onions'; +import { WithAbortSignal, WithTimeoutMs } from './requestWith'; export interface LokiFetchOptions { method: 'GET' | 'POST'; @@ -27,21 +28,22 @@ async function doRequestNoRetries({ url, associatedWith, targetNode, - timeout, + timeoutMs, allow401s, -}: { - url: string; - options: LokiFetchOptions; - targetNode?: Snode; - associatedWith: string | null; - timeout: number; - allow401s: boolean; -}): Promise { + abortSignal, +}: WithTimeoutMs & + WithAbortSignal & { + url: string; + options: LokiFetchOptions; + targetNode?: Snode; + associatedWith: string | null; + allow401s: boolean; + }): Promise { const method = options.method || 'GET'; const fetchOptions = { ...options, - timeout, + timeoutMs, method, }; @@ -59,6 +61,8 @@ async function doRequestNoRetries({ headers: fetchOptions.headers, associatedWith: associatedWith || undefined, allow401s, + abortSignal, + timeoutMs, }); if (!fetchResult) { return undefined; @@ -119,15 +123,16 @@ async function snodeRpcNoRetries( targetNode, associatedWith, allow401s, - timeout = 10000, - }: { - method: string; - params: Record | Array>; - targetNode: Snode; - associatedWith: string | null; - timeout?: number; - allow401s: boolean; - } // the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance + timeoutMs, + abortSignal, + }: WithTimeoutMs & + WithAbortSignal & { + method: string; + params: Record | Array>; + targetNode: Snode; + associatedWith: string | null; + allow401s: boolean; + } // the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance ): Promise { const url = `https://${targetNode.ip}:${targetNode.port}/storage_rpc/v1`; @@ -149,8 +154,9 @@ async function snodeRpcNoRetries( options: fetchOptions, targetNode, associatedWith, - timeout, + timeoutMs, allow401s, + abortSignal, }); } diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts index ec2bb53737..19a3269f22 100644 --- a/ts/session/onions/onionSend.ts +++ b/ts/session/onions/onionSend.ts @@ -21,6 +21,7 @@ import { } from '../apis/snode_api/onions'; import { PROTOCOLS } from '../constants'; import { OnionV4 } from './onionv4'; +import { MergedAbortSignal, WithAbortSignal, WithTimeoutMs } from '../apis/snode_api/requestWith'; export type OnionFetchOptions = { method: string; @@ -100,7 +101,8 @@ const sendViaOnionV4ToNonSnodeWithRetries = async ( url: URL, fetchOptions: OnionFetchOptions, throwErrors: boolean, - abortSignal?: AbortSignal + abortSignal: MergedAbortSignal, + timeoutMs: number ): Promise => { if (!fetchOptions.useV4) { throw new Error('sendViaOnionV4ToNonSnodeWithRetries is only to be used for onion v4 calls'); @@ -144,7 +146,7 @@ const sendViaOnionV4ToNonSnodeWithRetries = async ( ); } if (!pathNodes) { - throw new Error('getOnionPathForSending is emtpy'); + throw new Error('getOnionPathForSending is empty'); } /** @@ -161,6 +163,7 @@ const sendViaOnionV4ToNonSnodeWithRetries = async ( useV4: true, throwErrors, allow401s: false, + timeoutMs, }); if (window.sessionFeatureFlags?.debug.debugNonSnodeRequests) { @@ -261,17 +264,19 @@ const sendViaOnionV4ToNonSnodeWithRetries = async ( return result; }; -async function sendJsonViaOnionV4ToSogs(sendOptions: { - serverUrl: string; - endpoint: string; - serverPubkey: string; - blinded: boolean; - method: string; - stringifiedBody: string | null; - abortSignal: AbortSignal; - headers: Record | null; - throwErrors: boolean; -}): Promise { +async function sendJsonViaOnionV4ToSogs( + sendOptions: WithTimeoutMs & { + serverUrl: string; + endpoint: string; + serverPubkey: string; + blinded: boolean; + method: string; + stringifiedBody: string | null; + abortSignal: AbortSignal; + headers: Record | null; + throwErrors: boolean; + } +): Promise { const { serverUrl, endpoint, @@ -282,6 +287,7 @@ async function sendJsonViaOnionV4ToSogs(sendOptions: { abortSignal, headers: includedHeaders, throwErrors, + timeoutMs, } = sendOptions; if (!endpoint.startsWith('/')) { throw new Error('endpoint needs a leading /'); @@ -310,7 +316,8 @@ async function sendJsonViaOnionV4ToSogs(sendOptions: { useV4: true, }, throwErrors, - abortSignal + abortSignal, + timeoutMs ); return res as OnionV4JSONSnodeResponse; @@ -322,13 +329,15 @@ async function sendJsonViaOnionV4ToSogs(sendOptions: { * * You should probably not use this function directly but instead rely on the PnServer.notifyPnServer() function */ -async function sendJsonViaOnionV4ToPnServer(sendOptions: { - endpoint: string; - method: string; - stringifiedBody: string | null; - abortSignal: AbortSignal; -}): Promise { - const { endpoint, method, stringifiedBody, abortSignal } = sendOptions; +async function sendJsonViaOnionV4ToPnServer( + sendOptions: WithTimeoutMs & { + endpoint: string; + method: string; + stringifiedBody: string | null; + abortSignal: AbortSignal; + } +): Promise { + const { endpoint, method, stringifiedBody, abortSignal, timeoutMs } = sendOptions; if (!endpoint.startsWith('/')) { throw new Error('endpoint needs a leading /'); } @@ -344,21 +353,24 @@ async function sendJsonViaOnionV4ToPnServer(sendOptions: { useV4: true, }, false, - abortSignal + abortSignal, + timeoutMs ); return res as OnionV4JSONSnodeResponse; } -async function sendBinaryViaOnionV4ToSogs(sendOptions: { - serverUrl: string; - endpoint: string; - serverPubkey: string; - blinded: boolean; - method: string; - bodyBinary: Uint8Array; - abortSignal: AbortSignal; - headers: Record | null; -}): Promise { +async function sendBinaryViaOnionV4ToSogs( + sendOptions: WithTimeoutMs & { + serverUrl: string; + endpoint: string; + serverPubkey: string; + blinded: boolean; + method: string; + bodyBinary: Uint8Array; + abortSignal: AbortSignal; + headers: Record | null; + } +): Promise { const { serverUrl, endpoint, @@ -368,6 +380,7 @@ async function sendBinaryViaOnionV4ToSogs(sendOptions: { bodyBinary, abortSignal, headers: includedHeaders, + timeoutMs, } = sendOptions; if (!bodyBinary) { @@ -399,7 +412,8 @@ async function sendBinaryViaOnionV4ToSogs(sendOptions: { useV4: true, }, false, - abortSignal + abortSignal, + timeoutMs ); return res as OnionV4JSONSnodeResponse; @@ -415,13 +429,18 @@ async function sendBinaryViaOnionV4ToSogs(sendOptions: { * Upload binary to the file server. * You should probably not use this function directly, but instead rely on the FileServerAPI.uploadFileToFsWithOnionV4() */ -async function sendBinaryViaOnionV4ToFileServer(sendOptions: { - endpoint: string; - method: string; - bodyBinary: Uint8Array; - abortSignal: AbortSignal; -}): Promise { - const { endpoint, method, bodyBinary, abortSignal } = sendOptions; +async function sendBinaryViaOnionV4ToFileServer({ + endpoint, + method, + bodyBinary, + abortSignal, + timeoutMs, +}: WithTimeoutMs & + WithAbortSignal & { + endpoint: string; + method: string; + bodyBinary: Uint8Array; + }): Promise { if (!endpoint.startsWith('/')) { throw new Error('endpoint needs a leading /'); } @@ -437,7 +456,8 @@ async function sendBinaryViaOnionV4ToFileServer(sendOptions: { useV4: true, }, false, - abortSignal + abortSignal, + timeoutMs ); return res as OnionV4JSONSnodeResponse; @@ -447,13 +467,18 @@ async function sendBinaryViaOnionV4ToFileServer(sendOptions: { * Download binary from the file server. * You should probably not use this function directly, but instead rely on the FileServerAPI.downloadFileFromFileServer() */ -async function getBinaryViaOnionV4FromFileServer(sendOptions: { - endpoint: string; - method: string; - abortSignal: AbortSignal; - throwError: boolean; -}): Promise { - const { endpoint, method, abortSignal, throwError } = sendOptions; +async function getBinaryViaOnionV4FromFileServer({ + endpoint, + method, + abortSignal, + throwError, + timeoutMs, +}: WithTimeoutMs & + WithAbortSignal & { + endpoint: string; + method: string; + throwError: boolean; + }): Promise { if (!endpoint.startsWith('/')) { throw new Error('endpoint needs a leading /'); } @@ -475,7 +500,8 @@ async function getBinaryViaOnionV4FromFileServer(sendOptions: { useV4: true, }, throwError, - abortSignal + abortSignal, + timeoutMs ); if (window.sessionFeatureFlags?.debug.debugFileServerRequests) { @@ -491,14 +517,20 @@ async function getBinaryViaOnionV4FromFileServer(sendOptions: { * Send some generic json to the fileserver. * This function should probably not used directly as we only need it for the FileServerApi.getLatestReleaseFromFileServer() function */ -async function sendJsonViaOnionV4ToFileServer(sendOptions: { - endpoint: string; - method: string; - stringifiedBody: string | null; - abortSignal: AbortSignal; - headers: Record; -}): Promise { - const { endpoint, method, stringifiedBody, abortSignal, headers } = sendOptions; +async function sendJsonViaOnionV4ToFileServer({ + endpoint, + method, + stringifiedBody, + abortSignal, + headers, + timeoutMs, +}: WithAbortSignal & + WithTimeoutMs & { + endpoint: string; + method: string; + stringifiedBody: string | null; + headers: Record; + }): Promise { if (!endpoint.startsWith('/')) { throw new Error('endpoint needs a leading /'); } @@ -514,7 +546,8 @@ async function sendJsonViaOnionV4ToFileServer(sendOptions: { useV4: true, }, false, - abortSignal + abortSignal, + timeoutMs ); return res as OnionV4JSONSnodeResponse; diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index 7a588f6543..a43ecd4378 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -342,11 +342,14 @@ export class MessageQueueCl { rawMessage: OutgoingRawMessage; isSyncMessage: boolean; }) { + const start = Date.now(); + try { const { effectiveTimestamp } = await MessageSender.sendSingleMessage({ message: rawMessage, isSyncMessage, }); + window.log.debug('sendSingleMessage took ', Date.now() - start); const cb = this.pendingMessageCache.callbacks.get(rawMessage.identifier); @@ -361,6 +364,7 @@ export class MessageQueueCl { 'sendSingleMessageAndHandleResult: failed to send message with: ', error.message ); + await MessageSentHandler.handleSwarmMessageSentFailure( { device: rawMessage.device, identifier: rawMessage.identifier }, error diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 2f446cc556..08d80e4a09 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -40,7 +40,7 @@ import { } from '../apis/snode_api/signature/groupSignature'; import { SnodeSignature, SnodeSignatureResult } from '../apis/snode_api/signature/snodeSignatures'; import { SnodePool } from '../apis/snode_api/snodePool'; -import { TTL_DEFAULT } from '../constants'; +import { DURATION, TTL_DEFAULT } from '../constants'; import { ConvoHub } from '../conversations'; import { addMessagePadding } from '../crypto/BufferPadding'; import { ContentMessage } from '../messages/outgoing'; @@ -287,13 +287,15 @@ async function sendSingleMessage({ }); const targetNode = await SnodePool.getNodeFromSwarmOrThrow(destination); + const batchResult = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( subRequests, targetNode, - 6000, + 10 * DURATION.SECONDS, destination, false ); + await handleBatchResultWithSubRequests({ batchResult, subRequests, destination }); return { wrappedEnvelope: encryptedAndWrapped.encryptedAndWrappedData, @@ -304,6 +306,11 @@ async function sendSingleMessage({ retries: Math.max(attempts - 1, 0), factor: 1, minTimeout: retryMinTimeout || MessageSender.getMinRetryTimeout(), + onFailedAttempt: e => { + window?.log?.warn( + `[sendSingleMessage] attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... Error: ${e.message}` + ); + }, } ); } diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 85139edd0c..55266cd610 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -238,7 +238,11 @@ class GroupInviteJob extends PersistedJob { `${jobType} with groupPk:"${groupPk}" member: ${member} id:"${identifier}" finished. failed:${failed}` ); try { - await MetaGroupWrapperActions.memberSetInvited(groupPk, member, failed); + if (failed) { + await MetaGroupWrapperActions.memberSetInviteFailed(groupPk, member); + } else { + await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); + } // Depending on this field, we either send an invite or an invite-as-admin message. // When we do send an invite-as-admin we also need to update the promoted state, so that the invited members // knows he needs to accept the promotion when accepting the invite @@ -250,7 +254,10 @@ class GroupInviteJob extends PersistedJob { } } } catch (e) { - window.log.warn('GroupInviteJob memberSetInvited failed with', e.message); + window.log.warn( + 'GroupInviteJob memberSetPromotionFailed/memberSetPromotionSent failed with', + e.message + ); } updateFailedStateForMember(groupPk, member, failed); diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index f8afc823a4..14297e21de 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -522,7 +522,7 @@ async function handleWithHistoryMembers({ memberPubkey: member, profileKeyHex, }); - await MetaGroupWrapperActions.memberSetInvited(groupPk, member, false); + await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); } const encryptedSupplementKeys = withHistory.length ? await MetaGroupWrapperActions.generateSupplementKeys(groupPk, withHistory) @@ -552,7 +552,7 @@ async function handleWithoutHistoryMembers({ displayName, profileKeyHex, }); - await MetaGroupWrapperActions.memberSetInvited(groupPk, member, false); + await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); } if (!isEmpty(withoutHistory)) { @@ -1098,7 +1098,7 @@ const inviteResponseReceived = createAsyncThunk( try { await checkWeAreAdminOrThrow(groupPk, 'inviteResponseReceived'); - await MetaGroupWrapperActions.memberSetAccepted(groupPk, member); + await MetaGroupWrapperActions.memberSetInviteAccepted(groupPk, member); try { const memberConvo = ConvoHub.use().get(member); if (memberConvo) { diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 365080678b..5275004fd1 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -187,7 +187,7 @@ describe('libsession_metagroup', () => { it('can add member by setting its invited state, both ok and nok', () => { metaGroupWrapper.memberConstructAndSet(member); - metaGroupWrapper.memberSetInvited(member, false); // with invite success + metaGroupWrapper.memberSetInviteSent(member); // with invite success expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()).to.be.deep.eq([ { @@ -198,7 +198,7 @@ describe('libsession_metagroup', () => { metaGroupWrapper.memberConstructAndSet(member2); - metaGroupWrapper.memberSetInvited(member2, true); // with invite failed + metaGroupWrapper.memberSetInviteFailed(member2); // with invite failed expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ ...emptyMember(member2), @@ -209,7 +209,7 @@ describe('libsession_metagroup', () => { it('can add member by setting its accepted state', () => { metaGroupWrapper.memberConstructAndSet(member); - metaGroupWrapper.memberSetAccepted(member); + metaGroupWrapper.memberSetInviteAccepted(member); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ ...emptyMember(member), @@ -218,7 +218,7 @@ describe('libsession_metagroup', () => { metaGroupWrapper.memberConstructAndSet(member2); - metaGroupWrapper.memberSetAccepted(member2); + metaGroupWrapper.memberSetInviteAccepted(member2); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); expect(metaGroupWrapper.memberGet(member2)).to.be.deep.eq({ ...emptyMember(member2), @@ -230,7 +230,7 @@ describe('libsession_metagroup', () => { metaGroupWrapper.memberConstructAndSet(member); metaGroupWrapper.memberConstructAndSet(member2); - metaGroupWrapper.memberSetAccepted(member); + metaGroupWrapper.memberSetInviteAccepted(member); metaGroupWrapper.memberSetPromotionSent(member2); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(2); @@ -342,10 +342,10 @@ describe('libsession_metagroup', () => { // add 2 normal members to each of those wrappers const m1 = TestUtils.generateFakePubKeyStr(); const m2 = TestUtils.generateFakePubKeyStr(); - metaGroupWrapper.memberSetAccepted(m1); - metaGroupWrapper.memberSetAccepted(m2); - metaGroupWrapper2.memberSetAccepted(m1); - metaGroupWrapper2.memberSetAccepted(m2); + metaGroupWrapper.memberSetInviteAccepted(m1); + metaGroupWrapper.memberSetInviteAccepted(m2); + metaGroupWrapper2.memberSetInviteAccepted(m1); + metaGroupWrapper2.memberSetInviteAccepted(m2); expect(metaGroupWrapper.keysNeedsRekey()).to.be.eq(false); expect(metaGroupWrapper2.keysNeedsRekey()).to.be.eq(false); diff --git a/ts/test/session/unit/onion/OnionErrors_test.ts b/ts/test/session/unit/onion/OnionErrors_test.ts index a77b2123f5..463bf59a9f 100644 --- a/ts/test/session/unit/onion/OnionErrors_test.ts +++ b/ts/test/session/unit/onion/OnionErrors_test.ts @@ -1,4 +1,5 @@ import AbortController from 'abort-controller'; + import chai from 'chai'; import chaiAsPromised from 'chai-as-promised'; import { describe } from 'mocha'; diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index 550799bee2..d516222341 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -603,10 +603,12 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { members, withMessages, ]) as Promise>, - memberSetAccepted: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => - callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberSetAccepted', pubkeyHex]) as Promise< - ReturnType - >, + memberSetInviteAccepted: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberSetInviteAccepted', + pubkeyHex, + ]) as Promise>, memberSetPromoted: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([`MetaGroupConfig-${groupPk}`, 'memberSetPromoted', pubkeyHex]) as Promise< ReturnType @@ -630,13 +632,18 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { pubkeyHex, ]) as Promise>, - memberSetInvited: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, failed: boolean) => + memberSetInviteSent: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberSetInviteSent', + pubkeyHex, + ]) as Promise>, + memberSetInviteFailed: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, - 'memberSetInvited', + 'memberSetInviteFailed', pubkeyHex, - failed, - ]) as Promise>, + ]) as Promise>, memberSetNameTruncated: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType, name: string) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, From 28687a3b59b9909c02a90b392bde70864f3496e6 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 29 Nov 2024 13:53:49 +1100 Subject: [PATCH 196/302] fix: group creation: current admin is not part of the notification --- ts/state/ducks/metaGroups.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 14297e21de..8d8b5e6b82 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -197,9 +197,11 @@ const initNewGroupInWrapper = createAsyncThunk( // push one group change message where initial members are added to the group if (membersFromWrapper.length) { const membersHex = uniq(membersFromWrapper.map(m => m.pubkeyHex)); + + const membersHexWithoutUs = membersHex.filter(m => m !== us); const sentAt = NetworkTime.now(); const msgModel = await ClosedGroup.addUpdateMessage({ - diff: { type: 'add', added: membersHex, withHistory: false }, + diff: { type: 'add', added: membersHexWithoutUs, withHistory: false }, expireUpdate: null, sender: us, sentAt, @@ -210,7 +212,7 @@ const initNewGroupInWrapper = createAsyncThunk( adminSecretKey: groupSecretKey, convo, groupPk, - withoutHistory: membersHex, + withoutHistory: membersHexWithoutUs, createAtNetworkTimestamp: sentAt, dbMsgIdentifier: msgModel.id, }); From 85749eb10a92537251225f72fc715e6adfa7de6f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 29 Nov 2024 14:48:38 +1100 Subject: [PATCH 197/302] fix: empty states per type of conversations --- .../conversation/SubtleNotification.tsx | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index 152cccfd6c..8eb7c17b2f 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -19,9 +19,11 @@ import { useSelectedConversationKey, useSelectedHasDisabledBlindedMsgRequests, useSelectedIsApproved, + useSelectedIsGroupOrCommunity, useSelectedIsGroupV2, useSelectedIsNoteToSelf, useSelectedIsPrivate, + useSelectedIsPublic, useSelectedNicknameOrProfileNameOrShortenedPubkey, } from '../../state/selectors/selectedConversation'; import { @@ -204,6 +206,7 @@ export const NoMessageInConversation = () => { const selectedConversation = useSelectedConversationKey(); const hasMessages = useSelectedHasMessages(); const isGroupV2 = useSelectedIsGroupV2(); + const isGroupOrCommunity = useSelectedIsGroupOrCommunity(); const isInvitePending = useLibGroupInvitePending(selectedConversation); const isMe = useSelectedIsNoteToSelf(); @@ -215,27 +218,41 @@ export const NoMessageInConversation = () => { const isKickedFromGroup = useLibGroupKicked(selectedConversation); const isGroupDestroyed = useLibGroupDestroyed(selectedConversation); const name = useSelectedNicknameOrProfileNameOrShortenedPubkey(); + const isPublic = useSelectedIsPublic(); const getHtmlToRender = () => { + // First, handle the "oteToSelf and various "private" cases if (isMe) { return localize('noteToSelfEmpty').toString(); } - - if (canWrite) { - return localize('groupNoMessages').withArgs({ group_name: name }).toString(); - } - if (privateBlindedAndBlockingMsgReqs) { return localize('messageRequestsTurnedOff').withArgs({ name }).toString(); } + if (isPrivate) { + // "You have no messages in X, send a message to start a conversation." + return localize('groupNoMessages').withArgs({ group_name: name }).toString(); + } - if (isGroupV2 && isGroupDestroyed) { - return localize('groupDeletedMemberDescription').withArgs({ group_name: name }).toString(); + if (isPublic) { + return localize('conversationsEmpty').withArgs({ conversation_name: name }).toString(); } - if (isGroupV2 && isKickedFromGroup) { - return localize('groupRemovedYou').withArgs({ group_name: name }).toString(); + // a "group but not public" is a legacy or a groupv2 (isPublic is handled just above) + if (isGroupOrCommunity) { + if (isGroupDestroyed) { + return localize('groupDeletedMemberDescription').withArgs({ group_name: name }).toString(); + } + + if (isKickedFromGroup) { + return localize('groupRemovedYou').withArgs({ group_name: name }).toString(); + } + if (canWrite) { + return localize('groupNoMessages').withArgs({ group_name: name }).toString(); + } + // if we cannot write for some reason, don't show the "send a message" part + return localize('conversationsEmpty').withArgs({ conversation_name: name }).toString(); } + return localize('conversationsEmpty').withArgs({ conversation_name: name }).toString(); }; From 64a3360def7dafe4e3be5cd4cee260acd219ae31 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 2 Dec 2024 11:42:12 +1100 Subject: [PATCH 198/302] fix: use nickname for group update messages if available --- ts/components/NoticeBanner.tsx | 6 +-- ts/components/conversation/AddMentions.tsx | 2 +- .../message-content/ClickToTrustSender.tsx | 2 +- ts/components/dialog/InviteContactsDialog.tsx | 45 ++++++++++--------- .../leftpane/overlay/OverlayClosedGroup.tsx | 1 - ts/interactions/conversationInteractions.ts | 2 +- ts/models/conversation.ts | 5 +-- ts/models/groupUpdate.ts | 12 ++--- ts/models/message.ts | 8 ++-- ts/models/timerNotifications.ts | 2 +- .../conversations/ConversationController.ts | 4 +- ts/state/ducks/metaGroups.ts | 15 ++++--- ts/themes/oceanDark.ts | 2 +- 13 files changed, 52 insertions(+), 54 deletions(-) diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx index a8d1e432e7..f91c496cb8 100644 --- a/ts/components/NoticeBanner.tsx +++ b/ts/components/NoticeBanner.tsx @@ -5,7 +5,6 @@ import { SessionIconButton, SessionIconType } from './icon'; import { StyledRootDialog } from './dialog/StyledRootDialog'; const StyledNoticeBanner = styled(Flex)` - position: relative; background-color: var(--primary-color); color: var(--black-color); font-size: var(--font-size-md); @@ -15,14 +14,13 @@ const StyledNoticeBanner = styled(Flex)` cursor: pointer; .session-icon-button { - position: absolute; right: var(--margins-sm); pointer-events: none; } `; const StyledText = styled.span` - margin-right: var(--margins-xl); + margin-right: var(--margins-sm); `; type NoticeBannerProps = { @@ -65,7 +63,7 @@ const StyledGroupInviteBanner = styled(Flex)` // when part a a dialog, invert it and make it narrower (as the dialog grows to make it fit) ${StyledRootDialog} & { background-color: unset; - color: var(--orange-color); + color: var(--text-primary-color); max-width: 300px; } `; diff --git a/ts/components/conversation/AddMentions.tsx b/ts/components/conversation/AddMentions.tsx index 1021ac6991..d0e1283612 100644 --- a/ts/components/conversation/AddMentions.tsx +++ b/ts/components/conversation/AddMentions.tsx @@ -34,7 +34,7 @@ const Mention = (props: MentionProps) => { return ( - @{foundConvo?.getContactProfileNameOrShortenedPubKey() || PubKey.shorten(props.text)} + @{foundConvo?.getNicknameOrRealUsernameOrPlaceholder() || PubKey.shorten(props.text)} ); }; diff --git a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx index a9cd1637ec..13a3ff005d 100644 --- a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx +++ b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx @@ -46,7 +46,7 @@ export const ClickToTrustSender = (props: { messageId: string }) => { i18nMessage: { token: 'attachmentsAutoDownloadModalDescription', args: { - conversation_name: convo.getContactProfileNameOrShortenedPubKey(), + conversation_name: convo.getNicknameOrRealUsernameOrPlaceholder(), }, }, closeTheme: SessionButtonColor.Danger, diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx index f28f66f078..e4250b7457 100644 --- a/ts/components/dialog/InviteContactsDialog.tsx +++ b/ts/components/dialog/InviteContactsDialog.tsx @@ -127,7 +127,7 @@ const InviteContactsDialogInner = (props: Props) => { const isGroupV2 = useSelectedIsGroupV2(); const [shareHistory, setShareHistory] = useState(false); - const { uniqueValues: selectedContacts, addTo, removeFrom } = useSet(); + const { uniqueValues: selectedContacts, addTo, removeFrom, empty } = useSet(); if (isPrivate) { throw new Error('InviteContactsDialogInner must be a group'); @@ -144,27 +144,28 @@ const InviteContactsDialogInner = (props: Props) => { }; const onClickOK = () => { - if (selectedContacts.length > 0) { - if (isPublic) { - void submitForOpenGroup(conversationId, selectedContacts); - } else { - if (PubKey.is03Pubkey(conversationId)) { - const forcedAsPubkeys = selectedContacts as Array; - const action = groupInfoActions.currentDeviceGroupMembersChange({ - addMembersWithoutHistory: shareHistory ? [] : forcedAsPubkeys, - addMembersWithHistory: shareHistory ? forcedAsPubkeys : [], - removeMembers: [], - groupPk: conversationId, - alsoRemoveMessages: false, - }); - dispatch(action as any); - return; - } - void submitForClosedGroup(conversationId, selectedContacts); - } + if (selectedContacts.length <= 0) { + closeDialog(); + return; } - - closeDialog(); + if (isPublic) { + void submitForOpenGroup(conversationId, selectedContacts); + return; + } + if (PubKey.is03Pubkey(conversationId)) { + const forcedAsPubkeys = selectedContacts as Array; + const action = groupInfoActions.currentDeviceGroupMembersChange({ + addMembersWithoutHistory: shareHistory ? [] : forcedAsPubkeys, + addMembersWithHistory: shareHistory ? forcedAsPubkeys : [], + removeMembers: [], + groupPk: conversationId, + alsoRemoveMessages: false, + }); + dispatch(action as any); + empty(); + return; + } + void submitForClosedGroup(conversationId, selectedContacts); }; useKey((event: KeyboardEvent) => { @@ -182,7 +183,7 @@ const InviteContactsDialogInner = (props: Props) => { const hasContacts = validContactsForInvite.length > 0; return ( - + {hasContacts && isGroupV2 && } diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index 88b75d08cc..f599490215 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -134,7 +134,6 @@ export const OverlayClosedGroupV2 = () => { async function onEnterPressed() { setGroupNameError(undefined); - setGroupName(''); if (isCreatingGroup) { window?.log?.warn('Closed group creation already in progress'); return; diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 67b97e7d60..4fb24dabea 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -268,7 +268,7 @@ export const declineConversationWithConfirm = ({ // restoring from seed we might not have the sender of that invite, so we need to take care of not having one (and not block) const originNameToBlock = alsoBlock && !!conversationIdOrigin - ? ConvoHub.use().get(conversationIdOrigin)?.getContactProfileNameOrShortenedPubKey() + ? ConvoHub.use().get(conversationIdOrigin)?.getNicknameOrRealUsernameOrPlaceholder() : null; const convoName = ConvoHub.use().get(conversationId)?.getNicknameOrRealUsernameOrPlaceholder(); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 8efbcc4ffc..612144420d 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1817,9 +1817,8 @@ export class ConversationModel extends Backbone.Model { } /** - * For a private convo, returns the loki profile name if set, or a shortened - * version of the contact pubkey. - * Throws an error if called on a group convo. + * For a private convo, returns nickname || ('You' || userDisplayName) || shortened(pk) + * Throws an error if called on a no-private convo. * */ public getContactProfileNameOrShortenedPubKey() { diff --git a/ts/models/groupUpdate.ts b/ts/models/groupUpdate.ts index e2f3194fba..1e6f0b8a1d 100644 --- a/ts/models/groupUpdate.ts +++ b/ts/models/groupUpdate.ts @@ -14,15 +14,15 @@ function usAndXOthers(arr: Array) { export function getKickedGroupUpdateStr( kicked: Array, - groupName: string + _groupName: string ): LocalizerComponentPropsObject { const { others, us } = usAndXOthers(kicked); - const othersNames = others.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey); + const othersNames = others.map(ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder); if (us) { switch (others.length) { case 0: - return { token: 'groupRemovedYou', args: { group_name: groupName } }; + return { token: 'groupRemovedYouGeneral' }; case 1: return { token: 'groupRemovedYouTwo', args: { other_name: othersNames[0] } }; default: @@ -66,7 +66,7 @@ export function getLeftGroupUpdateChangeStr(left: Array): LocalizerCompo : { token: 'groupMemberLeft', args: { - name: ConvoHub.use().getContactProfileNameOrShortenedPubKey(others[0]), + name: ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder(others[0]), }, }; } @@ -78,7 +78,7 @@ export function getJoinedGroupUpdateChangeStr( _groupName: string ): LocalizerComponentPropsObject { const { others, us } = usAndXOthers(joined); - const othersNames = others.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey); + const othersNames = others.map(ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder); if (groupv2) { if (us) { @@ -164,7 +164,7 @@ export function getPromotedGroupUpdateChangeStr( joined: Array ): LocalizerComponentPropsObject { const { others, us } = usAndXOthers(joined); - const othersNames = others.map(ConvoHub.use().getContactProfileNameOrShortenedPubKey); + const othersNames = others.map(ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder); if (us) { switch (othersNames.length) { diff --git a/ts/models/message.ts b/ts/models/message.ts index aa971348fa..24ab54df91 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -343,16 +343,16 @@ export class MessageModel extends Backbone.Model { ) as DataExtractionNotificationMsg; if (dataExtraction.type === SignalService.DataExtractionNotification.Type.SCREENSHOT) { return window.i18n.stripped('screenshotTaken', { - name: ConvoHub.use().getContactProfileNameOrShortenedPubKey(dataExtraction.source), + name: ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder(dataExtraction.source), }); } return window.i18n.stripped('attachmentsMediaSaved', { - name: ConvoHub.use().getContactProfileNameOrShortenedPubKey(dataExtraction.source), + name: ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder(dataExtraction.source), }); } if (this.isCallNotification()) { - const name = ConvoHub.use().getContactProfileNameOrShortenedPubKey( + const name = ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder( this.get('conversationId') ); const callNotificationType = this.get('callNotificationType'); @@ -448,7 +448,7 @@ export class MessageModel extends Backbone.Model { (pubkeysInDesc || []).forEach((pubkeyWithAt: string) => { const pubkey = pubkeyWithAt.slice(1); const isUS = isUsAnySogsFromCache(pubkey); - const displayName = ConvoHub.use().getContactProfileNameOrShortenedPubKey(pubkey); + const displayName = ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder(pubkey); if (isUS) { bodyMentionsMappedToNames = bodyMentionsMappedToNames?.replace( pubkeyWithAt, diff --git a/ts/models/timerNotifications.ts b/ts/models/timerNotifications.ts index 94199e9cd6..77ee406281 100644 --- a/ts/models/timerNotifications.ts +++ b/ts/models/timerNotifications.ts @@ -24,7 +24,7 @@ export function getTimerNotificationStr({ const timespanText = TimerOptions.getName(timespanSeconds || 0); const disabled = !timespanSeconds || timespanSeconds <= 0; - const authorName = ConvoHub.use().getContactProfileNameOrShortenedPubKey(author); + const authorName = ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder(author); // TODO: legacy messages support will be removed in a future release if (isLegacyDisappearingModeEnabled(expirationMode)) { diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index a11f372ad2..f9f8392156 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -160,12 +160,12 @@ class ConvoController { return conversation; } - public getContactProfileNameOrShortenedPubKey(pubKey: string): string { + public getNicknameOrRealUsernameOrPlaceholder(pubKey: string): string { const conversation = ConvoHub.use().get(pubKey); if (!conversation) { return pubKey; } - return conversation.getContactProfileNameOrShortenedPubKey(); + return conversation.getNicknameOrRealUsernameOrPlaceholder(); } public async getOrCreateAndWait( diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 8d8b5e6b82..f9d382ab48 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -150,6 +150,14 @@ const initNewGroupInWrapper = createAsyncThunk( groupEd25519Pubkey: toFixedUint8ArrayOfLength(groupEd2519Pk, 32).buffer, }); + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + if (!infos) { + throw new Error(`getInfos of ${groupPk} returned empty result even if it was just init.`); + } + // if the name exceeds libsession-util max length for group name, the name will be saved truncated + infos.name = groupName; + await MetaGroupWrapperActions.infoSet(groupPk, infos); + for (let index = 0; index < uniqMembers.length; index++) { const member = uniqMembers[index]; const convoMember = ConvoHub.use().get(member); @@ -173,13 +181,6 @@ const initNewGroupInWrapper = createAsyncThunk( } } - const infos = await MetaGroupWrapperActions.infoGet(groupPk); - if (!infos) { - throw new Error(`getInfos of ${groupPk} returned empty result even if it was just init.`); - } - infos.name = groupName; - await MetaGroupWrapperActions.infoSet(groupPk, infos); - const membersFromWrapper = await MetaGroupWrapperActions.memberGetAll(groupPk); if (!membersFromWrapper || isEmpty(membersFromWrapper)) { throw new Error( diff --git a/ts/themes/oceanDark.ts b/ts/themes/oceanDark.ts index f76e8bd3de..f9160c43c0 100644 --- a/ts/themes/oceanDark.ts +++ b/ts/themes/oceanDark.ts @@ -51,7 +51,7 @@ export const oceanDark: ThemeColorVariables = { '--button-outline-border-hover-color': 'var(--text-primary-color)', '--button-outline-disabled-color': 'var(--disabled-color)', - '--button-solid-background-color': 'var(--background-secondary-color)', + '--button-solid-background-color': THEMES.OCEAN_DARK.COLOR1, '--button-solid-background-hover-color': THEMES.OCEAN_DARK.COLOR4, '--button-solid-text-color': 'var(--text-primary-color)', '--button-solid-text-hover-color': 'var(--text-primary-color)', From faf2444357a1c8d35aa6ab287505e4ca425a9485 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 2 Dec 2024 13:02:37 +1100 Subject: [PATCH 199/302] fix: refresh last message preview on handling of deleteAll --- .../snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index e184ea310a..f202f2ee5a 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -68,6 +68,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { window.inboxStore?.dispatch( messagesExpired(deletedMsgIds.map(messageId => ({ conversationKey: groupPk, messageId }))) ); + ConvoHub.use().get(groupPk)?.updateLastMessage(); lastAppliedRemoveMsgSentBeforeSeconds.set(groupPk, infos.deleteBeforeSeconds); } @@ -91,6 +92,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { await destroyMessagesAndUpdateRedux( impactedMsgModels.map(m => ({ conversationKey: groupPk, messageId: m.id })) ); + ConvoHub.use().get(groupPk)?.updateLastMessage(); lastAppliedRemoveAttachmentSentBeforeSeconds.set(groupPk, infos.deleteAttachBeforeSeconds); } From d5ecc100e86307ba7f9a5a870c6dd86b397ae456 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 2 Dec 2024 16:04:18 +1100 Subject: [PATCH 200/302] chore: bump to libsessio-nodejs 0.4.8 --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index dedfd9009d..f4f245acc6 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.6/libsession_util_nodejs-v0.4.6.tar.gz", + "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.7/libsession_util_nodejs-v0.4.7.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index 352f4f5ca0..1eccab9f53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1791,9 +1791,9 @@ available-typed-arrays@^1.0.7: possible-typed-array-names "^1.0.0" axios@^1.3.2: - version "1.7.7" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f" - integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q== + version "1.7.8" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.8.tgz#1997b1496b394c21953e68c14aaa51b7b5de3d6e" + integrity sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -4944,9 +4944,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.6/libsession_util_nodejs-v0.4.6.tar.gz": - version "0.4.6" - resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.6/libsession_util_nodejs-v0.4.6.tar.gz#8af92a58844bd4f1b4145371c62deb049266caaf" +"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.7/libsession_util_nodejs-v0.4.7.tar.gz": + version "0.4.7" + resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.7/libsession_util_nodejs-v0.4.7.tar.gz#9c488df53966516b2142d47e85dd433fc3bc7be6" dependencies: cmake-js "7.2.1" node-addon-api "^6.1.0" From b129c409a78a4cfe194d3c2edcebf9209c5c67be Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 2 Dec 2024 16:57:35 +1100 Subject: [PATCH 201/302] fix: allow to abort a request globally when a request takes too long --- ts/interactions/conversationInteractions.ts | 20 ++++++--- ts/session/apis/snode_api/SNodeAPI.ts | 41 +++++++++++++------ ts/session/apis/snode_api/batchRequest.ts | 5 ++- ts/session/apis/snode_api/expireRequest.ts | 3 +- .../apis/snode_api/getExpiriesRequest.ts | 3 +- .../apis/snode_api/getServiceNodesList.ts | 4 +- ts/session/apis/snode_api/getSwarmFor.ts | 8 ++-- ts/session/apis/snode_api/onsResolve.ts | 4 +- ts/session/apis/snode_api/retrieveRequest.ts | 4 +- .../conversations/ConversationController.ts | 19 ++++++--- ts/session/sending/MessageSender.ts | 13 +++++- ts/session/utils/Promise.ts | 21 ++++++++++ .../jobs/GroupPendingRemovalsJob.ts | 19 ++++++--- .../utils/job_runners/jobs/GroupSyncJob.ts | 27 ++++++++---- .../utils/job_runners/jobs/UserSyncJob.ts | 20 ++++++--- 15 files changed, 155 insertions(+), 56 deletions(-) diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 4fb24dabea..3efec954ee 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -1,5 +1,6 @@ import { isEmpty, isNil, uniq } from 'lodash'; import { PubkeyType, WithGroupPubkey } from 'libsession_util_nodejs'; +import AbortController from 'abort-controller'; import { ConversationNotificationSettingType, READ_MESSAGE_STATE, @@ -20,7 +21,7 @@ import { DecryptedAttachmentsManager } from '../session/crypto/DecryptedAttachme import { DisappearingMessageConversationModeType } from '../session/disappearing_messages/types'; import { PubKey } from '../session/types'; import { perfEnd, perfStart } from '../session/utils/Performance'; -import { sleepFor } from '../session/utils/Promise'; +import { sleepFor, timeoutWithAbort } from '../session/utils/Promise'; import { ed25519Str, fromHexToArray, toHex } from '../session/utils/String'; import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; @@ -59,6 +60,7 @@ import { GroupUpdateMessageFactory } from '../session/messages/message_factory/g import { GroupPromote } from '../session/utils/job_runners/jobs/GroupPromoteJob'; import { MessageSender } from '../session/sending'; import { StoreGroupRequestFactory } from '../session/apis/snode_api/factories/StoreGroupRequestFactory'; +import { DURATION } from '../session/constants'; export async function copyPublicKeyByConvoId(convoId: string) { if (OpenGroupUtils.isOpenGroupV2(convoId)) { @@ -1037,11 +1039,17 @@ export async function promoteUsersInGroup({ groupInWrapper ); - const result = await MessageSender.sendEncryptedDataToSnode({ - destination: groupPk, - method: 'batch', - sortedSubRequests: storeRequests, - }); + const controller = new AbortController(); + const result = await timeoutWithAbort( + MessageSender.sendEncryptedDataToSnode({ + destination: groupPk, + method: 'batch', + sortedSubRequests: storeRequests, + abortSignal: controller.signal, + }), + 2 * DURATION.MINUTES, + controller + ); if (result?.[0].code !== 200) { window.log.warn('promoteUsersInGroup: failed to store change'); diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 17d321ef7e..281c59fc71 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -3,6 +3,7 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { compact, isEmpty } from 'lodash'; import pRetry from 'p-retry'; +import AbortController from 'abort-controller'; import { UserGroupsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface'; import { getSodiumRenderer } from '../../crypto'; import { PubKey } from '../../types'; @@ -14,6 +15,7 @@ import { DeleteGroupHashesFactory } from './factories/DeleteGroupHashesRequestFa import { DeleteUserHashesFactory } from './factories/DeleteUserHashesRequestFactory'; import { SnodePool } from './snodePool'; import { DURATION } from '../../constants'; +import { timeoutWithAbort } from '../../utils/Promise'; export const ERROR_CODE_NO_CONNECT = 'ENETUNREACH: No network connection.'; @@ -183,12 +185,19 @@ const networkDeleteMessageOurSwarm = async ( async () => { const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.destination); - const ret = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [request], - snodeToMakeRequestTo, - 10 * DURATION.SECONDS, - request.destination, - false + const controller = new AbortController(); + const ret = await timeoutWithAbort( + BatchRequests.doUnsignedSnodeBatchRequestNoRetries( + [request], + snodeToMakeRequestTo, + 10 * DURATION.SECONDS, + request.destination, + false, + 'batch', + controller.signal + ), + 30 * DURATION.SECONDS, + controller ); if (!ret || !ret?.[0].body || ret[0].code !== 200) { @@ -331,13 +340,19 @@ const networkDeleteMessagesForGroup = async ( await pRetry( async () => { const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.destination); - - const ret = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [request], - snodeToMakeRequestTo, - 10 * DURATION.SECONDS, - request.destination, - false + const controller = new AbortController(); + const ret = await timeoutWithAbort( + BatchRequests.doUnsignedSnodeBatchRequestNoRetries( + [request], + snodeToMakeRequestTo, + 10 * DURATION.SECONDS, + request.destination, + false, + 'batch', + controller.signal + ), + 30 * DURATION.SECONDS, + controller ); if (!ret || !ret?.[0].body || ret[0].code !== 200) { diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 5b287a870d..8d123cf76b 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -110,7 +110,8 @@ async function doUnsignedSnodeBatchRequestNoRetries( timeoutMs: number, associatedWith: string | null, allow401s: boolean, - method: MethodBatchType = 'batch' + method: MethodBatchType = 'batch', + abortSignal: MergedAbortSignal | null ): Promise { const signedSubRequests = await MessageSender.signSubRequests(unsignedSubRequests); return BatchRequests.doSnodeBatchRequestNoRetries( @@ -119,7 +120,7 @@ async function doUnsignedSnodeBatchRequestNoRetries( timeoutMs, associatedWith, allow401s, - undefined, + abortSignal || undefined, method ); } diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index 470f90dc82..26e2fafa71 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -152,7 +152,8 @@ async function updateExpiryOnNodesNoRetries( 10 * DURATION.SECONDS, ourPubKey, false, - 'batch' + 'batch', + null ); if (!result || result.length !== expireRequests.length) { diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index be573be397..2c11f0e61b 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -53,7 +53,8 @@ async function getExpiriesFromNodesNoRetries( 10 * DURATION.SECONDS, associatedWith, false, - 'batch' + 'batch', + null ); if (!result || result.length !== 1) { diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index e6cf611a39..aa38cb1164 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -20,7 +20,9 @@ async function getSnodePoolFromSnode(targetNode: Snode): Promise> { targetNode, 10 * DURATION.SECONDS, null, - false + false, + 'batch', + null ); const firstResult = results[0]; diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index 44be0638c1..0c390cbbe4 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -18,14 +18,16 @@ async function requestSnodesForPubkeyWithTargetNodeRetryable( if (!PubKey.is03Pubkey(pubkey) && !PubKey.is05Pubkey(pubkey)) { throw new Error('invalid pubkey given for swarmFor'); } - const subrequest = new SwarmForSubRequest(pubkey); + const subRequest = new SwarmForSubRequest(pubkey); const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [subrequest], + [subRequest], targetNode, 10 * DURATION.SECONDS, pubkey, - false + false, + 'batch', + null ); if (!result || !result.length) { diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts index cc6a6adb5c..0fc996a1d7 100644 --- a/ts/session/apis/snode_api/onsResolve.ts +++ b/ts/session/apis/snode_api/onsResolve.ts @@ -41,7 +41,9 @@ async function getSessionIDForOnsName(onsNameCase: string) { targetNode, 10 * DURATION.SECONDS, null, - false + false, + 'batch', + null ); const firstResult = results[0]; if (!firstResult || firstResult.code !== 200 || !firstResult.body) { diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index 4c3b73fdc1..a106e90a52 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -232,7 +232,9 @@ async function retrieveNextMessagesNoRetries( // yes this is a long timeout for just messages, but 4s timeouts way to often... 10 * DURATION.SECONDS, associatedWith, - allow401s + allow401s, + 'batch', + null ); try { if (!results || !isArray(results) || !results.length) { diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index f9f8392156..181f656e79 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -3,6 +3,7 @@ import { ConvoVolatileType, GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { isEmpty, isNil } from 'lodash'; +import AbortController from 'abort-controller'; import { Data } from '../../data/data'; import { OpenGroupData } from '../../data/opengroups'; import { ConversationCollection, ConversationModel } from '../../models/conversation'; @@ -46,6 +47,8 @@ import { DisappearingMessages } from '../disappearing_messages'; import { StoreGroupRequestFactory } from '../apis/snode_api/factories/StoreGroupRequestFactory'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/types'; import { NetworkTime } from '../../util/NetworkTime'; +import { timeoutWithAbort } from '../utils/Promise'; +import { DURATION } from '../constants'; let instance: ConvoController | null; @@ -678,11 +681,17 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM secretKey: group.secretKey, } ); - const results = await MessageSender.sendEncryptedDataToSnode({ - destination: groupPk, - sortedSubRequests: storeRequests, - method: 'sequence', - }); + const controller = new AbortController(); + const results = await timeoutWithAbort( + MessageSender.sendEncryptedDataToSnode({ + destination: groupPk, + sortedSubRequests: storeRequests, + method: 'sequence', + abortSignal: controller.signal, + }), + 2 * DURATION.MINUTES, + controller + ); if (results?.[0].code !== 200) { throw new Error( diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 08d80e4a09..08ebcb5f95 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -56,6 +56,7 @@ import { EncryptAndWrapMessageResults, MessageWrapper } from './MessageWrapper'; import { stringify } from '../../types/sqlSharedTypes'; import { OpenGroupRequestCommonType } from '../../data/types'; import { NetworkTime } from '../../util/NetworkTime'; +import { MergedAbortSignal } from '../apis/snode_api/requestWith'; // ================ SNODE STORE ================ @@ -293,7 +294,9 @@ async function sendSingleMessage({ targetNode, 10 * DURATION.SECONDS, destination, - false + false, + 'sequence', + null ); await handleBatchResultWithSubRequests({ batchResult, subRequests, destination }); @@ -414,10 +417,12 @@ async function sendMessagesDataToSnode({ associatedWith, sortedSubRequests, method, + abortSignal, }: { sortedSubRequests: SortedSubRequestsType; associatedWith: T; method: MethodBatchType; + abortSignal: MergedAbortSignal | null; }): Promise { if (!associatedWith) { throw new Error('sendMessagesDataToSnode first sub request pubkey needs to be set'); @@ -442,7 +447,8 @@ async function sendMessagesDataToSnode({ 6000, associatedWith, false, - method + method, + abortSignal ); if (!responses || !responses.length) { @@ -500,10 +506,12 @@ async function sendEncryptedDataToSnode( destination, sortedSubRequests, method, + abortSignal, }: { sortedSubRequests: SortedSubRequestsType; // keeping those as an array because the order needs to be enforced for some (group keys for instance) destination: T; method: MethodBatchType; + abortSignal: MergedAbortSignal | null; }): Promise { try { const batchResults = await pRetry( @@ -512,6 +520,7 @@ async function sendEncryptedDataToSnode( sortedSubRequests, associatedWith: destination, method, + abortSignal, }); }, { diff --git a/ts/session/utils/Promise.ts b/ts/session/utils/Promise.ts index 5cc649ad31..ccb46997de 100644 --- a/ts/session/utils/Promise.ts +++ b/ts/session/utils/Promise.ts @@ -2,6 +2,7 @@ /* eslint-disable no-async-promise-executor */ /* eslint-disable @typescript-eslint/no-misused-promises */ +import AbortController from 'abort-controller'; import { Snode } from '../../data/types'; type SimpleFunction = (arg: T) => void; @@ -204,6 +205,26 @@ export async function timeout(promise: Promise, timeoutMs: number): Promis return Promise.race([timeoutPromise, promise]); } +/** + * Similar to timeout, but will also call controller.abort() when we timeout. + * This can be used to make a request and if it takes longer than X ms, abort it and return the current aborted promise. + */ +export async function timeoutWithAbort( + promise: Promise, + timeoutMs: number, + controller: AbortController +): Promise { + const timeoutPromise = new Promise((_, rej) => { + const wait = setTimeout(() => { + clearTimeout(wait); + controller.abort(); + rej(new TaskTimedOutError()); + }, timeoutMs); + }); + + return Promise.race([timeoutPromise, promise]); +} + export const sleepFor = async (ms: number, showLog = false) => { if (showLog) { // eslint-disable-next-line no-console diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 9a4ec1492b..f243fb0b15 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -2,6 +2,7 @@ import { WithGroupPubkey } from 'libsession_util_nodejs'; import { compact, isEmpty, isNumber } from 'lodash'; import { v4 } from 'uuid'; +import AbortController from 'abort-controller'; import { StringUtils } from '../..'; import { Data } from '../../../../data/data'; import { deleteMessagesFromSwarmOnly } from '../../../../interactions/conversations/unsendingInteractions'; @@ -37,6 +38,7 @@ import { } from '../../../types/with'; import { groupInfoActions } from '../../../../state/ducks/metaGroups'; import { DURATION } from '../../../constants'; +import { timeoutWithAbort } from '../../Promise'; const defaultMsBetweenRetries = 10000; const defaultMaxAttempts = 1; @@ -186,11 +188,18 @@ class GroupPendingRemovalsJob extends PersistedJob Date: Tue, 3 Dec 2024 14:55:06 +1100 Subject: [PATCH 202/302] chore: address PR reviews --- .../conversation/StagedAttachmentList.tsx | 2 +- .../composition/CompositionBox.tsx | 2 +- .../message-item/ExpirableReadableMessage.tsx | 2 +- ts/data/data.ts | 5 ++ ts/data/dataInit.ts | 1 + ts/models/conversation.ts | 8 ++-- ts/node/sql.ts | 11 +++++ ts/session/apis/snode_api/swarmPolling.ts | 15 +----- .../SwarmPollingGroupConfig.ts | 2 +- ts/session/constants.ts | 4 -- .../conversations/ConversationController.ts | 2 +- ts/session/disappearing_messages/index.ts | 6 ++- .../to_group/GroupUpdateInfoChangeMessage.ts | 3 -- .../GroupUpdateMemberChangeMessage.ts | 2 +- ts/session/sending/MessageSender.ts | 4 +- ts/session/types/with.ts | 4 ++ .../utils/job_runners/jobs/GroupInviteJob.ts | 30 ++++++++---- .../jobs/GroupPendingRemovalsJob.ts | 2 +- .../utils/job_runners/jobs/GroupSyncJob.ts | 5 +- .../utils/job_runners/jobs/UserSyncJob.ts | 2 +- .../utils/libsession/libsession_utils.ts | 4 +- .../libsession_utils_convo_info_volatile.ts | 4 +- ts/shared/data_test_id.ts | 2 +- ts/shared/env_vars.ts | 4 -- ts/state/ducks/conversations.ts | 48 ++++--------------- ts/state/ducks/metaGroups.ts | 2 - ts/state/ducks/modalDialog.tsx | 2 +- ts/state/ducks/stagedAttachments.ts | 9 ++-- .../group_sync_job/GroupSyncJob_test.ts | 2 +- .../user_sync_job/UserSyncJob_test.ts | 11 +++-- 30 files changed, 93 insertions(+), 107 deletions(-) diff --git a/ts/components/conversation/StagedAttachmentList.tsx b/ts/components/conversation/StagedAttachmentList.tsx index e5b56e1011..6041ab500d 100644 --- a/ts/components/conversation/StagedAttachmentList.tsx +++ b/ts/components/conversation/StagedAttachmentList.tsx @@ -47,7 +47,7 @@ export const StagedAttachmentList = (props: Props) => { if (!conversationKey) { return; } - dispatch(removeAllStagedAttachmentsInConversation({ conversationKey })); + dispatch(removeAllStagedAttachmentsInConversation({ conversationId: conversationKey })); }; const onRemoveByFilename = (filename: string) => { diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx index 303ce0c1a5..a74f92668b 100644 --- a/ts/components/conversation/composition/CompositionBox.tsx +++ b/ts/components/conversation/composition/CompositionBox.tsx @@ -866,7 +866,7 @@ class CompositionBoxInner extends Component { window.inboxStore?.dispatch( removeAllStagedAttachmentsInConversation({ - conversationKey: this.props.selectedConversationKey, + conversationId: this.props.selectedConversationKey, }) ); // Empty composition box and stagedAttachments diff --git a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx index ff4819f16c..0ef6db91fc 100644 --- a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx +++ b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx @@ -46,7 +46,7 @@ function useIsExpired( dispatch( messagesExpired([ { - conversationKey: convoId, + conversationId: convoId, messageId, }, ]) diff --git a/ts/data/data.ts b/ts/data/data.ts index 623e683068..fab909d6f2 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -224,6 +224,10 @@ async function saveSeenMessageHashes(data: Array): Promise { + await channels.clearLastHashesForConvoId(cleanData(data)); +} + async function updateLastHash(data: UpdateLastHashType): Promise { await channels.updateLastHash(cleanData(data)); } @@ -861,6 +865,7 @@ export const Data = { searchMessagesInConversation, cleanSeenMessages, cleanLastHashes, + clearLastHashesForConvoId, saveSeenMessageHashes, updateLastHash, saveMessage, diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts index 44de6f867c..473a78b436 100644 --- a/ts/data/dataInit.ts +++ b/ts/data/dataInit.ts @@ -38,6 +38,7 @@ const channelsToMake = new Set([ 'cleanSeenMessages', 'cleanLastHashes', 'updateLastHash', + 'clearLastHashesForConvoId', 'saveSeenMessageHashes', 'saveMessages', 'removeMessage', diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 612144420d..83d37a84e6 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -303,7 +303,7 @@ export class ConversationModel extends Backbone.Model { public getPriority() { if (PubKey.is05Pubkey(this.id) && this.isPrivate()) { - // TODO once we have a libsession state, we can make this used accross the app without repeating as much + // TODO once we have a libsession state, we can make this used across the app without repeating as much // if a private chat, trust the value from the Libsession wrapper cached first const contact = SessionUtilContact.getContactCached(this.id); if (contact) { @@ -1786,7 +1786,7 @@ export class ConversationModel extends Backbone.Model { window.inboxStore?.dispatch( conversationActions.messagesDeleted([ { - conversationKey: this.id, + conversationId: this.id, messageId, }, ]) @@ -1802,7 +1802,7 @@ export class ConversationModel extends Backbone.Model { public didApproveMe() { if (PubKey.is05Pubkey(this.id) && this.isPrivate()) { // if a private chat, trust the value from the Libsession wrapper cached first - // TODO once we have a libsession state, we can make this used accross the app without repeating as much + // TODO once we have a libsession state, we can make this used across the app without repeating as much return SessionUtilContact.getContactCached(this.id)?.approvedMe ?? !!this.get('didApproveMe'); } return !!this.get('didApproveMe'); @@ -2861,7 +2861,7 @@ async function cleanUpExpireHistoryFromConvo(conversationId: string, isPrivate: isPrivate ); window?.inboxStore?.dispatch( - messagesDeleted(updateIdsRemoved.map(m => ({ conversationKey: conversationId, messageId: m }))) + messagesDeleted(updateIdsRemoved.map(m => ({ conversationId, messageId: m }))) ); } diff --git a/ts/node/sql.ts b/ts/node/sql.ts index f27cd387b4..2616dfbb93 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -973,6 +973,16 @@ function updateLastHash(data: UpdateLastHashType) { }); } +function clearLastHashesForConvoId(data: { convoId: string }) { + const { convoId } = data; + if (!isString(convoId)) { + throw new Error('clearLastHashesForPubkey: convoId not a string'); + } + assertGlobalInstance().prepare(`DELETE FROM ${LAST_HASHES_TABLE} WHERE pubkey=$convoId;`).run({ + convoId, + }); +} + function saveSeenMessageHash(data: any) { const { expiresAt, hash } = data; try { @@ -2645,6 +2655,7 @@ export const sqlNode = { saveMessage, cleanSeenMessages, cleanLastHashes, + clearLastHashesForConvoId, saveSeenMessageHashes, saveSeenMessageHash, updateLastHash, diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index b9e40e3c45..f38c61152c 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -57,7 +57,6 @@ import { } from './types'; import { ConversationTypeEnum } from '../../../models/types'; import { Snode } from '../../../data/types'; -import { isDevProd } from '../../../shared/env_vars'; const minMsgCountShouldRetry = 95; @@ -292,12 +291,7 @@ export class SwarmPolling { if (!window.getGlobalOnlineStatus()) { window?.log?.error('SwarmPolling: pollForAllKeys: offline'); // Very important to set up a new polling call so we do retry at some point - timeouts.push( - setTimeout( - this.pollForAllKeys.bind(this), - isDevProd() ? SWARM_POLLING_TIMEOUT.ACTIVE_DEV : SWARM_POLLING_TIMEOUT.ACTIVE - ) - ); + timeouts.push(setTimeout(this.pollForAllKeys.bind(this), SWARM_POLLING_TIMEOUT.ACTIVE)); return; } @@ -317,12 +311,7 @@ export class SwarmPolling { window?.log?.warn('SwarmPolling: pollForAllKeys exception: ', e); throw e; } finally { - timeouts.push( - setTimeout( - this.pollForAllKeys.bind(this), - isDevProd() ? SWARM_POLLING_TIMEOUT.ACTIVE_DEV : SWARM_POLLING_TIMEOUT.ACTIVE - ) - ); + timeouts.push(setTimeout(this.pollForAllKeys.bind(this), SWARM_POLLING_TIMEOUT.ACTIVE)); } } diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index f202f2ee5a..bfed36920f 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -66,7 +66,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { deletedMsgIds ); window.inboxStore?.dispatch( - messagesExpired(deletedMsgIds.map(messageId => ({ conversationKey: groupPk, messageId }))) + messagesExpired(deletedMsgIds.map(messageId => ({ conversationId: groupPk, messageId }))) ); ConvoHub.use().get(groupPk)?.updateLastMessage(); lastAppliedRemoveMsgSentBeforeSeconds.set(groupPk, infos.deleteBeforeSeconds); diff --git a/ts/session/constants.ts b/ts/session/constants.ts index e0f3b8e1be..5dafa06aed 100644 --- a/ts/session/constants.ts +++ b/ts/session/constants.ts @@ -57,8 +57,6 @@ export const SWARM_POLLING_TIMEOUT = { MEDIUM_ACTIVE: DURATION.SECONDS * 60, /** 2 minutes */ INACTIVE: DURATION.SECONDS * 120, - /** 500 milliseconds */ - ACTIVE_DEV: 500, }; export const PROTOCOLS = { @@ -94,8 +92,6 @@ export const VALIDATION = { export const DEFAULT_RECENT_REACTS = ['😂', '🥰', '😢', '😡', '😮', '😈']; export const REACT_LIMIT = 6; -export const MAX_USERNAME_BYTES = 64; - export const UPDATER_INTERVAL_MS = 10 * DURATION.MINUTES; export const FEATURE_RELEASE_TIMESTAMPS = { diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 181f656e79..945d99f662 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -689,7 +689,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM method: 'sequence', abortSignal: controller.signal, }), - 2 * DURATION.MINUTES, + 30 * DURATION.SECONDS, controller ); diff --git a/ts/session/disappearing_messages/index.ts b/ts/session/disappearing_messages/index.ts index 24de18e061..4a2f69afb4 100644 --- a/ts/session/disappearing_messages/index.ts +++ b/ts/session/disappearing_messages/index.ts @@ -56,7 +56,11 @@ export async function destroyMessagesAndUpdateRedux( window.log.error('destroyMessages: removeMessagesByIds failed', e && e.message ? e.message : e); } // trigger a redux update if needed for all those messages - window.inboxStore?.dispatch(messagesExpired(messages)); + window.inboxStore?.dispatch( + messagesExpired( + messages.map(m => ({ conversationId: m.conversationKey, messageId: m.messageId })) + ) + ); // trigger a refresh the last message for all those uniq conversation conversationWithChanges.forEach(convoIdToUpdate => { diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts index e97d149363..3184ef7a66 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateInfoChangeMessage.ts @@ -79,13 +79,10 @@ export class GroupUpdateInfoChangeMessage extends GroupUpdateMessage { switch (this.typeOfChange) { case SignalService.GroupUpdateInfoChangeMessage.Type.NAME: infoChangeMessage.updatedName = this.updatedName; - break; case SignalService.GroupUpdateInfoChangeMessage.Type.DISAPPEARING_MESSAGES: infoChangeMessage.updatedExpiration = this.updatedExpirationSeconds; - break; - case SignalService.GroupUpdateInfoChangeMessage.Type.AVATAR: // nothing to do for the avatar case break; diff --git a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts index 0292898f1c..d109e729cb 100644 --- a/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberChangeMessage.ts @@ -32,7 +32,7 @@ type MembersPromotedMessageParams = GroupUpdateMessageParams & { }; /** - * GroupUpdateInfoChangeMessage is sent to the group's swarm. + * GroupUpdateMemberChangeMessage is sent to the group's swarm. */ export class GroupUpdateMemberChangeMessage extends GroupUpdateMessage { public readonly typeOfChange: 'added' | 'addedWithHistory' | 'removed' | 'promoted'; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 08ebcb5f95..c90566fb46 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -553,7 +553,7 @@ async function sendToOpenGroupV2( blinded: boolean, filesToLink: Array ): Promise { - // we agreed to pad message for opengroup v2 + // we agreed to pad messages for opengroup v2 const paddedBody = addMessagePadding(rawMessage.plainTextBuffer()); const v2Message = new OpenGroupMessageV2({ sentTimestamp: NetworkTime.now(), @@ -660,7 +660,7 @@ async function handleBatchResultWithSubRequests({ hash: storedHash, }); - // We need to store the hash of our synced message when for a 1o1. (as this is the one stored on our swarm) + // We need to store the hash of our synced message for a 1o1. (as this is the one stored on our swarm) // For groups, we can just store that hash directly as the group's swarm is hosting all of the group messages if (subRequest.dbMessageIdentifier) { // eslint-disable-next-line no-await-in-loop diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index 5f63a9dc84..4eebc02f11 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -16,3 +16,7 @@ export type WithMaxSize = { max_size?: number }; export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; export type WithCreatedAtNetworkTimestamp = { createdAtNetworkTimestamp: number }; export type WithMethod = { method: T }; + + +export type WithConvoId = { conversationId: string }; +export type WithMessageId = { messageId: string }; diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 55266cd610..f52550afdc 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -1,7 +1,8 @@ import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { debounce, difference, isNumber } from 'lodash'; import { v4 } from 'uuid'; -import { ToastUtils, UserUtils } from '../..'; +import AbortController from 'abort-controller'; +import { MessageUtils, ToastUtils, UserUtils } from '../..'; import { groupInfoActions } from '../../../../state/ducks/metaGroups'; import { MetaGroupWrapperActions, @@ -20,11 +21,12 @@ import { import { LibSessionUtil } from '../../libsession/libsession_utils'; import { showUpdateGroupMembersByConvoId } from '../../../../interactions/conversationInteractions'; import { ConvoHub } from '../../../conversations'; -import { MessageQueue } from '../../../sending'; +import { MessageSender } from '../../../sending'; import { NetworkTime } from '../../../../util/NetworkTime'; import { SubaccountUnrevokeSubRequest } from '../../../apis/snode_api/SnodeRequestTypes'; import { GroupSync } from './GroupSyncJob'; import { DURATION } from '../../../constants'; +import { timeoutWithAbort } from '../../Promise'; const defaultMsBetweenRetries = 10000; const defaultMaxAttempts = 1; @@ -220,12 +222,24 @@ class GroupInviteJob extends PersistedJob { groupPk, }); - const storedAt = await MessageQueue.use().sendTo1o1NonDurably({ - message: inviteDetails, - namespace: SnodeNamespaces.Default, - pubkey: PubKey.cast(member), - }); - if (storedAt !== null) { + const controller = new AbortController(); + + const rawMessage = await MessageUtils.toRawMessage( + PubKey.cast(member), + inviteDetails, + SnodeNamespaces.Default + ); + + const { effectiveTimestamp } = await timeoutWithAbort( + MessageSender.sendSingleMessage({ + message: rawMessage, + isSyncMessage: false, + }), + 30 * DURATION.SECONDS, + controller + ); + + if (effectiveTimestamp !== null) { failed = false; } } catch (e) { diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index f243fb0b15..fa520ddec7 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -197,7 +197,7 @@ class GroupPendingRemovalsJob extends PersistedJob { results.messages.push({ ciphertext: data, seqno: Long.fromNumber(seqno), - namespace, // we only use the namespace to know to wha + namespace, }); hashes.forEach(h => results.allOldHashes.add(h)); // add all the hashes to the set @@ -187,8 +187,6 @@ async function pendingChangesForGroup(groupPk: GroupPubkeyType): Promise - > + action: PayloadAction> ): ConversationsStateType { let stateCopy = state; action.payload.forEach(element => { @@ -761,35 +744,20 @@ const conversationsSlice = createSlice({ messagesExpired( state: ConversationsStateType, - action: PayloadAction< - Array<{ - messageId: string; - conversationKey: string; - }> - > + action: PayloadAction> ) { return handleMessagesExpiredOrDeleted(state, action); }, messageHashesExpired( state: ConversationsStateType, - action: PayloadAction< - Array<{ - messageHash: string; - conversationKey: string; - }> - > + action: PayloadAction> ) { return handleMessagesExpiredOrDeleted(state, action); }, messagesDeleted( state: ConversationsStateType, - action: PayloadAction< - Array<{ - messageId: string; - conversationKey: string; - }> - > + action: PayloadAction> ) { return handleMessagesExpiredOrDeleted(state, action); }, diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index f9d382ab48..616b013001 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -84,7 +84,6 @@ type GroupDetailsUpdate = { async function checkWeAreAdmin(groupPk: GroupPubkeyType) { const us = UserUtils.getOurPubKeyStrFromCache(); - const usInGroup = await MetaGroupWrapperActions.memberGet(groupPk, us); const inUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); // if the secretKey is not empty AND we are a member of the group, we are a current admin @@ -1418,7 +1417,6 @@ export const groupInfoActions = { currentDeviceGroupNameChange, triggerFakeAvatarUpdate, triggerFakeDeleteMsgBeforeNow, - ...metaGroupSlice.actions, }; export const groupReducer = metaGroupSlice.reducer; diff --git a/ts/state/ducks/modalDialog.tsx b/ts/state/ducks/modalDialog.tsx index d662db86da..d19fc027e5 100644 --- a/ts/state/ducks/modalDialog.tsx +++ b/ts/state/ducks/modalDialog.tsx @@ -6,12 +6,12 @@ import { SessionConfirmDialogProps } from '../../components/dialog/SessionConfir import { MediaItemType } from '../../components/lightbox/LightboxGallery'; import { AttachmentTypeWithPath } from '../../types/Attachment'; import type { EditProfilePictureModalProps, PasswordAction } from '../../types/ReduxTypes'; +import { WithConvoId } from '../../session/types/with'; export type BanType = 'ban' | 'unban'; export type ConfirmModalState = SessionConfirmDialogProps | null; -type WithConvoId = { conversationId: string }; export type InviteContactModalState = WithConvoId | null; export type BanOrUnbanUserModalState = | (WithConvoId & { diff --git a/ts/state/ducks/stagedAttachments.ts b/ts/state/ducks/stagedAttachments.ts index 8c6787d440..611235fa61 100644 --- a/ts/state/ducks/stagedAttachments.ts +++ b/ts/state/ducks/stagedAttachments.ts @@ -1,6 +1,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; import _ from 'lodash'; import { StagedAttachmentType } from '../../components/conversation/composition/CompositionBox'; +import { WithConvoId } from '../../session/types/with'; export type StagedAttachmentsStateType = { stagedAttachments: { [conversationKey: string]: Array }; @@ -44,11 +45,11 @@ const stagedAttachmentsSlice = createSlice({ }, removeAllStagedAttachmentsInConversation( state: StagedAttachmentsStateType, - action: PayloadAction<{ conversationKey: string }> + action: PayloadAction ) { - const { conversationKey } = action.payload; + const { conversationId } = action.payload; - const currentStagedAttachments = state.stagedAttachments[conversationKey]; + const currentStagedAttachments = state.stagedAttachments[conversationId]; if (!currentStagedAttachments || _.isEmpty(currentStagedAttachments)) { return state; } @@ -61,7 +62,7 @@ const stagedAttachmentsSlice = createSlice({ } }); - delete state.stagedAttachments[conversationKey]; + delete state.stagedAttachments[conversationId]; return state; }, removeStagedAttachmentInConversation( diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index bb7951f2ae..f0fa9b8537 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -141,7 +141,7 @@ describe('GroupSyncJob resultsToSuccessfulChange', () => { ).to.be.deep.eq([]); expect( - LibSessionUtil.batchResultsToGroupSuccessfulChange([] as any as NotEmptyArrayOfBatchResults, { + LibSessionUtil.batchResultsToGroupSuccessfulChange([] as unknown as NotEmptyArrayOfBatchResults, { allOldHashes: new Set(), messages: [], }) diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index 944d57f248..9cca984740 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -104,10 +104,13 @@ describe('UserSyncJob batchResultsToUserSuccessfulChange', () => { ).to.be.deep.eq([]); expect( - LibSessionUtil.batchResultsToUserSuccessfulChange([] as any as NotEmptyArrayOfBatchResults, { - allOldHashes: new Set(), - messages: [], - }) + LibSessionUtil.batchResultsToUserSuccessfulChange( + [] as unknown as NotEmptyArrayOfBatchResults, + { + allOldHashes: new Set(), + messages: [], + } + ) ).to.be.deep.eq([]); }); From 760aac372343eb3c46a10b256f2e6ce2e36edd9f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 3 Dec 2024 16:10:06 +1100 Subject: [PATCH 203/302] chore: more PR reviews --- ts/state/ducks/call.tsx | 2 +- ts/state/ducks/metaGroups.ts | 4 ++-- ts/state/ducks/onion.tsx | 3 +-- .../libsession_multi_encrypt_test.ts | 11 ----------- .../job_runner/user_sync_job/UserSyncJob_test.ts | 6 +++--- 5 files changed, 7 insertions(+), 19 deletions(-) diff --git a/ts/state/ducks/call.tsx b/ts/state/ducks/call.tsx index 8e664ea7d4..74077b7b47 100644 --- a/ts/state/ducks/call.tsx +++ b/ts/state/ducks/call.tsx @@ -16,7 +16,7 @@ export const initialCallState: CallStateType = { }; /** - * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. + * This slice is the one holding the redux slice representing our current call state. */ const callSlice = createSlice({ name: 'call', diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 616b013001..db7799fd03 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -395,7 +395,7 @@ const loadMetaDumpsFromDB = createAsyncThunk( toReturn.push({ groupPk, infos, members }); } catch (e) { - // Note: Don't re trow here, we want to load everything we can + // Note: Don't rethrow here, we want to load everything we can window.log.error( `initGroup of Group wrapper of variant ${variant} failed with ${e.message} ` ); @@ -1217,7 +1217,7 @@ function refreshConvosModelProps(convoIds: Array) { } /** - * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. + * This slice is representing the cached state of all our current 03-groups. */ const metaGroupSlice = createSlice({ name: 'metaGroup', diff --git a/ts/state/ducks/onion.tsx b/ts/state/ducks/onion.tsx index 0ab43e0c74..67e86bdc45 100644 --- a/ts/state/ducks/onion.tsx +++ b/ts/state/ducks/onion.tsx @@ -11,7 +11,7 @@ export const initialOnionPathState = { }; /** - * This slice is the one holding the default joinable rooms fetched once in a while from the default opengroup v2 server. + * This slice is the one holding our current onion path state, and if we are detect as online. */ const onionSlice = createSlice({ name: 'onionPaths', @@ -28,7 +28,6 @@ const onionSlice = createSlice({ }, }); -// destructures const { actions, reducer } = onionSlice; export const { updateOnionPaths, updateIsOnline } = actions; export const defaultOnionReducer = reducer; diff --git a/ts/test/session/unit/libsession_wrapper/libsession_multi_encrypt_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_multi_encrypt_test.ts index 64c5b50c76..0db0501423 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_multi_encrypt_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_multi_encrypt_test.ts @@ -5,17 +5,6 @@ import { fromHexToArray } from '../../../../session/utils/String'; import { TestUtils } from '../../../test-utils'; describe('libsession_multi_encrypt', () => { - // let us: TestUserKeyPairs; - // let groupX25519SecretKey: Uint8Array; - - beforeEach(async () => { - // us = await TestUtils.generateUserKeyPairs(); - // const group = await TestUtils.generateGroupV2(us.ed25519KeyPair.privKeyBytes); - // if (!group.secretKey) { - // throw new Error('failed to create grou[p'); - // } - // groupX25519SecretKey = group.secretKey; - }); afterEach(() => { Sinon.restore(); }); diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index 9cca984740..fe985df726 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -43,7 +43,7 @@ describe('UserSyncJob run()', () => { }); it('throws if no user keys', async () => { const job = new UserSync.UserSyncJob({}); - + // Note: the run() function should never throw, at most it should return "permanent failure" const func = async () => job.run(); await expect(func()).to.be.eventually.rejected; }); @@ -53,7 +53,7 @@ describe('UserSyncJob run()', () => { Sinon.stub(UserUtils, 'getOurPubKeyStrFromCache').returns({ something: false } as any); Sinon.stub(UserUtils, 'getUserED25519KeyPairBytes').resolves({ something: true } as any); Sinon.stub(ConvoHub.use(), 'get').resolves({}); // anything not falsy - + // Note: the run() function should never throw, at most it should return "permanent failure" const func = async () => job.run(); await expect(func()).to.be.eventually.rejected; }); @@ -298,7 +298,7 @@ describe('UserSyncJob pushChangesToUserSwarmIfNeeded', () => { expect(dump.firstCall.args).to.be.deep.eq(['ContactsConfig']); }); - it('calls sendEncryptedDataToSnode with the right data x3 and retry if network returned nothing then success', async () => { + it('calls sendEncryptedDataToSnode with the right data x2 and retry if network returned nothing then success', async () => { const profile = userChange(sodium, SnodeNamespaces.UserProfile, 321); const contact = userChange(sodium, SnodeNamespaces.UserContacts, 123); const groups = userChange(sodium, SnodeNamespaces.UserGroups, 111); From 315b4b4e4c570bf53932d8d85697dd54b4f4e68d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 4 Dec 2024 15:47:27 +1100 Subject: [PATCH 204/302] fix: add a way to empty all seenHashes & lastHashes for a pukbey --- ts/data/data.ts | 17 +++--- ts/data/dataInit.ts | 1 + ts/interactions/conversationInteractions.ts | 2 + ts/node/database_utility.ts | 1 + ts/node/migration/sessionMigrations.ts | 22 +++++++ ts/node/migration/signalMigrations.ts | 3 +- ts/node/sql.ts | 58 +++++++++++++------ ts/receiver/configMessage.ts | 1 + .../libsession/handleLibSessionMessage.ts | 1 + ts/session/apis/snode_api/swarmPolling.ts | 29 +++++++--- .../SwarmPollingGroupConfig.ts | 1 + .../conversations/ConversationController.ts | 12 +++- ts/session/sending/MessageSender.ts | 7 ++- ts/state/ducks/metaGroups.ts | 1 + ts/types/sqlSharedTypes.ts | 2 + 15 files changed, 119 insertions(+), 39 deletions(-) diff --git a/ts/data/data.ts b/ts/data/data.ts index fab909d6f2..99ce43b286 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -18,6 +18,7 @@ import { AsyncWrapper, MsgDuplicateSearchOpenGroup, SaveConversationReturn, + SaveSeenMessageHash, UnprocessedDataNode, UpdateLastHashType, } from '../types/sqlSharedTypes'; @@ -215,17 +216,16 @@ async function cleanLastHashes(): Promise { await channels.cleanLastHashes(); } -export type SeenMessageHashes = { - expiresAt: number; - hash: string; -}; - -async function saveSeenMessageHashes(data: Array): Promise { +async function saveSeenMessageHashes(data: Array): Promise { await channels.saveSeenMessageHashes(cleanData(data)); } -async function clearLastHashesForConvoId(data: { convoId: string }): Promise { - await channels.clearLastHashesForConvoId(cleanData(data)); +async function clearLastHashesForConvoId(conversationId: string): Promise { + await channels.clearLastHashesForConvoId(conversationId); +} + +async function emptySeenMessageHashesForConversation(conversationId: string): Promise { + await channels.emptySeenMessageHashesForConversation(conversationId); } async function updateLastHash(data: UpdateLastHashType): Promise { @@ -867,6 +867,7 @@ export const Data = { cleanLastHashes, clearLastHashesForConvoId, saveSeenMessageHashes, + emptySeenMessageHashesForConversation, updateLastHash, saveMessage, saveMessages, diff --git a/ts/data/dataInit.ts b/ts/data/dataInit.ts index 473a78b436..2696fe3432 100644 --- a/ts/data/dataInit.ts +++ b/ts/data/dataInit.ts @@ -40,6 +40,7 @@ const channelsToMake = new Set([ 'updateLastHash', 'clearLastHashesForConvoId', 'saveSeenMessageHashes', + 'emptySeenMessageHashesForConversation', 'saveMessages', 'removeMessage', 'removeMessagesByIds', diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 3efec954ee..26d5b20fb7 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -242,6 +242,7 @@ export async function declineConversationWithoutConfirm({ forceDestroyForAllMembers: false, fromSyncMessage: false, sendLeaveMessage: false, + clearFetchedHashes: false, }); } @@ -435,6 +436,7 @@ async function leaveGroupOrCommunityByConvoId({ deleteAllMessagesOnSwarm: false, deletionType: 'doNotKeep', forceDestroyForAllMembers: false, + clearFetchedHashes: true, }); } await clearConversationInteractionState({ conversationId }); diff --git a/ts/node/database_utility.ts b/ts/node/database_utility.ts index 157f6d7459..3293940944 100644 --- a/ts/node/database_utility.ts +++ b/ts/node/database_utility.ts @@ -17,6 +17,7 @@ export const ITEMS_TABLE = 'items'; export const ATTACHMENT_DOWNLOADS_TABLE = 'attachment_downloads'; export const CLOSED_GROUP_V2_KEY_PAIRS_TABLE = 'encryptionKeyPairsForClosedGroupV2'; export const LAST_HASHES_TABLE = 'lastHashes'; +export const SEEN_MESSAGE_TABLE = 'seenMessages'; export const HEX_KEY = /[^0-9A-Fa-f]/; diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts index 158a5f38d3..54dc29800c 100644 --- a/ts/node/migration/sessionMigrations.ts +++ b/ts/node/migration/sessionMigrations.ts @@ -19,6 +19,7 @@ import { MESSAGES_TABLE, NODES_FOR_PUBKEY_TABLE, OPEN_GROUP_ROOMS_V2_TABLE, + SEEN_MESSAGE_TABLE, dropFtsAndTriggers, objectToJSON, rebuildFtsTable, @@ -106,6 +107,7 @@ const LOKI_SCHEMA_VERSIONS = [ updateToSessionSchemaVersion36, updateToSessionSchemaVersion37, updateToSessionSchemaVersion38, + updateToSessionSchemaVersion39, ]; function updateToSessionSchemaVersion1(currentVersion: number, db: BetterSqlite3.Database) { @@ -2003,6 +2005,26 @@ function updateToSessionSchemaVersion38(currentVersion: number, db: BetterSqlite console.log(`updateToSessionSchemaVersion${targetVersion}: success!`); } +function updateToSessionSchemaVersion39(currentVersion: number, db: BetterSqlite3.Database) { + const targetVersion = 39; + if (currentVersion >= targetVersion) { + return; + } + + console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`); + + db.transaction(() => { + db.exec(`ALTER TABLE ${SEEN_MESSAGE_TABLE} ADD COLUMN conversationId TEXT;`); + + db.exec(`CREATE INDEX seen_hashes_per_pubkey ON ${SEEN_MESSAGE_TABLE} ( + conversationId + );`); + writeSessionSchemaVersion(targetVersion, db); + })(); + + console.log(`updateToSessionSchemaVersion${targetVersion}: success!`); +} + export function printTableColumns(table: string, db: BetterSqlite3.Database) { console.info(db.pragma(`table_info('${table}');`)); } diff --git a/ts/node/migration/signalMigrations.ts b/ts/node/migration/signalMigrations.ts index 6d7bddcd70..fb01760b96 100644 --- a/ts/node/migration/signalMigrations.ts +++ b/ts/node/migration/signalMigrations.ts @@ -11,6 +11,7 @@ import { LAST_HASHES_TABLE, MESSAGES_FTS_TABLE, MESSAGES_TABLE, + SEEN_MESSAGE_TABLE, } from '../database_utility'; import { getAppRootPath } from '../getRootPath'; import { updateSessionSchema } from './sessionMigrations'; @@ -245,7 +246,7 @@ function updateToSchemaVersion6(currentVersion: number, db: BetterSqlite3.Databa expiresAt INTEGER ); - CREATE TABLE seenMessages( + CREATE TABLE ${SEEN_MESSAGE_TABLE}( hash TEXT PRIMARY KEY, expiresAt INTEGER ); diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 2616dfbb93..f70f1f9869 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -48,6 +48,7 @@ import { NODES_FOR_PUBKEY_TABLE, objectToJSON, OPEN_GROUP_ROOMS_V2_TABLE, + SEEN_MESSAGE_TABLE, toSqliteBoolean, } from './database_utility'; import type { SetupI18nReturnType } from '../types/localizer'; // checked - only node @@ -58,6 +59,7 @@ import { MsgDuplicateSearchOpenGroup, roomHasBlindEnabled, SaveConversationReturn, + SaveSeenMessageHash, UnprocessedDataNode, UnprocessedParameter, UpdateLastHashType, @@ -937,12 +939,21 @@ function saveMessage(data: MessageAttributes) { return id; } -function saveSeenMessageHashes(arrayOfHashes: Array) { +function saveSeenMessageHashes(arrayOfHashes: Array) { assertGlobalInstance().transaction(() => { map(arrayOfHashes, saveSeenMessageHash); })(); } +function emptySeenMessageHashesForConversation(conversationId: string) { + if (!isString(conversationId) || isEmpty(conversationId)) { + throw new Error('emptySeenMessageHashesForConversation: conversationId is not a string'); + } + assertGlobalInstance() + .prepare(`DELETE FROM ${SEEN_MESSAGE_TABLE} WHERE conversationId=$conversationId`) + .run({ conversationId }); +} + function updateLastHash(data: UpdateLastHashType) { const { convoId, snode, hash, expiresAt, namespace } = data; if (!isNumber(namespace)) { @@ -973,32 +984,43 @@ function updateLastHash(data: UpdateLastHashType) { }); } -function clearLastHashesForConvoId(data: { convoId: string }) { - const { convoId } = data; - if (!isString(convoId)) { - throw new Error('clearLastHashesForPubkey: convoId not a string'); +function clearLastHashesForConvoId(conversationId: string) { + if (!isString(conversationId) || isEmpty(conversationId)) { + throw new Error('clearLastHashesForConvoId: conversationId is not a string'); } - assertGlobalInstance().prepare(`DELETE FROM ${LAST_HASHES_TABLE} WHERE pubkey=$convoId;`).run({ - convoId, - }); + assertGlobalInstance() + .prepare(`DELETE FROM ${LAST_HASHES_TABLE} WHERE id=$conversationId`) + .run({ conversationId }); } -function saveSeenMessageHash(data: any) { - const { expiresAt, hash } = data; +function saveSeenMessageHash(data: SaveSeenMessageHash) { + const { expiresAt, hash, conversationId } = data; + if (!isString(conversationId)) { + throw new Error('saveSeenMessageHash conversationId must be a string'); + } + if (!isString(hash)) { + throw new Error('saveSeenMessageHash hash must be a string'); + } + if (!isNumber(expiresAt)) { + throw new Error('saveSeenMessageHash expiresAt must be a number'); + } try { assertGlobalInstance() .prepare( - `INSERT OR REPLACE INTO seenMessages ( + `INSERT OR REPLACE INTO ${SEEN_MESSAGE_TABLE} ( expiresAt, - hash + hash, + conversationId ) values ( $expiresAt, - $hash + $hash, + $conversationId );` ) .run({ expiresAt, hash, + conversationId, }); } catch (e) { console.error('saveSeenMessageHash failed:', e.message); @@ -1012,7 +1034,7 @@ function cleanLastHashes() { } function cleanSeenMessages() { - assertGlobalInstance().prepare('DELETE FROM seenMessages WHERE expiresAt <= $now;').run({ + assertGlobalInstance().prepare(`DELETE FROM ${SEEN_MESSAGE_TABLE} WHERE expiresAt <= $now;`).run({ now: Date.now(), }); } @@ -1748,7 +1770,9 @@ function getLastHashBySnode(convoId: string, snode: string, namespace: number) { function getSeenMessagesByHashList(hashes: Array) { const rows = assertGlobalInstance() - .prepare(`SELECT * FROM seenMessages WHERE hash IN ( ${hashes.map(() => '?').join(', ')} );`) + .prepare( + `SELECT * FROM ${SEEN_MESSAGE_TABLE} WHERE hash IN ( ${hashes.map(() => '?').join(', ')} );` + ) .all(hashes); return map(rows, row => row.hash); @@ -2008,7 +2032,7 @@ function removeAll() { DELETE FROM ${LAST_HASHES_TABLE}; DELETE FROM ${NODES_FOR_PUBKEY_TABLE}; DELETE FROM ${CLOSED_GROUP_V2_KEY_PAIRS_TABLE}; - DELETE FROM seenMessages; + DELETE FROM ${SEEN_MESSAGE_TABLE}; DELETE FROM ${CONVERSATIONS_TABLE}; DELETE FROM ${MESSAGES_TABLE}; DELETE FROM ${ATTACHMENT_DOWNLOADS_TABLE}; @@ -2657,7 +2681,7 @@ export const sqlNode = { cleanLastHashes, clearLastHashesForConvoId, saveSeenMessageHashes, - saveSeenMessageHash, + emptySeenMessageHashesForConversation, updateLastHash, saveMessages, removeMessage, diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index e70c0378d7..6e300ff29f 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -759,6 +759,7 @@ async function handleSingleGroupUpdateToLeave(toLeave: GroupPubkeyType) { deletionType: 'doNotKeep', deleteAllMessagesOnSwarm: false, forceDestroyForAllMembers: false, + clearFetchedHashes: true, }); } catch (e) { window.log.info('Failed to deleteClosedGroup with: ', e.message); diff --git a/ts/receiver/libsession/handleLibSessionMessage.ts b/ts/receiver/libsession/handleLibSessionMessage.ts index e7975c5f3b..d019bde019 100644 --- a/ts/receiver/libsession/handleLibSessionMessage.ts +++ b/ts/receiver/libsession/handleLibSessionMessage.ts @@ -57,6 +57,7 @@ async function handleLibSessionKickedMessage({ deletionType: inviteWasPending ? 'doNotKeep' : 'keepAsKicked', deleteAllMessagesOnSwarm: false, forceDestroyForAllMembers: false, + clearFetchedHashes: true, }); } diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index f38c61152c..a5ea2ba034 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -489,7 +489,7 @@ export class SwarmPolling { const newMessages = await this.handleSeenMessages(uniqOtherMsgs); window.log.info( - `SwarmPolling: handleSeenMessages: ${newMessages.length} out of ${uniqOtherMsgs.length} are not seen yet. snode: ${toPollFrom ? ed25519Str(toPollFrom.pubkey_ed25519) : 'undefined'}` + `SwarmPolling: handleSeenMessages: ${newMessages.length} out of ${uniqOtherMsgs.length} are not seen yet about pk:${ed25519Str(pubkey)} snode: ${toPollFrom ? ed25519Str(toPollFrom.pubkey_ed25519) : 'undefined'}` ); if (type === ConversationTypeEnum.GROUPV2) { if (!PubKey.is03Pubkey(pubkey)) { @@ -510,7 +510,7 @@ export class SwarmPolling { // private and legacy groups are cached, so we can mark them as seen right away, they are still in the cache until processed correctly. // at some point we should get rid of the cache completely, and do the same logic as for groupv2 above - await this.updateSeenMessages(newMessages); + await this.updateSeenMessages(newMessages, pubkey); // trigger the handling of all the other messages, not shared config related and not groupv2 encrypted newMessages.forEach(m => { const extracted = extractWebSocketContent(m.data, m.hash); @@ -696,6 +696,7 @@ export class SwarmPolling { deletionType: 'doNotKeep', deleteAllMessagesOnSwarm: false, forceDestroyForAllMembers: false, + clearFetchedHashes: true, }); } } @@ -722,19 +723,22 @@ export class SwarmPolling { } const incomingHashes = messages.map((m: RetrieveMessageItem) => m.hash); - const dupHashes = await Data.getSeenMessagesByHashList(incomingHashes); const newMessages = messages.filter((m: RetrieveMessageItem) => !dupHashes.includes(m.hash)); return newMessages; } - private async updateSeenMessages(processedMessages: Array) { + private async updateSeenMessages( + processedMessages: Array, + conversationId: string + ) { if (processedMessages.length) { const newHashes = processedMessages.map((m: RetrieveMessageItem) => ({ // NOTE setting expiresAt will trigger the global function destroyExpiredMessages() on it's next interval expiresAt: m.expiration, hash: m.hash, + conversationId, })); await Data.saveSeenMessageHashes(newHashes); } @@ -822,6 +826,17 @@ export class SwarmPolling { return this.lastHashes[nodeEdKey][pubkey][namespace]; } + public async resetLastHashesForConversation(conversationId: string) { + await Data.clearLastHashesForConvoId(conversationId); + const snodeKeys = Object.keys(this.lastHashes); + for (let index = 0; index < snodeKeys.length; index++) { + const snodeKey = snodeKeys[index]; + if (!isEmpty(this.lastHashes[snodeKey][conversationId])) { + this.lastHashes[snodeKey][conversationId] = {}; + } + } + } + public async pollOnceForOurDisplayName(abortSignal?: AbortSignal): Promise { if (abortSignal?.aborted) { throw new NotFoundError('[pollOnceForOurDisplayName] aborted right away'); @@ -1089,6 +1104,7 @@ async function handleMessagesForGroupV2( { hash: msg.hash, expiresAt: msg.expiration, + conversationId: groupPk, }, ]); } catch (e) { @@ -1096,9 +1112,4 @@ async function handleMessagesForGroupV2( } } } - - // make sure that all the message above are indeed seen (extra check as everything should already be marked as seen in the loop above) - await Data.saveSeenMessageHashes( - newMessages.map(m => ({ hash: m.hash, expiresAt: m.expiration })) - ); } diff --git a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts index bfed36920f..4c1ef39f3f 100644 --- a/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts +++ b/ts/session/apis/snode_api/swarm_polling_config/SwarmPollingGroupConfig.ts @@ -48,6 +48,7 @@ async function handleMetaMergeResults(groupPk: GroupPubkeyType) { deletionType: 'keepAsDestroyed', // we just got something from the group's swarm, so it is not pendingInvite deleteAllMessagesOnSwarm: false, forceDestroyForAllMembers: false, + clearFetchedHashes: true, }); } else { if ( diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 945d99f662..efb126115d 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -259,11 +259,13 @@ class ConvoController { deletionType, deleteAllMessagesOnSwarm, forceDestroyForAllMembers, + clearFetchedHashes, }: DeleteOptions & { sendLeaveMessage: boolean; deletionType: 'doNotKeep' | 'keepAsKicked' | 'keepAsDestroyed'; deleteAllMessagesOnSwarm: boolean; forceDestroyForAllMembers: boolean; + clearFetchedHashes: boolean; } ) { if (!PubKey.is03Pubkey(groupPk)) { @@ -271,7 +273,7 @@ class ConvoController { } window.log.info( - `deleteGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, deletionType:${deletionType}, deleteAllMessagesOnSwarm:${deleteAllMessagesOnSwarm}, forceDestroyForAllMembers:${forceDestroyForAllMembers}` + `deleteGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, deletionType:${deletionType}, deleteAllMessagesOnSwarm:${deleteAllMessagesOnSwarm}, forceDestroyForAllMembers:${forceDestroyForAllMembers}, clearFetchedHashes:${clearFetchedHashes}` ); // this deletes all messages in the conversation @@ -373,6 +375,14 @@ class ConvoController { await this.removeGroupOrCommunityFromDBAndRedux(groupPk); } + // We want to clear the lastHash and the seenHashes of the corresponding group. + // We do this so that if we get reinvited to the group, we will + // fetch and display all the messages from the group's swarm again. + if (clearFetchedHashes) { + await getSwarmPollingInstance().resetLastHashesForConversation(groupPk); + await Data.emptySeenMessageHashesForConversation(groupPk); + } + await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupPk); // release the memory (and the current meta-dumps in memory for that group) window.log.info(`freeing meta group wrapper: ${ed25519Str(groupPk)}`); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index c90566fb46..197449b6d4 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -4,7 +4,7 @@ import { AbortController } from 'abort-controller'; import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; import { isArray, isEmpty, isNumber, isString } from 'lodash'; import pRetry from 'p-retry'; -import { Data, SeenMessageHashes } from '../../data/data'; +import { Data } from '../../data/data'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { OpenGroupMessageV2 } from '../apis/open_group_api/opengroupV2/OpenGroupMessageV2'; import { @@ -53,7 +53,7 @@ import { UserUtils } from '../utils'; import { ed25519Str, fromUInt8ArrayToBase64 } from '../utils/String'; import { MessageSentHandler } from './MessageSentHandler'; import { EncryptAndWrapMessageResults, MessageWrapper } from './MessageWrapper'; -import { stringify } from '../../types/sqlSharedTypes'; +import { SaveSeenMessageHash, stringify } from '../../types/sqlSharedTypes'; import { OpenGroupRequestCommonType } from '../../data/types'; import { NetworkTime } from '../../util/NetworkTime'; import { MergedAbortSignal } from '../apis/snode_api/requestWith'; @@ -632,7 +632,7 @@ async function handleBatchResultWithSubRequests({ return; } - const seenHashes: Array = []; + const seenHashes: Array = []; for (let index = 0; index < subRequests.length; index++) { const subRequest = subRequests[index]; @@ -658,6 +658,7 @@ async function handleBatchResultWithSubRequests({ seenHashes.push({ expiresAt: NetworkTime.now() + TTL_DEFAULT.CONTENT_MESSAGE, // non config msg expire at CONTENT_MESSAGE at most hash: storedHash, + conversationId: destination, }); // We need to store the hash of our synced message for a 1o1. (as this is the one stored on our swarm) diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index db7799fd03..7df015dda8 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -268,6 +268,7 @@ const initNewGroupInWrapper = createAsyncThunk( deletionType: 'doNotKeep', deleteAllMessagesOnSwarm: false, forceDestroyForAllMembers: false, + clearFetchedHashes: true, }); } throw e; diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index 5965b5e608..fb4d297262 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -319,3 +319,5 @@ export function stringify(obj: unknown) { 2 ); } + +export type SaveSeenMessageHash = { expiresAt: number; hash: string; conversationId: string }; From df2a9dd13fcdf72f1ad7b5caf13ea3636529fcba Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 5 Dec 2024 11:52:34 +1100 Subject: [PATCH 205/302] chore: refactor batch request functions to take record --- .../conversation/SubtleNotification.tsx | 5 +- ts/session/apis/snode_api/SNodeAPI.ts | 85 +++++++++---------- .../apis/snode_api/SnodeRequestTypes.ts | 1 + ts/session/apis/snode_api/batchRequest.ts | 71 ++++++++++------ ts/session/apis/snode_api/expireRequest.ts | 18 ++-- .../apis/snode_api/getExpiriesRequest.ts | 14 +-- .../apis/snode_api/getServiceNodesList.ts | 16 ++-- ts/session/apis/snode_api/getSwarmFor.ts | 22 ++--- ts/session/apis/snode_api/onsResolve.ts | 36 ++++---- ts/session/apis/snode_api/requestWith.ts | 2 +- ts/session/apis/snode_api/retrieveRequest.ts | 12 +-- ts/session/sending/MessageSender.ts | 28 +++--- ts/session/types/with.ts | 2 +- .../unit/sending/MessageSender_test.ts | 54 ++++++------ .../group_sync_job/GroupSyncJob_test.ts | 11 ++- 15 files changed, 202 insertions(+), 175 deletions(-) diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index 8eb7c17b2f..ab9657e370 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -221,7 +221,7 @@ export const NoMessageInConversation = () => { const isPublic = useSelectedIsPublic(); const getHtmlToRender = () => { - // First, handle the "oteToSelf and various "private" cases + // First, handle the "noteToSelf and various "private" cases if (isMe) { return localize('noteToSelfEmpty').toString(); } @@ -229,7 +229,7 @@ export const NoMessageInConversation = () => { return localize('messageRequestsTurnedOff').withArgs({ name }).toString(); } if (isPrivate) { - // "You have no messages in X, send a message to start a conversation." + // "You have no messages from X. Send a message to start the conversation!" return localize('groupNoMessages').withArgs({ group_name: name }).toString(); } @@ -247,6 +247,7 @@ export const NoMessageInConversation = () => { return localize('groupRemovedYou').withArgs({ group_name: name }).toString(); } if (canWrite) { + // "You have no messages from X. Send a message to start the conversation!" return localize('groupNoMessages').withArgs({ group_name: name }).toString(); } // if we cannot write for some reason, don't show the "send a message" part diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 281c59fc71..f8d5b50869 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -33,20 +33,21 @@ const forceNetworkDeletion = async (): Promise | null> => { window?.log?.warn('forceNetworkDeletion: we are offline.'); return null; } - const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(usPk); + const targetNode = await SnodePool.getNodeFromSwarmOrThrow(usPk); const builtRequest = await request.build(); - const ret = await BatchRequests.doSnodeBatchRequestNoRetries( - [builtRequest], - snodeToMakeRequestTo, - 10000, - usPk, - false - ); + const ret = await BatchRequests.doSnodeBatchRequestNoRetries({ + subRequests: [builtRequest], + targetNode, + timeoutMs: 10 * DURATION.SECONDS, + associatedWith: usPk, + allow401s: false, + method: 'batch', + }); if (!ret || !ret?.[0].body || ret[0].code !== 200) { throw new Error( `Empty response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )}` ); } @@ -58,7 +59,7 @@ const forceNetworkDeletion = async (): Promise | null> => { if (!swarm) { throw new Error( `Invalid JSON swarm response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )}, ${firstResultParsedBody}` ); } @@ -66,7 +67,7 @@ const forceNetworkDeletion = async (): Promise | null> => { if (!swarmAsArray.length) { throw new Error( `Invalid JSON swarmAsArray response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )}, ${firstResultParsedBody}` ); } @@ -84,7 +85,7 @@ const forceNetworkDeletion = async (): Promise | null> => { if (reason && statusCode) { window?.log?.warn( `Could not ${request.method} from ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )} due to error: ${reason}: ${statusCode}` ); // if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to. @@ -95,9 +96,7 @@ const forceNetworkDeletion = async (): Promise | null> => { } } else { window?.log?.warn( - `Could not ${request.method} from ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 - )}` + `Could not ${request.method} from ${ed25519Str(targetNode.pubkey_ed25519)}` ); } return snodePubkey; @@ -133,7 +132,7 @@ const forceNetworkDeletion = async (): Promise | null> => { } catch (e) { throw new Error( `Invalid JSON response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )}, ${ret}` ); } @@ -183,19 +182,19 @@ const networkDeleteMessageOurSwarm = async ( try { const success = await pRetry( async () => { - const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.destination); + const targetNode = await SnodePool.getNodeFromSwarmOrThrow(request.destination); const controller = new AbortController(); const ret = await timeoutWithAbort( - BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [request], - snodeToMakeRequestTo, - 10 * DURATION.SECONDS, - request.destination, - false, - 'batch', - controller.signal - ), + BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: [request], + targetNode, + timeoutMs: 10 * DURATION.SECONDS, + associatedWith: request.destination, + allow401s: false, + method: 'batch', + abortSignal: controller.signal, + }), 30 * DURATION.SECONDS, controller ); @@ -203,7 +202,7 @@ const networkDeleteMessageOurSwarm = async ( if (!ret || !ret?.[0].body || ret[0].code !== 200) { throw new Error( `networkDeleteMessageOurSwarm: Empty response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )} about pk: ${ed25519Str(request.destination)}` ); } @@ -215,7 +214,7 @@ const networkDeleteMessageOurSwarm = async ( if (!swarm) { throw new Error( `networkDeleteMessageOurSwarm: Invalid JSON swarm response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )}, ${firstResultParsedBody}` ); } @@ -223,7 +222,7 @@ const networkDeleteMessageOurSwarm = async ( if (!swarmAsArray.length) { throw new Error( `networkDeleteMessageOurSwarm: Invalid JSON swarmAsArray response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )}, ${firstResultParsedBody}` ); } @@ -241,13 +240,13 @@ const networkDeleteMessageOurSwarm = async ( if (reason && statusCode) { window?.log?.warn( `networkDeleteMessageOurSwarm: Could not ${request.method} from ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )} due to error: ${reason}: ${statusCode}` ); } else { window?.log?.warn( `networkDeleteMessageOurSwarm: Could not ${request.method} from ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )}` ); } @@ -277,7 +276,7 @@ const networkDeleteMessageOurSwarm = async ( } catch (e) { throw new Error( `networkDeleteMessageOurSwarm: Invalid JSON response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )}, ${ret}` ); } @@ -339,18 +338,18 @@ const networkDeleteMessagesForGroup = async ( await pRetry( async () => { - const snodeToMakeRequestTo = await SnodePool.getNodeFromSwarmOrThrow(request.destination); + const targetNode = await SnodePool.getNodeFromSwarmOrThrow(request.destination); const controller = new AbortController(); const ret = await timeoutWithAbort( - BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [request], - snodeToMakeRequestTo, - 10 * DURATION.SECONDS, - request.destination, - false, - 'batch', - controller.signal - ), + BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: [request], + targetNode, + timeoutMs: 10 * DURATION.SECONDS, + associatedWith: request.destination, + allow401s: false, + method: 'batch', + abortSignal: controller.signal, + }), 30 * DURATION.SECONDS, controller ); @@ -358,7 +357,7 @@ const networkDeleteMessagesForGroup = async ( if (!ret || !ret?.[0].body || ret[0].code !== 200) { throw new Error( `networkDeleteMessagesForGroup: Empty response got for ${request.method} on snode ${ed25519Str( - snodeToMakeRequestTo.pubkey_ed25519 + targetNode.pubkey_ed25519 )} about pk: ${ed25519Str(request.destination)}` ); } diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index af76dfd88e..105a5fe5cf 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -1295,6 +1295,7 @@ type StoreOnNodeSubAccountParams = Pick< type StoreOnNodeParams = StoreOnNodeNormalParams | StoreOnNodeSubAccountParams; export type MethodBatchType = 'batch' | 'sequence'; +export type WithMethodBatchType = { method: MethodBatchType }; export type RawSnodeSubRequests = | RetrieveLegacyClosedGroupSubRequest diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 8d123cf76b..e080525c0d 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -10,16 +10,20 @@ import { builtRequestToLoggingId, BuiltSnodeSubRequests, MAX_SUBREQUESTS_COUNT, - MethodBatchType, NotEmptyArrayOfBatchResults, RawSnodeSubRequests, + WithMethodBatchType, } from './SnodeRequestTypes'; -import { MergedAbortSignal } from './requestWith'; +import { MergedAbortSignal, WithTimeoutMs } from './requestWith'; function logSubRequests(requests: Array) { return `[${requests.map(builtRequestToLoggingId).join(', ')}]`; } +type WithTargetNode = { targetNode: Snode }; +type WithAssociatedWith = { associatedWith: string | null }; +type WithAllow401s = { allow401s: boolean }; + /** * This is the equivalent to the batch send on sogs. The target node runs each sub request and returns a list of all the sub status and bodies. * If the global status code is not 200, an exception is thrown. @@ -32,15 +36,22 @@ function logSubRequests(requests: Array) { * @param associatedWith used mostly for handling 421 errors, we need the pubkey the change is associated to * @param method can be either batch or sequence. A batch call will run all calls even if one of them fails. A sequence call will stop as soon as the first one fails */ -async function doSnodeBatchRequestNoRetries( - subRequests: Array, - targetNode: Snode, - timeoutMs: number, - associatedWith: string | null, - allow401s: boolean, - abortSignal?: MergedAbortSignal, - method: MethodBatchType = 'batch' -): Promise { +async function doSnodeBatchRequestNoRetries({ + allow401s, + associatedWith, + method, + subRequests, + targetNode, + timeoutMs, + abortSignal, +}: WithTargetNode & + WithTimeoutMs & + WithAssociatedWith & + WithAllow401s & + WithMethodBatchType & { + subRequests: Array; + abortSignal?: MergedAbortSignal; + }): Promise { window.log.debug( `doSnodeBatchRequestNoRetries "${method}":`, JSON.stringify(logSubRequests(subRequests)) @@ -102,27 +113,35 @@ async function doSnodeBatchRequestNoRetries( * @param timeoutMs the max timeout to wait for a reply * @param associatedWith the pubkey associated with this request (used to remove snode failing to reply from that users' swarm) * @param method the type of request to make batch or sequence - * @returns + * @param allow401 on very specific use case, we need to allow 401 (Group kicked event) + * @param abortSignal the signal used to know when we should abort the request */ -async function doUnsignedSnodeBatchRequestNoRetries( - unsignedSubRequests: Array, - targetNode: Snode, - timeoutMs: number, - associatedWith: string | null, - allow401s: boolean, - method: MethodBatchType = 'batch', - abortSignal: MergedAbortSignal | null -): Promise { +async function doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests, + targetNode, + timeoutMs, + associatedWith, + method, + allow401s, + abortSignal, +}: WithTargetNode & + WithTimeoutMs & + WithAssociatedWith & + WithAllow401s & + WithMethodBatchType & { + unsignedSubRequests: Array; + abortSignal: MergedAbortSignal | null; + }): Promise { const signedSubRequests = await MessageSender.signSubRequests(unsignedSubRequests); - return BatchRequests.doSnodeBatchRequestNoRetries( - signedSubRequests, + return BatchRequests.doSnodeBatchRequestNoRetries({ + subRequests: signedSubRequests, targetNode, timeoutMs, associatedWith, allow401s, - abortSignal || undefined, - method - ); + abortSignal: abortSignal || undefined, + method, + }); } /** diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index 26e2fafa71..a8376d9eb5 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -146,15 +146,15 @@ async function updateExpiryOnNodesNoRetries( expireRequests: Array ): Promise> { try { - const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - expireRequests, + const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: expireRequests, targetNode, - 10 * DURATION.SECONDS, - ourPubKey, - false, - 'batch', - null - ); + timeoutMs: 10 * DURATION.SECONDS, + associatedWith: ourPubKey, + allow401s: false, + method: 'batch', + abortSignal: null, + }); if (!result || result.length !== expireRequests.length) { window.log.error( @@ -381,7 +381,7 @@ export async function expireMessagesOnSnode( // TODO after the next storage server fork we will get a new endpoint allowing to batch // update expiries even when they are * not * the same for all the message hashes. // But currently we can't access it that endpoint, so we need to keep this hacky way for now. - // groupby expiries ( expireTimer+ readAt), then batch them with a limit of MAX_SUBREQUESTS_COUNT batch calls per batch requests, then do those in parralel, for now. + // group by expiries ( expireTimer+ readAt), then batch them with a limit of MAX_SUBREQUESTS_COUNT batch calls per batch requests, then do those in parallel, for now. const expireRequestsParams = await Promise.all( chunkedExpiries.map(chk => getBatchExpiryChunk({ diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index 2c11f0e61b..a9d56ab062 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -47,15 +47,15 @@ async function getExpiriesFromNodesNoRetries( ) { try { const expireRequest = new GetExpiriesFromNodeSubRequest({ messagesHashes: messageHashes }); - const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [expireRequest], + const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: [expireRequest], targetNode, - 10 * DURATION.SECONDS, + timeoutMs: 10 * DURATION.SECONDS, associatedWith, - false, - 'batch', - null - ); + allow401s: false, + method: 'batch', + abortSignal: null, + }); if (!result || result.length !== 1) { throw Error( diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index aa38cb1164..daab8347dc 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -15,15 +15,15 @@ import { DURATION } from '../../constants'; async function getSnodePoolFromSnode(targetNode: Snode): Promise> { const subRequest = new GetServiceNodesSubRequest(); - const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [subRequest], + const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: [subRequest], targetNode, - 10 * DURATION.SECONDS, - null, - false, - 'batch', - null - ); + timeoutMs: 10 * DURATION.SECONDS, + associatedWith: null, + allow401s: false, + method: 'batch', + abortSignal: null, + }); const firstResult = results[0]; diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index 0c390cbbe4..610fa7c9aa 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -20,19 +20,19 @@ async function requestSnodesForPubkeyWithTargetNodeRetryable( } const subRequest = new SwarmForSubRequest(pubkey); - const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [subRequest], + const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: [subRequest], targetNode, - 10 * DURATION.SECONDS, - pubkey, - false, - 'batch', - null - ); + timeoutMs: 10 * DURATION.SECONDS, + associatedWith: pubkey, + allow401s: false, + method: 'batch', + abortSignal: null, + }); if (!result || !result.length) { window?.log?.warn( - `SessionSnodeAPI::requestSnodesForPubkeyWithTargetNodeRetryable - sessionRpc on ${targetNode.ip}:${targetNode.port} returned falsish value`, + `SessionSnodeAPI::requestSnodesForPubkeyWithTargetNodeRetryable - sessionRpc on ${targetNode.ip}:${targetNode.port} returned falsy value`, result ); throw new Error('requestSnodesForPubkeyWithTargetNodeRetryable: Invalid result'); @@ -49,7 +49,7 @@ async function requestSnodesForPubkeyWithTargetNodeRetryable( const body = firstResult.body; if (!body.snodes || !isArray(body.snodes) || !body.snodes.length) { window?.log?.warn( - `SessionSnodeAPI::requestSnodesForPubkeyRetryable - sessionRpc on ${targetNode.ip}:${targetNode.port} returned falsish value for snodes`, + `SessionSnodeAPI::requestSnodesForPubkeyRetryable - sessionRpc on ${targetNode.ip}:${targetNode.port} returned falsy value for snodes`, result ); throw new Error('requestSnodesForPubkey: Invalid json (empty)'); @@ -117,7 +117,7 @@ async function requestSnodesForPubkeyRetryable(pubKey: string): Promise> { try { // catch exception in here only. - // the idea is that the pretry will retry a few times each calls, except if an AbortError is thrown. + // the idea is that the p-retry will retry a few times each calls, except if an AbortError is thrown. // if all retry fails, we will end up in the catch below when the last exception thrown return await requestSnodesForPubkeyRetryable(pubKey); diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts index 0fc996a1d7..d1790a92bf 100644 --- a/ts/session/apis/snode_api/onsResolve.ts +++ b/ts/session/apis/snode_api/onsResolve.ts @@ -36,18 +36,18 @@ async function getSessionIDForOnsName(onsNameCase: string) { const promises = range(0, validationCount).map(async () => { const targetNode = await SnodePool.getRandomSnode(); - const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - [subRequest], + const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: [subRequest], targetNode, - 10 * DURATION.SECONDS, - null, - false, - 'batch', - null - ); + timeoutMs: 10 * DURATION.SECONDS, + associatedWith: null, + allow401s: false, + method: 'batch', + abortSignal: null, + }); const firstResult = results[0]; if (!firstResult || firstResult.code !== 200 || !firstResult.body) { - throw new Error('ONSresolve:Failed to resolve ONS'); + throw new Error('OnsResolve :Failed to resolve ONS'); } const parsedBody = firstResult.body; GetNetworkTime.handleTimestampOffsetFromNetwork('ons_resolve', parsedBody.t); @@ -55,7 +55,7 @@ async function getSessionIDForOnsName(onsNameCase: string) { const intermediate = parsedBody?.result; if (!intermediate || !intermediate?.encrypted_value) { - throw new NotFoundError('ONSresolve: no encrypted_value'); + throw new NotFoundError('OnsResolve: no encrypted_value'); } const hexEncodedCipherText = intermediate?.encrypted_value; @@ -65,18 +65,18 @@ async function getSessionIDForOnsName(onsNameCase: string) { const hexEncodedNonce = intermediate.nonce as string; if (!hexEncodedNonce) { - throw new Error('ONSresolve: No hexEncodedNonce'); + throw new Error('OnsResolve: No hexEncodedNonce'); } const nonce = fromHexToArray(hexEncodedNonce); try { key = sodium.crypto_generichash(sodium.crypto_generichash_BYTES, nameAsData, nameHash); if (!key) { - throw new Error('ONSresolve: Hashing failed'); + throw new Error('OnsResolve: Hashing failed'); } } catch (e) { - window?.log?.warn('ONSresolve: hashing failed', e); - throw new Error('ONSresolve: Hashing failed'); + window?.log?.warn('OnsResolve: hashing failed', e); + throw new Error('OnsResolve: Hashing failed'); } const sessionIDAsData = sodium.crypto_aead_xchacha20poly1305_ietf_decrypt( @@ -88,7 +88,7 @@ async function getSessionIDForOnsName(onsNameCase: string) { ); if (!sessionIDAsData) { - throw new Error('ONSresolve: Decryption failed'); + throw new Error('OnsResolve: Decryption failed'); } return toHex(sessionIDAsData); @@ -98,16 +98,16 @@ async function getSessionIDForOnsName(onsNameCase: string) { // if one promise throws, we end un the catch case const allResolvedSessionIds = await Promise.all(promises); if (allResolvedSessionIds?.length !== validationCount) { - throw new Error('ONSresolve: Validation failed'); + throw new Error('OnsResolve: Validation failed'); } // assert all the returned account ids are the same if (_.uniq(allResolvedSessionIds).length !== 1) { - throw new Error('ONSresolve: Validation failed'); + throw new Error('OnsResolve: Validation failed'); } return allResolvedSessionIds[0]; } catch (e) { - window.log.warn('ONSresolve: error', e); + window.log.warn('OnsResolve: error', e); throw e; } } diff --git a/ts/session/apis/snode_api/requestWith.ts b/ts/session/apis/snode_api/requestWith.ts index 7608c200c9..07c1c7cd79 100644 --- a/ts/session/apis/snode_api/requestWith.ts +++ b/ts/session/apis/snode_api/requestWith.ts @@ -2,7 +2,7 @@ import { AbortSignal } from 'abort-controller'; // eslint-disable-next-line import/no-unresolved import { AbortSignal as AbortSignalNode } from 'node-fetch/externals'; -export type MergedAbortSignal = AbortSignal | AbortSignalNode +export type MergedAbortSignal = AbortSignal | AbortSignalNode; export type WithTimeoutMs = { timeoutMs: number }; export type WithAbortSignal = { abortSignal: MergedAbortSignal }; diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index a106e90a52..272ad6adc4 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -226,16 +226,16 @@ async function retrieveNextMessagesNoRetries( // no retry for this one as this a call we do every few seconds while polling for messages // just to make sure that we don't hang for more than timeOutMs - const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - rawRequests, + const results = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: rawRequests, targetNode, // yes this is a long timeout for just messages, but 4s timeouts way to often... - 10 * DURATION.SECONDS, + timeoutMs: 10 * DURATION.SECONDS, associatedWith, allow401s, - 'batch', - null - ); + method: 'batch', + abortSignal: null, + }); try { if (!results || !isArray(results) || !results.length) { window?.log?.warn( diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 197449b6d4..677fe586bc 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -289,15 +289,15 @@ async function sendSingleMessage({ const targetNode = await SnodePool.getNodeFromSwarmOrThrow(destination); - const batchResult = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - subRequests, + const batchResult = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: subRequests, targetNode, - 10 * DURATION.SECONDS, - destination, - false, - 'sequence', - null - ); + timeoutMs: 10 * DURATION.SECONDS, + associatedWith: destination, + allow401s: false, + method: 'sequence', + abortSignal: null, + }); await handleBatchResultWithSubRequests({ batchResult, subRequests, destination }); return { @@ -441,15 +441,15 @@ async function sendMessagesDataToSnode({ const targetNode = await SnodePool.getNodeFromSwarmOrThrow(associatedWith); try { - const responses = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries( - sortedSubRequests, + const responses = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: sortedSubRequests, targetNode, - 6000, + timeoutMs: 6 * DURATION.SECONDS, associatedWith, - false, + allow401s: false, method, - abortSignal - ); + abortSignal, + }); if (!responses || !responses.length) { window?.log?.warn( diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index 4eebc02f11..a3885b53a3 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -16,7 +16,7 @@ export type WithMaxSize = { max_size?: number }; export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; export type WithCreatedAtNetworkTimestamp = { createdAtNetworkTimestamp: number }; export type WithMethod = { method: T }; - +export type WithBatchMethod = { method: T }; export type WithConvoId = { conversationId: string }; export type WithMessageId = { messageId: string }; diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index a8d21944a0..9b7389bd91 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -133,11 +133,11 @@ describe('MessageSender', () => { }); describe('logic', () => { - let messageEncyrptReturnEnvelopeType = SignalService.Envelope.Type.SESSION_MESSAGE; + let messageEncryptReturnEnvelopeType = SignalService.Envelope.Type.SESSION_MESSAGE; beforeEach(() => { encryptStub.callsFake(async (_device, plainTextBuffer, _type) => ({ - envelopeType: messageEncyrptReturnEnvelopeType, + envelopeType: messageEncryptReturnEnvelopeType, cipherText: plainTextBuffer, })); }); @@ -164,26 +164,28 @@ describe('MessageSender', () => { const args = doSnodeBatchRequestStub.getCall(0).args; - expect(args[3]).to.equal(device.key); + expect(args[0].associatedWith).to.equal(device.key); const firstArg = args[0]; - expect(firstArg.length).to.equal(1); + expect(firstArg.subRequests.length).to.equal(1); - if (firstArg[0].method !== 'store') { + const firstSubRequest = firstArg.subRequests[0]; + + if (firstSubRequest.method !== 'store') { throw new Error('expected a store request with data'); } // expect(args[3]).to.equal(visibleMessage.timestamp); the timestamp is overwritten on sending by the network clock offset - expect(firstArg[0].params.ttl).to.equal(visibleMessage.ttl()); - expect(firstArg[0].params.pubkey).to.equal(device.key); - expect(firstArg[0].params.namespace).to.equal(SnodeNamespaces.Default); + expect(firstSubRequest.params.ttl).to.equal(visibleMessage.ttl()); + expect(firstSubRequest.params.pubkey).to.equal(device.key); + expect(firstSubRequest.params.namespace).to.equal(SnodeNamespaces.Default); // the request timestamp is always used fresh with the offset as the request will be denied with a 406 otherwise (clock out of sync) - expect(firstArg[0].params.timestamp).to.be.above(Date.now() - 10); - expect(firstArg[0].params.timestamp).to.be.below(Date.now() + 10); + expect(firstSubRequest.params.timestamp).to.be.above(Date.now() - 10); + expect(firstSubRequest.params.timestamp).to.be.below(Date.now() + 10); }); it('should correctly build the envelope and override the request timestamp but not the msg one', async () => { TestUtils.setupTestWithSending(); - messageEncyrptReturnEnvelopeType = SignalService.Envelope.Type.SESSION_MESSAGE; + messageEncryptReturnEnvelopeType = SignalService.Envelope.Type.SESSION_MESSAGE; // This test assumes the encryption stub returns the plainText passed into it. const device = TestUtils.generateFakePubKey(); @@ -204,11 +206,12 @@ describe('MessageSender', () => { }); const firstArg = doSnodeBatchRequestStub.getCall(0).args[0]; + const firstSubRequest = firstArg.subRequests[0]; - if (firstArg[0].method !== 'store') { + if (firstSubRequest.method !== 'store') { throw new Error('expected a store request with data'); } - const data = fromBase64ToArrayBuffer(firstArg[0].params.data); + const data = fromBase64ToArrayBuffer(firstSubRequest.params.data); const webSocketMessage = SignalService.WebSocketMessage.decode(new Uint8Array(data)); expect(webSocketMessage.request?.body).to.not.equal( undefined, @@ -226,7 +229,7 @@ describe('MessageSender', () => { expect(envelope.source).to.equal(''); // the timestamp in the message is not overridden on sending as it should be set with the network offset when created. - // we need that timestamp to not be overriden as the signature of the message depends on it. + // we need that timestamp to not be overridden as the signature of the message depends on it. const decodedTimestampFromSending = _.toNumber(envelope.timestamp); expect(decodedTimestampFromSending).to.be.eq(visibleMessage.createAtNetworkTimestamp); @@ -236,7 +239,7 @@ describe('MessageSender', () => { describe('SESSION_MESSAGE', () => { it('should set the envelope source to be empty', async () => { TestUtils.setupTestWithSending(); - messageEncyrptReturnEnvelopeType = SignalService.Envelope.Type.SESSION_MESSAGE; + messageEncryptReturnEnvelopeType = SignalService.Envelope.Type.SESSION_MESSAGE; Sinon.stub(ConvoHub.use(), 'get').returns(undefined as any); // This test assumes the encryption stub returns the plainText passed into it. @@ -255,11 +258,12 @@ describe('MessageSender', () => { }); const firstArg = doSnodeBatchRequestStub.getCall(0).args[0]; + const firstSubRequest = firstArg.subRequests[0]; - if (firstArg[0].method !== 'store') { + if (firstSubRequest.method !== 'store') { throw new Error('expected a store request with data'); } - const data = fromBase64ToArrayBuffer(firstArg[0].params.data); + const data = fromBase64ToArrayBuffer(firstSubRequest.params.data); const webSocketMessage = SignalService.WebSocketMessage.decode(new Uint8Array(data)); expect(webSocketMessage.request?.body).to.not.equal( undefined, @@ -343,17 +347,17 @@ describe('MessageSender', () => { Sinon.stub(OnionSending, 'getMinTimeoutForSogs').returns(5); - const decodev4responseStub = Sinon.stub(OnionV4, 'decodeV4Response'); - decodev4responseStub.throws('whate'); + const decodeV4responseStub = Sinon.stub(OnionV4, 'decodeV4Response'); + decodeV4responseStub.throws('whatever'); - decodev4responseStub.onThirdCall().returns({ + decodeV4responseStub.onThirdCall().returns({ metadata: { code: 200 }, body: {}, bodyBinary: new Uint8Array(), bodyContentType: 'a', }); await MessageSender.sendToOpenGroupV2(message, roomInfos, false, []); - expect(decodev4responseStub.callCount).to.eq(3); + expect(decodeV4responseStub.callCount).to.eq(3); }); it('should not retry more than 3 sendOnionRequestHandlingSnodeEjectStub ', async () => { @@ -362,10 +366,10 @@ describe('MessageSender', () => { Sinon.stub(Onions, 'sendOnionRequestHandlingSnodeEjectNoRetries').resolves({} as any); Sinon.stub(OnionSending, 'getMinTimeoutForSogs').returns(5); - const decodev4responseStub = Sinon.stub(OnionV4, 'decodeV4Response'); - decodev4responseStub.throws('whate'); + const decodeV4responseStub = Sinon.stub(OnionV4, 'decodeV4Response'); + decodeV4responseStub.throws('whatever'); - decodev4responseStub.onCall(4).returns({ + decodeV4responseStub.onCall(4).returns({ metadata: { code: 200 }, body: {}, bodyBinary: new Uint8Array(), @@ -375,7 +379,7 @@ describe('MessageSender', () => { await MessageSender.sendToOpenGroupV2(message, roomInfos, false, []); } catch (e) {} // we made the fourth call success, but we should not get there. We should stop at 3 the retries (1+2) - expect(decodev4responseStub.calledThrice); + expect(decodeV4responseStub.calledThrice); }); }); }); diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index f0fa9b8537..e8cf89f9c9 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -141,10 +141,13 @@ describe('GroupSyncJob resultsToSuccessfulChange', () => { ).to.be.deep.eq([]); expect( - LibSessionUtil.batchResultsToGroupSuccessfulChange([] as unknown as NotEmptyArrayOfBatchResults, { - allOldHashes: new Set(), - messages: [], - }) + LibSessionUtil.batchResultsToGroupSuccessfulChange( + [] as unknown as NotEmptyArrayOfBatchResults, + { + allOldHashes: new Set(), + messages: [], + } + ) ).to.be.deep.eq([]); }); From 9a627e719d518178afcc503ca7aae8e1cdd0ab96 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 5 Dec 2024 16:35:58 +1100 Subject: [PATCH 206/302] fix: envelope for all groups message is CLOSED_GROUP --- ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts index 89b6538f3e..592cbb3365 100644 --- a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts +++ b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts @@ -40,7 +40,7 @@ async function makeGroupMessageSubRequest( const messagesToEncrypt: Array = compactedMessages.map(updateMessage => { const wrapped = MessageWrapper.wrapContentIntoEnvelope( - SignalService.Envelope.Type.SESSION_MESSAGE, + SignalService.Envelope.Type.CLOSED_GROUP_MESSAGE, undefined, updateMessage.createAtNetworkTimestamp, // message is signed with this timestamp updateMessage.plainTextBuffer() From 3b18d6a165d81295b0cd721dfcb2d8fa3ba291fc Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 6 Dec 2024 09:02:38 +1100 Subject: [PATCH 207/302] chore: workflow: do not fail-fast --- .github/workflows/build-binaries.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index 507e011783..53e5c4afe7 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -31,6 +31,7 @@ jobs: build_linux: runs-on: ubuntu-20.04 strategy: + fail-fast: false matrix: # this needs to be a valid target of https://www.electron.build/linux#target pkg_to_build: ['deb', 'rpm', 'freebsd', 'AppImage'] From bc62b0ec40ba26b97057182e3609f0b3d60fc772 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 9 Dec 2024 13:47:33 +1100 Subject: [PATCH 208/302] fix: show invite failed toast even if the first part of update failed --- ts/state/ducks/metaGroups.ts | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 7df015dda8..abbfdd2440 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -660,6 +660,16 @@ async function handleMemberAddedFromUI({ updateMessagesToPush, group ); + // schedule send invite details, auth signature, etc. to the new users + // those will fail is the pushChangesToGroupSwarmIfNeeded fails, but we still want + // to display the toasts message saying they failed + await scheduleGroupInviteJobs( + groupPk, + withHistory, + withoutHistory, + window.sessionFeatureFlags.useGroupV2InviteAsAdmin + ); + await LibSessionUtil.saveDumpsToDb(groupPk); // push new members & key supplement in a single batch call const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ @@ -669,21 +679,14 @@ async function handleMemberAddedFromUI({ unrevokeSubRequest, extraStoreRequests, }); + await LibSessionUtil.saveDumpsToDb(groupPk); + if (sequenceResult !== RunJobResult.Success) { throw new Error( 'handleMemberAddedFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' ); } - // schedule send invite details, auth signature, etc. to the new users - await scheduleGroupInviteJobs( - groupPk, - withHistory, - withoutHistory, - window.sessionFeatureFlags.useGroupV2InviteAsAdmin - ); - await LibSessionUtil.saveDumpsToDb(groupPk); - convo.set({ active_at: createAtNetworkTimestamp, }); From 8d3ed1a2b78923f428e356619cd80d3bf4ffca62 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 9 Dec 2024 16:53:43 +1100 Subject: [PATCH 209/302] Revert "fix: show invite failed toast even if the first part of update failed" This reverts commit bc62b0ec40ba26b97057182e3609f0b3d60fc772. --- ts/state/ducks/metaGroups.ts | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index abbfdd2440..7df015dda8 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -660,16 +660,6 @@ async function handleMemberAddedFromUI({ updateMessagesToPush, group ); - // schedule send invite details, auth signature, etc. to the new users - // those will fail is the pushChangesToGroupSwarmIfNeeded fails, but we still want - // to display the toasts message saying they failed - await scheduleGroupInviteJobs( - groupPk, - withHistory, - withoutHistory, - window.sessionFeatureFlags.useGroupV2InviteAsAdmin - ); - await LibSessionUtil.saveDumpsToDb(groupPk); // push new members & key supplement in a single batch call const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ @@ -679,14 +669,21 @@ async function handleMemberAddedFromUI({ unrevokeSubRequest, extraStoreRequests, }); - await LibSessionUtil.saveDumpsToDb(groupPk); - if (sequenceResult !== RunJobResult.Success) { throw new Error( 'handleMemberAddedFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' ); } + // schedule send invite details, auth signature, etc. to the new users + await scheduleGroupInviteJobs( + groupPk, + withHistory, + withoutHistory, + window.sessionFeatureFlags.useGroupV2InviteAsAdmin + ); + await LibSessionUtil.saveDumpsToDb(groupPk); + convo.set({ active_at: createAtNetworkTimestamp, }); From fa98d0397a7b9c91144cfda3a63e7b2ab3212f51 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 9 Dec 2024 17:01:39 +1100 Subject: [PATCH 210/302] fix: make sure joined_at is in seconds before saving --- ts/receiver/configMessage.ts | 1 - ts/receiver/groupv2/handleGroupV2Message.ts | 2 +- ts/session/apis/snode_api/swarmPolling.ts | 11 +++++++---- .../libsession_wrapper_user_groups_test.ts | 17 ++++++++++++++++- .../group_sync_job/GroupSyncJob_test.ts | 2 +- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 6e300ff29f..28894ec185 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -789,7 +789,6 @@ async function handleGroupUpdate(latestEnvelopeTimestamp: number) { for (let index = 0; index < allGroupsInWrapper.length; index++) { const groupInWrapper = allGroupsInWrapper[index]; window.inboxStore?.dispatch(groupInfoActions.handleUserGroupUpdate(groupInWrapper) as any); - await handleSingleGroupUpdate({ groupInWrapper, latestEnvelopeTimestamp, userEdKeypair }); } diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 645687f708..80b12b3f7d 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -68,7 +68,7 @@ async function getInitializedGroupObject({ if (!found) { found = { authData: null, - joinedAtSeconds: Date.now(), + joinedAtSeconds: Math.floor(Date.now()/ 1000), name: groupName, priority: 0, pubkeyHex: groupPk, diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index a5ea2ba034..7518a2f1f1 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -462,6 +462,7 @@ export class SwarmPolling { ); // We always handle the config messages first (for groups 03 or our own messages) await this.handleUserOrGroupConfMessages({ confMessages, pubkey, type }); + await this.handleRevokedMessages({ revokedMessages, groupPk: pubkey, type }); // Merge results into one list of unique messages @@ -716,15 +717,17 @@ export class SwarmPolling { } private async handleSeenMessages( - messages: Array - ): Promise> { + messages: Array + ): Promise> { if (!messages.length) { return []; } - const incomingHashes = messages.map((m: RetrieveMessageItem) => m.hash); + const incomingHashes = messages.map((m: RetrieveMessageItemWithNamespace) => m.hash); const dupHashes = await Data.getSeenMessagesByHashList(incomingHashes); - const newMessages = messages.filter((m: RetrieveMessageItem) => !dupHashes.includes(m.hash)); + const newMessages = messages.filter( + (m: RetrieveMessageItemWithNamespace) => !dupHashes.includes(m.hash) + ); return newMessages; } diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts index b917742fdb..b0537c8d84 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { LegacyGroupInfo } from 'libsession_util_nodejs'; +import { LegacyGroupInfo, UserGroupsWrapperNode } from 'libsession_util_nodejs'; import { describe } from 'mocha'; import Sinon from 'sinon'; import { ConversationModel } from '../../../../models/conversation'; @@ -223,6 +223,21 @@ describe('libsession_user_groups', () => { 'joinedAtSeconds in the wrapper should match the inputted group' ).to.equal(group.get('lastJoinedTimestamp')); }); + + it('throws when joined_at is too far in the future', async () => { + const us = await TestUtils.generateUserKeyPairs(); + + const groupWrapper = new UserGroupsWrapperNode(us.ed25519KeyPair.privKeyBytes, null); + + const group = groupWrapper.createGroup(); + group.joinedAtSeconds = 4099680000 - 1; // 4099680000 is 1st january 2100 GMT + groupWrapper.setGroup(group); // shouldn't throw + group.joinedAtSeconds = 4099680000 + 1; // 4099680000 is 1st january 2100 GMT + expect(() => { + groupWrapper.setGroup(group); + }).to.throw(); + }); + it('if disappearing messages is on then the wrapper returned values should match the inputted group', async () => { const group = new ConversationModel({ ...validArgs, diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index e8cf89f9c9..b0e671c659 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -57,7 +57,7 @@ function validUserGroup03WithSecKey(pubkey?: GroupPubkeyType) { secretKey: new Uint8Array(30), destroyed: false, invitePending: false, - joinedAtSeconds: Date.now(), + joinedAtSeconds: Math.floor(Date.now()/1000), kicked: false, priority: 0, pubkeyHex: pubkey || TestUtils.generateFakeClosedGroupV2PkStr(), From fa8de2eee506ade12d38592535c1387d64e6de3f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 9 Dec 2024 17:02:40 +1100 Subject: [PATCH 211/302] fix: do not use 'anonymous' placeholder. We use the shorten pk --- ts/components/conversation/ContactName.tsx | 3 ++- .../conversation/composition/CompositionBox.tsx | 6 +++--- ts/models/conversation.ts | 9 ++------- ts/state/selectors/messages.ts | 8 ++++++-- ts/state/selectors/selectedConversation.ts | 3 --- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/ts/components/conversation/ContactName.tsx b/ts/components/conversation/ContactName.tsx index 261b4715ea..4ac500ed32 100644 --- a/ts/components/conversation/ContactName.tsx +++ b/ts/components/conversation/ContactName.tsx @@ -6,6 +6,7 @@ import { useNicknameOrProfileNameOrShortenedPubkey, } from '../../hooks/useParamSelector'; import { Emojify } from './Emojify'; +import { PubKey } from '../../session/types'; type Props = { pubkey: string; @@ -41,7 +42,7 @@ export const ContactName = (props: Props) => { } : commonStyles ) as CSSProperties; - const textProfile = profileName || name || convoName || window.i18n('anonymous'); + const textProfile = profileName || name || convoName || PubKey.shorten(pubkey); return ( { const allMembers = allPubKeys.map(pubKey => { const convo = ConvoHub.use().get(pubKey); - const profileName = - convo?.getNicknameOrRealUsernameOrPlaceholder() || window.i18n('anonymous'); + const profileName = convo?.getNicknameOrRealUsernameOrPlaceholder() || PubKey.shorten(pubKey); return { id: pubKey, @@ -539,7 +539,7 @@ class CompositionBoxInner extends Component { // Transform the users to what react-mentions expects const mentionsData = members.map(user => ({ - display: user.authorProfileName || window.i18n('anonymous'), + display: user.authorProfileName || PubKey.shorten(user.id), id: user.id, })); callback(mentionsData); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 83d37a84e6..3f53774c53 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1423,11 +1423,6 @@ export class ConversationModel extends Backbone.Model { return this.getNickname() || this.getRealSessionUsername(); } - /** - * @returns `getNickname` if a private convo and a nickname is set, or `getRealSessionUsername` - * - * Can also a localized 'Anonymous' for an unknown private chat and localized 'Unknown' for an unknown group (open/closed) - */ public getNicknameOrRealUsernameOrPlaceholder(): string { const nickOrReal = this.getNickname() || this.getRealSessionUsername(); @@ -1435,7 +1430,7 @@ export class ConversationModel extends Backbone.Model { return nickOrReal; } if (this.isPrivate()) { - return window.i18n('anonymous'); + return PubKey.shorten(this.id); } if (this.isPublic()) { return window.i18n('communityUnknown'); @@ -1981,7 +1976,7 @@ export class ConversationModel extends Backbone.Model { iconUrl, isExpiringMessage: false, message: window.i18n('callsIncoming', { - name: this.getNicknameOrRealUsername() || window.i18n('anonymous'), + name: this.getNicknameOrRealUsername() || PubKey.shorten(conversationId), }), messageSentAt: now, title: this.getNicknameOrRealUsernameOrPlaceholder(), diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index 6fada5564d..6e7637d289 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -11,6 +11,7 @@ import { StateType } from '../reducer'; import { getIsMessageSelected, getMessagePropsByMessageId } from './conversations'; import { useSelectedIsPrivate } from './selectedConversation'; import { LastMessageStatusType } from '../ducks/types'; +import { PubKey } from '../../session/types'; function useMessagePropsByMessageId(messageId: string | undefined) { return useSelector((state: StateType) => getMessagePropsByMessageId(state, messageId)); @@ -34,12 +35,15 @@ export const useAuthorProfileName = (messageId: string): string | null => { if (!msg || !senderProps) { return null; } + const { sender } = msg.propsForMessage; - const senderIsUs = msg.propsForMessage.sender === UserUtils.getOurPubKeyStrFromCache(); + const senderIsUs = sender === UserUtils.getOurPubKeyStrFromCache(); const authorProfileName = senderIsUs ? window.i18n('you') - : senderProps.nickname || senderProps.displayNameInProfile || window.i18n('anonymous'); + : senderProps.nickname || + senderProps.displayNameInProfile || + PubKey.shorten(sender); return authorProfileName || window.i18n('unknown'); }; diff --git a/ts/state/selectors/selectedConversation.ts b/ts/state/selectors/selectedConversation.ts index 3d52e8ed61..f6178c64dd 100644 --- a/ts/state/selectors/selectedConversation.ts +++ b/ts/state/selectors/selectedConversation.ts @@ -374,9 +374,6 @@ export function useSelectedShortenedPubkeyOrFallback() { if (isPrivate && selected) { return PubKey.shorten(selected); } - if (isPrivate) { - return window.i18n('anonymous'); - } return window.i18n('unknown'); } From 5c610824a145fae1eb7086314fa1bcdbf61c0f63 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 9 Dec 2024 17:17:29 +1100 Subject: [PATCH 212/302] chore: add lucide license --- README.md | 2 ++ third_party_licenses/LucideLicense.txt | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 third_party_licenses/LucideLicense.txt diff --git a/README.md b/README.md index 34dd4fa681..9c85f87f6b 100644 --- a/README.md +++ b/README.md @@ -67,3 +67,5 @@ Licensed under the GPLv3: https://www.gnu.org/licenses/gpl-3.0.html
## Attributions The IP-to-country mapping data used in this project is provided by [MaxMind GeoLite2](https://dev.maxmind.com/geoip/geolite2-free-geolocation-data). + +This project uses the [Lucide Icon Font](https://lucide.dev/), which is licensed under the [ISC License](./third_party_licenses/LucideLicense.txt). diff --git a/third_party_licenses/LucideLicense.txt b/third_party_licenses/LucideLicense.txt new file mode 100644 index 0000000000..42d5851df4 --- /dev/null +++ b/third_party_licenses/LucideLicense.txt @@ -0,0 +1,7 @@ +ISC License + +Copyright (c) for portions of Lucide are held by Cole Bemis 2013-2022 as part of Feather (MIT). All other copyright (c) for Lucide are held by Lucide Contributors 2022. + +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. \ No newline at end of file From d8bc48938bad57ca4cacae7ecc2a1aee6ed1c68a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 10 Dec 2024 16:30:43 +1100 Subject: [PATCH 213/302] fix: show deleted message when outgoing too --- stylesheets/_session.scss | 4 ++++ stylesheets/_session_theme.scss | 3 --- .../message/message-content/MessageText.tsx | 9 ++++++++- .../conversation/message/message-item/Message.tsx | 11 ----------- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index 45374127ae..fb8ef5f3b7 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -342,4 +342,8 @@ input { .module-message__text { white-space: pre-wrap; + + svg { + margin-right: var(--margins-xs); + } } diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss index 7ae9f678f2..9c6cf8c140 100644 --- a/stylesheets/_session_theme.scss +++ b/stylesheets/_session_theme.scss @@ -65,9 +65,6 @@ flex-direction: row; align-items: center; - svg { - margin-right: var(--margins-xs); - } a { text-decoration: underline; diff --git a/ts/components/conversation/message/message-content/MessageText.tsx b/ts/components/conversation/message/message-content/MessageText.tsx index 4eaf838577..40866b57f5 100644 --- a/ts/components/conversation/message/message-content/MessageText.tsx +++ b/ts/components/conversation/message/message-content/MessageText.tsx @@ -10,6 +10,7 @@ import { } from '../../../../state/selectors/conversations'; import { SessionIcon } from '../../../icon'; import { MessageBody } from './MessageBody'; +import { useMessageDirection } from '../../../../state/selectors'; type Props = { messageId: string; @@ -23,6 +24,7 @@ export type MessageTextSelectorProps = Pick< export const MessageText = (props: Props) => { const selected = useSelector((state: StateType) => getMessageTextProps(state, props.messageId)); const multiSelectMode = useSelector(isMessageSelectionMode); + const direction = useMessageDirection(props.messageId); if (!selected) { return null; @@ -35,9 +37,14 @@ export const MessageText = (props: Props) => { return null; } + const iconColor = + direction === 'incoming' + ? 'var(--message-bubbles-received-text-color)' + : 'var(--message-bubbles-sent-text-color)'; + return (
- {isDeleted && } + {isDeleted && } { - const msgProps = useSelector((state: StateType) => - getGenericReadableMessageSelectorProps(state, props.messageId) - ); - const ctxMenuID = `ctx-menu-message-${uuidv4()}`; - if (msgProps?.isDeleted && msgProps.direction === 'outgoing') { - return null; - } - return ; }; From b1b557581b9aa23cc7a11345434e39b3be6e7687 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 10 Dec 2024 16:32:34 +1100 Subject: [PATCH 214/302] feat: move back conversation request buttons to the bottom because we can --- .../conversation/MessageRequestButtons.tsx | 4 +--- .../conversation/SessionConversation.tsx | 7 +++++-- .../conversation/SubtleNotification.tsx | 10 ++++++++- .../conversations/unsendingInteractions.ts | 21 ++++++++++++------- ts/models/message.ts | 2 +- ts/receiver/groupv2/handleGroupV2Message.ts | 19 ++++++++--------- ts/session/types/with.ts | 2 ++ ts/state/selectors/messages.ts | 6 ++---- 8 files changed, 43 insertions(+), 28 deletions(-) diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index ea0afae94b..32bc31767c 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -15,13 +15,12 @@ import { SessionButton, SessionButtonColor } from '../basic/SessionButton'; import { ConversationIncomingRequestExplanation, ConversationOutgoingRequestExplanation, - InvitedToGroupControlMessage, } from './SubtleNotification'; import { NetworkTime } from '../../util/NetworkTime'; const MessageRequestContainer = styled.div` display: flex; - flex-direction: column; + flex-direction: column-reverse; justify-content: center; padding: var(--margins-lg); gap: var(--margins-lg); @@ -98,7 +97,6 @@ export const ConversationMessageRequestButtons = () => { return ( - { diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index 6ca1d35b6b..3ad79d45cd 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -58,7 +58,7 @@ import { ConversationMessageRequestButtons } from './MessageRequestButtons'; import { RightPanel, StyledRightPanelContainer } from './right-panel/RightPanel'; import { HTMLDirection } from '../../util/i18n/rtlSupport'; import { showLinkVisitWarningDialog } from '../dialog/OpenUrlModal'; -import { NoMessageInConversation } from './SubtleNotification'; +import { InvitedToGroup, NoMessageInConversation } from './SubtleNotification'; const DEFAULT_JPEG_QUALITY = 0.85; @@ -265,7 +265,8 @@ export class SessionConversation extends Component { >
- + + } bottom={ @@ -276,6 +277,8 @@ export class SessionConversation extends Component { } disableTop={!this.props.hasOngoingCallWithFocusedConvo} /> + + {isDraggingFile && }
diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index ab9657e370..f0838aff76 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -155,7 +155,7 @@ const GroupRequestExplanation = () => { ); }; -export const InvitedToGroupControlMessage = () => { +const InvitedToGroupControlMessage = () => { const selectedConversation = useSelectedConversationKey(); const isGroupV2 = useSelectedIsGroupV2(); const hasMessages = useSelectedHasMessages(); @@ -202,6 +202,14 @@ export const InvitedToGroupControlMessage = () => { ); }; +export const InvitedToGroup = () => { + return ( + + + + ); +}; + export const NoMessageInConversation = () => { const selectedConversation = useSelectedConversationKey(); const hasMessages = useSelectedHasMessages(); diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index d400bec5d5..3e8df466cf 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -21,6 +21,7 @@ import { ed25519Str } from '../../session/utils/String'; import { UserGroupsWrapperActions } from '../../webworker/workers/browser/libsession_worker_interface'; import { NetworkTime } from '../../util/NetworkTime'; import { MessageQueue } from '../../session/sending'; +import { WithLocalMessageDeletionType } from '../../session/types/with'; async function unsendMessagesForEveryone1o1AndLegacy( conversation: ConversationModel, @@ -103,7 +104,8 @@ export async function unsendMessagesForEveryoneGroupV2({ */ async function unsendMessagesForEveryone( conversation: ConversationModel, - msgsToDelete: Array + msgsToDelete: Array, + { deletionType }: WithLocalMessageDeletionType ) { window?.log?.info('Deleting messages for all users in this conversation'); const destinationId = conversation.id as string; @@ -134,7 +136,11 @@ async function unsendMessagesForEveryone( allMessagesFrom: [], // currently we cannot remove all the messages from a specific pubkey but we do already handle them on the receiving side }); } - await deleteMessagesFromSwarmAndCompletelyLocally(conversation, msgsToDelete); + if (deletionType === 'complete') { + await deleteMessagesFromSwarmAndCompletelyLocally(conversation, msgsToDelete); + } else { + await deleteMessagesFromSwarmAndMarkAsDeletedLocally(conversation, msgsToDelete); + } window.inboxStore?.dispatch(resetSelectedMessageIds()); ToastUtils.pushDeleted(msgsToDelete.length); @@ -311,10 +317,9 @@ export async function deleteMessageLocallyOnly({ conversation, message, deletionType, -}: { +}: WithLocalMessageDeletionType & { conversation: ConversationModel; message: MessageModel; - deletionType: 'complete' | 'markDeleted'; }) { if (deletionType === 'complete') { // remove the message from the database @@ -446,7 +451,9 @@ const doDeleteSelectedMessages = async ({ } } // if they are all ours, of not but we are an admin, we can move forward - await unsendMessagesForEveryone(conversation, selectedMessages); + await unsendMessagesForEveryone(conversation, selectedMessages, { + deletionType: 'markDeleted', // 03 groups: mark as deleted + }); return; } @@ -455,13 +462,13 @@ const doDeleteSelectedMessages = async ({ window.inboxStore?.dispatch(resetSelectedMessageIds()); return; } - await unsendMessagesForEveryone(conversation, selectedMessages); + await unsendMessagesForEveryone(conversation, selectedMessages, { deletionType: 'complete' }); // not 03 group: delete completely return; } // delete just for me in a legacy closed group only means delete locally if (conversation.isClosedGroup()) { - await deleteMessagesFromSwarmAndCompletelyLocally(conversation, selectedMessages); + await deleteMessagesFromSwarmAndMarkAsDeletedLocally(conversation, selectedMessages); // Update view and trigger update window.inboxStore?.dispatch(resetSelectedMessageIds()); diff --git a/ts/models/message.ts b/ts/models/message.ts index 24ab54df91..0beff6b158 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -752,7 +752,7 @@ export class MessageModel extends Backbone.Model { props.text = body; } if (this.get('isDeleted')) { - props.isDeleted = this.get('isDeleted'); + props.isDeleted = !!this.get('isDeleted'); } if (this.getMessageHash()) { diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 80b12b3f7d..552cd0a529 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -68,7 +68,7 @@ async function getInitializedGroupObject({ if (!found) { found = { authData: null, - joinedAtSeconds: Math.floor(Date.now()/ 1000), + joinedAtSeconds: Math.floor(Date.now() / 1000), name: groupName, priority: 0, pubkeyHex: groupPk, @@ -410,7 +410,7 @@ async function handleGroupUpdateMemberLeftNotificationMessage({ }); } -async function handleGroupDeleteMemberContentMessage({ +async function handleGroupUpdateDeleteMemberContentMessage({ groupPk, signatureTimestamp, change, @@ -420,7 +420,7 @@ async function handleGroupDeleteMemberContentMessage({ if (!convo) { return; } - window.log.info(`handleGroupDeleteMemberContentMessage for ${ed25519Str(groupPk)}`); + window.log.info(`handleGroupUpdateDeleteMemberContentMessage for ${ed25519Str(groupPk)}`); /** * When handling a GroupUpdateDeleteMemberContentMessage we need to do a few things. @@ -428,10 +428,8 @@ async function handleGroupDeleteMemberContentMessage({ * 1. we only delete the messageHashes which are in the change.messageHashes AND sent by that same author. * When `adminSignature` is not empty and valid, * 2. we delete all the messages in the group sent by any of change.memberSessionIds AND - * 3. we delete all the messageHashes in the conversation matching the change.messageHashes (even if not from the right sender) + * 3. we mark as deleted all the messageHashes in the conversation matching the change.messageHashes (even if not from the right sender) * - * Note: we never fully delete those messages locally, but only empty them and mark them as deleted with the - * "This message was deleted" placeholder. * Eventually, we will be able to delete those "deleted by kept locally" messages with placeholders. */ @@ -445,8 +443,8 @@ async function handleGroupDeleteMemberContentMessage({ signatureTimestamp, }); - // we don't want to hang while for too long here - // processing the handleGroupDeleteMemberContentMessage itself + // we don't want to hang for too long here + // processing the handleGroupUpdateDeleteMemberContentMessage itself // (we are running on the receiving pipeline here) // so network calls are not allowed. for (let index = 0; index < messageModels.length; index++) { @@ -456,7 +454,7 @@ async function handleGroupDeleteMemberContentMessage({ await messageModel.markAsDeleted(); } catch (e) { window.log.warn( - `handleGroupDeleteMemberContentMessage markAsDeleted non-admin of ${messageModel.getMessageHash()} failed with`, + `handleGroupUpdateDeleteMemberContentMessage markAsDeleted non-admin of ${messageModel.getMessageHash()} failed with`, e.message ); } @@ -488,6 +486,7 @@ async function handleGroupDeleteMemberContentMessage({ toRemove, signatureTimestamp, }); // this is step 2. + const modelsByHashes = await Data.findAllMessageHashesInConversation({ groupPk, messageHashes: change.messageHashes, @@ -731,7 +730,7 @@ async function handleGroupUpdateMessage( return; } if (details.updateMessage.deleteMemberContent) { - await handleGroupDeleteMemberContentMessage({ + await handleGroupUpdateDeleteMemberContentMessage({ change: details.updateMessage .deleteMemberContent as SignalService.GroupUpdateDeleteMemberContentMessage, ...detailsWithContext, diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index a3885b53a3..401c15a38e 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -20,3 +20,5 @@ export type WithBatchMethod = { method: T }; export type WithConvoId = { conversationId: string }; export type WithMessageId = { messageId: string }; + +export type WithLocalMessageDeletionType = { deletionType: 'complete' | 'markDeleted' }; diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index 6e7637d289..ed22b1875c 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -41,9 +41,7 @@ export const useAuthorProfileName = (messageId: string): string | null => { const authorProfileName = senderIsUs ? window.i18n('you') - : senderProps.nickname || - senderProps.displayNameInProfile || - PubKey.shorten(sender); + : senderProps.nickname || senderProps.displayNameInProfile || PubKey.shorten(sender); return authorProfileName || window.i18n('unknown'); }; @@ -70,7 +68,7 @@ export const useAuthorAvatarPath = (messageId: string): string | null => { export const useMessageIsDeleted = (messageId: string): boolean => { const props = useMessagePropsByMessageId(messageId); - return props?.propsForMessage.isDeleted || false; + return !!props?.propsForMessage.isDeleted || false; }; export const useFirstMessageOfSeries = (messageId: string | undefined): boolean => { From 605683c5b25c5ef38f026239f2907b6872953ea0 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 10 Dec 2024 16:33:10 +1100 Subject: [PATCH 215/302] fix: rollback change that breaks oceandark button border --- ts/themes/oceanDark.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/themes/oceanDark.ts b/ts/themes/oceanDark.ts index f9160c43c0..f76e8bd3de 100644 --- a/ts/themes/oceanDark.ts +++ b/ts/themes/oceanDark.ts @@ -51,7 +51,7 @@ export const oceanDark: ThemeColorVariables = { '--button-outline-border-hover-color': 'var(--text-primary-color)', '--button-outline-disabled-color': 'var(--disabled-color)', - '--button-solid-background-color': THEMES.OCEAN_DARK.COLOR1, + '--button-solid-background-color': 'var(--background-secondary-color)', '--button-solid-background-hover-color': THEMES.OCEAN_DARK.COLOR4, '--button-solid-text-color': 'var(--text-primary-color)', '--button-solid-text-hover-color': 'var(--text-primary-color)', From 30064e5740e565bff8fd294189f9fc6bad0deb96 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 10 Dec 2024 16:47:44 +1100 Subject: [PATCH 216/302] fix: show toast in the about window --- ts/components/AboutView.tsx | 4 ---- ts/components/basic/SessionToast.tsx | 19 +++---------------- .../buttons/CopyToClipboardButton.tsx | 15 ++++++--------- ts/hooks/useParamSelector.ts | 13 ------------- 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/ts/components/AboutView.tsx b/ts/components/AboutView.tsx index 58ae1ec989..a42e8b5d53 100644 --- a/ts/components/AboutView.tsx +++ b/ts/components/AboutView.tsx @@ -95,26 +95,22 @@ export const AboutView = () => { className="version" text={versionInfo} buttonType={SessionButtonType.Simple} - showToast={false} /> {environmentStates.length ? ( ) : null} https://getsession.org diff --git a/ts/components/basic/SessionToast.tsx b/ts/components/basic/SessionToast.tsx index aed2bf3df1..d90475c7fd 100644 --- a/ts/components/basic/SessionToast.tsx +++ b/ts/components/basic/SessionToast.tsx @@ -1,10 +1,9 @@ -import { clone, noop } from 'lodash'; +import { noop } from 'lodash'; import styled from 'styled-components'; import { Flex } from './Flex'; -import { useConversationsUsernameWithQuoteOrShortPk } from '../../hooks/useParamSelector'; import { SessionIcon, SessionIconType } from '../icon'; import { SessionHtmlRenderer } from './SessionHTMLRenderer'; @@ -39,25 +38,13 @@ const IconDiv = styled.div` margin: 0 var(--margins-sm) 0 var(--margins-xs); `; -function useReplacePkInTextWithNames(description: string) { - const pubkeysToLookup = [...description.matchAll(/0[3,5][0-9a-fA-F]{64}/g)]; - const memberNames = useConversationsUsernameWithQuoteOrShortPk(pubkeysToLookup.map(m => m[0])); - let replacedWithNames = clone(description); - for (let index = 0; index < memberNames.length; index++) { - const name = memberNames[index]; - const pk = pubkeysToLookup[index][0]; - replacedWithNames = replacedWithNames.replace(pk, name); - } - - return replacedWithNames; -} function DescriptionPubkeysReplaced({ description }: { description: string }) { - const replacedWithNames = useReplacePkInTextWithNames(description); + // const replacedWithNames = useReplacePkInTextWithNames(description); return ( - + ); } diff --git a/ts/components/buttons/CopyToClipboardButton.tsx b/ts/components/buttons/CopyToClipboardButton.tsx index a9a308395e..113251cca9 100644 --- a/ts/components/buttons/CopyToClipboardButton.tsx +++ b/ts/components/buttons/CopyToClipboardButton.tsx @@ -11,13 +11,12 @@ type CopyProps = { copyContent?: string; onCopyComplete?: (copiedValue: string | undefined) => void; hotkey?: boolean; - showToast?: boolean; }; type CopyToClipboardButtonProps = Omit & CopyProps; export const CopyToClipboardButton = (props: CopyToClipboardButtonProps) => { - const { copyContent, onCopyComplete, hotkey = false, text, showToast = true } = props; + const { copyContent, onCopyComplete, hotkey = false, text } = props; const [copied, setCopied] = useState(false); const onClick = () => { @@ -28,9 +27,8 @@ export const CopyToClipboardButton = (props: CopyToClipboardButtonProps) => { } clipboard.writeText(toCopy); - if (showToast) { - ToastUtils.pushCopiedToClipBoard(); - } + ToastUtils.pushCopiedToClipBoard(); + setCopied(true); if (onCopyComplete) { onCopyComplete(text); @@ -56,13 +54,12 @@ type CopyToClipboardIconProps = Omit { - const { copyContent, onCopyComplete, hotkey = false, showToast = true } = props; + const { copyContent, onCopyComplete, hotkey = false } = props; const onClick = () => { clipboard.writeText(copyContent); - if (showToast) { - ToastUtils.pushCopiedToClipBoard(); - } + ToastUtils.pushCopiedToClipBoard(); + if (onCopyComplete) { onCopyComplete(copyContent); } diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index a4003f0c6f..60224f12bc 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -115,19 +115,6 @@ export function useConversationsUsernameWithQuoteOrFullPubkey(pubkeys: Array) { - return useSelector((state: StateType) => { - return pubkeys.map(pubkey => { - const nameGot = usernameForQuoteOrFullPk(pubkey, state); - - return nameGot?.length ? nameGot : PubKey.shorten(pubkey); - }); - }); -} - export function useConversationsNicknameRealNameOrShortenPubkey(pubkeys: Array) { return useSelector((state: StateType) => { return pubkeys.map(pk => { From c72b9540b47f6eebdca8f5c3d13b975ec71d1ce9 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 10 Dec 2024 16:59:06 +1100 Subject: [PATCH 217/302] fix: use 'delete group' string in right overlay when kicked --- .../right-panel/overlay/OverlayRightPanelSettings.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 0e40c0a044..828e27eeb5 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -275,9 +275,7 @@ export const OverlayRightPanelSettings = () => { lastMessage?.interactionStatus === ConversationInteractionStatus.Error ? window.i18n('conversationsDelete') : isKickedFromGroup - ? window.i18n('groupRemovedYou', { - group_name: selectedUsername || window.i18n('groupUnknown'), - }) + ? window.i18n('groupDelete') : window.i18n('groupLeave'); const showUpdateGroupNameButton = isGroup && weAreAdmin && !commonNoShow; // legacy groups non-admin cannot change groupname anymore From 8b6ca72053aa76c005ca5c71238a980d54cd1413 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 11 Dec 2024 09:36:24 +1100 Subject: [PATCH 218/302] chore: address PR comments --- stylesheets/_session.scss | 2 +- ts/components/basic/SessionToast.tsx | 1 - ts/state/selectors/messages.ts | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index fb8ef5f3b7..96430acba7 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -344,6 +344,6 @@ input { white-space: pre-wrap; svg { - margin-right: var(--margins-xs); + margin-inline-end: var(--margins-xs); } } diff --git a/ts/components/basic/SessionToast.tsx b/ts/components/basic/SessionToast.tsx index d90475c7fd..4435a01a32 100644 --- a/ts/components/basic/SessionToast.tsx +++ b/ts/components/basic/SessionToast.tsx @@ -41,7 +41,6 @@ const IconDiv = styled.div` function DescriptionPubkeysReplaced({ description }: { description: string }) { - // const replacedWithNames = useReplacePkInTextWithNames(description); return ( diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index ed22b1875c..92d1221f49 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -1,6 +1,5 @@ import { useSelector } from 'react-redux'; import { MessageModelType } from '../../models/messageType'; -import { UserUtils } from '../../session/utils'; import { MessageModelPropsWithConvoProps, PropsForAttachment, @@ -12,6 +11,7 @@ import { getIsMessageSelected, getMessagePropsByMessageId } from './conversation import { useSelectedIsPrivate } from './selectedConversation'; import { LastMessageStatusType } from '../ducks/types'; import { PubKey } from '../../session/types'; +import { useIsMe } from '../../hooks/useParamSelector'; function useMessagePropsByMessageId(messageId: string | undefined) { return useSelector((state: StateType) => getMessagePropsByMessageId(state, messageId)); @@ -32,16 +32,16 @@ const useSenderConvoProps = ( export const useAuthorProfileName = (messageId: string): string | null => { const msg = useMessagePropsByMessageId(messageId); const senderProps = useSenderConvoProps(msg); + const senderIsUs = useIsMe(msg?.propsForMessage?.sender); if (!msg || !senderProps) { return null; } - const { sender } = msg.propsForMessage; - - const senderIsUs = sender === UserUtils.getOurPubKeyStrFromCache(); const authorProfileName = senderIsUs ? window.i18n('you') - : senderProps.nickname || senderProps.displayNameInProfile || PubKey.shorten(sender); + : senderProps.nickname || + senderProps.displayNameInProfile || + PubKey.shorten(msg.propsForMessage.sender); return authorProfileName || window.i18n('unknown'); }; From 1957b3ece383ea761c8c5be5ff91762666326c33 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 11 Dec 2024 16:32:24 +1100 Subject: [PATCH 219/302] fix: do not remove link previews as part of the "clear all attachments" --- ts/interactions/conversationInteractions.ts | 27 +++---------------- ts/node/sql.ts | 6 ++--- .../factories/StoreGroupRequestFactory.ts | 8 +++--- .../conversations/ConversationController.ts | 2 +- 4 files changed, 11 insertions(+), 32 deletions(-) diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index e7e4ea6be7..1d16757b03 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -510,30 +510,9 @@ export async function showLeaveGroupByConvoId(conversationId: string, name: stri conversationId, }) ); - // TODO this is post release chunk3 stuff: Only to be used after the closed group rebuild chunk3 - // const onClickOkLastAdmin = () => { - // /* TODO */ - // }; - // const onClickCloseLastAdmin = () => { - // /* TODO */ - // }; - // window?.inboxStore?.dispatch( - // updateConfirmModal({ - // title: window.i18n('groupLeave'), - // message: window.i18n('leaveGroupConfirmationOnlyAdmin', {name: name ?? ''}), - // messageSub: window.i18n('leaveGroupConfirmationOnlyAdminWarning'), - // onClickOk: onClickOkLastAdmin, - // okText: window.i18n('addModerator'), - // cancelText: window.i18n('leave'), - // onClickCancel: onClickCloseLastAdmin, - // closeTheme: SessionButtonColor.Danger, - // onClickClose, - // showExitIcon: true, - // headerReverse: true, - // conversationId, - // }) - // ); - } else if (isPublic || (isClosedGroup && !isAdmin)) { + return; + } + if (isPublic || (isClosedGroup && !isAdmin)) { window?.inboxStore?.dispatch( updateConfirmModal({ title: isPublic ? window.i18n('communityLeave') : window.i18n('groupLeave'), diff --git a/ts/node/sql.ts b/ts/node/sql.ts index f70f1f9869..554b23e369 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1108,7 +1108,7 @@ async function getAllMessagesWithAttachmentsInConversationSentBefore( .all({ conversationId, beforeMs: deleteAttachBeforeSeconds * 1000 }); const messages = map(rows, row => jsonToObject(row.json)); const messagesWithAttachments = messages.filter(m => { - return getExternalFilesForMessage(m).some(a => !isEmpty(a) && isString(a)); // when we remove an attachment, we set the path to '' so it should be excluded here + return getExternalFilesForMessage(m, false).some(a => !isEmpty(a) && isString(a)); // when we remove an attachment, we set the path to '' so it should be excluded here }); return messagesWithAttachments; } @@ -2079,7 +2079,7 @@ function getMessagesWithFileAttachments(conversationId: string, limit: number) { return map(rows, row => jsonToObject(row.json)); } -function getExternalFilesForMessage(message: any) { +function getExternalFilesForMessage(message: any, includePreview = true) { const { attachments, quote, preview } = message; const files: Array = []; @@ -2108,7 +2108,7 @@ function getExternalFilesForMessage(message: any) { }); } - if (preview && preview.length) { + if (includePreview && preview && preview.length) { forEach(preview, item => { const { image } = item; diff --git a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts index 592cbb3365..1e61264f5f 100644 --- a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts +++ b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts @@ -103,11 +103,11 @@ function makeStoreGroupKeysSubRequest({ if (!group.secretKey || isEmpty(group.secretKey)) { window.log.debug( - `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: keysEncryptedmessage not empty but we do not have the secretKey` + `makeStoreGroupKeysSubRequest: ${ed25519Str(groupPk)}: keysEncryptedmessage not empty but we do not have the secretKey` ); throw new Error( - 'pushChangesToGroupSwarmIfNeeded: keysEncryptedmessage not empty but we do not have the secretKey' + 'makeStoreGroupKeysSubRequest: keysEncryptedmessage not empty but we do not have the secretKey' ); } return new StoreGroupKeysSubRequest({ @@ -136,11 +136,11 @@ function makeStoreGroupConfigSubRequest({ if (!group.secretKey || isEmpty(group.secretKey)) { window.log.debug( - `pushChangesToGroupSwarmIfNeeded: ${ed25519Str(groupPk)}: pendingConfigMsgs not empty but we do not have the secretKey` + `makeStoreGroupConfigSubRequest: ${ed25519Str(groupPk)}: pendingConfigMsgs not empty but we do not have the secretKey` ); throw new Error( - 'pushChangesToGroupSwarmIfNeeded: pendingConfigMsgs not empty but we do not have the secretKey' + 'makeStoreGroupConfigSubRequest: pendingConfigMsgs not empty but we do not have the secretKey' ); } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index efb126115d..5be7a8397d 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -317,7 +317,7 @@ class ConvoController { } catch (e) { // nothing to do } - if (groupInUserGroup && nameInMetaGroup && groupInUserGroup.name !== nameInMetaGroup) { + if (groupInUserGroup && nameInMetaGroup) { groupInUserGroup.name = nameInMetaGroup; } await UserGroupsWrapperActions.setGroup(groupInUserGroup); From 53a6dae896e44e38453e68b54ee66f6d4179992b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 11 Dec 2024 16:41:55 +1100 Subject: [PATCH 220/302] chore: move deleteMessage & retrySend to other files --- .../message-content/MessageContextMenu.tsx | 51 ++----------------- .../DeleteMessage/DeleteMessageMenuItem.tsx | 35 +++++++++++++ .../items/RetrySend/RetrySendMenuItem.tsx | 25 +++++++++ 3 files changed, 65 insertions(+), 46 deletions(-) create mode 100644 ts/components/menu/items/DeleteMessage/DeleteMessageMenuItem.tsx create mode 100644 ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx index 112ccd1878..909bcda1a3 100644 --- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx +++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx @@ -11,7 +11,6 @@ import { Data } from '../../../../data/data'; import { MessageInteraction } from '../../../../interactions'; import { replyToMessage } from '../../../../interactions/conversationInteractions'; -import { deleteMessagesForX } from '../../../../interactions/conversations/unsendingInteractions'; import { addSenderAsModerator, removeSenderFromModerator, @@ -29,7 +28,6 @@ import { useMessageBody, useMessageDirection, useMessageIsDeletable, - useMessageIsDeletableForEveryone, useMessageSender, useMessageSenderIsAdmin, useMessageServerTimestamp, @@ -53,6 +51,9 @@ import { CopyAccountIdMenuItem } from '../../../menu/items/CopyAccountId/CopyAcc import { Localizer } from '../../../basic/Localizer'; import { ItemWithDataTestId } from '../../../menu/items/MenuItemWithDataTestId'; import { getMenuAnimation } from '../../../menu/MenuAnimation'; +import { WithMessageId } from '../../../../session/types/with'; +import { DeleteItem } from '../../../menu/items/DeleteMessage/DeleteMessageMenuItem'; +import { RetryItem } from '../../../menu/items/RetrySend/RetrySendMenuItem'; export type MessageContextMenuSelectorProps = Pick< MessageRenderingProps, @@ -91,32 +92,7 @@ const StyledEmojiPanelContainer = styled.div<{ x: number; y: number }>` } `; -const DeleteItem = ({ messageId }: { messageId: string }) => { - const convoId = useSelectedConversationKey(); - const isPublic = useSelectedIsPublic(); - - const isDeletable = useMessageIsDeletable(messageId); - const isDeletableForEveryone = useMessageIsDeletableForEveryone(messageId); - const messageStatus = useMessageStatus(messageId); - - const enforceDeleteServerSide = isPublic && messageStatus !== 'error'; - - const onDelete = useCallback(() => { - if (convoId) { - void deleteMessagesForX([messageId], convoId, enforceDeleteServerSide); - } - }, [convoId, enforceDeleteServerSide, messageId]); - - if (!convoId || (isPublic && !isDeletableForEveryone) || (!isPublic && !isDeletable)) { - return null; - } - - return {window.i18n('delete')}; -}; - -type MessageId = { messageId: string }; - -const AdminActionItems = ({ messageId }: MessageId) => { +const AdminActionItems = ({ messageId }: WithMessageId) => { const convoId = useSelectedConversationKey(); const isPublic = useSelectedIsPublic(); const weAreModerator = useSelectedWeAreModerator(); @@ -163,24 +139,6 @@ const AdminActionItems = ({ messageId }: MessageId) => { ) : null; }; -const RetryItem = ({ messageId }: MessageId) => { - const direction = useMessageDirection(messageId); - - const status = useMessageStatus(messageId); - const isOutgoing = direction === 'outgoing'; - - const showRetry = status === 'error' && isOutgoing; - const onRetry = useCallback(async () => { - const found = await Data.getMessageById(messageId); - if (found) { - await found.retrySend(); - } - }, [messageId]); - return showRetry ? ( - {window.i18n('resend')} - ) : null; -}; - export const showMessageInfoOverlay = async ({ messageId, dispatch, @@ -355,6 +313,7 @@ export const MessageContextMenu = (props: Props) => { if (!convoId) { return null; } + return ( {enableReactions && showEmojiPanel && ( diff --git a/ts/components/menu/items/DeleteMessage/DeleteMessageMenuItem.tsx b/ts/components/menu/items/DeleteMessage/DeleteMessageMenuItem.tsx new file mode 100644 index 0000000000..45173dad88 --- /dev/null +++ b/ts/components/menu/items/DeleteMessage/DeleteMessageMenuItem.tsx @@ -0,0 +1,35 @@ +import { useCallback } from 'react'; +import { deleteMessagesForX } from '../../../../interactions/conversations/unsendingInteractions'; +import { + useMessageIsDeletable, + useMessageIsDeletableForEveryone, + useMessageStatus, +} from '../../../../state/selectors'; +import { + useSelectedConversationKey, + useSelectedIsPublic, +} from '../../../../state/selectors/selectedConversation'; +import { ItemWithDataTestId } from '../MenuItemWithDataTestId'; + +export const DeleteItem = ({ messageId }: { messageId: string }) => { + const convoId = useSelectedConversationKey(); + const isPublic = useSelectedIsPublic(); + + const isDeletable = useMessageIsDeletable(messageId); + const isDeletableForEveryone = useMessageIsDeletableForEveryone(messageId); + const messageStatus = useMessageStatus(messageId); + + const enforceDeleteServerSide = isPublic && messageStatus !== 'error'; + + const onDelete = useCallback(() => { + if (convoId) { + void deleteMessagesForX([messageId], convoId, enforceDeleteServerSide); + } + }, [convoId, enforceDeleteServerSide, messageId]); + + if (!convoId || (isPublic && !isDeletableForEveryone) || (!isPublic && !isDeletable)) { + return null; + } + + return {window.i18n('delete')}; +}; diff --git a/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx b/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx new file mode 100644 index 0000000000..e571fb90b5 --- /dev/null +++ b/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx @@ -0,0 +1,25 @@ +import { useCallback } from 'react'; +import { WithMessageId } from '../../../../session/types/with'; +import { useMessageDirection, useMessageStatus } from '../../../../state/selectors'; +import { ItemWithDataTestId } from '../MenuItemWithDataTestId'; +import { Data } from '../../../../data/data'; + +export const RetryItem = ({ messageId }: WithMessageId) => { + const direction = useMessageDirection(messageId); + + const status = useMessageStatus(messageId); + const isOutgoing = direction === 'outgoing'; + + const showRetry = status === 'error' && isOutgoing; + const onRetry = useCallback(async () => { + const found = await Data.getMessageById(messageId); + if (found) { + await found.retrySend(); + } + }, [messageId]); + + return showRetry ? ( + // eslint-disable-next-line @typescript-eslint/no-misused-promises + {window.i18n('resend')} + ) : null; +}; From 48f18b1258a27565d81ecd42dac21cf703413c9f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 11 Dec 2024 17:12:14 +1100 Subject: [PATCH 221/302] chore: latest crowdinfetch --- _locales/af/messages.json | 1 - _locales/ar/messages.json | 95 +++++++++++++++++------------------ _locales/az/messages.json | 1 - _locales/bal/messages.json | 1 - _locales/be/messages.json | 1 - _locales/bg/messages.json | 1 - _locales/bn/messages.json | 1 - _locales/ca/messages.json | 1 - _locales/cs/messages.json | 1 - _locales/cy/messages.json | 1 - _locales/da/messages.json | 1 - _locales/de/messages.json | 1 - _locales/el/messages.json | 1 - _locales/en/messages.json | 3 +- _locales/eo/messages.json | 1 - _locales/es-419/messages.json | 1 - _locales/es/messages.json | 1 - _locales/et/messages.json | 1 - _locales/eu/messages.json | 1 - _locales/fa/messages.json | 1 - _locales/fi/messages.json | 1 - _locales/fil/messages.json | 1 - _locales/fr/messages.json | 1 - _locales/ha/messages.json | 1 - _locales/he/messages.json | 1 - _locales/hi/messages.json | 1 - _locales/hr/messages.json | 1 - _locales/hu/messages.json | 1 - _locales/hy-AM/messages.json | 1 - _locales/id/messages.json | 1 - _locales/it/messages.json | 1 - _locales/ja/messages.json | 1 - _locales/ka/messages.json | 1 - _locales/km/messages.json | 1 - _locales/kmr/messages.json | 1 - _locales/kn/messages.json | 1 - _locales/ko/messages.json | 1 - _locales/ku/messages.json | 1 - _locales/lg/messages.json | 1 - _locales/lt/messages.json | 1 - _locales/mk/messages.json | 1 - _locales/mn/messages.json | 1 - _locales/ms/messages.json | 1 - _locales/my/messages.json | 1 - _locales/nb/messages.json | 1 - _locales/ne/messages.json | 1 - _locales/nl/messages.json | 1 - _locales/nn/messages.json | 1 - _locales/no/messages.json | 1 - _locales/ny/messages.json | 1 - _locales/pl/messages.json | 1 - _locales/ps/messages.json | 1 - _locales/pt-BR/messages.json | 1 - _locales/pt-PT/messages.json | 1 - _locales/ro/messages.json | 1 - _locales/ru/messages.json | 1 - _locales/sh/messages.json | 1 - _locales/si/messages.json | 1 - _locales/sk/messages.json | 1 - _locales/sl/messages.json | 1 - _locales/sq/messages.json | 1 - _locales/sr-CS/messages.json | 1 - _locales/sr-SP/messages.json | 1 - _locales/sv/messages.json | 1 - _locales/sw/messages.json | 1 - _locales/ta/messages.json | 1 - _locales/te/messages.json | 1 - _locales/th/messages.json | 1 - _locales/tl/messages.json | 1 - _locales/tr/messages.json | 1 - _locales/uk/messages.json | 1 - _locales/ur/messages.json | 1 - _locales/uz/messages.json | 1 - _locales/vi/messages.json | 1 - _locales/xh/messages.json | 1 - _locales/zh-CN/messages.json | 1 - _locales/zh-TW/messages.json | 1 - ts/models/groupUpdate.ts | 2 +- 78 files changed, 50 insertions(+), 125 deletions(-) diff --git a/_locales/af/messages.json b/_locales/af/messages.json index 3d79ce8e36..3c2239cb7b 100644 --- a/_locales/af/messages.json +++ b/_locales/af/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} en {count} ander is genooi om by die groep aan te sluit.", "groupMemberNewTwo": "{name} en {other_name} is genooi om by die groep aan te sluit.", "groupMemberNewYouHistoryMultiple": "Jy en {count} ander is genooi om by die groep aan te sluit. Kletsgeskiedenis is gedeel.", - "groupMemberNewYouHistoryTwo": "Jy en {name} is genooi om by die groep aan te sluit. Kletsgeskiedenis is gedeel.", "groupMemberYouLeft": "You het die groep verlaat", "groupMembers": "Groep Lede", "groupMembersNone": "Daar is geen ander lede in hierdie groep nie.", diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json index 698db60456..5b91103d20 100644 --- a/_locales/ar/messages.json +++ b/_locales/ar/messages.json @@ -8,7 +8,7 @@ "accountIdErrorInvalid": "معرف الحساب هذا غير صالح. يرجى التحقق والمحاولة مرة أخرى.", "accountIdOrOnsEnter": "أدخل معرف الحساب أو ONS", "accountIdOrOnsInvite": "دعوة باستخدام معرف الحساب أو ONS", - "accountIdShare": "Hey, I've been using {app_name} to chat with complete privacy and security. Come join me! My Account ID is

{account_id}

Download it at {session_download_url}", + "accountIdShare": "مرحبًا، لقد كنت أستخدم {app_name} للدردشة مع خصوصية وأمان كاملين. انضم إليّ! معرف حسابي هو

{account_id}

قم بتحميله من {session_download_url}", "accountIdYours": "معرف حسابك", "accountIdYoursDescription": "هذا معرف الحساب الخاص بك. يمكن للمستخدمين الآخرين مسحه ضوئيا لبدء محادثة معك.", "actualSize": "الحجم الحقيقي", @@ -52,7 +52,7 @@ "appearanceThemesClassicLight": "فاتح كلاسيكي", "appearanceThemesOceanDark": "محيطي داكن", "appearanceThemesOceanLight": "محيطي فاتح", - "appearanceZoom": "كبِر", + "appearanceZoom": "تكبير", "appearanceZoomIn": "تكبير", "appearanceZoomOut": "تصغير", "attachment": "مرفق", @@ -67,7 +67,7 @@ "attachmentsClickToDownload": "اضغط لتنزيل {file_type}", "attachmentsCollapseOptions": "إغلاق خيارات المرفق", "attachmentsCollecting": "جارٍ جمع المرفقات...", - "attachmentsDownload": "نَزِل المرفق", + "attachmentsDownload": "تنزيل المرفق", "attachmentsDuration": "المدة:", "attachmentsErrorLoad": "خطأ في إرفاق الملف", "attachmentsErrorMediaSelection": "فشل في تحديد المرفق", @@ -96,7 +96,7 @@ "attachmentsNa": "N/A", "attachmentsNotification": "{emoji} مرفق", "attachmentsNotificationGroup": "{author}: {emoji} مرفق", - "attachmentsResolution": "الدقة أو الأبعاد:", + "attachmentsResolution": "دقة الشاشة:", "attachmentsSaveError": "تعذر حفظ الملف.", "attachmentsSendTo": "إرسال إلى {name}", "attachmentsTapToDownload": "انضغط لتنزيل {file_type}", @@ -106,7 +106,7 @@ "audio": "صوت", "audioNoInput": "لا يوجد ميكروفون", "audioNoOutput": "لا يوجد سماعات أو مكبر صوت", - "audioUnableToPlay": "غير قادر على تشغيل ملف الصوت.", + "audioUnableToPlay": "تعذّر تشغيل الملف الصوتي", "audioUnableToRecord": "تعذر تسجيل الصوت.", "authenticateFailed": "فشل في المصادقة", "authenticateFailedTooManyAttempts": "عدد كبير جدًا من محاولات التحقق الفاشلة. يرجى المحاولة مرة أخرى لاحقًا.", @@ -117,11 +117,11 @@ "banErrorFailed": "فشل المنع", "banUnbanErrorFailed": "لقد فشل الغاء المنع", "banUnbanUser": "الغاء منع المستخدم", - "banUnbanUserUnbanned": "تم رفع الحظر عن المستخدم", + "banUnbanUserUnbanned": "تم رفع المنع عن المستخدم", "banUser": "حظر المستخدم", - "banUserBanned": "تم حظر المستخدم", + "banUserBanned": "تم منع المستخدم", "block": "حظر", - "blockBlockedDescription": "فك حظر هذه جهة الإتصال لإرسال رسالة", + "blockBlockedDescription": "إلغاء حظر جهة الإتصال لإرسال رسالة", "blockBlockedNone": "لا توجد جهات اتصال محظورة", "blockBlockedUser": "تم حظر {name}", "blockDescription": "هل أنت متيقِّن من حظر {name}؟ المستخدمين المحظورين لايمكنهم إرسال طلبات الرسائل، دعوات المجموعات أو الإتصال بك.", @@ -241,7 +241,7 @@ "conversationsNew": "مراسلة جديدة", "conversationsNone": "لا تملك أي محادثات حتى الآن", "conversationsSendWithEnterKey": "ارسل مع مفتاح الدخول", - "conversationsSendWithEnterKeyDescription": "النقر على مفتاح الدخول سوف يرسل الرسالة بدلا من بدء سطر جديد.", + "conversationsSendWithEnterKeyDescription": "النقر على Enter سوف يرسل الرسالة بدلاَ من بدء سطر جديد.", "conversationsSettingsAllMedia": "جميع الوسائط", "conversationsSpellCheck": "التدقيق الإملائي", "conversationsSpellCheckDescription": "تفعيل التحقق الإملائي عند كتابة الرسائل.", @@ -256,7 +256,7 @@ "databaseOptimizing": "تحسين قاعدة البيانات", "debugLog": "سجل تصحيح الأخطاء", "decline": "أرفض", - "delete": "أحذف", + "delete": "حذف", "deleteAfterGroupFirstReleaseConfigOutdated": "بعض أجهزتك تستخدم إصدارات قديمة. قد تكون المزامنة غير موثوقة حتى يتم تحديثها.", "deleteAfterGroupPR1BlockThisUser": "حظر هذا المستخدم", "deleteAfterGroupPR1BlockUser": "حظر مستخدم", @@ -306,7 +306,7 @@ "disappearingMessagesFollowSettingOff": "لن تختفي الرسائل التي ترسلها بعد الآن. هل أنت متأكد أنك تريد إيقاف إيقاف الرسائل المختفية؟", "disappearingMessagesFollowSettingOn": "تعيين رسائلك لتختفي {time} بعد أن تكون {disappearing_messages_type} ؟", "disappearingMessagesLegacy": "{name} يستخدم عميل قديم. قد لا تعمل الرسائل المختفية على النحو المتوقع.", - "disappearingMessagesOnlyAdmins": "فقط المسؤولين يمكنهم تغيير هذا الإعداد.", + "disappearingMessagesOnlyAdmins": "يمكن لمشرفين المجموعة فقط تغيير هذا الإعداد.", "disappearingMessagesSent": "تم الإرسال", "disappearingMessagesSet": "{name} قام بتعيين الرسائل لتختفي بعد {time} من {disappearing_messages_type}.", "disappearingMessagesSetYou": "أنت قمت بتعيين الرسائل لتختفي بعد {time} من {disappearing_messages_type}.", @@ -334,16 +334,16 @@ "downloading": "جارٍ التنزيل...", "draft": "مسودة", "edit": "تعديل", - "emojiAndSymbols": "إيموجي & رموز", + "emojiAndSymbols": "إيموجي و رموز", "emojiCategoryActivities": "نشاطات", "emojiCategoryAnimals": "حيوانات & و طبيعة", "emojiCategoryFlags": "أعلام", - "emojiCategoryFood": "مأكولات & و مشروبات", + "emojiCategoryFood": "مأكولات و مشروبات", "emojiCategoryObjects": "أجسام", "emojiCategoryRecentlyUsed": "مستخدمة حديثًا", - "emojiCategorySmileys": "ابتسامات & وأشخاص", + "emojiCategorySmileys": "ابتسامات وأشخاص", "emojiCategorySymbols": "رموز", - "emojiCategoryTravel": "السفر & و أماكن", + "emojiCategoryTravel": "السفر و أماكن", "emojiReactsClearAll": "هل أنت متيقِّن من أنك تريد مسح كافة {emoji}؟", "emojiReactsCoolDown": "أبطأ! لقد أرسلت الكثير من ردود الفعل الرموز التعبيرية. حاول مرة أخرى قريبا", "emojiReactsHoverNameDesktop": "{name} تفاعل بـ {emoji_name}", @@ -352,7 +352,7 @@ "emojiReactsHoverYouNameDesktop": "تفاعلت مع {emoji_name}", "emojiReactsHoverYouNameMultipleDesktop": "تفاعلت أنت و{count} آخرين مع {emoji_name}", "emojiReactsHoverYouNameTwoDesktop": "تفاعلت أنت و{name} مع {emoji_name}", - "emojiReactsNotification": "تفاعل مع رسالتك {emoji}", + "emojiReactsNotification": "تفاعل مع رسالتك بـ {emoji}", "enable": "تفعيل", "errorConnection": "الرجاء التحقق من اتصالك بالإنترنت وحاول مرة أخرى.", "errorCopyAndQuit": "نسخ الخطأ والخروج", @@ -364,7 +364,7 @@ "followSystemSettings": "طابق إعدادات النظام", "from": "مِن", "fullScreenToggle": "تحويل الشاشة كاملة", - "gif": "صورة GIF", + "gif": "GIF", "giphyWarning": "Giphy", "giphyWarningDescription": "{app_name} سيتصل بمنصة Giphy لتقديم نتائج البحث. لن يكون لديك حماية كاملة للبيانات الوصفية عند إرسال الصور المتحركة (GIFs).", "groupAddMemberMaximum": "تضم المجموعات بحد أقصى 100 عضو", @@ -385,7 +385,7 @@ "groupInviteFailedTwo": "فشل دعوة {name} و {other_name} إلى {group_name}", "groupInviteFailedUser": "فشل دعوة {name} إلى {group_name}", "groupInviteSent": "تم إرسال الدعوة", - "groupInviteSuccessful": "الدعوة إلى المجموعة ناجحة", + "groupInviteSuccessful": "تمت دعوة المجموعة بنجاح", "groupInviteVersion": "يجب أن يمتلك المستخدمون الإصدار الأحدث لتلقي الدعوات", "groupInviteYou": "أنت تمت دعوتك للانضمام إلى المجموعة.", "groupInviteYouAndMoreNew": "أنت و{count} آخرين انضموا للمجموعة.", @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} و {count} اخرين تمت دعوتهم للانضمام إلى المجموعة.", "groupMemberNewTwo": "{name} و {other_name} تم دعوتهم للانضمام إلى المجموعة.", "groupMemberNewYouHistoryMultiple": "أنت و{count} آخرين انضموا للمجموعة. تمت مشاركة سجل الدردشة.", - "groupMemberNewYouHistoryTwo": "أنت و{name} انضموا للمجموعة. تمت مشاركة سجل الدردشة.", "groupMemberYouLeft": "أنت غادرت المجموعة.", "groupMembers": "أعضاء المجموعة", "groupMembersNone": "لا يوجد اعضاء اخرين في هذه المجموعة.", @@ -413,7 +412,7 @@ "groupNameEnter": "أدخل اسم المجموعة", "groupNameEnterPlease": "الرجاء إدخال اسم للمجموعة.", "groupNameEnterShorter": "الرجاء إدخال اسم مجموعة أقصر.", - "groupNameNew": "أسم المجموعة الآن '{group_name}.", + "groupNameNew": "اسم المجموعة الآن '{group_name}.", "groupNameUpdated": "تم تحديث اسم المجموعة.", "groupNoMessages": "ليس لديك رسائل من {group_name}. أرسل رسالة لبدء المحادثة!", "groupPromotedYou": "أنت تم ترقيتك إلى مشرف.", @@ -438,7 +437,7 @@ "helpReportABug": "الإبلاغ عن خطأ", "helpReportABugDescription": "شارك بعض التفاصيل لمساعدتنا في حل مشكلتك. صدّر السجلات الخاصة بك، ثم قم بتحميل الملف عبر مكتب المساعدة الخاص بـ {app_name}.", "helpReportABugExportLogs": "تصدير السجلات", - "helpReportABugExportLogsDescription": "اصدر السجلات الخاصة بك، ثم ارفع الملف عبر مكتب المساعدة الخاص بـ{app_name}.", + "helpReportABugExportLogsDescription": "إصدار السجلات الخاصة بك، ثم رفع الملف عبر مكتب المساعدة الخاص بـ{app_name}.", "helpReportABugExportLogsSaveToDesktop": "حفظ على سطح المكتب", "helpReportABugExportLogsSaveToDesktopDescription": "احفظ هذا الملف على سطح المكتب، ثم شاركه مع مطوري {app_name}.", "helpSupport": "الدعم", @@ -487,9 +486,9 @@ "max": "الأقصى", "media": "الوسائط", "members": "{count, plural, zero [# عضو] one [# أعضاء] two [# من الأعضاء] few [# عضوًا] many [# عضو] other [# عضو]}", - "membersActive": "{count, plural, zero [# عضو] one [# عضو] two [# عضو] few [# عضو] many [# عضو] other [# عضو نشط]}", + "membersActive": "{count, plural, zero [# عضو نشط] one [# عضو نشط] two [# عضو نشط] few [# عضو نشط] many [# عضو نشط] other [# عضو نشط]}", "membersAddAccountIdOrOns": "أضف معرف الحساب أو ONS", - "membersInvite": "دعوة المتصلين", + "membersInvite": "دعوة جهات الاتصال", "membersInviteSend": "{count, plural, zero [إرسال دعوات] one [إرسال دعوة] two [إرسال دعوات] few [إرسال دعوات] many [إرسال دعوات] other [إرسال دعوات]}", "membersInviteShareDescription": "هل تود مشاركة تاريخ الرسائل بالمجموعة مع {name}؟", "membersInviteShareDescriptionMultiple": "هل تود مشاركة تاريخ الرسائل بالمجموعة مع {name} و{count} آخرين؟", @@ -504,40 +503,40 @@ "messageErrorOld": "تلقينا رسالة مشفرة باستخدام إصدار قديم من {app_name} لم يعد مدعومًا. يرجى مطالبة المرسل بتحديث إلى أحدث إصدار وإعادة إرسال الرسالة.", "messageErrorOriginal": "لم يتم العثور على الرسالة الأصلية", "messageInfo": "معلومات الرسالة", - "messageMarkRead": "اعتبرها مقروءة", - "messageMarkUnread": "اجعله/ها غير مقروءة", + "messageMarkRead": "تحديد كـ \"مقروء\"", + "messageMarkUnread": "تحديد كـ \"غير مقروء\"", "messageNew": "{count, plural, zero [رسائل جديدة] one [رسالة جديدة] two [رسائل جديدة] few [رسائل جديدة] many [رسائل جديدة] other [رسائل جديدة]}", "messageNewDescriptionDesktop": "ابدأ محادثة جديدة عن طريق إدخال معرف حساب صديقك أو ONS.", "messageNewDescriptionMobile": "ابدأ محادثة جديدة عن طريق إدخال معرف حساب صديقك، ONS أو مسح رمزه QR.", "messageNewYouveGot": "{count, plural, zero [لديك # رسائل جديدة.] one [لديك رسالة جديدة.] two [لديك رسالتين # جدد.] few [لديك # رسائل جديدة.] many [لديك # رسائل جديدة.] other [لديك # رسائل جديدة.]}", "messageReplyingTo": "الرد على", "messageRequestGroupInvite": "{name} دعاك للانضمام إلى {group_name}.", - "messageRequestGroupInviteDescription": "إرسال رسالة إلى هذه المجموعة سوف يقبل تلقائيًا دعوة المجموعة.", + "messageRequestGroupInviteDescription": "بإرسال رسالة إلى هذه المجموعة سوف يقبل تلقائيًا دعوة المجموعة.", "messageRequestPending": "طلب رسالتك قيد الانتظار.", "messageRequestPendingDescription": "ستتمكن من إرسال الرسائل الصوتية والمرفقات بمجرد موافقة المستلم على طلب الرسالة هذا.", "messageRequestYouHaveAccepted": "لقد وافقتَ على طلب الرسالة من {name}.", - "messageRequestsAcceptDescription": "إرسال رسالة إلى هذا المستخدم سوف يقبل تلقائيًا طلب الرسالة الخاص به ويكشف عن معرف حسابك.", + "messageRequestsAcceptDescription": "بإرسال رسالة إلى هذا المستخدم سوف يقبل تلقائيًا طلب الرسالة الخاص به ويكشف عن معرف حسابك.", "messageRequestsAccepted": "تم قبول طلب الرسائل الخاص بك.", "messageRequestsClearAllExplanation": "هل أنت متأكد من أنك تريد مسح كافة طلبات الرسائل ودعوات المجموعات؟", "messageRequestsCommunities": "طلبات رسائل المجتمع", "messageRequestsCommunitiesDescription": "السماح بطلبات الرسائل من محادثات المجتمع.", "messageRequestsDelete": "هل أنت متأكد من أنك تريد حذف طلب الرسالة هذا؟", "messageRequestsNew": "لديك طلب مراسلة جديدة", - "messageRequestsNonePending": "لا توجد طلبات رسالة معلقة", + "messageRequestsNonePending": "لا توجد طلبات مراسلة معلقة", "messageRequestsTurnedOff": "تم إيقاف طلبات الرسائل من محادثات المجتمع من طرف {name}، لذا لا يمكنك إرسال الرسالة إليه.", - "messageSelect": "حدد الرسالة", + "messageSelect": "تحديد رسالة", "messageSnippetGroup": "{author}: {message_snippet}", "messageStatusFailedToSend": "فشل الإرسال", "messageStatusFailedToSync": "فشلت المزامنة", "messageStatusSyncing": "جارٍ المزامنة", "messageUnread": "الرسائل غير المقروءة", "messageVoice": "رسالة صوتية", - "messageVoiceErrorShort": "اضغط باستمرار لتسجيل رسالة صوتية", + "messageVoiceErrorShort": "اضغط مع الاستمرار لتسجيل رسالة صوتية", "messageVoiceSlideToCancel": "اسحب للإلغاء", "messageVoiceSnippet": "{emoji} رسالة صوتية", "messageVoiceSnippetGroup": "{author}: {emoji} رسالة صوتية", "messages": "الرسائل", - "minimize": "صغِّر", + "minimize": "تصغير", "next": "التالي", "nicknameDescription": "اختر اسم مستعار لـ {name}. سيظهر لك في محادثاتك الفردية والجماعية.", "nicknameEnter": "أدخل اسم مستعار", @@ -549,18 +548,18 @@ "notNow": "ليس الآن", "noteToSelf": "ملاحظة لنفسي", "noteToSelfEmpty": "ليس لديك أي رسائل في ملاحظة لنفسي أو بمعنى آخر في الرسائل المحفوظة.", - "noteToSelfHide": "إخفاء ملاحظة لنفسي", + "noteToSelfHide": "إخفاء \"ملاحظة لنفسي\"", "noteToSelfHideDescription": "هل أنت متأكد من أنك تريد إخفاء الملاحظة لنفسي؟", "notificationsAllMessages": "جميع الرسائل", "notificationsContent": "محتوى الإشعارات", - "notificationsContentDescription": "المعلومات معروضة في الإشعارات.", + "notificationsContentDescription": "المعلومات المعروضة في الإشعارات.", "notificationsContentShowNameAndContent": "الاسم والمحتوى", "notificationsContentShowNameOnly": "الاسم فقط", "notificationsContentShowNoNameOrContent": "بدون اسم او محتوى", "notificationsFastMode": "الوضع السريع", "notificationsFastModeDescription": "ستتم إعلامك بالرسائل الجديدة بشكل موثوق وفوري باستخدام خوادم إشعارات جوجل.", "notificationsFastModeDescriptionIos": "سوف يتم إعلامك برسائل جديدة بشكل موثوق وفوري باستخدام خوادم إشعارات Apple.", - "notificationsGoToDevice": "اذهب إلى إعدادات تنبيهات الجهاز", + "notificationsGoToDevice": "اذهب إلى إعدادات إشعارات الجهاز", "notificationsHeaderAllMessages": "الإشعارات - الكل", "notificationsHeaderMentionsOnly": "الإشعارات- الإشارات فقط", "notificationsHeaderMute": "الإشعارات - مكتومة", @@ -584,7 +583,7 @@ "notificationsSystem": "رسالة جديدة {message_count} في {conversation_count} محادثات", "notificationsVibrate": "الاهتزاز", "off": "مغلق", - "okay": "نعم", + "okay": "حسناً", "on": "يعمل", "onboardingAccountCreate": "إنشاء حساب", "onboardingAccountCreated": "تم إنشاء الحساب", @@ -619,8 +618,8 @@ "passwordCurrentIncorrect": "كلمة المرور الحالية غير صحيحة.", "passwordDescription": "يتطلب كلمة السر لفتح {app_name}.", "passwordEnter": "أدخل كلمة السر", - "passwordEnterCurrent": "يرجى إدخال كلمة السر الحالية", - "passwordEnterNew": "يرجى إدخال كلمة السر الجديدة", + "passwordEnterCurrent": "الرجاء إدخال كلمة السر الحالية", + "passwordEnterNew": "الرجاء إدخال كلمة السر الجديدة", "passwordError": "كلمة المرور يجب ان تحتوي فقط على الاحرف, الارقام و الرموز", "passwordErrorLength": "كلمة المرور يجب ان تكون بين 6 و 64 عنصر", "passwordErrorMatch": "كلمتا المرور لا تتطابقان", @@ -654,9 +653,9 @@ "permissionsStorageSaveDenied": "{app_name} يحتاج إذن الوصول إلى التخزين لحفظ الصور ومقاطع الفيديو، ولكن تم رفضه نهائيًا. يرجى الانتقال إلى إعدادات التطبيق، واختيار \"الأذونات\"، وتفعيل \"التخزين\".", "permissionsStorageSend": "{app_name} يحتاج إذن الوصول إلى التخزين لإرسال الصور ومقاطع الفيديو.", "pin": "ًًًُُثَبت", - "pinConversation": "ثَبِت المحادثة", + "pinConversation": "تثبيت المحادثة", "pinUnpin": "الغ التثبيت", - "pinUnpinConversation": "ألغِي تثبيت المحادثة", + "pinUnpinConversation": "إلغاء تثبيت المحادثة", "preview": "معاينة", "profile": "الملف الشخصي", "profileDisplayPicture": "صورة العرض", @@ -666,9 +665,9 @@ "profileErrorUpdate": "فشل تحديث الملف الشخصي.", "promote": "ترقية", "qrCode": "رمز QR", - "qrNotAccountId": "رمز QR هذا لا يحتوي على معرف حساب", + "qrNotAccountId": "رمز QR هذا لا يحتوي على مُعرف حساب", "qrNotRecoveryPassword": "رمز QR هذا لا يحتوي على عبارة استرداد", - "qrScan": "امسح رمز الاستجابة السريعة", + "qrScan": "امسح رمز الاستجابة السريعة QR", "qrView": "عرض QR", "qrYoursDescription": "يمكن للأصدقاء إرسال رسائل إليك عن طريق مسح رمز QR الخاص بك.", "quit": "انهاء {app_name}", @@ -691,7 +690,7 @@ "recoveryPasswordHidePermanently": "إخفاء كلمة مرور الاسترداد بشكل دائم", "recoveryPasswordHidePermanentlyDescription1": "بدون كلمة المرور الاستردادية، لا يمكنك تحميل حسابك على الأجهزة الجديدة.

نوصيك بشدة بحفظ كلمة المرور الاستردادية في مكان آمن قبل المتابعة.", "recoveryPasswordHidePermanentlyDescription2": "هل أنت متأكد من أنك تريد إخفاء كلمة مرور الاسترداد الخاصة بك على هذا الجهاز نهائيًا؟ لا يمكن التراجع عن هذا.", - "recoveryPasswordHideRecoveryPassword": "إخفاء كلمة المرور للاسترجاع", + "recoveryPasswordHideRecoveryPassword": "إخفاء كلمة مرور الاسترداد", "recoveryPasswordHideRecoveryPasswordDescription": "إخفاء كلمة المرور الخاصة بالاسترداد على هذا الجهاز بشكل دائم.", "recoveryPasswordRestoreDescription": "أدخل كلمة مرور الاسترجاع لتحميل حسابك. إذا لم تقم بحفظها، يمكنك العثور عليها في إعدادات التطبيق.", "recoveryPasswordView": "عرض كلمة المرور", @@ -717,10 +716,10 @@ "search": "بحث", "searchContacts": "ابحث في جهات الاتصال", "searchConversation": "بحث عن محادثة", - "searchEnter": "الرجاء إدخال كملة بحث.", - "searchMatches": "{count, plural, zero [{found_count} من # مطابقة] one [{found_count} من # إجابة] two [{found_count} من # مطابقات] few [{found_count} من # مطابقات] many [{found_count} من # مطابقات] other [{found_count} من # مطابقات]}", + "searchEnter": "الرجاء إدخال كلمة للبحث.", + "searchMatches": "{count, plural, zero [{found_count} من # مطابقة] one [{found_count} من # مطابقة] two [{found_count} من # مطابقتين] few [{found_count} من # مطابقات] many [{found_count} من # مطابقات] other [{found_count} من # مطابقات]}", "searchMatchesNone": "لم يتم العثور على أي نتيجة.", - "searchMatchesNoneSpecific": "لم يتم العثور على أية نتيجة لـ {query}", + "searchMatchesNoneSpecific": "لم يتم العثور على نتائج لـ {query}", "searchMembers": "بحث عن الأعضاء", "searchSearching": "جاري البحث...", "select": "حدد", @@ -732,7 +731,7 @@ "sessionClearData": "مسح البيانات", "sessionConversations": "المحادثات", "sessionHelp": "المساعدة", - "sessionInviteAFriend": "أُدعُ صديق", + "sessionInviteAFriend": "دعوة صديق", "sessionMessageRequests": "طلبات المُراسلة", "sessionNotifications": "الإشعارات", "sessionPermissions": "الصلاحيات", @@ -750,7 +749,7 @@ "showAll": "إظهار الكل", "showLess": "عرض أقل", "stickers": "الملصقات", - "supportGoTo": "اِذهب اِلى صفحة الدعم", + "supportGoTo": "الذهاب لصفحة الدعم", "systemInformationDesktop": "معلومات النظام: {information}", "theContinue": "التالي", "theDefault": "افتراضي", @@ -777,7 +776,7 @@ "urlOpenDescription": "هل أنت متأكد من أنك تريد فتح هذا الرابط في متصفحك؟

{url}", "useFastMode": "استخدم الوضع السريع", "video": "فيديو", - "videoErrorPlay": "غير قادر على تشغيل الفيديو.", + "videoErrorPlay": "تعذر تشغيل الفيديو", "view": "عرض", "waitFewMinutes": "قد يستغرق ذلك بضع دقائق.", "waitOneMoment": "لحظة واحدة من فضلك...", diff --git a/_locales/az/messages.json b/_locales/az/messages.json index 048e84b8c2..69db079863 100644 --- a/_locales/az/messages.json +++ b/_locales/az/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} və digər {count} nəfər qrupa qoşulmaq üçün dəvət edildi.", "groupMemberNewTwo": "{name} və {other_name} qrupa qoşulmaq üçün dəvət edildi.", "groupMemberNewYouHistoryMultiple": "Siz və digər {count} nəfər qrupa qoşulmaq üçün dəvət edildiniz. Söhbət tarixçəsi paylaşıldı.", - "groupMemberNewYouHistoryTwo": "Siz və {name} qrupa qoşulmaq üçün dəvət edildiniz. Söhbət tarixçəsi paylaşıldı.", "groupMemberYouLeft": "Siz qrupu tərk etdiniz.", "groupMembers": "Qrup üzvləri", "groupMembersNone": "Bu qrupda başqa üzv yoxdur.", diff --git a/_locales/bal/messages.json b/_locales/bal/messages.json index 989e931b60..ff1d88392e 100644 --- a/_locales/bal/messages.json +++ b/_locales/bal/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} a {count} drīg šumār zant group ke.", "groupMemberNewTwo": "{name} a {other_name} šumār zant group ke.", "groupMemberNewYouHistoryMultiple": "Šumār a {count} drīg šumār zant group ke. Chat history was shared.", - "groupMemberNewYouHistoryTwo": "Šumār a {name} šumār zant group ke. Chat history was shared.", "groupMemberYouLeft": "Šumār jāmš.", "groupMembers": "گروپءِ اراکنان", "groupMembersNone": "اس گروپ میں دوسرے کوئی رکن نہیں.", diff --git a/_locales/be/messages.json b/_locales/be/messages.json index d361c0e957..483e9556b6 100644 --- a/_locales/be/messages.json +++ b/_locales/be/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} і {count} іншых былі запрошаны далучыцца да групы.", "groupMemberNewTwo": "{name} і {other_name} былі запрошаны далучыцца да групы.", "groupMemberNewYouHistoryMultiple": "Вы і яшчэ {count} іншых былі запрошаны далучыцца да групы. Гісторыя чатаў была абагулена.", - "groupMemberNewYouHistoryTwo": "Вы і {name} былі запрошаны далучыцца да групы. Гісторыя чатаў была абагулена.", "groupMemberYouLeft": "Вы пакінулі групу.", "groupMembers": "Удзельнікі групы", "groupMembersNone": "У гэтай групе больш няма ўдзельнікаў.", diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json index 85bac8bd6f..8c989137f5 100644 --- a/_locales/bg/messages.json +++ b/_locales/bg/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} и {count} други бяха поканени да се присъединят към групата.", "groupMemberNewTwo": "{name} и {other_name} бяха поканени да се присъединят към групата.", "groupMemberNewYouHistoryMultiple": "Вие и {count} други бяхте поканени да се присъедините към групата. История на чатовете беше споделена.", - "groupMemberNewYouHistoryTwo": "Вие и {name} бяхте поканени да се присъедините към групата. История на чатовете беше споделена.", "groupMemberYouLeft": "Вие напуснахте групата.", "groupMembers": "Членове на групата", "groupMembersNone": "Няма други членове в тази група.", diff --git a/_locales/bn/messages.json b/_locales/bn/messages.json index f33744aedc..a01ff89a20 100644 --- a/_locales/bn/messages.json +++ b/_locales/bn/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} এবং {count} জন অন্য সদস্য গ্রুপে যোগ দেওয়ার জন্য আমন্ত্রিত হয়েছে।", "groupMemberNewTwo": "{name} এবং {other_name} গ্রুপে যোগ দেওয়ার জন্য আমন্ত্রিত হয়েছে।", "groupMemberNewYouHistoryMultiple": "আপনি এবং {count} জন অন্য সদস্য গ্রুপে যোগ দেওয়ার জন্য আমন্ত্রিত হয়েছে। চ্যাট ইতিহাস শেয়ার করা হয়েছে।", - "groupMemberNewYouHistoryTwo": "আপনি এবং {name} গ্রুপে যোগ দেওয়ার জন্য আমন্ত্রিত হয়েছে। চ্যাট ইতিহাস শেয়ার করা হয়েছে।", "groupMemberYouLeft": "আপনি গ্রুপ থেকে বের হয়ে গিয়েছেন।", "groupMembers": "গ্রুপ সদস্যবৃন্দ", "groupMembersNone": "এই গ্রুপে অন্য কোনো সদস্য নেই।", diff --git a/_locales/ca/messages.json b/_locales/ca/messages.json index 5bf5146889..80f67c7519 100644 --- a/_locales/ca/messages.json +++ b/_locales/ca/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} i {count} altres han estat convidats a unir-se al grup.", "groupMemberNewTwo": "{name} i {other_name} han estat convidats a unir-se al grup.", "groupMemberNewYouHistoryMultiple": "Tu i {count} altres heu estat convidats a unir-vos al grup. S'ha compartit l'historial de la conversa.", - "groupMemberNewYouHistoryTwo": "Tu i {name} heu estat convidats a unir-vos al grup. S'ha compartit l'historial de la conversa.", "groupMemberYouLeft": "Tu has abandonat el grup.", "groupMembers": "Membres del Grup", "groupMembersNone": "No hi ha altres membres en aquest grup.", diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json index 8c1fa01f6b..10b7c621fc 100644 --- a/_locales/cs/messages.json +++ b/_locales/cs/messages.json @@ -418,7 +418,6 @@ "groupMemberNewMultiple": "{name} a {count} dalších bylo pozváno do skupiny.", "groupMemberNewTwo": "{name} a {other_name} byli pozváni do skupiny.", "groupMemberNewYouHistoryMultiple": "Vy a {count} dalších bylo pozváno do skupiny. Historie konverzace byla sdílena.", - "groupMemberNewYouHistoryTwo": "Vy a {name} byli pozváni do skupiny. Historie konverzace byla sdílena.", "groupMemberYouLeft": "Opustil/a jste skupinu.", "groupMembers": "Členové skupiny", "groupMembersNone": "V této skupině nejsou žádní další členové.", diff --git a/_locales/cy/messages.json b/_locales/cy/messages.json index 3294ef5e7e..102d9b05ba 100644 --- a/_locales/cy/messages.json +++ b/_locales/cy/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} a {count} eraill wedi cael gwahoddiad i ymuno â'r grŵp.", "groupMemberNewTwo": "{name} a {other_name} wedi cael eu gwahodd i ymuno â'r grŵp.", "groupMemberNewYouHistoryMultiple": "Chi a {count} eraill ymunodd â'r grŵp. Hanes sgwrs wedi cael ei rhannu.", - "groupMemberNewYouHistoryTwo": "Chi a {name} ymunodd â'r grŵp. Hanes sgwrs wedi cael ei rhannu.", "groupMemberYouLeft": "Rydych chi wedi gadael y grŵp.", "groupMembers": "Aelodau'r grŵp", "groupMembersNone": "Nid oes aelodau eraill yn y grŵp hwn.", diff --git a/_locales/da/messages.json b/_locales/da/messages.json index e4e9a3fd81..f2eb66d1b1 100644 --- a/_locales/da/messages.json +++ b/_locales/da/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} og {count} andre blev inviteret til at deltage i gruppen.", "groupMemberNewTwo": "{name} og {other_name} blev inviteret til at deltage i gruppen.", "groupMemberNewYouHistoryMultiple": "Du og {count} andre blev inviteret til at deltage i gruppen. Chat historik blev delt.", - "groupMemberNewYouHistoryTwo": "Du og {name} blev inviteret til at deltage i gruppen. Chat historik blev delt.", "groupMemberYouLeft": "Du forlod gruppen.", "groupMembers": "Gruppemedlemmer", "groupMembersNone": "Der er ingen andre medlemmer i denne gruppe.", diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 7e692a843e..07ee112545 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -407,7 +407,6 @@ "groupMemberNewMultiple": "{name} und {count} andere wurden eingeladen, der Gruppe beizutreten.", "groupMemberNewTwo": "{name} und {other_name} wurden eingeladen, der Gruppe beizutreten.", "groupMemberNewYouHistoryMultiple": "Du und {count} andere wurden eingeladen, der Gruppe beizutreten. Der Chatverlauf wurde freigegeben.", - "groupMemberNewYouHistoryTwo": "Du und {name} wurden eingeladen, der Gruppe beizutreten. Der Chatverlauf wurde freigegeben.", "groupMemberYouLeft": "Du hast die Gruppe verlassen.", "groupMembers": "Gruppenmitglieder", "groupMembersNone": "Es gibt keine anderen Mitglieder in dieser Gruppe.", diff --git a/_locales/el/messages.json b/_locales/el/messages.json index d2468ca390..d21ecc13b7 100644 --- a/_locales/el/messages.json +++ b/_locales/el/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} και {count} άλλοι προσκλήθηκαν να εγγραφούν στην ομάδα.", "groupMemberNewTwo": "{name} και {other_name} προσκλήθηκαν να συμμετάσχουν στην ομάδα.", "groupMemberNewYouHistoryMultiple": "Εσείς και {count} άλλοι προσκληθήκατε να συμμετάσχετε στην ομάδα. Το ιστορικό συνομιλίας κοινοποιήθηκε.", - "groupMemberNewYouHistoryTwo": "Εσείς και {name} προσκληθήκατε να συμμετάσχετε στην ομάδα. Το ιστορικό συνομιλίας κοινοποιήθηκε.", "groupMemberYouLeft": "Εσείς αποχωρήσατε από την ομάδα.", "groupMembers": "Μέλη Ομάδας", "groupMembersNone": "Δεν υπάρχουν άλλα μέλη σε αυτήν την ομάδα.", diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 929f35a45a..e53b3c7767 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -380,6 +380,7 @@ "groupCreateErrorNoMembers": "Please pick at least one other group member.", "groupDelete": "Delete Group", "groupDeleteDescription": "Are you sure you want to delete {group_name}? This will remove all members and delete all group content.", + "groupDeleteDescriptionMember": "Are you sure you want to delete {group_name}?", "groupDeletedMemberDescription": "{group_name} has been deleted by a group admin. You will not be able to send any more messages.", "groupDescriptionEnter": "Enter a group description", "groupDisplayPictureUpdated": "Group display picture updated.", @@ -418,7 +419,7 @@ "groupMemberNewMultiple": "{name} and {count} others were invited to join the group.", "groupMemberNewTwo": "{name} and {other_name} were invited to join the group.", "groupMemberNewYouHistoryMultiple": "You and {count} others were invited to join the group. Chat history was shared.", - "groupMemberNewYouHistoryTwo": "You and {name} were invited to join the group. Chat history was shared.", + "groupMemberNewYouHistoryTwo": "You and {other_name} were invited to join the group. Chat history was shared.", "groupMemberYouLeft": "You left the group.", "groupMembers": "Group Members", "groupMembersNone": "There are no other members in this group.", diff --git a/_locales/eo/messages.json b/_locales/eo/messages.json index b7edd6df4d..046453d16c 100644 --- a/_locales/eo/messages.json +++ b/_locales/eo/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} kaj {count} aliaj estis invititaj aniĝi al la grupo.", "groupMemberNewTwo": "{name} kaj {other_name} estis invititaj aniĝi al la grupo.", "groupMemberNewYouHistoryMultiple": "Vi kaj {count} aliaj estis invititaj aniĝi al la grupo. Babilhistorio estis dividita.", - "groupMemberNewYouHistoryTwo": "Vi kaj {name} estis invititaj aniĝi al la grupo. Babilhistorio estis dividita.", "groupMemberYouLeft": "Vi forlasis la grupon.", "groupMembers": "Grupanoj", "groupMembersNone": "Ne estas aliaj membroj en ĉi tiu grupo.", diff --git a/_locales/es-419/messages.json b/_locales/es-419/messages.json index bd04463bc8..e14e2048f1 100644 --- a/_locales/es-419/messages.json +++ b/_locales/es-419/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} y {count} más fueron invitados a unirse al grupo.", "groupMemberNewTwo": "{name} y {other_name} fueron invitados a unirse al grupo.", "groupMemberNewYouHistoryMultiple": "Tú y {count} más fueron invitados a unirse al grupo. El historial de chat fue compartido.", - "groupMemberNewYouHistoryTwo": "Tú y {name} fueron invitados a unirse al grupo. El historial de chat fue compartido.", "groupMemberYouLeft": "Tú abandonaste el grupo.", "groupMembers": "Miembros del grupo", "groupMembersNone": "No hay otros miembros en este grupo.", diff --git a/_locales/es/messages.json b/_locales/es/messages.json index 0dd1e03e19..a9038a066f 100644 --- a/_locales/es/messages.json +++ b/_locales/es/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} y {count} más fueron invitados a unirse al grupo.", "groupMemberNewTwo": "{name} y {other_name} fueron invitados a unirse al grupo.", "groupMemberNewYouHistoryMultiple": "Tú y {count} más habéis sido invitados a uniros al grupo. El historial de mensajes ha sido compartido.", - "groupMemberNewYouHistoryTwo": "Tú y {name} fueron invitados a unirse al grupo. El historial de chat fue compartido.", "groupMemberYouLeft": "Tú has abandonado el grupo.", "groupMembers": "Miembros del grupo", "groupMembersNone": "No hay otros miembros en este grupo.", diff --git a/_locales/et/messages.json b/_locales/et/messages.json index 2f7758f933..e2f5997b8d 100644 --- a/_locales/et/messages.json +++ b/_locales/et/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} ja {count} teist kutsuti grupiga liituma.", "groupMemberNewTwo": "{name} ja {other_name} kutsuti grupiga liituma.", "groupMemberNewYouHistoryMultiple": "Sind ja {count} teist kutsuti grupiga liituma. Vestluse ajalugu jagati nendega.", - "groupMemberNewYouHistoryTwo": "Sind ja {name} kutsuti grupiga liituma. Vestluse ajalugu jagati nendega.", "groupMemberYouLeft": "Sina lahkusid grupist.", "groupMembers": "Grupi liikmed", "groupMembersNone": "Selles grupis pole teisi liikmeid.", diff --git a/_locales/eu/messages.json b/_locales/eu/messages.json index a9f925dec6..db96c2aa09 100644 --- a/_locales/eu/messages.json +++ b/_locales/eu/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} eta {count} beste taldera batzeko gonbidatu dira.", "groupMemberNewTwo": "{name} eta {other_name} taldera batzeko gonbidatu dira.", "groupMemberNewYouHistoryMultiple": "Zuk eta {count} beste taldera batzeko gonbidatu zaituzte. Txat historia partekatu da.", - "groupMemberNewYouHistoryTwo": "Zuk eta {name} taldera batzeko gonbidatu zaituzte. Txat historia partekatu da.", "groupMemberYouLeft": "Zuk taldea utzi duzu.", "groupMembers": "Taldeko Kideak", "groupMembersNone": "Ez dago beste kiderik talde honetan.", diff --git a/_locales/fa/messages.json b/_locales/fa/messages.json index 52b9a51508..0acef1efc1 100644 --- a/_locales/fa/messages.json +++ b/_locales/fa/messages.json @@ -404,7 +404,6 @@ "groupMemberNewMultiple": "{name} و {count} سایرین برای عضویت در گروه دعوت شدند.", "groupMemberNewTwo": "{name} و {other_name} برای عضویت در گروه دعوت شدند.", "groupMemberNewYouHistoryMultiple": "شما و{count} سایرین دعوت شدید تا به گروه بپیوندید. تاریخچه ی چت به اشتراک گذاشته شد.", - "groupMemberNewYouHistoryTwo": "شما و {name} دعوت شدید تا به گروه بپیوندید. تاریخچه ی چت به اشتراک گذاشته شد.", "groupMemberYouLeft": "شما گروه را ترک کردید.", "groupMembers": "اعضای گروه", "groupMembersNone": "هیچ عضو دیگری در این گروه نیست.", diff --git a/_locales/fi/messages.json b/_locales/fi/messages.json index 7b8145b64a..30404c743d 100644 --- a/_locales/fi/messages.json +++ b/_locales/fi/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} ja {count} muuta kutsuttiin ryhmään.", "groupMemberNewTwo": "{name} ja {other_name} kutsuttiin ryhmään.", "groupMemberNewYouHistoryMultiple": "Sinä ja {count} muuta kutsuttiin ryhmään. Keskusteluhistoria jaetaan.", - "groupMemberNewYouHistoryTwo": "Sinä ja {name} kutsuttiin ryhmään. Keskusteluhistoria jaetaan.", "groupMemberYouLeft": "Sinä poistuit ryhmästä.", "groupMembers": "Ryhmän jäsenet", "groupMembersNone": "Ryhmässä ei ole muita jäseniä.", diff --git a/_locales/fil/messages.json b/_locales/fil/messages.json index 8abf9fc4cb..fccca73e69 100644 --- a/_locales/fil/messages.json +++ b/_locales/fil/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} at {count} iba pa ay naimbitahan na sumali sa grupo.", "groupMemberNewTwo": "{name} at {other_name} ay naimbitahan na sumali sa grupo.", "groupMemberNewYouHistoryMultiple": "Ikaw at {count} iba pa ay naimbitahan na sumali sa grupo. Ibinahagi ang kasaysayan ng chat.", - "groupMemberNewYouHistoryTwo": "Ikaw at {name} ay naimbitahan na sumali sa grupo. Ibinahagi ang kasaysayan ng chat.", "groupMemberYouLeft": "Ikaw ay umalis sa grupo.", "groupMembers": "Mga Miyembro ng Grupo", "groupMembersNone": "Walang ibang miyembro sa grupong ito.", diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index 909a360024..dd7a801caa 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} et {count} autres ont été invité·e·s à rejoindre le groupe.", "groupMemberNewTwo": "{name} et {other_name} ont été invités à rejoindre le groupe.", "groupMemberNewYouHistoryMultiple": "Vous et {count} autres avez été invité·e·s à rejoindre le groupe. L'historique de discussion a été partagé.", - "groupMemberNewYouHistoryTwo": "Vous et {name} avez été invité·e·s à rejoindre le groupe. L'historique de discussion a été partagé.", "groupMemberYouLeft": "Vous avez quitté le groupe.", "groupMembers": "Membres du groupe", "groupMembersNone": "Il n'y a pas d'autres membres dans ce groupe.", diff --git a/_locales/ha/messages.json b/_locales/ha/messages.json index 87dd4c9761..15f2999fda 100644 --- a/_locales/ha/messages.json +++ b/_locales/ha/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} da {count} wasu an gayyace su shiga ƙungiyar.", "groupMemberNewTwo": "{name} da {other_name} an gayyace su shiga ƙungiyar.", "groupMemberNewYouHistoryMultiple": "Ku da {count} wasu an gayyace ku shiga ƙungiyar. An raba tarihin hira.", - "groupMemberNewYouHistoryTwo": "Ku da {name} an gayyace ku shiga ƙungiyar. An raba tarihin hira.", "groupMemberYouLeft": "Ku sun bar ƙungiyar.", "groupMembers": "Mambobin rukunin", "groupMembersNone": "Babu sauran mambobi a cikin wannan rukunin.", diff --git a/_locales/he/messages.json b/_locales/he/messages.json index 08f109a459..f191d43653 100644 --- a/_locales/he/messages.json +++ b/_locales/he/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name}‏ ו{count} אחרים‏ הוזמנו להצטרף לקבוצה.", "groupMemberNewTwo": "{name}‏ ו{other_name}‏ הוזמנו להצטרף לקבוצה.", "groupMemberNewYouHistoryMultiple": "את/ה ו{count} אחרים‏ הוזמנתם להצטרף לקבוצה. היסטוריית הצ'אט שותפה.", - "groupMemberNewYouHistoryTwo": "את/ה ו{name}‏ הוזמנתם להצטרף לקבוצה. היסטוריית הצ'אט שותפה.", "groupMemberYouLeft": "את/ה עזבת את הקבוצה.", "groupMembers": "חברי קבוצה", "groupMembersNone": "אין חברים אחרים בקבוצה זו.", diff --git a/_locales/hi/messages.json b/_locales/hi/messages.json index 6f10c7d2fb..3e66764bf9 100644 --- a/_locales/hi/messages.json +++ b/_locales/hi/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} और {count} अन्य को समूह में शामिल होने के लिए आमंत्रित किया गया।", "groupMemberNewTwo": "{name} और {other_name} को समूह में शामिल होने के लिए आमंत्रित किया गया था।", "groupMemberNewYouHistoryMultiple": "आप और {count} अन्य को समूह में शामिल होने के लिए आमंत्रित किया गया। चैट इतिहास साझा किया गया।", - "groupMemberNewYouHistoryTwo": "आप और {name} को समूह में शामिल होने के लिए आमंत्रित किया गया। चैट इतिहास साझा किया गया।", "groupMemberYouLeft": "आप ने समूह छोड़ दिया।", "groupMembers": "समूह के सदस्य", "groupMembersNone": "इस समूह में कोई अन्य सदस्य नहीं है।", diff --git a/_locales/hr/messages.json b/_locales/hr/messages.json index 2f2c3771e6..5a5df5c9c3 100644 --- a/_locales/hr/messages.json +++ b/_locales/hr/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} i {count} drugi pozvani su da se pridruže grupi.", "groupMemberNewTwo": "{name} i {other_name} pozvani su da se pridruže grupi.", "groupMemberNewYouHistoryMultiple": "Vi i {count} drugi pozvani ste da se pridružite grupi. Povijest razgovora je podijeljena.", - "groupMemberNewYouHistoryTwo": "Vi i {name} pozvani ste da se pridružite grupi. Povijest razgovora je podijeljena.", "groupMemberYouLeft": "Napustili ste grupu.", "groupMembers": "Članovi grupe", "groupMembersNone": "Nema drugih članova u ovoj grupi.", diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json index 5b9ff1bd43..967e04329b 100644 --- a/_locales/hu/messages.json +++ b/_locales/hu/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} és {count} másik személy meghívást kaptak a csoportba.", "groupMemberNewTwo": "{name} és {other_name} meghívást kaptak a csoportba.", "groupMemberNewYouHistoryMultiple": "Te és {count} másik személy meg lettetek hívva a csoportba. A beszélgetési előzményeket megosztottuk.", - "groupMemberNewYouHistoryTwo": "Te és {name} meg lettetek hívva a csoportba. A beszélgetési előzményeket megosztottuk.", "groupMemberYouLeft": "Te kiléptél a csoportból.", "groupMembers": "Csoporttagok", "groupMembersNone": "Nincsenek más tagok ebben a csoportban.", diff --git a/_locales/hy-AM/messages.json b/_locales/hy-AM/messages.json index dc3c91c031..99f27c8ec9 100644 --- a/_locales/hy-AM/messages.json +++ b/_locales/hy-AM/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name}֊ը և {count} ուրիշներ հրավիրվել են միանալու խմբին:", "groupMemberNewTwo": "{name}֊ը և {other_name}֊ը հրավիրվել են միանալու խմբին:", "groupMemberNewYouHistoryMultiple": "Դուք և {count} ուրիշներ հրավիրվել են միանալու խմբին: Զրույցի պատմությունը կիսվել է:", - "groupMemberNewYouHistoryTwo": "Դուք և {name}֊ը հրավիրվել են միանալու խմբին: Զրույցի պատմությունը կիսվել է:", "groupMemberYouLeft": "Դուք լքեցիք խումբը:", "groupMembers": "Խմբի անդամներ", "groupMembersNone": "Այս խմբում այլ անդամներ չկան.", diff --git a/_locales/id/messages.json b/_locales/id/messages.json index 810d631764..d74fded3d6 100644 --- a/_locales/id/messages.json +++ b/_locales/id/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} dan {count} lainnya telah diundang untuk bergabung dengan grup.", "groupMemberNewTwo": "{name} dan {other_name} telah diundang untuk bergabung dengan grup.", "groupMemberNewYouHistoryMultiple": "Anda dan {count} lainnya telah diundang untuk bergabung dengan grup. Riwayat obrolan dibagikan.", - "groupMemberNewYouHistoryTwo": "Anda dan {name} telah diundang untuk bergabung dengan grup. Riwayat obrolan dibagikan.", "groupMemberYouLeft": "Anda keluar dari grup.", "groupMembers": "Anggota grup", "groupMembersNone": "Tidak ada anggota lain di dalam grup ini.", diff --git a/_locales/it/messages.json b/_locales/it/messages.json index afafb77502..bbbfeb2046 100644 --- a/_locales/it/messages.json +++ b/_locales/it/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} e altri {count} hanno ricevuto un invito a unirsi al gruppo.", "groupMemberNewTwo": "{name} e {other_name} hanno ricevuto un invito a unirsi al gruppo.", "groupMemberNewYouHistoryMultiple": "Tu e altri {count} avete ricevuto un invito a unirvi al gruppo. La cronologia della chat è condivisa.", - "groupMemberNewYouHistoryTwo": "Tu e {name} avete ricevuto un invito a unirvi al gruppo. La cronologia della chat è condivisa.", "groupMemberYouLeft": "Hai lasciato il gruppo.", "groupMembers": "Membri del gruppo", "groupMembersNone": "Non ci sono altri membri in questo gruppo.", diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json index 9424e9b078..f38834e146 100644 --- a/_locales/ja/messages.json +++ b/_locales/ja/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} と {count}名 がグループに招待されました。", "groupMemberNewTwo": "{name} と {other_name} がグループに招待されました。", "groupMemberNewYouHistoryMultiple": "あなた と {count}名 がグループに招待されました。チャット履歴が共有されました。", - "groupMemberNewYouHistoryTwo": "あなた と {name} がグループに招待されました。チャット履歴が共有されました。", "groupMemberYouLeft": "Youがグループを退会しました", "groupMembers": "グループメンバー", "groupMembersNone": "このグループには他のメンバーがいません。", diff --git a/_locales/ka/messages.json b/_locales/ka/messages.json index 27deeaf3b7..f9e99a6067 100644 --- a/_locales/ka/messages.json +++ b/_locales/ka/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} და {count} სხვა მოიწვიეს ჯგუფში.", "groupMemberNewTwo": "{name} და {other_name} მოიწვიეს ჯგუფში.", "groupMemberNewYouHistoryMultiple": "თქვენ და {count} სხვა მიწვეული იყავით ჯგუფში. ჩეთის ისტორია გაზიარდა.", - "groupMemberNewYouHistoryTwo": "თქვენ და {name} მიწვეული იყავით ჯგუფში. ჩეთის ისტორია გაზიარდა.", "groupMemberYouLeft": "თქვენ დატოვეთ ჯგუფი.", "groupMembers": "ჯგუფის წევრები", "groupMembersNone": "ამ ჯგუფში სხვა წევრები არ არიან.", diff --git a/_locales/km/messages.json b/_locales/km/messages.json index 2dc26aeb3d..22e159832a 100644 --- a/_locales/km/messages.json +++ b/_locales/km/messages.json @@ -404,7 +404,6 @@ "groupMemberNewMultiple": "{name} និង {count} គេផ្សេងទៀត ត្រូវបានអញ្ជើញឱ្យចូលក្រុមនេះ។", "groupMemberNewTwo": "{name} និង {other_name} ត្រូវបានអញ្ជើញឱ្យចូលក្រុមនេះ។", "groupMemberNewYouHistoryMultiple": "អ្នក និង {count} គេផ្សេងទៀត ត្រូវបានអញ្ជើញឱ្យចូលក្រុមនេះ។បានចែករំលែកប្រវត្តិការជជែក។", - "groupMemberNewYouHistoryTwo": "អ្នក និង {name} ត្រូវបានអញ្ជើញឱ្យចូលក្រុមនេះ។បានចែករំលែកប្រវត្តិការជជែក។", "groupMemberYouLeft": "អ្នកបានចាកចេញពីក្រុម។", "groupMembers": "សមាជិកក្រុម", "groupMembersNone": "គ្មានសមាជិកផ្សេងទៀតនៅក្នុងក្រុមនេះទេ", diff --git a/_locales/kmr/messages.json b/_locales/kmr/messages.json index de00519fe3..aaa9b96566 100644 --- a/_locales/kmr/messages.json +++ b/_locales/kmr/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} û {count} yên din hatin dawetin ku tevlî komê bibin.", "groupMemberNewTwo": "{name} û {other_name} hatin dawetin ku tevlî komê bibin.", "groupMemberNewYouHistoryMultiple": "Te û {count} yên din hatin dawetin ku tevlî komê bibin. Dîroka sohbetê hate parve kirin.", - "groupMemberNewYouHistoryTwo": "Te û {name} hatin dawetin ku tevlî komê bibin. Dîroka sohbetê hate parve kirin.", "groupMemberYouLeft": "Tu ji komê derketî.", "groupMembers": "Endamên Kom", "groupMembersNone": "Li vê komê ti endamên din nîne.", diff --git a/_locales/kn/messages.json b/_locales/kn/messages.json index 6d74623447..26c3cd4177 100644 --- a/_locales/kn/messages.json +++ b/_locales/kn/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} ಮತ್ತು {count} ಇತರರನ್ನು ಗುಂಪಿಗೆ ಸೇರಲು ಆಹ್ವಾನಿಸಲಾಗಿದೆ.", "groupMemberNewTwo": "{name} ಮತ್ತು {other_name} ಅವರನ್ನು ಗುಂಪಿಗೆ ಸೇರಲು ಆಹ್ವಾನಿಸಲಾಗಿದೆ.", "groupMemberNewYouHistoryMultiple": "ನೀವು ಮತ್ತು {count} ಇತರರನ್ನು ಗುಂಪಿಗೆ ಸೇರಲು ಆಹ್ವಾನಿಸಲಾಗಿದೆ. ಚಾಟ್ ಇತಿಹಾಸವನ್ನು ಹಂಚಲಾಗಿದೆ.", - "groupMemberNewYouHistoryTwo": "ನೀವು ಮತ್ತು {name} ಅವರಿಗೆ ಗುಂಪಿಗೆ ಸೇರಲು ಆಹ್ವಾನಿಸಲಾಗಿದೆ. ಚಾಟ್ ಇತಿಹಾಸವನ್ನು ಹಂಚಲಾಗಿದೆ.", "groupMemberYouLeft": "ನೀವು ಗುಂಪನ್ನು ತೊರೆದು ಹೋದಿದ್ದೀರಿ.", "groupMembers": "ಗುಂಪಿನೊಂದಿಗೆ ಸಂಪರ್ಕ", "groupMembersNone": "ಈ ಗುಂಪಿನಲ್ಲಿ ಇತರ ಸದಸ್ಯರಿಲ್ಲ.", diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json index 0132695cd2..09c1aa9fe3 100644 --- a/_locales/ko/messages.json +++ b/_locales/ko/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name}님과 {count}명이 그룹에 초대되었습니다.", "groupMemberNewTwo": "{name}님과 {other_name}님이 그룹 초대를 받았습니다.", "groupMemberNewYouHistoryMultiple": "당신과 {count} 명의 사람들이 그룹으로 초대받았습니다. 대화 내역이 공개됩니다.", - "groupMemberNewYouHistoryTwo": "당신과 {name}이 그룹에 초대받았습니다. 대화 내역이 공개됩니다.", "groupMemberYouLeft": "당신이 그룹을 나갔습니다.", "groupMembers": "그룹 멤버", "groupMembersNone": "이 그룹에 다른 멤버가 없습니다.", diff --git a/_locales/ku/messages.json b/_locales/ku/messages.json index 5dbed26adc..910130c468 100644 --- a/_locales/ku/messages.json +++ b/_locales/ku/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} و {count} کەس دیکە بانگکران بۆ بەشداریکردن لە گروپەکە.", "groupMemberNewTwo": "{name} و {other_name} بانگکران بۆ بەشداریکردن لە گروپەکە.", "groupMemberNewYouHistoryMultiple": "تۆ و {count} کەس دیکە بانگکران بۆ بەشداریکردن لە گروپەکە. مێژوو بگردەوەیی پەیامەکان سییبرەیە.", - "groupMemberNewYouHistoryTwo": "تۆ و {name} بانگکران بۆ بەشداریکردن لە گروپەکە. مێژوو بگردەوەیی پەیامەکان سییبرەیە.", "groupMemberYouLeft": "تۆ گروپەکەت بەجێهێشتووە.", "groupMembers": "ئەندامانی گروپ", "groupMembersNone": "هیچ ئەندامی تر لەم گروپەدا نیە.", diff --git a/_locales/lg/messages.json b/_locales/lg/messages.json index b4175f77f9..07bec5f5ff 100644 --- a/_locales/lg/messages.json +++ b/_locales/lg/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} ne {count} abalala mwakuyitibwa okwegatta mu kibiina.", "groupMemberNewTwo": "{name} ne {other_name} mwakuyitibwa okwegatta mu kibiina.", "groupMemberNewYouHistoryMultiple": "Ggwe ne {count} abalala mwakuyitibwa okwegatta mu kibiina. Ebika by'obubaka by'akugabana.", - "groupMemberNewYouHistoryTwo": "Ggwe ne {name} mwakuyitibwa okwegatta mu kibiina. Ebika by'obubaka by'akugabana.", "groupMemberYouLeft": "Ggwe wafuma mu kibiina.", "groupMembers": "Bonna", "groupMembersNone": "Tewali mirala mu kibiina kino.", diff --git a/_locales/lt/messages.json b/_locales/lt/messages.json index c5c38c9162..5ae5fc865b 100644 --- a/_locales/lt/messages.json +++ b/_locales/lt/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} ir {count} kiti buvote pakviesti prisijungti prie grupės.", "groupMemberNewTwo": "{name} ir {other_name} buvote pakviesti prisijungti prie grupės.", "groupMemberNewYouHistoryMultiple": "Jūs ir dar {count} buvo pakviesti prisijungti prie grupės. Pokalbio istorija buvo pasidalinta.", - "groupMemberNewYouHistoryTwo": "Jūs ir {name} buvo pakviesti prisijungti prie grupės. Pokalbio istorija buvo pasidalinta.", "groupMemberYouLeft": "Jūs išėjote iš grupės.", "groupMembers": "Grupės dalyviai", "groupMembersNone": "Šioje grupėje nėra kitų narių.", diff --git a/_locales/mk/messages.json b/_locales/mk/messages.json index e637a949e8..f7d15d0373 100644 --- a/_locales/mk/messages.json +++ b/_locales/mk/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} и {count} други беа поканети да се придружат на групата.", "groupMemberNewTwo": "{name} и {other_name} беа поканети да се придружат на групата.", "groupMemberNewYouHistoryMultiple": "Вие и {count} други беа поканети да се придружат на групата. Историјата на разговорот е споделена.", - "groupMemberNewYouHistoryTwo": "Вие и {name} беа поканети да се придружат на групата. Историјата на разговорот е споделена.", "groupMemberYouLeft": "Вие ја напуштивте групата.", "groupMembers": "Членови на групата", "groupMembersNone": "Нема други членови во оваа група.", diff --git a/_locales/mn/messages.json b/_locales/mn/messages.json index ba11c7d66c..a97ba2fc96 100644 --- a/_locales/mn/messages.json +++ b/_locales/mn/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} болон {count} бусад бүлэгт уригдлаа.", "groupMemberNewTwo": "{name} болон {other_name} бүлэгт элсэхээр уригдсан байна.", "groupMemberNewYouHistoryMultiple": "Та болон {count} бусад бүлэгт нэгдэх урилга авсан байна. Чатын түүх хуваалцагдсан.", - "groupMemberNewYouHistoryTwo": "Та болон {name} бүлэгт нэгдэх урилга авсан байна. Чатын түүх хуваалцагдсан.", "groupMemberYouLeft": "Та бүлгээс гарлаа.", "groupMembers": "Бүлгийн гишүүд", "groupMembersNone": "Энэ бүлэгт өөр гишүүн байхгүй байна.", diff --git a/_locales/ms/messages.json b/_locales/ms/messages.json index c7e0f5761a..5cf331cc04 100644 --- a/_locales/ms/messages.json +++ b/_locales/ms/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} dan {count} lainnya dijemput untuk menyertai kumpulan.", "groupMemberNewTwo": "{name} dan {other_name} dijemput untuk menyertai kumpulan.", "groupMemberNewYouHistoryMultiple": "Anda dan {count} yang lain dijemput untuk menyertai kumpulan. Sejarah sembang telah dikongsi.", - "groupMemberNewYouHistoryTwo": "Anda dan {name} dijemput untuk menyertai kumpulan. Sejarah sembang telah dikongsi.", "groupMemberYouLeft": "Anda meninggalkan kumpulan.", "groupMembers": "Ahli Kumpulan", "groupMembersNone": "Tiada ahli lain di dalam kumpulan ini.", diff --git a/_locales/my/messages.json b/_locales/my/messages.json index 8d10c37d93..985d368adf 100644 --- a/_locales/my/messages.json +++ b/_locales/my/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} နှင့် {count} ဦး အဖွဲ့သို့ ဖိတ်ကြားခံရသည်။", "groupMemberNewTwo": "{name} နှင့် {other_name} အဖွဲ့သို့ ဖိတ်ကြားခံရသည်။", "groupMemberNewYouHistoryMultiple": "သင် နှင့် {count} ဦး အဖွဲ့သို့ ဖိတ်ကြားခံရသည်။ စကားဝိုင်းမှတ်တမ်းကိုမျှဝေခဲ့သည်။", - "groupMemberNewYouHistoryTwo": "သင်နှင့် {name} အဖွဲ့သို့ ဖိတ်ကြားခံရပြီ။ စကားဝိုင်းမှတ်တမ်းကိုမျှဝေခဲ့သည်။", "groupMemberYouLeft": "သင် အဖွဲ့မှ ထွက်သွားပါပြီ။", "groupMembers": "အုပ်စုဝင်များ", "groupMembersNone": "ဤအုပ်စုတွင် အခြား အဖွဲ့ဝင်မရှိပါ။", diff --git a/_locales/nb/messages.json b/_locales/nb/messages.json index 61851ab2c1..db3c36bf00 100644 --- a/_locales/nb/messages.json +++ b/_locales/nb/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} og {count} andre ble invitert til gruppen.", "groupMemberNewTwo": "{name} og {other_name} ble invitert til gruppen.", "groupMemberNewYouHistoryMultiple": "Du og {count} andre ble invitert til gruppen. Chat-historikk ble delt.", - "groupMemberNewYouHistoryTwo": "Du og {name} ble invitert til gruppen. Chat-historikk ble delt.", "groupMemberYouLeft": "Du forlot gruppen.", "groupMembers": "Gruppemedlemmer", "groupMembersNone": "Det er ingen andre medlemmer i denne gruppen.", diff --git a/_locales/ne/messages.json b/_locales/ne/messages.json index e32bdc041e..ab369c7b48 100644 --- a/_locales/ne/messages.json +++ b/_locales/ne/messages.json @@ -404,7 +404,6 @@ "groupMemberNewMultiple": "{name} र {count} अन्यलाई समूहमा सामेल हुन आमन्त्रित गरियो।", "groupMemberNewTwo": "{name} र {other_name}लाई समूहमा सामेल हुन आमन्त्रित गरियो।", "groupMemberNewYouHistoryMultiple": "तपाईं र {count} अन्यलाई समूहमा सामेल हुन आमन्त्रित गरियो। च्याट इतिहास सेयर गरियो।", - "groupMemberNewYouHistoryTwo": "तपाईं र {name}लाई समूहमा सामेल हुन आमन्त्रित गरियो। च्याट इतिहास सेयर गरियो।", "groupMemberYouLeft": "तपाईंले समूह छोड्नुभयो।", "groupMembers": "समूह सदस्यहरू", "groupMembersNone": "यस समूहमा अरु कुनै सदस्यहरू छैनन्।", diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json index 82167ca939..2d40483616 100644 --- a/_locales/nl/messages.json +++ b/_locales/nl/messages.json @@ -412,7 +412,6 @@ "groupMemberNewMultiple": "{name} en {count} anderen zijn uitgenodigd om lid te worden van de groep.", "groupMemberNewTwo": "{name} en {other_name} zijn uitgenodigd om lid te worden van de groep.", "groupMemberNewYouHistoryMultiple": "U en {count} anderen zijn uitgenodigd om lid te worden van de groep. Geschiedenis van het gesprek is gedeeld.", - "groupMemberNewYouHistoryTwo": "U en {name} zijn uitgenodigd om lid te worden van de groep. Geschiedenis van het gesprek is gedeeld.", "groupMemberYouLeft": "U heeft de groep verlaten.", "groupMembers": "Groepsleden", "groupMembersNone": "Er zijn geen andere leden in deze groep.", diff --git a/_locales/nn/messages.json b/_locales/nn/messages.json index 9bd7b05efe..7e187d5a78 100644 --- a/_locales/nn/messages.json +++ b/_locales/nn/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} og {count} andre vart invitert til å bli med i gruppa.", "groupMemberNewTwo": "{name} og {other_name} vart invitert til å bli med i gruppa.", "groupMemberNewYouHistoryMultiple": "Du og {count} andre vart invitert til å bli med i gruppa. Chathistorikk vart delt.", - "groupMemberNewYouHistoryTwo": "Du og {name} vart invitert til å bli med i gruppa. Chathistorikk vart delt.", "groupMemberYouLeft": "Du forlot gruppa.", "groupMembers": "Gruppemedlemmar", "groupMembersNone": "Det er ingen andre medlemmer i denne gruppa.", diff --git a/_locales/no/messages.json b/_locales/no/messages.json index 9e8a9c5815..7467c92b6b 100644 --- a/_locales/no/messages.json +++ b/_locales/no/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} og {count} andre ble invitert til å bli med i gruppen.", "groupMemberNewTwo": "{name} og {other_name} ble invitert til å bli med i gruppen.", "groupMemberNewYouHistoryMultiple": "Du og {count} andre ble invitert til å bli med i gruppen. Chat-historikk ble delt.", - "groupMemberNewYouHistoryTwo": "Du og {name} ble invitert til å bli med i gruppen. Chat-historikk ble delt.", "groupMemberYouLeft": "Du forlot gruppen.", "groupMembers": "Gruppemedlemmer", "groupMembersNone": "Det er ingen andre medlemmer i denne gruppen.", diff --git a/_locales/ny/messages.json b/_locales/ny/messages.json index 9f52eb5efa..38aed995a7 100644 --- a/_locales/ny/messages.json +++ b/_locales/ny/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} ndi {count} ena anaitanidwa kuti alowe mu gulu.", "groupMemberNewTwo": "{name} ndi {other_name} anaitanidwa kuti alowe mu gulu.", "groupMemberNewYouHistoryMultiple": "Inu ndi {count} ena anaitanidwa kuti alowe mu gulu. Mbiri ya macheza idagawidwa.", - "groupMemberNewYouHistoryTwo": "Inu ndi {name} anaitanidwa kuti alowe mu gulu. Mbiri ya macheza idagawidwa.", "groupMemberYouLeft": "Inu achoka gulu.", "groupMembers": "Mamembala am gulu", "groupMembersNone": "Palibe mamembala ena mu gulu ili.", diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json index fa6ada2653..74ce4296cc 100644 --- a/_locales/pl/messages.json +++ b/_locales/pl/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} i {count} innych użytkowników zostali zaproszeni do grupy.", "groupMemberNewTwo": "Użytkownicy {name} oraz {other_name} zostali zaproszeni do grupy.", "groupMemberNewYouHistoryMultiple": "Ty i {count} innych użytkowników zostaliście zaproszeni do grupy. Udostępniono historię czatu.", - "groupMemberNewYouHistoryTwo": "Ty oraz użytkownik {name} zostaliście zaproszeni do grupy. Udostępniono historię czatu.", "groupMemberYouLeft": "Opuszczasz grupę.", "groupMembers": "Członkowie grupy", "groupMembersNone": "W grupie nie ma innych członków.", diff --git a/_locales/ps/messages.json b/_locales/ps/messages.json index 3c8a0f9cdb..1a452ae491 100644 --- a/_locales/ps/messages.json +++ b/_locales/ps/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} او {count} نور ډله کې ګډون کولو ته بلل شوي.", "groupMemberNewTwo": "{name} او {other_name} ډله کې ګډون کولو ته بلل شوي.", "groupMemberNewYouHistoryMultiple": "تاسو او {count} نور ډله کې ګډون کولو ته بلل شوی. د خبرو تاریخ شریک شوی.", - "groupMemberNewYouHistoryTwo": "تاسو او {name} ډله کې ګډون کولو ته بلل شوی. د خبرو تاریخ شریک شوی.", "groupMemberYouLeft": "تاسو ګروپ پریښود.", "groupMembers": "د ډلې غړي", "groupMembersNone": "په دی ګروپ کې نور غړي نشته.", diff --git a/_locales/pt-BR/messages.json b/_locales/pt-BR/messages.json index a123f7bf4a..e8154adb87 100644 --- a/_locales/pt-BR/messages.json +++ b/_locales/pt-BR/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} e {count} outros foram convidados a juntar-se ao grupo.", "groupMemberNewTwo": "{name} e {other_name} foram convidados a juntar-se ao grupo.", "groupMemberNewYouHistoryMultiple": "Você e {count} outros foram convidados a participar do grupo. O histórico de conversas foi compartilhado.", - "groupMemberNewYouHistoryTwo": "Você e {name} foram convidados a participar do grupo. O histórico de conversas foi compartilhado.", "groupMemberYouLeft": "Você saiu do grupo.", "groupMembers": "Participantes do Grupo", "groupMembersNone": "Não há outros membros neste grupo.", diff --git a/_locales/pt-PT/messages.json b/_locales/pt-PT/messages.json index f6e261aa43..51fca321c7 100644 --- a/_locales/pt-PT/messages.json +++ b/_locales/pt-PT/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} e {count} outros foram convidados a juntar-se ao grupo.", "groupMemberNewTwo": "{name} e {other_name} foram convidados a juntar-se ao grupo.", "groupMemberNewYouHistoryMultiple": "Você e {count} outros foram convidados a juntar-se ao grupo. O histórico da conversa foi partilhado.", - "groupMemberNewYouHistoryTwo": "Você e {name} foram convidados a juntar-se ao grupo. O histórico da conversa foi partilhado.", "groupMemberYouLeft": "Você saiu do grupo.", "groupMembers": "Membros do Grupo", "groupMembersNone": "Não há outros membros neste grupo.", diff --git a/_locales/ro/messages.json b/_locales/ro/messages.json index 6c1deffcbd..54008aaaf5 100644 --- a/_locales/ro/messages.json +++ b/_locales/ro/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} și alți {count} au fost invitați să se alăture grupului.", "groupMemberNewTwo": "{name} și {other_name} au fost invitați să se alăture grupului.", "groupMemberNewYouHistoryMultiple": "Tu și alți {count} ați fost invitați să vă alăturați grupului. Istoricul conversațiilor a fost partajat.", - "groupMemberNewYouHistoryTwo": "Tu și {name} ați fost invitați să vă alăturați grupului. Istoricul conversațiilor a fost partajat.", "groupMemberYouLeft": "Tu ai părăsit grupul.", "groupMembers": "Membrii grupului", "groupMembersNone": "Nu există alți membri în acest grup.", diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index d1d61fd053..6e5d85a125 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -409,7 +409,6 @@ "groupMemberNewMultiple": "{name} и {count} других человек были приглашены в группу.", "groupMemberNewTwo": "{name} и {other_name} были приглашены в группу.", "groupMemberNewYouHistoryMultiple": "Вы и {count} других пользователей приглашены вступить в группу. История чата была передана.", - "groupMemberNewYouHistoryTwo": "Вы и пользователь {name} приглашены вступить в группу. История чата была передана.", "groupMemberYouLeft": "Вы покинули группу.", "groupMembers": "Участники группы", "groupMembersNone": "В этой группе нет других участников.", diff --git a/_locales/sh/messages.json b/_locales/sh/messages.json index 36b84bc9c4..b7ac7cfe51 100644 --- a/_locales/sh/messages.json +++ b/_locales/sh/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} i {count} drugih su pozvani da se pridruže grupi.", "groupMemberNewTwo": "{name} i {other_name} su pozvani da se pridruže grupi.", "groupMemberNewYouHistoryMultiple": "Ti i {count} drugih ste pozvani da se pridružite grupi. Istorija razgovora je deljena.", - "groupMemberNewYouHistoryTwo": "Ti i {name} ste pozvani da se pridružite grupi. Istorija razgovora je deljena.", "groupMemberYouLeft": "Ti si napustio grupu.", "groupMembers": "Članovi grupe", "groupMembersNone": "Nema drugih članova u ovoj grupi.", diff --git a/_locales/si/messages.json b/_locales/si/messages.json index ca12d437d6..40fa28f911 100644 --- a/_locales/si/messages.json +++ b/_locales/si/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} සහ {count} වෙනත් අය කණ්ඩායමට සම්බන්ධ වන්නට ආරාධනා කරන ලදී.", "groupMemberNewTwo": "{name} සහ {other_name} කණ්ඩායමට සම්බන්ධ වන්නට ආරාධනා කරන ලදී.", "groupMemberNewYouHistoryMultiple": "ඔබ සහ {count} වෙනත් අය කණ්ඩායමට සම්බන්ධ වන්නට ආරාධනා කරන ලදී. සංවාද ඉතිහාසය බෙදා ගන්නා ලදී.", - "groupMemberNewYouHistoryTwo": "ඔබ සහ {name} කණ්ඩායමට සම්බන්ධ වන්නට ආරාධනා කරන ලදී. සංවාද ඉතිහාසය බෙදා ගන්නා ලදී.", "groupMemberYouLeft": "ඔබ කණ්ඩායම හැර ගියේය.", "groupMembers": "සමූහ සාමාජිකයින්", "groupMembersNone": "මෙම සමූහයේ වෙනත් සාමාජිකයින් නැත.", diff --git a/_locales/sk/messages.json b/_locales/sk/messages.json index b41e3654d8..2ce8796ed9 100644 --- a/_locales/sk/messages.json +++ b/_locales/sk/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} a {count} ďalší boli pozvaní, aby sa pripojili do skupiny.", "groupMemberNewTwo": "{name} a {other_name} boli pozvaní, aby sa pripojili do skupiny.", "groupMemberNewYouHistoryMultiple": "Vy a {count} ďalší ste boli pozvaní, aby ste sa pripojili do skupiny. História chatu bola zdieľaná.", - "groupMemberNewYouHistoryTwo": "Vy a {name} ste boli pozvaní, aby ste sa pripojili do skupiny. História chatu bola zdieľaná.", "groupMemberYouLeft": "Vy ste opustili skupinu.", "groupMembers": "Členovia skupiny", "groupMembersNone": "V tejto skupine nie sú žiadni ďalší členovia.", diff --git a/_locales/sl/messages.json b/_locales/sl/messages.json index 3cf170c693..97fe28e94d 100644 --- a/_locales/sl/messages.json +++ b/_locales/sl/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} in {count} drugi so bili povabljeni, da se pridružijo skupini.", "groupMemberNewTwo": "{name} in {other_name} sta bila povabljena, da se pridružita skupini.", "groupMemberNewYouHistoryMultiple": "Vi in {count} drugi ste bili povabljeni, da se pridružite skupini. Zgodovina klepeta je bila deljena.", - "groupMemberNewYouHistoryTwo": "Vi in {name} sta bila povabljena, da se pridružita skupini. Zgodovina klepeta je bila deljena.", "groupMemberYouLeft": "Vi ste zapustili skupino.", "groupMembers": "Člani skupine", "groupMembersNone": "V tej skupini ni drugih članov.", diff --git a/_locales/sq/messages.json b/_locales/sq/messages.json index 11eebf4d83..d20a0bba2b 100644 --- a/_locales/sq/messages.json +++ b/_locales/sq/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} dhe {count} të tjerë u ftuat të bashkoheni me grupin.", "groupMemberNewTwo": "{name} dhe {other_name} u ftuat të bashkoheni me grupin.", "groupMemberNewYouHistoryMultiple": "Ju dhe {count} të tjerë u ftuat të bashkoheni me grupin. Historia e bisedës u ndanë.", - "groupMemberNewYouHistoryTwo": "Ju dhe {name} u ftuat të bashkoheni me grupin. Historia e bisedës u ndanë.", "groupMemberYouLeft": "Ju braktisët grupin.", "groupMembers": "Anëtarë grupi", "groupMembersNone": "Nuk ka anëtarë të tjerë në këtë grup.", diff --git a/_locales/sr-CS/messages.json b/_locales/sr-CS/messages.json index 058783c03c..b15f8c3833 100644 --- a/_locales/sr-CS/messages.json +++ b/_locales/sr-CS/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} i {count} drugih su pozvani da se pridruže grupi.", "groupMemberNewTwo": "{name} i {other_name} su pozvani da se pridruže grupi.", "groupMemberNewYouHistoryMultiple": "Vi i {count} drugih ste pozvani da se pridružite grupi. Istorija četa je podeljena.", - "groupMemberNewYouHistoryTwo": "Vi i {name} ste pozvani da se pridružite grupi. Istorija četa je podeljena.", "groupMemberYouLeft": "Vi ste napustili grupu.", "groupMembers": "Članovi grupe", "groupMembersNone": "Nema drugih članova u ovoj grupi.", diff --git a/_locales/sr-SP/messages.json b/_locales/sr-SP/messages.json index 92603f402a..0088290fd2 100644 --- a/_locales/sr-SP/messages.json +++ b/_locales/sr-SP/messages.json @@ -405,7 +405,6 @@ "groupMemberNewMultiple": "{name} и {count} осталих су позвани да се придруже групи.", "groupMemberNewTwo": "{name} и {other_name} су позвани да се придруже групи.", "groupMemberNewYouHistoryMultiple": "Ви и {count} осталих су позвани да се придруже групи. Историја ћаскања је подељена.", - "groupMemberNewYouHistoryTwo": "Ви и {name} су позвани да се придруже групи. Историја ћаскања је подељена.", "groupMemberYouLeft": "Ви сте напустили групу.", "groupMembers": "Чланови групе", "groupMembersNone": "Нема других чланова у овој групи.", diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json index 29714c97d7..7b7fd7abc6 100644 --- a/_locales/sv/messages.json +++ b/_locales/sv/messages.json @@ -407,7 +407,6 @@ "groupMemberNewMultiple": "{name} och {count} andra bjöds in till gruppen.", "groupMemberNewTwo": "{name} och {other_name} bjöds in att gå med i gruppen.", "groupMemberNewYouHistoryMultiple": "Du och {count} andra bjöds in att gå med i gruppen. Chatt historik delades.", - "groupMemberNewYouHistoryTwo": "Du och {name} bjöds in att gå med i gruppen. Chatt historik delades.", "groupMemberYouLeft": "Du lämnade gruppen.", "groupMembers": "Gruppmedlemmar", "groupMembersNone": "Det finns inga andra medlemmar i denna grupp.", diff --git a/_locales/sw/messages.json b/_locales/sw/messages.json index 5bde17485c..3fc48d9323 100644 --- a/_locales/sw/messages.json +++ b/_locales/sw/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} na {count} wengine wamealikwa kujiunga na kundi.", "groupMemberNewTwo": "{name} na {other_name} wamealikwa kujiunga na kundi.", "groupMemberNewYouHistoryMultiple": "Wewe na {count} wengine mmealikwa kujiunga na kundi. Historia ya gumzo ilishirikiwa.", - "groupMemberNewYouHistoryTwo": "Wewe na {name} mmealikwa kujiunga na kundi. Historia ya gumzo ilishirikiwa.", "groupMemberYouLeft": "Wewe umetoka kwenye kundi.", "groupMembers": "Wajumbe wa kikundi", "groupMembersNone": "Hakuna wanachama wengine katika kikundi hiki.", diff --git a/_locales/ta/messages.json b/_locales/ta/messages.json index 5f8a97695b..bae0d7c1a4 100644 --- a/_locales/ta/messages.json +++ b/_locales/ta/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} மற்றும் {count} பிறர் குழுவில் சேர்ந்தனர்.", "groupMemberNewTwo": "{name} மற்றும் {other_name} குழுவில் சேர்ந்தனர்.", "groupMemberNewYouHistoryMultiple": "நீங்கள் மற்றும் {count} பிறர் குழுவில் சேர்க்கப்பட்டீர்கள். உரையாடல் வரலாறு பகிரப்பட்டது.", - "groupMemberNewYouHistoryTwo": "நீங்கள் மற்றும் {name} குழுவில் சேர்க்கப்பட்டீர்கள். உரையாடல் வரலாறு பகிரப்பட்டது.", "groupMemberYouLeft": "நீங்கள் குழுவிலிருந்து வெளியேறிவிட்டீர்கள்.", "groupMembers": "குழு உறுப்பினர்கள்", "groupMembersNone": "இந்த குழுவில் வேறு உறுப்பினர்கள் இல்லை.", diff --git a/_locales/te/messages.json b/_locales/te/messages.json index 9a2d73c0d2..c7afeffd15 100644 --- a/_locales/te/messages.json +++ b/_locales/te/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} మరియు {count} ఇతరులు సమూహంలో చేరడానికి ఆహ్వానించబడ్డారు.", "groupMemberNewTwo": "{name} మరియు {other_name} సమూహంలో చేరడానికి ఆహ్వానించబడ్డారు.", "groupMemberNewYouHistoryMultiple": "మీరు మరియు {count} ఇతరులు సమూహంలో చేరడానికి ఆహ్వానించబడ్డారు. చాట్ చరిత్ర పంచబడింది.", - "groupMemberNewYouHistoryTwo": "మీరు మరియు {name} సమూహంలో చేరడానికి ఆహ్వానించబడ్డారు. చాట్ చరిత్ర పంచబడింది.", "groupMemberYouLeft": "మీరు సమూహాన్ని వదిలారు.", "groupMembers": "సమూహ సభ్యులు", "groupMembersNone": "ఈ గ్రూపులో ఇతరులు సభ్యులు లేరు.", diff --git a/_locales/th/messages.json b/_locales/th/messages.json index 5635daad06..b43c3e6080 100644 --- a/_locales/th/messages.json +++ b/_locales/th/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} และ {count} อื่นๆ ถูกเชิญเข้าร่วมกลุ่ม", "groupMemberNewTwo": "{name} และ {other_name} ถูกเชิญเข้าร่วมกลุ่ม", "groupMemberNewYouHistoryMultiple": "คุณ และ {count} อื่นๆ ถูกเชิญเข้าร่วมกลุ่ม ประวัติการแชทถูกแชร์", - "groupMemberNewYouHistoryTwo": "คุณ และ {name} ถูกเชิญเข้าร่วมกลุ่ม ประวัติการแชทถูกแชร์", "groupMemberYouLeft": "คุณ ได้ออกจากกลุ่ม", "groupMembers": "สมาชิกกลุ่ม", "groupMembersNone": "ไม่มีสมาชิกคนอื่นในกลุ่มนี้", diff --git a/_locales/tl/messages.json b/_locales/tl/messages.json index f477bf7f91..f9ee149fe2 100644 --- a/_locales/tl/messages.json +++ b/_locales/tl/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} at {count} iba pa ay inimbitahan na sumali sa grupo.", "groupMemberNewTwo": "{name} at {other_name} ay inimbitahan na sumali sa grupo.", "groupMemberNewYouHistoryMultiple": "Ikaw at {count} iba pa ay inimbitahan na sumali sa grupo. Naibahagi ang kasaysayan ng chat.", - "groupMemberNewYouHistoryTwo": "Ikaw at {name} ay inimbitahan na sumali sa grupo. Naibahagi ang kasaysayan ng chat.", "groupMemberYouLeft": "Ikaw ay umalis sa grupo.", "groupMembers": "Mga Miyembro ng Grupo", "groupMembersNone": "Walang ibang miyembro sa grupong ito.", diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json index 660b51c5c3..3c0d16a4b2 100644 --- a/_locales/tr/messages.json +++ b/_locales/tr/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} ve {count} diğer gruba katılmaları için davet edildi.", "groupMemberNewTwo": "{name} ve {other_name} gruba katılmak üzere davet edildi.", "groupMemberNewYouHistoryMultiple": "Sen ve {count} diğerleri gruba katılmaya davet edildiniz. Sohbet geçmişi paylaşıldı.", - "groupMemberNewYouHistoryTwo": "Sen ve {name} gruba katılmaya davet edildiniz. Sohbet geçmişi paylaşıldı.", "groupMemberYouLeft": "Sen gruptan ayrıldın.", "groupMembers": "Grup Üyeleri", "groupMembersNone": "Bu grupta başka üye yok.", diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json index 680721c28f..b1764cd90b 100644 --- a/_locales/uk/messages.json +++ b/_locales/uk/messages.json @@ -411,7 +411,6 @@ "groupMemberNewMultiple": "{name} та ще {count} інших були запрошені приєднатися до групи.", "groupMemberNewTwo": "{name} та {other_name} були запрошені приєднатися до групи.", "groupMemberNewYouHistoryMultiple": "Ви та {count} інших були запрошені приєднатися до групи. Було надано спільний доступ до історії чату.", - "groupMemberNewYouHistoryTwo": "Ви та {name} були запрошені приєднатися до групи. Було надано спільний доступ до історії чату.", "groupMemberYouLeft": "Ви покинули групу.", "groupMembers": "Учасники групи", "groupMembersNone": "Відсутні учасники у цій групі.", diff --git a/_locales/ur/messages.json b/_locales/ur/messages.json index 529e44182b..03ee531397 100644 --- a/_locales/ur/messages.json +++ b/_locales/ur/messages.json @@ -402,7 +402,6 @@ "groupMemberNewMultiple": "{name} اور {count} دیگر گروپ میں مدعو کیا گیا۔", "groupMemberNewTwo": "{name} اور {other_name} کو گروپ میں شامل ہونے کی دعوت دی گئی۔", "groupMemberNewYouHistoryMultiple": "آپ اور {count} دیگر گروپ میں شامل ہونے کی دعوت دی گئی۔ چیٹ تاریخ شیئر کی گئی۔", - "groupMemberNewYouHistoryTwo": "آپ اور {name} گروپ میں شامل ہونے کی دعوت دی گئی۔ چیٹ تاریخ شیئر کی گئی۔", "groupMemberYouLeft": "آپ نے گروپ چھوڑ دیا۔", "groupMembers": "گروپ کے اراکین", "groupMembersNone": "اس گروپ میں کوئی دیگر رکن نہیں ہیں۔", diff --git a/_locales/uz/messages.json b/_locales/uz/messages.json index 7d28d0edb6..466c532537 100644 --- a/_locales/uz/messages.json +++ b/_locales/uz/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} va {count} boshqalar guruhga qo'shildi.", "groupMemberNewTwo": "{name} va {other_name} guruhga qo'shildi.", "groupMemberNewYouHistoryMultiple": "Siz va {count} boshqalar guruhga qo'shildilar. Suhbat tarixini ko'rish imkoniyati berilgan.", - "groupMemberNewYouHistoryTwo": "Siz va {name} guruhga qo'shildi. Suhbat tarixini ko'rish imkoniyati berilgan.", "groupMemberYouLeft": "Siz guruhni tark etdik.", "groupMembers": "Guruh aʼzolari", "groupMembersNone": "Ushbu guruhda boshqa a'zolar yo'q.", diff --git a/_locales/vi/messages.json b/_locales/vi/messages.json index 5c81235990..d083588ccc 100644 --- a/_locales/vi/messages.json +++ b/_locales/vi/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} và {count} người khác đã được mời tham gia nhóm.", "groupMemberNewTwo": "{name} và {other_name} đã được mời tham gia nhóm.", "groupMemberNewYouHistoryMultiple": "Bạn và {count} người khác đã được mời tham gia nhóm. Lịch sử trò chuyện đã được chia sẻ.", - "groupMemberNewYouHistoryTwo": "Bạn và {name} đã được mời tham gia nhóm. Lịch sử trò chuyện đã được chia sẻ.", "groupMemberYouLeft": "Bạn đã rời nhóm.", "groupMembers": "Thành viên nhóm", "groupMembersNone": "Không có thành viên nào khác trong nhóm này.", diff --git a/_locales/xh/messages.json b/_locales/xh/messages.json index 940c6e5871..bc18027752 100644 --- a/_locales/xh/messages.json +++ b/_locales/xh/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} kunye {count} abanye abantu babememelwe ukuba bajoyine iqela.", "groupMemberNewTwo": "{name} kunye {other_name} babememelwe ukuba bajoyine iqela.", "groupMemberNewYouHistoryMultiple": "Mna kunye {count} abanye abantu babememelwe ukuba bajoyine iqela. Imbali yencoko yenziwe yabelwana ngayo.", - "groupMemberNewYouHistoryTwo": "Mna kunye {name} babememelwe ukuba bajoyine iqela. Imbali yencoko yenziwe yabelwana ngayo.", "groupMemberYouLeft": "Mna bashiye iqela.", "groupMembers": "Amalungu eQela", "groupMembersNone": "Akukho namanye amalungu kweli qela.", diff --git a/_locales/zh-CN/messages.json b/_locales/zh-CN/messages.json index 60c3354578..c32b690124 100644 --- a/_locales/zh-CN/messages.json +++ b/_locales/zh-CN/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name}和{count}名其他成员被邀请加入群组。", "groupMemberNewTwo": "{name}和{other_name}被邀请加入了群组。", "groupMemberNewYouHistoryMultiple": "您和其他{count}人被邀请加入群组。聊天记录已共享。", - "groupMemberNewYouHistoryTwo": "您和{name}被邀请加入了群组。 聊天记录已共享。", "groupMemberYouLeft": "您离开了群组。", "groupMembers": "群成员", "groupMembersNone": "此群组没有其他成员。", diff --git a/_locales/zh-TW/messages.json b/_locales/zh-TW/messages.json index a9d2b39ba2..24b472ba8b 100644 --- a/_locales/zh-TW/messages.json +++ b/_locales/zh-TW/messages.json @@ -406,7 +406,6 @@ "groupMemberNewMultiple": "{name} 和 {count} 位其他成員 已被邀請加入群組。", "groupMemberNewTwo": "{name} 和 {other_name} 已被邀請加入群組。", "groupMemberNewYouHistoryMultiple": "您 和 {count} 位其他成員 加入了群組。聊天記錄已分享。", - "groupMemberNewYouHistoryTwo": "您 和 {name} 加入了群組。聊天記錄已分享。", "groupMemberYouLeft": "你離開了此群組。", "groupMembers": "群組成員", "groupMembersNone": "這個群組沒有其他成員。", diff --git a/ts/models/groupUpdate.ts b/ts/models/groupUpdate.ts index 1e6f0b8a1d..e1332aacb1 100644 --- a/ts/models/groupUpdate.ts +++ b/ts/models/groupUpdate.ts @@ -87,7 +87,7 @@ export function getJoinedGroupUpdateChangeStr( return { token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou' }; case 1: return addedWithHistory - ? { token: 'groupMemberNewYouHistoryTwo', args: { name: othersNames[0] } } + ? { token: 'groupMemberNewYouHistoryTwo', args: { other_name: othersNames[0] } } : { token: 'groupInviteYouAndOtherNew', args: { other_name: othersNames[0] } }; default: return addedWithHistory From 4c258cc0441d6e1f3f0fb25941ba4a2ef6d7a1bb Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 12 Dec 2024 12:01:06 +1100 Subject: [PATCH 222/302] fix: sort group update changes by member pubkey --- ts/models/groupUpdate.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ts/models/groupUpdate.ts b/ts/models/groupUpdate.ts index e1332aacb1..0ff1775827 100644 --- a/ts/models/groupUpdate.ts +++ b/ts/models/groupUpdate.ts @@ -2,14 +2,15 @@ import { ConvoHub } from '../session/conversations'; import { UserUtils } from '../session/utils'; import type { LocalizerComponentPropsObject } from '../types/localizer'; -// to remove after merge with groups function usAndXOthers(arr: Array) { const us = UserUtils.getOurPubKeyStrFromCache(); - if (arr.includes(us)) { - return { us: true, others: arr.filter(m => m !== us) }; + const others = arr.filter(m => m !== us).sort(); + + if (others.length !== arr.length) { + return { us: true, others }; } - return { us: false, others: arr }; + return { us: false, others }; } export function getKickedGroupUpdateStr( From c96627f9d6dc468b8674ffb2a4faaf2b361f130a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 12 Dec 2024 12:11:12 +1100 Subject: [PATCH 223/302] fix: make msg request buttons sticky --- ts/components/SplitViewContainer.tsx | 3 ++- ts/components/conversation/MessageRequestButtons.tsx | 1 + ts/components/conversation/SessionConversation.tsx | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ts/components/SplitViewContainer.tsx b/ts/components/SplitViewContainer.tsx index 94485139d7..4f133a1160 100644 --- a/ts/components/SplitViewContainer.tsx +++ b/ts/components/SplitViewContainer.tsx @@ -8,7 +8,8 @@ type SplitViewProps = { }; const StyledSplitView = styled.div` - height: 100%; + max-height: 100%; + min-height: 0; display: flex; flex-direction: column; `; diff --git a/ts/components/conversation/MessageRequestButtons.tsx b/ts/components/conversation/MessageRequestButtons.tsx index 32bc31767c..bd70a3c70b 100644 --- a/ts/components/conversation/MessageRequestButtons.tsx +++ b/ts/components/conversation/MessageRequestButtons.tsx @@ -25,6 +25,7 @@ const MessageRequestContainer = styled.div` padding: var(--margins-lg); gap: var(--margins-lg); text-align: center; + background: var(--background-secondary-color); `; const ConversationBannerRow = styled.div` diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx index 3ad79d45cd..b57541844a 100644 --- a/ts/components/conversation/SessionConversation.tsx +++ b/ts/components/conversation/SessionConversation.tsx @@ -277,10 +277,10 @@ export class SessionConversation extends Component { } disableTop={!this.props.hasOngoingCallWithFocusedConvo} /> - {isDraggingFile && }
+ Date: Thu, 12 Dec 2024 16:12:40 +1100 Subject: [PATCH 224/302] chore: add modal dataTestId for title & description --- ts/components/SessionWrapperModal.tsx | 2 +- ts/components/dialog/SessionConfirm.tsx | 7 ++----- .../dialog/blockOrUnblock/BlockOrUnblockDialog.tsx | 2 +- ts/react.d.ts | 3 ++- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ts/components/SessionWrapperModal.tsx b/ts/components/SessionWrapperModal.tsx index 9f244c0444..5cccdf162f 100644 --- a/ts/components/SessionWrapperModal.tsx +++ b/ts/components/SessionWrapperModal.tsx @@ -124,7 +124,7 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => { }) : null} - {title} + {title} { const { title = '', i18nMessage, - i18nMessageSub, radioOptions, okTheme, closeTheme = SessionButtonColor.Danger, @@ -133,9 +131,8 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => { {!showHeader && }
- {i18nMessage ? : null} - {i18nMessageSub ? ( - + {i18nMessage ? ( + ) : null} {radioOptions && chosenOption !== '' ? ( - + diff --git a/ts/react.d.ts b/ts/react.d.ts index 79ff18f097..0e3fc2dc45 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -233,7 +233,8 @@ declare module 'react' { | 'conversation-options-avatar' | 'copy-sender-from-details' | 'copy-msg-from-details' - | 'block-unblock-modal-description' + | 'modal-heading' + | 'modal-description' // modules profile name | 'module-conversation__user__profile-name' | 'module-message-search-result__header__name__profile-name' From 3ee69437b0395fcb398a03af606346fa09835d32 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 13 Dec 2024 10:02:34 +1100 Subject: [PATCH 225/302] fix: split view with a few messages appeared sticky at the top --- ts/components/SplitViewContainer.tsx | 1 + ts/session/conversations/ConversationController.ts | 2 +- ts/session/types/PubKey.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ts/components/SplitViewContainer.tsx b/ts/components/SplitViewContainer.tsx index 4f133a1160..b81806ad45 100644 --- a/ts/components/SplitViewContainer.tsx +++ b/ts/components/SplitViewContainer.tsx @@ -11,6 +11,7 @@ const StyledSplitView = styled.div` max-height: 100%; min-height: 0; display: flex; + flex-grow: 1; flex-direction: column; `; diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 5be7a8397d..c62f79177a 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -166,7 +166,7 @@ class ConvoController { public getNicknameOrRealUsernameOrPlaceholder(pubKey: string): string { const conversation = ConvoHub.use().get(pubKey); if (!conversation) { - return pubKey; + return PubKey.shorten(pubKey); } return conversation.getNicknameOrRealUsernameOrPlaceholder(); } diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index 563f1a6bc6..ba98c6c62e 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -88,7 +88,7 @@ export class PubKey { const pk = value instanceof PubKey ? valAny.key : value; if (!pk || pk.length < 8) { - throw new Error('PubKey.shorten was given an invalid PubKey to shorten.'); + return pk; } return `(${pk.substring(0, 4)}...${pk.substring(pk.length - 4)})`; From c3cfd3795039700ca62fbe54e54bea87535b539b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 13 Dec 2024 15:31:38 +1100 Subject: [PATCH 226/302] fix: clean up delete/leave group&communities button/menuitems --- .../message-content/MessageContextMenu.tsx | 2 +- .../overlay/OverlayRightPanelSettings.tsx | 127 ++++++++++++++---- .../message-info/OverlayMessageInfo.tsx | 2 +- .../menu/ConversationListItemContextMenu.tsx | 9 +- ts/components/menu/Menu.tsx | 38 +----- .../CopyAccountId/CopyAccountIdMenuItem.tsx | 4 +- .../CopyAccountId/{index.ts => guard.ts} | 3 + .../CopyCommunityUrlMenuItem.tsx | 2 +- .../CopyCommunityUrl/{index.ts => guard.ts} | 0 .../DeleteGroupMenuItem.tsx | 46 +++++++ .../LeaveGroupMenuItem.tsx | 43 ++++++ .../menu/items/LeaveAndDeleteGroup/guard.ts | 42 ++++++ .../LeaveCommunity/LeaveCommunityMenuItem.tsx | 26 ++++ .../menu/items/LeaveCommunity/guard.ts | 3 + ts/hooks/useParamSelector.ts | 10 ++ ts/interactions/conversationInteractions.ts | 31 ++++- 16 files changed, 309 insertions(+), 79 deletions(-) rename ts/components/menu/items/CopyAccountId/{index.ts => guard.ts} (73%) rename ts/components/menu/items/CopyCommunityUrl/{index.ts => guard.ts} (100%) create mode 100644 ts/components/menu/items/LeaveAndDeleteGroup/DeleteGroupMenuItem.tsx create mode 100644 ts/components/menu/items/LeaveAndDeleteGroup/LeaveGroupMenuItem.tsx create mode 100644 ts/components/menu/items/LeaveAndDeleteGroup/guard.ts create mode 100644 ts/components/menu/items/LeaveCommunity/LeaveCommunityMenuItem.tsx create mode 100644 ts/components/menu/items/LeaveCommunity/guard.ts diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx index 909bcda1a3..e10fea0689 100644 --- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx +++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx @@ -46,7 +46,6 @@ import { Reactions } from '../../../../util/reactions'; import { SessionContextMenuContainer } from '../../../SessionContextMenuContainer'; import { SessionEmojiPanel, StyledEmojiPanel } from '../../SessionEmojiPanel'; import { MessageReactBar } from './MessageReactBar'; -import { showCopyAccountIdAction } from '../../../menu/items/CopyAccountId'; import { CopyAccountIdMenuItem } from '../../../menu/items/CopyAccountId/CopyAccountIdMenuItem'; import { Localizer } from '../../../basic/Localizer'; import { ItemWithDataTestId } from '../../../menu/items/MenuItemWithDataTestId'; @@ -54,6 +53,7 @@ import { getMenuAnimation } from '../../../menu/MenuAnimation'; import { WithMessageId } from '../../../../session/types/with'; import { DeleteItem } from '../../../menu/items/DeleteMessage/DeleteMessageMenuItem'; import { RetryItem } from '../../../menu/items/RetrySend/RetrySendMenuItem'; +import { showCopyAccountIdAction } from '../../../menu/items/CopyAccountId/guard'; export type MessageContextMenuSelectorProps = Pick< MessageRenderingProps, diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 828e27eeb5..fd180fab90 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -1,7 +1,7 @@ import { compact, flatten, isEqual } from 'lodash'; import { SessionDataTestId, useEffect, useState } from 'react'; -import { useDispatch } from 'react-redux'; +import { useDispatch, useSelector } from 'react-redux'; import useInterval from 'react-use/lib/useInterval'; import styled from 'styled-components'; import { Data } from '../../../../data/data'; @@ -10,6 +10,10 @@ import { SessionIconButton } from '../../../icon'; import { useConversationUsername, useDisappearingMessageSettingText, + useIsClosedGroup, + useIsKickedFromGroup, + useIsPublic, + useLastMessageIsLeaveError, } from '../../../../hooks/useParamSelector'; import { useIsRightPanelShowing } from '../../../../hooks/useUI'; import { @@ -36,7 +40,6 @@ import { useSelectedIsGroupV2, useSelectedIsKickedFromGroup, useSelectedIsPublic, - useSelectedLastMessage, useSelectedSubscriberCount, useSelectedWeAreAdmin, } from '../../../../state/selectors/selectedConversation'; @@ -49,11 +52,13 @@ import { PanelButtonGroup, PanelIconButton } from '../../../buttons'; import { MediaItemType } from '../../../lightbox/LightboxGallery'; import { MediaGallery } from '../../media-gallery/MediaGallery'; import { Header, StyledScrollContainer } from './components'; -import { - ConversationInteractionStatus, - ConversationInteractionType, -} from '../../../../interactions/types'; import { Localizer } from '../../../basic/Localizer'; +import { + showDeleteGroupItem, + showLeaveGroupItem, +} from '../../../menu/items/LeaveAndDeleteGroup/guard'; +import { getIsMessageRequestOverlayShown } from '../../../../state/selectors/section'; +import { showLeaveCommunityItem } from '../../../menu/items/LeaveCommunity/guard'; async function getMediaGalleryProps(conversationId: string): Promise<{ documents: Array; @@ -199,12 +204,94 @@ const StyledName = styled.h4` font-size: var(--font-size-md); `; +const LeaveCommunityPanelButton = () => { + const selectedConvoKey = useSelectedConversationKey(); + const selectedUsername = useConversationUsername(selectedConvoKey) || selectedConvoKey; + const isPublic = useIsPublic(selectedConvoKey); + + const showItem = showLeaveCommunityItem({ isPublic }); + + if (!selectedConvoKey || !showItem) { + return null; + } + + return ( + void showLeaveGroupByConvoId(selectedConvoKey, selectedUsername)} + color={'var(--danger-color)'} + iconType={'delete'} + /> + ); +}; + +const DeleteGroupPanelButton = () => { + const convoId = useSelectedConversationKey(); + const isGroup = useIsClosedGroup(convoId); + const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isKickedFromGroup = useIsKickedFromGroup(convoId) || false; + const lastMessageIsLeaveError = useLastMessageIsLeaveError(convoId); + const selectedUsername = useConversationUsername(convoId) || convoId; + + const showItem = showDeleteGroupItem({ + isGroup, + isKickedFromGroup, + isMessageRequestShown, + lastMessageIsLeaveError, + }); + + if (!showItem || !convoId) { + return null; + } + const token = PubKey.is03Pubkey(convoId) ? 'groupDelete' : 'conversationsDelete'; + + return ( + void showLeaveGroupByConvoId(convoId, selectedUsername)} + color={'var(--danger-color)'} + iconType={'delete'} + /> + ); +}; + +const LeaveGroupPanelButton = () => { + const selectedConvoKey = useSelectedConversationKey(); + const isGroup = useIsClosedGroup(selectedConvoKey); + const username = useConversationUsername(selectedConvoKey) || selectedConvoKey; + const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isKickedFromGroup = useIsKickedFromGroup(selectedConvoKey) || false; + const lastMessageIsLeaveError = useLastMessageIsLeaveError(selectedConvoKey); + + const showItem = showLeaveGroupItem({ + isGroup, + isKickedFromGroup, + isMessageRequestShown, + lastMessageIsLeaveError, + }); + + if (!selectedConvoKey || !showItem) { + return null; + } + + return ( + void showLeaveGroupByConvoId(selectedConvoKey, username)} + color={'var(--danger-color)'} + iconType={'delete'} + /> + ); +}; + export const OverlayRightPanelSettings = () => { const [documents, setDocuments] = useState>([]); const [media, setMedia] = useState>([]); const selectedConvoKey = useSelectedConversationKey(); - const selectedUsername = useConversationUsername(selectedConvoKey) || selectedConvoKey; const isShowing = useIsRightPanelShowing(); const dispatch = useDispatch(); @@ -219,7 +306,6 @@ export const OverlayRightPanelSettings = () => { const disappearingMessagesSubtitle = useDisappearingMessageSettingText({ convoId: selectedConvoKey, }); - const lastMessage = useSelectedLastMessage(); useEffect(() => { let isCancelled = false; @@ -269,23 +355,11 @@ export const OverlayRightPanelSettings = () => { const commonNoShow = isKickedFromGroup || isBlocked || !isActive; const hasDisappearingMessages = !isPublic && !commonNoShow; - const leaveGroupString = isPublic - ? window.i18n('communityLeave') - : lastMessage?.interactionType === ConversationInteractionType.Leave && - lastMessage?.interactionStatus === ConversationInteractionStatus.Error - ? window.i18n('conversationsDelete') - : isKickedFromGroup - ? window.i18n('groupDelete') - : window.i18n('groupLeave'); const showUpdateGroupNameButton = isGroup && weAreAdmin && !commonNoShow; // legacy groups non-admin cannot change groupname anymore const showAddRemoveModeratorsButton = weAreAdmin && !commonNoShow && isPublic; const showUpdateGroupMembersButton = !isPublic && isGroup && !commonNoShow; - const deleteConvoAction = () => { - void showLeaveGroupByConvoId(selectedConvoKey, selectedUsername); - }; - return ( @@ -399,14 +473,11 @@ export const OverlayRightPanelSettings = () => { {isGroup && ( - void deleteConvoAction()} - color={'var(--danger-color)'} - iconType={'delete'} - /> + <> + + + + )} diff --git a/ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx b/ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx index cf0d9d195b..c1e3c7bb37 100644 --- a/ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx +++ b/ts/components/conversation/right-panel/overlay/message-info/OverlayMessageInfo.tsx @@ -51,7 +51,7 @@ import { Message } from '../../../message/message-item/Message'; import { AttachmentInfo, MessageInfo } from './components'; import { AttachmentCarousel } from './components/AttachmentCarousel'; import { ToastUtils } from '../../../../../session/utils'; -import { showCopyAccountIdAction } from '../../../../menu/items/CopyAccountId'; +import { showCopyAccountIdAction } from '../../../../menu/items/CopyAccountId/guard'; // NOTE we override the default max-widths when in the detail isDetailView const StyledMessageBody = styled.div` diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx index 6d078f8a18..2ac35998f1 100644 --- a/ts/components/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/menu/ConversationListItemContextMenu.tsx @@ -21,7 +21,6 @@ import { DeleteMessagesMenuItem, DeletePrivateConversationMenuItem, InviteContactMenuItem, - LeaveGroupOrCommunityMenuItem, MarkAllReadMenuItem, MarkConversationUnreadMenuItem, NotificationForConvoMenuItem, @@ -32,6 +31,9 @@ import { CopyCommunityUrlMenuItem } from './items/CopyCommunityUrl/CopyCommunity import { CopyAccountIdMenuItem } from './items/CopyAccountId/CopyAccountIdMenuItem'; import { ItemWithDataTestId } from './items/MenuItemWithDataTestId'; import { getMenuAnimation } from './MenuAnimation'; +import { LeaveCommunityMenuItem } from './items/LeaveCommunity/LeaveCommunityMenuItem'; +import { LeaveGroupMenuItem } from './items/LeaveAndDeleteGroup/LeaveGroupMenuItem'; +import { DeleteGroupMenuItem } from './items/LeaveAndDeleteGroup/DeleteGroupMenuItem'; export type PropsContextConversationItem = { triggerId: string; @@ -57,7 +59,6 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) => {/* Generic actions */} - @@ -73,7 +74,9 @@ const ConversationListItemContextMenu = (props: PropsContextConversationItem) => - + + + diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index 64c1741d8c..b032375483 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -15,7 +15,6 @@ import { useIsPrivate, useIsPrivateAndFriend, useIsPublic, - useLastMessage, useNicknameOrProfileNameOrShortenedPubkey, useNotificationSetting, useWeAreAdmin, @@ -31,8 +30,7 @@ import { showAddModeratorsByConvoId, showBanUserByConvoId, showInviteContactByConvoId, - showLeaveGroupByConvoId, - showLeavePrivateConversationByConvoId, + showDeletePrivateConversationByConvoId, showRemoveModeratorsByConvoId, showUnbanUserByConvoId, showUpdateGroupNameByConvoId, @@ -58,10 +56,6 @@ import { useSelectedConversationKey } from '../../state/selectors/selectedConver import type { LocalizerToken } from '../../types/localizer'; import { SessionButtonColor } from '../basic/SessionButton'; import { ItemWithDataTestId } from './items/MenuItemWithDataTestId'; -import { - ConversationInteractionStatus, - ConversationInteractionType, -} from '../../interactions/types'; import { useLibGroupDestroyed } from '../../state/selectors/userGroups'; import { NetworkTime } from '../../util/NetworkTime'; @@ -155,34 +149,6 @@ export const DeletePrivateContactMenuItem = () => { return null; }; -export const LeaveGroupOrCommunityMenuItem = () => { - const convoId = useConvoIdFromContext(); - const username = useConversationUsername(convoId) || convoId; - const isPrivate = useIsPrivate(convoId); - const isPublic = useIsPublic(convoId); - const lastMessage = useLastMessage(convoId); - const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); - - if (!isPrivate && !isMessageRequestShown) { - return ( - { - void showLeaveGroupByConvoId(convoId, username); - }} - > - {isPublic - ? window.i18n('communityLeave') - : lastMessage?.interactionType === ConversationInteractionType.Leave && - lastMessage?.interactionStatus === ConversationInteractionStatus.Error - ? window.i18n('conversationsDelete') - : window.i18n('groupLeave')} - - ); - } - - return null; -}; - export const ShowUserDetailsMenuItem = () => { const dispatch = useDispatch(); const convoId = useConvoIdFromContext(); @@ -427,7 +393,7 @@ export const DeletePrivateConversationMenuItem = () => { return ( { - showLeavePrivateConversationByConvoId(convoId); + showDeletePrivateConversationByConvoId(convoId); }} > {isMe ? window.i18n('noteToSelfHide') : window.i18n('conversationsDelete')} diff --git a/ts/components/menu/items/CopyAccountId/CopyAccountIdMenuItem.tsx b/ts/components/menu/items/CopyAccountId/CopyAccountIdMenuItem.tsx index 4bd303f579..935ff093d3 100644 --- a/ts/components/menu/items/CopyAccountId/CopyAccountIdMenuItem.tsx +++ b/ts/components/menu/items/CopyAccountId/CopyAccountIdMenuItem.tsx @@ -1,8 +1,8 @@ import { useIsPrivate } from '../../../../hooks/useParamSelector'; import { copyPublicKeyByConvoId } from '../../../../interactions/conversationInteractions'; import { Localizer } from '../../../basic/Localizer'; -import { showCopyAccountIdAction } from '.'; import { ItemWithDataTestId } from '../MenuItemWithDataTestId'; +import { showCopyAccountIdAction } from './guard'; /** * Can be used to copy the conversation AccountID or the message's author sender'id. @@ -11,8 +11,6 @@ import { ItemWithDataTestId } from '../MenuItemWithDataTestId'; export const CopyAccountIdMenuItem = ({ pubkey }: { pubkey: string }): JSX.Element | null => { const isPrivate = useIsPrivate(pubkey); - // we want to show the copyId for communities only - if (showCopyAccountIdAction({ isPrivate, pubkey })) { return ( { const isPublic = useIsPublic(convoId); diff --git a/ts/components/menu/items/CopyCommunityUrl/index.ts b/ts/components/menu/items/CopyCommunityUrl/guard.ts similarity index 100% rename from ts/components/menu/items/CopyCommunityUrl/index.ts rename to ts/components/menu/items/CopyCommunityUrl/guard.ts diff --git a/ts/components/menu/items/LeaveAndDeleteGroup/DeleteGroupMenuItem.tsx b/ts/components/menu/items/LeaveAndDeleteGroup/DeleteGroupMenuItem.tsx new file mode 100644 index 0000000000..18411a807c --- /dev/null +++ b/ts/components/menu/items/LeaveAndDeleteGroup/DeleteGroupMenuItem.tsx @@ -0,0 +1,46 @@ +import { useSelector } from 'react-redux'; +import { useConvoIdFromContext } from '../../../../contexts/ConvoIdContext'; +import { + useConversationUsername, + useIsKickedFromGroup, + useIsClosedGroup, + useLastMessageIsLeaveError, +} from '../../../../hooks/useParamSelector'; +import { showLeaveGroupByConvoId } from '../../../../interactions/conversationInteractions'; +import { PubKey } from '../../../../session/types'; +import { getIsMessageRequestOverlayShown } from '../../../../state/selectors/section'; +import { ItemWithDataTestId } from '../MenuItemWithDataTestId'; +import { showDeleteGroupItem } from './guard'; +import { Localizer } from '../../../basic/Localizer'; + +export const DeleteGroupMenuItem = () => { + const convoId = useConvoIdFromContext(); + const username = useConversationUsername(convoId) || convoId; + const isGroup = useIsClosedGroup(convoId); + const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isKickedFromGroup = useIsKickedFromGroup(convoId) || false; + const lastMessageIsLeaveError = useLastMessageIsLeaveError(convoId); + + const showLeave = showDeleteGroupItem({ + isGroup, + isKickedFromGroup, + isMessageRequestShown, + lastMessageIsLeaveError, + }); + + if (!showLeave) { + return null; + } + + const token = PubKey.is03Pubkey(convoId) ? 'groupDelete' : 'conversationsDelete'; + + return ( + { + void showLeaveGroupByConvoId(convoId, username); + }} + > + + + ); +}; diff --git a/ts/components/menu/items/LeaveAndDeleteGroup/LeaveGroupMenuItem.tsx b/ts/components/menu/items/LeaveAndDeleteGroup/LeaveGroupMenuItem.tsx new file mode 100644 index 0000000000..4facb6bbd7 --- /dev/null +++ b/ts/components/menu/items/LeaveAndDeleteGroup/LeaveGroupMenuItem.tsx @@ -0,0 +1,43 @@ +import { useSelector } from 'react-redux'; +import { useConvoIdFromContext } from '../../../../contexts/ConvoIdContext'; +import { + useConversationUsername, + useIsKickedFromGroup, + useIsClosedGroup, + useLastMessageIsLeaveError, +} from '../../../../hooks/useParamSelector'; +import { showLeaveGroupByConvoId } from '../../../../interactions/conversationInteractions'; +import { getIsMessageRequestOverlayShown } from '../../../../state/selectors/section'; +import { ItemWithDataTestId } from '../MenuItemWithDataTestId'; +import { showLeaveGroupItem } from './guard'; +import { Localizer } from '../../../basic/Localizer'; + +export const LeaveGroupMenuItem = () => { + const convoId = useConvoIdFromContext(); + const isGroup = useIsClosedGroup(convoId); + const username = useConversationUsername(convoId) || convoId; + const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isKickedFromGroup = useIsKickedFromGroup(convoId) || false; + const lastMessageIsLeaveError = useLastMessageIsLeaveError(convoId); + + const showLeave = showLeaveGroupItem({ + isGroup, + isMessageRequestShown, + isKickedFromGroup, + lastMessageIsLeaveError, + }); + + if (!showLeave) { + return null; + } + + return ( + { + void showLeaveGroupByConvoId(convoId, username); + }} + > + + + ); +}; diff --git a/ts/components/menu/items/LeaveAndDeleteGroup/guard.ts b/ts/components/menu/items/LeaveAndDeleteGroup/guard.ts new file mode 100644 index 0000000000..e0dda44f5c --- /dev/null +++ b/ts/components/menu/items/LeaveAndDeleteGroup/guard.ts @@ -0,0 +1,42 @@ +function sharedEnabled({ + isGroup, + isMessageRequestShown, +}: Pick[0], 'isGroup' | 'isMessageRequestShown'>) { + return isGroup && !isMessageRequestShown; +} + +export function showLeaveGroupItem({ + isGroup, + isKickedFromGroup, + isMessageRequestShown, + lastMessageIsLeaveError, +}: { + isGroup: boolean; + isMessageRequestShown: boolean; + lastMessageIsLeaveError: boolean; + isKickedFromGroup: boolean; +}) { + // we can't try to leave the group if we were kicked from it, or if we've already tried to (lastMessageIsLeaveError is true) + return ( + sharedEnabled({ isGroup, isMessageRequestShown }) && + !isKickedFromGroup && + !lastMessageIsLeaveError + ); +} + +export function showDeleteGroupItem({ + isGroup, + isKickedFromGroup, + isMessageRequestShown, + lastMessageIsLeaveError, +}: { + isGroup: boolean; + isMessageRequestShown: boolean; + lastMessageIsLeaveError: boolean; + isKickedFromGroup: boolean; +}) { + return ( + sharedEnabled({ isGroup, isMessageRequestShown }) && + (isKickedFromGroup || lastMessageIsLeaveError) + ); +} diff --git a/ts/components/menu/items/LeaveCommunity/LeaveCommunityMenuItem.tsx b/ts/components/menu/items/LeaveCommunity/LeaveCommunityMenuItem.tsx new file mode 100644 index 0000000000..b306338eb1 --- /dev/null +++ b/ts/components/menu/items/LeaveCommunity/LeaveCommunityMenuItem.tsx @@ -0,0 +1,26 @@ +import { useConvoIdFromContext } from '../../../../contexts/ConvoIdContext'; +import { useConversationUsername, useIsPublic } from '../../../../hooks/useParamSelector'; +import { showLeaveGroupByConvoId } from '../../../../interactions/conversationInteractions'; +import { Localizer } from '../../../basic/Localizer'; +import { ItemWithDataTestId } from '../MenuItemWithDataTestId'; +import { showLeaveCommunityItem } from './guard'; + +export const LeaveCommunityMenuItem = () => { + const convoId = useConvoIdFromContext(); + const username = useConversationUsername(convoId) || convoId; + const isPublic = useIsPublic(convoId); + + if (!showLeaveCommunityItem({ isPublic })) { + return null; + } + + return ( + { + void showLeaveGroupByConvoId(convoId, username); + }} + > + + + ); +}; diff --git a/ts/components/menu/items/LeaveCommunity/guard.ts b/ts/components/menu/items/LeaveCommunity/guard.ts new file mode 100644 index 0000000000..99eab2fb6b --- /dev/null +++ b/ts/components/menu/items/LeaveCommunity/guard.ts @@ -0,0 +1,3 @@ +export const showLeaveCommunityItem = ({ isPublic }: { isPublic: boolean }) => { + return isPublic; +}; diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 60224f12bc..66a7123540 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -26,6 +26,7 @@ import { useLibGroupInvitePending, useLibGroupKicked, } from '../state/selectors/userGroups'; +import { ConversationInteractionStatus, ConversationInteractionType } from '../interactions/types'; export function useAvatarPath(convoId: string | undefined) { const convoProps = useConversationPropsById(convoId); @@ -536,3 +537,12 @@ export function useLastMessage(convoId?: string) { return convoProps.lastMessage; } + +export function useLastMessageIsLeaveError(convoId?: string) { + const lastMessage = useLastMessage(convoId); + + return ( + lastMessage?.interactionType === ConversationInteractionType.Leave && + lastMessage?.interactionStatus === ConversationInteractionStatus.Error + ); +} diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 1d16757b03..f8ca379853 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -340,7 +340,7 @@ export async function showUpdateGroupMembersByConvoId(conversationId: string) { window.inboxStore?.dispatch(updateGroupMembersModal({ conversationId })); } -export function showLeavePrivateConversationByConvoId(conversationId: string) { +export function showDeletePrivateConversationByConvoId(conversationId: string) { const conversation = ConvoHub.use().get(conversationId); const isMe = conversation.isMe(); @@ -367,7 +367,7 @@ export function showLeavePrivateConversationByConvoId(conversationId: string) { }); await clearConversationInteractionState({ conversationId }); } catch (err) { - window.log.warn(`showLeavePrivateConversationByConvoId error: ${err}`); + window.log.warn(`showDeletePrivateConversationByConvoId error: ${err}`); await saveConversationInteractionErrorAsMessage({ conversationId, interactionType: isMe @@ -452,6 +452,21 @@ async function leaveGroupOrCommunityByConvoId({ } } +/** + * Returns true if we the convo is a 03 group and if we can try to send a leave message. + */ +async function hasLeavingDetails(convoId: string) { + if (!PubKey.is03Pubkey(convoId)) { + return true; + } + + const group = await UserGroupsWrapperActions.getGroup(convoId); + + // we need the authData or the secretKey to be able to attempt to leave, + // otherwise we won't be able to even try + return group && (!isEmpty(group.authData) || !isEmpty(group.secretKey)); +} + export async function showLeaveGroupByConvoId(conversationId: string, name: string | undefined) { const conversation = ConvoHub.use().get(conversationId); @@ -465,15 +480,19 @@ export async function showLeaveGroupByConvoId(conversationId: string, name: stri const isAdmin = admins.includes(UserUtils.getOurPubKeyStrFromCache()); const showOnlyGroupAdminWarning = isClosedGroup && isAdmin; const weAreLastAdmin = - (PubKey.is05Pubkey(conversationId) && isAdmin && admins.length === 1) || - (PubKey.is03Pubkey(conversationId) && isAdmin && admins.length === 1); + (PubKey.is05Pubkey(conversationId) || PubKey.is03Pubkey(conversationId)) && + isAdmin && + admins.length === 1; const lastMessageInteractionType = conversation.get('lastMessageInteractionType'); const lastMessageInteractionStatus = conversation.get('lastMessageInteractionStatus'); + const canTryToLeave = await hasLeavingDetails(conversationId); + if ( !isPublic && - lastMessageInteractionType === ConversationInteractionType.Leave && - lastMessageInteractionStatus === ConversationInteractionStatus.Error + ((lastMessageInteractionType === ConversationInteractionType.Leave && + lastMessageInteractionStatus === ConversationInteractionStatus.Error) || + !canTryToLeave) // if we don't have any key to send our leave message, no need to try ) { await leaveGroupOrCommunityByConvoId({ conversationId, isPublic, sendLeaveMessage: false }); return; From 7f1dab1836033be8f87078a0d5f5c6bdd84dc344 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 13 Dec 2024 15:32:26 +1100 Subject: [PATCH 227/302] fix: make UserSyncJob a periodic task --- .../blockOrUnblock/BlockOrUnblockDialog.tsx | 2 -- ts/components/leftpane/ActionsPanel.tsx | 1 + .../leftpane/overlay/OverlayCommunity.tsx | 1 - .../leftpane/overlay/OverlayMessageRequest.tsx | 4 ---- .../settings/section/CategoryPrivacy.tsx | 2 -- ts/interactions/conversationInteractions.ts | 15 +-------------- ts/interactions/messageInteractions.ts | 2 +- ts/models/conversation.ts | 7 ------- ts/receiver/configMessage.ts | 15 +-------------- ts/receiver/groupv2/handleGroupV2Message.ts | 3 --- .../opengroupV2/JoinOpenGroupV2.ts | 18 +++--------------- .../open_group_api/utils/OpenGroupUtils.ts | 4 +--- .../conversations/ConversationController.ts | 13 +------------ ts/session/conversations/createClosedGroup.ts | 3 --- .../utils/job_runners/jobs/UserSyncJob.ts | 6 ++++++ .../utils/libsession/libsession_utils.ts | 3 --- ts/state/ducks/metaGroups.ts | 3 --- 17 files changed, 15 insertions(+), 87 deletions(-) diff --git a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx index ee5c371a4d..7069beebde 100644 --- a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx +++ b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx @@ -14,7 +14,6 @@ import { SessionButton, SessionButtonColor, SessionButtonType } from '../../basi import { StyledModalDescriptionContainer } from '../shared/ModalDescriptionContainer'; import { BlockOrUnblockModalState } from './BlockOrUnblockModalState'; import type { LocalizerComponentPropsObject } from '../../../types/localizer'; -import { UserSync } from '../../../session/utils/job_runners/jobs/UserSyncJob'; type ModalState = NonNullable; @@ -78,7 +77,6 @@ export const BlockOrUnblockDialog = ({ pubkeys, action, onConfirmed }: NonNullab } closeModal(); onConfirmed?.(); - await UserSync.queueNewJobIfNeeded(); }, [action, onConfirmed, pubkeys]); if (isEmpty(pubkeys)) { diff --git a/ts/components/leftpane/ActionsPanel.tsx b/ts/components/leftpane/ActionsPanel.tsx index c5c96ca032..ec1842774b 100644 --- a/ts/components/leftpane/ActionsPanel.tsx +++ b/ts/components/leftpane/ActionsPanel.tsx @@ -214,6 +214,7 @@ const doAppStartUp = async () => { global.setTimeout(() => { // 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(); }, 20000); }; diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx index 09407c39c4..3180d2bfda 100644 --- a/ts/components/leftpane/overlay/OverlayCommunity.tsx +++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx @@ -34,7 +34,6 @@ async function joinOpenGroup( const groupCreated = await joinOpenGroupV2WithUIEvents( serverUrl, false, - false, uiCallback, errorHandler ); diff --git a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx index aaaf8275ca..7d40f1660b 100644 --- a/ts/components/leftpane/overlay/OverlayMessageRequest.tsx +++ b/ts/components/leftpane/overlay/OverlayMessageRequest.tsx @@ -2,7 +2,6 @@ import { useDispatch, useSelector } from 'react-redux'; import useKey from 'react-use/lib/useKey'; import styled from 'styled-components'; import { declineConversationWithoutConfirm } from '../../../interactions/conversationInteractions'; -import { forceSyncConfigurationNowIfNeeded } from '../../../session/utils/sync/syncUtils'; import { updateConfirmModal } from '../../../state/ducks/modalDialog'; import { resetLeftOverlayMode } from '../../../state/ducks/section'; import { getConversationRequestsIds } from '../../../state/selectors/conversations'; @@ -83,7 +82,6 @@ export const OverlayMessageRequest = () => { alsoBlock: false, conversationId: convoId, currentlySelectedConvo, - syncToDevices: false, conversationIdOrigin: null, // block is false, no need for conversationIdOrigin }); } catch (e) { @@ -92,8 +90,6 @@ export const OverlayMessageRequest = () => { ); } } - - await forceSyncConfigurationNowIfNeeded(); }, onClickClose: () => { window.inboxStore?.dispatch(updateConfirmModal(null)); diff --git a/ts/components/settings/section/CategoryPrivacy.tsx b/ts/components/settings/section/CategoryPrivacy.tsx index aacef1775a..0721551918 100644 --- a/ts/components/settings/section/CategoryPrivacy.tsx +++ b/ts/components/settings/section/CategoryPrivacy.tsx @@ -8,7 +8,6 @@ import { SpacerLG } from '../../basic/Text'; import { TypingBubble } from '../../conversation/TypingBubble'; import { UserUtils } from '../../../session/utils'; -import { UserSync } from '../../../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilUserProfile } from '../../../session/utils/libsession/libsession_utils_user_profile'; import { useHasBlindedMsgRequestsEnabled, @@ -99,7 +98,6 @@ export const SettingsCategoryPrivacy = (props: { await SessionUtilUserProfile.insertUserProfileIntoWrapper( UserUtils.getOurPubKeyStrFromCache() ); - await UserSync.queueNewJobIfNeeded(); forceUpdate(); }} title={window.i18n('messageRequestsCommunities')} diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index f8ca379853..782f23bc8c 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -23,9 +23,7 @@ import { PubKey } from '../session/types'; import { perfEnd, perfStart } from '../session/utils/Performance'; import { sleepFor, timeoutWithAbort } from '../session/utils/Promise'; import { ed25519Str, fromHexToArray, toHex } from '../session/utils/String'; -import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; -import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils'; import { conversationReset, quoteMessage, @@ -124,7 +122,6 @@ export const handleAcceptConversationRequest = async ({ // Note: we don't mark as approvedMe = true, as we do not know if they did send us a message yet. await convo.setIsApproved(true, false); await convo.commit(); - void forceSyncConfigurationNowIfNeeded(); if (convo.isPrivate()) { // we only need the approval message (and sending a reply) when we are accepting a message request. i.e. someone sent us a message already and we didn't accept it yet. @@ -182,12 +179,10 @@ export async function declineConversationWithoutConfirm({ alsoBlock, conversationId, currentlySelectedConvo, - syncToDevices, conversationIdOrigin, }: { conversationId: string; currentlySelectedConvo: string | undefined; - syncToDevices: boolean; alsoBlock: boolean; conversationIdOrigin: string | null; }) { @@ -249,9 +244,6 @@ export async function declineConversationWithoutConfirm({ }); } - if (syncToDevices) { - await forceSyncConfigurationNowIfNeeded(); - } if (currentlySelectedConvo && currentlySelectedConvo === conversationId) { window?.inboxStore?.dispatch(resetConversationExternal()); } @@ -259,7 +251,6 @@ export async function declineConversationWithoutConfirm({ export const declineConversationWithConfirm = ({ conversationId, - syncToDevices, alsoBlock, currentlySelectedConvo, conversationIdOrigin, @@ -300,7 +291,6 @@ export const declineConversationWithConfirm = ({ conversationId, currentlySelectedConvo, alsoBlock, - syncToDevices, conversationIdOrigin, }); }, @@ -414,9 +404,7 @@ async function leaveGroupOrCommunityByConvoId({ } if (isPublic) { - await ConvoHub.use().deleteCommunity(conversationId, { - fromSyncMessage: false, - }); + await ConvoHub.use().deleteCommunity(conversationId); return; } // for groups, we have a "leaving..." state that we don't need for communities. @@ -760,7 +748,6 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) { if (newAvatarDecrypted) { await setLastProfileUpdateTimestamp(Date.now()); - await UserSync.queueNewJobIfNeeded(); const userConfigLibsession = await ReleasedFeatures.checkIsUserConfigFeatureReleased(); if (!userConfigLibsession) { diff --git a/ts/interactions/messageInteractions.ts b/ts/interactions/messageInteractions.ts index c67a4ec28e..5e92e50864 100644 --- a/ts/interactions/messageInteractions.ts +++ b/ts/interactions/messageInteractions.ts @@ -126,7 +126,7 @@ const acceptOpenGroupInvitationV2 = (completeUrl: string, roomName?: string) => }, }, onClickOk: async () => { - await joinOpenGroupV2WithUIEvents(completeUrl, true, false); + await joinOpenGroupV2WithUIEvents(completeUrl, true); }, onClickClose, diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 3f53774c53..461b6167b5 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -74,7 +74,6 @@ import { MessageRequestResponse, MessageRequestResponseParams, } from '../session/messages/outgoing/controlMessage/MessageRequestResponse'; -import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile'; import { SessionUtilUserGroups } from '../session/utils/libsession/libsession_utils_user_groups'; @@ -94,7 +93,6 @@ import { } from '../types/sqlSharedTypes'; import { Notifications } from '../util/notifications'; import { Reactions } from '../util/reactions'; -import { Registration } from '../util/registration'; import { Storage } from '../util/storage'; import { ConversationAttributes, @@ -2754,11 +2752,6 @@ async function commitConversationAndRefreshWrapper(id: string) { } } - if (Registration.isDone()) { - // save the new dump if needed to the DB asap - // this call throttled so we do not run this too often (and not for every .commit()) - await UserSync.queueNewJobIfNeeded(); - } convo.triggerUIRefresh(); } diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 28894ec185..a83eff8202 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -15,7 +15,6 @@ import { PubKey } from '../session/types'; import { StringUtils, UserUtils } from '../session/utils'; import { toHex } from '../session/utils/String'; import { FetchMsgExpirySwarm } from '../session/utils/job_runners/jobs/FetchMsgExpirySwarmJob'; -import { UserSync } from '../session/utils/job_runners/jobs/UserSyncJob'; import { LibSessionUtil } from '../session/utils/libsession/libsession_utils'; import { SessionUtilContact } from '../session/utils/libsession/libsession_utils_contacts'; import { SessionUtilConvoInfoVolatile } from '../session/utils/libsession/libsession_utils_convo_info_volatile'; @@ -506,9 +505,7 @@ async function handleCommunitiesUpdate() { for (let index = 0; index < communitiesToLeaveInDB.length; index++) { const toLeave = communitiesToLeaveInDB[index]; window.log.info('leaving community with convoId ', toLeave.id); - await ConvoHub.use().deleteCommunity(toLeave.id, { - fromSyncMessage: true, - }); + await ConvoHub.use().deleteCommunity(toLeave.id); } // this call can take quite a long time but must be awaited (as it is async and create the entry in the DB, used as a diff) @@ -978,7 +975,6 @@ async function processUserMergingResults(results: Map { @@ -620,7 +618,6 @@ async function handleGroupUpdatePromoteMessage({ } await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); - await UserSync.queueNewJobIfNeeded(); if (!found.invitePending) { // This group should already be polling based on if that author is pre-approved or we've already approved that group from another device. // Start polling from it, we will mark ourselves as admin once we get the first merge result, if needed. diff --git a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts index 20d36ded57..b8a8bbfd7f 100644 --- a/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts +++ b/ts/session/apis/open_group_api/opengroupV2/JoinOpenGroupV2.ts @@ -3,7 +3,6 @@ import { ConversationModel } from '../../../../models/conversation'; import { ConvoHub } from '../../../conversations'; import { PromiseUtils, ToastUtils } from '../../../utils'; -import { forceSyncConfigurationNowIfNeeded } from '../../../utils/sync/syncUtils'; import { getOpenGroupV2ConversationId, openGroupV2CompleteURLRegex, @@ -56,10 +55,7 @@ export function parseOpenGroupV2(urlWithPubkey: string): OpenGroupV2Room | undef * @param room The room id to join * @param publicKey The server publicKey. It comes from the joining link. (or is already here for the default open group server) */ -async function joinOpenGroupV2( - room: OpenGroupV2Room, - fromConfigMessage: boolean -): Promise { +async function joinOpenGroupV2(room: OpenGroupV2Room): Promise { if (!room.serverUrl || !room.roomId || room.roomId.length < 1 || !room.serverPublicKey) { return undefined; } @@ -81,9 +77,7 @@ async function joinOpenGroupV2( // we already have a convo associated with it. Remove everything related to it so we start fresh window?.log?.warn('leaving before rejoining open group v2 room', conversationId); - await ConvoHub.use().deleteCommunity(conversationId, { - fromSyncMessage: true, - }); + await ConvoHub.use().deleteCommunity(conversationId); } // Try to connect to server @@ -98,11 +92,6 @@ async function joinOpenGroupV2( throw new Error(window.i18n('communityJoinError')); } - // here we managed to connect to the group. - // if this is not a Sync Message, we should trigger one - if (!fromConfigMessage) { - await forceSyncConfigurationNowIfNeeded(); - } return conversation; } catch (e) { window?.log?.error('Could not join open group v2', e.message); @@ -132,7 +121,6 @@ export type JoinSogsRoomUICallbackArgs = { export async function joinOpenGroupV2WithUIEvents( completeUrl: string, showToasts: boolean, - fromConfigMessage: boolean, uiCallback?: (args: JoinSogsRoomUICallbackArgs) => void, errorHandler?: (error: string) => void ): Promise { @@ -174,7 +162,7 @@ export async function joinOpenGroupV2WithUIEvents( uiCallback?.({ loadingState: 'started', conversationKey: conversationID }); - const convoCreated = await joinOpenGroupV2(parsedRoom, fromConfigMessage); + const convoCreated = await joinOpenGroupV2(parsedRoom); if (convoCreated) { if (showToasts) { diff --git a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts index 62d95baf42..237f5f9386 100644 --- a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts +++ b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts @@ -148,9 +148,7 @@ export async function getAllValidOpenGroupV2ConversationRoomInfos() { /* eslint-disable no-await-in-loop */ await OpenGroupData.removeV2OpenGroupRoom(roomConvoId); getOpenGroupManager().removeRoomFromPolledRooms(infos); - await ConvoHub.use().deleteCommunity(roomConvoId, { - fromSyncMessage: false, - }); + await ConvoHub.use().deleteCommunity(roomConvoId); /* eslint-enable no-await-in-loop */ } } catch (e) { diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index c62f79177a..9f7edb5c46 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -38,7 +38,6 @@ import { ed25519Str } from '../utils/String'; import { PreConditionFailed } from '../utils/errors'; import { RunJobResult } from '../utils/job_runners/PersistedJob'; import { GroupSync } from '../utils/job_runners/jobs/GroupSyncJob'; -import { UserSync } from '../utils/job_runners/jobs/UserSyncJob'; import { LibSessionUtil } from '../utils/libsession/libsession_utils'; import { SessionUtilContact } from '../utils/libsession/libsession_utils_contacts'; import { SessionUtilConvoInfoVolatile } from '../utils/libsession/libsession_utils_convo_info_volatile'; @@ -248,7 +247,6 @@ class ConvoController { // we never keep a left legacy group. Only fully remove it. await this.removeGroupOrCommunityFromDBAndRedux(groupPk); - await UserSync.queueNewJobIfNeeded(); } public async deleteGroup( @@ -392,10 +390,9 @@ class ConvoController { getSwarmPollingInstance().removePubkey(groupPk, 'deleteGroup'); window.inboxStore?.dispatch(groupInfoActions.removeGroupDetailsFromSlice({ groupPk })); - await UserSync.queueNewJobIfNeeded(); } - public async deleteCommunity(convoId: string, options: DeleteOptions) { + public async deleteCommunity(convoId: string) { const conversation = await this.deleteConvoInitialChecks(convoId, 'Community', false); if (!conversation || !conversation.isPublic()) { return; @@ -408,10 +405,6 @@ class ConvoController { } await removeCommunityFromWrappers(conversation.id); // this call needs to fetch the pubkey await this.removeGroupOrCommunityFromDBAndRedux(conversation.id); - - if (!options.fromSyncMessage) { - await UserSync.queueNewJobIfNeeded(); - } } public async delete1o1( @@ -454,10 +447,6 @@ class ConvoController { window.inboxStore?.dispatch(resetConversationExternal()); } } - - if (!options.fromSyncMessage) { - await UserSync.queueNewJobIfNeeded(); - } } /** diff --git a/ts/session/conversations/createClosedGroup.ts b/ts/session/conversations/createClosedGroup.ts index dc9378ccfc..dd68bca458 100644 --- a/ts/session/conversations/createClosedGroup.ts +++ b/ts/session/conversations/createClosedGroup.ts @@ -13,7 +13,6 @@ import { } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage'; import { PubKey } from '../types'; import { UserUtils } from '../utils'; -import { forceSyncConfigurationNowIfNeeded } from '../utils/sync/syncUtils'; import { ConvoHub } from './ConversationController'; import { ConversationTypeEnum } from '../../models/types'; import { NetworkTime } from '../../util/NetworkTime'; @@ -90,8 +89,6 @@ export async function createClosedGroup(groupName: string, members: Array { } } +let interval: NodeJS.Timeout | undefined; + /** * Queue a new Sync Configuration if needed job. * A UserSyncJob can only be added if there is none of the same type queued already. @@ -239,6 +241,10 @@ async function queueNewJobIfNeeded() { return; } + // let's schedule periodic UserConfig jobs so we don't need to always remember to call UserSync.queueNewJobIfNeeded + if (!interval) { + interval = global.setInterval(() => void queueNewJobIfNeeded(), defaultMsBetweenRetries); + } if ( !lastRunConfigSyncJobTimestamp || lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries diff --git a/ts/session/utils/libsession/libsession_utils.ts b/ts/session/utils/libsession/libsession_utils.ts index 0abf5fb677..e2bcdd6353 100644 --- a/ts/session/utils/libsession/libsession_utils.ts +++ b/ts/session/utils/libsession/libsession_utils.ts @@ -23,7 +23,6 @@ import { NotEmptyArrayOfBatchResults, } from '../../apis/snode_api/SnodeRequestTypes'; import { PubKey } from '../../types'; -import { UserSync } from '../job_runners/jobs/UserSyncJob'; import { ed25519Str } from '../String'; const requiredUserVariants: Array = [ @@ -42,8 +41,6 @@ async function initializeLibSessionUtilWrappers() { throw new Error('edkeypair not found for current user'); } const privateKeyEd25519 = keypair.privKeyBytes; - // let's plan a sync on start with some room for the app to be ready - setTimeout(() => UserSync.queueNewJobIfNeeded, 20000); // fetch the dumps we already have from the database const dumps = await ConfigDumpData.getAllDumpsWithData(); diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 7df015dda8..c4e0f5e34b 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -28,7 +28,6 @@ import { PreConditionFailed } from '../../session/utils/errors'; import { GroupInvite } from '../../session/utils/job_runners/jobs/GroupInviteJob'; import { GroupPendingRemovals } from '../../session/utils/job_runners/jobs/GroupPendingRemovalsJob'; import { GroupSync } from '../../session/utils/job_runners/jobs/GroupSyncJob'; -import { UserSync } from '../../session/utils/job_runners/jobs/UserSyncJob'; import { RunJobResult } from '../../session/utils/job_runners/PersistedJob'; import { LibSessionUtil } from '../../session/utils/libsession/libsession_utils'; import { ed25519Str } from '../../session/utils/String'; @@ -871,8 +870,6 @@ async function handleNameChangeFromUI({ ); } - await UserSync.queueNewJobIfNeeded(); - convo.set({ active_at: createAtNetworkTimestamp, }); From 2ef48f5526fe06e3d8755d0a178f3e59380a4f2a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 16 Dec 2024 10:19:29 +1100 Subject: [PATCH 228/302] chore: more details to requests constructors so we can share more between wasm/swarm explorer/etc --- ts/components/SessionWrapperModal.tsx | 4 +- .../message-item/InteractionNotification.tsx | 3 +- .../InteractionItem.tsx | 2 +- ts/interactions/conversationInteractions.ts | 13 +- ts/session/apis/snode_api/BatchResultEntry.ts | 8 ++ .../apis/snode_api/SnodeRequestTypes.ts | 120 ++++++++++-------- ts/session/apis/snode_api/batchRequest.ts | 2 +- ts/session/apis/snode_api/expireRequest.ts | 7 +- .../factories/StoreGroupRequestFactory.ts | 11 ++ .../apis/snode_api/getExpiriesRequest.ts | 9 +- .../snode_api/signature/groupSignature.ts | 3 +- .../snode_api/signature/snodeSignatures.ts | 10 +- ts/session/apis/snode_api/types.ts | 5 - ts/session/sending/MessageSender.ts | 4 +- ts/session/types/with.ts | 5 +- .../jobs/GroupPendingRemovalsJob.ts | 4 +- .../utils/job_runners/jobs/UserSyncJob.ts | 2 + .../utils/libsession/libsession_utils.ts | 2 +- .../GetExpiriesRequest_test.ts | 8 +- .../snode_api/retrieveNextMessages_test.ts | 2 +- .../group_sync_job/GroupSyncJob_test.ts | 2 +- .../user_sync_job/UserSyncJob_test.ts | 2 +- ts/types/sqlSharedTypes.ts | 1 - 23 files changed, 131 insertions(+), 98 deletions(-) create mode 100644 ts/session/apis/snode_api/BatchResultEntry.ts diff --git a/ts/components/SessionWrapperModal.tsx b/ts/components/SessionWrapperModal.tsx index 5cccdf162f..f5e04fcc6d 100644 --- a/ts/components/SessionWrapperModal.tsx +++ b/ts/components/SessionWrapperModal.tsx @@ -124,7 +124,9 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => { }) : null} - {title} + + {title} + { switch (interactionType) { case ConversationInteractionType.Hide: // if it's hidden or pending hiding, we don't show any text - break; + return null; case ConversationInteractionType.Leave: errorText = isCommunity ? window.i18n('communityLeaveError', { diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 782f23bc8c..cb1734caf6 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -344,11 +344,8 @@ export function showDeletePrivateConversationByConvoId(conversationId: string) { const onClickOk = async () => { try { - await updateConversationInteractionState({ - conversationId, - type: isMe ? ConversationInteractionType.Hide : ConversationInteractionType.Leave, - status: ConversationInteractionStatus.Start, - }); + // no network calls are made when we hide/delete a private chat, so no need to have a + // ConversationInteractionType state onClickClose(); await ConvoHub.use().delete1o1(conversationId, { fromSyncMessage: false, @@ -358,12 +355,6 @@ export function showDeletePrivateConversationByConvoId(conversationId: string) { await clearConversationInteractionState({ conversationId }); } catch (err) { window.log.warn(`showDeletePrivateConversationByConvoId error: ${err}`); - await saveConversationInteractionErrorAsMessage({ - conversationId, - interactionType: isMe - ? ConversationInteractionType.Hide - : ConversationInteractionType.Leave, - }); } }; diff --git a/ts/session/apis/snode_api/BatchResultEntry.ts b/ts/session/apis/snode_api/BatchResultEntry.ts new file mode 100644 index 0000000000..fb8155842f --- /dev/null +++ b/ts/session/apis/snode_api/BatchResultEntry.ts @@ -0,0 +1,8 @@ +import { NonEmptyArray } from '../../types/utility'; + +export type BatchResultEntry = { + code: number; + body: Record; +}; + +export type NotEmptyArrayOfBatchResults = NonEmptyArray; diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts index 105a5fe5cf..7a32423c84 100644 --- a/ts/session/apis/snode_api/SnodeRequestTypes.ts +++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts @@ -17,18 +17,18 @@ import { } from './namespaces'; import { GroupDetailsNeededForSignature, SnodeGroupSignature } from './signature/groupSignature'; import { SnodeSignature } from './signature/snodeSignatures'; -import { ShortenOrExtend, WithMessagesHashes, WithShortenOrExtend } from './types'; -import { TTL_DEFAULT } from '../../constants'; -import { NetworkTime } from '../../../util/NetworkTime'; import { + WithMessagesHashes, + ShortenOrExtend, + WithShortenOrExtend, WithCreatedAtNetworkTimestamp, WithMaxSize, WithMethod, WithSecretKey, WithSignature, WithTimestamp, + WithGetNow, } from '../../types/with'; -import { NonEmptyArray } from '../../types/utility'; /** * This is the base sub request class that every other type of request has to extend. @@ -38,6 +38,11 @@ abstract class SnodeAPISubRequest { public abstract loggingId(): string; public abstract getDestination(): PubkeyType | GroupPubkeyType | ''; + public abstract build(): Promise>; + + public async toBody() { + return JSON.stringify(await this.build()); + } constructor({ method }: WithMethod) { this.method = method; @@ -89,8 +94,11 @@ abstract class ExpireSubRequest extends SnodeAPISubRequest<'expire'> { } abstract class StoreSubRequest extends SnodeAPISubRequest<'store'> { - constructor() { + public readonly getNow: () => number; + + constructor(args: WithGetNow) { super({ method: 'store' }); + this.getNow = args.getNow; } } @@ -110,7 +118,7 @@ export class RetrieveLegacyClosedGroupSubRequest extends RetrieveSubRequest { this.legacyGroupPk = legacyGroupPk; } - public build() { + public async build() { return { method: this.method, params: { @@ -172,7 +180,6 @@ export class RetrieveUserSubRequest extends RetrieveSubRequest { namespace: SnodeNamespacesUser | SnodeNamespacesUserConfig; }) { super({ last_hash, max_size }); - this.namespace = namespace; } @@ -280,7 +287,7 @@ export class OnsResolveSubRequest extends OxendSubRequest { this.base64EncodedNameHash = base64EncodedNameHash; } - public build() { + public async build() { return { method: this.method, params: { @@ -303,7 +310,7 @@ export class OnsResolveSubRequest extends OxendSubRequest { } export class GetServiceNodesSubRequest extends OxendSubRequest { - public build() { + public async build() { return { method: this.method, params: { @@ -343,7 +350,7 @@ export class SwarmForSubRequest extends SnodeAPISubRequest<'get_swarm'> { this.destination = pubkey; } - public build() { + public async build() { return { method: this.method, params: { @@ -375,7 +382,7 @@ export class NetworkTimeSubRequest extends SnodeAPISubRequest<'info'> { super({ method: 'info' }); } - public build() { + public async build() { return { method: this.method, params: {}, @@ -493,9 +500,12 @@ export class SubaccountUnrevokeSubRequest extends AbstractRevokeSubRequest<'unre */ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest<'get_expiries'> { public readonly messageHashes: Array; + public readonly getNow: () => number; - constructor(args: WithMessagesHashes) { + constructor(args: WithMessagesHashes & WithGetNow) { super({ method: 'get_expiries' }); + this.getNow = args.getNow; + this.messageHashes = args.messagesHashes; if (this.messageHashes.length === 0) { window.log.warn(`GetExpiriesFromNodeSubRequest given empty list of messageHashes`); @@ -506,7 +516,7 @@ export class GetExpiriesFromNodeSubRequest extends SnodeAPISubRequest<'get_expir * For Revoke/unrevoke, this needs an admin signature */ public async build() { - const timestamp = NetworkTime.now(); + const timestamp = this.getNow(); const ourPubKey = UserUtils.getOurPubKeyStrFromCache(); if (!ourPubKey) { @@ -871,6 +881,7 @@ export class StoreGroupMessageSubRequest extends StoreSubRequest { constructor( args: WithGroupPubkey & + WithGetNow & WithCreatedAtNetworkTimestamp & { ttlMs: number; encryptedData: Uint8Array; @@ -879,7 +890,7 @@ export class StoreGroupMessageSubRequest extends StoreSubRequest { secretKey: Uint8Array | null; } ) { - super(); + super(args); this.destination = args.groupPk; this.ttlMs = args.ttlMs; this.encryptedData = args.encryptedData; @@ -954,16 +965,18 @@ abstract class StoreGroupConfigSubRequest< public readonly secretKey: Uint8Array | null; constructor( - args: WithGroupPubkey & { - namespace: T; - encryptedData: Uint8Array; - secretKey: Uint8Array | null; - } + args: WithGroupPubkey & + WithGetNow & { + namespace: T; + encryptedData: Uint8Array; + secretKey: Uint8Array | null; + ttlMs: number; + } ) { - super(); + super(args); this.namespace = args.namespace; this.destination = args.groupPk; - this.ttlMs = TTL_DEFAULT.CONFIG_MESSAGE; + this.ttlMs = args.ttlMs; this.encryptedData = args.encryptedData; this.secretKey = args.secretKey; @@ -1061,12 +1074,14 @@ export class StoreUserConfigSubRequest extends StoreSubRequest { public readonly encryptedData: Uint8Array; public readonly destination: PubkeyType; - constructor(args: { - namespace: SnodeNamespacesUserConfig; - ttlMs: number; - encryptedData: Uint8Array; - }) { - super(); + constructor( + args: WithGetNow & { + namespace: SnodeNamespacesUserConfig; + ttlMs: number; + encryptedData: Uint8Array; + } + ) { + super(args); this.namespace = args.namespace; this.ttlMs = args.ttlMs; this.encryptedData = args.encryptedData; @@ -1136,19 +1151,20 @@ export class StoreUserMessageSubRequest extends StoreSubRequest { public readonly plainTextBuffer: Uint8Array | null; constructor( - args: WithCreatedAtNetworkTimestamp & { - ttlMs: number; - encryptedData: Uint8Array; - destination: PubkeyType; - dbMessageIdentifier: string | null; - /** - * When we send a message to a 1o1 recipient, we then need to send the same message to our own swarm as a synced message. - * To forward that message, we need the original message data, which is the plainTextBuffer field here. - */ - plainTextBuffer: Uint8Array | null; - } + args: WithCreatedAtNetworkTimestamp & + WithGetNow & { + ttlMs: number; + encryptedData: Uint8Array; + destination: PubkeyType; + dbMessageIdentifier: string | null; + /** + * When we send a message to a 1o1 recipient, we then need to send the same message to our own swarm as a synced message. + * To forward that message, we need the original message data, which is the plainTextBuffer field here. + */ + plainTextBuffer: Uint8Array | null; + } ) { - super(); + super(args); this.ttlMs = args.ttlMs; this.destination = args.destination; this.encryptedData = args.encryptedData; @@ -1174,7 +1190,7 @@ export class StoreUserMessageSubRequest extends StoreSubRequest { method: this.method, params: { pubkey: this.destination, - timestamp: NetworkTime.now(), + timestamp: this.getNow(), namespace: this.namespace, ttl: this.ttlMs, data: encryptedDataBase64, @@ -1207,14 +1223,15 @@ export class StoreLegacyGroupMessageSubRequest extends StoreSubRequest { public readonly createdAtNetworkTimestamp: number; constructor( - args: WithCreatedAtNetworkTimestamp & { - ttlMs: number; - encryptedData: Uint8Array; - destination: PubkeyType; - dbMessageIdentifier: string | null; - } + args: WithCreatedAtNetworkTimestamp & + WithGetNow & { + ttlMs: number; + encryptedData: Uint8Array; + destination: PubkeyType; + dbMessageIdentifier: string | null; + } ) { - super(); + super(args); this.ttlMs = args.ttlMs; this.destination = args.destination; this.encryptedData = args.encryptedData; @@ -1237,7 +1254,7 @@ export class StoreLegacyGroupMessageSubRequest extends StoreSubRequest { params: { // no signature required for a legacy group retrieve/store of message to namespace -10 pubkey: this.destination, - timestamp: NetworkTime.now(), + timestamp: this.getNow(), namespace: this.namespace, ttl: this.ttlMs, data: encryptedDataBase64, @@ -1359,13 +1376,6 @@ export function builtRequestToLoggingId(request: BuiltSnodeSubRequests): string } } -export type BatchResultEntry = { - code: number; - body: Record; -}; - -export type NotEmptyArrayOfBatchResults = NonEmptyArray; - export const MAX_SUBREQUESTS_COUNT = 20; export type BatchStoreWithExtraParams = diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index e080525c0d..2ce77e9bc3 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -10,10 +10,10 @@ import { builtRequestToLoggingId, BuiltSnodeSubRequests, MAX_SUBREQUESTS_COUNT, - NotEmptyArrayOfBatchResults, RawSnodeSubRequests, WithMethodBatchType, } from './SnodeRequestTypes'; +import { NotEmptyArrayOfBatchResults } from './BatchResultEntry'; import { MergedAbortSignal, WithTimeoutMs } from './requestWith'; function logSubRequests(requests: Array) { diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index a8376d9eb5..2cbdc52b1b 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -9,11 +9,8 @@ import { SeedNodeAPI } from '../seed_node_api'; import { MAX_SUBREQUESTS_COUNT, UpdateExpiryOnNodeUserSubRequest } from './SnodeRequestTypes'; import { BatchRequests } from './batchRequest'; import { SnodePool } from './snodePool'; -import { - ExpireMessageResultItem, - ExpireMessagesResultsContent, - WithShortenOrExtend, -} from './types'; +import { ExpireMessageResultItem, ExpireMessagesResultsContent } from './types'; +import { WithShortenOrExtend } from '../../types/with'; import { DURATION } from '../../constants'; export type verifyExpireMsgsResponseSignatureProps = ExpireMessageResultItem & { diff --git a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts index 1e61264f5f..255c2e1438 100644 --- a/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts +++ b/ts/session/apis/snode_api/factories/StoreGroupRequestFactory.ts @@ -17,6 +17,8 @@ import { import { SnodeNamespaces } from '../namespaces'; import { GroupUpdateDeleteMemberContentMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateDeleteMemberContentMessage'; import { GroupUpdateMemberLeftNotificationMessage } from '../../../messages/outgoing/controlMessage/group_v2/to_group/GroupUpdateMemberLeftNotificationMessage'; +import { TTL_DEFAULT } from '../../../constants'; +import { NetworkTime } from '../../../../util/NetworkTime'; export type StoreMessageToSubRequestType = | GroupUpdateMemberChangeMessage @@ -81,6 +83,7 @@ async function makeGroupMessageSubRequest( dbMessageIdentifier: m.dbMessageIdentifier, ...group, createdAtNetworkTimestamp: m.networkTimestamp, + getNow: NetworkTime.now, }); }); @@ -114,6 +117,8 @@ function makeStoreGroupKeysSubRequest({ encryptedData: encryptedSupplementKeys, groupPk, secretKey: group.secretKey, + ttlMs: TTL_DEFAULT.CONFIG_MESSAGE, + getNow: NetworkTime.now, }); } @@ -151,6 +156,8 @@ function makeStoreGroupConfigSubRequest({ encryptedData: m.ciphertext, groupPk, secretKey: group.secretKey, + ttlMs: TTL_DEFAULT.CONFIG_MESSAGE, + getNow: NetworkTime.now, }) : null ) @@ -163,6 +170,8 @@ function makeStoreGroupConfigSubRequest({ encryptedData: m.ciphertext, groupPk, secretKey: group.secretKey, + ttlMs: TTL_DEFAULT.CONFIG_MESSAGE, + getNow: NetworkTime.now, }) : null ) @@ -175,6 +184,8 @@ function makeStoreGroupConfigSubRequest({ encryptedData: m.ciphertext, groupPk, secretKey: group.secretKey, + ttlMs: TTL_DEFAULT.CONFIG_MESSAGE, + getNow: NetworkTime.now, }) : null ) diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index a9d56ab062..eef2ee9440 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -8,8 +8,10 @@ import { SeedNodeAPI } from '../seed_node_api'; import { GetExpiriesFromNodeSubRequest } from './SnodeRequestTypes'; import { BatchRequests } from './batchRequest'; import { SnodePool } from './snodePool'; -import { GetExpiriesResultsContent, WithMessagesHashes } from './types'; +import { GetExpiriesResultsContent } from './types'; +import { WithMessagesHashes } from '../../types/with'; import { DURATION } from '../../constants'; +import { NetworkTime } from '../../../util/NetworkTime'; export type GetExpiriesRequestResponseResults = Record; @@ -46,7 +48,10 @@ async function getExpiriesFromNodesNoRetries( associatedWith: PubkeyType ) { try { - const expireRequest = new GetExpiriesFromNodeSubRequest({ messagesHashes: messageHashes }); + const expireRequest = new GetExpiriesFromNodeSubRequest({ + messagesHashes: messageHashes, + getNow: NetworkTime.now, + }); const result = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ unsignedSubRequests: [expireRequest], targetNode, diff --git a/ts/session/apis/snode_api/signature/groupSignature.ts b/ts/session/apis/snode_api/signature/groupSignature.ts index 3ba7eea39e..d55fc3a452 100644 --- a/ts/session/apis/snode_api/signature/groupSignature.ts +++ b/ts/session/apis/snode_api/signature/groupSignature.ts @@ -14,7 +14,8 @@ import { StringUtils, UserUtils } from '../../../utils'; import { fromUInt8ArrayToBase64, stringToUint8Array } from '../../../utils/String'; import { PreConditionFailed } from '../../../utils/errors'; import { SnodeNamespacesGroup } from '../namespaces'; -import { SignedGroupHashesParams, WithMessagesHashes, WithShortenOrExtend } from '../types'; +import { SignedGroupHashesParams } from '../types'; +import { WithMessagesHashes, WithShortenOrExtend } from '../../../types/with'; import { SignatureShared } from './signatureShared'; import { SnodeSignatureResult } from './snodeSignatures'; import { getSodiumRenderer } from '../../../crypto'; diff --git a/ts/session/apis/snode_api/signature/snodeSignatures.ts b/ts/session/apis/snode_api/signature/snodeSignatures.ts index ef61e872cd..f97c8d7a46 100644 --- a/ts/session/apis/snode_api/signature/snodeSignatures.ts +++ b/ts/session/apis/snode_api/signature/snodeSignatures.ts @@ -11,9 +11,15 @@ import { PubKey } from '../../../types'; import { StringUtils, UserUtils } from '../../../utils'; import { fromHexToArray, fromUInt8ArrayToBase64 } from '../../../utils/String'; import { PreConditionFailed } from '../../../utils/errors'; -import { SignedHashesParams, WithMessagesHashes, WithShortenOrExtend } from '../types'; +import { SignedHashesParams } from '../types'; +import { + WithShortenOrExtend, + WithMessagesHashes, + WithSignature, + WithTimestamp, +} from '../../../types/with'; + import { NetworkTime } from '../../../../util/NetworkTime'; -import { WithSignature, WithTimestamp } from '../../../types/with'; export type SnodeSignatureResult = WithSignature & WithTimestamp & { diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts index 7fe1ab8267..160648388c 100644 --- a/ts/session/apis/snode_api/types.ts +++ b/ts/session/apis/snode_api/types.ts @@ -39,13 +39,8 @@ export type RetrieveRequestResult = { messages: RetrieveMessagesResultsContent; namespace: SnodeNamespaces; }; -export type WithMessagesHashes = { messagesHashes: Array }; - export type RetrieveMessagesResultsBatched = Array; -export type ShortenOrExtend = 'extend' | 'shorten' | ''; -export type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; - export type WithRevokeSubRequest = { revokeSubRequest?: SubaccountRevokeSubRequest; unrevokeSubRequest?: SubaccountUnrevokeSubRequest; diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 677fe586bc..9472ab7a1d 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -17,7 +17,6 @@ import { DeleteHashesFromGroupNodeSubRequest, DeleteHashesFromUserNodeSubRequest, MethodBatchType, - NotEmptyArrayOfBatchResults, RawSnodeSubRequests, StoreGroupInfoSubRequest, StoreGroupKeysSubRequest, @@ -30,6 +29,7 @@ import { SubaccountRevokeSubRequest, SubaccountUnrevokeSubRequest, } from '../apis/snode_api/SnodeRequestTypes'; +import { NotEmptyArrayOfBatchResults } from '../apis/snode_api/BatchResultEntry'; import { BatchRequests } from '../apis/snode_api/batchRequest'; import { GetNetworkTime } from '../apis/snode_api/getNetworkTime'; import { SnodeNamespace, SnodeNamespaces } from '../apis/snode_api/namespaces'; @@ -122,6 +122,7 @@ async function messageToRequest05({ namespace, createdAtNetworkTimestamp: networkTimestamp, plainTextBuffer, + getNow: NetworkTime.now, }; if (namespace === SnodeNamespaces.Default) { return new StoreUserMessageSubRequest(shared05Arguments); @@ -165,6 +166,7 @@ async function messageToRequest03({ groupPk: destination, dbMessageIdentifier: identifier || null, createdAtNetworkTimestamp: networkTimestamp, + getNow: NetworkTime.now, ...group, }; if ( diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index 401c15a38e..b7d6ff3aee 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -13,12 +13,15 @@ export type WithRemoveMembers = { removed: Array }; export type WithPromotedMembers = { promoted: Array }; export type WithMaxSize = { max_size?: number }; -export type WithShortenOrExtend = { shortenOrExtend: 'shorten' | 'extend' | '' }; export type WithCreatedAtNetworkTimestamp = { createdAtNetworkTimestamp: number }; export type WithMethod = { method: T }; export type WithBatchMethod = { method: T }; +export type WithGetNow = { getNow: () => number }; export type WithConvoId = { conversationId: string }; export type WithMessageId = { messageId: string }; export type WithLocalMessageDeletionType = { deletionType: 'complete' | 'markDeleted' }; +export type ShortenOrExtend = 'extend' | 'shorten' | ''; +export type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; +export type WithMessagesHashes = { messagesHashes: Array }; diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index fa520ddec7..17857b9458 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -37,7 +37,7 @@ import { WithSecretKey, } from '../../../types/with'; import { groupInfoActions } from '../../../../state/ducks/metaGroups'; -import { DURATION } from '../../../constants'; +import { DURATION, TTL_DEFAULT } from '../../../constants'; import { timeoutWithAbort } from '../../Promise'; const defaultMsBetweenRetries = 10000; @@ -163,6 +163,8 @@ class GroupPendingRemovalsJob extends PersistedJob { }; it('builds a valid request given the messageHashes and valid timestamp for now', async () => { - const unsigned = new GetExpiriesFromNodeSubRequest(props); + const unsigned = new GetExpiriesFromNodeSubRequest({ ...props, getNow: NetworkTime.now }); const request = await unsigned.build(); expect(request, 'should not return null').to.not.be.null; @@ -73,7 +73,7 @@ describe('GetExpiriesRequest', () => { (getOurPubKeyStrFromCacheStub as any).returns(undefined); let errorStr = 'fakeerror'; try { - const unsigned = new GetExpiriesFromNodeSubRequest(props); + const unsigned = new GetExpiriesFromNodeSubRequest({ ...props, getNow: NetworkTime.now }); const request = await unsigned.build(); if (request) { throw new Error('we should not have been able to build a request'); @@ -88,7 +88,7 @@ describe('GetExpiriesRequest', () => { // Modify the stub behavior for this test only we need to return an unsupported type to simulate a missing pubkey Sinon.stub(SnodeSignature, 'generateGetExpiriesOurSignature').resolves(null); - const unsigned = new GetExpiriesFromNodeSubRequest(props); + const unsigned = new GetExpiriesFromNodeSubRequest({ ...props, getNow: NetworkTime.now }); try { const request = await unsigned.build(); if (request) { diff --git a/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts b/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts index 01f69feb21..4c4c58450d 100644 --- a/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts +++ b/ts/test/session/unit/snode_api/retrieveNextMessages_test.ts @@ -12,7 +12,7 @@ import { } from '../../../../session/apis/snode_api/SnodeRequestTypes'; import { SnodeNamespaces } from '../../../../session/apis/snode_api/namespaces'; import { SnodeAPIRetrieve } from '../../../../session/apis/snode_api/retrieveRequest'; -import { WithShortenOrExtend } from '../../../../session/apis/snode_api/types'; +import { WithShortenOrExtend } from '../../../../session/types/with'; import { TestUtils } from '../../../test-utils'; import { expectAsyncToThrow, stubLibSessionWorker } from '../../../test-utils/utils'; import { NetworkTime } from '../../../../util/NetworkTime'; diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 90fd7a6496..9d7ed628b6 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -4,7 +4,7 @@ import { omit } from 'lodash'; import Long from 'long'; import Sinon from 'sinon'; import { getSodiumNode } from '../../../../../../node/sodiumNode'; -import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/SnodeRequestTypes'; +import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/BatchResultEntry'; import { SnodeNamespaces } from '../../../../../../session/apis/snode_api/namespaces'; import { ConvoHub } from '../../../../../../session/conversations'; import { LibSodiumWrappers } from '../../../../../../session/crypto'; diff --git a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts index fe985df726..0d3df0dbf3 100644 --- a/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/user_sync_job/UserSyncJob_test.ts @@ -3,7 +3,7 @@ import { omit } from 'lodash'; import Long from 'long'; import Sinon from 'sinon'; import { getSodiumNode } from '../../../../../../node/sodiumNode'; -import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/SnodeRequestTypes'; +import { NotEmptyArrayOfBatchResults } from '../../../../../../session/apis/snode_api/BatchResultEntry'; import { SnodeNamespaces, SnodeNamespacesUserConfig, diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts index fb4d297262..8079bfbc8c 100644 --- a/ts/types/sqlSharedTypes.ts +++ b/ts/types/sqlSharedTypes.ts @@ -269,7 +269,6 @@ export function getLegacyGroupInfoFromDBValues({ /** * This function can be used to make sure all the possible values as input of a switch as taken care off, without having a default case. - * */ export function assertUnreachable(_x: never, message: string): never { const msg = `assertUnreachable: Didn't expect to get here with "${message}"`; From ae08af1ae0e9b71646b0dbca7580830533722146 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 16 Dec 2024 10:31:57 +1100 Subject: [PATCH 229/302] fix: groups without joined_at are moved to bottom of convolist --- ts/receiver/configMessage.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index a83eff8202..ca975076a5 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -703,7 +703,6 @@ async function handleSingleGroupUpdate({ userEdKeypair, }: { groupInWrapper: UserGroupsGet; - latestEnvelopeTimestamp: number; userEdKeypair: UserUtils.ByteKeyPair; }) { const groupPk = groupInWrapper.pubkeyHex; @@ -725,7 +724,8 @@ async function handleSingleGroupUpdate({ if (!ConvoHub.use().get(groupPk)) { const created = await ConvoHub.use().getOrCreateAndWait(groupPk, ConversationTypeEnum.GROUPV2); - const joinedAt = groupInWrapper.joinedAtSeconds * 1000 || Date.now(); + const joinedAt = + groupInWrapper.joinedAtSeconds * 1000 || CONVERSATION.LAST_JOINED_FALLBACK_TIMESTAMP; const expireTimer = groupInWrapper.disappearingTimerSeconds && groupInWrapper.disappearingTimerSeconds > 0 ? groupInWrapper.disappearingTimerSeconds @@ -766,7 +766,7 @@ async function handleSingleGroupUpdateToLeave(toLeave: GroupPubkeyType) { /** * Called when we just got a userGroups merge from the network. We need to apply the changes to our local state. (i.e. DB and redux slice of 03 groups) */ -async function handleGroupUpdate(latestEnvelopeTimestamp: number) { +async function handleGroupUpdate(_latestEnvelopeTimestamp: number) { // first let's check which groups needs to be joined or left by doing a diff of what is in the wrapper and what is in the DB const allGroupsInWrapper = await UserGroupsWrapperActions.getAllGroups(); const allGroupsIdsInDb = ConvoHub.use() @@ -786,7 +786,7 @@ async function handleGroupUpdate(latestEnvelopeTimestamp: number) { for (let index = 0; index < allGroupsInWrapper.length; index++) { const groupInWrapper = allGroupsInWrapper[index]; window.inboxStore?.dispatch(groupInfoActions.handleUserGroupUpdate(groupInWrapper) as any); - await handleSingleGroupUpdate({ groupInWrapper, latestEnvelopeTimestamp, userEdKeypair }); + await handleSingleGroupUpdate({ groupInWrapper, userEdKeypair }); } const groupsInDbButNotInWrapper = difference(allGroupsIdsInDb, allGroupsIdsInWrapper); From 15c6e1f888cb8a5d2c7e783aea0c2d2848f64080 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 16 Dec 2024 13:08:52 +1100 Subject: [PATCH 230/302] chore: bump libsession-util-nodejs to 0.4.8 --- package.json | 2 +- .../libsession_wrapper_user_groups_test.ts | 4 ++-- yarn.lock | 21 ++++++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 3ec417d298..81929c3e93 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.7/libsession_util_nodejs-v0.4.7.tar.gz", + "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.8/libsession_util_nodejs-v0.4.8.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts index b0537c8d84..af266249db 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_user_groups_test.ts @@ -230,9 +230,9 @@ describe('libsession_user_groups', () => { const groupWrapper = new UserGroupsWrapperNode(us.ed25519KeyPair.privKeyBytes, null); const group = groupWrapper.createGroup(); - group.joinedAtSeconds = 4099680000 - 1; // 4099680000 is 1st january 2100 GMT + group.joinedAtSeconds = 9000000000 - 1; // 9000000000 is the cut off by libsession-util-nodejs groupWrapper.setGroup(group); // shouldn't throw - group.joinedAtSeconds = 4099680000 + 1; // 4099680000 is 1st january 2100 GMT + group.joinedAtSeconds = 9000000000 + 1; // 9000000000 is the cut off by libsession-util-nodejs expect(() => { groupWrapper.setGroup(group); }).to.throw(); diff --git a/yarn.lock b/yarn.lock index 1eccab9f53..1e559dae17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1791,9 +1791,9 @@ available-typed-arrays@^1.0.7: possible-typed-array-names "^1.0.0" axios@^1.3.2: - version "1.7.8" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.8.tgz#1997b1496b394c21953e68c14aaa51b7b5de3d6e" - integrity sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw== + version "1.7.9" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.9.tgz#d7d071380c132a24accda1b2cfc1535b79ec650a" + integrity sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.0" @@ -2646,7 +2646,7 @@ date-fns@^3.6.0: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf" integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww== -debug@4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.7" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== @@ -2674,6 +2674,13 @@ debug@^3.2.7: dependencies: ms "^2.1.1" +debug@^4: + version "4.4.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" + integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== + dependencies: + ms "^2.1.3" + decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" @@ -4944,9 +4951,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.7/libsession_util_nodejs-v0.4.7.tar.gz": - version "0.4.7" - resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.7/libsession_util_nodejs-v0.4.7.tar.gz#9c488df53966516b2142d47e85dd433fc3bc7be6" +"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.8/libsession_util_nodejs-v0.4.8.tar.gz": + version "0.4.8" + resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.8/libsession_util_nodejs-v0.4.8.tar.gz#6b99465af591545581ab9db64c63ab89198fe643" dependencies: cmake-js "7.2.1" node-addon-api "^6.1.0" From 17deaf42c01dd348b1abc0dc963507bd286f24b6 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 17 Dec 2024 15:52:22 +1100 Subject: [PATCH 231/302] fix: keep group messages until we managed to leave it --- .../conversations/ConversationController.ts | 15 ++- .../utils/job_runners/jobs/GroupInviteJob.ts | 2 + ts/state/ducks/metaGroups.ts | 122 ++++++++++++------ 3 files changed, 93 insertions(+), 46 deletions(-) diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 9f7edb5c46..748931f43e 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -274,8 +274,9 @@ class ConvoController { `deleteGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, deletionType:${deletionType}, deleteAllMessagesOnSwarm:${deleteAllMessagesOnSwarm}, forceDestroyForAllMembers:${forceDestroyForAllMembers}, clearFetchedHashes:${clearFetchedHashes}` ); - // this deletes all messages in the conversation - const conversation = await this.deleteConvoInitialChecks(groupPk, 'Group', false); + // Keep the messages until we have effectively left the group (and managed to send our leave message)m + // because we have the "Leaving..." state (left pane) linked to the last message in conversation. + const conversation = await this.deleteConvoInitialChecks(groupPk, 'Group', true); if (!conversation || !conversation.isClosedGroup()) { return; } @@ -292,7 +293,10 @@ class ConvoController { // this is caught and is adding an interaction notification message throw new Error('Failed to send our leaving message to 03 group'); } + // now that we know we've sent the leave message, delete any remaining messages + await this.deleteConvoInitialChecks(groupPk, 'Group', false); } + // a group 03 can be removed fully or kept empty as kicked. // when it was pendingInvite, we delete it fully, // when it was not, we empty the group but keep it with the "you have been kicked" message @@ -356,6 +360,8 @@ class ConvoController { deleteAllMessagesSubRequest, extraStoreRequests: [], }); + await LibSessionUtil.saveDumpsToDb(groupPk); + if (lastPushResult !== RunJobResult.Success) { throw new Error(`Failed to destroyGroupDetails for pk ${ed25519Str(groupPk)}`); } @@ -363,7 +369,10 @@ class ConvoController { } catch (e) { // if that group was already freed this will happen. // we still want to delete it entirely though - window.log.warn(`deleteGroup: MetaGroupWrapperActions failed with: ${e.message}`); + window.log.warn( + `deleteGroup: MetaGroupWrapperActions failed with: ${e.message}... Keeping it as this should be a retryable error` + ); + throw e; } // this deletes the secretKey if we had it. If we need it for something, it has to be done before this call. diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index f52550afdc..83f8949bd1 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -202,6 +202,8 @@ class GroupInviteJob extends PersistedJob { extraStoreRequests: [], }); if (sequenceResult !== RunJobResult.Success) { + await LibSessionUtil.saveDumpsToDb(groupPk); + throw new Error( 'GroupInviteJob: SubaccountUnrevokeSubRequest push() did not return success' ); diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index c4e0f5e34b..e35b9c70e4 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -660,17 +660,26 @@ async function handleMemberAddedFromUI({ group ); - // push new members & key supplement in a single batch call - const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - supplementalKeysSubRequest, - revokeSubRequest, - unrevokeSubRequest, - extraStoreRequests, - }); - if (sequenceResult !== RunJobResult.Success) { - throw new Error( - 'handleMemberAddedFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' + try { + // push new members & key supplement in a single batch call + const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + supplementalKeysSubRequest, + revokeSubRequest, + unrevokeSubRequest, + extraStoreRequests, + }); + if (sequenceResult !== RunJobResult.Success) { + await LibSessionUtil.saveDumpsToDb(groupPk); + + throw new Error( + 'handleMemberAddedFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' + ); + } + } catch (e) { + window.log.warn( + 'handleNameChangeFromUIOrNot: pushChangesToGroupSwarmIfNeeded failed with:', + e.message ); } @@ -779,15 +788,21 @@ async function handleMemberRemovedFromUI({ [removedControlMessage], group ); - - // Send the updated config (with changes to pending_removal) and that GroupUpdateMessage request (if any) as a sequence. - const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - extraStoreRequests, - }); - if (sequenceResult !== RunJobResult.Success) { - throw new Error( - 'currentDeviceGroupMembersChange: pushChangesToGroupSwarmIfNeeded did not return success' + try { + // Send the updated config (with changes to pending_removal) and that GroupUpdateMessage request (if any) as a sequence. + const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + extraStoreRequests, + }); + if (sequenceResult !== RunJobResult.Success) { + throw new Error( + 'currentDeviceGroupMembersChange: pushChangesToGroupSwarmIfNeeded did not return success' + ); + } + } catch (e) { + window.log.warn( + 'currentDeviceGroupMembersChange: pushChangesToGroupSwarmIfNeeded failed with:', + e.message ); } @@ -859,14 +874,23 @@ async function handleNameChangeFromUI({ group ); - const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - extraStoreRequests, - }); + try { + const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + extraStoreRequests, + }); - if (batchResult !== RunJobResult.Success) { - throw new Error( - 'handleNameChangeFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' + if (batchResult !== RunJobResult.Success) { + await LibSessionUtil.saveDumpsToDb(groupPk); + + throw new Error( + 'handleNameChangeFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' + ); + } + } catch (e) { + window.log.warn( + 'handleNameChangeFromUIOrNot: pushChangesToGroupSwarmIfNeeded failed with:', + e.message ); } @@ -975,14 +999,20 @@ const triggerFakeAvatarUpdate = createAsyncThunk( [updateMsg], group ); - - const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - extraStoreRequests, - }); - if (!batchResult) { - window.log.warn(`failed to send avatarChange message for group ${ed25519Str(groupPk)}`); - throw new Error('failed to send avatarChange message'); + try { + const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + extraStoreRequests, + }); + if (!batchResult) { + window.log.warn(`failed to send avatarChange message for group ${ed25519Str(groupPk)}`); + throw new Error('failed to send avatarChange message'); + } + } catch (e) { + window.log.warn( + 'currentDeviceGroupMembersChange: pushChangesToGroupSwarmIfNeeded failed with:', + e.message + ); } } ); @@ -1024,16 +1054,22 @@ const triggerFakeDeleteMsgBeforeNow = createAsyncThunk( await MetaGroupWrapperActions.infoSet(groupPk, infoGet); const extraStoreRequests = await StoreGroupRequestFactory.makeGroupMessageSubRequest([], group); - - const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - extraStoreRequests, - }); - if (!batchResult) { + try { + const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + extraStoreRequests, + }); + if (!batchResult) { + window.log.warn( + `failed to send deleteBeforeSeconds/deleteAttachBeforeSeconds message for group ${ed25519Str(groupPk)}` + ); + throw new Error('failed to send deleteBeforeSeconds/deleteAttachBeforeSeconds message'); + } + } catch (e) { window.log.warn( - `failed to send deleteBeforeSeconds/deleteAttachBeforeSeconds message for group ${ed25519Str(groupPk)}` + 'currentDeviceGroupMembersChange: pushChangesToGroupSwarmIfNeeded failed with:', + e.message ); - throw new Error('failed to send deleteBeforeSeconds/deleteAttachBeforeSeconds message'); } } ); From aa8c8a2ad86e1815515c1e58e1c469142bda3ca0 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 18 Dec 2024 10:32:34 +1100 Subject: [PATCH 232/302] fix: delete messages on group delete (after leaveMsg sent) --- .../conversations/ConversationController.ts | 95 +++++++++++-------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 748931f43e..ce33228dd7 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -293,10 +293,11 @@ class ConvoController { // this is caught and is adding an interaction notification message throw new Error('Failed to send our leaving message to 03 group'); } - // now that we know we've sent the leave message, delete any remaining messages - await this.deleteConvoInitialChecks(groupPk, 'Group', false); } + // now that we know we've sent the leave message, delete any remaining messages + await this.deleteConvoInitialChecks(groupPk, 'Group', false); + // a group 03 can be removed fully or kept empty as kicked. // when it was pendingInvite, we delete it fully, // when it was not, we empty the group but keep it with the "you have been kicked" message @@ -330,49 +331,59 @@ class ConvoController { } } } else { + // Let's check if we still have a MetaGroupWrapper for this group. If we don't we won't be able to do anything.. + let metaGroupWrapperExists = false; try { - const us = UserUtils.getOurPubKeyStrFromCache(); - const allMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); - const otherAdminsCount = allMembers - .filter(m => m.nominatedAdmin) - .filter(m => m.pubkeyHex !== us).length; - const weAreLastAdmin = otherAdminsCount === 0; - const infos = await MetaGroupWrapperActions.infoGet(groupPk); - const fromUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); - if (!infos || !fromUserGroup || isEmpty(infos) || isEmpty(fromUserGroup)) { - throw new Error('deleteGroup: some required data not present'); - } - const { secretKey } = fromUserGroup; - - // check if we are the last admin - if (secretKey && !isEmpty(secretKey) && (weAreLastAdmin || forceDestroyForAllMembers)) { - const deleteAllMessagesSubRequest = deleteAllMessagesOnSwarm - ? new DeleteAllFromGroupMsgNodeSubRequest({ - groupPk, - secretKey, - }) - : undefined; - - // this marks the group info as deleted. We need to push those details - await MetaGroupWrapperActions.infoDestroy(groupPk); - const lastPushResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ - groupPk, - deleteAllMessagesSubRequest, - extraStoreRequests: [], - }); - await LibSessionUtil.saveDumpsToDb(groupPk); - - if (lastPushResult !== RunJobResult.Success) { - throw new Error(`Failed to destroyGroupDetails for pk ${ed25519Str(groupPk)}`); + await MetaGroupWrapperActions.infoGet(groupPk); + metaGroupWrapperExists = true; + } catch { + window.log.warn(`deleteGroup: MetaGroupWrapperActions for ${groupPk} does not exist.`); + } + if (metaGroupWrapperExists) { + try { + const us = UserUtils.getOurPubKeyStrFromCache(); + const allMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); + const otherAdminsCount = allMembers + .filter(m => m.nominatedAdmin) + .filter(m => m.pubkeyHex !== us).length; + const weAreLastAdmin = otherAdminsCount === 0; + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + const fromUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); + if (!infos || !fromUserGroup || isEmpty(infos) || isEmpty(fromUserGroup)) { + throw new Error('deleteGroup: some required data not present'); } + const { secretKey } = fromUserGroup; + + // check if we are the last admin + if (secretKey && !isEmpty(secretKey) && (weAreLastAdmin || forceDestroyForAllMembers)) { + const deleteAllMessagesSubRequest = deleteAllMessagesOnSwarm + ? new DeleteAllFromGroupMsgNodeSubRequest({ + groupPk, + secretKey, + }) + : undefined; + + // this marks the group info as deleted. We need to push those details + await MetaGroupWrapperActions.infoDestroy(groupPk); + const lastPushResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ + groupPk, + deleteAllMessagesSubRequest, + extraStoreRequests: [], + }); + await LibSessionUtil.saveDumpsToDb(groupPk); + + if (lastPushResult !== RunJobResult.Success) { + throw new Error(`Failed to destroyGroupDetails for pk ${ed25519Str(groupPk)}`); + } + } + } catch (e) { + // if that group was already freed this will happen. + // we still want to delete it entirely though + window.log.warn( + `deleteGroup: MetaGroupWrapperActions failed with: ${e.message}... Keeping it as this should be a retryable error` + ); + throw e; } - } catch (e) { - // if that group was already freed this will happen. - // we still want to delete it entirely though - window.log.warn( - `deleteGroup: MetaGroupWrapperActions failed with: ${e.message}... Keeping it as this should be a retryable error` - ); - throw e; } // this deletes the secretKey if we had it. If we need it for something, it has to be done before this call. From 5a2bbc9f31602639c3720c6350570acba8ccc03b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 18 Dec 2024 10:58:16 +1100 Subject: [PATCH 233/302] fix: save dumps on group delete --- ts/session/conversations/ConversationController.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index ce33228dd7..6b6c08d4cd 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -401,6 +401,8 @@ class ConvoController { await Data.emptySeenMessageHashesForConversation(groupPk); } + await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); + await SessionUtilConvoInfoVolatile.removeGroupFromWrapper(groupPk); // release the memory (and the current meta-dumps in memory for that group) window.log.info(`freeing meta group wrapper: ${ed25519Str(groupPk)}`); From 93af4cc90bd9215b390571466dd7b7dabd5d1eda Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 18 Dec 2024 13:37:35 +1100 Subject: [PATCH 234/302] chore: add data testIds to community button&input overlay --- ts/components/leftpane/overlay/OverlayCommunity.tsx | 8 +++++++- ts/react.d.ts | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx index 3180d2bfda..ec612058ab 100644 --- a/ts/components/leftpane/overlay/OverlayCommunity.tsx +++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx @@ -112,9 +112,15 @@ export const OverlayCommunity = () => { centerText={true} monospaced={true} isTextArea={true} + inputDataTestId="join-community-conversation" /> - + {!loading ? : null} diff --git a/ts/react.d.ts b/ts/react.d.ts index 0e3fc2dc45..4ec2ceb4f5 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -179,6 +179,8 @@ declare module 'react' { // to sort | 'restore-using-recovery' | 'link-device' + | 'join-community-conversation' + | 'join-community-button' | 'select-contact' | 'contact' // this is way too generic | 'contact-status' From acc6e8462700cd0a04cda1ec2c42967eef873d84 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Wed, 18 Dec 2024 17:26:53 +1100 Subject: [PATCH 235/302] feat: add not_sent & unknown string also remove the desktop sending state. this will soon by in libsession --- _locales/en/messages.json | 4 + ts/components/MemberListItem.tsx | 76 +++++++----- ts/state/ducks/metaGroups.ts | 2 - ts/state/selectors/groups.ts | 204 ++++++++++--------------------- 4 files changed, 111 insertions(+), 175 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index e53b3c7767..409381a547 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -25,7 +25,9 @@ "adminPromotionFailedDescription": "Failed to promote {name} in {group_name}", "adminPromotionFailedDescriptionMultiple": "Failed to promote {name} and {count} others in {group_name}", "adminPromotionFailedDescriptionTwo": "Failed to promote {name} and {other_name} in {group_name}", + "adminPromotionNotSent": "Promotion not sent", "adminPromotionSent": "Admin promotion sent", + "adminPromotionStatusUnknown": "Promotion status unknown", "adminRemove": "Remove Admins", "adminRemoveAsAdmin": "Remove as Admin", "adminRemoveCommunityNone": "There are no Admins in this Community.", @@ -394,10 +396,12 @@ "groupInviteFailedMultiple": "Failed to invite {name} and {count} others to {group_name}", "groupInviteFailedTwo": "Failed to invite {name} and {other_name} to {group_name}", "groupInviteFailedUser": "Failed to invite {name} to {group_name}", + "groupInviteNotSent": "Invite not sent", "groupInviteReinvite": "{name} invited you to rejoin {group_name}, where you are an Admin.", "groupInviteReinviteYou": "You were invited to rejoin {group_name}, where you are an Admin.", "groupInviteSending": "{count, plural, one [Sending invite] other [Sending invites]}", "groupInviteSent": "Invite sent", + "groupInviteStatusUnknown": "Invite status unknown", "groupInviteSuccessful": "Group invite successful", "groupInviteVersion": "Users must have the latest release to receive invitations", "groupInviteYou": "You were invited to join the group.", diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 6fafbf41ee..f3eda05160 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -1,6 +1,6 @@ import styled from 'styled-components'; -import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType, MemberStateGroupV2, PubkeyType } from 'libsession_util_nodejs'; import { isEmpty } from 'lodash'; import { useNicknameOrProfileNameOrShortenedPubkey, @@ -13,14 +13,9 @@ import { GroupInvite } from '../session/utils/job_runners/jobs/GroupInviteJob'; import { hasClosedGroupV2QAButtons } from '../shared/env_vars'; import { useMemberHasAcceptedInvite, - useMemberInviteFailed, - useMemberInviteSending, - useMemberInviteSent, - useMemberPromoteSending, - useMemberPromotionFailed, - useMemberPromotionSent, useMemberIsNominatedAdmin, useMemberPendingRemoval, + useMemberStatus, } from '../state/selectors/groups'; import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar'; import { Flex } from './basic/Flex'; @@ -35,6 +30,7 @@ import { MetaGroupWrapperActions, UserGroupsWrapperActions, } from '../webworker/workers/browser/libsession_worker_interface'; +import { assertUnreachable } from '../types/sqlSharedTypes'; const AvatarContainer = styled.div` position: relative; @@ -161,43 +157,61 @@ const StyledGroupStatusText = styled.span<{ isFailure: boolean }>` text-align: start; `; +function localisedStatusFromMemberStatus(memberStatus: MemberStateGroupV2) { + switch (memberStatus) { + case 'INVITE_FAILED': + return window.i18n('groupInviteFailed'); + case 'INVITE_NOT_SENT': + return window.i18n('groupInviteNotSent'); + case 'INVITE_SENDING': + return window.i18n('groupInviteSending', { count: 1 }); + case 'INVITE_SENT': + return window.i18n('groupInviteSent'); + case 'INVITE_UNKNOWN': // fallback, hopefully won't happen in production + return window.i18n('groupInviteStatusUnknown'); + case 'PROMOTION_UNKNOWN': // fallback, hopefully won't happen in production + return window.i18n('adminPromotionStatusUnknown'); + case 'REMOVED_UNKNOWN': // fallback, hopefully won't happen in production + case 'REMOVED_MEMBER': // we want pending removal members at the end of the "invite" states + case 'REMOVED_MEMBER_AND_MESSAGES': + return null; // no text for those 3 pending removal states + case 'PROMOTION_FAILED': + return window.i18n('adminPromotionFailed'); + case 'PROMOTION_NOT_SENT': + return window.i18n('adminPromotionNotSent'); + case 'PROMOTION_SENDING': + return window.i18n('adminSendingPromotion', { count: 1 }); + case 'PROMOTION_SENT': + return window.i18n('adminPromotionSent'); + case 'PROMOTION_ACCEPTED': + return null; // no statuses for accepted state; + case 'INVITE_ACCEPTED': + return null; // no statuses for accepted state + default: + assertUnreachable(memberStatus, 'Unhandled switch case'); + return Number.MAX_SAFE_INTEGER; + } +} + const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupPubkeyType }) => { - const groupInviteFailed = useMemberInviteFailed(pubkey, groupPk); - const groupPromotionFailed = useMemberPromotionFailed(pubkey, groupPk); - const groupPromotionSending = useMemberPromoteSending(groupPk, pubkey); + const memberStatus = useMemberStatus(pubkey, groupPk); - const groupInviteSent = useMemberInviteSent(pubkey, groupPk); - const groupPromotionSent = useMemberPromotionSent(pubkey, groupPk); - const groupInviteSending = useMemberInviteSending(groupPk, pubkey); + if (!memberStatus) { + return null; + } /** * Note: Keep the "sending" checks here first, as we might be "sending" when we've previously failed. * If we were to have the "failed" checks first, we'd hide the "sending" state when we are retrying. */ - const statusText = groupInviteSending - ? window.i18n('groupInviteSending', { count: 1 }) - : groupPromotionSending - ? window.i18n('adminSendingPromotion', { count: 1 }) - : groupPromotionFailed - ? window.i18n('adminPromotionFailed') - : groupInviteFailed - ? window.i18n('groupInviteFailed') - : groupInviteSent - ? window.i18n('groupInviteSent') - : groupPromotionSent - ? window.i18n('adminPromotionSent') - : null; - + const statusText = localisedStatusFromMemberStatus(memberStatus); if (!statusText) { return null; } return ( {statusText} diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index e35b9c70e4..0c28dae07c 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -1202,8 +1202,6 @@ const currentDeviceGroupNameChange = createAsyncThunk( function deleteGroupPkEntriesFromState(state: GroupState, groupPk: GroupPubkeyType) { delete state.infos[groupPk]; delete state.members[groupPk]; - delete state.membersInviteSending[groupPk]; - delete state.membersPromoteSending[groupPk]; } function applySendingStateChange({ diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index 5bf75f9c35..f5efbe4516 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -5,7 +5,8 @@ import { PubkeyType, } from 'libsession_util_nodejs'; import { useSelector } from 'react-redux'; -import { compact, concat, differenceBy, sortBy, uniqBy } from 'lodash'; +import { sortBy } from 'lodash'; +import { useMemo } from 'react'; import { PubKey } from '../../session/types'; import { GroupState } from '../ducks/metaGroups'; import { StateType } from '../reducer'; @@ -14,8 +15,6 @@ import { UserUtils } from '../../session/utils'; import { useConversationsNicknameRealNameOrShortenPubkey } from '../../hooks/useParamSelector'; const getLibGroupsState = (state: StateType): GroupState => state.groups; -const getInviteSendingState = (state: StateType) => getLibGroupsState(state).membersInviteSending; -const getPromoteSendingState = (state: StateType) => getLibGroupsState(state).membersPromoteSending; function getMembersOfGroup(state: StateType, convo?: string): Array { if (!convo) { @@ -116,6 +115,11 @@ function getMemberPendingRemoval(state: StateType, pubkey: PubkeyType, convo?: G ); } +function getMemberStatus(state: StateType, pubkey: PubkeyType, convo?: GroupPubkeyType) { + const members = getMembersOfGroup(state, convo); + return findMemberInMembers(members, pubkey)?.memberStatus; +} + export function getLibMembersCount(state: StateType, convo?: GroupPubkeyType): Array { return getLibMembersPubkeys(state, convo); } @@ -171,6 +175,10 @@ export function useIsCreatingGroupFromUIPending() { return useSelector(getIsCreatingGroupFromUI); } +export function useMemberStatus(member: PubkeyType, groupPk: GroupPubkeyType) { + return useSelector((state: StateType) => getMemberStatus(state, member, groupPk)); +} + export function useMemberInviteFailed(member: PubkeyType, groupPk: GroupPubkeyType) { return useSelector((state: StateType) => getMemberInviteFailed(state, member, groupPk)); } @@ -219,152 +227,64 @@ export function useGroupNameChangeFromUIPending() { return useSelector(getGroupNameChangeFromUIPending); } -/** - * The selectors above are all deriving data from libsession. - * There is also some data that we only need in memory, not part of libsession (and so unsaved). - * An example is the "sending invite" or "sending promote" state of a member in a group. - */ - -function useMembersInviteSending(groupPk?: string) { - return useSelector((state: StateType) => - groupPk && PubKey.is03Pubkey(groupPk) ? getInviteSendingState(state)[groupPk] || [] : [] - ); -} - -export function useMemberInviteSending(groupPk: GroupPubkeyType, memberPk: PubkeyType) { - return useMembersInviteSending(groupPk).includes(memberPk); -} - -function useMembersPromoteSending(groupPk?: string) { - return useSelector((state: StateType) => - groupPk && PubKey.is03Pubkey(groupPk) ? getPromoteSendingState(state)[groupPk] || [] : [] - ); -} - -export function useMemberPromoteSending(groupPk: GroupPubkeyType, memberPk: PubkeyType) { - return useMembersPromoteSending(groupPk).includes(memberPk); +function getSortingOrderForStatus(memberStatus: MemberStateGroupV2) { + switch (memberStatus) { + case 'INVITE_FAILED': + return 0; + case 'INVITE_NOT_SENT': + return 10; + case 'INVITE_SENDING': + return 20; + case 'INVITE_SENT': + return 30; + case 'INVITE_UNKNOWN': // fallback, hopefully won't happen in production + return 40; + case 'REMOVED_UNKNOWN': // fallback, hopefully won't happen in production + case 'REMOVED_MEMBER': // we want pending removal members at the end of the "invite" states + case 'REMOVED_MEMBER_AND_MESSAGES': + return 50; + case 'PROMOTION_FAILED': + return 60; + case 'PROMOTION_NOT_SENT': + return 70; + case 'PROMOTION_SENDING': + return 80; + case 'PROMOTION_SENT': + return 90; + case 'PROMOTION_UNKNOWN': // fallback, hopefully won't happen in production + return 100; + case 'PROMOTION_ACCEPTED': + return 110; + case 'INVITE_ACCEPTED': + return 120; + default: + assertUnreachable(memberStatus, 'Unhandled switch case'); + return Number.MAX_SAFE_INTEGER; + } } -type MemberStateGroupV2WithSending = MemberStateGroupV2 | 'INVITE_SENDING' | 'PROMOTION_SENDING'; -type MemberWithV2Sending = Pick & { - memberStatus: MemberStateGroupV2WithSending; -}; - export function useStateOf03GroupMembers(convoId?: string) { const us = UserUtils.getOurPubKeyStrFromCache(); - let unsortedMembers = useSelector((state: StateType) => getMembersOfGroup(state, convoId)); - const invitesSendingPk = useMembersInviteSending(convoId); - const promotionsSendingPk = useMembersPromoteSending(convoId); - let invitesSending: Array = compact( - invitesSendingPk - .map(sending => unsortedMembers.find(m => m.pubkeyHex === sending)) - .map(m => { - return m ? { ...m, memberStatus: 'INVITE_SENDING' as const } : null; - }) - ); - const promotionSending: Array = compact( - promotionsSendingPk - .map(sending => unsortedMembers.find(m => m.pubkeyHex === sending)) - .map(m => { - return m ? { ...m, memberStatus: 'PROMOTION_SENDING' as const } : null; - }) - ); - - // promotionSending has priority against invitesSending, so removing anything in invitesSending found in promotionSending - invitesSending = differenceBy(invitesSending, promotionSending, value => value.pubkeyHex); - - const bothSending = concat(promotionSending, invitesSending); - - // promotionSending and invitesSending has priority against anything else, so remove anything found in one of those two - // from the unsorted list of members - unsortedMembers = differenceBy(unsortedMembers, bothSending, value => value.pubkeyHex); - - // at this point, merging invitesSending, promotionSending and unsortedMembers should create an array of unique members - const sortedByPriorities = concat(bothSending, unsortedMembers); - if (sortedByPriorities.length !== uniqBy(sortedByPriorities, m => m.pubkeyHex).length) { - throw new Error( - 'merging invitesSending, promotionSending and unsortedMembers should create an array of unique members' - ); - } + const unsortedMembers = useSelector((state: StateType) => getMembersOfGroup(state, convoId)); - // This could have been done now with a `sortedByPriorities.map()` call, - // but we don't want the order as sorted by `sortedByPriorities`, **only** to respect the priorities from it. - // What that means is that a member with a state as inviteSending, should have that state, but not be sorted first. - - // The order we (for now) want is: - // - (Invite failed + Invite Not Sent) merged together, sorted as NameSortingOrder - // - Sending invite, sorted as NameSortingOrder - // - Invite sent, sorted as NameSortingOrder - // - (Promotion failed + Promotion Not Sent) merged together, sorted as NameSortingOrder - // - Sending invite, sorted as NameSortingOrder - // - Invite sent, sorted as NameSortingOrder - // - Admin, sorted as NameSortingOrder - // - Accepted Member, sorted as NameSortingOrder - // NameSortingOrder: You first, then "nickname || name || pubkey -> aA-zZ" - - const unsortedWithStatuses: Array< - Pick & { memberStatus: MemberStateGroupV2WithSending } - > = []; - unsortedWithStatuses.push(...promotionSending); - unsortedWithStatuses.push(...differenceBy(invitesSending, promotionSending)); - unsortedWithStatuses.push(...differenceBy(unsortedMembers, invitesSending, promotionSending)); const names = useConversationsNicknameRealNameOrShortenPubkey( - unsortedWithStatuses.map(m => m.pubkeyHex) + unsortedMembers.map(m => m.pubkeyHex) ); - // needing an index like this outside of lodash is not pretty, - // but sortBy doesn't provide the index in the callback - let index = 0; - - const sorted = sortBy(unsortedWithStatuses, item => { - let stateSortingOrder = 0; - switch (item.memberStatus) { - case 'INVITE_FAILED': - case 'INVITE_NOT_SENT': - stateSortingOrder = -50; - break; - case 'INVITE_SENDING': - stateSortingOrder = -40; - break; - case 'INVITE_SENT': - stateSortingOrder = -30; - break; - case 'REMOVED_UNKNOWN': // fallback, hopefully won't happen in production - case 'REMOVED_MEMBER': // we want pending removal members at the end - case 'REMOVED_MEMBER_AND_MESSAGES': - stateSortingOrder = -20; - break; - case 'PROMOTION_FAILED': - case 'PROMOTION_NOT_SENT': - stateSortingOrder = -15; - break; - case 'PROMOTION_SENDING': - stateSortingOrder = -10; - break; - case 'PROMOTION_SENT': - stateSortingOrder = 0; - break; - case 'PROMOTION_ACCEPTED': - stateSortingOrder = 10; - break; - case 'INVITE_ACCEPTED': - stateSortingOrder = 20; - break; - case 'INVITE_UNKNOWN': // fallback, hopefully won't happen in production - case 'PROMOTION_UNKNOWN': // fallback, hopefully won't happen in production - stateSortingOrder = 50; - break; - - default: - assertUnreachable(item.memberStatus, 'Unhandled switch case'); - } - const sortingOrder = [ - stateSortingOrder, - // per section, we want "us first", then "nickname || displayName || pubkey" - item.pubkeyHex === us ? -1 : names[index]?.toLocaleLowerCase(), - ]; - index++; - return sortingOrder; - }); + const sorted = useMemo(() => { + // needing an index like this outside of lodash is not pretty, + // but sortBy doesn't provide the index in the callback + let index = 0; + return sortBy(unsortedMembers, item => { + const stateSortingOrder = getSortingOrderForStatus(item.memberStatus); + const sortingOrder = [ + stateSortingOrder, + // per section, we want "us" first, then "nickname || displayName || pubkey" + item.pubkeyHex === us ? -1 : names[index], + ]; + index++; + return sortingOrder; + }); + }, [unsortedMembers, us, names]); return sorted; } From df73ce679839f7b569b6e653ca8161d1cb7f7187 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 19 Dec 2024 10:55:25 +1100 Subject: [PATCH 236/302] chore: lint, dedup yarn.lock & address PR comments --- .../overlay/OverlayRightPanelSettings.tsx | 1 + .../menu/items/RetrySend/RetrySendMenuItem.tsx | 1 + ts/models/conversation.ts | 1 + .../conversations/ConversationController.ts | 2 +- yarn.lock | 15 ++++----------- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index fd180fab90..8b2843062b 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -244,6 +244,7 @@ const DeleteGroupPanelButton = () => { if (!showItem || !convoId) { return null; } + const token = PubKey.is03Pubkey(convoId) ? 'groupDelete' : 'conversationsDelete'; return ( diff --git a/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx b/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx index e571fb90b5..f10a72a663 100644 --- a/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx +++ b/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx @@ -11,6 +11,7 @@ export const RetryItem = ({ messageId }: WithMessageId) => { const isOutgoing = direction === 'outgoing'; const showRetry = status === 'error' && isOutgoing; + const onRetry = useCallback(async () => { const found = await Data.getMessageById(messageId); if (found) { diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 461b6167b5..03adc76ff7 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -795,6 +795,7 @@ export class ConversationModel extends Backbone.Model { const messageRequestResponse = new MessageRequestResponse(messageRequestResponseParams); const pubkeyForSending = new PubKey(this.id); + window.log.info(`Sending message request accepted message to ${PubKey.shorten(this.id)}`); await MessageQueue.use() .sendToPubKey(pubkeyForSending, messageRequestResponse, SnodeNamespaces.Default) .catch(window?.log?.error); diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 6b6c08d4cd..409e691ccf 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -274,7 +274,7 @@ class ConvoController { `deleteGroup: ${ed25519Str(groupPk)}, sendLeaveMessage:${sendLeaveMessage}, fromSyncMessage:${fromSyncMessage}, deletionType:${deletionType}, deleteAllMessagesOnSwarm:${deleteAllMessagesOnSwarm}, forceDestroyForAllMembers:${forceDestroyForAllMembers}, clearFetchedHashes:${clearFetchedHashes}` ); - // Keep the messages until we have effectively left the group (and managed to send our leave message)m + // Keep the messages until we have effectively left the group (and managed to send our leave message) // because we have the "Leaving..." state (left pane) linked to the last message in conversation. const conversation = await this.deleteConvoInitialChecks(groupPk, 'Group', true); if (!conversation || !conversation.isClosedGroup()) { diff --git a/yarn.lock b/yarn.lock index 1e559dae17..fd013d0c99 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2646,10 +2646,10 @@ date-fns@^3.6.0: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf" integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww== -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: - version "4.3.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" - integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== +debug@4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: + version "4.4.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" + integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== dependencies: ms "^2.1.3" @@ -2674,13 +2674,6 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4: - version "4.4.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" - integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== - dependencies: - ms "^2.1.3" - decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" From 1b223beba15b2b584322fe0dbe216fda7925c4d3 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 19 Dec 2024 13:35:37 +1100 Subject: [PATCH 237/302] fix: message request response msg needed a convo refresh to appear ... not anymore --- ts/models/conversation.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 03adc76ff7..2fc16fb205 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -2442,16 +2442,11 @@ export class ConversationModel extends Backbone.Model { }); // no need to trigger a UI update now, we trigger a messagesAdded just below - const messageId = await model.commit(false); + const messageId = await model.commit(true); model.set({ id: messageId }); await model.setToExpire(); - - const messageModelProps = model.getMessageModelProps(); - window.inboxStore?.dispatch(conversationActions.messagesChanged([messageModelProps])); this.updateLastMessage(); - - await this.commit(); return model; } From 767178419e46007e1d866fb9cdd261e1227e972e Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 19 Dec 2024 16:52:22 +1100 Subject: [PATCH 238/302] chore: address PR review --- ts/components/MemberListItem.tsx | 4 ---- ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx | 6 +++--- ts/models/conversation.ts | 1 - ts/session/types/PubKey.ts | 5 ++++- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index f3eda05160..aea87d1a26 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -200,10 +200,6 @@ const GroupStatusText = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Gro return null; } - /** - * Note: Keep the "sending" checks here first, as we might be "sending" when we've previously failed. - * If we were to have the "failed" checks first, we'd hide the "sending" state when we are retrying. - */ const statusText = localisedStatusFromMemberStatus(memberStatus); if (!statusText) { return null; diff --git a/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx b/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx index f10a72a663..992e23040a 100644 --- a/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx +++ b/ts/components/menu/items/RetrySend/RetrySendMenuItem.tsx @@ -1,4 +1,4 @@ -import { useCallback } from 'react'; +import useAsyncFn from 'react-use/lib/useAsyncFn'; import { WithMessageId } from '../../../../session/types/with'; import { useMessageDirection, useMessageStatus } from '../../../../state/selectors'; import { ItemWithDataTestId } from '../MenuItemWithDataTestId'; @@ -12,7 +12,7 @@ export const RetryItem = ({ messageId }: WithMessageId) => { const showRetry = status === 'error' && isOutgoing; - const onRetry = useCallback(async () => { + const [, doResend] = useAsyncFn(async () => { const found = await Data.getMessageById(messageId); if (found) { await found.retrySend(); @@ -21,6 +21,6 @@ export const RetryItem = ({ messageId }: WithMessageId) => { return showRetry ? ( // eslint-disable-next-line @typescript-eslint/no-misused-promises - {window.i18n('resend')} + doResend()}>{window.i18n('resend')} ) : null; }; diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 2fc16fb205..09a2e3fa25 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -2441,7 +2441,6 @@ export class ConversationModel extends Backbone.Model { flags, }); - // no need to trigger a UI update now, we trigger a messagesAdded just below const messageId = await model.commit(true); model.set({ id: messageId }); diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index ba98c6c62e..6eb94507e3 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -86,8 +86,11 @@ export class PubKey { public static shorten(value: string | PubKey): string { const valAny = value as PubKey; const pk = value instanceof PubKey ? valAny.key : value; + if (!pk) { + throw new Error('PubKey.shorten was given an invalid PubKey to shorten.'); + } - if (!pk || pk.length < 8) { + if (pk.length < 8) { return pk; } From 5d9dd8534201b1638e5d0ed6fcfe0c32584cdcd6 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 19 Dec 2024 17:02:41 +1100 Subject: [PATCH 239/302] fix: bump libsession-util-nodejs to 0.4.9 --- package.json | 2 +- .../libsession_wrapper_metagroup_test.ts | 12 ++++++++++-- yarn.lock | 6 +++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 81929c3e93..dc502b6ebc 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.8/libsession_util_nodejs-v0.4.8.tar.gz", + "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts index 5275004fd1..410371aa44 100644 --- a/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts +++ b/ts/test/session/unit/libsession_wrapper/libsession_wrapper_metagroup_test.ts @@ -260,6 +260,7 @@ describe('libsession_metagroup', () => { expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq({ ...emptyMember(member), name: 'member name', + memberStatus: 'INVITE_SENDING', }); }); @@ -268,7 +269,11 @@ describe('libsession_metagroup', () => { metaGroupWrapper.memberConstructAndSet(member); metaGroupWrapper.memberSetProfilePicture(member, pic); expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(1); - const expected = { ...emptyMember(member), profilePicture: pic }; + const expected = { + ...emptyMember(member), + profilePicture: pic, + memberStatus: 'INVITE_SENDING', + }; expect(metaGroupWrapper.memberGetAll()[0]).to.be.deep.eq(expected); }); @@ -289,7 +294,10 @@ describe('libsession_metagroup', () => { it('can simply add, and has the correct default', () => { expect(metaGroupWrapper.memberGetAll().length).to.be.deep.eq(0); metaGroupWrapper.memberConstructAndSet(member); - expect(metaGroupWrapper.memberGetAll()).to.be.deep.eq([emptyMember(member)]); + // locally, when adding a member it is shown as INVITE_SENDING + expect(metaGroupWrapper.memberGetAll()).to.be.deep.eq([ + { ...emptyMember(member), memberStatus: 'INVITE_SENDING' }, + ]); }); it('can mark as removed with messages', () => { diff --git a/yarn.lock b/yarn.lock index fd013d0c99..09a608b1ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4944,9 +4944,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.8/libsession_util_nodejs-v0.4.8.tar.gz": - version "0.4.8" - resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.8/libsession_util_nodejs-v0.4.8.tar.gz#6b99465af591545581ab9db64c63ab89198fe643" +"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz": + version "0.4.9" + resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz#239ddfb4a8a688b924ba0f1e4e1c9b573407e176" dependencies: cmake-js "7.2.1" node-addon-api "^6.1.0" From d12acc601fbcd7caff92491325678f81cdd57607 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 19 Dec 2024 17:27:35 +1100 Subject: [PATCH 240/302] fix: reset invite state to "not sent" on resend --- package.json | 2 +- preload.js | 2 +- ts/components/MemberListItem.tsx | 2 ++ ts/state/ducks/metaGroups.ts | 6 ++++-- ts/webworker/workers/browser/libsession_worker_interface.ts | 6 ++++++ yarn.lock | 6 +++--- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index dc502b6ebc..b93c639725 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz", + "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/preload.js b/preload.js index 30a43299f2..7857da8462 100644 --- a/preload.js +++ b/preload.js @@ -41,7 +41,7 @@ window.sessionFeatureFlags = { useOnionRequests: true, useTestNet: isTestNet() || isTestIntegration(), useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA - useClosedGroupV2QAButtons: true, // TODO DO NOT MERGE Remove after QA + useClosedGroupV2QAButtons: false, // TODO DO NOT MERGE Remove after QA replaceLocalizedStringsWithKeys: false, debug: { debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index aea87d1a26..d879d57c2d 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -259,6 +259,8 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP window.log.warn('tried to resend invite but we do not have correct details'); return; } + await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, pubkey); + // if we tried to invite that member as admin right away, let's retry it as such. const inviteAsAdmin = member.nominatedAdmin; await GroupInvite.addJob({ diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 0c28dae07c..ad1bb38df9 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -524,7 +524,8 @@ async function handleWithHistoryMembers({ memberPubkey: member, profileKeyHex, }); - await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); + // a group invite job will be added to the queue + await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, member); } const encryptedSupplementKeys = withHistory.length ? await MetaGroupWrapperActions.generateSupplementKeys(groupPk, withHistory) @@ -554,7 +555,8 @@ async function handleWithoutHistoryMembers({ displayName, profileKeyHex, }); - await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); + // a group invite job will be added to the queue + await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, member); } if (!isEmpty(withoutHistory)) { diff --git a/ts/webworker/workers/browser/libsession_worker_interface.ts b/ts/webworker/workers/browser/libsession_worker_interface.ts index d516222341..896b9ad821 100644 --- a/ts/webworker/workers/browser/libsession_worker_interface.ts +++ b/ts/webworker/workers/browser/libsession_worker_interface.ts @@ -638,6 +638,12 @@ export const MetaGroupWrapperActions: MetaGroupWrapperActionsCalls = { 'memberSetInviteSent', pubkeyHex, ]) as Promise>, + memberSetInviteNotSent: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => + callLibSessionWorker([ + `MetaGroupConfig-${groupPk}`, + 'memberSetInviteNotSent', + pubkeyHex, + ]) as Promise>, memberSetInviteFailed: async (groupPk: GroupPubkeyType, pubkeyHex: PubkeyType) => callLibSessionWorker([ `MetaGroupConfig-${groupPk}`, diff --git a/yarn.lock b/yarn.lock index 09a608b1ff..9f21297c9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4944,9 +4944,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz": - version "0.4.9" - resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.9/libsession_util_nodejs-v0.4.9.tar.gz#239ddfb4a8a688b924ba0f1e4e1c9b573407e176" +"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz": + version "0.4.10" + resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz#9a420fa0ad4dc9067de17b2ec9fa3676a1c10056" dependencies: cmake-js "7.2.1" node-addon-api "^6.1.0" From 64fcc8934de30114d4ad9525cf61125ed8e9ff29 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 20 Dec 2024 11:01:29 +1100 Subject: [PATCH 241/302] fix: delete group messages only if push destroyed passed --- ts/session/conversations/ConversationController.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 409e691ccf..5353cb42ad 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -295,14 +295,14 @@ class ConvoController { } } - // now that we know we've sent the leave message, delete any remaining messages - await this.deleteConvoInitialChecks(groupPk, 'Group', false); - // a group 03 can be removed fully or kept empty as kicked. // when it was pendingInvite, we delete it fully, // when it was not, we empty the group but keep it with the "you have been kicked" message // Note: the pendingInvite=true case cannot really happen as we wouldn't be polling from that group (and so, not get the message kicking us) if (deletionType === 'keepAsKicked' || deletionType === 'keepAsDestroyed') { + // now that we know we've sent the leave message, delete any remaining messages + await this.deleteConvoInitialChecks(groupPk, 'Group', false); + // delete the secretKey/authData if we had it. If we need it for something, it has to be done before this call. if (groupInUserGroup) { groupInUserGroup.authData = null; @@ -380,11 +380,13 @@ class ConvoController { // if that group was already freed this will happen. // we still want to delete it entirely though window.log.warn( - `deleteGroup: MetaGroupWrapperActions failed with: ${e.message}... Keeping it as this should be a retryable error` + `deleteGroup: MetaGroupWrapperActions failed with: ${e.message}... Keeping it as this should be a retryable error (we are admin case)` ); throw e; } } + // now that we know we've pushed the group as destroyed, destroy the group's messages locally + await this.deleteConvoInitialChecks(groupPk, 'Group', false); // this deletes the secretKey if we had it. If we need it for something, it has to be done before this call. await UserGroupsWrapperActions.eraseGroup(groupPk); From 16f33d916b2ad4a23ce87389d661f440e5a38d75 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 20 Dec 2024 11:23:41 +1100 Subject: [PATCH 242/302] chore: bump session to 1.15.0 for groups --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27b599ffe3..e8537644e6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "session-desktop", "productName": "Session", "description": "Private messaging from your desktop", - "version": "1.14.5", + "version": "1.15.0", "license": "GPL-3.0", "author": { "name": "Session Foundation", From a8372f1b8c6ee269cab370d2d642c209e2589159 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 31 Dec 2024 11:11:05 +1100 Subject: [PATCH 243/302] fix: show dialog before deleting group also deal with leave/delete group silent retries on 401 --- .../overlay/OverlayRightPanelSettings.tsx | 25 ++++--- .../conversation-list-item/MessageItem.tsx | 5 +- .../menu/ConversationListItemContextMenu.tsx | 4 +- ts/components/menu/Menu.tsx | 8 +-- .../DeleteGroupMenuItem.tsx | 18 ++--- .../LeaveGroupMenuItem.tsx | 14 ++-- .../menu/items/LeaveAndDeleteGroup/guard.ts | 49 ++++++++----- ts/hooks/useParamSelector.ts | 2 +- ts/interactions/conversationInteractions.ts | 70 +++++++++++-------- ts/models/conversation.ts | 1 + ts/session/apis/snode_api/batchRequest.ts | 2 +- ts/session/apis/snode_api/onions.ts | 32 ++++----- ts/session/apis/snode_api/sessionRpc.ts | 7 +- .../conversations/ConversationController.ts | 18 +++-- ts/session/sending/MessageSender.ts | 14 ++-- ts/session/types/with.ts | 1 + .../utils/job_runners/jobs/GroupInviteJob.ts | 1 + .../jobs/GroupPendingRemovalsJob.ts | 12 ++-- .../utils/job_runners/jobs/GroupSyncJob.ts | 5 ++ .../utils/job_runners/jobs/UserSyncJob.ts | 1 + ts/state/ducks/metaGroups.ts | 6 ++ ts/state/selectors/section.ts | 7 +- .../group_sync_job/GroupSyncJob_test.ts | 3 + 23 files changed, 185 insertions(+), 120 deletions(-) diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx index 8b2843062b..c50d7b5e1b 100644 --- a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx +++ b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx @@ -1,7 +1,7 @@ import { compact, flatten, isEqual } from 'lodash'; import { SessionDataTestId, useEffect, useState } from 'react'; -import { useDispatch, useSelector } from 'react-redux'; +import { useDispatch } from 'react-redux'; import useInterval from 'react-use/lib/useInterval'; import styled from 'styled-components'; import { Data } from '../../../../data/data'; @@ -11,13 +11,14 @@ import { useConversationUsername, useDisappearingMessageSettingText, useIsClosedGroup, + useIsGroupDestroyed, useIsKickedFromGroup, useIsPublic, - useLastMessageIsLeaveError, } from '../../../../hooks/useParamSelector'; import { useIsRightPanelShowing } from '../../../../hooks/useUI'; import { showAddModeratorsByConvoId, + showDeleteGroupByConvoId, showInviteContactByConvoId, showLeaveGroupByConvoId, showRemoveModeratorsByConvoId, @@ -57,7 +58,7 @@ import { showDeleteGroupItem, showLeaveGroupItem, } from '../../../menu/items/LeaveAndDeleteGroup/guard'; -import { getIsMessageRequestOverlayShown } from '../../../../state/selectors/section'; +import { useIsMessageRequestOverlayShown } from '../../../../state/selectors/section'; import { showLeaveCommunityItem } from '../../../menu/items/LeaveCommunity/guard'; async function getMediaGalleryProps(conversationId: string): Promise<{ @@ -229,16 +230,18 @@ const LeaveCommunityPanelButton = () => { const DeleteGroupPanelButton = () => { const convoId = useSelectedConversationKey(); const isGroup = useIsClosedGroup(convoId); - const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isMessageRequestShown = useIsMessageRequestOverlayShown(); const isKickedFromGroup = useIsKickedFromGroup(convoId) || false; - const lastMessageIsLeaveError = useLastMessageIsLeaveError(convoId); const selectedUsername = useConversationUsername(convoId) || convoId; + const isPublic = useIsPublic(convoId); + const isGroupDestroyed = useIsGroupDestroyed(convoId); const showItem = showDeleteGroupItem({ isGroup, isKickedFromGroup, isMessageRequestShown, - lastMessageIsLeaveError, + isPublic, + isGroupDestroyed, }); if (!showItem || !convoId) { @@ -251,7 +254,7 @@ const DeleteGroupPanelButton = () => { void showLeaveGroupByConvoId(convoId, selectedUsername)} + onClick={() => void showDeleteGroupByConvoId(convoId, selectedUsername)} color={'var(--danger-color)'} iconType={'delete'} /> @@ -262,15 +265,17 @@ const LeaveGroupPanelButton = () => { const selectedConvoKey = useSelectedConversationKey(); const isGroup = useIsClosedGroup(selectedConvoKey); const username = useConversationUsername(selectedConvoKey) || selectedConvoKey; - const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isMessageRequestShown = useIsMessageRequestOverlayShown(); const isKickedFromGroup = useIsKickedFromGroup(selectedConvoKey) || false; - const lastMessageIsLeaveError = useLastMessageIsLeaveError(selectedConvoKey); + const isPublic = useIsPublic(selectedConvoKey); + const isGroupDestroyed = useIsGroupDestroyed(selectedConvoKey); const showItem = showLeaveGroupItem({ isGroup, isKickedFromGroup, isMessageRequestShown, - lastMessageIsLeaveError, + isPublic, + isGroupDestroyed, }); if (!selectedConvoKey || !showItem) { diff --git a/ts/components/leftpane/conversation-list-item/MessageItem.tsx b/ts/components/leftpane/conversation-list-item/MessageItem.tsx index 78d240cdfb..1273a0ae76 100644 --- a/ts/components/leftpane/conversation-list-item/MessageItem.tsx +++ b/ts/components/leftpane/conversation-list-item/MessageItem.tsx @@ -1,7 +1,6 @@ import classNames from 'classnames'; import { isEmpty } from 'lodash'; -import { useSelector } from 'react-redux'; import { useConvoIdFromContext } from '../../../contexts/ConvoIdContext'; import { useHasUnread, @@ -12,7 +11,7 @@ import { } from '../../../hooks/useParamSelector'; import { LastMessageStatusType } from '../../../state/ducks/types'; import { useIsSearching } from '../../../state/selectors/search'; -import { getIsMessageRequestOverlayShown } from '../../../state/selectors/section'; +import { useIsMessageRequestOverlayShown } from '../../../state/selectors/section'; import { assertUnreachable } from '../../../types/sqlSharedTypes'; import { TypingAnimation } from '../../conversation/TypingAnimation'; import { MessageBody } from '../../conversation/message/message-content/MessageBody'; @@ -26,7 +25,7 @@ export const MessageItem = () => { const hasUnread = useHasUnread(conversationId); const isConvoTyping = useIsTyping(conversationId); - const isMessageRequest = useSelector(getIsMessageRequestOverlayShown); + const isMessageRequest = useIsMessageRequestOverlayShown(); const isOutgoingRequest = useIsOutgoingRequest(conversationId); const isSearching = useIsSearching(); diff --git a/ts/components/menu/ConversationListItemContextMenu.tsx b/ts/components/menu/ConversationListItemContextMenu.tsx index 2ac35998f1..83aeb1964a 100644 --- a/ts/components/menu/ConversationListItemContextMenu.tsx +++ b/ts/components/menu/ConversationListItemContextMenu.tsx @@ -5,8 +5,8 @@ import { useConvoIdFromContext } from '../../contexts/ConvoIdContext'; import { useIsPinned, useIsPrivate, useIsPrivateAndFriend } from '../../hooks/useParamSelector'; import { ConvoHub } from '../../session/conversations'; import { - getIsMessageRequestOverlayShown, getIsMessageSection, + useIsMessageRequestOverlayShown, } from '../../state/selectors/section'; import { useIsSearching } from '../../state/selectors/search'; import { SessionContextMenuContainer } from '../SessionContextMenuContainer'; @@ -91,7 +91,7 @@ export const PinConversationMenuItem = (): JSX.Element | null => { const isPrivateAndFriend = useIsPrivateAndFriend(conversationId); const isPrivate = useIsPrivate(conversationId); const isPinned = useIsPinned(conversationId); - const isMessageRequest = useSelector(getIsMessageRequestOverlayShown); + const isMessageRequest = useIsMessageRequestOverlayShown(); if (isMessagesSection && !isMessageRequest && (!isPrivate || (isPrivate && isPrivateAndFriend))) { const conversation = ConvoHub.use().get(conversationId); diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index b032375483..2c4d0ae902 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -49,8 +49,8 @@ import { } from '../../state/ducks/modalDialog'; import { useConversationIdOrigin } from '../../state/selectors/conversations'; import { - getIsMessageRequestOverlayShown, getIsMessageSection, + useIsMessageRequestOverlayShown, } from '../../state/selectors/section'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import type { LocalizerToken } from '../../types/localizer'; @@ -84,7 +84,7 @@ export const MarkConversationUnreadMenuItem = (): JSX.Element | null => { const isMessagesSection = useSelector(getIsMessageSection); const isPrivate = useIsPrivate(conversationId); const isPrivateAndFriend = useIsPrivateAndFriend(conversationId); - const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isMessageRequestShown = useIsMessageRequestOverlayShown(); if ( isMessagesSection && @@ -358,7 +358,7 @@ export const ChangeNicknameMenuItem = () => { */ export const DeleteMessagesMenuItem = () => { const convoId = useConvoIdFromContext(); - const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isMessageRequestShown = useIsMessageRequestOverlayShown(); if (!convoId || isMessageRequestShown) { return null; @@ -495,7 +495,7 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => { const isFriend = useIsPrivateAndFriend(convoId); const isPrivate = useIsPrivate(convoId); - const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isMessageRequestShown = useIsMessageRequestOverlayShown(); if ( !convoId || diff --git a/ts/components/menu/items/LeaveAndDeleteGroup/DeleteGroupMenuItem.tsx b/ts/components/menu/items/LeaveAndDeleteGroup/DeleteGroupMenuItem.tsx index 18411a807c..9fdc5aaa92 100644 --- a/ts/components/menu/items/LeaveAndDeleteGroup/DeleteGroupMenuItem.tsx +++ b/ts/components/menu/items/LeaveAndDeleteGroup/DeleteGroupMenuItem.tsx @@ -1,14 +1,14 @@ -import { useSelector } from 'react-redux'; import { useConvoIdFromContext } from '../../../../contexts/ConvoIdContext'; import { useConversationUsername, useIsKickedFromGroup, useIsClosedGroup, - useLastMessageIsLeaveError, + useIsPublic, + useIsGroupDestroyed, } from '../../../../hooks/useParamSelector'; -import { showLeaveGroupByConvoId } from '../../../../interactions/conversationInteractions'; +import { showDeleteGroupByConvoId } from '../../../../interactions/conversationInteractions'; import { PubKey } from '../../../../session/types'; -import { getIsMessageRequestOverlayShown } from '../../../../state/selectors/section'; +import { useIsMessageRequestOverlayShown } from '../../../../state/selectors/section'; import { ItemWithDataTestId } from '../MenuItemWithDataTestId'; import { showDeleteGroupItem } from './guard'; import { Localizer } from '../../../basic/Localizer'; @@ -17,15 +17,17 @@ export const DeleteGroupMenuItem = () => { const convoId = useConvoIdFromContext(); const username = useConversationUsername(convoId) || convoId; const isGroup = useIsClosedGroup(convoId); - const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isMessageRequestShown = useIsMessageRequestOverlayShown(); const isKickedFromGroup = useIsKickedFromGroup(convoId) || false; - const lastMessageIsLeaveError = useLastMessageIsLeaveError(convoId); + const isPublic = useIsPublic(convoId); + const isGroupDestroyed = useIsGroupDestroyed(convoId); const showLeave = showDeleteGroupItem({ isGroup, isKickedFromGroup, isMessageRequestShown, - lastMessageIsLeaveError, + isPublic, + isGroupDestroyed, }); if (!showLeave) { @@ -37,7 +39,7 @@ export const DeleteGroupMenuItem = () => { return ( { - void showLeaveGroupByConvoId(convoId, username); + void showDeleteGroupByConvoId(convoId, username); }} > diff --git a/ts/components/menu/items/LeaveAndDeleteGroup/LeaveGroupMenuItem.tsx b/ts/components/menu/items/LeaveAndDeleteGroup/LeaveGroupMenuItem.tsx index 4facb6bbd7..7602735134 100644 --- a/ts/components/menu/items/LeaveAndDeleteGroup/LeaveGroupMenuItem.tsx +++ b/ts/components/menu/items/LeaveAndDeleteGroup/LeaveGroupMenuItem.tsx @@ -1,13 +1,13 @@ -import { useSelector } from 'react-redux'; import { useConvoIdFromContext } from '../../../../contexts/ConvoIdContext'; import { useConversationUsername, useIsKickedFromGroup, useIsClosedGroup, - useLastMessageIsLeaveError, + useIsPublic, + useIsGroupDestroyed, } from '../../../../hooks/useParamSelector'; import { showLeaveGroupByConvoId } from '../../../../interactions/conversationInteractions'; -import { getIsMessageRequestOverlayShown } from '../../../../state/selectors/section'; +import { useIsMessageRequestOverlayShown } from '../../../../state/selectors/section'; import { ItemWithDataTestId } from '../MenuItemWithDataTestId'; import { showLeaveGroupItem } from './guard'; import { Localizer } from '../../../basic/Localizer'; @@ -15,16 +15,18 @@ import { Localizer } from '../../../basic/Localizer'; export const LeaveGroupMenuItem = () => { const convoId = useConvoIdFromContext(); const isGroup = useIsClosedGroup(convoId); + const isPublic = useIsPublic(convoId); const username = useConversationUsername(convoId) || convoId; - const isMessageRequestShown = useSelector(getIsMessageRequestOverlayShown); + const isMessageRequestShown = useIsMessageRequestOverlayShown(); const isKickedFromGroup = useIsKickedFromGroup(convoId) || false; - const lastMessageIsLeaveError = useLastMessageIsLeaveError(convoId); + const isGroupDestroyed = useIsGroupDestroyed(convoId); const showLeave = showLeaveGroupItem({ isGroup, isMessageRequestShown, isKickedFromGroup, - lastMessageIsLeaveError, + isPublic, + isGroupDestroyed, }); if (!showLeave) { diff --git a/ts/components/menu/items/LeaveAndDeleteGroup/guard.ts b/ts/components/menu/items/LeaveAndDeleteGroup/guard.ts index e0dda44f5c..baafe0d67a 100644 --- a/ts/components/menu/items/LeaveAndDeleteGroup/guard.ts +++ b/ts/components/menu/items/LeaveAndDeleteGroup/guard.ts @@ -1,42 +1,53 @@ function sharedEnabled({ isGroup, + isPublic, isMessageRequestShown, -}: Pick[0], 'isGroup' | 'isMessageRequestShown'>) { - return isGroup && !isMessageRequestShown; +}: Pick< + Parameters[0], + 'isGroup' | 'isMessageRequestShown' | 'isPublic' +>) { + return isGroup && !isMessageRequestShown && !isPublic; } - +/** + * We can try leave a group if + * - we are an admin of the group (that group would be marked as destroyed on delete) + * and + * - we are a **not kicked** member (if we are kicked without knowing about it and try to leave, we will silently remove the group) + * + * Note: Those actions are hidden if the group is a group request (as we have other buttons to accept/decline a group request). + * + * Note: If we fail to leave the group but that error is retryable, we will keep the group displaying the "leave" option. + */ export function showLeaveGroupItem({ isGroup, + isPublic, isKickedFromGroup, isMessageRequestShown, - lastMessageIsLeaveError, + isGroupDestroyed, }: { isGroup: boolean; + isPublic: boolean; isMessageRequestShown: boolean; - lastMessageIsLeaveError: boolean; isKickedFromGroup: boolean; + isGroupDestroyed: boolean; }) { - // we can't try to leave the group if we were kicked from it, or if we've already tried to (lastMessageIsLeaveError is true) return ( - sharedEnabled({ isGroup, isMessageRequestShown }) && + sharedEnabled({ isGroup, isMessageRequestShown, isPublic }) && !isKickedFromGroup && - !lastMessageIsLeaveError + !isGroupDestroyed ); } -export function showDeleteGroupItem({ - isGroup, - isKickedFromGroup, - isMessageRequestShown, - lastMessageIsLeaveError, -}: { +/** + * We can try to delete a group only if the `showLeaveGroupItem` returns false. + * Note: those actions are hidden if the group is a group request (as we have other buttons to accept/decline a group request) + */ +export function showDeleteGroupItem(args: { isGroup: boolean; + isPublic: boolean; isMessageRequestShown: boolean; - lastMessageIsLeaveError: boolean; isKickedFromGroup: boolean; + isGroupDestroyed: boolean; }) { - return ( - sharedEnabled({ isGroup, isMessageRequestShown }) && - (isKickedFromGroup || lastMessageIsLeaveError) - ); + return sharedEnabled(args) && !showLeaveGroupItem(args); } diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 66a7123540..e35ae40ddf 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -212,7 +212,7 @@ export function useIsKickedFromGroup(convoId?: string) { export function useIsGroupDestroyed(convoId?: string) { const libIsDestroyed = useLibGroupDestroyed(convoId); if (convoId && PubKey.is03Pubkey(convoId)) { - return libIsDestroyed; + return libIsDestroyed || false; } return false; } diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index cb1734caf6..1d4540276d 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -431,21 +431,6 @@ async function leaveGroupOrCommunityByConvoId({ } } -/** - * Returns true if we the convo is a 03 group and if we can try to send a leave message. - */ -async function hasLeavingDetails(convoId: string) { - if (!PubKey.is03Pubkey(convoId)) { - return true; - } - - const group = await UserGroupsWrapperActions.getGroup(convoId); - - // we need the authData or the secretKey to be able to attempt to leave, - // otherwise we won't be able to even try - return group && (!isEmpty(group.authData) || !isEmpty(group.secretKey)); -} - export async function showLeaveGroupByConvoId(conversationId: string, name: string | undefined) { const conversation = ConvoHub.use().get(conversationId); @@ -462,20 +447,6 @@ export async function showLeaveGroupByConvoId(conversationId: string, name: stri (PubKey.is05Pubkey(conversationId) || PubKey.is03Pubkey(conversationId)) && isAdmin && admins.length === 1; - const lastMessageInteractionType = conversation.get('lastMessageInteractionType'); - const lastMessageInteractionStatus = conversation.get('lastMessageInteractionStatus'); - - const canTryToLeave = await hasLeavingDetails(conversationId); - - if ( - !isPublic && - ((lastMessageInteractionType === ConversationInteractionType.Leave && - lastMessageInteractionStatus === ConversationInteractionStatus.Error) || - !canTryToLeave) // if we don't have any key to send our leave message, no need to try - ) { - await leaveGroupOrCommunityByConvoId({ conversationId, isPublic, sendLeaveMessage: false }); - return; - } // if this is a community, or we legacy group are not admin, we can just show a confirmation dialog @@ -525,6 +496,46 @@ export async function showLeaveGroupByConvoId(conversationId: string, name: stri } } +/** + * Can be used to show a dialog asking confirmation about deleting a group. + * Communities are explicitly forbidden. + * This function won't attempt to send a leave message. Use `showLeaveGroupByConvoId` for that purpose + */ +export async function showDeleteGroupByConvoId(conversationId: string, name: string | undefined) { + const conversation = ConvoHub.use().get(conversationId); + + const isPublic = conversation.isPublic(); + + if (!conversation.isGroup() || isPublic) { + throw new Error('showDeleteGroupByConvoId() called with a non group convo.'); + } + + const onClickClose = () => { + window?.inboxStore?.dispatch(updateConfirmModal(null)); + }; + + const onClickOk = async () => { + await leaveGroupOrCommunityByConvoId({ + conversationId, + isPublic, // we check for isPublic above, and throw if it's true + sendLeaveMessage: false, + onClickClose, + }); + }; + + window?.inboxStore?.dispatch( + updateConfirmModal({ + title: window.i18n('groupDelete'), + i18nMessage: { token: 'groupDeleteDescriptionMember', args: { group_name: name ?? '' } }, + onClickOk, + okText: window.i18n('delete'), + okTheme: SessionButtonColor.Danger, + onClickClose, + conversationId, + }) + ); +} + export function showInviteContactByConvoId(conversationId: string) { window.inboxStore?.dispatch(updateInviteContactModal({ conversationId })); } @@ -1027,6 +1038,7 @@ export async function promoteUsersInGroup({ method: 'batch', sortedSubRequests: storeRequests, abortSignal: controller.signal, + allow401s: false, }), 2 * DURATION.MINUTES, controller diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 09a2e3fa25..93a88876ae 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -1148,6 +1148,7 @@ export class ConversationModel extends Backbone.Model { await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk: this.id, extraStoreRequests, + allow401s: false, }); await GroupSync.queueNewJobIfNeeded(this.id); diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 2ce77e9bc3..64652bcc45 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -15,6 +15,7 @@ import { } from './SnodeRequestTypes'; import { NotEmptyArrayOfBatchResults } from './BatchResultEntry'; import { MergedAbortSignal, WithTimeoutMs } from './requestWith'; +import { WithAllow401s } from '../../types/with'; function logSubRequests(requests: Array) { return `[${requests.map(builtRequestToLoggingId).join(', ')}]`; @@ -22,7 +23,6 @@ function logSubRequests(requests: Array) { type WithTargetNode = { targetNode: Snode }; type WithAssociatedWith = { associatedWith: string | null }; -type WithAllow401s = { allow401s: boolean }; /** * This is the equivalent to the batch send on sogs. The target node runs each sub request and returns a list of all the sub status and bodies. diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index 6ef56204a7..a99e36252c 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -21,6 +21,7 @@ import { fileServerHost } from '../file_server_api/FileServerApi'; import { hrefPnServerProd } from '../push_notification_api/PnServer'; import { ERROR_CODE_NO_CONNECT } from './SNodeAPI'; import { MergedAbortSignal, WithAbortSignal, WithTimeoutMs } from './requestWith'; +import { WithAllow401s } from '../../types/with'; // hold the ed25519 key of a snode against the time it fails. Used to remove a snode only after a few failures (snodeFailureThreshold failures) let snodeFailureCount: Record = {}; @@ -310,12 +311,11 @@ export async function processOnionRequestErrorAtDestination({ destinationSnodeEd25519, associatedWith, allow401s, -}: { +}: WithAllow401s & { statusCode: number; body: string; destinationSnodeEd25519?: string; associatedWith?: string; - allow401s: boolean; }) { if (statusCode === 200) { return; @@ -526,14 +526,14 @@ async function processOnionResponse({ associatedWith, destinationSnodeEd25519, allow401s, -}: Partial & { - response?: { text: () => Promise; status: number }; - symmetricKey?: ArrayBuffer; - guardNode: Snode; - destinationSnodeEd25519?: string; - associatedWith?: string; - allow401s: boolean; -}): Promise { +}: Partial & + WithAllow401s & { + response?: { text: () => Promise; status: number }; + symmetricKey?: ArrayBuffer; + guardNode: Snode; + destinationSnodeEd25519?: string; + associatedWith?: string; + }): Promise { let ciphertext = ''; processAbortedRequest(abortSignal); @@ -828,7 +828,8 @@ async function sendOnionRequestHandlingSnodeEjectNoRetries({ allow401s, timeoutMs, }: WithAbortSignal & - WithTimeoutMs & { + WithTimeoutMs & + WithAllow401s & { nodePath: Array; destSnodeX25519: string; finalDestOptions: FinalDestOptions; @@ -836,7 +837,6 @@ async function sendOnionRequestHandlingSnodeEjectNoRetries({ associatedWith?: string; useV4: boolean; throwErrors: boolean; - allow401s: boolean; }): Promise { // this sendOnionRequestNoRetries() call has to be the only one like this. // If you need to call it, call it through sendOnionRequestHandlingSnodeEjectNoRetries because this is the one handling path rebuilding and known errors @@ -1118,12 +1118,12 @@ async function sendOnionRequestSnodeDestNoRetries({ timeoutMs, associatedWith, }: WithTimeoutMs & - WithAbortSignal & { + WithAbortSignal & + WithAllow401s & { onionPath: Array; targetNode: Snode; headers: Record; plaintext: string | null; - allow401s: boolean; associatedWith?: string; }) { return Onions.sendOnionRequestHandlingSnodeEjectNoRetries({ @@ -1155,12 +1155,12 @@ async function lokiOnionFetchNoRetries({ abortSignal, timeoutMs, }: WithTimeoutMs & - WithAbortSignal & { + WithAbortSignal & + WithAllow401s & { targetNode: Snode; headers: Record; body: string | null; associatedWith?: string; - allow401s: boolean; }): Promise { try { // Get a path excluding `targetNode`: diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index 0303d1a7a4..5a499f1bd4 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -10,6 +10,7 @@ import { HTTPError, NotFoundError } from '../../utils/errors'; import { APPLICATION_JSON } from '../../../types/MIME'; import { ERROR_421_HANDLED_RETRY_REQUEST, Onions, snodeHttpsAgent, SnodeResponse } from './onions'; import { WithAbortSignal, WithTimeoutMs } from './requestWith'; +import { WithAllow401s } from '../../types/with'; export interface LokiFetchOptions { method: 'GET' | 'POST'; @@ -32,12 +33,12 @@ async function doRequestNoRetries({ allow401s, abortSignal, }: WithTimeoutMs & - WithAbortSignal & { + WithAbortSignal & + WithAllow401s & { url: string; options: LokiFetchOptions; targetNode?: Snode; associatedWith: string | null; - allow401s: boolean; }): Promise { const method = options.method || 'GET'; @@ -126,12 +127,12 @@ async function snodeRpcNoRetries( timeoutMs, abortSignal, }: WithTimeoutMs & + WithAllow401s & WithAbortSignal & { method: string; params: Record | Array>; targetNode: Snode; associatedWith: string | null; - allow401s: boolean; } // the user pubkey this call is for. if the onion request fails, this is used to handle the error for this user swarm for instance ): Promise { const url = `https://${targetNode.ip}:${targetNode.port}/storage_rpc/v1`; diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 5353cb42ad..f293f706ee 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -286,8 +286,8 @@ class ConvoController { const groupInUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); // send the leave message before we delete everything for this group (including the key!) - // Note: if we were kicked, we already lost the authData/secretKey for it, so no need to try to send our message. - if (sendLeaveMessage && !groupInUserGroup?.kicked) { + + if (sendLeaveMessage) { const failedToSendLeaveMessage = await leaveClosedGroup(groupPk, fromSyncMessage); if (PubKey.is03Pubkey(groupPk) && failedToSendLeaveMessage) { // this is caught and is adding an interaction notification message @@ -369,6 +369,7 @@ class ConvoController { groupPk, deleteAllMessagesSubRequest, extraStoreRequests: [], + allow401s: false, }); await LibSessionUtil.saveDumpsToDb(groupPk); @@ -573,7 +574,7 @@ class ConvoController { throw new Error(`ConvoHub.${deleteType} needs complete initial fetch`); } - window.log.info(`${deleteType} with ${ed25519Str(convoId)}`); + window.log.info(`deleteConvoInitialChecks: type ${deleteType} with ${ed25519Str(convoId)}`); const conversation = this.conversations.get(convoId); if (!conversation) { @@ -693,7 +694,7 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM window?.log?.info( `We are leaving the group ${ed25519Str(groupPk)}. Sending our leaving messages.` ); - let failedToSent03LeaveMessage = false; + let failedToSent03LeaveMessage = true; // We might not be able to send our leaving messages (no encryption key pair, we were already removed, no network, etc). // If that happens, we should just remove everything from our current user. try { @@ -711,23 +712,28 @@ async function leaveClosedGroup(groupPk: PubkeyType | GroupPubkeyType, fromSyncM sortedSubRequests: storeRequests, method: 'sequence', abortSignal: controller.signal, + allow401s: true, // we want "allow" 401s so we don't throw }), 30 * DURATION.SECONDS, controller ); - if (results?.[0].code !== 200) { + if (results?.[0].code === 401) { + window.log.info( + `leaveClosedGroup for ${ed25519Str(groupPk)} failed with 401. Assuming we've been revoked.` + ); + } else if (results?.[0].code !== 200) { throw new Error( `Even with the retries, leaving message for group ${ed25519Str( groupPk )} failed to be sent...` ); } + failedToSent03LeaveMessage = false; } catch (e) { window?.log?.warn( `failed to send our leaving messages for ${ed25519Str(groupPk)}:${e.message}` ); - failedToSent03LeaveMessage = true; } // the rest of the cleaning of that conversation is done in the `deleteClosedGroup()` diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 9472ab7a1d..9705d7347f 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -57,6 +57,7 @@ import { SaveSeenMessageHash, stringify } from '../../types/sqlSharedTypes'; import { OpenGroupRequestCommonType } from '../../data/types'; import { NetworkTime } from '../../util/NetworkTime'; import { MergedAbortSignal } from '../apis/snode_api/requestWith'; +import { WithAllow401s } from '../types/with'; // ================ SNODE STORE ================ @@ -420,7 +421,8 @@ async function sendMessagesDataToSnode({ sortedSubRequests, method, abortSignal, -}: { + allow401s, +}: WithAllow401s & { sortedSubRequests: SortedSubRequestsType; associatedWith: T; method: MethodBatchType; @@ -448,7 +450,7 @@ async function sendMessagesDataToSnode({ targetNode, timeoutMs: 6 * DURATION.SECONDS, associatedWith, - allow401s: false, + allow401s, method, abortSignal, }); @@ -473,7 +475,9 @@ async function sendMessagesDataToSnode({ 'first result status is not 200 for sendMessagesDataToSnode but: ', firstResult.code ); - throw new Error('sendMessagesDataToSnode: Invalid status code'); + if (!allow401s || firstResult.code !== 401) { + throw new Error('sendMessagesDataToSnode: Invalid status code'); + } } GetNetworkTime.handleTimestampOffsetFromNetwork('store', firstResult.body.t); @@ -509,7 +513,8 @@ async function sendEncryptedDataToSnode( sortedSubRequests, method, abortSignal, -}: { + allow401s, +}: WithAllow401s & { sortedSubRequests: SortedSubRequestsType; // keeping those as an array because the order needs to be enforced for some (group keys for instance) destination: T; method: MethodBatchType; @@ -523,6 +528,7 @@ async function sendEncryptedDataToSnode( associatedWith: destination, method, abortSignal, + allow401s, }); }, { diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index b7d6ff3aee..37db189035 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -25,3 +25,4 @@ export type WithLocalMessageDeletionType = { deletionType: 'complete' | 'markDel export type ShortenOrExtend = 'extend' | 'shorten' | ''; export type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; export type WithMessagesHashes = { messagesHashes: Array }; +export type WithAllow401s = { allow401s: boolean }; diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 83f8949bd1..ac84a7283f 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -200,6 +200,7 @@ class GroupInviteJob extends PersistedJob { groupPk, unrevokeSubRequest, extraStoreRequests: [], + allow401s: false, }); if (sequenceResult !== RunJobResult.Success) { await LibSessionUtil.saveDumpsToDb(groupPk); diff --git a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts index 17857b9458..ce4f65d6ab 100644 --- a/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPendingRemovalsJob.ts @@ -68,13 +68,10 @@ async function getPendingRevokeParams({ const revokeChanges: RevokeChanges = []; const unrevokeChanges: RevokeChanges = []; - for (let index = 0; index < withoutHistory.length; index++) { - const m = withoutHistory[index]; - const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); - unrevokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); - } - for (let index = 0; index < withHistory.length; index++) { - const m = withHistory[index]; + const toUnrevoke = withoutHistory.concat(withHistory); + + for (let index = 0; index < toUnrevoke.length; index++) { + const m = toUnrevoke[index]; const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, m); unrevokeChanges.push({ action: 'unrevoke_subaccount', tokenToRevokeHex: token }); } @@ -198,6 +195,7 @@ class GroupPendingRemovalsJob extends PersistedJob { return await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk: thisJobDestination, extraStoreRequests: [], + allow401s: false, }); } catch (e) { window.log.warn('GroupSyncJob failed with', e.message); diff --git a/ts/session/utils/job_runners/jobs/UserSyncJob.ts b/ts/session/utils/job_runners/jobs/UserSyncJob.ts index 7e45009172..9b861ba4e8 100644 --- a/ts/session/utils/job_runners/jobs/UserSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/UserSyncJob.ts @@ -126,6 +126,7 @@ async function pushChangesToUserSwarmIfNeeded() { destination: us, method: 'sequence', abortSignal: controller.signal, + allow401s: false, // user swarm push, we shouldn't need to allow 401s }), 30 * DURATION.SECONDS, controller diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index ad1bb38df9..05bb277ec9 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -225,6 +225,7 @@ const initNewGroupInWrapper = createAsyncThunk( const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, extraStoreRequests, + allow401s: false, }); if (result !== RunJobResult.Success) { window.log.warn('GroupSync.pushChangesToGroupSwarmIfNeeded during create failed'); @@ -670,6 +671,7 @@ async function handleMemberAddedFromUI({ revokeSubRequest, unrevokeSubRequest, extraStoreRequests, + allow401s: false, }); if (sequenceResult !== RunJobResult.Success) { await LibSessionUtil.saveDumpsToDb(groupPk); @@ -795,6 +797,7 @@ async function handleMemberRemovedFromUI({ const sequenceResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, extraStoreRequests, + allow401s: false, }); if (sequenceResult !== RunJobResult.Success) { throw new Error( @@ -880,6 +883,7 @@ async function handleNameChangeFromUI({ const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, extraStoreRequests, + allow401s: false, }); if (batchResult !== RunJobResult.Success) { @@ -1005,6 +1009,7 @@ const triggerFakeAvatarUpdate = createAsyncThunk( const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, extraStoreRequests, + allow401s: false, }); if (!batchResult) { window.log.warn(`failed to send avatarChange message for group ${ed25519Str(groupPk)}`); @@ -1060,6 +1065,7 @@ const triggerFakeDeleteMsgBeforeNow = createAsyncThunk( const batchResult = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, extraStoreRequests, + allow401s: false, }); if (!batchResult) { window.log.warn( diff --git a/ts/state/selectors/section.ts b/ts/state/selectors/section.ts index 39992174e2..c74db0f53f 100644 --- a/ts/state/selectors/section.ts +++ b/ts/state/selectors/section.ts @@ -1,5 +1,6 @@ import { createSelector } from '@reduxjs/toolkit'; +import { useSelector } from 'react-redux'; import { LeftOverlayMode, SectionStateType, SectionType } from '../ducks/section'; import { StateType } from '../reducer'; import type { SessionSettingCategory } from '../../types/ReduxTypes'; @@ -34,9 +35,13 @@ export const getRightOverlayMode = (state: StateType) => { return state.section.rightOverlayMode; }; -export const getIsMessageRequestOverlayShown = (state: StateType) => { +const getIsMessageRequestOverlayShown = (state: StateType) => { const focusedSection = getFocusedSection(state); const leftOverlayMode = getLeftOverlayMode(state); return focusedSection === SectionType.Message && leftOverlayMode === 'message-requests'; }; + +export function useIsMessageRequestOverlayShown() { + return useSelector(getIsMessageRequestOverlayShown); +} diff --git a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts index 9d7ed628b6..a1cd627850 100644 --- a/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts +++ b/ts/test/session/unit/utils/job_runner/group_sync_job/GroupSyncJob_test.ts @@ -297,6 +297,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, extraStoreRequests: [], + allow401s: false, }); expect(result).to.be.eq(RunJobResult.Success); expect(sendStub.callCount).to.be.eq(0); @@ -322,6 +323,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, extraStoreRequests: [], + allow401s: false, }); sendStub.resolves(undefined); @@ -369,6 +371,7 @@ describe('GroupSyncJob pushChangesToGroupSwarmIfNeeded', () => { const result = await GroupSync.pushChangesToGroupSwarmIfNeeded({ groupPk, extraStoreRequests: [], + allow401s: false, }); expect(sendStub.callCount).to.be.eq(1); From ba3d7f43db237921a11ea830ba2e335a2b3dfc38 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 31 Dec 2024 11:40:54 +1100 Subject: [PATCH 244/302] fix: add data-testid to a few other modals description --- ts/components/basic/StyledI18nSubText.tsx | 21 +++++++++++++-------- ts/components/dialog/OpenUrlModal.tsx | 5 ++++- ts/components/dialog/QuitModal.tsx | 5 ++++- ts/components/dialog/SessionConfirm.tsx | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/ts/components/basic/StyledI18nSubText.tsx b/ts/components/basic/StyledI18nSubText.tsx index 56a28c0b78..696d03f5bd 100644 --- a/ts/components/basic/StyledI18nSubText.tsx +++ b/ts/components/basic/StyledI18nSubText.tsx @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import { forwardRef } from 'react'; +import { SessionDataTestId } from 'react'; import { Localizer } from './Localizer'; import type { LocalizerComponentProps, LocalizerToken } from '../../types/localizer'; @@ -15,13 +15,18 @@ const StyledI18nSubTextContainer = styled('div')` padding-inline: var(--margins-lg); `; -export const StyledI18nSubText = forwardRef< - HTMLSpanElement, - LocalizerComponentProps ->(({ className, ...props }) => { +export const StyledI18nSubText = ({ + className, + dataTestId, + localizerProps, +}: { + className?: string; + dataTestId: SessionDataTestId; + localizerProps: LocalizerComponentProps; +}) => { return ( - - + + ); -}); +}; diff --git a/ts/components/dialog/OpenUrlModal.tsx b/ts/components/dialog/OpenUrlModal.tsx index fe9353e854..75918cfd4c 100644 --- a/ts/components/dialog/OpenUrlModal.tsx +++ b/ts/components/dialog/OpenUrlModal.tsx @@ -47,7 +47,10 @@ export function OpenUrlModal(props: OpenUrlModalState) { >
- +
diff --git a/ts/components/dialog/QuitModal.tsx b/ts/components/dialog/QuitModal.tsx index 828c6c4730..6ea33fb926 100644 --- a/ts/components/dialog/QuitModal.tsx +++ b/ts/components/dialog/QuitModal.tsx @@ -85,7 +85,10 @@ export const QuitModal = (props: SessionConfirmDialogProps) => { style={modalStyle} > - + ) : null} diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx index 2657cfa2a2..04aa99c75e 100644 --- a/ts/components/dialog/SessionConfirm.tsx +++ b/ts/components/dialog/SessionConfirm.tsx @@ -132,7 +132,7 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
{i18nMessage ? ( - + ) : null} {radioOptions && chosenOption !== '' ? ( Date: Wed, 25 Sep 2024 11:00:50 +1000 Subject: [PATCH 245/302] fix: build locale types fully --- tools/localization/generateLocales.py | 4 +- tools/localization/localeTypes.py | 128 +++++++++++++++++++++++++- 2 files changed, 128 insertions(+), 4 deletions(-) diff --git a/tools/localization/generateLocales.py b/tools/localization/generateLocales.py index 2cbded9a58..182af90b3f 100755 --- a/tools/localization/generateLocales.py +++ b/tools/localization/generateLocales.py @@ -17,7 +17,7 @@ prettyPrintIssuesTable, identifyAndPrintOldDynamicVariables, extractFormattingTags, ) -from localization.localeTypes import generateLocalesType +from localization.localeTypes import generateLocalesType, generateLocalesMergedType from util.logger import console from util.fileUtils import createMappedJsonFileDictionary, writeFile @@ -116,7 +116,7 @@ # Generate the locales type and write it to a file if GENERATE_TYPES: - generateTypesOutputMessage = generateLocalesType(locales["en"]) + generateTypesOutputMessage = generateLocalesMergedType(locales) console.info(generateTypesOutputMessage) localeVariables = dict() diff --git a/tools/localization/localeTypes.py b/tools/localization/localeTypes.py index 3213f39e9d..05103d0b55 100644 --- a/tools/localization/localeTypes.py +++ b/tools/localization/localeTypes.py @@ -1,5 +1,6 @@ #!/bin/python3 import re +from typing import List, Tuple OUTPUT_FILE = "./ts/localization/locales.ts" @@ -49,6 +50,100 @@ def generate_js_object(data): return js_object +def extract_vars(text): + # Use a regular expression to find all strings inside curly braces + vars = re.findall(r'\{(.*?)\}', text) + return vars + +def extract_plurals(text: str) -> List[Tuple[str, str]]: + pattern = r'(\b\w+\b)\s*(\[[^\]]+\])' + + matches = re.findall(pattern, text) + + return matches + + +def vars_to_record(vars): + arr = [] + for var in vars: + to_append = '"' + var + '": ' + ('number' if var == 'count' else 'string') + if to_append not in arr: + arr.append(to_append) + + # print(arr) + if not arr: + return '' + return "{" + ', '.join(arr) + "}" + + +def replace_static_strings(str): + + # todo make those come from the glossary + replaced = str.replace("{app_name}", "Session")\ + .replace("{session_download_url}", "https://getsession.org/download")\ + .replace("{session_download_url}", "GIF")\ + .replace("{oxen_foundation}", "Oxen Foundation")\ + .replace("\"", "\\\"") + return replaced + + + + +def generate_type_object(locales): + """ + Generate a JavaScript type from a dictionary. + + Args: + data (dict): The dictionary containing key-value pairs. + + Returns: + str: A string representation of the JavaScript object. + """ + js_object = "{\n" + + for key, value_en in locales['en'].items(): + # print('value',value) + if value_en.startswith("{count, plural, "): + continue + # plurals = extract_plurals(value) + # print(plurals) + # js_plural_object = "{\n" + + # for plural in plurals: + # plural_token = plural[0] + # plural_str = plural[1].replace('#', '{count}') + # extracted_vars = extract_vars(replace_static_strings(plural_str)) + # if('count' not in extracted_vars): + # extracted_vars.append('count') + # print('extracted_vars',extracted_vars) + + # as_record_type = vars_to_record(extracted_vars) + # js_plural_object += f" {wrapValue(plural_token)}: {as_record_type},\n" + # js_plural_object += " }" + # js_object += f" {wrapValue(key)}: {js_plural_object},\n" + else: + replaced_en = replace_static_strings(value_en) + extracted_vars = extract_vars(replaced_en) + as_record_type = vars_to_record(extracted_vars) + other_locales_replaced_values = [[locale, replace_static_strings(data.get(key, ""))] for locale, data in locales.items()] + + filtered_values = [] + # filter out strings that matches the english one (i.e. untranslated strings) + for locale, replaced_val in other_locales_replaced_values: + if replaced_val == replaced_en and not locale == 'en': + # print(f"{locale}: ${key} saved content is the same as english saved.") + filtered_values.append(f"{locale}: undefined") + else: + filtered_values.append(f"{locale}: \"{replaced_val}\"") + + + # print('key',key, " other_locales_replaced_values:", other_locales_replaced_values) + js_object += f" {wrapValue(key)}:{{\n {",\n ".join(filtered_values)},\n args: {as_record_type if as_record_type else 'undefined'}\n }},\n" + + js_object += "}" + return js_object + + DISCLAIMER = """ // This file was generated by a script. Do not modify this file manually. // To make changes, modify the corresponding JSON file and re-run the script. @@ -56,7 +151,7 @@ def generate_js_object(data): """ -def generateLocalesType(locale): +def generateLocalesType(locale, data): """ Generate the locales type and write it to a file. @@ -67,6 +162,35 @@ def generateLocalesType(locale): with open(OUTPUT_FILE, "w", encoding='utf-8') as ts_file: ts_file.write( f"{DISCLAIMER}" - f"export const en = {generate_js_object(locale)} as const;\nexport type Dictionary = typeof en;" ) + ts_file.write( + f"export const {locale} = {generate_js_object(data)} as const;\n" + ) + ts_file.write( + f"\nexport type Dictionary = typeof en;\n" + ) + + return f"Locales generated at: {OUTPUT_FILE}" + + +def generateLocalesMergedType(locales): + """ + Generate the locales type and write it to a file. + + Args: + locale: The locale dictionary containing the localization data. + """ + + # write the locale_dict to a file + with open(OUTPUT_FILE, "w", encoding='utf-8') as ts_file: + ts_file.write( + f"{DISCLAIMER}" + ) + + ts_file.write( + f"export const plop = {generate_type_object(locales)};\n" + ) + + return f"Locales generated at: {OUTPUT_FILE}" + From 66e80fc1c99999a620a86a0e60530e3a15d0edb3 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 2 Jan 2025 10:42:31 +1100 Subject: [PATCH 246/302] fix: still plenty of errors, but simple window.i18n work --- _locales/th/messages.json | 1 - tools/localization/localeTypes.py | 93 +++++++++++++++---------- ts/test/session/unit/utils/i18n/util.ts | 3 +- ts/types/localizer.d.ts | 49 ++++++------- ts/util/i18n/i18n.ts | 1 + ts/util/notifications.ts | 2 +- ts/window.d.ts | 9 +-- 7 files changed, 86 insertions(+), 72 deletions(-) diff --git a/_locales/th/messages.json b/_locales/th/messages.json index b43c3e6080..d9b24b2585 100644 --- a/_locales/th/messages.json +++ b/_locales/th/messages.json @@ -719,7 +719,6 @@ "searchContacts": "ค้นหาผู้ติดต่อ", "searchConversation": "ค้นหาอะไรในการสนทนา", "searchEnter": "เขียนที่ค้นหา", - "searchMatches": "{count, plural, other [{found_count} จาก # รายการ]}", "searchMatchesNone": "ไม่พบข้อมูลเลย", "searchMatchesNoneSpecific": "ไม่พบข้อมูลเกี่ยวกับ '{query}", "searchMembers": "ค้นหาสมาชิก", diff --git a/tools/localization/localeTypes.py b/tools/localization/localeTypes.py index 05103d0b55..7fee807479 100644 --- a/tools/localization/localeTypes.py +++ b/tools/localization/localeTypes.py @@ -55,18 +55,11 @@ def extract_vars(text): vars = re.findall(r'\{(.*?)\}', text) return vars -def extract_plurals(text: str) -> List[Tuple[str, str]]: - pattern = r'(\b\w+\b)\s*(\[[^\]]+\])' - - matches = re.findall(pattern, text) - - return matches - def vars_to_record(vars): arr = [] for var in vars: - to_append = '"' + var + '": ' + ('number' if var == 'count' else 'string') + to_append = '' + var + ': ' + ('"number"' if var == 'count' or var == 'found_count' else '"string"') if to_append not in arr: arr.append(to_append) @@ -100,45 +93,69 @@ def generate_type_object(locales): str: A string representation of the JavaScript object. """ js_object = "{\n" + plural_pattern = r"(zero|one|two|few|many|other)\s*\[([^\]]+)\]" for key, value_en in locales['en'].items(): - # print('value',value) if value_en.startswith("{count, plural, "): - continue - # plurals = extract_plurals(value) - # print(plurals) - # js_plural_object = "{\n" - - # for plural in plurals: - # plural_token = plural[0] - # plural_str = plural[1].replace('#', '{count}') - # extracted_vars = extract_vars(replace_static_strings(plural_str)) - # if('count' not in extracted_vars): - # extracted_vars.append('count') - # print('extracted_vars',extracted_vars) - - # as_record_type = vars_to_record(extracted_vars) - # js_plural_object += f" {wrapValue(plural_token)}: {as_record_type},\n" - # js_plural_object += " }" - # js_object += f" {wrapValue(key)}: {js_plural_object},\n" + extracted_vars_en = extract_vars(replaced_en) + plurals_other = [[locale, replace_static_strings(data.get(key, ""))] for locale, data in locales.items()] + en_plurals_with_token = re.findall(plural_pattern, value_en.replace('#', '{count}')) + + if not en_plurals_with_token: + raise ValueError("invalid plural string") + + all_locales_plurals = [] + + extracted_vars = extract_vars(replace_static_strings(en_plurals_with_token[0][1])) + if('count' not in extracted_vars): + extracted_vars.append('count') + + for plural in plurals_other: + js_plural_object = "" + + locale_key = plural[0] # 'lo', 'th', .... + plural_str = plural[1].replace('#', '{count}') + + plurals_with_token = re.findall(plural_pattern, plural_str) + + + all_locales_strings = [] + as_record_type_en = vars_to_record(extracted_vars) + + for token, localized_string in plurals_with_token: + if localized_string: + to_append = "" + to_append += token + to_append += f": \"{localized_string.replace("\n", "\\n")}\"" + all_locales_strings.append(to_append) + + # if that locale doesn't have translation in plurals, add the english hones + if not len(all_locales_strings): + for plural_en_token, plural_en_str in en_plurals_with_token: + all_locales_strings.append(f"{plural_en_token}: \"{plural_en_str.replace("\n", "\\n")}\"") + js_plural_object += f" {wrapValue(locale_key)}:" + js_plural_object += "{\n " + js_plural_object += ",\n ".join(all_locales_strings) + js_plural_object += "\n }," + + all_locales_plurals.append(js_plural_object) + js_object += f" {wrapValue(key)}: {{\n{"\n".join(all_locales_plurals)}\n args: {f"{as_record_type_en} as const," if as_record_type_en else 'undefined,'}\n }},\n" + else: replaced_en = replace_static_strings(value_en) - extracted_vars = extract_vars(replaced_en) - as_record_type = vars_to_record(extracted_vars) - other_locales_replaced_values = [[locale, replace_static_strings(data.get(key, ""))] for locale, data in locales.items()] + extracted_vars_en = extract_vars(replaced_en) + as_record_type_en = vars_to_record(extracted_vars_en) + other_locales_replaced_values = [[locale, replace_static_strings(data.get(key, ""))] for locale, data in locales.items()] - filtered_values = [] - # filter out strings that matches the english one (i.e. untranslated strings) + all_locales_strings = [] for locale, replaced_val in other_locales_replaced_values: - if replaced_val == replaced_en and not locale == 'en': - # print(f"{locale}: ${key} saved content is the same as english saved.") - filtered_values.append(f"{locale}: undefined") + if replaced_val: + all_locales_strings.append(f"{locale}: \"{replaced_val.replace("\n", "\\n")}\"") else: - filtered_values.append(f"{locale}: \"{replaced_val}\"") - + all_locales_strings.append(f"{locale}: \"{replaced_en.replace("\n", "\\n")}\"") # print('key',key, " other_locales_replaced_values:", other_locales_replaced_values) - js_object += f" {wrapValue(key)}:{{\n {",\n ".join(filtered_values)},\n args: {as_record_type if as_record_type else 'undefined'}\n }},\n" + js_object += f" {wrapValue(key)}: {{\n {",\n ".join(all_locales_strings)},\n args: {f"{as_record_type_en} as const," if as_record_type_en else 'undefined,'}\n }},\n" js_object += "}" return js_object @@ -189,7 +206,7 @@ def generateLocalesMergedType(locales): ) ts_file.write( - f"export const plop = {generate_type_object(locales)};\n" + f"export const dictionary = {generate_type_object(locales)};\n\nexport type Dictionary = typeof dictionary;\n" ) return f"Locales generated at: {OUTPUT_FILE}" diff --git a/ts/test/session/unit/utils/i18n/util.ts b/ts/test/session/unit/utils/i18n/util.ts index fe9947be99..356a37c22a 100644 --- a/ts/test/session/unit/utils/i18n/util.ts +++ b/ts/test/session/unit/utils/i18n/util.ts @@ -13,7 +13,8 @@ export const testDictionary = { export function initI18n(dictionary: Record = en) { return setupI18n({ + // testing crowdinLocale: 'en', - translationDictionary: dictionary as LocalizerDictionary, + translationDictionary: dictionary as LocalizerDictionary, // testing }); } diff --git a/ts/types/localizer.d.ts b/ts/types/localizer.d.ts index f6c993672f..965675b8c1 100644 --- a/ts/types/localizer.d.ts +++ b/ts/types/localizer.d.ts @@ -1,6 +1,5 @@ import type { ElementType } from 'react'; import type { Dictionary } from '../localization/locales'; -import type { LOCALE_DEFAULTS } from '../localization/constants'; /** The dictionary of localized strings */ export type LocalizerDictionary = Dictionary; @@ -9,7 +8,8 @@ export type LocalizerDictionary = Dictionary; export type LocalizerToken = keyof Dictionary; /** A dynamic argument that can be used in a localized string */ -export type DynamicArg = string | number; +type DynamicArg = string | number; +type DynamicArgStr = 'string' | 'number'; /** A record of dynamic arguments for a specific key in the localization dictionary */ export type ArgsRecord = Record, DynamicArg>; @@ -19,32 +19,33 @@ export type DictionaryWithoutPluralStrings = Dictionary; export type PluralKey = 'count'; export type PluralString = `{${string}, plural, one [${string}] other [${string}]}`; -/** The dynamic arguments in a localized string */ -type DynamicArgs = - /** If a string follows the plural format use its plural variable name and recursively check for - * dynamic args inside all plural forms */ - LocalizedString extends `{${infer PluralVar}, plural, one [${infer PluralOne}] other [${infer PluralOther}]}` - ? PluralVar | DynamicArgs | DynamicArgs - : /** If a string segment follows the variable form parse its variable name and recursively - * check for more dynamic args */ - LocalizedString extends `${string}{${infer Var}}${infer Rest}` - ? Var | DynamicArgs - : never; +type ArgsTypeStrToTypes = T extends 'string' + ? string + : T extends 'number' + ? number + : never; -export type ArgsRecordExcludingDefaults = Omit< - ArgsRecord, - keyof typeof LOCALE_DEFAULTS ->; +// those are still a string of the type "string" | "number" and not the typescript types themselves +type ArgsFromTokenStr = Dictionary[T]['args'] extends undefined + ? never + : Dictionary[T]['args']; + +type ArgsFromToken = MappedToTsTypes>; +type IsTokenWithCountArgs = 'count' extends keyof ArgsFromToken + ? true + : false; /** The arguments for retrieving a localized message */ export type GetMessageArgs = T extends LocalizerToken - ? DynamicArgs extends never + ? ArgsFromToken extends never ? [T] - : ArgsRecordExcludingDefaults extends Record - ? [T] - : [T, ArgsRecordExcludingDefaults] + : [T, ArgsFromToken] : never; +type MappedToTsTypes> = { + [K in keyof T]: ArgsTypeStrToTypes; +}; + /** Basic props for all calls of the Localizer component */ type LocalizerComponentBaseProps = { token: T; @@ -54,11 +55,11 @@ type LocalizerComponentBaseProps = { /** The props for the localization component */ export type LocalizerComponentProps = T extends LocalizerToken - ? DynamicArgs extends never + ? ArgsFromToken extends never ? LocalizerComponentBaseProps - : ArgsRecordExcludingDefaults extends Record + : ArgsFromToken extends Record ? LocalizerComponentBaseProps - : LocalizerComponentBaseProps & { args: ArgsRecordExcludingDefaults } + : LocalizerComponentBaseProps & { args: ArgsFromToken } : never; export type LocalizerComponentPropsObject = LocalizerComponentProps; diff --git a/ts/util/i18n/i18n.ts b/ts/util/i18n/i18n.ts index 994bcfd2d7..ccef5390ca 100644 --- a/ts/util/i18n/i18n.ts +++ b/ts/util/i18n/i18n.ts @@ -29,6 +29,7 @@ export const setupI18n = ({ if (!translationDictionary || isEmpty(translationDictionary)) { throw new Error('translationDictionary was not provided'); } + console.warn('translationDictionary', translationDictionary); setInitialLocale(crowdinLocale, translationDictionary); diff --git a/ts/util/notifications.ts b/ts/util/notifications.ts index 8ece1d3472..3bc30f5778 100644 --- a/ts/util/notifications.ts +++ b/ts/util/notifications.ts @@ -221,7 +221,7 @@ function update(forceRefresh = false) { if (shouldHideExpiringMessageBody) { message = window.i18n('messageNew', { count: messagesNotificationCount }); } - + window.drawAttention(); if (status.shouldPlayNotificationSound) { if (!sound) { diff --git a/ts/window.d.ts b/ts/window.d.ts index dbb4774879..f7c98ec609 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -5,12 +5,7 @@ import { Store } from '@reduxjs/toolkit'; import { Persistor } from 'redux-persist/es/types'; import { PrimaryColorStateType, ThemeStateType } from './themes/constants/colors'; -import type { - GetMessageArgs, - I18nMethods, - LocalizerDictionary, - LocalizerToken, -} from './types/localizer'; +import type { GetMessageArgs, I18nMethods, LocalizerToken } from './types/localizer'; export interface LibTextsecure { messaging: boolean; @@ -50,7 +45,7 @@ declare global { * window.i18n('search', { count: 1, found_count: 1 }); * // => '1 of 1 match' */ - i18n: (( + i18n: (( ...[token, args]: GetMessageArgs ) => R) & { /** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.getRawMessage } and {@link window.i18n.getRawMessage } */ From fea05a28538209f913cf8cdb20a4d0f5a77e2a08 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 2 Jan 2025 11:26:32 +1100 Subject: [PATCH 247/302] fix: add datatestid link preview staged --- ts/components/conversation/StagedLinkPreview.tsx | 9 ++++++--- ts/react.d.ts | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ts/components/conversation/StagedLinkPreview.tsx b/ts/components/conversation/StagedLinkPreview.tsx index b410dbdbd7..104c2728f2 100644 --- a/ts/components/conversation/StagedLinkPreview.tsx +++ b/ts/components/conversation/StagedLinkPreview.tsx @@ -74,9 +74,11 @@ export const StagedLinkPreview = (props: Props) => { justifyContent={isLoading ? 'center' : 'flex-start'} alignItems={'center'} > - {isLoading ? : null} + {isLoading ? ( + + ) : null} {isLoaded && image && isContentTypeImage ? ( - + {AriaLabels.imageStagedLinkPreview} { /> ) : null} - {isLoaded ? {title} : null} + {isLoaded ? {title} : null} { }} margin={'0 var(--margins-sm) 0 0'} aria-label={window.i18n('close')} + dataTestId="link-preview-close" style={{ position: isLoading ? 'absolute' : undefined, right: isLoading ? 'var(--margins-sm)' : undefined, diff --git a/ts/react.d.ts b/ts/react.d.ts index 4ec2ceb4f5..a5bb7a5d6d 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -176,6 +176,12 @@ declare module 'react' { | 'session-link-helpdesk' | 'session-faq-link' + // link preview (staged) + | 'link-preview-loading' + | 'link-preview-image' + | 'link-preview-title' + | 'link-preview-close' + // to sort | 'restore-using-recovery' | 'link-device' From da39198f977552aa222a011c21fdfdeb1f162d05 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 3 Jan 2025 12:00:43 +1100 Subject: [PATCH 248/302] fix: strings do not load dict from json, but use built ts file --- about_preload.js | 3 +- password_preload.js | 3 +- preload.js | 4 +- tools/localization/localeTypes.py | 28 +- ts/components/basic/Localizer.tsx | 82 +---- ts/components/basic/StyledI18nSubText.tsx | 21 +- .../conversation/TimerNotification.tsx | 5 +- .../media-gallery/AttachmentSection.tsx | 2 +- .../notification-bubble/CallNotification.tsx | 4 +- ts/components/menu/Menu.tsx | 4 +- .../registration/components/BackButton.tsx | 6 +- ts/interactions/conversationInteractions.ts | 4 +- ts/localization/localeTools.ts | 284 ++++++++++++++++++ ts/mains/main_node.ts | 10 +- ts/models/message.ts | 25 +- ts/node/locale.ts | 35 +-- ts/test/session/unit/utils/i18n/util.ts | 5 +- ts/types/localizer.d.ts | 86 ++---- .../i18n/functions/formatMessageWithArgs.ts | 49 --- ts/util/i18n/functions/getMessage.ts | 41 +-- ts/util/i18n/functions/getRawMessage.ts | 106 ------- ts/util/i18n/functions/inEnglish.ts | 36 --- ts/util/i18n/functions/stripped.ts | 34 --- ts/util/i18n/i18n.ts | 16 +- ts/util/i18n/localizedString.ts | 201 ++++--------- ts/util/i18n/shared.ts | 47 +-- ts/util/notifications.ts | 2 +- ts/window.d.ts | 43 +-- 28 files changed, 461 insertions(+), 725 deletions(-) create mode 100644 ts/localization/localeTools.ts delete mode 100644 ts/util/i18n/functions/formatMessageWithArgs.ts delete mode 100644 ts/util/i18n/functions/getRawMessage.ts delete mode 100644 ts/util/i18n/functions/inEnglish.ts delete mode 100644 ts/util/i18n/functions/stripped.ts diff --git a/about_preload.js b/about_preload.js index 7c6bd8e3d5..6a6ff11d74 100644 --- a/about_preload.js +++ b/about_preload.js @@ -7,12 +7,11 @@ const os = require('os'); const { setupI18n } = require('./ts/util/i18n/i18n'); const config = url.parse(window.location.toString(), true).query; -const { dictionary, crowdinLocale } = ipcRenderer.sendSync('locale-data'); +const { crowdinLocale } = ipcRenderer.sendSync('locale-data'); window.theme = config.theme; window.i18n = setupI18n({ crowdinLocale, - translationDictionary: dictionary, }); window.getOSRelease = () => diff --git a/password_preload.js b/password_preload.js index d8dac4ad3b..39e87de082 100644 --- a/password_preload.js +++ b/password_preload.js @@ -6,7 +6,7 @@ const url = require('url'); const { setupI18n } = require('./ts/util/i18n/i18n'); const config = url.parse(window.location.toString(), true).query; -const { dictionary, crowdinLocale } = ipcRenderer.sendSync('locale-data'); +const { crowdinLocale } = ipcRenderer.sendSync('locale-data'); // If the app is locked we can't access the database to check the theme. window.theme = 'classic-dark'; @@ -14,7 +14,6 @@ window.primaryColor = 'green'; window.i18n = setupI18n({ crowdinLocale, - translationDictionary: dictionary, }); window.getEnvironment = () => config.environment; diff --git a/preload.js b/preload.js index 7857da8462..fb7ecdbaab 100644 --- a/preload.js +++ b/preload.js @@ -11,12 +11,12 @@ const _ = require('lodash'); const { setupI18n } = require('./ts/util/i18n/i18n'); -const { dictionary, crowdinLocale } = ipc.sendSync('locale-data'); +const { crowdinLocale } = ipc.sendSync('locale-data'); const config = url.parse(window.location.toString(), true).query; const configAny = config; -window.i18n = setupI18n({ crowdinLocale, translationDictionary: dictionary }); +window.i18n = setupI18n({ crowdinLocale }); let title = config.name; if (config.environment !== 'production') { diff --git a/tools/localization/localeTypes.py b/tools/localization/localeTypes.py index 7fee807479..a1d3cf2b72 100644 --- a/tools/localization/localeTypes.py +++ b/tools/localization/localeTypes.py @@ -93,6 +93,7 @@ def generate_type_object(locales): str: A string representation of the JavaScript object. """ js_object = "{\n" + js_plural_object_container = "{\n" plural_pattern = r"(zero|one|two|few|many|other)\s*\[([^\]]+)\]" for key, value_en in locales['en'].items(): @@ -113,7 +114,7 @@ def generate_type_object(locales): for plural in plurals_other: js_plural_object = "" - locale_key = plural[0] # 'lo', 'th', .... + locale_key = plural[0].replace("_","-") # 'lo', 'th', 'zh-CN', .... plural_str = plural[1].replace('#', '{count}') plurals_with_token = re.findall(plural_pattern, plural_str) @@ -139,7 +140,7 @@ def generate_type_object(locales): js_plural_object += "\n }," all_locales_plurals.append(js_plural_object) - js_object += f" {wrapValue(key)}: {{\n{"\n".join(all_locales_plurals)}\n args: {f"{as_record_type_en} as const," if as_record_type_en else 'undefined,'}\n }},\n" + js_plural_object_container += f" {wrapValue(key)}: {{\n{"\n".join(all_locales_plurals)}\n args: {as_record_type_en if as_record_type_en else 'undefined,'}\n }},\n" else: replaced_en = replace_static_strings(value_en) @@ -150,15 +151,16 @@ def generate_type_object(locales): all_locales_strings = [] for locale, replaced_val in other_locales_replaced_values: if replaced_val: - all_locales_strings.append(f"{locale}: \"{replaced_val.replace("\n", "\\n")}\"") + all_locales_strings.append(f"{wrapValue(locale.replace("_","-"))}: \"{replaced_val.replace("\n", "\\n")}\"") else: - all_locales_strings.append(f"{locale}: \"{replaced_en.replace("\n", "\\n")}\"") + all_locales_strings.append(f"{wrapValue(locale.replace("_","-"))}: \"{replaced_en.replace("\n", "\\n")}\"") # print('key',key, " other_locales_replaced_values:", other_locales_replaced_values) - js_object += f" {wrapValue(key)}: {{\n {",\n ".join(all_locales_strings)},\n args: {f"{as_record_type_en} as const," if as_record_type_en else 'undefined,'}\n }},\n" + js_object += f" {wrapValue(key)}: {{\n {",\n ".join(all_locales_strings)},\n args: {as_record_type_en if as_record_type_en else 'undefined,'}\n }},\n" js_object += "}" - return js_object + js_plural_object_container += "}" + return js_object,js_plural_object_container DISCLAIMER = """ @@ -205,9 +207,17 @@ def generateLocalesMergedType(locales): f"{DISCLAIMER}" ) - ts_file.write( - f"export const dictionary = {generate_type_object(locales)};\n\nexport type Dictionary = typeof dictionary;\n" - ) + dicts = generate_type_object(locales) + + dictVar = "simpleDictionary" + pluralDictVar = "pluralsDictionary" + + + ts_file.write(f""" +export const {dictVar} = {dicts[0]} as const; + +export const {pluralDictVar} = {dicts[1]} as const; +""") return f"Locales generated at: {OUTPUT_FILE}" diff --git a/ts/components/basic/Localizer.tsx b/ts/components/basic/Localizer.tsx index de3e65da53..2497558340 100644 --- a/ts/components/basic/Localizer.tsx +++ b/ts/components/basic/Localizer.tsx @@ -1,12 +1,12 @@ import styled from 'styled-components'; -import type { - ArgsRecord, - GetMessageArgs, - LocalizerComponentProps, - LocalizerDictionary, - LocalizerToken, -} from '../../types/localizer'; +import type { LocalizerComponentProps } from '../../types/localizer'; import { SessionHtmlRenderer } from './SessionHTMLRenderer'; +import { + GetMessageArgs, + MergedLocalizerTokens, + sanitizeArgs, +} from '../../localization/localeTools'; +import { getCrowdinLocale } from '../../util/i18n/shared'; /** An array of supported html tags to render if found in a string */ export const supportedFormattingTags = ['b', 'i', 'u', 's', 'br', 'span']; @@ -20,58 +20,6 @@ function createSupportedFormattingTagsRegex() { ); } -/** - * Replaces all html tag identifiers with their escaped equivalents - * @param str The string to sanitize - * @param identifier The identifier to use for the args. Use this if you want to de-sanitize the args later. - * @returns The sanitized string - */ -export function sanitizeHtmlTags(str: string, identifier: string = ''): string { - if (identifier && /[a-zA-Z0-9>/g, `${identifier}>${identifier}`); -} - -/** - * Replaces all sanitized html tags with their real equivalents - * @param str The string to de-sanitize - * @param identifier The identifier used when the args were sanitized - * @returns The de-sanitized string - */ -export function deSanitizeHtmlTags(str: string, identifier: string): string { - if (!identifier || /[a-zA-Z0-9>'); -} - -/** - * Sanitizes the args to be used in the i18n function - * @param args The args to sanitize - * @param identifier The identifier to use for the args. Use this if you want to de-sanitize the args later. - * @returns The sanitized args - */ -export function sanitizeArgs( - args: Record, - identifier?: string -): Record { - return Object.fromEntries( - Object.entries(args).map(([key, value]) => [ - key, - typeof value === 'string' ? sanitizeHtmlTags(value, identifier) : value, - ]) - ); -} - const StyledHtmlRenderer = styled.span` * > span { color: var(--renderer-span-primary-color); @@ -86,18 +34,12 @@ const StyledHtmlRenderer = styled.span` * @param props.as - An optional HTML tag to render the component as. Defaults to a fragment, unless the string contains html tags. In that case, it will render as HTML in a div tag. * * @returns The localized message string with substitutions and formatting applied. - * - * @example - * ```tsx - * - * - * - * ``` */ -export const Localizer = (props: LocalizerComponentProps) => { +export const Localizer = (props: LocalizerComponentProps) => { const args = 'args' in props ? props.args : undefined; - const rawString = window.i18n.getRawMessage( + const rawString = window.i18n.getRawMessage( + getCrowdinLocale(), ...([props.token, args] as GetMessageArgs) ); @@ -105,8 +47,8 @@ export const Localizer = (props: LocalizerComponentPro const cleanArgs = args && containsFormattingTags ? sanitizeArgs(args) : args; const i18nString = window.i18n.formatMessageWithArgs( - rawString as LocalizerDictionary[T], - cleanArgs as ArgsRecord + rawString, + cleanArgs as GetMessageArgs[1] ); return containsFormattingTags ? ( diff --git a/ts/components/basic/StyledI18nSubText.tsx b/ts/components/basic/StyledI18nSubText.tsx index 56a28c0b78..1bb6dcd528 100644 --- a/ts/components/basic/StyledI18nSubText.tsx +++ b/ts/components/basic/StyledI18nSubText.tsx @@ -1,7 +1,7 @@ import styled from 'styled-components'; import { forwardRef } from 'react'; import { Localizer } from './Localizer'; -import type { LocalizerComponentProps, LocalizerToken } from '../../types/localizer'; +import type { LocalizerComponentPropsObject } from '../../types/localizer'; const StyledI18nSubTextContainer = styled('div')` font-size: var(--font-size-md); @@ -15,13 +15,12 @@ const StyledI18nSubTextContainer = styled('div')` padding-inline: var(--margins-lg); `; -export const StyledI18nSubText = forwardRef< - HTMLSpanElement, - LocalizerComponentProps ->(({ className, ...props }) => { - return ( - - - - ); -}); +export const StyledI18nSubText = forwardRef( + ({ className, ...props }) => { + return ( + + + + ); + } +); diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index c768245dbd..522cd5de6d 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -17,11 +17,12 @@ import { ReleasedFeatures } from '../../util/releaseFeature'; import { Flex } from '../basic/Flex'; import { SpacerMD, TextWithChildren } from '../basic/Text'; import { ExpirableReadableMessage } from './message/message-item/ExpirableReadableMessage'; +import { LocalizerComponentPropsObject } from '../../types/localizer'; + // eslint-disable-next-line import/order import { ConversationInteraction } from '../../interactions'; import { ConvoHub } from '../../session/conversations'; import { updateConfirmModal } from '../../state/ducks/modalDialog'; -import type { LocalizerComponentProps, LocalizerToken } from '../../types/localizer'; import { Localizer } from '../basic/Localizer'; import { SessionButtonColor } from '../basic/SessionButton'; import { SessionIcon } from '../icon'; @@ -47,7 +48,7 @@ function useFollowSettingsButtonClick( ? window.i18n('disappearingMessagesTypeRead') : window.i18n('disappearingMessagesTypeSent'); - const i18nMessage: LocalizerComponentProps = props.disabled + const i18nMessage: LocalizerComponentPropsObject = props.disabled ? { token: 'disappearingMessagesFollowSettingOff', } diff --git a/ts/components/conversation/media-gallery/AttachmentSection.tsx b/ts/components/conversation/media-gallery/AttachmentSection.tsx index c40f2f2aaf..b0c4735e87 100644 --- a/ts/components/conversation/media-gallery/AttachmentSection.tsx +++ b/ts/components/conversation/media-gallery/AttachmentSection.tsx @@ -38,7 +38,7 @@ const Items = (props: Props): JSX.Element => { /> ); default: - return missingCaseError(type); + throw missingCaseError(type); } })} diff --git a/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx b/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx index 003c1c3f97..dd89a98dae 100644 --- a/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx +++ b/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx @@ -1,15 +1,15 @@ import { CallNotificationType, PropsForCallNotification } from '../../../../../state/ducks/types'; import { useSelectedNicknameOrProfileNameOrShortenedPubkey } from '../../../../../state/selectors/selectedConversation'; -import type { LocalizerToken } from '../../../../../types/localizer'; import { SessionIconType } from '../../../../icon'; import { ExpirableReadableMessage } from '../ExpirableReadableMessage'; import { NotificationBubble } from './NotificationBubble'; import { Localizer } from '../../../../basic/Localizer'; +import { MergedLocalizerTokens } from '../../../../../localization/localeTools'; type StyleType = Record< CallNotificationType, - { notificationTextKey: LocalizerToken; iconType: SessionIconType; iconColor: string } + { notificationTextKey: MergedLocalizerTokens; iconType: SessionIconType; iconColor: string } >; const style = { diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index b032375483..d49c0a90d3 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -53,11 +53,11 @@ import { getIsMessageSection, } from '../../state/selectors/section'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; -import type { LocalizerToken } from '../../types/localizer'; import { SessionButtonColor } from '../basic/SessionButton'; import { ItemWithDataTestId } from './items/MenuItemWithDataTestId'; import { useLibGroupDestroyed } from '../../state/selectors/userGroups'; import { NetworkTime } from '../../util/NetworkTime'; +import { MergedLocalizerTokens } from '../../localization/localeTools'; /** Menu items standardized */ @@ -516,7 +516,7 @@ export const NotificationForConvoMenuItem = (): JSX.Element | null => { isPrivate ? n !== 'mentions_only' : true ).map((n: ConversationNotificationSettingType) => { // do this separately so typescript's compiler likes it - const keyToUse: LocalizerToken = + const keyToUse: MergedLocalizerTokens = n === 'all' || !n ? 'notificationsAllMessages' : n === 'disabled' diff --git a/ts/components/registration/components/BackButton.tsx b/ts/components/registration/components/BackButton.tsx index 2391974e78..fcc36e6ac7 100644 --- a/ts/components/registration/components/BackButton.tsx +++ b/ts/components/registration/components/BackButton.tsx @@ -17,7 +17,7 @@ import { deleteDbLocally } from '../../../util/accountManager'; import { Flex } from '../../basic/Flex'; import { SessionButtonColor } from '../../basic/SessionButton'; import { SessionIconButton } from '../../icon'; -import type { LocalizerComponentProps, LocalizerToken } from '../../../types/localizer'; +import type { LocalizerComponentPropsObject } from '../../../types/localizer'; /** Min height should match the onboarding step with the largest height this prevents the loading spinner from jumping around while still keeping things centered */ const StyledBackButtonContainer = styled(Flex)` @@ -38,7 +38,7 @@ export const BackButtonWithinContainer = ({ callback?: () => void; onQuitVisible?: () => void; shouldQuitOnClick?: boolean; - quitI18nMessageArgs: LocalizerComponentProps; + quitI18nMessageArgs: LocalizerComponentPropsObject; }) => { return ( void; onQuitVisible?: () => void; shouldQuitOnClick?: boolean; - quitI18nMessageArgs: LocalizerComponentProps; + quitI18nMessageArgs: LocalizerComponentPropsObject; }) => { const step = useOnboardStep(); const restorationStep = useOnboardAccountRestorationStep(); diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index cb1734caf6..a2fab258e4 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -50,7 +50,7 @@ import { Storage, setLastProfileUpdateTimestamp } from '../util/storage'; import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; import { ConversationInteractionStatus, ConversationInteractionType } from './types'; import { BlockedNumberController } from '../util'; -import type { LocalizerComponentProps, LocalizerToken } from '../types/localizer'; +import type { LocalizerComponentPropsObject } from '../types/localizer'; import { sendInviteResponseToGroup } from '../session/sending/group/GroupInviteResponse'; import { NetworkTime } from '../util/NetworkTime'; import { ClosedGroup } from '../session'; @@ -270,7 +270,7 @@ export const declineConversationWithConfirm = ({ const convoName = ConvoHub.use().get(conversationId)?.getNicknameOrRealUsernameOrPlaceholder(); - const i18nMessage: LocalizerComponentProps = isGroupV2 + const i18nMessage: LocalizerComponentPropsObject = isGroupV2 ? alsoBlock && originNameToBlock ? { token: 'blockDescription', args: { name: originNameToBlock } } // groupv2, and blocking by sender name : { token: 'groupInviteDelete' } // groupv2, and no info about the sender, falling back to delete only diff --git a/ts/localization/localeTools.ts b/ts/localization/localeTools.ts new file mode 100644 index 0000000000..1ad8b74ab0 --- /dev/null +++ b/ts/localization/localeTools.ts @@ -0,0 +1,284 @@ +import { isEmpty } from 'lodash'; +import { CrowdinLocale } from './constants'; +import { getMessage } from '../util/i18n/functions/getMessage'; +import { pluralsDictionary, simpleDictionary } from './locales'; + +export type SimpleDictionary = typeof simpleDictionary; +export type PluralDictionary = typeof pluralsDictionary; + +export type SimpleLocalizerTokens = keyof SimpleDictionary; +export type PluralLocalizerTokens = keyof PluralDictionary; + +export type MergedLocalizerTokens = SimpleLocalizerTokens | PluralLocalizerTokens; + +type Logger = (message: string) => void; +let logger: Logger | undefined; + +export function setLogger(cb: Logger) { + if (logger) { + // eslint-disable-next-line no-console + console.log('logger already initialized'); + } + logger = cb; +} + +function log(message: Parameters[0]) { + logger?.(message); +} + +export function isSimpleToken(token: string): token is SimpleLocalizerTokens { + return token in simpleDictionary; +} + +export function isPluralToken(token: string): token is PluralLocalizerTokens { + return token in pluralsDictionary; +} + +type TokenWithArgs = { + [K in keyof D]: D[K] extends { args: undefined } | { args: never } ? never : K; +}[keyof D]; + +type MergedTokenWithArgs = TokenWithArgs | TokenWithArgs; + +export function isTokenWithArgs(token: string): token is MergedTokenWithArgs { + return ( + (isSimpleToken(token) && !isEmpty(simpleDictionary[token]?.args)) || + (isPluralToken(token) && !isEmpty(pluralsDictionary[token]?.args)) + ); +} + +type DynamicArgStr = 'string' | 'number'; + +export type LocalizerDictionary = SimpleDictionary; + +type ArgsTypeStrToTypes = T extends 'string' + ? string + : T extends 'number' + ? number + : never; + +// those are still a string of the type "string" | "number" and not the typescript types themselves +type ArgsFromTokenStr = + T extends SimpleLocalizerTokens + ? SimpleDictionary[T] extends { args: infer A } + ? A extends Record + ? A + : never + : never + : T extends PluralLocalizerTokens + ? PluralDictionary[T] extends { args: infer A } + ? A extends Record + ? A + : never + : never + : never; + +export type ArgsFromToken = MappedToTsTypes>; + +/** The arguments for retrieving a localized message */ +export type GetMessageArgs = T extends MergedLocalizerTokens + ? T extends MergedTokenWithArgs + ? [T, ArgsFromToken] + : [T] + : never; + +type MappedToTsTypes> = { + [K in keyof T]: ArgsTypeStrToTypes; +}; + +/** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.inEnglish } and {@link window.i18n.inEnglish } */ +/** + * Retrieves a message string in the {@link en} locale, substituting variables where necessary. + * + * NOTE: This does not work for plural strings. This function should only be used for debug and + * non-user-facing strings. Plural string support can be added splitting out the logic for + * {@link setupI18n.formatMessageWithArgs} and creating a new getMessageFromDictionary, which + * specifies takes a dictionary as an argument. This is left as an exercise for the reader. + * @deprecated this will eventually be replaced by LocalizedStringBuilder + * + * @param token - The token identifying the message to retrieve. + * @param args - An optional record of substitution variables and their replacement values. This is equired if the string has dynamic variables. + */ +export function inEnglish([token, args]: GetMessageArgs) { + if (!isSimpleToken(token)) { + throw new Error('inEnglish only supports simple strings for now'); + } + const rawMessage = simpleDictionary[token].en; + + if (!rawMessage) { + log(`Attempted to get forced en string for nonexistent key: '${token}' in fallback dictionary`); + return token; + } + return formatMessageWithArgs(rawMessage, args); +} + +/** + * Retrieves a localized message string, substituting variables where necessary. Then strips the message of any HTML and custom tags. + * + * @deprecated This will eventually be replaced altogether by LocalizedStringBuilder + * + * @param token - The token identifying the message to retrieve. + * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic variables. + * + * @returns The localized message string with substitutions applied. Any HTML and custom tags are removed. + */ + +export function stripped( + ...[token, args]: GetMessageArgs +): string { + const sanitizedArgs = args ? sanitizeArgs(args, '\u200B') : undefined; + + const i18nString = getMessage(...([token, sanitizedArgs] as GetMessageArgs)); + + const strippedString = i18nString.replaceAll(/<[^>]*>/g, ''); + + return deSanitizeHtmlTags(strippedString, '\u200B'); +} + +/** + * Sanitizes the args to be used in the i18n function + * @param args The args to sanitize + * @param identifier The identifier to use for the args. Use this if you want to de-sanitize the args later. + * @returns The sanitized args + */ +export function sanitizeArgs( + args: Record, + identifier?: string +): Record { + return Object.fromEntries( + Object.entries(args).map(([key, value]) => [ + key, + typeof value === 'string' ? sanitizeHtmlTags(value, identifier) : value, + ]) + ); +} + +/** + * Formats a localized message string with arguments and returns the formatted string. + * @param rawMessage - The raw message string to format. After using @see {@link getRawMessage} to get the raw string. + * @param args - An optional record of substitution variables and their replacement values. This + * is required if the string has dynamic variables. This can be optional as a strings args may be defined in @see {@link LOCALE_DEFAULTS} + * + * @returns The formatted message string. + * + * @deprecated + * + */ +export function formatMessageWithArgs( + rawMessage: string, + args?: ArgsFromToken +): string { + /** Find and replace the dynamic variables in a localized string and substitute the variables with the provided values */ + return rawMessage.replace(/\{(\w+)\}/g, (match: any, arg: string) => { + const matchedArg = args ? args[arg as keyof typeof args] : undefined; + + return matchedArg?.toString() ?? match; + }); +} + +/** + * Retrieves a localized message string, without substituting any variables. This resolves any plural forms using the given args + * @param token - The token identifying the message to retrieve. + * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic variables. + * + * @returns The localized message string with substitutions applied. + * + * NOTE: This is intended to be used to get the raw string then format it with {@link formatMessageWithArgs} + */ +export function getRawMessage( + crowdinLocale: CrowdinLocale, + ...[token, args]: GetMessageArgs +): string { + try { + if ( + typeof window !== 'undefined' && + window?.sessionFeatureFlags?.replaceLocalizedStringsWithKeys + ) { + return token as T; + } + + if (isSimpleToken(token)) { + return simpleDictionary[token][crowdinLocale]; + } + if (!isPluralToken(token)) { + throw new Error('invalid token, neither simple nor plural'); + } + const pluralsObjects = pluralsDictionary[token]; + const localePluralsObject = pluralsObjects[crowdinLocale]; + + if (!localePluralsObject || isEmpty(localePluralsObject)) { + log(`Attempted to get translation for nonexistent key: '${token}'`); + return token; + } + + const num = args && 'count' in args ? args.count : 0; + + const cardinalRule = new Intl.PluralRules(crowdinLocale).select(num); + + const pluralString = getStringForRule({ + dictionary: pluralsDictionary, + crowdinLocale, + cardinalRule, + token, + }); + + if (!pluralString) { + log(`Plural string not found for cardinal '${cardinalRule}': '${pluralString}'`); + return token as T; + } + + return pluralString.replaceAll('#', `${num}`); + } catch (error) { + log(error.message); + return token as T; + } +} + +export function getStringForRule({ + dictionary, + token, + crowdinLocale, + cardinalRule, +}: { + dictionary: PluralDictionary; + token: PluralLocalizerTokens; + crowdinLocale: CrowdinLocale; + cardinalRule: Intl.LDMLPluralRule; +}) { + const dictForLocale = dictionary[token][crowdinLocale]; + return cardinalRule in dictForLocale ? ((dictForLocale as any)[cardinalRule] as string) : token; +} + +/** + * Replaces all html tag identifiers with their escaped equivalents + * @param str The string to sanitize + * @param identifier The identifier to use for the args. Use this if you want to de-sanitize the args later. + * @returns The sanitized string + */ +export function sanitizeHtmlTags(str: string, identifier: string = ''): string { + if (identifier && /[a-zA-Z0-9>/g, `${identifier}>${identifier}`); +} + +/** + * Replaces all sanitized html tags with their real equivalents + * @param str The string to de-sanitize + * @param identifier The identifier used when the args were sanitized + * @returns The de-sanitized string + */ +export function deSanitizeHtmlTags(str: string, identifier: string): string { + if (!identifier || /[a-zA-Z0-9>'); +} diff --git a/ts/mains/main_node.ts b/ts/mains/main_node.ts index 243203b01e..158f1bb6c8 100644 --- a/ts/mains/main_node.ts +++ b/ts/mains/main_node.ts @@ -163,12 +163,9 @@ import { isDevProd, isTestIntegration } from '../shared/env_vars'; import { classicDark } from '../themes'; import type { SetupI18nReturnType } from '../types/localizer'; -import { - isSessionLocaleSet, - getTranslationDictionary, - getCrowdinLocale, -} from '../util/i18n/shared'; +import { isSessionLocaleSet, getCrowdinLocale } from '../util/i18n/shared'; import { loadLocalizedDictionary } from '../node/locale'; +import { simpleDictionary } from '../localization/locales'; // Both of these will be set after app fires the 'ready' event let logger: Logger | null = null; @@ -910,7 +907,6 @@ app.on('web-contents-created', (_createEvent, contents) => { ipc.on('locale-data', event => { // eslint-disable-next-line no-param-reassign event.returnValue = { - dictionary: getTranslationDictionary(), crowdinLocale: getCrowdinLocale(), }; }); @@ -984,7 +980,7 @@ ipc.on('password-recovery-phrase', async (event, passPhrase) => { // no issues. send back undefined, meaning OK sendResponse(undefined); } catch (e) { - const localisedError = getTranslationDictionary().passwordIncorrect; + const localisedError = simpleDictionary.passwordIncorrect[getCrowdinLocale()]; // send back the error sendResponse(localisedError); } diff --git a/ts/models/message.ts b/ts/models/message.ts index 0beff6b158..1eb4812551 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -88,7 +88,6 @@ import { ConversationModel } from './conversation'; import { READ_MESSAGE_STATE } from './conversationAttributes'; import { ConversationInteractionStatus, ConversationInteractionType } from '../interactions/types'; import { LastMessageStatusType } from '../state/ducks/types'; -import type { GetMessageArgs, LocalizerToken } from '../types/localizer'; import { getGroupDisplayPictureChangeStr, getGroupNameChangeStr, @@ -273,23 +272,21 @@ export class MessageModel extends Backbone.Model { // @ts-expect-error -- TODO: Fix by using new i18n builder const { token, args } = getLeftGroupUpdateChangeStr(groupUpdate.left, groupName); // TODO: clean up this typing - return window.i18n.stripped(...([token, args] as GetMessageArgs)); + return window.i18n.stripped(...[token, args]); } if (groupUpdate.name) { const result = getGroupNameChangeStr(groupUpdate.name); if ('args' in result) { - return window.i18n.stripped( - ...([result.token, result.args] as GetMessageArgs) - ); + return window.i18n.stripped(...[result.token, result.args]); } - return window.i18n.stripped(...([result.token] as GetMessageArgs)); + return window.i18n.stripped(...[result.token]); } if (groupUpdate.avatarChange) { const result = getGroupDisplayPictureChangeStr(); - return window.i18n.stripped(...([result.token] as GetMessageArgs)); + return window.i18n.stripped(...[result.token]); } if (groupUpdate.joined?.length) { @@ -301,7 +298,7 @@ export class MessageModel extends Backbone.Model { groupName ); // TODO: clean up this typing - return window.i18n.stripped(...([token, args] as GetMessageArgs)); + return window.i18n.stripped(...[token, args]); } if (groupUpdate.joinedWithHistory?.length) { @@ -313,20 +310,20 @@ export class MessageModel extends Backbone.Model { groupName ); // TODO: clean up this typing - return window.i18n.stripped(...([token, args] as GetMessageArgs)); + return window.i18n.stripped(...[token, args]); } if (groupUpdate.kicked?.length) { // @ts-expect-error -- TODO: Fix by using new i18n builder const { token, args } = getKickedGroupUpdateStr(groupUpdate.kicked, groupName); // TODO: clean up this typing - return window.i18n.stripped(...([token, args] as GetMessageArgs)); + return window.i18n.stripped(...[token, args]); } if (groupUpdate.promoted?.length) { // @ts-expect-error -- TODO: Fix by using new i18n builder const { token, args } = getPromotedGroupUpdateChangeStr(groupUpdate.promoted, groupName); // TODO: clean up this typing - return window.i18n.stripped(...([token, args] as GetMessageArgs)); + return window.i18n.stripped(...[token, args]); } window.log.warn('did not build a specific change for getDescription of ', groupUpdate); @@ -433,11 +430,9 @@ export class MessageModel extends Backbone.Model { }); if ('args' in i18nProps) { - return window.i18n.stripped( - ...([i18nProps.token, i18nProps.args] as GetMessageArgs) - ); + return window.i18n.stripped(...[i18nProps.token, i18nProps.args]); } - return window.i18n.stripped(...([i18nProps.token] as GetMessageArgs)); + return window.i18n.stripped(...[i18nProps.token]); } const body = this.get('body'); if (body) { diff --git a/ts/node/locale.ts b/ts/node/locale.ts index 9363b67965..1a28c81dc4 100644 --- a/ts/node/locale.ts +++ b/ts/node/locale.ts @@ -1,9 +1,4 @@ -import fs from 'fs'; -import path from 'path'; -import { isEmpty } from 'lodash'; -import type { LocalizerDictionary, SetupI18nReturnType } from '../types/localizer'; -import { getAppRootPath } from './getRootPath'; -import { en } from '../localization/locales'; +import type { SetupI18nReturnType } from '../types/localizer'; import { setupI18n } from '../util/i18n/i18n'; import { CrowdinLocale } from '../localization/constants'; @@ -32,18 +27,6 @@ export function normalizeLocaleName(locale: string) { return dashedLocale; } -function getLocaleMessages(locale: string): LocalizerDictionary { - if (locale.includes('_')) { - throw new Error( - "getLocaleMessages: expected locale to not have a '_' in it. Those should have been replaced to -" - ); - } - - const targetFile = path.join(getAppRootPath(), '_locales', locale, 'messages.json'); - - return JSON.parse(fs.readFileSync(targetFile, 'utf-8')); -} - export function loadLocalizedDictionary({ appLocale, logger, @@ -67,24 +50,10 @@ export function loadLocalizedDictionary({ // // possible locales: // https://github.com/electron/electron/blob/master/docs/api/locales.md - let crowdinLocale = normalizeLocaleName(appLocale) as CrowdinLocale; - let translationDictionary; - - try { - translationDictionary = getLocaleMessages(crowdinLocale); - } catch (e) { - logger.error(`Problem loading messages for locale ${crowdinLocale} ${e.stack}`); - logger.error('Falling back to en locale'); - } - - if (!translationDictionary || isEmpty(translationDictionary)) { - translationDictionary = en; - crowdinLocale = 'en'; - } + const crowdinLocale = normalizeLocaleName(appLocale) as CrowdinLocale; const i18n = setupI18n({ crowdinLocale, - translationDictionary, }); return { diff --git a/ts/test/session/unit/utils/i18n/util.ts b/ts/test/session/unit/utils/i18n/util.ts index 356a37c22a..2b5b13dd44 100644 --- a/ts/test/session/unit/utils/i18n/util.ts +++ b/ts/test/session/unit/utils/i18n/util.ts @@ -1,5 +1,3 @@ -import { en } from '../../../../../localization/locales'; -import type { LocalizerDictionary } from '../../../../../types/localizer'; import { setupI18n } from '../../../../../util/i18n/i18n'; export const testDictionary = { @@ -11,10 +9,9 @@ export const testDictionary = { argInTag: 'Hello, {name}! Welcome, {arg}!', } as const; -export function initI18n(dictionary: Record = en) { +export function initI18n() { return setupI18n({ // testing crowdinLocale: 'en', - translationDictionary: dictionary as LocalizerDictionary, // testing }); } diff --git a/ts/types/localizer.d.ts b/ts/types/localizer.d.ts index 965675b8c1..6864c95026 100644 --- a/ts/types/localizer.d.ts +++ b/ts/types/localizer.d.ts @@ -1,90 +1,46 @@ import type { ElementType } from 'react'; -import type { Dictionary } from '../localization/locales'; - -/** The dictionary of localized strings */ -export type LocalizerDictionary = Dictionary; - -/** A localization dictionary key */ -export type LocalizerToken = keyof Dictionary; - -/** A dynamic argument that can be used in a localized string */ -type DynamicArg = string | number; -type DynamicArgStr = 'string' | 'number'; - -/** A record of dynamic arguments for a specific key in the localization dictionary */ -export type ArgsRecord = Record, DynamicArg>; - -// TODO: create a proper type for this -export type DictionaryWithoutPluralStrings = Dictionary; -export type PluralKey = 'count'; -export type PluralString = `{${string}, plural, one [${string}] other [${string}]}`; - -type ArgsTypeStrToTypes = T extends 'string' - ? string - : T extends 'number' - ? number - : never; - -// those are still a string of the type "string" | "number" and not the typescript types themselves -type ArgsFromTokenStr = Dictionary[T]['args'] extends undefined - ? never - : Dictionary[T]['args']; - -type ArgsFromToken = MappedToTsTypes>; -type IsTokenWithCountArgs = 'count' extends keyof ArgsFromToken - ? true - : false; - -/** The arguments for retrieving a localized message */ -export type GetMessageArgs = T extends LocalizerToken - ? ArgsFromToken extends never - ? [T] - : [T, ArgsFromToken] - : never; - -type MappedToTsTypes> = { - [K in keyof T]: ArgsTypeStrToTypes; -}; +import type { ArgsFromToken, MergedLocalizerTokens } from '../localization/localeTools'; +import { CrowdinLocale } from '../localization/constants'; /** Basic props for all calls of the Localizer component */ -type LocalizerComponentBaseProps = { +type LocalizerComponentBaseProps = { token: T; asTag?: ElementType; className?: string; }; /** The props for the localization component */ -export type LocalizerComponentProps = T extends LocalizerToken - ? ArgsFromToken extends never - ? LocalizerComponentBaseProps - : ArgsFromToken extends Record +export type LocalizerComponentProps = + T extends MergedLocalizerTokens + ? ArgsFromToken extends never ? LocalizerComponentBaseProps - : LocalizerComponentBaseProps & { args: ArgsFromToken } - : never; + : ArgsFromToken extends Record + ? LocalizerComponentBaseProps + : LocalizerComponentBaseProps & { args: ArgsFromToken } + : never; -export type LocalizerComponentPropsObject = LocalizerComponentProps; +export type LocalizerComponentPropsObject = LocalizerComponentProps; export type I18nMethods = { /** @see {@link window.i18n.stripped} */ - stripped: ( + stripped: ( ...[token, args]: GetMessageArgs ) => R | T; /** @see {@link window.i18n.inEnglish} */ - inEnglish: ( + inEnglish: ( ...[token, args]: GetMessageArgs ) => R | T; /** @see {@link window.i18n.formatMessageWithArgs */ - getRawMessage: ( + getRawMessage: ( + crowdinLocale: CrowdinLocale, ...[token, args]: GetMessageArgs - ) => R | T; + ) => string; /** @see {@link window.i18n.formatMessageWithArgs} */ - formatMessageWithArgs: ( - rawMessage: R, - args?: ArgsRecord - ) => R; + formatMessageWithArgs: ( + rawMessage: string, + args?: ArgsFromToken + ) => string; }; export type SetupI18nReturnType = I18nMethods & - (( - ...[token, args]: GetMessageArgs - ) => R); + ((...[token, args]: GetMessageArgs) => string); diff --git a/ts/util/i18n/functions/formatMessageWithArgs.ts b/ts/util/i18n/functions/formatMessageWithArgs.ts deleted file mode 100644 index 5890d798b0..0000000000 --- a/ts/util/i18n/functions/formatMessageWithArgs.ts +++ /dev/null @@ -1,49 +0,0 @@ -/** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.formatMessageWithArgs } and {@link window.i18n.formatMessageWithArgs } */ - -import { LOCALE_DEFAULTS } from '../../../localization/constants'; -import type { - ArgsRecord, - DictionaryWithoutPluralStrings, - LocalizerToken, -} from '../../../types/localizer'; - -/** - * Formats a localized message string with arguments and returns the formatted string. - * @param rawMessage - The raw message string to format. After using @see {@link getRawMessage} to get the raw string. - * @param args - An optional record of substitution variables and their replacement values. This - * is required if the string has dynamic variables. This can be optional as a strings args may be defined in @see {@link LOCALE_DEFAULTS} - * - * @returns The formatted message string. - * - * @deprecated - * - * @example - * // The string greeting is 'Hello, {name}!' in the current locale - * window.i18n.getRawMessage('greeting', { name: 'Alice' }); - * // => 'Hello, {name}!' - * window.i18n.formatMessageWithArgs('Hello, {name}!', { name: 'Alice' }); - * // => 'Hello, Alice!' - * - * // The string search is '{count, plural, one [{found_count} of # match] other [{found_count} of # matches]}' in the current locale - * window.i18n.getRawMessage('search', { count: 1, found_count: 1 }); - * // => '{found_count} of {count} match' - * window.i18n.formatMessageWithArgs('{found_count} of {count} match', { count: 1, found_count: 1 }); - * // => '1 of 1 match' - */ -export function formatMessageWithArgs< - T extends LocalizerToken, - R extends DictionaryWithoutPluralStrings[T], ->(rawMessage: R, args?: ArgsRecord): R { - /** Find and replace the dynamic variables in a localized string and substitute the variables with the provided values */ - // TODO: remove the type casting once we have a proper DictionaryWithoutPluralStrings type - return (rawMessage as `${string}{${string}}${string}`).replace( - /\{(\w+)\}/g, - (match, arg: string) => { - const matchedArg = args ? args[arg as keyof typeof args] : undefined; - - return ( - matchedArg?.toString() ?? LOCALE_DEFAULTS[arg as keyof typeof LOCALE_DEFAULTS] ?? match - ); - } - ) as R; -} diff --git a/ts/util/i18n/functions/getMessage.ts b/ts/util/i18n/functions/getMessage.ts index db3c432cdc..6c95764616 100644 --- a/ts/util/i18n/functions/getMessage.ts +++ b/ts/util/i18n/functions/getMessage.ts @@ -1,17 +1,17 @@ /** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.getMessage } and {@link window.i18n } */ -import type { - LocalizerToken, - LocalizerDictionary, - GetMessageArgs, - SetupI18nReturnType, -} from '../../../types/localizer'; +import type { SetupI18nReturnType } from '../../../types/localizer'; import { i18nLog } from '../shared'; -import { formatMessageWithArgs } from './formatMessageWithArgs'; -import { getRawMessage } from './getRawMessage'; -import { inEnglish } from './inEnglish'; -import { stripped } from './stripped'; -import { localizeFromOld, type StringArgsRecord } from '../localizedString'; +import { localizeFromOld } from '../localizedString'; +import { + ArgsFromToken, + formatMessageWithArgs, + GetMessageArgs, + getRawMessage, + inEnglish, + MergedLocalizerTokens, + stripped, +} from '../../../localization/localeTools'; /** * Retrieves a localized message string, substituting variables where necessary. @@ -20,24 +20,15 @@ import { localizeFromOld, type StringArgsRecord } from '../localizedString'; * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic variables. * * @returns The localized message string with substitutions applied. - * - * @example - * // The string greeting is 'Hello, {name}!' in the current locale - * window.i18n('greeting', { name: 'Alice' }); - * // => 'Hello, Alice!' - * - * // The string search is '{count, plural, one [{found_count} of # match] other [{found_count} of # matches]}' in the current locale - * window.i18n('search', { count: 1, found_count: 1 }); - * // => '1 of 1 match' */ -function getMessageDefault( - ...[token, args]: GetMessageArgs -): R | T { +function getMessageDefault(...props: GetMessageArgs): string { + const token = props[0]; + try { - return localizeFromOld(token as T, args as StringArgsRecord).toString() as T | R; + return localizeFromOld(props[0], props[1] as ArgsFromToken).toString(); } catch (error) { i18nLog(error.message); - return token as R; + return token; } } diff --git a/ts/util/i18n/functions/getRawMessage.ts b/ts/util/i18n/functions/getRawMessage.ts deleted file mode 100644 index bd04d549eb..0000000000 --- a/ts/util/i18n/functions/getRawMessage.ts +++ /dev/null @@ -1,106 +0,0 @@ -/** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.getRawMessage } and {@link window.i18n.getRawMessage } */ - -import { en } from '../../../localization/locales'; -import type { - DictionaryWithoutPluralStrings, - GetMessageArgs, - LocalizerToken, - PluralKey, - PluralString, -} from '../../../types/localizer'; -import { - getTranslationDictionary, - getStringForCardinalRule, - i18nLog, - getCrowdinLocale, -} from '../shared'; - -function getPluralKey(string: PluralString): R { - const match = /{(\w+), plural, one \[.+\] other \[.+\]}/g.exec(string); - return (match?.[1] ?? undefined) as R; -} - -const isPluralForm = (localizedString: string): localizedString is PluralString => - /{\w+, plural, one \[.+\] other \[.+\]}/g.test(localizedString); - -/** - * Retrieves a localized message string, without substituting any variables. This resolves any plural forms using the given args - * @param token - The token identifying the message to retrieve. - * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic variables. - * - * @returns The localized message string with substitutions applied. - * - * NOTE: This is intended to be used to get the raw string then format it with {@link formatMessageWithArgs} - * - * @example - * // The string greeting is 'Hello, {name}!' in the current locale - * window.i18n.getRawMessage('greeting', { name: 'Alice' }); - * // => 'Hello, {name}!' - * - * // The string search is '{count, plural, one [{found_count} of # match] other [{found_count} of # matches]}' in the current locale - * window.i18n.getRawMessage('search', { count: 1, found_count: 1 }); - * // => '{found_count} of {count} match' - */ -export function getRawMessage< - T extends LocalizerToken, - R extends DictionaryWithoutPluralStrings[T], ->(...[token, args]: GetMessageArgs): R | T { - try { - if ( - typeof window !== 'undefined' && - window?.sessionFeatureFlags?.replaceLocalizedStringsWithKeys - ) { - return token as T; - } - - const localizedDictionary = getTranslationDictionary(); - - let localizedString = localizedDictionary[token] as R; - - if (!localizedString) { - i18nLog(`Attempted to get translation for nonexistent key: '${token}'`); - - localizedString = en[token] as R; - - if (!localizedString) { - i18nLog( - `Attempted to get translation for nonexistent key: '${token}' in fallback dictionary` - ); - return token as T; - } - } - - /** If a localized string does not have any arguments to substitute it is returned with no - * changes. We also need to check if the string contains a curly bracket as if it does - * there might be a default arg */ - if (!args && !localizedString.includes('{')) { - return localizedString; - } - - if (isPluralForm(localizedString)) { - const pluralKey = getPluralKey(localizedString); - - if (!pluralKey) { - i18nLog(`Attempted to nonexistent pluralKey for plural form string '${localizedString}'`); - } else { - const num = args?.[pluralKey as keyof typeof args] ?? 0; - - const currentLocale = getCrowdinLocale(); - const cardinalRule = new Intl.PluralRules(currentLocale).select(num); - - const pluralString = getStringForCardinalRule(localizedString, cardinalRule); - - if (!pluralString) { - i18nLog(`Plural string not found for cardinal '${cardinalRule}': '${localizedString}'`); - return token as T; - } - - localizedString = pluralString.replaceAll('#', `${num}`) as R; - } - } - return localizedString; - } catch (error) { - i18nLog(error.message); - return token as T; - } -} diff --git a/ts/util/i18n/functions/inEnglish.ts b/ts/util/i18n/functions/inEnglish.ts deleted file mode 100644 index 24447c10d2..0000000000 --- a/ts/util/i18n/functions/inEnglish.ts +++ /dev/null @@ -1,36 +0,0 @@ -/** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.inEnglish } and {@link window.i18n.inEnglish } */ - -import { en } from '../../../localization/locales'; -import type { - LocalizerToken, - LocalizerDictionary, - GetMessageArgs, - ArgsRecord, -} from '../../../types/localizer'; -import { i18nLog } from '../shared'; -import { formatMessageWithArgs } from './formatMessageWithArgs'; - -/** - * Retrieves a message string in the {@link en} locale, substituting variables where necessary. - * - * NOTE: This does not work for plural strings. This function should only be used for debug and - * non-user-facing strings. Plural string support can be added splitting out the logic for - * {@link setupI18n.formatMessageWithArgs} and creating a new getMessageFromDictionary, which - * specifies takes a dictionary as an argument. This is left as an exercise for the reader. - * @deprecated this will eventually be replaced by LocalizedStringBuilder - * - * @param token - The token identifying the message to retrieve. - * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic variables. - */ -export function inEnglish( - ...[token, args]: GetMessageArgs -): R | T { - const rawMessage = en[token] as R; - if (!rawMessage) { - i18nLog( - `Attempted to get forced en string for nonexistent key: '${token}' in fallback dictionary` - ); - return token as T; - } - return formatMessageWithArgs(rawMessage, args as ArgsRecord); -} diff --git a/ts/util/i18n/functions/stripped.ts b/ts/util/i18n/functions/stripped.ts deleted file mode 100644 index 1c490b81c2..0000000000 --- a/ts/util/i18n/functions/stripped.ts +++ /dev/null @@ -1,34 +0,0 @@ -/** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.stripped } and {@link window.i18n.stripped } */ - -import { deSanitizeHtmlTags, sanitizeArgs } from '../../../components/basic/Localizer'; -import type { GetMessageArgs, LocalizerDictionary, LocalizerToken } from '../../../types/localizer'; -import { getMessage } from './getMessage'; - -/** - * Retrieves a localized message string, substituting variables where necessary. Then strips the message of any HTML and custom tags. - * - * @deprecated This will eventually be replaced altogether by LocalizedStringBuilder - * - * @param token - The token identifying the message to retrieve. - * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic variables. - * - * @returns The localized message string with substitutions applied. Any HTML and custom tags are removed. - * - * @example - * // The string greeting is 'Hello, {name}! Welcome!' in the current locale - * window.i18n.stripped('greeting', { name: 'Alice' }); - * // => 'Hello, Alice! Welcome!' - */ -export function stripped( - ...[token, args]: GetMessageArgs -): R | T { - const sanitizedArgs = args ? sanitizeArgs(args, '\u200B') : undefined; - - const i18nString = getMessage( - ...([token, sanitizedArgs] as GetMessageArgs) - ); - - const strippedString = i18nString.replaceAll(/<[^>]*>/g, ''); - - return deSanitizeHtmlTags(strippedString, '\u200B') as R; -} diff --git a/ts/util/i18n/i18n.ts b/ts/util/i18n/i18n.ts index ccef5390ca..677b9e0579 100644 --- a/ts/util/i18n/i18n.ts +++ b/ts/util/i18n/i18n.ts @@ -1,39 +1,33 @@ // this file is a weird one as it is used by both sides of electron at the same time -import { isEmpty } from 'lodash'; -import type { LocalizerDictionary, SetupI18nReturnType } from '../../types/localizer'; +import type { SetupI18nReturnType } from '../../types/localizer'; import { getMessage } from './functions/getMessage'; import { i18nLog, setInitialLocale } from './shared'; import { CrowdinLocale } from '../../localization/constants'; +import { setLogger } from '../../localization/localeTools'; /** * Sets up the i18n function with the provided locale and messages. * * @param params - An object containing optional parameters. * @param params.crowdinLocale - The locale to use for translations (crowdin) - * @param params.translationDictionary - A dictionary of localized messages * * @returns A function that retrieves a localized message string, substituting variables where necessary. */ export const setupI18n = ({ crowdinLocale, - translationDictionary, }: { crowdinLocale: CrowdinLocale; - translationDictionary: LocalizerDictionary; }): SetupI18nReturnType => { if (!crowdinLocale) { throw new Error(`crowdinLocale not provided in i18n setup`); } - if (!translationDictionary || isEmpty(translationDictionary)) { - throw new Error('translationDictionary was not provided'); - } - console.warn('translationDictionary', translationDictionary); - - setInitialLocale(crowdinLocale, translationDictionary); + setInitialLocale(crowdinLocale); i18nLog(`Setup Complete with crowdinLocale: ${crowdinLocale}`); + // eslint-disable-next-line no-console + setLogger(i18nLog); return getMessage; }; diff --git a/ts/util/i18n/localizedString.ts b/ts/util/i18n/localizedString.ts index ed5dbc44be..6f173b0fec 100644 --- a/ts/util/i18n/localizedString.ts +++ b/ts/util/i18n/localizedString.ts @@ -1,101 +1,17 @@ -import { en } from '../../localization/locales'; +import { pluralsDictionary, simpleDictionary } from '../../localization/locales'; import { - getStringForCardinalRule, - getFallbackDictionary, - getTranslationDictionary, - i18nLog, - getCrowdinLocale, -} from './shared'; -import { LOCALE_DEFAULTS } from '../../localization/constants'; -import { deSanitizeHtmlTags, sanitizeArgs } from '../../components/basic/Localizer'; -import type { LocalizerDictionary } from '../../types/localizer'; - -type PluralKey = 'count'; + ArgsFromToken, + deSanitizeHtmlTags, + getStringForRule, + isPluralToken, + isSimpleToken, + MergedLocalizerTokens, + sanitizeArgs, +} from '../../localization/localeTools'; +import { i18nLog, getCrowdinLocale } from './shared'; +import { CrowdinLocale, LOCALE_DEFAULTS } from '../../localization/constants'; type ArgString = `${string}{${string}}${string}`; -type RawString = ArgString | string; - -type PluralString = `{${PluralKey}, plural, one [${RawString}] other [${RawString}]}`; - -type GenericLocalizedDictionary = Record; - -type TokenString = keyof Dict extends string - ? keyof Dict - : never; - -/** The dynamic arguments in a localized string */ -type StringArgs = - /** If a string follows the plural format use its plural variable name and recursively check for - * dynamic args inside all plural forms */ - T extends `{${infer PluralVar}, plural, one [${infer PluralOne}] other [${infer PluralOther}]}` - ? PluralVar | StringArgs | StringArgs - : /** If a string segment follows the variable form parse its variable name and recursively - * check for more dynamic args */ - T extends `${string}{${infer Var}}${infer Rest}` - ? Var | StringArgs - : never; - -export type StringArgsRecord = Record, string | number>; - -// TODO: move this to a test file -// -// const stringArgsTestStrings = { -// none: 'test', -// one: 'test{count}', -// two: 'test {count} second {another}', -// three: 'test {count} second {another} third {third}', -// four: 'test {count} second {another} third {third} fourth {fourth}', -// five: 'test {count} second {another} third {third} fourth {fourth} fifth {fifth}', -// twoConnected: 'test {count}{another}', -// threeConnected: '{count}{another}{third}', -// } as const; -// -// const stringArgsTestResults = { -// one: { count: 'count' }, -// two: { count: 'count', another: 'another' }, -// three: { count: 'count', another: 'another', third: 'third' }, -// four: { count: 'count', another: 'another', third: 'third', fourth: 'fourth' }, -// five: { count: 'count', another: 'another', third: 'third', fourth: 'fourth', fifth: 'fifth' }, -// twoConnected: { count: 'count', another: 'another' }, -// threeConnected: { count: 'count', another: 'another', third: 'third' }, -// } as const; -// -// let st0: Record, string>; -// const st1: Record, string> = stringArgsTestResults.one; -// const st2: Record, string> = stringArgsTestResults.two; -// const st3: Record< -// StringArgs, -// string -// > = stringArgsTestResults.three; -// const st4: Record< -// StringArgs, -// string -// > = stringArgsTestResults.four; -// const st5: Record< -// StringArgs, -// string -// > = stringArgsTestResults.five; -// const st6: Record< -// StringArgs, -// string -// > = stringArgsTestResults.twoConnected; -// const st7: Record< -// StringArgs, -// string -// > = stringArgsTestResults.threeConnected; -// -// const results = [st0, st1, st2, st3, st4, st5, st6, st7]; - -// Above is testing stuff - -function getPluralKey(string: PluralString): R { - const match = /{(\w+), plural, (zero|one|two|few|many|other) \[.+\]}/g.exec(string); - return match?.[1] as R; -} - -// TODO This regex is only going to work for the one/other case what about other langs where we can have one/two/other for example -const isPluralForm = (localizedString: string): localizedString is PluralString => - /{(\w+), plural, (zero|one|two|few|many|other) \[.+\]}/g.test(localizedString); /** * Checks if a string contains a dynamic variable. @@ -108,12 +24,9 @@ const isStringWithArgs = (localizedString: string): localizedString is ArgString const isReplaceLocalizedStringsWithKeysEnabled = () => !!(typeof window !== 'undefined' && window?.sessionFeatureFlags?.replaceLocalizedStringsWithKeys); -export class LocalizedStringBuilder< - Dict extends GenericLocalizedDictionary, - T extends TokenString, -> extends String { +export class LocalizedStringBuilder extends String { private readonly token: T; - private args?: StringArgsRecord; + private args?: ArgsFromToken; private isStripped = false; private isEnglishForced = false; @@ -144,7 +57,7 @@ export class LocalizedStringBuilder< } } - withArgs(args: StringArgsRecord): Omit { + withArgs(args: ArgsFromToken): Omit { this.args = args; return this; } @@ -157,7 +70,7 @@ export class LocalizedStringBuilder< strip(): Omit { const sanitizedArgs = this.args ? sanitizeArgs(this.args, '\u200B') : undefined; if (sanitizedArgs) { - this.args = sanitizedArgs as StringArgsRecord; + this.args = sanitizedArgs as ArgsFromToken; } this.isStripped = true; @@ -169,52 +82,35 @@ export class LocalizedStringBuilder< return deSanitizeHtmlTags(strippedString, '\u200B'); } - private getRawString(): RawString | TokenString { + private localeToTarget(): CrowdinLocale { + return this.isEnglishForced ? 'en' : getCrowdinLocale(); + } + + private getRawString(): string { try { if (this.renderStringAsToken) { return this.token; } - const dict: GenericLocalizedDictionary = this.isEnglishForced - ? en - : getTranslationDictionary(); - - let localizedString = dict[this.token]; - - if (!localizedString) { - i18nLog(`Attempted to get translation for nonexistent key: '${this.token}'`); - - localizedString = (getFallbackDictionary() as GenericLocalizedDictionary)[this.token]; + if (isSimpleToken(this.token)) { + return simpleDictionary[this.token][this.localeToTarget()]; + } - if (!localizedString) { - i18nLog( - `Attempted to get translation for nonexistent key: '${this.token}' in fallback dictionary` - ); - return this.token; - } + if (!isPluralToken(this.token)) { + throw new Error('invalid token provided'); } - return isPluralForm(localizedString) - ? this.resolvePluralString(localizedString) - : localizedString; + return this.resolvePluralString(); } catch (error) { i18nLog(error.message); return this.token; } } - private resolvePluralString(str: PluralString): string { - const pluralKey = getPluralKey(str); + private resolvePluralString(): string { + const pluralKey = 'count' as const; - // This should not be possible, but we need to handle it in case it does happen - if (!pluralKey) { - i18nLog( - `Attempted to get nonexistent pluralKey for plural form string '${str}' for token '${this.token}'` - ); - return this.token; - } - - let num = this.args?.[pluralKey as keyof StringArgsRecord]; + let num: number | string | undefined = this.args?.[pluralKey as keyof ArgsFromToken]; if (num === undefined) { i18nLog( @@ -236,20 +132,34 @@ export class LocalizedStringBuilder< } } - const currentLocale = getCrowdinLocale(); - const cardinalRule = new Intl.PluralRules(currentLocale).select(num); + const localeToTarget = this.localeToTarget(); + const cardinalRule = new Intl.PluralRules(localeToTarget).select(num); + + if (!isPluralToken(this.token)) { + throw new Error('resolvePluralString can only be called with a plural string'); + } - let pluralString = getStringForCardinalRule(str, cardinalRule); + let pluralString = getStringForRule({ + cardinalRule, + crowdinLocale: localeToTarget, + dictionary: pluralsDictionary, + token: this.token, + }); if (!pluralString) { i18nLog( - `Plural string not found for cardinal '${cardinalRule}': '${str}' Falling back to 'other' cardinal` + `Plural string not found for cardinal '${cardinalRule}': '${this.token}' Falling back to 'other' cardinal` ); - pluralString = getStringForCardinalRule(str, 'other'); + pluralString = getStringForRule({ + cardinalRule: 'other', + crowdinLocale: localeToTarget, + dictionary: pluralsDictionary, + token: this.token, + }); if (!pluralString) { - i18nLog(`Plural string not found for fallback cardinal 'other': '${str}'`); + i18nLog(`Plural string not found for fallback cardinal 'other': '${this.token}'`); return this.token; } @@ -262,7 +172,7 @@ export class LocalizedStringBuilder< /** Find and replace the dynamic variables in a localized string and substitute the variables with the provided values */ return str.replace(/\{(\w+)\}/g, (match, arg: string) => { const matchedArg = this.args - ? this.args[arg as keyof StringArgsRecord]?.toString() + ? this.args[arg as keyof ArgsFromToken]?.toString() : undefined; return matchedArg ?? LOCALE_DEFAULTS[arg as keyof typeof LOCALE_DEFAULTS] ?? match; @@ -270,13 +180,10 @@ export class LocalizedStringBuilder< } } -export function localize>(token: T) { - return new LocalizedStringBuilder(token); +export function localize(token: T) { + return new LocalizedStringBuilder(token); } -export function localizeFromOld>( - token: T, - args: StringArgsRecord -) { - return new LocalizedStringBuilder(token).withArgs(args); +export function localizeFromOld(token: T, args: ArgsFromToken) { + return new LocalizedStringBuilder(token).withArgs(args); } diff --git a/ts/util/i18n/shared.ts b/ts/util/i18n/shared.ts index cffdc3da7e..736809ba94 100644 --- a/ts/util/i18n/shared.ts +++ b/ts/util/i18n/shared.ts @@ -1,37 +1,17 @@ import { Locale } from 'date-fns'; import { CrowdinLocale } from '../../localization/constants'; -import { en } from '../../localization/locales'; -import type { LocalizerDictionary } from '../../types/localizer'; import { timeLocaleMap } from './timeLocaleMap'; let mappedBrowserLocaleDisplayed = false; let crowdinLocale: CrowdinLocale | undefined; -let translationDictionary: LocalizerDictionary | undefined; /** * Only exported for testing, reset the dictionary to use for translations and the locale set */ export function resetLocaleAndTranslationDict() { - translationDictionary = undefined; crowdinLocale = undefined; } -/** - * Returns the current dictionary to use for translations. - */ -export function getTranslationDictionary(): LocalizerDictionary { - if (translationDictionary) { - return translationDictionary; - } - - i18nLog('getTranslationDictionary: dictionary not init yet. Using en.'); - return en; -} - -export function getFallbackDictionary(): LocalizerDictionary { - return en; -} - /** * Logs an i18n message to the console. * @param message - The message to log. @@ -106,34 +86,13 @@ export function getBrowserLocale() { } } -export function setInitialLocale(crowdinLocaleArg: CrowdinLocale, dictionary: LocalizerDictionary) { - if (translationDictionary || crowdinLocale) { - throw new Error('setInitialLocale: translationDictionary or crowdinLocale is already init'); +export function setInitialLocale(crowdinLocaleArg: CrowdinLocale) { + if (crowdinLocale) { + throw new Error('setInitialLocale: crowdinLocale is already init'); } - translationDictionary = dictionary; crowdinLocale = crowdinLocaleArg; } export function isSessionLocaleSet() { return !!crowdinLocale; } - -export function getStringForCardinalRule( - localizedString: string, - cardinalRule: Intl.LDMLPluralRule -): string | undefined { - // TODO: investigate if this is the best way to handle regex like this - // We need block scoped regex to avoid running into this issue: - // https://stackoverflow.com/questions/18462784/why-is-javascript-regex-matching-every-second-time - const cardinalPluralRegex: Record = { - zero: /zero \[(.*?)\]/g, - one: /one \[(.*?)\]/g, - two: /two \[(.*?)\]/g, - few: /few \[(.*?)\]/g, - many: /many \[(.*?)\]/g, - other: /other \[(.*?)\]/g, - }; - const regex = cardinalPluralRegex[cardinalRule]; - const match = regex.exec(localizedString); - return match?.[1] ?? undefined; -} diff --git a/ts/util/notifications.ts b/ts/util/notifications.ts index 3bc30f5778..8ece1d3472 100644 --- a/ts/util/notifications.ts +++ b/ts/util/notifications.ts @@ -221,7 +221,7 @@ function update(forceRefresh = false) { if (shouldHideExpiringMessageBody) { message = window.i18n('messageNew', { count: messagesNotificationCount }); } - + window.drawAttention(); if (status.shouldPlayNotificationSound) { if (!sound) { diff --git a/ts/window.d.ts b/ts/window.d.ts index f7c98ec609..8abb44aba3 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -5,7 +5,8 @@ import { Store } from '@reduxjs/toolkit'; import { Persistor } from 'redux-persist/es/types'; import { PrimaryColorStateType, ThemeStateType } from './themes/constants/colors'; -import type { GetMessageArgs, I18nMethods, LocalizerToken } from './types/localizer'; +import type { GetMessageArgs, I18nMethods } from './types/localizer'; +import { MergedLocalizerTokens } from './localization/localeTools'; export interface LibTextsecure { messaging: boolean; @@ -35,19 +36,8 @@ declare global { * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic variables. * * @returns The localized message string with substitutions applied. - * - * @example - * // The string greeting is 'Hello, {name}!' in the current locale - * window.i18n('greeting', { name: 'Alice' }); - * // => 'Hello, Alice!' - * - * // The string search is '{count, plural, one [{found_count} of # match] other [{found_count} of # matches]}' in the current locale - * window.i18n('search', { count: 1, found_count: 1 }); - * // => '1 of 1 match' */ - i18n: (( - ...[token, args]: GetMessageArgs - ) => R) & { + i18n: ((...[token, args]: GetMessageArgs) => string) & { /** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.getRawMessage } and {@link window.i18n.getRawMessage } */ /** * Retrieves a localized message string, without substituting any variables. This resolves any plural forms using the given args @@ -59,15 +49,6 @@ declare global { * @deprecated * * NOTE: This is intended to be used to get the raw string then format it with {@link formatMessageWithArgs} - * - * @example - * // The string greeting is 'Hello, {name}!' in the current locale - * window.i18n.getRawMessage('greeting', { name: 'Alice' }); - * // => 'Hello, {name}!' - * - * // The string search is '{count, plural, one [{found_count} of # match] other [{found_count} of # matches]}' in the current locale - * window.i18n.getRawMessage('search', { count: 1, found_count: 1 }); - * // => '{found_count} of {count} match' */ getRawMessage: I18nMethods['getRawMessage']; @@ -81,19 +62,6 @@ declare global { * @returns The formatted message string. * * @deprecated - * - * @example - * // The string greeting is 'Hello, {name}!' in the current locale - * window.i18n.getRawMessage('greeting', { name: 'Alice' }); - * // => 'Hello, {name}!' - * window.i18n.formatMessageWithArgs('Hello, {name}!', { name: 'Alice' }); - * // => 'Hello, Alice!' - * - * // The string search is '{count, plural, one [{found_count} of # match] other [{found_count} of # matches]}' in the current locale - * window.i18n.getRawMessage('search', { count: 1, found_count: 1 }); - * // => '{found_count} of {count} match' - * window.i18n.formatMessageWithArgs('{found_count} of {count} match', { count: 1, found_count: 1 }); - * // => '1 of 1 match' */ formatMessageWithArgs: I18nMethods['formatMessageWithArgs']; @@ -107,11 +75,6 @@ declare global { * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic variables. * * @returns The localized message string with substitutions applied. Any HTML and custom tags are removed. - * - * @example - * // The string greeting is 'Hello, {name}! Welcome!' in the current locale - * window.i18n.stripped('greeting', { name: 'Alice' }); - * // => 'Hello, Alice! Welcome!' */ stripped: I18nMethods['stripped']; From 62a3d4e9bef868b8b5984860272664376b640401 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 3 Jan 2025 14:34:42 +1100 Subject: [PATCH 249/302] fix: wrap up changes for strings localization --- .eslintrc.js | 51 ++++ js/.eslintrc | 9 - .../conversation/SubtleNotification.tsx | 2 +- .../conversation/TimerNotification.tsx | 2 +- ts/localization/localeTools.ts | 240 ++++++++++++++++-- ts/util/i18n/functions/getMessage.ts | 33 +-- ts/util/i18n/i18n.ts | 3 +- ts/util/i18n/localizedString.ts | 189 -------------- 8 files changed, 286 insertions(+), 243 deletions(-) delete mode 100644 js/.eslintrc delete mode 100644 ts/util/i18n/localizedString.ts diff --git a/.eslintrc.js b/.eslintrc.js index 43cbfc9ef6..a0c94a147b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -153,5 +153,56 @@ module.exports = { files: ['ts/node/**/*.ts', 'ts/test/**/*.ts'], rules: { 'no-console': 'off', 'import/no-extraneous-dependencies': 'off' }, }, + { + files: ['ts/localization/*.ts', 'ts/localization/**/*.ts'], // anything in ts/localization has to only reference the files in that folder (this makes it reusable) + rules: { + 'no-restricted-imports': [ + 'error', + { + patterns: [ + 'a*', + 'b*', + 'c*', + 'd*', + 'e*', + 'f*', + 'g*', + 'h*', + 'i*', + 'j*', + 'k*', + 'l*', + 'm*', + 'n*', + 'o*', + 'p*', + 'q*', + 'r*', + 's*', + 't*', + 'u*', + 'v*', + 'w*', + 'x*', + 'y*', + 'z*', + '0*', + '1*', + '2*', + '3*', + '4*', + '5*', + '6*', + '7*', + '8*', + '9*', + '!./*', + ], // Disallow everything except ts/localization, this is the worst, + // but regexes are broken on our eslint8, and upgrading it means + // we need to bump node, which needs to bump electron.... and having '*' makes the other rules droped.. + }, + ], + }, + }, ], }; diff --git a/js/.eslintrc b/js/.eslintrc deleted file mode 100644 index 86ee928d49..0000000000 --- a/js/.eslintrc +++ /dev/null @@ -1,9 +0,0 @@ -{ - "env": { - "browser": true, - "node": true - }, - "parserOptions": { - "sourceType": "script" - } -} diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index f0838aff76..18de493979 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -33,7 +33,7 @@ import { useLibGroupKicked, useLibGroupWeHaveSecretKey, } from '../../state/selectors/userGroups'; -import { localize } from '../../util/i18n/localizedString'; +import { localize } from '../../localization/localeTools'; import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer'; const Container = styled.div<{ noExtraPadding: boolean }>` diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index 522cd5de6d..9ea5423b2d 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -17,7 +17,7 @@ import { ReleasedFeatures } from '../../util/releaseFeature'; import { Flex } from '../basic/Flex'; import { SpacerMD, TextWithChildren } from '../basic/Text'; import { ExpirableReadableMessage } from './message/message-item/ExpirableReadableMessage'; -import { LocalizerComponentPropsObject } from '../../types/localizer'; +import type { LocalizerComponentPropsObject } from '../../types/localizer'; // eslint-disable-next-line import/order import { ConversationInteraction } from '../../interactions'; diff --git a/ts/localization/localeTools.ts b/ts/localization/localeTools.ts index 1ad8b74ab0..ef64bddb49 100644 --- a/ts/localization/localeTools.ts +++ b/ts/localization/localeTools.ts @@ -1,29 +1,52 @@ -import { isEmpty } from 'lodash'; import { CrowdinLocale } from './constants'; -import { getMessage } from '../util/i18n/functions/getMessage'; import { pluralsDictionary, simpleDictionary } from './locales'; -export type SimpleDictionary = typeof simpleDictionary; -export type PluralDictionary = typeof pluralsDictionary; +type SimpleDictionary = typeof simpleDictionary; +type PluralDictionary = typeof pluralsDictionary; -export type SimpleLocalizerTokens = keyof SimpleDictionary; -export type PluralLocalizerTokens = keyof PluralDictionary; +type SimpleLocalizerTokens = keyof SimpleDictionary; +type PluralLocalizerTokens = keyof PluralDictionary; export type MergedLocalizerTokens = SimpleLocalizerTokens | PluralLocalizerTokens; +let localeInUse: CrowdinLocale = 'en'; + type Logger = (message: string) => void; let logger: Logger | undefined; +/** + * Simpler than lodash. Duplicated to avoid having to import lodash in the file. + * Because we share it with QA, but also to have a self contained localized tool that we can copy/paste + */ +function isEmptyObject(obj: unknown) { + if (!obj) { + return true; + } + if (typeof obj !== 'object') { + return false; + } + return Object.keys(obj).length === 0; +} + export function setLogger(cb: Logger) { if (logger) { // eslint-disable-next-line no-console - console.log('logger already initialized'); + console.log('logger already initialized. overwriding it'); } logger = cb; } +export function setLocaleInUse(crowdinLocale: CrowdinLocale) { + localeInUse = crowdinLocale; +} + function log(message: Parameters[0]) { - logger?.(message); + if (!logger) { + // eslint-disable-next-line no-console + console.log('logger is not set'); + return; + } + logger(message); } export function isSimpleToken(token: string): token is SimpleLocalizerTokens { @@ -42,8 +65,8 @@ type MergedTokenWithArgs = TokenWithArgs | TokenWithArgs([token, args]: GetMes return formatMessageWithArgs(rawMessage, args); } +/** + * Retrieves a localized message string, substituting variables where necessary. + * + * @param token - The token identifying the message to retrieve. + * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic variables. + * + * @returns The localized message string with substitutions applied. + */ +export function getMessageDefault( + ...props: GetMessageArgs +): string { + const token = props[0]; + try { + return localizeFromOld(props[0], props[1] as ArgsFromToken).toString(); + } catch (error) { + log(error.message); + return token; + } +} + /** * Retrieves a localized message string, substituting variables where necessary. Then strips the message of any HTML and custom tags. * @@ -128,7 +171,7 @@ export function stripped( ): string { const sanitizedArgs = args ? sanitizeArgs(args, '\u200B') : undefined; - const i18nString = getMessage(...([token, sanitizedArgs] as GetMessageArgs)); + const i18nString = getMessageDefault(...([token, sanitizedArgs] as GetMessageArgs)); const strippedString = i18nString.replaceAll(/<[^>]*>/g, ''); @@ -206,7 +249,7 @@ export function getRawMessage( const pluralsObjects = pluralsDictionary[token]; const localePluralsObject = pluralsObjects[crowdinLocale]; - if (!localePluralsObject || isEmpty(localePluralsObject)) { + if (!localePluralsObject || isEmptyObject(localePluralsObject)) { log(`Attempted to get translation for nonexistent key: '${token}'`); return token; } @@ -234,7 +277,7 @@ export function getRawMessage( } } -export function getStringForRule({ +function getStringForRule({ dictionary, token, crowdinLocale, @@ -255,7 +298,7 @@ export function getStringForRule({ * @param identifier The identifier to use for the args. Use this if you want to de-sanitize the args later. * @returns The sanitized string */ -export function sanitizeHtmlTags(str: string, identifier: string = ''): string { +function sanitizeHtmlTags(str: string, identifier: string = ''): string { if (identifier && /[a-zA-Z0-9>'); } + +class LocalizedStringBuilder extends String { + private readonly token: T; + private args?: ArgsFromToken; + private isStripped = false; + private isEnglishForced = false; + private crowdinLocale: CrowdinLocale; + + private readonly renderStringAsToken: boolean; + + constructor(token: T, crowdinLocale: CrowdinLocale, renderStringAsToken?: boolean) { + super(token); + this.token = token; + this.crowdinLocale = crowdinLocale; + this.renderStringAsToken = renderStringAsToken || false; + } + + public toString(): string { + try { + if (this.renderStringAsToken) { + return this.token; + } + + const rawString = this.getRawString(); + const str = this.formatStringWithArgs(rawString); + + if (this.isStripped) { + return this.postProcessStrippedString(str); + } + + return str; + } catch (error) { + log(error); + return this.token; + } + } + + withArgs(args: ArgsFromToken): Omit { + this.args = args; + return this; + } + + forceEnglish(): Omit { + this.isEnglishForced = true; + return this; + } + + strip(): Omit { + const sanitizedArgs = this.args ? sanitizeArgs(this.args, '\u200B') : undefined; + if (sanitizedArgs) { + this.args = sanitizedArgs as ArgsFromToken; + } + this.isStripped = true; + + return this; + } + + private postProcessStrippedString(str: string): string { + const strippedString = str.replaceAll(/<[^>]*>/g, ''); + return deSanitizeHtmlTags(strippedString, '\u200B'); + } + + private localeToTarget(): CrowdinLocale { + return this.isEnglishForced ? 'en' : this.crowdinLocale; + } + + private getRawString(): string { + try { + if (this.renderStringAsToken) { + return this.token; + } + + if (isSimpleToken(this.token)) { + return simpleDictionary[this.token][this.localeToTarget()]; + } + + if (!isPluralToken(this.token)) { + throw new Error('invalid token provided'); + } + + return this.resolvePluralString(); + } catch (error) { + log(error.message); + return this.token; + } + } + + private resolvePluralString(): string { + const pluralKey = 'count' as const; + + let num: number | string | undefined = this.args?.[pluralKey as keyof ArgsFromToken]; + + if (num === undefined) { + log( + `Attempted to get plural count for missing argument '${pluralKey} for token '${this.token}'` + ); + num = 0; + } + + if (typeof num !== 'number') { + log( + `Attempted to get plural count for argument '${pluralKey}' which is not a number for token '${this.token}'` + ); + num = parseInt(num, 10); + if (Number.isNaN(num)) { + log( + `Attempted to get parsed plural count for argument '${pluralKey}' which is not a number for token '${this.token}'` + ); + num = 0; + } + } + + const localeToTarget = this.localeToTarget(); + const cardinalRule = new Intl.PluralRules(localeToTarget).select(num); + + if (!isPluralToken(this.token)) { + throw new Error('resolvePluralString can only be called with a plural string'); + } + + let pluralString = getStringForRule({ + cardinalRule, + crowdinLocale: localeToTarget, + dictionary: pluralsDictionary, + token: this.token, + }); + + if (!pluralString) { + log( + `Plural string not found for cardinal '${cardinalRule}': '${this.token}' Falling back to 'other' cardinal` + ); + + pluralString = getStringForRule({ + cardinalRule: 'other', + crowdinLocale: localeToTarget, + dictionary: pluralsDictionary, + token: this.token, + }); + + if (!pluralString) { + log(`Plural string not found for fallback cardinal 'other': '${this.token}'`); + + return this.token; + } + } + + return pluralString.replaceAll('#', `${num}`); + } + + private formatStringWithArgs(str: string): string { + /** Find and replace the dynamic variables in a localized string and substitute the variables with the provided values */ + return str.replace(/\{(\w+)\}/g, (match, arg: string) => { + const matchedArg = this.args + ? this.args[arg as keyof ArgsFromToken]?.toString() + : undefined; + + return matchedArg ?? match; + }); + } +} + +export function localize(token: T) { + return new LocalizedStringBuilder(token, localeInUse); +} + +function localizeFromOld(token: T, args: ArgsFromToken) { + return localize(token).withArgs(args); +} diff --git a/ts/util/i18n/functions/getMessage.ts b/ts/util/i18n/functions/getMessage.ts index 6c95764616..f08d3d1887 100644 --- a/ts/util/i18n/functions/getMessage.ts +++ b/ts/util/i18n/functions/getMessage.ts @@ -1,40 +1,19 @@ /** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.getMessage } and {@link window.i18n } */ import type { SetupI18nReturnType } from '../../../types/localizer'; -import { i18nLog } from '../shared'; -import { localizeFromOld } from '../localizedString'; import { - ArgsFromToken, formatMessageWithArgs, - GetMessageArgs, getRawMessage, inEnglish, - MergedLocalizerTokens, stripped, + getMessageDefault, } from '../../../localization/localeTools'; -/** - * Retrieves a localized message string, substituting variables where necessary. - * - * @param token - The token identifying the message to retrieve. - * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic variables. - * - * @returns The localized message string with substitutions applied. - */ -function getMessageDefault(...props: GetMessageArgs): string { - const token = props[0]; +const getMessageDefaultCopy: any = getMessageDefault; - try { - return localizeFromOld(props[0], props[1] as ArgsFromToken).toString(); - } catch (error) { - i18nLog(error.message); - return token; - } -} - -getMessageDefault.inEnglish = inEnglish; -getMessageDefault.stripped = stripped; -getMessageDefault.getRawMessage = getRawMessage; -getMessageDefault.formatMessageWithArgs = formatMessageWithArgs; +getMessageDefaultCopy.inEnglish = inEnglish; +getMessageDefaultCopy.stripped = stripped; +getMessageDefaultCopy.getRawMessage = getRawMessage; +getMessageDefaultCopy.formatMessageWithArgs = formatMessageWithArgs; export const getMessage: SetupI18nReturnType = getMessageDefault as SetupI18nReturnType; diff --git a/ts/util/i18n/i18n.ts b/ts/util/i18n/i18n.ts index 677b9e0579..7ba9c4ed38 100644 --- a/ts/util/i18n/i18n.ts +++ b/ts/util/i18n/i18n.ts @@ -4,7 +4,7 @@ import type { SetupI18nReturnType } from '../../types/localizer'; import { getMessage } from './functions/getMessage'; import { i18nLog, setInitialLocale } from './shared'; import { CrowdinLocale } from '../../localization/constants'; -import { setLogger } from '../../localization/localeTools'; +import { setLocaleInUse, setLogger } from '../../localization/localeTools'; /** * Sets up the i18n function with the provided locale and messages. @@ -29,5 +29,6 @@ export const setupI18n = ({ // eslint-disable-next-line no-console setLogger(i18nLog); + setLocaleInUse(crowdinLocale); return getMessage; }; diff --git a/ts/util/i18n/localizedString.ts b/ts/util/i18n/localizedString.ts deleted file mode 100644 index 6f173b0fec..0000000000 --- a/ts/util/i18n/localizedString.ts +++ /dev/null @@ -1,189 +0,0 @@ -import { pluralsDictionary, simpleDictionary } from '../../localization/locales'; -import { - ArgsFromToken, - deSanitizeHtmlTags, - getStringForRule, - isPluralToken, - isSimpleToken, - MergedLocalizerTokens, - sanitizeArgs, -} from '../../localization/localeTools'; -import { i18nLog, getCrowdinLocale } from './shared'; -import { CrowdinLocale, LOCALE_DEFAULTS } from '../../localization/constants'; - -type ArgString = `${string}{${string}}${string}`; - -/** - * Checks if a string contains a dynamic variable. - * @param localizedString - The string to check. - * @returns `true` if the string contains a dynamic variable, otherwise `false`. - */ -const isStringWithArgs = (localizedString: string): localizedString is ArgString => - localizedString.includes('{'); - -const isReplaceLocalizedStringsWithKeysEnabled = () => - !!(typeof window !== 'undefined' && window?.sessionFeatureFlags?.replaceLocalizedStringsWithKeys); - -export class LocalizedStringBuilder extends String { - private readonly token: T; - private args?: ArgsFromToken; - private isStripped = false; - private isEnglishForced = false; - - private readonly renderStringAsToken = isReplaceLocalizedStringsWithKeysEnabled(); - - constructor(token: T) { - super(token); - this.token = token; - } - - public toString(): string { - try { - if (this.renderStringAsToken) { - return this.token; - } - - const rawString = this.getRawString(); - const str = isStringWithArgs(rawString) ? this.formatStringWithArgs(rawString) : rawString; - - if (this.isStripped) { - return this.postProcessStrippedString(str); - } - - return str; - } catch (error) { - i18nLog(error); - return this.token; - } - } - - withArgs(args: ArgsFromToken): Omit { - this.args = args; - return this; - } - - forceEnglish(): Omit { - this.isEnglishForced = true; - return this; - } - - strip(): Omit { - const sanitizedArgs = this.args ? sanitizeArgs(this.args, '\u200B') : undefined; - if (sanitizedArgs) { - this.args = sanitizedArgs as ArgsFromToken; - } - this.isStripped = true; - - return this; - } - - private postProcessStrippedString(str: string): string { - const strippedString = str.replaceAll(/<[^>]*>/g, ''); - return deSanitizeHtmlTags(strippedString, '\u200B'); - } - - private localeToTarget(): CrowdinLocale { - return this.isEnglishForced ? 'en' : getCrowdinLocale(); - } - - private getRawString(): string { - try { - if (this.renderStringAsToken) { - return this.token; - } - - if (isSimpleToken(this.token)) { - return simpleDictionary[this.token][this.localeToTarget()]; - } - - if (!isPluralToken(this.token)) { - throw new Error('invalid token provided'); - } - - return this.resolvePluralString(); - } catch (error) { - i18nLog(error.message); - return this.token; - } - } - - private resolvePluralString(): string { - const pluralKey = 'count' as const; - - let num: number | string | undefined = this.args?.[pluralKey as keyof ArgsFromToken]; - - if (num === undefined) { - i18nLog( - `Attempted to get plural count for missing argument '${pluralKey} for token '${this.token}'` - ); - num = 0; - } - - if (typeof num !== 'number') { - i18nLog( - `Attempted to get plural count for argument '${pluralKey}' which is not a number for token '${this.token}'` - ); - num = parseInt(num, 10); - if (Number.isNaN(num)) { - i18nLog( - `Attempted to get parsed plural count for argument '${pluralKey}' which is not a number for token '${this.token}'` - ); - num = 0; - } - } - - const localeToTarget = this.localeToTarget(); - const cardinalRule = new Intl.PluralRules(localeToTarget).select(num); - - if (!isPluralToken(this.token)) { - throw new Error('resolvePluralString can only be called with a plural string'); - } - - let pluralString = getStringForRule({ - cardinalRule, - crowdinLocale: localeToTarget, - dictionary: pluralsDictionary, - token: this.token, - }); - - if (!pluralString) { - i18nLog( - `Plural string not found for cardinal '${cardinalRule}': '${this.token}' Falling back to 'other' cardinal` - ); - - pluralString = getStringForRule({ - cardinalRule: 'other', - crowdinLocale: localeToTarget, - dictionary: pluralsDictionary, - token: this.token, - }); - - if (!pluralString) { - i18nLog(`Plural string not found for fallback cardinal 'other': '${this.token}'`); - - return this.token; - } - } - - return pluralString.replaceAll('#', `${num}`); - } - - private formatStringWithArgs(str: ArgString): string { - /** Find and replace the dynamic variables in a localized string and substitute the variables with the provided values */ - return str.replace(/\{(\w+)\}/g, (match, arg: string) => { - const matchedArg = this.args - ? this.args[arg as keyof ArgsFromToken]?.toString() - : undefined; - - return matchedArg ?? LOCALE_DEFAULTS[arg as keyof typeof LOCALE_DEFAULTS] ?? match; - }); - } -} - -export function localize(token: T) { - return new LocalizedStringBuilder(token); -} - -export function localizeFromOld(token: T, args: ArgsFromToken) { - return new LocalizedStringBuilder(token).withArgs(args); -} From 3764233cf8d5173b95567331317dc4e3a443cb41 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 3 Jan 2025 14:40:37 +1100 Subject: [PATCH 250/302] chore: add datatestid to audio-player --- ts/components/conversation/H5AudioPlayer.tsx | 4 ++-- ts/react.d.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ts/components/conversation/H5AudioPlayer.tsx b/ts/components/conversation/H5AudioPlayer.tsx index b1a3eb5d36..126545017f 100644 --- a/ts/components/conversation/H5AudioPlayer.tsx +++ b/ts/components/conversation/H5AudioPlayer.tsx @@ -1,5 +1,5 @@ // Audio Player -import { useEffect, useRef, useState } from 'react'; +import { SessionDataTestId, useEffect, useRef, useState } from 'react'; import H5AudioPlayer, { RHAP_UI } from 'react-h5-audio-player'; import { useDispatch, useSelector } from 'react-redux'; import styled from 'styled-components'; @@ -171,7 +171,7 @@ export const AudioPlayerWithEncryptedFile = (props: { direction === 'incoming' ? 'var(--message-bubbles-received-text-color)' : 'var(--message-bubbles-sent-text-color)'; - const dataTestId = `audio-${messageId}`; + const dataTestId: SessionDataTestId = 'audio-player'; const triggerPlayNextMessageIfNeeded = (endedMessageId: string) => { const justEndedMessageIndex = messageProps.findIndex( diff --git a/ts/react.d.ts b/ts/react.d.ts index a5bb7a5d6d..7bd968dc13 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -187,6 +187,7 @@ declare module 'react' { | 'link-device' | 'join-community-conversation' | 'join-community-button' + | 'audio-player' | 'select-contact' | 'contact' // this is way too generic | 'contact-status' From 6616ac4aa7e1a7ef79bd2e4c2e420cb895b41788 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 3 Jan 2025 16:51:16 +1100 Subject: [PATCH 251/302] fix: fix up string unit tests --- ts/components/basic/Localizer.tsx | 2 +- ts/components/basic/SessionHTMLRenderer.tsx | 5 +- ts/components/basic/StyledI18nSubText.tsx | 2 +- .../conversation/TimerNotification.tsx | 2 +- .../message-item/GroupUpdateMessage.tsx | 2 +- .../notification-bubble/CallNotification.tsx | 6 ++- .../message/reactions/ReactionPopup.tsx | 2 +- ts/components/dialog/SessionConfirm.tsx | 2 +- .../blockOrUnblock/BlockOrUnblockDialog.tsx | 2 +- .../registration/components/BackButton.tsx | 2 +- ts/interactions/conversationInteractions.ts | 2 +- ts/localization/localeTools.ts | 36 +++++++++++++- ts/models/groupUpdate.ts | 27 +++++----- ts/models/message.ts | 49 +++++-------------- ts/models/timerNotifications.ts | 2 +- .../unit/onboarding/Onboarding_test.ts | 2 - .../unit/selectors/conversations_test.ts | 2 - .../utils/i18n/formatMessageWithArgs_test.ts | 8 +-- .../unit/utils/i18n/getMessage_test.ts | 36 +++----------- .../unit/utils/i18n/getRawMessage_test.ts | 47 +++++++++--------- .../session/unit/utils/i18n/setupI18n_test.ts | 4 -- .../session/unit/utils/i18n/stripped_test.ts | 40 +++++---------- ts/test/session/unit/utils/i18n/util.ts | 12 +---- ts/types/localizer.d.ts | 42 +++++----------- ts/util/i18n/functions/getMessage.ts | 2 + ts/util/i18n/shared.ts | 9 +--- ts/window.d.ts | 2 + 27 files changed, 147 insertions(+), 202 deletions(-) diff --git a/ts/components/basic/Localizer.tsx b/ts/components/basic/Localizer.tsx index 2497558340..ca28132ba6 100644 --- a/ts/components/basic/Localizer.tsx +++ b/ts/components/basic/Localizer.tsx @@ -1,8 +1,8 @@ import styled from 'styled-components'; -import type { LocalizerComponentProps } from '../../types/localizer'; import { SessionHtmlRenderer } from './SessionHTMLRenderer'; import { GetMessageArgs, + LocalizerComponentProps, MergedLocalizerTokens, sanitizeArgs, } from '../../localization/localeTools'; diff --git a/ts/components/basic/SessionHTMLRenderer.tsx b/ts/components/basic/SessionHTMLRenderer.tsx index f6ad7334de..588782f49a 100644 --- a/ts/components/basic/SessionHTMLRenderer.tsx +++ b/ts/components/basic/SessionHTMLRenderer.tsx @@ -1,10 +1,11 @@ import DOMPurify from 'dompurify'; -import { createElement, type ElementType } from 'react'; +import { createElement } from 'react'; import { supportedFormattingTags } from './Localizer'; +import { LocalizerHtmlTag } from '../../localization/localeTools'; type ReceivedProps = { html: string; - tag?: ElementType; + tag?: LocalizerHtmlTag; key?: any; className?: string; }; diff --git a/ts/components/basic/StyledI18nSubText.tsx b/ts/components/basic/StyledI18nSubText.tsx index 1bb6dcd528..70c1bb3fa4 100644 --- a/ts/components/basic/StyledI18nSubText.tsx +++ b/ts/components/basic/StyledI18nSubText.tsx @@ -1,7 +1,7 @@ import styled from 'styled-components'; import { forwardRef } from 'react'; import { Localizer } from './Localizer'; -import type { LocalizerComponentPropsObject } from '../../types/localizer'; +import { LocalizerComponentPropsObject } from '../../localization/localeTools'; const StyledI18nSubTextContainer = styled('div')` font-size: var(--font-size-md); diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index 9ea5423b2d..23fa18c509 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -17,7 +17,6 @@ import { ReleasedFeatures } from '../../util/releaseFeature'; import { Flex } from '../basic/Flex'; import { SpacerMD, TextWithChildren } from '../basic/Text'; import { ExpirableReadableMessage } from './message/message-item/ExpirableReadableMessage'; -import type { LocalizerComponentPropsObject } from '../../types/localizer'; // eslint-disable-next-line import/order import { ConversationInteraction } from '../../interactions'; @@ -27,6 +26,7 @@ import { Localizer } from '../basic/Localizer'; import { SessionButtonColor } from '../basic/SessionButton'; import { SessionIcon } from '../icon'; import { getTimerNotificationStr } from '../../models/timerNotifications'; +import { LocalizerComponentPropsObject } from '../../localization/localeTools'; const FollowSettingButton = styled.button` color: var(--primary-color); diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx index 5415650444..7187d02d6f 100644 --- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx +++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx @@ -16,10 +16,10 @@ import { useSelectedIsGroupV2, useSelectedNicknameOrProfileNameOrShortenedPubkey, } from '../../../../state/selectors/selectedConversation'; -import type { LocalizerComponentPropsObject } from '../../../../types/localizer'; import { Localizer } from '../../../basic/Localizer'; import { ExpirableReadableMessage } from './ExpirableReadableMessage'; import { NotificationBubble } from './notification-bubble/NotificationBubble'; +import { LocalizerComponentPropsObject } from '../../../../localization/localeTools'; // This component is used to display group updates in the conversation view. diff --git a/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx b/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx index dd89a98dae..bc624d6257 100644 --- a/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx +++ b/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx @@ -45,7 +45,11 @@ export const CallNotification = (props: PropsForCallNotification) => { isControlMessage={true} > - + {notificationTextKey === 'callsInProgress' ? ( + + ) : ( + + )} ); diff --git a/ts/components/conversation/message/reactions/ReactionPopup.tsx b/ts/components/conversation/message/reactions/ReactionPopup.tsx index 1ba3cbae10..85561f8fa3 100644 --- a/ts/components/conversation/message/reactions/ReactionPopup.tsx +++ b/ts/components/conversation/message/reactions/ReactionPopup.tsx @@ -5,7 +5,7 @@ import { PubKey } from '../../../../session/types/PubKey'; import { Localizer } from '../../../basic/Localizer'; import { nativeEmojiData } from '../../../../util/emoji'; -import type { LocalizerComponentPropsObject } from '../../../../types/localizer'; +import { LocalizerComponentPropsObject } from '../../../../localization/localeTools'; export type TipPosition = 'center' | 'left' | 'right'; diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx index 2657cfa2a2..be6da48664 100644 --- a/ts/components/dialog/SessionConfirm.tsx +++ b/ts/components/dialog/SessionConfirm.tsx @@ -10,9 +10,9 @@ import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/S import { SessionRadioGroup, SessionRadioItems } from '../basic/SessionRadioGroup'; import { SpacerLG } from '../basic/Text'; import { SessionSpinner } from '../loading'; -import type { LocalizerComponentPropsObject } from '../../types/localizer'; import { StyledI18nSubText } from '../basic/StyledI18nSubText'; +import { LocalizerComponentPropsObject } from '../../localization/localeTools'; export interface SessionConfirmDialogProps { i18nMessage?: LocalizerComponentPropsObject; diff --git a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx index 7069beebde..93c49ec089 100644 --- a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx +++ b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx @@ -13,7 +13,7 @@ import { Localizer } from '../../basic/Localizer'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../../basic/SessionButton'; import { StyledModalDescriptionContainer } from '../shared/ModalDescriptionContainer'; import { BlockOrUnblockModalState } from './BlockOrUnblockModalState'; -import type { LocalizerComponentPropsObject } from '../../../types/localizer'; +import { LocalizerComponentPropsObject } from '../../../localization/localeTools'; type ModalState = NonNullable; diff --git a/ts/components/registration/components/BackButton.tsx b/ts/components/registration/components/BackButton.tsx index fcc36e6ac7..4c8ec63b7f 100644 --- a/ts/components/registration/components/BackButton.tsx +++ b/ts/components/registration/components/BackButton.tsx @@ -17,7 +17,7 @@ import { deleteDbLocally } from '../../../util/accountManager'; import { Flex } from '../../basic/Flex'; import { SessionButtonColor } from '../../basic/SessionButton'; import { SessionIconButton } from '../../icon'; -import type { LocalizerComponentPropsObject } from '../../../types/localizer'; +import { LocalizerComponentPropsObject } from '../../../localization/localeTools'; /** Min height should match the onboarding step with the largest height this prevents the loading spinner from jumping around while still keeping things centered */ const StyledBackButtonContainer = styled(Flex)` diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index a2fab258e4..39fad4de84 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -50,7 +50,6 @@ import { Storage, setLastProfileUpdateTimestamp } from '../util/storage'; import { UserGroupsWrapperActions } from '../webworker/workers/browser/libsession_worker_interface'; import { ConversationInteractionStatus, ConversationInteractionType } from './types'; import { BlockedNumberController } from '../util'; -import type { LocalizerComponentPropsObject } from '../types/localizer'; import { sendInviteResponseToGroup } from '../session/sending/group/GroupInviteResponse'; import { NetworkTime } from '../util/NetworkTime'; import { ClosedGroup } from '../session'; @@ -59,6 +58,7 @@ import { GroupPromote } from '../session/utils/job_runners/jobs/GroupPromoteJob' import { MessageSender } from '../session/sending'; import { StoreGroupRequestFactory } from '../session/apis/snode_api/factories/StoreGroupRequestFactory'; import { DURATION } from '../session/constants'; +import { LocalizerComponentPropsObject } from '../localization/localeTools'; export async function copyPublicKeyByConvoId(convoId: string) { if (OpenGroupUtils.isOpenGroupV2(convoId)) { diff --git a/ts/localization/localeTools.ts b/ts/localization/localeTools.ts index ef64bddb49..23eca90797 100644 --- a/ts/localization/localeTools.ts +++ b/ts/localization/localeTools.ts @@ -109,6 +109,14 @@ type MappedToTsTypes> = { [K in keyof T]: ArgsTypeStrToTypes; }; +function propsToTuple( + opts: LocalizerComponentProps +): GetMessageArgs { + return ( + isTokenWithArgs(opts.token) ? [opts.token, opts.args] : [opts.token] + ) as GetMessageArgs; +} + /** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.inEnglish } and {@link window.i18n.inEnglish } */ /** * Retrieves a message string in the {@link en} locale, substituting variables where necessary. @@ -178,6 +186,12 @@ export function stripped( return deSanitizeHtmlTags(strippedString, '\u200B'); } +export function strippedWithObj( + opts: LocalizerComponentProps +): string { + return stripped(...propsToTuple(opts)); +} + /** * Sanitizes the args to be used in the i18n function * @param args The args to sanitize @@ -489,6 +503,26 @@ export function localize(token: T) { return new LocalizedStringBuilder(token, localeInUse); } -function localizeFromOld(token: T, args: ArgsFromToken) { +export function localizeFromOld(token: T, args: ArgsFromToken) { return localize(token).withArgs(args); } + +export type LocalizerHtmlTag = 'span' | 'div'; +/** Basic props for all calls of the Localizer component */ +type LocalizerComponentBaseProps = { + token: T; + asTag?: LocalizerHtmlTag; + className?: string; +}; + +/** The props for the localization component */ +export type LocalizerComponentProps = + T extends MergedLocalizerTokens + ? ArgsFromToken extends never + ? LocalizerComponentBaseProps & { args?: undefined } + : ArgsFromToken extends Record + ? LocalizerComponentBaseProps & { args?: undefined } + : LocalizerComponentBaseProps & { args: ArgsFromToken } + : never; + +export type LocalizerComponentPropsObject = LocalizerComponentProps; diff --git a/ts/models/groupUpdate.ts b/ts/models/groupUpdate.ts index 0ff1775827..7c1e9766c9 100644 --- a/ts/models/groupUpdate.ts +++ b/ts/models/groupUpdate.ts @@ -1,6 +1,6 @@ +import { LocalizerComponentPropsObject } from '../localization/localeTools'; import { ConvoHub } from '../session/conversations'; import { UserUtils } from '../session/utils'; -import type { LocalizerComponentPropsObject } from '../types/localizer'; function usAndXOthers(arr: Array) { const us = UserUtils.getOurPubKeyStrFromCache(); @@ -23,7 +23,7 @@ export function getKickedGroupUpdateStr( if (us) { switch (others.length) { case 0: - return { token: 'groupRemovedYouGeneral' }; + return { token: 'groupRemovedYouGeneral', args: undefined }; case 1: return { token: 'groupRemovedYouTwo', args: { other_name: othersNames[0] } }; default: @@ -33,7 +33,7 @@ export function getKickedGroupUpdateStr( switch (othersNames.length) { case 0: - return { token: 'groupUpdated' }; + return { token: 'groupUpdated', args: undefined }; case 1: return { token: 'groupRemoved', args: { name: othersNames[0] } }; case 2: @@ -63,7 +63,7 @@ export function getLeftGroupUpdateChangeStr(left: Array): LocalizerCompo } return us - ? { token: 'groupMemberYouLeft' } + ? { token: 'groupMemberYouLeft', args: undefined } : { token: 'groupMemberLeft', args: { @@ -85,7 +85,10 @@ export function getJoinedGroupUpdateChangeStr( if (us) { switch (othersNames.length) { case 0: - return { token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou' }; + return { + token: addedWithHistory ? 'groupInviteYouHistory' : 'groupInviteYou', + args: undefined, + }; case 1: return addedWithHistory ? { token: 'groupMemberNewYouHistoryTwo', args: { other_name: othersNames[0] } } @@ -98,7 +101,7 @@ export function getJoinedGroupUpdateChangeStr( } switch (othersNames.length) { case 0: - return { token: 'groupUpdated' }; // this is an invalid case, but well. + return { token: 'groupUpdated', args: undefined }; // this is an invalid case, but well. case 1: return addedWithHistory ? { token: 'groupMemberNewHistory', args: { name: othersNames[0] } } @@ -130,7 +133,7 @@ export function getJoinedGroupUpdateChangeStr( if (us) { switch (othersNames.length) { case 0: - return { token: 'legacyGroupMemberYouNew' }; + return { token: 'legacyGroupMemberYouNew', args: undefined }; case 1: return { token: 'legacyGroupMemberNewYouOther', args: { other_name: othersNames[0] } }; default: @@ -139,7 +142,7 @@ export function getJoinedGroupUpdateChangeStr( } switch (othersNames.length) { case 0: - return { token: 'groupUpdated' }; + return { token: 'groupUpdated', args: undefined }; case 1: return { token: 'legacyGroupMemberNew', args: { name: othersNames[0] } }; case 2: @@ -170,7 +173,7 @@ export function getPromotedGroupUpdateChangeStr( if (us) { switch (othersNames.length) { case 0: - return { token: 'groupPromotedYou' }; + return { token: 'groupPromotedYou', args: undefined }; case 1: return { token: 'groupPromotedYouTwo', args: { name: othersNames[0] } }; default: @@ -179,7 +182,7 @@ export function getPromotedGroupUpdateChangeStr( } switch (othersNames.length) { case 0: - return { token: 'groupUpdated' }; + return { token: 'groupUpdated', args: undefined }; case 1: return { token: 'adminPromotedToAdmin', args: { name: othersNames[0] } }; case 2: @@ -204,9 +207,9 @@ export function getPromotedGroupUpdateChangeStr( export function getGroupNameChangeStr(newName: string | undefined): LocalizerComponentPropsObject { return newName ? { token: 'groupNameNew', args: { group_name: newName } } - : { token: 'groupNameUpdated' }; + : { token: 'groupNameUpdated', args: undefined }; } export function getGroupDisplayPictureChangeStr(): LocalizerComponentPropsObject { - return { token: 'groupDisplayPictureUpdated' }; + return { token: 'groupDisplayPictureUpdated', args: undefined }; } diff --git a/ts/models/message.ts b/ts/models/message.ts index 1eb4812551..708823e732 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -269,61 +269,39 @@ export class MessageModel extends Backbone.Model { this.getConversation()?.getNicknameOrRealUsernameOrPlaceholder() || window.i18n('unknown'); if (groupUpdate.left) { - // @ts-expect-error -- TODO: Fix by using new i18n builder - const { token, args } = getLeftGroupUpdateChangeStr(groupUpdate.left, groupName); - // TODO: clean up this typing - return window.i18n.stripped(...[token, args]); + return window.i18n.strippedWithObj(getLeftGroupUpdateChangeStr(groupUpdate.left)); } if (groupUpdate.name) { - const result = getGroupNameChangeStr(groupUpdate.name); - - if ('args' in result) { - return window.i18n.stripped(...[result.token, result.args]); - } - return window.i18n.stripped(...[result.token]); + return window.i18n.strippedWithObj(getGroupNameChangeStr(groupUpdate.name)); } if (groupUpdate.avatarChange) { - const result = getGroupDisplayPictureChangeStr(); - return window.i18n.stripped(...[result.token]); + return window.i18n.strippedWithObj(getGroupDisplayPictureChangeStr()); } if (groupUpdate.joined?.length) { - // @ts-expect-error -- TODO: Fix by using new i18n builder - const { token, args } = getJoinedGroupUpdateChangeStr( - groupUpdate.joined, - isGroupV2, - false, - groupName - ); - // TODO: clean up this typing - return window.i18n.stripped(...[token, args]); + const opts = getJoinedGroupUpdateChangeStr(groupUpdate.joined, isGroupV2, false, groupName); + return window.i18n.strippedWithObj(opts); } if (groupUpdate.joinedWithHistory?.length) { - // @ts-expect-error -- TODO: Fix by using new i18n builder - const { token, args } = getJoinedGroupUpdateChangeStr( + const opts = getJoinedGroupUpdateChangeStr( groupUpdate.joinedWithHistory, true, true, groupName ); - // TODO: clean up this typing - return window.i18n.stripped(...[token, args]); + return window.i18n.strippedWithObj(opts); } if (groupUpdate.kicked?.length) { - // @ts-expect-error -- TODO: Fix by using new i18n builder - const { token, args } = getKickedGroupUpdateStr(groupUpdate.kicked, groupName); - // TODO: clean up this typing - return window.i18n.stripped(...[token, args]); + const opts = getKickedGroupUpdateStr(groupUpdate.kicked, groupName); + return window.i18n.strippedWithObj(opts); } if (groupUpdate.promoted?.length) { - // @ts-expect-error -- TODO: Fix by using new i18n builder - const { token, args } = getPromotedGroupUpdateChangeStr(groupUpdate.promoted, groupName); - // TODO: clean up this typing - return window.i18n.stripped(...[token, args]); + const opts = getPromotedGroupUpdateChangeStr(groupUpdate.promoted); + return window.i18n.strippedWithObj(opts); } window.log.warn('did not build a specific change for getDescription of ', groupUpdate); @@ -429,10 +407,7 @@ export class MessageModel extends Backbone.Model { timespanSeconds: expireTimer, }); - if ('args' in i18nProps) { - return window.i18n.stripped(...[i18nProps.token, i18nProps.args]); - } - return window.i18n.stripped(...[i18nProps.token]); + return window.i18n.strippedWithObj(i18nProps); } const body = this.get('body'); if (body) { diff --git a/ts/models/timerNotifications.ts b/ts/models/timerNotifications.ts index 77ee406281..43c7186bee 100644 --- a/ts/models/timerNotifications.ts +++ b/ts/models/timerNotifications.ts @@ -5,7 +5,7 @@ import { PubKey } from '../session/types'; import { UserUtils } from '../session/utils'; import { TimerOptions } from '../session/disappearing_messages/timerOptions'; import { isLegacyDisappearingModeEnabled } from '../session/disappearing_messages/legacy'; -import type { LocalizerComponentPropsObject } from '../types/localizer'; +import { LocalizerComponentPropsObject } from '../localization/localeTools'; export function getTimerNotificationStr({ expirationMode, diff --git a/ts/test/session/unit/onboarding/Onboarding_test.ts b/ts/test/session/unit/onboarding/Onboarding_test.ts index bbe8deb1ae..81653687c0 100644 --- a/ts/test/session/unit/onboarding/Onboarding_test.ts +++ b/ts/test/session/unit/onboarding/Onboarding_test.ts @@ -10,7 +10,6 @@ import { } from '../../../../util/accountManager'; import { TestUtils } from '../../../test-utils'; import { stubWindow } from '../../../test-utils/utils'; -import { resetLocaleAndTranslationDict } from '../../../../util/i18n/shared'; describe('Onboarding', () => { const polledDisplayName = 'Hello World'; @@ -26,7 +25,6 @@ describe('Onboarding', () => { }); afterEach(() => { - resetLocaleAndTranslationDict(); Sinon.restore(); }); diff --git a/ts/test/session/unit/selectors/conversations_test.ts b/ts/test/session/unit/selectors/conversations_test.ts index 8bf08156b8..f1739d493b 100644 --- a/ts/test/session/unit/selectors/conversations_test.ts +++ b/ts/test/session/unit/selectors/conversations_test.ts @@ -8,7 +8,6 @@ import { _getSortedConversations, } from '../../../../state/selectors/conversations'; import { TestUtils } from '../../../test-utils'; -import { resetLocaleAndTranslationDict } from '../../../../util/i18n/shared'; describe('state/selectors/conversations', () => { beforeEach(() => { @@ -16,7 +15,6 @@ describe('state/selectors/conversations', () => { TestUtils.stubI18n(); }); afterEach(() => { - resetLocaleAndTranslationDict(); Sinon.restore(); }); describe('#getSortedConversationsList', () => { diff --git a/ts/test/session/unit/utils/i18n/formatMessageWithArgs_test.ts b/ts/test/session/unit/utils/i18n/formatMessageWithArgs_test.ts index e031077a82..0fade2304c 100644 --- a/ts/test/session/unit/utils/i18n/formatMessageWithArgs_test.ts +++ b/ts/test/session/unit/utils/i18n/formatMessageWithArgs_test.ts @@ -2,16 +2,12 @@ // @ts-nocheck - TODO: add generic type to setupI18n to fix this import { expect } from 'chai'; -import { initI18n, testDictionary } from './util'; -import { resetLocaleAndTranslationDict } from '../../../../../util/i18n/shared'; +import { initI18n } from './util'; describe('formatMessageWithArgs', () => { let i18n; beforeEach(() => { - i18n = initI18n(testDictionary); - }); - afterEach(() => { - resetLocaleAndTranslationDict(); + i18n = initI18n(); }); it('returns the message with args for a message', () => { diff --git a/ts/test/session/unit/utils/i18n/getMessage_test.ts b/ts/test/session/unit/utils/i18n/getMessage_test.ts index 77dced0004..9e485209cc 100644 --- a/ts/test/session/unit/utils/i18n/getMessage_test.ts +++ b/ts/test/session/unit/utils/i18n/getMessage_test.ts @@ -2,46 +2,26 @@ // @ts-nocheck - TODO: add generic type to setupI18n to fix this import { expect } from 'chai'; -import { initI18n, testDictionary } from './util'; -import { resetLocaleAndTranslationDict } from '../../../../../util/i18n/shared'; +import { initI18n } from './util'; describe('getMessage', () => { - let i18n; - beforeEach(() => { - i18n = initI18n(testDictionary); - }); - - afterEach(() => { - resetLocaleAndTranslationDict(); - }); - it('returns the message for a token', () => { - const message = i18n('greeting', { name: 'Alice' }); - expect(message).to.equal('Hello, Alice!'); + const message = initI18n()('searchContacts'); + expect(message).to.equal('Search Contacts'); }); it('returns the message for a plural token', () => { - const message = i18n('search', { count: 1, found_count: 2 }); + const message = initI18n()('searchMatches', { count: 1, found_count: 2 }); expect(message).to.equal('2 of 1 match'); }); it('returns the message for a token with no args', () => { - const message = i18n('noArgs'); - expect(message).to.equal('No args'); - }); - - it('returns the message for a token with args', () => { - const message = i18n('args', { name: 'Alice' }); - expect(message).to.equal('Hello, Alice!'); - }); - - it('returns the message for a token with a tag', () => { - const message = i18n('tag', { name: 'Alice' }); - expect(message).to.equal('Hello, Alice! Welcome!'); + const message = initI18n()('adminPromote'); + expect(message).to.equal('Promote Admins'); }); it('returns the message for a token with a tag and args', () => { - const message = i18n('argInTag', { name: 'Alice', arg: 'Bob' }); - expect(message).to.equal('Hello, Alice! Welcome, Bob!'); + const message = initI18n()('adminPromotedToAdmin', { name: 'Alice' }); + expect(message).to.equal('Alice was promoted to Admin.'); }); }); diff --git a/ts/test/session/unit/utils/i18n/getRawMessage_test.ts b/ts/test/session/unit/utils/i18n/getRawMessage_test.ts index 42cb207429..22f5acc4fe 100644 --- a/ts/test/session/unit/utils/i18n/getRawMessage_test.ts +++ b/ts/test/session/unit/utils/i18n/getRawMessage_test.ts @@ -2,46 +2,49 @@ // @ts-nocheck - TODO: add generic type to setupI18n to fix this import { expect } from 'chai'; -import { initI18n, testDictionary } from './util'; -import { resetLocaleAndTranslationDict } from '../../../../../util/i18n/shared'; +import { initI18n } from './util'; describe('getRawMessage', () => { - let i18n; - beforeEach(() => { - i18n = initI18n(testDictionary); - }); - - afterEach(() => { - resetLocaleAndTranslationDict(); - }); - it('returns the raw message for a token', () => { - const rawMessage = i18n.getRawMessage('greeting', { name: 'Alice' }); - expect(rawMessage).to.equal('Hello, {name}!'); + const rawMessage = initI18n().getRawMessage('en', 'adminPromoteDescription', { name: 'Alice' }); + expect(rawMessage).to.equal( + 'Are you sure you want to promote {name} to admin? Admins cannot be removed.' + ); }); it('returns the raw message for a plural token', () => { - const rawMessage = i18n.getRawMessage('search', { count: 1, found_count: 2 }); + const rawMessage = initI18n().getRawMessage('en', 'searchMatches', { + count: 1, + found_count: 2, + }); expect(rawMessage).to.equal('{found_count} of {count} match'); }); it('returns the raw message for a token with no args', () => { - const rawMessage = i18n.getRawMessage('noArgs'); - expect(rawMessage).to.equal('No args'); + const rawMessage = initI18n().getRawMessage('en', 'adminCannotBeRemoved'); + expect(rawMessage).to.equal('Admins cannot be removed.'); }); it('returns the raw message for a token with args', () => { - const rawMessage = i18n.getRawMessage('args', { name: 'Alice' }); - expect(rawMessage).to.equal('Hello, {name}!'); + const rawMessage = initI18n().getRawMessage('en', 'adminPromotionFailedDescription', { + name: 'Alice', + group_name: 'Group', + }); + expect(rawMessage).to.equal('Failed to promote {name} in {group_name}'); }); it('returns the raw message for a token with a tag', () => { - const rawMessage = i18n.getRawMessage('tag', { name: 'Alice' }); - expect(rawMessage).to.equal('Hello, {name}! Welcome!'); + const message = initI18n().getRawMessage('en', 'screenshotTaken', { name: 'Alice' }); + expect(message).to.equal('{name} took a screenshot.'); }); it('returns the raw message for a token with a tag and args', () => { - const rawMessage = i18n.getRawMessage('argInTag', { name: 'Alice', arg: 'Bob' }); - expect(rawMessage).to.equal('Hello, {name}! Welcome, {arg}!'); + const message = initI18n().getRawMessage('en', 'adminPromoteTwoDescription', { + name: 'Alice', + other_name: 'Bob', + }); + expect(message).to.equal( + 'Are you sure you want to promote {name} and {other_name} to admin? Admins cannot be removed.' + ); }); }); diff --git a/ts/test/session/unit/utils/i18n/setupI18n_test.ts b/ts/test/session/unit/utils/i18n/setupI18n_test.ts index dca67d37c3..1e749fe951 100644 --- a/ts/test/session/unit/utils/i18n/setupI18n_test.ts +++ b/ts/test/session/unit/utils/i18n/setupI18n_test.ts @@ -1,11 +1,7 @@ import { expect } from 'chai'; import { initI18n } from './util'; -import { resetLocaleAndTranslationDict } from '../../../../../util/i18n/shared'; describe('setupI18n', () => { - afterEach(() => { - resetLocaleAndTranslationDict(); - }); it('returns setupI18n with all methods defined', () => { const setupI18nReturn = initI18n(); expect(setupI18nReturn).to.be.a('function'); diff --git a/ts/test/session/unit/utils/i18n/stripped_test.ts b/ts/test/session/unit/utils/i18n/stripped_test.ts index 70cff00910..80eb52ca8f 100644 --- a/ts/test/session/unit/utils/i18n/stripped_test.ts +++ b/ts/test/session/unit/utils/i18n/stripped_test.ts @@ -2,45 +2,31 @@ // @ts-nocheck - TODO: add generic type to setupI18n to fix this import { expect } from 'chai'; -import { initI18n, testDictionary } from './util'; -import { resetLocaleAndTranslationDict } from '../../../../../util/i18n/shared'; +import { initI18n } from './util'; describe('stripped', () => { - let i18n; - beforeEach(() => { - i18n = initI18n(testDictionary); - }); - afterEach(() => { - resetLocaleAndTranslationDict(); - }); - it('returns the stripped message for a token', () => { - const message = i18n.stripped('greeting', { name: 'Alice' }); - expect(message).to.equal('Hello, Alice!'); + const message = initI18n().stripped('search'); + expect(message).to.equal('Search'); }); it('returns the stripped message for a plural token', () => { - const message = i18n.stripped('search', { count: 1, found_count: 2 }); + const message = initI18n().stripped('searchMatches', { count: 1, found_count: 2 }); expect(message).to.equal('2 of 1 match'); }); - it('returns the stripped message for a token with no args', () => { - const message = i18n.stripped('noArgs'); - expect(message).to.equal('No args'); - }); - - it('returns the stripped message for a token with args', () => { - const message = i18n.stripped('args', { name: 'Alice' }); - expect(message).to.equal('Hello, Alice!'); - }); - it('returns the stripped message for a token with the tags stripped', () => { - const message = i18n.stripped('tag', { name: 'Alice' }); - expect(message).to.equal('Hello, Alice! Welcome!'); + const message = initI18n().stripped('messageRequestYouHaveAccepted', { name: 'Alice' }); + expect(message).to.equal('You have accepted the message request from Alice.'); }); it('returns the stripped message for a token with the tags stripped', () => { - const message = i18n.stripped('argInTag', { name: 'Alice', arg: 'Bob' }); - expect(message).to.equal('Hello, Alice! Welcome, Bob!'); + const message = initI18n().stripped('adminPromoteTwoDescription', { + name: 'Alice', + other_name: 'Bob', + }); + expect(message).to.equal( + 'Are you sure you want to promote Alice and Bob to admin? Admins cannot be removed.' + ); }); }); diff --git a/ts/test/session/unit/utils/i18n/util.ts b/ts/test/session/unit/utils/i18n/util.ts index 2b5b13dd44..96388edb56 100644 --- a/ts/test/session/unit/utils/i18n/util.ts +++ b/ts/test/session/unit/utils/i18n/util.ts @@ -1,17 +1,7 @@ import { setupI18n } from '../../../../../util/i18n/i18n'; -export const testDictionary = { - greeting: 'Hello, {name}!', - search: '{found_count} of {count} match', - noArgs: 'No args', - args: 'Hello, {name}!', - tag: 'Hello, {name}! Welcome!', - argInTag: 'Hello, {name}! Welcome, {arg}!', -} as const; - export function initI18n() { return setupI18n({ - // testing - crowdinLocale: 'en', + crowdinLocale: 'en', // testing }); } diff --git a/ts/types/localizer.d.ts b/ts/types/localizer.d.ts index 6864c95026..0b537d0ea1 100644 --- a/ts/types/localizer.d.ts +++ b/ts/types/localizer.d.ts @@ -1,45 +1,29 @@ -import type { ElementType } from 'react'; -import type { ArgsFromToken, MergedLocalizerTokens } from '../localization/localeTools'; +import type { + ArgsFromToken, + MergedLocalizerTokens, + GetMessageArgs, + LocalizerComponentProps, +} from '../localization/localeTools'; import { CrowdinLocale } from '../localization/constants'; -/** Basic props for all calls of the Localizer component */ -type LocalizerComponentBaseProps = { - token: T; - asTag?: ElementType; - className?: string; -}; - -/** The props for the localization component */ -export type LocalizerComponentProps = - T extends MergedLocalizerTokens - ? ArgsFromToken extends never - ? LocalizerComponentBaseProps - : ArgsFromToken extends Record - ? LocalizerComponentBaseProps - : LocalizerComponentBaseProps & { args: ArgsFromToken } - : never; - -export type LocalizerComponentPropsObject = LocalizerComponentProps; - export type I18nMethods = { /** @see {@link window.i18n.stripped} */ - stripped: ( - ...[token, args]: GetMessageArgs - ) => R | T; + stripped: (...[token, args]: GetMessageArgs) => string | T; + strippedWithObj: ( + opts: LocalizerComponentProps + ) => string | T; /** @see {@link window.i18n.inEnglish} */ - inEnglish: ( - ...[token, args]: GetMessageArgs - ) => R | T; + inEnglish: (...[token, args]: GetMessageArgs) => string | T; /** @see {@link window.i18n.formatMessageWithArgs */ getRawMessage: ( crowdinLocale: CrowdinLocale, ...[token, args]: GetMessageArgs - ) => string; + ) => string | T; /** @see {@link window.i18n.formatMessageWithArgs} */ formatMessageWithArgs: ( rawMessage: string, args?: ArgsFromToken - ) => string; + ) => string | T; }; export type SetupI18nReturnType = I18nMethods & diff --git a/ts/util/i18n/functions/getMessage.ts b/ts/util/i18n/functions/getMessage.ts index f08d3d1887..d0bef4190d 100644 --- a/ts/util/i18n/functions/getMessage.ts +++ b/ts/util/i18n/functions/getMessage.ts @@ -7,12 +7,14 @@ import { inEnglish, stripped, getMessageDefault, + strippedWithObj, } from '../../../localization/localeTools'; const getMessageDefaultCopy: any = getMessageDefault; getMessageDefaultCopy.inEnglish = inEnglish; getMessageDefaultCopy.stripped = stripped; +getMessageDefaultCopy.strippedWithObj = strippedWithObj; getMessageDefaultCopy.getRawMessage = getRawMessage; getMessageDefaultCopy.formatMessageWithArgs = formatMessageWithArgs; diff --git a/ts/util/i18n/shared.ts b/ts/util/i18n/shared.ts index 736809ba94..2b9491a720 100644 --- a/ts/util/i18n/shared.ts +++ b/ts/util/i18n/shared.ts @@ -5,13 +5,6 @@ import { timeLocaleMap } from './timeLocaleMap'; let mappedBrowserLocaleDisplayed = false; let crowdinLocale: CrowdinLocale | undefined; -/** - * Only exported for testing, reset the dictionary to use for translations and the locale set - */ -export function resetLocaleAndTranslationDict() { - crowdinLocale = undefined; -} - /** * Logs an i18n message to the console. * @param message - The message to log. @@ -88,7 +81,7 @@ export function getBrowserLocale() { export function setInitialLocale(crowdinLocaleArg: CrowdinLocale) { if (crowdinLocale) { - throw new Error('setInitialLocale: crowdinLocale is already init'); + i18nLog('setInitialLocale: crowdinLocale is already init'); } crowdinLocale = crowdinLocaleArg; } diff --git a/ts/window.d.ts b/ts/window.d.ts index 8abb44aba3..705c72dd74 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -78,6 +78,8 @@ declare global { */ stripped: I18nMethods['stripped']; + strippedWithObj: I18nMethods['strippedWithObj']; + /** NOTE: Because of docstring limitations changes MUST be manually synced between {@link setupI18n.inEnglish } and {@link window.i18n.inEnglish } */ /** * Retrieves a message string in the {@link en} locale, substituting variables where necessary. From 97e95efcf7c783499e2d2da5167fb80d0d41d3ac Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 6 Jan 2025 09:58:24 +1100 Subject: [PATCH 252/302] chore: fix CI --- actions/setup_and_build/action.yml | 6 +++++- package.json | 4 ++-- tools/localization/localeTypes.py | 21 ++++++++++++++------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/actions/setup_and_build/action.yml b/actions/setup_and_build/action.yml index 67dae5f091..d74f555333 100644 --- a/actions/setup_and_build/action.yml +++ b/actions/setup_and_build/action.yml @@ -15,7 +15,11 @@ runs: - uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.12' + + - name: Install setuptools for python 3.12 + shell: bash + run: python -m pip install --upgrade pip setuptools # Not having this will break the windows build because the PATH won't be set by msbuild. - name: Add msbuild to PATH diff --git a/package.json b/package.json index e8537644e6..b974dd5b07 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .", "start-prod:pretty": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron . | npx bunyan", "start-dev": "cross-env NODE_ENV=development NODE_APP_INSTANCE=devprod$MULTI electron .", - "build-everything": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:locales-soft && tsc && yarn build:workers", - "build-everything:soft": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:locales-soft && tsc && yarn build:workers", + "build-everything": "python3 --version && yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:locales-soft && tsc && yarn build:workers", + "build-everything:soft": "python3 --version && yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:locales-soft && tsc && yarn build:workers", "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:locales-soft && yarn build:workers && yarn tsc -w", "start-dev:pretty": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron . | npx bunyan", "build:workers": "yarn worker:utils && yarn worker:libsession", diff --git a/tools/localization/localeTypes.py b/tools/localization/localeTypes.py index a1d3cf2b72..48f13fc15c 100644 --- a/tools/localization/localeTypes.py +++ b/tools/localization/localeTypes.py @@ -49,6 +49,12 @@ def generate_js_object(data): js_object += "}" return js_object +def escape_new_lines(value): + """ + Escapes new lines, from "\n" to "\\n". + """ + return value.replace("\n", "\\n") + def extract_vars(text): # Use a regular expression to find all strings inside curly braces @@ -70,7 +76,6 @@ def vars_to_record(vars): def replace_static_strings(str): - # todo make those come from the glossary replaced = str.replace("{app_name}", "Session")\ .replace("{session_download_url}", "https://getsession.org/download")\ @@ -80,6 +85,8 @@ def replace_static_strings(str): return replaced +def args_to_type(args): + return args if args else 'undefined,' def generate_type_object(locales): @@ -127,20 +134,20 @@ def generate_type_object(locales): if localized_string: to_append = "" to_append += token - to_append += f": \"{localized_string.replace("\n", "\\n")}\"" + to_append += f": \"{escape_new_lines(localized_string)}\"" all_locales_strings.append(to_append) # if that locale doesn't have translation in plurals, add the english hones if not len(all_locales_strings): for plural_en_token, plural_en_str in en_plurals_with_token: - all_locales_strings.append(f"{plural_en_token}: \"{plural_en_str.replace("\n", "\\n")}\"") + all_locales_strings.append(f"{plural_en_token}: \"{escape_new_lines(plural_en_str)}\"") js_plural_object += f" {wrapValue(locale_key)}:" js_plural_object += "{\n " js_plural_object += ",\n ".join(all_locales_strings) js_plural_object += "\n }," all_locales_plurals.append(js_plural_object) - js_plural_object_container += f" {wrapValue(key)}: {{\n{"\n".join(all_locales_plurals)}\n args: {as_record_type_en if as_record_type_en else 'undefined,'}\n }},\n" + js_plural_object_container += f' {wrapValue(key)}: {{\n{"\n".join(all_locales_plurals)}\n args: {args_to_type(as_record_type_en)}\n }},\n' else: replaced_en = replace_static_strings(value_en) @@ -151,12 +158,12 @@ def generate_type_object(locales): all_locales_strings = [] for locale, replaced_val in other_locales_replaced_values: if replaced_val: - all_locales_strings.append(f"{wrapValue(locale.replace("_","-"))}: \"{replaced_val.replace("\n", "\\n")}\"") + all_locales_strings.append(f'{wrapValue(locale.replace("_","-"))}: "{escape_new_lines(replaced_val)}"') else: - all_locales_strings.append(f"{wrapValue(locale.replace("_","-"))}: \"{replaced_en.replace("\n", "\\n")}\"") + all_locales_strings.append(f'{wrapValue(locale.replace("_","-"))}: "{escape_new_lines(replaced_en)}"') # print('key',key, " other_locales_replaced_values:", other_locales_replaced_values) - js_object += f" {wrapValue(key)}: {{\n {",\n ".join(all_locales_strings)},\n args: {as_record_type_en if as_record_type_en else 'undefined,'}\n }},\n" + js_object += f' {wrapValue(key)}: {{\n {",\n ".join(all_locales_strings)},\n args: {args_to_type(as_record_type_en)}\n }},\n' js_object += "}" js_plural_object_container += "}" From 3e34b0f77f3cfe1135f8c02c26ad41d33959abb7 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 6 Jan 2025 12:03:07 +1100 Subject: [PATCH 253/302] fix: use more withs for onion.ts file --- ts/hooks/useParamSelector.ts | 2 +- ts/session/apis/snode_api/batchRequest.ts | 6 +- ts/session/apis/snode_api/onions.ts | 74 +++++++++++------------ ts/session/types/with.ts | 8 +++ 4 files changed, 44 insertions(+), 46 deletions(-) diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index e35ae40ddf..6f5954029a 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -212,7 +212,7 @@ export function useIsKickedFromGroup(convoId?: string) { export function useIsGroupDestroyed(convoId?: string) { const libIsDestroyed = useLibGroupDestroyed(convoId); if (convoId && PubKey.is03Pubkey(convoId)) { - return libIsDestroyed || false; + return !!libIsDestroyed; } return false; } diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 64652bcc45..e9aecca649 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -2,7 +2,6 @@ import { isArray } from 'lodash'; import { AbortController } from 'abort-controller'; import { MessageSender } from '../../sending'; -import { Snode } from '../../../data/types'; import { SnodeResponseError } from '../../utils/errors'; import { processOnionRequestErrorAtDestination, SnodeResponse } from './onions'; import { SessionRpc } from './sessionRpc'; @@ -15,15 +14,12 @@ import { } from './SnodeRequestTypes'; import { NotEmptyArrayOfBatchResults } from './BatchResultEntry'; import { MergedAbortSignal, WithTimeoutMs } from './requestWith'; -import { WithAllow401s } from '../../types/with'; +import { WithAllow401s, WithAssociatedWith, WithTargetNode } from '../../types/with'; function logSubRequests(requests: Array) { return `[${requests.map(builtRequestToLoggingId).join(', ')}]`; } -type WithTargetNode = { targetNode: Snode }; -type WithAssociatedWith = { associatedWith: string | null }; - /** * This is the equivalent to the batch send on sogs. The target node runs each sub request and returns a list of all the sub status and bodies. * If the global status code is not 200, an exception is thrown. diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index a99e36252c..73c4e955b6 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -21,7 +21,13 @@ import { fileServerHost } from '../file_server_api/FileServerApi'; import { hrefPnServerProd } from '../push_notification_api/PnServer'; import { ERROR_CODE_NO_CONNECT } from './SNodeAPI'; import { MergedAbortSignal, WithAbortSignal, WithTimeoutMs } from './requestWith'; -import { WithAllow401s } from '../../types/with'; +import { + WithAllow401s, + WithAssociatedWith, + WithDestinationEd25519, + WithGuardNode, + WithSymmetricKey, +} from '../../types/with'; // hold the ed25519 key of a snode against the time it fails. Used to remove a snode only after a few failures (snodeFailureThreshold failures) let snodeFailureCount: Record = {}; @@ -311,12 +317,11 @@ export async function processOnionRequestErrorAtDestination({ destinationSnodeEd25519, associatedWith, allow401s, -}: WithAllow401s & { - statusCode: number; - body: string; - destinationSnodeEd25519?: string; - associatedWith?: string; -}) { +}: WithAllow401s & + Partial & { + statusCode: number; + body: string; + }) { if (statusCode === 200) { return; } @@ -328,13 +333,13 @@ export async function processOnionRequestErrorAtDestination({ process401Error(statusCode); } processOxenServerError(statusCode, body); - await process421Error(statusCode, body, associatedWith, destinationSnodeEd25519); + await process421Error(statusCode, body, associatedWith || undefined, destinationSnodeEd25519); if (destinationSnodeEd25519) { await processAnyOtherErrorAtDestination( statusCode, body, destinationSnodeEd25519, - associatedWith + associatedWith || undefined ); } } @@ -342,9 +347,8 @@ export async function processOnionRequestErrorAtDestination({ async function handleNodeNotFound({ ed25519NotFound, associatedWith, -}: { +}: Partial & { ed25519NotFound: string; - associatedWith?: string; }) { const shortNodeNotFound = ed25519Str(ed25519NotFound); window?.log?.warn('Handling NODE NOT FOUND with: ', shortNodeNotFound); @@ -526,13 +530,10 @@ async function processOnionResponse({ associatedWith, destinationSnodeEd25519, allow401s, -}: Partial & - WithAllow401s & { +}: Partial & + WithAllow401s & + WithGuardNode & { response?: { text: () => Promise; status: number }; - symmetricKey?: ArrayBuffer; - guardNode: Snode; - destinationSnodeEd25519?: string; - associatedWith?: string; }): Promise { let ciphertext = ''; @@ -549,7 +550,7 @@ async function processOnionResponse({ ciphertext, guardNode.pubkey_ed25519, destinationSnodeEd25519, - associatedWith + associatedWith || undefined ); if (!ciphertext) { @@ -598,7 +599,7 @@ async function processOnionResponse({ } return value; }) as Record; - + // TODO: type those status const status = jsonRes.status_code || jsonRes.status; await processOnionRequestErrorAtDestination({ @@ -642,13 +643,10 @@ async function processOnionResponseV4({ guardNode, destinationSnodeEd25519, associatedWith, -}: Partial & { - response?: Response; - symmetricKey?: ArrayBuffer; - guardNode: Snode; - destinationSnodeEd25519?: string; - associatedWith?: string; -}): Promise { +}: Partial & + WithGuardNode & { + response?: Response; + }): Promise { processAbortedRequest(abortSignal); const validSymmetricKey = await processNoSymmetricKeyError(guardNode, symmetricKey); @@ -669,7 +667,7 @@ async function processOnionResponseV4({ cipherText, guardNode.pubkey_ed25519, destinationSnodeEd25519, - associatedWith + associatedWith || undefined ); const plaintextBuffer = await callUtilsWorker( @@ -705,9 +703,8 @@ export type FinalRelayOptions = { port?: number; // default to 443 }; -export type DestinationContext = { +export type DestinationContext = WithSymmetricKey & { ciphertext: Uint8Array; - symmetricKey: ArrayBuffer; ephemeralKey: ArrayBuffer; }; @@ -721,10 +718,8 @@ async function handle421InvalidSwarm({ body, destinationSnodeEd25519, associatedWith, -}: { +}: Partial & { body: string; - destinationSnodeEd25519?: string; - associatedWith?: string; }) { if (!destinationSnodeEd25519 || !associatedWith) { // The snode isn't associated with the given public key anymore @@ -784,9 +779,8 @@ async function handle421InvalidSwarm({ async function incrementBadSnodeCountOrDrop({ snodeEd25519, associatedWith, -}: { +}: Partial & { snodeEd25519: string; - associatedWith?: string; }) { const oldFailureCount = snodeFailureCount[snodeEd25519] || 0; const newFailureCount = oldFailureCount + 1; @@ -829,12 +823,12 @@ async function sendOnionRequestHandlingSnodeEjectNoRetries({ timeoutMs, }: WithAbortSignal & WithTimeoutMs & - WithAllow401s & { + WithAllow401s & + Partial & { nodePath: Array; destSnodeX25519: string; finalDestOptions: FinalDestOptions; finalRelayOptions?: FinalRelayOptions; - associatedWith?: string; useV4: boolean; throwErrors: boolean; }): Promise { @@ -1119,12 +1113,12 @@ async function sendOnionRequestSnodeDestNoRetries({ associatedWith, }: WithTimeoutMs & WithAbortSignal & - WithAllow401s & { + WithAllow401s & + Partial & { onionPath: Array; targetNode: Snode; headers: Record; plaintext: string | null; - associatedWith?: string; }) { return Onions.sendOnionRequestHandlingSnodeEjectNoRetries({ nodePath: onionPath, @@ -1156,11 +1150,11 @@ async function lokiOnionFetchNoRetries({ timeoutMs, }: WithTimeoutMs & WithAbortSignal & - WithAllow401s & { + WithAllow401s & + Partial & { targetNode: Snode; headers: Record; body: string | null; - associatedWith?: string; }): Promise { try { // Get a path excluding `targetNode`: diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index 37db189035..edc9f8bd04 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -1,4 +1,5 @@ import { PubkeyType } from 'libsession_util_nodejs'; +import { Snode } from '../../data/types'; export type WithMessageHash = { messageHash: string }; export type WithTimestamp = { timestamp: number }; @@ -26,3 +27,10 @@ export type ShortenOrExtend = 'extend' | 'shorten' | ''; export type WithShortenOrExtend = { shortenOrExtend: ShortenOrExtend }; export type WithMessagesHashes = { messagesHashes: Array }; export type WithAllow401s = { allow401s: boolean }; + +export type WithDestinationEd25519 = { destinationSnodeEd25519: string }; +export type WithAssociatedWith = { associatedWith: string | null }; +export type WithTargetNode = { targetNode: Snode }; +export type WithGuardNode = { guardNode: Snode }; + +export type WithSymmetricKey = { symmetricKey: ArrayBuffer }; From 53e579427a515318e3041bc40013e5d71a206c7b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 6 Jan 2025 13:27:19 +1100 Subject: [PATCH 254/302] fix: do not schedule store update when deleting msgs --- ts/data/data.ts | 4 ++-- ts/models/message.ts | 4 ++-- ts/session/disappearing_messages/index.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ts/data/data.ts b/ts/data/data.ts index 99ce43b286..a7bc155b4c 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -263,7 +263,7 @@ async function removeMessage(id: string): Promise { // it needs to delete all associated on-disk files along with the database delete. if (message) { await channels.removeMessage(id); - await message.cleanup(); + await message.cleanup(true); } } @@ -554,7 +554,7 @@ async function removeAllMessagesInConversation(conversationId: string): Promise< for (let index = 0; index < messages.length; index++) { const message = messages.at(index); // eslint-disable-next-line no-await-in-loop - await message.cleanup(); + await message.cleanup(false); // not triggering UI updates, as we remove them from the store just below } window.log.info( `removeAllMessagesInConversation messages.cleanup() ${conversationId} took ${ diff --git a/ts/models/message.ts b/ts/models/message.ts index 0beff6b158..79b96fddc5 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -472,10 +472,10 @@ export class MessageModel extends Backbone.Model { return ''; } - public async cleanup() { + public async cleanup(triggerUIUpdate: boolean) { const changed = await deleteExternalMessageFiles(this.attributes); if (changed) { - await this.commit(); + await this.commit(triggerUIUpdate); } } diff --git a/ts/session/disappearing_messages/index.ts b/ts/session/disappearing_messages/index.ts index 4a2f69afb4..860916d2a6 100644 --- a/ts/session/disappearing_messages/index.ts +++ b/ts/session/disappearing_messages/index.ts @@ -46,7 +46,7 @@ export async function destroyMessagesAndUpdateRedux( // TODO make this use getMessagesById and not getMessageById const message = await Data.getMessageById(messageIds[i]); - await message?.cleanup(); + await message?.cleanup(false); // not triggering UI updates, as we remove them from the store just below /* eslint-enable no-await-in-loop */ } From e7bd7d9ea2776635ae0569974946d91e5ad8b9dc Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 6 Jan 2025 12:14:57 +1100 Subject: [PATCH 255/302] chore: rename StyledI18nSubText to I18nSubText because it is not directly a styled. element --- tools/localization/regex.py | 2 +- .../basic/{StyledI18nSubText.tsx => I18nSubText.tsx} | 2 +- ts/components/dialog/OpenUrlModal.tsx | 4 ++-- ts/components/dialog/QuitModal.tsx | 7 ++----- ts/components/dialog/SessionConfirm.tsx | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) rename ts/components/basic/{StyledI18nSubText.tsx => I18nSubText.tsx} (96%) diff --git a/tools/localization/regex.py b/tools/localization/regex.py index 1be444ffe7..4da06bf6c6 100644 --- a/tools/localization/regex.py +++ b/tools/localization/regex.py @@ -18,7 +18,7 @@ def get_localization_regex_list(string): fr"i18n\('{key}'(, {{[\S\s.]*}})?\)", fr"i18n\.(stripped|inEnglish|getRawMessage)\('{key}'(, {{[\S\s.]*}})?\)", fr"window\?\.i18n\?\.\('{key}'(, {{[\S\s.]*}})?\)", - fr"
- diff --git a/ts/components/dialog/QuitModal.tsx b/ts/components/dialog/QuitModal.tsx index 6ea33fb926..cbf0cfc0bb 100644 --- a/ts/components/dialog/QuitModal.tsx +++ b/ts/components/dialog/QuitModal.tsx @@ -8,7 +8,7 @@ import { Flex } from '../basic/Flex'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton'; import { SpacerLG, SpacerSM } from '../basic/Text'; import { SessionConfirmDialogProps } from './SessionConfirm'; -import { StyledI18nSubText } from '../basic/StyledI18nSubText'; +import { I18nSubText } from '../basic/I18nSubText'; const modalStyle: CSSProperties = { maxWidth: '300px', @@ -85,10 +85,7 @@ export const QuitModal = (props: SessionConfirmDialogProps) => { style={modalStyle} > - + ) : null} diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx index 04aa99c75e..ac495f9120 100644 --- a/ts/components/dialog/SessionConfirm.tsx +++ b/ts/components/dialog/SessionConfirm.tsx @@ -12,7 +12,7 @@ import { SpacerLG } from '../basic/Text'; import { SessionSpinner } from '../loading'; import type { LocalizerComponentPropsObject } from '../../types/localizer'; -import { StyledI18nSubText } from '../basic/StyledI18nSubText'; +import { I18nSubText } from '../basic/I18nSubText'; export interface SessionConfirmDialogProps { i18nMessage?: LocalizerComponentPropsObject; @@ -132,7 +132,7 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
{i18nMessage ? ( - + ) : null} {radioOptions && chosenOption !== '' ? ( Date: Mon, 6 Jan 2025 15:28:04 +1100 Subject: [PATCH 256/302] chore: address PR comments --- package.json | 7 ++++--- ts/components/basic/StyledI18nSubText.tsx | 2 +- ts/components/conversation/TimerNotification.tsx | 2 +- .../message/message-item/GroupUpdateMessage.tsx | 2 +- .../conversation/message/reactions/ReactionPopup.tsx | 2 +- ts/components/dialog/SessionConfirm.tsx | 2 +- .../dialog/blockOrUnblock/BlockOrUnblockDialog.tsx | 2 +- ts/components/registration/components/BackButton.tsx | 2 +- ts/interactions/conversationInteractions.ts | 2 +- ts/localization/localeTools.ts | 9 ++++++--- ts/models/groupUpdate.ts | 2 +- ts/models/timerNotifications.ts | 2 +- ts/state/ducks/metaGroups.ts | 6 +++--- ts/util/i18n/functions/getMessage.ts | 2 +- ts/window.d.ts | 2 +- 15 files changed, 25 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index b974dd5b07..8125e29649 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .", "start-prod:pretty": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron . | npx bunyan", "start-dev": "cross-env NODE_ENV=development NODE_APP_INSTANCE=devprod$MULTI electron .", - "build-everything": "python3 --version && yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:locales-soft && tsc && yarn build:workers", - "build-everything:soft": "python3 --version && yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:locales-soft && tsc && yarn build:workers", + "build-everything": "yarn print-deps && yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:locales-soft && tsc && yarn build:workers", + "build-everything:soft": "yarn print-deps && yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:locales-soft && tsc && yarn build:workers", "build-everything:watch": "yarn clean && yarn protobuf && yarn update-git-info && yarn sass && yarn build:locales-soft && yarn build:workers && yarn tsc -w", "start-dev:pretty": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron . | npx bunyan", "build:workers": "yarn worker:utils && yarn worker:libsession", @@ -60,7 +60,8 @@ "worker:utils": "webpack --config=./utils.worker.config.js", "worker:libsession": "rimraf 'ts/webworker/workers/node/libsession/*.node' && webpack --config=./libsession.worker.config.js", "dedup-yarn-lock": "npx --yes yarn-deduplicate yarn.lock", - "prepare": "husky install" + "prepare": "husky install", + "print-deps": "node -v && python3 --version" }, "dependencies": { "@emoji-mart/data": "^1.1.2", diff --git a/ts/components/basic/StyledI18nSubText.tsx b/ts/components/basic/StyledI18nSubText.tsx index 70c1bb3fa4..6a8af7fca5 100644 --- a/ts/components/basic/StyledI18nSubText.tsx +++ b/ts/components/basic/StyledI18nSubText.tsx @@ -1,7 +1,7 @@ import styled from 'styled-components'; import { forwardRef } from 'react'; import { Localizer } from './Localizer'; -import { LocalizerComponentPropsObject } from '../../localization/localeTools'; +import type { LocalizerComponentPropsObject } from '../../localization/localeTools'; const StyledI18nSubTextContainer = styled('div')` font-size: var(--font-size-md); diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index 23fa18c509..bd8fffb1d7 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -26,7 +26,7 @@ import { Localizer } from '../basic/Localizer'; import { SessionButtonColor } from '../basic/SessionButton'; import { SessionIcon } from '../icon'; import { getTimerNotificationStr } from '../../models/timerNotifications'; -import { LocalizerComponentPropsObject } from '../../localization/localeTools'; +import type { LocalizerComponentPropsObject } from '../../localization/localeTools'; const FollowSettingButton = styled.button` color: var(--primary-color); diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx index 7187d02d6f..c7f138ad10 100644 --- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx +++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx @@ -19,7 +19,7 @@ import { import { Localizer } from '../../../basic/Localizer'; import { ExpirableReadableMessage } from './ExpirableReadableMessage'; import { NotificationBubble } from './notification-bubble/NotificationBubble'; -import { LocalizerComponentPropsObject } from '../../../../localization/localeTools'; +import type { LocalizerComponentPropsObject } from '../../../../localization/localeTools'; // This component is used to display group updates in the conversation view. diff --git a/ts/components/conversation/message/reactions/ReactionPopup.tsx b/ts/components/conversation/message/reactions/ReactionPopup.tsx index 85561f8fa3..23c46a2c41 100644 --- a/ts/components/conversation/message/reactions/ReactionPopup.tsx +++ b/ts/components/conversation/message/reactions/ReactionPopup.tsx @@ -5,7 +5,7 @@ import { PubKey } from '../../../../session/types/PubKey'; import { Localizer } from '../../../basic/Localizer'; import { nativeEmojiData } from '../../../../util/emoji'; -import { LocalizerComponentPropsObject } from '../../../../localization/localeTools'; +import type { LocalizerComponentPropsObject } from '../../../../localization/localeTools'; export type TipPosition = 'center' | 'left' | 'right'; diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx index be6da48664..09c5efd8e4 100644 --- a/ts/components/dialog/SessionConfirm.tsx +++ b/ts/components/dialog/SessionConfirm.tsx @@ -12,7 +12,7 @@ import { SpacerLG } from '../basic/Text'; import { SessionSpinner } from '../loading'; import { StyledI18nSubText } from '../basic/StyledI18nSubText'; -import { LocalizerComponentPropsObject } from '../../localization/localeTools'; +import type { LocalizerComponentPropsObject } from '../../localization/localeTools'; export interface SessionConfirmDialogProps { i18nMessage?: LocalizerComponentPropsObject; diff --git a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx index 93c49ec089..bfa7909ae6 100644 --- a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx +++ b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx @@ -13,7 +13,7 @@ import { Localizer } from '../../basic/Localizer'; import { SessionButton, SessionButtonColor, SessionButtonType } from '../../basic/SessionButton'; import { StyledModalDescriptionContainer } from '../shared/ModalDescriptionContainer'; import { BlockOrUnblockModalState } from './BlockOrUnblockModalState'; -import { LocalizerComponentPropsObject } from '../../../localization/localeTools'; +import type { LocalizerComponentPropsObject } from '../../../localization/localeTools'; type ModalState = NonNullable; diff --git a/ts/components/registration/components/BackButton.tsx b/ts/components/registration/components/BackButton.tsx index 4c8ec63b7f..293ec1ac02 100644 --- a/ts/components/registration/components/BackButton.tsx +++ b/ts/components/registration/components/BackButton.tsx @@ -17,7 +17,7 @@ import { deleteDbLocally } from '../../../util/accountManager'; import { Flex } from '../../basic/Flex'; import { SessionButtonColor } from '../../basic/SessionButton'; import { SessionIconButton } from '../../icon'; -import { LocalizerComponentPropsObject } from '../../../localization/localeTools'; +import type { LocalizerComponentPropsObject } from '../../../localization/localeTools'; /** Min height should match the onboarding step with the largest height this prevents the loading spinner from jumping around while still keeping things centered */ const StyledBackButtonContainer = styled(Flex)` diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 39fad4de84..997113db62 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -58,7 +58,7 @@ import { GroupPromote } from '../session/utils/job_runners/jobs/GroupPromoteJob' import { MessageSender } from '../session/sending'; import { StoreGroupRequestFactory } from '../session/apis/snode_api/factories/StoreGroupRequestFactory'; import { DURATION } from '../session/constants'; -import { LocalizerComponentPropsObject } from '../localization/localeTools'; +import type { LocalizerComponentPropsObject } from '../localization/localeTools'; export async function copyPublicKeyByConvoId(convoId: string) { if (OpenGroupUtils.isOpenGroupV2(convoId)) { diff --git a/ts/localization/localeTools.ts b/ts/localization/localeTools.ts index 23eca90797..c28c7bd654 100644 --- a/ts/localization/localeTools.ts +++ b/ts/localization/localeTools.ts @@ -57,9 +57,12 @@ export function isPluralToken(token: string): token is PluralLocalizerTokens { return token in pluralsDictionary; } -type TokenWithArgs = { - [K in keyof D]: D[K] extends { args: undefined } | { args: never } ? never : K; -}[keyof D]; +/** + * This type extracts from a dictionary, the keys that have a property 'args' set (i.e. not undefined or never). + */ +type TokenWithArgs = { + [Key in keyof Dict]: Dict[Key] extends { args: undefined } | { args: never } ? never : Key; +}[keyof Dict]; type MergedTokenWithArgs = TokenWithArgs | TokenWithArgs; diff --git a/ts/models/groupUpdate.ts b/ts/models/groupUpdate.ts index 7c1e9766c9..1b09367ac9 100644 --- a/ts/models/groupUpdate.ts +++ b/ts/models/groupUpdate.ts @@ -1,4 +1,4 @@ -import { LocalizerComponentPropsObject } from '../localization/localeTools'; +import type { LocalizerComponentPropsObject } from '../localization/localeTools'; import { ConvoHub } from '../session/conversations'; import { UserUtils } from '../session/utils'; diff --git a/ts/models/timerNotifications.ts b/ts/models/timerNotifications.ts index 43c7186bee..6b11a1a7ab 100644 --- a/ts/models/timerNotifications.ts +++ b/ts/models/timerNotifications.ts @@ -5,7 +5,7 @@ import { PubKey } from '../session/types'; import { UserUtils } from '../session/utils'; import { TimerOptions } from '../session/disappearing_messages/timerOptions'; import { isLegacyDisappearingModeEnabled } from '../session/disappearing_messages/legacy'; -import { LocalizerComponentPropsObject } from '../localization/localeTools'; +import type { LocalizerComponentPropsObject } from '../localization/localeTools'; export function getTimerNotificationStr({ expirationMode, diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index ad1bb38df9..8a5a9def73 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -577,7 +577,7 @@ async function handleMemberAddedFromUI({ throw new Error('tried to make change to group but we do not have the admin secret key'); } - await checkWeAreAdminOrThrow(groupPk, 'handleMemberAddedFromUIOrNot'); + await checkWeAreAdminOrThrow(groupPk, 'handleMemberAddedFromUI'); const { withHistory, withoutHistory, convo, us } = validateMemberAddChange({ withHistory: addMembersWithHistory, @@ -675,12 +675,12 @@ async function handleMemberAddedFromUI({ await LibSessionUtil.saveDumpsToDb(groupPk); throw new Error( - 'handleMemberAddedFromUIOrNot: pushChangesToGroupSwarmIfNeeded did not return success' + 'handleMemberAddedFromUI: pushChangesToGroupSwarmIfNeeded did not return success' ); } } catch (e) { window.log.warn( - 'handleNameChangeFromUIOrNot: pushChangesToGroupSwarmIfNeeded failed with:', + 'handleMemberAddedFromUI: pushChangesToGroupSwarmIfNeeded failed with:', e.message ); } diff --git a/ts/util/i18n/functions/getMessage.ts b/ts/util/i18n/functions/getMessage.ts index d0bef4190d..4ad09ba299 100644 --- a/ts/util/i18n/functions/getMessage.ts +++ b/ts/util/i18n/functions/getMessage.ts @@ -18,4 +18,4 @@ getMessageDefaultCopy.strippedWithObj = strippedWithObj; getMessageDefaultCopy.getRawMessage = getRawMessage; getMessageDefaultCopy.formatMessageWithArgs = formatMessageWithArgs; -export const getMessage: SetupI18nReturnType = getMessageDefault as SetupI18nReturnType; +export const getMessage: SetupI18nReturnType = getMessageDefaultCopy as SetupI18nReturnType; diff --git a/ts/window.d.ts b/ts/window.d.ts index 705c72dd74..afb2283496 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -6,7 +6,7 @@ import { Persistor } from 'redux-persist/es/types'; import { PrimaryColorStateType, ThemeStateType } from './themes/constants/colors'; import type { GetMessageArgs, I18nMethods } from './types/localizer'; -import { MergedLocalizerTokens } from './localization/localeTools'; +import type { MergedLocalizerTokens } from './localization/localeTools'; export interface LibTextsecure { messaging: boolean; From 2ca2dd4790361fa971055416785dcc89707ed64e Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 7 Jan 2025 16:51:52 +1100 Subject: [PATCH 257/302] fix: allow promoted state to be reset to NOT_SENT --- package.json | 2 +- preload.js | 2 +- ts/components/MemberListItem.tsx | 4 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 29 ++++-------- .../utils/job_runners/jobs/GroupPromoteJob.ts | 5 +-- ts/state/ducks/metaGroups.ts | 44 ------------------- yarn.lock | 6 +-- 7 files changed, 16 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index e8537644e6..da9e1a73c1 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz", + "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.11/libsession_util_nodejs-v0.4.11.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/preload.js b/preload.js index 7857da8462..30a43299f2 100644 --- a/preload.js +++ b/preload.js @@ -41,7 +41,7 @@ window.sessionFeatureFlags = { useOnionRequests: true, useTestNet: isTestNet() || isTestIntegration(), useClosedGroupV2: true, // TODO DO NOT MERGE Remove after QA - useClosedGroupV2QAButtons: false, // TODO DO NOT MERGE Remove after QA + useClosedGroupV2QAButtons: true, // TODO DO NOT MERGE Remove after QA replaceLocalizedStringsWithKeys: false, debug: { debugLogging: !_.isEmpty(process.env.SESSION_DEBUG), diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index d879d57c2d..3f54d42766 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -259,14 +259,12 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP window.log.warn('tried to resend invite but we do not have correct details'); return; } - await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, pubkey); // if we tried to invite that member as admin right away, let's retry it as such. - const inviteAsAdmin = member.nominatedAdmin; await GroupInvite.addJob({ groupPk, member: pubkey, - inviteAsAdmin, + inviteAsAdmin: member.nominatedAdmin, forceUnrevoke: true, }); }} diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index ac84a7283f..3bf752cfb1 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -68,7 +68,15 @@ async function addJob({ groupPk, member, inviteAsAdmin, forceUnrevoke }: JobExtr forceUnrevoke, nextAttemptTimestamp: Date.now(), }); - window.log.debug(`addGroupInviteJob: adding group invite for ${groupPk}:${member} `); + window.log.debug( + `addGroupInviteJob: adding group invite for ${groupPk}:${member}. inviteAsAdmin:${inviteAsAdmin} ` + ); + if (inviteAsAdmin) { + // this resets the promotion status to not_sent, so that the sending state can be applied + await MetaGroupWrapperActions.memberSetPromoted(groupPk, member); + } else { + await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, member); + } window?.inboxStore?.dispatch( groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any @@ -76,16 +84,6 @@ async function addJob({ groupPk, member, inviteAsAdmin, forceUnrevoke }: JobExtr await LibSessionUtil.saveDumpsToDb(groupPk); await runners.groupInviteJobRunner.addJob(groupInviteJob); - - if (inviteAsAdmin) { - window?.inboxStore?.dispatch( - groupInfoActions.setPromotionPending({ groupPk, pubkey: member, sending: true }) - ); - } else { - window?.inboxStore?.dispatch( - groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: true }) - ); - } } } @@ -279,15 +277,6 @@ class GroupInviteJob extends PersistedJob { updateFailedStateForMember(groupPk, member, failed); - if (inviteAsAdmin) { - window?.inboxStore?.dispatch( - groupInfoActions.setPromotionPending({ groupPk, pubkey: member, sending: false }) - ); - } else { - window?.inboxStore?.dispatch( - groupInfoActions.setInvitePending({ groupPk, pubkey: member, sending: false }) - ); - } window?.inboxStore?.dispatch( groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any ); diff --git a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts index ff76a2395b..2346c3ab7e 100644 --- a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts @@ -46,7 +46,7 @@ async function addJob({ groupPk, member }: JobExtraArgs) { window.log.debug(`addGroupPromoteJob: adding group promote for ${groupPk}:${member} `); await runners.groupPromoteJobRunner.addJob(groupPromoteJob); window?.inboxStore?.dispatch( - groupInfoActions.setPromotionPending({ groupPk, pubkey: member, sending: true }) + groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any ); } } @@ -111,9 +111,6 @@ class GroupPromoteJob extends PersistedJob { failed = false; } } finally { - window?.inboxStore?.dispatch( - groupInfoActions.setPromotionPending({ groupPk, pubkey: member, sending: false }) - ); try { if (failed) { await MetaGroupWrapperActions.memberSetPromotionFailed(groupPk, member); diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 05bb277ec9..66499cacdf 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -7,7 +7,6 @@ import { PubkeyType, UserGroupsGet, WithGroupPubkey, - WithPubkey, } from 'libsession_util_nodejs'; import { concat, intersection, isEmpty, uniq } from 'lodash'; import { from_hex } from 'libsodium-wrappers-sumo'; @@ -1212,36 +1211,6 @@ function deleteGroupPkEntriesFromState(state: GroupState, groupPk: GroupPubkeyTy delete state.members[groupPk]; } -function applySendingStateChange({ - groupPk, - pubkey, - sending, - state, - changeType, -}: WithGroupPubkey & - WithPubkey & { sending: boolean; changeType: 'invite' | 'promote'; state: GroupState }) { - if (changeType === 'invite' && !state.membersInviteSending[groupPk]) { - state.membersInviteSending[groupPk] = []; - } else if (changeType === 'promote' && !state.membersPromoteSending[groupPk]) { - state.membersPromoteSending[groupPk] = []; - } - const arrRef = - changeType === 'invite' - ? state.membersInviteSending[groupPk] - : state.membersPromoteSending[groupPk]; - - const foundAt = arrRef.findIndex(p => p === pubkey); - - if (sending && foundAt === -1) { - arrRef.push(pubkey); - return state; - } - if (!sending && foundAt >= 0) { - arrRef.splice(foundAt, 1); - } - return state; -} - function refreshConvosModelProps(convoIds: Array) { /** * @@ -1263,19 +1232,6 @@ const metaGroupSlice = createSlice({ name: 'metaGroup', initialState: initialGroupState, reducers: { - setInvitePending( - state: GroupState, - { payload }: PayloadAction<{ sending: boolean } & WithGroupPubkey & WithPubkey> - ) { - return applySendingStateChange({ changeType: 'invite', ...payload, state }); - }, - - setPromotionPending( - state: GroupState, - { payload }: PayloadAction<{ pubkey: PubkeyType; groupPk: GroupPubkeyType; sending: boolean }> - ) { - return applySendingStateChange({ changeType: 'promote', ...payload, state }); - }, removeGroupDetailsFromSlice( state: GroupState, { payload }: PayloadAction<{ groupPk: GroupPubkeyType }> diff --git a/yarn.lock b/yarn.lock index 9f21297c9f..a77540814a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4944,9 +4944,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz": - version "0.4.10" - resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.10/libsession_util_nodejs-v0.4.10.tar.gz#9a420fa0ad4dc9067de17b2ec9fa3676a1c10056" +"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.11/libsession_util_nodejs-v0.4.11.tar.gz": + version "0.4.11" + resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.11/libsession_util_nodejs-v0.4.11.tar.gz#ea6ab3fc11088ede3c79ddc5b702b17af842f774" dependencies: cmake-js "7.2.1" node-addon-api "^6.1.0" From 82abfedad5bb7e87e2eb31e9250c91d7600ef7aa Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 9 Jan 2025 09:24:51 +1100 Subject: [PATCH 258/302] fix: sorting order for group depending on statuses --- ts/components/MemberListItem.tsx | 2 +- ts/state/ducks/metaGroups.ts | 5 +++++ ts/state/selectors/groups.ts | 32 ++++++++++++++++++++------------ 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 3f54d42766..1bfc66f316 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -174,7 +174,7 @@ function localisedStatusFromMemberStatus(memberStatus: MemberStateGroupV2) { case 'REMOVED_UNKNOWN': // fallback, hopefully won't happen in production case 'REMOVED_MEMBER': // we want pending removal members at the end of the "invite" states case 'REMOVED_MEMBER_AND_MESSAGES': - return null; // no text for those 3 pending removal states + return window.i18n('groupPendingRemoval'); // no text for those 3 pending removal states case 'PROMOTION_FAILED': return window.i18n('adminPromotionFailed'); case 'PROMOTION_NOT_SENT': diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 66499cacdf..e0fe152569 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -423,6 +423,10 @@ const refreshGroupDetailsFromWrapper = createAsyncThunk( const infos = await MetaGroupWrapperActions.infoGet(groupPk); const members = await MetaGroupWrapperActions.memberGetAll(groupPk); + if (window.sessionFeatureFlags.debug.debugLibsessionDumps) { + window.log.info(`groupInfo after refreshGroupDetailsFromWrapper: ${stringify(infos)}`); + window.log.info(`groupMembers after refreshGroupDetailsFromWrapper: ${stringify(members)}`); + } return { groupPk, infos, members }; } catch (e) { window.log.warn('refreshGroupDetailsFromWrapper failed with ', e.message); @@ -748,6 +752,7 @@ async function handleMemberRemovedFromUI({ // We don't revoke the member's token right away. Instead we schedule a `GroupPendingRemovals` // which will deal with the revokes of all of them together. await GroupPendingRemovals.addJob({ groupPk }); + window.inboxStore?.dispatch(refreshGroupDetailsFromWrapper({ groupPk }) as any); // Build a GroupUpdateMessage to be sent if that member was kicked by us. const createAtNetworkTimestamp = NetworkTime.now(); diff --git a/ts/state/selectors/groups.ts b/ts/state/selectors/groups.ts index f5efbe4516..ec3017f64f 100644 --- a/ts/state/selectors/groups.ts +++ b/ts/state/selectors/groups.ts @@ -272,19 +272,27 @@ export function useStateOf03GroupMembers(convoId?: string) { ); const sorted = useMemo(() => { - // needing an index like this outside of lodash is not pretty, - // but sortBy doesn't provide the index in the callback - let index = 0; - return sortBy(unsortedMembers, item => { - const stateSortingOrder = getSortingOrderForStatus(item.memberStatus); - const sortingOrder = [ - stateSortingOrder, + // damn this is overkill + return sortBy( + unsortedMembers, + item => { + const sortingOrder = getSortingOrderForStatus(item.memberStatus); + return sortingOrder; + }, + item => { // per section, we want "us" first, then "nickname || displayName || pubkey" - item.pubkeyHex === us ? -1 : names[index], - ]; - index++; - return sortingOrder; - }); + + if (item.pubkeyHex === us) { + return -1; + } + const index = unsortedMembers.findIndex(p => p.pubkeyHex === item.pubkeyHex); + if (index < 0 || index >= names.length) { + throw new Error('this should never happen'); + } + + return names[index].toLowerCase(); + } + ); }, [unsortedMembers, us, names]); return sorted; } From 3a336e83c2168222d546a6fbecc78d6ebae4875d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 9 Jan 2025 16:16:39 +1100 Subject: [PATCH 259/302] chore: allow jobrunner to run jobs in parallel --- ts/components/MemberListItem.tsx | 2 +- ts/session/utils/job_runners/JobRunner.ts | 329 +++++++++-------- .../unit/utils/job_runner/JobRunner_test.ts | 349 +++++++++++------- 3 files changed, 395 insertions(+), 285 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 1bfc66f316..9289c8ff67 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -174,7 +174,7 @@ function localisedStatusFromMemberStatus(memberStatus: MemberStateGroupV2) { case 'REMOVED_UNKNOWN': // fallback, hopefully won't happen in production case 'REMOVED_MEMBER': // we want pending removal members at the end of the "invite" states case 'REMOVED_MEMBER_AND_MESSAGES': - return window.i18n('groupPendingRemoval'); // no text for those 3 pending removal states + return window.i18n('groupPendingRemoval'); case 'PROMOTION_FAILED': return window.i18n('adminPromotionFailed'); case 'PROMOTION_NOT_SENT': diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts index cc9879a9f5..320bde1f4a 100644 --- a/ts/session/utils/job_runners/JobRunner.ts +++ b/ts/session/utils/job_runners/JobRunner.ts @@ -17,40 +17,73 @@ import { UserSyncPersistedData, } from './PersistedJob'; import { JobRunnerType } from './jobs/JobRunnerType'; - -/** - * 'job_in_progress' if there is already a job in progress - * 'job_deferred' if there is a next job, but too far in the future to start it now - * 'job_started' a job was pending to be started and we could start it, so we started it - * 'no_job' if there are no jobs to be run at all - */ -export type StartProcessingResult = 'job_in_progress' | 'job_deferred' | 'job_started' | 'no_job'; - -export type AddJobResult = 'job_deferred' | 'job_started'; +import { DURATION } from '../../constants'; function jobToLogId(jobRunner: JobRunnerType, job: PersistedJob) { return `id: "${job.persistedData.identifier}" (type: "${jobRunner}")`; } +/** + * The maximum number of workers that can be run at the same time in a job runner. + */ +const MAX_WORKER_COUNT = 4 as const; + +/** + * Everytime we add a job, we check if we can/should run it. + * When the runner start processing, we check if we can should run a job. + * Everytime a job finishes, we check if another one needs to be added. + * + * But when some jobs are scheduled and none of them needs to be run now, nothing will start the first one. + * This interval is used to periodically check for jobs to run. + */ +const planNextJobInternalMs = DURATION.SECONDS * 1; + /** * This class is used to plan jobs and make sure they are retried until the success. * By having a specific type, we can find the logic to be run by that type of job. - * - * There are different type of jobs which can be scheduled, but we currently only use the SyncConfigurationJob. - * - * SyncConfigurationJob is a job which can only be planned once until it is a success. So in the queue on jobs, there can only be one SyncConfigurationJob at all times. - * */ export class PersistedJobRunner { + /** + * The type of jobs that this runner is. It will only run jobs that matches it. + */ + private readonly jobRunnerType: JobRunnerType; + /** + * True if the runner has loaded its job list from the DB. + */ private isInit = false; + /** + * The count of workers that can be run at the same time for this runner. + * Enforced to be between 1 and `MAX_WORKER_COUNT`. + * Default is 1, so sequential jobs. + */ + private workerCount: number; + /** + * The list of jobs that are planned to be run. + * At most `this.workerCount` might be currently running. If so, they are also in `this.currentJobs`. + */ private jobsScheduled: Array> = []; - private isStarted = false; - private readonly jobRunnerType: JobRunnerType; - private nextJobStartTimer: NodeJS.Timeout | null = null; - private currentJob: PersistedJob | null = null; + /** + * The list of jobs that are currently running. Those should always reference a job from `jobsScheduled`. + * The length of this array can never be more than this.workerCount. + */ + private currentJobs: Array> = []; + + /** + * + */ + private planNextJobTick: NodeJS.Timeout | null = null; - constructor(jobRunnerType: JobRunnerType, _jobEventsListener: null) { + /** + * + * @param jobRunnerType the type of jobs allowed to run as part of this job runner + * @param workerCount the count of workers to allow (beware: not all jobs can be run in parallel safely) + */ + constructor(jobRunnerType: JobRunnerType, workerCount: 1 | 2 | 3 | typeof MAX_WORKER_COUNT = 1) { this.jobRunnerType = jobRunnerType; + this.workerCount = workerCount; + if (workerCount <= 0 || workerCount > MAX_WORKER_COUNT) { + throw new Error(`workerCount must be between 1 and ${MAX_WORKER_COUNT}`); + } window?.log?.warn(`new runner of type ${jobRunnerType} built`); } @@ -77,26 +110,30 @@ export class PersistedJobRunner { } const jobs: Array> = compact(jobsArray.map(persistedJobFromData)); this.jobsScheduled = cloneDeep(jobs); - // make sure the list is sorted + // make sure the list is sorted on load this.sortJobsList(); this.isInit = true; } public async addJob( job: PersistedJob - ): Promise<'type_exists' | 'identifier_exists' | AddJobResult> { + ): Promise<'type_exists' | 'identifier_exists' | 'job_added'> { this.assertIsInitialized(); - if (this.jobsScheduled.find(j => j.persistedData.identifier === job.persistedData.identifier)) { + if ( + this.getJobsScheduledButNotRunning().find( + j => j.persistedData.identifier === job.persistedData.identifier + ) + ) { window.log.info( `job runner (${this.jobRunnerType}) has already a job with id:"${job.persistedData.identifier}" planned so not adding another one` ); return 'identifier_exists'; } - const serializedNonRunningJobs = this.jobsScheduled - .filter(j => j !== this.currentJob) - .map(k => k.serializeJob()); + const serializedNonRunningJobs = this.getJobsScheduledButNotRunning().map(k => + k.serializeJob() + ); const addJobChecks = job.addJobCheck(serializedNonRunningJobs); if (addJobChecks === 'skipAddSameJobPresent') { @@ -107,61 +144,93 @@ export class PersistedJobRunner { // make sure there is no job with that same identifier already . window.log.debug(`job runner adding type:"${job.persistedData.jobType}"`); - return this.addJobUnchecked(job); + await this.addJobUnchecked(job); + return 'job_added'; + } + + /** + * Only used for testing + */ + public getScheduledJobs() { + return this.jobsScheduled.map(m => m.serializeJob()); } /** * Only used for testing */ - public getJobList() { - return this.getSerializedJobs(); + public getCurrentJobs() { + return this.currentJobs.map(m => m.serializeJob()); } public resetForTesting() { this.jobsScheduled = []; this.isInit = false; + this.stopTicking(); + this.currentJobs = []; + } - if (this.nextJobStartTimer) { - clearTimeout(this.nextJobStartTimer); - this.nextJobStartTimer = null; - } - this.currentJob = null; + public getCurrentJobIdentifiers(): Array { + return this.currentJobs.map(job => job.persistedData.identifier); } - public getCurrentJobIdentifier(): string | null { - return this.currentJob?.persistedData?.identifier || null; + private isStarted() { + return this.planNextJobTick !== null; } /** * if we are running a job, this call will await until the job is done and stop the queue */ - public async stopAndWaitCurrentJob(): Promise<'no_await' | 'await'> { - if (!this.isStarted || !this.currentJob) { + public async stopAndWaitCurrentJobs(): Promise<'no_await' | 'await'> { + this.stopTicking(); + if (!this.isRunningJobs()) { return 'no_await'; } - this.isStarted = false; - await this.currentJob.waitForCurrentTry(); + + await Promise.all(this.currentJobs.map(job => job.waitForCurrentTry())); return 'await'; } + public isRunningJobs() { + return this.currentJobs.length > 0; + } + /** * if we are running a job, this call will await until the job is done. * If another job must be run right away this one, we will also add the upcoming one as the currentJob. */ - public async waitCurrentJob(): Promise<'no_await' | 'await'> { - if (!this.isStarted || !this.currentJob) { + public async waitCurrentJobs(): Promise<'no_await' | 'await'> { + if (!this.isRunningJobs()) { return 'no_await'; } - await this.currentJob.waitForCurrentTry(); + await Promise.all(this.currentJobs.map(job => job.waitForCurrentTry())); return 'await'; } - public startProcessing(): StartProcessingResult { - if (this.isStarted) { - return this.planNextJob(); + public startProcessing() { + if (this.isStarted()) { + return; + } + this.planNextJobTick = global.setInterval(() => { + this.planNextJobs(); + }, planNextJobInternalMs); + // check if anything needs to be started now too + this.planNextJobs(); + } + + private getJobsScheduledButNotRunning() { + return this.jobsScheduled.filter( + scheduled => + !this.currentJobs.find( + running => scheduled.persistedData.identifier === running.persistedData.identifier + ) + ); + } + + private stopTicking() { + if (this.planNextJobTick) { + clearInterval(this.planNextJobTick); + this.planNextJobTick = null; } - this.isStarted = true; - return this.planNextJob(); } private sortJobsList() { @@ -171,145 +240,100 @@ export class PersistedJobRunner { } private async writeJobsToDB() { - const serialized = this.getSerializedJobs(); + this.sortJobsList(); + const serialized = this.getScheduledJobs(); await Storage.put(this.getJobRunnerItemId(), JSON.stringify(serialized)); } private async addJobUnchecked(job: PersistedJob) { this.jobsScheduled.push(cloneDeep(job)); - this.sortJobsList(); + this.sortJobsList(); // keeping this here as it is not await (and await) await this.writeJobsToDB(); - // a new job was added. trigger it if we can/have to start it - const result = this.planNextJob(); - - if (result === 'no_job') { - throw new Error('We just pushed a job, there cannot be no job'); - } - if (result === 'job_in_progress') { - return 'job_deferred'; - } - return result; - } - - private getSerializedJobs() { - return this.jobsScheduled.map(m => m.serializeJob()); + // a job has been added, let's check if we should/can run it now + this.planNextJobs(); } private getJobRunnerItemId() { return `jobRunner-${this.jobRunnerType}`; } - /** - * Returns 'job_in_progress' if there is already a job running - * Returns 'none' if there are no jobs to be started at all (or the runner is not running) - * Returns 'started' if there the next jobs was just started - * Returns 'job_deferred' if there is a next job but it is in the future and so wasn't started yet, but a timer is set. - */ - private planNextJob(): StartProcessingResult { - if (!this.isStarted) { - if (this.jobsScheduled.length) { - return 'job_deferred'; - } - return 'no_job'; - } - - if (this.currentJob) { - return 'job_in_progress'; - } - const nextJob = this.jobsScheduled?.[0]; - - if (!nextJob) { - return 'no_job'; - } - - if (nextJob.persistedData.nextAttemptTimestamp <= Date.now()) { - if (this.nextJobStartTimer) { - global.clearTimeout(this.nextJobStartTimer); - this.nextJobStartTimer = null; - } - // nextJob should be started right away + public planNextJobs() { + // we can start at most `this.workerCount` jobs, but if we have some running already in `thiscurrentJobs` + for (let index = 0; index < this.workerCount - this.currentJobs.length; index++) { void this.runNextJob(); - return 'job_started'; - } - - // next job is not to be started right away, just plan our runner to be awakened when the time is right. - if (this.nextJobStartTimer) { - // remove the timer as there might be a more urgent job to be run before the one we have set here. - global.clearTimeout(this.nextJobStartTimer); } - // plan a timer to wakeup when that timer is reached. - this.nextJobStartTimer = global.setTimeout( - () => { - if (this.nextJobStartTimer) { - global.clearTimeout(this.nextJobStartTimer); - this.nextJobStartTimer = null; - } - void this.runNextJob(); - }, - Math.max(nextJob.persistedData.nextAttemptTimestamp - Date.now(), 1) - ); - - return 'job_deferred'; } private deleteJobsByIdentifier(identifiers: Array) { identifiers.forEach(identifier => { const jobIndex = this.jobsScheduled.findIndex(f => f.persistedData.identifier === identifier); - window.log.debug( - `removing job ${jobToLogId( - this.jobRunnerType, - this.jobsScheduled[jobIndex] - )} at ${jobIndex}` - ); - if (jobIndex >= 0) { + if (jobIndex >= 0 && jobIndex <= this.jobsScheduled.length) { + window.log.debug( + `removing job ${jobToLogId( + this.jobRunnerType, + this.jobsScheduled[jobIndex] + )} at ${jobIndex}` + ); + this.jobsScheduled.splice(jobIndex, 1); + } else { + window.log.debug( + `failed to remove job ${identifier} with index ${jobIndex} from ${this.jobRunnerType}` + ); } }); } + private areWorkersFull() { + return this.currentJobs.length >= this.workerCount; + } + private async runNextJob() { this.assertIsInitialized(); - if (this.currentJob || !this.isStarted || !this.jobsScheduled.length) { + + if (this.areWorkersFull() || !this.isStarted || !this.jobsScheduled.length) { return; } - const nextJob = this.jobsScheduled[0]; + const nextJob = this.getJobsScheduledButNotRunning()[0]; + if (!nextJob) { + return; + } // if the time is 101, and that task is to be run at t=101, we need to start it right away. if (nextJob.persistedData.nextAttemptTimestamp > Date.now()) { - window.log.warn( - 'next job is not due to be run just yet. Going idle.', + window.log.info( + 'next job is not due to be run just yet...', nextJob.persistedData.nextAttemptTimestamp - Date.now() ); - this.planNextJob(); return; } - let success: RunJobResult | null = null; + let jobResult: RunJobResult | null = null; try { - if (this.currentJob) { + // checked above already, and there are no `await` between there and here... but better be sure. + if (this.areWorkersFull()) { return; } - this.currentJob = nextJob; + this.currentJobs.push(nextJob); - success = await timeout(this.currentJob.runJob(), this.currentJob.getJobTimeoutMs()); + jobResult = await timeout(nextJob.runJob(), nextJob.getJobTimeoutMs()); - if (success !== RunJobResult.Success) { + if (jobResult !== RunJobResult.Success) { throw new Error('return result was not "Success"'); } // here the job did not throw and didn't return false. Consider it OK then and remove it from the list of jobs to run. - this.deleteJobsByIdentifier([this.currentJob.persistedData.identifier]); - await this.writeJobsToDB(); + this.deleteJobsByIdentifier([nextJob.persistedData.identifier]); } catch (e) { window.log.info(`${jobToLogId(this.jobRunnerType, nextJob)} failed with "${e.message}"`); if ( - success === RunJobResult.PermanentFailure || + jobResult === RunJobResult.PermanentFailure || nextJob.persistedData.currentRetry >= nextJob.persistedData.maxAttempts - 1 ) { - if (success === RunJobResult.PermanentFailure) { + if (jobResult === RunJobResult.PermanentFailure) { window.log.info( `${jobToLogId(this.jobRunnerType, nextJob)}:${ nextJob.persistedData.currentRetry @@ -335,15 +359,18 @@ export class PersistedJobRunner { nextJob.persistedData.nextAttemptTimestamp = Date.now() + nextJob.persistedData.delayBetweenRetries; } - // in any case, either we removed a job or changed one of the timestamp. - // so sort the list again, and persist it + } finally { + // write changes (retries or success) to the DB this.sortJobsList(); await this.writeJobsToDB(); - } finally { - this.currentJob = null; - // start the next job if there is any to be started now, or just plan the wakeup of our runner for the right time. - this.planNextJob(); + // remove the job from the current jobs list (memory only) + const jobIndex = this.currentJobs.findIndex(f => f === nextJob); + if (jobIndex >= 0) { + this.currentJobs.splice(jobIndex, 1); + } + + this.planNextJobs(); } } @@ -356,37 +383,31 @@ export class PersistedJobRunner { } } -const userSyncRunner = new PersistedJobRunner('UserSyncJob', null); -const groupSyncRunner = new PersistedJobRunner('GroupSyncJob', null); +const userSyncRunner = new PersistedJobRunner('UserSyncJob'); +const groupSyncRunner = new PersistedJobRunner('GroupSyncJob'); const avatarDownloadRunner = new PersistedJobRunner( - 'AvatarDownloadJob', - null + 'AvatarDownloadJob' ); -const groupInviteJobRunner = new PersistedJobRunner( - 'GroupInviteJob', - null -); +const groupInviteJobRunner = new PersistedJobRunner('GroupInviteJob', 4); const groupPromoteJobRunner = new PersistedJobRunner( 'GroupPromoteJob', - null + 4 ); const groupPendingRemovalJobRunner = new PersistedJobRunner( 'GroupPendingRemovalJob', - null + 4 ); const updateMsgExpiryRunner = new PersistedJobRunner( - 'UpdateMsgExpirySwarmJob', - null + 'UpdateMsgExpirySwarmJob' ); const fetchSwarmMsgExpiryRunner = new PersistedJobRunner( - 'FetchMsgExpirySwarmJob', - null + 'FetchMsgExpirySwarmJob' ); export const runners = { diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts index 96b5b66b7e..69fccd164f 100644 --- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts +++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts @@ -48,24 +48,21 @@ function getFakeSleepForMultiJob({ return job; } -describe('JobRunner', () => { +describe('JobRunner SINGLE', () => { let getItemById: Sinon.SinonStub; let clock: Sinon.SinonFakeTimers; let runner: PersistedJobRunner; - let runnerMulti: PersistedJobRunner; beforeEach(() => { getItemById = stubData('getItemById'); stubData('createOrUpdateItem'); clock = Sinon.useFakeTimers({ shouldAdvanceTime: true }); - runner = new PersistedJobRunner('FakeSleepForJob', null); - runnerMulti = new PersistedJobRunner('FakeSleepForMultiJob', null); + runner = new PersistedJobRunner('FakeSleepForJob'); }); afterEach(() => { Sinon.restore(); runner.resetForTesting(); - runnerMulti.resetForTesting(); }); describe('loadJobsFromDb', () => { @@ -96,7 +93,7 @@ describe('JobRunner', () => { await runner.loadJobsFromDb(); - const jobList = runner.getJobList(); + const jobList = runner.getScheduledJobs(); expect(jobList).to.be.deep.eq( unsorted.sort((a, b) => a.nextAttemptTimestamp - b.nextAttemptTimestamp) ); @@ -111,7 +108,7 @@ describe('JobRunner', () => { await runner.loadJobsFromDb(); - const jobList = runner.getJobList(); + const jobList = runner.getScheduledJobs(); expect(jobList).to.be.deep.eq([]); }); @@ -120,7 +117,7 @@ describe('JobRunner', () => { await runner.loadJobsFromDb(); - const jobList = runner.getJobList(); + const jobList = runner.getScheduledJobs(); expect(jobList).to.be.deep.eq([]); }); }); @@ -131,23 +128,170 @@ describe('JobRunner', () => { const job = getFakeSleepForJob(123); const persisted = job.serializeJob(); const result = await runner.addJob(job); - expect(result).to.be.eq('job_deferred'); + expect(result).to.be.eq('job_added'); - expect(runner.getJobList()).to.deep.eq([persisted]); + expect(runner.getScheduledJobs()).to.deep.eq([persisted]); }); it('does not add a second FakeSleepForJob if one is already there', async () => { await runner.loadJobsFromDb(); const job = getFakeSleepForJob(123); const job2 = getFakeSleepForJob(1234); let result = await runner.addJob(job); - expect(result).to.eq('job_deferred'); + expect(result).to.eq('job_added'); result = await runner.addJob(job2); expect(result).to.eq('type_exists'); const persisted = job.serializeJob(); - expect(runner.getJobList()).to.deep.eq([persisted]); + expect(runner.getScheduledJobs()).to.deep.eq([persisted]); + }); + }); + + describe('startProcessing FakeSleepForJob', () => { + it('triggers a job right away if there is a job which should already be running', async () => { + await runner.loadJobsFromDb(); + clock.tick(100); + const job = getFakeSleepForJob(50); + await runner.addJob(job); + runner.startProcessing(); + expect(runner.getCurrentJobs()).to.deep.eq([job.serializeJob()]); + }); + + it('plans a deferred job if there is a job starting later', async () => { + await runner.loadJobsFromDb(); + clock.tick(100); + const job = getFakeSleepForJob(150); + expect(await runner.addJob(job)).to.be.eq('job_added'); + runner.startProcessing(); + }); + }); + + describe('stopAndWaitCurrentJob', () => { + it('does not await if no job at all ', async () => { + await runner.loadJobsFromDb(); + runner.startProcessing(); + const ret = await runner.stopAndWaitCurrentJobs(); + + expect(ret).to.be.eq('no_await'); + }); + + it('does not await if there are jobs but none are started', async () => { + await runner.loadJobsFromDb(); + clock.tick(100); + const job = getFakeSleepForJob(150); + await runner.addJob(job); + runner.startProcessing(); + clock.tick(45); + await sleepFor(10); // the runner should pick up the job + expect(runner.getCurrentJobs()).to.deep.eq([]); + expect(runner.isRunningJobs()).to.deep.eq(false); + const ret = await runner.stopAndWaitCurrentJobs(); + + expect(ret).to.be.eq('no_await'); + }); + + it('does await if there are jobs and one is started', async () => { + await runner.loadJobsFromDb(); + clock.tick(200); + const job = getFakeSleepForJob(150); + expect(await runner.addJob(job)).to.eq('job_added'); + runner.startProcessing(); + expect(runner.getCurrentJobs()).to.deep.eq([job.serializeJob()]); + + clock.tick(5000); + const ret = await runner.stopAndWaitCurrentJobs(); + await sleepFor(10); + expect(runner.getCurrentJobs()).to.deep.eq([]); + + expect(ret).to.be.eq('await'); + }); + }); + + describe('retriesFailing Jobs', () => { + it('does not await if no job at all ', async () => { + await runner.loadJobsFromDb(); + runner.startProcessing(); + const ret = await runner.stopAndWaitCurrentJobs(); + expect(ret).to.be.eq('no_await'); + }); + + it('does not await if there are jobs but none are started', async () => { + TestUtils.stubWindowLog(); + await runner.loadJobsFromDb(); + clock.tick(100); + const job = getFakeSleepForJob(150); + await runner.addJob(job); + + expect(runner.getCurrentJobs()).to.deep.eq([]); + expect(runner.getScheduledJobs()).to.deep.eq([job.serializeJob()]); + expect(runner.isRunningJobs()).to.be.eq(false); + + runner.startProcessing(); // a job should be started right away in the list of jobs + await sleepFor(10); + expect(runner.isRunningJobs()).to.be.eq(false); + + expect(runner.getCurrentJobs()).to.deep.eq([]); + expect(runner.getScheduledJobs()).to.deep.eq([job.serializeJob()]); + await sleepFor(10); + const ret = await runner.stopAndWaitCurrentJobs(); + expect(runner.getCurrentJobs()).to.deep.eq([]); + expect(runner.getScheduledJobs()).to.deep.eq([ + { ...job.serializeJob(), currentRetry: 0, nextAttemptTimestamp: 150 }, + ]); + + expect(ret).to.be.eq('no_await'); + }); + + it('does await if there are jobs and at least one is running', async () => { + TestUtils.stubWindowLog(); + await runner.loadJobsFromDb(); + clock.tick(100); + const job = getFakeSleepForJob(150); + await runner.addJob(job); + + clock.tick(50); + + expect(runner.getCurrentJobs()).to.deep.eq([]); + expect(runner.getScheduledJobs()).to.deep.eq([job.serializeJob()]); + expect(runner.isRunningJobs()).to.be.eq(false); + + runner.startProcessing(); // a job should be started right away in the list of jobs + await sleepFor(100); + expect(runner.isRunningJobs()).to.be.eq(true); + + expect(runner.getCurrentJobs()).to.deep.eq([job.serializeJob()]); + + clock.tick(5000); + + await sleepFor(10); + const ret = await runner.stopAndWaitCurrentJobs(); + expect(runner.getCurrentJobs()).to.deep.eq([]); + expect(runner.getScheduledJobs()).to.deep.eq([ + { ...job.serializeJob(), currentRetry: 1, nextAttemptTimestamp: clock.now + 10000 - 20 }, + ]); + + expect(ret).to.be.eq('no_await'); }); + }); +}); + +describe('JobRunner MULTI', () => { + let clock: Sinon.SinonFakeTimers; + let runnerMulti: PersistedJobRunner; + + beforeEach(() => { + stubData('createOrUpdateItem'); + stubData('getItemById'); + clock = Sinon.useFakeTimers({ shouldAdvanceTime: true }); + runnerMulti = new PersistedJobRunner('FakeSleepForMultiJob'); + }); + + afterEach(() => { + Sinon.restore(); + runnerMulti.resetForTesting(); + }); + + describe('addJob', () => { it('can add a FakeSleepForJobMulti (sorted) even if one is already there', async () => { await runnerMulti.loadJobsFromDb(); const job = getFakeSleepForMultiJob({ timestamp: 1234 }); @@ -155,15 +299,15 @@ describe('JobRunner', () => { const job3 = getFakeSleepForMultiJob({ timestamp: 1 }); let result = await runnerMulti.addJob(job); - expect(result).to.eq('job_deferred'); + expect(result).to.eq('job_added'); result = await runnerMulti.addJob(job2); - expect(result).to.eq('job_deferred'); + expect(result).to.eq('job_added'); result = await runnerMulti.addJob(job3); - expect(result).to.eq('job_deferred'); + expect(result).to.eq('job_added'); - expect(runnerMulti.getJobList()).to.deep.eq([ + expect(runnerMulti.getScheduledJobs()).to.deep.eq([ job3.serializeJob(), job2.serializeJob(), job.serializeJob(), @@ -178,11 +322,11 @@ describe('JobRunner', () => { identifier: job.persistedData.identifier, }); let result = await runnerMulti.addJob(job); - expect(result).to.be.eq('job_deferred'); + expect(result).to.be.eq('job_added'); result = await runnerMulti.addJob(job2); expect(result).to.be.eq('identifier_exists'); - expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([job.serializeJob()]); }); it('two jobs are running sequentially', async () => { @@ -195,28 +339,34 @@ describe('JobRunner', () => { // job should be started right away let result = await runnerMulti.addJob(job); - expect(result).to.eq('job_started'); + expect(result).to.eq('job_added'); result = await runnerMulti.addJob(job2); - expect(result).to.eq('job_deferred'); - expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob(), job2.serializeJob()]); - expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier); + expect(result).to.eq('job_added'); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([job.serializeJob(), job2.serializeJob()]); + expect(runnerMulti.getCurrentJobIdentifiers()).to.be.deep.equal([ + job.persistedData.identifier, + ]); // each job takes 5s to finish, so let's tick once the first one should be done clock.tick(5000); - expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier); - let awaited = await runnerMulti.waitCurrentJob(); + expect(runnerMulti.getCurrentJobIdentifiers()).to.be.deep.equal([ + job.persistedData.identifier, + ]); + let awaited = await runnerMulti.waitCurrentJobs(); expect(awaited).to.eq('await'); await sleepFor(10); - expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job2.persistedData.identifier); + expect(runnerMulti.getCurrentJobIdentifiers()).to.be.deep.equal([ + job2.persistedData.identifier, + ]); clock.tick(5000); - awaited = await runnerMulti.waitCurrentJob(); + awaited = await runnerMulti.waitCurrentJobs(); expect(awaited).to.eq('await'); await sleepFor(10); // those sleep for is just to let the runner the time to finish writing the tests to the DB and exit the handling of the previous test - expect(runnerMulti.getCurrentJobIdentifier()).to.eq(null); + expect(runnerMulti.getCurrentJobIdentifiers()).to.deep.eq([]); - expect(runnerMulti.getJobList()).to.deep.eq([]); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([]); }); it('adding one job after the first is done starts it', async () => { @@ -227,29 +377,31 @@ describe('JobRunner', () => { clock.tick(110); // job should be started right away let result = await runnerMulti.addJob(job); - expect(result).to.eq('job_started'); - expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]); - expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(job.persistedData.identifier); + expect(result).to.eq('job_added'); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([job.serializeJob()]); + expect(runnerMulti.getCurrentJobIdentifiers()).to.be.deep.equal([ + job.persistedData.identifier, + ]); clock.tick(5000); - await runnerMulti.waitCurrentJob(); + await runnerMulti.waitCurrentJobs(); // just give some time for the runnerMulti to pick up a new job await sleepFor(10); - expect(runnerMulti.getJobList()).to.deep.eq([]); - expect(runnerMulti.getCurrentJobIdentifier()).to.be.equal(null); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([]); + expect(runnerMulti.getCurrentJobIdentifiers()).to.be.deep.equal([]); // the first job should already be finished now result = await runnerMulti.addJob(job2); - expect(result).to.eq('job_started'); - expect(runnerMulti.getJobList()).to.deep.eq([job2.serializeJob()]); + expect(result).to.eq('job_added'); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([job2.serializeJob()]); // each job takes 5s to finish, so let's tick once the first one should be done clock.tick(5010); - await runnerMulti.waitCurrentJob(); + await runnerMulti.waitCurrentJobs(); await sleepFor(10); - expect(runnerMulti.getJobList()).to.deep.eq([]); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([]); }); it('adding one job after the first is done schedules it', async () => { @@ -260,11 +412,11 @@ describe('JobRunner', () => { clock.tick(110); // job should be started right away let result = await runnerMulti.addJob(job); - expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([job.serializeJob()]); - expect(result).to.eq('job_started'); + expect(result).to.eq('job_added'); clock.tick(5010); - await runnerMulti.waitCurrentJob(); + await runnerMulti.waitCurrentJobs(); clock.tick(5010); // just give some time for the runner to pick up a new job @@ -275,8 +427,8 @@ describe('JobRunner', () => { // job should already be finished now result = await runnerMulti.addJob(job2); // new job should be deferred as timestamp is not in the past - expect(result).to.eq('job_deferred'); - expect(runnerMulti.getJobList()).to.deep.eq([job2.serializeJob()]); + expect(result).to.eq('job_added'); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([job2.serializeJob()]); // tick enough for the job to need to be started clock.tick(100); @@ -286,89 +438,15 @@ describe('JobRunner', () => { clock.tick(5000); await job2.waitForCurrentTry(); - await runnerMulti.waitCurrentJob(); + await runnerMulti.waitCurrentJobs(); // we need to give some time for the jobrunner to handle the return of job2 and remove it await sleepFor(100); - expect(runnerMulti.getJobList()).to.deep.eq([]); - }); - }); - - describe('startProcessing FakeSleepForJob', () => { - it('does not trigger anything if no job present ', async () => { - await runner.loadJobsFromDb(); - expect(runner.startProcessing()).to.be.eq('no_job'); - }); - - it('triggers a job right away if there is a job which should already be running', async () => { - await runner.loadJobsFromDb(); - clock.tick(100); - const job = getFakeSleepForJob(50); - await runner.addJob(job); - expect(runner.startProcessing()).to.be.eq('job_started'); - }); - - it('plans a deferred job if there is a job starting later', async () => { - await runner.loadJobsFromDb(); - clock.tick(100); - const job = getFakeSleepForJob(150); - await runner.addJob(job); - expect(runner.startProcessing()).to.be.eq('job_deferred'); - }); - }); - - describe('stopAndWaitCurrentJob', () => { - it('does not await if no job at all ', async () => { - await runner.loadJobsFromDb(); - runner.startProcessing(); - const ret = await runner.stopAndWaitCurrentJob(); - - expect(ret).to.be.eq('no_await'); - }); - - it('does not await if there are jobs but none are started', async () => { - await runner.loadJobsFromDb(); - clock.tick(100); - const job = getFakeSleepForJob(150); - await runner.addJob(job); - expect(runner.startProcessing()).to.be.eq('job_deferred'); - const ret = await runner.stopAndWaitCurrentJob(); - - expect(ret).to.be.eq('no_await'); - }); - - it('does await if there are jobs and one is started', async () => { - await runner.loadJobsFromDb(); - clock.tick(200); - const job = getFakeSleepForJob(150); - await runner.addJob(job); - expect(runner.startProcessing()).to.be.eq('job_started'); - clock.tick(5000); - const ret = await runner.stopAndWaitCurrentJob(); - - expect(ret).to.be.eq('await'); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([]); }); }); describe('retriesFailing Jobs', () => { - it('does not await if no job at all ', async () => { - await runner.loadJobsFromDb(); - runner.startProcessing(); - const ret = await runner.stopAndWaitCurrentJob(); - expect(ret).to.be.eq('no_await'); - }); - - it('does not await if there are jobs but none are started', async () => { - await runner.loadJobsFromDb(); - clock.tick(100); - const job = getFakeSleepForJob(150); - await runner.addJob(job); - expect(runner.startProcessing()).to.be.eq('job_deferred'); - const ret = await runner.stopAndWaitCurrentJob(); - - expect(ret).to.be.eq('no_await'); - }); - it('does await if there are jobs and one is started', async () => { await runnerMulti.loadJobsFromDb(); const job = getFakeSleepForMultiJob({ timestamp: 100, returnResult: false }); // this job keeps failing, on purpose @@ -376,12 +454,15 @@ describe('JobRunner', () => { clock.tick(110); // job should be started right away const result = await runnerMulti.addJob(job); - expect(runnerMulti.getJobList()).to.deep.eq([job.serializeJob()]); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([job.serializeJob()]); + expect(runnerMulti.getCurrentJobs()).to.deep.eq([job.serializeJob()]); - expect(result).to.eq('job_started'); + expect(result).to.eq('job_added'); // the job takes 5 fake seconds, tick a bit less than that and then wait for it to finish - clock.tick(multiJobSleepDuration - 100); - await runnerMulti.waitCurrentJob(); + clock.tick(multiJobSleepDuration - 50); + expect(runnerMulti.getCurrentJobs()).to.deep.eq([job.serializeJob()]); + + await runnerMulti.waitCurrentJobs(); const jobUpdated = { ...job.serializeJob(), nextAttemptTimestamp: clock.now + job.persistedData.delayBetweenRetries, @@ -391,11 +472,14 @@ describe('JobRunner', () => { await sleepFor(10); // the job failed, so the job should still be there with a currentRetry of 1 - expect(runnerMulti.getJobList()).to.deep.eq([jobUpdated]); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([jobUpdated]); + expect(runnerMulti.getCurrentJobs()).to.deep.eq([]); + clock.tick(job.persistedData.delayBetweenRetries + 50); + expect(runnerMulti.planNextJobs()); // job should have been rescheduled after 10s, so if we tick 10000 + 4900ms, we should have that job about to be done again - clock.tick(job.persistedData.delayBetweenRetries + multiJobSleepDuration - 100); - await runnerMulti.waitCurrentJob(); + clock.tick(multiJobSleepDuration - 50); + await runnerMulti.waitCurrentJobs(); await sleepFor(10); const jobUpdated2 = { @@ -406,13 +490,18 @@ describe('JobRunner', () => { await sleepFor(10); - expect(runnerMulti.getJobList()).to.deep.eq([jobUpdated2]); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([jobUpdated2]); // that job should be retried one more time and then removed from the list of jobs to be run - clock.tick(job.persistedData.delayBetweenRetries + multiJobSleepDuration - 100); - await runnerMulti.waitCurrentJob(); + clock.tick(job.persistedData.delayBetweenRetries + 50); + expect(runnerMulti.planNextJobs()); + clock.tick(multiJobSleepDuration - 20); + + await runnerMulti.waitCurrentJobs(); + await sleepFor(10); - expect(runnerMulti.getJobList()).to.deep.eq([]); + + expect(runnerMulti.getScheduledJobs()).to.deep.eq([]); }); }); }); From 099c9d2b0ede396d333cadd6cb2d83111a10ef1f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 9 Jan 2025 16:40:11 +1100 Subject: [PATCH 260/302] fix: disable resend button on resending, shorter timeout with UI --- ts/components/MemberListItem.tsx | 2 ++ ts/session/utils/job_runners/jobs/GroupInviteJob.ts | 3 ++- ts/session/utils/job_runners/jobs/GroupSyncJob.ts | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 9289c8ff67..b7824b1455 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -234,6 +234,7 @@ const GroupStatusContainer = ({ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupPubkeyType }) => { const acceptedInvite = useMemberHasAcceptedInvite(pubkey, groupPk); const nominatedAdmin = useMemberIsNominatedAdmin(pubkey, groupPk); + const memberStatus = useMemberStatus(pubkey, groupPk); // as soon as the `admin` flag is set in the group for that member, we should be able to resend a promote as we cannot remove an admin. const canResendPromotion = hasClosedGroupV2QAButtons() && nominatedAdmin; @@ -252,6 +253,7 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP buttonShape={SessionButtonShape.Square} buttonType={SessionButtonType.Solid} text={window.i18n('resend')} + disabled={memberStatus === 'INVITE_SENDING' || memberStatus === 'PROMOTION_SENDING'} onClick={async () => { const group = await UserGroupsWrapperActions.getGroup(groupPk); const member = await MetaGroupWrapperActions.memberGet(groupPk, pubkey); diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 3bf752cfb1..7a68a5718a 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -199,6 +199,7 @@ class GroupInviteJob extends PersistedJob { unrevokeSubRequest, extraStoreRequests: [], allow401s: false, + timeoutMs: 10 * DURATION.SECONDS, }); if (sequenceResult !== RunJobResult.Success) { await LibSessionUtil.saveDumpsToDb(groupPk); @@ -236,7 +237,7 @@ class GroupInviteJob extends PersistedJob { message: rawMessage, isSyncMessage: false, }), - 30 * DURATION.SECONDS, + 10 * DURATION.SECONDS, controller ); diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index d0dae2e9e1..dd3aa1dcba 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -37,6 +37,7 @@ import { } from '../PersistedJob'; import { DURATION } from '../../../constants'; import { WithAllow401s } from '../../../types/with'; +import type { WithTimeoutMs } from '../../../apis/snode_api/requestWith'; const defaultMsBetweenRetries = 15000; // a long time between retries, to avoid running multiple jobs at the same time, when one was postponed at the same time as one already planned (5s) const defaultMaxAttempts = 2; @@ -91,9 +92,10 @@ async function pushChangesToGroupSwarmIfNeeded({ deleteAllMessagesSubRequest, extraStoreRequests, allow401s, + timeoutMs }: WithGroupPubkey & WithAllow401s & - WithRevokeSubRequest & { + WithRevokeSubRequest & Partial & { supplementalKeysSubRequest?: StoreGroupKeysSubRequest; deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest; extraStoreRequests: Array; @@ -175,7 +177,7 @@ async function pushChangesToGroupSwarmIfNeeded({ abortSignal: controller.signal, allow401s, }), - 30 * DURATION.SECONDS, + timeoutMs || 30 * DURATION.SECONDS, controller ); From 6cbbaa361a1a563b7754a9257f00e978d15ced14 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 10 Jan 2025 09:20:33 +1100 Subject: [PATCH 261/302] fix: correct alignment of isDeleted message svg --- stylesheets/_session.scss | 8 ------- .../message/message-content/MessageText.tsx | 24 +++++++++++++++++-- ts/session/utils/job_runners/JobRunner.ts | 4 ---- .../utils/job_runners/jobs/GroupInviteJob.ts | 16 +++++++++++-- .../utils/job_runners/jobs/GroupSyncJob.ts | 5 ++-- 5 files changed, 39 insertions(+), 18 deletions(-) diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index 96430acba7..bb243f91a3 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -339,11 +339,3 @@ input { margin: auto auto; } } - -.module-message__text { - white-space: pre-wrap; - - svg { - margin-inline-end: var(--margins-xs); - } -} diff --git a/ts/components/conversation/message/message-content/MessageText.tsx b/ts/components/conversation/message/message-content/MessageText.tsx index 40866b57f5..dfab97f142 100644 --- a/ts/components/conversation/message/message-content/MessageText.tsx +++ b/ts/components/conversation/message/message-content/MessageText.tsx @@ -1,6 +1,7 @@ import classNames from 'classnames'; import { useSelector } from 'react-redux'; +import styled from 'styled-components'; import { isOpenOrClosedGroup } from '../../../../models/conversationAttributes'; import { MessageRenderingProps } from '../../../../models/messageType'; import { StateType } from '../../../../state/reducer'; @@ -21,6 +22,21 @@ export type MessageTextSelectorProps = Pick< 'text' | 'direction' | 'status' | 'isDeleted' | 'conversationType' >; +const StyledMessageText = styled.div<{ isDeleted?: boolean }>` + white-space: pre-wrap; + + svg { + margin-inline-end: var(--margins-xs); + } + + ${({ isDeleted }) => + isDeleted && + ` + display: flex; + align-items: center; + `} +`; + export const MessageText = (props: Props) => { const selected = useSelector((state: StateType) => getMessageTextProps(state, props.messageId)); const multiSelectMode = useSelector(isMessageSelectionMode); @@ -43,7 +59,11 @@ export const MessageText = (props: Props) => { : 'var(--message-bubbles-sent-text-color)'; return ( -
+ {isDeleted && } { disableJumbomoji={false} isGroup={isOpenOrClosedGroup(conversationType)} /> -
+ ); }; diff --git a/ts/session/utils/job_runners/JobRunner.ts b/ts/session/utils/job_runners/JobRunner.ts index 320bde1f4a..b9e89e98df 100644 --- a/ts/session/utils/job_runners/JobRunner.ts +++ b/ts/session/utils/job_runners/JobRunner.ts @@ -304,10 +304,6 @@ export class PersistedJobRunner { // if the time is 101, and that task is to be run at t=101, we need to start it right away. if (nextJob.persistedData.nextAttemptTimestamp > Date.now()) { - window.log.info( - 'next job is not due to be run just yet...', - nextJob.persistedData.nextAttemptTimestamp - Date.now() - ); return; } let jobResult: RunJobResult | null = null; diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 7a68a5718a..0b5eff3817 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -78,10 +78,10 @@ async function addJob({ groupPk, member, inviteAsAdmin, forceUnrevoke }: JobExtr await MetaGroupWrapperActions.memberSetInviteNotSent(groupPk, member); } + await LibSessionUtil.saveDumpsToDb(groupPk); window?.inboxStore?.dispatch( groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any ); - await LibSessionUtil.saveDumpsToDb(groupPk); await runners.groupInviteJobRunner.addJob(groupInviteJob); } @@ -186,6 +186,8 @@ class GroupInviteJob extends PersistedJob { } let failed = true; try { + let start = Date.now(); + if (this.persistedData.forceUnrevoke) { const token = await MetaGroupWrapperActions.swarmSubAccountToken(groupPk, member); const unrevokeSubRequest = new SubaccountUnrevokeSubRequest({ @@ -201,7 +203,14 @@ class GroupInviteJob extends PersistedJob { allow401s: false, timeoutMs: 10 * DURATION.SECONDS, }); + window?.inboxStore?.dispatch( + groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any + ); if (sequenceResult !== RunJobResult.Success) { + window.log.warn( + `GroupInvite: GroupSync.pushChangesToGroupSwarmIfNeeded failed after ${Date.now() - start}ms` + ); + await LibSessionUtil.saveDumpsToDb(groupPk); throw new Error( @@ -231,7 +240,7 @@ class GroupInviteJob extends PersistedJob { inviteDetails, SnodeNamespaces.Default ); - + start = Date.now(); const { effectiveTimestamp } = await timeoutWithAbort( MessageSender.sendSingleMessage({ message: rawMessage, @@ -240,6 +249,9 @@ class GroupInviteJob extends PersistedJob { 10 * DURATION.SECONDS, controller ); + window.log.debug( + `GroupInvite: sendSingleMessage took ${Date.now() - start}ms. effectiveTimestamp: ${effectiveTimestamp}` + ); if (effectiveTimestamp !== null) { failed = false; diff --git a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts index dd3aa1dcba..cc393efc08 100644 --- a/ts/session/utils/job_runners/jobs/GroupSyncJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupSyncJob.ts @@ -92,10 +92,11 @@ async function pushChangesToGroupSwarmIfNeeded({ deleteAllMessagesSubRequest, extraStoreRequests, allow401s, - timeoutMs + timeoutMs, }: WithGroupPubkey & WithAllow401s & - WithRevokeSubRequest & Partial & { + WithRevokeSubRequest & + Partial & { supplementalKeysSubRequest?: StoreGroupKeysSubRequest; deleteAllMessagesSubRequest?: DeleteAllFromGroupMsgNodeSubRequest; extraStoreRequests: Array; From 8dde4596ade23a03a1d726fdd8d2220d18e6bbd9 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 10 Jan 2025 09:54:44 +1100 Subject: [PATCH 262/302] fix: toast for invite failure shows nickname if available --- ts/session/utils/job_runners/jobs/GroupInviteJob.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 0b5eff3817..c2c68499f0 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -98,12 +98,12 @@ function displayFailedInvitesForGroup(groupPk: GroupPubkeyType) { }; const count = thisGroupFailures.failedMembers.length; const groupName = ConvoHub.use().get(groupPk)?.getRealSessionUsername() || window.i18n('unknown'); - const firstUserName = - ConvoHub.use().get(thisGroupFailures.failedMembers?.[0])?.getRealSessionUsername() || - window.i18n('unknown'); - const secondUserName = - ConvoHub.use().get(thisGroupFailures.failedMembers?.[1])?.getRealSessionUsername() || - window.i18n('unknown'); + const firstUserName = ConvoHub.use() + .get(thisGroupFailures.failedMembers?.[0]) + ?.getNicknameOrRealUsernameOrPlaceholder(); + const secondUserName = ConvoHub.use() + .get(thisGroupFailures.failedMembers?.[1]) + ?.getNicknameOrRealUsernameOrPlaceholder(); switch (count) { case 1: ToastUtils.pushToastWarning( From dea69ed3535f573960d414e605c5d96399100095 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 10 Jan 2025 11:51:46 +1100 Subject: [PATCH 263/302] fix: sendSingleMessage retries itself on 421 errors --- ts/session/sending/MessageSender.ts | 129 +++++++++++++++------------- ts/state/ducks/metaGroups.ts | 2 +- 2 files changed, 71 insertions(+), 60 deletions(-) diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 9705d7347f..36008aa53e 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -58,6 +58,7 @@ import { OpenGroupRequestCommonType } from '../../data/types'; import { NetworkTime } from '../../util/NetworkTime'; import { MergedAbortSignal } from '../apis/snode_api/requestWith'; import { WithAllow401s } from '../types/with'; +import { ERROR_421_HANDLED_RETRY_REQUEST } from '../apis/snode_api/onions'; // ================ SNODE STORE ================ @@ -247,66 +248,76 @@ async function sendSingleMessage({ } return pRetry( async () => { - const recipient = PubKey.cast(message.device); - // we can only have a single message in this send function for now - const [encryptedAndWrapped] = await MessageWrapper.encryptMessagesAndWrap([ - { - destination: message.device, - plainTextBuffer: message.plainTextBuffer, - namespace: message.namespace, - ttl: message.ttl, - identifier: message.identifier, - networkTimestamp: message.networkTimestampCreated, - isSyncMessage: Boolean(isSyncMessage), - }, - ]); - - // make sure to update the local sent_at timestamp, because sometimes, we will get the just pushed message in the receiver side - // before we return from the await below. - // and the isDuplicate messages relies on sent_at timestamp to be valid. - const found = await Data.getMessageById(encryptedAndWrapped.identifier); - - // make sure to not update the sent timestamp if this a currently syncing message - if (found && !found.get('sentSync')) { - found.set({ sent_at: encryptedAndWrapped.networkTimestamp }); - await found.commit(); - } - const isSyncedDeleteAfterReadMessage = - found && - UserUtils.isUsFromCache(recipient.key) && - found.getExpirationType() === 'deleteAfterRead' && - found.getExpireTimerSeconds() > 0 && - encryptedAndWrapped.isSyncMessage; - - let overriddenTtl = encryptedAndWrapped.ttl; - if (isSyncedDeleteAfterReadMessage && found.getExpireTimerSeconds() > 0) { - const asMs = found.getExpireTimerSeconds() * 1000; - window.log.debug(`overriding ttl for synced DaR message to ${asMs}`); - overriddenTtl = asMs; - } + try { + const recipient = PubKey.cast(message.device); + // we can only have a single message in this send function for now + const [encryptedAndWrapped] = await MessageWrapper.encryptMessagesAndWrap([ + { + destination: message.device, + plainTextBuffer: message.plainTextBuffer, + namespace: message.namespace, + ttl: message.ttl, + identifier: message.identifier, + networkTimestamp: message.networkTimestampCreated, + isSyncMessage: Boolean(isSyncMessage), + }, + ]); + + // make sure to update the local sent_at timestamp, because sometimes, we will get the just pushed message in the receiver side + // before we return from the await below. + // and the isDuplicate messages relies on sent_at timestamp to be valid. + const found = await Data.getMessageById(encryptedAndWrapped.identifier); + + // make sure to not update the sent timestamp if this a currently syncing message + if (found && !found.get('sentSync')) { + found.set({ sent_at: encryptedAndWrapped.networkTimestamp }); + await found.commit(); + } + const isSyncedDeleteAfterReadMessage = + found && + UserUtils.isUsFromCache(recipient.key) && + found.getExpirationType() === 'deleteAfterRead' && + found.getExpireTimerSeconds() > 0 && + encryptedAndWrapped.isSyncMessage; + + let overriddenTtl = encryptedAndWrapped.ttl; + if (isSyncedDeleteAfterReadMessage && found.getExpireTimerSeconds() > 0) { + const asMs = found.getExpireTimerSeconds() * 1000; + window.log.debug(`overriding ttl for synced DaR message to ${asMs}`); + overriddenTtl = asMs; + } + + const subRequests = await messagesToRequests({ + encryptedAndWrappedArr: [{ ...encryptedAndWrapped, ttl: overriddenTtl }], + destination, + }); - const subRequests = await messagesToRequests({ - encryptedAndWrappedArr: [{ ...encryptedAndWrapped, ttl: overriddenTtl }], - destination, - }); - - const targetNode = await SnodePool.getNodeFromSwarmOrThrow(destination); - - const batchResult = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ - unsignedSubRequests: subRequests, - targetNode, - timeoutMs: 10 * DURATION.SECONDS, - associatedWith: destination, - allow401s: false, - method: 'sequence', - abortSignal: null, - }); - - await handleBatchResultWithSubRequests({ batchResult, subRequests, destination }); - return { - wrappedEnvelope: encryptedAndWrapped.encryptedAndWrappedData, - effectiveTimestamp: encryptedAndWrapped.networkTimestamp, - }; + const targetNode = await SnodePool.getNodeFromSwarmOrThrow(destination); + + const batchResult = await BatchRequests.doUnsignedSnodeBatchRequestNoRetries({ + unsignedSubRequests: subRequests, + targetNode, + timeoutMs: 10 * DURATION.SECONDS, + associatedWith: destination, + allow401s: false, + method: 'sequence', + abortSignal: null, + }); + + await handleBatchResultWithSubRequests({ batchResult, subRequests, destination }); + return { + wrappedEnvelope: encryptedAndWrapped.encryptedAndWrappedData, + effectiveTimestamp: encryptedAndWrapped.networkTimestamp, + }; + } catch (e) { + if (e instanceof pRetry.AbortError && e.message === ERROR_421_HANDLED_RETRY_REQUEST) { + // sendSingleMessage handles fetching a new snode itself once 421 was handled, but a pRetry.AbortError thrown + // will stop the retry process. We need to catch this specific error and throw it again (as a normal error) + // to let pRetry retry the request. + throw new Error(e.message); + } + throw e; + } }, { retries: Math.max(attempts - 1, 0), diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 31b245152b..bdc2dce898 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -1265,7 +1265,7 @@ const metaGroupSlice = createSlice({ builder.addCase(initNewGroupInWrapper.pending, (state, _action) => { state.creationFromUIPending = true; - window.log.error('a initNewGroupInWrapper is pending'); + window.log.debug('a initNewGroupInWrapper is pending'); return state; }); builder.addCase(loadMetaDumpsFromDB.fulfilled, (state, action) => { From 7a4c0a0377abe852d788899ecef39d06c698cf61 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 10 Jan 2025 13:34:33 +1100 Subject: [PATCH 264/302] chore: speed up unit testts --- ts/test/session/unit/onion/OnionPaths_test.ts | 3 ++- ts/test/session/unit/sending/MessageQueue_test.ts | 2 +- .../unit/utils/job_runner/JobRunner_test.ts | 14 +++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ts/test/session/unit/onion/OnionPaths_test.ts b/ts/test/session/unit/onion/OnionPaths_test.ts index c525c4ea32..19e30654be 100644 --- a/ts/test/session/unit/onion/OnionPaths_test.ts +++ b/ts/test/session/unit/onion/OnionPaths_test.ts @@ -143,7 +143,7 @@ describe('OnionPaths', () => { SNodeAPI.Onions.resetSnodeFailureCount(); OnionPaths.resetPathFailureCount(); OnionPaths.clearTestOnionPath(); - Sinon.stub(OnionPaths, 'getOnionPathMinTimeout').returns(10); + Sinon.stub(OnionPaths, 'getOnionPathMinTimeout').returns(1); }); afterEach(() => { @@ -157,6 +157,7 @@ describe('OnionPaths', () => { }); it('throws if we cannot find a valid edge snode', async () => { + TestUtils.stubWindowLog(); const badPool = generateFakeSnodes(0).map(m => { return { ...m, storage_server_version: [2, 1, 1] }; }); diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index 8d129e020e..71daf78b56 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -216,7 +216,7 @@ describe('MessageQueue', () => { done(e); } } - }); + }, {interval:5}); }); }); }); diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts index 69fccd164f..1381145ec8 100644 --- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts +++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts @@ -255,14 +255,14 @@ describe('JobRunner SINGLE', () => { expect(runner.isRunningJobs()).to.be.eq(false); runner.startProcessing(); // a job should be started right away in the list of jobs - await sleepFor(100); + await sleepFor(5); expect(runner.isRunningJobs()).to.be.eq(true); expect(runner.getCurrentJobs()).to.deep.eq([job.serializeJob()]); clock.tick(5000); - await sleepFor(10); + await sleepFor(5); const ret = await runner.stopAndWaitCurrentJobs(); expect(runner.getCurrentJobs()).to.deep.eq([]); expect(runner.getScheduledJobs()).to.deep.eq([ @@ -412,6 +412,7 @@ describe('JobRunner MULTI', () => { clock.tick(110); // job should be started right away let result = await runnerMulti.addJob(job); + expect(runnerMulti.getScheduledJobs()).to.deep.eq([job.serializeJob()]); expect(result).to.eq('job_added'); @@ -420,7 +421,7 @@ describe('JobRunner MULTI', () => { clock.tick(5010); // just give some time for the runner to pick up a new job - await sleepFor(100); + await sleepFor(5); const job2 = getFakeSleepForMultiJob({ timestamp: clock.now + 100 }); @@ -434,13 +435,16 @@ describe('JobRunner MULTI', () => { clock.tick(100); // that job2 should be running now - await sleepFor(100); + await sleepFor(5); clock.tick(5000); await job2.waitForCurrentTry(); + clock.tick(730); + await runnerMulti.waitCurrentJobs(); + // we need to give some time for the jobrunner to handle the return of job2 and remove it - await sleepFor(100); + await sleepFor(5); expect(runnerMulti.getScheduledJobs()).to.deep.eq([]); }); From f0141b5894b401df2c06951a70d5f2e10323d98f Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 13 Jan 2025 09:45:00 +1100 Subject: [PATCH 265/302] fix: add warning colours per theme and use them --- ts/components/NoticeBanner.tsx | 5 +---- ts/themes/classicDark.ts | 1 + ts/themes/classicLight.ts | 1 + ts/themes/constants/colors.tsx | 9 +++++++++ ts/themes/oceanDark.ts | 1 + ts/themes/oceanLight.ts | 1 + ts/themes/variableColors.tsx | 1 + 7 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx index f91c496cb8..06e567ccba 100644 --- a/ts/components/NoticeBanner.tsx +++ b/ts/components/NoticeBanner.tsx @@ -53,8 +53,7 @@ export const NoticeBanner = (props: NoticeBannerProps) => { const StyledGroupInviteBanner = styled(Flex)` position: relative; - background-color: var(--orange-color); - color: var(--black-color); + color: var(--warning-color); font-size: var(--font-size-sm); padding: var(--margins-xs) var(--margins-lg); text-align: center; @@ -62,8 +61,6 @@ const StyledGroupInviteBanner = styled(Flex)` // when part a a dialog, invert it and make it narrower (as the dialog grows to make it fit) ${StyledRootDialog} & { - background-color: unset; - color: var(--text-primary-color); max-width: 300px; } `; diff --git a/ts/themes/classicDark.ts b/ts/themes/classicDark.ts index fc776b56e1..76f4286955 100644 --- a/ts/themes/classicDark.ts +++ b/ts/themes/classicDark.ts @@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors'; export const classicDark: ThemeColorVariables = { '--danger-color': THEMES.CLASSIC_DARK.DANGER, + '--warning-color': THEMES.CLASSIC_DARK.WARNING, '--disabled-color': THEMES.CLASSIC_DARK.DISABLED, '--background-primary-color': THEMES.CLASSIC_DARK.COLOR1, diff --git a/ts/themes/classicLight.ts b/ts/themes/classicLight.ts index bc142fd30a..7f318196c8 100644 --- a/ts/themes/classicLight.ts +++ b/ts/themes/classicLight.ts @@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors'; export const classicLight: ThemeColorVariables = { '--danger-color': THEMES.CLASSIC_LIGHT.DANGER, + '--warning-color': THEMES.CLASSIC_LIGHT.WARNING, '--disabled-color': THEMES.CLASSIC_LIGHT.DISABLED, '--background-primary-color': THEMES.CLASSIC_LIGHT.COLOR6, diff --git a/ts/themes/constants/colors.tsx b/ts/themes/constants/colors.tsx index 5642ac7666..81db5b2cf2 100644 --- a/ts/themes/constants/colors.tsx +++ b/ts/themes/constants/colors.tsx @@ -119,6 +119,7 @@ export function convertThemeStateToName(themeState: string): ThemeNames { type ThemeColors = { PRIMARY: string; DANGER: string; + WARNING: string; DISABLED: string; COLOR0: string; COLOR1: string; @@ -134,6 +135,7 @@ type Themes = Record; // Classic Light const classicLightPrimary = primaryGreen; const classicLightDanger = dangerLight; +const classicLightWarning = '#A64B00'; const classicLightDisabled = disabledLight; const classicLight0 = '#000000'; const classicLight1 = '#6D6D6D'; @@ -146,6 +148,7 @@ const classicLight6 = '#FFFFFF'; // Classic Dark const classicDarkPrimary = primaryGreen; const classicDarkDanger = dangerDark; +const classicDarkWarning = '#FCB159'; const classicDarkDisabled = disabledDark; const classicDark0 = '#000000'; const classicDark1 = '#1B1B1B'; @@ -158,6 +161,7 @@ const classicDark6 = '#FFFFFF'; // Ocean Light const oceanLightPrimary = primaryBlue; const oceanLightDanger = dangerLight; +const oceanLightWarning = '#A64B00'; const oceanLightDisabled = disabledLight; const oceanLight0 = '#000000'; const oceanLight1 = '#19345D'; @@ -171,6 +175,7 @@ const oceanLight7 = '#FCFFFF'; // Ocean Dark const oceanDarkPrimary = primaryBlue; const oceanDarkDanger = dangerDark; +const oceanDarkWarning = '#FCB159'; const oceanDarkDisabled = disabledDark; const oceanDark0 = '#000000'; const oceanDark1 = '#1A1C28'; @@ -185,6 +190,7 @@ const THEMES: Themes = { CLASSIC_LIGHT: { PRIMARY: classicLightPrimary, DANGER: classicLightDanger, + WARNING: classicLightWarning, DISABLED: classicLightDisabled, COLOR0: classicLight0, COLOR1: classicLight1, @@ -196,6 +202,7 @@ const THEMES: Themes = { }, CLASSIC_DARK: { PRIMARY: classicDarkPrimary, + WARNING: classicDarkWarning, DANGER: classicDarkDanger, DISABLED: classicDarkDisabled, COLOR0: classicDark0, @@ -208,6 +215,7 @@ const THEMES: Themes = { }, OCEAN_LIGHT: { PRIMARY: oceanLightPrimary, + WARNING: oceanLightWarning, DANGER: oceanLightDanger, DISABLED: oceanLightDisabled, COLOR0: oceanLight0, @@ -221,6 +229,7 @@ const THEMES: Themes = { }, OCEAN_DARK: { PRIMARY: oceanDarkPrimary, + WARNING: oceanDarkWarning, DANGER: oceanDarkDanger, DISABLED: oceanDarkDisabled, COLOR0: oceanDark0, diff --git a/ts/themes/oceanDark.ts b/ts/themes/oceanDark.ts index f76e8bd3de..77765ddde1 100644 --- a/ts/themes/oceanDark.ts +++ b/ts/themes/oceanDark.ts @@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors'; export const oceanDark: ThemeColorVariables = { '--danger-color': THEMES.OCEAN_DARK.DANGER, + '--warning-color': THEMES.OCEAN_DARK.WARNING, '--disabled-color': THEMES.OCEAN_DARK.DISABLED, '--background-primary-color': THEMES.OCEAN_DARK.COLOR1, diff --git a/ts/themes/oceanLight.ts b/ts/themes/oceanLight.ts index 8d41f4ed95..9121be4fa8 100644 --- a/ts/themes/oceanLight.ts +++ b/ts/themes/oceanLight.ts @@ -4,6 +4,7 @@ import { ThemeColorVariables } from './variableColors'; export const oceanLight: ThemeColorVariables = { '--danger-color': THEMES.OCEAN_LIGHT.DANGER, + '--warning-color': THEMES.OCEAN_LIGHT.WARNING, '--disabled-color': THEMES.OCEAN_LIGHT.DISABLED, '--background-primary-color': THEMES.OCEAN_LIGHT.COLOR7!, diff --git a/ts/themes/variableColors.tsx b/ts/themes/variableColors.tsx index 5a9b3ac863..9d2392f247 100644 --- a/ts/themes/variableColors.tsx +++ b/ts/themes/variableColors.tsx @@ -1,6 +1,7 @@ // Default Theme should be Classic Dark export type ThemeColorVariables = { '--danger-color': string; + '--warning-color': string; '--disabled-color': string; /* Backgrounds */ From d59ecbb4710ef103f838b3838fc2ccc909b8beb2 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 13 Jan 2025 10:42:54 +1100 Subject: [PATCH 266/302] fix: groupInvite tracks abort signal to cancel request --- ts/session/sending/MessageQueue.ts | 1 + ts/session/sending/MessageSender.ts | 4 ++- ts/session/utils/calling/CallManager.ts | 1 + .../utils/job_runners/jobs/GroupInviteJob.ts | 1 + .../session/unit/sending/MessageQueue_test.ts | 29 ++++++++++--------- .../unit/sending/MessageSender_test.ts | 7 +++++ 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index a43ecd4378..c5f562de4e 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -348,6 +348,7 @@ export class MessageQueueCl { const { effectiveTimestamp } = await MessageSender.sendSingleMessage({ message: rawMessage, isSyncMessage, + abortSignal: null, }); window.log.debug('sendSingleMessage took ', Date.now() - start); diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 36008aa53e..4e65a6bc4f 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -236,8 +236,10 @@ async function sendSingleMessage({ retryMinTimeout = 100, attempts = 3, isSyncMessage, + abortSignal, }: { message: OutgoingRawMessage; + abortSignal: MergedAbortSignal | null; attempts?: number; retryMinTimeout?: number; // in ms isSyncMessage: boolean; @@ -301,7 +303,7 @@ async function sendSingleMessage({ associatedWith: destination, allow401s: false, method: 'sequence', - abortSignal: null, + abortSignal, }); await handleBatchResultWithSubRequests({ batchResult, subRequests, destination }); diff --git a/ts/session/utils/calling/CallManager.ts b/ts/session/utils/calling/CallManager.ts index 16de5215ac..6e7405d47a 100644 --- a/ts/session/utils/calling/CallManager.ts +++ b/ts/session/utils/calling/CallManager.ts @@ -555,6 +555,7 @@ export async function USER_callRecipient(recipient: string) { const { wrappedEnvelope } = await MessageSender.sendSingleMessage({ message: rawPreOffer, isSyncMessage: false, + abortSignal: null, }); void PnServer.notifyPnServer(wrappedEnvelope, recipient); diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index c2c68499f0..3cd5c223d1 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -245,6 +245,7 @@ class GroupInviteJob extends PersistedJob { MessageSender.sendSingleMessage({ message: rawMessage, isSyncMessage: false, + abortSignal: controller.signal, }), 10 * DURATION.SECONDS, controller diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts index 71daf78b56..28341fbd71 100644 --- a/ts/test/session/unit/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -203,20 +203,23 @@ describe('MessageQueue', () => { .then(() => messageQueueStub.processPending(device)); // The cb is only invoke is all reties fails. Here we poll until the messageSentHandlerFailed was invoked as this is what we want to do - return PromiseUtils.poll(done => { - if (messageSentHandlerFailedStub.callCount === 1) { - try { - expect(messageSentHandlerFailedStub.callCount).to.be.equal(1); - expect(messageSentHandlerFailedStub.lastCall.args[0].identifier).to.be.equal( - message.identifier - ); - expect(messageSentHandlerFailedStub.lastCall.args[1].message).to.equal('failure'); - done(); - } catch (e) { - done(e); + return PromiseUtils.poll( + done => { + if (messageSentHandlerFailedStub.callCount === 1) { + try { + expect(messageSentHandlerFailedStub.callCount).to.be.equal(1); + expect(messageSentHandlerFailedStub.lastCall.args[0].identifier).to.be.equal( + message.identifier + ); + expect(messageSentHandlerFailedStub.lastCall.args[1].message).to.equal('failure'); + done(); + } catch (e) { + done(e); + } } - } - }, {interval:5}); + }, + { interval: 5 } + ); }); }); }); diff --git a/ts/test/session/unit/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts index 9b7389bd91..37f0371bc6 100644 --- a/ts/test/session/unit/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -88,6 +88,7 @@ describe('MessageSender', () => { attempts: 3, retryMinTimeout: 10, isSyncMessage: false, + abortSignal: null, }); await expectAsyncToThrow(promise, 'Failed to encrypt'); expect(sessionMessageAPISendStub.callCount).to.equal(0); @@ -100,6 +101,7 @@ describe('MessageSender', () => { attempts: 3, retryMinTimeout: 10, isSyncMessage: false, + abortSignal: null, }); expect(doSnodeBatchRequestStub.callCount).to.equal(1); }); @@ -114,6 +116,7 @@ describe('MessageSender', () => { attempts, retryMinTimeout: 10, isSyncMessage: false, + abortSignal: null, }); await expect(promise).is.rejectedWith('API error'); expect(doSnodeBatchRequestStub.callCount).to.equal(attempts); @@ -127,6 +130,7 @@ describe('MessageSender', () => { attempts: 3, retryMinTimeout: 10, isSyncMessage: false, + abortSignal: null, }); expect(doSnodeBatchRequestStub.callCount).to.equal(2); }); @@ -160,6 +164,7 @@ describe('MessageSender', () => { attempts: 3, retryMinTimeout: 10, isSyncMessage: false, + abortSignal: null, }); const args = doSnodeBatchRequestStub.getCall(0).args; @@ -203,6 +208,7 @@ describe('MessageSender', () => { attempts: 3, retryMinTimeout: 10, isSyncMessage: false, + abortSignal: null, }); const firstArg = doSnodeBatchRequestStub.getCall(0).args[0]; @@ -255,6 +261,7 @@ describe('MessageSender', () => { attempts: 3, retryMinTimeout: 10, isSyncMessage: false, + abortSignal: null, }); const firstArg = doSnodeBatchRequestStub.getCall(0).args[0]; From 2b26c65f5f200982d95ce4e9ece0028d7ebf6038 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 13 Jan 2025 10:52:48 +1100 Subject: [PATCH 267/302] fix: declining convo mark it as hidden --- ts/hooks/useParamSelector.ts | 1 + ts/interactions/conversationInteractions.ts | 5 ++--- ts/models/conversation.ts | 8 +++++++- ts/receiver/groupv2/handleGroupV2Message.ts | 4 ++-- ts/session/conversations/ConversationController.ts | 14 ++++++++------ ts/state/selectors/conversations.ts | 4 +++- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts index 6f5954029a..55bdc46e8e 100644 --- a/ts/hooks/useParamSelector.ts +++ b/ts/hooks/useParamSelector.ts @@ -272,6 +272,7 @@ export function useIsIncomingRequest(convoId?: string) { didApproveMe: convoProps.didApproveMe || false, activeAt: convoProps.activeAt || 0, invitePending, + priority: convoProps.priority, }) ); } diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 6226cedd09..3fcb8326b5 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -199,9 +199,8 @@ export async function declineConversationWithoutConfirm({ `declineConversationWithoutConfirm of ${ed25519Str(conversationId)}, alsoBlock:${alsoBlock}, conversationIdOrigin:${conversationIdOrigin ? ed25519Str(conversationIdOrigin) : ''}` ); - // Note: do not set the active_at undefined as this would make that conversation not synced with the libsession wrapper - await conversationToDecline.setIsApproved(false, false); - await conversationToDecline.setDidApproveMe(false, false); + // Note: declining a message request just hides it. + await conversationToDecline.setHidden(false); if (conversationToDecline.isClosedGroupV2()) { // this can only be done for groupv2 convos diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 93a88876ae..97edd41ef2 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -727,6 +727,7 @@ export class ConversationModel extends Backbone.Model { activeAt: this.getActiveAt(), didApproveMe: this.didApproveMe(), invitePending, + priority: this.getPriority(), }); } @@ -2817,6 +2818,7 @@ export function hasValidIncomingRequestValues({ activeAt, didApproveMe, invitePending, + priority, }: { id: string; isMe: boolean; @@ -2826,16 +2828,20 @@ export function hasValidIncomingRequestValues({ didApproveMe: boolean; invitePending: boolean; activeAt: number | undefined; + priority: number | undefined; }): boolean { // if a convo is not active, it means we didn't get any messages nor sent any. const isActive = activeAt && isFinite(activeAt) && activeAt > 0; + const priorityWithDefault = priority ?? CONVERSATION_PRIORITIES.default; + const isHidden = priorityWithDefault < 0; return Boolean( (isPrivate || (PubKey.is03Pubkey(id) && invitePending)) && !isMe && !isApproved && !isBlocked && isActive && - didApproveMe + didApproveMe && + !isHidden ); } diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 794e533526..6c6ec0b0d0 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -3,7 +3,7 @@ import { isEmpty, isFinite, isNumber } from 'lodash'; import { Data } from '../../data/data'; import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions'; import { deleteMessagesFromSwarmOnly } from '../../interactions/conversations/unsendingInteractions'; -import { ConversationTypeEnum } from '../../models/types'; +import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/types'; import { HexString } from '../../node/hexStrings'; import { SignalService } from '../../protobuf'; import { getSwarmPollingInstance } from '../../session/apis/snode_api'; @@ -69,7 +69,7 @@ async function getInitializedGroupObject({ authData: null, joinedAtSeconds: Math.floor(Date.now() / 1000), name: groupName, - priority: 0, + priority: CONVERSATION_PRIORITIES.default, pubkeyHex: groupPk, secretKey: null, kicked: false, diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index f293f706ee..2b5acaa120 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -213,8 +213,7 @@ class ConvoController { // we remove the messages left in this convo. The caller has to merge them if needed await deleteAllMessagesByConvoIdNoConfirmation(conversation.id); - await conversation.setIsApproved(false, false); - await conversation.setDidApproveMe(false, false); + await conversation.setHidden(false); await conversation.commit(); } @@ -400,8 +399,7 @@ class ConvoController { // We do this so that if we get reinvited to the group, we will // fetch and display all the messages from the group's swarm again. if (clearFetchedHashes) { - await getSwarmPollingInstance().resetLastHashesForConversation(groupPk); - await Data.emptySeenMessageHashesForConversation(groupPk); + await this.resetLastHashesForConversation(groupPk); } await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); @@ -417,6 +415,11 @@ class ConvoController { window.inboxStore?.dispatch(groupInfoActions.removeGroupDetailsFromSlice({ groupPk })); } + async resetLastHashesForConversation(groupPk: GroupPubkeyType) { + await getSwarmPollingInstance().resetLastHashesForConversation(groupPk); + await Data.emptySeenMessageHashesForConversation(groupPk); + } + public async deleteCommunity(convoId: string) { const conversation = await this.deleteConvoInitialChecks(convoId, 'Community', false); if (!conversation || !conversation.isPublic()) { @@ -455,8 +458,7 @@ class ConvoController { } else { window.log.info(`deleteContact isPrivate, reset fields and removing from wrapper: ${id}`); - await conversation.setIsApproved(false, false); - await conversation.setDidApproveMe(false, false); + await conversation.setHidden(); conversation.set('active_at', 0); await BlockedNumberController.unblockAll([conversation.id]); await conversation.commit(); // first commit to DB so the DB knows about the changes diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 40d1f2a426..9a50650d58 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -399,7 +399,8 @@ const _getConversationRequests = ( sortedConversations: Array ): Array => { return filter(sortedConversations, conversation => { - const { isApproved, isBlocked, isPrivate, isMe, activeAt, didApproveMe, id } = conversation; + const { isApproved, isBlocked, isPrivate, isMe, activeAt, didApproveMe, id, priority } = + conversation; const invitePending = PubKey.is03Pubkey(id) ? UserGroupsWrapperActions.getCachedGroup(id)?.invitePending || false : false; @@ -412,6 +413,7 @@ const _getConversationRequests = ( activeAt: activeAt || 0, didApproveMe: didApproveMe || false, invitePending, + priority, }); return isIncomingRequest; }); From 6ae0e3aac9739969feca4f5235ae50b0f3127faa Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 13 Jan 2025 14:12:28 +1100 Subject: [PATCH 268/302] fix: reset lasthash on promotion --- ts/interactions/conversationInteractions.ts | 1 + ts/node/sql.ts | 15 +++++++++++-- ts/receiver/closedGroups.ts | 4 ++++ ts/receiver/groupv2/handleGroupV2Message.ts | 15 +++++++++++-- ts/receiver/queuedJob.ts | 1 + ts/session/apis/snode_api/swarmPolling.ts | 21 +++++++++++++++++++ .../conversations/ConversationController.ts | 1 + ts/session/group/closed-group.ts | 8 ++++++- ts/session/types/with.ts | 1 + ts/state/ducks/metaGroups.ts | 6 ++++++ 10 files changed, 68 insertions(+), 5 deletions(-) diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 3fcb8326b5..583d3c382f 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -1010,6 +1010,7 @@ export async function promoteUsersInGroup({ sentAt, convo, markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier + messageHash: null, }); const groupMemberChange = await GroupUpdateMessageFactory.getPromotedControlMessage({ adminSecretKey: groupInWrapper.secretKey, diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 554b23e369..004887970c 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1769,13 +1769,24 @@ function getLastHashBySnode(convoId: string, snode: string, namespace: number) { } function getSeenMessagesByHashList(hashes: Array) { - const rows = assertGlobalInstance() + const fromSeenTableRows = assertGlobalInstance() .prepare( `SELECT * FROM ${SEEN_MESSAGE_TABLE} WHERE hash IN ( ${hashes.map(() => '?').join(', ')} );` ) .all(hashes); - return map(rows, row => row.hash); + const fromMessagesTableRows = compact( + assertGlobalInstance() + .prepare( + `SELECT messageHash FROM ${MESSAGES_TABLE} WHERE messageHash IN ( ${hashes.map(() => '?').join(', ')} )` + ) + .all(hashes) + ); + + const hashesFromSeen: Array = map(fromSeenTableRows, row => row.hash); + const hashesFromMessages: Array = map(fromMessagesTableRows, row => row.messageHash); + + return uniq(hashesFromSeen.concat(hashesFromMessages)); } function getExpiredMessages() { diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index 8324f09bb9..d4929b8532 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -635,6 +635,7 @@ async function handleClosedGroupNameChanged( sentAt: toNumber(envelope.timestamp), expireUpdate, markAlreadySent: false, // legacy groups support will be removed eventually + messageHash: null, // legacy groups }); if (!shouldOnlyAddUpdateMessage) { convo.set({ displayNameInProfile: newName }); @@ -699,6 +700,7 @@ async function handleClosedGroupMembersAdded( sentAt: toNumber(envelope.timestamp), expireUpdate, markAlreadySent: false, // legacy groups support will be removed eventually + messageHash: null, // legacy groups }); if (!shouldOnlyAddUpdateMessage) { @@ -793,6 +795,7 @@ async function handleClosedGroupMembersRemoved( sentAt: toNumber(envelope.timestamp), expireUpdate, markAlreadySent: false, // legacy groups support will be removed eventually + messageHash: null, // legacy groups }); convo.updateLastMessage(); } @@ -932,6 +935,7 @@ async function handleClosedGroupMemberLeft( sentAt: toNumber(envelope.timestamp), expireUpdate, markAlreadySent: false, // legacy groups support will be removed eventually + messageHash: null, // legacy groups }); convo.updateLastMessage(); // if a user just left and we are the admin, we remove him right away for everyone by sending a MEMBERS_REMOVED message so no need to add him as a zombie diff --git a/ts/receiver/groupv2/handleGroupV2Message.ts b/ts/receiver/groupv2/handleGroupV2Message.ts index 6c6ec0b0d0..2db57144b1 100644 --- a/ts/receiver/groupv2/handleGroupV2Message.ts +++ b/ts/receiver/groupv2/handleGroupV2Message.ts @@ -12,7 +12,7 @@ import { getSodiumRenderer } from '../../session/crypto'; import { WithDisappearingMessageUpdate } from '../../session/disappearing_messages/types'; import { ClosedGroup } from '../../session/group/closed-group'; import { PubKey } from '../../session/types'; -import { WithMessageHash } from '../../session/types/with'; +import { WithMessageHash, type WithMessageHashOrNull } from '../../session/types/with'; import { UserUtils } from '../../session/utils'; import { sleepFor } from '../../session/utils/Promise'; import { ed25519Str, stringToUint8Array } from '../../session/utils/String'; @@ -44,7 +44,8 @@ type GroupUpdateGeneric = { } & WithSignatureTimestamp & WithGroupPubkey & WithAuthor & - WithDisappearingMessageUpdate; + WithDisappearingMessageUpdate & + WithMessageHashOrNull; type GroupUpdateDetails = { updateMessage: SignalService.GroupUpdateMessage; @@ -226,6 +227,7 @@ async function handleGroupInfoChangeMessage({ signatureTimestamp, author, expireUpdate, + messageHash, }: GroupUpdateGeneric) { const sigValid = await verifySig({ pubKey: HexString.fromHexStringNoPrefix(groupPk), @@ -252,6 +254,7 @@ async function handleGroupInfoChangeMessage({ sentAt: signatureTimestamp, expireUpdate, markAlreadySent: true, + messageHash, }); break; @@ -264,6 +267,7 @@ async function handleGroupInfoChangeMessage({ sentAt: signatureTimestamp, expireUpdate, markAlreadySent: true, + messageHash, }); break; } @@ -298,6 +302,7 @@ async function handleGroupMemberChangeMessage({ signatureTimestamp, author, expireUpdate, + messageHash, }: GroupUpdateGeneric) { const convo = ConvoHub.use().get(groupPk); if (!convo) { @@ -327,6 +332,7 @@ async function handleGroupMemberChangeMessage({ sentAt: signatureTimestamp, expireUpdate, markAlreadySent: true, + messageHash, }; switch (change.type) { @@ -386,6 +392,7 @@ async function handleGroupUpdateMemberLeftNotificationMessage({ signatureTimestamp, author, expireUpdate, + messageHash, }: GroupUpdateGeneric) { // No need to verify sig, the author is already verified with the libsession.decrypt() const convo = ConvoHub.use().get(groupPk); @@ -401,6 +408,7 @@ async function handleGroupUpdateMemberLeftNotificationMessage({ sentAt: signatureTimestamp, expireUpdate, markAlreadySent: true, + messageHash, }); convo.set({ @@ -619,6 +627,9 @@ async function handleGroupUpdatePromoteMessage({ await LibSessionUtil.saveDumpsToDb(UserUtils.getOurPubKeyStrFromCache()); if (!found.invitePending) { + // yes, we really want to refetch the whole history of messages from that group... + await ConvoHub.use().resetLastHashesForConversation(groupPk); + // This group should already be polling based on if that author is pre-approved or we've already approved that group from another device. // Start polling from it, we will mark ourselves as admin once we get the first merge result, if needed. getSwarmPollingInstance().addGroupId(groupPk); diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts index fe38120303..6f3683d151 100644 --- a/ts/receiver/queuedJob.ts +++ b/ts/receiver/queuedJob.ts @@ -285,6 +285,7 @@ async function handleMessageFromPendingMember( groupPk: convoId, author: source, change: { isApproved: true }, + messageHash: null, }); } diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 7518a2f1f1..745dd71585 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -619,6 +619,10 @@ export class SwarmPolling { return { namespace, lastHash }; }) ); + window.log.debug( + `namespacesAndLastHashes for ${ed25519Str(pubkey)}:`, + JSON.stringify(namespacesAndLastHashes) + ); const allow401s = type === ConversationTypeEnum.GROUPV2; const results = await SnodeAPIRetrieve.retrieveNextMessagesNoRetries( @@ -630,6 +634,23 @@ export class SwarmPolling { allow401s ); + const namespacesAndLastHashesAfterFetch = await Promise.all( + namespaces.map(async namespace => { + const lastHash = await this.getLastHash(snodeEdkey, pubkey, namespace); + return { namespace, lastHash }; + }) + ); + + if ( + namespacesAndLastHashes.some(m => m) && + namespacesAndLastHashesAfterFetch.every(m => !m) + ) { + window.log.info( + `SwarmPolling: hashes for ${ed25519Str(pubkey)} have been reset while we were fetching new messages. discarding them....` + ); + return []; + } + if (!results.length) { return []; } diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index 2b5acaa120..bca40faefc 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -416,6 +416,7 @@ class ConvoController { } async resetLastHashesForConversation(groupPk: GroupPubkeyType) { + window.log.info(`resetLastHashesForConversation for ${ed25519Str(groupPk)}`); await getSwarmPollingInstance().resetLastHashesForConversation(groupPk); await Data.emptySeenMessageHashesForConversation(groupPk); } diff --git a/ts/session/group/closed-group.ts b/ts/session/group/closed-group.ts index bf89c4a5be..c30023a6bb 100644 --- a/ts/session/group/closed-group.ts +++ b/ts/session/group/closed-group.ts @@ -34,6 +34,7 @@ import { PreConditionFailed } from '../utils/errors'; import { ConversationTypeEnum } from '../../models/types'; import { NetworkTime } from '../../util/NetworkTime'; import { MessageQueue } from '../sending'; +import type { WithMessageHashOrNull } from '../types/with'; export type GroupInfo = { id: string; @@ -128,6 +129,7 @@ async function initiateClosedGroupUpdate( const dbMessageName = await addUpdateMessage({ diff: nameOnlyDiff, ...sharedDetails, + messageHash: null, // this is legacy groups }); await sendNewName(convo, diff.newName, dbMessageName.id as string); } @@ -138,6 +140,7 @@ async function initiateClosedGroupUpdate( const dbMessageAdded = await addUpdateMessage({ diff: joiningOnlyDiff, ...sharedDetails, + messageHash: null, // this is legacy groups }); await sendAddedMembers(convo, diff.added, dbMessageAdded.id as string, updateObj); } @@ -148,6 +151,7 @@ async function initiateClosedGroupUpdate( const dbMessageLeaving = await addUpdateMessage({ diff: leavingOnlyDiff, ...sharedDetails, + messageHash: null, // this is legacy groups }); await sendRemovedMembers(convo, diff.kicked, updatedMembers, dbMessageLeaving.id as string); } @@ -161,7 +165,8 @@ export async function addUpdateMessage({ sentAt, expireUpdate, markAlreadySent, -}: { + messageHash, +}: WithMessageHashOrNull & { convo: ConversationModel; diff: GroupDiff; sender: string; @@ -197,6 +202,7 @@ export async function addUpdateMessage({ source: sender, conversationId: convo.id, type: isUs ? 'outgoing' : 'incoming', + messageHash: messageHash || undefined, }; /** diff --git a/ts/session/types/with.ts b/ts/session/types/with.ts index edc9f8bd04..e2503eb3ae 100644 --- a/ts/session/types/with.ts +++ b/ts/session/types/with.ts @@ -2,6 +2,7 @@ import { PubkeyType } from 'libsession_util_nodejs'; import { Snode } from '../../data/types'; export type WithMessageHash = { messageHash: string }; +export type WithMessageHashOrNull = { messageHash: string | null }; export type WithTimestamp = { timestamp: number }; export type WithSignature = { signature: string }; export type WithSecretKey = { secretKey: Uint8Array }; diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index bdc2dce898..c1bafc0f8f 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -205,6 +205,7 @@ const initNewGroupInWrapper = createAsyncThunk( sentAt, convo, markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier + messageHash: null, }); groupMemberChange = await GroupUpdateMessageFactory.getWithoutHistoryControlMessage({ adminSecretKey: groupSecretKey, @@ -624,6 +625,7 @@ async function handleMemberAddedFromUI({ sentAt: createAtNetworkTimestamp, expireUpdate: expireDetails, markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier + messageHash: null, }; const updateMessagesToPush: Array = []; if (withHistory.length) { @@ -779,6 +781,7 @@ async function handleMemberRemovedFromUI({ : null, }, markAlreadySent: false, // the store below will mark the message as sent using dbMsgIdentifier + messageHash: null, }); removedControlMessage = await GroupUpdateMessageFactory.getRemovedControlMessage({ adminSecretKey: group.secretKey, @@ -864,6 +867,7 @@ async function handleNameChangeFromUI({ createAtNetworkTimestamp ), markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier + messageHash: null, }); // we want to send an update only if the change was made locally. @@ -992,6 +996,7 @@ const triggerFakeAvatarUpdate = createAsyncThunk( sentAt: createAtNetworkTimestamp, convo, markAlreadySent: false, // the store below will mark the message as sent with dbMsgIdentifier + messageHash: null, }); await msgModel.commit(); @@ -1169,6 +1174,7 @@ const inviteResponseReceived = createAsyncThunk( ); } await GroupSync.queueNewJobIfNeeded(groupPk); + await LibSessionUtil.saveDumpsToDb(groupPk); } catch (e) { window.log.info('inviteResponseReceived failed with', e.message); // only admins can do the steps above, but we don't want to throw if we are not an admin From 97da52113a76d84f822e6b6a40506036849ee431 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 13 Jan 2025 14:56:07 +1100 Subject: [PATCH 269/302] fix: track hashes for disappearing message timer changes too --- ts/interactions/conversationInteractions.ts | 2 + ts/models/conversation.ts | 5 +- ts/receiver/closedGroups.ts | 1 + ts/receiver/configMessage.ts | 3 ++ ts/receiver/groupv2/handleGroupV2Message.ts | 47 ++++++++++++------- ts/receiver/queuedJob.ts | 1 + .../DisappearingMessage_test.ts | 3 ++ 7 files changed, 45 insertions(+), 17 deletions(-) diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 583d3c382f..eda52b0a83 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -647,6 +647,7 @@ export async function setDisappearingMessagesByConvoId( fromSync: false, fromCurrentDevice: true, fromConfigMessage: false, + messageHash: null, }); } else { await conversation.updateExpireTimer({ @@ -655,6 +656,7 @@ export async function setDisappearingMessagesByConvoId( fromSync: false, fromCurrentDevice: true, fromConfigMessage: false, + messageHash: null, }); } } diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 97edd41ef2..8a3f1d073d 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -137,6 +137,7 @@ import { OpenGroupRequestCommonType } from '../data/types'; import { ConversationTypeEnum, CONVERSATION_PRIORITIES } from './types'; import { NetworkTime } from '../util/NetworkTime'; import { MessageQueue } from '../session/sending'; +import type { WithMessageHashOrNull } from '../session/types/with'; type InMemoryConvoInfos = { mentionedUs: boolean; @@ -897,7 +898,8 @@ export class ConversationModel extends Backbone.Model { fromCurrentDevice, shouldCommitConvo = true, existingMessage, - }: { + messageHash, + }: WithMessageHashOrNull & { providedDisappearingMode?: DisappearingMessageConversationModeType; providedExpireTimer?: number; providedSource?: string; @@ -1005,6 +1007,7 @@ export class ConversationModel extends Backbone.Model { source, fromSync, }, + messageHash: messageHash || undefined, }; if (!message) { diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts index d4929b8532..92c9f20916 100644 --- a/ts/receiver/closedGroups.ts +++ b/ts/receiver/closedGroups.ts @@ -327,6 +327,7 @@ export async function handleNewClosedGroup( fromSync: false, fromCurrentDevice: false, fromConfigMessage: false, + messageHash: null, // legacy groups }); await IncomingMessageCache.removeFromCache(envelope); diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index ca975076a5..7926ded3ee 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -278,6 +278,7 @@ async function handleUserProfileUpdate(result: IncomingUserResult): Promise { existingMessage: undefined, fromCurrentDevice: false, fromConfigMessage: false, + messageHash: null, }); await expect(promise).is.rejectedWith( 'updateExpireTimer() Disappearing messages are only supported int groups and private chats' @@ -587,6 +588,7 @@ describe('DisappearingMessage', () => { existingMessage: undefined, fromCurrentDevice: false, fromConfigMessage: false, + messageHash: null, }); expect(updateSuccess, 'should be true').to.be.true; }); @@ -611,6 +613,7 @@ describe('DisappearingMessage', () => { existingMessage: undefined, fromCurrentDevice: false, fromConfigMessage: false, + messageHash: null, }); expect(updateSuccess, 'should be true').to.be.true; expect( From c90b84ca9238b3fd0eac206bf0a6a2d5580a62fd Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 13 Jan 2025 16:06:52 +1100 Subject: [PATCH 270/302] fix: decline msg group request syncs correctly --- ts/interactions/conversationInteractions.ts | 1 - ts/receiver/configMessage.ts | 3 +- .../conversations/ConversationController.ts | 47 ++++++++++++------- ts/state/ducks/metaGroups.ts | 12 +++-- 4 files changed, 41 insertions(+), 22 deletions(-) diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index eda52b0a83..78144d6fcd 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -231,7 +231,6 @@ export async function declineConversationWithoutConfirm({ } if (PubKey.is03Pubkey(conversationId)) { - await UserGroupsWrapperActions.eraseGroup(conversationId); // when deleting a 03 group message request, we also need to remove the conversation altogether await ConvoHub.use().deleteGroup(conversationId, { deleteAllMessagesOnSwarm: false, diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts index 7926ded3ee..4d2c8d78eb 100644 --- a/ts/receiver/configMessage.ts +++ b/ts/receiver/configMessage.ts @@ -794,7 +794,8 @@ async function handleGroupUpdate(_latestEnvelopeTimestamp: number) { const groupsInDbButNotInWrapper = difference(allGroupsIdsInDb, allGroupsIdsInWrapper); window.log.info( - `we have to leave ${groupsInDbButNotInWrapper.length} 03 groups in DB compared to what is in the wrapper` + `we have to leave ${groupsInDbButNotInWrapper.length} 03 groups in DB compared to what is in the wrapper`, + groupsInDbButNotInWrapper ); for (let index = 0; index < groupsInDbButNotInWrapper.length; index++) { diff --git a/ts/session/conversations/ConversationController.ts b/ts/session/conversations/ConversationController.ts index bca40faefc..29fe7079c3 100644 --- a/ts/session/conversations/ConversationController.ts +++ b/ts/session/conversations/ConversationController.ts @@ -1,6 +1,6 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable more/no-then */ -import { ConvoVolatileType, GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; +import { GroupPubkeyType, PubkeyType, type ConvoVolatileType } from 'libsession_util_nodejs'; import { isEmpty, isNil } from 'lodash'; import AbortController from 'abort-controller'; @@ -20,7 +20,7 @@ import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/con import { removeAllClosedGroupEncryptionKeyPairs } from '../../receiver/closedGroups'; import { groupInfoActions } from '../../state/ducks/metaGroups'; import { getCurrentlySelectedConversationOutsideRedux } from '../../state/selectors/conversations'; -import { assertUnreachable } from '../../types/sqlSharedTypes'; +import { assertUnreachable, stringify } from '../../types/sqlSharedTypes'; import { MetaGroupWrapperActions, UserGroupsWrapperActions, @@ -284,9 +284,17 @@ class ConvoController { const groupInUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); - // send the leave message before we delete everything for this group (including the key!) + // Let's check if we still have a MetaGroupWrapper for this group. If we don't we won't be able to do anything.. + let metaGroupWrapperExists = false; + try { + await MetaGroupWrapperActions.infoGet(groupPk); + metaGroupWrapperExists = true; + } catch { + window.log.warn(`deleteGroup: MetaGroupWrapperActions for ${groupPk} does not exist.`); + } - if (sendLeaveMessage) { + // send the leave message before we delete everything for this group (including the key!) + if (sendLeaveMessage && metaGroupWrapperExists) { const failedToSendLeaveMessage = await leaveClosedGroup(groupPk, fromSyncMessage); if (PubKey.is03Pubkey(groupPk) && failedToSendLeaveMessage) { // this is caught and is adding an interaction notification message @@ -330,30 +338,36 @@ class ConvoController { } } } else { - // Let's check if we still have a MetaGroupWrapper for this group. If we don't we won't be able to do anything.. - let metaGroupWrapperExists = false; - try { - await MetaGroupWrapperActions.infoGet(groupPk); - metaGroupWrapperExists = true; - } catch { - window.log.warn(`deleteGroup: MetaGroupWrapperActions for ${groupPk} does not exist.`); - } if (metaGroupWrapperExists) { + let secretKey: Uint8Array | null = null; + let weAreLastAdmin = false; + // this is pretty ugly. We need to **try to check** if we are the last admin before we destroy. + // That **try** is because we might not have the data we need to check that. + // If we do manage to check it AND we are the last admin, + // we mark the group as destroyed before destroying it locally. try { const us = UserUtils.getOurPubKeyStrFromCache(); const allMembers = await MetaGroupWrapperActions.memberGetAll(groupPk); const otherAdminsCount = allMembers .filter(m => m.nominatedAdmin) .filter(m => m.pubkeyHex !== us).length; - const weAreLastAdmin = otherAdminsCount === 0; + // check if we are the last admin + weAreLastAdmin = otherAdminsCount === 0; const infos = await MetaGroupWrapperActions.infoGet(groupPk); const fromUserGroup = await UserGroupsWrapperActions.getGroup(groupPk); if (!infos || !fromUserGroup || isEmpty(infos) || isEmpty(fromUserGroup)) { + window.log.debug( + `deleteGroup: some required data not present for ${ed25519Str(groupPk)}: infos:${stringify(infos)} fromUserGroup:${stringify(fromUserGroup)}` + ); throw new Error('deleteGroup: some required data not present'); } - const { secretKey } = fromUserGroup; - - // check if we are the last admin + secretKey = fromUserGroup.secretKey; + } catch (e) { + window.log.info( + `deleteGroup: initialchecks failed with: ${e.message}. Considering this error as not important and deleting the group anyway.` + ); + } + try { if (secretKey && !isEmpty(secretKey) && (weAreLastAdmin || forceDestroyForAllMembers)) { const deleteAllMessagesSubRequest = deleteAllMessagesOnSwarm ? new DeleteAllFromGroupMsgNodeSubRequest({ @@ -378,7 +392,6 @@ class ConvoController { } } catch (e) { // if that group was already freed this will happen. - // we still want to delete it entirely though window.log.warn( `deleteGroup: MetaGroupWrapperActions failed with: ${e.message}... Keeping it as this should be a retryable error (we are admin case)` ); diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index c1bafc0f8f..96aecb7104 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -288,11 +288,17 @@ const handleUserGroupUpdate = createAsyncThunk( const state = payloadCreator.getState() as StateType; const groupPk = userGroup.pubkeyHex; if (state.groups.infos[groupPk] && state.groups.members[groupPk]) { - window.log.info('handleUserGroupUpdate group already present in redux slice'); + const infos = await MetaGroupWrapperActions.infoGet(groupPk); + const members = await MetaGroupWrapperActions.memberGetAll(groupPk); + window.log.info( + `handleUserGroupUpdate group ${ed25519Str(groupPk)} already present in redux slice`, + infos, + members + ); return { groupPk, - infos: await MetaGroupWrapperActions.infoGet(groupPk), - members: await MetaGroupWrapperActions.memberGetAll(groupPk), + infos, + members, }; } From 1bf1c5e47a9b0ff631dc065bcf340cfc1375d949 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 13 Jan 2025 16:11:32 +1100 Subject: [PATCH 271/302] fix: disable resend button when member is pending removal --- ts/components/MemberListItem.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index b7824b1455..10fc12b60a 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -247,13 +247,19 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP if (!shouldShowResendButton) { return null; } + const resendButtonDisabled = + memberStatus === 'INVITE_SENDING' || + memberStatus === 'PROMOTION_SENDING' || + memberStatus === 'REMOVED_MEMBER' || + memberStatus === 'REMOVED_MEMBER_AND_MESSAGES' || + memberStatus === 'REMOVED_UNKNOWN'; return ( { const group = await UserGroupsWrapperActions.getGroup(groupPk); const member = await MetaGroupWrapperActions.memberGet(groupPk, pubkey); From 815984442695cb008b6a2580b8f63e864f97cbc2 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 13 Jan 2025 17:45:21 +1100 Subject: [PATCH 272/302] chore: add datatestid to hide recoveryphrase dialog --- ts/components/dialog/HideRecoveryPasswordDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/components/dialog/HideRecoveryPasswordDialog.tsx b/ts/components/dialog/HideRecoveryPasswordDialog.tsx index c88d582e9e..3cd726e060 100644 --- a/ts/components/dialog/HideRecoveryPasswordDialog.tsx +++ b/ts/components/dialog/HideRecoveryPasswordDialog.tsx @@ -78,7 +78,7 @@ export function HideRecoveryPasswordDialog(props: HideRecoveryPasswordDialogProp showHeader={true} additionalClassName="no-body-padding" > - + Date: Tue, 14 Jan 2025 10:17:01 +1100 Subject: [PATCH 273/302] fix: black on orange for leftpane invitewarning --- ts/components/NoticeBanner.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx index 06e567ccba..2c58b57be7 100644 --- a/ts/components/NoticeBanner.tsx +++ b/ts/components/NoticeBanner.tsx @@ -53,7 +53,8 @@ export const NoticeBanner = (props: NoticeBannerProps) => { const StyledGroupInviteBanner = styled(Flex)` position: relative; - color: var(--warning-color); + color: var(--black-color); + background-color: var(--warning-color); font-size: var(--font-size-sm); padding: var(--margins-xs) var(--margins-lg); text-align: center; @@ -62,6 +63,8 @@ const StyledGroupInviteBanner = styled(Flex)` // when part a a dialog, invert it and make it narrower (as the dialog grows to make it fit) ${StyledRootDialog} & { max-width: 300px; + color: var(--warning-color); + background-color: inherit; } `; From 3ce39f2662f32dafdecadadb6cb8cf98165c655b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 14 Jan 2025 12:07:52 +1100 Subject: [PATCH 274/302] chore: add datatestid to errorMsg label updateGroupName --- ts/components/dialog/UpdateGroupNameDialog.tsx | 1 + ts/react.d.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx index 56835bf529..b9e7e46849 100644 --- a/ts/components/dialog/UpdateGroupNameDialog.tsx +++ b/ts/components/dialog/UpdateGroupNameDialog.tsx @@ -168,6 +168,7 @@ export function UpdateGroupNameDialog(props: { conversationId: string }) { animate={{ opacity: errorDisplayed ? 1 : 0 }} transition={{ duration: THEME_GLOBALS['--duration-modal-error-shown'] }} style={{ marginTop: errorDisplayed ? '0' : '-5px' }} + data-testid="error-message" > {errorMsg} diff --git a/ts/react.d.ts b/ts/react.d.ts index 7bd968dc13..db54dd4594 100644 --- a/ts/react.d.ts +++ b/ts/react.d.ts @@ -244,6 +244,7 @@ declare module 'react' { | 'copy-msg-from-details' | 'modal-heading' | 'modal-description' + | 'error-message' // modules profile name | 'module-conversation__user__profile-name' | 'module-message-search-result__header__name__profile-name' From 74cceb2498eef69da7953fcd62a148728de43771 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 14 Jan 2025 13:25:22 +1100 Subject: [PATCH 275/302] fix: forced orange for invite banner when outside of modal --- ts/components/NoticeBanner.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx index 2c58b57be7..aa27c9c9be 100644 --- a/ts/components/NoticeBanner.tsx +++ b/ts/components/NoticeBanner.tsx @@ -54,7 +54,7 @@ export const NoticeBanner = (props: NoticeBannerProps) => { const StyledGroupInviteBanner = styled(Flex)` position: relative; color: var(--black-color); - background-color: var(--warning-color); + background-color: var(--orange-color); font-size: var(--font-size-sm); padding: var(--margins-xs) var(--margins-lg); text-align: center; From 9c969d1e83b885e8ce9cb4f58a28fb157e762543 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 14 Jan 2025 15:14:10 +1100 Subject: [PATCH 276/302] chore: address PR comments --- ts/components/MemberListItem.tsx | 2 ++ ts/session/utils/job_runners/JobRunner.ts | 2 +- ts/session/utils/job_runners/jobs/GroupInviteJob.ts | 4 +--- ts/test/session/unit/onion/OnionPaths_test.ts | 1 - .../session/unit/utils/job_runner/JobRunner_test.ts | 1 - ts/themes/constants/colors.tsx | 12 ++++++++---- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx index 10fc12b60a..100286194c 100644 --- a/ts/components/MemberListItem.tsx +++ b/ts/components/MemberListItem.tsx @@ -247,12 +247,14 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP if (!shouldShowResendButton) { return null; } + const resendButtonDisabled = memberStatus === 'INVITE_SENDING' || memberStatus === 'PROMOTION_SENDING' || memberStatus === 'REMOVED_MEMBER' || memberStatus === 'REMOVED_MEMBER_AND_MESSAGES' || memberStatus === 'REMOVED_UNKNOWN'; + return ( { private async addJobUnchecked(job: PersistedJob) { this.jobsScheduled.push(cloneDeep(job)); - this.sortJobsList(); // keeping this here as it is not await (and await) + this.sortJobsList(); await this.writeJobsToDB(); // a job has been added, let's check if we should/can run it now this.planNextJobs(); diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 3cd5c223d1..58f84ce1f7 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -250,9 +250,7 @@ class GroupInviteJob extends PersistedJob { 10 * DURATION.SECONDS, controller ); - window.log.debug( - `GroupInvite: sendSingleMessage took ${Date.now() - start}ms. effectiveTimestamp: ${effectiveTimestamp}` - ); + if (effectiveTimestamp !== null) { failed = false; diff --git a/ts/test/session/unit/onion/OnionPaths_test.ts b/ts/test/session/unit/onion/OnionPaths_test.ts index 19e30654be..aa11667ace 100644 --- a/ts/test/session/unit/onion/OnionPaths_test.ts +++ b/ts/test/session/unit/onion/OnionPaths_test.ts @@ -157,7 +157,6 @@ describe('OnionPaths', () => { }); it('throws if we cannot find a valid edge snode', async () => { - TestUtils.stubWindowLog(); const badPool = generateFakeSnodes(0).map(m => { return { ...m, storage_server_version: [2, 1, 1] }; }); diff --git a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts index 1381145ec8..8c5048be78 100644 --- a/ts/test/session/unit/utils/job_runner/JobRunner_test.ts +++ b/ts/test/session/unit/utils/job_runner/JobRunner_test.ts @@ -242,7 +242,6 @@ describe('JobRunner SINGLE', () => { }); it('does await if there are jobs and at least one is running', async () => { - TestUtils.stubWindowLog(); await runner.loadJobsFromDb(); clock.tick(100); const job = getFakeSleepForJob(150); diff --git a/ts/themes/constants/colors.tsx b/ts/themes/constants/colors.tsx index 81db5b2cf2..b1717df227 100644 --- a/ts/themes/constants/colors.tsx +++ b/ts/themes/constants/colors.tsx @@ -42,6 +42,10 @@ const primaryRed = '#FF9C8E'; const dangerLight = '#E12D19'; const dangerDark = '#FF3A3A'; +// Warning +const warningLight = '#A64B00'; +const warningDark = '#FCB159'; + // Disabled const disabledLight = '#6D6D6D'; const disabledDark = '#A1A2A1'; @@ -135,7 +139,7 @@ type Themes = Record; // Classic Light const classicLightPrimary = primaryGreen; const classicLightDanger = dangerLight; -const classicLightWarning = '#A64B00'; +const classicLightWarning = warningLight; const classicLightDisabled = disabledLight; const classicLight0 = '#000000'; const classicLight1 = '#6D6D6D'; @@ -148,7 +152,7 @@ const classicLight6 = '#FFFFFF'; // Classic Dark const classicDarkPrimary = primaryGreen; const classicDarkDanger = dangerDark; -const classicDarkWarning = '#FCB159'; +const classicDarkWarning = warningDark; const classicDarkDisabled = disabledDark; const classicDark0 = '#000000'; const classicDark1 = '#1B1B1B'; @@ -161,7 +165,7 @@ const classicDark6 = '#FFFFFF'; // Ocean Light const oceanLightPrimary = primaryBlue; const oceanLightDanger = dangerLight; -const oceanLightWarning = '#A64B00'; +const oceanLightWarning = warningLight; const oceanLightDisabled = disabledLight; const oceanLight0 = '#000000'; const oceanLight1 = '#19345D'; @@ -175,7 +179,7 @@ const oceanLight7 = '#FCFFFF'; // Ocean Dark const oceanDarkPrimary = primaryBlue; const oceanDarkDanger = dangerDark; -const oceanDarkWarning = '#FCB159'; +const oceanDarkWarning = warningDark; const oceanDarkDisabled = disabledDark; const oceanDark0 = '#000000'; const oceanDark1 = '#1A1C28'; From 8005f6eed6cfe9acaeaca4abafa3651d1aa8a781 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 14 Jan 2025 16:12:09 +1100 Subject: [PATCH 277/302] fix: remove GroupPromoteJob as GroupInvite does it all it also takes care of updating the "sending" state for invite or promote --- ts/interactions/conversationInteractions.ts | 4 +- .../utils/job_runners/jobs/GroupInviteJob.ts | 10 +- .../utils/job_runners/jobs/GroupPromoteJob.ts | 157 ------------------ 3 files changed, 6 insertions(+), 165 deletions(-) delete mode 100644 ts/session/utils/job_runners/jobs/GroupPromoteJob.ts diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts index 78144d6fcd..68643a2e00 100644 --- a/ts/interactions/conversationInteractions.ts +++ b/ts/interactions/conversationInteractions.ts @@ -54,11 +54,11 @@ import { sendInviteResponseToGroup } from '../session/sending/group/GroupInviteR import { NetworkTime } from '../util/NetworkTime'; import { ClosedGroup } from '../session'; import { GroupUpdateMessageFactory } from '../session/messages/message_factory/group/groupUpdateMessageFactory'; -import { GroupPromote } from '../session/utils/job_runners/jobs/GroupPromoteJob'; import { MessageSender } from '../session/sending'; import { StoreGroupRequestFactory } from '../session/apis/snode_api/factories/StoreGroupRequestFactory'; import { DURATION } from '../session/constants'; import type { LocalizerComponentPropsObject } from '../localization/localeTools'; +import { GroupInvite } from '../session/utils/job_runners/jobs/GroupInviteJob'; export async function copyPublicKeyByConvoId(convoId: string) { if (OpenGroupUtils.isOpenGroupV2(convoId)) { @@ -1053,6 +1053,6 @@ export async function promoteUsersInGroup({ for (let index = 0; index < membersHex.length; index++) { const member = membersHex[index]; // eslint-disable-next-line no-await-in-loop - await GroupPromote.addJob({ groupPk, member }); + await GroupInvite.addJob({ groupPk, member, inviteAsAdmin: true, forceUnrevoke: true }); } } diff --git a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts index 58f84ce1f7..0eff4695cb 100644 --- a/ts/session/utils/job_runners/jobs/GroupInviteJob.ts +++ b/ts/session/utils/job_runners/jobs/GroupInviteJob.ts @@ -251,7 +251,6 @@ class GroupInviteJob extends PersistedJob { controller ); - if (effectiveTimestamp !== null) { failed = false; } @@ -265,11 +264,6 @@ class GroupInviteJob extends PersistedJob { `${jobType} with groupPk:"${groupPk}" member: ${member} id:"${identifier}" finished. failed:${failed}` ); try { - if (failed) { - await MetaGroupWrapperActions.memberSetInviteFailed(groupPk, member); - } else { - await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); - } // Depending on this field, we either send an invite or an invite-as-admin message. // When we do send an invite-as-admin we also need to update the promoted state, so that the invited members // knows he needs to accept the promotion when accepting the invite @@ -279,6 +273,10 @@ class GroupInviteJob extends PersistedJob { } else { await MetaGroupWrapperActions.memberSetPromotionSent(groupPk, member); } + } else if (failed) { + await MetaGroupWrapperActions.memberSetInviteFailed(groupPk, member); + } else { + await MetaGroupWrapperActions.memberSetInviteSent(groupPk, member); } } catch (e) { window.log.warn( diff --git a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts b/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts deleted file mode 100644 index 2346c3ab7e..0000000000 --- a/ts/session/utils/job_runners/jobs/GroupPromoteJob.ts +++ /dev/null @@ -1,157 +0,0 @@ -import { GroupPubkeyType, PubkeyType } from 'libsession_util_nodejs'; -import { isNumber } from 'lodash'; -import { v4 } from 'uuid'; -import { UserUtils } from '../..'; -import { groupInfoActions } from '../../../../state/ducks/metaGroups'; -import { - MetaGroupWrapperActions, - UserGroupsWrapperActions, -} from '../../../../webworker/workers/browser/libsession_worker_interface'; -import { SnodeNamespaces } from '../../../apis/snode_api/namespaces'; -import { SnodeGroupSignature } from '../../../apis/snode_api/signature/groupSignature'; -import { PubKey } from '../../../types'; -import { runners } from '../JobRunner'; -import { - AddJobCheckReturn, - GroupPromotePersistedData, - PersistedJob, - RunJobResult, -} from '../PersistedJob'; -import { MessageQueue } from '../../../sending'; -import { DURATION } from '../../../constants'; - -const defaultMsBetweenRetries = 10000; -const defaultMaxAttempts = 1; - -type JobExtraArgs = { - groupPk: GroupPubkeyType; - member: PubkeyType; -}; - -export function shouldAddJob(args: JobExtraArgs) { - if (UserUtils.isUsFromCache(args.member)) { - return false; - } - - return true; -} - -async function addJob({ groupPk, member }: JobExtraArgs) { - if (shouldAddJob({ groupPk, member })) { - const groupPromoteJob = new GroupPromoteJob({ - groupPk, - member, - nextAttemptTimestamp: Date.now(), - }); - window.log.debug(`addGroupPromoteJob: adding group promote for ${groupPk}:${member} `); - await runners.groupPromoteJobRunner.addJob(groupPromoteJob); - window?.inboxStore?.dispatch( - groupInfoActions.refreshGroupDetailsFromWrapper({ groupPk }) as any - ); - } -} - -class GroupPromoteJob extends PersistedJob { - constructor({ - groupPk, - member, - nextAttemptTimestamp, - maxAttempts, - currentRetry, - identifier, - }: Pick & - Partial< - Pick< - GroupPromotePersistedData, - 'nextAttemptTimestamp' | 'identifier' | 'maxAttempts' | 'currentRetry' - > - >) { - super({ - jobType: 'GroupPromoteJobType', - identifier: identifier || v4(), - member, - groupPk, - delayBetweenRetries: defaultMsBetweenRetries, - maxAttempts: isNumber(maxAttempts) ? maxAttempts : defaultMaxAttempts, - nextAttemptTimestamp: nextAttemptTimestamp || Date.now() + defaultMsBetweenRetries, - currentRetry: isNumber(currentRetry) ? currentRetry : 0, - }); - } - - public async run(): Promise { - const { groupPk, member, jobType, identifier } = this.persistedData; - - window.log.info( - `running job ${jobType} with groupPk:"${groupPk}" member: ${member} id:"${identifier}" ` - ); - const group = await UserGroupsWrapperActions.getGroup(groupPk); - if (!group || !group.secretKey || !group.name) { - window.log.warn(`GroupPromoteJob: Did not find group in wrapper or no valid info in wrapper`); - return RunJobResult.PermanentFailure; - } - - if (UserUtils.isUsFromCache(member)) { - return RunJobResult.Success; - } - let failed = true; - try { - const message = await SnodeGroupSignature.getGroupPromoteMessage({ - member, - secretKey: group.secretKey, - groupPk, - groupName: group.name, - }); - - const storedAt = await MessageQueue.use().sendTo1o1NonDurably({ - message, - namespace: SnodeNamespaces.Default, - pubkey: PubKey.cast(member), - }); - if (storedAt !== null) { - failed = false; - } - } finally { - try { - if (failed) { - await MetaGroupWrapperActions.memberSetPromotionFailed(groupPk, member); - } else { - await MetaGroupWrapperActions.memberSetPromotionSent(groupPk, member); - } - } catch (e) { - window.log.warn('GroupPromoteJob memberSetPromoted failed with', e.message); - } - } - // return true so this job is marked as a success and we don't need to retry it - return RunJobResult.Success; - } - - public serializeJob(): GroupPromotePersistedData { - return super.serializeBase(); - } - - public nonRunningJobsToRemove(_jobs: Array) { - return []; - } - - public addJobCheck(jobs: Array): AddJobCheckReturn { - // avoid adding the same job if the exact same one is already planned - const hasSameJob = jobs.some(j => { - return j.groupPk === this.persistedData.groupPk && j.member === this.persistedData.member; - }); - - if (hasSameJob) { - return 'skipAddSameJobPresent'; - } - - return null; - } - - public getJobTimeoutMs(): number { - return 15 * DURATION.SECONDS; - } -} - -export const GroupPromote = { - GroupPromoteJob, - addJob, -}; From 992438185714897630b49cb7c7a44fdee129de90 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 14 Jan 2025 16:31:58 +1100 Subject: [PATCH 278/302] fix: allow to delete msg locally only for groupv2 --- .../conversations/unsendingInteractions.ts | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index 3e8df466cf..e92d6a6c7d 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -242,11 +242,7 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally( // LEGACY GROUPS -- we cannot delete on the swarm (just unsend which is done separately) if (conversation.isClosedGroup() && PubKey.is05Pubkey(pubkey)) { window.log.info('Cannot delete message from a closed group swarm, so we just complete delete.'); - await Promise.all( - messages.map(async message => { - return deleteMessageLocallyOnly({ conversation, message, deletionType: 'complete' }); - }) - ); + await deleteMessageLocallyOnly({ conversation, messages, deletionType: 'complete' }); return; } window.log.info( @@ -261,11 +257,7 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally( 'deleteMessagesFromSwarmAndCompletelyLocally: some messages failed to be deleted. Maybe they were already deleted?' ); } - await Promise.all( - messages.map(async message => { - return deleteMessageLocallyOnly({ conversation, message, deletionType: 'complete' }); - }) - ); + await deleteMessageLocallyOnly({ conversation, messages, deletionType: 'complete' }); } /** @@ -281,11 +273,8 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( window.log.info( 'Cannot delete messages from a legacy closed group swarm, so we just markDeleted.' ); - await Promise.all( - messages.map(async message => { - return deleteMessageLocallyOnly({ conversation, message, deletionType: 'markDeleted' }); - }) - ); + await deleteMessageLocallyOnly({ conversation, messages, deletionType: 'markDeleted' }); + return; } @@ -301,11 +290,7 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( 'deleteMessagesFromSwarmAndMarkAsDeletedLocally: some messages failed to be deleted but still removing the messages content... ' ); } - await Promise.all( - messages.map(async message => { - return deleteMessageLocallyOnly({ conversation, message, deletionType: 'markDeleted' }); - }) - ); + await deleteMessageLocallyOnly({ conversation, messages, deletionType: 'markDeleted' }); } /** @@ -315,19 +300,25 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( */ export async function deleteMessageLocallyOnly({ conversation, - message, + messages, deletionType, }: WithLocalMessageDeletionType & { conversation: ConversationModel; - message: MessageModel; + messages: Array; }) { - if (deletionType === 'complete') { - // remove the message from the database - await conversation.removeMessage(message.get('id')); - } else { - // just mark the message as deleted but still show in conversation - await message.markAsDeleted(); + for (let index = 0; index < messages.length; index++) { + const message = messages[index]; + if (deletionType === 'complete') { + // remove the message from the database + // eslint-disable-next-line no-await-in-loop + await conversation.removeMessage(message.get('id')); + } else { + // just mark the message as deleted but still show in conversation + // eslint-disable-next-line no-await-in-loop + await message.markAsDeleted(); + } } + conversation.updateLastMessage(); } @@ -391,7 +382,7 @@ const doDeleteSelectedMessagesInSOGS = async ( if (msgToDeleteLocally) { return deleteMessageLocallyOnly({ conversation, - message: msgToDeleteLocally, + messages: [msgToDeleteLocally], deletionType: 'complete', }); } @@ -430,11 +421,9 @@ const doDeleteSelectedMessages = async ({ return; } - /** - * Note: groupv2 support deleteForEveryone only. - * For groupv2, a user can delete only his messages, but an admin can delete the messages of anyone. - * */ - if (deleteForEveryone || conversation.isClosedGroupV2()) { + // Note: a groupv2 member can delete messages for everyone if they are the admin, or if that message is theirs. + + if (deleteForEveryone) { if (conversation.isClosedGroupV2()) { const convoId = conversation.id; if (!PubKey.is03Pubkey(convoId)) { @@ -466,6 +455,16 @@ const doDeleteSelectedMessages = async ({ return; } + // delete just for me in a groupv2 only means delete locally (not even synced to our other devices) + if (conversation.isClosedGroupV2()) { + await deleteMessageLocallyOnly({ + conversation, + messages: selectedMessages, + deletionType: 'markDeleted', + }); + return; + } + // delete just for me in a legacy closed group only means delete locally if (conversation.isClosedGroup()) { await deleteMessagesFromSwarmAndMarkAsDeletedLocally(conversation, selectedMessages); From 1f39533abdbdc8fa169d5ba06ffbebc8a01cdd06 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Tue, 14 Jan 2025 17:32:23 +1100 Subject: [PATCH 279/302] fix: make cancel button not hidden on light mode --- ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx | 1 - ts/themes/classicDark.ts | 1 + ts/themes/classicLight.ts | 1 + ts/themes/oceanDark.ts | 1 + ts/themes/oceanLight.ts | 1 + ts/themes/variableColors.tsx | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx index bfa7909ae6..9499f59cec 100644 --- a/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx +++ b/ts/components/dialog/blockOrUnblock/BlockOrUnblockDialog.tsx @@ -101,7 +101,6 @@ export const BlockOrUnblockDialog = ({ pubkeys, action, onConfirmed }: NonNullab /> Date: Wed, 15 Jan 2025 14:51:36 +1100 Subject: [PATCH 280/302] fix: only trigger remove of members that are not in the group --- ts/components/dialog/UpdateGroupMembersDialog.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx index c5b25dcdb2..50cbca8887 100644 --- a/ts/components/dialog/UpdateGroupMembersDialog.tsx +++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx @@ -175,11 +175,15 @@ export const UpdateGroupMembersDialog = (props: Props) => { const onClickOK = async () => { if (PubKey.is03Pubkey(conversationId)) { + const toRemoveAndCurrentMembers = membersToRemove.filter(m => + existingMembers.includes(m as PubkeyType) + ); + const groupv2Action = groupInfoActions.currentDeviceGroupMembersChange({ groupPk: conversationId, addMembersWithHistory: [], addMembersWithoutHistory: [], - removeMembers: membersToRemove as Array, + removeMembers: toRemoveAndCurrentMembers as Array, alsoRemoveMessages, }); dispatch(groupv2Action as any); From a80bbb00eb08fb442093d96b57b412405b2778cf Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Jan 2025 09:30:03 +1100 Subject: [PATCH 281/302] fix: attempt to fix bug when swarm reports no groupconfig attempt to fix SES-3180 --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f80009386d..8448927cd1 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "fs-extra": "9.0.0", "glob": "10.3.10", "image-type": "^4.1.0", - "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.11/libsession_util_nodejs-v0.4.11.tar.gz", + "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.12/libsession_util_nodejs-v0.4.12.tar.gz", "libsodium-wrappers-sumo": "^0.7.9", "linkify-it": "^4.0.1", "lodash": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index a77540814a..73bc16ebdb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4944,9 +4944,9 @@ levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" -"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.11/libsession_util_nodejs-v0.4.11.tar.gz": - version "0.4.11" - resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.11/libsession_util_nodejs-v0.4.11.tar.gz#ea6ab3fc11088ede3c79ddc5b702b17af842f774" +"libsession_util_nodejs@https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.12/libsession_util_nodejs-v0.4.12.tar.gz": + version "0.4.12" + resolved "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.12/libsession_util_nodejs-v0.4.12.tar.gz#6f0eae5c81f9a3e5101e038dbb7c82a9d50bfb7a" dependencies: cmake-js "7.2.1" node-addon-api "^6.1.0" From f3cfe577643e485b509a08fe156f5159daf04c2b Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Jan 2025 14:00:45 +1100 Subject: [PATCH 282/302] chore: cleanup requestresponse & communityinvitation control msg --- .../conversation/SessionMessagesList.tsx | 26 +++---- .../message/message-item/GroupInvitation.tsx | 52 +++++++++---- .../message-item/MessageRequestResponse.tsx | 25 +++++-- ts/models/conversation.ts | 1 + ts/models/message.ts | 75 ++++--------------- ts/node/sql.ts | 1 + ts/session/apis/snode_api/swarmPolling.ts | 2 +- ts/state/ducks/conversations.ts | 14 +--- ts/state/ducks/types.ts | 2 +- ts/state/selectors/conversations.ts | 17 +++-- ts/state/selectors/messages.ts | 29 +++++++ 11 files changed, 127 insertions(+), 117 deletions(-) diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx index 818f6f1ad1..d0b1d0a562 100644 --- a/ts/components/conversation/SessionMessagesList.tsx +++ b/ts/components/conversation/SessionMessagesList.tsx @@ -2,15 +2,8 @@ import { useLayoutEffect, useState } from 'react'; import { useSelector } from 'react-redux'; import useKey from 'react-use/lib/useKey'; -import { - PropsForDataExtractionNotification, - PropsForMessageRequestResponse, -} from '../../models/messageType'; -import { - PropsForExpirationTimer, - PropsForGroupInvitation, - PropsForGroupUpdate, -} from '../../state/ducks/conversations'; +import { PropsForDataExtractionNotification } from '../../models/messageType'; +import { PropsForExpirationTimer, PropsForGroupUpdate } from '../../state/ducks/conversations'; import { getOldBottomMessageId, getOldTopMessageId, @@ -18,7 +11,7 @@ import { } from '../../state/selectors/conversations'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { MessageDateBreak } from './message/message-item/DateBreak'; -import { GroupInvitation } from './message/message-item/GroupInvitation'; +import { CommunityInvitation } from './message/message-item/GroupInvitation'; import { GroupUpdateMessage } from './message/message-item/GroupUpdateMessage'; import { Message } from './message/message-item/Message'; import { MessageRequestResponse } from './message/message-item/MessageRequestResponse'; @@ -127,14 +120,17 @@ export const SessionMessagesList = (props: { } if (messageProps.message?.messageType === 'group-invitation') { - const msgProps = messageProps.message.props as PropsForGroupInvitation; - return [, ...componentToMerge]; + return [ + , + ...componentToMerge, + ]; } if (messageProps.message?.messageType === 'message-request-response') { - const msgProps = messageProps.message.props as PropsForMessageRequestResponse; - - return [, ...componentToMerge]; + return [ + , + ...componentToMerge, + ]; } if (messageProps.message?.messageType === 'data-extraction') { diff --git a/ts/components/conversation/message/message-item/GroupInvitation.tsx b/ts/components/conversation/message/message-item/GroupInvitation.tsx index 8265ea326f..35c5ab852c 100644 --- a/ts/components/conversation/message/message-item/GroupInvitation.tsx +++ b/ts/components/conversation/message/message-item/GroupInvitation.tsx @@ -2,12 +2,18 @@ import classNames from 'classnames'; import styled from 'styled-components'; +import { useMemo } from 'react'; import { acceptOpenGroupInvitation } from '../../../../interactions/messageInteractions'; -import { PropsForGroupInvitation } from '../../../../state/ducks/conversations'; import { SessionIconButton } from '../../../icon'; import { ExpirableReadableMessage } from './ExpirableReadableMessage'; - -const StyledGroupInvitation = styled.div` +import { + useMessageCommunityInvitationFullUrl, + useMessageCommunityInvitationCommunityName, + useMessageDirection, +} from '../../../../state/selectors'; +import type { WithMessageId } from '../../../../session/types/with'; + +const StyledCommunityInvitation = styled.div` background-color: var(--message-bubbles-received-background-color); &.invitation-outgoing { @@ -67,14 +73,30 @@ const StyledIconContainer = styled.div` border-radius: 100%; `; -export const GroupInvitation = (props: PropsForGroupInvitation) => { - const { messageId } = props; +export const CommunityInvitation = ({ messageId }: WithMessageId) => { + const messageDirection = useMessageDirection(messageId); const classes = ['group-invitation']; - if (props.direction === 'outgoing') { + const fullUrl = useMessageCommunityInvitationFullUrl(messageId); + const communityName = useMessageCommunityInvitationCommunityName(messageId); + + const hostname = useMemo(() => { + try { + const url = new URL(fullUrl || ''); + return url.origin; + } catch (e) { + window?.log?.warn('failed to get hostname from open groupv2 invitation', fullUrl); + return ''; + } + }, [fullUrl]); + + if (messageDirection === 'outgoing') { classes.push('invitation-outgoing'); } - const openGroupInvitation = window.i18n('communityInvitation'); + + if (!fullUrl || !hostname) { + return null; + } return ( { key={`readable-message-${messageId}`} dataTestId="control-message" > - +
{ - acceptOpenGroupInvitation(props.acceptUrl, props.serverName); + acceptOpenGroupInvitation(fullUrl, communityName); }} /> - {props.serverName} - {openGroupInvitation} - {props.url} + {communityName} + {window.i18n('communityInvitation')} + {hostname}
- + ); }; diff --git a/ts/components/conversation/message/message-item/MessageRequestResponse.tsx b/ts/components/conversation/message/message-item/MessageRequestResponse.tsx index 95b9504da3..8d7734dcc9 100644 --- a/ts/components/conversation/message/message-item/MessageRequestResponse.tsx +++ b/ts/components/conversation/message/message-item/MessageRequestResponse.tsx @@ -1,17 +1,28 @@ import { useNicknameOrProfileNameOrShortenedPubkey } from '../../../../hooks/useParamSelector'; -import { PropsForMessageRequestResponse } from '../../../../models/messageType'; -import { UserUtils } from '../../../../session/utils'; +import type { WithMessageId } from '../../../../session/types/with'; +import { + useMessageAuthorIsUs, + useMessageIsUnread, + useMessageReceivedAt, +} from '../../../../state/selectors'; +import { useSelectedConversationKey } from '../../../../state/selectors/selectedConversation'; import { Flex } from '../../../basic/Flex'; import { Localizer } from '../../../basic/Localizer'; import { SpacerSM, TextWithChildren } from '../../../basic/Text'; import { ReadableMessage } from './ReadableMessage'; -// Note this should not respond to the disappearing message conversation setting so we use the ReadableMessage -export const MessageRequestResponse = (props: PropsForMessageRequestResponse) => { - const { messageId, isUnread, receivedAt, conversationId } = props; +// Note: this should not respond to the disappearing message conversation setting so we use the ReadableMessage directly +export const MessageRequestResponse = ({ messageId }: WithMessageId) => { + const conversationId = useSelectedConversationKey(); + const receivedAt = useMessageReceivedAt(messageId); + const isUnread = useMessageIsUnread(messageId) || false; + const isUs = useMessageAuthorIsUs(messageId); const name = useNicknameOrProfileNameOrShortenedPubkey(conversationId); - const isFromSync = props.source === UserUtils.getOurPubKeyStrFromCache(); + + if (!conversationId || !messageId) { + return null; + } return ( > - {isFromSync ? ( + {isUs ? ( ({ conversationId, messageId: m }))) ); diff --git a/ts/models/message.ts b/ts/models/message.ts index 9942888f9d..c01f992e9e 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -25,7 +25,6 @@ import { MessageGroupUpdate, MessageModelType, PropsForDataExtractionNotification, - PropsForMessageRequestResponse, fillMessageAttributesWithDefaults, } from './messageType'; @@ -87,7 +86,7 @@ import { Storage } from '../util/storage'; import { ConversationModel } from './conversation'; import { READ_MESSAGE_STATE } from './conversationAttributes'; import { ConversationInteractionStatus, ConversationInteractionType } from '../interactions/types'; -import { LastMessageStatusType } from '../state/ducks/types'; +import { LastMessageStatusType, type PropsForCallNotification } from '../state/ducks/types'; import { getGroupDisplayPictureChangeStr, getGroupNameChangeStr, @@ -132,8 +131,7 @@ export class MessageModel extends Backbone.Model { const propsForGroupInvitation = this.getPropsForGroupInvitation(); const propsForGroupUpdateMessage = this.getPropsForGroupUpdateMessage(); const propsForTimerNotification = this.getPropsForTimerNotification(); - const propsForExpiringMessage = this.getPropsForExpiringMessage(); - const propsForMessageRequestResponse = this.getPropsForMessageRequestResponse(); + const isMessageResponse = this.isMessageRequestResponse(); const propsForQuote = this.getPropsForQuote(); const callNotificationType = this.get('callNotificationType'); const interactionNotification = this.getInteractionNotification(); @@ -144,8 +142,8 @@ export class MessageModel extends Backbone.Model { if (propsForDataExtractionNotification) { messageProps.propsForDataExtractionNotification = propsForDataExtractionNotification; } - if (propsForMessageRequestResponse) { - messageProps.propsForMessageRequestResponse = propsForMessageRequestResponse; + if (isMessageResponse) { + messageProps.propsForMessageRequestResponse = isMessageResponse; } if (propsForGroupInvitation) { messageProps.propsForGroupInvitation = propsForGroupInvitation; @@ -160,17 +158,12 @@ export class MessageModel extends Backbone.Model { messageProps.propsForQuote = propsForQuote; } - if (propsForExpiringMessage) { - messageProps.propsForExpiringMessage = propsForExpiringMessage; - } - if (callNotificationType) { - messageProps.propsForCallNotification = { + const propsForCallNotification: PropsForCallNotification = { + messageId: this.id, notificationType: callNotificationType, - receivedAt: this.get('received_at') || Date.now(), - isUnread: this.isUnread(), - ...this.getPropsForExpiringMessage(), }; + messageProps.propsForCallNotification = propsForCallNotification; } if (interactionNotification) { @@ -449,7 +442,7 @@ export class MessageModel extends Backbone.Model { } } - public getPropsForExpiringMessage(): PropsForExpiringMessage { + private getPropsForExpiringMessage(): PropsForExpiringMessage { const expirationType = this.getExpirationType(); const expirationDurationMs = this.getExpireTimerSeconds() ? this.getExpireTimerSeconds() * DURATION.SECONDS @@ -477,7 +470,7 @@ export class MessageModel extends Backbone.Model { }; } - public getPropsForTimerNotification(): PropsForExpirationTimer | null { + private getPropsForTimerNotification(): PropsForExpirationTimer | null { if (!this.isExpirationTimerUpdate()) { return null; } @@ -514,31 +507,19 @@ export class MessageModel extends Backbone.Model { return basicProps; } - public getPropsForGroupInvitation(): PropsForGroupInvitation | null { + private getPropsForGroupInvitation(): PropsForGroupInvitation | null { const invitation = this.getCommunityInvitation(); if (!invitation || !invitation.url) { return null; } - let serverAddress = ''; - - try { - const url = new URL(invitation.url); - serverAddress = url.origin; - } catch (e) { - window?.log?.warn('failed to get hostname from open groupv2 invitation', invitation); - } return { serverName: invitation.name, - url: serverAddress, - acceptUrl: invitation.url, - receivedAt: this.get('received_at'), - isUnread: this.isUnread(), - ...this.getPropsForExpiringMessage(), + fullUrl: invitation.url, }; } - public getPropsForDataExtractionNotification(): PropsForDataExtractionNotification | null { + private getPropsForDataExtractionNotification(): PropsForDataExtractionNotification | null { if (!this.isDataExtractionNotification()) { return null; } @@ -560,31 +541,7 @@ export class MessageModel extends Backbone.Model { }; } - public getPropsForMessageRequestResponse(): PropsForMessageRequestResponse | null { - if (!this.isMessageRequestResponse()) { - return null; - } - const messageRequestResponse = this.get('messageRequestResponse'); - - if (!messageRequestResponse) { - window.log.warn('messageRequestResponse should not happen'); - return null; - } - - const contact = findAndFormatContact(messageRequestResponse.source); - - return { - ...messageRequestResponse, - name: contact.profileName || contact.name || messageRequestResponse.source, - messageId: this.id, - receivedAt: this.get('received_at'), - isUnread: this.isUnread(), - conversationId: this.get('conversationId'), - source: this.get('source'), - }; - } - - public getPropsForGroupUpdateMessage(): PropsForGroupUpdate | null { + private getPropsForGroupUpdateMessage(): PropsForGroupUpdate | null { const groupUpdate = this.getGroupUpdateAsArray(); if (!groupUpdate || isEmpty(groupUpdate)) { return null; @@ -782,7 +739,7 @@ export class MessageModel extends Backbone.Model { return props; } - public getPropsForPreview(): Array | null { + private getPropsForPreview(): Array | null { const previews = this.get('preview') || null; if (!previews || previews.length === 0) { @@ -807,11 +764,11 @@ export class MessageModel extends Backbone.Model { }); } - public getPropsForReacts(): ReactionList | null { + private getPropsForReacts(): ReactionList | null { return this.get('reacts') || null; } - public getPropsForQuote(): PropsForQuote | null { + private getPropsForQuote(): PropsForQuote | null { return this.get('quote') || null; } diff --git a/ts/node/sql.ts b/ts/node/sql.ts index 004887970c..bfdf72500a 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1205,6 +1205,7 @@ function cleanUpExpirationTimerUpdateHistory( ) .all({ conversationId }); + // we keep at most one, so if we have <= 1, we can just return that nothing was removed. if (rows.length <= 1) { return []; } diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index 745dd71585..189b84cdd0 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -458,7 +458,7 @@ export class SwarmPolling { resultsFromAllNamespaces ); window.log.debug( - `SwarmPolling: received confMessages:${confMessages?.length || 0}, revokedMessages:${revokedMessages?.length || 0}, , otherMessages:${otherMessages?.length || 0}, ` + `SwarmPolling: received for ${ed25519Str(pubkey)} confMessages:${confMessages?.length || 0}, revokedMessages:${revokedMessages?.length || 0}, , otherMessages:${otherMessages?.length || 0}, ` ); // We always handle the config messages first (for groups 03 or our own messages) await this.handleUserOrGroupConfMessages({ confMessages, pubkey, type }); diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 6444ce2034..f59c0e7be8 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -11,11 +11,7 @@ import { ConversationAttributes, ConversationNotificationSettingType, } from '../../models/conversationAttributes'; -import { - MessageModelType, - PropsForDataExtractionNotification, - PropsForMessageRequestResponse, -} from '../../models/messageType'; +import { MessageModelType, PropsForDataExtractionNotification } from '../../models/messageType'; import { ConvoHub } from '../../session/conversations'; import { DisappearingMessages } from '../../session/disappearing_messages'; import { @@ -36,13 +32,12 @@ import { WithConvoId, WithMessageHash, WithMessageId } from '../../session/types export type MessageModelPropsWithoutConvoProps = { propsForMessage: PropsForMessageWithoutConvoProps; - propsForExpiringMessage?: PropsForExpiringMessage; propsForGroupInvitation?: PropsForGroupInvitation; propsForTimerNotification?: PropsForExpirationTimer; propsForDataExtractionNotification?: PropsForDataExtractionNotification; propsForGroupUpdateMessage?: PropsForGroupUpdate; propsForCallNotification?: PropsForCallNotification; - propsForMessageRequestResponse?: PropsForMessageRequestResponse; + propsForMessageRequestResponse?: boolean; propsForQuote?: PropsForQuote; propsForInteractionNotification?: PropsForInteractionNotification; }; @@ -137,10 +132,7 @@ export type PropsForGroupUpdate = { export type PropsForGroupInvitation = { serverName: string; - url: string; - direction: MessageModelType; - acceptUrl: string; - messageId: string; + fullUrl: string; }; export type PropsForAttachment = AttachmentType & { diff --git a/ts/state/ducks/types.ts b/ts/state/ducks/types.ts index dc1d1fbe18..8517d786a1 100644 --- a/ts/state/ducks/types.ts +++ b/ts/state/ducks/types.ts @@ -6,8 +6,8 @@ import { export type CallNotificationType = 'missed-call' | 'started-call' | 'answered-a-call'; export type PropsForCallNotification = { - notificationType: CallNotificationType; messageId: string; + notificationType: CallNotificationType; }; export type LastMessageStatusType = 'sending' | 'sent' | 'read' | 'error' | undefined; diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 9a50650d58..2f3e32c520 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -141,13 +141,14 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( : undefined; const common = { showUnreadIndicator: isFirstUnread, showDateBreak }; + const messageIdProps = { messageId: msg.propsForMessage.id }; if (msg.propsForDataExtractionNotification) { return { ...common, message: { messageType: 'data-extraction', - props: { ...msg.propsForDataExtractionNotification, messageId: msg.propsForMessage.id }, + props: { ...msg.propsForDataExtractionNotification, ...messageIdProps }, }, }; } @@ -157,7 +158,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( ...common, message: { messageType: 'message-request-response', - props: { ...msg.propsForMessageRequestResponse, messageId: msg.propsForMessage.id }, + props: messageIdProps, }, }; } @@ -167,7 +168,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( ...common, message: { messageType: 'group-invitation', - props: { ...msg.propsForGroupInvitation, messageId: msg.propsForMessage.id }, + props: messageIdProps, }, }; } @@ -177,7 +178,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( ...common, message: { messageType: 'group-notification', - props: { ...msg.propsForGroupUpdateMessage, messageId: msg.propsForMessage.id }, + props: { ...msg.propsForGroupUpdateMessage, ...messageIdProps }, }, }; } @@ -187,7 +188,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( ...common, message: { messageType: 'timer-notification', - props: { ...msg.propsForTimerNotification, messageId: msg.propsForMessage.id }, + props: { ...msg.propsForTimerNotification, ...messageIdProps }, }, }; } @@ -199,7 +200,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( messageType: 'call-notification', props: { ...msg.propsForCallNotification, - messageId: msg.propsForMessage.id, + ...messageIdProps, }, }, }; @@ -212,7 +213,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( messageType: 'interaction-notification', props: { ...msg.propsForInteractionNotification, - messageId: msg.propsForMessage.id, + ...messageIdProps, }, }, }; @@ -223,7 +224,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( showDateBreak, message: { messageType: 'regular-message', - props: { messageId: msg.propsForMessage.id }, + props: messageIdProps, }, }; }); diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index 92d1221f49..3add3e2562 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -12,6 +12,7 @@ import { useSelectedIsPrivate } from './selectedConversation'; import { LastMessageStatusType } from '../ducks/types'; import { PubKey } from '../../session/types'; import { useIsMe } from '../../hooks/useParamSelector'; +import { UserUtils } from '../../session/utils'; function useMessagePropsByMessageId(messageId: string | undefined) { return useSelector((state: StateType) => getMessagePropsByMessageId(state, messageId)); @@ -83,6 +84,10 @@ export const useMessageAuthor = (messageId: string | undefined): string | undefi return useMessagePropsByMessageId(messageId)?.propsForMessage.sender; }; +export const useMessageAuthorIsUs = (messageId: string | undefined): boolean => { + return UserUtils.isUsFromCache(useMessagePropsByMessageId(messageId)?.propsForMessage.sender); +}; + export const useMessageDirection = ( messageId: string | undefined ): MessageModelType | undefined => { @@ -129,6 +134,10 @@ export function useMessageReceivedAt(messageId: string | undefined) { return useMessagePropsByMessageId(messageId)?.propsForMessage.receivedAt; } +export function useMessageIsUnread(messageId: string | undefined) { + return useMessagePropsByMessageId(messageId)?.propsForMessage.isUnread; +} + export function useMessageTimestamp(messageId: string | undefined) { return useMessagePropsByMessageId(messageId)?.propsForMessage.timestamp; } @@ -174,3 +183,23 @@ export function useHideAvatarInMsgList(messageId?: string, isDetailView?: boolea export function useMessageSelected(messageId?: string) { return useSelector((state: StateType) => getIsMessageSelected(state, messageId)); } + +/** + * ================================================== + * Below are selectors for community invitation props + * ================================================== + */ + +/** + * Return the full url needed to join a community through a community invitation message + */ +export function useMessageCommunityInvitationFullUrl(messageId: string) { + return useMessagePropsByMessageId(messageId)?.propsForGroupInvitation?.fullUrl; +} + +/** + * Return the community display name to have a guess of what a community is about + */ +export function useMessageCommunityInvitationCommunityName(messageId: string) { + return useMessagePropsByMessageId(messageId)?.propsForGroupInvitation?.serverName; +} From 3c0f9fe14e087d5ad82e25728913a4d018427823 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Jan 2025 14:02:52 +1100 Subject: [PATCH 283/302] chore: move msgId to commonProps in SessionMessagesList --- .../conversation/SessionMessagesList.tsx | 8 +++---- ts/state/selectors/conversations.ts | 21 ++++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx index d0b1d0a562..1f6470edd9 100644 --- a/ts/components/conversation/SessionMessagesList.tsx +++ b/ts/components/conversation/SessionMessagesList.tsx @@ -49,16 +49,14 @@ export const SessionMessagesList = (props: { useLayoutEffect(() => { const newTopMessageId = messagesProps.length - ? messagesProps[messagesProps.length - 1].message.props.messageId + ? messagesProps[messagesProps.length - 1].messageId : undefined; if (oldTopMessageId !== newTopMessageId && oldTopMessageId && newTopMessageId) { props.scrollAfterLoadMore(oldTopMessageId, 'load-more-top'); } - const newBottomMessageId = messagesProps.length - ? messagesProps[0].message.props.messageId - : undefined; + const newBottomMessageId = messagesProps.length ? messagesProps[0].messageId : undefined; if (newBottomMessageId !== oldBottomMessageId && oldBottomMessageId && newBottomMessageId) { props.scrollAfterLoadMore(oldBottomMessageId, 'load-more-bottom'); @@ -93,7 +91,7 @@ export const SessionMessagesList = (props: { return ( {messagesProps.map(messageProps => { - const messageId = messageProps.message.props.messageId; + const { messageId } = messageProps; const unreadIndicator = messageProps.showUnreadIndicator ? ( Date: Thu, 16 Jan 2025 14:53:05 +1100 Subject: [PATCH 284/302] chore: cleanup data extraction notification --- .../conversation/SessionMessagesList.tsx | 5 +- .../DataExtractionNotification.tsx | 26 ++++----- ts/models/message.ts | 54 ++++--------------- ts/models/messageType.ts | 20 +++---- ts/receiver/contentMessage.ts | 12 ++--- .../DataExtractionNotificationMessage.ts | 2 +- ts/state/selectors/conversations.ts | 1 - ts/state/selectors/messages.ts | 1 + 8 files changed, 37 insertions(+), 84 deletions(-) diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx index 1f6470edd9..4b1c79bf47 100644 --- a/ts/components/conversation/SessionMessagesList.tsx +++ b/ts/components/conversation/SessionMessagesList.tsx @@ -2,7 +2,6 @@ import { useLayoutEffect, useState } from 'react'; import { useSelector } from 'react-redux'; import useKey from 'react-use/lib/useKey'; -import { PropsForDataExtractionNotification } from '../../models/messageType'; import { PropsForExpirationTimer, PropsForGroupUpdate } from '../../state/ducks/conversations'; import { getOldBottomMessageId, @@ -132,10 +131,8 @@ export const SessionMessagesList = (props: { } if (messageProps.message?.messageType === 'data-extraction') { - const msgProps = messageProps.message.props as PropsForDataExtractionNotification; - return [ - , + , ...componentToMerge, ]; } diff --git a/ts/components/conversation/message/message-item/DataExtractionNotification.tsx b/ts/components/conversation/message/message-item/DataExtractionNotification.tsx index bf58bed5fd..4055778148 100644 --- a/ts/components/conversation/message/message-item/DataExtractionNotification.tsx +++ b/ts/components/conversation/message/message-item/DataExtractionNotification.tsx @@ -1,12 +1,21 @@ -import { PropsForDataExtractionNotification } from '../../../../models/messageType'; -import { SignalService } from '../../../../protobuf'; import { ExpirableReadableMessage } from './ExpirableReadableMessage'; import { NotificationBubble } from './notification-bubble/NotificationBubble'; import { Localizer } from '../../../basic/Localizer'; +import { useMessageAuthor } from '../../../../state/selectors'; +import { useNicknameOrProfileNameOrShortenedPubkey } from '../../../../hooks/useParamSelector'; +import type { WithMessageId } from '../../../../session/types/with'; -export const DataExtractionNotification = (props: PropsForDataExtractionNotification) => { - const { name, type, source, messageId } = props; +export const DataExtractionNotification = (props: WithMessageId) => { + const { messageId } = props; + const author = useMessageAuthor(messageId); + const authorName = useNicknameOrProfileNameOrShortenedPubkey(author); + if (!author) { + return null; + } + + // Note: we only support one type of data extraction notification now (media saved). + // the screenshot support is entirely removed. return ( - + ); diff --git a/ts/models/message.ts b/ts/models/message.ts index c01f992e9e..f34d28ca2f 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -19,12 +19,10 @@ import { uploadQuoteThumbnailsToFileServer, } from '../session/utils'; import { - DataExtractionNotificationMsg, MessageAttributes, MessageAttributesOptionals, MessageGroupUpdate, MessageModelType, - PropsForDataExtractionNotification, fillMessageAttributesWithDefaults, } from './messageType'; @@ -222,7 +220,7 @@ export class MessageModel extends Backbone.Model { this.set(attributes); } - public isCommunityInvitation() { + private isCommunityInvitation() { return !!this.getCommunityInvitation(); } public getCommunityInvitation() { @@ -233,21 +231,16 @@ export class MessageModel extends Backbone.Model { return !!this.get('messageRequestResponse'); } - public isDataExtractionNotification() { - return !!this.getDataExtractionNotification(); - } - public getDataExtractionNotification() { - return this.get('dataExtractionNotification'); + private isDataExtractionNotification() { + // if set to {} this returns true + return !!this.get('dataExtractionNotification'); } - public isCallNotification() { - return !!this.getCallNotification(); - } - public getCallNotification() { - return this.get('callNotificationType'); + private isCallNotification() { + return !!this.get('callNotificationType'); } - public isInteractionNotification() { + private isInteractionNotification() { return !!this.getInteractionNotification(); } public getInteractionNotification() { @@ -306,17 +299,8 @@ export class MessageModel extends Backbone.Model { } if (this.isDataExtractionNotification()) { - const dataExtraction = this.get( - 'dataExtractionNotification' - ) as DataExtractionNotificationMsg; - if (dataExtraction.type === SignalService.DataExtractionNotification.Type.SCREENSHOT) { - return window.i18n.stripped('screenshotTaken', { - name: ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder(dataExtraction.source), - }); - } - return window.i18n.stripped('attachmentsMediaSaved', { - name: ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder(dataExtraction.source), + name: ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder(this.get('source')), }); } if (this.isCallNotification()) { @@ -519,26 +503,8 @@ export class MessageModel extends Backbone.Model { }; } - private getPropsForDataExtractionNotification(): PropsForDataExtractionNotification | null { - if (!this.isDataExtractionNotification()) { - return null; - } - const dataExtractionNotification = this.getDataExtractionNotification(); - - if (!dataExtractionNotification) { - window.log.warn('dataExtractionNotification should not happen'); - return null; - } - - const contact = findAndFormatContact(dataExtractionNotification.source); - - return { - ...dataExtractionNotification, - name: contact.profileName || contact.name || dataExtractionNotification.source, - receivedAt: this.get('received_at'), - isUnread: this.isUnread(), - ...this.getPropsForExpiringMessage(), - }; + private getPropsForDataExtractionNotification(): boolean { + return !!this.isDataExtractionNotification(); } private getPropsForGroupUpdateMessage(): PropsForGroupUpdate | null { diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts index e08aa9a01e..2097560cf9 100644 --- a/ts/models/messageType.ts +++ b/ts/models/messageType.ts @@ -127,12 +127,6 @@ export interface MessageAttributes { interactionNotification?: InteractionNotificationType; } -export interface DataExtractionNotificationMsg { - type: number; // screenshot or saving event, based on SignalService.DataExtractionNotification.Type - source: string; // the guy who made a screenshot - referencedAttachmentTimestamp: number; // the attachment timestamp he screenshot -} - export interface MessageRequestResponseMsg { source: string; isApproved: boolean; @@ -144,11 +138,13 @@ export enum MessageDirection { any = '%', } -export type PropsForDataExtractionNotification = DataExtractionNotificationMsg & { - name: string; - messageId: string; +type DataExtractionNotificationMsg = { + // Note: we only support one type (media saved, screenshot is not supported at all anymore) + // Note: just keeping this an object in case we need to add details to it. }; +export type PropsForDataExtractionNotification = DataExtractionNotificationMsg; + export type PropsForMessageRequestResponse = MessageRequestResponseMsg & { conversationId?: string; name?: string; @@ -196,11 +192,7 @@ export interface MessageAttributesOptionals { hasAttachments?: boolean; hasFileAttachments?: boolean; hasVisualMediaAttachments?: boolean; - dataExtractionNotification?: { - type: number; - source: string; - referencedAttachmentTimestamp: number; - }; + dataExtractionNotification?: DataExtractionNotificationMsg; messageRequestResponse?: { /** 1 means approved, 0 means unapproved. */ isApproved?: number; diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 8e227327bc..e5f10a8ede 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -913,15 +913,14 @@ export async function handleDataExtractionNotification({ envelope, expireUpdate, messageHash, - dataExtractionNotification, }: { envelope: EnvelopePlus; dataExtractionNotification: SignalService.DataExtractionNotification; expireUpdate: ReadyToDisappearMsgUpdate | undefined; messageHash: string; }): Promise { - // we currently don't care about the timestamp included in the field itself, just the timestamp of the envelope - const { type, timestamp: referencedAttachment } = dataExtractionNotification; + // Note: we currently don't care about the timestamp included in the field itself, just the timestamp of the envelope + // Note: we only support one type of data extraction notification const { source, timestamp } = envelope; await IncomingMessageCache.removeFromCache(envelope); @@ -933,23 +932,20 @@ export async function handleDataExtractionNotification({ return; } - if (!type || !source || !timestamp) { + if (!source || !timestamp) { window?.log?.info('DataNotification pre check failed'); return; } const sentAtTimestamp = toNumber(timestamp); - const referencedAttachmentTimestamp = toNumber(referencedAttachment); let created = await convo.addSingleIncomingMessage({ source, messageHash, sent_at: sentAtTimestamp, dataExtractionNotification: { - type, - referencedAttachmentTimestamp, // currently unused - source, + // just set it to non empty object. We don't need anything else than this for now }, }); diff --git a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts index c2cc384e4e..600406ab7a 100644 --- a/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts +++ b/ts/session/messages/outgoing/controlMessage/DataExtractionNotificationMessage.ts @@ -20,7 +20,7 @@ export class DataExtractionNotificationMessage extends ExpirableMessage { constructor(params: DataExtractionNotificationMessageParams) { super(params); this.referencedAttachmentTimestamp = params.referencedAttachmentTimestamp; - // this does not make any sense + // this is unused. Probably on all platforms, but well. if (!this.referencedAttachmentTimestamp) { throw new Error('referencedAttachmentTimestamp must be set'); } diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 69a9f779bf..751f4e1648 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -151,7 +151,6 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( ...common, message: { messageType: 'data-extraction', - props: { ...msg.propsForDataExtractionNotification }, }, }; } diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index 3add3e2562..1fe44b3ce0 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -203,3 +203,4 @@ export function useMessageCommunityInvitationFullUrl(messageId: string) { export function useMessageCommunityInvitationCommunityName(messageId: string) { return useMessagePropsByMessageId(messageId)?.propsForGroupInvitation?.serverName; } + From a70fda84723b018fc20922fb0986a0d615477fe8 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Jan 2025 15:05:40 +1100 Subject: [PATCH 285/302] chore: renamed deleteMessageLocallyOnly to plural syntax --- .../conversations/unsendingInteractions.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index e92d6a6c7d..f63b483877 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -242,7 +242,7 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally( // LEGACY GROUPS -- we cannot delete on the swarm (just unsend which is done separately) if (conversation.isClosedGroup() && PubKey.is05Pubkey(pubkey)) { window.log.info('Cannot delete message from a closed group swarm, so we just complete delete.'); - await deleteMessageLocallyOnly({ conversation, messages, deletionType: 'complete' }); + await deletesMessageLocallyOnly({ conversation, messages, deletionType: 'complete' }); return; } window.log.info( @@ -257,7 +257,7 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally( 'deleteMessagesFromSwarmAndCompletelyLocally: some messages failed to be deleted. Maybe they were already deleted?' ); } - await deleteMessageLocallyOnly({ conversation, messages, deletionType: 'complete' }); + await deletesMessageLocallyOnly({ conversation, messages, deletionType: 'complete' }); } /** @@ -273,7 +273,7 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( window.log.info( 'Cannot delete messages from a legacy closed group swarm, so we just markDeleted.' ); - await deleteMessageLocallyOnly({ conversation, messages, deletionType: 'markDeleted' }); + await deletesMessageLocallyOnly({ conversation, messages, deletionType: 'markDeleted' }); return; } @@ -290,7 +290,7 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( 'deleteMessagesFromSwarmAndMarkAsDeletedLocally: some messages failed to be deleted but still removing the messages content... ' ); } - await deleteMessageLocallyOnly({ conversation, messages, deletionType: 'markDeleted' }); + await deletesMessageLocallyOnly({ conversation, messages, deletionType: 'markDeleted' }); } /** @@ -298,7 +298,7 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( * @param message Message to delete * @param deletionType 'complete' means completely delete the item from the database, markDeleted means empty the message content but keep an entry */ -export async function deleteMessageLocallyOnly({ +async function deletesMessageLocallyOnly({ conversation, messages, deletionType, @@ -380,7 +380,7 @@ const doDeleteSelectedMessagesInSOGS = async ( toDeleteLocallyIds.map(async id => { const msgToDeleteLocally = await Data.getMessageById(id); if (msgToDeleteLocally) { - return deleteMessageLocallyOnly({ + return deletesMessageLocallyOnly({ conversation, messages: [msgToDeleteLocally], deletionType: 'complete', @@ -457,7 +457,7 @@ const doDeleteSelectedMessages = async ({ // delete just for me in a groupv2 only means delete locally (not even synced to our other devices) if (conversation.isClosedGroupV2()) { - await deleteMessageLocallyOnly({ + await deletesMessageLocallyOnly({ conversation, messages: selectedMessages, deletionType: 'markDeleted', From 35c77accacc40b071cd568695f57239d79234a42 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Jan 2025 15:15:10 +1100 Subject: [PATCH 286/302] chore: cleanup call notification message selectors --- ts/components/conversation/SessionMessagesList.tsx | 6 ++---- .../notification-bubble/CallNotification.tsx | 14 +++++++++++--- ts/models/conversation.ts | 8 ++------ ts/models/message.ts | 2 +- ts/models/messageType.ts | 4 ++-- ts/receiver/contentMessage.ts | 1 + ts/state/selectors/messages.ts | 12 ++++++++++++ 7 files changed, 31 insertions(+), 16 deletions(-) diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx index 4b1c79bf47..00b777a009 100644 --- a/ts/components/conversation/SessionMessagesList.tsx +++ b/ts/components/conversation/SessionMessagesList.tsx @@ -21,7 +21,7 @@ import { SessionLastSeenIndicator } from './SessionLastSeenIndicator'; import { TimerNotification } from './TimerNotification'; import { DataExtractionNotification } from './message/message-item/DataExtractionNotification'; import { InteractionNotification } from './message/message-item/InteractionNotification'; -import { PropsForCallNotification, PropsForInteractionNotification } from '../../state/ducks/types'; +import { PropsForInteractionNotification } from '../../state/ducks/types'; function isNotTextboxEvent(e: KeyboardEvent) { return (e?.target as any)?.type === undefined; @@ -144,9 +144,7 @@ export const SessionMessagesList = (props: { } if (messageProps.message?.messageType === 'call-notification') { - const msgProps = messageProps.message.props as PropsForCallNotification; - - return [, ...componentToMerge]; + return [, ...componentToMerge]; } if (messageProps.message?.messageType === 'interaction-notification') { diff --git a/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx b/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx index bc624d6257..71b993c625 100644 --- a/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx +++ b/ts/components/conversation/message/message-item/notification-bubble/CallNotification.tsx @@ -1,4 +1,4 @@ -import { CallNotificationType, PropsForCallNotification } from '../../../../../state/ducks/types'; +import { CallNotificationType } from '../../../../../state/ducks/types'; import { useSelectedNicknameOrProfileNameOrShortenedPubkey } from '../../../../../state/selectors/selectedConversation'; import { SessionIconType } from '../../../../icon'; @@ -6,6 +6,8 @@ import { ExpirableReadableMessage } from '../ExpirableReadableMessage'; import { NotificationBubble } from './NotificationBubble'; import { Localizer } from '../../../../basic/Localizer'; import { MergedLocalizerTokens } from '../../../../../localization/localeTools'; +import type { WithMessageId } from '../../../../../session/types/with'; +import { useMessageCallNotificationType } from '../../../../../state/selectors'; type StyleType = Record< CallNotificationType, @@ -30,11 +32,17 @@ const style = { }, } satisfies StyleType; -export const CallNotification = (props: PropsForCallNotification) => { - const { messageId, notificationType } = props; +export const CallNotification = (props: WithMessageId) => { + const { messageId } = props; + + const notificationType = useMessageCallNotificationType(messageId); const name = useSelectedNicknameOrProfileNameOrShortenedPubkey() ?? window.i18n('unknown'); + if (!notificationType) { + return null; + } + const { iconColor, iconType, notificationTextKey } = style[notificationType]; return ( diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 498e9243a3..06ed0e844b 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -753,9 +753,7 @@ export class ConversationModel extends Backbone.Model { public async addOutgoingApprovalMessage(timestamp: number) { await this.addSingleOutgoingMessage({ sent_at: timestamp, - messageRequestResponse: { - isApproved: 1, - }, + messageRequestResponse: {}, expireTimer: 0, }); @@ -771,9 +769,7 @@ export class ConversationModel extends Backbone.Model { await this.addSingleIncomingMessage({ sent_at: timestamp, source, - messageRequestResponse: { - isApproved: 1, - }, + messageRequestResponse: {}, unread: READ_MESSAGE_STATE.unread, // 1 means unread expireTimer: 0, }); diff --git a/ts/models/message.ts b/ts/models/message.ts index f34d28ca2f..5b34dc593d 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -227,7 +227,7 @@ export class MessageModel extends Backbone.Model { return this.get('groupInvitation'); } - public isMessageRequestResponse() { + private isMessageRequestResponse() { return !!this.get('messageRequestResponse'); } diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts index 2097560cf9..31bf981e1f 100644 --- a/ts/models/messageType.ts +++ b/ts/models/messageType.ts @@ -194,8 +194,8 @@ export interface MessageAttributesOptionals { hasVisualMediaAttachments?: boolean; dataExtractionNotification?: DataExtractionNotificationMsg; messageRequestResponse?: { - /** 1 means approved, 0 means unapproved. */ - isApproved?: number; + // keeping it as a object in case we ever add a field here. + // Note: we had isApproved field, but it was unused so I got rid of it }; unread?: number; group?: any; diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index e5f10a8ede..0a063f217c 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -793,6 +793,7 @@ async function handleMessageRequestResponse( envelope: EnvelopePlus, messageRequestResponse: SignalService.MessageRequestResponse ) { + // no one cares about the is `messageRequestResponse.isApproved` field currently. if (!messageRequestResponse || !messageRequestResponse.isApproved) { window?.log?.error('handleMessageRequestResponse: Invalid parameters -- dropping message.'); await IncomingMessageCache.removeFromCache(envelope); diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index 1fe44b3ce0..6727685bd4 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -204,3 +204,15 @@ export function useMessageCommunityInvitationCommunityName(messageId: string) { return useMessagePropsByMessageId(messageId)?.propsForGroupInvitation?.serverName; } +/** + * ========================================= + * Below are selectors for call notification + * ========================================= + */ + +/** + * Return the call notification type linked to the specified message + */ +export function useMessageCallNotificationType(messageId: string) { + return useMessagePropsByMessageId(messageId)?.propsForCallNotification?.notificationType; +} From fac7960cc9811f9a3c0968a56c1f07390f8057ad Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Thu, 16 Jan 2025 15:59:29 +1100 Subject: [PATCH 287/302] chore: cleanup expireationTimerUpdate msg --- .../conversation/SessionMessagesList.tsx | 14 ++-- .../conversation/TimerNotification.tsx | 81 ++++++++++++------- .../message-item/InteractionNotification.tsx | 36 ++++++--- ts/models/message.ts | 19 +---- ts/session/disappearing_messages/types.ts | 3 - ts/state/ducks/conversations.ts | 19 ++--- ts/state/ducks/types.ts | 8 +- ts/state/selectors/conversations.ts | 7 -- ts/state/selectors/messages.ts | 48 +++++++++++ .../DisappearingMessage_test.ts | 3 - ts/test/test-utils/utils/message.ts | 3 - 11 files changed, 142 insertions(+), 99 deletions(-) diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx index 00b777a009..9847c2df6b 100644 --- a/ts/components/conversation/SessionMessagesList.tsx +++ b/ts/components/conversation/SessionMessagesList.tsx @@ -2,7 +2,7 @@ import { useLayoutEffect, useState } from 'react'; import { useSelector } from 'react-redux'; import useKey from 'react-use/lib/useKey'; -import { PropsForExpirationTimer, PropsForGroupUpdate } from '../../state/ducks/conversations'; +import { PropsForGroupUpdate } from '../../state/ducks/conversations'; import { getOldBottomMessageId, getOldTopMessageId, @@ -21,7 +21,6 @@ import { SessionLastSeenIndicator } from './SessionLastSeenIndicator'; import { TimerNotification } from './TimerNotification'; import { DataExtractionNotification } from './message/message-item/DataExtractionNotification'; import { InteractionNotification } from './message/message-item/InteractionNotification'; -import { PropsForInteractionNotification } from '../../state/ducks/types'; function isNotTextboxEvent(e: KeyboardEvent) { return (e?.target as any)?.type === undefined; @@ -138,9 +137,7 @@ export const SessionMessagesList = (props: { } if (messageProps.message?.messageType === 'timer-notification') { - const msgProps = messageProps.message.props as PropsForExpirationTimer; - - return [, ...componentToMerge]; + return [, ...componentToMerge]; } if (messageProps.message?.messageType === 'call-notification') { @@ -148,9 +145,10 @@ export const SessionMessagesList = (props: { } if (messageProps.message?.messageType === 'interaction-notification') { - const msgProps = messageProps.message.props as PropsForInteractionNotification; - - return [, ...componentToMerge]; + return [ + , + ...componentToMerge, + ]; } if (!messageProps) { diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index bd8fffb1d7..ffa32ed421 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -1,9 +1,8 @@ import { useDispatch } from 'react-redux'; import styled from 'styled-components'; import { PubkeyType } from 'libsession_util_nodejs'; -import { PropsForExpirationTimer } from '../../state/ducks/conversations'; +import { isNil } from 'lodash'; -import { UserUtils } from '../../session/utils'; import { useSelectedConversationDisappearingMode, useSelectedConversationKey, @@ -27,35 +26,44 @@ import { SessionButtonColor } from '../basic/SessionButton'; import { SessionIcon } from '../icon'; import { getTimerNotificationStr } from '../../models/timerNotifications'; import type { LocalizerComponentPropsObject } from '../../localization/localeTools'; +import type { WithMessageId } from '../../session/types/with'; +import { + useMessageAuthor, + useMessageAuthorIsUs, + useMessageExpirationUpdateDisabled, + useMessageExpirationUpdateMode, + useMessageExpirationUpdateTimespanSeconds, + useMessageExpirationUpdateTimespanText, +} from '../../state/selectors'; const FollowSettingButton = styled.button` color: var(--primary-color); `; -function useFollowSettingsButtonClick( - props: Pick< - PropsForExpirationTimer, - 'disabled' | 'expirationMode' | 'timespanText' | 'timespanSeconds' - > -) { +function useFollowSettingsButtonClick({ messageId }: WithMessageId) { const selectedConvoKey = useSelectedConversationKey(); + const timespanSeconds = useMessageExpirationUpdateTimespanSeconds(messageId) || 0; + const expirationMode = useMessageExpirationUpdateMode(messageId) || 'off'; + const disabled = useMessageExpirationUpdateDisabled(messageId) || false; + const timespanText = useMessageExpirationUpdateTimespanText(messageId) || ''; + const dispatch = useDispatch(); const onExit = () => dispatch(updateConfirmModal(null)); const doIt = () => { const localizedMode = - props.expirationMode === 'deleteAfterRead' + expirationMode === 'deleteAfterRead' ? window.i18n('disappearingMessagesTypeRead') : window.i18n('disappearingMessagesTypeSent'); - const i18nMessage: LocalizerComponentPropsObject = props.disabled + const i18nMessage: LocalizerComponentPropsObject = disabled ? { token: 'disappearingMessagesFollowSettingOff', } : { token: 'disappearingMessagesFollowSettingOn', args: { - time: props.timespanText, + time: timespanText, disappearing_messages_type: localizedMode, }, }; @@ -79,16 +87,16 @@ function useFollowSettingsButtonClick( if (!convo.isPrivate()) { throw new Error('follow settings only work for private chats'); } - if (props.expirationMode === 'legacy') { + if (expirationMode === 'legacy') { throw new Error('follow setting does not apply with legacy'); } - if (props.expirationMode !== 'off' && !props.timespanSeconds) { + if (expirationMode !== 'off' && !timespanSeconds) { throw new Error('non-off mode requires seconds arg to be given'); } await ConversationInteraction.setDisappearingMessagesByConvoId( selectedConvoKey, - props.expirationMode, - props.timespanSeconds ?? undefined + expirationMode, + timespanSeconds ?? undefined ); }, showExitIcon: false, @@ -99,36 +107,43 @@ function useFollowSettingsButtonClick( return { doIt }; } -function useAreSameThanOurSide( - props: Pick -) { +function useAreSameThanOurSide({ messageId }: WithMessageId) { + const timespanSeconds = useMessageExpirationUpdateTimespanSeconds(messageId) || 0; + const expirationMode = useMessageExpirationUpdateMode(messageId) || 'off'; + const disabled = useMessageExpirationUpdateDisabled(messageId) || false; + const selectedMode = useSelectedConversationDisappearingMode(); const selectedTimespan = useSelectedExpireTimer(); - if (props.disabled && (selectedMode === 'off' || selectedMode === undefined)) { + + if (disabled && (selectedMode === 'off' || selectedMode === undefined)) { return true; } - if (props.expirationMode === selectedMode && props.timespanSeconds === selectedTimespan) { + if (expirationMode === selectedMode && timespanSeconds === selectedTimespan) { return true; } return false; } -const FollowSettingsButton = (props: PropsForExpirationTimer) => { +const FollowSettingsButton = ({ messageId }: WithMessageId) => { const v2Released = ReleasedFeatures.isUserConfigFeatureReleasedCached(); const isPrivateAndFriend = useSelectedIsPrivateFriend(); - const click = useFollowSettingsButtonClick(props); - const areSameThanOurs = useAreSameThanOurSide(props); + + const expirationMode = useMessageExpirationUpdateMode(messageId) || 'off'; + const authorIsUs = useMessageAuthorIsUs(messageId); + + const click = useFollowSettingsButtonClick({ + messageId, + }); + const areSameThanOurs = useAreSameThanOurSide({ messageId }); if (!v2Released || !isPrivateAndFriend) { return null; } if ( - props.type === 'fromMe' || - props.type === 'fromSync' || - props.pubkey === UserUtils.getOurPubKeyStrFromCache() || + authorIsUs || areSameThanOurs || - props.expirationMode === 'legacy' // we cannot follow settings with legacy mode + expirationMode === 'legacy' // we cannot follow settings with legacy mode ) { return null; } @@ -143,14 +158,18 @@ const FollowSettingsButton = (props: PropsForExpirationTimer) => { ); }; -export const TimerNotification = (props: PropsForExpirationTimer) => { - const { messageId, expirationMode, pubkey, timespanSeconds } = props; +export const TimerNotification = (props: WithMessageId) => { + const { messageId } = props; + const timespanSeconds = useMessageExpirationUpdateTimespanSeconds(messageId); + const expirationMode = useMessageExpirationUpdateMode(messageId); + const disabled = useMessageExpirationUpdateDisabled(messageId); + const pubkey = useMessageAuthor(messageId); const convoId = useSelectedConversationKey(); const isGroupOrCommunity = useSelectedIsGroupOrCommunity(); const isGroupV2 = useSelectedIsGroupV2(); const isPublic = useSelectedIsPublic(); - if (!convoId) { + if (!convoId || !messageId || isNil(timespanSeconds) || isNil(expirationMode)) { return null; } @@ -163,7 +182,7 @@ export const TimerNotification = (props: PropsForExpirationTimer) => { }); // renderOff is true when the update is put to off, or when we have a legacy group control message (as they are not expiring at all) - const renderOffIcon = props.disabled || (isGroupOrCommunity && isPublic && !isGroupV2); + const renderOffIcon = disabled || (isGroupOrCommunity && isPublic && !isGroupV2); return ( { - const { notificationType, convoId, messageId, receivedAt, isUnread } = props; - - const { interactionStatus, interactionType } = notificationType; +export const InteractionNotification = (props: WithMessageId) => { + const { messageId } = props; + const convoId = useSelectedConversationKey(); const displayName = useNicknameOrProfileNameOrShortenedPubkey(convoId); + const isGroup = !useSelectedIsPrivate(); + const isCommunity = useSelectedIsPublic(); + const isUnread = useMessageIsUnread(messageId) || false; + const receivedAt = useMessageReceivedAt(messageId); + const interactionNotification = useMessageInteractionNotification(messageId); - const isGroup = !useIsPrivate(convoId); - const isCommunity = useIsPublic(convoId); + if (!convoId || !messageId || !interactionNotification) { + return null; + } + const { interactionStatus, interactionType } = interactionNotification; // NOTE at this time we don't show visible control messages in communities, that might change in future... if (isCommunity) { diff --git a/ts/models/message.ts b/ts/models/message.ts index 5b34dc593d..0d04a8ed54 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -141,7 +141,7 @@ export class MessageModel extends Backbone.Model { messageProps.propsForDataExtractionNotification = propsForDataExtractionNotification; } if (isMessageResponse) { - messageProps.propsForMessageRequestResponse = isMessageResponse; + messageProps.propsForMessageRequestResponse = {}; } if (propsForGroupInvitation) { messageProps.propsForGroupInvitation = propsForGroupInvitation; @@ -167,10 +167,6 @@ export class MessageModel extends Backbone.Model { if (interactionNotification) { messageProps.propsForInteractionNotification = { notificationType: interactionNotification, - convoId: this.get('conversationId'), - messageId: this.id, - receivedAt: this.get('received_at') || Date.now(), - isUnread: this.isUnread(), }; } @@ -375,7 +371,7 @@ export class MessageModel extends Backbone.Model { expireTimer ); - const source = expireTimerUpdate?.source; + const source = this.get('source'); const i18nProps = getTimerNotificationStr({ convoId: convo.id, author: source as PubkeyType, @@ -462,11 +458,11 @@ export class MessageModel extends Backbone.Model { const timerUpdate = this.getExpirationTimerUpdate(); const convo = this.getConversation(); - if (!timerUpdate || !timerUpdate.source || !convo) { + if (!timerUpdate || !this.get('source') || !convo) { return null; } - const { expireTimer, fromSync, source } = timerUpdate; + const { expireTimer } = timerUpdate; const expirationMode = DisappearingMessages.changeToDisappearingConversationMode( convo, timerUpdate?.expirationType || 'unknown', @@ -474,18 +470,11 @@ export class MessageModel extends Backbone.Model { ); const timespanText = TimerOptions.getName(expireTimer || 0); - const disabled = !expireTimer; const basicProps: PropsForExpirationTimer = { - ...findAndFormatContact(source), timespanText, timespanSeconds: expireTimer || 0, - disabled, - type: fromSync ? 'fromSync' : UserUtils.isUsFromCache(source) ? 'fromMe' : 'fromOther', - receivedAt: this.get('received_at'), - isUnread: this.isUnread(), expirationMode: expirationMode || 'off', - ...this.getPropsForExpiringMessage(), }; return basicProps; diff --git a/ts/session/disappearing_messages/types.ts b/ts/session/disappearing_messages/types.ts index da671c52e2..7c707a0b38 100644 --- a/ts/session/disappearing_messages/types.ts +++ b/ts/session/disappearing_messages/types.ts @@ -20,9 +20,6 @@ export type DisappearingMessageConversationModeType = export type ExpirationTimerUpdate = { expirationType: DisappearingMessageType | undefined; expireTimer: number; - source: string; - /** updated setting from another device */ - fromSync?: boolean; }; export type DisappearingMessageUpdate = { diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index f59c0e7be8..8f68cd7765 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -25,6 +25,7 @@ import { LastMessageType, PropsForCallNotification, PropsForInteractionNotification, + type PropsForMessageRequestResponse, } from './types'; import { AttachmentType } from '../../types/Attachment'; import { CONVERSATION_PRIORITIES, ConversationTypeEnum } from '../../models/types'; @@ -32,14 +33,14 @@ import { WithConvoId, WithMessageHash, WithMessageId } from '../../session/types export type MessageModelPropsWithoutConvoProps = { propsForMessage: PropsForMessageWithoutConvoProps; - propsForGroupInvitation?: PropsForGroupInvitation; + propsForGroupInvitation?: PropsForGroupInvitation; // plop: cleaned up propsForTimerNotification?: PropsForExpirationTimer; - propsForDataExtractionNotification?: PropsForDataExtractionNotification; + propsForDataExtractionNotification?: PropsForDataExtractionNotification; // plop: cleaned up propsForGroupUpdateMessage?: PropsForGroupUpdate; - propsForCallNotification?: PropsForCallNotification; - propsForMessageRequestResponse?: boolean; + propsForCallNotification?: PropsForCallNotification; // plop: cleaned up + propsForMessageRequestResponse?: PropsForMessageRequestResponse; // plop: cleaned up propsForQuote?: PropsForQuote; - propsForInteractionNotification?: PropsForInteractionNotification; + propsForInteractionNotification?: PropsForInteractionNotification; // plop: cleaned up }; export type MessageModelPropsWithConvoProps = SortedMessageModelProps & { @@ -78,13 +79,6 @@ export type PropsForExpirationTimer = { expirationMode: DisappearingMessageConversationModeType; timespanText: string; timespanSeconds: number | null; - disabled: boolean; - pubkey: string; - avatarPath: string | null; - name: string | null; - profileName: string | null; - type: 'fromMe' | 'fromSync' | 'fromOther'; - messageId: string; }; export type PropsForGroupUpdateAdd = { @@ -161,7 +155,6 @@ export type PropsForMessageWithoutConvoProps = { sender: string; // this is the sender convoId: string; // this is the conversation in which this message was sent text?: string; - receivedAt?: number; serverTimestamp?: number; serverId?: number; diff --git a/ts/state/ducks/types.ts b/ts/state/ducks/types.ts index 8517d786a1..f96c2d6392 100644 --- a/ts/state/ducks/types.ts +++ b/ts/state/ducks/types.ts @@ -10,6 +10,10 @@ export type PropsForCallNotification = { notificationType: CallNotificationType; }; +export type PropsForMessageRequestResponse = { + // keeping this an object in case we need to add some details here +}; + export type LastMessageStatusType = 'sending' | 'sent' | 'read' | 'error' | undefined; export type LastMessageType = { @@ -26,8 +30,4 @@ export type InteractionNotificationType = { export type PropsForInteractionNotification = { notificationType: InteractionNotificationType; - convoId: string; - messageId: string; - receivedAt: number; - isUnread: boolean; }; diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 751f4e1648..6b48ee2b0d 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -188,7 +188,6 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( ...common, message: { messageType: 'timer-notification', - props: { ...msg.propsForTimerNotification }, }, }; } @@ -198,9 +197,6 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( ...common, message: { messageType: 'call-notification', - props: { - ...msg.propsForCallNotification, - }, }, }; } @@ -210,9 +206,6 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( ...common, message: { messageType: 'interaction-notification', - props: { - ...msg.propsForInteractionNotification, - }, }, }; } diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index 6727685bd4..7f32d68b44 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -216,3 +216,51 @@ export function useMessageCommunityInvitationCommunityName(messageId: string) { export function useMessageCallNotificationType(messageId: string) { return useMessagePropsByMessageId(messageId)?.propsForCallNotification?.notificationType; } + +/** + * ================================================ + * Below are selectors for interaction notification + * ================================================ + */ + +/** + * Return the call notification type linked to the specified message + */ +export function useMessageInteractionNotification(messageId: string) { + return useMessagePropsByMessageId(messageId)?.propsForInteractionNotification?.notificationType; +} + +/** + * ================================================ + * Below are selectors for expiration timer updates + * ================================================ + */ + +/** + * Return the expiration update mode linked to the specified message + */ +export function useMessageExpirationUpdateMode(messageId: string) { + return useMessagePropsByMessageId(messageId)?.propsForTimerNotification?.expirationMode; +} + +/** + * Return true if the message is disabling expiration timer update (timespanSeconds === 0) + */ +export function useMessageExpirationUpdateDisabled(messageId: string) { + const timespanSeconds = useMessageExpirationUpdateTimespanSeconds(messageId); + return timespanSeconds === 0; +} + +/** + * Return the timespan in seconds to which this expiration timer update is sett + */ +export function useMessageExpirationUpdateTimespanSeconds(messageId: string) { + return useMessagePropsByMessageId(messageId)?.propsForTimerNotification?.timespanSeconds; +} + +/** + * Return the timespan in text (localised) built from the field timespanSeconds + */ +export function useMessageExpirationUpdateTimespanText(messageId: string) { + return useMessagePropsByMessageId(messageId)?.propsForTimerNotification?.timespanText; +} diff --git a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts index 8551ecef8c..c443b6c145 100644 --- a/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts +++ b/ts/test/session/unit/disappearing_messages/DisappearingMessage_test.ts @@ -392,7 +392,6 @@ describe('DisappearingMessage', () => { expirationTimerUpdate: { expirationType: 'deleteAfterSend', expireTimer: 300, - source: testPubkey, }, }); @@ -426,7 +425,6 @@ describe('DisappearingMessage', () => { expirationTimerUpdate: { expirationType: 'deleteAfterSend', expireTimer: 300, - source: testPubkey, }, }); @@ -631,7 +629,6 @@ describe('DisappearingMessage', () => { const expirationTimerUpdateMessage = generateFakeExpirationTimerUpdate({ expirationType: 'deleteAfterSend', expireTimer: 300, - source: testPubkey, }); expect(expirationTimerUpdateMessage.get('flags'), 'flags should be 2').to.equal(2); diff --git a/ts/test/test-utils/utils/message.ts b/ts/test/test-utils/utils/message.ts index 578e57f43b..b68798cdba 100644 --- a/ts/test/test-utils/utils/message.ts +++ b/ts/test/test-utils/utils/message.ts @@ -171,11 +171,9 @@ export function generateDisappearingVisibleMessage({ export function generateFakeExpirationTimerUpdate({ expirationType, expireTimer, - source = '', }: { expirationType: DisappearingMessageType; expireTimer: number; - source?: string; }): MessageModel { const convoId = TestUtils.generateFakePubKeyStr(); return new MessageModel({ @@ -187,7 +185,6 @@ export function generateFakeExpirationTimerUpdate({ expirationTimerUpdate: { expirationType, expireTimer, - source, }, flags: 2, }); From 7cf3bcbcf1c66c6615a392081f3ed3e9cd9189b8 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 09:29:39 +1100 Subject: [PATCH 288/302] chore: cleanup groupUpdates props --- .../conversation/SessionMessagesList.tsx | 99 ++++++++-------- .../message-item/GroupUpdateMessage.tsx | 112 +++++++----------- ts/models/message.ts | 4 +- ts/state/ducks/conversations.ts | 5 +- ts/state/selectors/conversations.ts | 80 +++---------- ts/state/selectors/messages.ts | 13 ++ 6 files changed, 125 insertions(+), 188 deletions(-) diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx index 9847c2df6b..a32b54c9b1 100644 --- a/ts/components/conversation/SessionMessagesList.tsx +++ b/ts/components/conversation/SessionMessagesList.tsx @@ -2,7 +2,6 @@ import { useLayoutEffect, useState } from 'react'; import { useSelector } from 'react-redux'; import useKey from 'react-use/lib/useKey'; -import { PropsForGroupUpdate } from '../../state/ducks/conversations'; import { getOldBottomMessageId, getOldTopMessageId, @@ -21,6 +20,8 @@ import { SessionLastSeenIndicator } from './SessionLastSeenIndicator'; import { TimerNotification } from './TimerNotification'; import { DataExtractionNotification } from './message/message-item/DataExtractionNotification'; import { InteractionNotification } from './message/message-item/InteractionNotification'; +import { assertUnreachable } from '../../types/sqlSharedTypes'; +import type { WithMessageId } from '../../session/types/with'; function isNotTextboxEvent(e: KeyboardEvent) { return (e?.target as any)?.type === undefined; @@ -90,6 +91,49 @@ export const SessionMessagesList = (props: { {messagesProps.map(messageProps => { const { messageId } = messageProps; + + let ComponentToRender: React.FC | undefined; + + switch (messageProps.message.messageType) { + case 'group-notification': { + ComponentToRender = GroupUpdateMessage; + break; + } + case 'group-invitation': { + ComponentToRender = CommunityInvitation; + break; + } + case 'message-request-response': { + ComponentToRender = MessageRequestResponse; + break; + } + case 'data-extraction': { + ComponentToRender = DataExtractionNotification; + break; + } + case 'timer-notification': { + ComponentToRender = TimerNotification; + break; + } + case 'call-notification': { + ComponentToRender = CallNotification; + break; + } + case 'interaction-notification': { + ComponentToRender = Message; + break; + } + case 'regular-message': { + ComponentToRender = InteractionNotification; + break; + } + default: + assertUnreachable( + messageProps.message.messageType, + `unhandled case with ${messageProps.message.messageType}` + ); + } + const unreadIndicator = messageProps.showUnreadIndicator ? ( ) : null; - const componentToMerge = [dateBreak, unreadIndicator]; - - if (messageProps.message?.messageType === 'group-notification') { - const msgProps = messageProps.message.props as PropsForGroupUpdate; - return [, ...componentToMerge]; - } - - if (messageProps.message?.messageType === 'group-invitation') { - return [ - , - ...componentToMerge, - ]; - } - - if (messageProps.message?.messageType === 'message-request-response') { - return [ - , - ...componentToMerge, - ]; - } - - if (messageProps.message?.messageType === 'data-extraction') { - return [ - , - ...componentToMerge, - ]; - } - - if (messageProps.message?.messageType === 'timer-notification') { - return [, ...componentToMerge]; - } - - if (messageProps.message?.messageType === 'call-notification') { - return [, ...componentToMerge]; - } - - if (messageProps.message?.messageType === 'interaction-notification') { - return [ - , - ...componentToMerge, - ]; - } - - if (!messageProps) { - return null; - } - - return [, ...componentToMerge]; + return [ + , + unreadIndicator, + dateBreak, + ]; })} ); diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx index c7f138ad10..5b8b77ce69 100644 --- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx +++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx @@ -1,5 +1,3 @@ -import { PubkeyType } from 'libsession_util_nodejs'; -import { isNull } from 'lodash'; import { getGroupNameChangeStr, getJoinedGroupUpdateChangeStr, @@ -7,11 +5,7 @@ import { getLeftGroupUpdateChangeStr, getPromotedGroupUpdateChangeStr, } from '../../../../models/groupUpdate'; -import { PreConditionFailed } from '../../../../session/utils/errors'; -import { - PropsForGroupUpdate, - PropsForGroupUpdateType, -} from '../../../../state/ducks/conversations'; +import { PropsForGroupUpdateType } from '../../../../state/ducks/conversations'; import { useSelectedIsGroupV2, useSelectedNicknameOrProfileNameOrShortenedPubkey, @@ -20,84 +14,62 @@ import { Localizer } from '../../../basic/Localizer'; import { ExpirableReadableMessage } from './ExpirableReadableMessage'; import { NotificationBubble } from './notification-bubble/NotificationBubble'; import type { LocalizerComponentPropsObject } from '../../../../localization/localeTools'; +import type { WithMessageId } from '../../../../session/types/with'; +import { useMessageGroupUpdateChange } from '../../../../state/selectors'; +import { assertUnreachable } from '../../../../types/sqlSharedTypes'; // This component is used to display group updates in the conversation view. -const ChangeItemPromoted = (promoted: Array): LocalizerComponentPropsObject => { - if (!promoted.length) { - throw new Error('Group update promoted is missing contacts'); - } - const isGroupV2 = useSelectedIsGroupV2(); - - if (isGroupV2) { - return getPromotedGroupUpdateChangeStr(promoted); - } - throw new PreConditionFailed('ChangeItemPromoted only applies to groupv2'); -}; - -const ChangeItemAvatar = (): LocalizerComponentPropsObject => { - const isGroupV2 = useSelectedIsGroupV2(); - if (isGroupV2) { - return { token: 'groupDisplayPictureUpdated' }; - } - throw new PreConditionFailed('ChangeItemAvatar only applies to groupv2'); -}; - -const ChangeItemJoined = ( - added: Array, - withHistory: boolean -): LocalizerComponentPropsObject => { +function useChangeItem(change?: PropsForGroupUpdateType): LocalizerComponentPropsObject | null { const groupName = useSelectedNicknameOrProfileNameOrShortenedPubkey(); const isGroupV2 = useSelectedIsGroupV2(); - if (!added.length) { - throw new Error('Group update added is missing details'); - } - return getJoinedGroupUpdateChangeStr(added, isGroupV2, withHistory, groupName); -}; - -const ChangeItemKicked = (kicked: Array): LocalizerComponentPropsObject => { - if (!kicked.length) { - throw new Error('Group update kicked is missing details'); + if (!change) { + return null; } - const groupName = useSelectedNicknameOrProfileNameOrShortenedPubkey(); + const changeType = change.type; - return getKickedGroupUpdateStr(kicked, groupName); -}; - -const ChangeItemLeft = (left: Array): LocalizerComponentPropsObject => { - if (!left.length) { - throw new Error('Group update left is missing details'); - } - - return getLeftGroupUpdateChangeStr(left); -}; - -const ChangeItem = (change: PropsForGroupUpdateType): LocalizerComponentPropsObject => { - const { type } = change; - - switch (type) { - case 'name': - return getGroupNameChangeStr(change.newName); - case 'add': - return ChangeItemJoined(change.added, change.withHistory); + switch (changeType) { case 'left': - return ChangeItemLeft(change.left); + if (!change.left.length) { + throw new Error('Group update left is missing details'); + } + return getLeftGroupUpdateChangeStr(change.left); case 'kicked': - return ChangeItemKicked(change.kicked); + if (!change.kicked.length) { + throw new Error('Group update kicked is missing details'); + } + return getKickedGroupUpdateStr(change.kicked, groupName); + case 'add': + if (!change.added.length) { + throw new Error('Group update added is missing details'); + } + return getJoinedGroupUpdateChangeStr(change.added, isGroupV2, change.withHistory, groupName); case 'promoted': - return ChangeItemPromoted(change.promoted); + if (!change.promoted.length) { + throw new Error('Group update promoted is missing details'); + } + return getPromotedGroupUpdateChangeStr(change.promoted); + case 'name': + return getGroupNameChangeStr(change.newName); case 'avatarChange': - return ChangeItemAvatar(); + return { + token: 'groupDisplayPictureUpdated', + }; default: - return { token: 'groupUpdated' }; + assertUnreachable(changeType, `invalid case: ${changeType}`); + break; } -}; +} + +export const GroupUpdateMessage = ({ messageId }: WithMessageId) => { + const groupChange = useMessageGroupUpdateChange(messageId); -export const GroupUpdateMessage = (props: PropsForGroupUpdate) => { - const { change, messageId } = props; + const changeProps = useChangeItem(groupChange); - const changeItem = ChangeItem(change); + if (!changeProps || !groupChange) { + return null; + } return ( { isControlMessage={true} > - {!isNull(changeItem) ? : null} + ); diff --git a/ts/models/message.ts b/ts/models/message.ts index 0d04a8ed54..d8504492cd 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -471,13 +471,13 @@ export class MessageModel extends Backbone.Model { const timespanText = TimerOptions.getName(expireTimer || 0); - const basicProps: PropsForExpirationTimer = { + const props: PropsForExpirationTimer = { timespanText, timespanSeconds: expireTimer || 0, expirationMode: expirationMode || 'off', }; - return basicProps; + return props; } private getPropsForGroupInvitation(): PropsForGroupInvitation | null { diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 8f68cd7765..3c8d606691 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -34,9 +34,9 @@ import { WithConvoId, WithMessageHash, WithMessageId } from '../../session/types export type MessageModelPropsWithoutConvoProps = { propsForMessage: PropsForMessageWithoutConvoProps; propsForGroupInvitation?: PropsForGroupInvitation; // plop: cleaned up - propsForTimerNotification?: PropsForExpirationTimer; + propsForTimerNotification?: PropsForExpirationTimer; // plop: cleaned up propsForDataExtractionNotification?: PropsForDataExtractionNotification; // plop: cleaned up - propsForGroupUpdateMessage?: PropsForGroupUpdate; + propsForGroupUpdateMessage?: PropsForGroupUpdate; // plop: cleaned up propsForCallNotification?: PropsForCallNotification; // plop: cleaned up propsForMessageRequestResponse?: PropsForMessageRequestResponse; // plop: cleaned up propsForQuote?: PropsForQuote; @@ -121,7 +121,6 @@ export type PropsForGroupUpdateType = export type PropsForGroupUpdate = { change: PropsForGroupUpdateType; - messageId: string; }; export type PropsForGroupInvitation = { diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 6b48ee2b0d..c6a97e7769 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -146,74 +146,26 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( messageId: msg.propsForMessage.id, }; - if (msg.propsForDataExtractionNotification) { - return { - ...common, - message: { - messageType: 'data-extraction', - }, - }; - } - - if (msg.propsForMessageRequestResponse) { - return { - ...common, - message: { - messageType: 'message-request-response', - }, - }; - } - - if (msg.propsForGroupInvitation) { - return { - ...common, - message: { - messageType: 'group-invitation', - }, - }; - } - - if (msg.propsForGroupUpdateMessage) { - return { - ...common, - message: { - messageType: 'group-notification', - props: { ...msg.propsForGroupUpdateMessage }, - }, - }; - } - - if (msg.propsForTimerNotification) { - return { - ...common, - message: { - messageType: 'timer-notification', - }, - }; - } - - if (msg.propsForCallNotification) { - return { - ...common, - message: { - messageType: 'call-notification', - }, - }; - } - - if (msg.propsForInteractionNotification) { - return { - ...common, - message: { - messageType: 'interaction-notification', - }, - }; - } + const messageType = msg.propsForDataExtractionNotification + ? ('data-extraction' as const) + : msg.propsForMessageRequestResponse + ? ('message-request-response' as const) + : msg.propsForGroupInvitation + ? ('group-invitation' as const) + : msg.propsForGroupUpdateMessage + ? ('group-notification' as const) + : msg.propsForTimerNotification + ? ('timer-notification' as const) + : msg.propsForCallNotification + ? ('call-notification' as const) + : msg.propsForInteractionNotification + ? ('interaction-notification' as const) + : ('regular-message' as const); return { ...common, message: { - messageType: 'regular-message', + messageType, }, }; }); diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index 7f32d68b44..22778ee3dc 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -264,3 +264,16 @@ export function useMessageExpirationUpdateTimespanSeconds(messageId: string) { export function useMessageExpirationUpdateTimespanText(messageId: string) { return useMessagePropsByMessageId(messageId)?.propsForTimerNotification?.timespanText; } + +/** + * ============================================ + * Below are selectors for group change updates + * ============================================ + */ + +/** + * Return the group change corresponding to this message's group update + */ +export function useMessageGroupUpdateChange(messageId: string) { + return useMessagePropsByMessageId(messageId)?.propsForGroupUpdateMessage?.change; +} From 5fd5db5a2d7c9e780c59461ac79769df0248875d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 09:41:13 +1100 Subject: [PATCH 289/302] chore: bring back the screenshot notification handling as it is not removed from all platforms yet --- .../DataExtractionNotification.tsx | 18 +++++++++++----- ts/models/message.ts | 21 ++++++++++++++----- ts/models/messageType.ts | 6 +++--- ts/receiver/contentMessage.ts | 4 ++-- ts/state/selectors/messages.ts | 13 ++++++++++++ 5 files changed, 47 insertions(+), 15 deletions(-) diff --git a/ts/components/conversation/message/message-item/DataExtractionNotification.tsx b/ts/components/conversation/message/message-item/DataExtractionNotification.tsx index 4055778148..90cbef2b2a 100644 --- a/ts/components/conversation/message/message-item/DataExtractionNotification.tsx +++ b/ts/components/conversation/message/message-item/DataExtractionNotification.tsx @@ -1,21 +1,22 @@ import { ExpirableReadableMessage } from './ExpirableReadableMessage'; import { NotificationBubble } from './notification-bubble/NotificationBubble'; import { Localizer } from '../../../basic/Localizer'; -import { useMessageAuthor } from '../../../../state/selectors'; +import { useMessageAuthor, useMessageDataExtractionType } from '../../../../state/selectors'; import { useNicknameOrProfileNameOrShortenedPubkey } from '../../../../hooks/useParamSelector'; import type { WithMessageId } from '../../../../session/types/with'; +import { SignalService } from '../../../../protobuf'; export const DataExtractionNotification = (props: WithMessageId) => { const { messageId } = props; const author = useMessageAuthor(messageId); const authorName = useNicknameOrProfileNameOrShortenedPubkey(author); - if (!author) { + const dataExtractionType = useMessageDataExtractionType(messageId); + + if (!author || !dataExtractionType) { return null; } - // Note: we only support one type of data extraction notification now (media saved). - // the screenshot support is entirely removed. return ( { isControlMessage={true} > - + ); diff --git a/ts/models/message.ts b/ts/models/message.ts index d8504492cd..a396acf028 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -24,6 +24,7 @@ import { MessageGroupUpdate, MessageModelType, fillMessageAttributesWithDefaults, + type DataExtractionNotificationMsg, } from './messageType'; import { Data } from '../data/data'; @@ -229,7 +230,7 @@ export class MessageModel extends Backbone.Model { private isDataExtractionNotification() { // if set to {} this returns true - return !!this.get('dataExtractionNotification'); + return !isEmpty(this.get('dataExtractionNotification')); } private isCallNotification() { @@ -295,8 +296,14 @@ export class MessageModel extends Backbone.Model { } if (this.isDataExtractionNotification()) { - return window.i18n.stripped('attachmentsMediaSaved', { - name: ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder(this.get('source')), + const dataExtraction = this.get( + 'dataExtractionNotification' + ) as DataExtractionNotificationMsg; + const authorName = ConvoHub.use().getNicknameOrRealUsernameOrPlaceholder(this.get('source')); + const isScreenshot = + dataExtraction.type === SignalService.DataExtractionNotification.Type.SCREENSHOT; + return window.i18n.stripped(isScreenshot ? 'screenshotTaken' : 'attachmentsMediaSaved', { + name: authorName, }); } if (this.isCallNotification()) { @@ -492,8 +499,12 @@ export class MessageModel extends Backbone.Model { }; } - private getPropsForDataExtractionNotification(): boolean { - return !!this.isDataExtractionNotification(); + private getPropsForDataExtractionNotification(): DataExtractionNotificationMsg | null { + const dataExtraction = this.get('dataExtractionNotification'); + if (!dataExtraction || !dataExtraction.type) { + return null; + } + return { type: dataExtraction.type }; } private getPropsForGroupUpdateMessage(): PropsForGroupUpdate | null { diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts index 31bf981e1f..eb562d89f6 100644 --- a/ts/models/messageType.ts +++ b/ts/models/messageType.ts @@ -14,6 +14,7 @@ import { CallNotificationType, InteractionNotificationType, } from '../state/ducks/types'; +import type { SignalService } from '../protobuf'; export type MessageModelType = 'incoming' | 'outgoing'; @@ -138,9 +139,8 @@ export enum MessageDirection { any = '%', } -type DataExtractionNotificationMsg = { - // Note: we only support one type (media saved, screenshot is not supported at all anymore) - // Note: just keeping this an object in case we need to add details to it. +export type DataExtractionNotificationMsg = { + type: SignalService.DataExtractionNotification.Type; }; export type PropsForDataExtractionNotification = DataExtractionNotificationMsg; diff --git a/ts/receiver/contentMessage.ts b/ts/receiver/contentMessage.ts index 0a063f217c..c84f40898b 100644 --- a/ts/receiver/contentMessage.ts +++ b/ts/receiver/contentMessage.ts @@ -914,6 +914,7 @@ export async function handleDataExtractionNotification({ envelope, expireUpdate, messageHash, + dataExtractionNotification, }: { envelope: EnvelopePlus; dataExtractionNotification: SignalService.DataExtractionNotification; @@ -921,7 +922,6 @@ export async function handleDataExtractionNotification({ messageHash: string; }): Promise { // Note: we currently don't care about the timestamp included in the field itself, just the timestamp of the envelope - // Note: we only support one type of data extraction notification const { source, timestamp } = envelope; await IncomingMessageCache.removeFromCache(envelope); @@ -946,7 +946,7 @@ export async function handleDataExtractionNotification({ messageHash, sent_at: sentAtTimestamp, dataExtractionNotification: { - // just set it to non empty object. We don't need anything else than this for now + type: dataExtractionNotification.type, }, }); diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index 22778ee3dc..4660220e3a 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -217,6 +217,19 @@ export function useMessageCallNotificationType(messageId: string) { return useMessagePropsByMessageId(messageId)?.propsForCallNotification?.notificationType; } +/** + * ==================================================== + * Below are selectors for data extraction notification + * ==================================================== + */ + +/** + * Return the call notification type linked to the specified message + */ +export function useMessageDataExtractionType(messageId: string) { + return useMessagePropsByMessageId(messageId)?.propsForDataExtractionNotification?.type; +} + /** * ================================================ * Below are selectors for interaction notification From 42f47c15f6fe67c87ef0a2f07eeb6ee3afb98991 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 09:57:23 +1100 Subject: [PATCH 290/302] chore: move cleaning up of groupupdates --- .../conversation/SessionMessagesList.tsx | 4 +- .../message-item/GroupUpdateMessage.tsx | 2 +- ts/models/message.ts | 62 +++++-------------- 3 files changed, 18 insertions(+), 50 deletions(-) diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx index a32b54c9b1..d58d9f70be 100644 --- a/ts/components/conversation/SessionMessagesList.tsx +++ b/ts/components/conversation/SessionMessagesList.tsx @@ -120,11 +120,11 @@ export const SessionMessagesList = (props: { break; } case 'interaction-notification': { - ComponentToRender = Message; + ComponentToRender = InteractionNotification; break; } case 'regular-message': { - ComponentToRender = InteractionNotification; + ComponentToRender = Message; break; } default: diff --git a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx index 5b8b77ce69..8845fd2cfb 100644 --- a/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx +++ b/ts/components/conversation/message/message-item/GroupUpdateMessage.tsx @@ -58,7 +58,7 @@ function useChangeItem(change?: PropsForGroupUpdateType): LocalizerComponentProp }; default: assertUnreachable(changeType, `invalid case: ${changeType}`); - break; + throw new Error('unhandled case, but this is to make typescript happy'); } } diff --git a/ts/models/message.ts b/ts/models/message.ts index a396acf028..a3977d204c 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -22,7 +22,6 @@ import { MessageAttributes, MessageAttributesOptionals, MessageGroupUpdate, - MessageModelType, fillMessageAttributesWithDefaults, type DataExtractionNotificationMsg, } from './messageType'; @@ -55,7 +54,6 @@ import { MessageModelPropsWithoutConvoProps, PropsForAttachment, PropsForExpirationTimer, - PropsForExpiringMessage, PropsForGroupInvitation, PropsForGroupUpdate, PropsForGroupUpdateAdd, @@ -196,7 +194,7 @@ export class MessageModel extends Backbone.Model { } public isIncoming() { - return this.get('type') === 'incoming'; + return this.get('type') === 'incoming' || this.get('direction') === 'incoming'; } public isUnread() { @@ -429,34 +427,6 @@ export class MessageModel extends Backbone.Model { } } - private getPropsForExpiringMessage(): PropsForExpiringMessage { - const expirationType = this.getExpirationType(); - const expirationDurationMs = this.getExpireTimerSeconds() - ? this.getExpireTimerSeconds() * DURATION.SECONDS - : null; - - const expireTimerStart = this.getExpirationStartTimestamp() || null; - - const expirationTimestamp = - expirationType && expireTimerStart && expirationDurationMs - ? expireTimerStart + expirationDurationMs - : null; - - const direction = - this.get('direction') === 'outgoing' || this.get('type') === 'outgoing' - ? 'outgoing' - : 'incoming'; - - return { - convoId: this.get('conversationId'), - messageId: this.get('id'), - direction, - expirationDurationMs, - expirationTimestamp, - isExpired: this.isExpired(), - }; - } - private getPropsForTimerNotification(): PropsForExpirationTimer | null { if (!this.isExpirationTimerUpdate()) { return null; @@ -513,19 +483,13 @@ export class MessageModel extends Backbone.Model { return null; } - const sharedProps = { - isUnread: this.isUnread(), - receivedAt: this.get('received_at'), - ...this.getPropsForExpiringMessage(), - }; - if (groupUpdate.joined?.length) { const change: PropsForGroupUpdateAdd = { type: 'add', added: groupUpdate.joined as Array, withHistory: false, }; - return { change, ...sharedProps }; + return { change }; } if (groupUpdate.joinedWithHistory?.length) { const change: PropsForGroupUpdateAdd = { @@ -533,7 +497,7 @@ export class MessageModel extends Backbone.Model { added: groupUpdate.joinedWithHistory as Array, withHistory: true, }; - return { change, ...sharedProps }; + return { change }; } if (groupUpdate.kicked?.length) { @@ -541,7 +505,7 @@ export class MessageModel extends Backbone.Model { type: 'kicked', kicked: groupUpdate.kicked as Array, }; - return { change, ...sharedProps }; + return { change }; } if (groupUpdate.left?.length) { @@ -549,7 +513,7 @@ export class MessageModel extends Backbone.Model { type: 'left', left: groupUpdate.left as Array, }; - return { change, ...sharedProps }; + return { change }; } if (groupUpdate.promoted?.length) { @@ -557,20 +521,20 @@ export class MessageModel extends Backbone.Model { type: 'promoted', promoted: groupUpdate.promoted as Array, }; - return { change, ...sharedProps }; + return { change }; } if (groupUpdate.name) { const change: PropsForGroupUpdateName = { type: 'name', newName: groupUpdate.name, }; - return { change, ...sharedProps }; + return { change }; } if (groupUpdate.avatarChange) { const change: PropsForGroupUpdateAvatarChange = { type: 'avatarChange', }; - return { change, ...sharedProps }; + return { change }; } return null; @@ -624,8 +588,12 @@ export class MessageModel extends Backbone.Model { public getPropsForMessage(): PropsForMessageWithoutConvoProps { const sender = this.getSource(); const expirationType = this.getExpirationType(); - const expirationDurationMs = this.getExpireTimerSeconds() * DURATION.SECONDS; - const expireTimerStart = this.getExpirationStartTimestamp(); + const expirationDurationMs = this.getExpireTimerSeconds() + ? this.getExpireTimerSeconds() * DURATION.SECONDS + : null; + + const expireTimerStart = this.getExpirationStartTimestamp() || null; + const expirationTimestamp = expirationType && expireTimerStart && expirationDurationMs ? expireTimerStart + expirationDurationMs @@ -636,7 +604,7 @@ export class MessageModel extends Backbone.Model { const body = this.get('body'); const props: PropsForMessageWithoutConvoProps = { id: this.id, - direction: (this.isIncoming() ? 'incoming' : 'outgoing') as MessageModelType, + direction: this.isIncoming() ? 'incoming' : 'outgoing', timestamp: this.get('sent_at') || 0, sender, convoId: this.get('conversationId'), From e33f2ed734051420a298e3419ab0c554ea8849b5 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 10:16:35 +1100 Subject: [PATCH 291/302] chore: useIsMessageSelectioMode hook when needed --- ts/components/avatar/Avatar.tsx | 5 +- ts/components/conversation/H5AudioPlayer.tsx | 4 +- .../header/ConversationHeader.tsx | 10 ++-- .../message-content/MessageAttachment.tsx | 8 ++-- .../MessageContentWithStatus.tsx | 8 ++-- .../message/message-content/MessageText.tsx | 46 ++++++++----------- .../message-item/GenericReadableMessage.tsx | 8 ++-- ts/state/selectors/conversations.ts | 20 -------- 8 files changed, 37 insertions(+), 72 deletions(-) diff --git a/ts/components/avatar/Avatar.tsx b/ts/components/avatar/Avatar.tsx index 351b9a49b3..f420127386 100644 --- a/ts/components/avatar/Avatar.tsx +++ b/ts/components/avatar/Avatar.tsx @@ -1,7 +1,6 @@ import classNames from 'classnames'; import { isEqual } from 'lodash'; import { memo, SessionDataTestId, useState } from 'react'; -import { useSelector } from 'react-redux'; import styled from 'styled-components'; import { useDisableDrag } from '../../hooks/useDisableDrag'; @@ -11,10 +10,10 @@ import { useConversationUsername, useIsClosedGroup, } from '../../hooks/useParamSelector'; -import { isMessageSelectionMode } from '../../state/selectors/conversations'; import { SessionIcon } from '../icon'; import { AvatarPlaceHolder } from './AvatarPlaceHolder/AvatarPlaceHolder'; import { ClosedGroupAvatar } from './AvatarPlaceHolder/ClosedGroupAvatar'; +import { useIsMessageSelectionMode } from '../../state/selectors/selectedConversation'; export enum AvatarSize { XS = 28, @@ -127,7 +126,7 @@ const AvatarInner = (props: Props) => { } = props; const [imageBroken, setImageBroken] = useState(false); - const isSelectingMessages = useSelector(isMessageSelectionMode); + const isSelectingMessages = useIsMessageSelectionMode(); const isClosedGroup = useIsClosedGroup(pubkey); const avatarPath = useAvatarPath(pubkey); diff --git a/ts/components/conversation/H5AudioPlayer.tsx b/ts/components/conversation/H5AudioPlayer.tsx index 126545017f..31c9a9c2ec 100644 --- a/ts/components/conversation/H5AudioPlayer.tsx +++ b/ts/components/conversation/H5AudioPlayer.tsx @@ -9,11 +9,11 @@ import { useMessageDirection, useMessageSelected } from '../../state/selectors'; import { getNextMessageToPlayId, getSortedMessagesOfSelectedConversation, - isMessageSelectionMode, } from '../../state/selectors/conversations'; import { getAudioAutoplay } from '../../state/selectors/userConfig'; import { SessionButton, SessionButtonType } from '../basic/SessionButton'; import { SessionIcon } from '../icon'; +import { useIsMessageSelectionMode } from '../../state/selectors/selectedConversation'; const StyledSpeedButton = styled.div` padding: var(--margins-xs); @@ -164,7 +164,7 @@ export const AudioPlayerWithEncryptedFile = (props: { const autoPlaySetting = useSelector(getAudioAutoplay); const messageProps = useSelector(getSortedMessagesOfSelectedConversation); const nextMessageToPlayId = useSelector(getNextMessageToPlayId); - const multiSelectMode = useSelector(isMessageSelectionMode); + const multiSelectMode = useIsMessageSelectionMode(); const selected = useMessageSelected(messageId); const direction = useMessageDirection(messageId); const iconColor = diff --git a/ts/components/conversation/header/ConversationHeader.tsx b/ts/components/conversation/header/ConversationHeader.tsx index 238c7aba65..7c1fd1ca0c 100644 --- a/ts/components/conversation/header/ConversationHeader.tsx +++ b/ts/components/conversation/header/ConversationHeader.tsx @@ -1,17 +1,19 @@ -import { useDispatch, useSelector } from 'react-redux'; -import { isMessageSelectionMode } from '../../../state/selectors/conversations'; +import { useDispatch } from 'react-redux'; import { openRightPanel } from '../../../state/ducks/conversations'; import { useIsOutgoingRequest } from '../../../hooks/useParamSelector'; -import { useSelectedConversationKey } from '../../../state/selectors/selectedConversation'; +import { + useIsMessageSelectionMode, + useSelectedConversationKey, +} from '../../../state/selectors/selectedConversation'; import { Flex } from '../../basic/Flex'; import { AvatarHeader, CallButton } from './ConversationHeaderItems'; import { SelectionOverlay } from './ConversationHeaderSelectionOverlay'; import { ConversationHeaderTitle } from './ConversationHeaderTitle'; export const ConversationHeaderWithDetails = () => { - const isSelectionMode = useSelector(isMessageSelectionMode); + const isSelectionMode = useIsMessageSelectionMode(); const selectedConvoKey = useSelectedConversationKey(); const isOutgoingRequest = useIsOutgoingRequest(selectedConvoKey); diff --git a/ts/components/conversation/message/message-content/MessageAttachment.tsx b/ts/components/conversation/message/message-content/MessageAttachment.tsx index 00d32b1a51..5957384c9d 100644 --- a/ts/components/conversation/message/message-content/MessageAttachment.tsx +++ b/ts/components/conversation/message/message-content/MessageAttachment.tsx @@ -8,10 +8,7 @@ import { PropsForAttachment, toggleSelectedMessageId } from '../../../../state/d import { LightBoxOptions, updateLightBoxOptions } from '../../../../state/ducks/modalDialog'; import { StateType } from '../../../../state/reducer'; import { useMessageSelected } from '../../../../state/selectors'; -import { - getMessageAttachmentProps, - isMessageSelectionMode, -} from '../../../../state/selectors/conversations'; +import { getMessageAttachmentProps } from '../../../../state/selectors/conversations'; import { AttachmentType, AttachmentTypeWithPath, @@ -28,6 +25,7 @@ import { MessageHighlighter } from './MessageHighlighter'; import { useIsDetailMessageView } from '../../../../contexts/isDetailViewContext'; import { MessageGenericAttachment } from './MessageGenericAttachment'; import { ContextMessageProvider } from '../../../../contexts/MessageIdContext'; +import { useIsMessageSelectionMode } from '../../../../state/selectors/selectedConversation'; export type MessageAttachmentSelectorProps = Pick< MessageRenderingProps, @@ -67,7 +65,7 @@ export const MessageAttachment = (props: Props) => { getMessageAttachmentProps(state, messageId) ); - const multiSelectMode = useSelector(isMessageSelectionMode); + const multiSelectMode = useIsMessageSelectionMode(); const selected = useMessageSelected(messageId); const onClickOnImageGrid = useCallback( (attachment: AttachmentTypeWithPath | AttachmentType) => { diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx index 16e8aba018..482b85dd14 100644 --- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx +++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx @@ -9,10 +9,7 @@ import { toggleSelectedMessageId } from '../../../../state/ducks/conversations'; import { updateReactListModal } from '../../../../state/ducks/modalDialog'; import { StateType } from '../../../../state/reducer'; import { useHideAvatarInMsgList } from '../../../../state/selectors'; -import { - getMessageContentWithStatusesSelectorProps, - isMessageSelectionMode, -} from '../../../../state/selectors/conversations'; +import { getMessageContentWithStatusesSelectorProps } from '../../../../state/selectors/conversations'; import { Reactions } from '../../../../util/reactions'; import { Flex } from '../../../basic/Flex'; import { ExpirableReadableMessage } from '../message-item/ExpirableReadableMessage'; @@ -21,6 +18,7 @@ import { MessageContent } from './MessageContent'; import { MessageContextMenu } from './MessageContextMenu'; import { MessageReactions } from './MessageReactions'; import { MessageStatus } from './MessageStatus'; +import { useIsMessageSelectionMode } from '../../../../state/selectors/selectedConversation'; export type MessageContentWithStatusSelectorProps = { isGroup: boolean } & Pick< MessageRenderingProps, @@ -63,7 +61,7 @@ export const MessageContentWithStatuses = (props: Props) => { const dispatch = useDispatch(); const hideAvatar = useHideAvatarInMsgList(props.messageId); - const multiSelectMode = useSelector(isMessageSelectionMode); + const multiSelectMode = useIsMessageSelectionMode(); const onClickOnMessageOuterContainer = useCallback( (event: MouseEvent) => { diff --git a/ts/components/conversation/message/message-content/MessageText.tsx b/ts/components/conversation/message/message-content/MessageText.tsx index dfab97f142..e97148eeb8 100644 --- a/ts/components/conversation/message/message-content/MessageText.tsx +++ b/ts/components/conversation/message/message-content/MessageText.tsx @@ -1,26 +1,20 @@ import classNames from 'classnames'; -import { useSelector } from 'react-redux'; import styled from 'styled-components'; -import { isOpenOrClosedGroup } from '../../../../models/conversationAttributes'; -import { MessageRenderingProps } from '../../../../models/messageType'; -import { StateType } from '../../../../state/reducer'; -import { - getMessageTextProps, - isMessageSelectionMode, -} from '../../../../state/selectors/conversations'; import { SessionIcon } from '../../../icon'; import { MessageBody } from './MessageBody'; -import { useMessageDirection } from '../../../../state/selectors'; - -type Props = { - messageId: string; -}; +import { + useMessageDirection, + useMessageIsDeleted, + useMessageText, +} from '../../../../state/selectors'; +import { + useIsMessageSelectionMode, + useSelectedIsGroupOrCommunity, +} from '../../../../state/selectors/selectedConversation'; +import type { WithMessageId } from '../../../../session/types/with'; -export type MessageTextSelectorProps = Pick< - MessageRenderingProps, - 'text' | 'direction' | 'status' | 'isDeleted' | 'conversationType' ->; +type Props = WithMessageId; const StyledMessageText = styled.div<{ isDeleted?: boolean }>` white-space: pre-wrap; @@ -37,16 +31,12 @@ const StyledMessageText = styled.div<{ isDeleted?: boolean }>` `} `; -export const MessageText = (props: Props) => { - const selected = useSelector((state: StateType) => getMessageTextProps(state, props.messageId)); - const multiSelectMode = useSelector(isMessageSelectionMode); - const direction = useMessageDirection(props.messageId); - - if (!selected) { - return null; - } - const { text, isDeleted, conversationType } = selected; - +export const MessageText = ({ messageId }: Props) => { + const multiSelectMode = useIsMessageSelectionMode(); + const direction = useMessageDirection(messageId); + const isDeleted = useMessageIsDeleted(messageId); + const text = useMessageText(messageId); + const isOpenOrClosedGroup = useSelectedIsGroupOrCommunity(); const contents = isDeleted ? window.i18n('deleteMessageDeletedGlobally') : text?.trim(); if (!contents) { @@ -69,7 +59,7 @@ export const MessageText = (props: Props) => { text={contents || ''} disableLinks={multiSelectMode} disableJumbomoji={false} - isGroup={isOpenOrClosedGroup(conversationType)} + isGroup={isOpenOrClosedGroup} /> ); diff --git a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx index 8e5f52bda4..cca3dbf568 100644 --- a/ts/components/conversation/message/message-item/GenericReadableMessage.tsx +++ b/ts/components/conversation/message/message-item/GenericReadableMessage.tsx @@ -9,12 +9,10 @@ import { MessageRenderingProps } from '../../../../models/messageType'; import { ConvoHub } from '../../../../session/conversations'; import { StateType } from '../../../../state/reducer'; import { useMessageSelected } from '../../../../state/selectors'; -import { - getGenericReadableMessageSelectorProps, - isMessageSelectionMode, -} from '../../../../state/selectors/conversations'; +import { getGenericReadableMessageSelectorProps } from '../../../../state/selectors/conversations'; import { MessageContentWithStatuses } from '../message-content/MessageContentWithStatus'; import { StyledMessageReactionsContainer } from '../message-content/MessageReactions'; +import { useIsMessageSelectionMode } from '../../../../state/selectors/selectedConversation'; export type GenericReadableMessageSelectorProps = Pick< MessageRenderingProps, @@ -74,7 +72,7 @@ export const GenericReadableMessage = (props: Props) => { const isMessageSelected = useMessageSelected(props.messageId); - const multiSelectMode = useSelector(isMessageSelectionMode); + const multiSelectMode = useIsMessageSelectionMode(); const [isRightClicked, setIsRightClicked] = useState(false); const onMessageLoseFocus = useCallback(() => { diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index c6a97e7769..6ac6f858e2 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -22,7 +22,6 @@ import { ReplyingToMessageProps } from '../../components/conversation/compositio import { MessageAttachmentSelectorProps } from '../../components/conversation/message/message-content/MessageAttachment'; import { MessageContentSelectorProps } from '../../components/conversation/message/message-content/MessageContent'; import { MessageContentWithStatusSelectorProps } from '../../components/conversation/message/message-content/MessageContentWithStatus'; -import { MessageTextSelectorProps } from '../../components/conversation/message/message-content/MessageText'; import { GenericReadableMessageSelectorProps } from '../../components/conversation/message/message-item/GenericReadableMessage'; import { hasValidIncomingRequestValues } from '../../models/conversation'; import { isOpenOrClosedGroup } from '../../models/conversationAttributes'; @@ -855,25 +854,6 @@ export const getMessageQuoteProps = createSelector( } ); -export const getMessageTextProps = createSelector( - getMessagePropsByMessageId, - (props): MessageTextSelectorProps | undefined => { - if (!props || isEmpty(props)) { - return undefined; - } - - const msgProps: MessageTextSelectorProps = pick(props.propsForMessage, [ - 'direction', - 'status', - 'text', - 'isDeleted', - 'conversationType', - ]); - - return msgProps; - } -); - export const getMessageAttachmentProps = createSelector( getMessagePropsByMessageId, (props): MessageAttachmentSelectorProps | undefined => { From b3fffc9caee87e531bfc37a1e65d944c693699b1 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 11:30:47 +1100 Subject: [PATCH 292/302] fix: fix the control messages not being marked as read sometimes --- .../message-item/ExpirableReadableMessage.tsx | 5 +- .../message-item/InteractionNotification.tsx | 8 +-- .../message-item/MessageRequestResponse.tsx | 8 +-- .../message/message-item/ReadableMessage.tsx | 63 ++++++++++++------- ts/models/conversation.ts | 1 + ts/models/message.ts | 8 +-- ts/state/ducks/conversations.ts | 8 ++- 7 files changed, 52 insertions(+), 49 deletions(-) diff --git a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx index 0ef6db91fc..84cdfcba74 100644 --- a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx +++ b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx @@ -82,8 +82,7 @@ const StyledReadableMessage = styled(ReadableMessage)<{ flex-direction: column; `; -export interface ExpirableReadableMessageProps - extends Omit { +export interface ExpirableReadableMessageProps extends Omit { messageId: string; isControlMessage?: boolean; } @@ -130,7 +129,6 @@ export const ExpirableReadableMessage = (props: ExpirableReadableMessageProps) = const { messageId, direction: _direction, - receivedAt, isUnread, expirationDurationMs, expirationTimestamp, @@ -143,7 +141,6 @@ export const ExpirableReadableMessage = (props: ExpirableReadableMessageProps) = return ( { const isGroup = !useSelectedIsPrivate(); const isCommunity = useSelectedIsPublic(); const isUnread = useMessageIsUnread(messageId) || false; - const receivedAt = useMessageReceivedAt(messageId); const interactionNotification = useMessageInteractionNotification(messageId); if (!convoId || !messageId || !interactionNotification) { @@ -80,7 +75,6 @@ export const InteractionNotification = (props: WithMessageId) => { return ( { const conversationId = useSelectedConversationKey(); - const receivedAt = useMessageReceivedAt(messageId); const isUnread = useMessageIsUnread(messageId) || false; const isUs = useMessageAuthorIsUs(messageId); @@ -27,7 +22,6 @@ export const MessageRequestResponse = ({ messageId }: WithMessageId) => { return ( ; onDoubleClickCapture?: MouseEventHandler; @@ -70,12 +70,36 @@ const debouncedTriggerLoadMoreBottom = debounce( 100 ); +async function markReadFromMessageId({ + conversationId, + messageId, + isUnread, +}: WithMessageId & WithConvoId & { isUnread: boolean }) { + // isUnread comes from the redux store in memory, so pretty fast and allows us to fetch from the DB too often + if (!isUnread) { + return; + } + const found = await Data.getMessageById(messageId); + + if (!found) { + return; + } + + if (found.isUnread()) { + ConvoHub.use() + .get(conversationId) + ?.markConversationRead({ + newestUnreadDate: found.get('sent_at') || found.get('serverTimestamp') || Date.now(), + fromConfigMessage: false, + }); + } +} + export const ReadableMessage = (props: ReadableMessageProps) => { const { messageId, onContextMenu, className, - receivedAt, isUnread, onClick, onDoubleClickCapture, @@ -127,9 +151,12 @@ export const ReadableMessage = (props: ReadableMessageProps) => { // make sure the app is focused, because we mark message as read here if (inView === true && isAppFocused) { dispatch(showScrollToBottomButton(false)); - ConvoHub.use() - .get(selectedConversationKey) - ?.markConversationRead({ newestUnreadDate: receivedAt || 0, fromConfigMessage: false }); // TODOLATER this should be `sentAt || serverTimestamp` I think + // TODO this is pretty expensive and should instead use values from the redux store + await markReadFromMessageId({ + messageId, + conversationId: selectedConversationKey, + isUnread, + }); dispatch(markConversationFullyRead(selectedConversationKey)); } else if (inView === false) { @@ -147,23 +174,12 @@ export const ReadableMessage = (props: ReadableMessageProps) => { // this part is just handling the marking of the message as read if needed if (inView) { - if (isUnread) { - // TODOLATER this is pretty expensive and should instead use values from the redux store - const found = await Data.getMessageById(messageId); - - if (found && Boolean(found.get('unread'))) { - const foundSentAt = found.get('sent_at') || found.get('serverTimestamp'); - // we should stack those and send them in a single message once every 5secs or something. - // this would be part of an redesign of the sending pipeline - // mark the whole conversation as read until this point. - // this will trigger the expire timer. - if (foundSentAt) { - ConvoHub.use() - .get(selectedConversationKey) - ?.markConversationRead({ newestUnreadDate: foundSentAt, fromConfigMessage: false }); - } - } - } + // TODO this is pretty expensive and should instead use values from the redux store + await markReadFromMessageId({ + messageId, + conversationId: selectedConversationKey, + isUnread, + }); } }, [ @@ -173,10 +189,9 @@ export const ReadableMessage = (props: ReadableMessageProps) => { oldestMessageId, fetchingMoreInProgress, isAppFocused, - receivedAt, messageId, - isUnread, youngestMessageId, + isUnread, ] ); diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 06ed0e844b..929006bf7f 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -494,6 +494,7 @@ export class ConversationModel extends Backbone.Model { * Fetches from the Database an update of what are the memory only informations like mentionedUs and the unreadCount, etc */ public async refreshInMemoryDetails(providedMemoryDetails?: SaveConversationReturn) { + if (!SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(this)) { return; } diff --git a/ts/models/message.ts b/ts/models/message.ts index a3977d204c..e1befb6b9f 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -129,7 +129,6 @@ export class MessageModel extends Backbone.Model { const propsForGroupUpdateMessage = this.getPropsForGroupUpdateMessage(); const propsForTimerNotification = this.getPropsForTimerNotification(); const isMessageResponse = this.isMessageRequestResponse(); - const propsForQuote = this.getPropsForQuote(); const callNotificationType = this.get('callNotificationType'); const interactionNotification = this.getInteractionNotification(); @@ -151,9 +150,6 @@ export class MessageModel extends Backbone.Model { if (propsForTimerNotification) { messageProps.propsForTimerNotification = propsForTimerNotification; } - if (propsForQuote) { - messageProps.propsForQuote = propsForQuote; - } if (callNotificationType) { const propsForCallNotification: PropsForCallNotification = { @@ -198,7 +194,9 @@ export class MessageModel extends Backbone.Model { } public isUnread() { - return !!this.get('unread'); + const unreadField = this.get('unread'); + + return !!unreadField; } // Important to allow for this.set({ unread}), save to db, then fetch() diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index 3c8d606691..c87e61cca7 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -39,7 +39,6 @@ export type MessageModelPropsWithoutConvoProps = { propsForGroupUpdateMessage?: PropsForGroupUpdate; // plop: cleaned up propsForCallNotification?: PropsForCallNotification; // plop: cleaned up propsForMessageRequestResponse?: PropsForMessageRequestResponse; // plop: cleaned up - propsForQuote?: PropsForQuote; propsForInteractionNotification?: PropsForInteractionNotification; // plop: cleaned up }; @@ -151,7 +150,7 @@ export type PropsForMessageWithoutConvoProps = { id: string; // messageId direction: MessageModelType; timestamp: number; - sender: string; // this is the sender + sender: string; // this is the sender/author convoId: string; // this is the conversation in which this message was sent text?: string; receivedAt?: number; @@ -170,6 +169,11 @@ export type PropsForMessageWithoutConvoProps = { expirationDurationMs?: number; expirationTimestamp?: number | null; isExpired?: boolean; + /** + * true if the sender of that message is trusted for auto attachment downloads. + * Note: we keep it in the PropsForMessageWithoutConvoProps because it is a per-sender setting + * rather than a per-convo setting (especially for groups) + */ isTrustedForAttachmentDownload?: boolean; }; From 9e32aa01ef1e79989dfb4ed37503e2fad81eb2dd Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 11:33:27 +1100 Subject: [PATCH 293/302] chore: rename GroupInvitation.tsx to CommunityInvitation.tsx --- .../message-item/{GroupInvitation.tsx => CommunityInvitation.tsx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ts/components/conversation/message/message-item/{GroupInvitation.tsx => CommunityInvitation.tsx} (100%) diff --git a/ts/components/conversation/message/message-item/GroupInvitation.tsx b/ts/components/conversation/message/message-item/CommunityInvitation.tsx similarity index 100% rename from ts/components/conversation/message/message-item/GroupInvitation.tsx rename to ts/components/conversation/message/message-item/CommunityInvitation.tsx From d4cae6e5b2319d9ae317007aa399389df29dddac Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 11:43:52 +1100 Subject: [PATCH 294/302] chore: address PR reviews --- .../conversation/SessionMessagesList.tsx | 2 +- .../conversation/TimerNotification.tsx | 16 +++++++-------- .../conversations/unsendingInteractions.ts | 14 ++++++------- ts/models/conversation.ts | 7 +++---- ts/models/message.ts | 10 +++++----- ts/models/messageType.ts | 10 ---------- ...ssage.ts => CommunityInvitationMessage.ts} | 6 +++--- ts/state/ducks/conversations.ts | 16 +++++++-------- ts/state/selectors/conversations.ts | 2 +- ts/state/selectors/messages.ts | 20 +++++++++---------- .../messages/GroupInvitationMessage_test.ts | 8 ++++---- 11 files changed, 50 insertions(+), 61 deletions(-) rename ts/session/messages/outgoing/visibleMessage/{GroupInvitationMessage.ts => CommunityInvitationMessage.ts} (80%) diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx index d58d9f70be..491674e0a3 100644 --- a/ts/components/conversation/SessionMessagesList.tsx +++ b/ts/components/conversation/SessionMessagesList.tsx @@ -9,7 +9,7 @@ import { } from '../../state/selectors/conversations'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { MessageDateBreak } from './message/message-item/DateBreak'; -import { CommunityInvitation } from './message/message-item/GroupInvitation'; +import { CommunityInvitation } from './message/message-item/CommunityInvitation'; import { GroupUpdateMessage } from './message/message-item/GroupUpdateMessage'; import { Message } from './message/message-item/Message'; import { MessageRequestResponse } from './message/message-item/MessageRequestResponse'; diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index ffa32ed421..3f5cfb7b49 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -42,10 +42,10 @@ const FollowSettingButton = styled.button` function useFollowSettingsButtonClick({ messageId }: WithMessageId) { const selectedConvoKey = useSelectedConversationKey(); - const timespanSeconds = useMessageExpirationUpdateTimespanSeconds(messageId) || 0; - const expirationMode = useMessageExpirationUpdateMode(messageId) || 'off'; - const disabled = useMessageExpirationUpdateDisabled(messageId) || false; - const timespanText = useMessageExpirationUpdateTimespanText(messageId) || ''; + const timespanSeconds = useMessageExpirationUpdateTimespanSeconds(messageId); + const expirationMode = useMessageExpirationUpdateMode(messageId); + const disabled = useMessageExpirationUpdateDisabled(messageId); + const timespanText = useMessageExpirationUpdateTimespanText(messageId); const dispatch = useDispatch(); const onExit = () => dispatch(updateConfirmModal(null)); @@ -108,9 +108,9 @@ function useFollowSettingsButtonClick({ messageId }: WithMessageId) { } function useAreSameThanOurSide({ messageId }: WithMessageId) { - const timespanSeconds = useMessageExpirationUpdateTimespanSeconds(messageId) || 0; - const expirationMode = useMessageExpirationUpdateMode(messageId) || 'off'; - const disabled = useMessageExpirationUpdateDisabled(messageId) || false; + const timespanSeconds = useMessageExpirationUpdateTimespanSeconds(messageId); + const expirationMode = useMessageExpirationUpdateMode(messageId); + const disabled = useMessageExpirationUpdateDisabled(messageId); const selectedMode = useSelectedConversationDisappearingMode(); const selectedTimespan = useSelectedExpireTimer(); @@ -129,7 +129,7 @@ const FollowSettingsButton = ({ messageId }: WithMessageId) => { const v2Released = ReleasedFeatures.isUserConfigFeatureReleasedCached(); const isPrivateAndFriend = useSelectedIsPrivateFriend(); - const expirationMode = useMessageExpirationUpdateMode(messageId) || 'off'; + const expirationMode = useMessageExpirationUpdateMode(messageId); const authorIsUs = useMessageAuthorIsUs(messageId); const click = useFollowSettingsButtonClick({ diff --git a/ts/interactions/conversations/unsendingInteractions.ts b/ts/interactions/conversations/unsendingInteractions.ts index f63b483877..01b0e07df9 100644 --- a/ts/interactions/conversations/unsendingInteractions.ts +++ b/ts/interactions/conversations/unsendingInteractions.ts @@ -242,7 +242,7 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally( // LEGACY GROUPS -- we cannot delete on the swarm (just unsend which is done separately) if (conversation.isClosedGroup() && PubKey.is05Pubkey(pubkey)) { window.log.info('Cannot delete message from a closed group swarm, so we just complete delete.'); - await deletesMessageLocallyOnly({ conversation, messages, deletionType: 'complete' }); + await deleteMessagesLocallyOnly({ conversation, messages, deletionType: 'complete' }); return; } window.log.info( @@ -257,7 +257,7 @@ export async function deleteMessagesFromSwarmAndCompletelyLocally( 'deleteMessagesFromSwarmAndCompletelyLocally: some messages failed to be deleted. Maybe they were already deleted?' ); } - await deletesMessageLocallyOnly({ conversation, messages, deletionType: 'complete' }); + await deleteMessagesLocallyOnly({ conversation, messages, deletionType: 'complete' }); } /** @@ -273,7 +273,7 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( window.log.info( 'Cannot delete messages from a legacy closed group swarm, so we just markDeleted.' ); - await deletesMessageLocallyOnly({ conversation, messages, deletionType: 'markDeleted' }); + await deleteMessagesLocallyOnly({ conversation, messages, deletionType: 'markDeleted' }); return; } @@ -290,7 +290,7 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( 'deleteMessagesFromSwarmAndMarkAsDeletedLocally: some messages failed to be deleted but still removing the messages content... ' ); } - await deletesMessageLocallyOnly({ conversation, messages, deletionType: 'markDeleted' }); + await deleteMessagesLocallyOnly({ conversation, messages, deletionType: 'markDeleted' }); } /** @@ -298,7 +298,7 @@ export async function deleteMessagesFromSwarmAndMarkAsDeletedLocally( * @param message Message to delete * @param deletionType 'complete' means completely delete the item from the database, markDeleted means empty the message content but keep an entry */ -async function deletesMessageLocallyOnly({ +async function deleteMessagesLocallyOnly({ conversation, messages, deletionType, @@ -380,7 +380,7 @@ const doDeleteSelectedMessagesInSOGS = async ( toDeleteLocallyIds.map(async id => { const msgToDeleteLocally = await Data.getMessageById(id); if (msgToDeleteLocally) { - return deletesMessageLocallyOnly({ + return deleteMessagesLocallyOnly({ conversation, messages: [msgToDeleteLocally], deletionType: 'complete', @@ -457,7 +457,7 @@ const doDeleteSelectedMessages = async ({ // delete just for me in a groupv2 only means delete locally (not even synced to our other devices) if (conversation.isClosedGroupV2()) { - await deletesMessageLocallyOnly({ + await deleteMessagesLocallyOnly({ conversation, messages: selectedMessages, deletionType: 'markDeleted', diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index 929006bf7f..a8515d74a8 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -36,7 +36,7 @@ import { OpenGroupUtils } from '../session/apis/open_group_api/utils'; import { getOpenGroupV2FromConversationId } from '../session/apis/open_group_api/utils/OpenGroupUtils'; import { ExpirationTimerUpdateMessage } from '../session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage'; import { TypingMessage } from '../session/messages/outgoing/controlMessage/TypingMessage'; -import { GroupInvitationMessage } from '../session/messages/outgoing/visibleMessage/GroupInvitationMessage'; +import { CommunityInvitationMessage } from '../session/messages/outgoing/visibleMessage/CommunityInvitationMessage'; import { OpenGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; import { VisibleMessage, @@ -494,7 +494,6 @@ export class ConversationModel extends Backbone.Model { * Fetches from the Database an update of what are the memory only informations like mentionedUs and the unreadCount, etc */ public async refreshInMemoryDetails(providedMemoryDetails?: SaveConversationReturn) { - if (!SessionUtilConvoInfoVolatile.isConvoToStoreInWrapper(this)) { return; } @@ -2145,7 +2144,7 @@ export class ConversationModel extends Backbone.Model { const communityInvitation = message.getCommunityInvitation(); if (communityInvitation && communityInvitation.url) { - const groupInviteMessage = new GroupInvitationMessage({ + const communityInviteMessage = new CommunityInvitationMessage({ identifier: id, createAtNetworkTimestamp: networkTimestamp, name: communityInvitation.name, @@ -2156,7 +2155,7 @@ export class ConversationModel extends Backbone.Model { // we need the return await so that errors are caught in the catch {} await MessageQueue.use().sendToPubKey( destinationPubkey, - groupInviteMessage, + communityInviteMessage, SnodeNamespaces.Default ); return; diff --git a/ts/models/message.ts b/ts/models/message.ts index e1befb6b9f..0d7ad19b9e 100644 --- a/ts/models/message.ts +++ b/ts/models/message.ts @@ -54,7 +54,7 @@ import { MessageModelPropsWithoutConvoProps, PropsForAttachment, PropsForExpirationTimer, - PropsForGroupInvitation, + PropsForCommunityInvitation, PropsForGroupUpdate, PropsForGroupUpdateAdd, PropsForGroupUpdateAvatarChange, @@ -125,7 +125,7 @@ export class MessageModel extends Backbone.Model { public getMessageModelProps(): MessageModelPropsWithoutConvoProps { const propsForDataExtractionNotification = this.getPropsForDataExtractionNotification(); - const propsForGroupInvitation = this.getPropsForGroupInvitation(); + const propsForCommunityInvitation = this.getPropsForCommunityInvitation(); const propsForGroupUpdateMessage = this.getPropsForGroupUpdateMessage(); const propsForTimerNotification = this.getPropsForTimerNotification(); const isMessageResponse = this.isMessageRequestResponse(); @@ -141,8 +141,8 @@ export class MessageModel extends Backbone.Model { if (isMessageResponse) { messageProps.propsForMessageRequestResponse = {}; } - if (propsForGroupInvitation) { - messageProps.propsForGroupInvitation = propsForGroupInvitation; + if (propsForCommunityInvitation) { + messageProps.propsForCommunityInvitation = propsForCommunityInvitation; } if (propsForGroupUpdateMessage) { messageProps.propsForGroupUpdateMessage = propsForGroupUpdateMessage; @@ -455,7 +455,7 @@ export class MessageModel extends Backbone.Model { return props; } - private getPropsForGroupInvitation(): PropsForGroupInvitation | null { + private getPropsForCommunityInvitation(): PropsForCommunityInvitation | null { const invitation = this.getCommunityInvitation(); if (!invitation || !invitation.url) { return null; diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts index eb562d89f6..f7ab0ba43d 100644 --- a/ts/models/messageType.ts +++ b/ts/models/messageType.ts @@ -145,16 +145,6 @@ export type DataExtractionNotificationMsg = { export type PropsForDataExtractionNotification = DataExtractionNotificationMsg; -export type PropsForMessageRequestResponse = MessageRequestResponseMsg & { - conversationId?: string; - name?: string; - messageId: string; - receivedAt?: number; - isUnread: boolean; - isApproved?: boolean; - source?: string; -}; - export type MessageGroupUpdate = { left?: Array; joined?: Array; diff --git a/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts b/ts/session/messages/outgoing/visibleMessage/CommunityInvitationMessage.ts similarity index 80% rename from ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts rename to ts/session/messages/outgoing/visibleMessage/CommunityInvitationMessage.ts index e647a29834..b3a597b281 100644 --- a/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/CommunityInvitationMessage.ts @@ -2,16 +2,16 @@ import { SignalService } from '../../../../protobuf'; import { DataMessage } from '../DataMessage'; import { ExpirableMessageParams } from '../ExpirableMessage'; -interface GroupInvitationMessageParams extends ExpirableMessageParams { +interface CommunityInvitationMessageParams extends ExpirableMessageParams { url: string; name: string; } -export class GroupInvitationMessage extends DataMessage { +export class CommunityInvitationMessage extends DataMessage { private readonly url: string; private readonly name: string; - constructor(params: GroupInvitationMessageParams) { + constructor(params: CommunityInvitationMessageParams) { super({ createAtNetworkTimestamp: params.createAtNetworkTimestamp, identifier: params.identifier, diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index c87e61cca7..eb1b3b01a3 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -33,13 +33,13 @@ import { WithConvoId, WithMessageHash, WithMessageId } from '../../session/types export type MessageModelPropsWithoutConvoProps = { propsForMessage: PropsForMessageWithoutConvoProps; - propsForGroupInvitation?: PropsForGroupInvitation; // plop: cleaned up - propsForTimerNotification?: PropsForExpirationTimer; // plop: cleaned up - propsForDataExtractionNotification?: PropsForDataExtractionNotification; // plop: cleaned up - propsForGroupUpdateMessage?: PropsForGroupUpdate; // plop: cleaned up - propsForCallNotification?: PropsForCallNotification; // plop: cleaned up - propsForMessageRequestResponse?: PropsForMessageRequestResponse; // plop: cleaned up - propsForInteractionNotification?: PropsForInteractionNotification; // plop: cleaned up + propsForCommunityInvitation?: PropsForCommunityInvitation; + propsForTimerNotification?: PropsForExpirationTimer; + propsForDataExtractionNotification?: PropsForDataExtractionNotification; + propsForGroupUpdateMessage?: PropsForGroupUpdate; + propsForCallNotification?: PropsForCallNotification; + propsForMessageRequestResponse?: PropsForMessageRequestResponse; + propsForInteractionNotification?: PropsForInteractionNotification; }; export type MessageModelPropsWithConvoProps = SortedMessageModelProps & { @@ -122,7 +122,7 @@ export type PropsForGroupUpdate = { change: PropsForGroupUpdateType; }; -export type PropsForGroupInvitation = { +export type PropsForCommunityInvitation = { serverName: string; fullUrl: string; }; diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts index 6ac6f858e2..9c7846bae7 100644 --- a/ts/state/selectors/conversations.ts +++ b/ts/state/selectors/conversations.ts @@ -149,7 +149,7 @@ export const getSortedMessagesTypesOfSelectedConversation = createSelector( ? ('data-extraction' as const) : msg.propsForMessageRequestResponse ? ('message-request-response' as const) - : msg.propsForGroupInvitation + : msg.propsForCommunityInvitation ? ('group-invitation' as const) : msg.propsForGroupUpdateMessage ? ('group-notification' as const) diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index 4660220e3a..a6042295f2 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -194,20 +194,20 @@ export function useMessageSelected(messageId?: string) { * Return the full url needed to join a community through a community invitation message */ export function useMessageCommunityInvitationFullUrl(messageId: string) { - return useMessagePropsByMessageId(messageId)?.propsForGroupInvitation?.fullUrl; + return useMessagePropsByMessageId(messageId)?.propsForCommunityInvitation?.fullUrl; } /** * Return the community display name to have a guess of what a community is about */ export function useMessageCommunityInvitationCommunityName(messageId: string) { - return useMessagePropsByMessageId(messageId)?.propsForGroupInvitation?.serverName; + return useMessagePropsByMessageId(messageId)?.propsForCommunityInvitation?.serverName; } /** - * ========================================= - * Below are selectors for call notification - * ========================================= + * ========================================== + * Below are selectors for call notifications + * ========================================== */ /** @@ -224,7 +224,7 @@ export function useMessageCallNotificationType(messageId: string) { */ /** - * Return the call notification type linked to the specified message + * Return the data exrtaction type linked to the specified message */ export function useMessageDataExtractionType(messageId: string) { return useMessagePropsByMessageId(messageId)?.propsForDataExtractionNotification?.type; @@ -237,7 +237,7 @@ export function useMessageDataExtractionType(messageId: string) { */ /** - * Return the call notification type linked to the specified message + * Return the interaction notification type linked to the specified message */ export function useMessageInteractionNotification(messageId: string) { return useMessagePropsByMessageId(messageId)?.propsForInteractionNotification?.notificationType; @@ -253,7 +253,7 @@ export function useMessageInteractionNotification(messageId: string) { * Return the expiration update mode linked to the specified message */ export function useMessageExpirationUpdateMode(messageId: string) { - return useMessagePropsByMessageId(messageId)?.propsForTimerNotification?.expirationMode; + return useMessagePropsByMessageId(messageId)?.propsForTimerNotification?.expirationMode || 'off'; } /** @@ -265,7 +265,7 @@ export function useMessageExpirationUpdateDisabled(messageId: string) { } /** - * Return the timespan in seconds to which this expiration timer update is sett + * Return the timespan in seconds to which this expiration timer update is set */ export function useMessageExpirationUpdateTimespanSeconds(messageId: string) { return useMessagePropsByMessageId(messageId)?.propsForTimerNotification?.timespanSeconds; @@ -275,7 +275,7 @@ export function useMessageExpirationUpdateTimespanSeconds(messageId: string) { * Return the timespan in text (localised) built from the field timespanSeconds */ export function useMessageExpirationUpdateTimespanText(messageId: string) { - return useMessagePropsByMessageId(messageId)?.propsForTimerNotification?.timespanText; + return useMessagePropsByMessageId(messageId)?.propsForTimerNotification?.timespanText || ''; } /** diff --git a/ts/test/session/unit/messages/GroupInvitationMessage_test.ts b/ts/test/session/unit/messages/GroupInvitationMessage_test.ts index 3e7770ab67..75c2a22816 100644 --- a/ts/test/session/unit/messages/GroupInvitationMessage_test.ts +++ b/ts/test/session/unit/messages/GroupInvitationMessage_test.ts @@ -3,16 +3,16 @@ import { beforeEach } from 'mocha'; import { SignalService } from '../../../../protobuf'; import { Constants } from '../../../../session'; -import { GroupInvitationMessage } from '../../../../session/messages/outgoing/visibleMessage/GroupInvitationMessage'; +import { CommunityInvitationMessage } from '../../../../session/messages/outgoing/visibleMessage/CommunityInvitationMessage'; -describe('GroupInvitationMessage', () => { - let message: GroupInvitationMessage; +describe('CommunityInvitationMessage', () => { + let message: CommunityInvitationMessage; const createAtNetworkTimestamp = Date.now(); const url = 'http://localhost'; const name = 'test'; beforeEach(() => { - message = new GroupInvitationMessage({ + message = new CommunityInvitationMessage({ createAtNetworkTimestamp, url, name, From bc680a39f6de6a1d309222d186bc317d1f55afa0 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 11:49:34 +1100 Subject: [PATCH 295/302] chore: cleanup message list component to render switch --- .../conversation/SessionMessagesList.tsx | 55 +++++-------------- ts/state/selectors/conversations.ts | 3 +- 2 files changed, 14 insertions(+), 44 deletions(-) diff --git a/ts/components/conversation/SessionMessagesList.tsx b/ts/components/conversation/SessionMessagesList.tsx index 491674e0a3..889df5f46c 100644 --- a/ts/components/conversation/SessionMessagesList.tsx +++ b/ts/components/conversation/SessionMessagesList.tsx @@ -6,6 +6,7 @@ import { getOldBottomMessageId, getOldTopMessageId, getSortedMessagesTypesOfSelectedConversation, + type MessagePropsType, } from '../../state/selectors/conversations'; import { useSelectedConversationKey } from '../../state/selectors/selectedConversation'; import { MessageDateBreak } from './message/message-item/DateBreak'; @@ -20,7 +21,6 @@ import { SessionLastSeenIndicator } from './SessionLastSeenIndicator'; import { TimerNotification } from './TimerNotification'; import { DataExtractionNotification } from './message/message-item/DataExtractionNotification'; import { InteractionNotification } from './message/message-item/InteractionNotification'; -import { assertUnreachable } from '../../types/sqlSharedTypes'; import type { WithMessageId } from '../../session/types/with'; function isNotTextboxEvent(e: KeyboardEvent) { @@ -29,6 +29,17 @@ function isNotTextboxEvent(e: KeyboardEvent) { let previousRenderedConvo: string | undefined; +const componentForMessageType: Record> = { + 'group-notification': GroupUpdateMessage, + 'group-invitation': CommunityInvitation, + 'message-request-response': MessageRequestResponse, + 'data-extraction': DataExtractionNotification, + 'timer-notification': TimerNotification, + 'call-notification': CallNotification, + 'interaction-notification': InteractionNotification, + 'regular-message': Message, +}; + export const SessionMessagesList = (props: { scrollAfterLoadMore: ( messageIdToScrollTo: string, @@ -92,47 +103,7 @@ export const SessionMessagesList = (props: { {messagesProps.map(messageProps => { const { messageId } = messageProps; - let ComponentToRender: React.FC | undefined; - - switch (messageProps.message.messageType) { - case 'group-notification': { - ComponentToRender = GroupUpdateMessage; - break; - } - case 'group-invitation': { - ComponentToRender = CommunityInvitation; - break; - } - case 'message-request-response': { - ComponentToRender = MessageRequestResponse; - break; - } - case 'data-extraction': { - ComponentToRender = DataExtractionNotification; - break; - } - case 'timer-notification': { - ComponentToRender = TimerNotification; - break; - } - case 'call-notification': { - ComponentToRender = CallNotification; - break; - } - case 'interaction-notification': { - ComponentToRender = InteractionNotification; - break; - } - case 'regular-message': { - ComponentToRender = Message; - break; - } - default: - assertUnreachable( - messageProps.message.messageType, - `unhandled case with ${messageProps.message.messageType}` - ); - } + const ComponentToRender = componentForMessageType[messageProps.message.messageType]; const unreadIndicator = messageProps.showUnreadIndicator ? ( Date: Fri, 17 Jan 2025 13:14:13 +1100 Subject: [PATCH 296/302] fix: make inviteAsAdmin a useState and not featureFlag --- ts/components/leftpane/overlay/OverlayClosedGroup.tsx | 11 +++++------ ts/state/ducks/metaGroups.ts | 11 ++++------- ts/window.d.ts | 1 - 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx index f599490215..7ee5e8bbfa 100644 --- a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx +++ b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx @@ -5,7 +5,7 @@ import useKey from 'react-use/lib/useKey'; import styled from 'styled-components'; import { concat, isEmpty } from 'lodash'; -import useUpdate from 'react-use/lib/useUpdate'; +import useBoolean from 'react-use/lib/useBoolean'; import { MemberListItem } from '../../MemberListItem'; import { SessionButton } from '../../basic/SessionButton'; @@ -116,8 +116,8 @@ export const OverlayClosedGroupV2 = () => { const privateContactsPubkeys = useContactsToInviteToGroup(); const isCreatingGroup = useIsCreatingGroupFromUIPending(); const [groupName, setGroupName] = useState(''); + const [inviteAsAdmin, setInviteAsAdmin] = useBoolean(false); const [groupNameError, setGroupNameError] = useState(); - const forceUpdate = useUpdate(); const { uniqueValues: selectedMemberIds, addTo: addToSelected, @@ -166,6 +166,7 @@ export const OverlayClosedGroupV2 = () => { members: concat(selectedMemberIds, [us]), groupName, us, + inviteAsAdmin, }) as any ); } @@ -214,11 +215,9 @@ export const OverlayClosedGroupV2 = () => { Invite as admin?{' '} { - window.sessionFeatureFlags.useGroupV2InviteAsAdmin = - !window.sessionFeatureFlags.useGroupV2InviteAsAdmin; - forceUpdate(); + setInviteAsAdmin(!inviteAsAdmin); }} /> diff --git a/ts/state/ducks/metaGroups.ts b/ts/state/ducks/metaGroups.ts index 96aecb7104..7d156020d5 100644 --- a/ts/state/ducks/metaGroups.ts +++ b/ts/state/ducks/metaGroups.ts @@ -107,10 +107,12 @@ const initNewGroupInWrapper = createAsyncThunk( groupName, members, us, + inviteAsAdmin, }: { groupName: string; members: Array; us: string; + inviteAsAdmin: boolean; }, { dispatch } ): Promise => { @@ -250,7 +252,7 @@ const initNewGroupInWrapper = createAsyncThunk( groupPk, membersFromWrapper.map(m => m.pubkeyHex), [], - window.sessionFeatureFlags.useGroupV2InviteAsAdmin + inviteAsAdmin ); await openConversationWithMessages({ conversationKey: groupPk, messageId: null }); @@ -699,12 +701,7 @@ async function handleMemberAddedFromUI({ } // schedule send invite details, auth signature, etc. to the new users - await scheduleGroupInviteJobs( - groupPk, - withHistory, - withoutHistory, - window.sessionFeatureFlags.useGroupV2InviteAsAdmin - ); + await scheduleGroupInviteJobs(groupPk, withHistory, withoutHistory, false); await LibSessionUtil.saveDumpsToDb(groupPk); convo.set({ diff --git a/ts/window.d.ts b/ts/window.d.ts index afb2283496..c384cf8e2c 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -102,7 +102,6 @@ declare global { useTestNet: boolean; useClosedGroupV2: boolean; useClosedGroupV2QAButtons: boolean; - useGroupV2InviteAsAdmin: boolean; replaceLocalizedStringsWithKeys: boolean; debug: { debugLogging: boolean; From ce734f1e1c439f757c6772e1156e7361d4700754 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 13:51:42 +1100 Subject: [PATCH 297/302] chore: enforce i18n functions types to match what is in window.d.ts --- ts/localization/localeTools.ts | 47 +++++++++++++++------------------- ts/types/localizer.d.ts | 3 ++- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/ts/localization/localeTools.ts b/ts/localization/localeTools.ts index c28c7bd654..326173b308 100644 --- a/ts/localization/localeTools.ts +++ b/ts/localization/localeTools.ts @@ -1,10 +1,12 @@ +// eslint-disable-next-line no-restricted-imports +import type { I18nMethods } from '../types/localizer'; import { CrowdinLocale } from './constants'; import { pluralsDictionary, simpleDictionary } from './locales'; type SimpleDictionary = typeof simpleDictionary; type PluralDictionary = typeof pluralsDictionary; -type SimpleLocalizerTokens = keyof SimpleDictionary; +export type SimpleLocalizerTokens = keyof SimpleDictionary; type PluralLocalizerTokens = keyof PluralDictionary; export type MergedLocalizerTokens = SimpleLocalizerTokens | PluralLocalizerTokens; @@ -133,7 +135,7 @@ function propsToTuple( * @param token - The token identifying the message to retrieve. * @param args - An optional record of substitution variables and their replacement values. This is equired if the string has dynamic variables. */ -export function inEnglish([token, args]: GetMessageArgs) { +export const inEnglish: I18nMethods['inEnglish'] = token => { if (!isSimpleToken(token)) { throw new Error('inEnglish only supports simple strings for now'); } @@ -143,8 +145,8 @@ export function inEnglish([token, args]: GetMes log(`Attempted to get forced en string for nonexistent key: '${token}' in fallback dictionary`); return token; } - return formatMessageWithArgs(rawMessage, args); -} + return formatMessageWithArgs(rawMessage); +}; /** * Retrieves a localized message string, substituting variables where necessary. @@ -176,24 +178,21 @@ export function getMessageDefault( * * @returns The localized message string with substitutions applied. Any HTML and custom tags are removed. */ - -export function stripped( - ...[token, args]: GetMessageArgs -): string { +export const stripped: I18nMethods['stripped'] = (...[token, args]) => { const sanitizedArgs = args ? sanitizeArgs(args, '\u200B') : undefined; - const i18nString = getMessageDefault(...([token, sanitizedArgs] as GetMessageArgs)); + // Note: the `as any` is needed because we don't have the template argument available + // when enforcing the type of the stripped function to be the one defined by I18nMethods + const i18nString = getMessageDefault(...([token, sanitizedArgs] as GetMessageArgs)); const strippedString = i18nString.replaceAll(/<[^>]*>/g, ''); return deSanitizeHtmlTags(strippedString, '\u200B'); -} +}; -export function strippedWithObj( - opts: LocalizerComponentProps -): string { +export const strippedWithObj: I18nMethods['strippedWithObj'] = opts => { return stripped(...propsToTuple(opts)); -} +}; /** * Sanitizes the args to be used in the i18n function @@ -224,17 +223,14 @@ export function sanitizeArgs( * @deprecated * */ -export function formatMessageWithArgs( - rawMessage: string, - args?: ArgsFromToken -): string { +export const formatMessageWithArgs: I18nMethods['formatMessageWithArgs'] = (rawMessage, args) => { /** Find and replace the dynamic variables in a localized string and substitute the variables with the provided values */ return rawMessage.replace(/\{(\w+)\}/g, (match: any, arg: string) => { const matchedArg = args ? args[arg as keyof typeof args] : undefined; return matchedArg?.toString() ?? match; }); -} +}; /** * Retrieves a localized message string, without substituting any variables. This resolves any plural forms using the given args @@ -245,16 +241,13 @@ export function formatMessageWithArgs( * * NOTE: This is intended to be used to get the raw string then format it with {@link formatMessageWithArgs} */ -export function getRawMessage( - crowdinLocale: CrowdinLocale, - ...[token, args]: GetMessageArgs -): string { +export const getRawMessage: I18nMethods['getRawMessage'] = (crowdinLocale, ...[token, args]) => { try { if ( typeof window !== 'undefined' && window?.sessionFeatureFlags?.replaceLocalizedStringsWithKeys ) { - return token as T; + return token; } if (isSimpleToken(token)) { @@ -284,15 +277,15 @@ export function getRawMessage( if (!pluralString) { log(`Plural string not found for cardinal '${cardinalRule}': '${pluralString}'`); - return token as T; + return token; } return pluralString.replaceAll('#', `${num}`); } catch (error) { log(error.message); - return token as T; + return token; } -} +}; function getStringForRule({ dictionary, diff --git a/ts/types/localizer.d.ts b/ts/types/localizer.d.ts index 0b537d0ea1..b578d1db9a 100644 --- a/ts/types/localizer.d.ts +++ b/ts/types/localizer.d.ts @@ -3,6 +3,7 @@ import type { MergedLocalizerTokens, GetMessageArgs, LocalizerComponentProps, + SimpleLocalizerTokens, } from '../localization/localeTools'; import { CrowdinLocale } from '../localization/constants'; @@ -13,7 +14,7 @@ export type I18nMethods = { opts: LocalizerComponentProps ) => string | T; /** @see {@link window.i18n.inEnglish} */ - inEnglish: (...[token, args]: GetMessageArgs) => string | T; + inEnglish: (token: T) => string | T; /** @see {@link window.i18n.formatMessageWithArgs */ getRawMessage: ( crowdinLocale: CrowdinLocale, From 42d54abb91963037b2a526f830b35d4b94e9ae07 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 14:06:45 +1100 Subject: [PATCH 298/302] chore: refactor I18n types outside of window object to keep ts/localization folder self contained --- ts/localization/I18nMethods.d.ts | 28 ++++++++++++++++++++++++++++ ts/localization/localeTools.ts | 3 +-- ts/types/localizer.d.ts | 30 ++---------------------------- ts/window.d.ts | 3 ++- 4 files changed, 33 insertions(+), 31 deletions(-) create mode 100644 ts/localization/I18nMethods.d.ts diff --git a/ts/localization/I18nMethods.d.ts b/ts/localization/I18nMethods.d.ts new file mode 100644 index 0000000000..69a7130aa9 --- /dev/null +++ b/ts/localization/I18nMethods.d.ts @@ -0,0 +1,28 @@ +import type { CrowdinLocale } from './constants'; +import type { + MergedLocalizerTokens, + GetMessageArgs, + LocalizerComponentProps, + SimpleLocalizerTokens, + ArgsFromToken, +} from './localeTools'; + +export type I18nMethods = { + /** @see {@link window.i18n.stripped} */ + stripped: (...[token, args]: GetMessageArgs) => string | T; + strippedWithObj: ( + opts: LocalizerComponentProps + ) => string | T; + /** @see {@link window.i18n.inEnglish} */ + inEnglish: (token: T) => string | T; + /** @see {@link window.i18n.formatMessageWithArgs */ + getRawMessage: ( + crowdinLocale: CrowdinLocale, + ...[token, args]: GetMessageArgs + ) => string | T; + /** @see {@link window.i18n.formatMessageWithArgs} */ + formatMessageWithArgs: ( + rawMessage: string, + args?: ArgsFromToken + ) => string | T; +}; diff --git a/ts/localization/localeTools.ts b/ts/localization/localeTools.ts index 326173b308..69722a5d8f 100644 --- a/ts/localization/localeTools.ts +++ b/ts/localization/localeTools.ts @@ -1,6 +1,5 @@ -// eslint-disable-next-line no-restricted-imports -import type { I18nMethods } from '../types/localizer'; import { CrowdinLocale } from './constants'; +import type { I18nMethods } from './I18nMethods'; import { pluralsDictionary, simpleDictionary } from './locales'; type SimpleDictionary = typeof simpleDictionary; diff --git a/ts/types/localizer.d.ts b/ts/types/localizer.d.ts index b578d1db9a..fdf7906954 100644 --- a/ts/types/localizer.d.ts +++ b/ts/types/localizer.d.ts @@ -1,31 +1,5 @@ -import type { - ArgsFromToken, - MergedLocalizerTokens, - GetMessageArgs, - LocalizerComponentProps, - SimpleLocalizerTokens, -} from '../localization/localeTools'; -import { CrowdinLocale } from '../localization/constants'; - -export type I18nMethods = { - /** @see {@link window.i18n.stripped} */ - stripped: (...[token, args]: GetMessageArgs) => string | T; - strippedWithObj: ( - opts: LocalizerComponentProps - ) => string | T; - /** @see {@link window.i18n.inEnglish} */ - inEnglish: (token: T) => string | T; - /** @see {@link window.i18n.formatMessageWithArgs */ - getRawMessage: ( - crowdinLocale: CrowdinLocale, - ...[token, args]: GetMessageArgs - ) => string | T; - /** @see {@link window.i18n.formatMessageWithArgs} */ - formatMessageWithArgs: ( - rawMessage: string, - args?: ArgsFromToken - ) => string | T; -}; +import type { MergedLocalizerTokens, GetMessageArgs } from '../localization/localeTools'; +import type { I18nMethods } from './I18nMethods'; export type SetupI18nReturnType = I18nMethods & ((...[token, args]: GetMessageArgs) => string); diff --git a/ts/window.d.ts b/ts/window.d.ts index c384cf8e2c..11c98e3298 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -5,7 +5,8 @@ import { Store } from '@reduxjs/toolkit'; import { Persistor } from 'redux-persist/es/types'; import { PrimaryColorStateType, ThemeStateType } from './themes/constants/colors'; -import type { GetMessageArgs, I18nMethods } from './types/localizer'; +import type { GetMessageArgs } from './types/localizer'; +import type { I18nMethods } from './types/I18nMethods'; import type { MergedLocalizerTokens } from './localization/localeTools'; export interface LibTextsecure { From ca67167ce57e05dd86d448311d5b69a3eb04bccd Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 17 Jan 2025 14:09:24 +1100 Subject: [PATCH 299/302] chore: rename useAreSameThanOurSide to useOurExpirationMatches --- ts/components/conversation/TimerNotification.tsx | 4 ++-- .../conversation/message/message-item/ReadableMessage.tsx | 2 +- ts/state/selectors/messages.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx index 3f5cfb7b49..593560c24b 100644 --- a/ts/components/conversation/TimerNotification.tsx +++ b/ts/components/conversation/TimerNotification.tsx @@ -107,7 +107,7 @@ function useFollowSettingsButtonClick({ messageId }: WithMessageId) { return { doIt }; } -function useAreSameThanOurSide({ messageId }: WithMessageId) { +function useOurExpirationMatches({ messageId }: WithMessageId) { const timespanSeconds = useMessageExpirationUpdateTimespanSeconds(messageId); const expirationMode = useMessageExpirationUpdateMode(messageId); const disabled = useMessageExpirationUpdateDisabled(messageId); @@ -135,7 +135,7 @@ const FollowSettingsButton = ({ messageId }: WithMessageId) => { const click = useFollowSettingsButtonClick({ messageId, }); - const areSameThanOurs = useAreSameThanOurSide({ messageId }); + const areSameThanOurs = useOurExpirationMatches({ messageId }); if (!v2Released || !isPrivateAndFriend) { return null; diff --git a/ts/components/conversation/message/message-item/ReadableMessage.tsx b/ts/components/conversation/message/message-item/ReadableMessage.tsx index db9c6a328b..057c03e37d 100644 --- a/ts/components/conversation/message/message-item/ReadableMessage.tsx +++ b/ts/components/conversation/message/message-item/ReadableMessage.tsx @@ -75,7 +75,7 @@ async function markReadFromMessageId({ messageId, isUnread, }: WithMessageId & WithConvoId & { isUnread: boolean }) { - // isUnread comes from the redux store in memory, so pretty fast and allows us to fetch from the DB too often + // isUnread comes from the redux store in memory, so pretty fast and allows us to not fetch from the DB too often if (!isUnread) { return; } diff --git a/ts/state/selectors/messages.ts b/ts/state/selectors/messages.ts index a6042295f2..695c1570db 100644 --- a/ts/state/selectors/messages.ts +++ b/ts/state/selectors/messages.ts @@ -224,7 +224,7 @@ export function useMessageCallNotificationType(messageId: string) { */ /** - * Return the data exrtaction type linked to the specified message + * Return the data extraction type linked to the specified message */ export function useMessageDataExtractionType(messageId: string) { return useMessagePropsByMessageId(messageId)?.propsForDataExtractionNotification?.type; From 16d835edf316ec9a89dd80083552582b817209ac Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 20 Jan 2025 10:21:47 +1100 Subject: [PATCH 300/302] fix: resolve compilation issues after merge --- ts/components/registration/stages/CreateAccount.tsx | 2 +- ts/components/registration/stages/RestoreAccount.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/components/registration/stages/CreateAccount.tsx b/ts/components/registration/stages/CreateAccount.tsx index 4b8feae32b..8ab659393b 100644 --- a/ts/components/registration/stages/CreateAccount.tsx +++ b/ts/components/registration/stages/CreateAccount.tsx @@ -33,8 +33,8 @@ import { resetRegistration } from '../RegistrationStages'; import { ContinueButton, OnboardDescription, OnboardHeading } from '../components'; import { BackButtonWithinContainer } from '../components/BackButton'; import { displayNameIsValid, sanitizeDisplayNameOrToast } from '../utils'; -import { localize } from '../../../util/i18n/localizedString'; import { RetrieveDisplayNameError } from '../../../session/utils/errors'; +import { localize } from '../../../localization/localeTools'; export type AccountDetails = { recoveryPassword: string; diff --git a/ts/components/registration/stages/RestoreAccount.tsx b/ts/components/registration/stages/RestoreAccount.tsx index d995efaa18..a486709279 100644 --- a/ts/components/registration/stages/RestoreAccount.tsx +++ b/ts/components/registration/stages/RestoreAccount.tsx @@ -43,7 +43,7 @@ import { BackButtonWithinContainer } from '../components/BackButton'; import { useRecoveryProgressEffect } from '../hooks'; import { displayNameIsValid, sanitizeDisplayNameOrToast } from '../utils'; import { AccountDetails } from './CreateAccount'; -import { localize } from '../../../util/i18n/localizedString'; +import { localize } from '../../../localization/localeTools'; type AccountRestoreDetails = AccountDetails & { dispatch: Dispatch; abortSignal?: AbortSignal }; From eda1c53577444772b48db3cd1bebc40f347b998e Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 20 Jan 2025 11:23:20 +1100 Subject: [PATCH 301/302] chore: lint --- ts/node/sql.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/ts/node/sql.ts b/ts/node/sql.ts index bfdf72500a..51c7ca19ff 100644 --- a/ts/node/sql.ts +++ b/ts/node/sql.ts @@ -1,4 +1,3 @@ -// eslint-disable-next-line import/order import * as BetterSqlite3 from '@signalapp/better-sqlite3'; import { app, clipboard, dialog, Notification } from 'electron'; import fs from 'fs'; From 43818833cc5dd23c79944ffc7df85abbaf2f36df Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 20 Jan 2025 11:42:44 +1100 Subject: [PATCH 302/302] feat: add asdf .tool-versions file to specific python version for convenience --- .tool-versions | 1 + ts/state/ducks/conversations.ts | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000000..69e5cf784a --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +python 3.12.2 diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts index eb1b3b01a3..e99b4190f3 100644 --- a/ts/state/ducks/conversations.ts +++ b/ts/state/ducks/conversations.ts @@ -6,11 +6,7 @@ import { ReplyingToMessageProps } from '../../components/conversation/compositio import { QuotedAttachmentType } from '../../components/conversation/message/message-content/quote/Quote'; import { Data } from '../../data/data'; -import { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - ConversationAttributes, - ConversationNotificationSettingType, -} from '../../models/conversationAttributes'; +import { ConversationNotificationSettingType } from '../../models/conversationAttributes'; import { MessageModelType, PropsForDataExtractionNotification } from '../../models/messageType'; import { ConvoHub } from '../../session/conversations'; import { DisappearingMessages } from '../../session/disappearing_messages';