🔨继续重构service模块

Author: v_yuanwenbin

package-lock.json

@@ -206,7 +206,7 @@
     "mocha": "^8.2.1",
     "multispinner": "^0.2.1",
     "node-loader": "^1.0.0",
-    "node-sass": "^5.0.0",
+    "node-sass": "^4.9.2",
     "p-finally": "^2.0.1",
     "puppeteer-core": "^10.4.0",
     "puppeteer-in-electron": "^3.0.4",

package.json

@@ -75,11 +75,11 @@ declare module 'civet' {
 
 
     export enum ViewType {
-        Property = 1,
-        Navigation = 2,
-        Overview = 3,
-        ContentView = 4,
-        Search = 5
+        Property = 0x1,
+        Navigation = 0x2,
+        Overview = 0x4,
+        ContentView = 0x8,
+        Search = 0x10
     }
 
     /**

src/civet.d.ts

@@ -9,11 +9,11 @@ export enum PropertyType {
 }
 
 export enum ViewType {
-  Property = 1,
-  Navigation = 2,
-  Overview = 3,
-  ContentView = 4,
-  Search = 5
+  Property = 0x1,
+  Navigation = 0x2,
+  Overview = 0x4,
+  ContentView = 0x8,
+  Search = 0x10
 }
 
 export enum OverviewItemLayout {

src/public/ExtensionHostType.ts

@@ -13,8 +13,8 @@ import { ExtensionInstallManager, ExtensionDescriptor } from './ExtensionInstall
 import fs from 'fs'
 import { injectable, showErrorInfo, getSingleton } from './Singleton'
 import { IPCRendererResponse, IPCNormalMessage } from '@/../public/IPCMessage'
-import { AlgorithmService } from './service/AlgorithmService'
-import { MenuDetail } from './ExtensionPackage'
+import { ServiceFactory } from './service/ServiceFactory'
+import { ExtensionType, MenuDetail } from './ExtensionPackage'
 import { BaseService } from './service/ServiceInterface'
 
 class ExtensionCommandAccessor implements ExtensionAccessor {
@@ -99,7 +99,8 @@ export class ExtensionManager {
   // aviable extension of this
   private _extensionsOfConfig: string[] = [];
   private _extensions: ExtensionService[] = []; //
-  #extensions: BaseService[] = [];
+  #services: Map<string,BaseService> = new Map<string,BaseService>(); // name, service
+  #extensions: Map<string,BaseService[]> = new Map<string, BaseService[]>();  // contentType, service
   private _activableExtensions: Map<string, ExtensionService[]> = new Map<string, ExtensionService[]>();  // contentType, service
   private _viewServices: Map<string, ExtensionService> = new Map<string, ExtensionService>();
   private _installManager: ExtensionInstallManager|null = null;
@@ -167,8 +168,13 @@ export class ExtensionManager {
   private _initService(root: string, extensionName: string, pipeline: MessagePipeline): boolean {
     let service = this._getService(extensionName)
     try {
+      const packPath = root + '/' + extensionName
+      if (!this.#services.has(extensionName)) {
+        const serv = ServiceFactory.createService(packPath)
+        if (!serv) return false
+        this.#services.set(extensionName, serv)
+      }
       if (!service) {
-        const packPath = root + '/' + extensionName
         service = new ExtensionService(packPath, pipeline)
         this._extensions.push(service)
         console.info('extension name:', extensionName)
@@ -182,21 +188,22 @@ export class ExtensionManager {
 
   private _buildGraph() {
     this._activableExtensions.clear()
+    this.#extensions.clear()
     console.info('service:', this._extensions)
     let extServs: ExtensionService[] = this._extensions
     console.info('service:', extServs)
     // build dependent service
-    for (let idx = 0, len = extServs.length; idx < len; ++idx) {
-      let service = extServs[idx]
-      if (!service.dependency) continue
-      for (let pos = 0; pos < len; ++pos) {
-        if (service.dependency === extServs[pos].name) {
-          extServs[pos].addDependency(service)
-          // this._algorithmService.registExtension(service.name, service)
-          break
-        }
-      }
-    }
+    // for (let idx = 0, len = extServs.length; idx < len; ++idx) {
+    //   let service = extServs[idx]
+    //   if (!service.dependency) continue
+    //   for (let pos = 0; pos < len; ++pos) {
+    //     if (service.dependency === extServs[pos].name) {
+    //       extServs[pos].addDependency(service)
+    //       // this._algorithmService.registExtension(service.name, service)
+    //       break
+    //     }
+    //   }
+    // }
     // check if loop circle exist
     // build empty dependent service
     for (let idx = extServs.length - 1; idx >= 0; --idx) {
@@ -331,7 +338,7 @@ export class ExtensionManager {
 
   private _initViewExtension(service: ExtensionService) {
     let activeType = service.viewType()
-    if (!activeType) return
+    if (!(activeType & ExtensionType.ViewExtension)) return
     this._viewServices.set(service.name, service)
   }
 

src/worker/ExtensionManager.ts

@@ -16,6 +16,10 @@ const ViewTypeTable = {
   Search: ViewType.Search
 }
 
+export enum ExtensionType {
+  ServiceExtension = 1<<8,
+  ViewExtension = 1 << 9
+}
 export abstract class BaseExtension {
   #name: string = '';
   #instance: any = null;
@@ -36,8 +40,8 @@ export class ExtensionPackage extends BaseExtension {
   private _license?: string;
   private _description?: string;
   private _activeEvents: string[] = [];
-  private _viewEvents: ViewType[] = [];
-  private _dependency: string|undefined;
+  private _extensionInfo: number = 0;
+  private _dependency: string[]|undefined;
   private _menus: Map<string, MenuDetail[]> = new Map<string, MenuDetail[]>();  // 
   // private _dependency: Map<string, string> = new Map<string, string>();
 
@@ -58,12 +62,15 @@ export class ExtensionPackage extends BaseExtension {
       if (map[0] === 'onContentType') {
         this._activeEvents = str.split(',')
         // console.debug('support content type:', this._activeEvents)
+        this._extensionInfo |= ExtensionType.ServiceExtension
       } else if (map[0] === 'onView') {
         const views = str.split(',')
-        this._viewEvents = views.map((item: string) => {
-          return ViewTypeTable[item]
+        views.forEach(item => {
+          this._extensionInfo |= ViewTypeTable[item]
         })
+        this._extensionInfo |= ExtensionType.ViewExtension
       } else if (map[0] === 'onSave') {
+        this._extensionInfo |= ExtensionType.ServiceExtension
       }
     }
     // contrib
@@ -73,13 +80,7 @@ export class ExtensionPackage extends BaseExtension {
       this._initMenus(contrib['menus'])
     }
     // dependency
-    const dependency = pack['civet']['dependency']
-    if (dependency !== undefined) {
-      for (let name in dependency) {
-        // this._dependency[name] = dependency[name]
-        this._dependency = name
-      }
-    }
+    this._dependency = pack['civet']['dependency']
   }
 
   private _initMenus(menus: any) {
@@ -106,6 +107,7 @@ export class ExtensionPackage extends BaseExtension {
   get owner() { return this._owner; }
   get activeTypes() { return this._activeEvents }
   get dependency() { return this._dependency }
-  get viewEvents() { return this._viewEvents }
+  get viewEvents() { return this._extensionInfo }
+  get extensionType(): ExtensionType { return (this._extensionInfo & (ExtensionType.ServiceExtension|ExtensionType.ViewExtension)) }
   get menus() { return this._menus }
 }

src/worker/ExtensionPackage.ts

@@ -4,7 +4,7 @@ import { IPCRendererResponse } from '@/../public/IPCMessage'
 import { ViewType } from '@/../public/ExtensionHostType'
 import { ExtensionModule } from './api/ExtensionRequire'
 import { logger } from '@/../public/Logger'
-import { ExtensionPackage } from './ExtensionPackage'
+import { ExtensionPackage, ExtensionType } from './ExtensionPackage'
 const fs = require('fs')
 
 export interface ExtensionAccessor {
@@ -61,7 +61,7 @@ export class ExtensionService {
     return this._package.activeTypes
   }
 
-  viewType(): ViewType[] {
+  viewType(): ViewType {
     return this._package.viewEvents
   }
 
@@ -79,7 +79,7 @@ export class ExtensionService {
       case ExtensionActiveType.ExtContentType:
         return this._package.activeTypes.length > 0
       case ExtensionActiveType.ExtView:
-        return this._package.viewEvents.length > 0
+        return this._package.viewEvents & ExtensionType.ViewExtension
       default:
         return false
     }