Rosetta/desktop
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Новый протокол кодирования и декодирования вложений

Browse Source
This commit is contained in:
RoyceDa
2026-03-27 15:32:10 +02:00
parent 8d6090e632
commit 7e0e97f472
7 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/components/DialogInput/DialogInput.tsx
View File

@@ -92,7 +92,10 @@ export function DialogInput() {
preview: files[0].size + "::" + files[0].name,
transport_server: "",
transport_tag: "",
encoded_for: dialog
encoding: {
encoded_for: dialog,
encoder: publicKey
}
}]);
}
});
@@ -122,7 +125,10 @@ export function DialogInput() {
preview: "",
transport_server: "",
transport_tag: "",
encoded_for: dialog
encoding: {
encoded_for: dialog,
encoder: publicKey
}
}]);
if(editableDivRef.current){
editableDivRef.current.focus();
@@ -239,7 +245,10 @@ export function DialogInput() {
preview: "",
transport_server: "",
transport_tag: "",
encoded_for: dialog
encoding: {
encoded_for: dialog,
encoder: publicKey
}
}]);
if(editableDivRef.current){
editableDivRef.current.focus();
@@ -282,7 +291,10 @@ export function DialogInput() {
preview: "",
transport_server: "",
transport_tag: "",
encoded_for: dialog
encoding: {
encoded_for: dialog,
encoder: publicKey
}
}]);
}
if(editableDivRef.current){
@@ -319,7 +331,10 @@ export function DialogInput() {
preview: files[0].size + "::" + files[0].name,
transport_server: "",
transport_tag: "",
encoded_for: dialog
encoding: {
encoded_for: dialog,
encoder: publicKey
}
}]);
}

11
app/providers/AttachmentProvider/usePrepareAttachment.ts
View File

