@bbki.ng/site 5.7.0 → 5.8.0

package/src/plugins/blog/services/BlogUIService.ts

@@ -0,0 +1,120 @@
+import type React from 'react';
+
+import { IMiddlewareEntry, ISlotEntry } from '#/core/plugin-system/registry';
+import { createEventBus } from '#/core/utils/eventBus';
+import { IComPropsRegisteredToSlot } from '#/types/slots';
+
+import { BlogDataHookPoint, BlogSlotName, IBlogUIService } from './IBlogUIService';
+
+type RegistryEvents = {
+  'blog:slots:changed': void;
+  'blog:middleware:changed': BlogDataHookPoint;
+};
+
+export class BlogUIService implements IBlogUIService {
+  private static instance: BlogUIService;
+
+  private constructor() {}
+
+  private slots = new Map<BlogSlotName, Array<ISlotEntry>>();
+  private middlewares = new Map<BlogDataHookPoint, IMiddlewareEntry<unknown>[]>();
+
+  private bus = createEventBus<RegistryEvents>();
+
+  static getInstance(): BlogUIService {
+    if (!BlogUIService.instance) {
+      BlogUIService.instance = new BlogUIService();
+    }
+    return BlogUIService.instance;
+  }
+
+  subscribeSlotChange(listener: () => void) {
+    return this.bus.on('blog:slots:changed', listener);
+  }
+
+  subscribeMiddlewareChange(listener: (hookPoint: BlogDataHookPoint) => void) {
+    return this.bus.on('blog:middleware:changed', listener);
+  }
+
+  registerMiddleware: <S>(
+    hookPoint: BlogDataHookPoint,
+    fn: (data: S) => S | Promise<S>,
+    pluginId: string,
+    weight?: number
+  ) => void = <S>(
+    hookPoint: BlogDataHookPoint,
+    fn: (data: S) => S | Promise<S>,
+    pluginId: string,
+    weight = 0
+  ) => {
+    const existing = this.middlewares.get(hookPoint) || [];
+
+    const newEntry: IMiddlewareEntry<S> = {
+      id: `${pluginId}-${hookPoint}-middleware`,
+      pluginId,
+      fn,
+      weight,
+    };
+
+    const updated = [...existing, newEntry as IMiddlewareEntry<unknown>].sort(
+      (a, b) => (b.weight || 0) - (a.weight || 0)
+    );
+    this.middlewares.set(hookPoint, updated);
+
+    this.bus.emit('blog:middleware:changed', hookPoint);
+  };
+
+  registerSlot: (
+    slotName: BlogSlotName,
+    component: React.ComponentType<{ data: unknown }>,
+    pluginId: string,
+    weight?: number
+  ) => void = (slotName, component, pluginId, weight = 0) => {
+    const existing = this.slots.get(slotName) || [];
+    const newEntry: ISlotEntry = {
+      id: `${pluginId}-${slotName}-slot`,
+      pluginId,
+      component,
+      weight,
+    };
+
+    const updated = [...existing, newEntry].sort((a, b) => (b.weight || 0) - (a.weight || 0));
+    this.slots.set(slotName, updated);
+
+    this.bus.emit('blog:slots:changed', undefined);
+  };
+
+  unregisterAllByPluginId: (pluginId: string) => void = pluginId => {
+    // 移除中间件
+    this.middlewares.forEach((entries, hookPoint) => {
+      const filtered = entries.filter(entry => entry.pluginId !== pluginId);
+      if (filtered.length !== entries.length) {
+        this.middlewares.set(hookPoint, filtered);
+        this.bus.emit('blog:middleware:changed', hookPoint);
+      }
+    });
+
+    // 移除插槽组件
+    this.slots.forEach((entries, slotName) => {
+      const filtered = entries.filter(entry => entry.pluginId !== pluginId);
+      if (filtered.length !== entries.length) {
+        this.slots.set(slotName, filtered);
+      }
+    });
+
+    this.bus.emit('blog:slots:changed', undefined);
+  };
+
+  getComponents(slotName: BlogSlotName): React.ComponentType<IComPropsRegisteredToSlot>[] {
+    return (this.slots.get(slotName) || []).map(entry => entry.component);
+  }
+
+  async runMiddlewares<T>(point: BlogDataHookPoint, data: T): Promise<T> {
+    const fns = (this.middlewares.get(point) || []).map(entry => entry.fn);
+    let result = data;
+    for (const fn of fns) {
+      result = (await fn(result)) as T;
+    }
+    return result;
+  }
+}

package/src/plugins/blog/services/IBlogUIService.ts

