From 5d6703cc14c80cd1363b6b77ef3e992a2ccfc62a Mon Sep 17 00:00:00 2001 From: zarazaex69 Date: Fri, 8 May 2026 17:31:19 +0300 Subject: [PATCH] upd: update project ( actualize to gen ) --- docker-compose.server.yml | 2 +- script/cnc.sh | 6 +----- script/docker/olcrtc-entrypoint.sh | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/docker-compose.server.yml b/docker-compose.server.yml index 5737d07..1515b68 100644 --- a/docker-compose.server.yml +++ b/docker-compose.server.yml @@ -7,7 +7,7 @@ services: restart: unless-stopped environment: OLCRTC_CARRIER: "${OLCRTC_CARRIER:?set OLCRTC_CARRIER (telemost, jazz, wbstream)}" - OLCRTC_ROOM_ID: "${OLCRTC_ROOM_ID:?set OLCRTC_ROOM_ID}" + OLCRTC_ROOM_ID: "${OLCRTC_ROOM_ID:-}" OLCRTC_KEY: "${OLCRTC_KEY:-}" OLCRTC_DNS: "${OLCRTC_DNS:-1.1.1.1:53}" OLCRTC_SOCKS_PROXY: "${OLCRTC_SOCKS_PROXY:-}" diff --git a/script/cnc.sh b/script/cnc.sh index 9b2885b..14937fd 100755 --- a/script/cnc.sh +++ b/script/cnc.sh @@ -112,11 +112,7 @@ esac echo "[*] Using transport: $TRANSPORT" echo "" -if [ "$CARRIER" = "jazz" ]; then - read -p "Enter Room ID (format: roomId:password from server): " ROOM_ID -else - read -p "Enter Room ID: " ROOM_ID -fi +read -p "Enter Room ID: " ROOM_ID if [ -z "$ROOM_ID" ]; then echo "[X] Room ID cannot be empty" diff --git a/script/docker/olcrtc-entrypoint.sh b/script/docker/olcrtc-entrypoint.sh index eb55bb7..d62d4b2 100644 --- a/script/docker/olcrtc-entrypoint.sh +++ b/script/docker/olcrtc-entrypoint.sh @@ -59,9 +59,22 @@ vp8_batch="${OLCRTC_VP8_BATCH:-0}" [ "$mode" = "srv" ] || die "server image defaults to OLCRTC_MODE=srv; got '$mode'" [ -n "$carrier" ] || die "set OLCRTC_CARRIER (e.g. telemost, jazz, wbstream)" [ -n "$transport" ] || die "set OLCRTC_TRANSPORT (e.g. datachannel, videochannel, seichannel, vp8channel)" -[ -n "$room_id" ] || die "set OLCRTC_ROOM_ID to the room identifier" [ -n "$client_id" ] || die "set OLCRTC_CLIENT_ID to bind the expected client" +if [ -z "$room_id" ]; then + case "$carrier" in + jazz|wbstream) + echo "olcrtc-entrypoint: OLCRTC_ROOM_ID not set, generating room via -mode gen..." >&2 + room_id=$(/usr/local/bin/olcrtc -mode gen -carrier "$carrier" -dns "$dns_server" -amount 1 -data "$data_dir") + [ -n "$room_id" ] || die "room generation failed for carrier '$carrier'" + echo "olcrtc-entrypoint: generated room ID: $room_id" >&2 + ;; + *) + die "set OLCRTC_ROOM_ID to the room identifier" + ;; + esac +fi + if [ -z "$key" ]; then if [ -s "$key_file" ]; then key="$(tr -d '[:space:]' < "$key_file")"