some small fixes.
This commit is contained in:
parent
0e1c23a3f9
commit
87de1310b5
7
pool.js
7
pool.js
|
@ -23,7 +23,7 @@ export function relayPool(globalPrivateKey) {
|
|||
}
|
||||
|
||||
const sub = async (cb, params) => {
|
||||
const subControllers = R.map(relay => {
|
||||
const subControllers = R.map(({relay}) => {
|
||||
return relay.sub(params, cb.bind(null, relay))
|
||||
}, R.filter(R.pipe(R.prop('policy'), R.prop('write'), R.equals(true)), relays))
|
||||
|
||||
|
@ -38,6 +38,7 @@ export function relayPool(globalPrivateKey) {
|
|||
}
|
||||
|
||||
return {
|
||||
sub,
|
||||
relays,
|
||||
setPrivateKey(privateKey) {
|
||||
globalPrivateKey = privateKey
|
||||
|
@ -71,10 +72,6 @@ export function relayPool(globalPrivateKey) {
|
|||
relay.close()
|
||||
delete relays[relayURL]
|
||||
},
|
||||
offEvent(cb) {
|
||||
let index = eventCallbacks.indexOf(cb)
|
||||
if (index !== -1) eventCallbacks.splice(index, 1)
|
||||
},
|
||||
onNotice(cb) {
|
||||
noticeCallbacks.push(cb)
|
||||
},
|
||||
|
|
6
relay.js
6
relay.js
|
@ -29,9 +29,7 @@ export function relayConnect(url, onNotice) {
|
|||
var channels = {}
|
||||
|
||||
function connect() {
|
||||
ws = new WebSocket(
|
||||
url + (url.indexOf('?') !== -1 ? '&' : '?') + `session=${Math.random()}`
|
||||
)
|
||||
ws = new WebSocket(url)
|
||||
|
||||
ws.onopen = () => {
|
||||
console.log('connected to', url)
|
||||
|
@ -135,7 +133,7 @@ export function relayConnect(url, onNotice) {
|
|||
url,
|
||||
sub: R.partial(sub, [sha256(Math.random().toString())]),
|
||||
async publish(event) {
|
||||
trySend(JSON.stringify(event))
|
||||
trySend(JSON.stringify(['EVENT', event]))
|
||||
},
|
||||
close() {
|
||||
ws.close()
|
||||
|
|
Loading…
Reference in New Issue