更新同步协商流程

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)
+    const features: LX.Sync.EnabledFeatures = {}
     switch (serverType) {
       case 'server':
-      return {
+        if (featureVersion.list == supportedFeatures.list) {
-        list: featureVersion.list == supportedFeatures.list,
+          features.list = { skipSnapshot: false }
-        dislike: featureVersion.dislike == supportedFeatures.dislike,
         }
+        if (featureVersion.dislike == supportedFeatures.dislike) {
+          features.dislike = { skipSnapshot: false }
+        }
+        return features
       case 'desktop-app':
       default:
-      return {
+        if (featureVersion.list == supportedFeatures.list) {
-        list: featureVersion.list == supportedFeatures.list,
+          features.list = { skipSnapshot: false }
-        dislike: featureVersion.dislike == supportedFeatures.dislike,
         }
+        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,6 +196,7 @@ 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)
+  if (!(socket.feature.dislike as LX.Sync.DislikeConfig).skipSnapshot) {
     const user = getUserSpace(socket.userInfo.name)
     const userCurrentDislikeInfoKey = await user.dislikeManage.getDeviceCurrentSnapshotKey(socket.keyInfo.clientId)
     if (userCurrentDislikeInfoKey) {
@@ -206,6 +207,7 @@ const syncDislike = async(socket: LX.Sync.Server.Socket) => {
         return
       }
     }
+  }
   await handleSyncList(socket)
 }
 

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

@@ -398,6 +398,7 @@ 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)
+  if (!(socket.feature.list as LX.Sync.ListConfig).skipSnapshot) {
     const user = getUserSpace(socket.userInfo.name)
     const userCurrentListInfoKey = await user.listManage.getDeviceCurrentSnapshotKey(socket.keyInfo.clientId)
     if (userCurrentListInfoKey) {
@@ -408,6 +409,7 @@ const syncList = async(socket: LX.Sync.Server.Socket) => {
         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> = {
-export const onFeatureChanged = async(socket: LX.Sync.Server.Socket, feature: LX.Sync.EnabledFeatures) => {
+  async onFeatureChanged(socket, feature) {
     // const userSpace = getUserSpace(socket.userInfo.name)
     const beforeFeature = socket.feature
 
     for (const name of FeaturesList) {
-    if (feature[name] == beforeFeature[name]) continue
+      const newStatus = feature[name]
-    if (feature[name]) {
+      if (newStatus == null) continue
-      await modules[name].sync(socket).then(() => {
+      beforeFeature[name] = feature[name]
-        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')
   }