@qxs-bns/utils 0.0.7 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qxs-bns/utils",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "main": "./index.cjs",
   "module": "./index.js",
   "types": "./types/index.d.ts",

package/src/file-operations.cjs

@@ -1 +1 @@
-"use strict";var s=(e,d,l)=>new Promise((o,t)=>{var i=a=>{try{n(l.next(a))}catch(c){t(c)}},u=a=>{try{n(l.throw(a))}catch(c){t(c)}},n=a=>a.done?o(a.value):Promise.resolve(a.value).then(i,u);n((l=l.apply(e,d)).next())});Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("../public/aliyun-upload-sdk-1.5.6/aliyun-upload-sdk-1.5.6.min.cjs"),f=require("../public/aliyun-upload-sdk-1.5.6/lib/aliyun-oss-sdk-6.17.1.min.cjs");function y(e){return s(this,null,function*(){return new Promise((d,l)=>{try{const o=document.createElement("script");o.text=e,document.head.appendChild(o),d()}catch(o){l(o)}})})}function h(){return s(this,null,function*(){try{if(yield y(f),yield y(S),!window.AliyunUpload)throw new Error("SDK 加载成功但未找到 AliyunUpload 对象")}catch(e){throw e}})}function A(e){return s(this,null,function*(){if(typeof window=="undefined")throw new TypeError("VideoUploader 只能在浏览器环境中使用");window.AliyunUpload||(yield h());const d=new window.AliyunUpload.Vod({onUploadFailed:e.onUploadFailed,onUploadSucceed:e.onUploadSucceed,onUploadProgress:e.onUploadProgress,onUploadTokenExpired:e.onUploadTokenExpired||(()=>{}),onUploadstarted:o=>s(this,null,function*(){var n;const{uploadAuth:t,uploadAddress:i,videoId:u}=(yield(n=e.onUploadstarted)==null?void 0:n.call(e,o))||{};t&&i&&u&&d.setUploadAuthAndAddress(o,t,i,u)})});return{uploader:d,upload:o=>s(this,null,function*(){return new Promise((t,i)=>{const u=JSON.stringify({Vod:{UserData:{IsShowWaterMark:"false",Priority:"7"}}});d.addFile(o,null,null,null,u),d.startUpload();const n=r=>{t({videoId:r.videoId})},a=(r,w,p)=>{i(new Error(p||"上传失败"))},c=d.onUploadSucceed,U=d.onUploadFailed;d.onUploadSucceed=r=>{n(r),c==null||c(r)},d.onUploadFailed=(r,w,p)=>{a(r,w,p),U==null||U(r,w,p)}})})}})}exports.createVideoUploader=A;
+"use strict";var s=(r,l,a)=>new Promise((o,c)=>{var e=n=>{try{d(a.next(n))}catch(i){c(i)}},t=n=>{try{d(a.throw(n))}catch(i){c(i)}},d=n=>n.done?o(n.value):Promise.resolve(n.value).then(e,t);d((a=a.apply(r,l)).next())});Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});function u(r){return s(this,null,function*(){return new Promise((l,a)=>{try{const o=document.createElement("script");o.src=r,o.onload=()=>{l()},o.onerror=()=>{a(new Error(`Failed to load script from ${r}`))},document.head.appendChild(o)}catch(o){a(o)}})})}function p(){return s(this,null,function*(){try{if(yield u("https://gosspublic.alicdn.com/aliyun-oss-sdk.min.js"),yield u("https://cdnfile.yaomaitong.cn/cdn/js/aliyun-upload-sdk1.3.1.min.js"),!window.AliyunUpload)throw new Error("SDK 加载成功但未找到 AliyunUpload 对象")}catch(r){throw r}})}function w(r){return s(this,null,function*(){if(typeof window=="undefined")throw new TypeError("VideoUploader 只能在浏览器环境中使用");window.AliyunUpload||(yield p());let l=null,a=null;const o=new window.AliyunUpload.Vod({onUploadProgress:r.onUploadProgress,onUploadTokenExpired:r.onUploadTokenExpired||(()=>{}),onUploadstarted:e=>s(this,null,function*(){var t;try{const{uploadAuth:d,uploadAddress:n,videoId:i}=(yield(t=r.onUploadstarted)==null?void 0:t.call(r,e))||{};d&&n&&i&&o.setUploadAuthAndAddress(e,d,n,i)}catch(d){throw d}}),onUploadSucceed:e=>{l==null||l(e)},onUploadFailed:(e,t,d)=>{a==null||a(new Error(`${d} ${t}`))}});return{uploader:o,upload:e=>s(this,null,function*(){return new Promise((t,d)=>{l=t,a=d;const n=JSON.stringify({Vod:{UserData:{IsShowWaterMark:"false",Priority:"7"}}});o.addFile(e,null,null,null,n),o.startUpload()})})}})}exports.createVideoUploader=w;

package/src/file-operations.js

@@ -1,65 +1,77 @@
-var s = (d, o, l) => new Promise((e, t) => {
-  var i = (a) => {
+var s = (r, l, a) => new Promise((o, c) => {
+  var e = (d) => {
     try {
-      r(l.next(a));
-    } catch (c) {
-      t(c);
+      n(a.next(d));
+    } catch (i) {
+      c(i);
     }
-  }, p = (a) => {
+  }, t = (d) => {
     try {
-      r(l.throw(a));
-    } catch (c) {
-      t(c);
+      n(a.throw(d));
+    } catch (i) {
+      c(i);
     }
-  }, r = (a) => a.done ? e(a.value) : Promise.resolve(a.value).then(i, p);
-  r((l = l.apply(d, o)).next());
+  }, n = (d) => d.done ? o(d.value) : Promise.resolve(d.value).then(e, t);
+  n((a = a.apply(r, l)).next());
 });
-import f from "../public/aliyun-upload-sdk-1.5.6/aliyun-upload-sdk-1.5.6.min.js";
-import h from "../public/aliyun-upload-sdk-1.5.6/lib/aliyun-oss-sdk-6.17.1.min.js";
-function y(d) {
+function p(r) {
   return s(this, null, function* () {
-    return new Promise((o, l) => {
+    return new Promise((l, a) => {
       try {
-        const e = document.createElement("script");
-        e.text = d, document.head.appendChild(e), o();
-      } catch (e) {
-        l(e);
+        const o = document.createElement("script");
+        o.src = r, o.onload = () => {
+          l();
+        }, o.onerror = () => {
+          a(new Error(`Failed to load script from ${r}`));
+        }, document.head.appendChild(o);
+      } catch (o) {
+        a(o);
       }
     });
   });
 }
-function A() {
+function u() {
   return s(this, null, function* () {
     try {
-      if (yield y(h), yield y(f), !window.AliyunUpload)
+      if (yield p("https://gosspublic.alicdn.com/aliyun-oss-sdk.min.js"), yield p("https://cdnfile.yaomaitong.cn/cdn/js/aliyun-upload-sdk1.3.1.min.js"), !window.AliyunUpload)
         throw new Error("SDK 加载成功但未找到 AliyunUpload 对象");
-    } catch (d) {
-      throw d;
+    } catch (r) {
+      throw r;
     }
   });
 }
-function P(d) {
+function y(r) {
   return s(this, null, function* () {
     if (typeof window == "undefined")
       throw new TypeError("VideoUploader 只能在浏览器环境中使用");
-    window.AliyunUpload || (yield A());
+    window.AliyunUpload || (yield u());
+    let l = null, a = null;
     const o = new window.AliyunUpload.Vod({
-      onUploadFailed: d.onUploadFailed,
-      onUploadSucceed: d.onUploadSucceed,
-      onUploadProgress: d.onUploadProgress,
-      onUploadTokenExpired: d.onUploadTokenExpired || (() => {
+      onUploadProgress: r.onUploadProgress,
+      onUploadTokenExpired: r.onUploadTokenExpired || (() => {
       }),
       onUploadstarted: (e) => s(this, null, function* () {
-        var r;
-        const { uploadAuth: t, uploadAddress: i, videoId: p } = (yield (r = d.onUploadstarted) == null ? void 0 : r.call(d, e)) || {};
-        t && i && p && o.setUploadAuthAndAddress(e, t, i, p);
-      })
+        var t;
+        try {
+          const { uploadAuth: n, uploadAddress: d, videoId: i } = (yield (t = r.onUploadstarted) == null ? void 0 : t.call(r, e)) || {};
+          n && d && i && o.setUploadAuthAndAddress(e, n, d, i);
+        } catch (n) {
+          throw n;
+        }
+      }),
+      onUploadSucceed: (e) => {
+        l == null || l(e);
+      },
+      onUploadFailed: (e, t, n) => {
+        a == null || a(new Error(`${n} ${t}`));
+      }
     });
     return {
       uploader: o,
       upload: (e) => s(this, null, function* () {
-        return new Promise((t, i) => {
-          const p = JSON.stringify({
+        return new Promise((t, n) => {
+          l = t, a = n;
+          const d = JSON.stringify({
             Vod: {
               UserData: {
                 IsShowWaterMark: "false",
@@ -67,22 +79,12 @@ function P(d) {
               }
             }
           });
-          o.addFile(e, null, null, null, p), o.startUpload();
-          const r = (n) => {
-            t({ videoId: n.videoId });
-          }, a = (n, w, u) => {
-            i(new Error(u || "上传失败"));
-          }, c = o.onUploadSucceed, U = o.onUploadFailed;
-          o.onUploadSucceed = (n) => {
-            r(n), c == null || c(n);
-          }, o.onUploadFailed = (n, w, u) => {
-            a(n, w, u), U == null || U(n, w, u);
-          };
+          o.addFile(e, null, null, null, d), o.startUpload();
         });
       })
     };
   });
 }
 export {
-  P as createVideoUploader
+  y as createVideoUploader
 };

package/types/index.d.ts

@@ -121,6 +121,7 @@ declare interface VideoUploadOptions {
 
 declare interface VideoUploadResult {
     videoId: string;
+    uploadInfo: any;
 }
 
 export declare function watermark(): {
@@ -130,16 +131,10 @@ export declare function watermark(): {
 
 export { }
 
-
-declare module '*.js?raw' {
-    const content: string;
-}
-
-
 declare global {
     interface Window {
         AliyunUpload: any;
-        OSS: typeof OSS;
+        OSS: any;
     }
 }