Mirrors/doipjs
1
0
Fork 1
mirror of https://codeberg.org/keyoxide/doipjs.git synced 2024-12-22 14:39:28 -07:00
Code Issues Projects Releases Packages Wiki Activity

Support new XMPP proofs

Browse source
This commit is contained in:
Yarmo Mackenbach 2022-12-12 16:20:55 +01:00
parent 05fa92063a
commit 4385fa1e51
No known key found for this signature in database
GPG key ID: 37367F4AF4087AD1
2 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/claimDefinitions/xmpp.js
View file

@ -49,12 +49,7 @@ const processURI = (uri) => {
{ {
format: E.ClaimFormat.URI, format: E.ClaimFormat.URI,
relation: E.ClaimRelation.CONTAINS, relation: E.ClaimRelation.CONTAINS,
path: ['url'] path: []
},
{
format: E.ClaimFormat.URI,
relation: E.ClaimRelation.CONTAINS,
path: ['note']
} }
] ]
} }

62
src/fetcher/xmpp.js
View file

@ -45,10 +45,10 @@ if (jsEnv.isNode) {
} }
const { iqCaller } = xmpp const { iqCaller } = xmpp
xmpp.start() xmpp.start()
xmpp.on('online', (address) => { xmpp.on('online', _ => {
resolve({ xmpp: xmpp, iqCaller: iqCaller }) resolve({ xmpp: xmpp, iqCaller: iqCaller })
}) })
xmpp.on('error', (error) => { xmpp.on('error', error => {
reject(error) reject(error)
}) })
}) })
@ -96,12 +96,31 @@ if (jsEnv.isNode) {
const fetchPromise = new Promise((resolve, reject) => { const fetchPromise = new Promise((resolve, reject) => {
(async () => { (async () => {
let completed = false let completed = false
const vcard = { const proofs = []
url: [],
note: [] // Try the ariadne-id pubsub request
if (!completed) {
try {
const response = await iqCaller.request(
xml('iq', { type: 'get', to: data.id }, xml('pubsub', 'http://jabber.org/protocol/pubsub', xml('items', { node: 'http://ariadne.id/protocol/proof' }))),
30 * 1000
)
// Traverse the XML response
response.getChild('pubsub').getChildren('items').forEach(items => {
if (items.attrs.node === 'http://ariadne.id/protocol/proof') {
items.getChildren('item').forEach(item => {
proofs.push(item.getChildText('value'))
})
}
})
resolve(proofs)
completed = true
} catch (_) {}
} }
// Try the vcard4 pubsub request // Try the vcard4 pubsub request [backward compatibility]
if (!completed) { if (!completed) {
try { try {
const response = await iqCaller.request( const response = await iqCaller.request(
@ -117,38 +136,23 @@ if (jsEnv.isNode) {
const itemVcard = item.getChild('vcard', 'urn:ietf:params:xml:ns:vcard-4.0') const itemVcard = item.getChild('vcard', 'urn:ietf:params:xml:ns:vcard-4.0')
// Find the vCard URLs // Find the vCard URLs
itemVcard.getChildren('url').forEach(url => { itemVcard.getChildren('url').forEach(url => {
vcard.url.push(url.getChildText('uri')) proofs.push(url.getChildText('uri'))
}) })
// Find the vCard notes // Find the vCard notes
itemVcard.getChildren('note').forEach(note => { itemVcard.getChildren('note').forEach(note => {
vcard.note.push(note.getChildText('text')) proofs.push(note.getChildText('text'))
}) })
} }
}) })
} }
}) })
resolve(vcard) resolve(proofs)
completed = true completed = true
} catch (_) {} } catch (_) {}
} }
// // Try the vcard4 IQ request (not implemented on any server yet) // Try the vcard-temp IQ request [backward compatibility]
// if (!completed) {
// try {
// const response = await iqCaller.request(
// xml('iq', { type: 'get', to: data.id }, xml('vcard', 'urn:ietf:params:xml:ns:vcard-4.0' )),
// 30 * 1000
// )
// // Traverse the XML response
// resolve(vcard)
// completed = true
// } catch (_) {}
// }
// Try the vcard-temp IQ request
if (!completed) { if (!completed) {
try { try {
const response = await iqCaller.request( const response = await iqCaller.request(
@ -158,17 +162,17 @@ if (jsEnv.isNode) {
// Find the vCard URLs // Find the vCard URLs
response.getChild('vCard', 'vcard-temp').getChildren('URL').forEach(url => { response.getChild('vCard', 'vcard-temp').getChildren('URL').forEach(url => {
vcard.url.push(url.children[0]) proofs.push(url.children[0])
}) })
// Find the vCard notes // Find the vCard notes
response.getChild('vCard', 'vcard-temp').getChildren('NOTE').forEach(note => { response.getChild('vCard', 'vcard-temp').getChildren('NOTE').forEach(note => {
vcard.note.push(note.children[0]) proofs.push(note.children[0])
}) })
response.getChild('vCard', 'vcard-temp').getChildren('DESC').forEach(note => { response.getChild('vCard', 'vcard-temp').getChildren('DESC').forEach(note => {
vcard.note.push(note.children[0]) proofs.push(note.children[0])
}) })
resolve(vcard) resolve(proofs)
completed = true completed = true
} catch (error) { } catch (error) {
reject(error) reject(error)