@pisell/common 1.0.19 → 1.0.21

package/es/script/utils/index.js

@@ -1,10 +1,16 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _templateObject, _templateObject2, _templateObject3;
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 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 * as dotenv from 'dotenv';
+import npmCheck from 'npm-check';
 import path from 'path';
 import ssh2 from 'ssh2';
 
@@ -202,7 +208,8 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
  */
 var releaseProject = function releaseProject(conn, _ref6) {
   var path = _ref6.path,
-    fileName = _ref6.fileName;
+    fileName = _ref6.fileName,
+    isSSR = _ref6.isSSR;
   return new Promise(function (resolve, reject) {
     conn.shell(function (err, stream) {
       if (err) {
@@ -210,7 +217,7 @@ var releaseProject = function releaseProject(conn, _ref6) {
         reject(err);
         return;
       }
-      stream.end("\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 master\n             cp -R next-master master\n             rm -rf next-master\n             exit\n            ") // 打开到path
+      stream.end("\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 master\n             cp -R next-master master\n             rm -rf next-master\n             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ") // 打开到path
       // 复制pre-master到next-master
       // 删除pre-master
       // 复制1.0.0到next-master
@@ -255,6 +262,9 @@ var versionSort = function versionSort(versionList) {
 var getCurrentProjectName = function getCurrentProjectName() {
   return loadJSON(path.join(process.cwd(), './package.json')).name;
 };
+var getCurrentProjectPkg = function getCurrentProjectPkg() {
+  return loadJSON(path.join(process.cwd(), './package.json'));
+};
 var loadJSON = function loadJSON(path) {
   return JSON.parse(fs.readFileSync(path));
 };
@@ -291,6 +301,16 @@ var createFeishuMessageContent = function createFeishuMessageContent(contentArr)
     }];
   }));
 };
+
+// 获取除了此pkg的包
+var getNonExcludedPackages = function getNonExcludedPackages(excludedPackages) {
+  var packageData = getCurrentProjectPkg();
+  var dependencies = _objectSpread(_objectSpread({}, packageData.dependencies), packageData.devDependencies);
+  var nonExcludedPackages = Object.keys(dependencies).filter(function (packageName) {
+    return !excludedPackages.includes(packageName);
+  });
+  return nonExcludedPackages;
+};
 var sendWebhook = /*#__PURE__*/function () {
   var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref8) {
     var _dotenv$config, _dotenv$config$parsed, _dotenv$config2, _dotenv$config2$parse;
@@ -333,4 +353,39 @@ var sendWebhook = /*#__PURE__*/function () {
     return _ref9.apply(this, arguments);
   };
 }();
-export { isWorkingTreeClean, getServerConfig, connectServer, serverUpload, serverUnpack, versionSort, releaseProject, getGitCurrentBranch, getCurrentProjectName, loadJSON, getCurrentUserName, sendWebhook };
+var checkPkgVersion = /*#__PURE__*/function () {
+  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(checkPackages) {
+    var currentState, pkgs, wrongPkg, errorMessage, isWrongVersion;
+    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          _context6.next = 2;
+          return npmCheck({
+            skipUnused: true,
+            ignore: getNonExcludedPackages(checkPackages)
+          });
+        case 2:
+          currentState = _context6.sent;
+          pkgs = currentState.get('packages');
+          wrongPkg = pkgs.filter(function (item) {
+            return checkPackages.includes(item.moduleName) && item.mismatch;
+          });
+          errorMessage = wrongPkg.reduce(function (p, c) {
+            return "".concat(p, "\n     ").concat(c.moduleName, "\u672C\u5730\u7248\u672C").concat(c.installed, "\u9700\u5347\u7EA7\u81F3").concat(c.packageJson, "\n     ");
+          }, '');
+          isWrongVersion = wrongPkg.length;
+          return _context6.abrupt("return", {
+            success: !isWrongVersion,
+            message: errorMessage
+          });
+        case 8:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6);
+  }));
+  return function checkPkgVersion(_x3) {
+    return _ref10.apply(this, arguments);
+  };
+}();
+export { isWorkingTreeClean, getServerConfig, connectServer, serverUpload, serverUnpack, versionSort, releaseProject, getGitCurrentBranch, getCurrentProjectName, loadJSON, getCurrentUserName, sendWebhook, checkPkgVersion };

