@stage-labs/metro 0.1.0-beta.20 → 0.1.0-beta.22

package/runtime/node_modules/@metro-labs/mcp/src/stations/attach.ts

@@ -2,11 +2,11 @@ import { randomBytes } from 'node:crypto';
 import {
   DiscordTokenError,
   verifyDiscordBotToken,
-} from '@metro-labs/discord/verify';
+} from '@metro-labs/discord-bot/verify';
 import {
   TelegramTokenError,
   verifyTelegramBotToken,
-} from '@metro-labs/telegram/verify';
+} from '@metro-labs/telegram-bot/verify';
 import { ApiError } from '../daemon/api-error.js';
 import { publicBaseOrDefault } from '../daemon/attach-serve.js';
 import {
@@ -18,8 +18,8 @@ import {
 } from './attach-xmtp.js';
 
 export const ATTACHABLE_STATIONS = [
-  'discord',
-  'telegram',
+  'discord-bot',
+  'telegram-bot',
   'xmtp',
   'webhook',
 ] as const;
@@ -175,8 +175,8 @@ export async function prepareAccount(
   input: AttachInput,
   verify: VerifyXmtpKey = verifyXmtpKeyOutOfProcess,
 ): Promise<PreparedAccount> {
-  if (input.station === 'discord') return prepareDiscord(input.token);
-  if (input.station === 'telegram') return prepareTelegram(input.token);
+  if (input.station === 'discord-bot') return prepareDiscord(input.token);
+  if (input.station === 'telegram-bot') return prepareTelegram(input.token);
   if (input.station === 'webhook') return prepareWebhook();
   return prepareXmtp(verify);
 }

package/runtime/node_modules/@metro-labs/mcp/src/stations/lines.ts

@@ -38,7 +38,7 @@ function parseTelegramLine(
   line: Line | string,
 ): { accountId: string; chatId: number; topicId?: number } | null {
   const p = Line.parse(line);
-  if (p?.station !== 'telegram') return null;
+  if (p?.station !== 'telegram-bot') return null;
   const { accountId, rest } = splitTelegramAccount(p.path);
   const [chatId, topicId] = rest;
   if (rest.length < 1 || rest.length > 2 || chatId === undefined || !isSignedInt(chatId))
@@ -76,7 +76,7 @@ export const Line = {
   parseXmtp: (line: Line | string) => parseAccountScoped(line, 'xmtp'),
 
   parseDiscord: (line: Line | string) =>
-    parseAccountScoped(line, 'discord', isSnowflake),
+    parseAccountScoped(line, 'discord-bot', isSnowflake),
 
   parseTelegram: (line: Line | string) => parseTelegramLine(line),
 };

package/runtime/node_modules/@metro-labs/mcp/src/stations/registry.ts

@@ -1,17 +1,17 @@
 import type { Station } from './types.js';
 import { Line } from './lines.js';
 import { xmtpStation } from '@metro-labs/xmtp';
+import { telegramBotStation } from '@metro-labs/telegram-bot';
 import { telegramStation } from '@metro-labs/telegram';
-import { telegramUserStation } from '@metro-labs/telegram-user';
-import { discordStation } from '@metro-labs/discord';
+import { discordBotStation } from '@metro-labs/discord-bot';
 import { whatsappStation } from '@metro-labs/whatsapp';
 import { webhookStation } from '@metro-labs/webhook';
 
 export const STATIONS: readonly Station[] = [
   xmtpStation,
+  telegramBotStation,
   telegramStation,
-  telegramUserStation,
-  discordStation,
+  discordBotStation,
   whatsappStation,
   webhookStation,
 ];

package/runtime/node_modules/@metro-labs/telegram/package.json

@@ -6,20 +6,23 @@
   "exports": {
     ".": "./src/station.ts",
     "./train": "./src/index.ts",
-    "./verify": "./src/verify.ts"
+    "./login": "./src/login.ts"
   },
   "scripts": {
     "build": "tsc",
     "test": "tsc --noEmit && bun test test/"
   },
   "dependencies": {
-    "@metro-labs/mcp": "workspace:*"
+    "@metro-labs/mcp": "workspace:*",
+    "@mtcute/bun": "0.30.1"
   },
   "devDependencies": {
     "@stage-labs/config": "0.1.0-beta.2",
+    "@types/qrcode-terminal": "^0.12.2",
     "eslint": "^10.3.0",
     "knip": "^6.15.0",
     "madge": "^8.0.0",
+    "qrcode-terminal": "^0.12.0",
     "typescript": "^5"
   }
 }

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

@@ -3,102 +3,43 @@ import { join } from 'node:path';
 import {
   makeAccountStore,
   resolveAccountId,
+  type Die,
 } from '@metro-labs/mcp/stations/account-store';
-import { Line } from '@metro-labs/mcp/lines';
+import type { UserAccount } from './types.js';
 
 const ACCOUNTS_FILE =
   process.env.TELEGRAM_ACCOUNTS_FILE ??
   join(homedir(), '.metro', 'telegram-accounts.json');
 
-export interface AccountConfig {
-  id: string;
-  token: string;
-  owner?: string;
+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');
+  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<AccountConfig>({
+export const { loadAccounts } = makeAccountStore<UserAccount>({
   prefix: 'telegram',
   file: ACCOUNTS_FILE,
   allowlistEnv: ['TELEGRAM_ONLY_ACCOUNTS', 'TELEGRAM_ACCOUNTS'],
   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);
-    }
+    const seen = new Set<string>();
+    for (const a of raw) validateAccount(a, seen, die);
   },
 });
 
-export interface Account {
-  cfg: AccountConfig;
-  api: string;
-  fileApi: string;
-  offset: number;
-}
-export const accounts = new Map<string, Account>();
-
-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 ${method}: ${json.description ?? 'unknown'}`);
-  return json.result as T;
-}
-
-export async function tgForm<T>(
-  accountId: string,
-  method: string,
-  form: FormData,
-  timeoutMs = 60_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',
-    body: form,
-    signal: AbortSignal.timeout(timeoutMs),
-  });
-  const json = (await res.json()) as {
-    ok: boolean;
-    description?: string;
-    result?: T;
-  };
-  if (!json.ok)
-    throw new Error(`telegram ${method}: ${json.description ?? 'unknown'}`);
-  return json.result as T;
-}
+export const accounts = new Map<string, UserAccount>();
 
 export function accountFor(args: { account?: string; line?: string }): string {
-  return resolveAccountId(
-    accounts,
-    args,
-    (line) => Line.parseTelegram(line)?.accountId,
-  );
+  return resolveAccountId(accounts, args, (line) => targetOf(line)?.accountId);
 }
 
 export function lineOf(
@@ -110,11 +51,31 @@ export function lineOf(
   return `metro://telegram/${accountId}/${tail}`;
 }
 
-export function targetOf(
-  line: string,
-  accountOverride?: string,
-): { accountId: string; chatId: number; topicId?: number } {
-  const parsed = Line.parseTelegram(line);
-  if (!parsed) throw new Error(`bad telegram line: ${line}`);
-  return { ...parsed, accountId: accountOverride ?? parsed.accountId };
+interface Target {
+  accountId: string;
+  chatId: number;
+  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 [chatId, topicId] = rest;
+  if (rest.length < 1 || rest.length > 2 || chatId === undefined) return undefined;
+  if (!isSignedInt(chatId)) return undefined;
+  if (topicId !== undefined && !isTopic(topicId)) return undefined;
+  return {
+    accountId,
+    chatId: Number(chatId),
+    ...(topicId !== undefined ? { topicId: Number(topicId) } : {}),
+  };
 }