@pisell/common 0.0.61 → 0.0.63

package/es/script/aws/index.js

@@ -6,9 +6,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 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 { NodeHttpHandler } from '@smithy/node-http-handler';
 import fs from 'fs';
-import { Agent } from 'https';
 import mime from 'mime-types';
 import path from 'path';
 import { getServerConfig } from "../utils/index.js";
@@ -49,17 +47,7 @@ var init = /*#__PURE__*/function () {
             credentials: {
               accessKeyId: awsConfig.accessKeyId,
               secretAccessKey: awsConfig.secretAccessKey
-            },
-            requestHandler: new NodeHttpHandler({
-              httpsAgent: new Agent({
-                maxSockets: 500,
-                // keepAlive is a default from AWS SDK. We want to preserve this for
-                // performance reasons.
-                keepAlive: true,
-                keepAliveMsecs: 1000
-              }),
-              socketTimeout: 5000
-            })
+            }
           });
           console.log('aws 初始化成功');
           return _context.abrupt("return", serverConfig.aws);

package/es/script/release/index.js

@@ -79,7 +79,7 @@ var getVersionList = /*#__PURE__*/function () {
           if (env === 'release') {
             host = config.cn[env].host;
           } else if (env === 'prod') {
-            host = config.prod3.host;
+            host = config.serverConfigMap.aws.service[env].host;
             port = 9008;
           }
           projectName = project.fileName; // 域名 端口

package/es/script/uploadCode/index.js

@@ -79,6 +79,16 @@ var inquirerResult = function inquirerResult() {
     default: true
   }]);
 };
