From 00acc49342ba037ca3e301ea1fa8b1890d3ec0db Mon Sep 17 00:00:00 2001 From: liuyi Date: Wed, 17 Jan 2024 10:22:35 +0000 Subject: [PATCH] chore(server): remove octobase storage usage (#5594) since all blobs have been successfully migrated to r2, the octobase blob functions are no longer necessary. --- .../src/modules/storage/wrappers/blob.ts | 48 ++----------------- 1 file changed, 4 insertions(+), 44 deletions(-) diff --git a/packages/backend/server/src/modules/storage/wrappers/blob.ts b/packages/backend/server/src/modules/storage/wrappers/blob.ts index 80b2b9bc70..30a44ef69f 100644 --- a/packages/backend/server/src/modules/storage/wrappers/blob.ts +++ b/packages/backend/server/src/modules/storage/wrappers/blob.ts @@ -1,7 +1,4 @@ -import { Readable } from 'node:stream'; - -import type { Storage } from '@affine/storage'; -import { Injectable, OnModuleInit } from '@nestjs/common'; +import { Injectable } from '@nestjs/common'; import type { BlobInputType, @@ -12,20 +9,13 @@ import { Config, createStorageProvider, EventEmitter, - OctoBaseStorageModule, OnEvent, - toBuffer, } from '../../../fundamentals'; @Injectable() -export class WorkspaceBlobStorage implements OnModuleInit { +export class WorkspaceBlobStorage { public readonly provider: StorageProvider; - /** - * @deprecated for backwards compatibility, need to be removed in next stable release - */ - private octobase: Storage | null = null; - constructor( private readonly event: EventEmitter, private readonly config: Config @@ -33,42 +23,12 @@ export class WorkspaceBlobStorage implements OnModuleInit { this.provider = createStorageProvider(this.config.storage, 'blob'); } - async onModuleInit() { - if (!this.config.node.test) { - this.octobase = await OctoBaseStorageModule.Storage.connect( - this.config.db.url - ); - } - } - async put(workspaceId: string, key: string, blob: BlobInputType) { - const buf = await toBuffer(blob); - await this.provider.put(`${workspaceId}/${key}`, buf); - if (this.octobase) { - await this.octobase.uploadBlob(workspaceId, buf); - } + await this.provider.put(`${workspaceId}/${key}`, blob); } async get(workspaceId: string, key: string) { - const result = await this.provider.get(`${workspaceId}/${key}`); - if (!result.body && this.octobase) { - const blob = await this.octobase.getBlob(workspaceId, key); - - if (!blob) { - return result; - } - - return { - body: Readable.from(blob.data), - metadata: { - contentType: blob.contentType, - contentLength: blob.size, - lastModified: new Date(blob.lastModified), - }, - }; - } - - return result; + return this.provider.get(`${workspaceId}/${key}`); } async list(workspaceId: string) {