@pisell/common 0.0.59 → 0.0.61

package/es/script/aws/index.js

@@ -6,7 +6,9 @@ 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";
@@ -47,7 +49,17 @@ 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/constants/index.js

@@ -26,11 +26,11 @@ var outPathMap = {
   }
 };
 var isSsrMap = {
-  my_pisel_shop: false,
+  my_pisel_shop: true,
   admin: false,
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
-  pisell2_pages: false
+  pisell2_pages: true
 };
 var checkPackages = ['@pisell/date-picker', '@pisell/lowcode-renderer', '@pisell/common', '@pisell/utils'];
 

package/es/script/release/release.js

@@ -122,7 +122,8 @@ var Release = /*#__PURE__*/function () {
                 fileName: "".concat(this.version),
                 isSSR: this.isSSR,
                 env: this.env,
-                branch: grayBranch
+                branch: grayBranch,
+                projectName: this.projectName
               });
             case 2:
               return _context3.abrupt("return", _context3.sent);

package/es/script/uploadCode/index.js

@@ -234,7 +234,7 @@ function _init() {
         case 65:
           branch = _context.sent;
           grayBranch = 'master';
-          if (!originBranch.includes(branch)) {
+          if (!originBranch.includes(branch.trim())) {
             grayBranch = branch;
           }
           _context.next = 70;

package/es/script/utils/index.js

@@ -198,7 +198,10 @@ var releaseProject = function releaseProject(conn, _ref6) {
     isSSR = _ref6.isSSR,
     env = _ref6.env,
     _ref6$branch = _ref6.branch,
-    branch = _ref6$branch === void 0 ? 'master' : _ref6$branch;
+    branch = _ref6$branch === void 0 ? 'master' : _ref6$branch,
+    projectName = _ref6.projectName;
+  // 灰度项目的话重启目录不同 目前只有 my_pisel_shop和pisell2_pages走这个逻辑
+  var isGrayRestart = ['my_pisel_shop', 'pisell2_pages'].includes(projectName);
   return new Promise(function (resolve, reject) {
     conn.shell(function (err, stream) {
       if (err) {
@@ -206,7 +209,7 @@ var releaseProject = function releaseProject(conn, _ref6) {
         reject(err);
         return;
       }
-      stream.end("  ".concat(env === 'prod' ? 'sudo -i' : '', "\n             cd ").concat(path, "\n             cp -R -f pre-master next-master\n             rm -rf pre-master\n             \\cp -R -f ").concat(fileName, "/* next-master\n             cp -R -f ").concat(fileName, " pre-master\n             rm -rf ").concat(branch, "\n             cp -R next-master ").concat(branch, "\n             rm -rf next-master\n             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ").concat(env === 'prod' ? 'exit' : '', "\n            ") // 打开到path
+      stream.end("  ".concat(env === 'prod' ? 'sudo -i' : '', "\n             cd ").concat(path, "\n             cp -R -f pre-master next-master\n             rm -rf pre-master\n             \\cp -R -f ").concat(fileName, "/* next-master\n             cp -R -f ").concat(fileName, " pre-master\n             rm -rf ").concat(branch, "\n             cp -R next-master ").concat(branch, "\n             rm -rf next-master\n             ").concat(isGrayRestart && isSSR ? "cd ../front_service\n             pm2 restart ".concat(projectName, ".js\n             ") : '', "\n             ").concat(!isGrayRestart && isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ").concat(env === 'prod' ? 'exit' : '', "\n            ") // 打开到path
       // 复制pre-master到next-master
       // 删除pre-master
       // 复制1.0.0到next-master

package/lib/script/aws/index.js

@@ -34,7 +34,9 @@ __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");
@@ -53,7 +55,17 @@ 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/constants/index.js

@@ -53,11 +53,11 @@ var outPathMap = {
   }
 };
 var isSsrMap = {
-  my_pisel_shop: false,
+  my_pisel_shop: true,
   admin: false,
   my_pisel_pc_v2: true,
   my_pisel_h5_v2: true,
-  pisell2_pages: false
+  pisell2_pages: true
 };
 var checkPackages = [
   "@pisell/date-picker",

package/lib/script/release/release.js

@@ -76,7 +76,8 @@ var Release = class {
       fileName: `${this.version}`,
       isSSR: this.isSSR,
       env: this.env,
-      branch: grayBranch
+      branch: grayBranch,
+      projectName: this.projectName
     });
   }
   /**

package/lib/script/uploadCode/index.js

@@ -185,7 +185,7 @@ async function init() {
       console.log("开始发布");
       const branch = await (0, import_utils.getGitCurrentBranch)();
       let grayBranch = "master";
-      if (!import_constants.originBranch.includes(branch)) {
+      if (!import_constants.originBranch.includes(branch.trim())) {
         grayBranch = branch;
       }
       await releaseInstance.release(grayBranch);

package/lib/script/utils/index.js

@@ -151,7 +151,10 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, env
     });
   });
 };
-var releaseProject = (conn, { path: path2, fileName, isSSR, env, branch = "master" }) => {
+var releaseProject = (conn, { path: path2, fileName, isSSR, env, branch = "master", projectName }) => {
+  const isGrayRestart = ["my_pisel_shop", "pisell2_pages"].includes(
+    projectName
+  );
   return new Promise((resolve, reject) => {
     conn.shell((err, stream) => {
       if (err) {
@@ -169,7 +172,10 @@ var releaseProject = (conn, { path: path2, fileName, isSSR, env, branch = "maste
              rm -rf ${branch}
              cp -R next-master ${branch}
              rm -rf next-master
-             ${isSSR ? "pm2 restart server.js" : ""}
+             ${isGrayRestart && isSSR ? `cd ../front_service
+             pm2 restart ${projectName}.js
+             ` : ""}
+             ${!isGrayRestart && isSSR ? "pm2 restart server.js" : ""}
              exit
             ${env === "prod" ? "exit" : ""}
             `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "description": "A collection of reusable UI components for web development",
   "license": "MIT",
   "sideEffects": [
@@ -59,6 +59,7 @@
   },
   "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",