agent-messenger 1.0.0 → 1.1.0

package/src/platforms/discord/credential-manager.test.ts

@@ -1,173 +1,174 @@
-import { afterEach, beforeEach, expect, test } from 'bun:test'
-import { existsSync } from 'node:fs'
-import { rm } from 'node:fs/promises'
+import { afterAll, describe, expect, test } from 'bun:test'
+import { existsSync, rmSync } from 'node:fs'
 import { join } from 'node:path'
 import { DiscordCredentialManager } from './credential-manager'
 
-const TEST_CONFIG_DIR = '/tmp/discord-test-config'
+const testDirs: string[] = []
 
-beforeEach(async () => {
-  if (existsSync(TEST_CONFIG_DIR)) {
-    await rm(TEST_CONFIG_DIR, { recursive: true })
-  }
-})
+function setup(): DiscordCredentialManager {
+  const testConfigDir = join(
+    import.meta.dir,
+    `.test-discord-config-${Date.now()}-${Math.random().toString(36).slice(2)}`
+  )
+  testDirs.push(testConfigDir)
+  return new DiscordCredentialManager(testConfigDir)
+}
 
-afterEach(async () => {
-  if (existsSync(TEST_CONFIG_DIR)) {
-    await rm(TEST_CONFIG_DIR, { recursive: true })
+afterAll(() => {
+  for (const dir of testDirs) {
+    rmSync(dir, { recursive: true, force: true })
   }
 })
 
-test('load returns default config when file does not exist', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  const config = await manager.load()
+describe('DiscordCredentialManager', () => {
+  test('load returns default config when file does not exist', async () => {
+    const manager = setup()
+    const config = await manager.load()
 
-  expect(config).toEqual({
-    token: null,
-    current_guild: null,
-    guilds: {},
+    expect(config).toEqual({
+      token: null,
+      current_guild: null,
+      guilds: {},
+    })
   })
-})
-
-test('save creates config file with correct permissions', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  const config = {
-    token: 'test-token',
-    current_guild: 'guild-123',
-    guilds: {
-      'guild-123': { guild_id: 'guild-123', guild_name: 'Test Guild' },
-    },
-  }
-
-  await manager.save(config)
-
-  const credentialsPath = join(TEST_CONFIG_DIR, 'discord-credentials.json')
-  expect(existsSync(credentialsPath)).toBe(true)
-
-  const file = Bun.file(credentialsPath)
-  const content = await file.text()
-  const loaded = JSON.parse(content)
-  expect(loaded).toEqual(config)
-})
-
-test('getToken returns null when not authenticated', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  const token = await manager.getToken()
 
-  expect(token).toBeNull()
-})
-
-test('setToken saves token to config', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  await manager.setToken('test-token-123')
-
-  const token = await manager.getToken()
-  expect(token).toBe('test-token-123')
-})
+  test('save creates config file with correct permissions', async () => {
+    const testConfigDir = join(
+      import.meta.dir,
+      `.test-discord-config-${Date.now()}-${Math.random().toString(36).slice(2)}`
+    )
+    testDirs.push(testConfigDir)
+    const manager = new DiscordCredentialManager(testConfigDir)
+    const config = {
+      token: 'test-token',
+      current_guild: 'guild-123',
+      guilds: {
+        'guild-123': { guild_id: 'guild-123', guild_name: 'Test Guild' },
+      },
+    }
+
+    await manager.save(config)
+
+    const credentialsPath = join(testConfigDir, 'discord-credentials.json')
+    expect(existsSync(credentialsPath)).toBe(true)
+
+    const file = Bun.file(credentialsPath)
+    const content = await file.text()
+    const loaded = JSON.parse(content)
+    expect(loaded).toEqual(config)
+  })
 
-test('getToken returns previously set token', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  await manager.setToken('my-token')
+  test('getToken returns null when not authenticated', async () => {
+    const manager = setup()
+    const token = await manager.getToken()
+    expect(token).toBeNull()
+  })
 
-  const token = await manager.getToken()
-  expect(token).toBe('my-token')
-})
+  test('setToken saves token to config', async () => {
+    const manager = setup()
+    await manager.setToken('test-token-123')
 
-test('clearToken removes token from config', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  await manager.setToken('test-token')
-  await manager.clearToken()
+    const token = await manager.getToken()
+    expect(token).toBe('test-token-123')
+  })
 
-  const token = await manager.getToken()
-  expect(token).toBeNull()
-})
+  test('getToken returns previously set token', async () => {
+    const manager = setup()
+    await manager.setToken('my-token')
 
-test('getCurrentGuild returns null when not set', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  const guild = await manager.getCurrentGuild()
+    const token = await manager.getToken()
+    expect(token).toBe('my-token')
+  })
 
-  expect(guild).toBeNull()
-})
+  test('clearToken removes token from config', async () => {
+    const manager = setup()
+    await manager.setToken('test-token')
+    await manager.clearToken()
 
-test('setCurrentGuild saves guild id', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  await manager.setCurrentGuild('guild-456')
+    const token = await manager.getToken()
+    expect(token).toBeNull()
+  })
 
-  const guild = await manager.getCurrentGuild()
-  expect(guild).toBe('guild-456')
-})
+  test('getCurrentGuild returns null when not set', async () => {
+    const manager = setup()
+    const guild = await manager.getCurrentGuild()
+    expect(guild).toBeNull()
+  })
 
