@bbki.ng/site 5.8.8 → 5.8.9

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @bbki.ng/site
 
+## 5.8.9
+
+### Patch Changes
+
+- 1485cfd: update sticker
+- Updated dependencies [1485cfd]
+  - @bbki.ng/ui@0.2.21
+
 ## 5.8.8
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bbki.ng/site",
-  "version": "5.8.8",
+  "version": "5.8.9",
   "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.20"
+    "@bbki.ng/ui": "0.2.21"
   },
   "devDependencies": {
     "@eslint/compat": "^1.0.0",

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

@@ -1,5 +1,7 @@
 import { ServiceIdentifierMap, ServiceRegistry } from '#/core/shared-service/service-registry';
 
+const empty = {};
+
 // core/ServiceProxy.ts
 export function createServiceProxy<T extends object, K extends keyof ServiceIdentifierMap>(
   serviceId: K,
@@ -14,7 +16,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 {}; // 或者返回一个待定 Promise
+          return empty;
         };
       }
 

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

@@ -4,6 +4,7 @@ import { EffectLayer, grain, paper, spiral, watermark, Effect } from '@bbki.ng/u
 import { IComPropsRegisteredToSlot } from '#/types/slots';
 
 import { FxContext } from '../context';
+import { useTextEffects } from '../hooks/useTextEffects';
 
 const useLoadingState = () => {
   const ctx = FxContext.useCtx();
@@ -25,15 +26,20 @@ export const FxCom = (_: IComPropsRegisteredToSlot) => {
   const deviceId = ctx.deviceId;
   const isLoading = useLoadingState();
 
-  console.log('is loading', isLoading);
+  const textEffects = useTextEffects();
 
   const effects: Effect[] = useMemo(() => {
     const wmLines = [hashStr];
     if (deviceId) wmLines.push(deviceId);
-    wmLines.push('hello world');
 
-    return [grain(), paper(), spiral({ active: isLoading }), watermark({ lines: wmLines })];
-  }, [isLoading, deviceId, hashStr]);
+    return [
+      grain(),
+      paper(),
+      spiral({ active: isLoading }),
+      watermark({ lines: wmLines }),
+      ...textEffects,
+    ];
+  }, [isLoading, deviceId, hashStr, textEffects]);
 
   return <EffectLayer effects={effects} />;
 };

package/src/plugins/fx/hooks/useTextEffects.ts

@@ -0,0 +1,39 @@
+import { useEffect, useMemo, useState } from 'react';
+import { drawText } from '@bbki.ng/ui';
+
+import { DrawTextConfig } from '../services/IFxService';
+import { FxService } from '../services/FxService';
+
+const empty = {};
+
+export const useTextEffects = () => {
+  const fxServiceInst = FxService.getInstance();
+  const [fxMap, setFxMap] = useState<Record<string, DrawTextConfig>>(empty);
+  const [v, setVersion] = useState(0); // 用于强制更新组件
+
+  useEffect(() => {
+    const drawTextUnsub = fxServiceInst.subscribeDrawText(config => {
+      setFxMap(prev => ({ ...prev, [config.id]: config }));
+      setVersion(v => v + 1); // 强制更新组件以应用新的文本效果
+    });
+
+    const clearTextUnsub = fxServiceInst.subscribeClearText(id => {
+      setFxMap(prev => {
+        const newMap = { ...prev };
+        delete newMap[id];
+        return newMap;
+      });
+      setVersion(v => v + 1); // 强制更新组件以移除文本效果
+    });
+
+    return () => {
+      drawTextUnsub();
+      clearTextUnsub();
+    };
+  }, [fxServiceInst]);
+
+  return useMemo(() => {
+    console.log("fx text's snapshot version:", v);
+    return Object.values(fxMap).map(drawText);
+  }, [fxMap, v]);
+};

package/src/plugins/fx/index.ts

@@ -4,11 +4,16 @@ import { PluginID } from '#/types/plugin';
 
 import { FxCom } from './components';
 import { FxContext } from './context';
