@massalabs/gossip-sdk 0.0.2-dev.20260410072437 → 0.0.2-dev.20260410093719

package/dist/core/SdkEventEmitter.d.ts

@@ -1,7 +1,5 @@
 /**
- * SDK Event Emitter
- *
- * Type-safe event emitter for SDK events.
+ * SDK Event Emitter — type-safe event bus backed by mitt.
  */
 import type { Message, Discussion, Contact } from '../db';
 import type { SessionStatus } from '../wasm/bindings';
@@ -19,42 +17,71 @@ export declare enum SdkEventType {
     DISCUSSION_UPDATED = "discussionUpdated",
     WRITE_FAILED = "writeFailed",
     MESSAGE_OPTIMISTIC = "messageOptimistic",
+    MESSAGE_DELETED_OPTIMISTIC = "messageDeletedOptimistic",
+    MESSAGE_EDITED_OPTIMISTIC = "messageEditedOptimistic",
+    MESSAGE_DELETE_FAILED = "messageDeleteFailed",
+    MESSAGE_EDIT_FAILED = "messageEditFailed",
     ERROR = "error"
 }
-export interface SdkEventHandlers {
-    [SdkEventType.MESSAGE_RECEIVED]: (message: Omit<Message, 'id'> & {
+export type SdkEvents = {
+    [SdkEventType.MESSAGE_RECEIVED]: Omit<Message, 'id'> & {
         id?: number;
-    }) => void;
-    [SdkEventType.MESSAGE_SENT]: (message: Message) => void;
-    [SdkEventType.MESSAGE_READ]: (messageId: number) => void;
-    [SdkEventType.MESSAGE_FAILED]: (message: Message, error: Error) => void;
-    [SdkEventType.SESSION_REQUESTED]: (discussion: Discussion, contact: Contact) => void;
-    [SdkEventType.SESSION_CREATED]: (discussion: Discussion) => void;
-    [SdkEventType.SESSION_RENEWED]: (discussion: Discussion) => void;
-    [SdkEventType.SESSION_ACCEPTED]: (contactUserId: string) => void;
-    [SdkEventType.SEEKERS_UPDATED]: (seekers: Uint8Array[]) => void;
-    [SdkEventType.SESSION_STATUS_CHANGED]: (contactUserId: string, status: SessionStatus) => void;
-    [SdkEventType.DISCUSSION_UPDATED]: (contactUserId: string) => void;
-    [SdkEventType.WRITE_FAILED]: (messageId: Uint8Array | undefined, entityType: 'message' | 'discussion' | 'contact', error: Error) => void;
-    [SdkEventType.MESSAGE_OPTIMISTIC]: (message: Message) => void;
-    [SdkEventType.ERROR]: (error: Error, context: string) => void;
-}
+    };
+    [SdkEventType.MESSAGE_SENT]: Message;
+    [SdkEventType.MESSAGE_READ]: number;
+    [SdkEventType.MESSAGE_FAILED]: {
+        message: Message;
+        error: Error;
+    };
+    [SdkEventType.SESSION_REQUESTED]: {
+        discussion: Discussion;
+        contact: Contact;
+    };
+    [SdkEventType.SESSION_CREATED]: Discussion;
+    [SdkEventType.SESSION_RENEWED]: Discussion;
+    [SdkEventType.SESSION_ACCEPTED]: string;
+    [SdkEventType.SEEKERS_UPDATED]: Uint8Array[];
+    [SdkEventType.SESSION_STATUS_CHANGED]: {
+        contactUserId: string;
+        status: SessionStatus;
+    };
+    [SdkEventType.DISCUSSION_UPDATED]: string;
+    [SdkEventType.WRITE_FAILED]: {
+        messageId: Uint8Array | undefined;
+        entityType: 'message' | 'discussion' | 'contact';
+        error: Error;
+    };
+    [SdkEventType.MESSAGE_OPTIMISTIC]: Message;
+    [SdkEventType.MESSAGE_DELETED_OPTIMISTIC]: {
+        contactUserId: string;
+        messageDbId: number;
+        originalMsgId: Uint8Array;
+    };
+    [SdkEventType.MESSAGE_EDITED_OPTIMISTIC]: {
+        contactUserId: string;
+        messageDbId: number;
+        newContent: string;
+        metadata: Record<string, unknown>;
+    };
+    [SdkEventType.MESSAGE_DELETE_FAILED]: {
+        contactUserId: string;
+        messageDbId: number;
+        original: Message;
+    };
+    [SdkEventType.MESSAGE_EDIT_FAILED]: {
+        contactUserId: string;
+        messageDbId: number;
+        original: Message;
+    };
+    [SdkEventType.ERROR]: {
+        error: Error;
+        context: string;
+    };
+};
 export declare class SdkEventEmitter {
-    private handlers;
-    /**
-     * Register an event handler
-     */
-    on<K extends keyof SdkEventHandlers>(event: K, handler: SdkEventHandlers[K]): void;
-    /**
-     * Remove an event handler
-     */
-    off<K extends keyof SdkEventHandlers>(event: K, handler: SdkEventHandlers[K]): void;
-    /**
-     * Emit an event to all registered handlers
-     */
-    emit<K extends keyof SdkEventHandlers>(event: K, ...args: Parameters<SdkEventHandlers[K]>): void;
-    /**
-     * Remove all handlers for all events
-     */
+    private bus;
+    on<K extends keyof SdkEvents>(event: K, handler: (payload: SdkEvents[K]) => void): void;
+    off<K extends keyof SdkEvents>(event: K, handler: (payload: SdkEvents[K]) => void): void;
+    emit<K extends keyof SdkEvents>(event: K, payload: SdkEvents[K]): void;
     clear(): void;
 }

