malice

public

Star0

Fork 0

Watch0

70 commits 2 branches 0 tags 0 releases4.4 MiB

Commit `43c2cc753052`

tarball

atagen <boss@atagen.co>2026-10-25 09:09 UTC

10 files changed+88-3

history: expose segmented gap filling

Modified file: crates/malice-core/src/request.rs+14 additions−1 deletions@@ -1,4 +1,4 @@
-use macltok::ruma::{events::GlobalAccountDataEventType, serde::Raw};
+use macltok::ruma::{OwnedTransactionId, events::GlobalAccountDataEventType, serde::Raw};
 use macltok::{
     AttachmentUpload, ClientHandle, CreateRoomOptions, HistoryRepairBudget, HistoryRepairPolicy,
     ImagePackSource, MediaId, MediaSize, MemberFilter, MentionKey, MentionsBoundary,
@@ -103,6 +103,10 @@ pub enum Request {
     StartRecentHistory {
         room_id: String,
     },
+    FillHistoryGap {
+        room_id: String,
+        gap_id: String,
+    },
     HistoryRepairPolicy,
     SetHistoryRepairPolicy {
         policy: HistoryRepairPolicy,
@@ -598,6 +602,15 @@ pub async fn dispatch(
                 .await?;
             Ok(Reply::Json(json!(report)))
         }
+        Request::FillHistoryGap { room_id, gap_id } => {
+            if gap_id.is_empty() {
+                return Err(CoreError::bad_request("invalid history gap id"));
+            }
+            handle
+                .fill_history_gap(parse_room_id(&room_id)?, OwnedTransactionId::from(gap_id))
+                .await?;
+            Ok(Reply::Done)
+        }
         Request::HistoryRepairPolicy => {
             Ok(Reply::Json(json!(handle.history_repair_policy().await?)))
         }

Modified file: crates/malice-server/src/routes.rs+1

@@ -569,6 +569,7 @@ async fn post_command(

569569 | Request::ContinueHistoryRepair { .. }

570570 | Request::CancelHistoryRepair { .. }

571571 | Request::StartRecentHistory { .. }

572+ | Request::FillHistoryGap { .. }

572573 | Request::HistoryRepairPolicy

573574 | Request::SetHistoryRepairPolicy { .. }

574575 | Request::Kick { .. }

Modified file: web/src/App.svelte+36 additions−1 deletions@@ -36,6 +36,7 @@
     continueHistoryRepair,
     cancelHistoryRepair,
     startRecentHistory,
+    fillHistoryGap,
     joinRoom,
     leaveRoom,
     logout,
@@ -133,6 +134,12 @@
   let createBusy = false;
   let leaveBusy = false;
   let paginateBusy = false;
+  let fillingGaps: Record<string, string> = {};
+  let historyAccount: string | null | undefined;
+  $: if ($sessionUser !== historyAccount) {
+    historyAccount = $sessionUser;
+    fillingGaps = {};
+  }
   let reacting = false;
   let composer = '';
   let drafts: Record<string, string> = {};
@@ -419,7 +426,8 @@
         out.push({ key: e.item_id || e.event_id || `m-${index}`, item, showSender });
       } else {
         prevSender = null;
-        out.push({ key: `${item.kind}-${index}`, item, showSender });
+        const key = item.kind === 'historyGap' ? `gap-${item.gap.id}` : `${item.kind}-${index}`;
+        out.push({ key, item, showSender });
       }
     });
     return out;
@@ -1485,6 +1493,22 @@
     }
   }
 
