Fixed: wait that recording file has size greater than zero

Author: Antonio Serricchio

openvidu-server/src/main/java/io/openvidu/server/OpenViduServer.java

@@ -64,7 +64,7 @@
 import io.openvidu.server.kurento.kms.FixedOneKmsManager;
 import io.openvidu.server.kurento.kms.KmsManager;
 import io.openvidu.server.kurento.kms.LoadManager;
-import io.openvidu.server.recording.DummyRecordingDownloader;
+import io.openvidu.server.recording.ExternalizedRecordingDownloader;
 import io.openvidu.server.recording.DummyRecordingUploader;
 import io.openvidu.server.recording.RecordingDownloader;
 import io.openvidu.server.recording.RecordingUploader;
@@ -94,6 +94,8 @@ public class OpenViduServer implements JsonRpcConfigurer {
 	@Autowired
 	OpenviduConfig config;
 
+	private CustomFileManager fileManager = new LocalCustomFileManager();
+
 	@Bean
 	@ConditionalOnMissingBean
 	@DependsOn("openviduConfig")
@@ -174,7 +176,7 @@ public TokenRegister tokenRegister() {
 	@ConditionalOnMissingBean
 	@DependsOn("openviduConfig")
 	public RecordingManager recordingManager() {
-		return new RecordingManager(DockerManagerFactory.create(config), new LocalCustomFileManager());
+		return new RecordingManager(DockerManagerFactory.create(config), fileManager);
 	}
 
 	@Bean
@@ -212,7 +214,7 @@ public RecordingUploader recordingUpload() {
 	@Bean
 	@ConditionalOnMissingBean
 	public RecordingDownloader recordingDownload() {
-		return new DummyRecordingDownloader();
+		return new ExternalizedRecordingDownloader(config, fileManager);
 	}
 
 	@Bean

openvidu-server/src/main/java/io/openvidu/server/recording/ExternalizedRecordingDownloader.java

@@ -0,0 +1,59 @@
+/*
+ * (C) Copyright 2017-2022 OpenVidu (https://openvidu.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.openvidu.server.recording;
+
+import io.openvidu.server.config.OpenviduConfig;
+import io.openvidu.server.utils.CustomFileManager;
+import io.openvidu.server.utils.RecordingUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Collection;
+
+public class ExternalizedRecordingDownloader implements RecordingDownloader {
+
+    private static final Logger log = LoggerFactory.getLogger(ExternalizedRecordingDownloader.class);
+
+    private OpenviduConfig openviduConfig;
+    private CustomFileManager fileManager;
+
+    public ExternalizedRecordingDownloader(OpenviduConfig openviduConfig, CustomFileManager fileManager) {
+        this.openviduConfig = openviduConfig;
+        this.fileManager = fileManager;
+    }
+
+    @Override
+    public void downloadRecording(Recording recording, Collection<RecorderEndpointWrapper> wrappers, Runnable callback) throws IOException {
+        final String VIDEO_FILE = this.openviduConfig.getOpenViduRecordingPath(recording.getRecordingProperties().mediaNode()) + recording.getId() + "/"
+                + recording.getName() + RecordingUtils.getExtensionFromRecording(recording);
+        try {
+            this.fileManager.waitForFileToExistAndNotEmpty(recording.getRecordingProperties().mediaNode(), VIDEO_FILE);
+            log.info("File {} exists and is not empty", VIDEO_FILE);
+            callback.run();
+        } catch (Exception e) {
+            log.error("Recorder container failed generating video file (is empty) for session {}",
+                    recording.getSessionId());
+            throw new IOException(e);
+        }
+    }
+
+    @Override
+    public void cancelDownload(String recordingId) {
+    }
+}

openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManagerUtils.java

@@ -1,13 +1,11 @@
 package io.openvidu.server.recording.service;
 
-import java.util.Set;
-
-import org.springframework.http.HttpStatus;
-
-import io.openvidu.java.client.Recording.OutputMode;
 import io.openvidu.server.config.OpenviduConfig;
 import io.openvidu.server.recording.Recording;
 import io.openvidu.server.utils.JsonUtils;
+import org.springframework.http.HttpStatus;
+
+import java.util.Set;
 
 public abstract class RecordingManagerUtils {
 
@@ -31,16 +29,6 @@ public RecordingManagerUtils(OpenviduConfig openviduConfig, RecordingManager rec
 
 	protected abstract Set<String> getAllRecordingIdsFromStorage(String sessionIdPrefix);
 
-	protected String getExtensionFromRecording(Recording recording) {
-		if (OutputMode.INDIVIDUAL.equals(recording.getOutputMode())) {
-			return "zip";
-		} else if (recording.hasVideo()) {
-			return "mp4";
-		} else {
-			return "webm";
-		}
-	}
-
 	public String getFreeRecordingId(String sessionId) {
 		Set<String> recordingIds = getAllRecordingIdsFromStorage(sessionId);
 		return getNextAvailableRecordingId(sessionId, recordingIds);

openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingManagerUtilsLocalStorage.java

@@ -4,6 +4,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import io.openvidu.server.utils.RecordingUtils;
 import org.springframework.http.HttpStatus;
 
 import io.openvidu.server.config.OpenviduConfig;
@@ -35,8 +36,8 @@ public HttpStatus deleteRecordingFromStorage(String recordingId) {
 	@Override
 	public String getRecordingUrl(Recording recording) {
 		String basePath = RequestMappings.RECORDINGS.replaceFirst("^/", "") + "/";
-		return openviduConfig.getFinalUrl() + basePath + recording.getId() + "/" + recording.getName() + "."
-				+ this.getExtensionFromRecording(recording);
+		return openviduConfig.getFinalUrl() + basePath + recording.getId() + "/" + recording.getName()
+				+ RecordingUtils.getExtensionFromRecording(recording);
 	}
 
 	@Override

openvidu-server/src/main/java/io/openvidu/server/utils/RecordingUtils.java

@@ -2,6 +2,10 @@
 
 import io.openvidu.java.client.RecordingProperties;
 import io.openvidu.server.core.Session;
+import io.openvidu.server.recording.Recording;
+
+import static io.openvidu.java.client.Recording.OutputMode.INDIVIDUAL;
+import static io.openvidu.server.recording.service.RecordingService.*;
 
 public final class RecordingUtils {
 
@@ -15,4 +19,14 @@ public final static RecordingProperties RECORDING_PROPERTIES_WITH_MEDIA_NODE(Ses
 		return recordingProperties;
 	}
 
+	public static String getExtensionFromRecording(Recording recording) {
+		if (INDIVIDUAL.equals(recording.getOutputMode())) {
+			return INDIVIDUAL_RECORDING_COMPRESSED_EXTENSION;
+		} else if (recording.hasVideo()) {
+			return COMPOSED_RECORDING_EXTENSION;
+		} else {
+			return COMPOSED_RECORDING_AUDIO_ONLY_EXTENSION;
+		}
+	}
+
 }