prepare for ut

Author: sunnylqm

harmony/pushy/src/main/ets/DownloadTask.ts

@@ -12,12 +12,45 @@ import NativePatchCore, {
   CopyGroupResult,
 } from './NativePatchCore';
 
-interface PatchManifestArrays {
+export interface PatchManifestArrays {
   copyFroms: string[];
   copyTos: string[];
   deletes: string[];
 }
 
+export function parseManifestToArrays(
+  manifest: Record<string, any>,
+  normalizeResourceCopies: boolean,
+): PatchManifestArrays {
+  const copyFroms: string[] = [];
+  const copyTos: string[] = [];
+  const deletesValue = manifest.deletes;
+  const deletes = Array.isArray(deletesValue)
+    ? deletesValue.map(item => String(item))
+    : deletesValue && typeof deletesValue === 'object'
+      ? Object.keys(deletesValue)
+      : [];
+
+  const copies = (manifest.copies || {}) as Record<string, string>;
+  for (const [to, rawFrom] of Object.entries(copies)) {
+    let from = String(rawFrom || '');
+    if (normalizeResourceCopies) {
+      from = from.replace('resources/rawfile/', '');
+      if (!from) {
+        from = to;
+      }
+    }
+    copyFroms.push(from);
+    copyTos.push(to);
+  }
+
+  return {
+    copyFroms,
+    copyTos,
+    deletes,
+  };
+}
+
 const DIFF_MANIFEST_ENTRY = '__diff.json';
 const HARMONY_BUNDLE_PATCH_ENTRY = 'bundle.harmony.js.patch';
 const TEMP_ORIGIN_BUNDLE_ENTRY = '.origin.bundle.harmony.js';
@@ -166,44 +199,12 @@ export class DownloadTask {
       };
     }
 
-    return this.manifestToArrays(
+    return parseManifestToArrays(
       this.parseJsonEntry(await this.readFileContent(manifestPath)),
       normalizeResourceCopies,
     );
   }
 
-  private manifestToArrays(
-    manifest: Record<string, any>,
-    normalizeResourceCopies: boolean,
-  ): PatchManifestArrays {
-    const copyFroms: string[] = [];
-    const copyTos: string[] = [];
-    const deletesValue = manifest.deletes;
-    const deletes = Array.isArray(deletesValue)
-      ? deletesValue.map(item => String(item))
-      : deletesValue && typeof deletesValue === 'object'
-        ? Object.keys(deletesValue)
-        : [];
-
-    const copies = (manifest.copies || {}) as Record<string, string>;
-    for (const [to, rawFrom] of Object.entries(copies)) {
-      let from = String(rawFrom || '');
-      if (normalizeResourceCopies) {
-        from = from.replace('resources/rawfile/', '');
-        if (!from) {
-          from = to;
-        }
-      }
-      copyFroms.push(from);
-      copyTos.push(to);
-    }
-
-    return {
-      copyFroms,
-      copyTos,
-      deletes,
-    };
-  }
 
   private async applyBundlePatchFromFileSource(
     originContent: ArrayBuffer,

harmony/pushy/src/main/ets/PushyTurboModule.ts

@@ -11,6 +11,24 @@ import { util } from '@kit.ArkTS';
 
 const TAG = 'PushyTurboModule';
 
+export function getErrorMessage(error: any): string {
+  if (error && typeof error === 'object' && 'message' in error) {
+    return String(error.message);
+  }
+  return String(error);
+}
+
+export function validateHashInfo(info: string): void {
+  try {
+    const parsed = JSON.parse(info);
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+      throw Error('invalid json string');
+    }
+  } catch {
+    throw Error('invalid json string');
+  }
+}
+
 export class PushyTurboModule extends UITurboModule {
   public static readonly NAME = 'Pushy';
 
@@ -29,13 +47,6 @@ export class PushyTurboModule extends UITurboModule {
     return bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION;
   }
 
-  private getErrorMessage(error: any): string {
-    if (error && typeof error === 'object' && 'message' in error) {
-      return String(error.message);
-    }
-    return String(error);
-  }
-
   private getPackageVersion(): string {
     try {
       const bundleInfo = bundleManager.getBundleInfoForSelfSync(
@@ -70,17 +81,6 @@ export class PushyTurboModule extends UITurboModule {
     return hash;
   }
 
-  private validateHashInfo(info: string): void {
-    try {
-      const parsed = JSON.parse(info);
-      if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
-        throw Error('invalid json string');
-      }
-    } catch {
-      throw Error('invalid json string');
-    }
-  }
-
   private async restartAbility(): Promise<void> {
     const bundleInfo = await bundleManager.getBundleInfoForSelf(
       this.getBundleFlags(),
@@ -127,14 +127,14 @@ export class PushyTurboModule extends UITurboModule {
 
   setLocalHashInfo(hash: string, info: string): boolean {
     logger.debug(TAG, ',call setLocalHashInfo');
-    this.validateHashInfo(info);
+    validateHashInfo(info);
     this.context.setKv(`hash_${hash}`, info);
     return true;
   }
 
   getLocalHashInfo(hash: string): string {
     const value = this.context.getKv(`hash_${hash}`);
-    this.validateHashInfo(value);
+    validateHashInfo(value);
     return value;
   }
 
@@ -151,8 +151,8 @@ export class PushyTurboModule extends UITurboModule {
       this.context.switchVersion(hash);
       await this.restartAbility();
     } catch (error) {
-      logger.error(TAG, `reloadUpdate failed: ${this.getErrorMessage(error)}`);
-      throw Error(`switchVersion failed ${this.getErrorMessage(error)}`);
+      logger.error(TAG, `reloadUpdate failed: ${getErrorMessage(error)}`);
+      throw Error(`switchVersion failed ${getErrorMessage(error)}`);
     }
   }
 
@@ -161,8 +161,8 @@ export class PushyTurboModule extends UITurboModule {
     try {
       await this.restartAbility();
     } catch (error) {
-      logger.error(TAG, `restartApp failed: ${this.getErrorMessage(error)}`);
-      throw Error(`restartApp failed ${this.getErrorMessage(error)}`);
+      logger.error(TAG, `restartApp failed: ${getErrorMessage(error)}`);
+      throw Error(`restartApp failed ${getErrorMessage(error)}`);
     }
   }