9222203616

Committed 24 May 2024 10:02AM UTC coverage: 62.942% (-0.07%) from 63.012%

Build # 9222203616

Build Type

Pull #89

github

Committed by

web-flow

Commit Message

Merge fe1654aab into 28f4c3324

Pull Request Pull Request #89: fix: header value circual reference

Run Details

1351 of 1529 branches covered (88.36%)

Branch coverage included in aggregate %.

11 of 20 new or added lines in 3 files covered. (55.0%)

1 existing line in 1 file now uncovered.

5465 of 9300 relevant lines covered (58.76%)

32.64 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

87.85

/packages/mp-base/src/plugins/network/proxy/request.ts

import { getRandomId, isPlainObject, psLog, toStringTag } from 'base/src/index';
import {
  ReqReadyState,
  resolveUrlInfo,
  toLowerKeys,
} from 'base/src/network/common';
import { getMPSDK } from 'mp-base/src/utils';
import MPNetworkProxyBase from './base';

export default class MPWeixinRequestProxy extends MPNetworkProxyBase {
  private request: MPNetworkAPI['request'] | null = null;

  constructor() {
    super();
    this.initProxyHandler();
  }

  public reset() {
    if (this.request) {
      const mp = getMPSDK();
      Object.defineProperty(mp, 'request', {
        value: this.request,
      });
    }
  }

  private initProxyHandler() {
    const that = this;
    const mp = getMPSDK();
    const originRequest = mp.request;

    if (!originRequest) {
      return;
    }
    this.request = originRequest;

    Object.defineProperty(mp, 'request', {
      value(params: Parameters<MPNetworkAPI['request']>[0]) {
        const id = getRandomId();
        that.createRequest(id);
        const req = that.getRequest(id);
        if (req) {
          const method = params.method || 'GET';
          const { url } = params;
          req.requestHeader = [];

          const urlInfo = resolveUrlInfo(url);
          req.url = urlInfo.url;
          req.name = urlInfo.name;
          req.getData = urlInfo.query;

          req.method = method.toUpperCase();
          req.requestType = 'mp-request';
          req.status = 0;
          // TODO statusText 要不要标准化
          req.statusText = 'Pending';
          req.startTime = Date.now();
          req.readyState = ReqReadyState.UNSENT;

          // 小程序不会有其他格式，不用兼容
          if (isPlainObject(params.header)) {
            req.requestHeader = Object.entries(params.header).map(([k, v]) => [
              String(k),
              String(v),
            ]);
          }

          if (req.method !== 'GET') {
            // NOTE：小程序的奇葩操作： request content-type 全部为 application/json
            req.requestHeader.push(['Content-Type', 'application/json']);
            const { data } = params;
            if (data) {
              if (typeof data === 'string') {
                req.requestPayload = data;
              } else if (data instanceof ArrayBuffer) {
                req.requestPayload = '[object ArrayBuffer]';
              } else {
                try {
                  req.requestPayload = JSON.stringify(data);
                } catch (e) {
                  req.requestPayload = toStringTag(data);
                }
              }
            }
          }
          that.sendRequestItem(id, req);

          const originOnSuccess = params.success;
          const originOnFailed = params.fail;
          const originOnComplete = params.complete;

          const commonEnd = () => {
            req.endTime = Date.now();
            req.costTime = req.endTime - (req.startTime || req.endTime);
          };

          params.success = function (res) {
            commonEnd();
            req.status = res?.statusCode || 200;
            req.statusText = 'Done';
            req.responseHeader = [...Object.entries(res?.header || {})];
            req.readyState = ReqReadyState.HEADERS_RECEIVED;
            that.sendRequestItem(id, req);

            const lowerHeaders = toLowerKeys(res?.header || {});
            const contentType = lowerHeaders['content-type'];
            if (contentType) {
              if (contentType.includes('application/json')) {
                req.responseType = 'json';
              }

              if (
                contentType.includes('text/html') ||
                contentType.includes('text/plain')
              ) {
                req.responseType = 'text';
              }
            }
            if (!req.responseType) {
              req.responseType = 'arraybuffer';
            }

            switch (req.responseType) {
              case 'json':
              case 'text':
                if (typeof res?.data === 'string') {
                  try {
                    req.response = JSON.parse(res!.data as string);
                  } catch (e) {
                    req.response = res.data;
                    req.responseType = 'text';
                  }
                } else {
                  req.response = res?.data;
                }
                break;
              case 'arraybuffer':
                // NOTE: 小程序 arraybuffer 没有合适的方法转为 base64，一期暂时这样。
                req.response = '[object ArrayBuffer]';
                // req.responseReason = Reason.EXCEED_SIZE;
                break;
              default:
                break;
            }
            originOnSuccess?.(res);
          };

          params.fail = function (err) {
            commonEnd();
            originOnFailed?.(err);
          };

          params.complete = function (res: any) {
            req.readyState = ReqReadyState.DONE;
            that.sendRequestItem(id, req);
            originOnComplete?.(res);
          };

          const requestInstance = originRequest(params);
          return requestInstance;
        }

        /* c8 ignore next 2 */
        psLog.warn('The request object is not found on request event');
        return null;
      },
    });
  }
}

