@uniquedivine/tg-sai 0.0.4 → 0.0.5

package/mtcuteAdapter.ts

@@ -1,4 +1,5 @@
 import { TelegramClient } from "@mtcute/bun"
+import { createTelegramCryptoProvider } from "./telegramRuntime"
 import {
   addChatMembers,
   editAdminRights,
@@ -7,7 +8,6 @@ import {
   transferChatOwnership,
 } from "@mtcute/bun/methods.js"
 import { convertFromTelethonSession } from "@mtcute/convert"
-
 import type { ChatAuditInput, ChatMemberData, UserData } from "./adminAudit"
 import type { SaiChatRecord } from "./ops"
 import { isSaiChatTitle } from "./ops"
@@ -90,17 +90,25 @@ function isPeerNotFound(error: unknown): boolean {
   )
 }
 
+/** Shared constructor used by offline readiness and authenticated operations. */
+export function createMtcuteRuntimeClient(
+  config: Omit<MtcuteClientConfig, "session">,
+): TelegramClient {
+  return new TelegramClient({
+    crypto: createTelegramCryptoProvider(),
+    apiId: config.apiId,
+    apiHash: config.apiHash,
+    storage: config.storage ?? "sai-telegram-admin-check.session",
+  })
+}
+
 /**
  * Creates and authenticates a mtcute client from a Telethon session string.
  */
 export async function createMtcuteClient(
   config: MtcuteClientConfig,
 ): Promise<TelegramClient> {
-  const client = new TelegramClient({
-    apiId: config.apiId,
-    apiHash: config.apiHash,
-    storage: config.storage ?? "sai-telegram-admin-check.session",
-  })
+  const client = createMtcuteRuntimeClient(config)
 
   await client.importSession(convertFromTelethonSession(config.session), true)
   return client

package/ops.ts

@@ -1,3 +1,5 @@
+import { USERS } from "./cfg"
+
 /**
  * One chat entry consumed by command `tg-sai ops sai-bootstrap`.
  *
@@ -103,3 +105,13 @@ export function parseChatInputFile(contents: string): ChatInput[] {
 export function formatSaiChatJsonLine(record: SaiChatRecord): string {
   return JSON.stringify(record)
 }
+
+/**
+ * Resolves the owner target for `ops sai-bootstrap`. Defaults to the Sai
+ * custody account so a bare run never hands chats to a personal account.
+ */
+export function resolveBootstrapTarget(
+  targetUser: number | string | undefined,
+): number | string {
+  return targetUser ?? USERS.saiCustody.id
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniquedivine/tg-sai",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "type": "module",
   "private": false,
   "description": "Sai Telegram admin audit and bootstrap CLI",
@@ -8,12 +8,12 @@
     "bun": ">=1.0.0"
   },
   "bin": {
-    "tg-sai": "./main.ts"
+    "tg-sai": "main.ts"
   },
   "scripts": {
     "start": "bun main.ts",
     "test": "bun test",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "bun check",
     "py-test": "uv run pytest session_string_generator_test.py"
   },
   "files": [
@@ -30,12 +30,13 @@
   ],
   "license": "UNLICENSED",
   "devDependencies": {
-    "@types/bun": "^1.3.14",
+    "@types/bun": "^1.4.3",
     "typescript": "^6.0.3"
   },
   "dependencies": {
     "@mtcute/bun": "^0.30.1",
     "@mtcute/convert": "^0.30.1",
+    "@mtcute/wasm": "^0.29.0",
     "commander": "^15.0.0"
   }
 }

package/profiles.ts

@@ -1,7 +1,6 @@
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises"
 import { homedir, platform as osPlatform } from "node:os"
 import { dirname, join } from "node:path"
-
 import type { UserData } from "./adminAudit"
 
 const TG_SAI_DIR_ENV = "TG_SAI_DIR"
@@ -44,12 +43,16 @@ export interface TgSaiProfile {
 }
 
 export interface TgSaiConfig {
+  profiles: TgSaiProfile[]
+}
+
+export interface LegacyTgSaiConfig {
   activeProfile: string | null
   profiles: Record<string, TgSaiProfile>
 }
 
 export interface ProfileAddInput {
-  name: string
+  name?: string
   apiId: number | null
   apiHash: string
   sessionString: string
@@ -139,8 +142,7 @@ export const WINDOWS_DISCOVERY_PATHS = [
 ] as const
 
 export const emptyConfig = (): TgSaiConfig => ({
-  activeProfile: null,
-  profiles: {},
+  profiles: [],
 })
 
 export function homeDir(env: ProfileStoreEnv = process.env): string {
@@ -236,11 +238,12 @@ export async function readConfig(
 ): Promise<TgSaiConfig> {
   try {
     const raw = await readFile(configPath(env), "utf8")
-    const parsed = JSON.parse(raw) as TgSaiConfig
-    for (const profile of Object.values(parsed.profiles)) {
+    const parsed = JSON.parse(raw) as TgSaiConfig | LegacyTgSaiConfig
+    const config = normalizeConfig(parsed)
+    for (const profile of config.profiles) {
       profile.password = profile.password ?? ""
     }
-    return parsed
+    return config
   } catch (error) {
     if (
       error instanceof Error &&
@@ -253,6 +256,44 @@ export async function readConfig(
   }
 }
 
+export function normalizeConfig(
+  config: TgSaiConfig | LegacyTgSaiConfig,
+): TgSaiConfig {
+  if (Array.isArray(config.profiles)) {
+    return {
+      profiles: config.profiles.map((profile, index) =>
+        normalizeProfile(profile, index),
+      ),
+    }
+  }
+
+  const legacyConfig = config as LegacyTgSaiConfig
+  const legacyProfiles = Object.entries(legacyConfig.profiles)
+  const orderedNames = [
+    ...(legacyConfig.activeProfile &&
+    legacyConfig.profiles[legacyConfig.activeProfile]
+      ? [legacyConfig.activeProfile]
+      : []),
+    ...legacyProfiles
+      .map(([name]) => name)
+      .filter((name) => name !== legacyConfig.activeProfile),
+  ]
+
+  return {
+    profiles: orderedNames.map((name, index) =>
+      normalizeProfile({ ...legacyConfig.profiles[name]!, name }, index),
+    ),
+  }
+}
+
+function normalizeProfile(profile: TgSaiProfile, index: number): TgSaiProfile {
+  return {
+    ...profile,
+    name: profile.name || profile.handle || `profile-${index}`,
+    password: profile.password ?? "",
+  }
+}
+
 export async function writeConfig(
   config: TgSaiConfig,
   env: ProfileStoreEnv = process.env,
@@ -273,25 +314,46 @@ export async function clearConfig(
 export function profileFromInput(
   input: ProfileAddInput,
   now = new Date(),
+  index = 0,
 ): TgSaiProfile {
   const timestamp = now.toISOString()
   return {
     ...input,
+    name: profileNameFromInput(input, index),
     createdAt: timestamp,
     updatedAt: timestamp,
   }
 }
 
+function profileNameFromInput(input: ProfileAddInput, index: number): string {
+  return (
+    input.name ??
+    input.handle ??
+    (input.userId !== null ? String(input.userId) : null) ??
+    `profile-${index}`
+  )
+}
+
 export async function addProfile(
   input: ProfileAddInput,
   env: ProfileStoreEnv = process.env,
   now = new Date(),
 ): Promise<TgSaiConfig> {
   const config = await readConfig(env)
-  const previous = config.profiles[input.name]
+  const index =
+    input.name !== undefined
+      ? findProfileIndex(config, input.name)
+      : config.profiles.length > 0
+        ? 0
+        : -1
+  const targetIndex = index >= 0 ? index : config.profiles.length
+  const previous = index >= 0 ? config.profiles[index] : undefined
+  if (previous?.userId != null && input.userId != null && input.userId !== previous.userId) {
+    throw new Error("Cannot replace a saved profile's account identity. Use a new profile name or explicitly remove the old profile first.")
+  }
   const timestamp = now.toISOString()
-  config.profiles[input.name] = {
-    name: input.name,
+  const nextProfile: TgSaiProfile = {
+    name: profileNameFromInput(input, targetIndex),
     apiId: input.apiId ?? previous?.apiId ?? null,
     apiHash: input.apiHash || previous?.apiHash || "",
     sessionString: input.sessionString || previous?.sessionString || "",
@@ -303,9 +365,10 @@ export async function addProfile(
     updatedAt: timestamp,
   }
 
-  const profileCount = Object.keys(config.profiles).length
-  if (config.activeProfile === null || profileCount === 1) {
-    config.activeProfile = input.name
+  if (index >= 0) {
+    config.profiles[index] = nextProfile
+  } else {
+    config.profiles.push(nextProfile)
   }
 
   await writeConfig(config, env)
@@ -313,40 +376,69 @@ export async function addProfile(
 }
 
 export async function removeProfile(
-  name: string,
+  selector: string,
   env: ProfileStoreEnv = process.env,
 ): Promise<TgSaiConfig> {
   const config = await readConfig(env)
-  delete config.profiles[name]
-
-  if (config.activeProfile === name) {
-    const remaining = Object.keys(config.profiles)
-    config.activeProfile = remaining.length === 1 ? remaining[0]! : null
+  const index = findProfileIndex(config, selector)
+  if (index === -1) {
+    throw new Error(`Unknown profile: ${selector}`)
   }
+  config.profiles.splice(index, 1)
 
   await writeConfig(config, env)
   return config
 }
 
 export async function setActiveProfile(
-  name: string,
+  selector: string,
   env: ProfileStoreEnv = process.env,
 ): Promise<TgSaiConfig> {
   const config = await readConfig(env)
-  if (!config.profiles[name]) {
-    throw new Error(`Unknown profile: ${name}`)
+  const index = findProfileIndex(config, selector)
+  if (index === -1) {
+    throw new Error(`Unknown profile: ${selector}`)
   }
-  config.activeProfile = name
+  const [profile] = config.profiles.splice(index, 1)
+  config.profiles.unshift(profile!)
   await writeConfig(config, env)
   return config
 }
 
 export function getProfile(
   config: TgSaiConfig,
-  name: string | undefined,
+  selector: string | undefined,
 ): TgSaiProfile | null {
-  const profileName = name ?? config.activeProfile
-  return profileName ? (config.profiles[profileName] ?? null) : null
+  if (selector === undefined) {
+    return config.profiles[0] ?? null
+  }
+  const index = findProfileIndex(config, selector)
+  return index === -1 ? null : config.profiles[index]!
+}
+
+export function findProfileIndex(
+  config: TgSaiConfig,
+  selector: string,
+): number {
+  const exactMatch = config.profiles.findIndex(
+    (profile) =>
+      profile.name === selector ||
+      profile.handle === selector ||
+      String(profile.userId) === selector,
+  )
+  if (exactMatch !== -1) {
+    return exactMatch
+  }
+
+  const asIndex = Number(selector)
+  if (Number.isInteger(asIndex) && asIndex >= 0) {
+    return asIndex < config.profiles.length ? asIndex : -1
+  }
+  return -1
+}
+
+export function profileLabel(profile: TgSaiProfile, index: number): string {
+  return profile.handle ?? profile.name ?? `profile-${index}`
 }
 
 export function redactedProfile(profile: TgSaiProfile) {
@@ -713,7 +805,7 @@ export async function resolveTelegramCredentials(
 }
 
 export function profileInputFromUser(
-  name: string,
+  name: string | undefined,
   credentials: TelegramCredentials,
   user: UserData,
   password = "",
@@ -729,3 +821,18 @@ export function profileInputFromUser(
     displayName: user.displayName,
   }
 }
+
+/** Provisioning must never inherit another account from environment or discovery. */
+export async function strictProfileCredentials(
+  selector: string,
+  expectedUserId: number,
+  env: ProfileStoreEnv = process.env,
+): Promise<TelegramCredentials> {
+  if (!selector?.trim()) throw new Error("Explicit custody profile required")
+  const profile = getProfile(await readConfig(env), selector)
+  if (!profile) throw new Error("Custody profile is not configured")
+  if (profile.userId !== expectedUserId) throw new Error("Custody profile user ID mismatch")
+  const credentials = credentialsFromProfileRecord(profile)
+  if (!credentials) throw new Error("Custody profile is incomplete")
+  return credentials
+}