picgo-plugin-s3 1.3.3 → 1.3.6

package/README.md

@@ -47,6 +47,8 @@ picgo set uploader aws-s3
 | `{md5}`      | 图片 MD5 计算值        |
 | `{sha1}`     | 图片 SHA1 计算值       |
 | `{sha256}`   | 图片 SHA256 计算值     |
+| `{timestamp}`   | Unix 时间戳     |
+| `{timestampMS}`   | Unix 时间戳（毫秒）     |
 
 ### 示例 Example
 

package/dist/index.js

@@ -117,10 +117,11 @@ module.exports = (ctx) => {
         if (!userConfig) {
             throw new Error("Can't find amazon s3 uploader config");
         }
-        if (userConfig.urlPrefix) {
-            userConfig.urlPrefix = userConfig.urlPrefix.replace(/\/?$/, "");
+        let urlPrefix = userConfig.urlPrefix;
+        if (urlPrefix) {
+            urlPrefix = urlPrefix.replace(/\/?$/, "");
             if (userConfig.pathStyleAccess && !userConfig.disableBucketPrefixToURL) {
-                userConfig.urlPrefix += "/" + userConfig.bucketName;
+                urlPrefix += "/" + userConfig.bucketName;
             }
         }
         const client = uploader_1.default.createS3Client(userConfig);
@@ -132,7 +133,7 @@ module.exports = (ctx) => {
             path: (0, utils_1.formatPath)(item, userConfig.uploadPath),
             item: item,
             acl: userConfig.acl,
-            urlPrefix: userConfig.urlPrefix,
+            urlPrefix,
         }));
         let results;
         try {

package/dist/uploader.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const client_s3_1 = require("@aws-sdk/client-s3");
 const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
-const node_http_handler_1 = require("@aws-sdk/node-http-handler");
+const node_http_handler_1 = require("@smithy/node-http-handler");
 const url_1 = __importDefault(require("url"));
 const utils_1 = require("./utils");
 function createS3Client(opts) {
@@ -52,10 +52,11 @@ async function createUploadTask(opts) {
     catch (err) {
         return Promise.reject(err);
     }
+    const acl = opts.acl;
     const command = new client_s3_1.PutObjectCommand({
         Bucket: opts.bucketName,
         Key: opts.path,
-        ACL: opts.acl,
+        ACL: acl,
         Body: body,
         ContentType: contentType,
         ContentEncoding: contentEncoding,

package/dist/utils.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProxyAgent = exports.extractInfo = exports.formatPath = void 0;
 const crypto_1 = __importDefault(require("crypto"));
-const file_type_1 = __importDefault(require("file-type"));
+const file_type_1 = require("file-type");
 const mime_1 = __importDefault(require("mime"));
 const hpagent_1 = require("hpagent");
 class FileNameGenerator {
@@ -62,6 +62,12 @@ class FileNameGenerator {
     sha256() {
         return crypto_1.default.createHash("sha256").update(this.imgBuffer()).digest("hex");
     }
+    timestamp() {
+        return Math.floor(Date.now() / 1000).toString();
+    }
+    timestampMS() {
+        return Date.now().toString();
+    }
     imgBuffer() {
         return this.info.base64Image ? this.info.base64Image : this.info.buffer;
     }
@@ -78,6 +84,8 @@ FileNameGenerator.fields = [
     "md5B64Short",
     "sha1",
     "sha256",
+    "timestamp",
+    "timestampMS",
 ];
 function formatPath(info, format) {
     if (!format) {
@@ -109,7 +117,7 @@ async function extractInfo(info) {
     }
     // fallback to detect from buffer
     if (!result.contentType) {
-        const fileType = await file_type_1.default.fromBuffer(result.body);
+        const fileType = await (0, file_type_1.fromBuffer)(result.body);
         result.contentType = fileType === null || fileType === void 0 ? void 0 : fileType.mime;
     }
     return result;

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "picgo-plugin-s3",
-  "version": "1.3.3",
+  "version": "1.3.6",
   "description": "picgo amazon s3 uploader",
   "main": "dist/index.js",
   "publishConfig": {
     "access": "public"
   },
+  "type": "commonjs",
   "homepage": "https://github.com/wayjam/picgo-plugin-s3",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -28,24 +29,24 @@
   "author": "WayJam So",
   "license": "MIT",
   "devDependencies": {
-    "@types/mime": "^3.0.1",
-    "@types/node": "^18.7.23",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
-    "eslint": "^8.25.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "prettier": "^2.7.1",
-    "typescript": "^4.8.4"
+    "@types/mime": "^3.0.4",
+    "@types/node": "^20.12.7",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "prettier": "^3.2.5",
+    "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.304.0",
-    "@aws-sdk/lib-storage": "^3.304.0",
-    "@aws-sdk/node-http-handler": "^3.360.0",
-    "@aws-sdk/s3-request-presigner": "^3.305.0",
-    "file-type": "^16.2.0",
+    "@aws-sdk/client-s3": "^3.556.0",
+    "@aws-sdk/lib-storage": "^3.556.0",
+    "@aws-sdk/node-http-handler": "^3.374.0",
+    "@aws-sdk/s3-request-presigner": "^3.556.0",
+    "file-type": ">16.5.0 <17.0.0",
     "hpagent": "^1.2.0",
-    "mime": "^2.5.2",
-    "picgo": "^1.5.3"
+    "mime": "^3.0.0",
+    "picgo": "^1.5.6"
   }
 }