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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomicservice/ascf-toolkit-hvigor-plugin",
-  "version": "1.0.2",
+  "version": "1.0.3-beta.6",
   "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.2"
+    "@atomicservice/ascf-toolkit": "1.0.3-beta.6"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/common/common-enum.ts

@@ -0,0 +1,6 @@
+export enum LogLevel {
+  DEBUG = 'debug',
+  INFO = 'info',
+  WARN = 'warn',
+  ERROR = 'error'
+}

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 { 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 { LogLevel } from '../common/common-enum';
+import { deepMerge } from '../common/common-utils';
 
 import { doModifyShareInfoPlugin } from './modifyShareInfoPlugin';
 import { doInstallAscfHspPlugin } from './installAscfHspPlugin';
@@ -13,23 +16,29 @@ 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,
+  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);
 
@@ -47,13 +56,20 @@ export default function ascfToolkitHvigorPlugin(options: AscfPluginOptions): Hvi
             const buildMode = appContext.getBuildMode();
             const nodeExe = getNodeExe();
             const ascfScript = getAscfScript();
-            let cmd = `\"${nodeExe}\" \"${ascfScript}\" compile -c ${buildMode === 'debug' ? '-m' : ''} ${appContext.getProjectPath()}`;
+            let cmd = `${nodeExe} ${ascfScript} compile -c ${buildMode === 'debug' ? '-m' : ''} ${appContext.getProjectPath()}`;
 
-            if (opts.debug && logger.getLevel().levelStr === 'DEBUG') {
+            const hvigorLevelStr = (logger.getLevel() as Level).levelStr.toLowerCase();
+            if (opts.debug && hvigorLevelStr === LogLevel.DEBUG) {
               cmd += ' --debug';
             }
+            if (opts.compilerOptions.swc) {
+              cmd += ' --swc';
+            }
 
-            await executeCommand(cmd);
+            const logLevel = (opts.logging ? opts.logging : hvigorLevelStr).toLowerCase();
+            cmd += ` --logging=${logLevel}`;
+            logger.debug(cmd);
+            await executeCommand(cmd, hvigorLevelStr);
             logger.debug('ascf compile completed');
           }
         } catch (err: any) {
@@ -74,33 +90,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,7 +15,7 @@ function execSafe(cmd: string) {
   }
 }
 
-const BUNDLE_NAME_ASCF = 'com.huawei.hms.ascf';
+const BUNDLE_NAME_ASCF = 'com.huawei.hms.ascfruntime';
 const ERR_MSG = `${BUNDLE_NAME_ASCF} install failed, please open helloUniapp manually.`;
 
 function checkAscfHsp() {
@@ -38,7 +38,7 @@ function doInstallAscfHsp(resolve: any, reject: any) {
   logger.debug(`trying to install ${BUNDLE_NAME_ASCF}`);
   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 startInfo = execSafe(`hdc shell aa start -b com.huawei.hmos.browser -a MainAbility -A ohos.want.action.viewData -U "${configJson.ascfRuntimeHspUrl}"`);
   if (!startInfo?.includes('successfully')) {
     logger.warn(`${ERR_MSG} errorInfo=${startInfo}`);
     reject(ERR_MSG);