diff --git a/packages/uni-h5/dist/uni-h5.cjs.js b/packages/uni-h5/dist/uni-h5.cjs.js index 1b40f7c6763584386b4c9834a64f6ae0eaff91fe..7cf58d89fb68b43e68522b2876c616679e0a6b05 100644 --- a/packages/uni-h5/dist/uni-h5.cjs.js +++ b/packages/uni-h5/dist/uni-h5.cjs.js @@ -13167,9 +13167,9 @@ class SocketTask { const res = name === "message" ? { data: event2.data } : {}; - this._callbacks[name].forEach((callback22) => { + this._callbacks[name].forEach((callback3) => { try { - callback22(res); + callback3(res); } catch (e2) { console.error(`thirdScriptError ${e2};at socketTask.on${shared.capitalize(name)} callback function @@ -13214,9 +13214,9 @@ ${e2};at socketTask.on${shared.capitalize(name)} callback function throw new Error("SocketTask.readyState is not OPEN"); } ws.send(data); - this._callback(options, "sendSocketMessage:ok"); + callback(options, "sendSocketMessage:ok"); } catch (error) { - this._callback(options, `sendSocketMessage:fail ${error}`); + callback(options, `sendSocketMessage:fail ${error}`); } } close(options = {}) { @@ -13229,30 +13229,9 @@ ${e2};at socketTask.on${shared.capitalize(name)} callback function } else { ws.close(code); } - this._callback(options, "closeSocket:ok"); + callback(options, "closeSocket:ok"); } catch (error) { - this._callback(options, `closeSocket:fail ${error}`); - } - } - _callback({ - success, - fail, - complete - } = {}, errMsg) { - const data = { - errMsg - }; - if (/:ok$/.test(errMsg)) { - if (typeof success === "function") { - success(data); - } - } else { - if (typeof fail === "function") { - fail(data); - } - } - if (typeof complete === "function") { - complete(data); + callback(options, `closeSocket:fail ${error}`); } } onOpen(callback2) { diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index d3cbd0a6eac46e7fb81f4687546a05cffe1e5d91..1a2d3c00fb83bd2215cab76c19c359cd589b9a12 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -13164,9 +13164,9 @@ class SocketTask { const res = name === "message" ? { data: event2.data } : {}; - this._callbacks[name].forEach((callback22) => { + this._callbacks[name].forEach((callback3) => { try { - callback22(res); + callback3(res); } catch (e2) { console.error(`thirdScriptError ${e2};at socketTask.on${capitalize(name)} callback function @@ -13211,9 +13211,9 @@ ${e2};at socketTask.on${capitalize(name)} callback function throw new Error("SocketTask.readyState is not OPEN"); } ws.send(data); - this._callback(options, "sendSocketMessage:ok"); + callback(options, "sendSocketMessage:ok"); } catch (error) { - this._callback(options, `sendSocketMessage:fail ${error}`); + callback(options, `sendSocketMessage:fail ${error}`); } } close(options = {}) { @@ -13226,30 +13226,9 @@ ${e2};at socketTask.on${capitalize(name)} callback function } else { ws.close(code); } - this._callback(options, "closeSocket:ok"); + callback(options, "closeSocket:ok"); } catch (error) { - this._callback(options, `closeSocket:fail ${error}`); - } - } - _callback({ - success, - fail, - complete - } = {}, errMsg) { - const data = { - errMsg - }; - if (/:ok$/.test(errMsg)) { - if (typeof success === "function") { - success(data); - } - } else { - if (typeof fail === "function") { - fail(data); - } - } - if (typeof complete === "function") { - complete(data); + callback(options, `closeSocket:fail ${error}`); } } onOpen(callback2) { diff --git a/packages/uni-h5/src/service/api/network/socket.ts b/packages/uni-h5/src/service/api/network/socket.ts index e3ba2aad77bec77306441861b5122627e0b6a25b..4521ad21482aa5528990720bff42500d319bae6f 100644 --- a/packages/uni-h5/src/service/api/network/socket.ts +++ b/packages/uni-h5/src/service/api/network/socket.ts @@ -14,6 +14,7 @@ import { API_TYPE_CLOSE_SOCKET, CloseSocketProtocol, } from '@dcloudio/uni-api' +import { callback } from '../../../helpers/utils' type eventName = keyof WebSocketEventMap @@ -116,9 +117,9 @@ class SocketTask implements UniApp.SocketTask { throw new Error('SocketTask.readyState is not OPEN') } ws.send(data) - this._callback(options, 'sendSocketMessage:ok') + callback(options, 'sendSocketMessage:ok') } catch (error) { - this._callback(options, `sendSocketMessage:fail ${error}`) + callback(options, `sendSocketMessage:fail ${error}`) } } @@ -137,40 +138,11 @@ class SocketTask implements UniApp.SocketTask { } else { ws.close(code) } - this._callback(options, 'closeSocket:ok') + callback(options, 'closeSocket:ok') } catch (error) { - this._callback(options, `closeSocket:fail ${error}`) + callback(options, `closeSocket:fail ${error}`) } } - - /** - * 通用回调处理 - */ - _callback( - { - success, - fail, - complete, - }: UniApp.SendSocketMessageOptions | UniApp.CloseSocketOptions = {}, - errMsg: string - ) { - const data = { - errMsg, - } - if (/:ok$/.test(errMsg)) { - if (typeof success === 'function') { - success(data) - } - } else { - if (typeof fail === 'function') { - fail(data) - } - } - if (typeof complete === 'function') { - complete(data) - } - } - onOpen(callback: (result: any) => void) { this._callbacks.open.push(callback) }