diff --git a/packages/doc-n-help-site/docs/FAQ/02_free_quota_and_price.mdx b/packages/doc-n-help-site/docs/FAQ/02_free_quota_and_price.mdx index 3c711795..d0fbcd7c 100644 --- a/packages/doc-n-help-site/docs/FAQ/02_free_quota_and_price.mdx +++ b/packages/doc-n-help-site/docs/FAQ/02_free_quota_and_price.mdx @@ -12,8 +12,8 @@ Points will be added at the next point increase time only after your points are If you check a page twice a day, you can have enough points for a month. ## Task number and script number limit {#task-n-script-limit} -Each user can create up to 3 different tasks. -Each user can create up to 3 different eraser scripts. +Each user can create up to 5 different tasks. +Each user can create up to 5 different eraser scripts. See also: [Task execute / Email send strategy](03_task_and_email_strategy.mdx) . @@ -21,6 +21,6 @@ See also: [Task execute / Email send strategy](03_task_and_email_strategy.mdx) . Recharge 1 RMB to get 100 points and 1 USD to get 500 points. -## Redeem ways {#redeem-ways} +## Top-up ways {#top-up-ways} Mainland China users can use WeChat to top up, and overseas users can use Paypal to transfer points manually. You can check the [top-up page](https://webpagemonitor.net/zh/member/redeem) after logging in for specific information. \ No newline at end of file diff --git a/packages/doc-n-help-site/docs/FAQ/03_task_and_email_strategy.mdx b/packages/doc-n-help-site/docs/FAQ/03_task_and_email_strategy.mdx index 8f6a83af..d9402355 100644 --- a/packages/doc-n-help-site/docs/FAQ/03_task_and_email_strategy.mdx +++ b/packages/doc-n-help-site/docs/FAQ/03_task_and_email_strategy.mdx @@ -6,6 +6,11 @@ import ImageChanger from "@site/src/components/ImageChanger"; ## Task execution strategy {#task-execution-strategy} +### End time for cron (repeated) task's checks +For users with less than or equal to 80 points, the max end time for created tasks is 7 days later. +For users with more than 80 points, the max end time for created tasks is 30 days later. +The default value of end time input field is 7 days later. + ### Min intervals between tasks The minimum interval for timed detection tasks is 10 minutes. When the above conditions are not met, the Create Task page will give a prompt and the Create Task button will be grayed out and cannot be clicked. @@ -14,9 +19,13 @@ When the above conditions are not met, the Create Task page will give a prompt a
Also, since we need 15 minutes to assign tasks to different servers, the first timed detection task within 15 minutes will be ignored. -### End time for cron (repeated) task's checks -For users with less than or equal to 80 points, the deadline for created tasks is at the latest 7 days later. -For users with more than 80 points, the deadline for created tasks is 30 days later at the latest. + +### Time limit for a single detection task +The time limit for a single detection task is 7 seconds. +For mostly detection tasks, 7 seconds is a reasonable limit and is perfectly adequate. +If we cannot get the web area's text after that time, an error message is reported as `pptr script timeout`. +You can see the task's err message in the exported csv file on task list page. +If multiple tasks are all time out, please check our contact information in the top-up page for help. ## Email send strategy {#email-send-strategy} diff --git a/packages/doc-n-help-site/i18n/zh/docusaurus-plugin-content-docs/current/FAQ/02_free_quota_and_price.mdx b/packages/doc-n-help-site/i18n/zh/docusaurus-plugin-content-docs/current/FAQ/02_free_quota_and_price.mdx index f60502cb..146779d7 100644 --- a/packages/doc-n-help-site/i18n/zh/docusaurus-plugin-content-docs/current/FAQ/02_free_quota_and_price.mdx +++ b/packages/doc-n-help-site/i18n/zh/docusaurus-plugin-content-docs/current/FAQ/02_free_quota_and_price.mdx @@ -8,14 +8,14 @@ title: "免费额度、价格与使用限制" 如果一天检测两次,可以足够用一个月。 ## 任务与脚本数量限制 {#task-n-script-limit} -每个用户可以创建最多3个不同的任务。 -每个用户可以创建最多3个不同的橡皮脚本。 +每个用户可以创建最多5个不同的任务。 +每个用户可以创建最多5个不同的橡皮脚本。 另见:[任务执行/邮件发送策略](03_task_and_email_strategy.mdx)。 ## 价格 {#price} 充值1人民币可以获得100点数,1美元获得500点数。 -## 充值途径{#redeem-ways} +## 充值途径{#top-up-ways} 中国内地用户可以使用微信充值,海外用户可以使用Paypal手动转账。 具体信息可以登录后查看[充值点数](https://monit.or.passby.me/zh/member/redeem)界面。 diff --git a/packages/doc-n-help-site/i18n/zh/docusaurus-plugin-content-docs/current/FAQ/03_task_and_email_strategy.mdx b/packages/doc-n-help-site/i18n/zh/docusaurus-plugin-content-docs/current/FAQ/03_task_and_email_strategy.mdx index 9d2c3d5b..db33e099 100644 --- a/packages/doc-n-help-site/i18n/zh/docusaurus-plugin-content-docs/current/FAQ/03_task_and_email_strategy.mdx +++ b/packages/doc-n-help-site/i18n/zh/docusaurus-plugin-content-docs/current/FAQ/03_task_and_email_strategy.mdx @@ -4,7 +4,12 @@ title: "任务执行/邮件发送策略" import ImageChanger from "@site/src/components/ImageChanger"; -## 定时检测任务执行策略 {#task-execution-strategy} +## 定时检测任务执行策略 {#task-execution-strategy} + +### 定时检测任务的截止时间 +点数小于等于80的用户,创建的任务的截止时间最晚为7天后。 +点数大于80的用户,创建的任务的截止时间最晚为30天后。 +任务截止时间输入框的默认值为7天后。 ### 定时检测任务的间隔 定时检测任务的最小间隔为10分钟。 @@ -15,9 +20,12 @@ import ImageChanger from "@site/src/components/ImageChanger";
同时, 因为我们需要15分钟来分配任务到不同的服务器,因此在15分钟内的第一个定时检测任务将被忽略。 -### 定时检测任务的截止时间 -点数小于等于80的用户,创建的任务的截止时间最晚为7天后。 -点数大于80的用户,创建的任务的截止时间最晚为30天后。 +### 单次检测任务所花费的时间限制 +单次检测任务的时间限制为7秒钟。 +对于大多是检测任务,7秒钟是一个合理的限制,完全够用。 +若超时仍未检测到相应区域的网页文本,则报错的err信息为`pptr script timeout`。 +您可以在任务列表的导出csv文件中查看任务的err信息。 +若多次任务均超时,请在充值页面中查看我们的联系方式,以获取帮助。 ## 邮件发送策略 {#email-send-strategy} diff --git a/packages/helper/transRes.mjs b/packages/helper/transRes.mjs index 9d92ed4b..60a0979a 100644 --- a/packages/helper/transRes.mjs +++ b/packages/helper/transRes.mjs @@ -98,9 +98,9 @@ let trans = { the first repeated task within 15 minutes will be ignored.": "注意:我们需要15分钟分配任务到不同的服务器。
\ 在15分钟内的第一个重复任务将被忽略。", - "Notice: One user can only create max 3 tasks, and lasts max 7 days (30 days if your points > 80) per task.\ + "Notice: One user can create max 5 tasks, and lasts max 7 days (30 days if your points > 80) per task.\ Minimum interval between two tasks is 10 minutes.": - "注意:一个用户只能创建最多3个任务,每个任务最长持续7天(若点数大于80,则可持续30天)。\ + "注意:一个用户可以创建最多5个任务,每个任务最长持续7天(若点数大于80,则可持续30天)。\ 两个任务之间的最小间隔为10分钟。", "Create Now": "立即创建", "Success. you will be redirected to task list page.\n\ diff --git a/packages/web/src/pages/api/market/script.ts b/packages/web/src/pages/api/market/script.ts index 1275b469..2387e4d0 100644 --- a/packages/web/src/pages/api/market/script.ts +++ b/packages/web/src/pages/api/market/script.ts @@ -50,8 +50,8 @@ async function scriptPostHandler( let userScriptCount = await db.collection(collectionName).countDocuments({ userId, }); - if( (!_id && userScriptCount >= 3) || (_id && userScriptCount >= 6)){ - return res.status(400).json({ err: 'user script count is over 3' }) + if( (!_id && userScriptCount >= 5) || (_id && userScriptCount >= 7)){ + return res.status(400).json({ err: 'user script count is over 5' }) } if( String(value).match(/require|import|fetch/g) ){ return res.status(400).json({ err: 'cannot contain "require" / "import" / "fetch" inside eraser script.' }) diff --git a/packages/web/src/pages/api/task.ts b/packages/web/src/pages/api/task.ts index fbd3cce4..56da84e4 100644 --- a/packages/web/src/pages/api/task.ts +++ b/packages/web/src/pages/api/task.ts @@ -93,8 +93,8 @@ async function _postHandler( let userTaskCount = await db.collection("task").countDocuments({ userId, }); - if( (!_id && userTaskCount >= 3) || (_id && userTaskCount >= 6)){ - return res.status(400).json({ err: 'user task count is over 3' }) + if( (!_id && userTaskCount >= 5) || (_id && userTaskCount >= 7)){ + return res.status(400).json({ err: 'user task count is over 5' }) } return mongo.upsertDoc(db, 'task', filter, newDoc, res, true); } diff --git a/packages/web/src/pages/task/edit_simp.tsx b/packages/web/src/pages/task/edit_simp.tsx index 9ca70749..5a8c387d 100644 --- a/packages/web/src/pages/task/edit_simp.tsx +++ b/packages/web/src/pages/task/edit_simp.tsx @@ -330,7 +330,7 @@ Also, you can close our page, your task will keep running until `) + taskDetail. -
80) per task.\ +
7 days (30 days if your points > 80) per task.\ Minimum interval between two tasks is 10 minutes.'))}>
public web pages,\