@pisell/common 0.0.34 → 0.0.35

package/es/script/aws/index.js

@@ -7,11 +7,20 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { PutObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import fs from 'fs';
+import mime from 'mime-types';
 import path from 'path';
 import { getServerConfig } from "../utils/index.js";
 var filterFiles = ['index.html', 'umi.server.js', 'umi.server.d.ts'];
 var s3Client = null;
 var bucketName = '';
+
+/*******
+ * @title: 初始化
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:05
+ */
 var init = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var serverConfig, awsConfig;
@@ -23,12 +32,15 @@ var init = /*#__PURE__*/function () {
           return getServerConfig();
         case 3:
           serverConfig = _context.sent;
+          // aws配置
           awsConfig = serverConfig.aws;
           if (!awsConfig) {
             _context.next = 12;
             break;
           }
           bucketName = awsConfig.bucketName;
+
+          // 创建实例
           s3Client = new S3Client({
             region: awsConfig.region,
             credentials: {
@@ -63,48 +75,57 @@ var init = /*#__PURE__*/function () {
 // 上传文件到S3指定目录
 var uploadFile = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(directory, fileKey, filePath) {
-    var fileStream, uploadParams, command, response;
+    var fileStream, contentType, uploadParams, command, response;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          fileStream = fs.createReadStream(filePath);
+          fileStream = fs.createReadStream(filePath); // 根据文件扩展名获取MIME类型
+          contentType = mime.lookup(filePath);
           uploadParams = {
             Bucket: bucketName,
             Key: "static/".concat(directory, "/").concat(fileKey),
             // 指定目录路径
-            Body: fileStream
+            Body: fileStream,
+            contentType: contentType,
+            ACL: 'public-read' // 设置ACL权限为公共读取
           };
           command = new PutObjectCommand(uploadParams);
-          _context2.prev = 3;
-          _context2.next = 6;
+          _context2.prev = 4;
+          _context2.next = 7;
           return s3Client.send(command);
-        case 6:
+        case 7:
           response = _context2.sent;
           console.log("\u4E0A\u4F20\u6210\u529F: ".concat(fileKey));
           return _context2.abrupt("return", {
             fileName: fileKey,
             location: response.Location
           });
-        case 11:
-          _context2.prev = 11;
-          _context2.t0 = _context2["catch"](3);
+        case 12:
+          _context2.prev = 12;
+          _context2.t0 = _context2["catch"](4);
           console.error("\u4E0A\u4F20\u5931\u8D25: ".concat(fileKey), _context2.t0);
           return _context2.abrupt("return", {
             fileName: fileKey,
             error: _context2.t0
           });
-        case 15:
+        case 16:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[3, 11]]);
+    }, _callee2, null, [[4, 12]]);
   }));
   return function uploadFile(_x, _x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();
 
-// 递归上传文件夹内容
+/*******
+ * @title: 递归上传文件夹内容
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:06
+ */
 export var uploadFolderContents = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(directory) {
     var folderPath,
@@ -124,20 +145,21 @@ export var uploadFolderContents = /*#__PURE__*/function () {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           folderPath = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : path.resolve(__dirname, 'dist');
-          files = fs.readdirSync(folderPath);
+          files = fs.readdirSync(folderPath); // promise all 储存
           uploadPromises = [];
           _iterator = _createForOfIteratorHelper(files);
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               file = _step.value;
               filePath = path.join(folderPath, file);
-              fileStats = fs.statSync(filePath);
+              fileStats = fs.statSync(filePath); // 文件上传, 文件夹递归循环
               if (fileStats.isFile()) {
-                fileKey = path.relative(folderPath, filePath);
+                fileKey = path.relative(folderPath, filePath); // 过滤不需要上传的文件
                 if (!filterFiles.includes(fileKey)) {
                   uploadPromise = uploadFile(directory, fileKey, filePath);
                   uploadPromises.push(uploadPromise);
                 }
+                // 文件夹
               } else if (fileStats.isDirectory()) {
                 subDirectory = path.join(directory, file);
                 subFolderPromise = uploadFolderContents(subDirectory, filePath);
@@ -163,6 +185,14 @@ export var uploadFolderContents = /*#__PURE__*/function () {
     return _ref3.apply(this, arguments);
   };
 }();
+
+/*******
+ * @title: 上传资源到oss
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:04
+ */
 export var uploadStaticToOSS = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(directory) {
     var folderPath,

package/es/script/uploadCode/index.js

@@ -81,7 +81,7 @@ function init() {
  */
 function _init() {
   _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var res, uploadCode, version, currentUserName, result, conn, releaseInstance;
+    var res, uploadCode, version, currentUserName, result, _fileName, conn, releaseInstance;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -151,35 +151,40 @@ function _init() {
           return uploadCode.build();
         case 30:
           console.log('✅ 打包完成');
-          if (!(res.env === 'prod')) {
-            _context.next = 34;
+          if (!(res.env === 'pre' || res.env === 'prod')) {
+            _context.next = 36;
             break;
           }
-          _context.next = 34;
-          return uploadStaticToOSS(res.project.fileName);
-        case 34:
+          _fileName = res.project.fileName;
+          if (res.env === 'pre') {
+            _fileName = 'pre_' + _fileName;
+          }
+          // 上传oss
+          _context.next = 36;
+          return uploadStaticToOSS(_fileName);
+        case 36:
           console.log('开始压缩');
-          _context.next = 37;
+          _context.next = 39;
           return uploadCode.compress();
-        case 37:
+        case 39:
           console.log('✅ 压缩完成');
           console.log('开始连接服务器');
-          _context.next = 41;
+          _context.next = 43;
           return uploadCode.connectServer();
-        case 41:
+        case 43:
           conn = _context.sent;
           console.log('✅ 连接服务器完成');
           console.log('开始上传');
-          _context.next = 46;
+          _context.next = 48;
           return uploadCode.serverUpload();
-        case 46:
+        case 48:
           console.log('✅ 上传完成');
           console.log('开始解压');
-          _context.next = 50;
+          _context.next = 52;
           return uploadCode.serverUnpack();
-        case 50:
+        case 52:
           if (!res.is_release) {
-            _context.next = 55;
+            _context.next = 57;
             break;
           }
           releaseInstance = new Release({
@@ -189,32 +194,32 @@ function _init() {
             conn: conn
           });
           console.log('开始发布');
-          _context.next = 55;
-          return releaseInstance.release();
-        case 55:
           _context.next = 57;
-          return uploadCode.disconnectServer();
+          return releaseInstance.release();
         case 57:
           _context.next = 59;
-          return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
+          return uploadCode.disconnectServer();
         case 59:
           _context.next = 61;
-          return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
+          return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
         case 61:
+          _context.next = 63;
+          return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
+        case 63:
           console.log('✅ 成功后推送到git');
-          _context.next = 73;
+          _context.next = 75;
           break;
-        case 64:
-          _context.prev = 64;
+        case 66:
+          _context.prev = 66;
           _context.t0 = _context["catch"](26);
           console.log(_context.t0, '执行出错 请排查重试');
-          _context.next = 69;
-          return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
-        case 69:
           _context.next = 71;
-          return $(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["git tag -d v", ""])), uploadCode.currentVersion);
+          return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
         case 71:
           _context.next = 73;
+          return $(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["git tag -d v", ""])), uploadCode.currentVersion);
+        case 73:
+          _context.next = 75;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u5931\u8D25"),
             content: [{
@@ -228,18 +233,18 @@ function _init() {
               value: version || ''
             }]
           });
-        case 73:
+        case 75:
           if (!(res.project.fileName === 'my_pisel_shop')) {
-            _context.next = 76;
+            _context.next = 78;
             break;
           }
-          _context.next = 76;
+          _context.next = 78;
           return updateVersion({
             version: version,
             changelog: res.changelog
           }, res.env);
-        case 76:
-          _context.next = 78;
+        case 78:
+          _context.next = 80;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u6210\u529F"),
             content: [{
@@ -253,13 +258,13 @@ function _init() {
               value: version || ''
             }]
           });
-        case 78:
+        case 80:
           uploadCode.deleteLocalZip();
-        case 79:
+        case 81:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[26, 64]]);
+    }, _callee, null, [[26, 66]]);
   }));
   return _init.apply(this, arguments);
 }