+
+// 手动上传oss
+var isManuallyUploadOss = function isManuallyUploadOss() {
+  return inquirer.prompt([{
+    type: 'confirm',
+    message: '是否手动上传oss',
+    name: 'is_manually_upload_OSS',
+    default: false
+  }]);
+};
 var inquirerOss = function inquirerOss() {
   return inquirer.prompt([{
     type: 'confirm',
@@ -101,7 +111,7 @@ function init() {
  */
 function _init() {
   _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var res, uploadCode, version, currentUserName, result, _fileName, ossRes, conn, releaseInstance, branch, grayBranch;
+    var res, isManuallyOss, isManuallyOssRes, uploadCode, version, currentUserName, result, _fileName, ossRes, conn, releaseInstance, branch, grayBranch;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -109,13 +119,24 @@ function _init() {
           return inquirerResult();
         case 2:
           res = _context.sent;
+          isManuallyOss = false;
           if (res.is_confirm) {
-            _context.next = 6;
+            _context.next = 7;
             break;
           }
           console.log('取消发布');
           return _context.abrupt("return");
-        case 6:
+        case 7:
+          if (!(res.env === 'prod')) {
+            _context.next = 12;
+            break;
+          }
+          _context.next = 10;
+          return isManuallyUploadOss();
+        case 10:
+          isManuallyOssRes = _context.sent;
+          isManuallyOss = isManuallyOssRes.is_manually_upload_OSS;
+        case 12:
           /** 之前选择项目模式改为获取当前主项目 */
           res.project = {
             path: './',
@@ -125,30 +146,30 @@ function _init() {
           // const data = await $`curl -X POST -H "Content-Type: application/json" -d '{"msg_type":"post","content":""}' https://open.feishu.cn/open-apis/bot/v2/hook/08349b0d-016c-4133-9442-9e95d4adc1e8`
 
           // 删除本地在远程不存在的tag
-          _context.next = 9;
+          _context.next = 15;
           return $(_templateObject || (_templateObject = _taggedTemplateLiteral(["git fetch --prune-tags"])));
-        case 9:
+        case 15:
           uploadCode = new UploadCode(res);
-          _context.next = 12;
+          _context.next = 18;
           return uploadCode.check();
-        case 12:
+        case 18:
           if (_context.sent) {
-            _context.next = 14;
+            _context.next = 20;
             break;
           }
           return _context.abrupt("return");
-        case 14:
+        case 20:
           console.log('开始更新版本号');
-          _context.next = 17;
+          _context.next = 23;
           return uploadCode.updateVersion();
-        case 17:
+        case 23:
           version = _context.sent;
           console.log('✅ 版本更新完成');
-          _context.next = 21;
+          _context.next = 27;
           return getCurrentUserName();
-        case 21:
+        case 27:
           currentUserName = _context.sent;
-          _context.next = 24;
+          _context.next = 30;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883\u5F00\u59CB").concat(res.is_release ? '上传并发布' : '上传'),
             content: [{
@@ -162,64 +183,68 @@ function _init() {
               value: version || ''
             }]
           });
-        case 24:
+        case 30:
           result = _context.sent;
           console.log(result, 'result');
-          _context.prev = 26;
+          _context.prev = 32;
           if (!res.whether_build) {
-            _context.next = 34;
+            _context.next = 40;
             break;
           }
           console.log('开始打包');
-          _context.next = 31;
+          _context.next = 37;
           return uploadCode.build();
-        case 31:
+        case 37:
           console.log('✅ 打包完成');
-          _context.next = 35;
+          _context.next = 41;
           break;
-        case 34:
+        case 40:
           console.log('使用本地/dist');
-        case 35:
+        case 41:
           if (!(res.env === 'prod')) {
-            _context.next = 44;
+            _context.next = 51;
+            break;
+          }
+          if (isManuallyOss) {
+            _context.next = 51;
             break;
           }
           _fileName = res.project.fileName; // 上传oss
-          _context.next = 39;
+          _context.next = 46;
           return uploadStaticToOSS(_fileName);
-        case 39:
-          _context.next = 41;
+        case 46:
+          _context.next = 48;
           return inquirerOss();
-        case 41:
+        case 48:
           ossRes = _context.sent;
           if (ossRes.is_upload_completed_OSS) {
-            _context.next = 44;
+            _context.next = 51;
             break;
           }
           return _context.abrupt("return");
-        case 44:
+        case 51:
           console.log('开始压缩');
-          _context.next = 47;
+          _context.next = 54;
           return uploadCode.compress();
-        case 47:
+        case 54:
           console.log('✅ 压缩完成');
           console.log('开始连接服务器');
-          _context.next = 51;
+          _context.next = 58;
           return uploadCode.connectServer();
-        case 51:
+        case 58:
           conn = _context.sent;
           console.log('✅ 连接服务器完成');
           console.log('开始上传');
-          _context.next = 56;
+          _context.next = 63;
           return uploadCode.serverUpload();
-        case 56:
+        case 63:
           console.log('✅ 上传完成');
           console.log('开始解压');
-          _context.next = 60;
+          _context.next = 67;
           return uploadCode.serverUnpack();
-        case 60:
+        case 67:
           if (!res.is_release) {
-            _context.next = 70;
+            _context.next = 77;
             break;
           }
           releaseInstance = new Release({
@@ -229,40 +254,40 @@ function _init() {
             conn: conn
           });
           console.log('开始发布');
-          _context.next = 65;
+          _context.next = 72;
           return getGitCurrentBranch();
-        case 65:
+        case 72:
           branch = _context.sent;
           grayBranch = 'master';
           if (!originBranch.includes(branch.trim())) {
             grayBranch = branch;
           }
-          _context.next = 70;
+          _context.next = 77;
           return releaseInstance.release(grayBranch);
-        case 70:
-          _context.next = 72;
+        case 77:
+          _context.next = 79;
           return uploadCode.disconnectServer();
-        case 72:
-          _context.next = 74;
+        case 79:
+          _context.next = 81;
           return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
-        case 74:
-          _context.next = 76;
+        case 81:
+          _context.next = 83;
           return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
-        case 76:
+        case 83:
           console.log('✅ 成功后推送到git');
 
           // 只有在shop端发布
           if (!(res.project.fileName === 'my_pisel_shop')) {
-            _context.next = 80;
+            _context.next = 87;
             break;
           }
-          _context.next = 80;
+          _context.next = 87;
           return updateVersion({
             version: version,
             changelog: res.changelog
           }, res.env);
-        case 80:
-          _context.next = 82;
+        case 87:
+          _context.next = 89;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u6210\u529F"),
             content: [{
@@ -276,20 +301,20 @@ function _init() {
               value: version || ''
             }]
           });
-        case 82:
-          _context.next = 93;
+        case 89:
+          _context.next = 100;
           break;
-        case 84:
-          _context.prev = 84;
-          _context.t0 = _context["catch"](26);
+        case 91:
+          _context.prev = 91;
+          _context.t0 = _context["catch"](32);
           console.log(_context.t0, '执行出错 请排查重试');
-          _context.next = 89;
+          _context.next = 96;
           return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
-        case 89:
-          _context.next = 91;
+        case 96:
+          _context.next = 98;
           return deleteGitTag("v".concat(uploadCode.currentVersion));
-        case 91:
-          _context.next = 93;
+        case 98:
+          _context.next = 100;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u5931\u8D25"),
             content: [{
@@ -306,13 +331,13 @@ function _init() {
               value: "".concat(_context.t0) || ''
             }]
           });
-        case 93:
+        case 100:
           uploadCode.deleteLocalZip();
-        case 94:
+        case 101:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[26, 84]]);
+    }, _callee, null, [[32, 91]]);
   }));
   return _init.apply(this, arguments);
 }