package/dist/core/SdkEventEmitter.js

@@ -1,11 +1,7 @@
 /**
- * SDK Event Emitter
- *
- * Type-safe event emitter for SDK events.
+ * SDK Event Emitter — type-safe event bus backed by mitt.
  */
-// ─────────────────────────────────────────────────────────────────────────────
-// Event Types
-// ─────────────────────────────────────────────────────────────────────────────
+import mitt from 'mitt';
 export var SdkEventType;
 (function (SdkEventType) {
     SdkEventType["MESSAGE_RECEIVED"] = "messageReceived";
@@ -21,65 +17,41 @@ export var SdkEventType;
     SdkEventType["DISCUSSION_UPDATED"] = "discussionUpdated";
     SdkEventType["WRITE_FAILED"] = "writeFailed";
     SdkEventType["MESSAGE_OPTIMISTIC"] = "messageOptimistic";
+    SdkEventType["MESSAGE_DELETED_OPTIMISTIC"] = "messageDeletedOptimistic";
+    SdkEventType["MESSAGE_EDITED_OPTIMISTIC"] = "messageEditedOptimistic";
+    SdkEventType["MESSAGE_DELETE_FAILED"] = "messageDeleteFailed";
+    SdkEventType["MESSAGE_EDIT_FAILED"] = "messageEditFailed";
     SdkEventType["ERROR"] = "error";
 })(SdkEventType || (SdkEventType = {}));
