Fix BaseStore sync

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/common/base-store/base-store.ts

@@ -25,12 +25,17 @@ export interface BaseStoreParams<T> extends Omit<ConfOptions<T>, "migrations"> {
   configName: string;
 }
 
+export interface IpcChannelPrefixes {
+  local: string;
+  remote: string;
+}
+
 export interface BaseStoreDependencies {
   readonly logger: Logger;
   readonly storeMigrationVersion: string;
   readonly directoryForUserData: string;
   readonly migrations: Migrations<Record<string, unknown>>;
-  readonly ipcChannelPrefix: string;
+  readonly ipcChannelPrefixes: IpcChannelPrefixes;
   readonly shouldDisableSyncInListener: boolean;
   getConfigurationFileModel: GetConfigurationFileModel;
   persistStateToConfig: PersistStateToConfig;
@@ -83,7 +88,6 @@ export abstract class BaseStore<T extends object> {
 
   private startSyncing(config: Config<T>) {
     const name = this.dependencies.getBasenameOfPath(config.path);
-    const channelName = `${this.dependencies.ipcChannelPrefix}:${config.path}`;
 
     const disableSync = () => this.syncDisposers();
     const enableSync = () => {
@@ -92,13 +96,13 @@ export abstract class BaseStore<T extends object> {
           () => toJS(this.toJSON()), // unwrap possible observables and react to everything
           model => {
             this.dependencies.persistStateToConfig(config, model);
-            broadcastMessage(channelName, model);
+            broadcastMessage(`${this.dependencies.ipcChannelPrefixes.remote}:${config.path}`, model);
           },
           this.params.syncOptions,
         ),
         this.dependencies.enlistMessageChannelListener({
           channel: {
-            id: channelName,
+            id: `${this.dependencies.ipcChannelPrefixes.local}:${config.path}`,
           },
           handler: (model) => {
             this.dependencies.logger.silly(`[${this.displayName}]: syncing ${name}`, { model });

src/common/base-store/channel-prefix.ts

@@ -4,7 +4,8 @@
  */
 
 import { getInjectionToken } from "@ogre-tools/injectable";
+import type { IpcChannelPrefixes } from "./base-store";
 
-export const baseStoreIpcChannelPrefixInjectionToken = getInjectionToken<string>({
+export const baseStoreIpcChannelPrefixesInjectionToken = getInjectionToken<IpcChannelPrefixes>({
   id: "base-store-ipc-channel-prefix-token",
 });

src/common/cluster-store/cluster-store.injectable.ts

@@ -13,7 +13,7 @@ import loggerInjectable from "../logger.injectable";
 import storeMigrationVersionInjectable from "../vars/store-migration-version.injectable";
 import storeMigrationsInjectable from "../base-store/migrations.injectable";
 import { clusterStoreMigrationInjectionToken } from "./migration-token";
-import { baseStoreIpcChannelPrefixInjectionToken } from "../base-store/channel-prefix";
+import { baseStoreIpcChannelPrefixesInjectionToken } from "../base-store/channel-prefix";
 import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../base-store/disable-sync";
 import { persistStateToConfigInjectionToken } from "../base-store/save-to-file";
 import getBasenameOfPathInjectable from "../path/get-basename.injectable";
@@ -32,7 +32,7 @@ const clusterStoreInjectable = getInjectable({
     storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
     migrations: di.inject(storeMigrationsInjectable, clusterStoreMigrationInjectionToken),
     getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
-    ipcChannelPrefix: di.inject(baseStoreIpcChannelPrefixInjectionToken),
+    ipcChannelPrefixes: di.inject(baseStoreIpcChannelPrefixesInjectionToken),
     persistStateToConfig: di.inject(persistStateToConfigInjectionToken),
     enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
     shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),

src/common/hotbars/store.injectable.ts

@@ -12,7 +12,7 @@ import storeMigrationVersionInjectable from "../vars/store-migration-version.inj
 import storeMigrationsInjectable from "../base-store/migrations.injectable";
 import { hotbarStoreMigrationInjectionToken } from "./migrations-token";
 import getBasenameOfPathInjectable from "../path/get-basename.injectable";
-import { baseStoreIpcChannelPrefixInjectionToken } from "../base-store/channel-prefix";
+import { baseStoreIpcChannelPrefixesInjectionToken } from "../base-store/channel-prefix";
 import { persistStateToConfigInjectionToken } from "../base-store/save-to-file";
 import { enlistMessageChannelListenerInjectionToken } from "../utils/channel/enlist-message-channel-listener-injection-token";
 import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../base-store/disable-sync";
@@ -28,7 +28,7 @@ const hotbarStoreInjectable = getInjectable({
     storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
     migrations: di.inject(storeMigrationsInjectable, hotbarStoreMigrationInjectionToken),
     getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
-    ipcChannelPrefix: di.inject(baseStoreIpcChannelPrefixInjectionToken),
+    ipcChannelPrefixes: di.inject(baseStoreIpcChannelPrefixesInjectionToken),
     persistStateToConfig: di.inject(persistStateToConfigInjectionToken),
     enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
     shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),

src/common/user-store/user-store.injectable.ts

@@ -12,7 +12,7 @@ import loggerInjectable from "../logger.injectable";
 import storeMigrationVersionInjectable from "../vars/store-migration-version.injectable";
 import storeMigrationsInjectable from "../base-store/migrations.injectable";
 import { userStoreMigrationInjectionToken } from "./migrations-token";
-import { baseStoreIpcChannelPrefixInjectionToken } from "../base-store/channel-prefix";
+import { baseStoreIpcChannelPrefixesInjectionToken } from "../base-store/channel-prefix";
 import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../base-store/disable-sync";
 import { persistStateToConfigInjectionToken } from "../base-store/save-to-file";
 import getBasenameOfPathInjectable from "../path/get-basename.injectable";
@@ -31,7 +31,7 @@ const userStoreInjectable = getInjectable({
     storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
     migrations: di.inject(storeMigrationsInjectable, userStoreMigrationInjectionToken),
     getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
-    ipcChannelPrefix: di.inject(baseStoreIpcChannelPrefixInjectionToken),
+    ipcChannelPrefixes: di.inject(baseStoreIpcChannelPrefixesInjectionToken),
     persistStateToConfig: di.inject(persistStateToConfigInjectionToken),
     enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
     shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),

src/common/weblinks-store/weblink-store.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import { baseStoreIpcChannelPrefixInjectionToken } from "../base-store/channel-prefix";
+import { baseStoreIpcChannelPrefixesInjectionToken } from "../base-store/channel-prefix";
 import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../base-store/disable-sync";
 import storeMigrationsInjectable from "../base-store/migrations.injectable";
 import { persistStateToConfigInjectionToken } from "../base-store/save-to-file";
@@ -25,7 +25,7 @@ const weblinkStoreInjectable = getInjectable({
     storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
     migrations: di.inject(storeMigrationsInjectable, weblinkStoreMigrationInjectionToken),
     getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
-    ipcChannelPrefix: di.inject(baseStoreIpcChannelPrefixInjectionToken),
+    ipcChannelPrefixes: di.inject(baseStoreIpcChannelPrefixesInjectionToken),
     persistStateToConfig: di.inject(persistStateToConfigInjectionToken),
     enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
     shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),

src/extensions/extension-loader/file-system-provisioner-store/file-system-provisioner-store.injectable.ts

@@ -12,7 +12,7 @@ import directoryForUserDataInjectable from "../../../common/app-paths/directory-
 import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
 import storeMigrationVersionInjectable from "../../../common/vars/store-migration-version.injectable";
-import { baseStoreIpcChannelPrefixInjectionToken } from "../../../common/base-store/channel-prefix";
+import { baseStoreIpcChannelPrefixesInjectionToken } from "../../../common/base-store/channel-prefix";
 import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../../../common/base-store/disable-sync";
 import { persistStateToConfigInjectionToken } from "../../../common/base-store/save-to-file";
 import getBasenameOfPathInjectable from "../../../common/path/get-basename.injectable";
@@ -32,7 +32,7 @@ const fileSystemProvisionerStoreInjectable = getInjectable({
     storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
     migrations: {},
     getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
-    ipcChannelPrefix: di.inject(baseStoreIpcChannelPrefixInjectionToken),
+    ipcChannelPrefixes: di.inject(baseStoreIpcChannelPrefixesInjectionToken),
     persistStateToConfig: di.inject(persistStateToConfigInjectionToken),
     enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
     shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),

src/extensions/extension-store.ts

@@ -16,7 +16,7 @@ import getConfigurationFileModelInjectable from "../common/get-configuration-fil
 import loggerInjectable from "../common/logger.injectable";
 import storeMigrationVersionInjectable from "../common/vars/store-migration-version.injectable";
 import type { Migrations } from "conf/dist/source/types";
-import { baseStoreIpcChannelPrefixInjectionToken } from "../common/base-store/channel-prefix";
+import { baseStoreIpcChannelPrefixesInjectionToken } from "../common/base-store/channel-prefix";
 import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../common/base-store/disable-sync";
 import { persistStateToConfigInjectionToken } from "../common/base-store/save-to-file";
 import getBasenameOfPathInjectable from "../common/path/get-basename.injectable";
@@ -59,7 +59,7 @@ export abstract class ExtensionStore<T extends object> extends BaseStore<T> {
       storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
       migrations: migrations as Migrations<Record<string, unknown>>,
       getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
-      ipcChannelPrefix: di.inject(baseStoreIpcChannelPrefixInjectionToken),
+      ipcChannelPrefixes: di.inject(baseStoreIpcChannelPrefixesInjectionToken),
       persistStateToConfig: di.inject(persistStateToConfigInjectionToken),
       enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
       shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),

src/extensions/extensions-store/extensions-store.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
-import { baseStoreIpcChannelPrefixInjectionToken } from "../../common/base-store/channel-prefix";
+import { baseStoreIpcChannelPrefixesInjectionToken } from "../../common/base-store/channel-prefix";
 import { shouldBaseStoreDisableSyncInIpcListenerInjectionToken } from "../../common/base-store/disable-sync";
 import { persistStateToConfigInjectionToken } from "../../common/base-store/save-to-file";
 import getConfigurationFileModelInjectable from "../../common/get-configuration-file-model/get-configuration-file-model.injectable";
@@ -23,7 +23,7 @@ const extensionsStoreInjectable = getInjectable({
     storeMigrationVersion: di.inject(storeMigrationVersionInjectable),
     migrations: {},
     getBasenameOfPath: di.inject(getBasenameOfPathInjectable),
-    ipcChannelPrefix: di.inject(baseStoreIpcChannelPrefixInjectionToken),
+    ipcChannelPrefixes: di.inject(baseStoreIpcChannelPrefixesInjectionToken),
     persistStateToConfig: di.inject(persistStateToConfigInjectionToken),
     enlistMessageChannelListener: di.inject(enlistMessageChannelListenerInjectionToken),
     shouldDisableSyncInListener: di.inject(shouldBaseStoreDisableSyncInIpcListenerInjectionToken),

src/main/base-store/ipc-channel-prefix.injectable.ts

@@ -3,12 +3,15 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { baseStoreIpcChannelPrefixInjectionToken } from "../../common/base-store/channel-prefix";
+import { baseStoreIpcChannelPrefixesInjectionToken } from "../../common/base-store/channel-prefix";
 
 const baseStoreIpcChannelPrefixInjectable = getInjectable({
   id: "base-store-ipc-channel-prefix",
-  instantiate: () => "store-sync-main",
+  instantiate: () => ({
-  injectionToken: baseStoreIpcChannelPrefixInjectionToken,
+    local: "store-sync-main",
+    remote: "store-sync-renderer",
+  }),
+  injectionToken: baseStoreIpcChannelPrefixesInjectionToken,
 });
 
 export default baseStoreIpcChannelPrefixInjectable;

src/renderer/base-store/ipc-channel-prefix.injectable.ts

@@ -3,12 +3,15 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import { baseStoreIpcChannelPrefixInjectionToken } from "../../common/base-store/channel-prefix";
+import { baseStoreIpcChannelPrefixesInjectionToken } from "../../common/base-store/channel-prefix";
 
 const baseStoreIpcChannelPrefixInjectable = getInjectable({
   id: "base-store-ipc-channel-prefix",
-  instantiate: () => "store-sync-renderer",
+  instantiate: () => ({
-  injectionToken: baseStoreIpcChannelPrefixInjectionToken,
+    local: "store-sync-renderer",
+    remote: "store-sync-main",
+  }),
+  injectionToken: baseStoreIpcChannelPrefixesInjectionToken,
 });
 
 export default baseStoreIpcChannelPrefixInjectable;