harmony run

Author: wtto00

package.json

@@ -53,6 +53,7 @@
     "proxy-agent": "^6.5.0",
     "send": "^1.1.0",
     "validate-npm-package-name": "^6.0.0",
+    "which": "^5.0.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {
@@ -61,6 +62,7 @@
     "@types/node": "^22.10.2",
     "@types/send": "^0.17.4",
     "@types/validate-npm-package-name": "^4.0.2",
+    "@types/which": "^3.0.4",
     "@types/ws": "^8.5.13",
     "@wtto00/biome-config": "^0.0.1",
     "globstar": "^1.0.0",

pnpm-lock.yaml

@@ -1,6 +1,6 @@
 import { resolve } from 'node:path'
 import Android from '@wtto00/android-tools'
-import { type ResultPromise, execa } from 'execa'
+import { execa } from 'execa'
 import ora from 'ora'
 import type { BuildOptions } from '../build.js'
 import { App } from '../utils/app.js'
@@ -11,17 +11,10 @@ import { cleanAndroid } from './clean.js'
 import { getGradleExePath } from './gradle.js'
 import { prepare } from './prepare.js'
 
-let logcatProcess: ResultPromise<{
-  stdout: 'inherit'
-  stderr: 'ignore'
-  buffer: false
-  reject: false
-}>
+let logcatProcessController = new AbortController()
 
 function killLogcat() {
-  if (logcatProcess && !logcatProcess.killed) {
-    logcatProcess.kill()
-  }
+  logcatProcessController.abort()
 }
 
 export interface AndroidBuildOptions {
@@ -114,11 +107,13 @@ export async function buildAndroid(options: BuildOptions, runOptions?: AndroidBu
     }
 
     if (!runOptions?.isBuild) {
-      logcatProcess = execa({
+      logcatProcessController = new AbortController()
+      await execa({
         stdout: 'inherit',
         stderr: 'ignore',
         buffer: false,
         reject: false,
+        cancelSignal: logcatProcessController.signal,
       })`${android.adbBin} -s ${deviceName} logcat console:D jsLog:D weex:E aaa:D *:S -v raw -v color -v time`
     }
   } catch (error) {

src/android/build.ts

@@ -4,9 +4,13 @@ import { App } from './utils/app.js'
 import Log from './utils/log.js'
 import { isInstalled } from './utils/package.js'
 
+export type AndroidBundle = 'apk' | 'aab' | 'wgt'
+
+export type HarmonyBundle = 'hap' | 'har' | 'hsp' | 'app'
+
 export interface BuildOptions extends CommonOptions, AndroidCommonOptoins {
   /** Android打包产物类型 */
-  bundle?: 'apk' | 'aab' | 'wgt'
+  bundle?: AndroidBundle | HarmonyBundle
 }
 
 export async function build(platform: PLATFORM, options: BuildOptions) {

src/build.ts

@@ -1,3 +1,27 @@
-import type { RunOptions } from '../run.js'
+import type { BuildOptions, HarmonyBundle } from '../build.js'
+import Log from '../utils/log.js'
+import { clean } from './clean.js'
+import { prepare } from './prepare.js'
+import { hvigorwBuild, hvigorwSync } from './tools/hvigorw.js'
+import { ohpmInstall } from './tools/ohpm.js'
 
-export async function buildHarmony(_options: RunOptions) {}
+export interface HarmonyBuildOptions {
+  isBuild?: boolean
+}
+
+export async function buildHarmony(options: BuildOptions, runOptions?: HarmonyBuildOptions) {
+  Log.info('执行 clean')
+  await clean()
+
+  Log.info('执行 prepare')
+  await prepare({ isBuild: runOptions?.isBuild })
+
+  Log.info('安装 Harmony 依赖')
+  await ohpmInstall()
+
+  Log.info('打包初始化')
+  await hvigorwSync()
+
+  Log.info('开始打包')
+  await hvigorwBuild(options.bundle as HarmonyBundle)
+}

src/harmony/build.ts

@@ -14,18 +14,18 @@ export function checkConfig() {
 
   if (!bundleName) {
     failed = true
-    Log.warn('请在文件manifest.json中配置应用包名: app-harmony.distribute.bundleName')
+    Log.error('请在文件manifest.json中配置应用包名: app-harmony.distribute.bundleName')
   }
 
   // versionName
   if (!manifest.versionName) {
     failed = true
-    Log.warn('请在文件manifest.json中配置应用版本号: versionName')
+    Log.error('请在文件manifest.json中配置应用版本号: versionName')
   }
   // versionCode
-  if (!manifest.versionCode) {
+  if (!manifest.versionCode || Number.isNaN(Number(manifest.versionCode))) {
     failed = true
-    Log.warn('请在文件manifest.json中配置应用版本码: versionCode')
+    Log.error('请在文件manifest.json中配置应用版本码(数字类型): versionCode')
   }
 
   if (!icons?.foreground) {
@@ -47,7 +47,7 @@ export function checkConfig() {
 
   if (modules?.['uni-map']?.tencent && !modules['uni-map'].tencent.key) {
     failed = true
-    Log.warn(
+    Log.error(
       '您配置了腾讯地图，请在文件manifest.json中配置腾讯地图的key: app-harmony.distribute.modules.uni-map.tencent.key',
     )
   }

src/harmony/check.ts

@@ -0,0 +1,16 @@
+import { join } from 'node:path'
+import { cleanFiles } from '../utils/file.js'
+import { HarmonyDir, TemplateDir } from '../utils/path.js'
+import { hvigorwClean } from './tools/hvigorw.js'
+
+export async function clean() {
+  await cleanFiles(join(TemplateDir, 'harmony'), HarmonyDir, ['oh_modules', '.hvigor', '.idea', 'build'])
+}
+
+export async function cleanHvigorw() {
+  await hvigorwClean()
+}
+
+export async function reset() {
+  await cleanFiles(join(TemplateDir, 'harmony'), HarmonyDir)
+}

src/harmony/clean.ts

@@ -1,13 +1,62 @@
-import { cp, rm } from 'node:fs/promises'
+import { cp, readdir, rm } from 'node:fs/promises'
 import { join } from 'node:path'
 import type { PackageJson } from 'pkg-types'
 import { App } from '../utils/app.js'
-import { editJsonFile, exists } from '../utils/file.js'
+import { editJsonFile, exists, readJsonFile } from '../utils/file.js'
 import Log from '../utils/log.js'
+import { getPackageDependencies } from '../utils/package.js'
 import { HarmonyDir, TemplateDir } from '../utils/path.js'
 import type { AppJson } from './templates/app.json5.js'
+import type { BuildProfile } from './templates/build-profile.js'
 import type { ColorConfig } from './templates/element.json.js'
-import { assetsAppsPath, copyWww } from './www.js'
+
+export const assetsAppsPath = join(HarmonyDir, 'entry/src/main/resources/resfile/apps/HBuilder/www')
+
+export const devDistPath = join(App.projectRoot, 'dist/dev/app-harmony')
+
+export const buildDistPath = join(App.projectRoot, 'dist/build/app-harmony')
+
+export async function copyWww(options?: { isBuild?: boolean }) {
+  const buildDistDir = options?.isBuild ? buildDistPath : devDistPath
+  const files = await readdir(buildDistDir)
+  for (const file of files) {
+    const filePath = join(buildDistDir, file)
+    if (file === 'uni_modules') {
+      const hmFiles = await readdir(filePath)
+      for (const hmFile of hmFiles) {
+        const hmFilePath = join(filePath, hmFile)
+        if (hmFile === 'build-profile.json5') {
+          const modules = readJsonFile<BuildProfile>(hmFilePath, true).modules || []
+          if (modules.length > 0) {
+            await editJsonFile(join(HarmonyDir, hmFile), (data: BuildProfile) => {
+              data.modules.push(...modules)
+            })
+          }
+        } else if (hmFile === 'index.generated.ets') {
+          await cp(hmFilePath, join(HarmonyDir, `entry/src/main/ets/uni_modules/${hmFile}`), { recursive: true })
+        } else if (hmFile === 'oh-package.json5') {
+          const dependencies = getPackageDependencies(readJsonFile<PackageJson>(hmFilePath, true) || {})
+          if (Object.keys(dependencies).length > 0) {
+            await editJsonFile(join(HarmonyDir, hmFile), (data: PackageJson) => {
+              if (!data.dependencies) data.dependencies = dependencies
+              else {
+                for (const key in dependencies) {
+                  if (data.dependencies[key]) {
+                    if (data.dependencies[key] === dependencies[key]) continue
+                    Log.debug(`uni_modules 依赖 \`${key}\` 版本不一致，使用版本 ${dependencies[key]}`)
+                  }
+                  data.dependencies[key] = dependencies[key]
+                }
+              }
+            })
+          }
+        }
+      }
+    } else {
+      await cp(filePath, join(assetsAppsPath, file), { recursive: true })
+    }
+  }
+}
 
 export async function prepare(options?: { isBuild?: boolean }) {
   Log.debug('前端打包资源嵌入 Harmony 资源中')

src/harmony/prepare.ts

@@ -0,0 +1,53 @@
+import { readdir } from 'node:fs/promises'
+import { join } from 'node:path'
+import which from 'which'
+import { exists } from '../../utils/file.js'
+import { isDarwin, isWindows } from '../../utils/util.js'
+
+export async function getHdc() {
+  let hdcPath = await which('hdc', { nothrow: true })
+  if (hdcPath && (await exists(hdcPath))) return hdcPath
+
+  const hdcFileName = isWindows() ? 'hdc.exe' : 'hdc'
+
+  if (process.env.HARMONY_HOME) {
+    hdcPath = join(process.env.HARMONY_HOME, 'sdk', 'default', 'openharmony', 'toolchains', hdcFileName)
+    if (await exists(hdcPath)) return hdcPath
+  }
+
+  if (isWindows()) {
+    if (process.env['DevEco Studio']) {
+      hdcPath = join(process.env['DevEco Studio'], '..', 'sdk', 'default', 'openharmony', 'toolchains', hdcFileName)
+      if (await exists(hdcPath)) return hdcPath
+    }
+    if (process.env.ProgramFiles) {
+      hdcPath = join(
+        process.env.ProgramFiles,
+        'Huawei',
+        'DevEco Studio',
+        'sdk',
+        'default',
+        'openharmony',
+        'toolchains',
+        hdcFileName,
+      )
+      if (await exists(hdcPath)) return hdcPath
+    }
+    if (process.env.LOCALAPPDATA) {
+      const sdkDir = join(process.env.LOCALAPPDATA, 'OpenHarmony', 'Sdk')
+      if (await exists(sdkDir)) {
+        const sdkVerions = (await readdir(sdkDir)).map((file) => Number(file)).filter((ver) => !Number.isNaN(ver))
+        if (sdkVerions.length > 0) {
+          const maxSdkVersion = Math.max(...sdkVerions)
+          hdcPath = join(sdkDir, `${maxSdkVersion}`, 'toolchains', hdcFileName)
+          if (await exists(hdcPath)) return hdcPath
+        }
+      }
+    }
+  } else if (isDarwin()) {
+    hdcPath = `/Applications/DevEco-Studio.app/Contents/sdk/default/openharmony/toolchains/${hdcFileName}`
+    if (await exists(hdcPath)) return hdcPath
+  }
+
+  throw Error('未找到 hdc 可执行文件，请确定已安装 Harmony SDK')
+}