@eeymoo/hum 0.1.15 → 0.1.17

package/bin/index.js

@@ -8,6 +8,7 @@ import timeline from '../src/commands/timeline.js'
 import weight from '../src/commands/weight.js'
 import exercise from '../src/commands/exercise.js'
 import diet from '../src/commands/diet.js'
+import food from '../src/commands/food.js'
 import sleep from '../src/commands/sleep.js'
 import { checkVersion, getCliVersion } from '../src/lib/version-check.js'
 
@@ -32,6 +33,7 @@ program.addCommand(timeline)
 program.addCommand(weight)
 program.addCommand(exercise)
 program.addCommand(diet)
+program.addCommand(food)
 program.addCommand(sleep)
 
 program.parse()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeymoo/hum",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Hum CLI - A command line tool for Hum API",
   "repository": {
     "type": "git",

package/src/commands/diet.js

@@ -16,6 +16,7 @@ diet
   .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')
@@ -31,6 +32,7 @@ diet
         sodium: options.sodium,
         foods: options.foods,
         water: options.water,
+        extraData: options.extraData,
         note: options.note,
         date: appendTimezoneOffset(options.date)
       }, options.file || [])
@@ -108,6 +110,7 @@ diet
   .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')
@@ -124,6 +127,7 @@ diet
         sodium: options.sodium,
         foods: options.foods,
         water: options.water,
+        extraData: options.extraData,
         note: options.note,
         date: appendTimezoneOffset(options.date),
         replaceAttachments: options.replaceAttachments ? 'true' : undefined

package/src/commands/exercise.js

@@ -14,6 +14,7 @@ exercise
   .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)')
@@ -28,6 +29,7 @@ exercise
         heartRateAvg: options.heartRateAvg,
         heartRateMax: options.heartRateMax,
         feeling: options.feeling,
+        extraData: options.extraData,
         location: options.location,
         note: options.note,
         date: appendTimezoneOffset(options.date)
@@ -104,6 +106,7 @@ exercise
   .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)')
@@ -119,6 +122,7 @@ exercise
         heartRateAvg: options.heartRateAvg,
         heartRateMax: options.heartRateMax,
         feeling: options.feeling,
+        extraData: options.extraData,
         location: options.location,
         note: options.note,
         date: appendTimezoneOffset(options.date),

package/src/commands/food.js

@@ -0,0 +1,29 @@
+import { Command } from 'commander'
+import { searchFood } from '../lib/foodSearch.js'
+import { outputData } from '../lib/output.js'
+
+const food = new Command('food')
+
+food
+  .description('查询食物营养信息')
+  .requiredOption('-n, --name <name>', '食物名称（支持模糊匹配）')
+  .option('-l, --limit <number>', '返回结果数量上限', '5')
+  .option('--no-cache', '跳过本地缓存，重新请求远端')
+  .option('--format <format>', '输出格式: json, table, toon', 'json')
+  .action(async (options) => {
+    try {
+      const limit = parseInt(options.limit, 10) || 5
+      const { items, degraded } = await searchFood(options.name, {
+        limit,
+        noCache: options.cache === false
+      })
+
+      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)
+      process.exitCode = 1
+    }
+  })
+
+export default food

package/src/commands/sleep.js

@@ -7,7 +7,7 @@ const sleep = new Command('sleep')
 
 sleep
   .command('add')
-  .requiredOption('--duration <value>', 'Sleep duration in hours')
+  .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')
@@ -15,13 +15,27 @@ sleep
   .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: options.duration,
+        duration,
         bedTime: options.bedtime,
         wakeTime: options.waketime,
         quality: options.quality,
@@ -29,6 +43,7 @@ sleep
         remSleep: options.remSleep,
         awakenings: options.awakenings,
         feeling: options.feeling,
+        extraData: options.extraData,
         note: options.note,
         date: appendTimezoneOffset(options.date)
       }, options.file || [])
@@ -104,6 +119,7 @@ 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')
@@ -119,6 +135,7 @@ sleep
         remSleep: options.remSleep,
         awakenings: options.awakenings,
         feeling: options.feeling,
+        extraData: options.extraData,
         note: options.note,
         date: appendTimezoneOffset(options.date),
         replaceAttachments: options.replaceAttachments ? 'true' : undefined

package/src/commands/weight.js

@@ -14,6 +14,7 @@ weight
   .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')
@@ -27,6 +28,7 @@ weight
         water: options.water,
         boneMass: options.boneMass,
         visceralFat: options.visceralFat,
+        extraData: options.extraData,
         note: options.note,
         date: appendTimezoneOffset(options.date)
       }, options.file || [])
@@ -101,6 +103,7 @@ weight
   .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')
@@ -115,6 +118,7 @@ weight
         water: options.water,
         boneMass: options.boneMass,
         visceralFat: options.visceralFat,
