agent-messenger 2.10.2 → 2.11.1

package/src/platforms/discord/token-extractor.ts

@@ -10,6 +10,7 @@ import {
   ChromiumCookieDecryptor,
   discoverBrowserProfileDirs,
   getBrowserBasePath,
+  getAgentBrowserProfileDirs,
 } from '@/shared/chromium'
 import type { KeychainVariant } from '@/shared/chromium'
 import { DerivedKeyCache } from '@/shared/utils/derived-key-cache'
@@ -74,12 +75,20 @@ export class DiscordTokenExtractor {
   private keyCache: DerivedKeyCache
   private cachedKey: Buffer | null = null
   private decryptor: ChromiumCookieDecryptor
-
-  constructor(platform?: NodeJS.Platform, startupWait?: number, killWait?: number, keyCache?: DerivedKeyCache) {
+  private customBrowserProfileDirs: string[]
+
+  constructor(
+    platform?: NodeJS.Platform,
+    startupWait?: number,
+    killWait?: number,
+    keyCache?: DerivedKeyCache,
+    customBrowserProfileDirs?: string[],
+  ) {
     this.platform = platform ?? process.platform
     this.startupWait = startupWait ?? DISCORD_STARTUP_WAIT
     this.killWait = killWait ?? 1000
     this.keyCache = keyCache ?? new DerivedKeyCache()
+    this.customBrowserProfileDirs = customBrowserProfileDirs ?? []
     this.decryptor = new ChromiumCookieDecryptor({
       platform: this.platform,
       appKeychainVariants: DISCORD_APP_KEYCHAIN_VARIANTS,
@@ -125,6 +134,10 @@ export class DiscordTokenExtractor {
       }
     }
 
+    for (const profileDir of getAgentBrowserProfileDirs({ customProfileDirs: this.customBrowserProfileDirs })) {
+      dirs.push(join(profileDir, 'Local Storage', 'leveldb'))
+    }
+
     return dirs
   }
 
@@ -164,6 +177,15 @@ export class DiscordTokenExtractor {
     const results: ExtractedDiscordToken[] = []
     const seenTokens = new Set<string>()
 
+    if (this.customBrowserProfileDirs.length > 0) {
+      for (const t of await this.extractFromBrowserLevelDB()) {
+        if (!seenTokens.has(t.token)) {
+          seenTokens.add(t.token)
+          results.push(t)
+        }
+      }
+    }
+
     for (const t of await this.extractFromLevelDB()) {
       if (!seenTokens.has(t.token)) {
         seenTokens.add(t.token)
@@ -171,10 +193,12 @@ export class DiscordTokenExtractor {
       }
     }
 
-    for (const t of await this.extractFromBrowserLevelDB()) {
-      if (!seenTokens.has(t.token)) {
-        seenTokens.add(t.token)
-        results.push(t)
+    if (this.customBrowserProfileDirs.length === 0) {
+      for (const t of await this.extractFromBrowserLevelDB()) {
+        if (!seenTokens.has(t.token)) {
+          seenTokens.add(t.token)
+          results.push(t)
+        }
       }
     }
 

package/src/platforms/discordbot/cli.ts

@@ -22,8 +22,18 @@ program
   .name('agent-discordbot')
   .description('CLI tool for Discord bot integration using bot tokens')
   .version(pkg.version)
+  .option('--pretty', 'Pretty-print JSON output')
   .option('--bot <id>', 'Bot ID to use')
   .option('--server <id>', 'Server ID to use')
+  .hook('preAction', (thisCmd, actionCmd) => {
+    for (const [key, value] of Object.entries(thisCmd.opts())) {
+      if (value === undefined) continue
+      const source = actionCmd.getOptionValueSource(key)
+      if (source === undefined || source === 'default') {
+        actionCmd.setOptionValue(key, value)
+      }
+    }
+  })
 
 program.addCommand(authCommand)
 program.addCommand(whoamiCommand)

package/src/platforms/discordbot/client.ts

@@ -347,6 +347,10 @@ export class DiscordBotClient {
     return this.request<DiscordChannel>('PATCH', `/channels/${threadId}`, { archived })
   }
 
+  async gatewayConnect(): Promise<{ token: string }> {
+    return { token: this.ensureAuth() }
+  }
+
   async resolveChannel(guildId: string, channel: string): Promise<string> {
     if (/^\d+$/.test(channel)) return channel
 

package/src/platforms/discordbot/commands/auth.ts

@@ -1,5 +1,6 @@
 import { Command } from 'commander'
 
+import { cliOutput } from '@/shared/utils/cli-output'
 import { formatOutput } from '@/shared/utils/output'
 
 import { DiscordBotClient } from '../client'
@@ -163,11 +164,6 @@ export async function removeAction(botId: string, options: ActionOptions): Promi
   }
 }
 
-function cliOutput(result: ActionResult, pretty?: boolean, exitOnError = true): void {
-  console.log(formatOutput(result, pretty))
-  if (result.error && exitOnError) process.exit(1)
-}
-
 export const authCommand = new Command('auth')
   .description('Bot authentication commands')
   .addCommand(

package/src/platforms/discordbot/commands/message.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander'
 
-import { formatOutput } from '@/shared/utils/output'
+import { cliOutput } from '@/shared/utils/cli-output'
 
 import type { BotOption } from './shared'
 import { getClient, getCurrentServer } from './shared'
@@ -165,11 +165,6 @@ export async function repliesAction(
   }
 }
 
-function cliOutput(result: MessageResult, pretty?: boolean): void {
-  console.log(formatOutput(result, pretty))
-  if (result.error) process.exit(1)
-}
-
 export const messageCommand = new Command('message')
   .description('Message commands')
   .addCommand(

package/src/platforms/discordbot/commands/server.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander'
 
-import { formatOutput } from '@/shared/utils/output'
+import { cliOutput } from '@/shared/utils/cli-output'
 
 import { DiscordBotCredentialManager } from '../credential-manager'
 import type { BotOption } from './shared'
@@ -82,10 +82,6 @@ export async function infoAction(serverId: string, options: BotOption): Promise<
   }
 }
 
-const cliOutput = (result: ActionResult, pretty?: boolean) => {
-  console.log(formatOutput(result, pretty))
-}
-
 export const serverCommand = new Command('server')
   .description('Server commands')
   .addCommand(

package/src/platforms/discordbot/commands/whoami.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander'
 
-import { formatOutput } from '@/shared/utils/output'
+import { cliOutput } from '@/shared/utils/cli-output'
 
 import type { BotOption } from './shared'
 import { getClient } from './shared'
@@ -30,11 +30,6 @@ export async function whoamiAction(options: BotOption): Promise<WhoamiResult> {
   }
 }
 
-function cliOutput(result: WhoamiResult, pretty?: boolean): void {
-  console.log(formatOutput(result, pretty))
-  if (result.error) process.exit(1)
-}
-
 export const whoamiCommand = new Command('whoami')
   .description('Show current authenticated bot')
   .option('--bot <id>', 'Bot ID to use')

package/src/platforms/discordbot/index.test.ts

@@ -0,0 +1,82 @@
+import { expect, it } from 'bun:test'
+
+import {
+  DiscordBotClient,
+  DiscordBotConfigSchema,
+  DiscordBotCredentialManager,
+  DiscordBotCredentialsSchema,
+  DiscordBotEntrySchema,
+  DiscordBotError,
+  DiscordBotListener,
+  DiscordChannelSchema,
+  DiscordFileSchema,
+  DiscordGatewayOpcode,
+  DiscordGuildSchema,
+  DiscordIntent,
+  DiscordMessageSchema,
+  DiscordReactionSchema,
+  DiscordUserSchema,
+} from '@/platforms/discordbot/index'
+
+it('DiscordBotClient is exported from barrel', () => {
+  expect(typeof DiscordBotClient).toBe('function')
+})
+
+it('DiscordBotError is exported from barrel', () => {
+  expect(typeof DiscordBotError).toBe('function')
+})
+
+it('DiscordBotCredentialManager is exported from barrel', () => {
+  expect(typeof DiscordBotCredentialManager).toBe('function')
+})
+
+it('DiscordBotListener is exported from barrel', () => {
+  expect(typeof DiscordBotListener).toBe('function')
+})
+
+it('DiscordGatewayOpcode is exported from barrel', () => {
+  expect(DiscordGatewayOpcode.Identify).toBe(2)
+  expect(DiscordGatewayOpcode.Hello).toBe(10)
+})
+
+it('DiscordIntent is exported from barrel', () => {
+  expect(DiscordIntent.Guilds).toBe(1)
+  expect(DiscordIntent.GuildMessages).toBe(1 << 9)
+  expect(DiscordIntent.MessageContent).toBe(1 << 15)
+})
+
+it('DiscordBotEntrySchema is exported from barrel', () => {
+  expect(typeof DiscordBotEntrySchema.parse).toBe('function')
+})
+
+it('DiscordBotConfigSchema is exported from barrel', () => {
+  expect(typeof DiscordBotConfigSchema.parse).toBe('function')
+})
+
+it('DiscordBotCredentialsSchema is exported from barrel', () => {
+  expect(typeof DiscordBotCredentialsSchema.parse).toBe('function')
+})
+
+it('DiscordGuildSchema is exported from barrel', () => {
+  expect(typeof DiscordGuildSchema.parse).toBe('function')
+})
+
+it('DiscordChannelSchema is exported from barrel', () => {
+  expect(typeof DiscordChannelSchema.parse).toBe('function')
+})
+
+it('DiscordMessageSchema is exported from barrel', () => {
+  expect(typeof DiscordMessageSchema.parse).toBe('function')
+})
+
+it('DiscordUserSchema is exported from barrel', () => {
+  expect(typeof DiscordUserSchema.parse).toBe('function')
+})
+
+it('DiscordReactionSchema is exported from barrel', () => {
+  expect(typeof DiscordReactionSchema.parse).toBe('function')
+})
+
+it('DiscordFileSchema is exported from barrel', () => {
+  expect(typeof DiscordFileSchema.parse).toBe('function')
+})

package/src/platforms/discordbot/index.ts

@@ -1,23 +1,41 @@
 export { DiscordBotClient } from './client'
 export { DiscordBotCredentialManager } from './credential-manager'
-export {
+export { DiscordBotListener } from './listener'
+export type {
   DiscordBotConfig,
-  DiscordBotConfigSchema,
   DiscordBotCredentials,
-  DiscordBotCredentialsSchema,
   DiscordBotEntry,
+  DiscordBotListenerEventMap,
+  DiscordChannel,
+  DiscordFile,
+  DiscordGatewayChannelEvent,
+  DiscordGatewayEvent,
+  DiscordGatewayGenericEvent,
+  DiscordGatewayGuildEvent,
+  DiscordGatewayInteractionEvent,
+  DiscordGatewayMemberEvent,
+  DiscordGatewayMessageCreateEvent,
+  DiscordGatewayMessageDeleteEvent,
+  DiscordGatewayMessageUpdateEvent,
+  DiscordGatewayPresenceEvent,
+  DiscordGatewayReactionEvent,
+  DiscordGatewayTypingEvent,
+  DiscordGuild,
+  DiscordMessage,
+  DiscordReaction,
+  DiscordUser,
+} from './types'
+export {
+  DiscordBotConfigSchema,
+  DiscordBotCredentialsSchema,
   DiscordBotEntrySchema,
   DiscordBotError,
-  DiscordChannel,
   DiscordChannelSchema,
-  DiscordFile,
   DiscordFileSchema,
-  DiscordGuild,
+  DiscordGatewayOpcode,
   DiscordGuildSchema,
-  DiscordMessage,
+  DiscordIntent,
   DiscordMessageSchema,
-  DiscordReaction,
   DiscordReactionSchema,
-  DiscordUser,
   DiscordUserSchema,
 } from './types'