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

package/lib/compiler/javascript/vela/utils/signature/SignUtil.js

@@ -12,9 +12,7 @@ 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 CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
-const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const crypto_1 = __importDefault(require("crypto"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const jsrsasign_1 = __importDefault(require("jsrsasign"));
@@ -31,43 +29,70 @@ const Signer_1 = __importDefault(require("./Signer"));
 class SignUtil {
     /**
      * 获取签名相关的配置内容
-     * 1. ICompileParam参数中获取编译模式是否为release
-     * 2. IJavascriptCompileOption参数中获取签名目录等内容
-     * @param param
+     * @param param IJavascriptCompileOption参数中获取签名目录等内容
+     * @returns
      */
     static getProjectSignConfig(param) {
         const { mode, projectPath, signRoot } = param;
+        const signPathFolder = path_1.default.join(projectPath, signRoot || 'sign');
+        const signPathConfig = {
+            debug: {
+                privatekey: path_1.default.join(signPathFolder, 'debug', 'private.pem'),
+                certificate: path_1.default.join(signPathFolder, 'debug', 'certificate.pem')
+            },
+            sign: {
+                privatekey: path_1.default.join(signPathFolder, 'private.pem'),
+                certificate: path_1.default.join(signPathFolder, 'certificate.pem')
+            },
+            defaultDevelopment: {
+                privatekey: path_1.default.join(__dirname, 'pem', 'private.pem'),
+                certificate: path_1.default.join(__dirname, 'pem', 'certificate.pem')
+            },
+            oldRelease: {
+                privatekey: path_1.default.join(signPathFolder, 'release', 'private.pem'),
+                certificate: path_1.default.join(signPathFolder, 'release', 'certificate.pem')
+            }
+        };
+        // build模式 优先sign/debug/证书 其次sign/证书 最后toolkit中默认的证书
+        const developmentSignConfig = [
+            signPathConfig.debug,
+            signPathConfig.sign,
+            signPathConfig.defaultDevelopment
+        ];
+        // release模式 优先sign/release/证书 其次sign/证书
+        const releaseSignConfig = [signPathConfig.oldRelease, signPathConfig.sign];
+        let modeSignConfig = [];
         let signConfig;
-        let privatekeyPath;
-        let certificatePath;
         switch (mode) {
             case CompileMode_1.default.DEVELOPMENT:
-                privatekeyPath = path_1.default.join(__dirname, 'pem', 'private.pem');
-                certificatePath = path_1.default.join(__dirname, 'pem', 'certificate.pem');
-                ColorConsole_1.default.info(`User debug signature is enabled by project build`);
+                modeSignConfig = developmentSignConfig;
                 break;
             case CompileMode_1.default.PRODUCTION:
-                privatekeyPath = path_1.default.join(projectPath, signRoot, 'private.pem');
-                certificatePath = path_1.default.join(projectPath, signRoot, 'certificate.pem');
-                ColorConsole_1.default.info(`release signature is enabled by project build`);
+                modeSignConfig = releaseSignConfig;
                 break;
             default:
                 // 打印信息， 模式未定义
-                ColorConsole_1.default.error(`Error: mode ${mode} undefined`);
+                shared_utils_1.ColorConsole.error(`Error: mode ${mode} undefined`);
                 break;
         }
-        // 检查路径是否真实存在
-        if (privatekeyPath &&
-            certificatePath &&
-            FileUtil_1.default.checkFilePath([privatekeyPath, certificatePath])) {
+        // 寻找有效的证书路径
+        const findPath = modeSignConfig.find(({ privatekey, certificate }) => shared_utils_1.FileUtil.checkFilePath([privatekey, certificate]));
+        if (findPath) {
+            let { privatekey: privatekeyPath, certificate: certificatePath } = findPath;
+            shared_utils_1.ColorConsole.info('privatekeyPath is ', {
+                word: privatekeyPath
+            }, `\ncertificatePath is `, {
+                word: certificatePath
+            });
+            // 读取证书内容
             signConfig = {
                 privatekey: fs_extra_1.default.readFileSync(privatekeyPath),
                 certificate: fs_extra_1.default.readFileSync(certificatePath)
             };
         }
         else {
-            // 结束程序
-            process.exit();
+            // 抛出错误,在指定模式下未找到证书
+            throw new Error(`The current mode is ${mode}, and there is a problem with the certification path`);
         }
         return signConfig;
     }
@@ -83,12 +108,12 @@ class SignUtil {
             if (metaBuffer) {
                 const metaHash = {
                     name: ZipUtil_1.default.DIGEST_HASH_JSON,
-                    hash: CommonUtil_1.default.calcDataDigest(metaBuffer)
+                    hash: shared_utils_1.CommonUtil.calcDataDigest(metaBuffer)
                 };
                 const signedMetaBuffer = SignUtil.doSign(metaBuffer, [metaHash], privatekey, certificate);
                 if (signedMetaBuffer === false) {
                     // META-INF/CERT签名失败
-                    ColorConsole_1.default.throw('META-INF/CERT signature failed');
+                    shared_utils_1.ColorConsole.throw('META-INF/CERT signature failed');
                 }
                 else {
                     fileList.push({
@@ -97,7 +122,7 @@ class SignUtil {
                     });
                     fileDigestHash.push({
                         name: ZipUtil_1.default.CERT_PATH,
-                        hash: CommonUtil_1.default.calcDataDigest(signedMetaBuffer)
+                        hash: shared_utils_1.CommonUtil.calcDataDigest(signedMetaBuffer)
                     });
                 }
             }
@@ -107,7 +132,7 @@ class SignUtil {
                 fileList.push(item);
                 fileDigestHash.push({
                     name: item.path,
-                    hash: CommonUtil_1.default.calcDataDigest(item.content)
+                    hash: shared_utils_1.CommonUtil.calcDataDigest(item.content)
                 });
             });
             // 因为META变化，重新创建ZIP流
@@ -116,7 +141,7 @@ class SignUtil {
             const signedZipBuffer = SignUtil.doSign(newZipBuffer, fileDigestHash, privatekey, certificate);
             if (signedZipBuffer === false) {
                 // 签名失败
-                ColorConsole_1.default.throw('package signature failed');
+                shared_utils_1.ColorConsole.throw('package signature failed');
             }
             return signedZipBuffer;
         });
@@ -180,13 +205,13 @@ class SignUtil {
     static unZipFiles(fileBuffer, files) {
         // 1. 读取zip文件
         if (!fileBuffer || fileBuffer.length <= 4) {
-            ColorConsole_1.default.error('Zip file open failed');
+            shared_utils_1.ColorConsole.error('Zip file open failed');
             return false;
         }
         // 2. 检查文件格式是否正确
         const fileMagic = fileBuffer.readInt32LE(0);
         if (fileMagic !== 0x4034b50) {
-            ColorConsole_1.default.error('Zip file format is wrong');
+            shared_utils_1.ColorConsole.error('Zip file format is wrong');
             return false;
         }
         // 3. 解析数据块

package/lib/compiler/javascript/vela/utils/webpackLoader/addColSourceMap.d.ts

@@ -0,0 +1,3 @@
+import { LoaderContext } from 'webpack';
+declare function addColSourceMap(this: LoaderContext<any>, source: string, map: any): Promise<void>;
+export default addColSourceMap;

package/lib/compiler/javascript/vela/utils/webpackLoader/addColSourceMap.js

@@ -0,0 +1,56 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const parser_1 = require("@aiot-toolkit/parser");
+function addColSourceMap(source, map) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const callback = this.async();
+        if (!map) {
+            callback(null, source, map);
+        }
+        let { consumer, tempGenerator } = yield parser_1.SourceMapUtil.createConsumerAndGenerator(JSON.stringify(map));
+        let recordLine = -1;
+        consumer.eachMapping((mapping) => {
+            if (mapping.source === consumer.sources[consumer.sources.length - 1]) {
+                if (recordLine < mapping.generatedLine &&
+                    (mapping.generatedColumn !== 0 || mapping.originalColumn !== 0)) {
+                    tempGenerator.addMapping({
+                        generated: {
+                            line: mapping.generatedLine,
+                            column: 0
+                        },
+                        original: {
+                            line: mapping.originalLine,
+                            column: 0
+                        },
+                        source: mapping.source,
+                        name: ''
+                    });
+                }
+                recordLine = mapping.generatedLine;
+            }
+            tempGenerator.addMapping({
+                generated: {
+                    line: mapping.generatedLine,
+                    column: mapping.generatedColumn
+                },
+                original: {
+                    line: mapping.originalLine,
+                    column: mapping.originalColumn
+                },
+                source: mapping.source,
+                name: mapping.name
+            });
+        });
+        callback(null, source, JSON.parse(tempGenerator.toString()));
+    });
+}
+exports.default = addColSourceMap;

package/lib/compiler/javascript/vela/utils/webpackLoader/extractMapData.d.ts

@@ -0,0 +1,3 @@
+import { LoaderContext } from 'webpack';
+declare function extractMapData(this: LoaderContext<any>, source: string, map: any): void;
+export default extractMapData;

package/lib/compiler/javascript/vela/utils/webpackLoader/{splitMap.js → extractMapData.js}

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-function splitMap(source, map) {
+function extractMapData(source, map) {
     const enterFilePath = this.resourcePath;
     // 获取当前文件夹和文件名
     const dirName = path_1.default.dirname(enterFilePath);
@@ -17,4 +17,4 @@ function splitMap(source, map) {
     }
     this.callback(null, source, map && JSON.parse(map));
 }
-exports.default = splitMap;
+exports.default = extractMapData;

package/lib/config/UxConfig.d.ts

@@ -1,14 +1,25 @@
 import { IFileLaneConfig } from 'file-lane';
 import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascriptCompileOption';
-import AppUxLoader from '../loader/ux/AppUxLoader';
 import JsLoader from '../loader/ux/JsLoader';
-import UxLoader from '../loader/ux/UxLoader';
+import PngLoader from '../loader/ux/PngLoader';
+import AppUxLoader from '../loader/ux/vela/AppUxLoader';
+import HmlLoader from '../loader/ux/vela/HmlLoader';
+import UxLoader from '../loader/ux/vela/UxLoader';
 declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
     readonly projectPath: string;
     constructor(projectPath: string);
-    exclude: RegExp[];
+    exclude: (RegExp | ((filePath: string) => boolean))[];
     get output(): string;
-    module: {
+    preWorks: import("file-lane").PreWork<IJavascriptCompileOption>[];
+    followWorks: {
+        worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
+        workerDescribe: string;
+    }[];
+    watchIgnores: (string | RegExp)[];
+    /**
+     * 通过项目类型，返回模块配置
+     */
+    get module(): {
         rules: ({
             test: string[];
             loader: (typeof AppUxLoader)[];
@@ -17,14 +28,25 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
             test: RegExp[];
             exclude: RegExp[];
             loader: (typeof UxLoader)[];
+        } | {
+            test: RegExp[];
+            loader: (typeof HmlLoader | typeof UxLoader)[];
+            exclude?: undefined;
         } | {
             test: RegExp[];
             loader: (typeof JsLoader)[];
             exclude?: undefined;
+        } | {
+            test: RegExp[];
+            loader: (typeof PngLoader)[];
+            exclude?: undefined;
         })[];
     };
-    preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<IJavascriptCompileOption>[];
-    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<IJavascriptCompileOption>[];
-    watchIgnores: RegExp[];
+    /**
+     * 判断项目类型
+     *
+     * 目前的办法是通过 manifest.json 的 deviceTypeList 是否有 watch 判断
+     */
+    private getProjectType;
 }
 export default UxConfig;

package/lib/config/UxConfig.js

@@ -3,39 +3,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const parser_1 = require("@aiot-toolkit/parser");
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const AppUxLoader_1 = __importDefault(require("../loader/ux/AppUxLoader"));
+const UxFollowWorks_1 = __importDefault(require("../followWorks/ux/UxFollowWorks"));
 const JsLoader_1 = __importDefault(require("../loader/ux/JsLoader"));
 const PngLoader_1 = __importDefault(require("../loader/ux/PngLoader"));
-const UxLoader_1 = __importDefault(require("../loader/ux/UxLoader"));
+const AppUxLoader_1 = __importDefault(require("../loader/ux/vela/AppUxLoader"));
+const HmlLoader_1 = __importDefault(require("../loader/ux/vela/HmlLoader"));
+const UxLoader_1 = __importDefault(require("../loader/ux/vela/UxLoader"));
+const UxPreWorks_1 = __importDefault(require("../preWorks/ux/UxPreWorks"));
 const PreWorkUtils_1 = __importDefault(require("../utils/PreWorkUtils"));
-const UxFollowWorks_1 = __importDefault(require("../utils/ux/UxFollowWorks"));
-const UxPreWorks_1 = __importDefault(require("../utils/ux/UxPreWorks"));
+const UxLoader_2 = __importDefault(require("../loader/ux/android/UxLoader"));
 class UxConfig {
     constructor(projectPath) {
         this.projectPath = projectPath;
-        this.exclude = [/node_modules/, /dist/, /build/];
-        this.module = {
-            rules: [
-                {
-                    test: ['app.ux'],
-                    loader: [AppUxLoader_1.default]
-                },
-                {
-                    test: [/.+\.ux$/],
-                    exclude: [/app\.ux/],
-                    loader: [UxLoader_1.default]
-                },
-                {
-                    test: [/.+\.js$/],
-                    loader: [JsLoader_1.default]
-                },
-                {
-                    test: [/.+\.9.png/],
-                    loader: [PngLoader_1.default]
+        this.exclude = [
+            /node_modules/,
+            /dist/,
+            /build/,
+            (filePath) => {
+                // 如果 是 script， style文件，且同路径下存在同名 hml，则忽略
+                const { ext, name } = path_1.default.parse(filePath);
+                if (![...parser_1.ExtensionConfig.SCRIPTS, ...parser_1.ExtensionConfig.STYLES].includes(ext)) {
+                    return false;
                 }
-            ]
-        };
+                const hmlPath = shared_utils_1.FileUtil.updateFileName(filePath, `${name}${parser_1.ExtensionConfig.HML}`);
+                if (fs_1.default.existsSync(hmlPath)) {
+                    return true;
+                }
+                return false;
+            }
+        ];
         this.preWorks = [
             UxPreWorks_1.default.validateManifest,
             UxPreWorks_1.default.validateSitemap,
@@ -44,20 +44,97 @@ class UxConfig {
             PreWorkUtils_1.default.getGlobalVar
         ];
         this.followWorks = [
-            UxFollowWorks_1.default.symlinkNodeModule,
-            UxFollowWorks_1.default.webpack,
-            UxFollowWorks_1.default.copyResource,
-            UxFollowWorks_1.default.jsc,
-            UxFollowWorks_1.default.toRpk,
-            UxFollowWorks_1.default.moveBackResult,
-            UxFollowWorks_1.default.protobuf
+            {
+                worker: UxFollowWorks_1.default.symlinkNodeModule,
+                workerDescribe: 'Create a soft link to the node_modules folder'
+            },
+            {
+                worker: UxFollowWorks_1.default.webpack,
+                workerDescribe: 'Compile the project using webpack'
+            },
+            {
+                worker: UxFollowWorks_1.default.copyResource,
+                workerDescribe: 'Copy resource files'
+            },
+            {
+                worker: UxFollowWorks_1.default.jsc,
+                workerDescribe: 'Generate jsc bytecode'
+            },
+            {
+                worker: UxFollowWorks_1.default.protobuf,
+                workerDescribe: 'Generate protobuf json'
+            },
+            {
+                worker: UxFollowWorks_1.default.toRpk,
+                workerDescribe: 'Package the project into an RPK file'
+            },
+            {
+                worker: UxFollowWorks_1.default.moveBackResult,
+                workerDescribe: 'Migrate temporary project'
+            }
         ];
-        this.watchIgnores = [/node_modules/];
+        this.watchIgnores = [/node_modules/, '/build/', '/dist/'];
     }
     get output() {
         const name = path_1.default.basename(this.projectPath);
         const result = `../.temp_${name}`;
         return result;
     }
+    /**
+     * 通过项目类型，返回模块配置
+     */
+    get module() {
+        const isVela = this.getProjectType() === shared_utils_1.ProjectType.VELA_UX;
+        return isVela
+            ? {
+                rules: [
+                    {
+                        test: ['app.ux'],
+                        loader: [AppUxLoader_1.default]
+                    },
+                    {
+                        test: [/.+\.ux$/],
+                        exclude: [/app\.ux/],
+                        loader: [UxLoader_1.default]
+                    },
+                    {
+                        test: [/.+\.hml$/],
+                        loader: [HmlLoader_1.default, UxLoader_1.default]
+                    },
+                    {
+                        test: [/.+\.js$/],
+                        loader: [JsLoader_1.default]
+                    },
+                    {
+                        test: [/.+\.9.png/],
+                        loader: [PngLoader_1.default]
+                    }
+                ]
+            }
+            : {
+                rules: [
+                    {
+                        test: [/.+\.ux$/],
+                        loader: [UxLoader_2.default]
+                    },
+                    {
+                        test: [/.+\.js$/],
+                        loader: [JsLoader_1.default]
+                    },
+                    {
+                        test: [/.+\.9.png/],
+                        loader: [PngLoader_1.default]
+                    }
+                ]
+            };
+    }
+    /**
+     * 判断项目类型
+     *
+     * 目前的办法是通过 manifest.json 的 deviceTypeList 是否有 watch 判断
+     */
+    getProjectType() {
+        return shared_utils_1.ProjectType.getProjectType(this.projectPath);
+    }
 }
 exports.default = UxConfig;

package/lib/config/XtsConfig.d.ts

@@ -1,4 +1,4 @@
-import { IFileLaneConfig } from 'file-lane';
+import { IFileLaneConfig, PreWork } from 'file-lane';
 import XtsLoader from '../loader/xts/XtsLoader';
 /**
  * XtsConfig
@@ -12,7 +12,9 @@ declare class XtsConfig implements IFileLaneConfig {
             loader: (typeof XtsLoader)[];
         }[];
     };
-    preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<import("../interface/ICompileOptions").IXtsCompileOptions>[];
-    followWorks: import("file-lane/lib/interface/IFileLaneConfig").FollowWork<import("../interface/ICompileOptions").IXtsCompileOptions>[];
+    preWorks: PreWork[];
+    followWorks: {
+        worker: import("file-lane").FollowWork<import("..").IXtsCompileOptions>;
+    }[];
 }
 export default XtsConfig;

package/lib/config/XtsConfig.js

@@ -7,7 +7,6 @@ const entryTemplate_1 = require("../followWorks/xts/entryTemplate");
 const generateRpk_1 = require("../followWorks/xts/generateRpk");
 const ts2wasm_1 = require("../followWorks/xts/ts2wasm");
 const XtsLoader_1 = __importDefault(require("../loader/xts/XtsLoader"));
-const preInstall_1 = require("../preWorks/xts/preInstall");
 /**
  * XtsConfig
  */
@@ -23,8 +22,18 @@ class XtsConfig {
                 }
             ]
         };
-        this.preWorks = [preInstall_1.preInstall];
-        this.followWorks = [entryTemplate_1.generateEntryFile, ts2wasm_1.ts2wasm, generateRpk_1.generateRpk];
+        this.preWorks = [];
+        this.followWorks = [
+            {
+                worker: entryTemplate_1.generateEntryFile
+            },
+            {
+                worker: ts2wasm_1.ts2wasm
+            },
+            {
+                worker: generateRpk_1.generateRpk
+            }
+        ];
     }
 }
 exports.default = XtsConfig;

package/lib/{utils → followWorks}/ux/UxFollowWorks.d.ts

@@ -1,4 +1,4 @@
-import { FollowWork } from 'file-lane/lib/interface/IFileLaneConfig';
+import { FollowWork } from 'file-lane';
 import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
 /**
  * UxFollowWorks