@bbki.ng/site 5.6.7 → 5.8.0

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);
 
@@ -106,8 +106,9 @@ export const StorePage = (_: IComPropsRegisteredToSlot) => {
   const headerRenderer = useCallback(() => {
     return (
       <>
-        <Table.HCell>插件名称</Table.HCell>
-        <Table.HCell>插件描述</Table.HCell>
+        <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,37 +1,7 @@
-import React from 'react';
-import { Fetcher } from 'swr';
-
-import { type FingerprintData } from '@/utils/fingerprints';
-import { PluginStore } from '#/core/pluginStore';
-
-import { HookPoint, IComPropsRegisteredToSlot, SlotName } from './slots';
-import { 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;
-  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

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

package/src/utils/index.tsx

@@ -1,52 +1,20 @@
-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';
 
-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
-  );
+export const buildEntrySlotCom = (entry: IPluginEntry) => {
+  const Component = (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;
+  };
 
-  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
-  );
+  Component.displayName = `EntrySlotCom(${entry.path})`;
 
-  if (!entry.label) return;
-
-  ctx.api.registerMiddleware(
-    'transformCoverEntry',
-    (entries: Array<LinkProps>) => {
-      return [
-        ...entries,
-        {
-          to: entry.path,
-          children: entry.label,
-        },
-      ];
-    },
-    id,
-    10
-  );
+  return Component;
 };

package/tsconfig.json

@@ -6,7 +6,6 @@
     "noEmit": true,
     "moduleResolution": "bundler",
     "paths": {
-      "@/*": ["./src/blog/*"],
       "#/*": ["./src/*"]
     }
   },

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/blog/app.tsx

@@ -1,52 +0,0 @@
-import React from 'react';
-import { Outlet, Route, Routes } from 'react-router-dom';
-import { NotFound } from '@bbki.ng/ui';
-
-import ArticlePage from '@/pages/extensions/txt/article';
-import Txt from '@/pages/extensions/txt';
-import { BotRedirect } from '@/pages/bot';
-import { BBContext } from '@/context/bbcontext';
-import { Slot } from '#/core/components/SlotComp';
-import { usePlugins } from '#/core/hooks/use_plugins';
-import { SWR } from '@/swr';
-
-import { Cover } from './pages';
-import { usePluginEntries } from './hooks/use_plugin_entries';
-import { BaseLayout } from './components/BaseLayout';
-
-const AppRoutes = () => {
-  usePlugins();
-
-  const pluginEntries = usePluginEntries();
-
-  return (
-    <Routes>
-      <Route path="/" element={<BaseLayout />}>
-        <Route index element={<Cover />} />
-
-        <Route path="blog" element={<Outlet />}>
-          <Route path="" element={<Txt />} />
-          <Route path=":title" element={<ArticlePage />} />
-        </Route>
-
-        <Route path="bot" element={<BotRedirect />} />
-        {pluginEntries?.map(route => (
-          <Route key={route.path} path={route.path} element={<Slot name="route" data={route} />} />
-        ))}
-        <Route path="*" element={pluginEntries?.length ? <NotFound /> : null} />
-      </Route>
-    </Routes>
-  );
-};
-
-export const App = () => {
-  return (
-    <SWR>
-      <BBContext>
-        <AppRoutes />
-      </BBContext>
-    </SWR>
-  );
-};
-
-export default App;

package/src/blog/constants/index.ts

@@ -1 +0,0 @@
-export { ROUTES, ROUTE_NAME, GITHUB_REPO_ADDRESS } from './routes';

package/src/blog/constants/routes.ts

@@ -1,20 +0,0 @@
-export const ROUTES = {
-  INDEX: '/',
-  CONTENT: '/blog',
-  HELP: '/blog/说明书',
-  TAGS: '/tags',
-  LOGIN: '/login',
-  BLOG: '/blog',
-};
-
-export const ROUTE_NAME = {
-  [ROUTES.CONTENT]: '目录',
-  [ROUTES.BLOG]: '文章',
-  unknown: '未知',
-};
-
-export const GITHUB_REPO_ADDRESS = 'https://github.com/bbbottle/bottle/tree/main/apps/site';
-export const API_ENDPOINT = 'https://cf.bbki.ng';
-export const API = {
-  POSTS: 'posts',
-};

package/src/blog/hooks/index.ts

@@ -1,2 +0,0 @@
-export { usePaths } from './use_paths';
-export { useGlobalLoading } from './use_loading';

package/src/blog/hooks/use_blog_context.ts

@@ -1,14 +0,0 @@
-import { GlobalLoadingContext } from '@/context/global_loading_state_provider';
-import { IBlogContext } from '@/types/blog-context';
-import { useContext } from 'react';
-import { useLocation } from 'react-router-dom';
-
-export const useBlogContext = (): IBlogContext => {
-  const globalLoading = useContext(GlobalLoadingContext);
-  const location = useLocation();
-
-  return {
-    gloalLoading: globalLoading.isLoading,
-    location,
-  };
-};

package/src/blog/hooks/use_mouse_position.ts

@@ -1,17 +0,0 @@
-import { useEffect, useRef } from 'react';
-
-export const useMousePosition = () => {
-  const posRef = useRef<{ x: number; y: number }>({ x: 0, y: 0 });
-  useEffect(() => {
-    const updateMousePosition = (e: MouseEvent) => {
-      posRef.current = {
-        x: e.clientX,
-        y: e.clientY,
-      };
-    };
-    window.addEventListener('mousemove', updateMousePosition);
-    return () => window.removeEventListener('mousemove', updateMousePosition);
-  }, []);
-
-  return posRef;
-};

package/src/blog/hooks/use_role.ts

@@ -1,14 +0,0 @@
-export enum Role {
-  KING = 'king',
-  QUEEN = 'queen',
-  ANNO = 'anno',
-}
-
-/**
- * Returns user role
- * Currently always returns ANNO as role-based authentication is now handled via API keys in CLI
- * Frontend role management may be re-implemented in the future
- */
-export const useRole = (): Role => {
-  return Role.ANNO;
-};

package/src/blog/hooks/use_sticker.ts

@@ -1,11 +0,0 @@
-import { pluginManager } from '#/core/pluginManager';
-import { useEffect } from 'react';
-export const useSticker = () => {
-  useEffect(() => {
-    pluginManager.loadPlugin('sticker');
-
-    return () => {
-      pluginManager.disablePlugin('sticker');
-    };
-  }, []);
-};

package/src/blog/pages/index.tsx

@@ -1,2 +0,0 @@
-export { Cover } from './cover';
-export { default as Streaming } from '../../plugins/now/components/streaming';

package/src/blog/pages/login/index.tsx

@@ -1,24 +0,0 @@
-import React from 'react';
-import { ArticlePage } from '@/components/article';
-
-/**
- * Login page
- * Note: OAuth authentication has been removed. Authentication is now handled
- * via API keys in the CLI tool. Frontend authentication may be re-implemented
- * in the future.
- */
-export const Login = () => {
-  return (
-    <ArticlePage title="登录">
-      <div className="prose dark:prose-invert">
-        <p className="text-gray-600 dark:text-gray-400">网页登录功能已暂时禁用。</p>
-        <p className="text-gray-600 dark:text-gray-400">
-          如需管理内容，请使用 CLI 工具并通过 API Key 进行认证：
-        </p>
-        <pre className="bg-gray-100 dark:bg-gray-800 p-4 rounded">
-          <code>bbking login</code>
-        </pre>
-      </div>
-    </ArticlePage>
-  );
-};

package/src/blog/types/blog-context.ts

@@ -1,6 +0,0 @@
-import { Location } from 'react-router-dom';
-
-export interface IBlogContext {
-  gloalLoading: boolean;
-  location: Location;
-}

package/src/blog/types/font.ts

@@ -1,4 +0,0 @@
-export enum FontType {
-  NotoSerifSC = 'noto-serif',
-  Mono = 'font-mono',
-}

package/src/blog/types/glsl.d.ts

@@ -1,8 +0,0 @@
-declare module '*.frag' {
-  const file: string;
-  export default file;
-}
-declare module '*.vert' {
-  const file: string;
-  export default file;
-}

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;
-  }
-}