+import { FxService } from './services/FxService';
 
 class FxPlugin extends BBPlugin {
   id: PluginID = 'fx';
 
+  private _ctx: IHostContext | null = null;
+
   override onInstall = async (ctx: IHostContext) => {
+    this._ctx = ctx;
+
     const coreService = ctx.service.get('core:baseService');
 
     if (!coreService) {
@@ -22,6 +27,8 @@ class FxPlugin extends BBPlugin {
       return;
     }
 
+    ctx.service.register('fx:service', FxService.getInstance());
+
     systemUIService.registerSlot(
       'pageFooter',
       FxContext.withCtx(
@@ -37,6 +44,10 @@ class FxPlugin extends BBPlugin {
       this.id
     );
   };
+
+  override onDestroy?: (() => void) | undefined = () => {
+    this._ctx?.service.unregister('fx:service');
+  };
 }
 
 export default new FxPlugin();

package/src/plugins/fx/services/FxService.ts

@@ -0,0 +1,47 @@
+import { createEventBus } from '#/core/utils/eventBus';
+
+import { DrawTextConfig, IFxService } from './IFxService';
+
+export type DrawTextEvent = {
+  'fx:drawText': DrawTextConfig & { id: string };
+  'fx:clearText': string; // id of the text to clear
+};
+
+export class FxService implements IFxService {
+  private bus = createEventBus<DrawTextEvent>();
+
+  private configs: Array<DrawTextConfig & { id: string }> = [];
+
+  drawText: (c: DrawTextConfig) => () => void = (opts: DrawTextConfig) => {
+    const id = `${Date.now()}-${Math.random()}`;
+
+    const fullConfig = { ...opts, id };
+
+    this.configs.push(fullConfig);
+
+    this.bus.emit('fx:drawText', fullConfig);
+
+    return () => {
+      this.configs = this.configs.filter(c => c.id !== id);
+      // Emit an empty config to signal clearing the text
+      this.bus.emit('fx:clearText', id);
+    };
+  };
+
+  subscribeDrawText(listener: (payload: DrawTextEvent['fx:drawText']) => void) {
+    return this.bus.on('fx:drawText', listener);
+  }
+
+  subscribeClearText(listener: (payload: DrawTextEvent['fx:clearText']) => void) {
+    return this.bus.on('fx:clearText', listener);
+  }
+
+  private static instance: FxService | null = null;
+
+  static getInstance(): FxService {
+    if (!FxService.instance) {
+      FxService.instance = new FxService();
+    }
+    return FxService.instance;
+  }
+}

package/src/plugins/fx/services/IFxService.ts

@@ -0,0 +1,15 @@
+import { DrawTextEffect } from '@bbki.ng/ui';
+
+declare module '#/core/shared-service/service-registry' {
+  interface ServiceIdentifierMap {
+    'fx:service': IFxService;
+  }
+}
+
+export type DrawTextConfig = Omit<DrawTextEffect, 'clear' | 'type'>;
+
+export interface IFxService {
+  drawText: (opts: DrawTextConfig) => () => void;
+  subscribeDrawText: (listener: (payload: DrawTextConfig & { id: string }) => void) => () => void;
+  subscribeClearText: (listener: (payload: string) => void) => () => void;
+}

package/src/plugins/sticker/components/StickerCom.tsx

@@ -12,11 +12,11 @@ export const StickerCom = ({ data }: IComPropsRegisteredToSlot) => {
     return null;
   }
 
-  const lastPath = paths[paths.length - 1];
+  // const lastPath = paths[paths.length - 1];
 
-  if (lastPath.name !== '~') {
-    return null;
-  }
+  // if (lastPath.name !== '~') {
+  //   return null;
+  // }
 
   return (
     <div className="fixed bottom-32 left-16">

package/src/plugins/sticker/index.ts

@@ -36,7 +36,7 @@ class Sticker extends BBPlugin {
       return;
     }
 
-    systemUIService.registerSlot('leftCol', Sticker, this.id);
+    systemUIService.registerSlot('centerEntryArea', Sticker, this.id);
   };
 }
 

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

@@ -118,9 +118,9 @@ export const StorePage = (_: IComPropsRegisteredToSlot) => {
   const headerRenderer = useCallback(() => {
     return (
       <>
-        <Table.HCell>功能</Table.HCell>
-        <Table.HCell style={{ width: 'unset', maxWidth: 'unset' }}>描述</Table.HCell>
-        <Table.HCell style={{ textAlign: 'right' }}>安装/卸载</Table.HCell>
+        <Table.HCell>功能清单</Table.HCell>
+        <Table.HCell style={{ width: 'unset', maxWidth: 'unset' }}>&nbsp;</Table.HCell>
+        <Table.HCell style={{ textAlign: 'right' }}>&nbsp;</Table.HCell>
       </>
     );
   }, []);