@idm-plugin/aliclient2 0.0.1 → 0.0.2

package/dist/alioss/src/oss.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
+import OSS from 'ali-oss';
 import { ReadStream } from 'fs';
 /**
  * 阿里云OSS客户端, 限NODE环境中使用
@@ -25,6 +26,19 @@ export declare class AliOssClient {
         aliSign: boolean;
         external: string;
     }[] | never[]>;
+    /**
+     * 删除对象
+     * @param filePath
+     * @param options
+     */
+    deleteObject(filePath: string, options?: any): Promise<OSS.DeleteResult | null | undefined>;
+    /**
+     * 删除目录下所有对象或按names列表删除
+     * @param directory
+     * @param names
+     * @param options
+     */
+    deleteObjects(directory: string, names?: string[], options?: any): Promise<any[]>;
     /**
      * 签名
      * @param url 待签名的url

package/dist/index.js

@@ -1,16 +1,16 @@
-var g = Object.defineProperty;
-var d = (n, t, e) => t in n ? g(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
-var a = (n, t, e) => (d(n, typeof t != "symbol" ? t + "" : t, e), e);
-import w from "@log4js-node/log4js-api";
-import u from "ali-oss";
-import { ReadStream as f } from "fs";
-let m;
+var j = Object.defineProperty;
+var w = (o, c, i) => c in o ? j(o, c, { enumerable: !0, configurable: !0, writable: !0, value: i }) : o[c] = i;
+var p = (o, c, i) => (w(o, typeof c != "symbol" ? c + "" : c, i), i);
+import x from "@log4js-node/log4js-api";
+import f from "ali-oss";
+import { ReadStream as y } from "fs";
+let s;
 try {
-  m = w.getLogger("ali-client");
+  s = x.getLogger("ali-client");
 } catch {
 } finally {
 }
-class b {
+class I {
   /**
    * 创建阿里云OSS客户端
    * @param region enum [tk, hz]
@@ -18,49 +18,102 @@ class b {
    * @param accessKeySecret
    * @param internal boolean true 内网访问
    */