+        extraData: options.extraData,
         note: options.note,
         date: appendTimezoneOffset(options.date),
         replaceAttachments: options.replaceAttachments ? 'true' : undefined

package/src/lib/api.js

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch'
-import { FormData, File } from 'node-fetch'
 import { readFileSync } from 'fs'
 import config from './config.js'
 
@@ -42,10 +40,27 @@ export function createFormData(fields, files = []) {
     }
   })
 
+  const mimeMap = {
+    '.png': 'image/png',
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.gif': 'image/gif',
+    '.webp': 'image/webp',
+    '.bmp': 'image/bmp',
+    '.heic': 'image/heic',
+    '.heif': 'image/heif',
+    '.pdf': 'application/pdf',
+    '.txt': 'text/plain',
+    '.gpx': 'application/gpx+xml',
+    '.fit': 'application/fit'
+  }
+
   files.forEach(filePath => {
     const buffer = readFileSync(filePath)
     const fileName = filePath.split('/').pop()
-    const file = new File([buffer], fileName)
+    const ext = '.' + fileName.split('.').pop().toLowerCase()
+    const type = mimeMap[ext] || 'application/octet-stream'
+    const file = new File([buffer], fileName, { type })
     formData.append('file', file)
   })
 

package/src/lib/foodSearch.js

