From dbd7b7932f7b9540406ea8b04d9d6a711e4c9dd7 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Tue, 14 May 2024 17:23:56 +0800
Subject: [PATCH] cont

---
 packages/api/src/services/library_item.ts |  4 +--
 packages/api/src/utils/uploads.ts         | 39 +----------------------
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts
index 1b3420c22..1b503f5af 100644
--- a/packages/api/src/services/library_item.ts
+++ b/packages/api/src/services/library_item.ts
@@ -24,7 +24,7 @@ import { Merge, PickTuple } from '../util'
 import { deepDelete, setRecentlySavedItemInRedis } from '../utils/helpers'
 import { logger } from '../utils/logger'
 import { parseSearchQuery } from '../utils/search'
-import { downloadFileFromBucket, uploadToBucket } from '../utils/uploads'
+import { downloadFromBucket, uploadToBucket } from '../utils/uploads'
 import { HighlightEvent } from './highlights'
 import { addLabelsToLibraryItem, LabelEvent } from './labels'
 
@@ -1703,5 +1703,5 @@ export const downloadOriginalContent = async (
   userId: string,
   libraryItemId: string
 ) => {
-  return downloadFileFromBucket(originalContentFilename(userId, libraryItemId))
+  return downloadFromBucket(originalContentFilename(userId, libraryItemId))
 }
diff --git a/packages/api/src/utils/uploads.ts b/packages/api/src/utils/uploads.ts
index ed4951600..043a21159 100644
--- a/packages/api/src/utils/uploads.ts
+++ b/packages/api/src/utils/uploads.ts
@@ -154,44 +154,7 @@ export const isFileExists = async (filePath: string): Promise<boolean> => {
   return exists
 }
 
-export const downloadFromUrl = async (
-  contentObjUrl: string,
-  timeout?: number
-) => {
-  // download the content as stream and max 10MB
-  const response = await axios.get<Buffer>(contentObjUrl, {
-    responseType: 'stream',
-    maxContentLength,
-    timeout,
-  })
-
-  return response.data
-}
-
-export const uploadToSignedUrl = async (
-  uploadSignedUrl: string,
-  data: Buffer,
-  contentType: string,
-  timeout?: number
-) => {
-  // upload the stream to the signed url
-  await axios.put(uploadSignedUrl, data, {
-    headers: {
-      'Content-Type': contentType,
-    },
-    maxBodyLength: maxContentLength,
-    timeout,
-  })
-}
-
-export const isFileExists = async (filePath: string): Promise<boolean> => {
-  const [exists] = await storage.bucket(bucketName).file(filePath).exists()
-  return exists
-}
-
-export const downloadFileFromBucket = async (
-  filePath: string
-): Promise<Buffer> => {
+export const downloadFromBucket = async (filePath: string): Promise<Buffer> => {
   const file = storage.bucket(bucketName).file(filePath)
 
   const [exists] = await file.exists()