@oniroproject/core 0.15.0 → 0.15.1

package/dist/index.cjs

@@ -163,6 +163,7 @@ __export(index_exports, {
   isOutOfSpaceError: () => isOutOfSpaceError,
   isRamBackedPath: () => isRamBackedPath,
   isUnsignedHap: () => isUnsignedHap,
+  isUsableDevice: () => isUsableDevice,
   isValidBundleName: () => isValidBundleName,
   isValidProjectName: () => isValidProjectName,
   killProcessTree: () => killProcessTree,
@@ -2342,12 +2343,13 @@ async function listDevices(config, opts = {}) {
   });
   return parseDeviceList(res.stdout);
 }
+function isUsableDevice(device) {
+  return device.status === "Connected" || device.status === "Unknown";
+}
 async function selectDevice(config, serial, opts = {}) {
   const resolved = resolveDeviceSerial(serial);
   if (resolved) return resolved;
-  const usable = (await listDevices(config, opts)).filter(
-    (d) => d.status === "Connected" || d.status === "Unknown"
-  );
+  const usable = (await listDevices(config, opts)).filter(isUsableDevice);
   if (usable.length === 1) return usable[0].serial;
   if (usable.length === 0) {
     throw new OniroError("No connected device found. Connect a device/emulator or set ONIRO_DEVICE_SERIAL.");
@@ -5479,7 +5481,7 @@ var SIGNING_ERRORS = {
   DEVICE_ADD: "AppGallery Connect did not register the device.",
   DEVICE_LIMIT: "This team has reached its device limit. Remove an unused device in AppGallery Connect and retry.",
   DEVICE_NAME_REPEAT: "A device with that name is already registered. Retry.",
-  DEVICE_NONE: "No device is connected and none is registered to this team, but a debug profile must name at least one. Connect a device and retry.",
+  DEVICE_NONE: "This team has no registered device and none could be registered from here, but a debug profile must name at least one. Connect a device that reports a UDID (`hdc shell bm get -u`), or register one in AppGallery Connect, and retry.",
   PROFILE_ADD: "AppGallery Connect did not issue the provisioning profile.",
   PROFILE_NAME_REPEAT: "A provisioning profile with that name already exists in AppGallery Connect. Retry.",
   PROVISION_LIMIT: "This team has reached its debug-profile limit. Delete unused profiles in AppGallery Connect and retry.",
@@ -5728,21 +5730,31 @@ function parseDeviceKind(stdout) {
 }
 async function collectLocalDevices(config, logger) {
   const devices = [];
+  const skipped = [];
   for (const target of await listDevices(config, { logger, timeoutMs: 15e3 })) {
-    if (target.status !== "Connected") continue;
+    const skip = (why) => {
+      logger.warn(`[harmonyos] ${target.serial} ${why}`);
+      skipped.push(target.serial);
+    };
+    if (!isUsableDevice(target)) {
+      skip(
+        target.status === "Unauthorized" ? "is unauthorized; accept the debugging prompt on the device to register it." : `is ${target.status.toLowerCase()}; skipping it.`
+      );
+      continue;
+    }
     const shell2 = async (...args) => (await hdcExec({ config, deviceSerial: target.serial, args: ["shell", ...args], timeoutMs: 15e3, logger })).stdout;
     try {
       const udid = parseUdid(await shell2("bm", "get", "-u"));
       if (!udid) {
-        logger.warn(`[harmonyos] ${target.serial} did not report a UDID; skipping it.`);
+        skip("did not report a UDID (`bm get -u`), so it cannot be registered.");
         continue;
       }
       devices.push({ serial: target.serial, udid, kind: parseDeviceKind(await shell2("getprop", "hw_sc.build.os.deviceType")) });
     } catch (err) {
-      logger.warn(`[harmonyos] Could not read ${target.serial}: ${err.message}`);
+      skip(`could not be read: ${err.message}`);
     }
   }
-  return devices;
+  return { devices, skipped };
 }
 async function registerDevices(agc, connected, logger) {
   let devices = await agc.listDevices();
@@ -5755,11 +5767,6 @@ async function registerDevices(agc, connected, logger) {
   if (unregistered.length > 0) devices = await agc.listDevices();
   const deviceIds = devices.map((d) => d.id);
   if (deviceIds.length === 0) throw new AgcError(SIGNING_ERRORS.DEVICE_NONE);
-  if (connected.length === 0) {
-    logger.warn(
-      `[harmonyos] No device is connected; the profile will name the ${deviceIds.length} device(s) already registered to this team.`
-    );
-  }
   return deviceIds;
 }
 
@@ -5996,7 +6003,7 @@ async function harmonyOsAutoSign(opts) {
   const aclPermissions = collectAclPermissions(projectDir, logger);
   const paths = resolveSigningMaterialPaths(opts.config, productName, projectDir);
   logger.info(`[harmonyos] Signing ${bundleName} (product '${productName}', team ${auth.teamId}).`);
-  const connected = await collectLocalDevices(opts.config, logger);
+  const local = await collectLocalDevices(opts.config, logger);
   const result = (regenerated) => ({
     bundleName,
     teamId: auth.teamId,
@@ -6010,7 +6017,7 @@ async function harmonyOsAutoSign(opts) {
     productName,
     bundleName,
     teamId: auth.teamId,
-    connectedUdids: connected.map((d) => d.udid),
+    connectedUdids: local.devices.map((d) => d.udid),
     aclPermissions,
     force: opts.force
   });
@@ -6020,7 +6027,11 @@ async function harmonyOsAutoSign(opts) {
   }
   logger.info(`[harmonyos] Regenerating signing material: ${reason}.`);
   const agc = createAgcClient(opts.http ?? createHttpClient({ logger }), auth);
-  const deviceIds = await registerDevices(agc, connected, logger);
+  const deviceIds = await registerDevices(agc, local.devices, logger);
+  if (local.devices.length === 0) {
+    const cause = local.skipped.length > 0 ? "No connected device could be registered" : "No device is connected";
+    logger.warn(`[harmonyos] ${cause}; the profile will name the ${deviceIds.length} device(s) already registered to this team.`);
+  }
   for (const file of Object.values(paths)) fs40.rmSync(file, { force: true });
   const certName = `oniro_debug_${auth.teamId.replace(/[\\/.:]/g, "")}.cer`;
   const stale = (await agc.listCertificates()).find((c) => c.certName === certName);
@@ -6067,7 +6078,7 @@ async function harmonyOsAutoSign(opts) {
 }
 
 // src/index.ts
-var VERSION = "0.15.0";
+var VERSION = "0.15.1";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ALL_SDKS,
@@ -6203,6 +6214,7 @@ var VERSION = "0.15.0";
   isOutOfSpaceError,
   isRamBackedPath,
   isUnsignedHap,
+  isUsableDevice,
   isValidBundleName,
   isValidProjectName,
   killProcessTree,