@eeymoo/hum 0.1.23 → 0.1.25

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eeymoo/hum",
-  "version": "0.1.23",
-  "description": "Hum CLI - A command line tool for Hum API",
+  "version": "0.1.25",
+    "description": "Hum CLI - A command line tool for Hum API",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Eeymoo/hum.git",
@@ -20,12 +20,12 @@
     "@toon-format/toon": "^2.3.0",
     "commander": "^12.1.0",
     "conf": "^13.0.1",
-    "dayjs": "^1.11.13",
-    "node-fetch": "^3.3.2"
+    "dayjs": "^1.11.13"
   },
   "scripts": {
     "build": "node bin/index.js --version",
-    "test:e2e": "bash test/e2e.sh"
+    "test:e2e": "bash test/e2e.sh",
+    "test:e2e:extended": "bash test/e2e-extended.sh"
   },
   "devDependencies": {
     "typescript": "^5.6.0"

package/src/commands/auth.js

@@ -16,7 +16,7 @@ auth
         console.log('Please visit:', deviceData.verificationUriComplete)
         console.log('Code:', deviceData.userCode)
         console.log('Waiting for authorization...')
-        
+
         const maxAttempts = 60
         for (let i = 0; i < maxAttempts; i++) {
           await new Promise(resolve => setTimeout(resolve, deviceData.interval * 1000))
@@ -28,10 +28,10 @@ auth
                 grantType: 'urn:ietf:params:oauth:grant-type:device_code'
               })
             })
-            
-            if (tokenData.accessToken) {
-              config.set('accessToken', tokenData.accessToken)
-              config.set('refreshToken', tokenData.refreshToken)
+
+            if (tokenData.access_token) {
+              config.set('accessToken', tokenData.access_token)
+              config.set('refreshToken', tokenData.refresh_token)
               console.log('Successfully logged in!')
               return
             }
@@ -40,14 +40,21 @@ auth
           }
         }
         console.error('Authorization timeout')
-      } else if (options.apiKey) {
+      } else if (options.apiKey || process.env.HUM_API_KEY) {
+        const apiKey = options.apiKey || process.env.HUM_API_KEY
         const result = await request('/auth/verify', {
           method: 'POST',
-          body: JSON.stringify({ apiKey: options.apiKey })
+          body: JSON.stringify({ apiKey })
+        }).catch(err => {
+          // verify 端点在 key 无效时返回 401，捕获后返回统一结构
+          if (err.message.includes('401')) {
+            return { valid: false }
+          }
+          throw err
         })
 
         if (result.valid) {
-          config.set('apiKey', options.apiKey)
+          config.set('apiKey', apiKey)
           const parts = []
           if (result.user) parts.push(result.user)
           if (result.keyName) parts.push(`key: ${result.keyName}`)
@@ -56,7 +63,7 @@ auth
           console.error('Invalid API key')
         }
       } else {
-        console.error('Please provide --api-key or --device option')
+        console.error('Please provide --api-key or --device option, or set HUM_API_KEY environment variable')
       }
     } catch (error) {
       console.error('Login failed:', error.message)

package/src/commands/config.js

@@ -45,7 +45,12 @@ configCmd
     console.log('Configuration:')
     for (const [key, value] of Object.entries(allConfig)) {
       const displayKey = key === 'apiUrl' ? 'api-url' : key === 'dateFormat' ? 'date-format' : key
-      console.log(`  ${displayKey}: ${value}`)
+      let displayValue = value
+      // 脱敏敏感信息
+      if ((key === 'apiKey' || key === 'accessToken' || key === 'refreshToken') && typeof value === 'string' && value.length > 8) {
+        displayValue = value.slice(0, 4) + '****' + value.slice(-4)
+      }
+      console.log(`  ${displayKey}: ${displayValue}`)
     }
   })
 

package/src/commands/diet.js