package/lib/script/aws/index.js

@@ -34,9 +34,7 @@ __export(aws_exports, {
 });
 module.exports = __toCommonJS(aws_exports);
 var import_client_s3 = require("@aws-sdk/client-s3");
-var import_node_http_handler = require("@smithy/node-http-handler");
 var import_fs = __toESM(require("fs"));
-var import_https = require("https");
 var import_mime_types = __toESM(require("mime-types"));
 var import_path = __toESM(require("path"));
 var import_utils = require("../utils/index.js");
@@ -55,17 +53,7 @@ var init = async () => {
         credentials: {
           accessKeyId: awsConfig.accessKeyId,
           secretAccessKey: awsConfig.secretAccessKey
-        },
-        requestHandler: new import_node_http_handler.NodeHttpHandler({
-          httpsAgent: new import_https.Agent({
-            maxSockets: 500,
-            // keepAlive is a default from AWS SDK. We want to preserve this for
-            // performance reasons.
-            keepAlive: true,
-            keepAliveMsecs: 1e3
-          }),
-          socketTimeout: 5e3
-        })
+        }
       });
       console.log("aws 初始化成功");
       return serverConfig.aws;

package/lib/script/release/index.js

@@ -85,7 +85,7 @@ var getVersionList = async ({ env, project }) => {
   if (env === "release") {
     host = config.cn[env].host;
   } else if (env === "prod") {
-    host = config.prod3.host;
+    host = config.serverConfigMap.aws.service[env].host;
     port = 9008;
   }
   let projectName = project.fileName;

package/lib/script/uploadCode/index.js

@@ -101,6 +101,16 @@ var inquirerResult = () => {
     }
   ]);
 };
+var isManuallyUploadOss = () => {
+  return import_inquirer.default.prompt([
+    {
+      type: "confirm",
+      message: "是否手动上传oss",
+      name: "is_manually_upload_OSS",
+      default: false
+    }
+  ]);
+};
 var inquirerOss = () => {
   return import_inquirer.default.prompt([
     {
@@ -113,10 +123,15 @@ var inquirerOss = () => {
 };
 async function init() {
   let res = await inquirerResult();
+  let isManuallyOss = false;
   if (!res.is_confirm) {
     console.log("取消发布");
     return;
   }
+  if (res.env === "prod") {
+    const isManuallyOssRes = await isManuallyUploadOss();
+    isManuallyOss = isManuallyOssRes.is_manually_upload_OSS;
+  }
   res.project = {
     path: "./",
     fileName: (0, import_utils.getCurrentProjectName)()
@@ -157,11 +172,13 @@ async function init() {
       console.log("使用本地/dist");
     }
     if (res.env === "prod") {
-      let _fileName = res.project.fileName;
-      await (0, import_aws.uploadStaticToOSS)(_fileName);
-      const ossRes = await inquirerOss();
-      if (!ossRes.is_upload_completed_OSS) {
-        return;
+      if (!isManuallyOss) {
+        let _fileName = res.project.fileName;
+        await (0, import_aws.uploadStaticToOSS)(_fileName);
+        const ossRes = await inquirerOss();
+        if (!ossRes.is_upload_completed_OSS) {
+          return;
+        }
       }
     }
     console.log("开始压缩");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "0.0.61",
+  "version": "0.0.63",
   "description": "A collection of reusable UI components for web development",
   "license": "MIT",
   "sideEffects": [
@@ -59,7 +59,6 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.456.0",
-    "@smithy/node-http-handler": "^2.1.10",
     "antd5": "npm:antd@^5.5.0",
     "archiver": "^5.3.1",
     "array-move": "^3.0.1",