@cloudcare/hvigor-ohos-plugin 0.1.0 → 0.1.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.1.1] - 2026-09-14
+
+- Fixed console/HiLog instrumentation being skipped when cold-launch instrumentation is enabled in the same Hvigor plugin.
+
 ## [0.1.0] - 2026-09-14
 
 - Added compiler instrumentation for automatic console/HiLog collection.
@@ -18,4 +22,3 @@
 
 - Prepared the initial npm prerelease of the console/HiLog and cold-launch instrumentation plugin.
 
-

package/README.md

@@ -1,6 +1,6 @@
 # Guance HarmonyOS Hvigor Plugin
 
-[![Hvigor plugin version](https://img.shields.io/badge/dynamic/json?label=plugin&color=orange&query=%24.version&uri=https%3A%2F%2Fraw.githubusercontent.com%2FGuanceCloud%2Fdatakit-harmonyos%2Fmaster%2Fft_hvigor_plugin%2Fpackage.json)](https://github.com/GuanceCloud/datakit-harmonyos/tree/master/ft_hvigor_plugin)
+[![Hvigor plugin version](https://img.shields.io/badge/dynamic/json?label=plugin&color=orange&query=$.version&uri=https://static.guance.com/ft-sdk-package/badge/harmonyos/plugin/version.json)](https://www.npmjs.com/package/@cloudcare/hvigor-ohos-plugin)
 
 `@cloudcare/hvigor-ohos-plugin` is the build-time companion for `@guancecloud/ft_sdk`. It instruments direct `console.*` and `hilog.*` calls and injects cold-launch lifecycle tracking into a HAP module's `src/main/ets` sources. Runtime log collection remains controlled by `FTLoggerConfig.setEnableConsoleLog(true)` in `@guancecloud/ft_sdk`.
 
@@ -11,17 +11,7 @@ This is a Hvigor tool package, so declare it in the project-level `hvigor/hvigor
 ```json5
 {
   "dependencies": {
-    "@cloudcare/hvigor-ohos-plugin": "0.1.0"
-  }
-}
-```
-
-For local development, a filesystem dependency is also supported:
-
-```json5
-{
-  "dependencies": {
-    "@cloudcare/hvigor-ohos-plugin": "file:../ft_hvigor_plugin"
+    "@cloudcare/hvigor-ohos-plugin": "^0.1.1"
   }
 }
 ```
@@ -42,6 +32,6 @@ The plugin preserves the original console/HiLog output and does not modify appli
 
 ## Compatibility
 
-Version `0.1.0` is verified with Node.js 18 or newer, Hvigor and `@ohos/hvigor-ohos-plugin` 6.23.5, and HarmonyOS SDK 6.0.2 (API 22). It supports `@guancecloud/ft_sdk` `0.1.17` and later releases.
+The plugin is verified with Node.js 18 or newer, Hvigor and `@ohos/hvigor-ohos-plugin` 6.23.5, and HarmonyOS SDK 6.0.2 (API 22). It supports `@guancecloud/ft_sdk` `0.1.17` and later releases.
 
 `@ohos/hvigor-ohos-plugin` is supplied by DevEco Studio's Hvigor runtime. `@guancecloud/ft_sdk` must still be declared as the application's runtime HAR dependency because the generated imports target that package.

package/hvigorCompile/ft-cold-launch-transform.ts

@@ -15,20 +15,6 @@ declare const __dirname: string;
 type TypeScriptApi = any;
 type AbilityClassKind = 'stage' | 'ui' | 'other';
 
-interface CompilePluginContext {
-  share: {
-    projectConfig: {
-      etsLoaderPath: string;
-    };
-  };
-}
-
-interface SharedSourceTransformRegistry {
-  originalReadFile: (fileName: string, options?: any) => any;
-  buffer: any;
-  transforms: Map<string, (fileName: string, code: string) => string>;
-}
-
 interface ColdLaunchInjection {
   position: number;
   content: string;
@@ -36,10 +22,6 @@ interface ColdLaunchInjection {
 
 const COLD_LAUNCH_BRIDGE_IMPORT = '@guancecloud/ft_sdk/Index';
 const COLD_LAUNCH_TRANSFORM_MARKER = '/* guance-cold-launch-transform:instrumented */';
-const SOURCE_TRANSFORM_REGISTRY_KEY = '__guanceHvigorSourceTransformRegistry';
-const TRANSFORM_ID = 'guance-cold-launch-transform';
-
-let registeredFileSystem: any = null;
 
 export function isApplicationArkTsSource(id: string): boolean {
   const normalizedId = id.replace(/\\/g, '/');
@@ -311,7 +293,7 @@ function applyColdLaunchInjections(code: string, injections: ColdLaunchInjection
   return transformedCode;
 }
 
-function rewriteSource(ts: TypeScriptApi, id: string, code: string): string {
+export function transformColdLaunchSource(ts: TypeScriptApi, id: string, code: string): string {
   if (!isApplicationArkTsSource(id) || code.includes(COLD_LAUNCH_TRANSFORM_MARKER)) {
     return code;
   }
@@ -328,60 +310,3 @@ function rewriteSource(ts: TypeScriptApi, id: string, code: string): string {
   const transformedCode = applyColdLaunchInjections(code, injections);
   return transformedCode.slice(0, insertionOffset) + bridgeImport + transformedCode.slice(insertionOffset);
 }
-
-function installSourceReader(context: CompilePluginContext): void {
-  if (registeredFileSystem !== null) {
-    return;
-  }
-  const typeScriptPath = `${context.share.projectConfig.etsLoaderPath}/node_modules/typescript`;
-  const ts = require.main.require(typeScriptPath);
-  const fileSystem = require.main.require('fs');
-  let registry = fileSystem[SOURCE_TRANSFORM_REGISTRY_KEY] as SharedSourceTransformRegistry | undefined;
-  if (!registry) {
-    registry = {
-      originalReadFile: fileSystem.readFileSync as (fileName: string, options?: any) => any,
-      buffer: require.main.require('buffer'),
-      transforms: new Map<string, (fileName: string, code: string) => string>()
-    };
-    fileSystem[SOURCE_TRANSFORM_REGISTRY_KEY] = registry;
-    fileSystem.readFileSync = (fileName: string, options?: any): any => {
-      const content = registry!.originalReadFile(fileName, options);
-      if (typeof fileName !== 'string' || !isApplicationArkTsSource(fileName)) {
-        return content;
-      }
-      let transformedCode = typeof content === 'string' ? content : content.toString();
-      registry!.transforms.forEach((transform: (id: string, code: string) => string) => {
-        transformedCode = transform(fileName, transformedCode);
-      });
-      return typeof content === 'string' ? transformedCode : registry!.buffer.Buffer.from(transformedCode);
-    };
-  }
-  registry.transforms.set(TRANSFORM_ID, (fileName: string, code: string) => rewriteSource(ts, fileName, code));
-  registeredFileSystem = fileSystem;
-}
-
-function restoreSourceReader(): void {
-  if (registeredFileSystem === null) {
-    return;
-  }
-  const registry = registeredFileSystem[SOURCE_TRANSFORM_REGISTRY_KEY] as SharedSourceTransformRegistry | undefined;
-  if (registry) {
-    registry.transforms.delete(TRANSFORM_ID);
-    if (registry.transforms.size === 0) {
-      registeredFileSystem.readFileSync = registry.originalReadFile;
-      delete registeredFileSystem[SOURCE_TRANSFORM_REGISTRY_KEY];
-    }
-  }
-  registeredFileSystem = null;
-}
-
-export default {
-  name: 'guance-cold-launch-transform',
-  order: 'first',
-  buildStart(this: CompilePluginContext): void {
-    installSourceReader(this);
-  },
-  buildEnd(): void {
-    restoreSourceReader();
-  }
-};

package/hvigorCompile/ft-console-log-transform.ts

@@ -7,28 +7,8 @@
  * never changed.
  */
 
-declare const require: {
-  main: {
-    require(moduleName: string): any;
-  };
-};
-
 type TypeScriptApi = any;
 
-interface CompilePluginContext {
-  share: {
-    projectConfig: {
-      etsLoaderPath: string;
-    };
-  };
-}
-
-interface SharedSourceTransformRegistry {
-  originalReadFile: (fileName: string, options?: any) => any;
-  buffer: any;
-  transforms: Map<string, (fileName: string, code: string) => string>;
-}
-
 interface TransformCandidate {
   start: number;
   end: number;
@@ -52,10 +32,6 @@ const BRIDGE_IMPORT = '@guancecloud/ft_sdk/Index';
 // incremental/daemon build. Keep a marker in the in-memory result so a later
 // reader does not wrap the original console/HiLog call a second time.
 const TRANSFORM_MARKER = '/* guance-console-log-transform:instrumented */';
-const SOURCE_TRANSFORM_REGISTRY_KEY = '__guanceHvigorSourceTransformRegistry';
-const TRANSFORM_ID = 'guance-console-log-transform';
-
-let registeredFileSystem: any = null;
 
 export function isApplicationArkTsSource(id: string): boolean {
   const normalizedId = id.replace(/\\/g, '/');
@@ -259,7 +235,7 @@ function findImportInsertionOffset(ts: TypeScriptApi, sourceFile: any): number {
   return offset;
 }
 
-function rewriteSource(ts: TypeScriptApi, id: string, code: string): string {
+export function transformConsoleLogSource(ts: TypeScriptApi, id: string, code: string): string {
   if (!isApplicationArkTsSource(id) || code.includes(TRANSFORM_MARKER)) {
     return code;
   }
@@ -279,61 +255,3 @@ function rewriteSource(ts: TypeScriptApi, id: string, code: string): string {
   return transformedCode.slice(0, transformedInsertionOffset) + bridgeImport +
     transformedCode.slice(transformedInsertionOffset);
 }
-
-function installSourceReader(context: CompilePluginContext): void {
-  if (registeredFileSystem !== null) {
-    return;
-  }
-
-  const typeScriptPath = `${context.share.projectConfig.etsLoaderPath}/node_modules/typescript`;
-  const ts = require.main.require(typeScriptPath);
-  const fileSystem = require.main.require('fs');
-  let registry = fileSystem[SOURCE_TRANSFORM_REGISTRY_KEY] as SharedSourceTransformRegistry | undefined;
-  if (!registry) {
-    registry = {
-      originalReadFile: fileSystem.readFileSync as (fileName: string, options?: any) => any,
-      buffer: require.main.require('buffer'),
-      transforms: new Map<string, (fileName: string, code: string) => string>()
-    };
-    fileSystem[SOURCE_TRANSFORM_REGISTRY_KEY] = registry;
-    fileSystem.readFileSync = (fileName: string, options?: any): any => {
-      const content = registry!.originalReadFile(fileName, options);
-      if (typeof fileName !== 'string' || !isApplicationArkTsSource(fileName)) {
-        return content;
-      }
-      let transformedCode = typeof content === 'string' ? content : content.toString();
-      registry!.transforms.forEach((transform: (id: string, code: string) => string) => {
-        transformedCode = transform(fileName, transformedCode);
-      });
-      return typeof content === 'string' ? transformedCode : registry!.buffer.Buffer.from(transformedCode);
-    };
-  }
-  registry.transforms.set(TRANSFORM_ID, (fileName: string, code: string) => rewriteSource(ts, fileName, code));
-  registeredFileSystem = fileSystem;
-}
-
-function restoreSourceReader(): void {
-  if (registeredFileSystem === null) {
-    return;
-  }
-  const registry = registeredFileSystem[SOURCE_TRANSFORM_REGISTRY_KEY] as SharedSourceTransformRegistry | undefined;
-  if (registry) {
-    registry.transforms.delete(TRANSFORM_ID);
-    if (registry.transforms.size === 0) {
-      registeredFileSystem.readFileSync = registry.originalReadFile;
-      delete registeredFileSystem[SOURCE_TRANSFORM_REGISTRY_KEY];
-    }
-  }
-  registeredFileSystem = null;
-}
-
-export default {
-  name: 'guance-console-log-transform',
-  order: 'first',
-  buildStart(this: CompilePluginContext): void {
-    installSourceReader(this);
-  },
-  buildEnd(): void {
-    restoreSourceReader();
-  }
-};

package/hvigorCompile/ft-source-transform-host.ts

@@ -0,0 +1,112 @@
+/**
+ * Guance compiler source-transform host.
+ *
+ * Hvigor reads ArkTS source while creating its type-checking program, before
+ * normal Rollup transforms run. This host owns that single read hook and
+ * composes feature transforms in a deterministic order. Feature modules must
+ * only transform source; they must not patch the file system themselves.
+ */
+
+import {
+  isApplicationArkTsSource,
+  transformConsoleLogSource
+} from './ft-console-log-transform';
+import { transformColdLaunchSource } from './ft-cold-launch-transform';
+
+declare const require: {
+  main: {
+    require(moduleName: string): any;
+  };
+};
+
+type TypeScriptApi = any;
+type SourceTransform = (ts: TypeScriptApi, fileName: string, code: string) => string;
+
+interface CompilePluginContext {
+  share: {
+    projectConfig: {
+      etsLoaderPath: string;
+    };
+  };
+}
+
+interface SourceTransformDefinition {
+  id: string;
+  transform: SourceTransform;
+}
+
+interface SharedSourceTransformRegistry {
+  originalReadFile: (fileName: string, options?: any) => any;
+  buffer: any;
+  transforms: Map<string, (fileName: string, code: string) => string>;
+}
+
+const SOURCE_TRANSFORM_REGISTRY_KEY = '__guanceHvigorSourceTransformRegistry';
+const SOURCE_TRANSFORMS: SourceTransformDefinition[] = [
+  { id: 'guance-console-log-transform', transform: transformConsoleLogSource },
+  { id: 'guance-cold-launch-transform', transform: transformColdLaunchSource }
+];
+
+let registeredFileSystem: any = null;
+
+function installSourceReader(context: CompilePluginContext): void {
+  if (registeredFileSystem !== null) {
+    return;
+  }
+
+  const typeScriptPath = `${context.share.projectConfig.etsLoaderPath}/node_modules/typescript`;
+  const ts = require.main.require(typeScriptPath);
+  const fileSystem = require.main.require('fs');
+  let registry = fileSystem[SOURCE_TRANSFORM_REGISTRY_KEY] as SharedSourceTransformRegistry | undefined;
+  if (!registry) {
+    registry = {
+      originalReadFile: fileSystem.readFileSync as (fileName: string, options?: any) => any,
+      buffer: require.main.require('buffer'),
+      transforms: new Map<string, (fileName: string, code: string) => string>()
+    };
+    fileSystem[SOURCE_TRANSFORM_REGISTRY_KEY] = registry;
+    fileSystem.readFileSync = (fileName: string, options?: any): any => {
+      const content = registry!.originalReadFile(fileName, options);
+      if (typeof fileName !== 'string' || !isApplicationArkTsSource(fileName)) {
+        return content;
+      }
+      let transformedCode = typeof content === 'string' ? content : content.toString();
+      registry!.transforms.forEach((transform: (id: string, code: string) => string) => {
+        transformedCode = transform(fileName, transformedCode);
+      });
+      return typeof content === 'string' ? transformedCode : registry!.buffer.Buffer.from(transformedCode);
+    };
+  }
+
+  SOURCE_TRANSFORMS.forEach((definition: SourceTransformDefinition) => {
+    registry!.transforms.set(definition.id, (fileName: string, code: string) =>
+      definition.transform(ts, fileName, code));
+  });
+  registeredFileSystem = fileSystem;
+}
+
+function restoreSourceReader(): void {
+  if (registeredFileSystem === null) {
+    return;
+  }
+  const registry = registeredFileSystem[SOURCE_TRANSFORM_REGISTRY_KEY] as SharedSourceTransformRegistry | undefined;
+  if (registry) {
+    SOURCE_TRANSFORMS.forEach((definition: SourceTransformDefinition) => registry!.transforms.delete(definition.id));
+    if (registry.transforms.size === 0) {
+      registeredFileSystem.readFileSync = registry.originalReadFile;
+      delete registeredFileSystem[SOURCE_TRANSFORM_REGISTRY_KEY];
+    }
+  }
+  registeredFileSystem = null;
+}
+
+export default {
+  name: 'guance-source-transform-host',
+  order: 'first',
+  buildStart(this: CompilePluginContext): void {
+    installSourceReader(this);
+  },
+  buildEnd(): void {
+    restoreSourceReader();
+  }
+};

package/index.js

@@ -15,10 +15,8 @@ function ftConsoleLogPlugin() {
     pluginId: 'guance-console-log-compiler',
     apply(node) {
       const hapContext = node.getContext(OhosPluginId.OHOS_HAP_PLUGIN);
-      const consoleLogTransformPath = path.join(__dirname, 'hvigorCompile', 'ft-console-log-transform.ts');
-      const coldLaunchTransformPath = path.join(__dirname, 'hvigorCompile', 'ft-cold-launch-transform.ts');
-      hapContext.loadCompilePlugin(consoleLogTransformPath);
-      hapContext.loadCompilePlugin(coldLaunchTransformPath);
+      const sourceTransformHostPath = path.join(__dirname, 'hvigorCompile', 'ft-source-transform-host.ts');
+      hapContext.loadCompilePlugin(sourceTransformHostPath);
     }
   };
 }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@cloudcare/hvigor-ohos-plugin",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Guance HarmonyOS Hvigor plugin for automatic console, HiLog, and cold-launch collection.",
   "main": "index.js",
   "files": [
     "index.js",
+    "hvigorCompile/ft-source-transform-host.ts",
     "hvigorCompile/ft-console-log-transform.ts",
     "hvigorCompile/ft-cold-launch-transform.ts",
     "README.md",