tensamin/client
Watch
6
0
Fork
You've already forked client
 0
Code Issues Pull requests 3 Projects Releases 2 Packages Wiki Activity Actions

[Fix] Connections

Browse source
This commit is contained in:
Alex Emmet 2026-08-30 18:26:32 +02:00
commit 74fb46990e
No known key found for this signature in database
14 changed files with 950 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

45
packages/chat/src/components/input.tsx
View file

@ -15,7 +15,7 @@ import { Button } from "@methanium/ui";
import { Plus, Laugh, FileVideo, SendHorizonal } from "lucide-react";
import { useChat, useReplyMessage } from "../context";
import { useMTP } from "@tensamin/mtp";
import { requireRelaySuccess, useMTP } from "@tensamin/mtp";
import { log, toast } from "@tensamin/shared/log";
import { cn, useIsMobile } from "@methanium/ui";
import { encryptChatText } from "@tensamin/crypto/chatSecret";
@ -39,7 +39,7 @@ export default function InputComponent({
}) {
const [invertEnterBehavior, setInvertEnterBehavior] = useState(false);
const { send } = useMTP();
const { send, sendSealedRelay } = useMTP();
const {
addLiveMessage,
chatSecret,
@ -174,19 +174,46 @@ export default function InputComponent({
log(3, "chat", "purple", "Content encrypted, sending message...");
send("MessageSend", {
Content: encryptedContent,
ReceiverId: userId,
SendTime: time,
...(replyTo && { ReplyId: replyTo }),
}).catch((e) => {
try {
const [ownIota, peerIota] = await Promise.all([
send("GetIotaData", { UserId: ownId }),
send("GetIotaData", { UserId: userId }),
]);
if (ownIota.type !== "GetIotaData" || peerIota.type !== "GetIotaData") {
throw new Error("Could not resolve an Iota for this message");
}
const response = await sendSealedRelay(
"MessageSend",
{
Content: encryptedContent,
ReceiverId: userId,
SendTime: time,
...(replyTo && { ReplyId: replyTo }),
},
{
nextHop: { kind: "iota", id: ownIota.data.IotaId },
finalRecipientId: userId,
metadataRecipients: [
{ value: ownIota.data.PublicKey, encoding: "base64" },
{ value: peerIota.data.PublicKey, encoding: "base64" },
],
contentRecipients: [
{ value: ownIota.data.PublicKey, encoding: "base64" },
{ value: peerIota.data.PublicKey, encoding: "base64" },
],
},
);
requireRelaySuccess(response);
reference.setMessageState("sent");
} catch (e) {
log(0, "Chat", "red", "Failed to send message", e, {
ReceiverId: userId,
SendTime: time,
});
reference.setFailed(true);
toast("error", "Failed to send message");
});
return;
}
if (replyTo) {
setReplyTo(undefined);

37
packages/chat/src/context.tsx
View file

@ -23,7 +23,7 @@ import {
wrapChatSecret,
} from "@tensamin/crypto/chatSecret";
import { useStorage } from "@tensamin/storage/context";
import { useMTP } from "@tensamin/mtp";
import { requireRelaySuccess, useMTP } from "@tensamin/mtp";
import { log, toast } from "@tensamin/shared/log";
import { useSession } from "@tensamin/storage/session";
import { useUser } from "@tensamin/user/context";
@ -226,7 +226,7 @@ export async function fetchReplyMessage({
export default function Provider({ children }: { children: ReactNode }) {
const { load } = useStorage();
const { send, subscribe } = useMTP();
const { send, sendSealedRelay, subscribe } = useMTP();
const { get: getUser } = useUser();
const { moveUserIdToTop } = useSession();
@ -469,9 +469,17 @@ export default function Provider({ children }: { children: ReactNode }) {
version: CHAT_SECRET_VERSION,
});
assertProtocolSuccess(
const ownIota = await send("GetIotaData", { UserId: ownUserId });
if (ownIota.type !== "GetIotaData") {
throw new Error(`Own Iota lookup failed: ${ownIota.type}`);
}
const peerIota = await send("GetIotaData", { UserId: userIdValue });
if (peerIota.type !== "GetIotaData") {
throw new Error(`Peer Iota lookup failed: ${peerIota.type}`);
}
const response = await sendSealedRelay(
"SetChatSecret",
await send("SetChatSecret", {
{
ChatId: chatId,
SecretId: secretId,
VersionNumber: CHAT_SECRET_VERSION,
@ -489,8 +497,21 @@ export default function Provider({ children }: { children: ReactNode }) {
KemCiphertext: protocolBytes(peerWrapped.kemCiphertext),
},
],
}),
},
{
nextHop: { kind: "iota", id: ownIota.data.IotaId },
finalRecipientId: userIdValue,
metadataRecipients: [
{ value: ownIota.data.PublicKey, encoding: "base64" },
{ value: peerIota.data.PublicKey, encoding: "base64" },
],
contentRecipients: [
{ value: ownIota.data.PublicKey, encoding: "base64" },
{ value: peerIota.data.PublicKey, encoding: "base64" },
],
},
);
requireRelaySuccess(response);
if (active) {
setCurrentChatSecretState({ userId: userIdValue, value: rawSecret });
@ -508,7 +529,7 @@ export default function Provider({ children }: { children: ReactNode }) {
return () => {
active = false;
};
}, [getUser, load, send, userIdValue]);
}, [getUser, load, send, sendSealedRelay, userIdValue]);
const getChatSecret = useCallback(
async (userId: number): Promise<Uint8Array | null> => {
@ -901,6 +922,9 @@ export default function Provider({ children }: { children: ReactNode }) {
setFailed: (failed: boolean) => {
editMessage(message.SendTime, { failed });
},
setMessageState: (MessageState: RawMessage["MessageState"]) => {
editMessage(message.SendTime, { MessageState });
},
};
},
[editMessage, userIdValue, moveUserIdToTop, ownId],
@ -1021,6 +1045,7 @@ type contextType = {
liveMessages: () => LiveMessage[];
addLiveMessage: (message: RawMessage) => {
setFailed: (failed: boolean) => void;
setMessageState: (messageState: RawMessage["MessageState"]) => void;
};
editMessage: (sendTime: number, edit: MessageEdit) => void;
deleteMessage: (sendTime: number) => void;