Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xmpp-pane
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Adrien Dorsaz
xmpp-pane
Commits
876c716c
Commit
876c716c
authored
Apr 13, 2018
by
Adrien Dorsaz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
client: add an <error> element detection (need better error message handling)
parent
f6daed85
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
4 deletions
+22
-4
src/xmpp/client.js
src/xmpp/client.js
+22
-4
No files found.
src/xmpp/client.js
View file @
876c716c
...
...
@@ -268,22 +268,39 @@ class Client {
if
(
Object
.
keys
(
this
.
contracts
).
find
((
contractId
)
=>
{
return
contractId
==
_message
.
id
}))
{
// TODO: Check that XMPP always send <error> (if not move this code approprieterly)
let
errorEntities
=
_message
.
getElementsByTagName
(
'
error
'
);
if
(
errorEntities
.
length
>
0
)
{
let
errorCode
=
errorEntities
[
0
].
getAttribute
(
'
code
'
);
let
errorMessage
=
_message
.
getElementsByTagName
(
'
text
'
)[
0
].
innerHTML
;
this
.
contracts
[
_message
.
id
].
fail
({
message
:
errorMessage
,
code
:
errorCode
});
console
.
error
(
'
xmppClient: contract
'
+
_message
.
id
+
'
has failed (error:
'
+
errorCode
+
'
,
'
+
errorMessage
+
'
)
'
);
return
;
}
// TODO: Add checks about namespaceURI too
if
(
this
.
contracts
[
_message
.
id
].
nodeName
==
_message
.
nodeName
)
{
this
.
contracts
[
_message
.
id
].
success
(
_message
);
}
else
{
this
.
contracts
[
_message
.
id
].
fail
({
error
:
'
node name did not match: expected [
'
message
:
'
node name did not match: expected [
'
+
this
.
contracts
[
_message
.
id
].
nodeName
+
'
]
'
+
'
, received [
'
+
_message
.
children
[
0
].
nodeName
+
'
]
'
+
'
]
'
,
code
:
'
badNodeName
'
});
}
}
else
{
console
.
err
(
'
xmppClient: client
'
+
this
.
fulljid
+
'
did not expect contract id:
'
+
_message
.
id
);
console
.
err
or
(
'
xmppClient: client
'
+
this
.
fulljid
+
'
did not expect contract id:
'
+
_message
.
id
);
}
}
...
...
@@ -450,7 +467,8 @@ class Client {
this
.
xmppNet
.
registerService
(
entity
);
},
(
error
)
=>
{
reject
(
'
client: discoPubsubService: unknown error:
'
+
error
);
console
.
log
(
'
client: discoPubsubService received error:
'
+
error
.
message
);
reject
(
error
);
})
.
then
(
(
result
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment