@duxweb/dvha-core 1.0.33 → 1.0.35

package/dist/cjs/hooks/upload/s3.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("../data.cjs"),U=require("axios");function g(n){const i=m.useClient();return{async upload(a,t){const o=await i.request({method:"GET",path:n.signPath,query:{name:a.name,size:a.size,mime:a.type,...t.params},signal:t.signal,onUploadProgress:t.onUploadProgress}),r=n.signCallback?.(o)||{uploadUrl:o.data?.uploadUrl,url:o.data?.url,params:o.data?.params};if(!r.uploadUrl)throw new Error("Upload URL is required");if(!r.url)throw new Error("File URL is required");const u=t.method||"POST";let s=null;const p=t.headers||{};if(u==="PUT")s=a,p["Content-Type"]=a.type||"application/octet-stream";else{const e=new FormData;e.append("Content-Type",a.type||"application/octet-stream"),e.append("file",a),r.params&&Object.entries(r.params).forEach(([d,c])=>{e.append(d,String(c))}),s=e}const l=await U.request({method:u,url:r.uploadUrl,data:s,signal:t.signal,headers:p,onUploadProgress:e=>{if(t.onUploadProgress&&e.total){const d=Math.round(e.loaded*100/e.total);t.onUploadProgress({loaded:e.loaded,total:e.total,percent:d})}}});if(l.status<200||l.status>=300)throw new Error(`S3 upload failed: ${l.statusText}`);return{data:{url:r.url,filename:a.name,size:a.size,mime:a.type},message:"upload successful"}}}}exports.createS3UploadDriver=g;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("axios"),U=require("../data.cjs");function g(n){const p=U.useClient();return{async upload(a,r){const s=await p.request({method:"GET",path:n.signPath,query:{name:a.name,size:a.size,mime:a.type,...r.params},signal:r.signal,onUploadProgress:r.onUploadProgress}),t=n.signCallback?.(s)||{uploadUrl:s.data?.uploadUrl,url:s.data?.url,params:s.data?.params};if(!t.uploadUrl)throw new Error("Upload URL is required");if(!t.url)throw new Error("File URL is required");const u=r.method||"POST";let o=null;const i=r.headers||{};if(u==="PUT")o=a,i["Content-Type"]=a.type||"application/octet-stream";else{const e=new FormData;t.params&&Object.entries(t.params).forEach(([d,c])=>{e.append(d,String(c))}),e.append("file",a),o=e}const l=await m.request({method:u,url:t.uploadUrl,data:o,signal:r.signal,headers:i,onUploadProgress:e=>{if(r.onUploadProgress&&e.total){const d=Math.round(e.loaded*100/e.total);r.onUploadProgress({loaded:e.loaded,total:e.total,percent:d})}}});if(l.status<200||l.status>=300)throw new Error(`S3 upload failed: ${l.statusText}`);return{data:{url:t.url,filename:a.name,size:a.size,mime:a.type},message:"upload successful"}}}}exports.createS3UploadDriver=g;

package/dist/esm/hooks/upload/s3.js

@@ -1,9 +1,9 @@
-import { useClient as c } from "../data.js";
-import U from "axios";
+import c from "axios";
+import { useClient as U } from "../data.js";
 function w(n) {
-  const i = c();
+  const i = U();
   return {
-    async upload(a, t) {
+    async upload(a, r) {
       const o = await i.request({
         method: "GET",
         path: n.signPath,
@@ -11,40 +11,40 @@ function w(n) {
           name: a.name,
           size: a.size,
           mime: a.type,
-          ...t.params
+          ...r.params
         },
-        signal: t.signal,
-        onUploadProgress: t.onUploadProgress
-      }), r = n.signCallback?.(o) || {
+        signal: r.signal,
+        onUploadProgress: r.onUploadProgress
+      }), t = n.signCallback?.(o) || {
         uploadUrl: o.data?.uploadUrl,
         url: o.data?.url,
         params: o.data?.params
       };
-      if (!r.uploadUrl)
+      if (!t.uploadUrl)
         throw new Error("Upload URL is required");
-      if (!r.url)
+      if (!t.url)
         throw new Error("File URL is required");
-      const p = t.method || "POST";
+      const u = r.method || "POST";
       let s = null;
-      const u = t.headers || {};
-      if (p === "PUT")
-        s = a, u["Content-Type"] = a.type || "application/octet-stream";
+      const p = r.headers || {};
+      if (u === "PUT")
+        s = a, p["Content-Type"] = a.type || "application/octet-stream";
       else {
         const e = new FormData();
-        e.append("Content-Type", a.type || "application/octet-stream"), e.append("file", a), r.params && Object.entries(r.params).forEach(([d, m]) => {
+        t.params && Object.entries(t.params).forEach(([d, m]) => {
           e.append(d, String(m));
-        }), s = e;
+        }), e.append("file", a), s = e;
       }
-      const l = await U.request({
-        method: p,
-        url: r.uploadUrl,
+      const l = await c.request({
+        method: u,
+        url: t.uploadUrl,
         data: s,
-        signal: t.signal,
-        headers: u,
+        signal: r.signal,
+        headers: p,
         onUploadProgress: (e) => {
-          if (t.onUploadProgress && e.total) {
+          if (r.onUploadProgress && e.total) {
             const d = Math.round(e.loaded * 100 / e.total);
-            t.onUploadProgress({
+            r.onUploadProgress({
               loaded: e.loaded,
               total: e.total,
               percent: d
@@ -56,7 +56,7 @@ function w(n) {
         throw new Error(`S3 upload failed: ${l.statusText}`);
       return {
         data: {
-          url: r.url,
+          url: t.url,
           filename: a.name,
           size: a.size,
           mime: a.type

package/dist/types/hooks/upload/index.d.ts

@@ -1,3 +1,3 @@
-export * from './types';
 export * from './local';
 export * from './s3';
+export * from './types';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@duxweb/dvha-core",
   "type": "module",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "author": "DuxWeb",
   "license": "MIT",
   "repository": {