Merge pull request #109 from iDerekLi/dev

1.7.2
iDerekLi · Feb 13, 2023 · 015d50b · 015d50b
2 parents 10c9998 + 1b74975
commit 015d50b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,4 +1,4 @@
 {
   "useWorkspaces": true,
-  "version": "1.7.1"
+  "version": "1.7.2"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "juejin-helper-monorepo",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "private": true,
   "author": "Derek Li",
   "workspaces": [

diff --git a/packages/juejin-helper/package.json b/packages/juejin-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "juejin-helper",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "稀土掘金助手：签到、抽奖、沾喜气、海底淘金、BugFix、自动化工作流。",
   "author": "Derek Li",
   "license": "Apache-2.0",

diff --git a/packages/juejin-helper/src/utils/browser.ts b/packages/juejin-helper/src/utils/browser.ts
@@ -27,7 +27,8 @@ export default class JuejinBrowser {
   async visitPage(path: string = "", options = {}): Promise<Page> {
     const opts = Object.assign(
       {
-        viewport: { width: 414, height: 820 }
+        viewport: { width: 414, height: 820 },
+        timeout: 30000
       },
       options
     );
@@ -36,6 +37,7 @@ export default class JuejinBrowser {
     const page = await browser.newPage();
 
     await page.setViewport(opts.viewport);
+    page.setDefaultTimeout(opts.timeout);
 
     const cookiesString = this.juejin.cookie.toString();
     const cookiesArray = cookiesString.split(/;\W+/).map(item => item.split("="));

diff --git a/workflows/package.json b/workflows/package.json
@@ -1,6 +1,6 @@
 {
   "name": "workflows",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "private": true,
   "description": "稀土掘金助手：签到、抽奖、沾喜气、消除Bug、海底掘金游戏、自动化工作流。",
   "author": "Derek Li",
@@ -11,7 +11,7 @@
   "dependencies": {
     "axios": "^0.27.2",
     "fast-astar": "^1.0.6",
-    "juejin-helper": "^1.7.1",
+    "juejin-helper": "^1.7.2",
     "nodemailer": "^6.7.0",
     "typescript": "^4.7.4"
   },

diff --git a/workflows/utils/notification-kit.ts b/workflows/utils/notification-kit.ts
@@ -28,7 +28,7 @@ export class NotificationKit {
     };
 
     if (!auth.user || !auth.pass || auth.user === "" || auth.pass === "") {
-      throw new Error("邮箱功能不可用, 请先配置邮箱用户和密码。");
+      throw new Error("未配置邮箱。");
     }
 
     const transporter = nodemailer.createTransport({

diff --git a/workflows/yarn.lock b/workflows/yarn.lock
@@ -435,10 +435,10 @@ jsonwebtoken@^8.5.1:
     ms "^2.1.1"
     semver "^5.6.0"
 
-juejin-helper@^1.7.1:
-  version "1.7.1"
-  resolved "https://registry.npmjs.org/juejin-helper/-/juejin-helper-1.7.1.tgz#cc4678ef06f31d459ac8b5d1e9823ccb7f45517c"
-  integrity sha512-lAdJGj1/EvOnJbU6koEvVsDFm8lWheBUr/ODne/WfrIBjeAmA6ufVrOJre1ET8vKpvXPRqJePDS5ndHA9lcXOg==
+juejin-helper@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.npmjs.org/juejin-helper/-/juejin-helper-1.7.2.tgz#902a27102389f650c2cd91210571592215edfc1e"
+  integrity sha512-9zS2vwoAcfk/zeUM5s0qisdekv3pq3MffTdfvFjQuO898249humSF1tFW+pliU9hkrFTnXxXNsORlEZfWAP24Q==
   dependencies:
     axios "^0.27.2"
     jsonwebtoken "^8.5.1"