-test('getGuilds returns empty object when no guilds set', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  const guilds = await manager.getGuilds()
+  test('setCurrentGuild saves guild id', async () => {
+    const manager = setup()
+    await manager.setCurrentGuild('guild-456')
 
-  expect(guilds).toEqual({})
-})
+    const guild = await manager.getCurrentGuild()
+    expect(guild).toBe('guild-456')
+  })
 
-test('setGuilds saves guilds to config', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  const guilds = {
-    'guild-1': { guild_id: 'guild-1', guild_name: 'Guild One' },
-    'guild-2': { guild_id: 'guild-2', guild_name: 'Guild Two' },
-  }
+  test('getGuilds returns empty object when no guilds set', async () => {
+    const manager = setup()
+    const guilds = await manager.getGuilds()
+    expect(guilds).toEqual({})
+  })
 
-  await manager.setGuilds(guilds)
+  test('setGuilds saves guilds to config', async () => {
+    const manager = setup()
+    const guilds = {
+      'guild-1': { guild_id: 'guild-1', guild_name: 'Guild One' },
+      'guild-2': { guild_id: 'guild-2', guild_name: 'Guild Two' },
+    }
 
-  const loaded = await manager.getGuilds()
-  expect(loaded).toEqual(guilds)
-})
+    await manager.setGuilds(guilds)
 
-test('getCredentials returns null when not authenticated', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  const creds = await manager.getCredentials()
+    const loaded = await manager.getGuilds()
+    expect(loaded).toEqual(guilds)
+  })
 
-  expect(creds).toBeNull()
-})
+  test('getCredentials returns null when not authenticated', async () => {
+    const manager = setup()
+    const creds = await manager.getCredentials()
+    expect(creds).toBeNull()
+  })
 
-test('getCredentials returns null when token exists but no guild selected', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  await manager.setToken('test-token')
+  test('getCredentials returns null when token exists but no guild selected', async () => {
+    const manager = setup()
+    await manager.setToken('test-token')
 
-  const creds = await manager.getCredentials()
-  expect(creds).toBeNull()
-})
+    const creds = await manager.getCredentials()
+    expect(creds).toBeNull()
+  })
 
-test('getCredentials returns null when guild selected but no token', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  await manager.setCurrentGuild('guild-123')
+  test('getCredentials returns null when guild selected but no token', async () => {
+    const manager = setup()
+    await manager.setCurrentGuild('guild-123')
 
-  const creds = await manager.getCredentials()
-  expect(creds).toBeNull()
-})
+    const creds = await manager.getCredentials()
+    expect(creds).toBeNull()
+  })
 
