@eeymoo/hum 0.1.23 → 0.1.25

package/src/commands/sleep.js

@@ -1,168 +1,47 @@
-import { Command } from 'commander'
-import { request, createFormData } from '../lib/api.js'
-import { appendTimezoneOffset, buildQueryParams } from '../lib/timezone.js'
-import { outputData } from '../lib/output.js'
-
-const sleep = new Command('sleep')
-
-sleep
-  .command('add')
-  .option('--duration <value>', 'Sleep duration in hours')
-  .requiredOption('--bedtime <time>', 'Bedtime (HH:mm)')
-  .requiredOption('--waketime <time>', 'Wake time (HH:mm)')
-  .requiredOption('--quality <value>', 'Sleep quality 1-10')
-  .option('--deep-sleep <value>', 'Deep sleep duration in hours')
-  .option('--rem-sleep <value>', 'REM sleep duration in hours')
-  .option('--awakenings <value>', 'Number of awakenings')
-  .option('--feeling <value>', 'Feeling 1-10')
-  .option('--extra-data <json>', 'Extra data (JSON string)')
-  .option('--note <note>', 'Note')
-  .option('--date <date>', 'Date (YYYY-MM-DD or ISO 8601 datetime)')
-  .option('--file <paths...>', 'File paths to attach')
-  .action(async (options) => {
-    try {
-      let duration = options.duration
-      if (!duration && options.bedtime && options.waketime) {
-        const [bh, bm] = options.bedtime.split(':').map(Number)
-        const [wh, wm] = options.waketime.split(':').map(Number)
-        let diff = (wh * 60 + wm) - (bh * 60 + bm)
-        if (diff < 0) diff += 24 * 60
-        duration = (diff / 60).toFixed(1)
-      }
-      if (!duration) {
-        console.error('需要 --duration 或同时提供 --bedtime 和 --waketime')
-        process.exit(1)
-      }
-
-      const formData = createFormData({
-        duration,
-        bedTime: options.bedtime,
-        wakeTime: options.waketime,
-        quality: options.quality,
-        deepSleep: options.deepSleep,
-        remSleep: options.remSleep,
-        awakenings: options.awakenings,
-        feeling: options.feeling,
-        extraData: options.extraData,
-        note: options.note,
-        date: appendTimezoneOffset(options.date)
-      }, options.file || [])
-
-      const result = await request('/sleeps', {
-        method: 'POST',
-        body: formData,
-        isFormData: true
-      })
-
-      console.log('Sleep record added:', result.id)
-    } catch (error) {
-      console.error('Failed to add sleep record:', error.message)
-    }
-  })
-
-sleep
-  .command('list')
-  .option('--last <period>', 'Last N days/weeks/months/years')
-  .option('--start <date>', 'Start date (YYYY-MM-DD)')
-  .option('--end <date>', 'End date (YYYY-MM-DD)')
-  .option('--page <number>', 'Page number', '1')
-  .option('--limit <number>', 'Items per page', '20')
-  .option('--include-deleted', 'Include deleted records')
-  .option('--format <format>', 'Output format: json, table, toon', 'json')
-  .action(async (options) => {
-    try {
-      const { params, page } = buildQueryParams(options)
-      const result = await request(`/sleeps?${params.toString()}`)
-      outputData(result, { format: options.format, type: 'sleep-list', page })
-    } catch (error) {
-      console.error('Failed to list sleep records:', error.message)
+import { createCrudCommand } from '../lib/crud-command.js'
+
+const sleep = createCrudCommand('sleep', {
+  endpoint: '/sleeps',
+  fields: [
+    { flag: 'duration', description: 'Sleep duration in hours' },
+    { flag: 'bedtime', description: 'Bedtime (HH:mm)', formKey: 'bedTime', required: true },
+    { flag: 'waketime', description: 'Wake time (HH:mm)', formKey: 'wakeTime', required: true },
+    { flag: 'quality', description: 'Sleep quality 1-10', required: true },
+    { flag: 'deep-sleep', description: 'Deep sleep duration in hours', formKey: 'deepSleep' },
+    { flag: 'rem-sleep', description: 'REM sleep duration in hours', formKey: 'remSleep' },
+    { flag: 'awakenings', description: 'Number of awakenings' },
+    { flag: 'feeling', description: 'Feeling 1-10' },
+    { flag: 'extra-data', description: 'Extra data (JSON string)', formKey: 'extraData' },
+    { flag: 'note', description: 'Note' }
+  ],
+  fileFields: ['file'],
+  beforeAdd(opts) {
+    let duration = opts.duration
+    if (!duration && opts.bedtime && opts.waketime) {
+      const [bh, bm] = opts.bedtime.split(':').map(Number)
+      const [wh, wm] = opts.waketime.split(':').map(Number)
+      let diff = (wh * 60 + wm) - (bh * 60 + bm)
+      if (diff < 0) diff += 24 * 60
+      duration = (diff / 60).toFixed(1)
     }
-  })
-
-sleep
-  .command('stats')
-  .option('--last <period>', 'Last N days/weeks/months/years')
-  .option('--start <date>', 'Start date (YYYY-MM-DD)')
-  .option('--end <date>', 'End date (YYYY-MM-DD)')
-  .option('--format <format>', 'Output format: json, table, toon', 'json')
-  .action(async (options) => {
-    try {
-      const { params } = buildQueryParams(options)
-      const result = await request(`/sleeps/stats?${params.toString()}`)
-      outputData(result, { format: options.format, type: 'sleep-stats' })
-    } catch (error) {
-      console.error('Failed to get sleep stats:', error.message)
+    if (!duration) {
+      console.error('需要 --duration 或同时提供 --bedtime 和 --waketime')
+      process.exit(1)
     }
-  })
-
-sleep
-  .command('get')
-  .requiredOption('--id <id>', 'Sleep record ID')
-  .option('--format <format>', 'Output format: json, table, toon', 'json')
-  .action(async (options) => {
-    try {
-      const result = await request(`/sleeps/${options.id}`)
-      outputData(result, { format: options.format, type: 'sleep-get' })
-    } catch (error) {
-      console.error('Failed to get sleep record:', error.message)
-    }
-  })
-
-sleep
-  .command('update')
-  .requiredOption('--id <id>', 'Sleep record ID')
-  .option('--duration <value>', 'Updated duration')
-  .option('--bedtime <time>', 'Updated bedtime')
-  .option('--waketime <time>', 'Updated wake time')
-  .option('--quality <value>', 'Updated quality')
-  .option('--deep-sleep <value>', 'Updated deep sleep')
-  .option('--rem-sleep <value>', 'Updated REM sleep')
-  .option('--awakenings <value>', 'Updated number of awakenings')
-  .option('--feeling <value>', 'Updated feeling')
-  .option('--extra-data <json>', 'Updated extra data (JSON string)')
-  .option('--note <note>', 'Updated note')
-  .option('--date <date>', 'Updated date (YYYY-MM-DD or ISO 8601 datetime)')
-  .option('--file <paths...>', 'File paths to attach')
-  .option('--replace-attachments', 'Replace existing attachments instead of adding')
-  .action(async (options) => {
-    try {
-      const formData = createFormData({
-        duration: options.duration,
-        bedTime: options.bedtime,
-        wakeTime: options.waketime,
-        quality: options.quality,
-        deepSleep: options.deepSleep,
-        remSleep: options.remSleep,
-        awakenings: options.awakenings,
-        feeling: options.feeling,
-        extraData: options.extraData,
-        note: options.note,
-        date: appendTimezoneOffset(options.date),
-        replaceAttachments: options.replaceAttachments ? 'true' : undefined
-      }, options.file || [])
-
-      const result = await request(`/sleeps/${options.id}`, {
-        method: 'PATCH',
-        body: formData,
-        isFormData: true
-      })
-
-      console.log('Sleep record updated:', result.id)
-    } catch (error) {
-      console.error('Failed to update sleep record:', error.message)
-    }
-  })
-
-sleep
-  .command('delete')
-  .requiredOption('--id <id>', 'Sleep record ID')
-  .action(async (options) => {
-    try {
-      await request(`/sleeps/${options.id}`, { method: 'DELETE' })
-      console.log('Sleep record deleted')
-    } catch (error) {
-      console.error('Failed to delete sleep record:', error.message)
+    return {
+      duration,
+      bedTime: opts.bedtime,
+      wakeTime: opts.waketime,
+      quality: opts.quality,
+      deepSleep: opts.deepSleep,
+      remSleep: opts.remSleep,
+      awakenings: opts.awakenings,
+      feeling: opts.feeling,
+      extraData: opts.extraData,
+      note: opts.note,
+      date: opts.date
     }
-  })
+  }
+})
 
 export default sleep

package/src/commands/timeline.js

@@ -19,7 +19,7 @@ timeline
       const result = await request(`/timeline?${params.toString()}`)
       outputData(result, { format: options.format, type: 'timeline', page })
     } catch (error) {
-      console.error('Failed to get timeline:', error.message)
+      console.error('获取时间线失败:', error.message)
     }
   })
 

package/src/commands/weight.js

@@ -1,151 +1,19 @@
-import { Command } from 'commander'
-import { request, createFormData } from '../lib/api.js'
-import { appendTimezoneOffset, buildQueryParams } from '../lib/timezone.js'
-import { outputData } from '../lib/output.js'
-
-const weight = new Command('weight')
-
-weight
-  .command('add')
-  .requiredOption('--value <value>', 'Weight value (kg)')
-  .option('--body-fat <value>', 'Body fat percentage')
-  .option('--muscle-mass <value>', 'Muscle mass (kg)')
-  .option('--bmi <value>', 'BMI')
-  .option('--water <value>', 'Water percentage')
-  .option('--bone-mass <value>', 'Bone mass (kg)')
-  .option('--visceral-fat <value>', 'Visceral fat level')
-  .option('--extra-data <json>', 'Extra data (JSON string)')
-  .option('--note <note>', 'Note for the record')
-  .option('--date <date>', 'Date (YYYY-MM-DD or ISO 8601 datetime)')
-  .option('--file <paths...>', 'File paths to attach')
-  .action(async (options) => {
-    try {
-      const formData = createFormData({
-        weight: options.value,
-        bodyFat: options.bodyFat,
-        muscleMass: options.muscleMass,
-        bmi: options.bmi,
-        water: options.water,
-        boneMass: options.boneMass,
-        visceralFat: options.visceralFat,
-        extraData: options.extraData,
-        note: options.note,
-        date: appendTimezoneOffset(options.date)
-      }, options.file || [])
-
-      const result = await request('/weights', {
-        method: 'POST',
-        body: formData,
-        isFormData: true
-      })
-
-      console.log('Weight record added:', result.id)
-    } catch (error) {
-      console.error('Failed to add weight record:', error.message)
-    }
-  })
-
-weight
-  .command('list')
-  .option('--last <period>', 'Last N days/weeks/months/years (e.g., 10, 7d, 2w, 6m, 1y)')
-  .option('--start <date>', 'Start date (YYYY-MM-DD)')
-  .option('--end <date>', 'End date (YYYY-MM-DD)')
-  .option('--page <number>', 'Page number', '1')
-  .option('--limit <number>', 'Items per page', '20')
-  .option('--include-deleted', 'Include deleted records')
-  .option('--format <format>', 'Output format: json, table, toon', 'json')
-  .action(async (options) => {
-    try {
-      const { params, page } = buildQueryParams(options)
-      const result = await request(`/weights?${params.toString()}`)
-      outputData(result, { format: options.format, type: 'weight-list', page })
-    } catch (error) {
-      console.error('Failed to list weight records:', error.message)
-    }
-  })
-
-weight
-  .command('stats')
-  .option('--last <period>', 'Last N days/weeks/months/years (e.g., 10, 7d, 2w, 6m, 1y)')
-  .option('--start <date>', 'Start date (YYYY-MM-DD)')
-  .option('--end <date>', 'End date (YYYY-MM-DD)')
-  .option('--format <format>', 'Output format: json, table, toon', 'json')
-  .action(async (options) => {
-    try {
-      const { params } = buildQueryParams(options)
-      const result = await request(`/weights/stats?${params.toString()}`)
-      outputData(result, { format: options.format, type: 'weight-stats' })
-    } catch (error) {
-      console.error('Failed to get weight stats:', error.message)
-    }
-  })
-
-weight
-  .command('get')
-  .requiredOption('--id <id>', 'Weight record ID')
-  .option('--format <format>', 'Output format: json, table, toon', 'json')
-  .action(async (options) => {
-    try {
-      const result = await request(`/weights/${options.id}`)
-      outputData(result, { format: options.format, type: 'weight-get' })
-    } catch (error) {
-      console.error('Failed to get weight record:', error.message)
-    }
-  })
-
-weight
-  .command('update')
-  .requiredOption('--id <id>', 'Weight record ID')
-  .option('--value <value>', 'Updated weight value (kg)')
-  .option('--body-fat <value>', 'Updated body fat percentage')
-  .option('--muscle-mass <value>', 'Updated muscle mass (kg)')
-  .option('--bmi <value>', 'Updated BMI')
-  .option('--water <value>', 'Updated water percentage')
-  .option('--bone-mass <value>', 'Updated bone mass (kg)')
-  .option('--visceral-fat <value>', 'Updated visceral fat level')
-  .option('--extra-data <json>', 'Updated extra data (JSON string)')
-  .option('--note <note>', 'Updated note')
-  .option('--date <date>', 'Updated date (YYYY-MM-DD or ISO 8601 datetime)')
-  .option('--file <paths...>', 'File paths to attach')
-  .option('--replace-attachments', 'Replace existing attachments instead of adding')
-  .action(async (options) => {
-    try {
-      const formData = createFormData({
-        weight: options.value,
-        bodyFat: options.bodyFat,
-        muscleMass: options.muscleMass,
-        bmi: options.bmi,
-        water: options.water,
-        boneMass: options.boneMass,
-        visceralFat: options.visceralFat,
-        extraData: options.extraData,
-        note: options.note,
-        date: appendTimezoneOffset(options.date),
-        replaceAttachments: options.replaceAttachments ? 'true' : undefined
-      }, options.file || [])
-
-      const result = await request(`/weights/${options.id}`, {
-        method: 'PATCH',
-        body: formData,
-        isFormData: true
-      })
-
-      console.log('Weight record updated:', result.id)
-    } catch (error) {
-      console.error('Failed to update weight record:', error.message)
-    }
-  })
-
-weight
-  .command('delete')
-  .requiredOption('--id <id>', 'Weight record ID')
-  .action(async (options) => {
-    try {
-      await request(`/weights/${options.id}`, { method: 'DELETE' })
-      console.log('Weight record deleted')
-    } catch (error) {
-      console.error('Failed to delete weight record:', error.message)
-    }
-  })
+import { createCrudCommand } from '../lib/crud-command.js'
+
+const weight = createCrudCommand('weight', {
+  endpoint: '/weights',
+  fields: [
+    { flag: 'value', description: 'Weight value (kg)', formKey: 'weight', required: true },
+    { flag: 'body-fat', description: 'Body fat percentage', formKey: 'bodyFat' },
+    { flag: 'muscle-mass', description: 'Muscle mass (kg)', formKey: 'muscleMass' },
+    { flag: 'bmi', description: 'BMI' },
+    { flag: 'water', description: 'Water percentage' },
+    { flag: 'bone-mass', description: 'Bone mass (kg)', formKey: 'boneMass' },
+    { flag: 'visceral-fat', description: 'Visceral fat level', formKey: 'visceralFat' },
+    { flag: 'extra-data', description: 'Extra data (JSON string)', formKey: 'extraData' },
+    { flag: 'note', description: 'Note for the record' }
+  ],
+  fileFields: ['file']
+})
 
 export default weight

