agent-messenger 2.5.0 → 2.6.0

package/src/platforms/kakaotalk/listener.ts

@@ -72,7 +72,7 @@ export class KakaoTalkListener {
     if (!this.running) return
 
     try {
-      const { oauthToken, userId, deviceUuid } = this.client.getCredentials()
+      const { oauthToken, userId, deviceUuid, deviceType } = this.client.getCredentials()
       if (!this.running) return
 
       this.userId = userId
@@ -88,7 +88,7 @@ export class KakaoTalkListener {
         }
       })
 
-      await session.login(oauthToken, userId, deviceUuid)
+      await session.login(oauthToken, userId, deviceUuid, undefined, deviceType)
 
       if (!this.running) {
         session.close()

package/src/platforms/kakaotalk/protocol/config.ts

@@ -1,6 +1,8 @@
 // Protocol constants for KakaoTalk LOCO.
 // See protocol/NOTICE.md for attribution of protocol knowledge.
 
+import type { KakaoDeviceType } from '../types'
+
 // LOCO RSA public key (PKCS#1 DER, base64). RSA-2048, e=3.
 // Source: openkakao (MIT) — extracted from KakaoTalk macOS binary.
 export const LOCO_RSA_PUBLIC_KEY_DER_B64 =
@@ -17,8 +19,17 @@ export const BOOKING_PORT = 443
 export const CHECKIN_HOST = 'ticket-loco.kakao.com'
 export const CHECKIN_PORT = 995
 
-export const APP_VERSION = '26.2.0'
-export const OS = 'mac'
+// PC slot identity — platform-aware: 'win' on Windows, 'mac' on macOS
+const PC_APP_VERSION = '26.2.0'
+const PC_OS: string = process.platform === 'win32' ? 'win' : 'mac'
+export const PC_OS_NAME: string = process.platform === 'win32' ? 'Windows' : 'macOS'
+
+// Android (tablet slot) identity — must match the Android sub-device agent
+// used in auth/kakao-login.ts so the server sees a consistent tablet session.
+const ANDROID_APP_VERSION = '25.9.2'
+const ANDROID_OS = 'android'
+
+// dtype: 2 = sub-device, 1 = main device (ref: node-kakao config.ts)
 export const DTYPE = 2
 export const MCCMNC = '99999'
 export const LANG = 'ko'
@@ -26,3 +37,16 @@ export const COUNTRY_ISO = 'KR'
 export const PROTOCOL_VERSION = '1'
 
 export const PING_INTERVAL_MS = 300_000
+
+export interface LocoDeviceConfig {
+  os: string
+  appVersion: string
+  useSub: boolean
+}
+
+export function getLocoDeviceConfig(deviceType: KakaoDeviceType): LocoDeviceConfig {
+  if (deviceType === 'tablet') {
+    return { os: ANDROID_OS, appVersion: ANDROID_APP_VERSION, useSub: true }
+  }
+  return { os: PC_OS, appVersion: PC_APP_VERSION, useSub: false }
+}

package/src/platforms/kakaotalk/protocol/session.ts

@@ -1,7 +1,8 @@
 import { Binary, Long } from 'bson'
 
+import type { KakaoDeviceType } from '../types'
+
 import {
-  APP_VERSION,
   BOOKING_HOST,
   BOOKING_PORT,
   CHECKIN_HOST,
@@ -12,6 +13,7 @@ import {
   MCCMNC,
   PING_INTERVAL_MS,
   PROTOCOL_VERSION,
+  getLocoDeviceConfig,
 } from './config'
 import { LocoConnection } from './connection'
 import type { BookingResponse, CheckinResponse, LoginListResponse, LocoPacket, SyncState } from './types'
@@ -21,9 +23,13 @@ export class LocoSession {
   private pingTimer: ReturnType<typeof setInterval> | null = null
   private pushHandler: ((packet: LocoPacket) => void) | null = null
   private closeHandler: (() => void) | null = null
+  private deviceType: KakaoDeviceType = 'tablet'
+
+  async login(oauthToken: string, userId: string, deviceUuid: string, syncState?: SyncState, deviceType?: KakaoDeviceType): Promise<LoginListResponse> {
+    this.deviceType = deviceType ?? 'tablet'
+    const deviceConfig = getLocoDeviceConfig(this.deviceType)
 
-  async login(oauthToken: string, userId: string, deviceUuid: string, syncState?: SyncState): Promise<LoginListResponse> {
-    const { host, port } = await this.bookAndCheckin(userId)
+    const { host, port } = await this.bookAndCheckin(userId, deviceConfig)
 
     this.connection = new LocoConnection()
     await this.connection.connectSecure(host, port)
@@ -43,9 +49,9 @@ export class LocoSession {
     const lbk = syncState?.lbk ?? 0
 
     const response = await this.connection.sendPacket('LOGINLIST', {
-      appVer: APP_VERSION,
+      appVer: deviceConfig.appVersion,
       prtVer: PROTOCOL_VERSION,
-      os: 'mac',
+      os: deviceConfig.os,
       lang: LANG,
       dtype: DTYPE,
       duuid: deviceUuid,
@@ -65,12 +71,12 @@ export class LocoSession {
     return response.body as unknown as LoginListResponse
   }
 
-  private async bookAndCheckin(userId: string): Promise<{ host: string; port: number }> {
+  private async bookAndCheckin(userId: string, deviceConfig: { os: string; appVersion: string; useSub: boolean }): Promise<{ host: string; port: number }> {
     const bookingConn = new LocoConnection()
     await bookingConn.connectTls(BOOKING_HOST, BOOKING_PORT)
 
     const bookingResponse = await bookingConn.sendPacket('GETCONF', {
-      os: 'mac',
+      os: deviceConfig.os,
       model: '',
     })
     bookingConn.close()
@@ -86,13 +92,13 @@ export class LocoSession {
 
     const checkinResponse = await checkinConn.sendPacket('CHECKIN', {
       userId: Number(userId),
-      os: 'mac',
+      os: deviceConfig.os,
       ntype: 0,
-      appVer: APP_VERSION,
+      appVer: deviceConfig.appVersion,
       MCCMNC: MCCMNC,
       lang: LANG,
       countryISO: COUNTRY_ISO,
-      useSub: true,
+      useSub: deviceConfig.useSub,
     })
     checkinConn.close()
 

package/src/platforms/kakaotalk/types.ts

@@ -11,6 +11,8 @@ export interface ExtractedKakaoToken {
   login_form_body?: string
 }
 
+export type KakaoAuthMethod = 'login' | 'extract'
+
 export interface KakaoAccountCredentials {
   account_id: string
   oauth_token: string
@@ -18,6 +20,7 @@ export interface KakaoAccountCredentials {
   refresh_token?: string
   device_uuid: string
   device_type: KakaoDeviceType
+  auth_method?: KakaoAuthMethod
   created_at: string
   updated_at: string
 }
@@ -162,6 +165,7 @@ export const KakaoAccountCredentialsSchema = z.object({
   refresh_token: z.string().optional(),
   device_uuid: z.string(),
   device_type: z.enum(['pc', 'tablet']),
+  auth_method: z.enum(['login', 'extract']).optional(),
   created_at: z.string(),
   updated_at: z.string(),
 })

package/src/tui/adapters/kakaotalk-adapter.ts

@@ -64,7 +64,7 @@ export class KakaoTalkAdapter implements PlatformAdapter {
     if (!creds) throw new Error(`Account ${accountId} not found`)
 
     const client = new KakaoTalkClient()
-    await client.login({ oauthToken: creds.oauth_token, userId: creds.user_id, deviceUuid: creds.device_uuid })
+    await client.login({ oauthToken: creds.oauth_token, userId: creds.user_id, deviceUuid: creds.device_uuid, deviceType: creds.device_type })
     this.client = client
     this.currentAccount = { id: creds.account_id, name: creds.account_id }
   }
@@ -86,7 +86,8 @@ export class KakaoTalkAdapter implements PlatformAdapter {
 
     const existing = await this.credManager.getAccount()
     const pendingState = await this.credManager.loadPendingLogin()
-    const savedDeviceUuid = pendingState?.device_uuid ?? existing?.device_uuid ?? generateDeviceUuid()
+    const existingUuid = existing?.auth_method === 'login' ? existing?.device_uuid : undefined
+    const savedDeviceUuid = pendingState?.device_uuid ?? existingUuid ?? generateDeviceUuid()
 
     let email: string | undefined
     let password: string | undefined
@@ -139,6 +140,7 @@ export class KakaoTalkAdapter implements PlatformAdapter {
       refresh_token: result.credentials.refresh_token,
       device_uuid: result.credentials.device_uuid,
       device_type: result.credentials.device_type,
+      auth_method: 'login',
       created_at: now,
       updated_at: now,
     })
@@ -149,6 +151,7 @@ export class KakaoTalkAdapter implements PlatformAdapter {
       oauthToken: result.credentials.access_token,
       userId: result.credentials.user_id,
       deviceUuid: result.credentials.device_uuid,
+      deviceType: result.credentials.device_type,
     })
     this.client = client
     this.currentAccount = { id: result.credentials.user_id, name: email }