@oniroproject/oniro-app 0.15.0 → 0.16.0

package/README.md

@@ -61,9 +61,20 @@ Install commands are idempotent (they skip when already present); pass `--force`
 | Command | Description |
 | --- | --- |
 | `sdk install <version> [--force] [--tmp-dir <path>]` | Download and install an OpenHarmony SDK (e.g. `6.1`). `--tmp-dir` overrides where download/extract temporaries go (see [Temporary space](#temporary-space)). |
+| `sdk install --from-archive <path> [--force] [--tmp-dir <path>]` | Install an SDK from a local `.tar.gz` instead, such as the [full SDK](#full-sdk). Only the current OS's components are unpacked, and the API level is read from them; an SDK already installed at that level is replaced only with `--force`. |
 | `sdk list [--json]` | List known SDK versions; an `*` marks installed ones. |
 | `sdk remove <api>` | Remove an installed SDK by API level (e.g. `18`, `20`). |
 
+##### Full SDK
+
+`sdk install <version>` downloads the public SDK, which leaves out system APIs (`@systemapi`). The full SDK is not on the release mirror: download an `ohos-sdk-full` archive from the [OpenHarmony daily builds](https://dcp.openharmony.cn/workbench/cicd/dailybuild/dailylist) and install it from the file:
+
+```bash
+oniro-app sdk install --from-archive ~/Downloads/version-Master_Version-OpenHarmony_7.0.0.39-…-ohos-sdk-full_7.0-Release.tar.gz
+```
+
+It lands in `<ONIRO_SDK_ROOT_DIR>/<os>/<api>` like a downloaded release, so projects with that `compileSdkVersion` build against it. Pass `--force` to replace a public SDK of the same API level, or set `ONIRO_SDK_ROOT_DIR` to a separate root to keep both.
+
 #### `cmdtools` — manage the OpenHarmony command-line tools (provides `hvigorw`, `ohpm`, `hdc`, `codelinter`)
 
 | Command | Description |
@@ -578,7 +589,7 @@ oniro-app sign --apl system_core --acls ohos.permission.ACCESSIBILITY_EXTENSION_
     --app-privilege-capabilities AllowAppUsePrivilegeExtension
 ```
 
-Apps like these usually also call system APIs (`@systemapi`), which the public SDK that `sdk install` downloads leaves out: the build fails with errors such as `'config' is not exported from Kit '@kit.AccessibilityKit'`. Build them against the full OpenHarmony SDK by unpacking its components into `<root>/<os>/<api>` of a separate SDK root and pointing `ONIRO_SDK_ROOT_DIR` at that root.
+Apps like these usually also call system APIs (`@systemapi`), which the public SDK that `sdk install` downloads leaves out: the build fails with errors such as `'config' is not exported from Kit '@kit.AccessibilityKit'`. Build them against the full OpenHarmony SDK, installed with `sdk install --from-archive` (see [Full SDK](#full-sdk)).
 
 The `signingConfigs` block written to `build-profile.json5` mirrors the names used by the project's `products[*].signingConfig` (e.g. `applications/standard/systemui` uses `release`, `launcher` uses `default`). If the project has no products section, `default` is used, and a product that names no `signingConfig` is pointed at it.
 

package/dist/oniro-app.js

@@ -2,17 +2,19 @@
 
 // src/bin/oniro-app.ts
 import { Command as Command4 } from "commander";
-import { OniroError as OniroError2 } from "@oniroproject/core";
+import { OniroError as OniroError3 } from "@oniroproject/core";
 
 // src/commands/sdk.ts
 import * as fs from "fs";
 import * as path from "path";
 import {
   ALL_SDKS,
+  OHOS_DAILY_BUILDS_URL,
   downloadAndInstallSdk,
   getOsFolder,
   getSdkRootDir,
   getSupportedSdksForUi,
+  installSdkFromArchive,
   removeSdk
 } from "@oniroproject/core";
 
@@ -104,13 +106,42 @@ function getRuntime() {
 }
 
 // src/commands/sdk.ts
+var FULL_SDK_TIP = `Tip: the full SDK (with system APIs) is not on the release mirror. Download an ohos-sdk-full archive from the OpenHarmony daily builds, ${OHOS_DAILY_BUILDS_URL}, and install it with \`oniro-app sdk install --from-archive <archive>\`.`;
 function registerSdkCommand(program) {
   const sdk = program.command("sdk").description("Manage OpenHarmony SDK installs.");
-  sdk.command("install <version>").description("Download and install an OpenHarmony SDK. Skips if already installed.").option("--force", "Reinstall even if the SDK is already present.").option(
+  sdk.command("install [version]").description(
+    "Download and install an OpenHarmony SDK (skips if already installed), or install one from a local archive with --from-archive."
+  ).option(
+    "--from-archive <path>",
+    "Install from a local SDK .tar.gz instead of downloading, e.g. the full SDK. The API level is read from the archive."
+  ).option("--force", "Reinstall even if the SDK is already present.").option(
     "--tmp-dir <path>",
     "Directory for download/extract temporaries (default: ONIRO_TMP_DIR, else .oniro-tmp next to the install target). Use this when that filesystem is short on space."
-  ).action(async (version, opts) => {
+  ).addHelpText("after", `
+${FULL_SDK_TIP}`).action(async (version, opts) => {
     const { config, logger, progress } = getRuntime();
+    if (opts.fromArchive) {
+      if (version) throw new Error("Pass either a version or --from-archive, not both.");
+      const archivePath = path.resolve(opts.fromArchive);
+      logger.info(`Installing OpenHarmony SDK from ${archivePath}...`);
+      const installed = await installSdkFromArchive({
+        config,
+        archivePath,
+        force: opts.force,
+        progress,
+        logger,
+        tmpDir: opts.tmpDir
+      });
+      const label = installed.version ? `SDK ${installed.version} (api ${installed.api})` : `SDK api ${installed.api}`;
+      logger.info(`${label} installed at ${installed.dir}.`);
+      return;
+    }
+    if (!version) {
+      throw new Error(
+        `Name an SDK version (${ALL_SDKS.map((s) => s.version).join(", ")}) or pass --from-archive <path>.
+` + FULL_SDK_TIP
+      );
+    }
     const release = ALL_SDKS.find((s) => s.version === version);
     if (!release) {
       throw new Error(
@@ -488,7 +519,17 @@ function registerAuthCommand(program) {
 
 // src/commands/app.ts
 import * as path4 from "path";
-import { installApp, launchApp, uninstallApp, forceStop, applyChanges, getBundleName } from "@oniroproject/core";
+import {
+  installApp,
+  launchApp,
+  uninstallApp,
+  forceStop,
+  applyChanges,
+  existingHapOrUnsigned,
+  getBundleName,
+  readHapBundleName,
+  OniroError as OniroError2
+} from "@oniroproject/core";
 function registerAppCommand(program) {
   const app = program.command("app").description("Install, launch, and manage built apps on a connected device/emulator.");
   app.command("install [project-dir-or-hap]").description(
@@ -516,16 +557,29 @@ function registerAppCommand(program) {
     }
     logger.info("App launched.");
   });
-  app.command("apply [project-dir]").description(
-    "Install a HAP and verify the running process took the change. Handles sign-info mismatch, asset-cache invalidation, and persistent-bundle restart."
-  ).option("--bundle <bundle>", "Bundle name to apply changes to. Defaults to the bundleName in the project AppScope/app.json5.").option("--module <module>", "Module to resolve the HAP from (multi-module projects).").option("--hap <path>", "Explicit .hap path (relative to project-dir or absolute).").option("--installed-hap <path>", "Local path to the currently-installed HAP, to enable the asset-cache reboot.").option("--system", "Treat as a persistent/system bundle (refuses uninstall on sign-info mismatch).").option("--allow-uninstall", "Permit uninstalling a system bundle on sign-info mismatch (dangerous).").option("--device <serial>", "Target device serial.").option("--json", "Emit the result as JSON.").action(async (projectDir, opts) => {
+  app.command("apply [project-dir-or-hap]").description(
+    "Install a HAP (a project dir, default the current one, or a .hap file) and verify the running process took the change. Refuses a HAP of another bundle. Handles sign-info mismatch, asset-cache invalidation, and persistent-bundle restart."
+  ).option(
+    "--bundle <bundle>",
+    "Bundle name to apply changes to. Defaults to the bundleName in the .hap file, else in the project AppScope/app.json5."
+  ).option("--module <module>", "Module to resolve the HAP from (multi-module projects).").option("--hap <path>", "Explicit .hap path (relative to project-dir or absolute).").option("--installed-hap <path>", "Local path to the currently-installed HAP, to enable the asset-cache reboot.").option("--system", "Treat as a persistent/system bundle (refuses uninstall on sign-info mismatch).").option("--allow-uninstall", "Permit uninstalling a system bundle on sign-info mismatch (dangerous).").option("--device <serial>", "Target device serial.").option("--json", "Emit the result as JSON.").action(async (target, opts) => {
     const { config, logger } = getRuntime();
-    const dir = path4.resolve(projectDir ?? process.cwd());
-    const bundle = opts.bundle ?? getBundleName(dir);
+    const isHap = target !== void 0 && /\.hap$/i.test(target);
+    if (isHap && opts.hap) throw new OniroError2("Pass the HAP either as the argument or with --hap, not both.");
+    const dir = isHap ? process.cwd() : path4.resolve(target ?? process.cwd());
+    const hapPath = isHap ? path4.resolve(target) : opts.hap;
+    let bundle = opts.bundle;
+    if (!bundle && isHap) {
+      const hap = existingHapOrUnsigned(hapPath);
+      if (!hap) throw new OniroError2(`HAP not found at ${hapPath}.`);
+      bundle = await readHapBundleName(hap.path).catch(() => null) ?? void 0;
+      if (!bundle) throw new OniroError2(`Could not read the bundle name from ${hap.path}. Pass --bundle.`);
+    }
+    bundle ??= getBundleName(dir);
     const result = await applyChanges({
       config,
       bundle,
-      hapPath: opts.hap,
+      hapPath,
       projectDir: dir,
       module: opts.module,
       installedHapPath: opts.installedHap,
@@ -685,16 +739,31 @@ function targetIndexFrom(opts) {
   return n;
 }
 
+// src/lib/logSince.ts
+function parseSince(value) {
+  if (value === void 0) return void 0;
+  if (value === "all") return Infinity;
+  const seconds = Number(value);
+  if (value.trim() === "" || !Number.isFinite(seconds) || seconds < 0) {
+    throw new Error(`--since takes a number of seconds or "all", not "${value}".`);
+  }
+  return seconds * 1e3;
+}
+
 // src/commands/wait.ts
 function registerWaitCommand(program) {
   const wait = program.command("wait").description(
     "Wait for a device condition: a log line (--log), boot (--boot), a bundle to start (--bundle), or an on-screen element (--target / --target-id / --target-type)."
-  ).option("--log <pattern>", "Resolve when a hilog line (tag: message) matches this regex.").option("--boot", "Resolve when the device is reachable (optionally also --pid-of).").option("--bundle <bundle>", "With --log: filter to this bundle. Alone: wait until this bundle is running.").option("--pid-of <name>", "With --boot: also require this process to have a pid.").option("--domain <domain>", "With --log: hilog domain filter (e.g. 0xD003900).");
+  ).option("--log <pattern>", "Resolve when a hilog line (tag: message) logged after the command starts matches this regex.").option(
+    "--since <seconds>",
+    'With --log: also match lines logged up to N seconds before the command started, measured on the device clock; "all" matches everything still in the device log buffer.'
+  ).option("--boot", "Resolve when the device is reachable (optionally also --pid-of).").option("--bundle <bundle>", "With --log: filter to this bundle. Alone: wait until this bundle is running.").option("--pid-of <name>", "With --boot: also require this process to have a pid.").option("--domain <domain>", "With --log: hilog domain filter (e.g. 0xD003900).");
   addTargetOptions(wait, "Resolve when", { index: false });
   wait.option("--gone", "With --target*: resolve when no uncovered element matches any more.").option("--interval <ms>", "With --target*: poll interval, ms (each poll is a layout dump).", "500").option("--timeout <ms>", "Max wait, ms.", "30000").option("--device <serial>", "Target device serial.").option("--json", "With --log or --target*: emit the matched entry/element as JSON.").action(async (opts) => {
     const { config, logger } = getRuntime();
     const timeoutMs = Number(opts.timeout);
     const selector = selectorFrom(opts);
+    if (opts.since !== void 0 && !opts.log) throw new Error("--since applies only to --log.");
     if (opts.log) {
       const entry = await waitForLog({
         config,
@@ -703,11 +772,12 @@ function registerWaitCommand(program) {
         bundle: opts.bundle,
         domain: opts.domain,
         deviceSerial: opts.device,
+        lookbackMs: parseSince(opts.since),
         logger
       });
       if (opts.json) process.stdout.write(`${JSON.stringify(entry, null, 2)}
 `);
-      else logger.info(`matched: ${entry.tag}: ${entry.message}`);
+      else logger.info(`matched: ${entry.time}  ${entry.tag}: ${entry.message}`);
       return;
     }
     if (opts.boot) {
@@ -746,7 +816,10 @@ function registerWaitCommand(program) {
 // src/commands/watch.ts
 import { watchLog } from "@oniroproject/core";
 function registerWatchCommand(program) {
-  program.command("watch").description("Collect hilog lines matching a pattern for a fixed duration.").option("--log <pattern>", "Regex tested against each line (tag: message).").option("--for <ms>", "Duration to watch, ms.", "10000").option("--bundle <bundle>", "Filter to this bundle.").option("--domain <domain>", "hilog domain filter (e.g. 0xD003900).").option("--no-dedup", "Do not collapse consecutive duplicate lines.").option("--device <serial>", "Target device serial.").option("--json", "Emit the entries as JSON.").action(async (opts) => {
+  program.command("watch").description("Collect the hilog lines matching a pattern that are logged during a fixed duration.").option("--log <pattern>", "Regex tested against each line (tag: message).").option("--for <ms>", "Duration to watch, ms.", "10000").option(
+    "--since <seconds>",
+    'Also collect lines logged up to N seconds before the command started, measured on the device clock; "all" adds everything still in the device log buffer.'
+  ).option("--bundle <bundle>", "Filter to this bundle.").option("--domain <domain>", "hilog domain filter (e.g. 0xD003900).").option("--no-dedup", "Do not collapse consecutive duplicate lines.").option("--device <serial>", "Target device serial.").option("--json", "Emit the entries as JSON.").action(async (opts) => {
     const { config, logger } = getRuntime();
     if (!opts.log) throw new Error("watch requires --log <pattern>.");
     const entries = await watchLog({
@@ -757,6 +830,7 @@ function registerWatchCommand(program) {
       domain: opts.domain,
       dedup: opts.dedup,
       deviceSerial: opts.device,
+      lookbackMs: parseSince(opts.since),
       logger
     });
     if (opts.json) {
@@ -1194,6 +1268,7 @@ import {
   detectCmdToolsFlavour,
   detectRuntimeOs as detectRuntimeOs2,
   getCmdToolsPath,
+  missingProjectRootFiles,
   runCodelinter
 } from "@oniroproject/core";
 function lintTotals(result) {
@@ -1208,8 +1283,10 @@ function lintTotals(result) {
 }
 function lintExitCode(result) {
   if (lintTotals(result).errors > 0) return 1;
-  const noReport = result.summary === null && result.findings.length === 0;
-  return noReport && result.code !== 0 ? result.code : 0;
+  return lintFailed(result) ? result.code : 0;
+}
+function lintFailed(result) {
+  return result.summary === null && result.findings.length === 0 && result.code !== 0;
 }
 function registerLintCommand(program) {
   program.command("lint [project-dir]").description(
@@ -1219,10 +1296,11 @@ function registerLintCommand(program) {
     const dir = path8.resolve(projectDir ?? process.cwd());
     const result = await runCodelinter({ config, projectDir: dir, files: opts.files, logger });
     const totals = lintTotals(result);
+    const failed = lintFailed(result);
     if (opts.json) {
       process.stdout.write(`${JSON.stringify(result, null, 2)}
 `);
-    } else {
+    } else if (!failed) {
       for (const f of result.findings) {
         const at = `${f.file}:${f.line}${f.column ? `:${f.column}` : ""}`;
         process.stdout.write(`${at} ${f.severity} ${f.message}${f.code ? ` [${f.code}]` : ""}
@@ -1233,9 +1311,13 @@ function registerLintCommand(program) {
 `
       );
     }
-    if (result.summary === null && result.findings.length === 0 && result.code !== 0) {
-      logger.error(`codelinter exited ${result.code} without a report:
-${result.raw.trim().split("\n").slice(-15).join("\n")}`);
+    if (failed) {
+      const missing = missingProjectRootFiles(dir);
+      const why = missing.length ? ` It needs a DevEco project root, and ${dir} has no ${missing.join(", ")}.` : "";
+      logger.error(
+        `codelinter exited ${result.code} without a report, so nothing was linted.${why}
+` + result.raw.trim().split("\n").slice(-15).join("\n")
+      );
     }
     if (result.incomplete) {
       for (const n of result.notices) logger.warn(`codelinter: ${n}`);
@@ -1921,19 +2003,19 @@ function registerHdcCommand(program) {
 `);
       return;
     }
-    await new Promise((resolve9, reject) => {
+    await new Promise((resolve10, reject) => {
       const child = spawnCompat(hdc, hdcPassthroughArgv(args, opts.device), { stdio: "inherit" });
       child.on("error", (err) => reject(new Error(`Failed to run ${hdc}: ${err.message}`)));
       child.on("close", (code) => {
         process.exitCode = code ?? 1;
-        resolve9();
+        resolve10();
       });
     });
   });
 }
 
 // src/bin/oniro-app.ts
-var CLI_VERSION = "0.15.0";
+var CLI_VERSION = "0.16.0";
 function buildProgram() {
   const program = new Command4().name("oniro-app").description(
     "Cross-platform CLI for Oniro/OpenHarmony app development.\n\nDesigned for non-interactive use (CI, scripts, agents): every command\ntakes explicit flags, results go to stdout, progress/logs go to stderr,\nand a non-zero exit code indicates failure."
@@ -1965,7 +2047,7 @@ async function main() {
   try {
     await program.parseAsync(process.argv);
   } catch (err) {
-    const message = err instanceof OniroError2 ? err.message : err instanceof Error ? err.message : String(err);
+    const message = err instanceof OniroError3 ? err.message : err instanceof Error ? err.message : String(err);
     process.stderr.write(`[error] ${message}
 `);
     if (process.env.ONIRO_DEBUG === "1" && err instanceof Error && err.stack) {