@@ -0,0 +1,174 @@
+import config from './config.js'
+
+const CACHE_KEY = 'foodCache'
+
+function getCache() {
+  return config.get(CACHE_KEY) || []
+}
+
+function setCache(cache) {
+  config.set(CACHE_KEY, cache)
+}
+
+function parseNumber(str) {
+  if (!str || str === '—' || str === '') return null
+  const num = parseFloat(String(str).replace(/[^\d.]/g, ''))
+  return isNaN(num) ? null : num
+}
+
+function parseKjToKcal(str) {
+  const kj = parseNumber(str)
+  if (kj === null) return null
+  return Math.round(kj / 4.184 * 10) / 10
+}
+
+/**
+ * Parse a single food item from the API response array into a structured object.
+ * Field mapping (based on actual API response):
+ *   [0]  foodCode       → sourceId
+ *   [2]  foodName       → name
+ *   [5]  water %
+ *   [6]  edible portion
+ *   [7]  energy (kJ)    → energyKcal (converted)
+ *   [8]  protein (g)
+ *   [9]  fat (g)
+ *   [11] dietary fiber (g)
+ *   [12] carbohydrate (g)
+ */
+function parseFoodItem(item) {
+  return {
+    source: 'chinanutri',
+    sourceId: String(item[0]),
+    name: item[2] || '',
+    energyKcal: parseKjToKcal(item[7]),
+    protein: parseNumber(item[8]),
+    fat: parseNumber(item[9]),
+    carbs: parseNumber(item[12]),
+    rawItem: item
+  }
+}
+
+/**
+ * Search foods from the remote API.
+ * Returns an array of parsed food objects.
+ */
+export async function searchRemote(name, limit = 20) {
+  const body = new URLSearchParams({
+    categoryOne: '0',
+    categoryTwo: '0',
+    foodName: name,
+    pageNum: '1',
+    field: '0',
+    flag: '0'
+  })
+
+  const controller = new AbortController()
+  const timeout = setTimeout(() => controller.abort(), 5000)
+
+  try {
+    const response = await fetch(
+      'https://nlc.chinanutri.cn/fq/FoodInfoQueryAction!queryFoodInfoList.do',
+      {
+        method: 'POST',
+        headers: {
+          'Referer': 'https://nlc.chinanutri.cn/fq/foodlist.htm',
+          'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+        },
+        body: body.toString(),
+        signal: controller.signal
+      }
+    )
+
+    clearTimeout(timeout)
+
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}`)
+    }
+
+    const data = await response.json()
+    const items = data.list || []
+
+    return items.slice(0, limit).map(parseFoodItem)
+  } catch (error) {
+    clearTimeout(timeout)
+    if (error.name === 'AbortError') {
+      throw new Error('TIMEOUT')
+    }
+    throw error
+  }
+}
+
+/**
+ * Search cached foods by name (fuzzy match).
+ */
+export function searchCache(name, limit = 5) {
+  const cache = getCache()
+  const keyword = name.toLowerCase()
+  return cache
+    .filter(item => item.name.toLowerCase().includes(keyword))
+    .slice(0, limit)
+}
+
+/**
+ * Upsert food items into local cache.
+ */
+export function upsertCache(items) {
+  const cache = getCache()
+  for (const item of items) {
+    const idx = cache.findIndex(c => c.sourceId === item.sourceId)
+    const entry = {
+      source: item.source,
+      sourceId: item.sourceId,
+      name: item.name,
+      energyKcal: item.energyKcal,
+      protein: item.protein,
+      carbs: item.carbs,
+      fat: item.fat,
+      updatedAt: new Date().toISOString()
+    }
+    if (idx >= 0) {
+      cache[idx] = entry
+    } else {
+      cache.push(entry)
+    }
+  }
+  setCache(cache)
+}
+
+/**
+ * Main search function: cache-first with remote fallback.
+ */
+export async function searchFood(name, { limit = 5, noCache = false } = {}) {
+  // 1. If cache is allowed, try cache first
+  if (!noCache) {
+    const cached = searchCache(name, limit)
+    if (cached.length > 0) {
+      return { items: cached, fromCache: true }
+    }
+  }
+
+  // 2. Query remote
+  try {
+    const remoteItems = await searchRemote(name, limit)
+    if (remoteItems.length > 0) {
+      upsertCache(remoteItems)
+      return { items: remoteItems.slice(0, limit), fromCache: false }
+    }
+    return { items: [], fromCache: false }
+  } catch (error) {
+    // 3. On remote failure, try cache as fallback
+    if (error.message === 'TIMEOUT') {
+      const cached = searchCache(name, limit)
+      if (cached.length > 0) {
+        return { items: cached, fromCache: true, degraded: true }
+      }
+      throw new Error('查询超时，请稍后重试')
+    }
+    // Other remote errors: degrade to cache
+    const cached = searchCache(name, limit)
+    if (cached.length > 0) {
+      return { items: cached, fromCache: true, degraded: true }
+    }
+    throw error
+  }
+}

package/src/lib/output.js

@@ -39,6 +39,7 @@ function extractItems(data, type) {
     'diet-list': 'diets',
     'sleep-list': 'sleeps',
     'record-list': 'records',
+    'food-list': 'foods',
     'timeline': 'items'
   }
   const key = keyMap[type]
@@ -101,6 +102,15 @@ function buildRows(items, type) {
         item.date ? formatDate(item.date, df) : '-',
         item.note || '-'
       ])
+    case 'food-list':
+      return items.map((item, idx) => [
+        idx + 1,
+        item.name,
+        item.energyKcal ?? '-',
+        item.protein ?? '-',
+        item.carbs ?? '-',
+        item.fat ?? '-'
+      ])
     case 'timeline':
       return items.map((item, idx) => {
         let summary = ''
@@ -128,6 +138,7 @@ function getHeaders(type) {
     case 'diet-list': return ['#', 'ID', '餐别', '热量', '蛋白质', '碳水', '脂肪', '日期']
     case 'sleep-list': return ['#', 'ID', '时长(h)', '质量', '入睡', '醒来', '深睡(h)', '日期']
     case 'record-list': return ['#', 'ID', '类型', '标签', '日期', '备注']
+    case 'food-list': return ['#', '名称', '热量(kcal)', '蛋白质(g)', '碳水(g)', '脂肪(g)']
     case 'timeline': return ['#', '时间', '类型', '摘要']
     default: return []
   }
@@ -154,7 +165,9 @@ function outputStats(data, type, format) {
     case 'exercise-stats':
       if (data.count !== undefined) rows.push(['总次数', data.count])
       if (data.totalDuration !== undefined) rows.push(['总时长', `${data.totalDuration} min`])
+      if (data.avgDuration !== null) rows.push(['平均时长', `${data.avgDuration.toFixed(1)} min`])
       if (data.totalCalories !== undefined) rows.push(['总热量', `${data.totalCalories} kcal`])
+      if (data.avgCalories !== null) rows.push(['平均热量', `${data.avgCalories.toFixed(0)} kcal`])
       if (data.frequencyByType) {
         for (const [t, c] of Object.entries(data.frequencyByType)) {
           rows.push([`频率 (${t})`, c])
@@ -162,7 +175,7 @@ function outputStats(data, type, format) {
       }
       break
     case 'diet-stats':
-      if (data.avgCaloriesPerDay !== undefined) rows.push(['日均热量', `${data.avgCaloriesPerDay?.toFixed?.(0) || data.avgCaloriesPerDay} kcal`])
+      if (data.avgCalories !== undefined) rows.push(['平均热量', `${data.avgCalories?.toFixed?.(0) || data.avgCalories} kcal`])
       if (data.avgProtein !== undefined) rows.push(['平均蛋白质', `${data.avgProtein?.toFixed?.(1) || data.avgProtein}g`])
       if (data.avgCarbs !== undefined) rows.push(['平均碳水', `${data.avgCarbs?.toFixed?.(1) || data.avgCarbs}g`])
       if (data.avgFat !== undefined) rows.push(['平均脂肪', `${data.avgFat?.toFixed?.(1) || data.avgFat}g`])