skillfree 0.1.13 → 0.1.15

package/bin/skillfree.js

@@ -39,6 +39,7 @@ program
   .option('--voice <voice>',  'TTS 声音（默认 nova）')
   .option('--size <size>',    '图像尺寸（默认 1024x1024）')
   .option('--duration <sec>', '视频/音乐时长（秒）')
+  .option('--lyrics <text>',  '歌词（music-2.5 用，支持 [verse][chorus] 标签）')
   .action(async (flags) => {
     const { pilot } = require('../scripts/commands/pilot')
     await pilot(flags).catch(e => { console.error('❌', e.message); process.exit(1) })
@@ -54,6 +55,16 @@ program
     await pilot({ type: 'chat', prompt, ...flags }).catch(e => { console.error('❌', e.message); process.exit(1) })
   })
 
+// ── models ────────────────────────────────────────────────────────────────────
+program
+  .command('models')
+  .description('查看所有可用模型')
+  .option('--type <type>', '按类型过滤: chat | image | tts | video | music | ocr | embedding')
+  .action(async (flags) => {
+    const { listModels } = require('../scripts/commands/models')
+    await listModels(flags.type).catch(e => { console.error('❌', e.message); process.exit(1) })
+  })
+
 // ── balance ───────────────────────────────────────────────────────────────────
 program
   .command('balance')
@@ -75,7 +86,11 @@ program
     // Suno 任务用 suno:xxx 格式区分
     if (taskId.startsWith('suno:')) {
       const sunoId = taskId.slice(5)
-      const poll = await request('/suno/fetch/' + sunoId, { method: 'GET' })
+      const { BASE_URL, getApiKey } = require('../scripts/lib/client')
+      const apiKey = getApiKey()
+      const poll = await fetch(`${BASE_URL}/suno/fetch/${sunoId}`, {
+        headers: { 'Authorization': `Bearer ${apiKey}` }
+      })
       const result = await poll.json()
       if (result.code !== 'success') throw new Error(result.message || JSON.stringify(result))
       const status = result.data?.status
@@ -100,7 +115,7 @@ program
     }
 
     // 视频任务
