refactor(flat-services): support keep reference

netless-io · Aug 22, 2022 · e08b874 · e08b874
1 parent 052fb39
commit e08b874
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 25 deletions.
diff --git a/packages/flat-pages/src/FilePreviewPage/index.tsx b/packages/flat-pages/src/FilePreviewPage/index.tsx
@@ -43,7 +43,16 @@ export const FilePreviewPage: React.FC<FilePreviewPageProps> = props => {
     );
 
     useIsomorphicLayoutEffect(() => {
-        sp(FlatServices.getInstance().requestService(`file-preview:${fileExt}`)).then(setService);
+        let previewService: IServiceFilePreview | null = null;
+        sp(FlatServices.getInstance().requestService(`file-preview:${fileExt}`, false)).then(
+            service => {
+                previewService = service;
+                setService(service);
+            },
+        );
+        return () => {
+            previewService?.destroy?.();
+        };
     }, []);
 
     useIsomorphicLayoutEffect(() => {

diff --git a/packages/flat-services/src/flat-services.ts b/packages/flat-services/src/flat-services.ts
@@ -70,13 +70,16 @@ export class FlatServices {
 
     public async requestService<T extends FlatServiceID>(
         name: T,
+        keepReference = true,
     ): Promise<FlatServicesCatalog[T] | null> {
         let service = this.services.get(name) || null;
         if (!service) {
             const creator = this.registry.get(name);
             if (creator) {
                 service = creator();
-                this.services.set(name, service);
+                if (keepReference) {
+                    this.services.set(name, service);
+                }
             }
         }
         return service as Promise<FlatServicesCatalog[T] | null>;

diff --git a/packages/flat-services/src/providers/provider-file.ts b/packages/flat-services/src/providers/provider-file.ts
@@ -6,7 +6,7 @@ import {
 } from "@netless/flat-server-api";
 import type { FlatI18n } from "@netless/flat-i18n";
 import type { Toaster } from "../toaster";
-import { FlatServiceID, FlatServices, FlatServicesCatalog } from "../flat-services";
+import { FlatServiceID, FlatServices } from "../flat-services";
 import { getFileExt } from "../services/file/utils";
 import { IServiceFile, IServiceFileExtensions } from "../services/file";
 import { SideEffectManager } from "side-effect-manager";
@@ -41,20 +41,22 @@ export class FlatServiceProviderFile implements IServiceFile {
         const ext = getFileExt(file.fileName) as IServiceFileExtensions;
         const serviceName = `file-insert:${ext}` as const;
 
-        const insertService = await this.requestAutoService(serviceName);
+        const insertService = await this.flatServices.requestService(serviceName, false);
         if (!insertService) {
             throw new TypeError(`No service provider for inserting file '${file.fileName}'`);
         }
 
-        const convertStatus = await this.checkConvertStatus(file, ext);
+        try {
+            const convertStatus = await this.checkConvertStatus(file, ext);
 
-        if (convertStatus === FileConvertStep.Done || convertStatus === FileConvertStep.None) {
-            try {
+            if (convertStatus === FileConvertStep.Done || convertStatus === FileConvertStep.None) {
                 await insertService.insert(file);
-            } catch (e) {
-                this.toaster.emit("error", this.flatI18n.t("unable-to-insert-courseware"));
             }
+        } catch (e) {
+            this.toaster.emit("error", this.flatI18n.t("unable-to-insert-courseware"));
         }
+
+        await insertService.destroy?.();
     }
 
     public async preview(file: CloudFile): Promise<void> {
@@ -78,9 +80,10 @@ export class FlatServiceProviderFile implements IServiceFile {
         file: CloudFile,
         ext: IServiceFileExtensions,
     ): Promise<FileConvertStep> {
+        let convertStep = file.convertStep;
         if (file.convertStep !== FileConvertStep.Done) {
             const serviceName = `file-convert:${ext}` as const;
-            const convertService = await this.requestAutoService(serviceName);
+            const convertService = await this.flatServices.requestService(serviceName, false);
             if (convertService) {
                 try {
                     const result = await convertService.queryStatus(file);
@@ -112,25 +115,13 @@ export class FlatServiceProviderFile implements IServiceFile {
                             this.flatI18n.t("in-the-process-of-transcoding-tips"),
                         );
                     }
-                    return result.status;
+                    convertStep = result.status;
                 } catch (e) {
                     console.error(e);
-                    return file.convertStep;
                 }
+                convertService.destroy?.();
             }
         }
-        return file.convertStep;
-    }
-
-    private async requestAutoService<T extends FlatServiceID>(
-        serviceName: T,
-    ): Promise<FlatServicesCatalog[T] | null> {
-        const convertService = await this.flatServices.requestService(serviceName);
-        this.sideEffect.setTimeout(
-            () => this.flatServices.shutdownService(serviceName),
-            5000,
-            serviceName,
-        );
-        return convertService;
+        return convertStep;
     }
 }