@oniroproject/core 0.11.0 → 0.12.0

package/README.md

@@ -99,7 +99,7 @@ The injection points every frontend implements, plus their defaults.
 | `getInstalledSdks` | `(config) => string[]` | Versions with at least one OS-folder install. |
 | `removeSdk` | `(config, api) => boolean` | Remove an installed SDK by API level across OS folders. |
 | `detectProjectSdkVersion` | `(projectRoot, logger?) => number \| undefined` | Read `compileSdkVersion` from a project's `build-profile.json5`. |
-| `ALL_SDKS` / `SdkRelease` | — | Catalog of known releases (`version`, `api`, `tarballStrip`). |
+| `ALL_SDKS` / `SdkRelease` | — | Catalog of known releases (`version`, `api`, `tarballStrip`, optional `archiveSuffix`). |
 | `OHOS_URL_BASE` | — | Default SDK mirror base URL. |
 | `getOsFolder()` / `getSdkFilename(version?)` | — | Map the host platform to its OS folder / SDK archive (`SdkArchiveInfo`). |
 
@@ -182,7 +182,7 @@ The injection-safe primitives every device operation builds on (`spawn` with `sh
 
 | Export | Signature | Description |
 | --- | --- | --- |
-| `reboot` | `(RebootOptions) => Promise<void>` | `system` (via `param set ohos.startup.powerctrl reboot`), `bootloader`, or `recovery`. Optionally waits for a bundle to return (and reconnects a TCP target across the reboot). |
+| `reboot` | `(RebootOptions) => Promise<void>` | `system` (via `param set ohos.startup.powerctrl reboot`), `bootloader`, or `recovery`. Optionally waits for a bundle to return (and reconnects a TCP target across the reboot, restarting the hdc server if it keeps the dead session). |
 | `waitForBundle` | `(WaitForBundleOptions) => Promise<void>` | Poll `pidof <bundle>` until it has a clean numeric pid. |
 | `waitForBoot` | `(WaitForBootOptions) => Promise<void>` | Poll until reachable (and optionally `untilPidOf` has a pid). Tolerant of the reboot disconnect. |
 | `waitForCondition` | `(WaitForConditionOptions) => Promise<void>` | Generic deadline + poll + heartbeat loop. A throwing probe counts as "not yet". |

package/dist/index.cjs

@@ -375,7 +375,8 @@ var ALL_SDKS = [
   { version: "5.1.0", api: "18", tarballStrip: { linuxWindows: 1, darwin: 3 } },
   { version: "5.1.1", api: "19", tarballStrip: { linuxWindows: 1, darwin: 3 } },
   { version: "6.0", api: "20", tarballStrip: { linuxWindows: 0, darwin: 3 } },
-  { version: "6.1", api: "23", tarballStrip: { linuxWindows: 0, darwin: 3 } }
+  { version: "6.1", api: "23", tarballStrip: { linuxWindows: 0, darwin: 3 } },
+  { version: "7.0", api: "26", tarballStrip: { linuxWindows: 1, darwin: 3 }, archiveSuffix: "_20260829" }
 ];
 var OHOS_URL_BASE = "https://repo.huaweicloud.com/openharmony/os";
 
@@ -391,18 +392,20 @@ function getOsFolder() {
 function getSdkFilename(version) {
   const platform7 = os2.platform();
   const v = version ?? ALL_SDKS[ALL_SDKS.length - 1].version;
-  const strips = ALL_SDKS.find((r) => r.version === v)?.tarballStrip ?? { linuxWindows: 1, darwin: 3 };
+  const release = ALL_SDKS.find((r) => r.version === v);
+  const strips = release?.tarballStrip ?? { linuxWindows: 1, darwin: 3 };
+  const archive = (base) => `${base}${release?.archiveSuffix ?? ""}.tar.gz`;
   if (platform7 === "linux") {
-    return { filename: "ohos-sdk-windows_linux-public.tar.gz", osFolder: "linux", strip: strips.linuxWindows };
+    return { filename: archive("ohos-sdk-windows_linux-public"), osFolder: "linux", strip: strips.linuxWindows };
   }
   if (platform7 === "darwin") {
     if (os2.arch() === "arm64") {
-      return { filename: "L2-SDK-MAC-M1-PUBLIC.tar.gz", osFolder: "darwin", strip: strips.darwin };
+      return { filename: archive("L2-SDK-MAC-M1-PUBLIC"), osFolder: "darwin", strip: strips.darwin };
     }
-    return { filename: "ohos-sdk-mac-public.tar.gz", osFolder: "darwin", strip: strips.darwin };
+    return { filename: archive("ohos-sdk-mac-public"), osFolder: "darwin", strip: strips.darwin };
   }
   if (platform7 === "win32") {
-    return { filename: "ohos-sdk-windows_linux-public.tar.gz", osFolder: "windows", strip: strips.linuxWindows };
+    return { filename: archive("ohos-sdk-windows_linux-public"), osFolder: "windows", strip: strips.linuxWindows };
   }
   throw new UnsupportedPlatformError(platform7);
 }
@@ -2464,19 +2467,39 @@ async function isReachable(config, deviceSerial) {
   }
 }
 var TCP_SERIAL_RE = /^.+:\d+$/;
-async function reconnectIfTcp(config, deviceSerial, logger) {
-  if (!deviceSerial || !TCP_SERIAL_RE.test(deviceSerial)) return;
-  try {
-    await hdcExec({ config, args: ["tconn", deviceSerial], timeoutMs: 5e3, logger });
-  } catch {
-  }
+var WEDGED_POLLS_BEFORE_RESTART = 3;
+function tcpReconnector(config, deviceSerial, logger) {
+  let wedgedPolls = 0;
+  return async () => {
+    if (!deviceSerial || !TCP_SERIAL_RE.test(deviceSerial)) return;
+    let claimsConnected = false;
+    try {
+      const res = await hdcExec({ config, args: ["tconn", deviceSerial], timeoutMs: 5e3, logger });
+      claimsConnected = /already connected|repeat operation/i.test(`${res.stdout}
+${res.stderr}`);
+    } catch {
+    }
+    if (!claimsConnected || await isReachable(config, deviceSerial)) {
+      wedgedPolls = 0;
+      return;
+    }
+    if (++wedgedPolls < WEDGED_POLLS_BEFORE_RESTART) return;
+    wedgedPolls = 0;
+    logger.warn(`hdc reports ${deviceSerial} as connected but it does not answer; restarting the hdc server.`);
+    try {
+      await hdcExec({ config, args: ["start", "-r"], timeoutMs: 15e3, logger });
+      await hdcExec({ config, args: ["tconn", deviceSerial], timeoutMs: 5e3, logger });
+    } catch {
+    }
+  };
 }
 async function waitForBundle(opts) {
   const logger = scopedLogger(opts.logger ?? noopLogger, "hdc");
   const timeoutMs = opts.timeoutMs ?? 18e4;
+  const reconnectIfTcp = tcpReconnector(opts.config, opts.deviceSerial, logger);
   await waitForCondition({
     probe: async () => {
-      await reconnectIfTcp(opts.config, opts.deviceSerial, logger);
+      await reconnectIfTcp();
       return await findRunningProcess({ config: opts.config, bundle: opts.bundle, deviceSerial: opts.deviceSerial, timeoutMs: 8e3 }) !== null;
     },
     timeoutMs,
@@ -2489,9 +2512,10 @@ async function waitForBundle(opts) {
 async function waitForBoot(opts) {
   const logger = scopedLogger(opts.logger ?? noopLogger, "hdc");
   const timeoutMs = opts.timeoutMs ?? 18e4;
+  const reconnectIfTcp = tcpReconnector(opts.config, opts.deviceSerial, logger);
   await waitForCondition({
     probe: async () => {
-      await reconnectIfTcp(opts.config, opts.deviceSerial, logger);
+      await reconnectIfTcp();
       if (!await isReachable(opts.config, opts.deviceSerial)) return false;
       if (!opts.untilPidOf) return true;
       return await findRunningProcess({ config: opts.config, bundle: opts.untilPidOf, deviceSerial: opts.deviceSerial, timeoutMs: 8e3 }) !== null;
@@ -4947,7 +4971,7 @@ async function harmonyOsAutoSign(opts) {
 }
 
 // src/index.ts
-var VERSION = "0.11.0";
+var VERSION = "0.12.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ALL_SDKS,