-  constructor(t, e, r, o) {
-    a(this, "client");
-    a(this, "region");
-    this.region = t, t === "tk" ? this.client = new u({
+  constructor(c, i, t, r) {
+    p(this, "client");
+    p(this, "region");
+    this.region = c, c === "tk" ? this.client = new f({
       secure: !0,
       region: "oss-ap-northeast-1",
-      accessKeyId: e,
-      accessKeySecret: r,
+      accessKeyId: i,
+      accessKeySecret: t,
       bucket: "idm-wx",
-      internal: o,
+      internal: r,
       cname: !0,
       endpoint: "https://img.idmwx.com"
-    }) : this.client = new u({
+    }) : this.client = new f({
       secure: !0,
       region: "oss-cn-hangzhou",
-      accessKeyId: e,
-      accessKeySecret: r,
+      accessKeyId: i,
+      accessKeySecret: t,
       bucket: "idm-hz",
-      internal: o,
+      internal: r,
       cname: !0,
       endpoint: "https://osshz.idmwx.com"
     });
   }
-  async putObjects(t, e, r = {}) {
-    const o = e.map(async (s) => {
-      var c, l;
-      let i = `${t}/${s.name}`.replaceAll(/\/\//g, "/");
-      i = i.startsWith("/") ? i.substring(1) : i;
-      const h = this.region === "tk" ? `https://oss.idmwx.com/${i}` : `https://osshz.idmwx.com/${i}`, p = this.region === "tk" ? `https://img.idmwx.com/${i}` : `https://osshz.idmwx.com/${i}`;
-      return s.stream instanceof f ? await ((c = this.client) == null ? void 0 : c.putStream(i, s.stream)) : await ((l = this.client) == null ? void 0 : l.put(i, s.stream)), { url: h, name: s.name, aliSign: !0, external: p };
+  async putObjects(c, i, t = {}) {
+    const r = i.map(async (e) => {
+      var u, n;
+      let a = `${c}/${e.name}`.replaceAll(/\/\//g, "/");
+      a = a.startsWith("/") ? a.substring(1) : a;
+      const h = this.region === "tk" ? `https://oss.idmwx.com/${a}` : `https://osshz.idmwx.com/${a}`, d = this.region === "tk" ? `https://img.idmwx.com/${a}` : `https://osshz.idmwx.com/${a}`;
+      return e.stream instanceof y ? await ((u = this.client) == null ? void 0 : u.putStream(a, e.stream)) : await ((n = this.client) == null ? void 0 : n.put(a, e.stream)), { url: h, name: e.name, aliSign: !0, external: d };
     });
-    return await Promise.all(o).then((s) => (m.info("[%s] upload to oss success, url: %j", r.requestId, s), s)).catch((s) => (m.error("[%s] upload to oss failed: %j-%s", r.requestId, s), []));
+    return await Promise.all(r).then((e) => (s.info("[%s] upload to oss success, url: %j", t.requestId, e), e)).catch((e) => (s.error("[%s] upload to oss failed: %j-%s", t.requestId, e), []));
+  }
+  /**
+   * 删除对象
+   * @param filePath
+   * @param options
+   */
+  async deleteObject(c, i = {}) {
+    var r;
+    let t = `${c}`.replaceAll(/\/\//g, "/");
+    t = t.startsWith("/") ? t.substring(1) : t;
+    try {
+      const e = await ((r = this.client) == null ? void 0 : r.delete(t));
+      return s == null || s.info("[%s] delete oss object success: %s", i.requestId, t), e;
+    } catch (e) {
+      return s == null || s.error("[%s] delete oss object failed: %s - %j", i.requestId, t, e), null;
+    }
+  }
+  /**
+   * 删除目录下所有对象或按names列表删除
+   * @param directory
+   * @param names
+   * @param options
+   */
+  async deleteObjects(c, i, t = {}) {
+    var d, u;
+    let r = `${c}`.replaceAll(/\/\//g, "/");
+    r = r.startsWith("/") ? r.substring(1) : r, r && !r.endsWith("/") && (r += "/");
+    let e = [];
+    if (Array.isArray(i) && i.length > 0)
+      e = i.map((n) => `${r}${n}`.replaceAll(/\/\//g, "/").replace(/^\//, ""));
+    else {
+      let n;
+      try {
+        do {
+          const l = await ((d = this.client) == null ? void 0 : d.list({ prefix: r, marker: n })), m = (l == null ? void 0 : l.objects) || [];
+          e.push(...m.map((b) => b.name)), n = l == null ? void 0 : l.nextMarker;
+        } while (n);
+      } catch (l) {
+        return s == null || s.error("[%s] list oss objects failed: %s - %j", t.requestId, r, l), [];
+      }
+    }
+    if (e.length === 0)
+      return s == null || s.info("[%s] no objects to delete for prefix: %s", t.requestId, r), [];
+    const a = 1e3, h = [];
+    try {
+      for (let n = 0; n < e.length; n += a) {
+        const l = e.slice(n, n + a), m = await ((u = this.client) == null ? void 0 : u.deleteMulti(l, { quiet: !0 }));
+        h.push(m);
+      }
+      return s == null || s.info("[%s] delete oss objects success, count: %d", t.requestId, e.length), h;
+    } catch (n) {
+      return s == null || s.error("[%s] delete oss objects failed: %s - %j", t.requestId, r, n), [];
+    }
   }
   /**
    * 签名
    * @param url 待签名的url
    * @param expires 过期时间,单位秒
    */
-  async signature(t, e = 60) {
-    var r;
-    return (r = this.client) == null ? void 0 : r.signatureUrl(t, { expires: e });
+  async signature(c, i = 60) {
+    var t;
+    return (t = this.client) == null ? void 0 : t.signatureUrl(c, { expires: i });
   }
 }
 export {
-  b as AliOssClient
+  I as AliOssClient
 };

package/dist/index.umd.cjs

@@ -1 +1 @@
-(function(e,t){typeof exports=="object"&&typeof module<"u"?t(exports,require("@log4js-node/log4js-api"),require("ali-oss"),require("fs")):typeof define=="function"&&define.amd?define(["exports","@log4js-node/log4js-api","ali-oss","fs"],t):(e=typeof globalThis<"u"?globalThis:e||self,t(e["idm-plugin-aliclient"]={},e["@log4js-node/log4js-api"],e.OSS,e.fs))})(this,function(e,t,n,h){"use strict";var j=Object.defineProperty;var x=(e,t,n)=>t in e?j(e,t,{enumerable:!0,configurable:!0,writable:!0,value:n}):e[t]=n;var c=(e,t,n)=>(x(e,typeof t!="symbol"?t+"":t,n),n);let a;try{a=t.getLogger("ali-client")}catch{}finally{}class p{constructor(o,l,r,u){c(this,"client");c(this,"region");this.region=o,o==="tk"?this.client=new n({secure:!0,region:"oss-ap-northeast-1",accessKeyId:l,accessKeySecret:r,bucket:"idm-wx",internal:u,cname:!0,endpoint:"https://img.idmwx.com"}):this.client=new n({secure:!0,region:"oss-cn-hangzhou",accessKeyId:l,accessKeySecret:r,bucket:"idm-hz",internal:u,cname:!0,endpoint:"https://osshz.idmwx.com"})}async putObjects(o,l,r={}){const u=l.map(async s=>{var m,d;let i=`${o}/${s.name}`.replaceAll(/\/\//g,"/");i=i.startsWith("/")?i.substring(1):i;const f=this.region==="tk"?`https://oss.idmwx.com/${i}`:`https://osshz.idmwx.com/${i}`,w=this.region==="tk"?`https://img.idmwx.com/${i}`:`https://osshz.idmwx.com/${i}`;return s.stream instanceof h.ReadStream?await((m=this.client)==null?void 0:m.putStream(i,s.stream)):await((d=this.client)==null?void 0:d.put(i,s.stream)),{url:f,name:s.name,aliSign:!0,external:w}});return await Promise.all(u).then(s=>(a.info("[%s] upload to oss success, url: %j",r.requestId,s),s)).catch(s=>(a.error("[%s] upload to oss failed: %j-%s",r.requestId,s),[]))}async signature(o,l=60){var r;return(r=this.client)==null?void 0:r.signatureUrl(o,{expires:l})}}e.AliOssClient=p,Object.defineProperty(e,Symbol.toStringTag,{value:"Module"})});
+(function(r,c){typeof exports=="object"&&typeof module<"u"?c(exports,require("@log4js-node/log4js-api"),require("ali-oss"),require("fs")):typeof define=="function"&&define.amd?define(["exports","@log4js-node/log4js-api","ali-oss","fs"],c):(r=typeof globalThis<"u"?globalThis:r||self,c(r["idm-plugin-aliclient"]={},r["@log4js-node/log4js-api"],r.OSS,r.fs))})(this,function(r,c,d,b){"use strict";var q=Object.defineProperty;var $=(r,c,d)=>c in r?q(r,c,{enumerable:!0,configurable:!0,writable:!0,value:d}):r[c]=d;var j=(r,c,d)=>($(r,typeof c!="symbol"?c+"":c,d),d);let e;try{e=c.getLogger("ali-client")}catch{}finally{}class w{constructor(o,l,t,i){j(this,"client");j(this,"region");this.region=o,o==="tk"?this.client=new d({secure:!0,region:"oss-ap-northeast-1",accessKeyId:l,accessKeySecret:t,bucket:"idm-wx",internal:i,cname:!0,endpoint:"https://img.idmwx.com"}):this.client=new d({secure:!0,region:"oss-cn-hangzhou",accessKeyId:l,accessKeySecret:t,bucket:"idm-hz",internal:i,cname:!0,endpoint:"https://osshz.idmwx.com"})}async putObjects(o,l,t={}){const i=l.map(async s=>{var h,n;let a=`${o}/${s.name}`.replaceAll(/\/\//g,"/");a=a.startsWith("/")?a.substring(1):a;const f=this.region==="tk"?`https://oss.idmwx.com/${a}`:`https://osshz.idmwx.com/${a}`,m=this.region==="tk"?`https://img.idmwx.com/${a}`:`https://osshz.idmwx.com/${a}`;return s.stream instanceof b.ReadStream?await((h=this.client)==null?void 0:h.putStream(a,s.stream)):await((n=this.client)==null?void 0:n.put(a,s.stream)),{url:f,name:s.name,aliSign:!0,external:m}});return await Promise.all(i).then(s=>(e.info("[%s] upload to oss success, url: %j",t.requestId,s),s)).catch(s=>(e.error("[%s] upload to oss failed: %j-%s",t.requestId,s),[]))}async deleteObject(o,l={}){var i;let t=`${o}`.replaceAll(/\/\//g,"/");t=t.startsWith("/")?t.substring(1):t;try{const s=await((i=this.client)==null?void 0:i.delete(t));return e==null||e.info("[%s] delete oss object success: %s",l.requestId,t),s}catch(s){return e==null||e.error("[%s] delete oss object failed: %s - %j",l.requestId,t,s),null}}async deleteObjects(o,l,t={}){var m,h;let i=`${o}`.replaceAll(/\/\//g,"/");i=i.startsWith("/")?i.substring(1):i,i&&!i.endsWith("/")&&(i+="/");let s=[];if(Array.isArray(l)&&l.length>0)s=l.map(n=>`${i}${n}`.replaceAll(/\/\//g,"/").replace(/^\//,""));else{let n;try{do{const u=await((m=this.client)==null?void 0:m.list({prefix:i,marker:n})),p=(u==null?void 0:u.objects)||[];s.push(...p.map(x=>x.name)),n=u==null?void 0:u.nextMarker}while(n)}catch(u){return e==null||e.error("[%s] list oss objects failed: %s - %j",t.requestId,i,u),[]}}if(s.length===0)return e==null||e.info("[%s] no objects to delete for prefix: %s",t.requestId,i),[];const a=1e3,f=[];try{for(let n=0;n<s.length;n+=a){const u=s.slice(n,n+a),p=await((h=this.client)==null?void 0:h.deleteMulti(u,{quiet:!0}));f.push(p)}return e==null||e.info("[%s] delete oss objects success, count: %d",t.requestId,s.length),f}catch(n){return e==null||e.error("[%s] delete oss objects failed: %s - %j",t.requestId,i,n),[]}}async signature(o,l=60){var t;return(t=this.client)==null?void 0:t.signatureUrl(o,{expires:l})}}r.AliOssClient=w,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@idm-plugin/aliclient2",
   "private": false,
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "idm plugin for ali used in backend",
   "type": "module",
   "keywords": [