@@ -0,0 +1,31 @@
+import type React from 'react';
+
+import { type IBaseUIService } from '#/core/shared-service/contract/IUIService';
+
+declare module '#/core/shared-service/service-registry' {
+  interface ServiceIdentifierMap {
+    'blog:uiService': IBlogUIService;
+  }
+}
+
+export type BlogSlotName = 'blog:articleActionRow' | 'blog:articleTitle';
+
+export type BlogDataHookPoint =
+  | 'blog:filterPosts'
+  | 'blog:transformPostContent'
+  | 'blog:transformTitleList';
+
+export interface IBlogUIService extends IBaseUIService<BlogSlotName, BlogDataHookPoint> {
+  registerMiddleware: <S>(
+    hookPoint: BlogDataHookPoint,
+    fn: (data: S) => S | Promise<S>,
+    pluginId: string,
+    weight?: number
+  ) => void;
+  registerSlot: (
+    slotName: BlogSlotName,
+    component: React.ComponentType<{ data: unknown }>,
+    pluginId: string,
+    weight?: number
+  ) => void;
+}

package/src/plugins/extra-cd/index.ts

@@ -1,4 +1,4 @@
-import { BBPlugin } from '#/core/bbplugin';
+import { BBPlugin } from '#/core/plugin-system/bbplugin';
 import { IHostContext } from '#/types/hostApi';
 import { PluginID } from '#/types/plugin';
 import { TitleListItem } from '#/types/posts';
