aljaz/blastr
1
0
Fork 0
mirror of https://github.com/aljazceru/blastr.git synced 2025-12-17 05:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from MutinyWallet/more-queues

Browse Source 
Add more queues and delete some prev ones
This commit is contained in:
Tony Giorgio
2023-03-05 16:37:05 -06:00
committed by GitHub
parent 15e90fd93e eb0b5fd8ac
commit cd6a43b8df
3 changed files with 73 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib.rs
View File

@@ -1,4 +1,8 @@
use crate::nostr::get_nip11_response;
use crate::nostr::NOSTR_QUEUE_10;
use crate::nostr::NOSTR_QUEUE_7;
use crate::nostr::NOSTR_QUEUE_8;
use crate::nostr::NOSTR_QUEUE_9;
pub(crate) use crate::nostr::{
try_queue_event, NOSTR_QUEUE, NOSTR_QUEUE_2, NOSTR_QUEUE_3, NOSTR_QUEUE_4, NOSTR_QUEUE_5,
NOSTR_QUEUE_6,
@@ -78,6 +82,10 @@ pub async fn main(req: Request, env: Env, _ctx: Context) -> Result<Response> {
ctx.env.queue(NOSTR_QUEUE_4).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_5).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_6).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_7).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_8).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_9).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_10).expect("get queue"),
];
try_queue_event(*event.clone(), nostr_queues).await;
console_log!("queued up nostr event: {}", event.id);
@@ -187,6 +195,10 @@ pub async fn main(req: Request, env: Env, _ctx: Context) -> Result<Response> {
ctx.env.queue(NOSTR_QUEUE_4).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_5).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_6).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_7).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_8).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_9).expect("get queue"),
ctx.env.queue(NOSTR_QUEUE_10).expect("get queue"),
];
try_queue_event(*event.clone(), nostr_queues).await;
console_log!("queued up nostr event: {}", event.id);
@@ -282,6 +294,10 @@ pub fn queue_number(batch_name: &str) -> Result<u32> {
NOSTR_QUEUE_4 => Ok(3),
NOSTR_QUEUE_5 => Ok(4),
NOSTR_QUEUE_6 => Ok(5),
NOSTR_QUEUE_7 => Ok(6),
NOSTR_QUEUE_8 => Ok(7),
NOSTR_QUEUE_9 => Ok(8),
NOSTR_QUEUE_10 => Ok(9),
_ => Err("unexpected queue".into()),
}
}

12
src/nostr.rs
View File

@@ -8,12 +8,16 @@ use std::{time::Duration, vec};
use worker::WebsocketEvent;
use worker::{console_log, Cache, Delay, Fetch, Queue, Response, WebSocket};
pub(crate) const NOSTR_QUEUE: &str = "nostr-events-pub";
pub(crate) const NOSTR_QUEUE: &str = "nostr-events-pub-1";
pub(crate) const NOSTR_QUEUE_2: &str = "nostr-events-pub-2";
pub(crate) const NOSTR_QUEUE_3: &str = "nostr-events-pub-3";
pub(crate) const NOSTR_QUEUE_4: &str = "nostr-events-pub-4";
pub(crate) const NOSTR_QUEUE_5: &str = "nostr-events-pub-5";
pub(crate) const NOSTR_QUEUE_6: &str = "nostr-events-pub-6";
pub(crate) const NOSTR_QUEUE_6: &str = "nostr-events-pub-6-a";
pub(crate) const NOSTR_QUEUE_7: &str = "nostr-events-pub-7";
pub(crate) const NOSTR_QUEUE_8: &str = "nostr-events-pub-8";
pub(crate) const NOSTR_QUEUE_9: &str = "nostr-events-pub-9";
pub(crate) const NOSTR_QUEUE_10: &str = "nostr-events-pub-10";
const RELAY_LIST_URL: &str = "https://api.nostr.watch/v1/online";
const RELAYS: [&str; 8] = [
"wss://nostr.zebedee.cloud",
@@ -209,8 +213,8 @@ fn get_sub_vec_range(original: Vec<String>, range: (usize, usize)) -> Vec<String
}
fn find_range_from_part(part: u32) -> (usize, usize) {
let start = 48 * part;
let end = start + 47;
let start = 30 * part;
let end = start + 29;
(start as usize, end as usize)
}

61
wrangler.toml
View File

@@ -16,8 +16,8 @@ kv_namespaces = [
WORKERS_RS_VERSION = "0.0.11"
[[queues.producers]]
queue = "nostr-events-pub"
binding = "nostr-events-pub"
queue = "nostr-events-pub-1"
binding = "nostr-events-pub-1"
[[queues.producers]]
queue = "nostr-events-pub-2"
@@ -36,37 +36,74 @@ WORKERS_RS_VERSION = "0.0.11"
binding = "nostr-events-pub-5"
[[queues.producers]]
queue = "nostr-events-pub-6"
binding = "nostr-events-pub-6"
queue = "nostr-events-pub-6-a"
binding = "nostr-events-pub-6-a"
[[queues.producers]]
queue = "nostr-events-pub-7"
binding = "nostr-events-pub-7"
[[queues.producers]]
queue = "nostr-events-pub-8"
binding = "nostr-events-pub-8"
[[queues.producers]]
queue = "nostr-events-pub-9"
binding = "nostr-events-pub-9"
[[queues.producers]]
queue = "nostr-events-pub-10"
binding = "nostr-events-pub-10"
# consumers
[[queues.consumers]]
queue = "nostr-events-pub"
queue = "nostr-events-pub-1"
max_batch_size = 15
max_batch_timeout = 15
max_batch_timeout = 5 # this is the best one, run quicker
[[queues.consumers]]
queue = "nostr-events-pub-2"
max_batch_size = 15
max_batch_size = 20
max_batch_timeout = 15
[[queues.consumers]]
queue = "nostr-events-pub-3"
max_batch_size = 15
max_batch_size = 20
max_batch_timeout = 15
[[queues.consumers]]
queue = "nostr-events-pub-4"
max_batch_size = 15
max_batch_size = 20
max_batch_timeout = 15
[[queues.consumers]]
queue = "nostr-events-pub-5"
max_batch_size = 15
max_batch_size = 20
max_batch_timeout = 15
[[queues.consumers]]
queue = "nostr-events-pub-6"
max_batch_size = 15
queue = "nostr-events-pub-6-a"
max_batch_size = 20
max_batch_timeout = 15
[[queues.consumers]]
queue = "nostr-events-pub-7"
max_batch_size = 20
max_batch_timeout = 15
[[queues.consumers]]
queue = "nostr-events-pub-8"
max_batch_size = 20
max_batch_timeout = 15
[[queues.consumers]]
queue = "nostr-events-pub-9"
max_batch_size = 20
max_batch_timeout = 15
[[queues.consumers]]
queue = "nostr-events-pub-10"
max_batch_size = 20
max_batch_timeout = 15
[build]