@bbki.ng/site 5.8.0 → 5.8.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @bbki.ng/site
 
+## 5.8.2
+
+### Patch Changes
+
+- b4037f7: udpate notification zIndex
+
+## 5.8.1
+
+### Patch Changes
+
+- 0790fd3: add notification plugin
+
 ## 5.8.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "5.8.0",
+  "version": "5.8.2",
   "description": "code behind bbki.ng",
   "main": "index.js",
   "type": "module",
@@ -13,6 +13,7 @@
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-router-dom": "6",
+    "sonner": "^2.0.7",
     "swr": "^2.2.5",
     "@bbki.ng/ui": "0.2.19"
   },
@@ -23,8 +24,8 @@
     "@mdx-js/react": "^3.0.0",
     "@mdx-js/rollup": "^3.0.0",
     "@tailwindcss/postcss": "4.1.17",
-    "@tailwindcss/vite": "4.1.17",
     "@tailwindcss/typography": "^0.5.0",
+    "@tailwindcss/vite": "4.1.17",
     "@types/node": "^20.0.0",
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.6",

package/src/{plugins → core/plugin-system}/manifest.ts

@@ -47,4 +47,10 @@ export const FALLBACK_MANIFEST: Array<IPluginManifestEntry> = [
     version: '0.1.0',
     description: '一个简单的博客系统，支持 Markdown 格式的文章',
   },
+  {
+    name: '通知',
+    id: 'notification',
+    version: '0.1.0',
+    description: '接收通知',
+  },
 ];

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

@@ -1,7 +1,6 @@
 import { IHostContext } from '#/types/hostApi';
-import { IPlugin, PluginEvents, PluginID, PluginPerm } from '#/types/plugin';
+import { IPlugin, PluginID, PluginPerm } from '#/types/plugin';
 
-import { createEventBus } from '../utils/eventBus';
 import { AdminPluginIDSet } from '../const';
 import { ServiceRegistry } from '../shared-service/service-registry';
 
