@stage-labs/metro 0.1.0-beta.201 → 0.1.0-beta.203

package/runtime/node_modules/@metro-labs/outlook/src/actions.ts

@@ -1,20 +1,14 @@
 import { makeStation, respond } from '@metro-labs/core/stations/station-runtime';
-import type { Normalized } from '@metro-labs/core/stations/messaging-normalize';
 import { accounts } from './accounts.js';
 import { MAILBOX_URL } from './config.js';
 import { reply, send } from './outbound.js';
 import { read } from './query.js';
 
-type Args = Record<string, unknown>;
-
 function listAccounts(id: string): void {
   const list = [...accounts.values()].map((a) => ({ id: a.id, handle: a.email, url: MAILBOX_URL, email: a.email }));
   respond(id, { result: { accounts: list } });
 }
 
-const normalizeOutlook = (action: string, args: Args): Normalized => ({ action, args });
-
 export const handleCall = makeStation({
   handlers: { accounts: listAccounts, send, reply, read },
-  normalize: normalizeOutlook,
 });

package/runtime/node_modules/@metro-labs/outlook/src/format.ts

@@ -86,7 +86,6 @@ export function inboundEnvelope(accountId: string, self: string, m: GraphMessage
   const from = addressOf(m.from);
   const title = titleOf(m);
   return {
-    kind: 'inbound',
     id: mintId(),
     ts: m.receivedDateTime ?? new Date().toISOString(),
     station: 'outlook',

package/runtime/node_modules/@metro-labs/outlook/src/state.ts

@@ -27,7 +27,7 @@ export function loadState(accountId: string, seed: Partial<AccountState>): Accou
     refreshToken,
     accessToken: fromFile ? text(saved.accessToken) : text(seed.accessToken),
     expiresAt: fromFile ? Number(saved.expiresAt) || 0 : Number(seed.expiresAt) || 0,
-    deltaLink: nullable(saved.deltaLink) ?? seed.deltaLink ?? null,
+    deltaLink: nullable(saved.deltaLink),
     syncedAt: nullable(saved.syncedAt),
     seen: Array.isArray(saved.seen) ? saved.seen.filter((s): s is string => typeof s === 'string') : [],
   };

package/runtime/node_modules/@metro-labs/telegram/src/accounts.ts

@@ -1,5 +1,3 @@
-import { homedir } from 'node:os';
-import { join } from 'node:path';
 import {
   makeAccountStore,
   resolveAccountId,
@@ -7,31 +5,22 @@ import {
 } from '@metro-labs/core/stations/account-store';
 import type { UserAccount } from './types.js';
 
-const ACCOUNTS_FILE =
-  process.env.TELEGRAM_ACCOUNTS_FILE ??
-  join(homedir(), '.metro', 'telegram-accounts.json');
-
 const isSignedInt = (s: string): boolean => /^-?\d+$/.test(s);
 const isTopic = (s: string): boolean => /^\d+$/.test(s);
 
-function validateAccount(a: UserAccount, seen: Set<string>, die: Die): void {
-  if (!a.id) die('account missing id');
+function validateAccount(a: UserAccount, die: Die): void {
   if (!a.session || typeof a.session !== 'string')
     die(`account '${a.id}' missing session`);
   if (!Number.isInteger(a.apiId) || (a.apiId ?? 0) <= 0)
     die(`account '${a.id}' missing apiId`);
   if (!a.apiHash || typeof a.apiHash !== 'string')
     die(`account '${a.id}' missing apiHash`);
-  if (seen.has(a.id)) die(`duplicate account id '${a.id}'`);
-  seen.add(a.id);
 }
 
 export const { loadAccounts } = makeAccountStore<UserAccount>({
   prefix: 'telegram',
-  file: ACCOUNTS_FILE,
   validate(raw, die) {
-    const seen = new Set<string>();
-    for (const a of raw) validateAccount(a, seen, die);
+    for (const a of raw) validateAccount(a, die);
   },
 });
 
@@ -56,20 +45,13 @@ interface Target {
   topicId?: number;
 }
 
-function splitScoped(path: string[]): { accountId: string; rest: string[] } {
-  const first = path[0];
-  if (path.length >= 2 && first !== undefined && !isSignedInt(first))
-    return { accountId: first, rest: path.slice(1) };
-  return { accountId: 'default', rest: path };
-}
-
 export function targetOf(line: string): Target | undefined {
   const prefix = 'metro://telegram/';
   if (!line.startsWith(prefix)) return undefined;
   const path = line.slice(prefix.length).split('/').filter(Boolean);
-  const { accountId, rest } = splitScoped(path);
+  const [accountId, ...rest] = path;
   const [chatId, topicId] = rest;
-  if (rest.length < 1 || rest.length > 2 || chatId === undefined) return undefined;
+  if (accountId === undefined || chatId === undefined || rest.length > 2) return undefined;
   if (!isSignedInt(chatId)) return undefined;
   if (topicId !== undefined && !isTopic(topicId)) return undefined;
   return {

package/runtime/node_modules/@metro-labs/telegram/src/actions.ts

@@ -8,7 +8,7 @@ import {
 } from '@metro-labs/core/stations/station-runtime';
 import { accountFor, accounts, targetOf } from './accounts.js';
 import type { UserClient } from './client.js';
-import { normalizeTelegramUser } from './normalize.js';
+import { messagingAliases } from '@metro-labs/core/stations/messaging-normalize';
 import {
   sendAttachments,
   type CanonicalAttachment,
@@ -251,6 +251,6 @@ export function makeHandleCall(
       set_profile: makeSetProfile(clientFor),
       profile: makeReadProfile(clientFor),
     },
-    normalize: normalizeTelegramUser,
+    normalize: messagingAliases(),
   });
 }

package/runtime/node_modules/@metro-labs/telegram/src/format.ts

@@ -1,6 +1,6 @@
 import type { Chat, Message, Peer, User } from '@mtcute/bun';
 import { lineOf } from './accounts.js';
-import { mintId } from './wire.js';
+import { mintId } from '@metro-labs/core/stations/station-runtime';
 import { isDownloadable, pendingDescriptorOf } from './attachments.js';
 
 const isUser = (peer: Peer): peer is User => peer.type === 'user';
@@ -72,7 +72,6 @@ export function envelope(
       ? [pendingDescriptorOf(media)]
       : undefined;
   return {
-    kind: 'inbound',
     id: mintId(),
     ts: m.date.toISOString(),
     station: 'telegram',
@@ -108,7 +107,6 @@ export interface ReactionInput {
 
 export function reactionEnvelope(r: ReactionInput): Record<string, unknown> {
   return {
-    kind: 'react',
     id: mintId(),
     ts: r.date.toISOString(),
     station: 'telegram',

package/runtime/node_modules/@metro-labs/telegram/src/inbound.ts

@@ -1,6 +1,6 @@
 import type { Message } from '@mtcute/bun';
 import { errMsg, log } from '@metro-labs/core/log';
-import { emit } from './wire.js';
+import { emit } from '@metro-labs/core/stations/station-runtime';
 import { reportAttachment } from '@metro-labs/core/stations/train-events';
 import { envelope, isOwnEcho } from './format.js';
 import { downloadMedia, isDownloadable } from './attachments.js';

package/runtime/node_modules/@metro-labs/telegram/src/media-actions.ts

@@ -6,12 +6,11 @@ import type { UserClient } from './client.js';
 export interface CanonicalAttachment {
   kind?: string;
   path?: string;
-  url?: string;
   mime?: string;
   name?: string;
 }
 
-const srcOf = (att: CanonicalAttachment): string => att.path ?? att.url ?? '';
+const srcOf = (att: CanonicalAttachment): string => att.path ?? '';
 
 function isImage(att: CanonicalAttachment): boolean {
   if (att.kind === 'image') return true;

package/runtime/node_modules/@metro-labs/telegram/src/reactions.ts

@@ -1,7 +1,7 @@
 import type { tl } from '@mtcute/bun';
 import { getBarePeerId, getMarkedPeerId } from '@mtcute/bun';
 import { errMsg } from '@metro-labs/core/log';
-import { emit } from './wire.js';
+import { emit } from '@metro-labs/core/stations/station-runtime';
 import { reactionEnvelope } from './format.js';
 import type { UserClient } from './client.js';
 

package/runtime/node_modules/@metro-labs/telegram-bot/src/accounts.ts

@@ -1,15 +1,9 @@
-import { homedir } from 'node:os';
-import { join } from 'node:path';
 import {
   makeAccountStore,
   resolveAccountId,
 } from '@metro-labs/core/stations/account-store';
 import { Line } from '@metro-labs/core/lines';
 
-const ACCOUNTS_FILE =
-  process.env.TELEGRAM_BOT_ACCOUNTS_FILE ??
-  join(homedir(), '.metro', 'telegram-bot-accounts.json');
-
 export interface AccountConfig {
   id: string;
   token: string;
@@ -17,20 +11,15 @@ export interface AccountConfig {
 
 export const { loadAccounts } = makeAccountStore<AccountConfig>({
   prefix: 'telegram-bot',
-  file: ACCOUNTS_FILE,
   validate(raw, die) {
-    const seenId = new Set<string>();
     const seenTok = new Set<string>();
     for (const a of raw) {
-      if (!a.id) die('account missing id');
       if (!a.token || typeof a.token !== 'string')
         die(`account '${a.id}' missing token`);
-      if (seenId.has(a.id)) die(`duplicate account id '${a.id}'`);
       if (seenTok.has(a.token))
         die(
           `account '${a.id}' reuses a token used by another account (409 on getUpdates)`,
         );
-      seenId.add(a.id);
       seenTok.add(a.token);
     }
   },
@@ -49,37 +38,15 @@ export async function tg<T>(
   accountId: string,
   method: string,
   body: unknown,
-  timeoutMs = 30_000,
-): Promise<T> {
-  const acct = accounts.get(accountId);
-  if (!acct) throw new Error(`unknown account '${accountId}'`);
-  const res = await fetch(`${acct.api}/${method}`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify(body),
-    signal: AbortSignal.timeout(timeoutMs),
-  });
-  const json = (await res.json()) as {
-    ok: boolean;
-    description?: string;
-    result?: T;
-  };
-  if (!json.ok)
-    throw new Error(`telegram-bot ${method}: ${json.description ?? 'unknown'}`);
-  return json.result as T;
-}
-
-export async function tgForm<T>(
-  accountId: string,
-  method: string,
-  form: FormData,
-  timeoutMs = 60_000,
+  timeoutMs = body instanceof FormData ? 60_000 : 30_000,
 ): Promise<T> {
   const acct = accounts.get(accountId);
   if (!acct) throw new Error(`unknown account '${accountId}'`);
+  const form = body instanceof FormData;
   const res = await fetch(`${acct.api}/${method}`, {
     method: 'POST',
-    body: form,
+    ...(form ? {} : { headers: { 'Content-Type': 'application/json' } }),
+    body: form ? body : JSON.stringify(body),
     signal: AbortSignal.timeout(timeoutMs),
   });
   const json = (await res.json()) as {

package/runtime/node_modules/@metro-labs/telegram-bot/src/actions.ts

@@ -1,17 +1,12 @@
 import { accounts, tg, targetOf } from './accounts.js';
-import { respond } from './wire.js';
 import { errMsg } from '@metro-labs/core/log';
-import { normalizeTelegram } from '@metro-labs/core/stations/messaging-normalize';
+import { messagingAliases } from '@metro-labs/core/stations/messaging-normalize';
 import {
   adminMemberList,
   inaccessibleMemberList,
   type TgChatMember,
 } from './members.js';
-import {
-  makeStation,
-  type CallMsg,
-  type StationHandler,
-} from '@metro-labs/core/stations/station-runtime';
+import { makeStation, respond, type CallMsg, type StationHandler } from '@metro-labs/core/stations/station-runtime';
 import { mediaKindOf } from './attachments.js';
 import {
   emitOutbound,
@@ -65,13 +60,10 @@ interface SendArgs {
   line: string;
   text: string;
   replyTo?: string;
-  parseMode?: string;
-  buttons?: { text: string; url: string }[][];
   account?: string;
   attachments?: {
     kind?: string;
     path?: string;
-    url?: string;
     mime?: string;
     name?: string;
   }[];
@@ -80,11 +72,8 @@ interface SendArgs {
 
 type WireAttachment = NonNullable<SendArgs['attachments']>[number];
 
-const attachmentSrc = (att: WireAttachment): string | undefined =>
-  att.path ?? att.url;
-
 const attachmentKind = (att: WireAttachment): string =>
-  mediaKindOf(att.kind, att.mime, attachmentSrc(att) ?? att.name);
+  mediaKindOf(att.kind, att.mime, att.path ?? att.name);
 
 async function sendOneAttachment(
   a: SendArgs,
@@ -96,10 +85,9 @@ async function sendOneAttachment(
   if (!mf) throw new Error(`telegram-bot cannot send a '${kind}' attachment`);
   const sent = await sendMedia(mf.method, mf.field, {
     line: a.line,
-    path: attachmentSrc(att),
+    path: att.path,
     caption,
     replyTo: a.replyTo,
-    parseMode: a.parseMode,
     account: a.account,
     name: att.name,
   });
@@ -144,13 +132,11 @@ async function send(id: string, args: Record<string, unknown>): Promise<void> {
     await sendAttachments(id, a);
     return;
   }
-  const { line, text, replyTo, parseMode, buttons, account } = a;
+  const { line, text, replyTo, account } = a;
   const { accountId, chatId, topicId } = targetOf(line, account);
   const body: Record<string, unknown> = { chat_id: chatId, text };
   if (topicId !== undefined) body.message_thread_id = topicId;
   if (replyTo) body.reply_parameters = { message_id: Number(replyTo) };
-  if (parseMode) body.parse_mode = parseMode;
-  if (buttons) body.reply_markup = { inline_keyboard: buttons };
   const sent = await tg<{ message_id: number }>(accountId, 'sendMessage', body);
   finishSend(id, accountId, line, String(sent.message_id), text, replyTo);
 }
@@ -171,12 +157,22 @@ async function react(id: string, args: Record<string, unknown>): Promise<void> {
   respond(id, { result: { ok: true, account: accountId } });
 }
 
+async function typing(id: string, args: Record<string, unknown>): Promise<void> {
+  const { line, on, account } = args as { line: string; on?: boolean; account?: string };
+  const { accountId, chatId, topicId } = targetOf(line, account);
+  if (on !== false) {
+    const body: Record<string, unknown> = { chat_id: chatId, action: 'typing' };
+    if (topicId !== undefined) body.message_thread_id = topicId;
+    await tg(accountId, 'sendChatAction', body);
+  }
+  respond(id, { result: { ok: true, account: accountId } });
+}
+
 async function edit(id: string, args: Record<string, unknown>): Promise<void> {
-  const { line, messageId, text, parseMode, account } = args as {
+  const { line, messageId, text, account } = args as {
     line: string;
     messageId: string;
     text: string;
-    parseMode?: string;
     account?: string;
   };
   const { accountId, chatId } = targetOf(line, account);
@@ -184,7 +180,6 @@ async function edit(id: string, args: Record<string, unknown>): Promise<void> {
     chat_id: chatId,
     message_id: Number(messageId),
     text,
-    parse_mode: parseMode,
   });
   respond(id, { result: { ok: true, account: accountId } });
 }
@@ -233,6 +228,7 @@ const HANDLERS: Record<string, StationHandler> = {
   accounts: (id) => listAccounts(id),
   send,
   react,
+  typing,
   edit,
   delete: remove,
   listMembers,
@@ -242,5 +238,5 @@ const HANDLERS: Record<string, StationHandler> = {
 
 export const handleCall = makeStation({
   handlers: HANDLERS,
-  normalize: normalizeTelegram,
+  normalize: messagingAliases(),
 });

package/runtime/node_modules/@metro-labs/telegram-bot/src/format.ts

@@ -1,6 +1,6 @@
 import { accounts, lineOf } from './accounts.js';
 import { reportAttachment } from '@metro-labs/core/stations/train-events';
-import { mintId } from './wire.js';
+import { mintId } from '@metro-labs/core/stations/station-runtime';
 import { mediaRefOf, saveTelegramMedia } from './attachments.js';
 import type { TgMsg, TgReaction, TgReactionCount, TgUser } from './types.js';
 
@@ -80,7 +80,6 @@ export const fullName = (u: TgUser | undefined): string | undefined => {
 export function envelope(accountId: string, m: TgMsg): Record<string, unknown> {
   const { line } = lineForMsg(accountId, m);
   return {
-    kind: 'inbound',
     id: mintId(),
     ts: new Date(m.date * 1000).toISOString(),
     station: 'telegram-bot',
@@ -111,7 +110,6 @@ export function reactionEnvelope(
   const added = newEmojis.filter((e) => !oldEmojis.includes(e));
   if (!added.length) return null;
   return {
-    kind: 'react',
     id: mintId(),
     ts: new Date(r.date * 1000).toISOString(),
     station: 'telegram-bot',
@@ -141,7 +139,6 @@ export function reactionCountEnvelope(
   const emoji = top.type.emoji ?? '';
   if (!emoji) return null;
   return {
-    kind: 'react',
     id: mintId(),
     ts: new Date(rc.date * 1000).toISOString(),
     station: 'telegram-bot',

package/runtime/node_modules/@metro-labs/telegram-bot/src/media-actions.ts

@@ -1,6 +1,6 @@
-import { tgForm, targetOf } from './accounts.js';
+import { tg, targetOf } from './accounts.js';
 import { selfUri } from '@metro-labs/core/stations/train-events';
-import { emit, mintId, respond } from './wire.js';
+import { emit, mintId, respond } from '@metro-labs/core/stations/station-runtime';
 import { appendFile } from '@metro-labs/core/stations/attachments';
 
 export function emitOutbound(
@@ -11,18 +11,16 @@ export function emitOutbound(
   replyTo?: string,
 ): void {
   emit({
-    kind: 'outbound',
     id: mintId(),
     ts: new Date().toISOString(),
     station: 'telegram-bot',
     line,
-    from: selfUri('telegram-bot', accountId),
+    from: selfUri(),
     to: line,
     message_id: messageId,
     text,
     reply_to: replyTo,
     ...(replyTo ? { event: { type: 'reply', replyTo } } : {}),
-    account: accountId,
     payload: { account: accountId },
   });
 }
@@ -47,7 +45,6 @@ interface MediaArgs {
   path: string;
   caption?: string;
   replyTo?: string;
-  parseMode?: string;
   account?: string;
   name?: string;
 }
@@ -62,7 +59,6 @@ export async function sendMedia(
     path,
     caption,
     replyTo,
-    parseMode,
     account,
     name: fileName,
   } = args as unknown as MediaArgs;
@@ -71,7 +67,6 @@ export async function sendMedia(
   form.append('chat_id', String(chatId));
   if (topicId !== undefined) form.append('message_thread_id', String(topicId));
   if (caption) form.append('caption', caption);
-  if (parseMode) form.append('parse_mode', parseMode);
   if (replyTo)
     form.append(
       'reply_parameters',
@@ -79,7 +74,7 @@ export async function sendMedia(
     );
   const name = fileName ?? path.split('/').pop() ?? fieldName;
   await appendFile(form, fieldName, path, name);
-  const r = await tgForm<{ message_id: number }>(accountId, method, form);
+  const r = await tg<{ message_id: number }>(accountId, method, form);
   return { accountId, message_id: r.message_id };
 }
 

package/runtime/node_modules/@metro-labs/telegram-bot/src/profile.ts

@@ -9,15 +9,15 @@ import {
 } from '@metro-labs/core/stations/profile';
 import { makeProfileCache, nonEmpty, type SenderProfile } from '@metro-labs/core/stations/sender-profile';
 import { TrainError } from '@metro-labs/core/train-error';
-import { accountFor, tg, tgForm } from './accounts.js';
-import { respond } from './wire.js';
+import { accountFor, tg } from './accounts.js';
+import { respond } from '@metro-labs/core/stations/station-runtime';
 
 async function setPhoto(accountId: string, avatar: ProfileAvatar): Promise<void> {
   assertImage(avatar);
   const form = new FormData();
   form.append('photo', JSON.stringify({ type: 'static', photo: 'attach://avatar' }));
   await appendFile(form, 'avatar', avatar.path, avatar.name);
-  await tgForm(accountId, 'setMyProfilePhoto', form);
+  await tg(accountId, 'setMyProfilePhoto', form);
 }
 
 export async function applyProfile(accountId: string, change: ProfileChange): Promise<void> {

package/runtime/node_modules/@metro-labs/telegram-bot/src/station.ts

@@ -12,7 +12,9 @@ export const telegramBotStation: Station = {
     'unreact',
     'edit',
     'delete',
+    'typing',
   ]),
+  typingRefreshMs: 4_000,
   attachmentMode: 'canonical',
   profileFields: new Set<ProfileField>(PROFILE_FIELDS),
   readsProfiles: true,

package/runtime/node_modules/@metro-labs/threema/src/accounts.ts

@@ -1,5 +1,3 @@
-import { homedir } from 'node:os';
-import { join } from 'node:path';
 import {
   makeAccountStore,
   resolveAccountId,
@@ -12,10 +10,6 @@ import { isGatewayId, normalizeThreemaId, parsePrivateKey } from './ids.js';
 import { GroupStore, parseGroupKey } from './groups.js';
 import type { GroupRef } from './messages.js';
 
-const ACCOUNTS_FILE =
-  process.env.THREEMA_ACCOUNTS_FILE ??
-  join(homedir(), '.metro', 'threema-accounts.json');
-
 export interface AccountConfig {
   id: string;
   gatewayId: string;
@@ -26,7 +20,6 @@ export interface AccountConfig {
 }
 
 function checkAccount(a: AccountConfig, die: Die): void {
-  if (!a.id) die('account missing id');
   if (typeof a.gatewayId !== 'string' || !isGatewayId(a.gatewayId))
     die(`account '${a.id}' has no Gateway ID`);
   if (typeof a.secret !== 'string' || a.secret === '')
@@ -37,16 +30,12 @@ function checkAccount(a: AccountConfig, die: Die): void {
 
 export const { loadAccounts } = makeAccountStore<AccountConfig>({
   prefix: 'threema',
-  file: ACCOUNTS_FILE,
   validate(raw, die) {
-    const seenId = new Set<string>();
     const seenGateway = new Set<string>();
     for (const a of raw) {
       checkAccount(a, die);
-      if (seenId.has(a.id)) die(`duplicate account id '${a.id}'`);
       if (seenGateway.has(a.gatewayId))
         die(`account '${a.id}' reuses the Gateway ID of another account`);
-      seenId.add(a.id);
       seenGateway.add(a.gatewayId);
     }
   },

package/runtime/node_modules/@metro-labs/threema/src/actions.ts

@@ -4,7 +4,7 @@ import {
   respond,
   type CallMsg,
 } from '@metro-labs/core/stations/station-runtime';
-import type { Normalized } from '@metro-labs/core/stations/messaging-normalize';
+import { messagingAliases } from '@metro-labs/core/stations/messaging-normalize';
 import { accountFor, accounts, publicKeyFor, targetOf, type Account } from './accounts.js';
 import { hexToBytes, macMatches, open } from './crypto.js';
 import { groupLineOf, type InboundMeta } from './format.js';
@@ -118,17 +118,7 @@ async function callback(id: string, args: Args): Promise<void> {
   respond(id, { result: { ok: true, kind: deliver(acct, meta, decode(plain)) } });
 }
 
-export function normalizeThreema(action: string, env: Args): Normalized {
-  if (action === 'reply')
-    return {
-      action: 'send',
-      args: { line: env.line, text: env.text, replyTo: env.replyTo, account: env.account },
-    };
-  if (action === 'unreact') return { action: 'react', args: { ...env, action: 'removed' } };
-  return { action, args: env };
-}
-
 export const handleCall = makeStation({
   handlers: { accounts: listAccounts, send, react, callback, listMembers },
-  normalize: normalizeThreema,
+  normalize: messagingAliases({ action: 'removed' }),
 });

package/runtime/node_modules/@metro-labs/threema/src/files.ts

@@ -1,6 +1,5 @@
 import { readFile } from 'node:fs/promises';
-import { emit } from '@metro-labs/core/stations/station-runtime';
-import { attachmentFailedEvent, attachmentSavedEvent, emitInbound } from '@metro-labs/core/stations/train-events';
+import { emitInbound, reportAttachment, type SavedFile } from '@metro-labs/core/stations/train-events';
 import { assertAttachmentSize, isImageMime, kindOf, saveBufferToCache } from '@metro-labs/core/stations/attachments';
 import { TrainError } from '@metro-labs/core/train-error';
 import type { Account } from './accounts.js';
@@ -30,12 +29,11 @@ export const encodeFileFor = (group: GroupRef | null, file: FileData): Uint8Arra
 
 export const fileLabel = (file: OutgoingFile): string => kindOf(file.mime, file.path);
 
-async function fetchFile(acct: Account, m: InboundMeta, file: FileData): Promise<{ path: string; bytes: number }> {
+async function fetchFile(acct: Account, m: InboundMeta, file: FileData): Promise<SavedFile> {
   const sealed = await downloadBlob(acct.cfg, file.blobId);
   const plain = openBlob(sealed, hexToBytes(file.key, 'blob key'));
   if (plain === null) throw new TrainError('threema_bad_blob', 'the file did not decrypt with the key in the message', { retryable: false });
-  const saved = await saveBufferToCache(plain, m.messageId, 0, { mime: file.mime, name: file.name });
-  return { path: saved.path, bytes: saved.bytes };
+  return saveBufferToCache(plain, m.messageId, 0, { mime: file.mime, name: file.name });
 }
 
 export function deliverFile(acct: Account, m: InboundMeta, file: FileData, room: Room, sentByUs: (id: string) => boolean): void {
@@ -44,15 +42,6 @@ export function deliverFile(acct: Account, m: InboundMeta, file: FileData, room:
   const forId = String(env.id);
   const payload = { ...(env.payload as Record<string, unknown>), attachments: [{ kind: kindOf(file.mime, file.name), name: file.name, mime: file.mime, ...(file.size === null ? {} : { size: file.size }) }] };
   emitInbound(acct.cfg.id, { ...env, payload });
-  const at = { station: 'threema', account: acct.cfg.id, line, forId, index: 0 };
   const kind = kindOf(file.mime, file.name);
-  fetchFile(acct, m, file)
-    .then(({ path, bytes }) => {
-      emit(attachmentSavedEvent({ ...at, saved: { path, mime: file.mime, name: file.name }, extra: { kind, size: bytes } }));
-    })
-    .catch((err: unknown) => {
-      const reason = err instanceof Error ? err.message : String(err);
-      process.stderr.write(`threema[${acct.cfg.id}]: could not fetch ${file.name} from ${m.from}: ${reason}\n`);
-      emit(attachmentFailedEvent({ ...at, reason, extra: { kind } }));
-    });
+  reportAttachment(fetchFile(acct, m, file), { station: 'threema', account: acct.cfg.id, line, forId, index: 0 }, { saved: { kind }, failed: { kind } });
 }

package/runtime/node_modules/@metro-labs/threema/src/format.ts

@@ -53,7 +53,6 @@ function base(
 ): Record<string, unknown> {
   const group = room.group;
   return {
-    kind: 'inbound',
     id: mintId(),
     ts: tsOf(m.date),
     station: 'threema',
@@ -127,18 +126,16 @@ export function emitOutbound(
   replyTo?: string,
 ): void {
   emit({
-    kind: 'outbound',
     id: mintId(),
     ts: new Date().toISOString(),
     station: 'threema',
     line,
-    from: selfUri('threema', accountId),
+    from: selfUri(),
     to: line,
     message_id: messageId,
     text,
     reply_to: replyTo,
     ...(replyTo ? { event: { type: 'reply', replyTo } } : {}),
-    account: accountId,
     payload: { account: accountId },
   });
 }
@@ -152,18 +149,16 @@ export function emitOutboundReaction(
   removed: boolean,
 ): void {
   emit({
-    kind: 'outbound',
     id: mintId(),
     ts: new Date().toISOString(),
     station: 'threema',
     line,
-    from: selfUri('threema', accountId),
+    from: selfUri(),
     to: line,
     message_id: messageId,
     text: `[react ${emoji}${removed ? ' (removed)' : ''}]`,
     emoji,
     event: { type: 'react', emoji, targetId, ...(removed ? { removed: true } : {}) },
-    account: accountId,
     payload: { account: accountId },
   });
 }