@bbki.ng/site 5.8.9 → 5.8.11

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @bbki.ng/site
 
+## 5.8.11
+
+### Patch Changes
+
+- f631db2: add version plugin
+- Updated dependencies [f631db2]
+  - @bbki.ng/ui@0.2.22
+
+## 5.8.10
+
+### Patch Changes
+
+- 28580cc: update manual install prompt
+
 ## 5.8.9
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "5.8.9",
+  "version": "5.8.11",
   "description": "code behind bbki.ng",
   "main": "index.js",
   "type": "module",
@@ -15,7 +15,7 @@
     "react-router-dom": "6",
     "sonner": "^2.0.7",
     "swr": "^2.2.5",
-    "@bbki.ng/ui": "0.2.21"
+    "@bbki.ng/ui": "0.2.22"
   },
   "devDependencies": {
     "@eslint/compat": "^1.0.0",

package/src/core/hooks/use_plugins.ts

@@ -1,4 +1,5 @@
 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';
@@ -52,6 +53,9 @@ export const usePlugins = () => {
 
   usePluginsLoading();
 
+  const nav = useNavigate();
+  CoreService.getInstance().injectNavigate(nav);
+
   useEffect(() => {
     const unregister = setGlobalLoading('plugins', !done);
 

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

@@ -8,6 +8,7 @@ export class BBPlugin implements IPlugin {
   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/pluginManager.ts

@@ -43,7 +43,7 @@ class PluginManager {
   }
 
   // enable abort ctrl
-  async loadPlugin(pluginId: PluginID) {
+  async loadPlugin(pluginId: PluginID): Promise<IPlugin | undefined> {
     if (this.activePlugins.has(pluginId)) {
       console.warn(`Plugin ${pluginId} is already loaded.`);
       return;
@@ -88,6 +88,7 @@ class PluginManager {
       }
 
       this.activePlugins.set(pluginId, p);
+      return p;
     } catch (error) {
       console.error(`Failed to load plugin ${pluginId}:`, error);
     } finally {
@@ -96,6 +97,10 @@ class PluginManager {
     }
   }
 
+  getPlugin(pluginId: PluginID): IPlugin | undefined {
+    return this.activePlugins.get(pluginId);
+  }
+
   async disablePlugin(pluginId: PluginID) {
     const plugin = this.activePlugins.get(pluginId);
     if (!plugin) {

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

@@ -164,7 +164,7 @@ export class PluginStore {
     };
   };
 
-  installPlugin: (id: PluginID) => Promise<boolean> = async id => {
+  installPlugin: (id: PluginID, manual?: boolean) => Promise<boolean> = async (id, manual) => {
     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`);
@@ -172,7 +172,10 @@ export class PluginStore {
     }
 
     try {
-      await pluginManager.loadPlugin(id);
+      const plugin = await pluginManager.loadPlugin(id);
+      if (manual && plugin?.onManualInstall) {
+        plugin.onManualInstall();
+      }
       this.installedSet.add(id);
       this.stringify();
       return true;

package/src/core/plugin-system/services/coreService.ts

@@ -1,4 +1,5 @@
 import { Fetcher } from 'swr';
+import { NavigateFunction } from 'react-router-dom';
 
 import { getStableDeviceId } from '#/app/utils/fingerprints';
 import { cfApiFetcher } from '#/app/utils';
@@ -13,9 +14,27 @@ export class CoreService implements ICoreService {
   private constructor() {}
 
   private bus = createEventBus<PluginEvents>();
+  private navigate?: NavigateFunction;
 
   getDeviceId = getStableDeviceId;
 
+  injectNavigate(nav: NavigateFunction) {
+    this.navigate = nav;
+  }
+
+  open = (url: string, options?: { newTab?: boolean }) => {
+    // use navigate
+    if (this.navigate) {
+      this.navigate(url);
+    } else {
+      if (options?.newTab) {
+        window.open(url, '_blank');
+      } else {
+        window.location.href = url;
+      }
+    }
+  };
+
   getVersionHash() {
     const hashStr: string = typeof GLOBAL_COMMIT_HASH === 'string' ? GLOBAL_COMMIT_HASH : '0000000';
     return hashStr;

package/src/core/shared-service/contract/ICoreService.ts

@@ -1,4 +1,5 @@
 import { Fetcher } from 'swr';
+import { NavigateFunction } from 'react-router-dom';
 
 import { FingerprintData } from '#/app/utils/fingerprints';
 import { PluginID } from '#/types/plugin';
@@ -19,5 +20,9 @@ export interface ICoreService {
   subscribePluginUninstall(listener: (payload: PluginID) => void): () => void;
   notifyPluginUninstall(id: PluginID): void;
 
+  injectNavigate: (nav: NavigateFunction) => void;
+
+  open: (url: string, options?: { newTab?: boolean }) => void;
+
   fetch: Fetcher;
 }

package/src/plugins/blog/components/BlogLink.tsx

@@ -0,0 +1,11 @@
+import { Link } from '@bbki.ng/ui';
+
+const LinkCom = () => {
+  return (
+    <Link to="/blog" className="ml-[var(--toast-button-margin-start)]">
+      打开
+    </Link>
+  );
+};
+
+export const BlogLink = <LinkCom />;

package/src/plugins/blog/index.ts

@@ -5,6 +5,7 @@ import { IHostContext } from '#/types/hostApi';
 import { PluginID } from '#/types/plugin';
 
 import { BlogPageApp } from './components/app';
+import { BlogLink } from './components/BlogLink';
 import { BlogContext } from './context';
 import { BlogUIService } from './services/BlogUIService';
 
@@ -51,6 +52,18 @@ export class BlogPlugin extends BBPlugin {
     );
   };
 
+  override onManualInstall = () => {
+    this.promptToOpen();
+  };
+
+  private promptToOpen = () => {
+    const notificationService = this._serviceRegistry?.get('notification');
+    notificationService?.notify({
+      message: '博客安装成功.',
+      action: BlogLink,
+    });
+  };
+
   override onDestroy?: (() => void) | undefined = () => {
     BlogUIService.getInstance().unregisterAllByPluginId(this.id);
     this._serviceRegistry?.unregister('blog:uiService');

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

@@ -22,14 +22,14 @@ const useLoadingState = () => {
 
 export const FxCom = (_: IComPropsRegisteredToSlot) => {
   const ctx = FxContext.useCtx();
-  const hashStr = ctx.versionHash;
+  // const hashStr = ctx.versionHash;
   const deviceId = ctx.deviceId;
   const isLoading = useLoadingState();
 
   const textEffects = useTextEffects();
 
   const effects: Effect[] = useMemo(() => {
-    const wmLines = [hashStr];
+    const wmLines = [];
     if (deviceId) wmLines.push(deviceId);
 
     return [
@@ -39,7 +39,7 @@ export const FxCom = (_: IComPropsRegisteredToSlot) => {
       watermark({ lines: wmLines }),
       ...textEffects,
     ];
-  }, [isLoading, deviceId, hashStr, textEffects]);
+  }, [isLoading, deviceId, textEffects]);
 
   return <EffectLayer effects={effects} />;
 };

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

@@ -16,6 +16,10 @@ export const NotifyComp: FC<IComPropsRegisteredToSlot> = _ => {
           borderRadius: 0,
           border: 'none',
         },
+        classNames: {
+          actionButton: 'rounded-none!',
+          toast: 'font-mono',
+        },
       }}
     />
   );

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

@@ -1,3 +1,6 @@
+import type React from 'react';
+import { ToastT } from 'sonner';
+
 declare module '#/core/shared-service/service-registry' {
   interface ServiceIdentifierMap {
     notification: INotificationService;
@@ -6,10 +9,12 @@ declare module '#/core/shared-service/service-registry' {
 
 export type NotificationType = 'toast' | 'banner' | 'modal';
 
-export interface INotificationOptions {
-  type?: NotificationType;
-  level?: 'info' | 'success' | 'warning' | 'error';
-  message: string;
+export interface INotificationOptions extends Omit<
+  ToastT,
+  'message' | 'id' | 'type' | 'title' | 'jsx' | 'delete' | 'promise'
+> {
+  uiType?: NotificationType;
+  message: (() => React.ReactNode) | React.ReactNode;
   duration?: number; // 持续时间，单位为毫秒，默认为4000ms
 }
 

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

@@ -17,6 +17,7 @@ export class NotificationService implements INotificationService {
   notify(options: INotificationOptions): string {
     const id = toast(options.message, {
       duration: options.duration || 3000,
+      ...options,
     });
 
     return id as string;

package/src/plugins/now/components/NowLink.tsx

@@ -0,0 +1,7 @@
+import { Link } from '@bbki.ng/ui';
+
+export const NowLink = (
+  <Link to="/now" className="ml-[var(--toast-button-margin-start)]">
+    打开
+  </Link>
+);

package/src/plugins/now/index.ts

@@ -3,13 +3,17 @@ import { IHostContext } from '#/types/hostApi';
 import { PluginID } from '#/types/plugin';
 
 import { pageNow } from './components';
+import { NowLink } from './components/NowLink';
 import { NowCtx } from './context';
 
 export class NowPlugin extends BBPlugin {
   id: PluginID = 'now';
 
+  private _serviceRegistry?: IHostContext['service'];
+
   override onInstall = async (ctx: IHostContext): Promise<void> => {
     const systemUIService = ctx.service.get('core:uiService');
+    this._serviceRegistry = ctx.service;
     if (!systemUIService) {
       console.warn(`[${this.id}] core:uiService not found, cannot register entry`);
       return;
@@ -41,6 +45,18 @@ export class NowPlugin extends BBPlugin {
       this.id
     );
   };
+
+  override onManualInstall = () => {
+    this.promptToOpen();
+  };
+
+  private promptToOpen = () => {
+    const notificationService = this._serviceRegistry?.get('notification');
+    notificationService?.notify({
+      message: '安装成功.',
+      action: NowLink,
+    });
+  };
 }
 
 export default new NowPlugin();

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

@@ -17,7 +17,7 @@ const EmptyState = () => (
 
 // 错误状态展示
 const ErrorState = ({ error, onRetry }: { error: Error; onRetry: () => void }) => (
-  <div className="flex flex-col items-center justify-center p-8">
+  <div className="flex flex-col items-start justify-center p-8">
     <p className="text-content-danger text-sm mb-4">加载失败: {error.message}</p>
     <Button onClick={onRetry} size="sm">
       重试
@@ -77,18 +77,16 @@ export const StorePage = (_: IComPropsRegisteredToSlot) => {
       setError(null);
 
       try {
-        const success = await install(id);
+        const success = await install(id, true);
         if (success) {
           await refreshList();
         } else {
           notificationService.notify({
-            level: 'error',
             message: `安装插件失败，依赖缺失或其他错误`,
           });
         }
       } catch (err) {
         notificationService.notify({
-          level: 'error',
           message: `安装插件失败: ${err instanceof Error ? err.message : String(err)}`,
         });
       } finally {

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

@@ -3,7 +3,7 @@ import { NotificationService } from '#/plugins/notification/services/Notificatio
 import { IPluginStoreEntry, PluginID } from '#/types/plugin';
 
 export interface IStoreCtx {
-  install: (pid: PluginID) => Promise<boolean>;
+  install: (pid: PluginID, manual?: boolean) => Promise<boolean>;
   uninstall: (pid: PluginID) => Promise<void>;
   isInstalled: (pid: PluginID) => boolean;
   list: () => Promise<Array<IPluginStoreEntry>> | Array<IPluginStoreEntry>;

package/src/plugins/version/index.ts

@@ -0,0 +1,28 @@
+import { BBPlugin } from '#/core/plugin-system/bbplugin';
+import { IHostContext } from '#/types/hostApi';
+import { PluginID } from '#/types/plugin';
+
+export class VersionPlugin extends BBPlugin {
+  id: PluginID = 'version';
+
+  private _clear = () => {};
+
+  override onInstall?: ((ctx: IHostContext) => void | Promise<void>) | undefined = async ctx => {
+    const fxService = ctx.service.get('fx:service');
+
+    const hash = await ctx.service.get('core:baseService')?.getVersionHash();
+
+    this._clear = fxService.drawText({
+      text: `version: ${hash}`,
+      color: '#f8babc',
+      y: window.innerHeight - 50,
+      x: 16,
+    });
+  };
+
+  override onDestroy?: (() => void) | undefined = () => {
+    this._clear?.();
+  };
+}
+
+export default new VersionPlugin();

package/src/plugins/xwy/components/XwyLink.tsx

@@ -0,0 +1,7 @@
+import { Link } from '@bbki.ng/ui';
+
+export const XwyLink = (
+  <Link to="/blog/小乌鸦合集" className="ml-[var(--toast-button-margin-start)]">
+    打开
+  </Link>
+);

package/src/plugins/xwy/index.ts

@@ -12,14 +12,18 @@ import {
   transformPostContent,
   pinTitle,
 } from './transformers';
+import { XwyLink } from './components/XwyLink';
 
 class XwyPlugin extends BBPlugin {
   id: PluginID = 'xwy';
 
   private loadedFonts = new Set<string>();
 
+  private _serviceRegistry?: IHostContext['service'];
+
   override onInstall = (ctx: IHostContext) => {
     // add font loading listener
+    this._serviceRegistry = ctx.service;
     this.initFontLoadingListener();
 
     // 加载所有需要的字体文件
@@ -64,6 +68,18 @@ class XwyPlugin extends BBPlugin {
     }
   }
 
+  override onManualInstall = () => {
+    this.promptToOpen();
+  };
+
+  private promptToOpen = () => {
+    const notificationService = this._serviceRegistry?.get('notification');
+    notificationService?.notify({
+      message: '小乌鸦安装成功.',
+      action: XwyLink,
+    });
+  };
+
   private initFontLoadingListener() {
     // listen font loading status and add class to body for styling
     console.log('Initializing font loading listener');

package/src/types/plugin.ts

@@ -11,12 +11,15 @@ export interface IPlugin {
   onInstall?: (ctx: IHostContext) => void | Promise<void>;
   onDisable?: () => Promise<void> | void;
   onDestroy?: () => void;
+
+  onManualInstall?: () => void;
 }
 
 export type PluginID =
   | 'sticker'
   | 'xwy'
   | 'extra-cd'
+  | 'version'
   | 'extra-entry'
   | 'store'
   | 'now'