@@ -7,7 +7,18 @@ class ExtraCd extends BBPlugin {
   id: PluginID = 'extra-cd';
 
   override onInstall = async (ctx: IHostContext): Promise<void> => {
-    ctx.api.registerMiddleware('transformTitleList', this.transformTitleList, this.id, 10);
+    const blogUIService = ctx.service.get('blog:uiService');
+    if (!blogUIService) {
+      console.error('Blog UI service not found. ExtraCd installation failed.');
+      return;
+    }
+
+    blogUIService.registerMiddleware(
+      'blog:transformTitleList',
+      this.transformTitleList,
+      this.id,
+      10
+    );
   };
 
   private transformTitleList = (titleList: Array<TitleListItem>) => {

package/src/plugins/extra-entry/index.ts

@@ -1,7 +1,6 @@
-import { BBPlugin } from '#/core/bbplugin';
+import { BBPlugin } from '#/core/plugin-system/bbplugin';
 import { IHostContext } from '#/types/hostApi';
 import { PluginID } from '#/types/plugin';
-import { buildEntryCreator } from '#/utils';
 
 import { ExtendedRoutesPage } from './components/page';
 
@@ -9,8 +8,13 @@ export class ExtraEntryPlugin extends BBPlugin {
   id: PluginID = 'extra-entry';
 
   override onInstall = async (ctx: IHostContext): Promise<void> => {
-    const entryCreator = buildEntryCreator(ctx);
-    entryCreator(
+    const systemUIService = ctx.service.get('core:uiService');
+    if (!systemUIService) {
+      console.warn(`[${this.id}] core:uiService not found, cannot register entry`);
+      return;
+    }
+
+    systemUIService.registerPluginEntry(
       {
         pageComponent: ExtendedRoutesPage,
         path: '/hello',

package/src/plugins/fx/index.ts

@@ -1,4 +1,4 @@
-import { BBPlugin } from '#/core/bbplugin';
+import { BBPlugin } from '#/core/plugin-system/bbplugin';
 import { IHostContext } from '#/types/hostApi';
 import { PluginID } from '#/types/plugin';
 
@@ -9,14 +9,27 @@ class FxPlugin extends BBPlugin {
   id: PluginID = 'fx';
 
   override onInstall = async (ctx: IHostContext) => {
-    ctx.api.registerSlot(
+    const coreService = ctx.service.get('core:baseService');
+
+    if (!coreService) {
+      console.error('Core service not found. FxPlugin installation failed.');
+      return;
+    }
+
+    const systemUIService = ctx.service.get('core:uiService');
+    if (!systemUIService) {
+      console.error('UI service not found. FxPlugin installation failed.');
+      return;
+    }
+
+    systemUIService.registerSlot(
       'pageFooter',
       FxContext.withCtx(
         {
-          versionHash: await ctx.api.getVersionHash(),
-          deviceId: (await ctx.api.getDeviceId()).id,
+          versionHash: await coreService.getVersionHash(),
+          deviceId: (await coreService.getDeviceId())?.id,
           subscribeToLoading: listener => {
-            return ctx.api.onLoadingChanged(listener);
+            return coreService.subscribeLoadingChange(listener);
           },
         },
         FxCom

package/src/plugins/manifest.ts

@@ -26,6 +26,7 @@ export const FALLBACK_MANIFEST: Array<IPluginManifestEntry> = [
     version: '0.1.0',
     description:
       '提供额外的页面跳转链接。例如在标题列表末尾添加一个 "cd ~" 的选项，点击后跳转到主页',
+    dependencies: ['blog'],
   },
   {
     name: '特效',
@@ -33,17 +34,12 @@ export const FALLBACK_MANIFEST: Array<IPluginManifestEntry> = [
     version: '0.1.0',
     description: '提供一些额外的视觉效果。例如版本、设备信息水印，加载状态螺旋线、背景纹理等',
   },
-  // {
-  //   name: 'extra-entry',
-  //   id: 'extra-entry',
-  //   version: '0.1.0',
-  //   description: 'Provides extra entries for cover and extended routes.',
-  // },
   {
     name: '小乌鸦',
     id: 'xwy',
     version: '0.1.0',
     description: '为小乌鸦合集实现定制功能或者样式的插件',
+    dependencies: ['blog'],
   },
   {
     name: '博客',

package/src/plugins/now/hooks/use_streaming.ts

@@ -74,7 +74,9 @@ export function useStreaming(options: UseStreamingOptions = {}) {
     });
   }, []);
 
-  nowCtx.setLoading(isLoading);
+  useEffect(() => {
+    nowCtx.setLoading(isLoading);
+  }, [nowCtx, isLoading]);
 
   return {
     streaming: data?.data ?? [],

package/src/plugins/now/index.ts

@@ -1,7 +1,6 @@
-import { BBPlugin } from '#/core/bbplugin';
+import { BBPlugin } from '#/core/plugin-system/bbplugin';
 import { IHostContext } from '#/types/hostApi';
 import { PluginID } from '#/types/plugin';
-import { buildEntryCreator } from '#/utils';
 
 import { pageNow } from './components';
 import { NowCtx } from './context';
@@ -10,19 +9,31 @@ export class NowPlugin extends BBPlugin {
   id: PluginID = 'now';
 
   override onInstall = async (ctx: IHostContext): Promise<void> => {
-    const nowEntryCreator = buildEntryCreator(ctx);
+    const systemUIService = ctx.service.get('core:uiService');
+    if (!systemUIService) {
+      console.warn(`[${this.id}] core:uiService not found, cannot register entry`);
+      return;
+    }
     const { withCtx } = NowCtx;
 
-    nowEntryCreator(
+    const coreService = ctx.service.get('core:baseService');
+
+    if (!coreService) {
+      console.error('Core service not found. NowPlugin installation failed.');
+      return;
+    }
+
+    systemUIService.registerPluginEntry(
       {
         path: '/now',
         label: 'cd ./now',
         pageComponent: withCtx(
           {
             setLoading: loading => {
-              ctx.api.setLoading('now', loading);
+              // ctx.api.setLoading('now', loading);
+              coreService.setLoading('now', loading);
             },
-            fetch: ctx.api.fetch,
+            fetch: coreService.fetch, // 直接使用 coreService 的 fetch 方法
           },
           pageNow
         ),

package/src/plugins/sticker/const.ts

@@ -5,7 +5,7 @@ export const STICKERS: IStickerConfig[] = [
     id: 'copilot',
     imageUrl: '/stickers/copilot.svg',
     rotation: 20,
-    maxWidth: 100,
+    maxWidth: 60,
     aspectRatio: '505/410',
     xOffset: 0,
     yOffset: 0,
@@ -41,7 +41,7 @@ export const STICKERS: IStickerConfig[] = [
     id: 'vite',
     imageUrl: '/stickers/vitejs.svg',
     rotation: -5,
-    maxHeight: 180,
+    maxWidth: 30,
     aspectRatio: '512/512',
     xOffset: 100,
     yOffset: -30,

package/src/plugins/sticker/index.ts

@@ -1,4 +1,4 @@
-import { BBPlugin } from '#/core/bbplugin';
+import { BBPlugin } from '#/core/plugin-system/bbplugin';
 import { IHostContext } from '#/types/hostApi';
 import { PluginID } from '#/types/plugin';
 
@@ -9,8 +9,17 @@ class Sticker extends BBPlugin {
   id: PluginID = 'sticker';
 
   private createPluginCtx = async (ctx: IHostContext): Promise<IStickerCtx> => {
+    const coreService = ctx.service.get('core:baseService');
+
+    if (!coreService) {
+      console.error('Core service not found. StickerPlugin installation failed.');
+      return {
+        deviceId: '',
+      };
+    }
+
     return {
-      deviceId: (await ctx.api.getDeviceId()).id,
+      deviceId: (await coreService.getDeviceId()).id,
     };
   };
 
@@ -21,7 +30,13 @@ class Sticker extends BBPlugin {
 
     const Sticker = withCtx(pluginCtx, StickerCom);
 
-    ctx.api.registerSlot('leftCol', Sticker, this.id);
+    const systemUIService = ctx.service.get('core:uiService');
+    if (!systemUIService) {
+      console.error('UI service not found. StickerPlugin installation failed.');
+      return;
+    }
+
+    systemUIService.registerSlot('leftCol', Sticker, this.id);
   };
 }
 

package/src/plugins/store/components/storePage.tsx

@@ -25,7 +25,7 @@ const ErrorState = ({ error, onRetry }: { error: Error; onRetry: () => void }) =
 );
 
 export const StorePage = (_: IComPropsRegisteredToSlot) => {
-  const { list, setLoading, isInstalled, install, uninstall } = StoreCtx.useCtx();
+  const { list, setLoading, isInstalled, install, uninstall, get } = StoreCtx.useCtx();
   const [plugins, setPlugins] = useState<Array<IPluginStoreEntry>>([]);
   const [error, setError] = useState<Error | null>(null);
 
@@ -108,6 +108,7 @@ export const StorePage = (_: IComPropsRegisteredToSlot) => {
       <>
         <Table.HCell>功能</Table.HCell>
         <Table.HCell>描述</Table.HCell>
+        <Table.HCell>依赖</Table.HCell>
         <Table.HCell style={{ textAlign: 'right' }}>安装/卸载</Table.HCell>
       </>
     );
@@ -126,6 +127,16 @@ export const StorePage = (_: IComPropsRegisteredToSlot) => {
         <>
           <Table.Cell>{plugin.name}</Table.Cell>
           <Table.Cell>{plugin.description}</Table.Cell>
+          <Table.Cell>
+            {plugin.dependencies && plugin.dependencies.length > 0
+              ? plugin.dependencies
+                  .map(dep => {
+                    const depPlugin = get(dep);
+                    return depPlugin ? depPlugin.name : dep;
+                  })
+                  .join(', ')
+              : ''}
+          </Table.Cell>
           <Table.Cell style={{ textAlign: 'right' }}>
             {pluginInstalled ? (
               <Button
@@ -144,7 +155,7 @@ export const StorePage = (_: IComPropsRegisteredToSlot) => {
         </>
       );
     },
-    [plugins, isInstalled, handleInstall, handleUninstall]
+    [plugins, isInstalled, get, handleUninstall, handleInstall]
   );
 
   if (error) {

package/src/plugins/store/context/index.ts

@@ -6,6 +6,7 @@ export interface IStoreCtx {
   uninstall: (pid: PluginID) => Promise<void>;
   isInstalled: (pid: PluginID) => boolean;
   list: () => Promise<Array<IPluginStoreEntry>> | Array<IPluginStoreEntry>;
+  get: (pid: PluginID) => IPluginStoreEntry | undefined;
   setLoading: (loading: boolean) => void;
 }
 

package/src/plugins/store/index.ts

@@ -1,7 +1,6 @@
-import { BBPlugin } from '#/core/bbplugin';
+import { BBPlugin } from '#/core/plugin-system/bbplugin';
 import { IHostContext } from '#/types/hostApi';
 import { PluginID } from '#/types/plugin';
-import { buildEntryCreator } from '#/utils';
 
 import { StorePage } from './components/storePage';
 import { StoreCtx } from './context';
@@ -9,8 +8,19 @@ import { StoreCtx } from './context';
 export class StorePlugin extends BBPlugin {
   id: PluginID = 'store';
   override onInstall = async (ctx: IHostContext): Promise<void> => {
-    const entryCreator = buildEntryCreator(ctx);
-    entryCreator(
+    const coreService = ctx.service.get('core:baseService');
+    if (!coreService) {
+      console.error('Core service not found. StorePlugin installation failed.');
+      return;
+    }
+
+    const systemUIService = ctx.service.get('core:uiService');
+    if (!systemUIService) {
+      console.error('UI service not found. StorePlugin installation failed.');
+      return;
+    }
+
+    systemUIService.registerPluginEntry(
       {
         path: '/store',
         label: 'cd ./store',
@@ -19,14 +29,15 @@ export class StorePlugin extends BBPlugin {
             install: ctx.store?.installPlugin || (async () => {}),
             uninstall: ctx.store?.disablePlugin || (async () => {}),
             isInstalled: ctx.store?.isPluginInstalled || ((_: PluginID) => false),
+            get: ctx.store?.getPlugin || ((_: PluginID) => undefined),
             list: async () => {
-              ctx.api.setLoading('store', true);
+              coreService.setLoading('store', true);
               const all = Array.from((await ctx.store?.getAllPlugins()) || []);
-              ctx.api.setLoading('store', false);
+              coreService.setLoading('store', false);
               return all.filter(({ id }) => id !== this.id);
             },
             setLoading: (loading: boolean) => {
-              ctx.api.setLoading('store', loading);
+              coreService.setLoading('store', loading);
             },
           },
           StorePage

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

@@ -31,6 +31,7 @@ export interface IPluginEntry {
 }
 
 export type PluginEvents = {
+  'plugin:uninstall': PluginID;
   'plugin:loading:changed': IPluginLoadingPayload;
   'site:loading:changed': boolean;
 };