Merge pull request #468 from redpwn/refactor/upload-provider

refactor(server): proxy upload provider methods

Author: chen-robert

server/api/admin/upload/post.js

@@ -1,6 +1,6 @@
 import { responses } from '../../../responses'
 import perms from '../../../util/perms'
-import { get as getUploadProvider } from '../../../uploads'
+import { upload } from '../../../uploads'
 import toBuffer from 'data-uri-to-buffer'
 
 const itemSchema = {
@@ -35,7 +35,6 @@ export default {
   },
   bodyLimit: 2 ** 30, // 1 GiB
   handler: async ({ req }) => {
-    const uploadProvider = getUploadProvider()
     let convertedFiles
     try {
       convertedFiles = req.body.files.map(({ name, data }) => {
@@ -51,7 +50,7 @@ export default {
     try {
       const files = await Promise.all(
         convertedFiles.map(async ({ name, data }) => {
-          const url = await uploadProvider.upload(data, name)
+          const url = await upload(data, name)
 
           return {
             name,

server/api/admin/upload/query.js

@@ -1,6 +1,6 @@
 import { responses } from '../../../responses'
 import perms from '../../../util/perms'
-import { get as getUploadProvider } from '../../../uploads'
+import { getUrl } from '../../../uploads'
 
 export default {
   method: 'POST',
@@ -31,11 +31,9 @@ export default {
     }
   },
   handler: async ({ req }) => {
-    const uploadProvider = getUploadProvider()
-
     const data = await Promise.all(
       req.body.uploads.map(async ({ sha256, name }) => {
-        const url = await uploadProvider.getUrl(sha256, name)
+        const url = await getUrl(sha256, name)
 
         return {
           sha256,

server/providers/uploads/dummy/index.ts

@@ -1,4 +1,4 @@
-import { Provider } from '../../../uploads/types'
+import { Provider } from '../../../uploads/provider'
 
 export default class DummyProvider implements Provider {
   upload = async (): Promise<string> => ''

server/providers/uploads/gcs/index.ts

@@ -1,6 +1,6 @@
 import { Storage, Bucket, File } from '@google-cloud/storage'
 import crypto from 'crypto'
-import { Provider } from '../../../uploads/types'
+import { Provider } from '../../../uploads/provider'
 
 interface GcsProviderOptions {
   credentials: Record<string, unknown>;

server/providers/uploads/local/index.ts

@@ -1,4 +1,4 @@
-import { Provider } from '../../../uploads/types'
+import { Provider } from '../../../uploads/provider'
 import process from 'process'
 import path from 'path'
 import fs from 'fs'

server/uploads/index.ts

@@ -1,6 +1,6 @@
 import config from '../config/server'
 import path from 'path'
-import { Provider, ProviderConstructor } from './types'
+import { Provider, ProviderConstructor } from './provider'
 import { FastifyInstance } from 'fastify'
 
 let provider: Provider | null = null
@@ -15,10 +15,18 @@ export const init = (app: FastifyInstance | null): void => {
   provider = new ProviderClass(config.uploadProvider.options ?? {}, app)
 }
 
-export const get = (): Provider => {
+export const upload = (data: Buffer, name: string): Promise<string> => {
   if (provider === null) {
     throw new Error('upload provider called before initialization')
   }
 
-  return provider
+  return provider.upload(data, name)
+}
+
+export const getUrl = (sha256: string, name: string): Promise<string|null> => {
+  if (provider === null) {
+    throw new Error('upload provider called before initialization')
+  }
+
+  return provider.getUrl(sha256, name)
 }