48 Commits
Author SHA1 Message Date
emil28092005 58cadadf7f Add JWT authorization functionality. 2026-01-21 04:20:44 +03:00
emil28092005 b36b19af27 Harbor works! 2026-01-18 22:27:16 +03:00
emil28092005 909d3e9162 Harbor works! 2026-01-18 22:26:18 +03:00
emil28092005 07b178b488 Harbor works! 2026-01-18 21:36:22 +03:00
emil28092005 82cc3d396a Set up Harbor. 2026-01-18 21:30:52 +03:00
emil28092005 acea25f536 Set up Harbor. 2026-01-18 21:10:26 +03:00
emil28092005 2883cb6045 Minimal CI/CD works! 2026-01-18 06:23:02 +03:00
emil28092005 aeed25da38 Testing Github webhook cicd. 2026-01-18 06:21:12 +03:00
emil28092005 a26fc340eb Testing Github webhook cicd. 2026-01-18 06:17:39 +03:00
emil28092005 2e9ad750de Fix nginx. 2026-01-18 06:13:23 +03:00
emil28092005 f93d66c35b Testing Github webhook cicd. 2026-01-18 06:02:11 +03:00
emil28092005 1acd6b67c4 Testing Github webhook cicd. 2026-01-18 05:58:35 +03:00
emil28092005 89c12dace6 Testing Github webhook cicd. 2026-01-18 05:53:20 +03:00
emil28092005 d115624d85 Testing Github webhook cicd. 2026-01-18 05:52:24 +03:00
emil28092005 5e6f526446 Testing Github webhook cicd. 2026-01-18 05:47:15 +03:00
emil28092005 d7427c55dd Fix Jenkinsfile. 2026-01-18 05:46:28 +03:00
emil28092005 e05d1000f8 Testing Github webhook cicd. 2026-01-18 05:40:31 +03:00
Emil Shanaty 8437a82428 Merge pull request #6 from emil28092005/cicd-fix
Tryiing to fix Jenkins.
2026-01-18 05:23:55 +03:00
emil28092005 bfe848f335 Tryiing to fix Jenkins. 2026-01-18 05:23:17 +03:00
Emil Shanaty 0e70e7d2bc Merge pull request #5 from emil28092005/cicd-fix
Cicd fix
2026-01-18 05:18:52 +03:00
emil28092005 cce78fa8b3 Try fixing Jenkins. 2026-01-18 01:48:00 +00:00
emil28092005 e67fb2ffe2 Try fixing Jenkins. 2026-01-18 01:47:32 +00:00
emil28092005 98f505ce88 Try fixing Jenkins. 2026-01-18 01:46:29 +00:00
emil28092005 da850e6086 Try fixing Jenkins. 2026-01-18 01:42:20 +00:00
emil28092005 4aa6aad6cb Try fixing Jenkins. 2026-01-18 01:07:38 +00:00
emil28092005 eb476c0b9d Try fixing Jenkins. 2026-01-18 01:03:36 +00:00
emil28092005 dab959d1a5 Try fixing Jenkins. 2026-01-18 01:00:20 +00:00
emil28092005 3929678a43 Try fixing Jenkins. 2026-01-18 00:58:13 +00:00
emil28092005 ce46878054 Try fixing Jenkins. 2026-01-17 22:40:55 +00:00
emil28092005 1e29b2e624 Try fixing Jenkins. 2026-01-17 22:28:22 +00:00
emil28092005 d2b12d2e5a Try fixing Jenkins. 2026-01-17 22:25:36 +00:00
emil28092005 c25952bbc1 Try fixing Jenkins 2026-01-16 23:52:50 +03:00
emil28092005 5b8f9bc1ab Try fixing Jenkins 2026-01-16 23:23:09 +03:00
emil28092005 04d0e2ae31 remake architecture. 2026-01-16 23:17:44 +03:00
emil28092005 4259295ba3 Try fixing Jenkins. 2026-01-16 21:26:28 +03:00
emil28092005 b98326f510 Try fixing Jenkins. 2026-01-16 21:17:13 +03:00
emil28092005 7db2a78c0b Try fixing Jenkins. 2026-01-16 21:08:46 +03:00
emil28092005 cbc6ff04f6 Try fixing Jenkins. 2026-01-16 21:02:33 +03:00
emil28092005 c7955ecee7 Fix WebSocket connection. 2026-01-16 20:31:39 +03:00
emil28092005 acede2104a Fix docker-compose-jenkins.yml 2026-01-16 08:50:53 +03:00
emil28092005 5895990cbb Fix Jenkinsfile. 2026-01-16 08:26:11 +03:00
emil28092005 320d4d7502 Fix Jenkinsfile. 2026-01-16 08:10:07 +03:00
emil28092005 cc70057b63 Fix Jenkinsfile. 2026-01-16 08:02:26 +03:00
emil28092005 dbe3b79fb5 Fix Jenkinsfile. 2026-01-16 07:49:05 +03:00
emil28092005 0e56d9f1f8 Add Jenkinsfile. 2026-01-16 07:42:19 +03:00
emil28092005 b894e3a6f1 docker-compose-jenkins.yml 2026-01-16 07:17:56 +03:00
emil28092005 19433276af docker-compose-jenkins.yml + minor fixes. 2026-01-16 07:14:11 +03:00
Emil Shanaty 552fc6b9a8 Merge pull request #4 from emil28092005/dev
Dev
2026-01-14 04:58:57 +03:00
19 changed files with 428 additions and 89 deletions
+2
View File
@@ -1,2 +1,4 @@
project_context.txt
shagram.db
deploy/shagram/nginx/certs/*.pem
deploy/shagram/.env
+9 -7
View File
@@ -1,20 +1,22 @@
FROM golang:1.25.5-alpine AS builder
RUN apk add --no-cache build-base
RUN apk add --no-cache build-base ca-certificates
WORKDIR /app
COPY go.mod go.sum ./
RUN go mod download
RUN --mount=type=cache,target=/go/pkg/mod \
go mod download
COPY . .
RUN CGO_ENABLED=1 GOOS=linux go build -a -installsuffix cgo -o shagram ./cmd/server
RUN --mount=type=cache,target=/go/pkg/mod \
--mount=type=cache,target=/root/.cache/go-build \
CGO_ENABLED=1 GOOS=linux go build -o shagram ./cmd/server
FROM alpine:latest
RUN apk --no-cache add ca-certificates sqlite-libs
RUN apk add --no-cache ca-certificates sqlite-libs sqlite
WORKDIR /app
COPY --from=builder /app/shagram .
COPY static ./static
COPY migrations ./migrations
RUN mkdir -p /app/data
EXPOSE 8080
CMD ["./shagram"]
Vendored
+99
View File
@@ -0,0 +1,99 @@
pipeline {
agent { label 'docker-agent' }
options {
skipDefaultCheckout(true)
timestamps()
}
environment {
REGISTRY = "158.160.92.116:8085"
REGISTRY_PROJECT = "shagram"
IMAGE_NAME = "shagram"
DEPLOY_DIR = "/opt/shagram/shagram/deploy/shagram"
COMPOSE_FILE = "${WORKSPACE}/deploy/shagram/compose.yaml"
}
stages {
stage('Checkout') {
steps {
checkout scm
sh '''
set -eux
git reset --hard
git clean -xffd
'''
}
}
stage('Detect branch') {
steps {
script {
env.GIT_BRANCH = sh(
script: "git name-rev --name-only --refs=refs/remotes/origin/* HEAD | sed 's#^remotes/##' | head -n1",
returnStdout: true
).trim()
echo "Detected branch: ${env.GIT_BRANCH}"
}
}
}
stage('Build image') {
steps {
script {
env.GIT_SHA = sh(script: "git rev-parse --short HEAD", returnStdout: true).trim()
// итоговый тег для Harbor
env.APP_IMAGE = "${REGISTRY}/${REGISTRY_PROJECT}/${IMAGE_NAME}:${env.GIT_SHA}"
}
sh '''
set -eux
# собираем локальный образ без registry
docker build -t "${IMAGE_NAME}:${GIT_SHA}" .
'''
}
}
stage('Login & Push to Harbor') {
steps {
withCredentials([usernamePassword(
credentialsId: 'harbor-creds',
usernameVariable: 'HARBOR_USER',
passwordVariable: 'HARBOR_PASS'
)]) {
sh '''
set -eux
echo "$HARBOR_PASS" | docker login "$REGISTRY" -u "$HARBOR_USER" --password-stdin
docker tag "${IMAGE_NAME}:${GIT_SHA}" "${APP_IMAGE}"
docker push "${APP_IMAGE}"
'''
}
}
}
stage('Test') {
steps {
sh 'echo "Testing..."'
}
}
stage('Deploy') {
when {
expression { env.GIT_BRANCH == 'origin/main' }
}
steps {
sh '''
set -eux
mkdir -p "$DEPLOY_DIR"
cat > "$DEPLOY_DIR/.env" <<EOF
APP_IMAGE=${APP_IMAGE}
EOF
docker compose -f "$COMPOSE_FILE" --project-directory "$DEPLOY_DIR" pull
docker compose -f "$COMPOSE_FILE" --project-directory "$DEPLOY_DIR" up -d --remove-orphans
docker compose -f "$COMPOSE_FILE" --project-directory "$DEPLOY_DIR" ps
'''
}
}
}
}
View File
+29 -1
View File
@@ -3,16 +3,23 @@ package main
import (
"log"
"net/http"
"os"
"shagram/internal/api"
"shagram/internal/auth"
"shagram/internal/db"
"shagram/internal/models"
"shagram/internal/websocket"
"time"
"github.com/gin-gonic/gin"
)
func main() {
database, err := db.NewDB("/app/data/shagram.db")
dbPath := os.Getenv("DATABASE_PATH")
if dbPath == "" {
dbPath = "/app/data/shagram.db"
}
database, err := db.NewDB(dbPath)
if err != nil {
log.Fatal(err)
}
@@ -24,6 +31,27 @@ func main() {
router := gin.Default()
router.POST("/api/auth/login", func(c *gin.Context) {
var req struct {
Username string `json:"username"`
}
if err := c.ShouldBindJSON(&req); err != nil || req.Username == "" {
c.JSON(http.StatusBadRequest, gin.H{"error": "username required"})
return
}
token, err := auth.NewAccessToken(req.Username, time.Hour)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return
}
c.JSON(200, gin.H{"access_token": token})
})
router.GET("/api/me", auth.Middleware(), func(c *gin.Context) {
username := c.GetString(auth.CtxUsernameKey)
c.JSON(200, gin.H{"username": username})
})
router.GET("/ws/:room", func(c *gin.Context) {
api.WebSocketHandler(hub, database)(c)
})
+27
View File
@@ -0,0 +1,27 @@
services:
shagram:
image: ${APP_IMAGE:-shagram:local}
build:
context: ../..
container_name: shagram-app
environment:
- DATABASE_PATH=/app/data/shagram.db
- JWT_SECRET=${JWT_SECRET}
volumes:
- shagram_data:/app/data
expose:
- "8080"
nginx:
image: nginx:alpine
container_name: shagram-nginx
ports:
- "80:80"
- "443:443"
volumes:
- ./nginx/conf.d:/etc/nginx/conf.d:ro
- ./nginx/certs:/etc/nginx/certs:ro
depends_on:
- shagram
volumes:
shagram_data:
View File
+34
View File
@@ -0,0 +1,34 @@
# TLS Certificates for Nginx (Development / Self-Signed)
In production, TLS certificates are typically issued by a trusted Certificate Authority (for example, via Lets Encrypt).
For local development and demo environments, a self-signed certificate can be used.
## Generate a self-signed certificate (Linux/macOS)
From the repository root:
```bash
mkdir -p deploy/shagram/nginx/certs
openssl req -x509 -newkey rsa:4096 \
-keyout deploy/shagram/nginx/certs/key.pem \
-out deploy/shagram/nginx/certs/cert.pem \
-sha256 -days 365 -nodes \
-subj "/C=RU/ST=Moscow/L=Korolyov/O=Shagram/CN=localhost"
```
## Verify
```bash
openssl x509 -in deploy/shagram/nginx/certs/cert.pem -noout -text | head
```
## Usage
The Nginx configuration expects:
- `deploy/shagram/nginx/certs/cert.pem`
- `deploy/shagram/nginx/certs/key.pem`
Start the deployment:
```bash
cd deploy/shagram
docker compose up -d
```
-26
View File
@@ -1,26 +0,0 @@
version: '3.8'
services:
shagram:
build: .
ports:
- "8080"
volumes:
- ./data:/app/data
- ./static:/app/static
- ./migrations:/app/migrations
environment:
- DATABASE_PATH=/app/shagram.db
container_name: shagram-app
nginx:
image: nginx:alpine
ports:
- "80:80"
- "443:443"
volumes:
- ./nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
- ./nginx/certs:/etc/nginx/certs
depends_on:
- shagram
container_name: shagram-nginx
+1
View File
@@ -14,6 +14,7 @@ require (
github.com/go-playground/validator/v10 v10.27.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/goccy/go-yaml v1.18.0 // indirect
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
+2
View File
@@ -22,6 +22,8 @@ github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+78
View File
@@ -0,0 +1,78 @@
# Jenkins (Controller + Docker Agent) Setup (Docker Compose)
This directory contains a minimal Jenkins setup using a dedicated **controller** and a separate inbound **agent** intended for Docker-based workloads.
The goal is to keep the controller responsible for orchestration and configuration, while all builds run on the agent labeled `docker`.
## Prerequisites
- Docker Engine installed on the host
- Docker Compose available as `docker compose`
- A host directory `/opt/shagram` (used by pipelines as a shared location for source code and deployment files)
## Start Jenkins
From the repository root:
```bash
cd infra/jenkins
docker compose up -d
docker compose ps
```
Jenkins UI will be available at:
- http://<server-ip>:8080
### Initial admin password
Retrieve the initial password with:
```bash
docker exec -it jenkins-controller cat /var/jenkins_home/secrets/initialAdminPassword
```
## Disable builds on the built-in node (Executors = 0)
To ensure builds do not run on the controller:
1. Open Jenkins UI
2. Go to: **Manage Jenkins → Manage Nodes and Clouds**
3. Open **Built-In Node → Configure**
4. Set **Number of executors** to `0`
5. Save
## Create an inbound agent node (docker-agent)
Create a dedicated node for running pipelines:
1. Go to: **Manage Jenkins → Manage Nodes and Clouds → New Node**
2. Set:
- **Node name**: `docker-agent`
- **Type**: Permanent Agent
- **Remote root directory**: `/home/jenkins/agent`
- **Labels**: `docker`
- **Usage**: Only build jobs with label expressions matching this node
3. Save
After saving, open the agent page:
- **Manage Nodes and Clouds → docker-agent**
On that page, Jenkins provides the inbound connection details, including the **secret** required by the inbound agent container.
## Configure the agent secret in Compose
Edit `infra/jenkins/compose.yaml` and replace:
- `JENKINS_SECRET=__PASTE_ME__`
with the real secret value shown on the `docker-agent` node page.
Restart only the agent container:
```bash
docker compose up -d --force-recreate jenkins-agent-docker
docker logs -f jenkins-agent-docker
```
## Verification
- In Jenkins UI: **Manage Nodes and Clouds**, the node `docker-agent` should be **Online**
- Any pipeline using `agent { label 'docker' }` should execute on this agent
## Security note
The Docker agent container mounts `/var/run/docker.sock`, which effectively grants high-level control over the Docker host. Use this setup only in trusted environments and limit access to Jenkins accordingly.
+37
View File
@@ -0,0 +1,37 @@
services:
jenkins-controller:
image: jenkins/jenkins:lts-jdk17
container_name: jenkins-controller
ports:
- "8080:8080"
volumes:
- jenkins_home:/var/jenkins_home
restart: unless-stopped
jenkins-agent-docker:
image: jenkins/inbound-agent:latest-jdk17
container_name: jenkins-agent-docker
user: "1000:1000"
group_add:
- "988"
environment:
- JENKINS_URL=http://jenkins-controller:8080
- JENKINS_AGENT_NAME=docker-agent
- JENKINS_SECRET=0c92dc0b807b3c7213cd2abcec4f88182aa8f4fb2233ca9c674f17fd771fe662
- AGENT_WORKDIR=/home/jenkins/agent
volumes:
- agent_workdir:/home/jenkins/agent
- /var/run/docker.sock:/var/run/docker.sock
- /usr/bin/docker:/usr/bin/docker
- /usr/libexec/docker/cli-plugins:/usr/libexec/docker/cli-plugins:ro
- /opt/shagram:/opt/shagram
restart: unless-stopped
depends_on:
- jenkins-controller
volumes:
jenkins_home:
external: true
name: jenkins_jenkins_home
agent_workdir:
+64
View File
@@ -0,0 +1,64 @@
package auth
import (
"errors"
"os"
"time"
"github.com/golang-jwt/jwt/v5"
)
type Claims struct {
Username string `json:"username"`
jwt.RegisteredClaims
}
func secret() ([]byte, error) {
s := os.Getenv("JWT_SECRET")
if s == "" {
return nil, errors.New("JWT_SECRET is not set")
}
return []byte(s), nil
}
func NewAccessToken(username string, ttl time.Duration) (string, error) {
key, err := secret()
if err != nil {
return "", err
}
now := time.Now()
claims := Claims{
Username: username,
RegisteredClaims: jwt.RegisteredClaims{
Subject: username,
IssuedAt: jwt.NewNumericDate(now),
ExpiresAt: jwt.NewNumericDate(now.Add(ttl)),
},
}
t := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
return t.SignedString(key)
}
func ParseAccessToken(tokenString string) (*Claims, error) {
key, err := secret()
if err != nil {
return nil, err
}
token, err := jwt.ParseWithClaims(tokenString, &Claims{}, func(token *jwt.Token) (any, error) {
return key, nil
},
jwt.WithValidMethods([]string{jwt.SigningMethodHS256.Alg()}),
)
if err != nil {
return nil, err
}
claims, ok := token.Claims.(*Claims)
if !ok || !token.Valid {
return nil, errors.New("invalid token")
}
return claims, nil
}
+41
View File
@@ -0,0 +1,41 @@
package auth
import (
"net/http"
"strings"
"github.com/gin-gonic/gin"
)
const CtxUsernameKey = "username"
func Middleware() gin.HandlerFunc {
return func(c *gin.Context) {
h := c.GetHeader("Authorization")
if h == "" {
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "missing Authorization header"})
return
}
const prefix = "Bearer "
if !strings.HasPrefix(h, prefix) {
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "expected Bearer token"})
return
}
raw := strings.TrimSpace(strings.TrimPrefix(h, prefix))
if raw == "" {
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "empty token"})
return
}
claims, err := ParseAccessToken(raw)
if err != nil {
c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "invalid token"})
return
}
c.Set(CtxUsernameKey, claims.Username)
c.Next()
}
}
-22
View File
@@ -1,22 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIDjzCCAnegAwIBAgIUG1Qc10mXTy5+Zuh1COAK6fqAl34wDQYJKoZIhvcNAQEL
BQAwVzELMAkGA1UEBhMCUlUxDzANBgNVBAgMBk1vc2NvdzERMA8GA1UEBwwIS29y
b2x5b3YxEDAOBgNVBAoMB1NoYWdyYW0xEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0y
NjAxMTQwMTMxNDhaFw0yNzAxMTQwMTMxNDhaMFcxCzAJBgNVBAYTAlJVMQ8wDQYD
VQQIDAZNb3Njb3cxETAPBgNVBAcMCEtvcm9seW92MRAwDgYDVQQKDAdTaGFncmFt
MRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
AoIBAQDLOB4WybryG6Cc4yU+2PPrLiM/tt15HMVp0TgcA277vofYFd90IArihbmG
KEaKYyZplUzxk55RRNS6BaAroZb0AWEg8cOid83gbnuKKaIUhjz/CDADPnnRWynb
PHjVuvIBtPLgyunbtB6U7a6JLP2nA8XaTcDFtLrhy8PTKFZ9fLRBXzxW8ZvNnL4i
FSLQYe851dOfJ1m0HwA/meK8QWfYn01O8zprleSMo+HPIudRR6ySnx/Cy3LuAcqM
sjttf6EFWs9XTiAOIbKC4M8VbOrfZjXFz45ljD0tZNziJ2g61lmdJAV8ElwZ6SDP
fGTwGjWj5Qx9Lg7qdFqjVyE0QFBJAgMBAAGjUzBRMB0GA1UdDgQWBBSd7S5Xngb4
9eeBbmTCslblkWClRDAfBgNVHSMEGDAWgBSd7S5Xngb49eeBbmTCslblkWClRDAP
BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQA8Lx0PAhfYRuRYuQxV
EyU4pmQ6JuAPl3gxVKHY6bFGMYooSRr5Nw/YulfPucxTKHtVlgY/l0kwofmTUh3B
Df1tulFCCmBW4zbl6cHd7TVSEJBkV7R9AqAC49ni8mVhmo3uPuARFa+mR8ATrF4y
LWlO/2n7F5g+093CqOG3b4O76PlqAl6L/z/Z+UBoMVEyiPgfxAztucsBn7oOaQwG
g6ohX2kosC2uRsc1bAofHWW0u3tFY0i6oiI7XPF9REuWJOiDlN2PsDMXhSG5xeLj
e7LUOQsNXB5deAfUFxbtEDCnEDzyp+GxXwZ0iPsJOzm2ccL6XdDzucCuR/NtuhGf
KwpD
-----END CERTIFICATE-----
-28
View File
@@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDLOB4WybryG6Cc
4yU+2PPrLiM/tt15HMVp0TgcA277vofYFd90IArihbmGKEaKYyZplUzxk55RRNS6
BaAroZb0AWEg8cOid83gbnuKKaIUhjz/CDADPnnRWynbPHjVuvIBtPLgyunbtB6U
7a6JLP2nA8XaTcDFtLrhy8PTKFZ9fLRBXzxW8ZvNnL4iFSLQYe851dOfJ1m0HwA/
meK8QWfYn01O8zprleSMo+HPIudRR6ySnx/Cy3LuAcqMsjttf6EFWs9XTiAOIbKC
4M8VbOrfZjXFz45ljD0tZNziJ2g61lmdJAV8ElwZ6SDPfGTwGjWj5Qx9Lg7qdFqj
VyE0QFBJAgMBAAECggEALgf0UtOXd6M35omSBHIWkBknjVVRxc71TYKBS+EgOMA/
23ua3Z4rcQN60k9ZqRuL1iMmJls6Y2yspcVD8lYcEAGm+1Qf7PNnrBRCgflrt+vv
MZJsc7OpWrlkWf9Q3JLHogjXcgEsZyJdwfyzielpvDS/0nLFvVKyeRZTcUdEDhCz
MoY3tqcZVwq1k+CsW5Z8C1DZaEwgwhEXNGPgfX7R86FSNwlNmcTKJG/YHb9xBA84
O109pfe9PsQnYB9Lw+CNPHl1v6wIMRlVZZMFPevBJq+r9d8iN6dsX7c4oR8SXDDS
4Shux9RNE8XyD6HOTK+QuEvJmZmPIFjnlVZIsVkpHQKBgQD5bfeh7En+VPdHFGTg
+0o1ZSYrfvErak8zP7DoLZF4EY6CK20uZ8ou09ebWXZQfC37PliOSMJyDG70PuXc
Rh/TfnUPkPbmyRrvQi+MAsIjCEYGk2iiMQvSVs099AB6oAQetyPm2AcT4HeGNaLM
m1gurXTCelV0yT7oL7IhI6AqRQKBgQDQkoenTQ1nnvA4ghN253c+mbJWvTX+lbo9
WicOAxmA9gp/VN7NErXbgr5FcMwPtT+yLDqDgSjLp2T9ClYt/laWcO/KYwrnP9o5
DTeSB+biEAd3GHJLWJApY/dmFZey5uza+hXvlTdVCUgvFJYGgHw/Dg5E+jvUwrNT
MNN/OnpQNQKBgAtxxz3vuIlp3pqtTd+gyAvhIzo1rd0fGJkyX+yXQqhurco9MdpC
Ot2hLLBdD3er6vQvLSMCJaHT/jdIt4U+1nD+yWI4dYurSIgX0lSrP7sZwxTEKLXg
aDlzcCFak7cMpoO+RXBvEwwPbYyD439d1VL29HeD423jWfaPUa4Bk3S9AoGAWGdj
PBQ6tEr3wtvPaDyfnFcE8iLsueW4tLx7hULnEnQ26tWMQhvGHS6De2dd9uJ6Bwkc
HBUot3lSIra45HHDPazM1lm4i1/THQ9vGGRlBjiJEX+5Ihp9sC2A9TH9xISArCgI
GC6E73QptlrhZAwdnZRVlAMETR/hZkdxvaGJqmkCgYEAzHpqhLMFwOOvDr5Ya2DW
5IGSCohsNBRvPKLSXlMIT1yMfRStsp5qQrZq2Oj2xXX7Jk3jf+1lU3ZQ5O6bI6br
9MhrVKu6qI8YS3OtSDPAUOzPw1zu4yaKyCO0eNghY51PTZd3A3JA8Uh9Si7OCryD
iHnkhUQ1iasZLdnubyVUuh0=
-----END PRIVATE KEY-----
+3 -3
View File
@@ -23,12 +23,12 @@ function loadRooms() {
function connectRoom() {
const room = roomSelect.value || 'general';
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
const host = window.location.host;
if (ws) {
ws.close();
}
ws = new WebSocket(`${protocol}//localhost:8080/ws/${room}`);
const wsUrl = `${protocol}//${host}/ws/${room}`;
ws = new WebSocket(wsUrl);