Feat/deploy

.github/workflows/pr-test.yml

@@ -12,6 +12,7 @@ on:
     branches: [ "main" ]
   workflow_dispatch:
 
+
 jobs:
   build:
 
@@ -79,4 +80,60 @@ jobs:
       - name: Generate and submit dependency graph
         uses: gradle/actions/dependency-submission@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
 
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      write-all
+    #contents: read
 
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+      # Configure Gradle for optimal use in GiHub Actions, including caching of downloaded dependencies.
+      # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+
+    - name: Build with Gradle Wrapper
+      run: ./gradlew build
+      # dockerfile을 통해 이미지를 빌드하고, 이를 docker repo로 push 합니다.
+      # 이 때 사용되는 ${{ secrets.DOCKER_REPO }} 가 위에서 만든 도커 repository 입니다.
+    - name: Docker build & push to docker repo
+      run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -f Dockerfile -t ${{ secrets.DOCKER_REPO }} .
+          docker push ${{ secrets.DOCKER_REPO }}
+
+    # appleboy/ssh-action@master 액션을 사용하여 지정한 서버에 ssh로 접속하고, script를 실행합니다.
+    # script의 내용은 도커의 기존 프로세스들을 제거하고, docker repo로부터 방금 위에서 push한 내용을 pull 받아 실행하는 것입니다.
+    # 실행 시, docker-compose를 사용합니다.
+    - name: Deploy to server
+      uses: appleboy/ssh-action@master
+      env:
+        COMPOSE: ${{ secrets.DOCKER_PATH }}
+      id: deploy
+      with:
+        host: ${{ secrets.HOST }}
+        username: ubuntu
+        port: 22
+        key: ${{ secrets.KEY }}
+        envs: GITHUB_SHA
+        script: |
+          sudo docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          echo ${{secrets.PROJECT_PATH}}
+          cd ${{secrets.PROJECT_PATH}}
+          sudo docker-compose stop
+
+          sudo docker rm $(docker ps -a -q)
+          sudo docker rmi ${{ secrets.DOCKER_USERNAME }}/sample-repository
+          sudo docker pull ${{ secrets.DOCKER_USERNAME }}/sample-repository
+
+          sudo docker-compose up --build -d

.gitignore

@@ -1,4 +1,4 @@
-*.yml
+application.yml
 HELP.md
 .gradle
 build/

Dockerfile