-// ─────────────────────────────────────────────────────────────────────────────
-// Event Emitter Class
-// ─────────────────────────────────────────────────────────────────────────────
 export class SdkEventEmitter {
     constructor() {
-        Object.defineProperty(this, "handlers", {
+        Object.defineProperty(this, "bus", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: {
-                [SdkEventType.MESSAGE_RECEIVED]: new Set(),
-                [SdkEventType.MESSAGE_SENT]: new Set(),
-                [SdkEventType.MESSAGE_READ]: new Set(),
-                [SdkEventType.MESSAGE_FAILED]: new Set(),
-                [SdkEventType.SESSION_REQUESTED]: new Set(),
-                [SdkEventType.SESSION_CREATED]: new Set(),
-                [SdkEventType.SESSION_RENEWED]: new Set(),
-                [SdkEventType.SESSION_ACCEPTED]: new Set(),
-                [SdkEventType.SEEKERS_UPDATED]: new Set(),
-                [SdkEventType.SESSION_STATUS_CHANGED]: new Set(),
-                [SdkEventType.DISCUSSION_UPDATED]: new Set(),
-                [SdkEventType.WRITE_FAILED]: new Set(),
-                [SdkEventType.MESSAGE_OPTIMISTIC]: new Set(),
-                [SdkEventType.ERROR]: new Set(),
-            }
+            value: mitt()
         });
     }
-    /**
-     * Register an event handler
-     */
     on(event, handler) {
-        this.handlers[event].add(handler);
+        this.bus.on(event, handler);
     }
-    /**
-     * Remove an event handler
-     */
     off(event, handler) {
-        this.handlers[event].delete(handler);
+        this.bus.off(event, handler);
     }
-    /**
-     * Emit an event to all registered handlers
-     */
-    emit(event, ...args) {
-        const handlers = this.handlers[event];
-        handlers.forEach(handler => {
-            try {
-                handler(...args);
-            }
-            catch (error) {
-                console.error(`[SdkEventEmitter] Error in ${event} handler:`, error);
+    emit(event, payload) {
+        const handlers = this.bus.all.get(event);
+        if (handlers) {
+            for (const handler of handlers) {
+                try {
+                    handler(payload);
+                }
+                catch (error) {
+                    console.error(`[SdkEventEmitter] Error in ${String(event)} handler:`, error);
+                }
             }
-        });
+        }
     }
-    /**
-     * Remove all handlers for all events
-     */
     clear() {
-        Object.values(this.handlers).forEach(set => set.clear());
+        this.bus.all.clear();
     }
 }

package/dist/core/SdkPolling.js

@@ -54,7 +54,10 @@ export class SdkPolling {
             }
             catch (error) {
                 const err = error instanceof Error ? error : new Error(String(error));
-                this.eventEmitter?.emit(SdkEventType.ERROR, err, 'message_polling');
+                this.eventEmitter?.emit(SdkEventType.ERROR, {
+                    error: err,
+                    context: 'message_polling',
+                });
             }
         }, config.polling.messagesIntervalMs);
         // Start announcement polling
@@ -64,7 +67,10 @@ export class SdkPolling {
             }
             catch (error) {
                 const err = error instanceof Error ? error : new Error(String(error));
-                this.eventEmitter?.emit(SdkEventType.ERROR, err, 'announcement_polling');
+                this.eventEmitter?.emit(SdkEventType.ERROR, {
+                    error: err,
+                    context: 'announcement_polling',
+                });
             }
         }, config.polling.announcementsIntervalMs);
         // Start session refresh polling
@@ -74,7 +80,10 @@ export class SdkPolling {
             }
             catch (error) {
                 const err = error instanceof Error ? error : new Error(String(error));
-                this.eventEmitter?.emit(SdkEventType.ERROR, err, 'session_update');
+                this.eventEmitter?.emit(SdkEventType.ERROR, {
+                    error: err,
+                    context: 'session_update',
+                });
             }
         }, config.polling.sessionRefreshIntervalMs);
         // Start session status change polling (fixed 3s interval)
@@ -84,7 +93,10 @@ export class SdkPolling {
             }
             catch (error) {
                 const err = error instanceof Error ? error : new Error(String(error));
-                this.eventEmitter?.emit(SdkEventType.ERROR, err, 'session_status_polling');
+                this.eventEmitter?.emit(SdkEventType.ERROR, {
+                    error: err,
+                    context: 'session_status_polling',
+                });
             }
         }, SESSION_STATUS_POLL_INTERVAL_MS);
     }

package/dist/core/index.d.ts

@@ -2,6 +2,6 @@
  * Core SDK components
  */
 export { SdkEventEmitter } from './SdkEventEmitter.js';
-export { SdkEventType, type SdkEventHandlers } from './SdkEventEmitter.js';
+export { SdkEventType, type SdkEvents } from './SdkEventEmitter.js';
 export { SdkPolling } from './SdkPolling.js';
 export type { PollingCallbacks } from './SdkPolling.js';

package/dist/db/sqlite-worker.js

