fsd-oss 0.14.0 → 0.14.1

package/lib/index.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const Path = require("path");
-const qs = require("qs");
-const slash = require("slash");
-const minimatch = require("minimatch");
-const Debugger = require("debug");
-const eachLimit = require("async/eachLimit");
-const RPC = require("@alicloud/pop-core");
-const simple_oss_client_1 = require("./simple-oss-client");
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const qs_1 = tslib_1.__importDefault(require("qs"));
+const slash_1 = tslib_1.__importDefault(require("slash"));
+const minimatch_1 = require("minimatch");
+const debug_1 = tslib_1.__importDefault(require("debug"));
+const eachLimit_1 = tslib_1.__importDefault(require("async/eachLimit"));
+const pop_core_1 = tslib_1.__importDefault(require("@alicloud/pop-core"));
+const simple_oss_client_1 = tslib_1.__importDefault(require("./simple-oss-client"));
 const stream_1 = require("stream");
-const debug = Debugger('fsd-oss');
+const debug = (0, debug_1.default)('fsd-oss');
 const CALLBACK_BODY = 'bucket=${bucket}&path=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&height=${imageInfo.height}&width=${imageInfo.width}&format=${imageInfo.format}';
 class OSSAdapter {
     constructor(options) {
@@ -41,7 +42,7 @@ class OSSAdapter {
             if (options.region) {
                 stsEndpoint = `https://sts.${options.region.replace('oss-', '')}.aliyuncs.com`;
             }
-            this._rpc = new RPC({
+            this._rpc = new pop_core_1.default({
                 accessKeyId: options.accessKeyId,
                 accessKeySecret: options.accessKeySecret,
                 endpoint: stsEndpoint,
@@ -51,7 +52,7 @@ class OSSAdapter {
         this.createUploadToken = async (path, meta, durationSeconds) => {
             if (!options.accountId || !options.roleName)
                 throw new Error('Can not create sts token, missing options: accountId and roleName!');
-            path = slash(Path.join(options.root, path)).substring(1);
+            path = (0, slash_1.default)(path_1.default.join(options.root, path)).substring(1);
             let params = {
                 RoleArn: `acs:ram::${options.accountId}:role/${options.roleName}`,
                 RoleSessionName: 'fsd',
@@ -109,7 +110,7 @@ class OSSAdapter {
     async append(path, data) {
         debug('append %s', path);
         const { root } = this._options;
-        let p = slash(Path.join(root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(root, path)).substring(1);
         if (typeof data === 'string') {
             data = Buffer.from(data);
         }
@@ -123,7 +124,7 @@ class OSSAdapter {
     async createReadStream(path, options) {
         debug('createReadStream %s options: %o', path, options);
         const { root } = this._options;
-        let p = slash(Path.join(root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(root, path)).substring(1);
         let opts = {};
         if (options) {
             let start = options.start || 0;
@@ -146,7 +147,7 @@ class OSSAdapter {
         if (options?.start)
             throw new Error('fsd-oss read stream does not support start options');
         const { root } = this._options;
-        let p = slash(Path.join(root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(root, path)).substring(1);
         let stream = new stream_1.PassThrough();
         stream.promise = this._oss.put(p, stream);
         return stream;
@@ -154,7 +155,7 @@ class OSSAdapter {
     async unlink(path) {
         debug('unlink %s', path);
         const { root } = this._options;
-        let p = slash(Path.join(root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(root, path)).substring(1);
         if (path.endsWith('/')) {
             let continuationToken = '';
             do {
@@ -178,7 +179,7 @@ class OSSAdapter {
     }
     async mkdir(path, recursive) {
         debug('mkdir %s', path);
-        let parent = Path.dirname(path);
+        let parent = path_1.default.dirname(path);
         if (recursive && parent !== '/') {
             parent += '/';
             if (!(await this.exists(parent))) {
@@ -187,7 +188,7 @@ class OSSAdapter {
             }
         }
         const { root } = this._options;
-        let p = slash(Path.join(root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(root, path)).substring(1);
         let res = await this._oss.put(p, Buffer.from(''));
         debug('mkdir result: %O', res);
     }
@@ -202,7 +203,7 @@ class OSSAdapter {
             pattern = recursion;
         }
         const { root } = this._options;
-        let p = slash(Path.join(root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(root, path)).substring(1);
         let results = Object.create(null);
         let continuationToken = '';
         let hasContents = false;
@@ -219,12 +220,12 @@ class OSSAdapter {
             if (list.Contents) {
                 hasContents = true;
                 list.Contents.forEach((object) => {
-                    let relative = slash(Path.relative(p, object.Key));
+                    let relative = (0, slash_1.default)(path_1.default.relative(p, object.Key));
                     if (!relative)
                         return;
                     if (object.Key.endsWith('/'))
                         relative += '/';
-                    if (pattern && pattern !== '**/*' && !minimatch(relative, pattern))
+                    if (pattern && pattern !== '**/*' && !(0, minimatch_1.minimatch)(relative, pattern))
                         return;
                     results[relative] = {
                         name: relative,
@@ -238,7 +239,7 @@ class OSSAdapter {
             if (list.CommonPrefixes) {
                 hasCommonPrefixes = true;
                 list.CommonPrefixes.forEach((prefix) => {
-                    let relative = slash(Path.relative(p, prefix.Prefix));
+                    let relative = (0, slash_1.default)(path_1.default.relative(p, prefix.Prefix));
                     if (!relative)
                         return;
                     relative += '/';
@@ -259,7 +260,7 @@ class OSSAdapter {
         debug('createUrl %s', path);
         options = Object.assign({}, options);
         const { root, urlPrefix, publicRead } = this._options;
-        let p = slash(Path.join(root, path));
+        let p = (0, slash_1.default)(path_1.default.join(root, path));
         let suffix = '';
         if (options.thumb) {
             if (options.thumb in this._options.thumbs) {
@@ -275,7 +276,7 @@ class OSSAdapter {
         if (suffix) {
             if (suffix[0] === '?')
                 suffix = suffix.substring(1);
-            options.query = qs.parse(suffix);
+            options.query = qs_1.default.parse(suffix);
         }
         let url = this._oss.signatureUrl(p.substring(1), options);
         if (urlPrefix) {
@@ -288,8 +289,8 @@ class OSSAdapter {
         if (!(await this.exists(path)))
             throw new Error('The source path is not exists!');
         const { root } = this._options;
-        let from = slash(Path.join(root, path)).substring(1);
-        let to = slash(Path.join(root, dest)).substring(1);
+        let from = (0, slash_1.default)(path_1.default.join(root, path)).substring(1);
+        let to = (0, slash_1.default)(path_1.default.join(root, dest)).substring(1);
         if (path.endsWith('/')) {
             debug('copy directory %s -> %s', from, to);
             let continuationToken = '';
@@ -302,10 +303,10 @@ class OSSAdapter {
                 debug('list result: %O', list);
                 continuationToken = list.NextContinuationToken;
                 if (list.Contents?.length) {
-                    await eachLimit(list.Contents, 10, async (object) => {
+                    await (0, eachLimit_1.default)(list.Contents, 10, async (object) => {
                         debug(' -> copy %s', object.Key);
-                        let relative = slash(Path.relative(from, object.Key));
-                        let target = slash(Path.join(to, relative));
+                        let relative = (0, slash_1.default)(path_1.default.relative(from, object.Key));
+                        let target = (0, slash_1.default)(path_1.default.join(to, relative));
                         await this._oss.copy(target, object.Key);
                     });
                 }
@@ -328,7 +329,7 @@ class OSSAdapter {
     async exists(path) {
         debug('check exists %s', path);
         const { root } = this._options;
-        let p = slash(Path.join(root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(root, path)).substring(1);
         if (path.endsWith('/')) {
             let list = await this._oss.list({
                 prefix: p,
@@ -347,7 +348,7 @@ class OSSAdapter {
     async isFile(path) {
         debug('check is file %s', path);
         const { root } = this._options;
-        let p = slash(Path.join(root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(root, path)).substring(1);
         try {
             await this._oss.head(p);
             return true;
@@ -358,7 +359,7 @@ class OSSAdapter {
     }
     async isDirectory(path) {
         debug('check is directory %s', path);
-        let p = slash(Path.join(this._options.root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(this._options.root, path)).substring(1);
         try {
             await this._oss.head(p);
             return true;
@@ -369,20 +370,20 @@ class OSSAdapter {
     }
     async size(path) {
         debug('get file size %s', path);
-        let p = slash(Path.join(this._options.root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(this._options.root, path)).substring(1);
         let res = await this._oss.head(p);
         return parseInt(res.headers.get('Content-Length')) || 0;
     }
     async lastModified(path) {
         debug('get file lastModified %s', path);
-        let p = slash(Path.join(this._options.root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(this._options.root, path)).substring(1);
         let res = await this._oss.head(p);
         let headers = res.headers;
         return new Date(headers.get('Last-Modified'));
     }
     async initMultipartUpload(path, partCount) {
         debug('initMultipartUpload %s, partCount: %d', path, partCount);
-        let p = slash(Path.join(this._options.root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(this._options.root, path)).substring(1);
         let { UploadId } = await this._oss.initMultipartUpload(p);
         let files = [];
         for (let i = 1; i <= partCount; i += 1) {
@@ -392,7 +393,7 @@ class OSSAdapter {
     }
     async writePart(path, partTask, data, size) {
         debug('writePart %s, task: %s', path, partTask);
-        let p = slash(Path.join(this._options.root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(this._options.root, path)).substring(1);
         if (!partTask.startsWith('task://'))
             throw new Error('Invalid part task id');
         let [uploadId, no] = partTask.replace('task://', '').split('?');
@@ -407,7 +408,7 @@ class OSSAdapter {
     async completeMultipartUpload(path, parts) {
         debug('completeMultipartUpload %s', path);
         let uploadId = parts[0].replace('part://', '').split('?')[0];
-        let p = slash(Path.join(this._options.root, path)).substring(1);
+        let p = (0, slash_1.default)(path_1.default.join(this._options.root, path)).substring(1);
         debug('update id: %s, target: %s', uploadId, p);
         let datas = parts.map((item, key) => ({
             etag: item.split('#')[1],

package/lib/simple-oss-client.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const qs = require("qs");
-const xml2js = require("xml2js");
-const sha1 = require("crypto-js/hmac-sha1");
-const md5 = require("crypto-js/md5");
-const Base64Encoder = require("crypto-js/enc-base64");
-const mime = require("mime-types");
-const akita_1 = require("akita");
+const tslib_1 = require("tslib");
+const qs_1 = tslib_1.__importDefault(require("qs"));
+const xml2js_1 = tslib_1.__importDefault(require("xml2js"));
+const hmac_sha1_1 = tslib_1.__importDefault(require("crypto-js/hmac-sha1"));
+const md5_1 = tslib_1.__importDefault(require("crypto-js/md5"));
+const enc_base64_1 = tslib_1.__importDefault(require("crypto-js/enc-base64"));
+const mime_types_1 = tslib_1.__importDefault(require("mime-types"));
+const akita_1 = tslib_1.__importDefault(require("akita"));
 const client = akita_1.default.create({});
 class SimpleOSSClient {
     constructor(config) {
@@ -23,7 +24,7 @@ class SimpleOSSClient {
         options = options || {};
         let position = options.position || 0;
         if (!options.mime)
-            options.mime = mime.lookup(name) || 'application/octet-stream';
+            options.mime = mime_types_1.default.lookup(name) || 'application/octet-stream';
         return this.requestData('POST', `${name}?append&position=${position}`, body, options);
     }
     get(name, options) {
@@ -32,7 +33,7 @@ class SimpleOSSClient {
     put(name, body, options) {
         options = options || {};
         if (!options.mime)
-            options.mime = mime.lookup(name) || 'application/octet-stream';
+            options.mime = mime_types_1.default.lookup(name) || 'application/octet-stream';
         return this.requestData('PUT', name, body, options);
     }
     async copy(to, from, options) {
@@ -95,7 +96,7 @@ class SimpleOSSClient {
     del(name, options) {
         options = options || {};
         if (!options.mime)
-            options.mime = mime.lookup(name) || 'application/octet-stream';
+            options.mime = mime_types_1.default.lookup(name) || 'application/octet-stream';
         return this.requestData('DELETE', name, null, options);
     }
     async deleteMulti(names, options) {
@@ -105,7 +106,7 @@ class SimpleOSSClient {
             options.mime = 'application/xml';
         if (!options.headers)
             options.headers = {};
-        options.headers['Content-MD5'] = md5(body).toString(Base64Encoder);
+        options.headers['Content-MD5'] = (0, md5_1.default)(body).toString(enc_base64_1.default);
         let res = await this.requestData('POST', '?delete', body, options);
         if (res.Deleted) {
             if (!Array.isArray(res.Deleted))
@@ -120,13 +121,13 @@ class SimpleOSSClient {
     async initMultipartUpload(name, options) {
         options = options || {};
         if (!options.mime)
-            options.mime = mime.lookup(name) || 'application/octet-stream';
+            options.mime = mime_types_1.default.lookup(name) || 'application/octet-stream';
         return await this.requestData('POST', `${name}?uploads`, '', options);
     }
     uploadPart(name, uploadId, partNumber, body, options) {
         options = options || {};
         if (!options.mime)
-            options.mime = mime.lookup(name) || 'application/octet-stream';
+            options.mime = mime_types_1.default.lookup(name) || 'application/octet-stream';
         return this.requestData('PUT', `${name}?partNumber=${partNumber}&uploadId=${uploadId}`, body, options);
     }
     async completeMultipartUpload(name, uploadId, parts, options) {
@@ -173,7 +174,7 @@ class SimpleOSSClient {
                 headers: response.headers
             };
         }
-        let data = await xml2js.parseStringPromise(xml, {
+        let data = await xml2js_1.default.parseStringPromise(xml, {
             trim: true,
             explicitArray: false,
             explicitRoot: false
@@ -202,12 +203,12 @@ class SimpleOSSClient {
             query['security-token'] = this.config.stsToken;
         }
         let parts = [options.method || 'GET', '', '', String(expires)];
-        let string = qs.stringify(query);
+        let string = qs_1.default.stringify(query);
         parts.push(`/${this.config.bucket}/${name}${string ? `?${string}` : ''}`);
-        query.Signature = sha1(parts.join('\n'), this.config.accessKeySecret).toString(Base64Encoder);
+        query.Signature = (0, hmac_sha1_1.default)(parts.join('\n'), this.config.accessKeySecret).toString(enc_base64_1.default);
         query.OSSAccessKeyId = this.config.accessKeyId;
         query.Expires = expires;
-        return `${url}?${qs.stringify(query)}`;
+        return `${url}?${qs_1.default.stringify(query)}`;
     }
     createCanonicalizedResource(resource, subres) {
         if (!subres)
@@ -235,7 +236,7 @@ class SimpleOSSClient {
                 parts.push(`${key}:${headers[key]}`);
         });
         parts.push(canonicalizedResource);
-        let sign = sha1(parts.join('\n'), this.config.accessKeySecret).toString(Base64Encoder);
+        let sign = (0, hmac_sha1_1.default)(parts.join('\n'), this.config.accessKeySecret).toString(enc_base64_1.default);
         return `OSS ${this.config.accessKeyId}:${sign}`;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fsd-oss",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "Aliyun OSS adapter for fsd",
   "main": "lib/index.js",
   "types": "index.d.ts",
@@ -16,11 +16,10 @@
     "akita": "^1.1.0",
     "async": "*",
     "crypto-js": "^4.2.0",
-    "debug": "^4.4.0",
-    "mime-types": "^2.1.35",
-    "minimatch": "^3.1.2",
+    "debug": "^4.4.3",
+    "mime-types": "^3.0.2",
+    "minimatch": "^9.0.5",
     "slash": "^3.0.0",
     "xml2js": "^0.6.2"
-  },
-  "gitHead": "74e32bf47242909f040eb6012dda56e5c5a668a0"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 郑州渺漠信息科技有限公司
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, destribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.