-test('getCredentials returns token and guildId when both are set', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
-  await manager.setToken('test-token-xyz')
-  await manager.setCurrentGuild('guild-789')
+  test('getCredentials returns token and guildId when both are set', async () => {
+    const manager = setup()
+    await manager.setToken('test-token-xyz')
+    await manager.setCurrentGuild('guild-789')
 
-  const creds = await manager.getCredentials()
-  expect(creds).toEqual({
-    token: 'test-token-xyz',
-    guildId: 'guild-789',
+    const creds = await manager.getCredentials()
+    expect(creds).toEqual({
+      token: 'test-token-xyz',
+      guildId: 'guild-789',
+    })
   })
-})
 
-test('multiple operations preserve existing data', async () => {
-  const manager = new DiscordCredentialManager(TEST_CONFIG_DIR)
+  test('multiple operations preserve existing data', async () => {
+    const manager = setup()
+    await manager.setToken('token-1')
+    await manager.setCurrentGuild('guild-1')
+    const guilds = {
+      'guild-1': { guild_id: 'guild-1', guild_name: 'Guild One' },
+    }
+    await manager.setGuilds(guilds)
 
-  // Set initial data
-  await manager.setToken('token-1')
-  await manager.setCurrentGuild('guild-1')
-  const guilds = {
-    'guild-1': { guild_id: 'guild-1', guild_name: 'Guild One' },
-  }
-  await manager.setGuilds(guilds)
+    await manager.setToken('token-2')
 
-  // Update token
-  await manager.setToken('token-2')
-
-  // Verify all data is preserved
-  expect(await manager.getToken()).toBe('token-2')
-  expect(await manager.getCurrentGuild()).toBe('guild-1')
-  expect(await manager.getGuilds()).toEqual(guilds)
+    expect(await manager.getToken()).toBe('token-2')
+    expect(await manager.getCurrentGuild()).toBe('guild-1')
+    expect(await manager.getGuilds()).toEqual(guilds)
+  })
 })

package/src/platforms/discord/credential-manager.ts

@@ -1,5 +1,5 @@
 import { existsSync } from 'node:fs'
-import { mkdir } from 'node:fs/promises'
+import { chmod, mkdir, readFile, writeFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 
@@ -27,21 +27,24 @@ export class DiscordCredentialManager {
       }
     }
 
-    const file = Bun.file(this.credentialsPath)
-    const content = await file.text()
+    const content = await readFile(this.credentialsPath, 'utf-8')
     return JSON.parse(content) as DiscordConfig
   }
 
   async save(config: DiscordConfig): Promise<void> {
     await mkdir(this.configDir, { recursive: true })
 
-    const file = Bun.file(this.credentialsPath)
-    await Bun.write(file, JSON.stringify(config, null, 2))
-
-    await Bun.spawn(['chmod', '0600', this.credentialsPath]).exited
+    await writeFile(this.credentialsPath, JSON.stringify(config, null, 2))
+    await chmod(this.credentialsPath, 0o600)
   }
 
   async getToken(): Promise<string | null> {
+    // Check env var first (takes precedence over file-based credentials)
+    const envToken = process.env.E2E_DISCORD_TOKEN
+    if (envToken) {
+      return envToken
+    }
+
     const config = await this.load()
     return config.token
   }
@@ -59,6 +62,12 @@ export class DiscordCredentialManager {
   }
 
   async getCurrentGuild(): Promise<string | null> {
+    // Check env var first (takes precedence over file-based credentials)
+    const envGuildId = process.env.E2E_DISCORD_GUILD_ID
+    if (envGuildId) {
+      return envGuildId
+    }
+
     const config = await this.load()
     return config.current_guild
   }
@@ -81,15 +90,13 @@ export class DiscordCredentialManager {
   }
 
   async getCredentials(): Promise<{ token: string; guildId: string } | null> {
-    const config = await this.load()
+    const token = await this.getToken()
+    const guildId = await this.getCurrentGuild()
 
-    if (!config.token || !config.current_guild) {
+    if (!token || !guildId) {
       return null
     }
 
-    return {
-      token: config.token,
-      guildId: config.current_guild,
-    }
+    return { token, guildId }
   }
 }