@howuse/feedback 0.1.0 → 0.3.0

package/dist/index.cjs

@@ -21,9 +21,18 @@ function tryLoadNativeLibrary() {
   } else {
     throw new Error(`Unsupported platform: ${platform}`);
   }
-  const libPath = path.join(packageRoot, "native", libName);
+  let libPath = path.join(packageRoot, "native", libName);
   if (!fs.existsSync(libPath)) {
-    throw new Error(`Native library not found: ${libPath}. Please run 'npm run build:native' first.`);
+    if (libPath.includes(".asar")) {
+      const asarPath = libPath.replace(".asar", ".asar.unpacked");
+      if (fs.existsSync(asarPath)) {
+        libPath = asarPath;
+      } else {
+        throw new Error(`Native library asarPath not found: ${asarPath}. Please run 'npm run build:native' first.`);
+      }
+    } else {
+      throw new Error(`Native library not found: ${libPath}. Please run 'npm run build:native' first.`);
+    }
   }
   try {
     return koffi.load(libPath);
@@ -54,19 +63,20 @@ function createNativeClient() {
       return JSON.parse(result);
     },
     async checkActivation(request, softwareId) {
-      const json = JSON.stringify({ ...request, softwareId });
+      const json = JSON.stringify({ softwareId });
       const result = CheckActivation(json);
       return JSON.parse(result);
     }
   };
 }
 class FeedbackClient {
-  constructor(enabled, baseUrl, softwareId, version, nativeClient) {
+  constructor(enabled, baseUrl, softwareId, version, nativeClient, machineCode) {
     this.enabled = enabled;
     this.baseUrl = baseUrl;
     this.softwareId = softwareId;
     this.version = version;
     this.nativeClient = nativeClient;
+    this.machineCode = machineCode;
   }
   /**
    * 提交反馈
@@ -93,17 +103,23 @@ class FeedbackClient {
     return this.nativeClient.activate(data, this.softwareId);
   }
   /**
-   * 检查激活状态
+   * 检查激活状态（机器码在内部自动使用）
    */
-  async check(data) {
+  async check() {
     if (!this.enabled) {
       return {
         expired: true,
         reason: "sdk_disabled_or_init_failed"
       };
     }
+    if (!this.machineCode) {
+      return {
+        expired: true,
+        reason: "machine_code_not_found"
+      };
+    }
     try {
-      const result = await this.nativeClient.checkActivation(data, this.softwareId);
+      const result = await this.nativeClient.checkActivation({}, this.softwareId);
       if (!result.expired && !result.activated) {
         return {
           expired: true,
@@ -120,8 +136,8 @@ class FeedbackClient {
   }
 }
 async function initFeedbackClient(options) {
-  if (!options.baseUrl || !options.softwareId || !options.version) {
-    throw new Error("baseUrl, softwareId, and version are required");
+  if (!options.baseUrl || !options.softwareId || !options.version || !options.machineCodePath) {
+    throw new Error("baseUrl, softwareId, version, and machineCodePath are required");
   }
   const baseUrl = options.baseUrl.replace(/\/$/, "");
   const nativeClient = createNativeClient();
@@ -139,7 +155,8 @@ async function initFeedbackClient(options) {
     baseUrl,
     options.softwareId,
     options.version,
-    nativeClient
+    nativeClient,
+    initResult.machineCode
   );
 }
 exports.FeedbackClient = FeedbackClient;

package/dist/index.d.ts

@@ -1,15 +1,16 @@
 import { type NativeClient } from './native';
-import type { InitOptions, FeedbackPayload, FeedbackResult, ActivationRequest, ActivationResult, ActivationCheckRequest, ActivationCheckResponse } from './types';
+import type { InitOptions, FeedbackPayload, FeedbackResult, ActivationRequest, ActivationResult, ActivationCheckResponse } from './types';
 /**
  * FeedbackClient 类
  */
 export declare class FeedbackClient {
     readonly enabled: boolean;
+    readonly machineCode?: string;
     private readonly baseUrl;
     private readonly softwareId;
     private readonly version;
     private readonly nativeClient;
-    constructor(enabled: boolean, baseUrl: string, softwareId: number, version: string, nativeClient: NativeClient);
+    constructor(enabled: boolean, baseUrl: string, softwareId: number, version: string, nativeClient: NativeClient, machineCode?: string);
     /**
      * 提交反馈
      */
@@ -19,9 +20,9 @@ export declare class FeedbackClient {
      */
     activate(data: ActivationRequest): Promise<ActivationResult>;
     /**
-     * 检查激活状态
+     * 检查激活状态（机器码在内部自动使用）
      */
-    check(data: ActivationCheckRequest): Promise<ActivationCheckResponse>;
+    check(): Promise<ActivationCheckResponse>;
 }
 /**
  * 初始化 Feedback 客户端

package/dist/index.mjs

@@ -19,9 +19,18 @@ function tryLoadNativeLibrary() {
   } else {
     throw new Error(`Unsupported platform: ${platform}`);
   }
-  const libPath = path.join(packageRoot, "native", libName);
+  let libPath = path.join(packageRoot, "native", libName);
   if (!fs.existsSync(libPath)) {
-    throw new Error(`Native library not found: ${libPath}. Please run 'npm run build:native' first.`);
+    if (libPath.includes(".asar")) {
+      const asarPath = libPath.replace(".asar", ".asar.unpacked");
+      if (fs.existsSync(asarPath)) {
+        libPath = asarPath;
+      } else {
+        throw new Error(`Native library asarPath not found: ${asarPath}. Please run 'npm run build:native' first.`);
+      }
+    } else {
+      throw new Error(`Native library not found: ${libPath}. Please run 'npm run build:native' first.`);
+    }
   }
   try {
     return koffi.load(libPath);
@@ -52,19 +61,20 @@ function createNativeClient() {
       return JSON.parse(result);
     },
     async checkActivation(request, softwareId) {
-      const json = JSON.stringify({ ...request, softwareId });
+      const json = JSON.stringify({ softwareId });
       const result = CheckActivation(json);
       return JSON.parse(result);
     }
   };
 }
 class FeedbackClient {
-  constructor(enabled, baseUrl, softwareId, version, nativeClient) {
+  constructor(enabled, baseUrl, softwareId, version, nativeClient, machineCode) {
     this.enabled = enabled;
     this.baseUrl = baseUrl;
     this.softwareId = softwareId;
     this.version = version;
     this.nativeClient = nativeClient;
+    this.machineCode = machineCode;
   }
   /**
    * 提交反馈
@@ -91,17 +101,23 @@ class FeedbackClient {
     return this.nativeClient.activate(data, this.softwareId);
   }
   /**
-   * 检查激活状态
+   * 检查激活状态（机器码在内部自动使用）
    */
-  async check(data) {
+  async check() {
     if (!this.enabled) {
       return {
         expired: true,
         reason: "sdk_disabled_or_init_failed"
       };
     }
+    if (!this.machineCode) {
+      return {
+        expired: true,
+        reason: "machine_code_not_found"
+      };
+    }
     try {
-      const result = await this.nativeClient.checkActivation(data, this.softwareId);
+      const result = await this.nativeClient.checkActivation({}, this.softwareId);
       if (!result.expired && !result.activated) {
         return {
           expired: true,
@@ -118,8 +134,8 @@ class FeedbackClient {
   }
 }
 async function initFeedbackClient(options) {
-  if (!options.baseUrl || !options.softwareId || !options.version) {
-    throw new Error("baseUrl, softwareId, and version are required");
+  if (!options.baseUrl || !options.softwareId || !options.version || !options.machineCodePath) {
+    throw new Error("baseUrl, softwareId, version, and machineCodePath are required");
   }
   const baseUrl = options.baseUrl.replace(/\/$/, "");
   const nativeClient = createNativeClient();
@@ -137,7 +153,8 @@ async function initFeedbackClient(options) {
     baseUrl,
     options.softwareId,
     options.version,
-    nativeClient
+    nativeClient,
+    initResult.machineCode
   );
 }
 export {

package/dist/types.d.ts

@@ -8,6 +8,8 @@ export interface InitOptions {
     softwareId: number;
     /** 软件版本号 */
     version: string;
+    /** 机器码存放目录路径 */
+    machineCodePath: string;
     /** 请求超时时间（毫秒），可选 */
     timeoutMs?: number;
 }
@@ -17,6 +19,8 @@ export interface InitOptions {
 export interface InitResult {
     /** 是否启用 */
     enabled: boolean;
+    /** 生成的机器码 */
+    machineCode?: string;
     /** 错误信息（如果初始化失败） */
     error?: string;
 }
@@ -70,8 +74,6 @@ export interface FeedbackResult {
  * 激活请求
  */
 export interface ActivationRequest {
-    /** 机器码 */
-    machineCode: string;
     /** 激活码 */
     code: string;
 }
@@ -84,11 +86,9 @@ export interface ActivationResult {
     error?: string;
 }
 /**
- * 激活检查请求
+ * 激活检查请求（无需参数，机器码在内部自动使用）
  */
 export interface ActivationCheckRequest {
-    /** 机器码 */
-    machineCode: string;
 }
 /**
  * 激活检查响应

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howuse/feedback",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Node.js/Electron SDK for user feedback and activation management",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",