Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小浣熊撸代码
uni-app
提交
9f5aee35
U
uni-app
项目概览
小浣熊撸代码
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9f5aee35
编写于
4月 30, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: socket callback
上级
41e8dc5c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
87 deletion
+17
-87
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+6
-27
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+6
-27
packages/uni-h5/src/service/api/network/socket.ts
packages/uni-h5/src/service/api/network/socket.ts
+5
-33
未找到文件。
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
9f5aee35
...
...
@@ -13167,9 +13167,9 @@ class SocketTask {
const
res
=
name
===
"
message
"
?
{
data
:
event2
.
data
}
:
{};
this
.
_callbacks
[
name
].
forEach
((
callback
22
)
=>
{
this
.
_callbacks
[
name
].
forEach
((
callback
3
)
=>
{
try
{
callback
22
(
res
);
callback
3
(
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
)
{
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
9f5aee35
...
...
@@ -13164,9 +13164,9 @@ class SocketTask {
const
res
=
name
===
"
message
"
?
{
data
:
event2
.
data
}
:
{};
this
.
_callbacks
[
name
].
forEach
((
callback
22
)
=>
{
this
.
_callbacks
[
name
].
forEach
((
callback
3
)
=>
{
try
{
callback
22
(
res
);
callback
3
(
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
)
{
...
...
packages/uni-h5/src/service/api/network/socket.ts
浏览文件 @
9f5aee35
...
...
@@ -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
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录