@bbki.ng/site 5.8.11 → 6.0.1

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @bbki.ng/site
 
+## 6.0.1
+
+### Patch Changes
+
+- 02b0627: fix style
+- 39f4f29: fix style error
+- 8d26c74: update version color
+- aea84cf: fix style
+- Updated dependencies [39f4f29]
+- Updated dependencies [8d26c74]
+- Updated dependencies [aea84cf]
+  - @bbki.ng/plugin-sdk@1.0.1
+  - @bbki.ng/plugins@1.0.1
+  - @bbki.ng/core@1.0.1
+  - @bbki.ng/ui@1.0.1
+
+## 6.0.0
+
+### Major Changes
+
+- 7edb536: refactor plugins
+
+### Patch Changes
+
+- Updated dependencies [7edb536]
+  - @bbki.ng/plugin-sdk@1.0.0
+  - @bbki.ng/plugins@1.0.0
+  - @bbki.ng/core@1.0.0
+  - @bbki.ng/ui@1.0.0
+
 ## 5.8.11
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "5.8.11",
+  "version": "6.0.1",
   "description": "code behind bbki.ng",
   "main": "index.js",
   "type": "module",
@@ -15,7 +15,10 @@
     "react-router-dom": "6",
     "sonner": "^2.0.7",
     "swr": "^2.2.5",
-    "@bbki.ng/ui": "0.2.22"
+    "@bbki.ng/core": "1.0.1",
+    "@bbki.ng/plugin-sdk": "1.0.1",
+    "@bbki.ng/plugins": "1.0.1",
+    "@bbki.ng/ui": "1.0.1"
   },
   "devDependencies": {
     "@eslint/compat": "^1.0.0",
@@ -58,7 +61,7 @@
     "vite-plugin-mdx": "^3.5.8",
     "vite-plugin-pwa": "0.19",
     "workbox-window": "^6.3.0",
-    "@bbki.ng/config": "1.0.9"
+    "@bbki.ng/config": "2.0.1"
   },
   "author": "bbbottle",
   "license": "MIT",

package/src/app/app.tsx

@@ -1,16 +1,17 @@
-import React from 'react';
-import { Route, Routes } from 'react-router-dom';
+import { Route, Routes, useNavigate } from 'react-router-dom';
+import { usePlugins, usePluginEntries } from '@bbki.ng/core/react';
+import { IPluginEntry } from '@bbki.ng/plugin-sdk';
 
 import { BotRedirect } from '#/app/components/bot';
-import { BBContext } from '#/app/context/bbcontext';
-import { usePlugins } from '#/core/hooks/use_plugins';
 import { Cover } from '#/app/components/cover';
+import { BBContext } from '#/app/context/bbcontext';
 import { SWR } from '#/app/swr';
-import { usePluginEntries } from '#/app/hooks/use_plugin_entries';
 import { BaseLayout } from '#/app/components/BaseLayout';
 
 const AppRoutes = () => {
-  usePlugins();
+  const { injectNavigate } = usePlugins();
+  const nav = useNavigate();
+  injectNavigate(nav);
 
   const pluginEntries = usePluginEntries();
 
@@ -19,7 +20,7 @@ const AppRoutes = () => {
       <Route path="/" element={<BaseLayout />}>
         <Route index element={<Cover />} />
         <Route path="bot" element={<BotRedirect />} />
-        {pluginEntries?.map(route => {
+        {pluginEntries?.map((route: IPluginEntry) => {
           const Com = route.pageComponent;
           return <Route key={route.path} path={`${route.path}/*`} element={<Com data={route} />} />;
         })}

package/src/app/components/BaseLayout.tsx

@@ -1,11 +1,13 @@
 import React, { useContext } from 'react';
 import { useNavigate, Outlet } from 'react-router-dom';
-import { Logo, Nav, Page, Grid, ErrorBoundary, Container } from '@bbki.ng/ui';
+import { Logo } from '@bbki.ng/ui/logo';
+import { Nav } from '@bbki.ng/ui/nav';
+import { Page, ErrorBoundary } from '@bbki.ng/ui/page';
+import { Grid } from '@bbki.ng/ui/grid';
+import { Container } from '@bbki.ng/ui/container';
 
-import { Slot } from '#/core/components/SlotComp';
+import { Slot, GlobalLoadingContext, useMiddlewareTransformedData } from '@bbki.ng/core/react';
 import { usePaths } from '#/app/hooks/use_paths';
-import { GlobalLoadingContext } from '#/app/context/global_loading_state_provider';
-import { useMiddlewareTransformedData } from '#/core/hooks/useMiddlewareTransData';
 
 export const BaseLayout = () => {
   const paths = usePaths();

package/src/app/components/cover/index.tsx

@@ -1,10 +1,14 @@
 import React from 'react';
-import { LinkProps, LinkListProps, LinkList } from '@bbki.ng/ui';
+import type { LinkProps } from '@bbki.ng/ui/link';
+import { LinkList } from '@bbki.ng/ui/list';
+import type { LinkListProps } from '@bbki.ng/ui/list';
 
-import { usePluginEntries } from '#/app/hooks/use_plugin_entries';
-import { useMiddlewareTransformedData } from '#/core/hooks/useMiddlewareTransData';
-import { Slot } from '#/core/components/SlotComp';
-import { useGlobalLoading } from '#/app/hooks/use_global_loading';
+import {
+  usePluginEntries,
+  useMiddlewareTransformedData,
+  Slot,
+  useGlobalLoading,
+} from '@bbki.ng/core/react';
 
 const CenterLinkList = (props: LinkListProps) => {
   return (

package/src/app/context/bbcontext.tsx

@@ -1,6 +1,6 @@
 import React, { ReactNode } from 'react';
 
-import { GlobalLoadingStateProvider } from '#/app/context/global_loading_state_provider';
+import { GlobalLoadingStateProvider } from '@bbki.ng/core/react';
 import { GlobalRoutesProvider } from '#/app/context/global_routes_provider';
 
 export const BBContext = (props: { children: ReactNode }) => {

package/src/app/index.tsx

@@ -2,15 +2,32 @@ import React from 'react';
 import { createRoot } from 'react-dom/client';
 import { BrowserRouter as Router } from 'react-router-dom';
 
+import { createPluginRuntime } from '@bbki.ng/core';
+import { PluginRuntimeProvider } from '@bbki.ng/core/react';
+import { builtinPluginModules, FALLBACK_MANIFEST } from '@bbki.ng/plugins';
+import { cfApiFetcher } from '#/app/utils';
+import { getStableDeviceId } from '#/app/utils/fingerprints';
+
 import { App } from './app';
 import './main.css';
 
+const runtime = createPluginRuntime({
+  fetcher: cfApiFetcher,
+  getDeviceId: getStableDeviceId,
+  versionHash: typeof GLOBAL_COMMIT_HASH === 'string' ? GLOBAL_COMMIT_HASH : '0000000',
+  fallbackManifest: FALLBACK_MANIFEST,
+  builtinPluginModules,
+  adminPluginIds: new Set(['store']),
+});
+
 export const RenderApp = (ele: Element) => {
   const root = createRoot(ele);
   root.render(
     <React.StrictMode>
       <Router>
-        <App />
+        <PluginRuntimeProvider runtime={runtime}>
+          <App />
+        </PluginRuntimeProvider>
       </Router>
     </React.StrictMode>
   );

package/src/types/hostApi.ts

@@ -1,5 +1,4 @@
-import { PluginStore } from '#/core/plugin-system/pluginStore';
-import { type ServiceRegistry } from '#/core/shared-service/service-registry';
+import type { PluginStore, ServiceRegistry } from '@bbki.ng/core';
 
 export interface IHostContext {
   store?: PluginStore;

package/src/app/context/global_loading_state_provider.tsx

@@ -1,65 +0,0 @@
-import React, { createContext, ReactNode, useState, useCallback, useMemo } from 'react';
-
-type LoadingStates = Map<string, boolean>;
-
-type LoadingContext = {
-  isLoading: boolean;
-  register: (id: string) => void;
-  setLoading: (id: string, loading: boolean) => void;
-  unregister: (id: string) => void;
-};
-
-export const GlobalLoadingContext = createContext<LoadingContext>({
-  isLoading: false,
-  register: () => {},
-  setLoading: () => {},
-  unregister: () => {},
-});
-
-export const GlobalLoadingStateProvider = (props: { children: ReactNode }) => {
-  const [loadingStates, setLoadingStates] = useState<LoadingStates>(new Map());
-
-  const register = useCallback((id: string) => {
-    setLoadingStates(prev => {
-      const next = new Map(prev);
-      next.set(id, false);
-      return next;
-    });
-  }, []);
-
-  const setLoading = useCallback((id: string, loading: boolean) => {
-    setLoadingStates(prev => {
-      const next = new Map(prev);
-      next.set(id, loading);
-      return next;
-    });
-  }, []);
-
-  const unregister = useCallback((id: string) => {
-    setLoadingStates(prev => {
-      const next = new Map(prev);
-      next.delete(id);
-      return next;
-    });
-  }, []);
-
-  const isLoading = useMemo(() => {
-    return Array.from(loadingStates.values()).some(Boolean);
-  }, [loadingStates]);
-
-  const contextValue = useMemo(
-    () => ({
-      isLoading,
-      register,
-      setLoading,
-      unregister,
-    }),
-    [isLoading, register, setLoading, unregister]
-  );
-
-  return (
-    <GlobalLoadingContext.Provider value={contextValue}>
-      {props.children}
-    </GlobalLoadingContext.Provider>
-  );
-};

package/src/app/hooks/use_global_loading.ts

@@ -1,47 +0,0 @@
-import { useCallback, useContext, useEffect } from 'react';
-
-import { GlobalLoadingContext } from '#/app/context/global_loading_state_provider';
-
-/**
- * Hook to register a loading state with the global loading context.
- * The global loading state is true if ANY registered loading state is true.
- *
- * @param id - Unique identifier for this loading state
- * @param loading - Whether this specific loading state is active
- */
-export function useGlobalLoading(
-  id?: string | undefined,
-  loading?: boolean | undefined
-): {
-  isLoading: boolean;
-  setGlobalLoading: (key: string, loadingFromManual: boolean) => () => void;
-} {
-  const { register, setLoading, unregister, isLoading } = useContext(GlobalLoadingContext);
-
-  useEffect(() => {
-    if (!id || loading === undefined) return;
-
-    register(id);
-    setLoading(id, loading);
-    return () => {
-      unregister(id);
-    };
-  }, [id, loading, register, setLoading, unregister]);
-
-  const setGlobalLoading = useCallback(
-    (key: string, loadingFromManual: boolean) => {
-      register(key);
-      setLoading(key, loadingFromManual);
-
-      return () => {
-        unregister(key);
-      };
-    },
-    [register, setLoading, unregister]
-  );
-
-  return {
-    isLoading,
-    setGlobalLoading,
-  };
-}

package/src/app/hooks/use_plugin_entries.ts

@@ -1,34 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-
-import { SystemUIService } from '#/core/plugin-system/services/systemUIService';
-import { IPluginEntry } from '#/types/plugin';
-
-const protectedRoutesSet = new Set<string>(['/bot', '/', 'default']);
-
-const emptyEntries: Array<IPluginEntry> = [];
-
-export const usePluginEntries = () => {
-  const [entries, setEntries] = useState<Array<IPluginEntry>>(() =>
-    SystemUIService.getInstance().getPluginEntries()
-  );
-
-  useEffect(() => {
-    const service = SystemUIService.getInstance();
-    setEntries(service.getPluginEntries());
-
-    const unsubscribe = service.subscribePluginEntryChange(() => {
-      setEntries(service.getPluginEntries());
-    });
-
-    return () => {
-      unsubscribe();
-    };
-  }, []);
-
-  const safeEntries = useMemo(
-    () => entries?.filter(entry => !protectedRoutesSet.has(entry.path)),
-    [entries]
-  );
-
-  return safeEntries ?? emptyEntries;
-};

package/src/core/components/SlotComp.tsx

@@ -1,14 +0,0 @@
-import React from 'react';
-
-import { SystemUIService } from '#/core/plugin-system/services/systemUIService';
-import { createSlotComponent } from '#/core/shared-service/factory/createUIServiceReactKit';
-
-import { SystemSlotName } from '../shared-service/contract/IUIService';
-
-export interface ISlotProps {
-  name: SystemSlotName;
-  data?: unknown;
-  placeholder?: React.ReactNode;
-}
-
-export const Slot = createSlotComponent<SystemSlotName>(SystemUIService.getInstance());

package/src/core/const/index.ts

@@ -1,3 +0,0 @@
-import { PluginID } from '#/types/plugin';
-
-export const AdminPluginIDSet: Set<PluginID> = new Set(['store']);

package/src/core/context/createPluginCtx.tsx

@@ -1,60 +0,0 @@
-import React, { createContext, useContext, ComponentType } from 'react';
-
-import { IComPropsRegisteredToSlot } from '#/types/slots';
-
-/**
- * 创建插件专属的 Context 工具集
- */
-export function createPluginCtx<T>() {
-  const Ctx = createContext<T | null>(null);
-
-  /**
-   * 在组件内部使用，获取插件上下文
-   * @throws 如果不在 Provider 内会抛出错误
-   */
-  const useCtx = (): T => {
-    const val = useContext(Ctx);
-    if (!val) {
-      throw new Error(
-        'useCtx must be used within a Plugin Context Provider. ' +
-          'Make sure your component is wrapped by withCtx().'
-      );
-    }
-    return val;
-  };
-
-  /**
-   * 高阶组件：为组件注入插件上下文
-   *
-   * @param picker - 从 IHostContext 中提取需要的值
-   * @param Component - 基础组件
-   * @returns 接收 IHostContext 并返回包装后组件的函数
-   *
-   * 使用方式:
-   * const Enhanced = withCtx(picker, BaseComp)(ctx);
-   * ctx.api.registerSlot('slotName', Enhanced, pluginId);
-   */
-  const withCtx = <P extends IComPropsRegisteredToSlot>(
-    ctx: T,
-    Component: React.ComponentType<P>
-  ): ComponentType<P> => {
-    const WrappedComponent: React.FC<P> = props => {
-      return (
-        <Ctx.Provider value={ctx}>
-          <Component {...props} />
-        </Ctx.Provider>
-      );
-    };
-
-    return WrappedComponent;
-  };
-
-  return {
-    /** React Context 对象，通常不需要直接使用 */
-    Ctx,
-    /** 在组件内部使用，获取插件上下文 */
-    useCtx,
-    /** 高阶组件，用于包装组件并注入 Context */
-    withCtx,
-  };
-}

package/src/core/context/index.ts

@@ -1 +0,0 @@
-export { createPluginCtx } from './createPluginCtx';

package/src/core/hooks/index.ts

@@ -1,6 +0,0 @@
-export { useSlotComp } from './useSlotComp';
-export { useMiddlewareRunner } from './useMiddlewareTransData';
-export type {
-  UseMiddlewareRunnerOptions as UseMiddlewareTransDataOptions,
-  UseMiddlewareRunnerResult as UseMiddlewareTransDataResult,
-} from './useMiddlewareTransData';

package/src/core/hooks/useMiddlewareTransData.ts

@@ -1,13 +0,0 @@
-import {
-  createMiddlewareRunnerHook,
-  createMiddlewareTransformedDataHook,
-} from '#/core/shared-service/factory/createUIServiceReactKit';
-import { SystemUIService } from '#/core/plugin-system/services/systemUIService';
-
-export const useMiddlewareRunner = createMiddlewareRunnerHook(SystemUIService.getInstance());
-export const useMiddlewareTransformedData =
-  createMiddlewareTransformedDataHook(useMiddlewareRunner);
-export type {
-  UseMiddlewareRunnerOptions,
-  UseMiddlewareRunnerResult,
-} from '#/core/shared-service/factory/createUIServiceReactKit';

package/src/core/hooks/useSlotComp.ts

@@ -1,4 +0,0 @@
-import { createSlotHook } from '#/core/shared-service/factory/createUIServiceReactKit';
-import { SystemUIService } from '#/core/plugin-system/services/systemUIService';
-
-export const useSlotComp = createSlotHook(SystemUIService.getInstance());

package/src/core/hooks/use_plugins.ts

@@ -1,115 +0,0 @@
-import { useEffect, useMemo, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
-
-import { useGlobalLoading } from '#/app/hooks/use_global_loading';
-import { pluginManager } from '#/core/plugin-system/pluginManager';
-import { PluginID } from '#/types/plugin';
-
-import { PluginManifestService } from '../plugin-system/pluginManifestService';
-import { PluginStore } from '../plugin-system/pluginStore';
-import { CoreService } from '../plugin-system/services/coreService';
-
-const usePluginsLoading = () => {
-  const { setGlobalLoading, isLoading } = useGlobalLoading();
-
-  useEffect(() => {
-    CoreService.getInstance().setSiteLoading(isLoading);
-  }, [isLoading]);
-
-  useEffect(() => {
-    let unregisters = new Map<string, () => void>();
-
-    const unsubscribe = CoreService.getInstance().subscribePluginLoading(payload => {
-      unregisters.set(payload.id, setGlobalLoading(payload.id, payload.loading));
-    });
-
-    return () => {
-      unsubscribe();
-      unregisters.forEach(unregister => unregister());
-    };
-  }, [setGlobalLoading]);
-};
-
-/**
- * 通用插件管理 hook
- * 根据传入的插件ID列表加载和卸载插件
- *
- * @param pluginIds - 要加载的插件ID列表
- *
- * @example
- * usePlugins(['sticker', 'fontstyler']);
- */
-export const usePlugins = () => {
-  const [done, setDone] = useState(false);
-
-  const installedPlugins = PluginStore.getInstance().getInstalledPlugins();
-
-  const { setGlobalLoading } = useGlobalLoading();
-
-  const pluginIds: Array<PluginID> = useMemo(
-    () => [...Array.from(installedPlugins), 'store'],
-    [installedPlugins]
-  );
-
-  usePluginsLoading();
-
-  const nav = useNavigate();
-  CoreService.getInstance().injectNavigate(nav);
-
-  useEffect(() => {
-    const unregister = setGlobalLoading('plugins', !done);
-
-    return () => {
-      unregister();
-    };
-  }, [done, setGlobalLoading]);
-
-  useEffect(() => {
-    let cancelled = false;
-
-    PluginManifestService.getInstance()
-      .fetch()
-      .then(() => {
-        if (cancelled) {
-          return;
-        }
-        const loadNext = (index: number) => {
-          if (cancelled || index >= pluginIds.length) {
-            if (!cancelled) {
-              setDone(true);
-            }
-            return;
-          }
-
-          const id = pluginIds[index];
-          pluginManager
-            .loadPlugin(id)
-            .then(() => loadNext(index + 1))
-            .catch(error => {
-              if (!cancelled) {
-                console.error(`Error loading plugin ${id}:`, error);
-                // 即使某个插件加载失败，也继续加载下一个
-                loadNext(index + 1);
-              }
-            });
-        };
-
-        loadNext(0);
-      })
-      .catch(error => {
-        if (!cancelled) {
-          console.error('Error fetching plugin manifest:', error);
-        }
-      });
-
-    return () => {
-      cancelled = true;
-      // 卸载所有指定的插件
-      pluginIds.forEach(id => {
-        pluginManager.disablePlugin(id);
-      });
-    };
-  }, [pluginIds]);
-
-  return done;
-};

package/src/core/plugin-system/bbplugin.ts

@@ -1,15 +0,0 @@
-import { IHostContext } from '#/types/hostApi';
-import { IPlugin, IPluginManifestEntry, PluginID } from '#/types/plugin';
-
-import { PluginManifestService } from './pluginManifestService';
-
-export class BBPlugin implements IPlugin {
-  id: PluginID = 'default';
-  onInstall?: ((ctx: IHostContext) => void | Promise<void>) | undefined;
-  onDisable?: (() => Promise<void> | void) | undefined;
-  onDestroy?: (() => void) | undefined;
-  onManualInstall?: (() => void) | undefined;
-  getMeta(): IPluginManifestEntry {
-    return PluginManifestService.getInstance().getPlugin(this.id) as IPluginManifestEntry;
-  }
-}

package/src/core/plugin-system/manifest.ts

@@ -1,56 +0,0 @@
-import { IPluginManifestEntry } from '#/types/plugin';
-
-export const FALLBACK_MANIFEST: Array<IPluginManifestEntry> = [
-  {
-    name: '贴纸',
-    id: 'sticker',
-    version: '0.1.0',
-    description: '在页面一些地方显示奇怪的贴纸',
-  },
-  {
-    name: '插件商店',
-    id: 'store',
-    version: '0.1.0',
-    description: '一个管理 bbki.ng 插件的商店',
-    perm: 'admin',
-  },
-  {
-    name: '最近',
-    id: 'now',
-    version: '1.0.0',
-    description: '显示网站最近更新的版本，以及一些文字动态',
-  },
-  {
-    name: '捷径',
-    id: 'extra-cd',
-    version: '0.1.0',
-    description:
-      '提供额外的页面跳转链接。例如在标题列表末尾添加一个 "cd ~" 的选项，点击后跳转到主页',
-    dependencies: ['blog'],
-  },
-  {
-    name: '特效',
-    id: 'fx',
-    version: '0.1.0',
-    description: '提供一些额外的视觉效果。例如版本、设备信息水印，加载状态螺旋线、背景纹理等',
-  },
-  {
-    name: '小乌鸦',
-    id: 'xwy',
-    version: '0.1.0',
-    description: '为小乌鸦合集实现定制功能或者样式的插件',
-    dependencies: ['blog'],
-  },
-  {
-    name: '博客',
-    id: 'blog',
-    version: '0.1.0',
-    description: '一个简单的博客系统，支持 Markdown 格式的文章',
-  },
-  {
-    name: '通知',
-    id: 'notification',
-    version: '0.1.0',
-    description: '接收通知',
-  },
-];