@aiot-toolkit/aiotpack 2.0.2-beta.10 → 2.0.2-beta.11

package/lib/utils/xts/XtsFileLaneUtils.js

@@ -0,0 +1,68 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const archiver_1 = __importDefault(require("archiver"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+class XtsFileLaneUtils {
+    /**
+     * 将buildPath文件夹的内容压缩成zip包，放置于targetPath路径下
+     * @param buildPath
+     * @param targetPath
+     * @param zipRootDirNames 可自定义压缩包内最外层目录的名称
+     */
+    static zipProject(buildPath, targetFile, zipRootDirNames) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                const output = fs_extra_1.default.createWriteStream(targetFile);
+                const archive = archiver_1.default.create('zip', {
+                    zlib: { level: 9 }
+                });
+                // 监听错误
+                archive.on('error', (err) => {
+                    shared_utils_1.ColorConsole.throw(`${err.message}`);
+                    output.close();
+                    reject();
+                });
+                // 监听写入流打开的事件
+                output.on('open', () => {
+                    shared_utils_1.ColorConsole.info(`Write stream is open`);
+                });
+                output.on('close', () => {
+                    shared_utils_1.ColorConsole.info(`Write stream is closed`);
+                    resolve();
+                });
+                // 将压缩文件导入到输出流中
+                archive.pipe(output);
+                // 指定压缩目录
+                buildPath.forEach((folder, index) => {
+                    const folderName = path_1.default.basename(folder); // 获取文件夹名
+                    if (zipRootDirNames && zipRootDirNames[index]) {
+                        archive.directory(folder, zipRootDirNames[index]);
+                    }
+                    else {
+                        archive.directory(folder, folderName);
+                    }
+                });
+                archive.on('finish', () => {
+                    shared_utils_1.ColorConsole.info('finish');
+                });
+                // 完成压缩，关闭输出流
+                archive.finalize();
+            });
+        });
+    }
+}
+exports.default = XtsFileLaneUtils;

package/lib/utils/xts/XtsFollowWorks.js

@@ -12,11 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const FileLaneUtil_1 = __importDefault(require("file-lane/lib/utils/FileLaneUtil"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const UxFileUtils_1 = __importDefault(require("./../ux/UxFileUtils"));
+const XtsFileLaneUtils_1 = __importDefault(require("../../utils/xts/XtsFileLaneUtils"));
 /**
  * XtsFollowWorks
  */
@@ -33,7 +33,7 @@ class XtsFollowWorks {
             const zipPath = path_1.default.join(projectPath, 'dist');
             // buildPath必须是真实文件夹路径
             if (!fs_extra_1.default.existsSync(buildPath)) {
-                ColorConsole_1.default.throw(`buildPath: '${buildPath}' not exist`);
+                shared_utils_1.ColorConsole.throw(`buildPath: '${buildPath}' not exist`);
             }
             try {
                 // 确认文件夹是否存在，不存在则创建
@@ -41,10 +41,10 @@ class XtsFollowWorks {
                 // 清空dist文件夹
                 fs_extra_1.default.emptyDirSync(zipPath);
                 const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', options.packageName, 'rpk');
-                yield FileLaneUtil_1.default.zipProject([buildPath], filePath, [options.packageName]);
+                yield XtsFileLaneUtils_1.default.zipProject([buildPath], filePath, [options.packageName]);
             }
             catch (err) {
-                ColorConsole_1.default.throw(`${err.message}`);
+                shared_utils_1.ColorConsole.throw(`${err.message}`);
             }
         });
     }
@@ -115,13 +115,13 @@ class XtsFollowWorks {
                     const buildPaths = item.aspectList.map((name) => path_1.default.join(projectPath, output, name));
                     const filePath = XtsFollowWorks.getFilePath(projectPath, 'dist', item.device);
                     try {
-                        yield FileLaneUtil_1.default.zipProject(buildPaths, filePath);
+                        yield XtsFileLaneUtils_1.default.zipProject(buildPaths, filePath);
                     }
                     catch (error) { }
                 }
             }
             else {
-                ColorConsole_1.default.throw('not find manifest.json');
+                shared_utils_1.ColorConsole.throw('not find manifest.json');
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-beta.10",
+  "version": "2.0.2-beta.11",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,13 +19,14 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-beta.10",
-    "@aiot-toolkit/parser": "2.0.2-beta.10",
+    "@aiot-toolkit/generator": "2.0.2-beta.11",
+    "@aiot-toolkit/parser": "2.0.2-beta.11",
     "@hap-toolkit/aaptjs": "^2.0.0",
+    "archiver": "^6.0.1",
     "babel-loader": "^9.1.3",
     "del": "^4.1.0",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-beta.10",
+    "file-lane": "2.0.2-beta.11",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^7.2.2",
@@ -41,5 +42,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "00d23c1ad1306a6c72bb007685de9fd4a6ee61af"
+  "gitHead": "07c38dd12ba0d932c6dc1fd16fe25aaf15ab9fbb"
 }