Merge branch 'master' of https://github.com/SaXz2/orca-tabs-plugin

# Conflicts:
#	dist/index.js   resolved by master version
#	src/main.ts   resolved by master version

Author: SaXz2

src/services/storage.ts

@@ -78,11 +78,11 @@ export class OrcaStorageService {
    * 
    * @param key 存储键 - 用于标识数据的唯一键名
    * @param data 要保存的数据 - 可以是任何可序列化的数据类型
-   * @param pluginName 插件名称 - 默认为'orca-tabs-plugin'
+   * @param pluginName 插件名称
    * @returns Promise<boolean> 保存是否成功
    * @throws 当Orca API和localStorage都不可用时抛出错误
    */
-  async saveConfig(key: string, data: any, pluginName: string = 'orca-tabs-plugin'): Promise<boolean> {
+  async saveConfig(key: string, data: any, pluginName: string): Promise<boolean> {
     try {
       // 数据序列化 - 将复杂对象转换为JSON字符串，确保存储格式一致
       const serializedData = typeof data === 'string' ? data : JSON.stringify(data);
@@ -119,12 +119,12 @@ export class OrcaStorageService {
    * 
    * @template T 返回数据的类型
    * @param key 存储键 - 要读取的数据键名
-   * @param pluginName 插件名称 - 默认为'orca-tabs-plugin'
+   * @param pluginName 插件名称
    * @param defaultValue 默认值 - 当数据不存在时返回的默认值
    * @returns Promise<T | null> 读取的数据或null
    * @throws 当Orca API和localStorage都不可用时抛出错误
    */
-  async getConfig<T>(key: string, pluginName: string = 'orca-tabs-plugin', defaultValue?: T): Promise<T | null> {
+  async getConfig<T>(key: string, pluginName: string, defaultValue?: T): Promise<T | null> {
     try {
       // 调用Orca API读取数据
       const result = await orca.plugins.getData(pluginName, key);
@@ -166,11 +166,11 @@ export class OrcaStorageService {
    * 如果Orca API不可用，会自动降级到localStorage删除。
    * 
    * @param key 存储键 - 要删除的数据键名
-   * @param pluginName 插件名称 - 默认为'orca-tabs-plugin'
+   * @param pluginName 插件名称
    * @returns Promise<boolean> 删除是否成功
    * @throws 当Orca API和localStorage都不可用时抛出错误
    */
-  async removeConfig(key: string, pluginName: string = 'orca-tabs-plugin'): Promise<boolean> {
+  async removeConfig(key: string, pluginName: string): Promise<boolean> {
     try {
       // 调用Orca API删除数据
       await orca.plugins.removeData(pluginName, key);
@@ -322,40 +322,41 @@ export class OrcaStorageService {
    * 
    * 测试完成后会自动清理测试数据，不会影响实际使用。
    * 
+   * @param pluginName 插件名称 - 用于测试的插件名称
    * @async
    * @returns Promise<void> 测试完成
    * @throws 当测试过程中发生错误时抛出
    */
-  async testConfigSerialization(): Promise<void> {
+  async testConfigSerialization(pluginName: string): Promise<void> {
     try {
       this.log("🧪 开始测试API配置序列化...");
 
       // ==================== 字符串数据测试 ====================
       // 测试简单字符串的保存和读取
       const testString = "test string";
-      await this.saveConfig('test-string', testString);
-      const retrievedString = await this.getConfig<string>('test-string', 'orca-tabs-plugin');
+      await this.saveConfig('test-string', testString, pluginName);
+      const retrievedString = await this.getConfig<string>('test-string', pluginName);
       this.log(`字符串测试: ${testString === retrievedString ? '✅' : '❌'}`);
 
       // ==================== 复杂对象测试 ====================
       // 测试嵌套对象的序列化和反序列化
       const testObject = { name: "test", value: 123, nested: { data: [1, 2, 3] } };
-      await this.saveConfig('test-object', testObject);
-      const retrievedObject = await this.getConfig<typeof testObject>('test-object', 'orca-tabs-plugin');
+      await this.saveConfig('test-object', testObject, pluginName);
+      const retrievedObject = await this.getConfig<typeof testObject>('test-object', pluginName);
       this.log(`对象测试: ${JSON.stringify(testObject) === JSON.stringify(retrievedObject) ? '✅' : '❌'}`);
 
       // ==================== 数组数据测试 ====================
       // 测试数组的保存和读取
       const testArray = [1, 2, 3, { nested: true }];
-      await this.saveConfig('test-array', testArray);
-      const retrievedArray = await this.getConfig<typeof testArray>('test-array', 'orca-tabs-plugin');
+      await this.saveConfig('test-array', testArray, pluginName);
+      const retrievedArray = await this.getConfig<typeof testArray>('test-array', pluginName);
       this.log(`数组测试: ${JSON.stringify(testArray) === JSON.stringify(retrievedArray) ? '✅' : '❌'}`);
 
       // ==================== 清理测试数据 ====================
       // 删除所有测试数据，避免影响实际使用
-      await this.removeConfig('test-string');
-      await this.removeConfig('test-object');
-      await this.removeConfig('test-array');
+      await this.removeConfig('test-string', pluginName);
+      await this.removeConfig('test-object', pluginName);
+      await this.removeConfig('test-array', pluginName);
 
       this.log("🧪 API配置序列化测试完成");
     } catch (error) {

src/services/tabStorage.ts

@@ -236,10 +236,10 @@ export class TabStorageService {
    */
   async loadWorkspaces(): Promise<{ workspaces: Workspace[], enableWorkspaces: boolean }> {
     try {
-      const workspacesData = await this.storageService.getConfig(PLUGIN_STORAGE_KEYS.WORKSPACES);
+      const workspacesData = await this.storageService.getConfig(PLUGIN_STORAGE_KEYS.WORKSPACES, this.pluginName);
       const workspaces: Workspace[] = workspacesData && Array.isArray(workspacesData) ? workspacesData : [];
 
-      const enableWorkspaces = await this.storageService.getConfig(PLUGIN_STORAGE_KEYS.ENABLE_WORKSPACES);
+      const enableWorkspaces = await this.storageService.getConfig(PLUGIN_STORAGE_KEYS.ENABLE_WORKSPACES, this.pluginName);
       const enableWorkspacesValue = typeof enableWorkspaces === 'boolean' ? enableWorkspaces : false;
 
       this.log(`📁 已加载 ${workspaces.length} 个工作区`);
@@ -427,8 +427,8 @@ export class TabStorageService {
    */
   async clearCache(): Promise<void> {
     try {
-      await this.storageService.removeConfig(PLUGIN_STORAGE_KEYS.FIRST_PANEL_TABS);
-      await this.storageService.removeConfig(PLUGIN_STORAGE_KEYS.CLOSED_TABS);
+      await this.storageService.removeConfig(PLUGIN_STORAGE_KEYS.FIRST_PANEL_TABS, this.pluginName);
+      await this.storageService.removeConfig(PLUGIN_STORAGE_KEYS.CLOSED_TABS, this.pluginName);
       this.log(`🗑️ 已删除API配置缓存: 标签页数据和已关闭标签列表`);
     } catch (e) {
       this.warn("删除API配置缓存失败:", e);