controller/files.go

@@ -12,8 +12,6 @@ import (
 	"io"
 )
 
-var errStreamDone = errors.New("done")
-
 type FilesController struct {
 	Controller
 }
@@ -76,8 +74,12 @@ func (f *FilesController) GetDownloadBy(cidString string) {
 		return
 	}
 
-	err = passThroughStream(download, ctx)
+	err = ctx.StreamWriter(func(w io.Writer) error {
-	if err != errStreamDone && internalError(ctx, err) {
+		_, err = io.Copy(w, download)
+		_ = download.(io.Closer).Close()
+		return err
+	})
+	if internalError(ctx, err) {
 		logger.Get().Debug("failed streaming file", zap.Error(err))
 	}
 }
@@ -91,13 +93,17 @@ func (f *FilesController) GetProofBy(cidString string) {
 		return
 	}
 
-	proof, err := files.DownloadProof(hashHex)
+	download, err := files.DownloadProof(hashHex)
 	if internalError(ctx, err) {
 		logger.Get().Debug("failed fetching file proof", zap.Error(err))
 		return
 	}
 
-	err = passThroughStream(proof, ctx)
+	err = ctx.StreamWriter(func(w io.Writer) error {
+		_, err = io.Copy(w, download)
+		_ = download.(io.Closer).Close()
+		return err
+	})
 	if internalError(ctx, err) {
 		logger.Get().Debug("failed streaming file proof", zap.Error(err))
 	}
@@ -177,36 +183,3 @@ func validateCid(cidString string, validateStatus bool, ctx iris.Context) (strin
 
 	return hashHex, true
 }
-
-func passThroughStream(stream io.Reader, ctx iris.Context) error {
-	closed := false
-
-	err := ctx.StreamWriter(func(w io.Writer) error {
-		if closed {
-			return errStreamDone
-		}
-
-		count, err := io.CopyN(w, stream, 1024)
-		if count == 0 || err == io.EOF {
-			err = stream.(io.Closer).Close()
-			if err != nil {
-				logger.Get().Error("failed closing stream", zap.Error(err))
-				return err
-			}
-			closed = true
-			return nil
-		}
-
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-
-	if err == errStreamDone {
-		err = nil
-	}
-
-	return err
-}

service/files/files.go

@@ -164,7 +164,7 @@ func Download(hash string) (io.Reader, error) {
 	tusItem := db.Get().Table("tus").Where(&model.Tus{Hash: hash}).Row()
 
 	if uploadItem.Err() == nil {
-		fetch, err := client.R().SetDoNotParseResponse(true).Get(getWorkerObjectUrl(hash))
+		fetch, err := client.R().SetDoNotParseResponse(true).Get(getWorkerProofUrl(hash))
 		if err != nil {
 			logger.Get().Error(ErrFailedFetchObject.Error(), zap.Error(err))
 			return nil, ErrFailedFetchObject