+  async function fillGap(gapId: string): Promise<void> {
+    const roomId = $selectedRoomId;
+    if (!roomId || fillingGaps[roomId]) return;
+    fillingGaps = { ...fillingGaps, [roomId]: gapId };
+    try {
+      await fillHistoryGap(roomId, gapId);
+    } catch (e) {
+      pushBanner(e instanceof Error ? e.message : 'Loading the missing history failed');
+    } finally {
+      if (fillingGaps[roomId] === gapId) {
+        const { [roomId]: _done, ...rest } = fillingGaps;
+        fillingGaps = rest;
+      }
+    }
+  }
+
   async function loadMembers(roomId: string): Promise<void> {
     if (membersFor === roomId && $membersLoading) return;
     membersFor = roomId;
@@ -2591,6 +2615,17 @@
                   <div class="new-row"><span>New</span></div>
                 {:else if g.item.kind === 'start'}
                   <p class="start-note">Beginning of history</p>
+                {:else if g.item.kind === 'historyGap'}
+                  {#if g.item.gap.continuity !== 'Verified'}
+                    {@const gap = g.item.gap}
+                    {@const filling = fillingGaps[selectedRoom.room_id] === gap.id || gap.lifecycle === 'Fetching'}
+                    <div class="history-gap">
+                      <span>{gap.failure ?? 'Some history is not loaded'}</span>
+                      <button type="button" class="ghost-btn" disabled={!!fillingGaps[selectedRoom.room_id] || gap.lifecycle === 'Fetching' || gap.lifecycle === 'Unavailable'} on:click={() => void fillGap(gap.id)}>
+                        {filling ? 'Loading…' : gap.lifecycle === 'Unavailable' ? 'History unavailable' : 'Fetch older history'}
+                      </button>
+                    </div>
+                  {/if}
                 {:else if g.item.kind === 'unknown'}
                   <p class="unknown-note">Unsupported event ({g.item.label})</p>
                 {:else}

Modified file: web/src/app.css+1

@@ -1091,3 +1091,4 @@ input, textarea { font: inherit; }

10911091

 .pinned-list { list-style: none; margin: 0; padding: 0 8px 6px 58px; max-height: 40vh; overflow-y: auto; animation: pop-in var(--pop); }

10921092 .pinned-list li { display: flex; align-items: center; gap: 6px; border-top: 1px solid var(--border); }

10931093 .pinned-strip .icon-btn { width: 26px; height: 26px; }

1094

+.history-gap { display: flex; align-items: center; justify-content: center; gap: 10px; margin: 12px 0; padding: 10px; border: 1px dashed var(--border); border-radius: var(--r-md); color: var(--muted); font-size: 12px; }

Modified file: web/src/lib/ContextTimeline.svelte+1−1

@@ -46,7 +46,7 @@

4646 const seen = new Set<string>();

4747 const result: TimelineItem[] = [];

4848 for (const item of items) {

49- if (item.kind === 'readMarker' || item.kind === 'start' || item.kind === 'unknown') continue;

+      if (item.kind === 'readMarker' || item.kind === 'start' || item.kind === 'unknown' || item.kind === 'historyGap') continue;

5050 if (item.kind === 'event') {

5151 const eventKey = stable(item.event);

5252 if (seen.has(eventKey)) continue;

Modified file: web/src/lib/api.ts+1

@@ -74,6 +74,7 @@ export const continueHistoryRepair = (room_id: string, budget?: HistoryRepairBud

7474 transport.continueHistoryRepair(room_id, budget);

7575 export const cancelHistoryRepair = (room_id: string): Promise<void> => transport.cancelHistoryRepair(room_id);

7676

 export const startRecentHistory = (room_id: string): Promise<HistoryRepairReport> => transport.startRecentHistory(room_id);

+export const fillHistoryGap = (room_id: string, gap_id: string): Promise<void> => transport.fillHistoryGap(room_id, gap_id);

7778 export const historyRepairPolicy = (): Promise<HistoryRepairPolicy> => transport.historyRepairPolicy();

7879

 export const setHistoryRepairPolicy = (policy: HistoryRepairPolicy): Promise<void> => transport.setHistoryRepairPolicy(policy);

7980 export const setTyping = (room_id: string, typing: boolean) => transport.setTyping(room_id, typing);

Modified file: web/src/lib/transport-http.ts+3 additions@@ -160,6 +160,9 @@ export class HttpTransport implements Transport {
     if (!parsed) throw new ApiError(502, 'Invalid history repair response');
     return parsed;
   }
+  async fillHistoryGap(room_id: string, gap_id: string): Promise<void> {
+    await this.command({ op: 'fill_history_gap', room_id, gap_id });
+  }
   async historyRepairPolicy(): Promise<HistoryRepairPolicy> {
     const parsed = parseHistoryRepairPolicy(await this.command({ op: 'history_repair_policy' }));
     if (!parsed) throw new ApiError(502, 'Invalid history repair policy response');

Modified file: web/src/lib/transport-worker.ts+3 additions@@ -267,6 +267,9 @@ export class WorkerTransport implements Transport {
     if (!parsed) throw new ApiError(502, 'Invalid history repair response');
     return parsed;
   }
+  async fillHistoryGap(room_id: string, gap_id: string): Promise<void> {
+    await this.client.call('fill_history_gap', { room_id, gap_id });
+  }
   async historyRepairPolicy(): Promise<HistoryRepairPolicy> {
     const parsed = parseHistoryRepairPolicy(await this.client.call('history_repair_policy'));
     if (!parsed) throw new ApiError(502, 'Invalid history repair policy response');

Modified file: web/src/lib/transport.ts+2 additions@@ -73,6 +73,7 @@ export type HistoryRepairRequest =
   | { op: 'continue_history_repair'; room_id: string; budget: HistoryRepairBudget }
   | { op: 'cancel_history_repair'; room_id: string }
   | { op: 'start_recent_history'; room_id: string }
+  | { op: 'fill_history_gap'; room_id: string; gap_id: string }
   | { op: 'history_repair_policy' }
   | { op: 'set_history_repair_policy'; policy: HistoryRepairPolicy };
 
@@ -130,6 +131,7 @@ export interface Transport {
   continueHistoryRepair(room_id: string, budget?: HistoryRepairBudget): Promise<HistoryRepairReport>;
   cancelHistoryRepair(room_id: string): Promise<void>;
   startRecentHistory(room_id: string): Promise<HistoryRepairReport>;
+  fillHistoryGap(room_id: string, gap_id: string): Promise<void>;
   historyRepairPolicy(): Promise<HistoryRepairPolicy>;
   setHistoryRepairPolicy(policy: HistoryRepairPolicy): Promise<void>;
   setTyping(room_id: string, typing: boolean): Promise<void>;

Modified file: web/src/lib/types.ts+26 additions@@ -650,11 +650,21 @@ function parseTimelineEvent(raw: Record<string, unknown>): TimelineEvent {
 
 export type TimelineItem =
   | { kind: 'event'; event: TimelineEvent }
+  | { kind: 'historyGap'; gap: HistoryGap }
   | { kind: 'day'; timestamp_ms: number }
   | { kind: 'readMarker' }
   | { kind: 'start' }
   | { kind: 'unknown'; label: string };
 
+export interface HistoryGap {
+  id: string;
+  older_boundary: string | null;
+  newer_boundary: string | null;
+  lifecycle: 'Idle' | 'Fetching' | 'Paused' | 'Failed' | 'Unavailable';
+  continuity: 'Unresolved' | 'Verified' | 'AccessibleStart';
+  failure: string | null;
+}
+
 export interface EventContext {
   events_before: TimelineItem[];
   event: TimelineItem | null;
@@ -678,6 +688,22 @@ export function parseTimelineItem(raw: unknown): TimelineItem | null {
   if (raw === 'TimelineStart') return { kind: 'start' };
   if (!isRecord(raw)) return null;
   if (isRecord(raw['Event'])) return { kind: 'event', event: parseTimelineEvent(raw['Event']) };
+  if (isRecord(raw['HistoryGap'])) {
+    const gap = raw['HistoryGap'];
+    const lifecycle = gap['lifecycle'];
+    const continuity = gap['continuity'];
+    return {
+      kind: 'historyGap',
+      gap: {
+        id: stringField(gap, 'id'),
+        older_boundary: optionalString(gap, 'older_boundary'),
+        newer_boundary: optionalString(gap, 'newer_boundary'),
+        lifecycle: lifecycle === 'Fetching' || lifecycle === 'Paused' || lifecycle === 'Failed' || lifecycle === 'Unavailable' ? lifecycle : 'Idle',
+        continuity: continuity === 'Verified' || continuity === 'AccessibleStart' ? continuity : 'Unresolved',
+        failure: optionalString(gap, 'failure')
+      }
+    };
+  }
   if ('DayDivider' in raw) {
     const inner = raw['DayDivider'];
     const ts = isRecord(inner) && typeof inner['timestamp_ms'] === 'number' ? inner['timestamp_ms'] : 0;

malice

Commit 43c2cc753052

Commit `43c2cc753052`