cutsdk 1.0.0 → 1.1.1

package/dist/api/setup/templates/project/{cut-sdk → cutcli-docs}/quickstart.md

@@ -1,4 +1,4 @@
-# cut_sdk 快速开始
+# cutsdk 快速开始
 
 ## 1. 安装
 
@@ -24,7 +24,7 @@ async function main() {
         clips: [
           {
             type: 'caption',
-            text: '第一个 cut_sdk 草稿',
+            text: '第一个 cutsdk 草稿',
             start: '0s',
             duration: '3s',
             position: 'center',
@@ -108,3 +108,23 @@ AI Draft Spec：
 ```ts
 { start: '0s', duration: '3s' }
 ```
+
+## 6. CLI 本地路径与文字效果
+
+```bash
+cutcli draft easy <draftId> --audio-src ./素材/bgm.mp3 --image-src ./素材/bg.png \
+  --text "爆款标题" --font-size 10 --text-color "#ffffff"
+
+cutcli query text-effects --keyword 火焰 --limit 5
+cutcli text add <draftId> --text "爆款标题" --start 0s --duration 3s \
+  --text-effect "红黄火焰综艺花字" --shadow --shadow-color "#000000"
+```
+
+## 7. 云渲染状态
+
+```bash
+cutcli cloud render <draftId> --wait --pretty
+cutcli cloud result <jobId> --pretty
+```
+
+状态 `0/1/2` 表示等待或处理中；`3/5/6` 表示失败终态；只有 `7` 表示成功，此时才会有 `video_url`。

package/dist/api/videos/add-videos.js

@@ -47,7 +47,7 @@ async function addVideos(params) {
         if (params.transformY != null)
             segment.clip.transform.y = params.transformY;
         segment.clip.alpha = alpha;
-        if (i < videoInfos.length - 1 && vi.transition) {
+        if (vi.transition && (videoInfos.length === 1 || i < videoInfos.length - 1)) {
             const trans = draft.create_materials_transitions(vi.transition);
             if (vi.transitionDuration) {
                 trans.duration = (vi.transitionDuration >= 100000 && vi.transitionDuration <= 2500000) ? vi.transitionDuration : 500000;

package/dist/api/videos/add-videos.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-videos.js","sourceRoot":"","sources":["../../../src/api/videos/add-videos.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-videos.js","sourceRoot":"","sources":["../../../src/api/videos/add-videos.ts"],"names":[],"mappings":";;AAiBA,8BAsEC;AAvFD,+BAAoC;AACpC,8DAAkE;AAClE,gDAAmD;AACnD,oEAAgG;AAGhG,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEpE,MAAM,mBAAmB,GAAuE;IAC9F,KAAK,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;IAC/J,MAAM,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;IACnK,MAAM,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IACrK,IAAI,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;IAC7I,IAAI,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;IACrH,IAAI,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE;CACtH,CAAC;AAEK,KAAK,UAAU,SAAS,CAAC,MAAsB;IACpD,MAAM,UAAU,GAAgB,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ;QACnE,CAAC,CAAC,IAAA,qBAAY,EAAc,MAAM,CAAC,UAAU,EAAE,YAAY,EAAE,WAAW,CAAC;QACzE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;IACtB,MAAM,KAAK,GAAG,MAAM,IAAA,yBAAS,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAElG,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,+BAAY,EAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAC1E,MAAM,SAAS,GAAG,IAAA,oCAAiB,EAAC,QAAQ,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,KAAK,CAAC,sBAAsB,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;QAChH,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAE5E,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;YACZ,MAAM,UAAU,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACxD,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YAChE,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;YACvB,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,MAAM,CAAC,MAAM;YAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;QACxD,IAAI,MAAM,CAAC,MAAM;YAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;QACxD,IAAI,MAAM,CAAC,UAAU,IAAI,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC;QAC5E,IAAI,MAAM,CAAC,UAAU,IAAI,IAAI;YAAE,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC;QAC5E,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAE3B,IAAI,EAAE,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;YAC5E,MAAM,KAAK,GAAG,KAAK,CAAC,4BAA4B,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;YAChE,IAAI,EAAE,CAAC,kBAAkB,EAAE,CAAC;gBAC1B,KAAK,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC,kBAAkB,IAAI,MAAM,IAAI,EAAE,CAAC,kBAAkB,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1H,CAAC;YACD,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,IAAI,EAAE,CAAC,MAAM,IAAI,IAAI;YAAE,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;QAElD,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,MAAM,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;YACpC,MAAM,WAAW,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;YACtC,MAAM,cAAc,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;YACzC,OAAO,CAAC,KAAK,GAAG,WAAW,GAAG,cAAc,CAAC;YAC7C,OAAO,CAAC,gBAAgB,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;YACzE,MAAM,OAAO,GAAG,IAAA,SAAM,GAAE,CAAC;YAEzB,IAAI,EAAE,CAAC,UAAU,IAAI,mBAAmB,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;gBACxD,MAAM,MAAM,GAAG,mBAAmB,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;gBAClD,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;oBAC1B,WAAW,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE;oBAChF,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO;iBAC1D,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;YAChH,CAAC;YACD,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5C,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAC3B,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAS,EAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACtD,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;AAC9E,CAAC"}

package/dist/config/index.d.ts

@@ -1,5 +1,6 @@
 export declare const config: {
     draftsDir: string;
+    uploadBaseUrl: string;
     api: {
         baseUrl: string;
     };

package/dist/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,MAAM;;;;;;;;CAQlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,MAAM;;;;;;;;;CASlB,CAAC"}

package/dist/config/index.js

@@ -16,11 +16,12 @@ function defaultDraftsDir() {
 }
 exports.config = {
     draftsDir: process.env.CUT_DRAFTS_DIR || defaultDraftsDir(),
+    uploadBaseUrl: 'https://cutsdk-api.51sux.com',
     api: {
-        baseUrl: process.env.CUT_API_BASE || 'https://ts-api.fyshark.com',
+        baseUrl: 'https://cutsdk-api.51sux.com',
     },
     uploadApi: {
-        baseUrl: process.env.CUT_UPLOAD_API_BASE || '',
+        baseUrl: 'https://cutsdk-api.51sux.com',
     },
 };
 //# sourceMappingURL=index.js.map

package/dist/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,4CAAoB;AACpB,oDAA4B;AAC5B,gBAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,SAAS,gBAAgB;IACvB,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC;AAEY,QAAA,MAAM,GAAG;IACpB,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,gBAAgB,EAAE;IAC3D,GAAG,EAAE;QACH,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,4BAA4B;KAClE;IACD,SAAS,EAAE;QACT,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE;KAC/C;CACF,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,4CAAoB;AACpB,oDAA4B;AAC5B,gBAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,SAAS,gBAAgB;IACvB,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,cAAI,CAAC,IAAI,CAAC,YAAE,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AACnD,CAAC;AAEY,QAAA,MAAM,GAAG;IACpB,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,gBAAgB,EAAE;IAC3D,aAAa,EAAE,8BAA8B;IAC7C,GAAG,EAAE;QACH,OAAO,EAAE,8BAA8B;KACxC;IACD,SAAS,EAAE;QACT,OAAO,EAAE,8BAA8B;KACxC;CACF,CAAC"}

package/dist/draft/drafts/Effects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Effects.d.ts","sourceRoot":"","sources":["../../../src/draft/drafts/Effects.js"],"names":[],"mappings":"AAIA;IAoEI,qEAUC;IA3ED,2CA4DC;IA3DG;;;;QAAuB;IAiBnB,eAAiC;IACjC,UAAuB;IACvB,iBAAqC;IAqBzC,gCAAiC;IACjC,0BAA0B;IAC1B,sBAA4B;IAC5B,oBAAqB;IACrB,sBAAuB;IACvB,wBAA0B;IAC1B,4BAA8B;IAC9B,mBAAoB;IACpB,WAAkB;IAClB,aAAc;IACd,iBAAqB;IACrB,qBAAqB;IACrB,mBAAoB;IACpB,wBAAwB;IACxB,gBAAsB;IACtB,2BAA2B;IAC3B,aAA0B;IAC1B,cAAgB;IAChB,gBAAiB;CAuBxB"}
+{"version":3,"file":"Effects.d.ts","sourceRoot":"","sources":["../../../src/draft/drafts/Effects.js"],"names":[],"mappings":"AAIA;IAoEI,qEASC;IA1ED,2CA4DC;IA3DG;;;;QAAuB;IAiBnB,eAAiC;IACjC,UAAuB;IACvB,iBAAqC;IAqBzC,gCAAiC;IACjC,0BAA0B;IAC1B,sBAA4B;IAC5B,oBAAqB;IACrB,sBAAuB;IACvB,wBAA0B;IAC1B,4BAA8B;IAC9B,mBAAoB;IACpB,WAAkB;IAClB,aAAc;IACd,iBAAqB;IACrB,qBAAqB;IACrB,mBAAoB;IACpB,wBAAwB;IACxB,gBAAsB;IACtB,2BAA2B;IAC3B,aAA0B;IAC1B,cAAgB;IAChB,gBAAiB;CAsBxB"}

package/dist/draft/drafts/Effects.js

@@ -65,7 +65,6 @@ class Effects {
         let effect = null;
         if (online) {
             effect = await fetch_effect_by_name(effect_title);
-            console.log(effect);
             return new Effects(effect, true);
         }
         else {

package/dist/draft/drafts/Effects.js.map

@@ -1 +1 @@
-{"version":3,"file":"Effects.js","sourceRoot":"","sources":["../../../src/draft/drafts/Effects.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Effects.js","sourceRoot":"","sources":["../../../src/draft/drafts/Effects.js"],"names":[],"mappings":"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"}