Update

Author: github-actions[bot]

TS_USER_AGENTS.js

@@ -36,13 +36,12 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 exports.__esModule = true;
-exports.jdpingou = exports.obj2str = exports.wechat_app_msg = exports.randomWord = exports.getShareCodePool = exports.getshareCodeHW = exports.randomNumString = exports.o2s = exports.resetHosts = exports.randomString = exports.exceptCookie = exports.h5st = exports.getJxToken = exports.decrypt = exports.requestAlgo = exports.getRandomNumberByRange = exports.wait = exports.requireConfig = exports.getFarmShareCode = exports.getBeanShareCode = exports.TotalBean = void 0;
+exports.jdpingou = exports.obj2str = exports.wechat_app_msg = exports.randomWord = exports.getShareCodePool = exports.getshareCodeHW = exports.randomNumString = exports.o2s = exports.resetHosts = exports.randomString = exports.exceptCookie = exports.getJxToken = exports.requestAlgo = exports.getRandomNumberByRange = exports.wait = exports.requireConfig = exports.getFarmShareCode = exports.getBeanShareCode = exports.TotalBean = void 0;
 var axios_1 = require("axios");
 var ts_md5_1 = require("ts-md5");
-var date_fns_1 = require("date-fns");
 var dotenv = require("dotenv");
 var fs_1 = require("fs");
-var CryptoJS = require('crypto-js');
+var sendNotify_1 = require("./sendNotify");
 dotenv.config();
 var fingerprint, token = '', enCryptMethodJD;
 var USER_AGENTS = [
@@ -149,30 +148,74 @@ function getFarmShareCode(cookie) {
     });
 }
 exports.getFarmShareCode = getFarmShareCode;