package/lib/index.d.ts

@@ -1,3 +1,2 @@
 declare const _default: {};
 export default _default;
-//# sourceMappingURL=index.d.ts.map

package/lib/script/aws/index.js

@@ -0,0 +1,125 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/script/aws/index.js
+var aws_exports = {};
+__export(aws_exports, {
+  uploadFolderContents: () => uploadFolderContents,
+  uploadStaticToOSS: () => uploadStaticToOSS
+});
+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"];
+var __dirname = process.cwd();
+var s3Client = null;
+var bucketName = "";
+var init = async () => {
+  try {
+    const serverConfig = await (0, import_utils.getServerConfig)("admin");
+    let awsConfig = serverConfig.aws;
+    if (awsConfig) {
+      bucketName = awsConfig.bucketName;
+      s3Client = new import_client_s3.S3Client({
+        region: awsConfig.region,
+        credentials: {
+          accessKeyId: awsConfig.accessKeyId,
+          secretAccessKey: awsConfig.secretAccessKey
+        }
+      });
+      console.log("aws 初始化成功");
+      return serverConfig.aws;
+    } else {
+      console.log("未获取到aws权限");
+      return false;
+    }
+  } catch (err) {
+    console.log(err);
+    return false;
+  }
+};
+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: `${directory}/${fileKey}`,
+    // 指定目录路径
+    Body: fileStream,
+    ContentType: contentType,
+    ContentDisposition: "inline",
+    ACL: "public-read"
+    // 设置ACL权限为公共读取
+  };
+  const command = new import_client_s3.PutObjectCommand(uploadParams);
+  try {
+    const response = await s3Client.send(command);
+    console.log(`上传成功: ${fileKey}`);
+    return { fileName: fileKey, location: response.Location };
+  } catch (err) {
+    console.error(`上传失败: ${fileKey}`, err);
+    throw new Error(`上传失败: ${fileKey}, ${err.message}`);
+  }
+};
+var uploadFolderContents = async (directory, folderPath = import_path.default.resolve(__dirname, "dist")) => {
+  const files = import_fs.default.readdirSync(folderPath);
+  const uploadPromises = [];
+  for (const file of files) {
+    const filePath = import_path.default.join(folderPath, file);
+    const fileStats = import_fs.default.statSync(filePath);
+    if (fileStats.isFile()) {
+      const fileKey = import_path.default.relative(folderPath, filePath);
+      if (!filterFiles.includes(fileKey)) {
+        const uploadPromise = uploadFile(directory, fileKey, filePath);
+        uploadPromises.push(uploadPromise);
+      }
+    } else if (fileStats.isDirectory()) {
+      const subDirectory = import_path.default.join(directory, file);
+      const subFolderPromise = uploadFolderContents(subDirectory, filePath);
+      uploadPromises.push(subFolderPromise);
+    }
+  }
+  return Promise.all(uploadPromises).then((res) => {
+    console.log("全部上传完成", res.length);
+    return res;
+  }).catch((err) => {
+    throw new Error(`上传cdn失败: ${err.message}`);
+  });
+};
+var uploadStaticToOSS = async (directory, folderPath = import_path.default.resolve(__dirname, "dist")) => {
+  await init();
+  return uploadFolderContents(directory, folderPath);
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  uploadFolderContents,
+  uploadStaticToOSS
+});

package/lib/script/constants/index.js

