@bbki.ng/site 5.7.0 → 5.8.1

package/src/plugins/xwy/index.ts

@@ -1,9 +1,7 @@
 import { IHostContext } from '#/types/hostApi';
-import { BBPlugin } from '#/core/bbplugin';
-import { HookPoint } from '#/types/slots';
+import { BBPlugin } from '#/core/plugin-system/bbplugin';
 import { PluginID } from '#/types/plugin';
 
-import { HookPointTypeMap, Transformer } from './types';
 import { SpecialTitle } from './components/article';
 import { XwyLogo } from './components/logo';
 import { FontRules, LOADING_CLASS } from './const';
@@ -35,27 +33,34 @@ class XwyPlugin extends BBPlugin {
     this.batchRegisterMiddlewares(ctx);
 
     // 注册logo插槽组件
-    ctx.api.registerSlot('logo', XwyLogo, this.id);
+    const systemUIService = ctx.service.get('core:uiService');
+    systemUIService?.registerSlot('logo', XwyLogo, this.id);
 
     // 注册「小乌鸦合集」标题组件
-    ctx.api.registerSlot('articleTitle', SpecialTitle, this.id);
-  };
-
-  private trasformerMap: {
-    [K in Extract<HookPoint, keyof HookPointTypeMap>]?: Array<Transformer<K>>;
-  } = {
-    transformTitleList: [pinTitle, transformTitleList],
-    transformBreadcrumbPath: [transformBreadcrumbPaths],
-    transformPostContent: [transformPostContent],
+    const blogUIService = ctx.service.get('blog:uiService');
+    blogUIService?.registerSlot('blog:articleTitle', SpecialTitle, this.id);
   };
 
   private batchRegisterMiddlewares(ctx: IHostContext) {
-    for (const [point, fns] of Object.entries(this.trasformerMap) as Array<
-      [HookPoint, Array<(baseData: unknown) => unknown>]
-    >) {
-      fns.forEach(fn => {
-        ctx.api.registerMiddleware(point, fn, this.id, 10);
-      });
+    const blogUIService = ctx.service.get('blog:uiService');
+    const systemUIService = ctx.service.get('core:uiService');
+
+    if (!blogUIService || !systemUIService) {
+      console.warn(`[${this.id}] Required UI services not found, skipping middleware registration`);
+      return;
+    }
+
+    // 注册博客相关的中间件
+    for (const transformer of [pinTitle, transformTitleList]) {
+      blogUIService.registerMiddleware('blog:transformTitleList', transformer, this.id);
+    }
+    for (const transformer of [transformPostContent]) {
+      blogUIService.registerMiddleware('blog:transformPostContent', transformer, this.id);
+    }
+
+    // 注册系统相关的中间件
+    for (const transformer of [transformBreadcrumbPaths]) {
+      systemUIService.registerMiddleware('transformBreadcrumbPath', transformer, this.id);
     }
   }
 

package/src/plugins/xwy/types/index.ts

@@ -1,7 +1,3 @@
-import { PathObj } from '@bbki.ng/ui';
-
-import { TitleListItem } from '#/types/posts';
-
 export interface FontConfig {
   name: string;
   src: string;
@@ -19,17 +15,3 @@ export interface FontRule {
   extraCls?: string;
   variant?: 'default' | 'special';
 }
-
-// 1. 先定义每个 HookPoint 对应的类型映射
-export interface HookPointTypeMap {
-  transformTitleList: { input: TitleListItem[]; output: TitleListItem[] };
-  transformBreadcrumbPath: { input: PathObj[]; output: PathObj[] };
-  transformPostContent: { input: string; output: string };
-}
-
-type HookPoint = keyof HookPointTypeMap;
-
-// 2. 定义带类型的 Transformer
-export type Transformer<K extends HookPoint> = (
-  baseData: HookPointTypeMap[K]['input']
-) => HookPointTypeMap[K]['output'];

package/src/types/hostApi.ts

@@ -1,38 +1,7 @@
-import React from 'react';
-import { Fetcher } from 'swr';
-
-import { type FingerprintData } from '#/app/utils/fingerprints';
-import { PluginStore } from '#/core/pluginStore';
-
-import { HookPoint, IComPropsRegisteredToSlot, SlotName } from './slots';
-import { IPluginEntry, PluginEvents, PluginID } from './plugin';
-
-export interface IHostApi {
-  getDeviceId: () => Promise<{ id: string; fp: FingerprintData }>;
-  getVersionHash: () => Promise<string> | string;
-  setLoading: (id: PluginID, loading: boolean) => void;
-  onLoadingChanged: (
-    listener: (payload: PluginEvents['site:loading:changed']) => void
-  ) => () => void;
-  registerMiddleware: <T>(
-    point: HookPoint,
-    fn: (baseData: T) => T,
-    pluginId: string,
-    weight?: number
-  ) => void;
-  registerEntry: (entry: IPluginEntry, id: string) => void;
-  registerSlot: (
-    slotName: SlotName,
-    component: React.ComponentType<IComPropsRegisteredToSlot>,
-    pluginId: string,
-    weight?: number
-  ) => void;
-  fetch: Fetcher;
-}
-
-export type PluginInitializer = (api: IHostApi) => void;
+import { PluginStore } from '#/core/plugin-system/pluginStore';
+import { type ServiceRegistry } from '#/core/shared-service/service-registry';
 
 export interface IHostContext {
   store?: PluginStore;
-  api: IHostApi;
+  service: ServiceRegistry;
 }

package/src/types/plugin.ts

@@ -22,6 +22,7 @@ export type PluginID =
   | 'now'
   | 'default'
   | 'blog'
+  | 'notification'
   | 'fx';
 
 export interface IPluginEntry {
@@ -31,6 +32,7 @@ export interface IPluginEntry {
 }
 
 export type PluginEvents = {
+  'plugin:uninstall': PluginID;
   'plugin:loading:changed': IPluginLoadingPayload;
   'site:loading:changed': boolean;
 };

package/src/utils/index.tsx

@@ -1,7 +1,6 @@
-import { LinkProps, PathRouteProps } from 'react-router-dom';
+import { PathRouteProps } from 'react-router-dom';
 import React from 'react';
 
-import { IHostContext } from '#/types/hostApi';
 import { IPluginEntry } from '#/types/plugin';
 import { IComPropsRegisteredToSlot } from '#/types/slots';
 
@@ -19,49 +18,3 @@ export const buildEntrySlotCom = (entry: IPluginEntry) => {
 
   return Component;
 };
-
-export const buildEntryCreator = (ctx: IHostContext) => (entry: IPluginEntry, id: string) => {
-  ctx.api.registerMiddleware(
-    'extendedRoutes',
-    (routes: Array<Omit<PathRouteProps, 'element'>>) => {
-      return [
-        ...routes,
-        {
-          path: entry.path,
-        },
-      ];
-    },
-    id,
-    10
-  );
-
-  ctx.api.registerSlot(
-    'route',
-    (props: IComPropsRegisteredToSlot) => {
-      const route = props.data as Omit<PathRouteProps, 'element'>;
-      if (route.path === entry.path) {
-        const Com = entry.pageComponent;
-        return <Com data={props.data} />;
-      }
-      return null;
-    },
-    id
-  );
-
-  if (!entry.label) return;
-
-  ctx.api.registerMiddleware(
-    'transformCoverEntry',
-    (entries: Array<LinkProps>) => {
-      return [
-        ...entries,
-        {
-          to: entry.path,
-          children: entry.label,
-        },
-      ];
-    },
-    id,
-    10
-  );
-};

package/vite.config.js

@@ -78,7 +78,7 @@ export default defineConfig({
       registerType: 'autoUpdate',
       includeAssets: ['favicon.svg', 'robots.txt', 'apple-touch-icon.png', 'Logo.svg'],
       devOptions: {
-        enabled: true,
+        enabled: false,
       },
       workbox: {
         cleanupOutdatedCaches: true,

package/src/core/pluginManager.ts

@@ -1,191 +0,0 @@
-import React from 'react';
-import { PathRouteProps } from 'react-router-dom';
-import { LinkProps } from '@bbki.ng/ui';
-
-import { IHostContext } from '#/types/hostApi';
-import type { SlotName, HookPoint, IComPropsRegisteredToSlot } from '#/types/slots';
-import { IPlugin, IPluginEntry, PluginEvents, PluginID, PluginPerm } from '#/types/plugin';
-import { getStableDeviceId } from '#/app/utils/fingerprints';
-import { cfApiFetcher } from '#/app/utils';
-import { buildEntrySlotCom } from '#/utils';
-
-import { registry } from './registry';
-import { createEventBus } from './utils/eventBus';
-import { AdminPluginIDSet } from './const';
-import { PluginStore } from './pluginStore';
-
-const pluginModules = import.meta.glob('../plugins/*/index.ts');
-
-class PluginManager {
-  private activePlugins: Map<string, IPlugin> = new Map();
-
-  private bus = createEventBus<PluginEvents>();
-
-  private registryEntry = (entry: IPluginEntry, id: string) => {
-    this.registerMiddleware(
-      'extendedRoutes',
-      (routes: Array<Omit<PathRouteProps, 'element'>>) => {
-        return [
-          ...routes,
-          {
-            path: entry.path,
-          },
-        ];
-      },
-      id,
-      10
-    );
-
-    this.registerSlot('route', buildEntrySlotCom(entry), id);
-
-    if (!entry.label) return;
-
-    this.registerMiddleware(
-      'transformCoverEntry',
-      (entries: Array<LinkProps>) => {
-        return [
-          ...entries,
-          {
-            to: entry.path,
-            children: entry.label,
-          },
-        ];
-      },
-      id,
-      10
-    );
-  };
-
-  private registerMiddleware = <T>(
-    point: HookPoint,
-    fn: (data: T) => Promise<T> | T,
-    pluginId: string,
-    weight = 0
-  ) => {
-    registry.registerMiddleware(point, fn, pluginId, weight);
-  };
-
-  private registerSlot = (
-    slotName: SlotName,
-    component: React.ComponentType<IComPropsRegisteredToSlot>,
-    pluginId: string,
-    weight = 0
-  ) => {
-    registry.registerComponent(slotName, component, pluginId, weight);
-  };
-
-  private createHostContext(perm: PluginPerm = 'guest'): IHostContext {
-    const adminCtx =
-      perm === 'admin'
-        ? {
-            store: PluginStore.getInstance(),
-          }
-        : {};
-    return {
-      ...adminCtx,
-      api: {
-        fetch: cfApiFetcher,
-        setLoading: (id: PluginID, loading: boolean) => {
-          this.bus.emit('plugin:loading:changed', { id, loading });
-        },
-        onLoadingChanged: (listener: (payload: PluginEvents['site:loading:changed']) => void) => {
-          return this.bus.on('site:loading:changed', listener);
-        },
-
-        getDeviceId: getStableDeviceId,
-        getVersionHash: () => {
-          const hashStr: string =
-            typeof GLOBAL_COMMIT_HASH === 'string' ? GLOBAL_COMMIT_HASH : '0000000';
-          return hashStr;
-        },
-
-        registerSlot: this.registerSlot,
-        registerMiddleware: this.registerMiddleware,
-        registerEntry: this.registryEntry,
-      },
-    };
-  }
-
-  private loading = new Set<string>();
-
-  notifySiteLoadingChanged(loading: boolean) {
-    this.bus.emit('site:loading:changed', loading);
-  }
-
-  subscribePluginLoading(listener: (payload: PluginEvents['plugin:loading:changed']) => void) {
-    return this.bus.on('plugin:loading:changed', listener);
-  }
-
-  // enable abort ctrl
-  async loadPlugin(pluginId: PluginID) {
-    if (this.activePlugins.has(pluginId)) {
-      console.warn(`Plugin ${pluginId} is already loaded.`);
-      return;
-    }
-
-    if (this.loading.has(pluginId)) {
-      console.warn(`Plugin ${pluginId} is loading...`);
-      return;
-    }
-
-    // try load plugin
-    this.loading.add(pluginId);
-    this.bus.emit('plugin:loading:changed', { id: pluginId, loading: true });
-
-    const modulePath = `../plugins/${pluginId}/index.ts`;
-    const moduleLoader = pluginModules[modulePath];
-    if (!moduleLoader) {
-      console.error(`Plugin ${pluginId} not found in registry`);
-
-      this.loading.delete(pluginId);
-      this.bus.emit('plugin:loading:changed', { id: pluginId, loading: false });
-
-      return;
-    }
-
-    try {
-      const module = (await moduleLoader()) as {
-        default: IPlugin;
-      };
-
-      const p: IPlugin = module.default;
-
-      const perm = p.getMeta().perm || 'guest';
-      if (perm === 'admin' && !AdminPluginIDSet.has(pluginId)) {
-        console.error(`Plugin ${pluginId} requires admin permission, but it's not trusted.`);
-        return;
-      }
-
-      const ctx = this.createHostContext(perm);
-
-      if (p.onInstall) {
-        await p.onInstall(ctx);
-      }
-
-      this.activePlugins.set(pluginId, p);
-    } catch (error) {
-      console.error(`Failed to load plugin ${pluginId}:`, error);
-    } finally {
-      this.loading.delete(pluginId);
-      this.bus.emit('plugin:loading:changed', { id: pluginId, loading: false });
-    }
-  }
-
-  async disablePlugin(pluginId: PluginID) {
-    const plugin = this.activePlugins.get(pluginId);
-    if (!plugin) {
-      console.warn(`Plugin ${pluginId} is not loaded.`);
-      return;
-    }
-
-    if (plugin.onDisable) {
-      await plugin.onDisable();
-    }
-
-    this.activePlugins.delete(pluginId);
-
-    registry.unregisterAllByPluginId(plugin.id);
-  }
-}
-
-export const pluginManager = new PluginManager();

package/src/core/pluginStore.ts

@@ -1,70 +0,0 @@
-import { IPluginStoreEntry, PluginID } from '#/types/plugin';
-
-import { pluginManager } from './pluginManager';
-import { PluginManifestService } from './pluginManifestService';
-
-export class PluginStore {
-  private static instance: PluginStore;
-
-  private installedSet: Set<PluginID> = new Set();
-
-  private constructor() {
-    this.parse();
-  }
-
-  private parse = () => {
-    this.installedSet.clear();
-    const installedPluginsStr = localStorage.getItem('installed_plugins');
-    if (installedPluginsStr) {
-      try {
-        const entries = JSON.parse(installedPluginsStr) as Array<PluginID>;
-        entries.forEach(id => this.installedSet.add(id));
-      } catch (e) {
-        console.error('Failed to parse installed plugins from localStorage', e);
-      }
-    }
-
-    return this.installedSet;
-  };
-
-  private stringify = () => {
-    localStorage.setItem('installed_plugins', JSON.stringify(Array.from(this.installedSet)));
-  };
-
-  getInstalledPlugins: () => Set<PluginID> = () => {
-    return this.parse();
-  };
-
-  async getAllPlugins(): Promise<Array<IPluginStoreEntry>> {
-    const installedPlugins = this.getInstalledPlugins();
-    await PluginManifestService.getInstance().fetch();
-    const manifest = PluginManifestService.getInstance().getAllPlugins();
-    return manifest.map(plugin => ({
-      ...plugin,
-      enabled: installedPlugins.has(plugin.id),
-    }));
-  }
-
-  isPluginInstalled: (id: PluginID) => boolean = id => {
-    return this.getInstalledPlugins().has(id);
-  };
-
-  installPlugin: (id: PluginID) => Promise<void> = async id => {
-    await pluginManager.loadPlugin(id);
-    this.installedSet.add(id);
-    this.stringify();
-  };
-
-  disablePlugin: (id: PluginID) => Promise<void> = async id => {
-    await pluginManager.disablePlugin(id);
-    this.installedSet.delete(id);
-    this.stringify();
-  };
-
-  static getInstance() {
-    if (!PluginStore.instance) {
-      PluginStore.instance = new PluginStore();
-    }
-    return PluginStore.instance;
-  }
-}