-    const res = await request(`/v1/tasks/${taskId}`, { method: 'GET' })
+    const res = await request(`/tasks/${taskId}`, { method: 'GET' })
     const task = await res.json()
     console.log(`\n📋 任务 ${taskId}`)
     console.log(`   状态：${task.status}`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillfree",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "🦞 一个 API，满足所有龙虾技能需求",
   "main": "bin/skillfree.js",
   "bin": {

package/scripts/commands/models.js

@@ -1,32 +1,36 @@
-const { apiHubGet } = require('../lib/client')
+const { request } = require('../lib/client')
 
-/**
- * List available models from API Hub
- * @param {object} [params] - List parameters
- * @param {string} [params.type] - Filter by category (chat, tts, image, video, scraping, etc.)
- * @param {string} [params.vendor] - Filter by vendor
- * @returns {Promise<object>} Models list
- */
-async function listModels(params = {}) {
-  const response = await apiHubGet('/v1/models')
-  let models = response.models || []
+async function listModels(type) {
+  const res = await request('/models', { method: 'GET' })
+  const data = await res.json()
+  const all = data.data || []
 
-  // Filter by category/type
-  if (params.type) {
-    const typeFilter = params.type.toLowerCase()
-    models = models.filter(m =>
-      m.category?.toLowerCase() === typeFilter ||
-      m.type?.toLowerCase() === typeFilter
-    )
+  const groups = {}
+  for (const m of all) {
+    const t = m.type || 'chat'
+    if (type && t !== type) continue
+    if (!groups[t]) groups[t] = []
+    groups[t].push(m.id)
   }
 
-  // Filter by vendor
-  if (params.vendor) {
-    const vendorFilter = params.vendor.toLowerCase()
-    models = models.filter(m => m.vendor?.toLowerCase() === vendorFilter)
+  const typeLabel = {
+    chat:      '💬 对话',
+    image:     '🎨 图像',
+    tts:       '🔊 语音合成',
+    video:     '🎬 视频',
+    music:     '🎵 音乐',
+    ocr:       '📄 OCR',
+    embedding: '🔢 Embedding',
   }
 
-  return { count: models.length, models }
+  console.log('\n🦞 SkillFree 可用模型\n')
+  for (const [t, ids] of Object.entries(groups)) {
+    console.log(`${typeLabel[t] || t}`)
+    ids.forEach(id => console.log(`  ${id}`))
+    console.log()
+  }
+  console.log(`共 ${all.length} 个模型`)
+  console.log(`\n用法示例：skillfree pilot --type chat --model DeepSeek-V3.2-Fast --prompt "你好"`)
 }
 
 module.exports = { listModels }

package/scripts/commands/pilot.js

@@ -143,11 +143,12 @@ async function pilot(flags) {
       else console.log(`✅ TTS 成功，时长约 ${(data.extra_info?.audio_length / 1000).toFixed(1)} 秒`)
 
     } else if (ttsModel === 'gemini-2.5-pro-preview-tts' || ttsModel === 'gemini-2.5-flash-preview-tts') {
-      // Gemini TTS：走 /v1beta/models/:id:generateContent，认证无 Bearer
+      // Gemini TTS：走 skillfree.tech 后端 /v1beta 路由
+      // 注意：用 fetch+BASE_URL 而非 request()，因为 request() 会自动加 /v1 前缀
       const apiKey = getApiKey()
-      const res = await fetch(BASE_URL.replace('skillfree.tech', 'dmxapi.cn') + '/v1beta/models/' + ttsModel + ':generateContent', {
+      const res = await fetch(BASE_URL + '/v1beta/models/' + ttsModel + ':generateContent', {
         method: 'POST',
-        headers: { 'Authorization': apiKey, 'Content-Type': 'application/json' },
+        headers: { 'Authorization': `Bearer ${apiKey}`, 'Content-Type': 'application/json' },
         body: JSON.stringify({
           contents: [{ parts: [{ text }] }],
           generationConfig: {
@@ -192,10 +193,11 @@ async function pilot(flags) {
     const musicModel = model || 'chirp-v5'
 
     if (musicModel === 'chirp-v5') {
-      // Suno 异步接口
-      const res = await request('/suno/submit/music', {
+      // Suno 异步接口（路由在 /suno/，不在 /v1/ 下，需用 BASE_URL 直接请求）
+      const apiKey = getApiKey()
+      const res = await fetch(`${BASE_URL}/suno/submit/music`, {
         method: 'POST',
-        headers: { 'Accept': 'application/json' },
+        headers: { 'Content-Type': 'application/json', 'Accept': 'application/json', 'Authorization': `Bearer ${apiKey}` },
         body: JSON.stringify({
           gpt_description_prompt: prompt,
           make_instrumental: true,
@@ -211,7 +213,9 @@ async function pilot(flags) {
       // 轮询结果
       for (let i = 0; i < 15; i++) {
         await new Promise(r => setTimeout(r, 10000))
-        const poll = await request('/suno/fetch/' + taskId, { method: 'GET' })
+        const poll = await fetch(`${BASE_URL}/suno/fetch/${taskId}`, {
+          headers: { 'Authorization': `Bearer ${apiKey}` }
+        })
         const result = await poll.json()
         if (result.code !== 'success') throw new Error(result.message || JSON.stringify(result))
         const status = result.data?.status
@@ -339,7 +343,7 @@ async function pilot(flags) {
 
     // 1. 提交任务
     process.stdout.write(`🎬 提交视频任务（${videoModel}）...`)
-    const res = await request('/v1/video/generations', {
+    const res = await request('/video/generations', {
       method: 'POST',
       body: JSON.stringify({ model: videoModel, prompt }),
     })
@@ -357,7 +361,7 @@ async function pilot(flags) {
 
     while (Date.now() - start < maxWait) {
       await new Promise(r => setTimeout(r, interval))
-      const pollRes = await request(`/v1/tasks/${taskId}`, { method: 'GET' })
+      const pollRes = await request(`/tasks/${taskId}`, { method: 'GET' })
       const task = await pollRes.json()
       const status = task.status