@@ -0,0 +1,17 @@
+#FROM openjdk:17-jdk
+#LABEL maintainer="email"
+#ARG JAR_FILE=build/libs/docker-0.0.1-SNAPSHOT.jar
+#ADD ${JAR_FILE} docker-springboot.jar
+#ENTRYPOINT ["java","-jar","/docker-springboot.jar"]
+
+FROM openjdk:17-jdk
+
+# build가 되는 시점에 JAR_FILE이라는 변수 명에 build/libs/*.jar 선언
+# build/libs - gradle로 빌드했을 때 jar 파일이 생성되는 경로
+ARG JAR_FILE=build/libs/*.jar
+
+# JAR_FILE을 app.jar로 복사
+COPY ${JAR_FILE} app.jar
+
+# 운영 및 개발에서 사용되는 환경 설정을 분리
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "/app.jar"]

build.gradle

@@ -37,3 +37,7 @@ dependencies {
 tasks.named('test') {
 	useJUnitPlatform()
 }
+jar {
+	enabled = false
+}
+

docker-compose.yml

@@ -0,0 +1,16 @@
+version: '3'
+services:
+  redis:
+    image: redis
+    ports:
+      - 6379:6379
+  springbootapp:
+    image: ji0513ji/sample-repository:v1.0.0
+#    build:
+#      context: .
+#      dockerfile: Dockerfile
+    ports:
+      - 8080:8080
+    depends_on:
+      - redis
+

src/main/java/kutaverse/game/DemoApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class DemoApplication {
 
 	public static void main(String[] args) {

src/main/java/kutaverse/game/map/controller/WebSocketController.java

@@ -0,0 +1,14 @@
+package kutaverse.game.map.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.reactive.result.view.Rendering;
+import reactor.core.publisher.Mono;
+
+@Controller
+public class WebSocketController {
+    @GetMapping("/")
+    public Mono<Rendering> home() {
+        return Mono.just(Rendering.view("index").build());
+    }
+}

src/main/java/kutaverse/game/map/domain/Status.java

@@ -0,0 +1,5 @@
+package kutaverse.game.map.domain;
+
+public enum Status {
+    JUMP,STAND
+}

src/main/java/kutaverse/game/map/domain/User.java

@@ -1,30 +1,45 @@
 package kutaverse.game.map.domain;
 
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.redis.core.RedisHash;
 
 @Getter
 @RedisHash(value = "user", timeToLive = 30) //초단위
 @NoArgsConstructor
+@ToString
 public class User {
 
     @Id
     private String key;
 
-    private String name;
-
     private Integer positionX;
 
     private Integer positionY;
 
+    private Integer positionZ;
+
+    private Integer eulerAngleX;
+
+    private Integer eulerAngleY;
 
-    public User(String key, String name) {
-        this.key=key;
-        this.name = name;
-        positionX=0;
-        positionY=0;
+    private Integer eulerAngleZ;
 
+    private Status status;
+
+    @Builder
+    public User(String key, Integer positionX, Integer positionY, Integer positionZ, Integer eulerAngleX, Integer eulerAngleY, Integer eulerAngleZ, Status status) {
+        this.key = key;
+        this.positionX = positionX;
+        this.positionY = positionY;
+        this.positionZ = positionZ;
+        this.eulerAngleX = eulerAngleX;
+        this.eulerAngleY = eulerAngleY;
+        this.eulerAngleZ = eulerAngleZ;
+        this.status = status;
     }
+
 }

src/main/java/kutaverse/game/map/dto/UserRequestDto.java

@@ -0,0 +1,35 @@
+package kutaverse.game.map.dto;
+
+import kutaverse.game.map.domain.Status;
+import kutaverse.game.map.domain.User;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Setter
+@Getter
+@ToString
+public class UserRequestDto {
+
+    private String userId;
+    private String positionX;
+    private String positionY;
+    private String positionZ;
+    private String eulerAngleX;
+    private String eulerAngleY;
+    private String eulerAngleZ;
+    private String status;
+
+    public User toEntity(){
+        return User.builder()
+                .key(userId)
+                .positionX(Integer.valueOf(positionX))
+                .positionY(Integer.valueOf(positionY))
+                .positionZ(Integer.valueOf(positionZ))
+                .eulerAngleX(Integer.valueOf(eulerAngleX))
+                .eulerAngleY(Integer.valueOf(eulerAngleY))
+                .eulerAngleZ(Integer.valueOf(eulerAngleZ))
+                .status(Status.valueOf(status))
+                .build();
+    }
+}

src/main/java/kutaverse/game/map/service/RedisUserService.java

@@ -1,6 +1,7 @@
 package kutaverse.game.map.service;
 
 import kutaverse.game.map.domain.User;
+import kutaverse.game.map.dto.UserRequestDto;
 import kutaverse.game.map.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -32,4 +33,10 @@ public Mono<User> findOne(String id) {
     public Mono<Long> deleteById(String key) {
         return userRepository.delete(key);
     }
+
+    @Override
+    public Mono<User> update(UserRequestDto userRequestDto) {
+        return create(userRequestDto.toEntity());
+    }
+
 }

src/main/java/kutaverse/game/map/service/UserService.java

@@ -1,6 +1,7 @@
 package kutaverse.game.map.service;
 
 import kutaverse.game.map.domain.User;
+import kutaverse.game.map.dto.UserRequestDto;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -13,4 +14,6 @@ public interface UserService {
     Mono<User> findOne(String key);
 
     Mono<Long> deleteById(String key);
+
+    Mono<User> update(UserRequestDto userRequestDto);
 }

src/main/java/kutaverse/game/map/websocket/CustomWebSocketHandler.java

@@ -0,0 +1,40 @@
+package kutaverse.game.map.websocket;
+
+import kutaverse.game.map.websocket.handler.WebSocketHandler;
+import kutaverse.game.map.websocket.handler.WebSocketHandlerMapping;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.socket.WebSocketSession;
+import reactor.core.publisher.Mono;
+import reactor.core.publisher.Sinks;
+
+
+@Component
+@Slf4j
+public class CustomWebSocketHandler implements org.springframework.web.reactive.socket.WebSocketHandler {
+
+	private final Sinks.Many<String> sink;
+
+	public CustomWebSocketHandler(Sinks.Many<String> sink) {
+		this.sink = sink;
+	}
+	public Mono<Void> sendMessageToAllClients(String message) {
+		sink.emitNext(message, Sinks.EmitFailureHandler.FAIL_FAST);
+		return null;
+	}
+
+	@Override
+	public Mono<Void> handle(WebSocketSession session) {
+		var output = session.receive()
+				// 메시지를 JSON 객체로 변환
+				.map(e -> e.getPayloadAsText())
+				.map(e -> {
+					WebSocketHandler webSocketHandler= WebSocketHandlerMapping.getHandler(e);
+					return webSocketHandler.handle(e);
+				});
+
+		output.subscribe(s -> sink.emitNext(s, Sinks.EmitFailureHandler.FAIL_FAST));
+
+		return session.send(sink.asFlux().map(session::textMessage));
+	}
+}

src/main/java/kutaverse/game/map/websocket/MessageSender.java

@@ -0,0 +1,54 @@
+package kutaverse.game.map.websocket;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import kutaverse.game.map.domain.User;
+import kutaverse.game.map.service.UserService;
+import lombok.RequiredArgsConstructor;
+import org.reactivestreams.Publisher;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Component
+@RequiredArgsConstructor
+public class MessageSender {
+
+    private final CustomWebSocketHandler webSocketHandler;
+
+    private final UserService userService;
+
+    ObjectMapper objectMapper=new ObjectMapper();
+
+    @Scheduled(fixedRate = 1000) // 5초마다 실행
+    public void sendMessageToClients() {
+        Mono<String> result=Mono.just("");
+
+        userService.findAll()
+                .collectList()
+                .flatMap(u -> {
+                    String combinedUsers = u.stream()
+                            .map(Object::toString)
+                            .collect(Collectors.joining(" "));
+                    // 기존의 result Mono에 새로운 값을 추가하여 반환
+                    return result.map(existingValue -> existingValue + " " + combinedUsers);
+
+                }).subscribe(this::sendUsersAsJsonToClients);
+
+    }
+
+    private Mono<Void> sendUsersAsJsonToClients(String user) {
+        try {
+            String json = objectMapper.writeValueAsString(user);
+            return webSocketHandler.sendMessageToAllClients(json);
+
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}