1	import { getRandomId, isPlainObject, psLog, toStringTag } from 'base/src/index';	2✔
2	import {	2✔
3	ReqReadyState,	2✔
4	resolveUrlInfo,	2✔
5	toLowerKeys,	2✔
6	} from 'base/src/network/common';	2✔
7	import { getMPSDK } from 'mp-base/src/utils';	2✔
8	import MPNetworkProxyBase from './base';	2✔
9		2✔
10	export default class MPWeixinRequestProxy extends MPNetworkProxyBase {	2✔
11	private request: MPNetworkAPI['request'] \| null = null;	2✔
12		2✔
13	constructor() {	2✔
14	super();	26✔
15	this.initProxyHandler();	26✔
16	}	26✔
17		2✔
18	public reset() {	2✔
19	if (this.request) {	32✔
20	const mp = getMPSDK();	30✔
21	Object.defineProperty(mp, 'request', {	30✔
22	value: this.request,	30✔
23	});	30✔
24	}	30✔
25	}	32✔
26		2✔
27	private initProxyHandler() {	2✔
28	const that = this;	26✔
29	const mp = getMPSDK();	26✔
30	const originRequest = mp.request;	26✔
31		26✔
32	if (!originRequest) {	26✔
33	return;	2✔
34	}	2✔
35	this.request = originRequest;	24✔
36		24✔
37	Object.defineProperty(mp, 'request', {	24✔
38	value(params: Parameters<MPNetworkAPI['request']>[0]) {	24✔
39	const id = getRandomId();	26✔
40	that.createRequest(id);	26✔
41	const req = that.getRequest(id);	26✔
42	if (req) {	26✔
43	const method = params.method \|\| 'GET';	26✔
44	const { url } = params;	26✔
45	req.requestHeader = [];	26✔
46		26✔
47	const urlInfo = resolveUrlInfo(url);	26✔
48	req.url = urlInfo.url;	26✔
49	req.name = urlInfo.name;	26✔
50	req.getData = urlInfo.query;	26✔
51		26✔
52	req.method = method.toUpperCase();	26✔
53	req.requestType = 'mp-request';	26✔
54	req.status = 0;	26✔
55	// TODO statusText 要不要标准化	26✔
56	req.statusText = 'Pending';	26✔
57	req.startTime = Date.now();	26✔
58	req.readyState = ReqReadyState.UNSENT;	26✔
59		26✔
60	// 小程序不会有其他格式，不用兼容	26✔
61	if (isPlainObject(params.header)) {	26!
NEW 62	req.requestHeader = Object.entries(params.header).map(([k, v]) => [	×
NEW 63	String(k),	×
NEW 64	String(v),	×
NEW 65	]);	×
UNCOV 66	}	×
67		26✔
68	if (req.method !== 'GET') {	26✔
69	// NOTE：小程序的奇葩操作： request content-type 全部为 application/json	6✔
70	req.requestHeader.push(['Content-Type', 'application/json']);	6✔
71	const { data } = params;	6✔
72	if (data) {	6✔
73	if (typeof data === 'string') {	6✔
74	req.requestPayload = data;	6✔
75	} else if (data instanceof ArrayBuffer) {	6!
76	req.requestPayload = '[object ArrayBuffer]';	×
77	} else {	×
78	try {	×
79	req.requestPayload = JSON.stringify(data);	×
80	} catch (e) {	×
81	req.requestPayload = toStringTag(data);	×
82	}	×
83	}	×
84	}	6✔
85	}	6✔
86	that.sendRequestItem(id, req);	26✔
87		26✔
88	const originOnSuccess = params.success;	26✔
89	const originOnFailed = params.fail;	26✔
90	const originOnComplete = params.complete;	26✔
91		26✔
92	const commonEnd = () => {	26✔
93	req.endTime = Date.now();	26✔
94	req.costTime = req.endTime - (req.startTime \|\| req.endTime);	26!
95	};	26✔
96		26✔
97	params.success = function (res) {	26✔
98	commonEnd();	24✔
99	req.status = res?.statusCode \|\| 200;	24!
100	req.statusText = 'Done';	24✔
101	req.responseHeader = [...Object.entries(res?.header \|\| {})];	24!
102	req.readyState = ReqReadyState.HEADERS_RECEIVED;	24✔
103	that.sendRequestItem(id, req);	24✔
104		24✔
105	const lowerHeaders = toLowerKeys(res?.header \|\| {});	24!
106	const contentType = lowerHeaders['content-type'];	24✔
107	if (contentType) {	24✔
108	if (contentType.includes('application/json')) {	24✔
109	req.responseType = 'json';	8✔
110	}	8✔
111		24✔
112	if (	24✔
113	contentType.includes('text/html') \|\|	24✔
114	contentType.includes('text/plain')	24✔
115	) {	24✔
116	req.responseType = 'text';	14✔
117	}	14✔
118	}	24✔
119	if (!req.responseType) {	24✔
120	req.responseType = 'arraybuffer';	2✔
121	}	2✔
122		24✔
123	switch (req.responseType) {	24✔
124	case 'json':	24✔
125	case 'text':	24✔
126	if (typeof res?.data === 'string') {	22✔
127	try {	16✔
128	req.response = JSON.parse(res!.data as string);	16✔
129	} catch (e) {	16✔
130	req.response = res.data;	16✔
131	req.responseType = 'text';	16✔
132	}	16✔
133	} else {	22✔
134	req.response = res?.data;	6✔
135	}	6✔
136	break;	22✔
137	case 'arraybuffer':	24✔
138	// NOTE: 小程序 arraybuffer 没有合适的方法转为 base64，一期暂时这样。	2✔
139	req.response = '[object ArrayBuffer]';	2✔
140	// req.responseReason = Reason.EXCEED_SIZE;	2✔
141	break;	2✔
142	default:	24!
143	break;	×
144	}	24✔
145	originOnSuccess?.(res);	24✔
146	};	26✔
147		26✔
148	params.fail = function (err) {	26✔
149	commonEnd();	2✔
150	originOnFailed?.(err);	2✔
151	};	26✔
152		26✔
153	params.complete = function (res: any) {	26✔
154	req.readyState = ReqReadyState.DONE;	26✔
155	that.sendRequestItem(id, req);	26✔
156	originOnComplete?.(res);	26✔
157	};	26✔
158		26✔
159	const requestInstance = originRequest(params);	26✔
160	return requestInstance;	26✔
161	}	26✔
162		×
163	/* c8 ignore next 2 */	2✔
164	psLog.warn('The request object is not found on request event');	2✔
165	return null;	2✔
166	},	24✔
167	});	24✔
168	}	24✔
169	}	2✔

HuolalaTech / page-spy / 9222203616

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous