更新同步协商流程

src/common/types/sync.d.ts

@@ -69,10 +69,16 @@ declare namespace LX {
       isMobile: boolean
     }
 
+    interface ListConfig {
+      skipSnapshot: boolean
+    }
+    interface DislikeConfig {
+      skipSnapshot: boolean
+    }
     type ServerType = 'desktop-app' | 'server'
     interface EnabledFeatures {
-      list: boolean
+      list?: false | ListConfig
-      dislike: boolean
+      dislike?: false | DislikeConfig
     }
     type SupportedFeatures = Partial<{ [k in keyof EnabledFeatures]: number }>
   }

src/main/modules/sync/client/sync/handler.ts

@@ -5,20 +5,30 @@
 
 import { featureVersion } from '../modules'
 
-
+const handler: Omit<LX.Sync.ClientSyncHandlerActions<LX.Sync.Client.Socket>, 'finished'> = {
-export const getEnabledFeatures = async(socket: LX.Sync.Client.Socket, serverType: LX.Sync.ServerType, supportedFeatures: LX.Sync.SupportedFeatures): Promise<LX.Sync.EnabledFeatures> => {
+  async getEnabledFeatures(socket, serverType, supportedFeatures) {
   // const userSpace = getUserSpace(socket.userInfo.name)
-  switch (serverType) {
+    const features: LX.Sync.EnabledFeatures = {}
-    case 'server':
+    switch (serverType) {
-      return {
+      case 'server':
-        list: featureVersion.list == supportedFeatures.list,
+        if (featureVersion.list == supportedFeatures.list) {
-        dislike: featureVersion.dislike == supportedFeatures.dislike,
+          features.list = { skipSnapshot: false }
-      }
+        }
-    case 'desktop-app':
+        if (featureVersion.dislike == supportedFeatures.dislike) {
-    default:
+          features.dislike = { skipSnapshot: false }
-      return {
+        }
-        list: featureVersion.list == supportedFeatures.list,
+        return features
-        dislike: featureVersion.dislike == supportedFeatures.dislike,
+      case 'desktop-app':
-      }
+      default:
-  }
+        if (featureVersion.list == supportedFeatures.list) {
+          features.list = { skipSnapshot: false }
+        }
+        if (featureVersion.dislike == supportedFeatures.dislike) {
+          features.dislike = { skipSnapshot: false }
+        }
+        return features
+    }
+  },
 }
+
+export default handler

src/main/modules/sync/client/sync/index.ts

@@ -1,4 +1,4 @@
-import * as handler from './handler'
+import handler from './handler'
 import { callObj as _callObj } from '../modules'
 export { modules } from '../modules'
 

src/main/modules/sync/server/modules/dislike/sync/sync.ts

@@ -196,14 +196,16 @@ const handleMergeListDataFromSnapshot = async(socket: LX.Sync.Server.Socket, sna
 const syncDislike = async(socket: LX.Sync.Server.Socket) => {
   // socket.data.snapshotFilePath = getSnapshotFilePath(socket.keyInfo)
   // console.log(socket.keyInfo)
-  const user = getUserSpace(socket.userInfo.name)
+  if (!(socket.feature.dislike as LX.Sync.DislikeConfig).skipSnapshot) {
-  const userCurrentDislikeInfoKey = await user.dislikeManage.getDeviceCurrentSnapshotKey(socket.keyInfo.clientId)
+    const user = getUserSpace(socket.userInfo.name)
-  if (userCurrentDislikeInfoKey) {
+    const userCurrentDislikeInfoKey = await user.dislikeManage.getDeviceCurrentSnapshotKey(socket.keyInfo.clientId)
-    const listData = await user.dislikeManage.snapshotDataManage.getSnapshot(userCurrentDislikeInfoKey)
+    if (userCurrentDislikeInfoKey) {
-    if (listData) {
+      const listData = await user.dislikeManage.snapshotDataManage.getSnapshot(userCurrentDislikeInfoKey)
-      console.log('handleMergeDislikeDataFromSnapshot')
+      if (listData) {
-      await handleMergeListDataFromSnapshot(socket, listData)
+        console.log('handleMergeDislikeDataFromSnapshot')
-      return
+        await handleMergeListDataFromSnapshot(socket, listData)
+        return
+      }
     }
   }
   await handleSyncList(socket)

src/main/modules/sync/server/modules/list/sync/sync.ts

@@ -398,14 +398,16 @@ const handleMergeListDataFromSnapshot = async(socket: LX.Sync.Server.Socket, sna
 const syncList = async(socket: LX.Sync.Server.Socket) => {
   // socket.data.snapshotFilePath = getSnapshotFilePath(socket.keyInfo)
   // console.log(socket.keyInfo)
-  const user = getUserSpace(socket.userInfo.name)
+  if (!(socket.feature.list as LX.Sync.ListConfig).skipSnapshot) {
-  const userCurrentListInfoKey = await user.listManage.getDeviceCurrentSnapshotKey(socket.keyInfo.clientId)
+    const user = getUserSpace(socket.userInfo.name)
-  if (userCurrentListInfoKey) {
+    const userCurrentListInfoKey = await user.listManage.getDeviceCurrentSnapshotKey(socket.keyInfo.clientId)
-    const listData = await user.listManage.snapshotDataManage.getSnapshot(userCurrentListInfoKey)
+    if (userCurrentListInfoKey) {
-    if (listData) {
+      const listData = await user.listManage.snapshotDataManage.getSnapshot(userCurrentListInfoKey)
-      console.log('handleMergeListDataFromSnapshot')
+      if (listData) {
-      await handleMergeListDataFromSnapshot(socket, listData)
+        console.log('handleMergeListDataFromSnapshot')
-      return
+        await handleMergeListDataFromSnapshot(socket, listData)
+        return
+      }
     }
   }
   await handleSyncList(socket)

src/main/modules/sync/server/server/sync/handler.ts

@@ -3,21 +3,19 @@
 import { FeaturesList } from '../../../../../../common/constants_sync'
 import { modules } from '../../modules'
 
+const handler: LX.Sync.ServerSyncHandlerActions<LX.Sync.Server.Socket> = {
+  async onFeatureChanged(socket, feature) {
+    // const userSpace = getUserSpace(socket.userInfo.name)
+    const beforeFeature = socket.feature
 
-export const onFeatureChanged = async(socket: LX.Sync.Server.Socket, feature: LX.Sync.EnabledFeatures) => {
+    for (const name of FeaturesList) {
-  // const userSpace = getUserSpace(socket.userInfo.name)
+      const newStatus = feature[name]
-  const beforeFeature = socket.feature
+      if (newStatus == null) continue
-
+      beforeFeature[name] = feature[name]
-  for (const name of FeaturesList) {
-    if (feature[name] == beforeFeature[name]) continue
-    if (feature[name]) {
-      await modules[name].sync(socket).then(() => {
-        beforeFeature[name] = true
-      }).catch(_ => _)
-    } else {
       socket.moduleReadys[name] = false
-      beforeFeature[name] = false
+      if (feature[name]) await modules[name].sync(socket).catch(_ => _)
     }
-  }
+  },
 }
 
+export default handler

src/main/modules/sync/server/server/sync/index.ts

@@ -1,4 +1,4 @@
-import * as handler from './handler'
+import handler from './handler'
 import { callObj as _callObj } from '../../modules'
 export { sync } from './sync'
 export { modules } from '../../modules'

src/main/modules/sync/server/server/sync/sync.ts

@@ -12,9 +12,8 @@ export const sync = async(socket: LX.Sync.Server.Socket) => {
   if (disconnected) throw new Error('disconnected')
   for (const moduleName of FeaturesList) {
     if (enabledFeatures[moduleName]) {
-      await modules[moduleName].sync(socket).then(() => {
+      socket.feature[moduleName] = enabledFeatures[moduleName]
-        socket.feature[moduleName] = true
+      await modules[moduleName].sync(socket).catch(_ => _)
-      }).catch(_ => _)
     }
     if (disconnected) throw new Error('disconnected')
   }