test

src/coupons/const.js

@@ -20,8 +20,8 @@ const gundamActConfs = [
 
 const wxfwhActConfs = [
   // { gid: '1C0wLz', name: '天天神券服务号专属福利' },
-  { gid: '1HgnjG', name: '神奇福利社' },
-  { gid: '1I9uL6', name: '社群专属福利' }
+  { gid: '1I9uL6', name: '社群专属福利' },
+  { gid: '1HgnjG', name: '神奇福利社' }
 ]
 
 export { ECODE, gundamActConfs, mainActConf, wxfwhActConfs, lotteryActConfs }

src/coupons/gundam.js

@@ -34,13 +34,16 @@ function resolveRedMod(text, renderList) {
 
 async function getPayload(
   cookie,
-  { gundamId, gdId, appJs, renderList },
+  { gundamId, gdId, pageId, appJs, renderList },
   guard
 ) {
   const jsText = await fetch(appJs).then((res) => res.text())
   const data =
     resolveRedMod(jsText, renderList) ??
-    resolveRedMod(jsText, await getRenderList(cookie, gdId, guard))
+    resolveRedMod(
+      jsText,
+      await getRenderList(cookie, { gundamId, gdId, pageId }, guard)
+    )
 
   if (!data) {
     throw new Error(`[${gundamId}] Gundam Payload 生成失败`)

src/coupons/index.js

@@ -67,7 +67,7 @@ async function runTask(cookie, guard) {
  * @param  {Number} maxRetry  最大重试次数
  * @return {Promise(<Object>)} 结果
  */
-async function getCoupons(token, { maxRetry = 0, httpProxy }) {
+async function getCoupons(token, { maxRetry = 0, proxy }) {
   if (!token) {
     return {
       code: ECODE.RUNTIME,
@@ -77,8 +77,8 @@ async function getCoupons(token, { maxRetry = 0, httpProxy }) {
   }
 
   // 优先设置代理
-  if (httpProxy) {
-    fetch.setProxyAgent(httpProxy)
+  if (proxy) {
+    fetch.setProxyAgent(proxy)
   }
 
   const cookieJar = createMTCookie(token)

src/coupons/wxfwh.js

@@ -1,6 +1,6 @@
 import fetch from '../fetch.js'
 import { dateFormat, groupBy } from '../util/index.js'
-import { getTemplateData, matchMoudleData } from '../template.js'
+import { getTemplateData, getRenderList, matchMoudleData } from '../template.js'
 import { ECODE } from './const.js'
 
 /* 服务号专属活动 */
@@ -69,9 +69,10 @@ async function getPayload(
   guard
 ) {
   const jsText = await fetch(appJs).then((res) => res.text())
+  const list = await getRenderList(cookie, { gundamId, gdId, pageId }, guard)
   let data = null
 
-  console.log('+++++++++ getPayload', gundamId, renderList)
+  console.log('+++++++++ getPayload', gundamId, list)
 
   try {
     for (const instanceId of renderList) {

src/fetch.js

@@ -35,6 +35,8 @@ async function fetch(url, opts = {}) {
 
   if (fetch._proxyAgent) {
     opts.agent = fetch._proxyAgent
+  } else if (opts.proxy) {
+    opts.agent = new HttpsProxyAgent(opts.proxy)
   }
 
   opts.headers = Object.assign({}, defHeader, opts.headers)

src/shadow/const.js

@@ -1,3 +1,3 @@
 export const yodaReady = 'h5'
 export const csecPlatform = 4
-export const guardVersion = '2.3.1'
+export const guardVersion = '2.4.0'

src/template.js

@@ -9,17 +9,14 @@ function extractAppJsUrl(text) {
 
 async function getTemplateData(cookie, gundamId) {
   const text = await fetch(
-    `https://market.waimai.meituan.com/api/template/get?env=current&el_biz=waimai&el_page=gundam.loader&gundam_id=${gundamId}`,
-    { cookie }
+    `https://market.waimai.meituan.com/api/template/get?env=current&el_biz=waimai&el_page=gundam.loader&gundam_id=${gundamId}`
   ).then((rep) => rep.text())
   const matchGlobal = text.match(/globalData: ({.+})/)
   const appJs = extractAppJsUrl(text)
 
   try {
     const globalData = JSON.parse(matchGlobal[1])
 
-    console.log('globalData', globalData.renderInfo)
-
     return {
       gundamId,
       gdId: globalData.gdId,
@@ -34,21 +31,21 @@ async function getTemplateData(cookie, gundamId) {
 }
 
 function getRenderListFromGlobalData(globalData) {
-  const renderInfo = globalData.renderInfo?.componentRenderInfos
+  const renderInfo = globalData.renderInfo
 
-  if (!renderInfo) return []
+  if (renderInfo.status != 0 || !renderInfo?.componentRenderInfos) return []
 
-  return formatRendeInfo(renderInfo)
+  return filterRenderableKeys(renderInfo.componentRenderInfos)
 }
 
-function formatRendeInfo(renderInfo) {
+function filterRenderableKeys(renderInfo) {
   return Object.entries(renderInfo)
     .filter(([_, v]) => v.render)
     .map(([k]) => k)
 }
 
 // 通过接口获取真实的渲染列表
-async function getRenderList(cookie, gdNumId, guard) {
+async function getRenderList(cookie, { gundamId, gdId, pageId }, guard) {
   let data
 
   try {
@@ -58,7 +55,9 @@ async function getRenderList(cookie, gdNumId, guard) {
         params: {
           el_biz: 'waimai',
           el_page: 'gundam.loader',
-          gdId: gdNumId,
+          gundam_id: gundamId,
+          gdId: gdId,
+          pageId: pageId,
           tenant: 'gundam'
         },
         cookie,
@@ -71,7 +70,7 @@ async function getRenderList(cookie, gdNumId, guard) {
     throw new Error('renderinfo 接口调用失败:' + e.message)
   }
 
-  return formatRendeInfo(data)
+  return filterRenderableKeys(data)
 }
 
 function matchMoudleData(text, start, end) {

test/payload.js

@@ -31,7 +31,7 @@ test('Test Main Payload', async () => {
 })
 
 test('Test Wxfwh Payload', async () => {
-  const tmplData = await getTemplateData(null, wxfwhActConfs[1].gid)
+  const tmplData = await getTemplateData(null, wxfwhActConfs[0].gid)
   const payload = await wxfwhAct.getPayload(cookie, tmplData, guard)
 
   return expect(payload).toMatchObject({

test/template.js

@@ -10,19 +10,23 @@ const cookie = createMTCookie(tokens[0].token)
 
 beforeAll(() => guard.init(mainGrab.getActUrl(wxfwhActConfs[0].gid)))
 
-test('Test getTemplateData', async () => {
-  const res = await getTemplateData(null, wxfwhActConfs[0].gid)
+// test('Test getTemplateData', async () => {
+//   const res = await getTemplateData(null, wxfwhActConfs[0].gid)
 
-  return expect(res).toMatchObject({
-    pageId: expect.any(Number),
-    gdId: expect.any(Number),
-    actName: expect.any(String),
-    appJs: expect.stringMatching(/app[^"]*\.js/)
-  })
-})
+//   return expect(res).toMatchObject({
+//     pageId: expect.any(Number),
+//     gdId: expect.any(Number),
+//     actName: expect.any(String),
+//     appJs: expect.stringMatching(/app[^"]*\.js/)
+//   })
+// })
 
 test('Test getRenderList', async () => {
-  const renderList = await getRenderList(cookie, 466632, guard)
+  const renderList = await getRenderList(
+    cookie,
+    { gundamId: '1I9uL6', pageId: 544003, gdId: 466632 },
+    guard
+  )
 
   console.log(renderList)