@@ -11,6 +11,7 @@ import { useConsoleLogger } from "@/app/hooks/useConsoleLogger";
import { useDialogsCache } from "../DialogProvider/useDialogsCache";
import { DialogContext } from "../DialogProvider/DialogProvider";
import { useTransportServer } from "../TransportProvider/useTransportServer";
import { usePublicKey } from "../AccountProvider/usePublicKey";
export function usePrepareAttachment() {
const intervalsRef = useRef<NodeJS.Timeout>(null);
@@ -21,6 +22,7 @@ export function usePrepareAttachment() {
const {getDialogCache} = useDialogsCache();
const context = useContext(DialogContext);
const transportServer = useTransportServer();
const publicKey = usePublicKey();
const updateTimestampInDialogCache = (dialog : string, message_id: string) => {
const dialogCache = getDialogCache(dialog);
@@ -117,9 +119,9 @@ export function usePrepareAttachment() {
const blurhash = await base64ImageToBlurhash(attachment.blob);
attachment.preview = blurhash;
}
if(rePrepared && attachment.encoded_for == dialog){
if(rePrepared && (attachment.encoding.encoded_for == dialog || attachment.encoding.encoder == dialog)){
/**
* Это пересланное сообщение и оно уже закодировано для этого диалога, значит не нужно его кодировать и загружать заново
* Это пересланное сообщение и оно уже закодировано для этого диалога, или закодировано отправителем, значит не нужно его кодировать и загружать заново
*/
prepared.push({
...attachment,
@@ -141,7 +143,10 @@ export function usePrepareAttachment() {
...attachment,
transport_server: transportServer || "",
transport_tag: tag,
encoded_for: dialog,
encoding: {
encoded_for: dialog,
encoder: publicKey
},
preview: attachment.preview,
blob: ""
});

5
app/providers/CallProvider/CallProvider.tsx
View File

@@ -474,7 +474,10 @@ export function CallProvider(props : CallProviderProps) {
type: AttachmentType.CALL,
transport_server: "",
transport_tag: "",
encoded_for: "",
encoding: {
encoded_for: "",
encoder: ""
},
blob: ""
}], true);
}

6
app/providers/DialogProvider/DialogProvider.tsx
View File

@@ -1,7 +1,7 @@
import { chacha20Decrypt, decodeWithPassword, decrypt, generateMd5 } from '@/app/workers/crypto/crypto';
import { useDatabase } from '@/app/providers/DatabaseProvider/useDatabase';
import { createContext, useEffect, useRef, useState } from 'react';
import { Attachment, AttachmentType, PacketMessage } from '@/app/providers/ProtocolProvider/protocol/packets/packet.message';
import { Attachment, AttachmentEncoding, AttachmentType, PacketMessage } from '@/app/providers/ProtocolProvider/protocol/packets/packet.message';
import { usePrivatePlain } from '../AccountProvider/usePrivatePlain';
import { usePublicKey } from '../AccountProvider/usePublicKey';
import { PacketRead } from '@/app/providers/ProtocolProvider/protocol/packets/packet.read';
@@ -47,7 +47,7 @@ export interface AttachmentMeta {
type: AttachmentType;
preview: string;
transport_tag: string;
encoded_for: string;
encoding: AttachmentEncoding;
transport_server: string;
}
@@ -962,7 +962,7 @@ export function DialogProvider(props: DialogProviderProps) {
preview: meta.preview,
transport_server: meta.transport_server,
transport_tag: meta.transport_tag,
encoded_for: meta.encoded_for
encoding: meta.encoding
});
}
return attachments;

2
app/providers/DialogProvider/useDialog.ts
View File

@@ -121,7 +121,7 @@ export function useDialog() : {
preview: attachment.preview,
transport_server: attachment.transport_server,
transport_tag: attachment.transport_tag,
encoded_for: dialog
encoding: attachment.encoding
});
if(attachment.type == AttachmentType.FILE){
/**

4
app/providers/DialogProvider/useSynchronize.ts
View File

@@ -191,7 +191,7 @@ export function useSynchronize() {
id: attachment.id,
type: attachment.type,
preview: attachment.preview,
encoded_for: attachment.encoded_for,
encoding: attachment.encoding,
transport_server: attachment.transport_server,
transport_tag: attachment.transport_tag
});
@@ -376,7 +376,7 @@ export function useSynchronize() {
id: attachment.id,
type: attachment.type,
preview: attachment.preview,
encoded_for: attachment.encoded_for,
encoding: attachment.encoding,
transport_server: attachment.transport_server,
transport_tag: attachment.transport_tag
});

26
app/providers/ProtocolProvider/protocol/packets/packet.message.ts
View File

@@ -9,6 +9,17 @@ export enum AttachmentType {
CALL = 4
}
export interface AttachmentEncoding {
/**
* Для кого вложение закодировано (для какого диалога)
*/
encoded_for: string;
/**
* Кто кодировал вложение
*/
encoder: string;
}
export interface Attachment {
id: string;
blob: string;
@@ -16,10 +27,7 @@ export interface Attachment {
preview: string;
transport_tag: string;
transport_server: string;
/**
* Обозначает, для кого закодировано это вложение, нужно для того, чтобы не кодировать и не загружать заново пересланные сообщения, если они уже были закодированы для этого диалога
*/
encoded_for: string;
encoding: AttachmentEncoding;
}
export class PacketMessage extends Packet {
@@ -59,8 +67,11 @@ export class PacketMessage extends Packet {
let type = stream.readInt8() as AttachmentType;
let transport_tag = stream.readString();
let transport_server = stream.readString();
let encoded_for = stream.readString();
this.attachments.push({id, preview, type, blob, transport_tag, transport_server, encoded_for});
const encoding : AttachmentEncoding = {
encoded_for: stream.readString(),
encoder: stream.readString()
}
this.attachments.push({id, preview, type, blob, transport_tag, transport_server, encoding});
}
this.aesChachaKey = stream.readString();
}
@@ -83,7 +94,8 @@ export class PacketMessage extends Packet {
stream.writeInt8(this.attachments[i].type);
stream.writeString(this.attachments[i].transport_tag);
stream.writeString(this.attachments[i].transport_server);
stream.writeString(this.attachments[i].encoded_for);
stream.writeString(this.attachments[i].encoding.encoded_for);
stream.writeString(this.attachments[i].encoding.encoder);
}
stream.writeString(this.aesChachaKey);
return stream;