refactor: native fetch

Author: vv314

package.json

@@ -20,7 +20,6 @@
   "dependencies": {
     "@wasmer/wasi": "^1.2.2",
     "https-proxy-agent": "^7.0.5",
-    "node-fetch": "^3.3.2",
     "p-limit": "^6.1.0",
     "semver": "^7.6.3",
     "timeout-signal": "^2.0.0",

pnpm-lock.yaml

@@ -1,4 +1,4 @@
-import fetch from '../fetch.js'
+import request from '../request.js'
 import { dateFormat, removePhoneRestriction } from '../util/index.js'
 import { getTemplateData, matchMoudleData } from '../template.js'
 import { ECODE } from './const.js'
@@ -26,7 +26,7 @@ function resolveRedMod(text, renderList) {
 }
 
 async function getPayload({ gundamId, gdId, appJs, renderList }, guard) {
-  const jsText = await fetch(appJs).then((res) => res.text())
+  const jsText = await request(appJs).then((res) => res.text())
   const data = resolveRedMod(jsText, renderList)
 
   if (!data) {
@@ -82,7 +82,7 @@ async function grabCoupon(cookie, gundamId, guard) {
   const actUrl = getActUrl(gundamId)
   const tmplData = await getTemplateData(cookie, gundamId, guard)
   const payload = await getPayload(tmplData, guard)
-  const res = await fetch.post(
+  const res = await request.post(
     'https://mediacps.meituan.com/gundam/gundamGrabV4',
     payload,
     {

src/coupons/gundam.js

@@ -1,4 +1,4 @@
-import fetch from '../fetch.js'
+import request from '../request.js'
 import ShadowGuard from '../shadow/index.js'
 import { createMTCookie, getUserInfo } from '../user.js'
 import { mainActConf, gundamActConfs, wxfwhActConfs, ECODE } from './const.js'
@@ -44,12 +44,12 @@ async function runTask(cookie, guard) {
         code = ECODE.AUTH
         msg = '登录过期'
         break
-      case fetch.ECODE.FETCH:
+      case request.ECODE.FETCH:
         code = ECODE.API
         msg = '接口异常'
         break
-      case fetch.ECODE.TIMEOUT:
-      case fetch.ECODE.NETWOEK:
+      case request.ECODE.TIMEOUT:
+      case request.ECODE.NETWOEK:
         code = ECODE.NETWOEK
         msg = '网络异常'
         break
@@ -79,7 +79,7 @@ async function grabCoupons(token, { maxRetry = 0, proxy }) {
 
   // 优先设置代理
   if (proxy) {
-    fetch.setProxyAgent(proxy)
+    request.setProxyAgent(proxy)
   }
 
   const cookieJar = createMTCookie(token)
@@ -89,7 +89,7 @@ async function grabCoupons(token, { maxRetry = 0, proxy }) {
 
   async function main(retryTimes = 0) {
     const result = await runTask(cookieJar, guard)
-    const needRetry = [fetch.ECODE.NETWOEK, fetch.ECODE.API].includes(
+    const needRetry = [request.ECODE.NETWOEK, request.ECODE.API].includes(
       result.code
     )
 

src/coupons/index.js

@@ -1,6 +1,5 @@
-import fetch from '../fetch.js'
+import request from '../request.js'
 import { getTemplateData } from '../template.js'
-import { ECODE } from './const.js'
 
 const fetchStatus = {
   CAN_FETCH: 0,
@@ -41,7 +40,7 @@ function resolveMetadata(renderList, jsText) {
 }
 
 async function getTicketConfig(appJs, renderList) {
-  const jsText = await fetch(appJs).then((res) => res.text())
+  const jsText = await request(appJs).then((res) => res.text())
   const data = resolveMetadata(renderList, jsText)
   const ticketConfig = data.ticketConfig.makeOptions1.ticketInfo1
 
@@ -87,7 +86,7 @@ function formatCoupons(coupons, info) {
 }
 
 async function getCouponList(cookie, couponIds) {
-  const res = await fetch.get(
+  const res = await request.get(
     `https://promotion.waimai.meituan.com/lottery/couponcomponent/info/v2`,
     {
       cookie,
@@ -131,7 +130,7 @@ async function grabCoupon(cookie, gundamId, guard) {
           },
           guard
         )
-        const res = await fetch.post(
+        const res = await request.post(
           `https://promotion.waimai.meituan.com/lottery/couponcomponent/fetchcomponentcoupon/v2`,
           payload.body,
           {

src/coupons/lottery.js

@@ -1,4 +1,4 @@
-import fetch from '../fetch.js'
+import request from '../request.js'
 import { dateFormat, groupBy } from '../util/index.js'
 import { getTemplateData, matchMoudleData } from '../template.js'
 import { ECODE } from './const.js'
@@ -30,7 +30,7 @@ function formatCoupons(coupons, actName) {
 }
 
 async function getCouponList(cookie, viewId) {
-  const res = await fetch.get(
+  const res = await request.get(
     'https://promotion.waimai.meituan.com/playcenter/generalcoupon/info',
     {
       params: {
@@ -66,7 +66,7 @@ async function getPayload(
   { gundamId, gdId, pageId, renderList, appJs },
   guard
 ) {
-  const jsText = await fetch(appJs).then((res) => res.text())
+  const jsText = await request(appJs).then((res) => res.text())
   let data = null
 
   try {
@@ -119,7 +119,7 @@ async function grabCoupon(cookie, gundamId, guard) {
     return []
   }
 
-  const res = await fetch.post(
+  const res = await request.post(
     'https://promotion.waimai.meituan.com/playcenter/generalcoupon/fetch',
     payload,
     {

src/coupons/wxfwh.js

@@ -1,10 +1,10 @@
-import fetch from 'node-fetch'
+import timeoutSignal from 'timeout-signal'
 
 function doGet(url, data) {
   const params = new URLSearchParams(data)
 
   return fetch(`${url}?${params.toString()}`, {
-    timeout: 10000
+    signal: timeoutSignal(10000)
   }).then((res) => res.json())
 }
 
@@ -27,7 +27,7 @@ function doPost(url, data, type = 'json') {
     headers: {
       'Content-Type': cType
     },
-    timeout: 10000
+    signal: timeoutSignal(10000)
   }).then((res) => res.json())
 }
 

src/notifier/util.js

@@ -1,4 +1,3 @@
-import nodeFetch from 'node-fetch'
 import tough from 'tough-cookie'
 import timeoutSignal from 'timeout-signal'
 import HttpsProxyAgent from 'https-proxy-agent'
@@ -13,7 +12,7 @@ const ECODE = {
   TIMEOUT: 'TIMEOUT'
 }
 
-async function fetch(url, opts = {}) {
+async function request(url, opts = {}) {
   const cookieJar = opts.cookie
   const existCookie = cookieJar?.getCookieStringSync?.(url)
   const optCookie = opts.headers?.cookie || ''
@@ -66,7 +65,7 @@ async function fetch(url, opts = {}) {
   }
 
   try {
-    res = await nodeFetch(urlObj, opts)
+    res = await fetch(urlObj, opts)
   } catch (e) {
     if (opts.signal?.aborted) {
       throw { code: ECODE.TIMEOUT, req: urlObj, msg: e }
@@ -75,7 +74,7 @@ async function fetch(url, opts = {}) {
     throw { code: ECODE.FETCH, req: urlObj, msg: res.statusText }
   }
 
-  const setCookies = res.headers.raw()['set-cookie']
+  const setCookies = res.headers['set-cookie']
 
   if (setCookies) {
     setCookies.map((cookie) =>
@@ -87,7 +86,7 @@ async function fetch(url, opts = {}) {
 }
 
 async function doGet(url, opts = {}) {
-  const res = await fetch(url, {
+  const res = await request(url, {
     ...opts,
     timeout: opts.timeout ?? 10000
   })
@@ -111,7 +110,7 @@ async function doPost(url, data, opts = {}) {
     body = data ? JSON.stringify(data) : ''
   }
 
-  const res = await fetch(url, {
+  const res = await request(url, {
     ...opts,
     method: 'POST',
     body: body,
@@ -126,11 +125,11 @@ async function doPost(url, data, opts = {}) {
   throw { code: ECODE.FETCH, url: url, msg: res.statusText }
 }
 
-fetch.ECODE = ECODE
-fetch.get = doGet
-fetch.post = doPost
-fetch.setProxyAgent = (url) => {
-  fetch._proxyAgent = new HttpsProxyAgent(url)
+request.ECODE = ECODE
+request.get = doGet
+request.post = doPost
+request.setProxyAgent = (url) => {
+  request._proxyAgent = new HttpsProxyAgent(url)
 }
 
 export function createCookieJar(id) {
@@ -141,4 +140,4 @@ export function createCookieJar(id) {
   return cookieJar
 }
 
-export default fetch
+export default request

src/fetch.js src/request.js

@@ -1,4 +1,4 @@
-import fetch from '../fetch.js'
+import request from '../request.js'
 import {
   formatUrl,
   genMetaData,
@@ -40,7 +40,7 @@ class ShadowGuard {
   }
 
   async getWebDfpId(fingerprint) {
-    const res = await fetch.post(
+    const res = await request.post(
       'https://appsec-mobile.meituan.com/v1/webdfpid',
       {
         data: fingerprint