Merge pull request #535 from qrtc/features/rtc_add_test

longbai · web-flow · commit e54008c9a82c · 2021-12-08T16:46:43.000+08:00
增加房间创建和删除逻辑
diff --git a/src/main/java/com/qiniu/rtc/QRTC.java b/src/main/java/com/qiniu/rtc/QRTC.java
@@ -1,5 +1,15 @@
 package com.qiniu.rtc;
 
+import com.qiniu.common.QiniuException;
+import com.qiniu.http.Response;
+import com.qiniu.rtc.model.AppParam;
+import com.qiniu.rtc.model.AppResult;
+import com.qiniu.rtc.model.QRTCResult;
+import com.qiniu.rtc.service.AppService;
+import com.qiniu.util.Auth;
+import com.qiniu.util.Json;
+import com.qiniu.util.StringUtils;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -39,6 +49,55 @@ public static QRTCClient init(String accessKey, String secretKey, String appId)
         return holder.get(appId);
     }
 
+
+    /**
+     * 创建app
+     *
+     * @param appParam APP创建参数
+     * @return
+     * @throws QiniuException
+     */
+    public static QRTCResult<AppResult> createApp(AppParam appParam, String accessKey, String secretKey) throws QiniuException {
+        Response response = null;
+        try {
+            response = fetchCreateApp(appParam, accessKey, secretKey);
+            return formatCreateAppResult(response);
+        } finally {
+            // 释放资源
+            if (response != null) response.close();
+        }
+    }
+
+    /**
+     * 结果格式化
+     *
+     * @param response
+     * @return
+     * @throws QiniuException
+     */
+    private static QRTCResult<AppResult> formatCreateAppResult(Response response) throws QiniuException {
+        if (null == response || StringUtils.isNullOrEmpty(response.bodyString())) {
+            return QRTCResult.fail(-1, "result is null");
+        }
+        AppResult t = Json.decode(response.bodyString(), AppResult.class);
+        return QRTCResult.success(response.statusCode, t);
+    }
+
+    /**
+     * 创建请求处理
+     *
+     * @param appParam
+     * @param accessKey
+     * @param secretKey
+     * @return
+     * @throws QiniuException
+     */
+    private static Response fetchCreateApp(AppParam appParam, String accessKey, String secretKey) throws QiniuException {
+        AppService appService = new AppService(Auth.create(accessKey, secretKey));
+        return appService.createApp(appParam);
+    }
+
+
     /**
      * 根据appId 获取当前的client
      *
diff --git a/src/main/java/com/qiniu/rtc/QRTCClient.java b/src/main/java/com/qiniu/rtc/QRTCClient.java
@@ -55,22 +55,6 @@ private void initService(Auth auth) {
 
     /////////////////////////app service//////////////////////////////////////
 
-    /**
-     * 创建app
-     *
-     * @param appParam
-     * @return
-     * @throws QiniuException
-     */
-    public QRTCResult<AppResult> createApp(final AppParam appParam) throws QiniuException {
-        ServiceCallFunc func = new ServiceCallFunc() {
-            @Override
-            public Response call() throws QiniuException {
-                return appService.createApp(appParam);
-            }
-        };
-        return buildResult(func, AppResult.class);
-    }
 
     /**
      * 获取当前绑定的client的app信息
@@ -123,6 +107,40 @@ public Response call() throws QiniuException {
 
     /////////////////////////room service//////////////////////////////////////
 
+    /**
+     * 创建房间
+     *
+     * @param roomParam
+     * @return
+     * @throws QiniuException
+     */
+    public QRTCResult<RoomResult> createRoom(final RoomParam roomParam) throws QiniuException {
+        ServiceCallFunc func = new ServiceCallFunc() {
+            @Override
+            public Response call() throws QiniuException {
+                return roomService.createRoom(appId, roomParam);
+            }
+        };
+        return buildResult(func, RoomResult.class);
+    }
+
+    /**
+     * 删除房间
+     *
+     * @param roomName
+     * @return
+     * @throws QiniuException
+     */
+    public QRTCResult<RoomResult> deleteRoom(final String roomName) throws QiniuException {
+        ServiceCallFunc func = new ServiceCallFunc() {
+            @Override
+            public Response call() throws QiniuException {
+                return roomService.deleteRoom(appId, roomName);
+            }
+        };
+        return buildResult(func, RoomResult.class);
+    }
+
     /**
      * 获取房间内的所有用户
      *
@@ -287,7 +305,7 @@ public QRTCResult<MergeResult> updateMergeTrack(final MergeTrackParam mergeTrack
         ServiceCallFunc updateMergeTrackFunc = new ServiceCallFunc() {
             @Override
             public Response call() throws QiniuException {
-                UrlParam mergeTrackUrlParam  = UrlParam.builder().appId(appId).roomName(roomName).jobId(jobId).build();
+                UrlParam mergeTrackUrlParam = UrlParam.builder().appId(appId).roomName(roomName).jobId(jobId).build();
                 return mergeService.updateMergeTrack(mergeTrackParam, mergeTrackUrlParam);
             }
         };
@@ -308,7 +326,7 @@ public QRTCResult<MergeResult> updateMergeWatermarks(final WatermarksParam water
         ServiceCallFunc updateMergeWatermarksFunc = new ServiceCallFunc() {
             @Override
             public Response call() throws QiniuException {
-                UrlParam mergeWatermarksUrlParam  = UrlParam.builder().appId(appId).roomName(roomName).jobId(jobId).build();
+                UrlParam mergeWatermarksUrlParam = UrlParam.builder().appId(appId).roomName(roomName).jobId(jobId).build();
                 return mergeService.updateMergeWatermarks(watermarksParam, mergeWatermarksUrlParam);
             }
         };
diff --git a/src/main/java/com/qiniu/rtc/RtcAppManager.java b/src/main/java/com/qiniu/rtc/RtcAppManager.java
@@ -121,4 +121,4 @@ public Response updateApp(String appId, String hub, String title, int maxUsers,
         return client.post(url, body, headers, Client.JsonMime);
     }
 
-}
+}
diff --git a/src/main/java/com/qiniu/rtc/RtcRoomManager.java b/src/main/java/com/qiniu/rtc/RtcRoomManager.java
@@ -99,4 +99,4 @@ public String getRoomToken(String appId, String roomName, String userId,
         return auth.signRoomToken(json);
     }
 
-}
+}
diff --git a/src/main/java/com/qiniu/rtc/model/AppResult.java b/src/main/java/com/qiniu/rtc/model/AppResult.java
@@ -11,7 +11,7 @@ public class AppResult {
     private int maxUsers;
     private boolean noAutoKickUser;
     private String createdAt;
-    private String UpdatedAt;
+    private String updatedAt;
     private String error;
     private String status;
 
diff --git a/src/main/java/com/qiniu/rtc/model/ForwardParam.java b/src/main/java/com/qiniu/rtc/model/ForwardParam.java
@@ -3,7 +3,6 @@
 import lombok.Data;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 转推的参数
@@ -13,14 +12,26 @@ public class ForwardParam {
     private String id;
     private String publishUrl;
     private String playerId;
-    private List<Map<String, String>> tracks;
+    private List<TrackInfo> tracks;
 
     public ForwardParam(String id, String publishUrl, String playerId) {
         this.id = id;
         this.publishUrl = publishUrl;
         this.playerId = playerId;
     }
 
+    @Data
+    public static class TrackInfo {
+        private String trackId;
+
+        public TrackInfo(String trackId) {
+            this.trackId = trackId;
+        }
+
+        public TrackInfo() {
+        }
+    }
+
     public ForwardParam() {
     }
 }
diff --git a/src/main/java/com/qiniu/rtc/model/ForwardResult.java b/src/main/java/com/qiniu/rtc/model/ForwardResult.java
@@ -4,6 +4,12 @@
 
 @Data
 public class ForwardResult {
+    /**
+     * 单路转推状态
+     */
     private String status;
