shawenguan 1 年之前
父节点
当前提交
b1886a52ff
共有 4 个文件被更改,包括 27 次插入10 次删除
  1. 0 1
      Scripts/dingdong/dingdongHelper.js
  2. 24 6
      Scripts/smzdm/smzdmHelper.js
  3. 3 3
      Scripts/util/MagicJS3.js
  4. 0 0
      Scripts/util/MagicJS3.min.js

+ 0 - 1
Scripts/dingdong/dingdongHelper.js

@@ -63,7 +63,6 @@ async function checkHandleRequest(){
     const path = request.path;
     magicJS.logger.info(`path=${path}`);
     if (path.match(/\/point\/home/)) {
-        magicJS.logger.info('333333333333');
         await handlePointHomeData();
     } else if (path.match(/\/user\/info/)) {
         // await handlePointHomeData();

+ 24 - 6
Scripts/smzdm/smzdmHelper.js

@@ -6,6 +6,7 @@
 [rewrite_local]
 
 ^https?:\/\/user-api\.smzdm\.com\/checkin$ url script-request-header https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Scripts/smzdm/smzdmHelper.js
+^https?:\/\/zhiyou\.smzdm\.com\/user url script-request-header https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Scripts/smzdm/smzdmHelper.js
 
 [MITM]
 
@@ -36,15 +37,32 @@ let pcUserAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36
 
 async function Main() {
     if (magicJS.isRequest) {
-        if(AppGetCookieRegex.test(magicJS.request.url)){
-            await getWebOrAppCookie();
-        }
+        await checkHandleRequest();
     } else {
         await multiUsersSignIn();
     }
     magicJS.done();
 }
 
+async function checkHandleRequest(){
+    const request = magicJS.request;
+    if(request.method == 'OPTIONS'){
+        return;
+    }
+    const url = request.url;
+    const path = request.path;
+    magicJS.logger.info(`path=${path}`);
+    if (path.match(/\/checkin$/)) {
+        await getWebOrAppCookie();
+    } else if (path.match(/\/user/)) {
+        await getWebOrAppCookie();
+    } else {
+        switch (path) {
+            default:
+                break;
+        }
+    }
+}
 
 function randomStr(len = 18) {
     let char = "0123456789";
@@ -59,9 +77,8 @@ magicJS.http.interceptors.request.use((config) => {
     if (!!currentCookie) {
         config.headers.Cookie = currentCookie;
         // 尝试将Cookie中的iOS相关信息去除
-        config.headers.Cookie = config.headers.Cookie.replace("iphone", "android").replace("iPhone", "Android").replace("apk_partner_name=appstore", "apk_partner_name=android");
+        // config.headers.Cookie = config.headers.Cookie.replace("iphone", "android").replace("iPhone", "Android").replace("apk_partner_name=appstore", "apk_partner_name=android");
 
-        config.headers.Cookie
         magicJS.logger.info(`${config.headers.Cookie}`);
     }
     return config;
@@ -198,7 +215,7 @@ function getWebUserInfo() {
     return new Promise(async (resolve) => {
         // 获取旧版用户信息
         await magicJS.http.get({
-                url: `https://zhiyou.smzdm.com/user/info/jsonp_get_current?with_avatar_ornament=1&callback=jQuery112403507528653716241_${new Date().getTime()}&_=${new Date().getTime()}`,
+                url: `https://zhiyou.smzdm.com/user/info/jsonp_get_current?with_avatar_ornament=1&callback=jQuery112401373589258505905_${new Date().getTime()}&_=${new Date().getTime()+1}`,
                 headers: {
                     Accept: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript, */*; q=0.01",
                     "Accept-Language": "zh-CN,zh;q=0.9",
@@ -206,6 +223,7 @@ function getWebUserInfo() {
                     Host: "zhiyou.smzdm.com",
                     Referer: "https://zhiyou.smzdm.com/user/",
                     "User-Agent": webUserAgent,
+                    Cookie: currentCookie,
                 },
             }).then((resp) => {
                 let obj = JSON.parse(/\((.*)\)/.exec(resp.body)[1]);

+ 3 - 3
Scripts/util/MagicJS3.js

@@ -158,6 +158,9 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
             // this.checkRecordRequestBody();
         }
         get isRequest() {
+            return typeof $request !== "undefined";
+        }
+        get isStrictRequest() {
             return typeof $request !== "undefined" && typeof $response === "undefined";
         }
         get isResponse() {
@@ -205,7 +208,6 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
                 );
             }
         }
-
         getRequestBody() {
             const env = this.env;
             const path = $request.path;
@@ -227,13 +229,11 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
                 }
             }
         }
-
         getResponseBody() {
             if ($response) {
                 return $response.body;
             }
         }
-
         costTime() {
             let info = `${this.scriptName}执行完毕!`
             // if (this.isNode && this.isExecComm) {

文件差异内容过多而无法显示
+ 0 - 0
Scripts/util/MagicJS3.min.js


部分文件因为文件数量过多而无法显示