@@ -1,160 +1,21 @@
-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 diet = new Command('diet')
-
-diet
-  .command('add')
-  .requiredOption('--meal <type>', 'Meal type (breakfast/lunch/dinner/snack)')
-  .option('--calories <value>', 'Calories')
-  .option('--protein <value>', 'Protein (g)')
-  .option('--carbs <value>', 'Carbs (g)')
-  .option('--fat <value>', 'Fat (g)')
-  .option('--fiber <value>', 'Fiber (g)')
-  .option('--sodium <value>', 'Sodium (mg)')
-  .option('--foods <string>', 'Foods in format: "name:amount,name2:amount2"')
-  .option('--water <value>', 'Water (ml)')
-  .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 {
-      const formData = createFormData({
-        mealType: options.meal,
-        calories: options.calories,
-        protein: options.protein,
-        carbs: options.carbs,
-        fat: options.fat,
-        fiber: options.fiber,
-        sodium: options.sodium,
-        foods: options.foods,
-        water: options.water,
-        extraData: options.extraData,
-        note: options.note,
-        date: appendTimezoneOffset(options.date)
-      }, options.file || [])
-
-      const result = await request('/diets', {
-        method: 'POST',
-        body: formData,
-        isFormData: true
-      })
-
-      console.log('Diet record added:', result.id)
-    } catch (error) {
-      console.error('Failed to add diet record:', error.message)
-    }
-  })
-
-diet
-  .command('list')
-  .option('--meal <type>', 'Filter by meal type')
-  .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(`/diets?${params.toString()}`)
-      outputData(result, { format: options.format, type: 'diet-list', page })
-    } catch (error) {
-      console.error('Failed to list diet records:', error.message)
-    }
-  })
-
-diet
-  .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(`/diets/stats?${params.toString()}`)
-      outputData(result, { format: options.format, type: 'diet-stats' })
-    } catch (error) {
-      console.error('Failed to get diet stats:', error.message)
-    }
-  })
-
-diet
-  .command('get')
-  .requiredOption('--id <id>', 'Diet record ID')
-  .option('--format <format>', 'Output format: json, table, toon', 'json')
-  .action(async (options) => {
-    try {
-      const result = await request(`/diets/${options.id}`)
-      outputData(result, { format: options.format, type: 'diet-get' })
-    } catch (error) {
-      console.error('Failed to get diet record:', error.message)
-    }
-  })
-
-diet
-  .command('update')
-  .requiredOption('--id <id>', 'Diet record ID')
-  .option('--meal <type>', 'Updated meal type')
-  .option('--calories <value>', 'Updated calories')
-  .option('--protein <value>', 'Updated protein')
-  .option('--carbs <value>', 'Updated carbs')
-  .option('--fat <value>', 'Updated fat')
-  .option('--fiber <value>', 'Updated fiber')
-  .option('--sodium <value>', 'Updated sodium')
-  .option('--foods <string>', 'Updated foods')
-  .option('--water <value>', 'Updated water')
-  .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({
-        mealType: options.meal,
-        calories: options.calories,
-        protein: options.protein,
-        carbs: options.carbs,
-        fat: options.fat,
-        fiber: options.fiber,
-        sodium: options.sodium,
-        foods: options.foods,
-        water: options.water,
-        extraData: options.extraData,
-        note: options.note,
-        date: appendTimezoneOffset(options.date),
-        replaceAttachments: options.replaceAttachments ? 'true' : undefined
-      }, options.file || [])
-
-      const result = await request(`/diets/${options.id}`, {
-        method: 'PATCH',
-        body: formData,
-        isFormData: true
-      })
-
-      console.log('Diet record updated:', result.id)
-    } catch (error) {
-      console.error('Failed to update diet record:', error.message)
-    }
-  })
-
-diet
-  .command('delete')
-  .requiredOption('--id <id>', 'Diet record ID')
-  .action(async (options) => {
-    try {
-      await request(`/diets/${options.id}`, { method: 'DELETE' })
-      console.log('Diet record deleted')
-    } catch (error) {
-      console.error('Failed to delete diet record:', error.message)
-    }
-  })
+import { createCrudCommand } from '../lib/crud-command.js'
+
+const diet = createCrudCommand('diet', {
+  endpoint: '/diets',
+  fields: [
+    { flag: 'meal', description: 'Meal type (breakfast/lunch/dinner/snack)', formKey: 'mealType', required: true },
+    { flag: 'calories', description: 'Calories' },
+    { flag: 'protein', description: 'Protein (g)' },
+    { flag: 'carbs', description: 'Carbs (g)' },
+    { flag: 'fat', description: 'Fat (g)' },
+    { flag: 'fiber', description: 'Fiber (g)' },
+    { flag: 'sodium', description: 'Sodium (mg)' },
+    { flag: 'foods', description: 'Foods in format: "name:amount,name2:amount2"' },
+    { flag: 'water', description: 'Water (ml)' },
+    { flag: 'extra-data', description: 'Extra data (JSON string)', formKey: 'extraData' },
+    { flag: 'note', description: 'Note' }
+  ],
+  fileFields: ['file']
+})
 
 export default diet

