Merge pull request chavyleung#254 from id77/master

更新: 修复脚本提前 $done 问题
lben163 · Nov 14, 2020 · 83f2a36 · 83f2a36
2 parents fc695bb + 0b4ef54
commit 83f2a36
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/10010/10010.js b/10010/10010.js
@@ -40,8 +40,9 @@ let gosign = JSON.parse(chavy.getdata("chavy_gosign_10010")||chavygosign)
     }
     await getinfo()
     showmsg()
-    chavy.done()
-})().catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`), chavy.done())
+})()
+  .catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`))
+  .finally(() => chavy.done())
 
 function loginapp() {
     return new Promise((resolve, reject) => {

diff --git a/csdn/csdn.js b/csdn/csdn.js
@@ -20,8 +20,9 @@ let VAL_signheader = chavy.getdata(KEY_signheader)
     await luckyapp()
   }
   showmsg()
-  chavy.done()
-})().catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`), chavy.done())
+})()
+.catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`))
+.finally(() => chavy.done())
 
 function loginapp() {
   return new Promise((resolve, reject) => {

diff --git a/everphoto/everphoto.js b/everphoto/everphoto.js
@@ -11,8 +11,9 @@ let VAL_signheader = chavy.getdata(KEY_signheader)
   chavy.log(`🔔 ${cookieName} 开始签到`)
   await signapp()
   showmsg()
-  chavy.done()
-})().catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`), chavy.done())
+})()
+.catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`))
+.finally(() => chavy.done())
 
 function signapp() {
   return new Promise((resolve, reject) => {

diff --git a/mcdd/mcdd.js b/mcdd/mcdd.js
@@ -15,8 +15,9 @@ let VAL_homeheader = chavy.getdata(KEY_homeheader)
   await browseapp()
   await getinfo()
   showmsg()
-  chavy.done()
-})().catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`), chavy.done())
+})()
+.catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`))
+.finally(() => chavy.done())
 
 function getinfo() {
   return new Promise((resolve, reject) => {

diff --git a/rrtv/rrtv.js b/rrtv/rrtv.js
@@ -51,8 +51,9 @@ const week = "日一二三四五六".charAt(new Date().getDay())
   )
   await getinfo()
   showmsg()
-  chavy.done()
-})().catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`), chavy.done())
+})()
+.catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`))
+.finally(() => chavy.done())
 
 function getuid() {
   return new Promise((resolve, reject) => {

diff --git a/suning/suning.js b/suning/suning.js
@@ -40,8 +40,9 @@ let VAl_logflag = chavy.getdata(KEY_logflag) === "true" ? true : false
   if (VAL_signgameurl && VAL_signgetgameurl) await signgame(), await getgameinfo()
   showmsg()
   chavy.log(`🔔 ${cookieName} 结束`)
-  chavy.done()
-})().catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`), chavy.done())
+})()
+.catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`))
+.finally(() => chavy.done())
 
 function loginapp() {
   return new Promise((resolve, reject) => {

diff --git a/videoqq/videoqq.js b/videoqq/videoqq.js
@@ -19,8 +19,9 @@ let VAL_mh5signheader = chavy.getdata(KEY_mh5signheader)
   await signapp()
   await getexp()
   showmsg()
-  chavy.done()
-})().catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`), chavy.done())
+})()
+.catch((e) => chavy.log(`❌ ${cookieName} 签到失败: ${e}`))
+.finally(() => chavy.done())
 
 function login() {
   return new Promise((resolve, reject) => {