@@ -19,12 +19,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/script/constants/index.js
 var constants_exports = {};
 __export(constants_exports, {
+  checkPackages: () => checkPackages,
+  isSsrMap: () => isSsrMap,
   outPathMap: () => outPathMap
 });
 module.exports = __toCommonJS(constants_exports);
 var outPathMap = {
   my_pisel_shop: {
-    prod: "../data/release/project/mypisel_shop",
+    prod: "../data/release/project/my_pisel_shop",
     release: "../data/release/project/my_pisel_shop",
     pre: "../data/release/project/my_pisel_shop"
   },
@@ -32,9 +34,33 @@ var outPathMap = {
     prod: "../../data/project/pisell2",
     release: "../data/release/project/pisell_v2",
     pre: "../data/release/project/pisell_v2"
+  },
+  my_pisel_pc_v2: {
+    prod: "../data/release/project/my_pisel_pc_v2",
+    release: "../data/release/project/my_pisel_pc_v2",
+    pre: "../data/release/project/my_pisel_pc_v2"
+  },
+  my_pisel_h5_v2: {
+    prod: "../data/release/project/my_pisel_h5_v2",
+    release: "../data/release/project/my_pisel_h5_v2",
+    pre: "../data/release/project/my_pisel_h5_v2"
   }
 };
+var isSsrMap = {
+  my_pisel_shop: false,
+  admin: false,
+  my_pisel_pc_v2: true,
+  my_pisel_h5_v2: true
+};
+var checkPackages = [
+  "@pisell/date-picker",
+  "@pisell/lowcode-renderer",
+  "@pisell/common",
+  "@pisell/utils"
+];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  checkPackages,
+  isSsrMap,
   outPathMap
 });

package/lib/script/release/release.js

