feat: 增加文件事件回调等

winjo · winjo · commit ee7b6bfb98cd · 2021-08-17T20:56:28.000+08:00
diff --git a/packages/alex/src/api/renderApp.tsx b/packages/alex/src/api/renderApp.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef, useMemo } from 'react';
 import ReactDOM from 'react-dom';
 import { IReporterService, localize, getDebugLogger } from '@ali/ide-core-common';
-import { REPORT_NAME } from '@alipay/alex-core';
+import { REPORT_NAME, RuntimeConfig } from '@alipay/alex-core';
 import { createApp } from './createApp';
 import { Root } from '../core/Root';
 import { RootProps, LandingProps } from '../core/types';
@@ -46,9 +46,11 @@ export const renderApp = (domElement: HTMLElement, props: IAppRendererProps) =>
         domElement
       );
 
-      (app.injector.get(
-        IReporterService
-      ) as IReporterService).point(REPORT_NAME.ALEX_APP_START_ERROR, err?.message, { error: err });
+      (app.injector.get(IReporterService) as IReporterService).point(
+        REPORT_NAME.ALEX_APP_START_ERROR,
+        err?.message,
+        { error: err }
+      );
       getDebugLogger().error(err);
       setTimeout(() => {
         throw err;
@@ -65,6 +67,11 @@ export const AppRenderer: React.FC<IAppRendererProps> = ({ onLoad, Landing, ...o
   const themeType = useConstant(() => app.currentThemeType);
   const appElementRef = useRef<React.ReactElement | null>(null);
 
+  // 确保回调始终为最新
+  // TODO: 用 PropsService
+  const runtimeConfig: RuntimeConfig = app.injector.get(RuntimeConfig);
+  runtimeConfig.workspace = opts.runtimeConfig.workspace;
+
   const [state, setState] = useState<{
     status: RootProps['status'];
     error?: RootProps['error'];
diff --git a/packages/alex/src/core/extension/extension.contribution.ts b/packages/alex/src/core/extension/extension.contribution.ts
@@ -1,24 +1,44 @@
 import { Autowired } from '@ali/common-di';
-import { Domain, ClientAppContribution, IEventBus } from '@ali/ide-core-browser';
-import { ExtensionBeforeActivateEvent } from '@ali/ide-kaitian-extension/lib/browser/types';
+import { Domain, ClientAppContribution, IEventBus, Disposable } from '@ali/ide-core-browser';
+import {
+  ExtensionBeforeActivateEvent,
+  ExtensionWillActivateEvent,
+} from '@ali/ide-kaitian-extension/lib/browser/types';
 import { IPluginService } from '@alipay/alex-plugin';
+import { IMainLayoutService } from '@ali/ide-main-layout';
 
 @Domain(ClientAppContribution)
-export class ExtensionActivateContribution implements ClientAppContribution {
+export class ExtensionActivateContribution extends Disposable implements ClientAppContribution {
   @Autowired(IEventBus)
   private readonly eventBus: IEventBus;
 
   @Autowired(IPluginService)
   pluginService: IPluginService;
 
+  @Autowired(IMainLayoutService)
+  mainLayoutService: IMainLayoutService;
+
   initialize() {
-    this.eventBus.on(ExtensionBeforeActivateEvent, async () => {
-      try {
-        // 确保插件先激活
-        await this.pluginService.whenReady.promise;
-      } catch (e) {
-        console.error(e);
-      }
-    });
+    this.addDispose(
+      this.eventBus.on(ExtensionBeforeActivateEvent, async () => {
+        try {
+          // 确保插件先激活
+          await this.pluginService.whenReady.promise;
+        } catch (e) {
+          console.error(e);
+        }
+      })
+    );
+
+    // 如果有 browserMain，则等待 view ready，否则可能引起 bug
+    // 待 kaitian 修复 https://yuque.antfin-inc.com/ide-framework/topics/629
+    this.addDispose(
+      this.eventBus.on(ExtensionWillActivateEvent, (e) => {
+        if (e.payload.contributes.browserMain) {
+          return this.mainLayoutService.viewReady.promise;
+        }
+        return Promise.resolve();
+      })
+    );
   }
 }
diff --git a/packages/code-api/src/common/config.ts b/packages/code-api/src/common/config.ts
@@ -68,7 +68,7 @@ export const CODE_PLATFORM_CONFIG: Record<ICodePlatform, ICodePlatformConfig> =
   [CodePlatform.gitlab]: {
     platform: CodePlatform.gitlab,
     hostname: ['gitlab.alibaba-inc.com', 'code.aone.alibaba-inc.com'],
-    origin: 'https://code.alipay.com',
+    origin: 'https://gitlab.alibaba-inc.com',
     endpoint: 'https://gitlab.alibaba-inc.com',
     brand: 'GitLab',
     line: {
diff --git a/packages/core/src/client/custom/editor.ts b/packages/core/src/client/custom/editor.ts
@@ -1,12 +1,12 @@
 import { Autowired } from '@ali/common-di';
 import { ClientAppContribution } from '@ali/ide-core-browser';
-import { OnEvent, WithEventBus, BasicEvent, Domain } from '@ali/ide-core-common';
+import { OnEvent, WithEventBus, BasicEvent, Domain, URI } from '@ali/ide-core-common';
 import {
   EditorDocumentModelSavedEvent,
   EditorDocumentModelContentChangedEvent,
   IEditorDocumentModelService,
 } from '@ali/ide-editor/lib/browser';
-import { IFileServiceClient } from '@ali/ide-file-service/lib/common';
+import { IFileServiceClient, FileChangeType } from '@ali/ide-file-service/lib/common';
 import { AppConfig, RuntimeConfig } from '../../common/types';
 import * as path from 'path';
 
@@ -31,12 +31,78 @@ export class EditorActionEventContribution extends WithEventBus implements Clien
 
   onStart() {}
 
+  initialize() {
+    type EventType = { uri: string; filepath: string };
+
+    this.addDispose(
+      this.fileService.onFilesChanged((changes) => {
+        const created: EventType[] = [];
+        const changed: EventType[] = [];
+        const deleted: EventType[] = [];
+
+        for (const change of changes) {
+          const relativePath = this.getWorkspaceRelativePath(new URI(change.uri));
+          if (relativePath === null) {
+            continue;
+          }
+          const obj: EventType = { uri: change.uri, filepath: relativePath };
+          switch (change.type) {
+            case FileChangeType.ADDED:
+              created.push(obj);
+              break;
+            case FileChangeType.UPDATED:
+              changed.push(obj);
+              break;
+            case FileChangeType.DELETED:
+              deleted.push(obj);
+              break;
+            default:
+              break;
+          }
+        }
+
+        const { workspace } = this.runtimeConfig;
+        if (created.length && workspace?.onDidCreateFiles) {
+          workspace.onDidCreateFiles(created.map((data) => data.filepath));
+        }
+        if (deleted.length && workspace?.onDidDeleteFiles) {
+          workspace.onDidDeleteFiles(deleted.map((data) => data.filepath));
+        }
+        if (changed.length && workspace?.onDidChangeFiles) {
+          const { onDidChangeFiles } = workspace;
+          // TODO: 直接返回 buffer? 编码假定为 utf8 了
+          Promise.all(
+            changed.map(async ({ uri, filepath }) => {
+              const { content } = await this.fileService.resolveContent(uri);
+              return {
+                filepath,
+                content,
+              };
+            })
+          )
+            .then((data) => {
+              onDidChangeFiles(data);
+            })
+            .catch((err) => {
+              console.error(err);
+            });
+        }
+      })
+    );
+  }
+
   @OnEvent(EditorDocumentModelSavedEvent)
   async onEditorDocumentModelSavingEvent(e: EditorDocumentModelSavedEvent) {
     if (this.runtimeConfig.workspace?.onDidSaveTextDocument) {
       const uri = e.payload;
+      if (uri.scheme !== 'file') {
+        return;
+      }
       const { content } = await this.fileService.resolveContent(uri.toString(true));
-      const filepath = path.relative(this.appConfig.workspaceDir, uri.codeUri.fsPath);
+      const filepath = this.getWorkspaceRelativePath(uri);
+      if (filepath === null) {
+        return;
+      }
       this.runtimeConfig.workspace.onDidSaveTextDocument({ filepath, content });
     }
   }
@@ -45,14 +111,30 @@ export class EditorActionEventContribution extends WithEventBus implements Clien
   async onEditorDocumentModelContentChangedEvent(e: EditorDocumentModelContentChangedEvent) {
     if (this.runtimeConfig.workspace?.onDidChangeTextDocument) {
       const { uri } = e.payload;
+      if (uri.scheme !== 'file') {
+        return;
+      }
       const model = this.docModelService.getModelReference(uri);
       if (model) {
-        const filepath = path.relative(this.appConfig.workspaceDir, uri.codeUri.fsPath);
+        const filepath = this.getWorkspaceRelativePath(uri);
+        if (filepath === null) {
+          return;
+        }
         this.runtimeConfig.workspace.onDidChangeTextDocument({
           filepath,
           content: model.instance.getText(),
         });
+        model.dispose();
       }
     }
   }
+
+  getWorkspaceRelativePath(uri: URI): string | null {
+    const absolutePath = uri.codeUri.path;
+    const { workspaceDir } = this.appConfig;
+    if (!absolutePath.startsWith(workspaceDir)) {
+      return null;
+    }
+    return path.relative(this.appConfig.workspaceDir, absolutePath);
+  }
 }
diff --git a/packages/core/src/client/index.ts b/packages/core/src/client/index.ts
@@ -8,7 +8,7 @@ import {
   PreferenceScope,
   PreferenceProvider,
 } from '@ali/ide-core-browser';
-import { BasicModule } from '@ali/ide-core-common';
+import { BackService, BasicModule } from '@ali/ide-core-common';
 import { WSChannelHandler } from '@ali/ide-connection';
 
 import { FCServiceCenter, ClientPort, initFCService } from '../connection';
@@ -157,29 +157,33 @@ export async function bindConnectionService(injector: Injector, modules: ModuleC
 
   const { getFCService } = initFCService(clientCenter);
 
+  const backServiceList: BackService[] = [];
+
   for (const module of modules) {
     const moduleInstance = injector.get(module) as BasicModule;
-    if (!moduleInstance.backServices) {
-      continue;
-    }
-    for (const backService of moduleInstance.backServices) {
-      if (!isBackServicesInBrowser(backService)) {
-        continue;
+    if (moduleInstance.backServices) {
+      for (const backService of moduleInstance.backServices) {
+        if (isBackServicesInBrowser(backService)) {
+          backServiceList.push(backService);
+        }
       }
-      const { servicePath } = backService;
-      const fcService = getFCService(servicePath);
+    }
+  }
 
-      const injectService = {
-        token: servicePath,
-        useValue: fcService,
-      } as Provider;
+  for (const backService of backServiceList) {
+    const { servicePath } = backService;
+    const fcService = getFCService(servicePath);
 
-      injector.addProviders(injectService);
+    const injectService = {
+      token: servicePath,
+      useValue: fcService,
+    } as Provider;
 
-      if (backService.clientToken) {
-        const clientService = injector.get(backService.clientToken);
-        fcService.onRequestService(clientService);
-      }
+    injector.addProviders(injectService);
+
+    if (backService.clientToken) {
+      const clientService = injector.get(backService.clientToken);
+      fcService.onRequestService(clientService);
     }
   }
 }
diff --git a/packages/core/src/common/types.ts b/packages/core/src/common/types.ts
@@ -32,9 +32,38 @@ export interface RuntimeConfig {
   scenario?: string | null;
   /** 工作空间配置 */
   workspace?: {
+    /**
+     * 文件系统配置
+     */
     filesystem: FileSystemConfiguration;
+    /**
+     * 文档保存事件
+     * @param data.filepath 文档相对工作空间路径
+     * @param data.content 文档内容
+     */
     onDidSaveTextDocument?: (data: { filepath: string; content: string }) => void;
+    /**
+     * 文档更改事件
+     * @param data.filepath 文档相对工作空间路径
+     * @param data.content 文档内容
+     */
     onDidChangeTextDocument?: (data: { filepath: string; content: string }) => void;
+    /**
+     * 文件创建事件
+     * @param files 相对工作空间文件路径
+     */
+    onDidCreateFiles?: (files: string[]) => void;
+    /**
+     * 文件删除事件
+     * @param files 相对工作空间文件路径
+     */
+    onDidDeleteFiles?: (files: string[]) => void;
+    /**
+     * 文件变更事件
+     * @param data.filepath 相对工作空间文件路径
+     * @param data.content 文件内容
+     */
+    onDidChangeFiles?: (data: { filepath: string; content: string }[]) => void;
   };
   /** 默认打开的文件，多个文件时，会展示最右边的文件 */
   defaultOpenFile?: string | string[];
diff --git a/packages/integrations/src/filesystem/index.tsx b/packages/integrations/src/filesystem/index.tsx
@@ -122,7 +122,26 @@ const App = () => {
     }
   }, [fsType]);
 
-  const workspace = filesystem ? { filesystem } : undefined;
+  const workspace = filesystem
+    ? {
+        filesystem,
+        onDidChangeTextDocument(e) {
+          console.log('>>>onDidChangeTextDocument', e);
+        },
+        onDidSaveTextDocument(e) {
+          console.log('>>>onDidSaveTextDocument', e);
+        },
+        onDidCreateFiles(e) {
+          console.log('>>>onDidCreateFiles', e);
+        },
+        onDidChangeFiles(e) {
+          console.log('>>>onDidChangeFiles', e);
+        },
+        onDidDeleteFiles(e) {
+          console.log('>>>onDidDeleteFiles', e);
+        },
+      }
+    : undefined;
 
   return (
     <div style={{ height: '100%' }}>
diff --git a/scripts/build-assets.js b/scripts/build-assets.js
@@ -7,6 +7,7 @@ const fs = require('fs');
 const signale = require('signale');
 const { invoke, exec } = require('./utils/utils');
 const { upload } = require('./utils/upload');
+const pkg = require('../package.json');
 
 invoke(async () => {
   signale.pending(`开始编译 worker-host 和 webview`);
@@ -39,14 +40,22 @@ invoke(async () => {
       key: 'webview/index.html',
       transform: (v) => transformHttps(v.slice(0, v.lastIndexOf('/'))),
     },
+    __WEBVIEW_SCRIPT__: {
+      key: 'webview',
+      transform: transformHttps,
+    },
   };
-  const config = Object.keys(env).reduce((obj, name) => {
-    const { key, transform } = env[name];
-    if (cdnResult[key]) {
-      obj[name] = transform(cdnResult[key]);
-    }
-    return obj;
-  }, {});
+  const config = Object.keys(env).reduce(
+    (obj, name) => {
+      const { key, transform } = env[name];
+      if (cdnResult[key]) {
+        obj[name] = transform(cdnResult[key]);
+      }
+      return obj;
+    },
+    { __KAITIAN_VERSION__: pkg.engines.kaitian }
+  );
+
   fs.writeFileSync(
     path.resolve(__dirname, '../packages/toolkit/define.json'),
     JSON.stringify(config, null, 2)
diff --git a/scripts/utils/upload.js b/scripts/utils/upload.js
