@atomicservice/ascf-toolkit-hvigor-plugin 1.0.3-beta.0 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomicservice/ascf-toolkit-hvigor-plugin",
-  "version": "1.0.3-beta.0",
+  "version": "1.0.3",
   "title": "ASCF toolkit hvigor plugin for atomicservice",
   "description": "ASCF toolkit hvigor plugin for atomicservice",
   "main": "index.ts",
@@ -11,7 +11,7 @@
     "@ohos/hvigor-ohos-plugin": "5.8.9"
   },
   "dependencies": {
-    "@atomicservice/ascf-toolkit": "1.0.3-beta.0"
+    "@atomicservice/ascf-toolkit": "1.0.3"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -105,7 +105,8 @@
     "@jridgewell/source-map": "0.3.2",
     "browserslist": "4.24.2",
     "resolve": "1.22.8",
-    "terser-webpack-plugin": "5.3.7"
+    "terser-webpack-plugin": "5.3.7",
+    "@swc/types": "0.1.17"
   },
   "license": "Apache-2.0",
   "licenseFilename": "LICENSE"

package/src/common/common-enum.ts

@@ -0,0 +1,33 @@
+export enum LogLevel {
+  DEBUG = 'debug',
+  INFO = 'info',
+  WARN = 'warn',
+  ERROR = 'error'
+}
+export enum DevtoolEnum {
+  EVAL = 'eval',
+  EVAL_CHEAP_SOURCE_MAP = 'eval-cheap-source-map',
+  EVAL_CHEAP_MODULE_SOURCE_MAP = 'eval-cheap-module-source-map',
+  EVAL_SOURCE_MAP = 'eval-source-map',
+  CHEAP_SOURCE_MAP = 'cheap-source-map',
+  CHEAP_MODULE_SOURCE_MAP = 'cheap-module-source-map',
+  SOURCE_MAP = 'source-map',
+  INLINE_CHEAP_SOURCE_MAP = 'inline-cheap-source-map',
+  INLINE_CHEAP_MODULE_SOURCE_MAP = 'inline-cheap-module-source-map',
+  INLINE_SOURCE_MAP = 'inline-source-map',
+  EVAL_NOSOURCES_CHEAP_SOURCE_MAP = 'eval-nosources-cheap-source-map',
+  EVAL_NOSOURCES_CHEAP_MODULE_SOURCE_MAP = 'eval-nosources-cheap-module-source-map',
+  EVAL_NOSOURCES_SOURCE_MAP = 'eval-nosources-source-map',
+  INLINE_NOSOURCES_CHEAP_SOURCE_MAP = 'inline-nosources-cheap-source-map',
+  INLINE_NOSOURCES_CHEAP_MODULE_SOURCE_MAP = 'inline-nosources-cheap-module-source-map',
+  INLINE_NOSOURCES_SOURCE_MAP = 'inline-nosources-source-map',
+  NOSOURCES_CHEAP_SOURCE_MAP = 'nosources-cheap-source-map',
+  NOSOURCES_CHEAP_MODULE_SOURCE_MAP = 'nosources-cheap-module-source-map',
+  NOSOURCES_SOURCE_MAP = 'nosources-source-map',
+  HIDDEN_NOSOURCES_CHEAP_SOURCE_MAP = 'hidden-nosources-cheap-source-map',
+  HIDDEN_NOSOURCES_CHEAP_MODULE_SOURCE_MAP = 'hidden-nosources-cheap-module-source-map',
+  HIDDEN_NOSOURCES_SOURCE_MAP = 'hidden-nosources-source-map',
+  HIDDEN_CHEAP_SOURCE_MAP = 'hidden-cheap-source-map',
+  HIDDEN_CHEAP_MODULE_SOURCE_MAP = 'hidden-cheap-module-source-map',
+  HIDDEN_SOURCE_MAP = 'hidden-source-map',
+}

package/src/common/common-utils.ts

@@ -0,0 +1,26 @@
+type DeepPartial<T> = {
+  [P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P];
+};
+
+function deepMerge<T extends object>(target: T, source?: DeepPartial<T>): T {
+  if (!source) {
+    return target;
+  }
+  for (const key of Object.keys(source) as Array<keyof T>) {
+    const sourceValue = source[key];
+    const targetValue = target[key];
+    
+    if (isObject(sourceValue) && key in target && isObject(targetValue)) {
+      deepMerge(targetValue as Object, sourceValue as DeepPartial<typeof targetValue>);
+    } else {
+      target[key] = sourceValue as T[keyof T];
+    }
+  }
+  return target;
+}
+
+function isObject(target: any) {
+  return Object.prototype.toString.call(target) === '[object Object]';
+}
+
+export { deepMerge };