@@ -14,8 +13,6 @@ const pluginModules = import.meta.glob('../../plugins/*/index.ts');
 class PluginManager {
   private activePlugins: Map<string, IPlugin> = new Map();
 
-  private bus = createEventBus<PluginEvents>();
-
   private constructor() {
     ServiceRegistry.getInstance().register('core:baseService', CoreService.getInstance());
     ServiceRegistry.getInstance().register('core:uiService', SystemUIService.getInstance());
@@ -45,14 +42,6 @@ class PluginManager {
     return PluginManager.instance;
   }
 
-  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)) {
@@ -67,7 +56,7 @@ class PluginManager {
 
     // try load plugin
     this.loading.add(pluginId);
-    this.bus.emit('plugin:loading:changed', { id: pluginId, loading: true });
+    CoreService.getInstance().setLoading(pluginId, true);
 
     const modulePath = `../../plugins/${pluginId}/index.ts`;
     const moduleLoader = pluginModules[modulePath];
@@ -75,7 +64,7 @@ class PluginManager {
       console.error(`Plugin ${pluginId} not found in registry`);
 
       this.loading.delete(pluginId);
-      this.bus.emit('plugin:loading:changed', { id: pluginId, loading: false });
+      CoreService.getInstance().setLoading(pluginId, false);
 
       return;
     }
@@ -104,7 +93,7 @@ class PluginManager {
       console.error(`Failed to load plugin ${pluginId}:`, error);
     } finally {
       this.loading.delete(pluginId);
-      this.bus.emit('plugin:loading:changed', { id: pluginId, loading: false });
+      CoreService.getInstance().setLoading(pluginId, false);
     }
   }
 

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

@@ -1,18 +1,8 @@
 import { cfApiFetcher } from '#/app/utils';
-import { FALLBACK_MANIFEST } from '#/plugins/manifest';
+import { FALLBACK_MANIFEST } from '#/core/plugin-system/manifest';
 import { IPluginManifestEntry, PluginID } from '#/types/plugin';
 
-const KnownPluginIDSet = new Set<string>([
-  'sticker',
-  'xwy',
-  'extra-cd',
-  'extra-entry',
-  'store',
-  'now',
-  'default',
-  'fx',
-  'blog',
-]);
+const KnownPluginIDSet = new Set<string>(FALLBACK_MANIFEST.map(entry => entry.id));
 
 interface PluginsApiResponse {
   status: string;

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

@@ -163,16 +163,22 @@ export class PluginStore {
     };
   };
 
-  installPlugin: (id: PluginID) => Promise<void> = async id => {
+  installPlugin: (id: PluginID) => Promise<boolean> = async id => {
     if (!this.checkDep(id)) {
       // throw new Error(`Cannot install plugin ${id} due to missing dependencies`);
       console.warn(`Cannot install plugin ${id} due to missing dependencies`);
-      return;
+      return false;
     }
 
-    await pluginManager.loadPlugin(id);
-    this.installedSet.add(id);
-    this.stringify();
+    try {
+      await pluginManager.loadPlugin(id);
+      this.installedSet.add(id);
+      this.stringify();
+      return true;
+    } catch (error) {
+      console.error(`Failed to install plugin ${id}:`, error);
+      return false;
+    }
   };
 
   disablePlugin: (id: PluginID) => Promise<void> = async id => {

package/src/core/shared-service/service-proxy.ts

@@ -14,7 +14,7 @@ export function createServiceProxy<T extends object, K extends keyof ServiceIden
           console.warn(
             `[System] Service ${serviceId} is currently unavailable. Call to ${String(prop)} ignored.`
           );
-          return undefined; // 或者返回一个待定 Promise
+          return {}; // 或者返回一个待定 Promise
         };
       }
 

package/src/core/shared-service/service-registry.ts

@@ -35,7 +35,9 @@ export class ServiceRegistry {
     return target as ServiceIdentifierMap[T];
   }
 
-  get<T extends keyof ServiceIdentifierMap>(name: T): ServiceIdentifierMap[T] | undefined {
+  get<T extends keyof ServiceIdentifierMap>(
+    name: T
+  ): ServiceIdentifierMap[T] | Record<string, never> {
     // const target = this.services.get(name);
     // if (!target) {
     //   console.warn(`Service with name ${name} is not registered.`);

package/src/plugins/notification/components/index.tsx

@@ -0,0 +1,22 @@
+import React, { FC } from 'react';
+import { Toaster } from 'sonner';
+
+import { IComPropsRegisteredToSlot } from '#/types/slots';
+
+export const NotifyComp: FC<IComPropsRegisteredToSlot> = _ => {
+  return (
+    <Toaster
+      position="bottom-center"
+      style={{
+        position: 'fixed',
+        zIndex: 998,
+      }}
+      toastOptions={{
+        style: {
+          borderRadius: 0,
+          border: 'none',
+        },
+      }}
+    />
+  );
+};

package/src/plugins/notification/index.ts

@@ -0,0 +1,26 @@
+import { BBPlugin } from '#/core/plugin-system/bbplugin';
+import { IHostContext } from '#/types/hostApi';
+import { PluginID } from '#/types/plugin';
+
+import { NotifyComp } from './components';
+import { NotificationService } from './services/NotificationService';
+
+export class NotificationPlugin extends BBPlugin {
+  id: PluginID = 'notification' as const;
+
+  private _serviceRegistry?: IHostContext['service'];
+
+  override onInstall = async (ctx: IHostContext) => {
+    this._serviceRegistry = ctx.service;
+    this._serviceRegistry.register('notification', NotificationService.getInstance());
+
+    const coreUIService = ctx.service.get('core:uiService');
+    coreUIService.registerSlot('pageFooter', NotifyComp, this.id);
+  };
+
+  override onDestroy = () => {
+    this._serviceRegistry?.unregister('notification');
+  };
+}
+
+export default new NotificationPlugin();

package/src/plugins/notification/services/INotificationService.ts

@@ -0,0 +1,19 @@
+declare module '#/core/shared-service/service-registry' {
+  interface ServiceIdentifierMap {
+    notification: INotificationService;
+  }
+}
+
+export type NotificationType = 'toast' | 'banner' | 'modal';
+
+export interface INotificationOptions {
+  type?: NotificationType;
+  level?: 'info' | 'success' | 'warning' | 'error';
+  message: string;
+  duration?: number; // 持续时间，单位为毫秒，默认为4000ms
+}
+
+export interface INotificationService {
+  notify: (options: INotificationOptions) => string;
+  dismiss: (id: string) => void;
+}

package/src/plugins/notification/services/NotificationService.ts

@@ -0,0 +1,28 @@
+import { toast } from 'sonner';
+
+import { INotificationOptions, INotificationService } from './INotificationService';
+
+export class NotificationService implements INotificationService {
+  private static instance: NotificationService;
+
+  private constructor() {}
+
+  static getInstance(): NotificationService {
+    if (!NotificationService.instance) {
+      NotificationService.instance = new NotificationService();
+    }
+    return NotificationService.instance;
+  }
+
+  notify(options: INotificationOptions): string {
+    const id = toast(options.message, {
+      duration: options.duration || 3000,
+    });
+
+    return id as string;
+  }
+
+  dismiss(id: string): void {
+    toast.dismiss(id);
+  }
+}

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

@@ -6,6 +6,7 @@ import { IComPropsRegisteredToSlot } from '#/types/slots';
 import { IPluginStoreEntry, PluginID } from '#/types/plugin';
 
 import { StoreCtx } from '../context';
+import { pluginDepDescForHuman } from '../utils';
 
 // 空状态展示
 const EmptyState = () => (
@@ -25,7 +26,8 @@ const ErrorState = ({ error, onRetry }: { error: Error; onRetry: () => void }) =
 );
 
 export const StorePage = (_: IComPropsRegisteredToSlot) => {
-  const { list, setLoading, isInstalled, install, uninstall, get } = StoreCtx.useCtx();
+  const { list, setLoading, isInstalled, install, uninstall, get, notificationService } =
+    StoreCtx.useCtx();
   const [plugins, setPlugins] = useState<Array<IPluginStoreEntry>>([]);
   const [error, setError] = useState<Error | null>(null);
 
@@ -75,15 +77,25 @@ export const StorePage = (_: IComPropsRegisteredToSlot) => {
       setError(null);
 
       try {
-        await install(id);
-        await refreshList();
+        const success = await install(id);
+        if (success) {
+          await refreshList();
+        } else {
+          notificationService.notify({
+            level: 'error',
+            message: `安装插件失败，依赖缺失或其他错误`,
+          });
+        }
       } catch (err) {
-        setError(err instanceof Error ? err : new Error('安装失败'));
+        notificationService.notify({
+          level: 'error',
+          message: `安装插件失败: ${err instanceof Error ? err.message : String(err)}`,
+        });
       } finally {
         setLoading(false);
       }
     },
-    [install, refreshList, setLoading]
+    [install, refreshList, setLoading, notificationService]
   );
 
   const handleUninstall = useCallback(
@@ -108,7 +120,6 @@ export const StorePage = (_: IComPropsRegisteredToSlot) => {
       <>
         <Table.HCell>功能</Table.HCell>
         <Table.HCell>描述</Table.HCell>
-        <Table.HCell>依赖</Table.HCell>
         <Table.HCell style={{ textAlign: 'right' }}>安装/卸载</Table.HCell>
       </>
     );
@@ -126,16 +137,13 @@ export const StorePage = (_: IComPropsRegisteredToSlot) => {
       return (
         <>
           <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(', ')
-              : ''}
+            {plugin.description}
+            {plugin.dependencies && plugin.dependencies.length > 0 && (
+              <div className="mt-4 text-xs text-content-secondary">
+                {pluginDepDescForHuman(plugin, get)}
+              </div>
+            )}
           </Table.Cell>
           <Table.Cell style={{ textAlign: 'right' }}>
             {pluginInstalled ? (

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

@@ -1,13 +1,15 @@
 import { createPluginCtx } from '#/core/context';
+import { NotificationService } from '#/plugins/notification/services/NotificationService';
 import { IPluginStoreEntry, PluginID } from '#/types/plugin';
 
 export interface IStoreCtx {
-  install: (pid: PluginID) => Promise<void>;
+  install: (pid: PluginID) => Promise<boolean>;
   uninstall: (pid: PluginID) => Promise<void>;
   isInstalled: (pid: PluginID) => boolean;
   list: () => Promise<Array<IPluginStoreEntry>> | Array<IPluginStoreEntry>;
   get: (pid: PluginID) => IPluginStoreEntry | undefined;
   setLoading: (loading: boolean) => void;
+  notificationService: NotificationService | Record<string, never>;
 }
 
 export const StoreCtx = createPluginCtx<IStoreCtx>();

package/src/plugins/store/index.ts

@@ -26,7 +26,7 @@ export class StorePlugin extends BBPlugin {
         label: 'cd ./store',
         pageComponent: StoreCtx.withCtx(
           {
-            install: ctx.store?.installPlugin || (async () => {}),
+            install: ctx.store?.installPlugin || (async () => false),
             uninstall: ctx.store?.disablePlugin || (async () => {}),
             isInstalled: ctx.store?.isPluginInstalled || ((_: PluginID) => false),
             get: ctx.store?.getPlugin || ((_: PluginID) => undefined),
@@ -36,6 +36,7 @@ export class StorePlugin extends BBPlugin {
               coreService.setLoading('store', false);
               return all.filter(({ id }) => id !== this.id);
             },
+            notificationService: ctx.service.get('notification'),
             setLoading: (loading: boolean) => {
               coreService.setLoading('store', loading);
             },

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

@@ -0,0 +1,26 @@
+import { IPluginStoreEntry, PluginID } from '#/types/plugin';
+
+export const pluginDepDescForHuman = (
+  plugin: IPluginStoreEntry,
+  infoGetter: (id: PluginID) => IPluginStoreEntry | undefined
+): string => {
+  if (!plugin.dependencies || plugin.dependencies.length === 0) {
+    return '';
+  }
+
+  const desc =
+    plugin.dependencies && plugin.dependencies.length > 0
+      ? plugin.dependencies
+          .map(dep => {
+            const depPlugin = infoGetter(dep);
+            return depPlugin ? depPlugin.name : dep;
+          })
+          .join(', ')
+      : '';
+
+  if (!desc) {
+    return '';
+  }
+
+  return `需要先安装${desc}。`;
+};

package/src/types/plugin.ts

@@ -22,6 +22,7 @@ export type PluginID =
   | 'now'
   | 'default'
   | 'blog'
+  | 'notification'
   | 'fx';
 
 export interface IPluginEntry {