@hira-core/sdk 1.0.3 → 1.0.4

package/dist/index.d.ts

@@ -541,9 +541,12 @@ interface IHidemiumProfile {
     created_at: string;
 }
 interface IHidemiumStartResult {
+    status: boolean;
     remote_port: number;
-    web_socket: string;
+    web_socket?: string;
     profile_path: string;
+    execute_path: string;
+    profile_name?: string;
     uuid: string;
 }
 interface IHidemiumListParams {
@@ -572,7 +575,13 @@ declare class HidemiumService {
     deleteProfiles(uuids: string[]): Promise<boolean>;
     updateProxy(uuid: string, proxy: string): Promise<boolean>;
     checkHealth(): Promise<boolean>;
-    connectToBrowser(wsUrl: string, maxRetries?: number, delayMs?: number): Promise<Browser>;
+    /**
+     * Kết nối browser — thử theo thứ tự:
+     * 1. web_socket (nếu API trả)
+     * 2. browserURL via remote_port (nếu API trả)
+     * 3. Fallback: quét default port 9222 (Hidemium mặc định)
+     */
+    connectToBrowser(startResult: IHidemiumStartResult, maxRetries?: number, delayMs?: number): Promise<Browser>;
 }
 
 declare class HidemiumStandaloneAdapter implements IBrowserAdapter {

package/dist/index.js

@@ -12535,6 +12535,26 @@ var WindowManager = class {
     const y = Math.floor(row * itemHeight);
     return { x, y };
   }
+  /**
+   * Tính vị trí cửa sổ cho Hidemium (--force-device-scale-factor)
+   * Khác GPM: scale ảnh hưởng kích thước thực tế của window
+   * → dùng effectiveWidth/Height cho cả grid lẫn vị trí
+   */
+  static calculatePositionScaled(index, screen, itemWidth, itemHeight, scale = 1) {
+    const screenWidth = screen.width;
+    const screenHeight = screen.height;
+    const scaledWidth = Math.floor((itemWidth > 0 ? itemWidth : 800) * scale);
+    const scaledHeight = Math.floor((itemHeight > 0 ? itemHeight : 600) * scale);
+    const cols = Math.floor(screenWidth / scaledWidth) || 1;
+    const rows = Math.floor(screenHeight / scaledHeight) || 1;
+    const itemsPerScreen = cols * rows;
+    const visualIndex = index % itemsPerScreen;
+    const row = Math.floor(visualIndex / cols);
+    const col = visualIndex % cols;
+    const x = col * scaledWidth;
+    const y = row * scaledHeight;
+    return { x, y, scaledWidth, scaledHeight };
+  }
 };
 
 // ../../node_modules/.pnpm/axios@1.13.4/node_modules/axios/lib/helpers/bind.js
@@ -16480,7 +16500,7 @@ var HidemiumService = class {
     }
     return false;
   }
-  async getProfiles(params, isLocal = true) {
+  async getProfiles(params, isLocal) {
     var _a, _b;
     const response = await this.api.post(
       "/v1/browser/list",
@@ -16490,7 +16510,8 @@ var HidemiumService = class {
         search: (params == null ? void 0 : params.search) || "",
         orderName: (params == null ? void 0 : params.orderName) || 0
       },
-      { params: { is_local: isLocal } }
+      // Chỉ truyền is_local nếu caller chỉ định — mặc định lấy tất cả
+      isLocal !== void 0 ? { params: { is_local: isLocal } } : void 0
     );
     return ((_b = (_a = response.data) == null ? void 0 : _a.data) == null ? void 0 : _b.content) || [];
   }
@@ -16520,24 +16541,49 @@ var HidemiumService = class {
       return false;
     }
   }
-  async connectToBrowser(wsUrl, maxRetries = 5, delayMs = 1e3) {
+  /**
+   * Kết nối browser — thử theo thứ tự:
+   * 1. web_socket (nếu API trả)
+   * 2. browserURL via remote_port (nếu API trả)
+   * 3. Fallback: quét default port 9222 (Hidemium mặc định)
+   */
+  async connectToBrowser(startResult, maxRetries = 5, delayMs = 1e3) {
     let lastError;
-    for (let attempt = 1; attempt <= maxRetries; attempt++) {
-      try {
-        const browser = await import_puppeteer_core2.default.connect({
-          browserWSEndpoint: wsUrl,
-          defaultViewport: null
-        });
-        return browser;
-      } catch (error) {
-        lastError = error;
-        if (attempt < maxRetries) {
-          await new Promise((r) => setTimeout(r, delayMs));
+    if (startResult.web_socket) {
+      for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+          const browser = await import_puppeteer_core2.default.connect({
+            browserWSEndpoint: startResult.web_socket,
+            defaultViewport: null
+          });
+          return browser;
+        } catch (error) {
+          lastError = error;
+          if (attempt < maxRetries) {
+            await new Promise((r) => setTimeout(r, delayMs));
+          }
+        }
+      }
+    }
+    if (startResult.remote_port) {
+      const browserURL = `http://127.0.0.1:${startResult.remote_port}`;
+      for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+          const browser = await import_puppeteer_core2.default.connect({
+            browserURL,
+            defaultViewport: null
+          });
+          return browser;
+        } catch (error) {
+          lastError = error;
+          if (attempt < maxRetries) {
+            await new Promise((r) => setTimeout(r, delayMs));
+          }
         }
       }
     }
     throw new Error(
-      `Failed to connect to browser at ${wsUrl} after ${maxRetries} attempts. Last error: ${lastError == null ? void 0 : lastError.message}`
+      `Failed to connect to Hidemium browser after ${maxRetries} attempts. Last error: ${lastError == null ? void 0 : lastError.message}`
     );
   }
 };
@@ -16599,7 +16645,16 @@ var HidemiumStandaloneAdapter = class {
         windowConfig.height,
         windowConfig.scale
       );
-      const command = `--window-position=${x},${y} --window-size=${windowConfig.width},${windowConfig.height}`;
+      const command = [
+        `--window-position=${x},${y}`,
+        `--window-size=${windowConfig.width},${windowConfig.height}`,
+        `--force-device-scale-factor=${windowConfig.scale}`
+      ].join(" ");
+      try {
+        await this.service.stopProfile(targetProfile.uuid);
+        await new Promise((r) => setTimeout(r, 2e3));
+      } catch {
+      }
       const startResult = await this.service.startProfile(
         targetProfile.uuid,
         command
@@ -16607,9 +16662,12 @@ var HidemiumStandaloneAdapter = class {
       if (!startResult) {
         throw new Error(`Failed to start profile: ${profileName}`);
       }
-      const browser = await this.service.connectToBrowser(
-        startResult.web_socket
-      );
+      if (!startResult.web_socket && !startResult.remote_port) {
+        throw new Error(
+          `Hidemium openProfile did not return web_socket or remote_port for "${profileName}". Please ensure the profile is not already opened in another session.`
+        );
+      }
+      const browser = await this.service.connectToBrowser(startResult);
       const pages = await browser.pages();
       const page = pages.length > 0 ? pages[0] : await browser.newPage();
       this.openedProfiles.set(profileName, targetProfile.uuid);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hira-core/sdk",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "SDK for building Hira automation flows with TypeScript",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",