opensoma 0.5.1 → 0.7.0

package/src/commands/toz.ts

@@ -0,0 +1,607 @@
+import { stdin as input, stdout as output } from 'node:process'
+import { createInterface } from 'node:readline/promises'
+
+import { Command } from 'commander'
+
+import { TOZ_BRANCHES } from '../constants'
+import { CredentialManager } from '../credential-manager'
+import { handleError } from '../shared/utils/error-handler'
+import { formatOutput } from '../shared/utils/output'
+import * as stderr from '../shared/utils/stderr'
+import { formatPhone, parsePhone } from '../shared/utils/toz'
+import { TozClient } from '../toz-client'
+import type { TozPendingReservation } from '../toz-pending-store'
+import { TozPendingStore } from '../toz-pending-store'
+
+type LoginOpts = { name: string; phone: string; pretty?: boolean }
+type StatusOpts = { pretty?: boolean }
+type BranchesOpts = { pretty?: boolean }
+type MeetingsOpts = { pretty?: boolean }
+type AvailableOpts = {
+  date: string
+  start: string
+  duration: string
+  userCount: string
+  branch?: string[]
+  pretty?: boolean
+}
+type CheckOpts = {
+  date: string
+  time: string[]
+  duration: string
+  userCount: string
+  branch?: string[]
+  pretty?: boolean
+}
+type ReserveRequestOpts = {
+  date: string
+  start: string
+  duration: string
+  userCount: string
+  boothId: string
+  meetingId?: string
+  newMeeting?: string
+  email: string
+  memo?: string
+  name?: string
+  phone?: string
+  pretty?: boolean
+}
+type ReserveConfirmOpts = { pin?: string; pretty?: boolean }
+type ReserveOpts = ReserveRequestOpts & { pin?: string }
+type ListOpts = {
+  start?: string
+  end?: string
+  meeting?: string
+  name?: string
+  phone?: string
+  pretty?: boolean
+}
+type CancelOpts = { name?: string; phone?: string; pretty?: boolean }
+type LogoutOpts = { pretty?: boolean }
+type TozIdentityStore = Pick<CredentialManager, 'getTozIdentity'>
+type TozIdentityPrompt = () => Promise<string>
+type TozPinPrompt = () => Promise<string>
+
+function parseStrictPositiveInt(value: string, flag: string): number {
+  if (!/^\d+$/.test(value)) throw new Error(`Invalid --${flag}: ${value} (expected positive integer)`)
+  const n = Number.parseInt(value, 10)
+  if (!Number.isSafeInteger(n) || n <= 0) throw new Error(`Invalid --${flag}: ${value} (expected positive integer)`)
+  return n
+}
+
+function parseDurationFlag(value: string): number {
+  const match = /^(\d+)\s*([hm])?$/i.exec(value.trim())
+  if (!match) throw new Error(`Invalid --duration: ${value} (use e.g. "2h", "120", "150m")`)
+  const n = Number.parseInt(match[1], 10)
+  const unit = (match[2] ?? 'm').toLowerCase()
+  return unit === 'h' ? n * 60 : n
+}
+
+function parseUserCount(value: string): number {
+  const n = Number.parseInt(value, 10)
+  if (!Number.isFinite(n) || n <= 0) throw new Error(`Invalid --user-count: ${value}`)
+  return n
+}
+
+function resolveBranchIds(values: readonly string[] | undefined): number[] {
+  if (!values || values.length === 0) return TOZ_BRANCHES.map((b) => b.id)
+  const ids: number[] = []
+  for (const value of values) {
+    const numeric = Number.parseInt(value, 10)
+    if (Number.isFinite(numeric)) {
+      ids.push(numeric)
+      continue
+    }
+    const matched = TOZ_BRANCHES.find((b) => b.name === value || b.name.includes(value))
+    if (!matched) throw new Error(`Unknown branch: ${value}`)
+    ids.push(matched.id)
+  }
+  return ids
+}
+
+export async function resolveTozIdentity(
+  flagName: string | undefined,
+  flagPhone: string | undefined,
+  options: { promptPhone?: TozIdentityPrompt; store?: TozIdentityStore } = {},
+): Promise<{ name: string; phone: string }> {
+  if (flagName && flagPhone) return { name: flagName, phone: flagPhone }
+  const store = options.store ?? new CredentialManager()
+  const stored = await store.getTozIdentity()
+  const name = flagName ?? stored?.name
+  let phone = flagPhone ?? stored?.phone
+  if (!name) {
+    throw new Error('Toz identity not set. Run: opensoma toz login --name <name> --phone <phone>')
+  }
+  if (!phone) {
+    if (!options.promptPhone) {
+      throw new Error('Toz identity not set. Run: opensoma toz login --name <name> --phone <phone>')
+    }
+    phone = await options.promptPhone()
+  }
+  return { name, phone }
+}
+
+export async function resolveTozPin(pin: string | undefined, promptPin: TozPinPrompt): Promise<string> {
+  return pin ?? (await promptPin())
+}
+
+async function loginAction(options: LoginOpts): Promise<void> {
+  try {
+    const manager = new CredentialManager()
+    await manager.setTozIdentity(options.name, options.phone)
+    console.log(
+      formatOutput(
+        { ok: true, message: `Toz identity saved for ${options.name} (${maskPhone(options.phone)})` },
+        options.pretty,
+      ),
+    )
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function logoutAction(options: LogoutOpts): Promise<void> {
+  try {
+    await new CredentialManager().clearTozIdentity()
+    await new TozPendingStore().clear()
+    console.log(formatOutput({ ok: true }, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function statusAction(options: StatusOpts): Promise<void> {
+  try {
+    const stored = await new CredentialManager().getTozIdentity()
+    if (!stored) {
+      console.log(formatOutput({ loggedIn: false }, options.pretty))
+      return
+    }
+    console.log(formatOutput({ loggedIn: true, name: stored.name, phone: maskPhone(stored.phone) }, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function branchesAction(options: BranchesOpts): Promise<void> {
+  try {
+    const branches = await new TozClient().branches()
+    console.log(formatOutput(branches, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function meetingsAction(options: MeetingsOpts): Promise<void> {
+  try {
+    const meetings = await new TozClient().meetings()
+    console.log(formatOutput(meetings, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function availableAction(options: AvailableOpts): Promise<void> {
+  try {
+    const booths = await new TozClient().available({
+      date: options.date,
+      startTime: options.start,
+      durationMinutes: parseDurationFlag(options.duration),
+      userCount: parseUserCount(options.userCount),
+      branchIds: resolveBranchIds(options.branch),
+    })
+    console.log(formatOutput(booths, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function checkAction(options: CheckOpts): Promise<void> {
+  try {
+    const startedAt = Date.now()
+    const checked = await new TozClient().check({
+      date: options.date,
+      startTimes: options.time,
+      durationMinutes: parseDurationFlag(options.duration),
+      userCount: parseUserCount(options.userCount),
+      branchIds: resolveBranchIds(options.branch),
+    })
+    console.log(
+      formatOutput(
+        {
+          date: options.date,
+          durationMinutes: parseDurationFlag(options.duration),
+          userCount: parseUserCount(options.userCount),
+          checked,
+          requestsIssued: options.time.length,
+          wallTimeMs: Date.now() - startedAt,
+        },
+        options.pretty,
+      ),
+    )
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function reserveRequestAction(options: ReserveRequestOpts): Promise<void> {
+  try {
+    const identity = await resolveTozIdentity(options.name, options.phone, { promptPhone })
+    const durationMinutes = parseDurationFlag(options.duration)
+    const userCount = parseUserCount(options.userCount)
+    const boothId = parseStrictPositiveInt(options.boothId, 'booth-id')
+    const meetingId = options.meetingId ? parseStrictPositiveInt(options.meetingId, 'meeting-id') : undefined
+    if (!meetingId && !options.newMeeting) throw new Error('--meeting-id or --new-meeting is required')
+
+    const client = new TozClient()
+    const reserved = await client.reserveBooth({
+      date: options.date,
+      startTime: options.start,
+      durationMinutes,
+      userCount,
+      boothId,
+    })
+    await client.skipEquipment({
+      reservationId: reserved.reservationId,
+      date: options.date,
+      startTime: options.start,
+      durationMinutes,
+    })
+    await client.sendOtp(identity.phone)
+
+    const endTime = computeEndTime(options.start, durationMinutes)
+    const now = new Date()
+    const pending: TozPendingReservation = {
+      reservationId: reserved.reservationId,
+      cookies: client.http.getCookies(),
+      branchName: reserved.branchName,
+      branchTel: reserved.branchTel,
+      boothGroupName: reserved.boothGroupName,
+      isLargeBooth: reserved.isLargeBooth,
+      date: options.date,
+      startTime: options.start,
+      endTime,
+      durationMinutes,
+      userCount,
+      boothId,
+      meetingId,
+      newMeetingName: options.newMeeting,
+      email: options.email,
+      memo: options.memo,
+      name: identity.name,
+      phone: identity.phone,
+      createdAt: now.toISOString(),
+      expiresAt: new Date(now.getTime() + 5 * 60 * 1000).toISOString(),
+    }
+    await new TozPendingStore().set(pending)
+
+    console.log(
+      formatOutput(
+        {
+          ok: true,
+          reservationId: reserved.reservationId,
+          branchName: reserved.branchName,
+          boothGroupName: reserved.boothGroupName,
+          date: options.date,
+          startTime: options.start,
+          endTime,
+          expiresAt: pending.expiresAt,
+          message: `SMS sent to ${maskPhone(identity.phone)}. Run: opensoma toz reserve-confirm --pin <pin>`,
+        },
+        options.pretty,
+      ),
+    )
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function reserveConfirmAction(options: ReserveConfirmOpts): Promise<void> {
+  try {
+    const store = new TozPendingStore()
+    const pending = await store.get()
+    if (!pending) {
+      throw new Error('No pending toz reservation. Run: opensoma toz reserve-request first.')
+    }
+    if (Date.now() > new Date(pending.expiresAt).getTime()) {
+      await store.clear()
+      throw new Error(
+        'Pending toz reservation expired (5-minute hold lapsed). Run: opensoma toz reserve-request again.',
+      )
+    }
+
+    const pin = await resolveTozPin(options.pin, promptPin)
+    const client = new TozClient({ cookies: pending.cookies })
+    const result = await client.confirm({
+      reservationId: pending.reservationId,
+      date: pending.date,
+      startTime: pending.startTime,
+      durationMinutes: pending.durationMinutes,
+      name: pending.name,
+      phone: pending.phone,
+      email: pending.email,
+      pinNum: pin,
+      meetingId: pending.meetingId,
+      newMeetingName: pending.newMeetingName,
+      memo: pending.memo,
+    })
+
+    await store.clear()
+    console.log(
+      formatOutput(
+        {
+          ok: true,
+          reservationId: pending.reservationId,
+          branchName: pending.branchName,
+          boothGroupName: pending.boothGroupName,
+          date: pending.date,
+          startTime: pending.startTime,
+          endTime: pending.endTime,
+          message: result.resultMsg,
+        },
+        options.pretty,
+      ),
+    )
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function reserveAction(options: ReserveOpts): Promise<void> {
+  try {
+    const identity = await resolveTozIdentity(options.name, options.phone, { promptPhone })
+    const durationMinutes = parseDurationFlag(options.duration)
+    const userCount = parseUserCount(options.userCount)
+    const boothId = parseStrictPositiveInt(options.boothId, 'booth-id')
+    const meetingId = options.meetingId ? parseStrictPositiveInt(options.meetingId, 'meeting-id') : undefined
+    if (!meetingId && !options.newMeeting) throw new Error('--meeting-id or --new-meeting is required')
+
+    const client = new TozClient()
+    stderr.info(`[1/4] Reserving booth ${boothId}...`)
+    const reserved = await client.reserveBooth({
+      date: options.date,
+      startTime: options.start,
+      durationMinutes,
+      userCount,
+      boothId,
+    })
+    stderr.info(`      ok (reservationId=${reserved.reservationId}, ${reserved.branchName} ${reserved.boothGroupName})`)
+
+    stderr.info('[2/4] Skipping equipment...')
+    await client.skipEquipment({
+      reservationId: reserved.reservationId,
+      date: options.date,
+      startTime: options.start,
+      durationMinutes,
+    })
+    stderr.info('      ok')
+
+    stderr.info(`[3/4] Sending SMS to ${maskPhone(identity.phone)}...`)
+    await client.sendOtp(identity.phone)
+    stderr.info('      ok')
+
+    const pin = options.pin ?? (await promptPin())
+    stderr.info('[4/4] Confirming reservation...')
+    const result = await client.confirm({
+      reservationId: reserved.reservationId,
+      date: options.date,
+      startTime: options.start,
+      durationMinutes,
+      name: identity.name,
+      phone: identity.phone,
+      email: options.email,
+      pinNum: pin,
+      meetingId,
+      newMeetingName: options.newMeeting,
+      memo: options.memo,
+    })
+    stderr.info('      ok')
+
+    console.log(
+      formatOutput(
+        {
+          ok: true,
+          reservationId: reserved.reservationId,
+          branchName: reserved.branchName,
+          boothGroupName: reserved.boothGroupName,
+          date: options.date,
+          startTime: options.start,
+          endTime: computeEndTime(options.start, durationMinutes),
+          message: result.resultMsg,
+        },
+        options.pretty,
+      ),
+    )
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function listAction(options: ListOpts): Promise<void> {
+  try {
+    const identity = await resolveTozIdentity(options.name, options.phone)
+    const reservations = await new TozClient().myReservations({
+      name: identity.name,
+      phone: identity.phone,
+      startDate: options.start,
+      endDate: options.end,
+      meetingName: options.meeting,
+    })
+    console.log(formatOutput(reservations, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+async function cancelAction(reservationId: string, options: CancelOpts): Promise<void> {
+  try {
+    const id = parseStrictPositiveInt(reservationId, 'reservationId')
+    const identity = await resolveTozIdentity(options.name, options.phone)
+    await new TozClient().cancel({ reservationId: id, name: identity.name, phone: identity.phone })
+    console.log(formatOutput({ ok: true, message: '취소되었습니다.' }, options.pretty))
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+function maskPhone(phone: string): string {
+  return phone.replace(
+    /^(\d{3})-?(\d{3,4})-?(\d{4})$/,
+    (_, a: string, _b: string, c: string) => `${a}-${'*'.repeat(_b.length)}-${c}`,
+  )
+}
+
+function computeEndTime(start: string, durationMinutes: number): string {
+  const [h, m] = start.split(':').map((s) => Number.parseInt(s, 10))
+  const total = h * 60 + m + durationMinutes
+  const eh = Math.floor(total / 60) % 24
+  const em = total % 60
+  return `${String(eh).padStart(2, '0')}:${String(em).padStart(2, '0')}`
+}
+
+async function promptPin(): Promise<string> {
+  const rl = createInterface({ input, output })
+  try {
+    const answer = await rl.question('Enter 6-digit PIN from SMS: ')
+    return answer.trim()
+  } finally {
+    rl.close()
+  }
+}
+
+async function promptPhone(): Promise<string> {
+  const rl = createInterface({ input, output })
+  try {
+    while (true) {
+      const answer = await rl.question('Phone number (e.g. 010-1234-5678): ')
+      const phone = answer.trim()
+      try {
+        return formatPhone(parsePhone(phone))
+      } catch (error) {
+        stderr.warn(error instanceof Error ? error.message : String(error))
+      }
+    }
+  } finally {
+    rl.close()
+  }
+}
+
+export const tozCommand = new Command('toz')
+  .description('Manage TOZ external meeting room reservations (SW마에스트로 partnership)')
+  .addCommand(
+    new Command('login')
+      .description('Save TOZ identity (name + phone) to credentials')
+      .requiredOption('--name <name>', 'Reservation holder name')
+      .requiredOption('--phone <phone>', 'Phone number, e.g. 010-1234-5678')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(loginAction),
+  )
+  .addCommand(
+    new Command('logout')
+      .description('Clear stored TOZ identity and pending reservation state')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(logoutAction),
+  )
+  .addCommand(
+    new Command('status')
+      .description('Show stored TOZ identity')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(statusAction),
+  )
+  .addCommand(
+    new Command('branches')
+      .description('List partner branches (live from booking.htm)')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(branchesAction),
+  )
+  .addCommand(
+    new Command('meetings')
+      .description('List active SW마에스트로 meetings (live from booking.htm)')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(meetingsAction),
+  )
+  .addCommand(
+    new Command('available')
+      .description('Show available booths for one date+time+duration')
+      .requiredOption('--date <date>', 'YYYY-MM-DD')
+      .requiredOption('--start <time>', 'HH:MM')
+      .requiredOption('--duration <duration>', 'e.g. 2h, 150m, 120 (default minutes)')
+      .requiredOption('--user-count <n>', 'Number of attendees')
+      .option('--branch <id-or-name...>', 'Branch IDs or names (default: all 9)')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(availableAction),
+  )
+  .addCommand(
+    new Command('check')
+      .description('Check booth availability for multiple times (max 6, serial)')
+      .requiredOption('--date <date>', 'YYYY-MM-DD')
+      .requiredOption('--time <time...>', 'HH:MM (repeatable, max 6)')
+      .requiredOption('--duration <duration>', 'e.g. 2h')
+      .requiredOption('--user-count <n>', 'Number of attendees')
+      .option('--branch <id-or-name...>', 'Branch IDs or names')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(checkAction),
+  )
+  .addCommand(
+    new Command('reserve-request')
+      .description('Step 1 of non-interactive reservation: hold booth + send SMS')
+      .requiredOption('--date <date>', 'YYYY-MM-DD')
+      .requiredOption('--start <time>', 'HH:MM')
+      .requiredOption('--duration <duration>', 'e.g. 2h')
+      .requiredOption('--user-count <n>', 'Number of attendees')
+      .requiredOption('--booth-id <id>', 'Booth ID from `toz available`')
+      .option('--meeting-id <id>', 'Meeting ID from `toz meetings`')
+      .option('--new-meeting <name>', 'Create a new meeting with this name')
+      .requiredOption('--email <email>', 'Contact email')
+      .option('--memo <text>', 'Reservation memo')
+      .option('--name <name>', 'Override stored name')
+      .option('--phone <phone>', 'Override stored phone')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(reserveRequestAction),
+  )
+  .addCommand(
+    new Command('reserve-confirm')
+      .description('Step 2 of non-interactive reservation: finalize with PIN')
+      .option('--pin <pin>', '6-digit PIN from SMS (prompts if omitted)')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(reserveConfirmAction),
+  )
+  .addCommand(
+    new Command('reserve')
+      .description('Interactive single-process reservation (prompts for PIN)')
+      .requiredOption('--date <date>', 'YYYY-MM-DD')
+      .requiredOption('--start <time>', 'HH:MM')
+      .requiredOption('--duration <duration>', 'e.g. 2h')
+      .requiredOption('--user-count <n>', 'Number of attendees')
+      .requiredOption('--booth-id <id>', 'Booth ID')
+      .option('--meeting-id <id>', 'Meeting ID')
+      .option('--new-meeting <name>', 'Create new meeting with this name')
+      .requiredOption('--email <email>', 'Contact email')
+      .option('--memo <text>', 'Reservation memo')
+      .option('--name <name>', 'Override stored name')
+      .option('--phone <phone>', 'Override stored phone')
+      .option('--pin <pin>', 'PIN if already received (skip prompt)')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(reserveAction),
+  )
+  .addCommand(
+    new Command('list')
+      .description('List my TOZ reservations')
+      .option('--start <date>', 'YYYY-MM-DD')
+      .option('--end <date>', 'YYYY-MM-DD')
+      .option('--meeting <name>', 'Filter by meeting name')
+      .option('--name <name>', 'Override stored name')
+      .option('--phone <phone>', 'Override stored phone')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(listAction),
+  )
+  .addCommand(
+    new Command('cancel')
+      .description('Cancel a TOZ reservation')
+      .argument('<reservationId>')
+      .option('--name <name>', 'Override stored name')
+      .option('--phone <phone>', 'Override stored phone')
+      .option('--pretty', 'Pretty print JSON output')
+      .action(cancelAction),
+  )

package/src/constants.ts

@@ -5,8 +5,8 @@ export const MENU_NO = {
   DASHBOARD: '200026',
   NOTICE: '200038',
   TEAM: '200093',
+  SCHEDULE: '200043',
   MENTORING: '200046',
-  EVENT: '200045',
   APPLICATION_HISTORY: '200047',
   ROOM: '200058',
   MEMBER_INFO: '200036',
@@ -25,16 +25,20 @@ export const ROOM_IDS: Record<string, number> = {
   A8: 24,
 }
 
+// Values mirror the native <select name="place"> options verbatim, including the
+// trailing spaces on 건대/역삼/홍대 that swmaestro.ai ships in its HTML. Per the
+// mirror rule in AGENTS.md, we send the native bytes exactly, not a "cleaned up"
+// variant. If a future native release drops the spaces, update these here.
 export const VENUES = {
   TOZ_GWANGHWAMUN: '토즈-광화문점',
   TOZ_YANGJAE: '토즈-양재점',
   TOZ_GANGNAM_CONFERENCE_CENTER: '토즈-강남컨퍼런스센터점',
-  TOZ_KONKUK: '토즈-건대점',
+  TOZ_KONKUK: '토즈-건대점 ',
   TOZ_GANGNAM_TOWER: '토즈-강남역토즈타워점',
   TOZ_SEOLLEUNG: '토즈-선릉점',
-  TOZ_YEOKSAM: '토즈-역삼점',
-  TOZ_HONGDAE: '토즈-홍대점',
-  TOZ_SINCHON_BUSINESS_CENTER: '토즈-신촌비즈니스센터점',
+  TOZ_YEOKSAM: '토즈-역삼점 ',
+  TOZ_HONGDAE: '토즈-홍대점 ',
+  TOZ_SINCHON_BUSINESS_CENTER: '연수센터-7',
   ONLINE_WEBEX: '온라인(Webex)',
   SPACE_A1: '스페이스 A1',
   SPACE_A2: '스페이스 A2',
@@ -55,12 +59,20 @@ export const VENUE_ALIASES: Record<string, string> = {
   광화문점: '토즈-광화문점',
   양재점: '토즈-양재점',
   강남컨퍼런스센터점: '토즈-강남컨퍼런스센터점',
-  건대점: '토즈-건대점',
+  건대점: '토즈-건대점 ',
   강남역토즈타워점: '토즈-강남역토즈타워점',
   선릉점: '토즈-선릉점',
-  역삼점: '토즈-역삼점',
-  홍대점: '토즈-홍대점',
+  역삼점: '토즈-역삼점 ',
+  홍대점: '토즈-홍대점 ',
   신촌비즈니스센터점: '연수센터-7',
+  '토즈-광화문점': '토즈-광화문점',
+  '토즈-양재점': '토즈-양재점',
+  '토즈-강남컨퍼런스센터점': '토즈-강남컨퍼런스센터점',
+  '토즈-건대점': '토즈-건대점 ',
+  '토즈-강남역토즈타워점': '토즈-강남역토즈타워점',
+  '토즈-선릉점': '토즈-선릉점',
+  '토즈-역삼점': '토즈-역삼점 ',
+  '토즈-홍대점': '토즈-홍대점 ',
   '토즈-신촌비즈니스센터점': '연수센터-7',
 }