diff --git a/js/nostr-broadcast.js b/js/nostr-broadcast.js
index dfa4e30..58f4e2e 100644
--- a/js/nostr-broadcast.js
+++ b/js/nostr-broadcast.js
@@ -32,7 +32,7 @@ const fetchAndBroadcast = async () => {
$('#checking-relays-header-box').css('display', 'flex')
$('#checking-relays-box').css('display', 'flex')
- $('#checking-relays-header').html("
Relay | Status | From Key | About Key | Events | ")
+ $('#checking-relays-header').html("Relay | Status | From Key | About Key | Events | | ")
// get all events from relays
const filters =[{ authors: [pubkey] }, { "#p": [pubkey] }]
@@ -78,7 +78,7 @@ const fetchAndBroadcast = async () => {
$('#checking-relays-header-box').css('display', 'flex')
$('#checking-relays-box').css('display', 'flex')
- $('#checking-relays-header').html("Relay | Status | | | Events | ")
+ $('#checking-relays-header').html("Relay | Status | | | Events | Message | ")
await broadcastEvents(data)
}
@@ -159,7 +159,7 @@ const broadcast = async (data) => {
$('#checking-relays-header-box').css('display', 'flex')
$('#checking-relays-box').css('display', 'flex')
- $('#checking-relays-header').html("Relay | Status | | | Events | ")
+ $('#checking-relays-header').html("Relay | Status | | | Events | Message | ")
await broadcastEvents(data)
diff --git a/js/nostr-utils.js b/js/nostr-utils.js
index 5667fe3..80a0562 100644
--- a/js/nostr-utils.js
+++ b/js/nostr-utils.js
@@ -56,7 +56,7 @@ const downloadFile = (data, fileName) => {
tempLink.click()
}
-const updateRelayStatus = (relay, status, addToCount, subscription, until, relayStatusAndCount) => {
+const updateRelayStatus = (relay, status, addToCount, subscription, until, message, relayStatusAndCount) => {
if (relayStatusAndCount[relay] == undefined) {
relayStatusAndCount[relay] = {}
}
@@ -71,6 +71,9 @@ const updateRelayStatus = (relay, status, addToCount, subscription, until, relay
if (subscription)
relayStatusAndCount[relay].until[subscription] = until
+ if (message)
+ relayStatusAndCount[relay].message = message
+
if (relayStatusAndCount[relay].count != undefined)
relayStatusAndCount[relay].count = relayStatusAndCount[relay].count + addToCount
else
@@ -98,9 +101,14 @@ const displayRelayStatus = (relayStatusAndCount) => {
} else {
untilStr += " | | "
}
+
+ let msg = ""
+
+ if (relayStatusAndCount[it].message)
+ msg = relayStatusAndCount[it].message
const relayName = it.replace("wss://", "").replace("ws://", "")
- const line = "" + relayName + " | " + relayStatusAndCount[it].status + " | " + untilStr + "" + relayStatusAndCount[it].count + " | "
+ const line = "" + relayName + " | " + relayStatusAndCount[it].status + " | " + untilStr + "" + relayStatusAndCount[it].count + " | " + "" + msg + " | "
const elemId = relayName.replaceAll(".", "-")
@@ -123,7 +131,7 @@ const displayRelayStatus = (relayStatusAndCount) => {
const fetchFromRelay = async (relay, filters, addedFilters, pubkey, events, relayStatus) =>
new Promise((resolve, reject) => {
try {
- updateRelayStatus(relay, "Starting", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Starting", 0, undefined, undefined, undefined, relayStatus)
// open websocket
const ws = new WebSocket(relay)
@@ -166,7 +174,7 @@ const fetchFromRelay = async (relay, filters, addedFilters, pubkey, events, rela
ws.close()
reject(relay)
}, 10_000)
- updateRelayStatus(relay, "Downloading", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Downloading", 0, undefined, undefined, undefined, relayStatus)
for (const [key, sub] of Object.entries(subscriptions)) {
ws.send(JSON.stringify(['REQ', sub.id, sub.filter]))
@@ -210,7 +218,7 @@ const fetchFromRelay = async (relay, filters, addedFilters, pubkey, events, rela
until = subscriptions[subscriptionId].lastEvent.created_at
}
- updateRelayStatus(relay, undefined, 1, subscriptionId, until, relayStatus)
+ updateRelayStatus(relay, undefined, 1, subscriptionId, until, undefined, relayStatus)
// prevent duplicated events
if (events[id]) return
@@ -232,7 +240,7 @@ const fetchFromRelay = async (relay, filters, addedFilters, pubkey, events, rela
let alldone = Object.values(subscriptions).every(filter => filter.done === true);
if (alldone) {
- updateRelayStatus(relay, "Done", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Done", 0, undefined, undefined, undefined, relayStatus)
ws.close()
resolve(relay)
}
@@ -270,7 +278,7 @@ const fetchFromRelay = async (relay, filters, addedFilters, pubkey, events, rela
let alldone = Object.values(subscriptions).every(filter => filter.done === true);
if (alldone) {
- updateRelayStatus(relay, "Done", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Done", 0, undefined, undefined, undefined, relayStatus)
ws.close()
resolve(relay)
}
@@ -285,7 +293,7 @@ const fetchFromRelay = async (relay, filters, addedFilters, pubkey, events, rela
}
}
ws.onerror = (err) => {
- updateRelayStatus(relay, "Done", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Done", 0, undefined, undefined, undefined, relayStatus)
try {
ws.close()
reject(relay)
@@ -294,12 +302,12 @@ const fetchFromRelay = async (relay, filters, addedFilters, pubkey, events, rela
}
}
ws.onclose = (socket, event) => {
- updateRelayStatus(relay, "Done", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Done", 0, undefined, undefined, undefined, relayStatus)
resolve(relay)
}
} catch (exception) {
console.log(exception)
- updateRelayStatus(relay, "Error", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Error", 0, undefined, undefined, undefined, relayStatus)
try {
ws.close()
} catch (exception) {
@@ -378,7 +386,7 @@ const sendToRelay = async (relay, data, relayStatus) =>
try {
const ws = new WebSocket(relay)
- updateRelayStatus(relay, "Starting", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Starting", 0, undefined, undefined, undefined, relayStatus)
// prevent hanging forever
let myTimeout = setTimeout(() => {
@@ -388,7 +396,7 @@ const sendToRelay = async (relay, data, relayStatus) =>
// fetch events from relay
ws.onopen = () => {
- updateRelayStatus(relay, "Sending", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Sending", 0, undefined, undefined, undefined, relayStatus)
clearTimeout(myTimeout)
myTimeout = setTimeout(() => {
@@ -406,13 +414,14 @@ const sendToRelay = async (relay, data, relayStatus) =>
reject('timeout')
}, 10_000)
- const [msgType, subscriptionId, inserted] = JSON.parse(event.data)
+ const [msgType, subscriptionId, inserted, message] = JSON.parse(event.data)
// event messages
// end of subscription messages
if (msgType === 'OK') {
if (inserted == true) {
- updateRelayStatus(relay, undefined, 1, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, undefined, 1, undefined, undefined, message, relayStatus)
} else {
+ updateRelayStatus(relay, undefined, 0, undefined, undefined, message, relayStatus)
console.log(relay, event.data)
}
} else {
@@ -420,19 +429,19 @@ const sendToRelay = async (relay, data, relayStatus) =>
}
}
ws.onerror = (err) => {
- updateRelayStatus(relay, "Error", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Error", 0, undefined, undefined, undefined, relayStatus)
console.log("Error", err)
ws.close()
reject(err)
}
ws.onclose = (socket, event) => {
- updateRelayStatus(relay, "Done", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Done", 0, undefined, undefined, undefined, relayStatus)
console.log("OnClose", relayStatus)
resolve()
}
} catch (exception) {
console.log(exception)
- updateRelayStatus(relay, "Error", 0, undefined, undefined, relayStatus)
+ updateRelayStatus(relay, "Error", 0, undefined, undefined, undefined, relayStatus)
try {
ws.close()
} catch (exception) {
diff --git a/style.css b/style.css
index 560235d..2f51b81 100644
--- a/style.css
+++ b/style.css
@@ -9,7 +9,7 @@ body {
}
.fullwidth {
- width: 500px;
+ width: 700px;
}
.container {