package/src/lib/api.js

@@ -1,9 +1,19 @@
 import { readFileSync } from 'fs'
 import config from './config.js'
 
+function yellowWarn(message) {
+  // \x1b[33m 是黄色，\x1b[0m 是重置
+  console.warn('\x1b[33m%s\x1b[0m', message)
+}
+
 export async function request(endpoint, options = {}) {
   const apiUrl = config.get('apiUrl') || 'http://localhost:3000'
   const apiKey = config.get('apiKey')
+  const accessToken = config.get('accessToken')
+
+  if (apiUrl === 'http://localhost:3000') {
+    yellowWarn('Warning: Using local API (http://localhost:3000). Ensure this is intended.')
+  }
 
   const url = `${apiUrl}/api/v1${endpoint}`
   const headers = {
@@ -14,8 +24,9 @@ export async function request(endpoint, options = {}) {
     headers['Content-Type'] = 'application/json'
   }
 
-  if (apiKey) {
-    headers['Authorization'] = `Bearer ${apiKey}`
+  const bearerToken = apiKey || accessToken
+  if (bearerToken) {
+    headers['Authorization'] = `Bearer ${bearerToken}`
   }
 
   const response = await fetch(url, {
@@ -25,7 +36,7 @@ export async function request(endpoint, options = {}) {
 
   if (!response.ok) {
     const error = await response.json().catch(() => ({}))
-    throw new Error(error.message || `HTTP error! status: ${response.status}`)
+    throw new Error(error.message || `请求失败，状态码: ${response.status}`)
   }
 
   return response.json()

package/src/lib/crud-command.js

@@ -0,0 +1,186 @@
+import { Command } from 'commander'
+import { request, createFormData } from './api.js'
+import { appendTimezoneOffset, buildQueryParams } from './timezone.js'
+import { outputData } from './output.js'
+
+/**
+ * Create a CRUD command with add/list/get/update/delete/stats subcommands.
+ *
+ * @param {string} name - Command name (e.g. 'diet', 'exercise')
+ * @param {object} options
+ * @param {string} options.endpoint - API endpoint prefix (e.g. '/diets')
+ * @param {Array<{flag: string, description: string, formKey?: string, required?: boolean}>} options.fields
+ *   CLI flags for add/update. `formKey` maps to the FormData field name; defaults to camelCase of flag.
+ * @param {string[]} [options.fileFields] - Flags that accept file paths (e.g. ['file'])
+ * @param {Function} [options.statsFormatter] - Optional formatter for stats output type (e.g. () => 'diet-stats')
+ * @param {Function} [options.beforeAdd] - Hook to mutate fields before add request
+ * @param {Function} [options.beforeUpdate] - Hook to mutate fields before update request
+ */
+export function createCrudCommand(name, options) {
+  const { endpoint, fields = [], fileFields = [], statsFormatter, beforeAdd, beforeUpdate } = options
+  const cmd = new Command(name)
+
+  const toCamel = (str) =>
+    str.replace(/^-+/, '').replace(/-([a-z])/g, (_, c) => c.toUpperCase())
+
+  const buildFormData = (opts) => {
+    const data = {}
+    for (const f of fields) {
+      const key = f.formKey || toCamel(f.flag)
+      const val = opts[toCamel(f.flag)]
+      if (val !== undefined && val !== null) {
+        data[key] = val
+      }
+    }
+    if (opts.date) {
+      data.date = appendTimezoneOffset(opts.date)
+    }
+    if (opts.replaceAttachments) {
+      data.replaceAttachments = 'true'
+    }
+    const files = []
+    for (const ff of fileFields) {
+      const val = opts[toCamel(ff)]
+      if (val && val.length > 0) {
+        files.push(...val)
+      }
+    }
+    return createFormData(data, files)
+  }
+
+  // add
+  const addCmd = cmd.command('add')
+  for (const f of fields) {
+    const method = f.required ? 'requiredOption' : 'option'
+    addCmd[method](`--${f.flag} <value>`, f.description)
+  }
+  for (const ff of fileFields) {
+    addCmd.option(`--${ff} <paths...>`, 'File paths to attach')
+  }
+  addCmd
+    .option('--date <date>', 'Date (YYYY-MM-DD or ISO 8601 datetime)')
+    .action(async (opts) => {
+      try {
+        let formData = buildFormData(opts)
+        if (beforeAdd) {
+          const override = beforeAdd(opts)
+          if (override) {
+            formData = createFormData(override, opts.file || [])
+          }
+        }
+        const result = await request(endpoint, {
+          method: 'POST',
+          body: formData,
+          isFormData: true
+        })
+        console.log(`${name} record added:`, result.id)
+      } catch (error) {
+        console.error(`添加${name}记录失败:`, error.message)
+        process.exitCode = 1
+      }
+    })
+
+  // list
+  cmd
+    .command('list')
+    .option('--last <period>', 'Last N days/weeks/months/years')
+    .option('--start <date>', 'Start date (YYYY-MM-DD)')
+    .option('--end <date>', 'End date (YYYY-MM-DD)')
+    .option('--page <number>', 'Page number', '1')
+    .option('--limit <number>', 'Items per page', '20')
+    .option('--include-deleted', 'Include deleted records')
+    .option('--format <format>', 'Output format: json, table, toon', 'json')
+    .action(async (opts) => {
+      try {
+        const { params, page } = buildQueryParams(opts)
+        const result = await request(`${endpoint}?${params.toString()}`)
+        outputData(result, { format: opts.format, type: `${name}-list`, page })
+      } catch (error) {
+        console.error(`获取${name}列表失败:`, error.message)
+        process.exitCode = 1
+      }
+    })
+
+  // stats
+  cmd
+    .command('stats')
+    .option('--last <period>', 'Last N days/weeks/months/years')
+    .option('--start <date>', 'Start date (YYYY-MM-DD)')
+    .option('--end <date>', 'End date (YYYY-MM-DD)')
+    .option('--format <format>', 'Output format: json, table, toon', 'json')
+    .action(async (opts) => {
+      try {
+        const { params } = buildQueryParams(opts)
+        const result = await request(`${endpoint}/stats?${params.toString()}`)
+        const type = statsFormatter ? statsFormatter() : `${name}-stats`
+        outputData(result, { format: opts.format, type })
+      } catch (error) {
+        console.error(`获取${name}统计失败:`, error.message)
+        process.exitCode = 1
+      }
+    })
+
+  // get
+  cmd
+    .command('get')
+    .requiredOption('--id <id>', `${name} record ID`)
+    .option('--format <format>', 'Output format: json, table, toon', 'json')
+    .action(async (opts) => {
+      try {
+        const result = await request(`${endpoint}/${opts.id}`)
+        outputData(result, { format: opts.format, type: `${name}-get` })
+      } catch (error) {
+        console.error(`获取${name}记录失败:`, error.message)
+        process.exitCode = 1
+      }
+    })
+
+  // update
+  const updateCmd = cmd.command('update')
+  updateCmd.requiredOption('--id <id>', `${name} record ID`)
+  for (const f of fields) {
+    updateCmd.option(`--${f.flag} <value>`, `Updated ${f.description.toLowerCase()}`)
+  }
+  for (const ff of fileFields) {
+    updateCmd.option(`--${ff} <paths...>`, 'File paths to attach')
+  }
+  updateCmd
+    .option('--date <date>', 'Updated date (YYYY-MM-DD or ISO 8601 datetime)')
+    .option('--replace-attachments', 'Replace existing attachments instead of adding')
+    .action(async (opts) => {
+      try {
+        let formData = buildFormData(opts)
+        if (beforeUpdate) {
+          const override = beforeUpdate(opts)
+          if (override) {
+            formData = createFormData(override, opts.file || [])
+          }
+        }
+        const result = await request(`${endpoint}/${opts.id}`, {
+          method: 'PATCH',
+          body: formData,
+          isFormData: true
+        })
+        console.log(`${name} record updated:`, result.id)
+      } catch (error) {
+        console.error(`更新${name}记录失败:`, error.message)
+        process.exitCode = 1
+      }
+    })
+
+  // delete
+  cmd
+    .command('delete')
+    .requiredOption('--id <id>', `${name} record ID`)
+    .action(async (opts) => {
+      try {
+        await request(`${endpoint}/${opts.id}`, { method: 'DELETE' })
+        console.log(`${name} record deleted`)
+      } catch (error) {
+        console.error(`删除${name}记录失败:`, error.message)
+        process.exitCode = 1
+      }
+    })
+
+  return cmd
+}