package/lib/script/aws/index.js

@@ -35,6 +35,7 @@ __export(aws_exports, {
 module.exports = __toCommonJS(aws_exports);
 var import_client_s3 = require("@aws-sdk/client-s3");
 var import_fs = __toESM(require("fs"));
+var import_mime_types = __toESM(require("mime-types"));
 var import_path = __toESM(require("path"));
 var import_utils = require("../utils/index.js");
 var filterFiles = ["index.html", "umi.server.js", "umi.server.d.ts"];
@@ -66,11 +67,15 @@ var init = async () => {
 };
 var uploadFile = async (directory, fileKey, filePath) => {
   const fileStream = import_fs.default.createReadStream(filePath);
+  const contentType = import_mime_types.default.lookup(filePath);
   const uploadParams = {
     Bucket: bucketName,
     Key: `static/${directory}/${fileKey}`,
     // 指定目录路径
-    Body: fileStream
+    Body: fileStream,
+    contentType,
+    ACL: "public-read"
+    // 设置ACL权限为公共读取
   };
   const command = new import_client_s3.PutObjectCommand(uploadParams);
   try {

package/lib/script/uploadCode/index.js

@@ -132,8 +132,12 @@ async function init() {
     console.log("开始打包");
     await uploadCode.build();
     console.log("✅ 打包完成");
-    if (res.env === "prod") {
-      await (0, import_aws.uploadStaticToOSS)(res.project.fileName);
+    if (res.env === "pre" || res.env === "prod") {
+      let _fileName = res.project.fileName;
+      if (res.env === "pre") {
+        _fileName = "pre_" + _fileName;
+      }
+      await (0, import_aws.uploadStaticToOSS)(_fileName);
     }
     console.log("开始压缩");
     await uploadCode.compress();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "description": "A collection of reusable UI components for web development",
   "license": "MIT",
   "sideEffects": [
@@ -64,6 +64,7 @@
     "array-move": "^3.0.1",
     "dotenv": "^16.0.3",
     "inquirer": "^9.2.6",
+    "mime-types": "^2.1.35",
     "npm-check": "^6.0.1",
     "react-beautiful-dnd": "^13.1.0",
     "react-color": "^2.19.3",