@idm-plugin/aliclient2 0.1.0 → 0.1.1

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

@@ -3,15 +3,21 @@
 /// <reference types="node" />
 import OSS from 'ali-oss';
 import { ReadStream } from 'fs';
+export declare enum OSSRegion {
+    tk = "tk",
+    hz = "hz",
+    sh = "sh"
+}
 /**
  * 阿里云OSS客户端, 限NODE环境中使用
  */
 export declare class AliOssClient {
     private client;
     private readonly region;
+    private readonly domain;
     /**
      * 创建阿里云OSS客户端
-     * @param region enum [tk, hz]
+     * @param region enum [tk, hz, sh]
      * @param accessKeyId
      * @param accessKeySecret
      * @param internal boolean true 内网访问

package/dist/index.js

@@ -1,71 +1,91 @@
 var j = Object.defineProperty;
-var w = (l, c, i) => c in l ? j(l, c, { enumerable: !0, configurable: !0, writable: !0, value: i }) : l[c] = i;
-var p = (l, c, i) => (w(l, typeof c != "symbol" ? c + "" : c, i), i);
-import x from "@log4js-node/log4js-api";
-import f from "ali-oss";
-import { ReadStream as k } from "fs";
+var w = (c, n, i) => n in c ? j(c, n, { enumerable: !0, configurable: !0, writable: !0, value: i }) : c[n] = i;
+var d = (c, n, i) => (w(c, typeof n != "symbol" ? n + "" : n, i), i);
+import k from "@log4js-node/log4js-api";
+import y from "ali-oss";
+import { ReadStream as x } from "fs";
 let s;
 try {
-  s = x.getLogger("ali-client");
+  s = k.getLogger("ali-client");
 } catch {
 } finally {
 }
-class I {
+var $ = /* @__PURE__ */ ((c) => (c.tk = "tk", c.hz = "hz", c.sh = "sh", c))($ || {});
+const f = {
+  tk: {
+    region: "oss-ap-northeast-1",
+    bucket: "idm-wx",
+    domain: "https://osstk.ormwx.com",
+    endpoint: "https://osstk.ormwx.com"
+  },
+  hz: {
+    region: "oss-cn-hangzhou",
+    bucket: "idm-hz",
+    domain: "https://ossimg.ormwx.com",
+    endpoint: "https://ossimg.ormwx.com",
+    forceCname: !0
+  },
+  sh: {
+    region: "oss-cn-shanghai",
+    bucket: "orm-sh",
+    domain: "https://osssh.ormwx.com",
+    endpoint: "https://osssh.ormwx.com",
+    forceCname: !0
+  }
+};
+function I(c, n) {
+  return c.domain ? c.domain : `https://${c.bucket}.${c.region}${n ? "-internal" : ""}.aliyuncs.com`;
+}
+class O {
   /**
    * 创建阿里云OSS客户端
-   * @param region enum [tk, hz]
+   * @param region enum [tk, hz, sh]
    * @param accessKeyId
    * @param accessKeySecret
    * @param internal boolean true 内网访问
    * @param cname boolean 是否使用自定义域名访问
    */
-  constructor(c, i, e, r, t = !0) {
-    p(this, "client");
-    p(this, "region");
-    this.region = c, c === "tk" ? this.client = new f({
-      secure: !0,
-      region: "oss-ap-northeast-1",
-      accessKeyId: i,
-      accessKeySecret: e,
-      bucket: "idm-wx",
-      internal: r,
-      cname: t,
-      endpoint: t ? "https://osstk.ormwx.com" : void 0
-    }) : this.client = new f({
+  constructor(n, i, t, r, e = !0) {
+    d(this, "client");
+    d(this, "region");
+    d(this, "domain");
+    this.region = n;
+    const a = f[this.region] || f.hz, u = !!a.endpoint && (a.forceCname ?? e);
+    this.domain = I(a, r), this.client = new y({
       secure: !0,
-      region: "oss-cn-hangzhou",
+      region: a.region,
       accessKeyId: i,
-      accessKeySecret: e,
-      bucket: "idm-hz",
+      accessKeySecret: t,
+      bucket: a.bucket,
       internal: r,
-      cname: !0,
-      endpoint: "https://ossimg.ormwx.com"
+      cname: u,
+      endpoint: u ? a.endpoint : void 0
     });
   }
-  async putObjects(c, i, e = {}) {
-    const r = i.map(async (t) => {
-      var n, o;
-      let a = `${c}/${t.name}`.replaceAll(/\/\//g, "/");
+  async putObjects(n, i, t = {}) {
+    const r = i.map(async (e) => {
+      var o, l;
+      let a = `${n}/${e.name}`.replaceAll(/\/\//g, "/");
       a = a.startsWith("/") ? a.substring(1) : a;
-      const u = this.region === "tk" ? `https://osstk.ormwx.com/${a}` : `https://ossimg.ormwx.com/${a}`, h = this.region === "tk" ? `https://osstk.ormwx.com/${a}` : `https://ossimg.ormwx.com/${a}`, m = e.headers || {};
-      return t.stream instanceof k ? await ((n = this.client) == null ? void 0 : n.putStream(a, t.stream)) : await ((o = this.client) == null ? void 0 : o.put(a, t.stream, { headers: m })), { url: u, name: t.name, aliSign: !0, external: h };
+      const u = `${this.domain}/${a}`, h = `${this.domain}/${a}`, m = t.headers || {};
+      return e.stream instanceof x ? await ((o = this.client) == null ? void 0 : o.putStream(a, e.stream)) : await ((l = this.client) == null ? void 0 : l.put(a, e.stream, { headers: m })), { url: u, name: e.name, aliSign: !0, external: h };
     });
-    return await Promise.all(r).then((t) => (s.info("[%s] upload to oss success, url: %j", e.requestId, t), t)).catch((t) => (s.error("[%s] upload to oss failed: %j-%s", e.requestId, t), []));
+    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 = {}) {
+  async deleteObject(n, i = {}) {
     var r;
-    let e = `${c}`.replaceAll(/\/\//g, "/");
-    e = e.startsWith("/") ? e.substring(1) : e;
+    let t = `${n}`.replaceAll(/\/\//g, "/");
+    t = t.startsWith("/") ? t.substring(1) : t;
     try {
-      const t = await ((r = this.client) == null ? void 0 : r.delete(e));
-      return s == null || s.info("[%s] delete oss object success: %s", i.requestId, e), t;
-    } catch (t) {
-      return s == null || s.error("[%s] delete oss object failed: %s - %j", i.requestId, e, t), null;
+      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;
     }
   }
   /**
@@ -74,35 +94,35 @@ class I {
    * @param names
    * @param options
    */
-  async deleteObjects(c, i, e = {}) {
+  async deleteObjects(n, i, t = {}) {
     var h, m;
-    let r = `${c}`.replaceAll(/\/\//g, "/");
+    let r = `${n}`.replaceAll(/\/\//g, "/");
     r = r.startsWith("/") ? r.substring(1) : r, r && !r.endsWith("/") && (r += "/");
-    let t = [];
+    let e = [];
     if (Array.isArray(i) && i.length > 0)
-      t = i.map((n) => `${r}${n}`.replaceAll(/\/\//g, "/").replace(/^\//, ""));
+      e = i.map((o) => `${r}${o}`.replaceAll(/\/\//g, "/").replace(/^\//, ""));
     else {
-      let n;
+      let o;
       try {
         do {
-          const o = await ((h = this.client) == null ? void 0 : h.list({ prefix: r, marker: n, "max-keys": 1e3 })), d = (o == null ? void 0 : o.objects) || [];
-          t.push(...d.map((b) => b.name)), n = o == null ? void 0 : o.nextMarker;
-        } while (n);
-      } catch (o) {
-        return s == null || s.error("[%s] list oss objects failed: %s - %j", e.requestId, r, o), [];
+          const l = await ((h = this.client) == null ? void 0 : h.list({ prefix: r, marker: o, "max-keys": 1e3 })), p = (l == null ? void 0 : l.objects) || [];
+          e.push(...p.map((b) => b.name)), o = l == null ? void 0 : l.nextMarker;
+        } while (o);
+      } catch (l) {
+        return s == null || s.error("[%s] list oss objects failed: %s - %j", t.requestId, r, l), [];
       }
     }
-    if (t.length === 0)
-      return s == null || s.info("[%s] no objects to delete for prefix: %s", e.requestId, r), [];
+    if (e.length === 0)
+      return s == null || s.info("[%s] no objects to delete for prefix: %s", t.requestId, r), [];
     const a = 1e3, u = [];
     try {
-      for (let n = 0; n < t.length; n += a) {
-        const o = t.slice(n, n + a), d = await ((m = this.client) == null ? void 0 : m.deleteMulti(o, { quiet: !0 }));
-        u.push(d);
+      for (let o = 0; o < e.length; o += a) {
+        const l = e.slice(o, o + a), p = await ((m = this.client) == null ? void 0 : m.deleteMulti(l, { quiet: !0 }));
+        u.push(p);
       }
-      return s == null || s.info("[%s] delete oss objects success, count: %d", e.requestId, t.length), u;
-    } catch (n) {
-      return s == null || s.error("[%s] delete oss objects failed: %s - %j", e.requestId, r, n), [];
+      return s == null || s.info("[%s] delete oss objects success, count: %d", t.requestId, e.length), u;
+    } catch (o) {
+      return s == null || s.error("[%s] delete oss objects failed: %s - %j", t.requestId, r, o), [];
     }
   }
   /**
@@ -110,11 +130,12 @@ class I {
    * @param url 待签名的url
    * @param expires 过期时间,单位秒
    */
-  async signature(c, i = 60) {
-    var e;
-    return (e = this.client) == null ? void 0 : e.signatureUrl(c, { expires: i });
+  async signature(n, i = 60) {
+    var t;
+    return (t = this.client) == null ? void 0 : t.signatureUrl(n, { expires: i });
   }
 }
 export {
-  I as AliOssClient
+  O as AliOssClient,
+  $ as OSSRegion
 };

package/dist/index.umd.cjs

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

package/package.json

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