package/src/commands/exercise.js

@@ -1,156 +1,20 @@
-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 exercise = new Command('exercise')
-
-exercise
-  .command('add')
-  .requiredOption('--type <type>', 'Exercise type (running/strength/cycling/swimming/other)')
-  .requiredOption('--duration <value>', 'Duration in minutes')
-  .option('--calories <value>', 'Calories burned')
-  .option('--activities <string>', 'Activities in format: "name:prop1=val1,prop2=val2;name2:prop1=val1"')
-  .option('--heart-rate-avg <value>', 'Average heart rate')
-  .option('--heart-rate-max <value>', 'Max heart rate')
-  .option('--feeling <value>', 'Feeling 1-10')
-  .option('--extra-data <json>', 'Extra data (JSON string)')
-  .option('--location <location>', 'Location')
-  .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 {
-      const formData = createFormData({
-        type: options.type,
-        duration: options.duration,
-        caloriesBurned: options.calories,
-        activities: options.activities,
-        heartRateAvg: options.heartRateAvg,
-        heartRateMax: options.heartRateMax,
-        feeling: options.feeling,
-        extraData: options.extraData,
-        location: options.location,
-        note: options.note,
-        date: appendTimezoneOffset(options.date)
-      }, options.file || [])
-
-      const result = await request('/exercises', {
-        method: 'POST',
-        body: formData,
-        isFormData: true
-      })
-
-      console.log('Exercise record added:', result.id)
-    } catch (error) {
-      console.error('Failed to add exercise record:', error.message)
-    }
-  })
-
-exercise
-  .command('list')
-  .option('--type <type>', 'Filter by type')
-  .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(`/exercises?${params.toString()}`)
-      outputData(result, { format: options.format, type: 'exercise-list', page })
-    } catch (error) {
-      console.error('Failed to list exercise records:', error.message)
-    }
-  })
-
-exercise
-  .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(`/exercises/stats?${params.toString()}`)
-      outputData(result, { format: options.format, type: 'exercise-stats' })
-    } catch (error) {
-      console.error('Failed to get exercise stats:', error.message)
-    }
-  })
-
-exercise
-  .command('get')
-  .requiredOption('--id <id>', 'Exercise record ID')
-  .option('--format <format>', 'Output format: json, table, toon', 'json')
-  .action(async (options) => {
-    try {
-      const result = await request(`/exercises/${options.id}`)
-      outputData(result, { format: options.format, type: 'exercise-get' })
-    } catch (error) {
-      console.error('Failed to get exercise record:', error.message)
-    }
-  })
-
-exercise
-  .command('update')
-  .requiredOption('--id <id>', 'Exercise record ID')
-  .option('--type <type>', 'Updated type')
-  .option('--duration <value>', 'Updated duration')
-  .option('--calories <value>', 'Updated calories burned')
-  .option('--activities <string>', 'Updated activities')
-  .option('--heart-rate-avg <value>', 'Updated average heart rate')
-  .option('--heart-rate-max <value>', 'Updated max heart rate')
-  .option('--feeling <value>', 'Updated feeling')
-  .option('--extra-data <json>', 'Updated extra data (JSON string)')
-  .option('--location <location>', 'Updated location')
-  .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({
-        type: options.type,
-        duration: options.duration,
-        caloriesBurned: options.calories,
-        activities: options.activities,
-        heartRateAvg: options.heartRateAvg,
-        heartRateMax: options.heartRateMax,
-        feeling: options.feeling,
-        extraData: options.extraData,
-        location: options.location,
-        note: options.note,
-        date: appendTimezoneOffset(options.date),
-        replaceAttachments: options.replaceAttachments ? 'true' : undefined
-      }, options.file || [])
-
-      const result = await request(`/exercises/${options.id}`, {
-        method: 'PATCH',
-        body: formData,
-        isFormData: true
-      })
-
-      console.log('Exercise record updated:', result.id)
-    } catch (error) {
-      console.error('Failed to update exercise record:', error.message)
-    }
-  })
-
-exercise
-  .command('delete')
-  .requiredOption('--id <id>', 'Exercise record ID')
-  .action(async (options) => {
-    try {
-      await request(`/exercises/${options.id}`, { method: 'DELETE' })
-      console.log('Exercise record deleted')
-    } catch (error) {
-      console.error('Failed to delete exercise record:', error.message)
-    }
-  })
+import { createCrudCommand } from '../lib/crud-command.js'
+
+const exercise = createCrudCommand('exercise', {
+  endpoint: '/exercises',
+  fields: [
+    { flag: 'type', description: 'Exercise type (running/strength/cycling/swimming/other)', required: true },
+    { flag: 'duration', description: 'Duration in minutes', required: true },
+    { flag: 'calories', description: 'Calories burned', formKey: 'caloriesBurned' },
+    { flag: 'activities', description: 'Activities in format: "name:prop1=val1,prop2=val2;name2:prop1=val1"' },
+    { flag: 'heart-rate-avg', description: 'Average heart rate', formKey: 'heartRateAvg' },
+    { flag: 'heart-rate-max', description: 'Max heart rate', formKey: 'heartRateMax' },
+    { flag: 'feeling', description: 'Feeling 1-10' },
+    { flag: 'extra-data', description: 'Extra data (JSON string)', formKey: 'extraData' },
+    { flag: 'location', description: 'Location' },
+    { flag: 'note', description: 'Note' }
+  ],
+  fileFields: ['file']
+})
 
 export default exercise

package/src/commands/food.js

@@ -21,7 +21,7 @@ food
       const cleaned = items.map(({ rawItem, ...rest }) => rest)
       outputData({ foods: cleaned, totalPages: 1, total: cleaned.length }, { format: options.format, type: 'food-list' })
     } catch (error) {
-      console.error(error.message)
+      console.error('查询食物失败:', error.message)
       process.exitCode = 1
     }
   })

package/src/commands/record.js

@@ -29,9 +29,9 @@ record
         body: JSON.stringify(recordData)
       })
 
-      console.log('Record added:', result.id)
+      console.log('记录已添加:', result.id)
     } catch (error) {
-      console.error('Failed to add record:', error.message)
+      console.error('添加记录失败:', error.message)
     }
   })
 
@@ -53,7 +53,7 @@ record
       const result = await request(`/records?${params.toString()}`)
       outputData(result, { format: options.format, type: 'record-list', page })
     } catch (error) {
-      console.error('Failed to list records:', error.message)
+      console.error('获取记录列表失败:', error.message)
     }
   })
 
@@ -72,7 +72,7 @@ record
       const result = await request(`/records/${options.id}${queryString ? '?' + queryString : ''}`)
       outputData(result, { format: options.format, type: 'record-get' })
     } catch (error) {
-      console.error('Failed to get record:', error.message)
+      console.error('获取记录失败:', error.message)
     }
   })
 
@@ -98,9 +98,9 @@ record
         body: JSON.stringify(updateData)
       })
 
-      console.log('Record updated:', result.id)
+      console.log('记录已更新:', result.id)
     } catch (error) {
-      console.error('Failed to update record:', error.message)
+      console.error('更新记录失败:', error.message)
     }
   })
 
@@ -113,9 +113,9 @@ record
         method: 'DELETE'
       })
 
-      console.log('Record deleted')
+      console.log('记录已删除')
     } catch (error) {
-      console.error('Failed to delete record:', error.message)
+      console.error('删除记录失败:', error.message)
     }
   })
 
@@ -135,7 +135,7 @@ record
       const result = await request(`/records/search?${params.toString()}`)
       outputData(result, { format: options.format, type: 'record-list', page })
     } catch (error) {
-      console.error('Failed to search records:', error.message)
+      console.error('搜索记录失败:', error.message)
     }
   })