-    private String id;//forward id
+    /**
+     * 单路转推ID
+     */
+    private String id;
 }
diff --git a/src/main/java/com/qiniu/rtc/model/MergeTrackParam.java b/src/main/java/com/qiniu/rtc/model/MergeTrackParam.java
@@ -21,4 +21,4 @@ public static class MergeTrack {
         private String stretchMode;
         private boolean supportSei = false;
     }
-}
+}
diff --git a/src/main/java/com/qiniu/rtc/model/RoomParam.java b/src/main/java/com/qiniu/rtc/model/RoomParam.java
@@ -0,0 +1,13 @@
+// codebeat:disable[TOO_MANY_IVARS]
+package com.qiniu.rtc.model;
+
+import lombok.Data;
+
+@Data
+public class RoomParam {
+    private String roomName;
+    private int maxUsers;
+    private int autoCloseTtlS;
+    private int noEntreTtlS;
+    private boolean openRoom;
+}
diff --git a/src/main/java/com/qiniu/rtc/model/RoomResult.java b/src/main/java/com/qiniu/rtc/model/RoomResult.java
@@ -14,6 +14,7 @@ public class RoomResult {
     private List<String> rooms;
     private boolean end;
     private int offset;
+    private String roomId;
 
     @Data
     public static class UserInfo {
diff --git a/src/main/java/com/qiniu/rtc/service/CallbackService.java b/src/main/java/com/qiniu/rtc/service/CallbackService.java
@@ -30,8 +30,9 @@ public CallbackService(Auth auth) {
      * @throws QiniuException
      */
     public Response setHttpCallback(String appId, CallbackParam param) throws QiniuException {
-        if (null == param || StringUtils.isNullOrEmpty(param.getEventCbUrl()) ||
-                StringUtils.isNullOrEmpty(param.getEventCbSecret())) {
+        if (null == param
+                || StringUtils.isNullOrEmpty(param.getEventCbUrl())
+                || StringUtils.isNullOrEmpty(param.getEventCbSecret())) {
             throw new IllegalArgumentException("CallbackParam cannot be null...");
         }
         param.setEventCbVersion("1");
diff --git a/src/main/java/com/qiniu/rtc/service/MergeService.java b/src/main/java/com/qiniu/rtc/service/MergeService.java
@@ -69,7 +69,7 @@ public Response updateMergeWatermarks(WatermarksParam watermarksParam, UrlParam
      * @throws QiniuException
      */
     public Response stopMergeJob(String appId, String roomName, String jobId) throws QiniuException {
-        String urlPattern = "/v3/apps/<appID>/rooms/<roomName>/merge_job/<jobID>";
+        String urlPattern = "/v3/apps/%s/rooms/%s/merge_job/%s";
         return deleteCall(null, urlPattern, appId, roomName, jobId);
     }
 
diff --git a/src/main/java/com/qiniu/rtc/service/RoomService.java b/src/main/java/com/qiniu/rtc/service/RoomService.java
@@ -3,6 +3,7 @@
 
 import com.qiniu.common.QiniuException;
 import com.qiniu.http.Response;
+import com.qiniu.rtc.model.RoomParam;
 import com.qiniu.rtc.model.UrlParam;
 import com.qiniu.rtc.model.RoomAccess;
 import com.qiniu.util.Auth;
@@ -22,6 +23,32 @@ public RoomService(Auth auth) {
     }
 
 
+    /**
+     * 创建房间
+     *
+     * @param appId
+     * @param roomParam
+     * @return
+     * @throws QiniuException
+     */
+    public Response createRoom(String appId, RoomParam roomParam) throws QiniuException {
+        String urlPattern = "/v3/apps/%s/createroom";
+        return postCall(roomParam, urlPattern, appId);
+    }
+
+    /**
+     * 删除房间
+     *
+     * @param appId
+     * @param roomName
+     * @return
+     * @throws QiniuException
+     */
+    public Response deleteRoom(String appId, String roomName) throws QiniuException {
+        String urlPattern = "/v3/apps/%s/rooms/%s";
+        return deleteCall(null, urlPattern, appId, roomName);
+    }
+
     /**
      * @param appId    房间所属帐号的 app
      * @param roomName 操作所查询的连麦房间
@@ -54,7 +81,7 @@ public Response kickUser(String appId, String roomName, String userId) throws Qi
      * 获取当前所有活跃的房间
      *
      * @param roomNamePrefix
-     * @param urlParam 分页参数
+     * @param urlParam       分页参数
      * @return
      * @throws QiniuException
      */
diff --git a/src/test/java/test/com/qiniu/rtc/RtcTest.java b/src/test/java/test/com/qiniu/rtc/RtcTest.java

Original file line number	Diff line number	Diff line change
`@@ -121,4 +121,4 @@ public Response updateApp(String appId, String hub, String title, int maxUsers,`
`121`	`121`	`return client.post(url, body, headers, Client.JsonMime);`
`122`	`122`	`}`
`123`	`123`
`124`		`-}`
	`124`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,4 @@ public String getRoomToken(String appId, String roomName, String userId,`
`99`	`99`	`return auth.signRoomToken(json);`
`100`	`100`	`}`
`101`	`101`
`102`		`-}`
	`102`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@ public static class MergeTrack {`
`21`	`21`	`private String stretchMode;`
`22`	`22`	`private boolean supportSei = false;`
`23`	`23`	`}`
`24`		`-}`
	`24`	`+}`