package/src/config.json

@@ -1,3 +1,4 @@
 {
-  "ascfHspUrl": "https://h5hosting-drcn.dbankcdn.cn/cch5/wallet/ascf-cn/ascfHsp.html?auto=1"
+  "ascfHspUrl": "https://h5hosting-drcn.dbankcdn.cn/cch5/wallet/ascf-cn/ascfHsp.html?auto=1",
+  "ascfRuntimeHspUrl": "https://h5hosting-drcn.dbankcdn.cn/cch5/wallet/ascf-cn/ascfRuntimeHsp.html?auto=1"
 }

package/src/plugin/ascf-toolkit-hvigor-plugin.ts

@@ -1,11 +1,14 @@
-import { OhosAppContext, OhosPluginId } from '@ohos/hvigor-ohos-plugin';
+import {OhosAppContext, OhosHapContext, OhosPluginId} from '@ohos/hvigor-ohos-plugin';
 import { Property } from '@ohos/hvigor-ohos-plugin/src/sdk/lib/property-get';
 import { PropertyConst } from '@ohos/hvigor-ohos-plugin/src/const/property-const';
-import { hvigor, HvigorLogger, HvigorNode, HvigorPlugin } from '@ohos/hvigor';
+import { hvigor, HvigorLogger, HvigorNode, HvigorPlugin, Level } from '@ohos/hvigor';
 import ascf from '@atomicservice/ascf-toolkit';
 import { exec } from 'child_process';
 import path from 'path';
+import fs from 'fs';
 import os from 'os';
+import { DevtoolEnum, LogLevel } from '../common/common-enum';
+import { deepMerge } from '../common/common-utils';
 
 import { doModifyShareInfoPlugin } from './modifyShareInfoPlugin';
 import { doInstallAscfHspPlugin } from './installAscfHspPlugin';
@@ -13,23 +16,30 @@ import { doInstallAscfHspPlugin } from './installAscfHspPlugin';
 const logger = HvigorLogger.getLogger('ascfPlugin');
 
 export interface AscfPluginOptions {
-  fixSharedHsp: true,
-  installAscfHsp: true,
-  debug: true,
+  fixSharedHsp: boolean,
+  installAscfHsp: boolean,
+  debug: boolean,
+  logging?: LogLevel,
+  devtool?: DevtoolEnum,
+  compilerOptions: {
+    swc: boolean,
+  }
 }
 
 const DEFAULT_OPTIONS: AscfPluginOptions = {
   fixSharedHsp: true,
   installAscfHsp: true,
   debug: true,
+  compilerOptions: {
+    swc: false,
+  }
 };
 
-export default function ascfToolkitHvigorPlugin(options: AscfPluginOptions): HvigorPlugin {
+export default function ascfToolkitHvigorPlugin(options?: AscfPluginOptions): HvigorPlugin {
   return {
     pluginId: 'ascfToolkitHvigorPlugin',
     apply(node: HvigorNode) {
-      const opts = Object.assign({}, DEFAULT_OPTIONS, options);
-
+      const opts = deepMerge(DEFAULT_OPTIONS, options);
       hvigor.nodesEvaluated(async () => {
         await execPlugin(opts, node);
 
@@ -42,19 +52,48 @@ export default function ascfToolkitHvigorPlugin(options: AscfPluginOptions): Hvi
               },
             });
           } else {
-            logger.debug('start exec ascf compile');
+            logger.debug('start exec ascf quickGenSub');
+            await ascf.quickGenerateSubpackage();
+            logger.debug('ascf quickGenSub completed');
             const appContext = node.getContext(OhosPluginId.OHOS_APP_PLUGIN) as OhosAppContext;
-            const buildMode = appContext.getBuildMode();
-            const nodeExe = getNodeExe();
-            const ascfScript = getAscfScript();
-            let cmd = `\"${nodeExe}\" \"${ascfScript}\" compile -c ${buildMode === 'debug' ? '-m' : ''} ${appContext.getProjectPath()}`;
-
-            if (opts.debug && logger.getLevel().levelStr === 'DEBUG') {
-              cmd += ' --debug';
-            }
+            node.subNodes((subNode: HvigorNode) => {
+              const hapContext = subNode.getContext(OhosPluginId.OHOS_HAP_PLUGIN) as OhosHapContext;
+              if(hapContext && hapContext.getModuleType() === 'entry') {
+                subNode.registerTask({
+                  // 任务名称
+                  name: 'quickGenerateSubpackage',
+                  // 任务执行逻辑主体函数
+                  async run() {
+                    logger.debug('start exec ascf compile');
+                    const buildMode = appContext.getBuildMode();
+                    const nodeExe = getNodeExe();
+                    const ascfScript = getAscfScript();
+                    let cmd = `${nodeExe} ${ascfScript} compile -c ${buildMode === 'debug' ? '-m' : ''} ${appContext.getProjectPath()}`;
 
-            await executeCommand(cmd);
-            logger.debug('ascf compile completed');
+                    const hvigorLevelStr = (logger.getLevel() as Level).levelStr.toLowerCase();
+                    if (opts.debug && hvigorLevelStr === LogLevel.DEBUG) {
+                      cmd += ' --debug';
+                    }
+                    if (opts.compilerOptions.swc) {
+                      cmd += ' --swc';
+                    }
+                    const devtool = opts.devtool?.toLowerCase();
+                    if (devtool) {
+                      cmd += ` --devtool=${devtool}`;
+                    }
+                    const logLevel = (opts.logging ? opts.logging : hvigorLevelStr).toLowerCase();
+                    cmd += ` --logging=${logLevel}`;
+                    logger.debug(cmd);
+                    await executeCommand(cmd, hvigorLevelStr);
+                    logger.debug('ascf compile completed');
+                  },
+                  // 配置前置任务依赖
+                  dependencies: ['default@PreBuild'],
+                  // 配置任务的后置任务依赖
+                  postDependencies: ['assembleHap']
+                });
+              }
+            });
           }
         } catch (err: any) {
           logger.errorExit(new Error(err));
@@ -74,33 +113,53 @@ async function execPlugin(opts: AscfPluginOptions, node: HvigorNode) {
   }
 }
 
-function executeCommand(command: string) {
+function executeCommand(command: string, levelStr: string) {
   return new Promise((resolve, reject) => {
-    exec(command, (error: any, stdout: any, stderr: string) => {
+    exec(command, (error: any, stdout: string, stderr: string) => {
+      printLogger(stdout, levelStr);
       if (error) {
         reject(error);
       } else {
-        logger.debug(stderr);
-        logger.debug(stdout);
-        resolve(stderr);
+        resolve(stdout);
       }
     });
   });
 }
 
+function printLogger(stdout: string, levelStr: string) {
+  if (stdout.length === 0) {
+    return;
+  }
+  if (levelStr === LogLevel.INFO) {
+    logger.info(stdout);
+  } else if (levelStr === LogLevel.WARN) {
+    logger.warn(stdout);
+  } else if (levelStr === LogLevel.ERROR) {
+    logger.error(stdout);
+  } else {
+    logger.debug(stdout);
+  }
+}
+
 function getNodeExe() {
   const property: Property = new Property();
   const nodeDir = property.getProperty(PropertyConst.NPM_DIR);
   const platform = os.platform();
+  let got = 'node';
+
   if (platform === 'win32') {
-    return path.join(nodeDir, 'node.exe');
+    got = path.join(nodeDir, 'node.exe');
   } else if (platform === 'darwin' || platform === 'linux') {
-    return path.join(nodeDir, 'node');
-  } else {
-    return 'node';
+    got = path.join(nodeDir, 'node');
   }
+
+  return fs.existsSync(got) ? adjustPathByPlatform(got) : 'node';
 }
 
 function getAscfScript() {
-  return path.join(ascf.getAscfToolkitDirname(), 'bin', 'ascf.js');
+  return adjustPathByPlatform(path.join(ascf.getAscfToolkitDirname(), 'bin', 'ascf.js'));
+}
+
+function adjustPathByPlatform(path: string) {
+  return os.platform() === 'win32' ? `\"${path}\"` : path;
 }

package/src/plugin/installAscfHspPlugin.ts

@@ -5,7 +5,7 @@ import { execSync } from 'child_process';
 import path from 'path';
 import fs from 'fs';
 
-const logger = HvigorLogger.getLogger('modifyShareInfoPlugin');
+const logger = HvigorLogger.getLogger('installAscfHspPlugin');
 
 function execSafe(cmd: string) {
   try {
@@ -15,40 +15,58 @@ function execSafe(cmd: string) {
   }
 }
 
-const BUNDLE_NAME_ASCF = 'com.huawei.hms.ascfruntime';
-const ERR_MSG = `${BUNDLE_NAME_ASCF} install failed, please open helloUniapp manually.`;
+function checkProjectAscfVer() {
+  logger.debug(`Check project ascf dependency version.`);
+  const node = hvigor.getNodeByName('entry');
+  let ohPkgFile = path.resolve(node?.getNodePath(), './oh-package.json');
+  if (!fs.existsSync(ohPkgFile)) {
+    ohPkgFile += '5'; // trying module.json5
+    if (!fs.existsSync(ohPkgFile)) {
+      logger.warn(`Check oh-package failed. Not found ${ohPkgFile}.`);
+      return false;
+    }
+  }
+  const ohPkgDeps = JSON.parse(fs.readFileSync(ohPkgFile).toString())?.dependencies;
+  logger.debug(`ohPkgDeps: ${JSON.stringify(ohPkgDeps)}`);
+  return !!Object.prototype.hasOwnProperty.call(ohPkgDeps, '@atomicservice/ascf');
+}
 
-function checkAscfHsp() {
-  logger.debug(`Check and install ${BUNDLE_NAME_ASCF} for local development`);
-  const sharedInfo = execSafe(`hdc shell bm dump-shared -a`);
-  if (sharedInfo?.includes(BUNDLE_NAME_ASCF)) {
-    const verInfo = execSafe(`hdc shell "bm dump-shared -n ${BUNDLE_NAME_ASCF} | grep versionName"`);
-    logger.debug(`found ${BUNDLE_NAME_ASCF} ${verInfo}`);
+function checkAscfHsp(ascfBundleName: string) {
+  logger.debug(`Check and install ${ascfBundleName} for local development`);
+  const sharedInfo: string = execSafe(`hdc shell bm dump-shared -a`) ?? '';
+  if (new RegExp(`${ascfBundleName}(\\r?\\n|$)`).test(sharedInfo)) {
+    const verInfo = execSafe(`hdc shell "bm dump-shared -n ${ascfBundleName} | grep versionName"`);
+    logger.debug(`found ${ascfBundleName} ${verInfo}`);
     return true;
   }
   return false;
 }
 
 function doInstallAscfHsp(resolve: any, reject: any) {
-  if (checkAscfHsp()) {
+  const isDepOldAscf: boolean = checkProjectAscfVer();
+  const ascfBundleName: string = isDepOldAscf ? 'com.huawei.hms.ascf' : 'com.huawei.hms.ascfruntime';
+  const errMsg: string = `${ascfBundleName} install failed, please open helloUniapp manually.`;
+
+  if (checkAscfHsp(ascfBundleName)) {
     resolve();
     return;
   }
 
-  logger.debug(`trying to install ${BUNDLE_NAME_ASCF}`);
+  logger.debug(`trying to install ${ascfBundleName}`);
   const configJsonPath = path.resolve(__dirname, '../config.json');
   const configJson = JSON.parse(fs.readFileSync(configJsonPath).toString());
-  const startInfo = execSafe(`hdc shell aa start -b com.huawei.hmos.browser -a MainAbility -A ohos.want.action.viewData -U "${configJson.ascfHspUrl}"`);
+  const hspUrl = isDepOldAscf ? configJson.ascfHspUrl : configJson.ascfRuntimeHspUrl;
+  const startInfo = execSafe(`hdc shell aa start -b com.huawei.hmos.browser -a MainAbility -A ohos.want.action.viewData -U "${hspUrl}"`);
   if (!startInfo?.includes('successfully')) {
-    logger.warn(`${ERR_MSG} errorInfo=${startInfo}`);
-    reject(ERR_MSG);
+    logger.warn(`${errMsg} errorInfo=${startInfo}`);
+    reject(errMsg);
     return;
   }
 
   logger.debug(`begin to wait install hsp`);
   let needWait = 0;
   let timer = setInterval(() => {
-    const found = checkAscfHsp();
+    const found = checkAscfHsp(ascfBundleName);
     needWait++;
 
     if (found || needWait > 5) {
@@ -56,8 +74,8 @@ function doInstallAscfHsp(resolve: any, reject: any) {
       if (found) {
         resolve();
       } else {
-        logger.warn(ERR_MSG);
-        reject(ERR_MSG);
+        logger.warn(errMsg);
+        reject(errMsg);
       }
       return;
     }