@@ -32,6 +32,7 @@ var Release = class {
     this.version = version;
     this.conn = conn;
     this.outPath = import_constants.outPathMap[this.projectName][this.env];
+    this.isSSR = import_constants.isSsrMap[this.projectName];
   }
   /**
    * @Title: 设置连接服务器配置
@@ -72,7 +73,8 @@ var Release = class {
   async release() {
     return await (0, import_utils.releaseProject)(this.conn, {
       path: this.outPath,
-      fileName: `${this.version}`
+      fileName: `${this.version}`,
+      isSSR: this.isSSR
     });
   }
   /**

package/lib/script/uploadCode/index.js

@@ -35,6 +35,7 @@ __export(uploadCode_exports, {
 module.exports = __toCommonJS(uploadCode_exports);
 var import_inquirer = __toESM(require("inquirer"));
 var import_globals = require("zx/globals");
+var import_aws = require("../aws/index.js");
 var import_release = __toESM(require("../release/release.js"));
 var import_utils = require("../utils/index.js");
 var import_uploadCode = __toESM(require("./uploadCode.js"));
@@ -82,6 +83,15 @@ var inquirerResult = () => {
         { value: false, name: "只上传" }
       ]
     },
+    {
+      type: "list",
+      message: "是否执行build打包",
+      name: "whether_build",
+      choices: [
+        { value: true, name: "执行打包" },
+        { value: false, name: "不执行打包，使用项目根目录/dist文件夹" }
+      ]
+    },
     {
       type: "confirm",
       message: "确认信息无误",
@@ -128,9 +138,23 @@ async function init() {
   });
   console.log(result, "result");
   try {
-    console.log("开始打包");
-    await uploadCode.build();
-    console.log("✅ 打包完成");
+    if (res.whether_build) {
+      console.log("开始打包");
+      await uploadCode.build();
+      console.log("✅ 打包完成");
+    } else {
+      console.log("使用本地/dist");
+    }
+    if (res.env === "prod") {
+      let _fileName = res.project.fileName;
+      if (res.env === "pre") {
+        _fileName = "pre_" + _fileName;
+      }
+      if (_fileName === "admin") {
+        _fileName = "my_pisell_v2";
+      }
+      await (0, import_aws.uploadStaticToOSS)(_fileName);
+    }
     console.log("开始压缩");
     await uploadCode.compress();
     console.log("✅ 压缩完成");

package/lib/script/uploadCode/uploadCode.js

@@ -49,6 +49,7 @@ var UploadCode = class {
     this.projectAbsolutePath = "";
     this.conn = null;
     this.serverConfig = null;
+    this.isSSR = import_constants.isSsrMap[this.projectName];
     this.outPath = import_constants.outPathMap[this.projectName][this.env];
   }
   /**
@@ -82,9 +83,7 @@ var UploadCode = class {
       serverConfig = this.setConfig(serverConfigMap.cn[this.env]);
     }
     if (this.env === "prod") {
-      serverConfig.privateKey = fs.readFileSync(
-        import_path.default.join(process.env.HOME, ".ssh", "id_rsa")
-      );
+      serverConfig = this.setConfig(serverConfigMap["prod3"]);
     }
     if (this.env === "prod" && this.projectName === "admin") {
       serverConfig = serverConfigMap.aws[this.env];

package/lib/script/utils/index.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/script/utils/index.js
 var utils_exports = {};
 __export(utils_exports, {
+  checkPkgVersion: () => checkPkgVersion,
   connectServer: () => connectServer,
   getCurrentProjectName: () => getCurrentProjectName,
   getCurrentUserName: () => getCurrentUserName,
@@ -44,6 +45,7 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var dotenv = __toESM(require("dotenv"));
+var import_npm_check = __toESM(require("npm-check"));
 var import_path = __toESM(require("path"));
 var import_ssh2 = __toESM(require("ssh2"));
 var isWorkingTreeClean = async () => {
@@ -149,7 +151,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog }) =>
     });
   });
 };
-var releaseProject = (conn, { path: path2, fileName }) => {
+var releaseProject = (conn, { path: path2, fileName, isSSR }) => {
   return new Promise((resolve, reject) => {
     conn.shell((err, stream) => {
       if (err) {
@@ -167,6 +169,7 @@ var releaseProject = (conn, { path: path2, fileName }) => {
              rm -rf master
              cp -R next-master master
              rm -rf next-master
+             ${isSSR ? "pm2 restart server.js" : ""}
              exit
             `
         // 打开到path
@@ -203,6 +206,9 @@ var versionSort = (versionList) => {
 var getCurrentProjectName = () => {
   return loadJSON(import_path.default.join(process.cwd(), "./package.json")).name;
 };
+var getCurrentProjectPkg = () => {
+  return loadJSON(import_path.default.join(process.cwd(), "./package.json"));
+};
 var loadJSON = (path2) => JSON.parse(fs.readFileSync(path2));
 var getCurrentUserName = async () => {
   const { stdout } = await $`git config user.name`;
@@ -218,6 +224,17 @@ var createFeishuMessageContent = (contentArr) => {
     })
   );
 };
+var getNonExcludedPackages = (excludedPackages) => {
+  const packageData = getCurrentProjectPkg();
+  const dependencies = {
+    ...packageData.dependencies,
+    ...packageData.devDependencies
+  };
+  const nonExcludedPackages = Object.keys(dependencies).filter(
+    (packageName) => !excludedPackages.includes(packageName)
+  );
+  return nonExcludedPackages;
+};
 var sendWebhook = async ({ title, content }) => {
   var _a, _b, _c, _d;
   const contentStr = createFeishuMessageContent(content);
@@ -235,8 +252,29 @@ var sendWebhook = async ({ title, content }) => {
   });
   return await response.json();
 };
+var checkPkgVersion = async (checkPackages) => {
+  const currentState = await (0, import_npm_check.default)({
+    skipUnused: true,
+    ignore: getNonExcludedPackages(checkPackages)
+  });
+  const pkgs = currentState.get("packages");
+  const wrongPkg = pkgs.filter((item) => {
+    return checkPackages.includes(item.moduleName) && item.mismatch;
+  });
+  const errorMessage = wrongPkg.reduce((p, c) => {
+    return `${p}
+     ${c.moduleName}本地版本${c.installed}需升级至${c.packageJson}
+     `;
+  }, "");
+  const isWrongVersion = wrongPkg.length;
+  return {
+    success: !isWrongVersion,
+    message: errorMessage
+  };
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  checkPkgVersion,
   connectServer,
   getCurrentProjectName,
   getCurrentUserName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "sideEffects": [
     "*.less"
   ],
@@ -12,12 +12,15 @@
     "pisell": "es/bin/pisell.js"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.456.0",
     "zx": "^7.2.2",
     "inquirer": "^6.2.6",
+    "mime-types": "^2.1.35",
+    "npm-check": "^6.0.1",
     "archiver": "^5.3.1",
     "dotenv": "^16.0.3",
     "ssh2": "^1.13.0",
-    "@pisell/utils": "1.0.20"
+    "@pisell/utils": "1.0.22"
   },
   "devDependencies": {
     "father": "^4.1.6"

package/src/script/aws/index.js

@@ -0,0 +1,138 @@
+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';
+const filterFiles = ['index.html', 'umi.server.js', 'umi.server.d.ts'];
+const __dirname = process.cwd();
+let s3Client = null;
+let bucketName = '';
+
+/*******
+ * @title: 初始化
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:05
+ */
+const init = async () => {
+  try {
+    // 读取本地config
+    const serverConfig = await getServerConfig('admin');
+
+    // aws配置
+    let awsConfig = serverConfig.aws;
+
+    if (awsConfig) {
+      bucketName = awsConfig.bucketName;
+
+      // 创建实例
+      s3Client = new S3Client({
+        region: awsConfig.region,
+        credentials: {
+          accessKeyId: awsConfig.accessKeyId,
+          secretAccessKey: awsConfig.secretAccessKey,
+        },
+      });
+      console.log('aws 初始化成功');
+
+      return serverConfig.aws;
+    } else {
+      console.log('未获取到aws权限');
+
+      return false;
+    }
+  } catch (err) {
+    console.log(err);
+
+    return false;
+  }
+};
+
+// 上传文件到S3指定目录
+const uploadFile = async (directory, fileKey, filePath) => {
+  const fileStream = fs.createReadStream(filePath);
+  // 根据文件扩展名获取MIME类型
+  const contentType = mime.lookup(filePath);
+  const uploadParams = {
+    Bucket: bucketName,
+    Key: `${directory}/${fileKey}`, // 指定目录路径
+    Body: fileStream,
+    ContentType: contentType,
+    ContentDisposition: 'inline',
+    ACL: 'public-read', // 设置ACL权限为公共读取
+  };
+
+  const command = new PutObjectCommand(uploadParams);
+
+  try {
+    const response = await s3Client.send(command);
+    console.log(`上传成功: ${fileKey}`);
+    return { fileName: fileKey, location: response.Location };
+  } catch (err) {
+    console.error(`上传失败: ${fileKey}`, err);
+    throw new Error(`上传失败: ${fileKey}, ${err.message}`);
+  }
+};
+
+/*******
+ * @title: 递归上传文件夹内容
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:06
+ */
+export const uploadFolderContents = async (
+  directory,
+  folderPath = path.resolve(__dirname, 'dist'),
+) => {
+  const files = fs.readdirSync(folderPath);
+
+  // promise all 储存
+  const uploadPromises = [];
+  for (const file of files) {
+    const filePath = path.join(folderPath, file);
+    const fileStats = fs.statSync(filePath);
+
+    // 文件上传, 文件夹递归循环
+    if (fileStats.isFile()) {
+      const fileKey = path.relative(folderPath, filePath);
+      // 过滤不需要上传的文件
+      if (!filterFiles.includes(fileKey)) {
+        const uploadPromise = uploadFile(directory, fileKey, filePath);
+        uploadPromises.push(uploadPromise);
+      }
+      // 文件夹
+    } else if (fileStats.isDirectory()) {
+      const subDirectory = path.join(directory, file);
+      const subFolderPromise = uploadFolderContents(subDirectory, filePath);
+      uploadPromises.push(subFolderPromise);
+    }
+  }
+
+  return Promise.all(uploadPromises)
+    .then((res) => {
+      console.log('全部上传完成', res.length);
+      return res;
+    })
+    .catch((err) => {
+      throw new Error(`上传cdn失败: ${err.message}`);
+    });
+};
+
+/*******
+ * @title: 上传资源到oss
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2023-11-24 14:04
+ */
+export const uploadStaticToOSS = async (
+  directory,
+  folderPath = path.resolve(__dirname, 'dist'),
+) => {
+  // 初始化aws
+  await init();
+
+  return uploadFolderContents(directory, folderPath);
+};