@@ -51,16 +51,13 @@ async function handleMessage(e) {
     try {
         switch (type) {
             case 'init': {
-                const { dbPath, wasmUrl, initSql, useOPFS } = e.data;
+                const { dbPath, wasmBinary, initSql, useOPFS } = e.data;
                 const moduleArg = {};
-                // Pre-fetch WASM as ArrayBuffer and override instantiateWasm
-                // so Emscripten never calls instantiateStreaming (Safari chokes
-                // on chunked Transfer-Encoding).
-                if (wasmUrl) {
-                    const resp = await fetch(wasmUrl);
-                    const bytes = await resp.arrayBuffer();
+                // WASM bytes are pre-fetched in the main thread to avoid
+                // Safari's chunked Transfer-Encoding bug in Worker fetch().
+                if (wasmBinary) {
                     moduleArg.instantiateWasm = (imports, successCallback) => {
-                        WebAssembly.instantiate(bytes, imports).then(result => {
+                        WebAssembly.instantiate(wasmBinary, imports).then(result => {
                             successCallback(result.instance, result.module);
                         });
                         return {};

package/dist/db/sqlite.js

@@ -92,12 +92,14 @@ export class DatabaseConnection {
         return this.state.drizzleDb !== null;
     }
     // ─── Raw SQL execution ─────────────────────────────────────────
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    postToWorker(msg) {
+    postToWorker(msg, transfer = []) {
         return new Promise((resolve, reject) => {
             const id = ++this.state.msgId;
-            this.state.pending.set(id, { resolve, reject });
-            this.state.worker.postMessage({ ...msg, id });
+            this.state.pending.set(id, {
+                resolve: resolve,
+                reject,
+            });
+            this.state.worker.postMessage({ ...msg, id }, transfer);
         });
     }
     createDrizzleInstance() {
@@ -152,13 +154,14 @@ export class DatabaseConnection {
                 this.state.worker.onmessage = this.handleWorkerMessage;
                 this.state.useWorker = true;
                 try {
-                    await this.postToWorker({
-                        type: 'init',
-                        dbPath,
-                        useOPFS,
-                        wasmUrl: storage.wasmUrl,
-                        initSql: PRAGMAS,
-                    });
+                    // Pre-fetch WASM in the main thread to avoid Safari's
+                    // chunked Transfer-Encoding bug in Worker fetch().
+                    let wasmBinary;
+                    if (storage.wasmUrl) {
+                        const resp = await fetch(storage.wasmUrl);
+                        wasmBinary = await resp.arrayBuffer();
+                    }
+                    await this.postToWorker({ type: 'init', dbPath, useOPFS, wasmBinary, initSql: PRAGMAS }, wasmBinary ? [wasmBinary] : []);
                 }
                 catch (err) {
                     if (this.state.worker) {

package/dist/gossip.d.ts

@@ -11,9 +11,7 @@ import { type ValidationResult } from './utils/validation.js';
 import { type StorageConfig } from './db/index.js';
 import { Queries } from './db/queries/index.js';
 import { type UserPublicKeys, type SessionConfig } from './wasm/bindings.js';
-import { SdkEventType, type SdkEventHandlers } from './core/SdkEventEmitter.js';
-export type { SdkEventHandlers };
-export { SdkEventType };
+import { SdkEventType, type SdkEvents } from './core/SdkEventEmitter.js';
 export declare enum SdkStatus {
     UNINITIALIZED = "uninitialized",
     INITIALIZED = "initialized",
@@ -132,11 +130,11 @@ declare class GossipSdk {
     /**
      * Register an event handler
      */
-    on<K extends SdkEventType>(event: K, handler: SdkEventHandlers[K]): void;
+    on<K extends SdkEventType>(event: K, handler: (payload: SdkEvents[K]) => void): void;
     /**
      * Remove an event handler
      */
-    off<K extends SdkEventType>(event: K, handler: SdkEventHandlers[K]): void;
+    off<K extends SdkEventType>(event: K, handler: (payload: SdkEvents[K]) => void): void;
     private requireSession;
     private handleSessionPersist;
     /**
@@ -174,4 +172,4 @@ interface PollingAPI {
 }
 /** A convenience singleton for apps that only need one SDK instance. */
 export declare const gossipSdk: GossipSdk;
-export { GossipSdk };
+export { GossipSdk, SdkEventType };

package/dist/gossip.js

@@ -57,7 +57,9 @@ import { Queries } from './db/queries/index.js';
 import { SessionManagerWrapper, } from './wasm/bindings.js';
 import { SdkEventEmitter, SdkEventType, } from './core/SdkEventEmitter.js';
 import { SdkPolling } from './core/SdkPolling.js';
-export { SdkEventType };
+// ─────────────────────────────────────────────────────────────────────────────
+// Types
+// ─────────────────────────────────────────────────────────────────────────────
 export var SdkStatus;
 (function (SdkStatus) {
     SdkStatus["UNINITIALIZED"] = "uninitialized";
@@ -247,7 +249,10 @@ class GossipSdk {
         // Publish gossip ID (public key) on messageProtocol so the user is discoverable.
         // Non-blocking: login must succeed even when the API is unreachable.
         this._auth.publishPublicKey(session.ourPk, session.userIdEncoded, queries).catch(err => {
-            this.eventEmitter.emit(SdkEventType.ERROR, err instanceof Error ? err : new Error(String(err)), 'publishPublicKey');
+            this.eventEmitter.emit(SdkEventType.ERROR, {
+                error: err instanceof Error ? err : new Error(String(err)),
+                context: 'publishPublicKey',
+            });
         });
         // Now set refreshService on services (circular dependency resolved via setter)
         this._discussion.setRefreshService(this._refresh);
@@ -540,7 +545,10 @@ class GossipSdk {
             await onPersist(blob, encryptionKey);
         }
         catch (error) {
-            this.eventEmitter.emit(SdkEventType.ERROR, error instanceof Error ? error : new Error(String(error)), 'session_persist');
+            this.eventEmitter.emit(SdkEventType.ERROR, {
+                error: error instanceof Error ? error : new Error(String(error)),
+                context: 'session_persist',
+            });
         }
     }
     /**
@@ -581,4 +589,4 @@ class GossipSdk {
 // ─────────────────────────────────────────────────────────────────────────────
 /** A convenience singleton for apps that only need one SDK instance. */
 export const gossipSdk = new GossipSdk();
-export { GossipSdk };
+export { GossipSdk, SdkEventType };

package/dist/index.d.ts

@@ -19,6 +19,7 @@
  *
  * @packageDocumentation
  */
+export * from './core/SdkEventEmitter.js';
 export * from './api/index.js';
 export * from './crypto/index.js';
 export * from './gossip.js';

package/dist/index.js

@@ -19,6 +19,7 @@
  *
  * @packageDocumentation
  */
+export * from './core/SdkEventEmitter.js';
 export * from './api/index.js';
 export * from './crypto/index.js';
 export * from './gossip.js';

package/dist/services/announcement.js

@@ -426,7 +426,10 @@ export class AnnouncementService {
                 contactRow &&
                 this.session.peerSessionStatus(decodeUserId(contactUserId)) ===
                     SessionStatus.PeerRequested) {
-                this.eventEmitter.emit(SdkEventType.SESSION_REQUESTED, toDiscussion(newDiscussion), contactRow);
+                this.eventEmitter.emit(SdkEventType.SESSION_REQUESTED, {
+                    discussion: toDiscussion(newDiscussion),
+                    contact: contactRow,
+                });
             }
             return { discussionId: existing.id };
         }
@@ -443,7 +446,10 @@ export class AnnouncementService {
         const discussion = await this.queries.discussions.getById(discussionId);
         const contactRow = await this.queries.contacts.getByOwnerAndUser(ownerUserId, contactUserId);
         if (discussion && contactRow) {
-            this.eventEmitter.emit(SdkEventType.SESSION_REQUESTED, toDiscussion(discussion), contactRow);
+            this.eventEmitter.emit(SdkEventType.SESSION_REQUESTED, {
+                discussion: toDiscussion(discussion),
+                contact: contactRow,
+            });
         }
         return { discussionId };
     }

package/dist/services/message.js

@@ -961,17 +961,23 @@ export class MessageService {
                                 type: msg.type,
                                 direction: msg.direction,
                             });
-                            try {
-                                this.eventEmitter.emit(SdkEventType.MESSAGE_SENT, {
-                                    ...msg,
-                                    status: MessageStatus.SENT,
-                                });
-                            }
-                            catch (error) {
-                                log.error('failed to emit message sent event', {
-                                    messageId: msg.id,
-                                    error,
-                                });
+                            // Skip emitting MESSAGE_SENT for control messages (delete/edit).
+                            // These are internal transport details; the semantic optimistic
+                            // events already handle UI state.
+                            const isControlMessage = !!(msg.deleteOf || msg.editOf);
+                            if (!isControlMessage) {
+                                try {
+                                    this.eventEmitter.emit(SdkEventType.MESSAGE_SENT, {
+                                        ...msg,
+                                        status: MessageStatus.SENT,
+                                    });
+                                }
+                                catch (error) {
+                                    log.error('failed to emit message sent event', {
+                                        messageId: msg.id,
+                                        error,
+                                    });
+                                }
                             }
                         }
                     }
@@ -1066,11 +1072,19 @@ export class MessageService {
         // Persist in background (non-optimistic path)
         this.send({ ...message, messageId }).then(result => {
             if (!result.success) {
-                this.eventEmitter.emit(SdkEventType.WRITE_FAILED, messageId, 'message', new Error(result.error ?? 'Unknown error'));
+                this.eventEmitter.emit(SdkEventType.WRITE_FAILED, {
+                    messageId,
+                    entityType: 'message',
+                    error: new Error(result.error ?? 'Unknown error'),
+                });
             }
         }, error => {
             log.error('optimistic send failed', { error });
-            this.eventEmitter.emit(SdkEventType.WRITE_FAILED, messageId, 'message', error instanceof Error ? error : new Error(String(error)));
+            this.eventEmitter.emit(SdkEventType.WRITE_FAILED, {
+                messageId,
+                entityType: 'message',
+                error: error instanceof Error ? error : new Error(String(error)),
+            });
         });
         return { success: true, message: optimisticMessage };
     }
@@ -1105,41 +1119,59 @@ export class MessageService {
      */
     async deleteMessage(id) {
         const row = await this.queries.messages.getById(id);
-        if (!row) {
+        if (!row)
             return false;
-        }
-        // Only allow deleting our own outgoing messages
-        if (row.direction !== MessageDirection.OUTGOING) {
+        if (row.direction !== MessageDirection.OUTGOING)
             return false;
-        }
-        if (!row.messageId) {
+        if (!row.messageId)
             throw new Error('Cannot delete a message that has no messageId');
-        }
+        const original = rowToMessage(row);
         const ownerUserId = this.session.userIdEncoded;
-        // Mark the original message as deleted locally
-        await this.queries.messages.updateById(id, {
-            content: '[Message deleted]',
-            type: MessageType.DELETED,
-        });
-        // Enqueue a delete control message to notify the peer
-        const controlMessage = {
-            ownerUserId,
-            contactUserId: row.contactUserId,
-            content: '',
-            type: MessageType.DELETED,
-            direction: MessageDirection.OUTGOING,
-            status: MessageStatus.WAITING_SESSION,
-            timestamp: new Date(),
-            deleteOf: {
+        // Emit optimistic event so UI updates immediately (skip for reactions —
+        // the store handles reaction removal separately).
+        if (row.type !== MessageType.REACTION) {
+            this.eventEmitter.emit(SdkEventType.MESSAGE_DELETED_OPTIMISTIC, {
+                contactUserId: row.contactUserId,
+                messageDbId: id,
                 originalMsgId: row.messageId,
-            },
-        };
-        const result = await this.send(controlMessage);
-        if (!result.success) {
-            throw new Error(result.error ?? 'Failed to enqueue delete message');
+            });
+        }
+        try {
+            await this.queries.messages.updateById(id, {
+                content: '[Message deleted]',
+                type: MessageType.DELETED,
+            });
+            const controlMessage = {
+                ownerUserId,
+                contactUserId: row.contactUserId,
+                content: '',
+                type: MessageType.DELETED,
+                direction: MessageDirection.OUTGOING,
+                status: MessageStatus.WAITING_SESSION,
+                timestamp: new Date(),
+                deleteOf: { originalMsgId: row.messageId },
+            };
+            const result = await this.send(controlMessage);
+            if (!result.success)
+                throw new Error(result.error ?? 'Failed to enqueue delete message');
+            await this.refreshService?.stateUpdate();
+            return true;
+        }
+        catch (error) {
+            // Rollback: emit failure so store can restore original
+            if (row.type !== MessageType.REACTION) {
+                this.eventEmitter.emit(SdkEventType.MESSAGE_DELETE_FAILED, {
+                    contactUserId: row.contactUserId,
+                    messageDbId: id,
+                    original,
+                });
+            }
+            // Best-effort DB rollback
+            await this.queries.messages
+                .updateById(id, { content: original.content, type: original.type })
+                .catch(() => { });
+            throw error;
         }
-        await this.refreshService?.stateUpdate();
-        return true;
     }
     async sendReaction(contactUserId, emoji, originalMsgId) {
         const message = {
@@ -1163,50 +1195,59 @@ export class MessageService {
      */
     async editMessage(id, newContent) {
         const row = await this.queries.messages.getById(id);
-        if (!row) {
+        if (!row)
             return false;
-        }
-        // Only allow editing our own outgoing messages
-        if (row.direction !== MessageDirection.OUTGOING) {
+        if (row.direction !== MessageDirection.OUTGOING)
             return false;
-        }
-        if (!row.messageId || row.messageId.length !== MESSAGE_ID_SIZE) {
+        if (!row.messageId || row.messageId.length !== MESSAGE_ID_SIZE)
             throw new Error('Cannot edit a message that has no valid messageId');
-        }
+        const original = rowToMessage(row);
         const ownerUserId = this.session.userIdEncoded;
-        // Merge existing metadata with edited flag
         const existingMetadata = deserializeMetadata(row.metadata) ?? {};
-        const mergedMetadata = {
-            ...existingMetadata,
-            edited: true,
-        };
-        // Update the original message content locally, preserving timestamp
-        await this.queries.messages.updateById(id, {
-            content: newContent,
-            metadata: serializeMetadata(mergedMetadata),
-        });
-        // Enqueue an edit control message to notify the peer
-        const controlMessage = {
-            ownerUserId,
+        const mergedMetadata = { ...existingMetadata, edited: true };
+        // Emit optimistic event so UI updates immediately
+        this.eventEmitter.emit(SdkEventType.MESSAGE_EDITED_OPTIMISTIC, {
             contactUserId: row.contactUserId,
-            content: newContent,
-            type: MessageType.TEXT,
-            direction: MessageDirection.OUTGOING,
-            status: MessageStatus.WAITING_SESSION,
-            timestamp: new Date(),
-            editOf: {
-                originalMsgId: row.messageId,
-            },
-            metadata: {
-                control: 'edit',
-            },
-        };
-        const result = await this.send(controlMessage);
-        if (!result.success) {
-            throw new Error(result.error ?? 'Failed to enqueue edit message');
+            messageDbId: id,
+            newContent,
+            metadata: mergedMetadata,
+        });
+        try {
+            await this.queries.messages.updateById(id, {
+                content: newContent,
+                metadata: serializeMetadata(mergedMetadata),
+            });
+            const controlMessage = {
+                ownerUserId,
+                contactUserId: row.contactUserId,
+                content: newContent,
+                type: MessageType.TEXT,
+                direction: MessageDirection.OUTGOING,
+                status: MessageStatus.WAITING_SESSION,
+                timestamp: new Date(),
+                editOf: { originalMsgId: row.messageId },
+                metadata: { control: 'edit' },
+            };
+            const result = await this.send(controlMessage);
+            if (!result.success)
+                throw new Error(result.error ?? 'Failed to enqueue edit message');
+            await this.refreshService?.stateUpdate();
+            return true;
+        }
+        catch (error) {
+            this.eventEmitter.emit(SdkEventType.MESSAGE_EDIT_FAILED, {
+                contactUserId: row.contactUserId,
+                messageDbId: id,
+                original,
+            });
+            await this.queries.messages
+                .updateById(id, {
+                content: original.content,
+                metadata: row.metadata ?? undefined,
+            })
+                .catch(() => { });
+            throw error;
         }
-        await this.refreshService?.stateUpdate();
-        return true;
     }
     /**
      * Hard-delete messages that have exceeded their discussion retention duration.

package/dist/services/refresh.js

@@ -113,7 +113,10 @@ export class RefreshService {
             const previous = this.sessionStatusMap.get(discussion.contactUserId);
             if (previous !== status) {
                 this.sessionStatusMap.set(discussion.contactUserId, status);
-                this.eventEmitter.emit(SdkEventType.SESSION_STATUS_CHANGED, discussion.contactUserId, status);
+                this.eventEmitter.emit(SdkEventType.SESSION_STATUS_CHANGED, {
+                    contactUserId: discussion.contactUserId,
+                    status,
+                });
             }
         }
     }
@@ -218,7 +221,10 @@ export class RefreshService {
                             timestamp: new Date(),
                         });
                         if (!result.success) {
-                            this.eventEmitter.emit(SdkEventType.ERROR, new Error(result.error || 'Unknown error'), 'keep_alive_message');
+                            this.eventEmitter.emit(SdkEventType.ERROR, {
+                                error: new Error(result.error || 'Unknown error'),
+                                context: 'keep_alive_message',
+                            });
                         }
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@massalabs/gossip-sdk",
-  "version": "0.0.2-dev.20260410072437",
+  "version": "0.0.2-dev.20260410093719",
   "description": "Gossip SDK for automation, chatbot, and integration use cases",
   "type": "module",
   "main": "./dist/index.js",
@@ -50,6 +50,7 @@
     "@scure/base": "^2.0.0",
     "@scure/bip39": "^2.0.1",
     "drizzle-orm": "^0.45.2",
+    "mitt": "^3.0.1",
     "wa-sqlite": "^1.0.0"
   }
 }