8002552455

Committed 22 Feb 2024 09:53AM UTC coverage: 84.307% (+0.003%) from 84.304%

Build # 8002552455

Build Type

Pull #52

github

Committed by

web-flow

Commit Message

Merge b8adef7fc into dae5b1f56

Pull Request Pull Request #52: fix alipay other proxy(network) not work due to last fix commit

Run Details

1344 of 1491 branches covered (90.14%)

Branch coverage included in aggregate %.

35 of 61 new or added lines in 5 files covered. (57.38%)

2 existing lines in 1 file now uncovered.

5178 of 6245 relevant lines covered (82.91%)

44.8 hits per line

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

72.97

/packages/mp-base/src/helpers/socket.ts

import { ROOM_SESSION_KEY } from 'base/src/constants';
import {
  SocketStoreBase,
  SocketState,
  SocketWrapper,
} from 'base/src/socket-base';
import { getMPSDK, utilAPI } from '../utils';

export class MPSocketWrapper extends SocketWrapper {
  private socketInstance: MPSocket | null = null;

  private state: SocketState = 0;

  // some ali-family app only support single socket connection...
  public static isSingleSocket = false;

  init(url: string) {
    this.state = SocketState.CONNECTING;
    const mp = getMPSDK();
    const closeHandler: SocketOnCloseHandler = (data) => {
      this.state = SocketState.CLOSED;
      this.emit('close', data);
    };
    const openHandler: SocketOnOpenHandler = (data) => {
      this.state = SocketState.OPEN;
      this.emit('open', data);
    };
    const errorHandler: SocketOnErrorHandler = (data) => {
      this.state = SocketState.CLOSED;
      this.emit('error', data);
    };
    const messageHandler: SocketOnMessageHandler = (data) => {
      this.emit('message', data);
    };

    if (!MPSocketWrapper.isSingleSocket) {
      this.socketInstance = mp.connectSocket({
        url,
        multiple: true, // for alipay mp to return a task
        complete() {}, // make sure the uniapp return a task
      });
      this.socketInstance.onClose(closeHandler);
      this.socketInstance.onError(errorHandler);
      this.socketInstance.onOpen(openHandler);
      this.socketInstance.onMessage(messageHandler);
    } else {
      mp.connectSocket({ url });
      mp.onSocketClose(closeHandler);
      mp.onSocketError(errorHandler);
      mp.onSocketMessage(messageHandler);
      mp.onSocketOpen(openHandler);
    }
  }

  send(data: string) {
    if (MPSocketWrapper.isSingleSocket) {
      getMPSDK().sendSocketMessage({ data });
    } else {
      this.socketInstance?.send({
        data,
      });
    }
  }

  close() {
    if (MPSocketWrapper.isSingleSocket) {
      getMPSDK().closeSocket({});
    } else {
      this.socketInstance?.close({});
    }
    this.state = SocketState.CLOSED;
    this.clearListeners();
  }

  getState(): SocketState {
    return this.state;
  }
}

export class MPSocketStore extends SocketStoreBase {
  // websocket socketInstance
  protected socketWrapper = new MPSocketWrapper();

  public getSocket() {
    return this.socketWrapper;
  }

  // this is an abstract method of parent class, cannot be static
  /* eslint-disable-next-line */
  onOffline() {
    utilAPI.setStorage(ROOM_SESSION_KEY, JSON.stringify({ usable: false }));
  }
}

export default new MPSocketStore();

1	import { ROOM_SESSION_KEY } from 'base/src/constants';	2✔
2	import {	2✔
3	SocketStoreBase,	2✔
4	SocketState,	2✔
5	SocketWrapper,	2✔
6	} from 'base/src/socket-base';	2✔
7	import { getMPSDK, utilAPI } from '../utils';	2✔
8		2✔
9	export class MPSocketWrapper extends SocketWrapper {	2✔
10	private socketInstance: MPSocket \| null = null;	2✔
11		10✔
12	private state: SocketState = 0;	2✔
13		2✔
14	// some ali-family app only support single socket connection...	2✔
15	public static isSingleSocket = false;	2✔
16		2✔
17	init(url: string) {	2✔
18	this.state = SocketState.CONNECTING;	10✔
19	const mp = getMPSDK();	10✔
20	const closeHandler: SocketOnCloseHandler = (data) => {	10✔
21	this.state = SocketState.CLOSED;	×
22	this.emit('close', data);	×
23	};	10✔
24	const openHandler: SocketOnOpenHandler = (data) => {	10✔
25	this.state = SocketState.OPEN;	×
26	this.emit('open', data);	×
27	};	10✔
28	const errorHandler: SocketOnErrorHandler = (data) => {	10✔
29	this.state = SocketState.CLOSED;	×
30	this.emit('error', data);	×
31	};	10✔
32	const messageHandler: SocketOnMessageHandler = (data) => {	10✔
33	this.emit('message', data);	×
34	};	10✔
35		10✔
36	if (!MPSocketWrapper.isSingleSocket) {	10✔
37	this.socketInstance = mp.connectSocket({	10✔
38	url,	10✔
39	multiple: true, // for alipay mp to return a task	10✔
40	complete() {}, // make sure the uniapp return a task	10✔
41	});	10✔
42	this.socketInstance.onClose(closeHandler);	10✔
43	this.socketInstance.onError(errorHandler);	10✔
44	this.socketInstance.onOpen(openHandler);	10✔
45	this.socketInstance.onMessage(messageHandler);	10✔
46	} else {	10!
47	mp.connectSocket({ url });	×
48	mp.onSocketClose(closeHandler);	×
49	mp.onSocketError(errorHandler);	×
50	mp.onSocketMessage(messageHandler);	×
51	mp.onSocketOpen(openHandler);	×
52	}	×
53	}	10✔
54		2✔
55	send(data: string) {	2✔
56	if (MPSocketWrapper.isSingleSocket) {	×
57	getMPSDK().sendSocketMessage({ data });	×
58	} else {	×
59	this.socketInstance?.send({	×
60	data,	×
61	});	×
62	}	×
63	}	×
64		2✔
65	close() {	2✔
66	if (MPSocketWrapper.isSingleSocket) {	10!
67	getMPSDK().closeSocket({});	×
68	} else {	10✔
69	this.socketInstance?.close({});	10✔
70	}	10✔
71	this.state = SocketState.CLOSED;	10✔
72	this.clearListeners();	10✔
73	}	10✔
74		2✔
75	getState(): SocketState {	2✔
76	return this.state;	10✔
77	}	10✔
78	}	2✔
79		2✔
80	export class MPSocketStore extends SocketStoreBase {	2✔
81	// websocket socketInstance	2✔
82	protected socketWrapper = new MPSocketWrapper();	2✔
83		2✔
84	public getSocket() {	2✔
85	return this.socketWrapper;	×
86	}	×
87		2✔
88	// this is an abstract method of parent class, cannot be static	2✔
89	/* eslint-disable-next-line */	2✔
90	onOffline() {	2✔
NEW 91	utilAPI.setStorage(ROOM_SESSION_KEY, JSON.stringify({ usable: false }));	×
92	}	×
93	}	2✔
94		2✔
95	export default new MPSocketStore();	2✔

HuolalaTech / page-spy / 8002552455

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