@iflyrpa/playwright 1.0.7 → 1.0.8

package/dist/index.cjs

@@ -5,7 +5,6 @@ const path = require('node:path');
 const axios = require('axios');
 const fs = require('fs-extra');
 const electron = require('electron');
-const playwright = require('playwright');
 const spawn = require('cross-spawn');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -18,7 +17,7 @@ const spawn__default = /*#__PURE__*/_interopDefaultCompat(spawn);
 
 const name = "@iflyrpa/playwright";
 const type = "module";
-const version$1 = "1.0.7";
+const version$1 = "1.0.8";
 const description = "";
 const main = "./dist/index.cjs";
 const module$1 = "./dist/index.mjs";
@@ -103,9 +102,9 @@ const xiaohongshuPublishAction = async (props) => {
   const selectAddress = async (selector, address) => {
     const instance = typeof selector === "string" ? page.locator(selector) : selector;
     await instance.click();
-    await instance.fill(address);
+    await instance.locator("input").fill(address);
     const poperInstance = page.locator(
-      ".el-popper[aria-hidden=false] ul li[role=option]"
+      '.d-popover:not([style*="display: none"]) .d-options .d-grid-item'
     );
     await poperInstance.first().waitFor();
     await poperInstance.first().click();
@@ -116,8 +115,12 @@ const xiaohongshuPublishAction = async (props) => {
     await instance.fill(date);
     await instance.blur();
   };
-  await page.waitForSelector("#CreatorPlatform", { state: "visible" });
-  await page.locator("#content-area .menu-container .publish-video a").click();
+  await page.waitForSelector("#CreatorPlatform", { state: "visible" }).catch(() => {
+    throw new Error("\u767B\u5F55\u5931\u8D25");
+  });
+  await page.locator("#content-area .menu-container .publish-video a").click().catch(() => {
+    throw new Error("\u672A\u627E\u5230\u53D1\u5E03\u7B14\u8BB0\u6309\u94AE");
+  });
   await page.locator(".creator-container .header .title").filter({ hasText: /^上传图文$/ }).click();
   const images = await Promise.all(
     params.banners.map((url) => {
@@ -140,7 +143,7 @@ const xiaohongshuPublishAction = async (props) => {
   await page.mouse.wheel(0, 500);
   if (params.address) {
     await selectAddress(
-      ".media-extension .address-input input[placeholder=\u6DFB\u52A0\u5730\u70B9]",
+      page.locator(".media-extension .address-input").filter({ hasText: "\u6DFB\u52A0\u5730\u70B9" }),
       params.address
     );
   }
@@ -167,7 +170,7 @@ const xiaohongshuPublishAction = async (props) => {
         const hasCustomContent = shootingDate || shootingLocation;
         if (shootingLocation) {
           await selectAddress(
-            selfShootingPopup.locator(".address-input input"),
+            selfShootingPopup.locator(".address-input"),
             shootingLocation
           );
         }
@@ -228,7 +231,8 @@ const generateFile = async (dir) => {
   }
   return filePath;
 };
-const createElectronApp = async (cachePath) => {
+const createElectronApp = async (cachePath, playwrightPackage) => {
+  const playwright = await playwrightPackage;
   const mainPath = await generateFile(cachePath);
   const electronApp = await playwright._electron.launch({
     executablePath: electron.app.getPath("exe"),
@@ -245,14 +249,15 @@ var __publicField$1 = (obj, key, value) => {
   return value;
 };
 class PackageManager {
-  // 依赖名称
-  constructor(packageName, cacheDir) {
+  constructor(params) {
     __publicField$1(this, "cacheDir");
     // 依赖安装目录
-    __publicField$1(this, "packageName");
-    this.cacheDir = cacheDir;
-    this.packageName = packageName;
-    this.init();
+    __publicField$1(this, "forceUpdate");
+    // 是否强制更新
+    __publicField$1(this, "initPromise");
+    this.cacheDir = params.cacheDir;
+    this.forceUpdate = params.forceUpdate || true;
+    this.initPromise = this.init(params.packageName, params.packageVersion);
   }
   // 在子线程执行 npm 命令
   execCommand(cmd, modules, where = this.cacheDir) {
@@ -284,7 +289,7 @@ class PackageManager {
     });
   }
   // 构建 package.json 文件，有了该文件后，依赖可以安装在该目录下，避免污染全局环境
-  async initCacheProject() {
+  initCacheProject() {
     const packagePath = path__default.join(this.cacheDir, "package.json");
     if (!fs__default.existsSync(packagePath)) {
       const pkg = {
@@ -292,10 +297,8 @@ class PackageManager {
         description: "rpa-plugins",
         license: "MIT"
       };
-      await fs__default.ensureFile(packagePath);
-      await Promise.all([
-        fs__default.writeFile(packagePath, JSON.stringify(pkg), "utf8")
-      ]);
+      fs__default.ensureFileSync(packagePath);
+      fs__default.writeFileSync(packagePath, JSON.stringify(pkg), "utf8");
     }
   }
   // 获取依赖信息
@@ -315,26 +318,31 @@ class PackageManager {
       return null;
     }
   }
+  async getPluginAfterInit(module) {
+    await this.initPromise;
+    return this.getPlugin(module);
+  }
   // 安装依赖
-  install(module) {
-    return this.execCommand("install", [module]);
+  install(module, version) {
+    const moduleName = version ? `${module}@${version}` : module;
+    return this.execCommand("install", [moduleName]);
   }
   // 更新依赖
   update(module) {
     return this.execCommand("update", [module]);
   }
-  async init() {
-    await this.initCacheProject();
-    const plugin = this.getPlugin(path__default.join(this.packageName, "package.json"));
+  async init(name, version) {
+    this.initCacheProject();
+    const plugin = this.getPlugin(path__default.join(name, "package.json"));
     if (!plugin) {
-      await this.install(this.packageName);
-    } else {
-      const pkInfo = await this.getPluginInfo(this.packageName);
+      await this.install(name, version);
+    } else if (this.forceUpdate) {
+      const pkInfo = await this.getPluginInfo(name);
       if (!pkInfo)
         throw new Error("\u4F9D\u8D56\u4FE1\u606F\u83B7\u53D6\u5931\u8D25");
       const hasNewVersion = semver__default.gt(pkInfo.version, plugin.version);
       if (hasNewVersion) {
-        await this.install(`${this.packageName}@${pkInfo.version}`);
+        await this.install(name, pkInfo.version);
       }
     }
     console.log("Package manager init done!");
@@ -347,14 +355,32 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
+const PLAYWRIGHT_VERSION = "1.46.1";
 class LocalAutomateTask {
   constructor(params) {
     __publicField(this, "cachePath");
     __publicField(this, "debug");
     __publicField(this, "appWhenReady");
+    __publicField(this, "playwrightPackage");
     this.cachePath = params.cachePath;
     this.debug = params.debug || false;
-    this.appWhenReady = createElectronApp(params.cachePath);
+    this.playwrightPackage = this.installPlaywright();
+    this.appWhenReady = createElectronApp(
+      params.cachePath,
+      this.playwrightPackage
+    );
+  }
+  /**
+   * 安装 playwright
+   * @returns
+   */
+  installPlaywright() {
+    const playwrightPackageManager = new PackageManager({
+      packageName: "playwright",
+      packageVersion: PLAYWRIGHT_VERSION,
+      cacheDir: this.cachePath
+    });
+    return playwrightPackageManager.getPluginAfterInit("playwright");
   }
   /**
    * 关闭 playwright 启动的 electron 客户端
@@ -418,7 +444,10 @@ class LocalAutomateTask {
   }
 }
 const RpaTask = (params) => {
-  const packageManager = new PackageManager(packageJson.name, params.cachePath);
+  const packageManager = new PackageManager({
+    packageName: packageJson.name,
+    cacheDir: params.cachePath
+  });
   const localPackge = packageManager.getPlugin(packageJson.name);
   if (localPackge?.LocalAutomateTask && localPackge?.version && semver__default.gt(localPackge.version, packageJson.version)) {
     return new localPackge.LocalAutomateTask(params);

package/dist/index.d.cts

@@ -47,7 +47,13 @@ declare class LocalAutomateTask implements TaskParams {
     cachePath: string;
     debug: boolean;
     appWhenReady: Promise<ElectronApplication>;
+    playwrightPackage: Promise<unknown>;
     constructor(params: TaskParams);
+    /**
+     * 安装 playwright
+     * @returns
+     */
+    installPlaywright(): Promise<any>;
     /**
      * 关闭 playwright 启动的 electron 客户端
      * @returns

package/dist/index.d.mts

@@ -47,7 +47,13 @@ declare class LocalAutomateTask implements TaskParams {
     cachePath: string;
     debug: boolean;
     appWhenReady: Promise<ElectronApplication>;
+    playwrightPackage: Promise<unknown>;
     constructor(params: TaskParams);
+    /**
+     * 安装 playwright
+     * @returns
+     */
+    installPlaywright(): Promise<any>;
     /**
      * 关闭 playwright 启动的 electron 客户端
      * @returns

package/dist/index.d.ts

@@ -47,7 +47,13 @@ declare class LocalAutomateTask implements TaskParams {
     cachePath: string;
     debug: boolean;
     appWhenReady: Promise<ElectronApplication>;
+    playwrightPackage: Promise<unknown>;
     constructor(params: TaskParams);
+    /**
+     * 安装 playwright
+     * @returns
+     */
+    installPlaywright(): Promise<any>;
     /**
      * 关闭 playwright 启动的 electron 客户端
      * @returns

package/dist/index.mjs

@@ -3,12 +3,11 @@ import path from 'node:path';
 import axios from 'axios';
 import fs from 'fs-extra';
 import { app } from 'electron';
-import { _electron } from 'playwright';
 import spawn from 'cross-spawn';
 
 const name = "@iflyrpa/playwright";
 const type = "module";
-const version$1 = "1.0.7";
+const version$1 = "1.0.8";
 const description = "";
 const main = "./dist/index.cjs";
 const module = "./dist/index.mjs";
@@ -93,9 +92,9 @@ const xiaohongshuPublishAction = async (props) => {
   const selectAddress = async (selector, address) => {
     const instance = typeof selector === "string" ? page.locator(selector) : selector;
     await instance.click();
-    await instance.fill(address);
+    await instance.locator("input").fill(address);
     const poperInstance = page.locator(
-      ".el-popper[aria-hidden=false] ul li[role=option]"
+      '.d-popover:not([style*="display: none"]) .d-options .d-grid-item'
     );
     await poperInstance.first().waitFor();
     await poperInstance.first().click();
@@ -106,8 +105,12 @@ const xiaohongshuPublishAction = async (props) => {
     await instance.fill(date);
     await instance.blur();
   };
-  await page.waitForSelector("#CreatorPlatform", { state: "visible" });
-  await page.locator("#content-area .menu-container .publish-video a").click();
+  await page.waitForSelector("#CreatorPlatform", { state: "visible" }).catch(() => {
+    throw new Error("\u767B\u5F55\u5931\u8D25");
+  });
+  await page.locator("#content-area .menu-container .publish-video a").click().catch(() => {
+    throw new Error("\u672A\u627E\u5230\u53D1\u5E03\u7B14\u8BB0\u6309\u94AE");
+  });
   await page.locator(".creator-container .header .title").filter({ hasText: /^上传图文$/ }).click();
   const images = await Promise.all(
     params.banners.map((url) => {
@@ -130,7 +133,7 @@ const xiaohongshuPublishAction = async (props) => {
   await page.mouse.wheel(0, 500);
   if (params.address) {
     await selectAddress(
-      ".media-extension .address-input input[placeholder=\u6DFB\u52A0\u5730\u70B9]",
+      page.locator(".media-extension .address-input").filter({ hasText: "\u6DFB\u52A0\u5730\u70B9" }),
       params.address
     );
   }
@@ -157,7 +160,7 @@ const xiaohongshuPublishAction = async (props) => {
         const hasCustomContent = shootingDate || shootingLocation;
         if (shootingLocation) {
           await selectAddress(
-            selfShootingPopup.locator(".address-input input"),
+            selfShootingPopup.locator(".address-input"),
             shootingLocation
           );
         }
@@ -218,9 +221,10 @@ const generateFile = async (dir) => {
   }
   return filePath;
 };
-const createElectronApp = async (cachePath) => {
+const createElectronApp = async (cachePath, playwrightPackage) => {
+  const playwright = await playwrightPackage;
   const mainPath = await generateFile(cachePath);
-  const electronApp = await _electron.launch({
+  const electronApp = await playwright._electron.launch({
     executablePath: app.getPath("exe"),
     // 获取 Electron 可执行文件的路径
     args: [mainPath]
@@ -235,14 +239,15 @@ var __publicField$1 = (obj, key, value) => {
   return value;
 };
 class PackageManager {
-  // 依赖名称
-  constructor(packageName, cacheDir) {
+  constructor(params) {
     __publicField$1(this, "cacheDir");
     // 依赖安装目录
-    __publicField$1(this, "packageName");
-    this.cacheDir = cacheDir;
-    this.packageName = packageName;
-    this.init();
+    __publicField$1(this, "forceUpdate");
+    // 是否强制更新
+    __publicField$1(this, "initPromise");
+    this.cacheDir = params.cacheDir;
+    this.forceUpdate = params.forceUpdate || true;
+    this.initPromise = this.init(params.packageName, params.packageVersion);
   }
   // 在子线程执行 npm 命令
   execCommand(cmd, modules, where = this.cacheDir) {
@@ -274,7 +279,7 @@ class PackageManager {
     });
   }
   // 构建 package.json 文件，有了该文件后，依赖可以安装在该目录下，避免污染全局环境
-  async initCacheProject() {
+  initCacheProject() {
     const packagePath = path.join(this.cacheDir, "package.json");
     if (!fs.existsSync(packagePath)) {
       const pkg = {
@@ -282,10 +287,8 @@ class PackageManager {
         description: "rpa-plugins",
         license: "MIT"
       };
-      await fs.ensureFile(packagePath);
-      await Promise.all([
-        fs.writeFile(packagePath, JSON.stringify(pkg), "utf8")
-      ]);
+      fs.ensureFileSync(packagePath);
+      fs.writeFileSync(packagePath, JSON.stringify(pkg), "utf8");
     }
   }
   // 获取依赖信息
@@ -305,26 +308,31 @@ class PackageManager {
       return null;
     }
   }
+  async getPluginAfterInit(module) {
+    await this.initPromise;
+    return this.getPlugin(module);
+  }
   // 安装依赖
-  install(module) {
-    return this.execCommand("install", [module]);
+  install(module, version) {
+    const moduleName = version ? `${module}@${version}` : module;
+    return this.execCommand("install", [moduleName]);
   }
   // 更新依赖
   update(module) {
     return this.execCommand("update", [module]);
   }
-  async init() {
-    await this.initCacheProject();
-    const plugin = this.getPlugin(path.join(this.packageName, "package.json"));
+  async init(name, version) {
+    this.initCacheProject();
+    const plugin = this.getPlugin(path.join(name, "package.json"));
     if (!plugin) {
-      await this.install(this.packageName);
-    } else {
-      const pkInfo = await this.getPluginInfo(this.packageName);
+      await this.install(name, version);
+    } else if (this.forceUpdate) {
+      const pkInfo = await this.getPluginInfo(name);
       if (!pkInfo)
         throw new Error("\u4F9D\u8D56\u4FE1\u606F\u83B7\u53D6\u5931\u8D25");
       const hasNewVersion = semver.gt(pkInfo.version, plugin.version);
       if (hasNewVersion) {
-        await this.install(`${this.packageName}@${pkInfo.version}`);
+        await this.install(name, pkInfo.version);
       }
     }
     console.log("Package manager init done!");
@@ -337,14 +345,32 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
+const PLAYWRIGHT_VERSION = "1.46.1";
 class LocalAutomateTask {
   constructor(params) {
     __publicField(this, "cachePath");
     __publicField(this, "debug");
     __publicField(this, "appWhenReady");
+    __publicField(this, "playwrightPackage");
     this.cachePath = params.cachePath;
     this.debug = params.debug || false;
-    this.appWhenReady = createElectronApp(params.cachePath);
+    this.playwrightPackage = this.installPlaywright();
+    this.appWhenReady = createElectronApp(
+      params.cachePath,
+      this.playwrightPackage
+    );
+  }
+  /**
+   * 安装 playwright
+   * @returns
+   */
+  installPlaywright() {
+    const playwrightPackageManager = new PackageManager({
+      packageName: "playwright",
+      packageVersion: PLAYWRIGHT_VERSION,
+      cacheDir: this.cachePath
+    });
+    return playwrightPackageManager.getPluginAfterInit("playwright");
   }
   /**
    * 关闭 playwright 启动的 electron 客户端
@@ -408,7 +434,10 @@ class LocalAutomateTask {
   }
 }
 const RpaTask = (params) => {
-  const packageManager = new PackageManager(packageJson.name, params.cachePath);
+  const packageManager = new PackageManager({
+    packageName: packageJson.name,
+    cacheDir: params.cachePath
+  });
   const localPackge = packageManager.getPlugin(packageJson.name);
   if (localPackge?.LocalAutomateTask && localPackge?.version && semver.gt(localPackge.version, packageJson.version)) {
     return new localPackge.LocalAutomateTask(params);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@iflyrpa/playwright",
 	"type": "module",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"description": "",
 	"main": "./dist/index.cjs",
 	"module": "./dist/index.mjs",