skillfree 0.1.14 → 0.1.16

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) })
@@ -85,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
@@ -115,10 +120,11 @@ program
     console.log(`\n📋 任务 ${taskId}`)
     console.log(`   状态：${task.status}`)
     console.log(`   模型：${task.model}`)
-    if (task.status === 'completed' && task.output_url) {
-      console.log(`   链接：${task.output_url}`)
+    const videoUrl = task.result_url || task.output_url
+    if (task.status === 'completed' && videoUrl) {
+      console.log(`   链接：${videoUrl}`)
       if (flags.output) {
-        const resp = await fetch(task.output_url)
+        const resp = await fetch(videoUrl)
         fs.writeFileSync(flags.output, Buffer.from(await resp.arrayBuffer()))
         console.log(`✅ 已下载到 ${flags.output}`)
       } else {

package/package.json

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

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
@@ -365,7 +369,7 @@ async function pilot(flags) {
 
       if (status === 'completed') {
         console.log('\n')
-        const videoUrl = task.output_url
+        const videoUrl = task.result_url || task.output_url
         if (!videoUrl) throw new Error('任务完成但未返回视频 URL: ' + JSON.stringify(task))
 
         if (output) {