-function requireConfig(index) {
-    if (index === void 0) { index = -1; }
+function requireConfig() {
     return __awaiter(this, void 0, void 0, function () {
-        var cookiesArr, jdCookieNode;
+        var cookiesArr, jdCookieNode, keys, i, cookie, username;
         return __generator(this, function (_a) {
-            cookiesArr = [];
-            jdCookieNode = require('./jdCookie.js');
-            Object.keys(jdCookieNode).forEach(function (item) {
-                if (jdCookieNode[item]) {
-                    cookiesArr.push(jdCookieNode[item]);
-                }
-            });
-            console.log("\u5171".concat(cookiesArr.length, "\u4E2A\u4EAC\u4E1C\u8D26\u53F7\n"));
-            if (index != -1) {
-                return [2 /*return*/, [cookiesArr[index]]];
-            }
-            else {
-                return [2 /*return*/, cookiesArr];
+            switch (_a.label) {
+                case 0:
+                    cookiesArr = [];
+                    jdCookieNode = require('./jdCookie.js');
+                    keys = Object.keys(jdCookieNode);
+                    i = 0;
+                    _a.label = 1;
+                case 1:
+                    if (!(i < keys.length)) return [3 /*break*/, 6];
+                    cookie = jdCookieNode[keys[i]];
+                    return [4 /*yield*/, checkCookie(cookie)];
+                case 2:
+                    if (!_a.sent()) return [3 /*break*/, 3];
+                    cookiesArr.push(cookie);
+                    return [3 /*break*/, 5];
+                case 3:
+                    username = decodeURIComponent(jdCookieNode[keys[i]].match(/pt_pin=([^;]*)/)[1]);
+                    console.log('Cookie失效', username);
+                    return [4 /*yield*/, (0, sendNotify_1.sendNotify)('Cookie失效', '【京东账号】' + username)];
+                case 4:
+                    _a.sent();
+                    _a.label = 5;
+                case 5:
+                    i++;
+                    return [3 /*break*/, 1];
+                case 6:
+                    console.log("\u5171".concat(cookiesArr.length, "\u4E2A\u4EAC\u4E1C\u8D26\u53F7\n"));
+                    return [2 /*return*/, cookiesArr];
             }
-            return [2 /*return*/];
         });
     });
 }
 exports.requireConfig = requireConfig;
+function checkCookie(cookie) {
+    return __awaiter(this, void 0, void 0, function () {
+        var data, e_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, wait(1000)];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    _a.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, axios_1["default"].get("https://api.m.jd.com/client.action?functionId=GetJDUserInfoUnion&appid=jd-cphdeveloper-m&body=".concat(encodeURIComponent(JSON.stringify({ "orgFlag": "JD_PinGou_New", "callSource": "mainorder", "channel": 4, "isHomewhite": 0, "sceneval": 2 })), "&loginType=2&_=").concat(Date.now(), "&sceneval=2&g_login_type=1&callback=GetJDUserInfoUnion&g_ty=ls"), {
+                            headers: {
+                                'authority': 'api.m.jd.com',
+                                'user-agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1',
+                                'referer': 'https://home.m.jd.com/',
+                                'cookie': cookie
+                            }
+                        })];
+                case 3:
+                    data = (_a.sent()).data;
+                    data = JSON.parse(data.match(/GetJDUserInfoUnion\((.*)\)/)[1]);
+                    return [2 /*return*/, data.retcode === '0'];
+                case 4:
+                    e_1 = _a.sent();
+                    return [2 /*return*/, false];
+                case 5: return [2 /*return*/];
+            }
+        });
+    });
+}
 function wait(timeout) {
     return new Promise(function (resolve) {
         setTimeout(resolve, timeout);
@@ -241,44 +284,6 @@ function generateFp() {
         i += e[Math.random() * e.length | 0];
     return (i + Date.now()).slice(0, 16);
 }
-function getQueryString(url, name) {
-    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-    var r = url.split('?')[1].match(reg);
-    if (r != null)
-        return decodeURIComponent(r[2]);
-    return '';
-}
-function decrypt(stk, url, appId) {
-    var timestamp = ((0, date_fns_1.format)(new Date(), 'yyyyMMddhhmmssSSS'));
-    var hash1;
-    if (fingerprint && token && enCryptMethodJD) {
-        hash1 = enCryptMethodJD(token, fingerprint.toString(), timestamp.toString(), appId.toString(), CryptoJS).toString(CryptoJS.enc.Hex);
-    }
-    else {
-        var random = '5gkjB6SpmC9s';
-        token = "tk01wcdf61cb3a8nYUtHcmhSUFFCfddDPRvKvYaMjHkxo6Aj7dhzO+GXGFa9nPXfcgT+mULoF1b1YIS1ghvSlbwhE0Xc";
-        fingerprint = 9686767825751161;
-        var str = "".concat(token).concat(fingerprint).concat(timestamp).concat(appId).concat(random);
-        hash1 = CryptoJS.SHA512(str, token).toString(CryptoJS.enc.Hex);
-    }
-    var st = '';
-    stk.split(',').map(function (item, index) {
-        st += "".concat(item, ":").concat(getQueryString(url, item)).concat(index === stk.split(',').length - 1 ? '' : '&');
-    });
-    var hash2 = CryptoJS.HmacSHA256(st, hash1.toString()).toString(CryptoJS.enc.Hex);
-    return encodeURIComponent(["".concat(timestamp.toString()), "".concat(fingerprint.toString()), "".concat(appId.toString()), "".concat(token), "".concat(hash2)].join(";"));
-}
-exports.decrypt = decrypt;
-function h5st(url, stk, params, appId) {
-    if (appId === void 0) { appId = 10032; }
-    for (var _i = 0, _a = Object.entries(params); _i < _a.length; _i++) {
-        var _b = _a[_i], key = _b[0], val = _b[1];
-        url += "&".concat(key, "=").concat(val);
-    }
-    url += '&h5st=' + decrypt(stk, url, appId);
-    return url;
-}
-exports.h5st = h5st;
 function getJxToken(cookie, phoneId) {
     if (phoneId === void 0) { phoneId = ''; }
     function generateStr(input) {
@@ -356,7 +361,7 @@ function randomWord(n) {
 exports.randomWord = randomWord;
 function getshareCodeHW(key) {
     return __awaiter(this, void 0, void 0, function () {
-        var shareCodeHW, i, data, e_1;
+        var shareCodeHW, i, data, e_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -377,7 +382,7 @@ function getshareCodeHW(key) {
                     }
                     return [3 /*break*/, 6];
                 case 4:
-                    e_1 = _a.sent();
+                    e_2 = _a.sent();
                     console.log("getshareCodeHW Error, Retry...");
                     return [4 /*yield*/, wait(getRandomNumberByRange(2000, 6000))];
                 case 5:
@@ -394,7 +399,7 @@ function getshareCodeHW(key) {
 exports.getshareCodeHW = getshareCodeHW;
 function getShareCodePool(key, num) {
     return __awaiter(this, void 0, void 0, function () {
-        var shareCode, i, data, e_2;
+        var shareCode, i, data, e_3;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -416,7 +421,7 @@ function getShareCodePool(key, num) {
                     }
                     return [3 /*break*/, 6];
                 case 4:
-                    e_2 = _a.sent();
+                    e_3 = _a.sent();
                     console.log("getShareCodePool Error, Retry...");
                     return [4 /*yield*/, wait(getRandomNumberByRange(2000, 6000))];
                 case 5:

TS_USER_AGENTS.ts

@@ -1,10 +1,8 @@
 import axios from "axios"
 import {Md5} from "ts-md5"
-import {format} from 'date-fns'
 import * as dotenv from "dotenv"
 import {existsSync, readFileSync, writeFileSync} from "fs"
-
-const CryptoJS = require('crypto-js')
+import {sendNotify} from './sendNotify'
 dotenv.config()
 
 let fingerprint: string | number, token: string = '', enCryptMethodJD: any
@@ -98,19 +96,39 @@ async function getFarmShareCode(cookie: string) {
     return ''
 }
 
-async function requireConfig(index: number = -1): Promise<string[]> {
+async function requireConfig(): Promise<string[]> {
   let cookiesArr: string[] = []
   const jdCookieNode = require('./jdCookie.js')
-  Object.keys(jdCookieNode).forEach((item) => {
-    if (jdCookieNode[item]) {
-      cookiesArr.push(jdCookieNode[item])
+  let keys: string[] = Object.keys(jdCookieNode)
+  for (let i = 0; i < keys.length; i++) {
+    let cookie = jdCookieNode[keys[i]]
+    if (await checkCookie(cookie)) {
+      cookiesArr.push(cookie)
+    } else {
+      let username = decodeURIComponent(jdCookieNode[keys[i]].match(/pt_pin=([^;]*)/)![1])
+      console.log('Cookie失效', username)
+      await sendNotify('Cookie失效', '【京东账号】' + username)
     }
-  })
+  }
   console.log(`共${cookiesArr.length}个京东账号\n`)
-  if (index != -1) {
-    return [cookiesArr[index]]
-  } else {
-    return cookiesArr
+  return cookiesArr
+}
+
+async function checkCookie(cookie) {
+  await wait(1000)
+  try {
+    let {data}: any = await axios.get(`https://api.m.jd.com/client.action?functionId=GetJDUserInfoUnion&appid=jd-cphdeveloper-m&body=${encodeURIComponent(JSON.stringify({"orgFlag": "JD_PinGou_New", "callSource": "mainorder", "channel": 4, "isHomewhite": 0, "sceneval": 2}))}&loginType=2&_=${Date.now()}&sceneval=2&g_login_type=1&callback=GetJDUserInfoUnion&g_ty=ls`, {
+      headers: {
+        'authority': 'api.m.jd.com',
+        'user-agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X) AppleWebKit/603.1.30 (KHTML, like Gecko) Version/10.0 Mobile/14E304 Safari/602.1',
+        'referer': 'https://home.m.jd.com/',
+        'cookie': cookie
+      }
+    })
+    data = JSON.parse(data.match(/GetJDUserInfoUnion\((.*)\)/)[1])
+    return data.retcode === '0';
+  } catch (e) {
+    return false
   }
 }
 
@@ -167,41 +185,6 @@ function generateFp() {
   return (i + Date.now()).slice(0, 16)
 }
 
-function getQueryString(url: string, name: string) {
-  let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i")
-  let r = url.split('?')[1].match(reg)
-  if (r != null) return decodeURIComponent(r[2])
-  return ''
-}
-
-function decrypt(stk: string, url: string, appId: number) {
-  const timestamp = (format(new Date(), 'yyyyMMddhhmmssSSS'))
-  let hash1: string
-  if (fingerprint && token && enCryptMethodJD) {
-    hash1 = enCryptMethodJD(token, fingerprint.toString(), timestamp.toString(), appId.toString(), CryptoJS).toString(CryptoJS.enc.Hex)
-  } else {
-    const random = '5gkjB6SpmC9s'
-    token = `tk01wcdf61cb3a8nYUtHcmhSUFFCfddDPRvKvYaMjHkxo6Aj7dhzO+GXGFa9nPXfcgT+mULoF1b1YIS1ghvSlbwhE0Xc`
-    fingerprint = 9686767825751161
-    const str = `${token}${fingerprint}${timestamp}${appId}${random}`
-    hash1 = CryptoJS.SHA512(str, token).toString(CryptoJS.enc.Hex)
-  }
-  let st: string = ''
-  stk.split(',').map((item, index) => {
-    st += `${item}:${getQueryString(url, item)}${index === stk.split(',').length - 1 ? '' : '&'}`
-  })
-  const hash2 = CryptoJS.HmacSHA256(st, hash1.toString()).toString(CryptoJS.enc.Hex)
-  return encodeURIComponent(["".concat(timestamp.toString()), "".concat(fingerprint.toString()), "".concat(appId.toString()), "".concat(token), "".concat(hash2)].join(";"))
-}
-
-function h5st(url: string, stk: string, params: object, appId: number = 10032) {
-  for (const [key, val] of Object.entries(params)) {
-    url += `&${key}=${val}`
-  }
-  url += '&h5st=' + decrypt(stk, url, appId)
-  return url
-}
-
 function getJxToken(cookie: string, phoneId: string = '') {
   function generateStr(input: number) {
     let src = 'abcdefghijklmnopqrstuvwxyz1234567890'
@@ -368,9 +351,7 @@ export {
   wait,
   getRandomNumberByRange,
   requestAlgo,
-  decrypt,
   getJxToken,
-  h5st,
   exceptCookie,
   randomString,
   resetHosts,

jd_checkCookie.js

@@ -36,72 +36,22 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 exports.__esModule = true;
-/**
- * 每天检测cookie是否有效
- * cron: 10 * * * *
- */
-var axios_1 = require("axios");
 var TS_USER_AGENTS_1 = require("./TS_USER_AGENTS");
-var notify = require('./sendNotify');
-var cookie = '', UserName, index, errMsg = '';
+var cookie = '', UserName;
 !(function () { return __awaiter(void 0, void 0, void 0, function () {
-    var cookiesArr, i;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var cookiesArr, _i, _a, _b, index, value;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0: return [4 /*yield*/, (0, TS_USER_AGENTS_1.requireConfig)()];
             case 1:
-                cookiesArr = _a.sent();
-                i = 0;
-                _a.label = 2;
-            case 2:
-                if (!(i < cookiesArr.length)) return [3 /*break*/, 5];
-                cookie = cookiesArr[i];
-                UserName = decodeURIComponent(cookie.match(/pt_pin=([^;]*)/)[1]);
-                index = i + 1;
-                return [4 /*yield*/, api(index, cookie, UserName)];
-            case 3:
-                _a.sent();
-                _a.label = 4;
-            case 4:
-                i++;
-                return [3 /*break*/, 2];
-            case 5:
-                if (!errMsg) return [3 /*break*/, 7];
-                return [4 /*yield*/, notify.sendNotify("Cookie失效", errMsg, '', '你好，世界！')];
-            case 6:
-                _a.sent();
-                _a.label = 7;
-            case 7: return [2 /*return*/];
+                cookiesArr = _c.sent();
+                for (_i = 0, _a = cookiesArr.entries(); _i < _a.length; _i++) {
+                    _b = _a[_i], index = _b[0], value = _b[1];
+                    cookie = value;
+                    UserName = decodeURIComponent(cookie.match(/pt_pin=([^;]*)/)[1]);
+                    console.log(index + 1, UserName);
+                }
+                return [2 /*return*/];
         }
     });
 }); })();
-function api(index, cookie, username) {
-    return __awaiter(this, void 0, void 0, function () {
-        var data;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, axios_1["default"].get("https://me-api.jd.com/user_new/info/GetJDUserInfoUnion", {
-                        headers: {
-                            Host: "me-api.jd.com",
-                            Connection: "keep-alive",
-                            Cookie: cookie,
-                            "User-Agent": TS_USER_AGENTS_1["default"],
-                            "Accept-Language": "zh-cn",
-                            "Referer": "https://home.m.jd.com/myJd/newhome.action?sceneval=2&ufc=&",
-                            "Accept-Encoding": "gzip, deflate, br"
-                        }
-                    })];
-                case 1:
-                    data = (_a.sent()).data;
-                    if (data.retcode === '0') {
-                        console.log(index, '✅', username);
-                    }
-                    else {
-                        console.log(index, '❌', username);
-                        errMsg += "".concat(index, " ").concat(username, "\n");
-                    }
-                    return [2 /*return*/];
-            }
-        });
-    });
-}