@vrtmrz/livesync-commonlib 0.1.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/README.md +49 -0
- package/dist/API/DirectFileManipulator.d.ts +2 -0
- package/dist/API/DirectFileManipulator.js +4 -0
- package/dist/API/DirectFileManipulatorV2.d.ts +150 -0
- package/dist/API/DirectFileManipulatorV2.js +424 -0
- package/dist/API/processSetting.d.ts +41 -0
- package/dist/API/processSetting.js +140 -0
- package/dist/ContentSplitter/ContentSplitter.d.ts +28 -0
- package/dist/ContentSplitter/ContentSplitter.js +5 -0
- package/dist/ContentSplitter/ContentSplitterBase.d.ts +51 -0
- package/dist/ContentSplitter/ContentSplitterBase.js +83 -0
- package/dist/ContentSplitter/ContentSplitterRabinKarp.d.ts +9 -0
- package/dist/ContentSplitter/ContentSplitterRabinKarp.js +32 -0
- package/dist/ContentSplitter/ContentSplitterV1.d.ts +9 -0
- package/dist/ContentSplitter/ContentSplitterV1.js +34 -0
- package/dist/ContentSplitter/ContentSplitterV2.d.ts +9 -0
- package/dist/ContentSplitter/ContentSplitterV2.js +34 -0
- package/dist/ContentSplitter/ContentSplitters.d.ts +12 -0
- package/dist/ContentSplitter/ContentSplitters.js +29 -0
- package/dist/bureau/bureau.d.ts +7 -0
- package/dist/bureau/bureau.js +5 -0
- package/dist/common/ConnectionString.d.ts +30 -0
- package/dist/common/ConnectionString.js +179 -0
- package/dist/common/LSError.d.ts +48 -0
- package/dist/common/LSError.js +112 -0
- package/dist/common/configForDoc.d.ts +79 -0
- package/dist/common/configForDoc.js +312 -0
- package/dist/common/coreEnvFunctions.d.ts +21 -0
- package/dist/common/coreEnvFunctions.js +22 -0
- package/dist/common/coreEnvVars.d.ts +3 -0
- package/dist/common/coreEnvVars.js +6 -0
- package/dist/common/i18n.d.ts +18 -0
- package/dist/common/i18n.js +7193 -0
- package/dist/common/logger.d.ts +2 -0
- package/dist/common/logger.js +1 -0
- package/dist/common/messages/combinedMessages.dev.d.ts +7 -0
- package/dist/common/messages/combinedMessages.dev.js +44 -0
- package/dist/common/messages/combinedMessages.prod.d.ts +9264 -0
- package/dist/common/messages/combinedMessages.prod.js +9271 -0
- package/dist/common/messages/de.d.ts +297 -0
- package/dist/common/messages/de.js +7 -0
- package/dist/common/messages/def.d.ts +1119 -0
- package/dist/common/messages/def.js +7 -0
- package/dist/common/messages/es.d.ts +689 -0
- package/dist/common/messages/es.js +7 -0
- package/dist/common/messages/fr.d.ts +582 -0
- package/dist/common/messages/fr.js +7 -0
- package/dist/common/messages/he.d.ts +583 -0
- package/dist/common/messages/he.js +7 -0
- package/dist/common/messages/ja.d.ts +838 -0
- package/dist/common/messages/ja.js +7 -0
- package/dist/common/messages/ko.d.ts +800 -0
- package/dist/common/messages/ko.js +7 -0
- package/dist/common/messages/ru.d.ts +858 -0
- package/dist/common/messages/ru.js +7 -0
- package/dist/common/messages/zh-tw.d.ts +384 -0
- package/dist/common/messages/zh-tw.js +7 -0
- package/dist/common/messages/zh.d.ts +1093 -0
- package/dist/common/messages/zh.js +7 -0
- package/dist/common/messagesJson/de.json +295 -0
- package/dist/common/messagesJson/en.json +1117 -0
- package/dist/common/messagesJson/es.json +687 -0
- package/dist/common/messagesJson/fr.json +580 -0
- package/dist/common/messagesJson/he.json +581 -0
- package/dist/common/messagesJson/ja.json +836 -0
- package/dist/common/messagesJson/ko.json +798 -0
- package/dist/common/messagesJson/ru.json +856 -0
- package/dist/common/messagesJson/zh-tw.json +382 -0
- package/dist/common/messagesJson/zh.json +1091 -0
- package/dist/common/models/auth.type.d.ts +41 -0
- package/dist/common/models/auth.type.js +0 -0
- package/dist/common/models/db.const.d.ts +20 -0
- package/dist/common/models/db.const.js +28 -0
- package/dist/common/models/db.definition.d.ts +56 -0
- package/dist/common/models/db.definition.js +6 -0
- package/dist/common/models/db.type.d.ts +142 -0
- package/dist/common/models/db.type.js +0 -0
- package/dist/common/models/diff.definition.d.ts +16 -0
- package/dist/common/models/diff.definition.js +0 -0
- package/dist/common/models/fileaccess.const.d.ts +7 -0
- package/dist/common/models/fileaccess.const.js +16 -0
- package/dist/common/models/fileaccess.type.d.ts +72 -0
- package/dist/common/models/fileaccess.type.js +0 -0
- package/dist/common/models/redflag.const.d.ts +32 -0
- package/dist/common/models/redflag.const.js +27 -0
- package/dist/common/models/setting.const.d.ts +49 -0
- package/dist/common/models/setting.const.defaults.d.ts +3 -0
- package/dist/common/models/setting.const.defaults.js +185 -0
- package/dist/common/models/setting.const.js +68 -0
- package/dist/common/models/setting.const.preferred.d.ts +5 -0
- package/dist/common/models/setting.const.preferred.js +35 -0
- package/dist/common/models/setting.const.qr.d.ts +2 -0
- package/dist/common/models/setting.const.qr.js +174 -0
- package/dist/common/models/setting.type.d.ts +900 -0
- package/dist/common/models/setting.type.js +8 -0
- package/dist/common/models/shared.const.behabiour.d.ts +28 -0
- package/dist/common/models/shared.const.behabiour.js +36 -0
- package/dist/common/models/shared.const.d.ts +5 -0
- package/dist/common/models/shared.const.js +12 -0
- package/dist/common/models/shared.const.symbols.d.ts +9 -0
- package/dist/common/models/shared.const.symbols.js +20 -0
- package/dist/common/models/shared.definition.configNames.d.ts +36 -0
- package/dist/common/models/shared.definition.configNames.js +203 -0
- package/dist/common/models/shared.definition.d.ts +22 -0
- package/dist/common/models/shared.definition.js +24 -0
- package/dist/common/models/shared.type.util.d.ts +8 -0
- package/dist/common/models/shared.type.util.js +0 -0
- package/dist/common/models/sync.definition.d.ts +18 -0
- package/dist/common/models/sync.definition.js +20 -0
- package/dist/common/models/tweak.definition.d.ts +191 -0
- package/dist/common/models/tweak.definition.js +77 -0
- package/dist/common/rosetta.d.ts +42 -0
- package/dist/common/rosetta.js +57 -0
- package/dist/common/settingConstants.d.ts +216 -0
- package/dist/common/settingConstants.js +434 -0
- package/dist/common/typeUtils.d.ts +17 -0
- package/dist/common/typeUtils.js +51 -0
- package/dist/common/types.d.ts +107 -0
- package/dist/common/types.js +212 -0
- package/dist/common/utils.d.ts +129 -0
- package/dist/common/utils.doc.d.ts +11 -0
- package/dist/common/utils.doc.js +35 -0
- package/dist/common/utils.js +583 -0
- package/dist/common/utils.object.d.ts +2 -0
- package/dist/common/utils.object.js +14 -0
- package/dist/common/utils.patch.d.ts +8 -0
- package/dist/common/utils.patch.js +178 -0
- package/dist/common/utils.type.d.ts +1 -0
- package/dist/common/utils.type.js +0 -0
- package/dist/context.d.ts +8 -0
- package/dist/context.js +14 -0
- package/dist/databases/IndexedDBKeyValueDatabase.d.ts +26 -0
- package/dist/databases/IndexedDBKeyValueDatabase.js +130 -0
- package/dist/dataobject/StoredMap.d.ts +12 -0
- package/dist/dataobject/StoredMap.js +47 -0
- package/dist/dev/checks.d.ts +5 -0
- package/dist/dev/checks.js +38 -0
- package/dist/encryption/encryptHKDF.d.ts +3 -0
- package/dist/encryption/encryptHKDF.js +7 -0
- package/dist/encryption/stringEncryption.d.ts +27 -0
- package/dist/encryption/stringEncryption.js +59 -0
- package/dist/events/coreEvents.d.ts +54 -0
- package/dist/events/coreEvents.js +46 -0
- package/dist/hub/hub.d.ts +11 -0
- package/dist/hub/hub.js +7 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +4 -0
- package/dist/interfaces/AsyncActivityRunner.d.ts +18 -0
- package/dist/interfaces/AsyncActivityRunner.js +7 -0
- package/dist/interfaces/Confirm.d.ts +17 -0
- package/dist/interfaces/Confirm.js +0 -0
- package/dist/interfaces/DatabaseFileAccess.d.ts +14 -0
- package/dist/interfaces/DatabaseFileAccess.js +0 -0
- package/dist/interfaces/DatabaseRebuilder.d.ts +13 -0
- package/dist/interfaces/DatabaseRebuilder.js +0 -0
- package/dist/interfaces/FileHandler.d.ts +13 -0
- package/dist/interfaces/FileHandler.js +0 -0
- package/dist/interfaces/KeyValueDatabase.d.ts +11 -0
- package/dist/interfaces/KeyValueDatabase.js +0 -0
- package/dist/interfaces/ServiceModule.d.ts +59 -0
- package/dist/interfaces/ServiceModule.js +19 -0
- package/dist/interfaces/StorageAccess.d.ts +44 -0
- package/dist/interfaces/StorageAccess.js +0 -0
- package/dist/interfaces/StorageEventManager.d.ts +16 -0
- package/dist/interfaces/StorageEventManager.js +5 -0
- package/dist/managers/ChangeManager.d.ts +61 -0
- package/dist/managers/ChangeManager.js +104 -0
- package/dist/managers/ChunkDeliveryCoordinator.d.ts +51 -0
- package/dist/managers/ChunkDeliveryCoordinator.js +136 -0
- package/dist/managers/ChunkFetcher.d.ts +44 -0
- package/dist/managers/ChunkFetcher.js +251 -0
- package/dist/managers/ChunkManager.d.ts +2 -0
- package/dist/managers/ChunkManager.js +4 -0
- package/dist/managers/ConflictManager.d.ts +37 -0
- package/dist/managers/ConflictManager.js +322 -0
- package/dist/managers/EntryManager/EntryManager.d.ts +37 -0
- package/dist/managers/EntryManager/EntryManager.js +73 -0
- package/dist/managers/EntryManager/EntryManagerImpls.d.ts +74 -0
- package/dist/managers/EntryManager/EntryManagerImpls.js +499 -0
- package/dist/managers/HashManager/HashManager.d.ts +60 -0
- package/dist/managers/HashManager/HashManager.js +97 -0
- package/dist/managers/HashManager/HashManagerCore.d.ts +114 -0
- package/dist/managers/HashManager/HashManagerCore.js +99 -0
- package/dist/managers/HashManager/PureJSHashManager.d.ts +77 -0
- package/dist/managers/HashManager/PureJSHashManager.js +84 -0
- package/dist/managers/HashManager/XXHashHashManager.d.ts +96 -0
- package/dist/managers/HashManager/XXHashHashManager.js +111 -0
- package/dist/managers/LayeredChunkManager/ArrivalWaitLayer.d.ts +30 -0
- package/dist/managers/LayeredChunkManager/ArrivalWaitLayer.js +115 -0
- package/dist/managers/LayeredChunkManager/CacheLayer.d.ts +59 -0
- package/dist/managers/LayeredChunkManager/CacheLayer.js +161 -0
- package/dist/managers/LayeredChunkManager/ChunkLayerInterfaces.d.ts +37 -0
- package/dist/managers/LayeredChunkManager/ChunkLayerInterfaces.js +0 -0
- package/dist/managers/LayeredChunkManager/DatabaseReadLayer.d.ts +14 -0
- package/dist/managers/LayeredChunkManager/DatabaseReadLayer.js +78 -0
- package/dist/managers/LayeredChunkManager/DatabaseWriteLayer.d.ts +11 -0
- package/dist/managers/LayeredChunkManager/DatabaseWriteLayer.js +43 -0
- package/dist/managers/LayeredChunkManager/HotPackLayer.d.ts +9 -0
- package/dist/managers/LayeredChunkManager/HotPackLayer.js +8 -0
- package/dist/managers/LayeredChunkManager/types.d.ts +39 -0
- package/dist/managers/LayeredChunkManager/types.js +0 -0
- package/dist/managers/LayeredChunkManager.d.ts +53 -0
- package/dist/managers/LayeredChunkManager.js +240 -0
- package/dist/managers/LiveSyncManagers.d.ts +48 -0
- package/dist/managers/LiveSyncManagers.js +136 -0
- package/dist/managers/StorageEventManager.d.ts +135 -0
- package/dist/managers/StorageEventManager.js +564 -0
- package/dist/managers/StorageProcessingManager.d.ts +14 -0
- package/dist/managers/StorageProcessingManager.js +48 -0
- package/dist/managers/adapters/IStorageEventConverterAdapter.d.ts +16 -0
- package/dist/managers/adapters/IStorageEventConverterAdapter.js +0 -0
- package/dist/managers/adapters/IStorageEventManagerAdapter.d.ts +18 -0
- package/dist/managers/adapters/IStorageEventManagerAdapter.js +0 -0
- package/dist/managers/adapters/IStorageEventPersistenceAdapter.d.ts +15 -0
- package/dist/managers/adapters/IStorageEventPersistenceAdapter.js +0 -0
- package/dist/managers/adapters/IStorageEventStatusAdapter.d.ts +13 -0
- package/dist/managers/adapters/IStorageEventStatusAdapter.js +0 -0
- package/dist/managers/adapters/IStorageEventTypeGuardAdapter.d.ts +16 -0
- package/dist/managers/adapters/IStorageEventTypeGuardAdapter.js +0 -0
- package/dist/managers/adapters/IStorageEventWatchAdapter.d.ts +21 -0
- package/dist/managers/adapters/IStorageEventWatchAdapter.js +0 -0
- package/dist/managers/adapters/index.d.ts +6 -0
- package/dist/managers/adapters/index.js +0 -0
- package/dist/mock_and_interop/stores.d.ts +21 -0
- package/dist/mock_and_interop/stores.js +15 -0
- package/dist/mock_and_interop/wrapper.d.ts +7 -0
- package/dist/mock_and_interop/wrapper.js +37 -0
- package/dist/mods.d.ts +1 -0
- package/dist/mods.js +18 -0
- package/dist/platform/browser/index.d.ts +1 -0
- package/dist/platform/browser/index.js +10 -0
- package/dist/platform/browser/storage.d.ts +35 -0
- package/dist/platform/browser/storage.js +139 -0
- package/dist/platform/node/index.d.ts +23 -0
- package/dist/platform/node/index.js +33 -0
- package/dist/platform/node/storage.d.ts +31 -0
- package/dist/platform/node/storage.js +104 -0
- package/dist/platform/storagePath.d.ts +7 -0
- package/dist/platform/storagePath.js +20 -0
- package/dist/pouchdb/LiveSyncDBFunctions.d.ts +14 -0
- package/dist/pouchdb/LiveSyncDBFunctions.js +129 -0
- package/dist/pouchdb/LiveSyncLocalDB.d.ts +196 -0
- package/dist/pouchdb/LiveSyncLocalDB.js +381 -0
- package/dist/pouchdb/PouchDBConstructor.d.ts +3 -0
- package/dist/pouchdb/PouchDBConstructor.js +0 -0
- package/dist/pouchdb/ReplicatorShim.d.ts +51 -0
- package/dist/pouchdb/ReplicatorShim.js +109 -0
- package/dist/pouchdb/StreamingFetch.d.ts +19 -0
- package/dist/pouchdb/StreamingFetch.js +263 -0
- package/dist/pouchdb/chunks.d.ts +38 -0
- package/dist/pouchdb/chunks.js +314 -0
- package/dist/pouchdb/compress.d.ts +11 -0
- package/dist/pouchdb/compress.js +99 -0
- package/dist/pouchdb/encryption.d.ts +20 -0
- package/dist/pouchdb/encryption.js +458 -0
- package/dist/pouchdb/negotiation.d.ts +9 -0
- package/dist/pouchdb/negotiation.js +109 -0
- package/dist/pouchdb/pouchdb-browser.d.ts +2 -0
- package/dist/pouchdb/pouchdb-browser.js +96 -0
- package/dist/pouchdb/pouchdb-http.d.ts +2 -0
- package/dist/pouchdb/pouchdb-http.js +94 -0
- package/dist/pouchdb/pouchdb-test.d.ts +2 -0
- package/dist/pouchdb/pouchdb-test.js +12 -0
- package/dist/pouchdb/utils_couchdb.d.ts +4 -0
- package/dist/pouchdb/utils_couchdb.js +38 -0
- package/dist/replication/LiveSyncAbstractReplicator.d.ts +69 -0
- package/dist/replication/LiveSyncAbstractReplicator.js +92 -0
- package/dist/replication/SyncParamsHandler.d.ts +35 -0
- package/dist/replication/SyncParamsHandler.js +118 -0
- package/dist/replication/couchdb/LiveSyncReplicator.d.ts +85 -0
- package/dist/replication/couchdb/LiveSyncReplicator.js +1132 -0
- package/dist/replication/httplib.d.ts +75 -0
- package/dist/replication/httplib.js +187 -0
- package/dist/replication/journal/JournalSyncCore.d.ts +70 -0
- package/dist/replication/journal/JournalSyncCore.js +737 -0
- package/dist/replication/journal/JournalSyncTypes.d.ts +9 -0
- package/dist/replication/journal/JournalSyncTypes.js +11 -0
- package/dist/replication/journal/LiveSyncJournalReplicator.d.ts +40 -0
- package/dist/replication/journal/LiveSyncJournalReplicator.js +294 -0
- package/dist/replication/journal/LiveSyncJournalReplicatorEnv.d.ts +3 -0
- package/dist/replication/journal/LiveSyncJournalReplicatorEnv.js +0 -0
- package/dist/replication/journal/objectstore/JournalStorageAdapter.d.ts +15 -0
- package/dist/replication/journal/objectstore/JournalStorageAdapter.js +0 -0
- package/dist/replication/journal/objectstore/MinioStorageAdapter.d.ts +21 -0
- package/dist/replication/journal/objectstore/MinioStorageAdapter.js +204 -0
- package/dist/replication/trystero/LiveSyncTrysteroReplicator.d.ts +90 -0
- package/dist/replication/trystero/LiveSyncTrysteroReplicator.js +380 -0
- package/dist/replication/trystero/P2PLogCollector.d.ts +8 -0
- package/dist/replication/trystero/P2PLogCollector.js +91 -0
- package/dist/replication/trystero/P2PReplicatorBase.d.ts +19 -0
- package/dist/replication/trystero/P2PReplicatorBase.js +0 -0
- package/dist/replication/trystero/P2PReplicatorCore.d.ts +12 -0
- package/dist/replication/trystero/P2PReplicatorCore.js +126 -0
- package/dist/replication/trystero/P2PReplicatorPaneCommon.d.ts +41 -0
- package/dist/replication/trystero/P2PReplicatorPaneCommon.js +20 -0
- package/dist/replication/trystero/ProxiedDB.d.ts +13 -0
- package/dist/replication/trystero/ProxiedDB.js +20 -0
- package/dist/replication/trystero/TrysteroReplicator.d.ts +152 -0
- package/dist/replication/trystero/TrysteroReplicator.js +683 -0
- package/dist/replication/trystero/TrysteroReplicatorP2PClient.d.ts +19 -0
- package/dist/replication/trystero/TrysteroReplicatorP2PClient.js +80 -0
- package/dist/replication/trystero/TrysteroReplicatorP2PConnection.d.ts +2 -0
- package/dist/replication/trystero/TrysteroReplicatorP2PConnection.js +4 -0
- package/dist/replication/trystero/TrysteroReplicatorP2PServer.d.ts +117 -0
- package/dist/replication/trystero/TrysteroReplicatorP2PServer.js +540 -0
- package/dist/replication/trystero/UseP2PReplicatorResult.d.ts +11 -0
- package/dist/replication/trystero/UseP2PReplicatorResult.js +0 -0
- package/dist/replication/trystero/addP2PEventHandlers.d.ts +35 -0
- package/dist/replication/trystero/addP2PEventHandlers.js +43 -0
- package/dist/replication/trystero/rpcCompat.d.ts +1 -0
- package/dist/replication/trystero/rpcCompat.js +9 -0
- package/dist/replication/trystero/types.d.ts +95 -0
- package/dist/replication/trystero/types.js +27 -0
- package/dist/replication/trystero/useP2PReplicatorCommands.d.ts +7 -0
- package/dist/replication/trystero/useP2PReplicatorCommands.js +25 -0
- package/dist/replication/trystero/useP2PReplicatorFeature.d.ts +17 -0
- package/dist/replication/trystero/useP2PReplicatorFeature.js +82 -0
- package/dist/rpc/RpcRoom.d.ts +24 -0
- package/dist/rpc/RpcRoom.js +300 -0
- package/dist/rpc/RpcSession.d.ts +9 -0
- package/dist/rpc/RpcSession.js +32 -0
- package/dist/rpc/chunking.d.ts +11 -0
- package/dist/rpc/chunking.js +58 -0
- package/dist/rpc/errors.d.ts +8 -0
- package/dist/rpc/errors.js +26 -0
- package/dist/rpc/index.d.ts +6 -0
- package/dist/rpc/index.js +12 -0
- package/dist/rpc/pouchdb/RpcPouchDBProxy.d.ts +75 -0
- package/dist/rpc/pouchdb/RpcPouchDBProxy.js +115 -0
- package/dist/rpc/pouchdb/RpcPouchDBServer.d.ts +16 -0
- package/dist/rpc/pouchdb/RpcPouchDBServer.js +55 -0
- package/dist/rpc/transports/DiagRTCPeerConnections.d.ts +24 -0
- package/dist/rpc/transports/DiagRTCPeerConnections.js +208 -0
- package/dist/rpc/transports/DiagRTCPeerConnections.types.d.ts +64 -0
- package/dist/rpc/transports/DiagRTCPeerConnections.types.js +12 -0
- package/dist/rpc/transports/DiagRTCPeerConnections.utils.d.ts +33 -0
- package/dist/rpc/transports/DiagRTCPeerConnections.utils.js +217 -0
- package/dist/rpc/transports/TrysteroTransport.d.ts +216 -0
- package/dist/rpc/transports/TrysteroTransport.js +134 -0
- package/dist/rpc/transports/trysteroUtils.d.ts +3 -0
- package/dist/rpc/transports/trysteroUtils.js +37 -0
- package/dist/rpc/types.d.ts +75 -0
- package/dist/rpc/types.js +6 -0
- package/dist/serviceFeatures/checkRemoteSize.d.ts +28 -0
- package/dist/serviceFeatures/checkRemoteSize.js +178 -0
- package/dist/serviceFeatures/offlineScanner.d.ts +128 -0
- package/dist/serviceFeatures/offlineScanner.js +553 -0
- package/dist/serviceFeatures/prepareDatabaseForUse.d.ts +20 -0
- package/dist/serviceFeatures/prepareDatabaseForUse.js +39 -0
- package/dist/serviceFeatures/remoteConfig.d.ts +46 -0
- package/dist/serviceFeatures/remoteConfig.js +247 -0
- package/dist/serviceFeatures/setupObsidian/qrCode.d.ts +4 -0
- package/dist/serviceFeatures/setupObsidian/qrCode.js +67 -0
- package/dist/serviceFeatures/setupObsidian/setupUri.d.ts +7 -0
- package/dist/serviceFeatures/setupObsidian/setupUri.js +70 -0
- package/dist/serviceFeatures/setupObsidian/types.d.ts +2 -0
- package/dist/serviceFeatures/setupObsidian/types.js +0 -0
- package/dist/serviceFeatures/targetFilter.d.ts +24 -0
- package/dist/serviceFeatures/targetFilter.js +178 -0
- package/dist/serviceModules/FileAccessBase.d.ts +93 -0
- package/dist/serviceModules/FileAccessBase.js +219 -0
- package/dist/serviceModules/Rebuilder.d.ts +92 -0
- package/dist/serviceModules/Rebuilder.js +449 -0
- package/dist/serviceModules/ServiceDatabaseFileAccessBase.d.ts +40 -0
- package/dist/serviceModules/ServiceDatabaseFileAccessBase.js +306 -0
- package/dist/serviceModules/ServiceFileAccessBase.d.ts +64 -0
- package/dist/serviceModules/ServiceFileAccessBase.js +312 -0
- package/dist/serviceModules/ServiceFileHandlerBase.d.ts +52 -0
- package/dist/serviceModules/ServiceFileHandlerBase.js +493 -0
- package/dist/serviceModules/ServiceModuleBase.d.ts +10 -0
- package/dist/serviceModules/ServiceModuleBase.js +13 -0
- package/dist/serviceModules/adapters/IConversionAdapter.d.ts +15 -0
- package/dist/serviceModules/adapters/IConversionAdapter.js +0 -0
- package/dist/serviceModules/adapters/IFileSystemAdapter.d.ts +47 -0
- package/dist/serviceModules/adapters/IFileSystemAdapter.js +0 -0
- package/dist/serviceModules/adapters/IPathAdapter.d.ts +15 -0
- package/dist/serviceModules/adapters/IPathAdapter.js +0 -0
- package/dist/serviceModules/adapters/IStorageAdapter.d.ts +56 -0
- package/dist/serviceModules/adapters/IStorageAdapter.js +0 -0
- package/dist/serviceModules/adapters/ITypeGuardAdapter.d.ts +14 -0
- package/dist/serviceModules/adapters/ITypeGuardAdapter.js +0 -0
- package/dist/serviceModules/adapters/IVaultAdapter.d.ts +51 -0
- package/dist/serviceModules/adapters/IVaultAdapter.js +0 -0
- package/dist/serviceModules/adapters/index.d.ts +6 -0
- package/dist/serviceModules/adapters/index.js +0 -0
- package/dist/services/BrowserServices.d.ts +36 -0
- package/dist/services/BrowserServices.js +123 -0
- package/dist/services/HeadlessServices.d.ts +14 -0
- package/dist/services/HeadlessServices.js +144 -0
- package/dist/services/InjectableServices.d.ts +1 -0
- package/dist/services/InjectableServices.js +4 -0
- package/dist/services/ServiceHub.d.ts +82 -0
- package/dist/services/ServiceHub.js +66 -0
- package/dist/services/base/APIService.d.ts +93 -0
- package/dist/services/base/APIService.js +44 -0
- package/dist/services/base/AppLifecycleService.d.ts +132 -0
- package/dist/services/base/AppLifecycleService.js +123 -0
- package/dist/services/base/ConfigService.d.ts +7 -0
- package/dist/services/base/ConfigService.js +6 -0
- package/dist/services/base/ConflictService.d.ts +54 -0
- package/dist/services/base/ConflictService.js +22 -0
- package/dist/services/base/ControlService.d.ts +54 -0
- package/dist/services/base/ControlService.js +103 -0
- package/dist/services/base/DatabaseEventService.d.ts +38 -0
- package/dist/services/base/DatabaseEventService.js +38 -0
- package/dist/services/base/DatabaseService.d.ts +40 -0
- package/dist/services/base/DatabaseService.js +79 -0
- package/dist/services/base/FileProcessingService.d.ts +25 -0
- package/dist/services/base/FileProcessingService.js +28 -0
- package/dist/services/base/IService.d.ts +284 -0
- package/dist/services/base/IService.js +1 -0
- package/dist/services/base/KeyValueDBService.d.ts +42 -0
- package/dist/services/base/KeyValueDBService.js +133 -0
- package/dist/services/base/MessageTranslator.d.ts +6 -0
- package/dist/services/base/MessageTranslator.js +4 -0
- package/dist/services/base/PathService.d.ts +38 -0
- package/dist/services/base/PathService.js +66 -0
- package/dist/services/base/RemoteService.d.ts +61 -0
- package/dist/services/base/RemoteService.js +212 -0
- package/dist/services/base/ReplicationService.d.ts +92 -0
- package/dist/services/base/ReplicationService.js +261 -0
- package/dist/services/base/ReplicatorService.d.ts +66 -0
- package/dist/services/base/ReplicatorService.js +164 -0
- package/dist/services/base/ServiceBase.d.ts +33 -0
- package/dist/services/base/ServiceBase.js +27 -0
- package/dist/services/base/SettingService.d.ts +112 -0
- package/dist/services/base/SettingService.js +543 -0
- package/dist/services/base/TestService.d.ts +28 -0
- package/dist/services/base/TestService.js +19 -0
- package/dist/services/base/TweakValueService.d.ts +40 -0
- package/dist/services/base/TweakValueService.js +6 -0
- package/dist/services/base/UnresolvedErrorManager.d.ts +15 -0
- package/dist/services/base/UnresolvedErrorManager.js +44 -0
- package/dist/services/base/VaultService.d.ts +69 -0
- package/dist/services/base/VaultService.js +70 -0
- package/dist/services/implements/base/SvelteDialog.d.ts +79 -0
- package/dist/services/implements/base/SvelteDialog.js +134 -0
- package/dist/services/implements/base/UIService.d.ts +24 -0
- package/dist/services/implements/base/UIService.js +37 -0
- package/dist/services/implements/browser/BrowserAPIService.d.ts +54 -0
- package/dist/services/implements/browser/BrowserAPIService.js +298 -0
- package/dist/services/implements/browser/BrowserDatabaseService.d.ts +7 -0
- package/dist/services/implements/browser/BrowserDatabaseService.js +10 -0
- package/dist/services/implements/browser/ConfigServiceBrowserCompat.d.ts +16 -0
- package/dist/services/implements/browser/ConfigServiceBrowserCompat.js +23 -0
- package/dist/services/implements/headless/HeadlessAPIService.d.ts +52 -0
- package/dist/services/implements/headless/HeadlessAPIService.js +127 -0
- package/dist/services/implements/headless/HeadlessDatabaseService.d.ts +7 -0
- package/dist/services/implements/headless/HeadlessDatabaseService.js +10 -0
- package/dist/services/implements/injectable/InjectableAPIService.d.ts +7 -0
- package/dist/services/implements/injectable/InjectableAPIService.js +18 -0
- package/dist/services/implements/injectable/InjectableAppLifecycleService.d.ts +11 -0
- package/dist/services/implements/injectable/InjectableAppLifecycleService.js +14 -0
- package/dist/services/implements/injectable/InjectableConflictService.d.ts +11 -0
- package/dist/services/implements/injectable/InjectableConflictService.js +14 -0
- package/dist/services/implements/injectable/InjectableDatabaseEventService.d.ts +4 -0
- package/dist/services/implements/injectable/InjectableDatabaseEventService.js +7 -0
- package/dist/services/implements/injectable/InjectableFileProcessingService.d.ts +4 -0
- package/dist/services/implements/injectable/InjectableFileProcessingService.js +6 -0
- package/dist/services/implements/injectable/InjectablePathService.d.ts +12 -0
- package/dist/services/implements/injectable/InjectablePathService.js +36 -0
- package/dist/services/implements/injectable/InjectableRemoteService.d.ts +4 -0
- package/dist/services/implements/injectable/InjectableRemoteService.js +7 -0
- package/dist/services/implements/injectable/InjectableReplicationService.d.ts +4 -0
- package/dist/services/implements/injectable/InjectableReplicationService.js +6 -0
- package/dist/services/implements/injectable/InjectableReplicatorService.d.ts +4 -0
- package/dist/services/implements/injectable/InjectableReplicatorService.js +7 -0
- package/dist/services/implements/injectable/InjectableServiceHub.d.ts +72 -0
- package/dist/services/implements/injectable/InjectableServiceHub.js +125 -0
- package/dist/services/implements/injectable/InjectableServices.d.ts +36 -0
- package/dist/services/implements/injectable/InjectableServices.js +1 -0
- package/dist/services/implements/injectable/InjectableSettingService.d.ts +11 -0
- package/dist/services/implements/injectable/InjectableSettingService.js +33 -0
- package/dist/services/implements/injectable/InjectableTestService.d.ts +5 -0
- package/dist/services/implements/injectable/InjectableTestService.js +8 -0
- package/dist/services/implements/injectable/InjectableTweakValueService.d.ts +15 -0
- package/dist/services/implements/injectable/InjectableTweakValueService.js +12 -0
- package/dist/services/implements/injectable/InjectableVaultService.d.ts +9 -0
- package/dist/services/implements/injectable/InjectableVaultService.js +20 -0
- package/dist/services/lib/HandlerUtils.d.ts +374 -0
- package/dist/services/lib/HandlerUtils.js +412 -0
- package/dist/services/lib/logUtils.d.ts +13 -0
- package/dist/services/lib/logUtils.js +28 -0
- package/dist/services/lib/remoteActivity.d.ts +13 -0
- package/dist/services/lib/remoteActivity.js +11 -0
- package/dist/string_and_binary/chunks.d.ts +10 -0
- package/dist/string_and_binary/chunks.js +561 -0
- package/dist/string_and_binary/convert.d.ts +8 -0
- package/dist/string_and_binary/convert.js +46 -0
- package/dist/string_and_binary/hash.d.ts +2 -0
- package/dist/string_and_binary/hash.js +1 -0
- package/dist/string_and_binary/path.d.ts +35 -0
- package/dist/string_and_binary/path.js +240 -0
- package/dist/worker/bg.common.d.ts +2 -0
- package/dist/worker/bg.common.js +6 -0
- package/dist/worker/bg.worker.d.ts +1 -0
- package/dist/worker/bg.worker.encryption.d.ts +7 -0
- package/dist/worker/bg.worker.encryption.js +30 -0
- package/dist/worker/bg.worker.js +14 -0
- package/dist/worker/bg.worker.splitting.d.ts +6 -0
- package/dist/worker/bg.worker.splitting.js +36 -0
- package/dist/worker/bgWorker.d.ts +25 -0
- package/dist/worker/bgWorker.direct.d.ts +40 -0
- package/dist/worker/bgWorker.direct.js +65 -0
- package/dist/worker/bgWorker.encryption.d.ts +22 -0
- package/dist/worker/bgWorker.encryption.js +40 -0
- package/dist/worker/bgWorker.js +348 -0
- package/dist/worker/bgWorker.splitting.d.ts +27 -0
- package/dist/worker/bgWorker.splitting.js +123 -0
- package/dist/worker/universalTypes.d.ts +63 -0
- package/dist/worker/universalTypes.js +4 -0
- package/docs/development.md +51 -0
- package/docs/platform-storage.md +60 -0
- package/docs/releasing.md +69 -0
- package/package.json +693 -0
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { type DocumentID } from "../common/types.js";
|
|
2
|
+
import { type ChunkManager } from "./ChunkManager.js";
|
|
3
|
+
import type { IReplicatorService, ISettingService } from "../services/base/IService.js";
|
|
4
|
+
export declare const EVENT_MISSING_CHUNKS = "missingChunks";
|
|
5
|
+
export declare const EVENT_MISSING_CHUNK_REMOTE = "missingChunkRemote";
|
|
6
|
+
export declare const EVENT_CHUNK_FETCHED = "chunkFetched";
|
|
7
|
+
export type ChunkFetcherOptions = {
|
|
8
|
+
settingService: ISettingService;
|
|
9
|
+
chunkManager: ChunkManager;
|
|
10
|
+
replicatorService: IReplicatorService;
|
|
11
|
+
deliveryStallTimeoutMs?: number;
|
|
12
|
+
};
|
|
13
|
+
export declare class ChunkFetcher {
|
|
14
|
+
options: ChunkFetcherOptions;
|
|
15
|
+
get chunkManager(): ChunkManager;
|
|
16
|
+
queue: DocumentID[];
|
|
17
|
+
private readonly pendingClaims;
|
|
18
|
+
private destroyed;
|
|
19
|
+
get interval(): number;
|
|
20
|
+
get concurrency(): number;
|
|
21
|
+
abort: AbortController;
|
|
22
|
+
constructor(options: ChunkFetcherOptions);
|
|
23
|
+
destroy(): void;
|
|
24
|
+
onEventHandler: (ids: DocumentID[]) => void;
|
|
25
|
+
onEvent(ids: DocumentID[]): void;
|
|
26
|
+
private ensureClaims;
|
|
27
|
+
private removePendingDelivery;
|
|
28
|
+
private onClaimStalled;
|
|
29
|
+
private settleClaim;
|
|
30
|
+
private touchClaims;
|
|
31
|
+
private waitForActivityBoundary;
|
|
32
|
+
/**
|
|
33
|
+
* Processing requests
|
|
34
|
+
*/
|
|
35
|
+
currentProcessing: number;
|
|
36
|
+
/**
|
|
37
|
+
* Time of the last request to the remote server.
|
|
38
|
+
* This is used to manage the interval between requests.
|
|
39
|
+
* Even if concurrency allows, every start of a request will ensure that the interval is respected.
|
|
40
|
+
*/
|
|
41
|
+
previousRequestTime: number;
|
|
42
|
+
canRequestMore(): boolean;
|
|
43
|
+
requestMissingChunks(): Promise<void>;
|
|
44
|
+
}
|
|
@@ -0,0 +1,251 @@
|
|
|
1
|
+
import { delay, promiseWithResolvers } from "octagonal-wheels/promises";
|
|
2
|
+
import { unique } from "octagonal-wheels/collection";
|
|
3
|
+
import { LOG_LEVEL_VERBOSE, Logger } from "../common/logger.js";
|
|
4
|
+
import { DEFAULT_SETTINGS } from "../common/types.js";
|
|
5
|
+
import {} from "./ChunkManager.js";
|
|
6
|
+
import { compatGlobal } from "../common/coreEnvFunctions.js";
|
|
7
|
+
import { DEFAULT_CHUNK_DELIVERY_STALL_TIMEOUT_MS } from "./ChunkDeliveryCoordinator.js";
|
|
8
|
+
const EVENT_MISSING_CHUNKS = "missingChunks";
|
|
9
|
+
const EVENT_MISSING_CHUNK_REMOTE = "missingChunkRemote";
|
|
10
|
+
const EVENT_CHUNK_FETCHED = "chunkFetched";
|
|
11
|
+
const BATCH_SIZE = 100;
|
|
12
|
+
class ChunkFetcher {
|
|
13
|
+
options;
|
|
14
|
+
get chunkManager() {
|
|
15
|
+
return this.options.chunkManager;
|
|
16
|
+
}
|
|
17
|
+
queue = [];
|
|
18
|
+
pendingClaims = /* @__PURE__ */ new Map();
|
|
19
|
+
destroyed = false;
|
|
20
|
+
get interval() {
|
|
21
|
+
const settings = this.options.settingService.currentSettings();
|
|
22
|
+
return settings.minimumIntervalOfReadChunksOnline || DEFAULT_SETTINGS.minimumIntervalOfReadChunksOnline;
|
|
23
|
+
}
|
|
24
|
+
get concurrency() {
|
|
25
|
+
const settings = this.options.settingService.currentSettings();
|
|
26
|
+
return settings.concurrencyOfReadChunksOnline || DEFAULT_SETTINGS.concurrencyOfReadChunksOnline;
|
|
27
|
+
}
|
|
28
|
+
abort = new AbortController();
|
|
29
|
+
constructor(options) {
|
|
30
|
+
this.options = options;
|
|
31
|
+
this.chunkManager.addListener(EVENT_MISSING_CHUNKS, this.onEventHandler, {
|
|
32
|
+
signal: this.abort.signal
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
destroy() {
|
|
36
|
+
if (this.destroyed) return;
|
|
37
|
+
this.destroyed = true;
|
|
38
|
+
this.abort.abort();
|
|
39
|
+
this.queue = [];
|
|
40
|
+
const pendingDeliveries = new Set(this.pendingClaims.values());
|
|
41
|
+
this.pendingClaims.clear();
|
|
42
|
+
for (const pending of pendingDeliveries) {
|
|
43
|
+
pending.resolveActivityBoundary(false);
|
|
44
|
+
pending.claim.release();
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
onEventHandler = this.onEvent.bind(this);
|
|
48
|
+
onEvent(ids) {
|
|
49
|
+
if (this.destroyed) return;
|
|
50
|
+
const claimedIds = this.ensureClaims(ids);
|
|
51
|
+
this.queue = unique([...this.queue, ...claimedIds]);
|
|
52
|
+
if (this.canRequestMore()) {
|
|
53
|
+
compatGlobal.setTimeout(() => void this.requestMissingChunks(), 1);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
ensureClaims(ids) {
|
|
57
|
+
const unclaimedIds = unique(ids.filter((id) => !this.pendingClaims.has(id)));
|
|
58
|
+
if (unclaimedIds.length === 0) return [];
|
|
59
|
+
let pending;
|
|
60
|
+
const activityBoundary = promiseWithResolvers();
|
|
61
|
+
const claim = this.chunkManager.deliveryCoordinator.claim(unclaimedIds, {
|
|
62
|
+
stallTimeoutMs: this.options.deliveryStallTimeoutMs ?? DEFAULT_CHUNK_DELIVERY_STALL_TIMEOUT_MS,
|
|
63
|
+
onStalled: (stalledIds) => this.onClaimStalled(pending, stalledIds)
|
|
64
|
+
});
|
|
65
|
+
pending = {
|
|
66
|
+
activityBoundaryEntered: activityBoundary.promise,
|
|
67
|
+
claim,
|
|
68
|
+
resolveActivityBoundary: activityBoundary.resolve
|
|
69
|
+
};
|
|
70
|
+
for (const id of unclaimedIds) {
|
|
71
|
+
this.pendingClaims.set(id, pending);
|
|
72
|
+
}
|
|
73
|
+
void this.options.replicatorService.runBoundedRemoteActivity(
|
|
74
|
+
() => {
|
|
75
|
+
pending.claim.touch();
|
|
76
|
+
pending.resolveActivityBoundary(true);
|
|
77
|
+
return claim.done;
|
|
78
|
+
},
|
|
79
|
+
{ label: "chunk-fetch" }
|
|
80
|
+
).catch((error) => {
|
|
81
|
+
const abandonedIds = claim.pendingIds;
|
|
82
|
+
pending.resolveActivityBoundary(false);
|
|
83
|
+
this.removePendingDelivery(pending, abandonedIds);
|
|
84
|
+
claim.release();
|
|
85
|
+
Logger("The chunk-delivery activity runner rejected before the claim settled.", LOG_LEVEL_VERBOSE);
|
|
86
|
+
Logger(error, LOG_LEVEL_VERBOSE);
|
|
87
|
+
});
|
|
88
|
+
return unclaimedIds;
|
|
89
|
+
}
|
|
90
|
+
removePendingDelivery(pending, ids) {
|
|
91
|
+
for (const id of ids) {
|
|
92
|
+
if (this.pendingClaims.get(id) === pending) {
|
|
93
|
+
this.pendingClaims.delete(id);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
const removed = new Set(ids);
|
|
97
|
+
this.queue = this.queue.filter((id) => !(removed.has(id) && !this.pendingClaims.has(id)));
|
|
98
|
+
}
|
|
99
|
+
onClaimStalled(pending, stalledIds) {
|
|
100
|
+
pending.resolveActivityBoundary(false);
|
|
101
|
+
this.removePendingDelivery(pending, stalledIds);
|
|
102
|
+
Logger(`Chunk delivery stalled for the following IDs: ${stalledIds.join(", ")}`, LOG_LEVEL_VERBOSE);
|
|
103
|
+
}
|
|
104
|
+
settleClaim(id) {
|
|
105
|
+
const pending = this.pendingClaims.get(id);
|
|
106
|
+
if (!pending) return;
|
|
107
|
+
this.pendingClaims.delete(id);
|
|
108
|
+
pending.claim.settle(id);
|
|
109
|
+
}
|
|
110
|
+
touchClaims(ids) {
|
|
111
|
+
const pendingDeliveries = new Set(
|
|
112
|
+
ids.map((id) => this.pendingClaims.get(id)).filter((pending) => pending !== void 0)
|
|
113
|
+
);
|
|
114
|
+
for (const pending of pendingDeliveries) {
|
|
115
|
+
pending.claim.touch();
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
async waitForActivityBoundary(ids) {
|
|
119
|
+
const pendingDeliveries = new Set(
|
|
120
|
+
ids.map((id) => this.pendingClaims.get(id)).filter((pending) => pending !== void 0)
|
|
121
|
+
);
|
|
122
|
+
const entered = new Map(
|
|
123
|
+
await Promise.all(
|
|
124
|
+
[...pendingDeliveries].map(async (pending) => [pending, await pending.activityBoundaryEntered])
|
|
125
|
+
)
|
|
126
|
+
);
|
|
127
|
+
return ids.filter((id) => {
|
|
128
|
+
const pending = this.pendingClaims.get(id);
|
|
129
|
+
return pending !== void 0 && entered.get(pending) === true;
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
/**
|
|
133
|
+
* Processing requests
|
|
134
|
+
*/
|
|
135
|
+
currentProcessing = 0;
|
|
136
|
+
/**
|
|
137
|
+
* Time of the last request to the remote server.
|
|
138
|
+
* This is used to manage the interval between requests.
|
|
139
|
+
* Even if concurrency allows, every start of a request will ensure that the interval is respected.
|
|
140
|
+
*/
|
|
141
|
+
previousRequestTime = 0;
|
|
142
|
+
canRequestMore() {
|
|
143
|
+
return this.currentProcessing < this.concurrency && this.queue.length > 0;
|
|
144
|
+
}
|
|
145
|
+
async requestMissingChunks() {
|
|
146
|
+
if (this.destroyed || !this.canRequestMore()) {
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
let requestIDs = [];
|
|
150
|
+
try {
|
|
151
|
+
let isValidChunk2 = function(chunk) {
|
|
152
|
+
return chunk && typeof chunk?._id === "string" && typeof chunk?.data === "string";
|
|
153
|
+
};
|
|
154
|
+
var isValidChunk = isValidChunk2;
|
|
155
|
+
this.currentProcessing++;
|
|
156
|
+
requestIDs = this.queue.splice(0, BATCH_SIZE);
|
|
157
|
+
this.ensureClaims(requestIDs);
|
|
158
|
+
requestIDs = await this.waitForActivityBoundary(requestIDs);
|
|
159
|
+
if (requestIDs.length === 0) return;
|
|
160
|
+
this.touchClaims(requestIDs);
|
|
161
|
+
const now = Date.now();
|
|
162
|
+
const timeSinceLastRequest = now - this.previousRequestTime;
|
|
163
|
+
this.previousRequestTime = now;
|
|
164
|
+
const timeToWait = Math.max(this.interval - timeSinceLastRequest, 0);
|
|
165
|
+
if (timeToWait > 0) await delay(timeToWait);
|
|
166
|
+
this.touchClaims(requestIDs);
|
|
167
|
+
const replicator = this.options.replicatorService.getActiveReplicator();
|
|
168
|
+
if (!replicator) {
|
|
169
|
+
Logger("No active replicator was found to request missing chunks.");
|
|
170
|
+
return;
|
|
171
|
+
}
|
|
172
|
+
const fetched = await replicator.fetchRemoteChunks(requestIDs, false);
|
|
173
|
+
this.touchClaims(requestIDs);
|
|
174
|
+
if (!fetched) {
|
|
175
|
+
Logger(`No chunks were found for the following IDs: ${requestIDs.join(", ")}`);
|
|
176
|
+
for (const chunkID of requestIDs) {
|
|
177
|
+
this.chunkManager.emitEvent(EVENT_MISSING_CHUNK_REMOTE, chunkID);
|
|
178
|
+
}
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
const chunks = fetched.filter((chunk) => isValidChunk2(chunk));
|
|
182
|
+
if (chunks.length !== fetched.length) {
|
|
183
|
+
Logger(
|
|
184
|
+
`Some fetched chunks are invalid and will be ignored: (${fetched.length - chunks.length} / ${fetched.length}).`,
|
|
185
|
+
LOG_LEVEL_VERBOSE
|
|
186
|
+
);
|
|
187
|
+
for (const chunk of fetched) {
|
|
188
|
+
if (!isValidChunk2(chunk)) {
|
|
189
|
+
Logger(`Invalid chunk: ${JSON.stringify(chunk)}`, LOG_LEVEL_VERBOSE);
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
if (chunks.length === 0) {
|
|
194
|
+
Logger(`No valid chunks were found for the following IDs: ${requestIDs.join(", ")}`);
|
|
195
|
+
}
|
|
196
|
+
const missingIDs = requestIDs.filter((id) => !chunks.some((chunk) => chunk._id === id));
|
|
197
|
+
try {
|
|
198
|
+
if (chunks.length === 0) {
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
Logger(`Writing fetched chunks (${chunks.length}) to the database...`);
|
|
202
|
+
const result = await this.chunkManager.write(
|
|
203
|
+
chunks,
|
|
204
|
+
{
|
|
205
|
+
skipCache: true,
|
|
206
|
+
force: true
|
|
207
|
+
// Force writing to ensure the chunks with existing _rev.
|
|
208
|
+
},
|
|
209
|
+
"ChunkFetcher"
|
|
210
|
+
);
|
|
211
|
+
this.touchClaims(requestIDs);
|
|
212
|
+
if (result.result === true) {
|
|
213
|
+
Logger(`Fetched chunks were stored successfully: ${chunks.length}`, LOG_LEVEL_VERBOSE);
|
|
214
|
+
} else {
|
|
215
|
+
Logger(
|
|
216
|
+
`Fetched chunks could not be stored: ${chunks.map((chunk) => chunk._id).join(", ")}`,
|
|
217
|
+
LOG_LEVEL_VERBOSE
|
|
218
|
+
);
|
|
219
|
+
}
|
|
220
|
+
} catch (error) {
|
|
221
|
+
Logger(`An error occurred while storing fetched chunks!`, LOG_LEVEL_VERBOSE);
|
|
222
|
+
Logger(error, LOG_LEVEL_VERBOSE);
|
|
223
|
+
} finally {
|
|
224
|
+
for (const chunk of chunks) {
|
|
225
|
+
this.chunkManager.emitEvent(EVENT_CHUNK_FETCHED, chunk);
|
|
226
|
+
}
|
|
227
|
+
for (const chunkID of missingIDs) {
|
|
228
|
+
this.chunkManager.emitEvent(EVENT_MISSING_CHUNK_REMOTE, chunkID);
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
} catch (error) {
|
|
232
|
+
Logger("An error occurred while fetching remote chunks.", LOG_LEVEL_VERBOSE);
|
|
233
|
+
Logger(error, LOG_LEVEL_VERBOSE);
|
|
234
|
+
} finally {
|
|
235
|
+
for (const id of requestIDs) {
|
|
236
|
+
this.settleClaim(id);
|
|
237
|
+
}
|
|
238
|
+
this.currentProcessing--;
|
|
239
|
+
this.previousRequestTime = Date.now();
|
|
240
|
+
if (this.queue.length > 0) {
|
|
241
|
+
compatGlobal.setTimeout(() => void this.requestMissingChunks(), 0);
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
export {
|
|
247
|
+
ChunkFetcher,
|
|
248
|
+
EVENT_CHUNK_FETCHED,
|
|
249
|
+
EVENT_MISSING_CHUNKS,
|
|
250
|
+
EVENT_MISSING_CHUNK_REMOTE
|
|
251
|
+
};
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { type Diff } from "diff-match-patch";
|
|
2
|
+
import { type EntryDoc, type FilePathWithPrefix, type diff_result_leaf, type LoadedEntry, type DIFF_CHECK_RESULT_AUTO } from "../common/types.js";
|
|
3
|
+
import type { EntryManager } from "./EntryManager/EntryManager.js";
|
|
4
|
+
import type { IPathService } from "../services/base/IService.js";
|
|
5
|
+
type AutoMergeOutcomeOK = {
|
|
6
|
+
ok: DIFF_CHECK_RESULT_AUTO;
|
|
7
|
+
};
|
|
8
|
+
type AutoMergeCanBeDoneByDeletingRev = {
|
|
9
|
+
result: string;
|
|
10
|
+
conflictedRev: string;
|
|
11
|
+
};
|
|
12
|
+
type UserActionRequired = {
|
|
13
|
+
leftRev: string;
|
|
14
|
+
rightRev: string;
|
|
15
|
+
leftLeaf: diff_result_leaf | false;
|
|
16
|
+
rightLeaf: diff_result_leaf | false;
|
|
17
|
+
};
|
|
18
|
+
export type AutoMergeResult = Promise<AutoMergeOutcomeOK | AutoMergeCanBeDoneByDeletingRev | UserActionRequired>;
|
|
19
|
+
export interface ConflictManagerOptions {
|
|
20
|
+
entryManager: EntryManager;
|
|
21
|
+
pathService: IPathService;
|
|
22
|
+
database: PouchDB.Database<EntryDoc>;
|
|
23
|
+
}
|
|
24
|
+
export declare class ConflictManager {
|
|
25
|
+
options: ConflictManagerOptions;
|
|
26
|
+
constructor(options: ConflictManagerOptions);
|
|
27
|
+
get database(): PouchDB.Database<EntryDoc>;
|
|
28
|
+
getConflictedDoc(path: FilePathWithPrefix, rev: string): Promise<false | diff_result_leaf>;
|
|
29
|
+
mergeSensibly(path: FilePathWithPrefix, baseRev: string, currentRev: string, conflictedRev: string): Promise<Diff[] | false>;
|
|
30
|
+
mergeObject(path: FilePathWithPrefix, baseRev: string, currentRev: string, conflictedRev: string): Promise<string | false>;
|
|
31
|
+
tryAutoMergeSensibly(path: FilePathWithPrefix, test: LoadedEntry, conflicts: string[]): Promise<false | {
|
|
32
|
+
result: string;
|
|
33
|
+
conflictedRev: string;
|
|
34
|
+
}>;
|
|
35
|
+
tryAutoMerge(path: FilePathWithPrefix, enableMarkdownAutoMerge: boolean): AutoMergeResult;
|
|
36
|
+
}
|
|
37
|
+
export {};
|
|
@@ -0,0 +1,322 @@
|
|
|
1
|
+
import { diff_match_patch, DIFF_DELETE, DIFF_INSERT, DIFF_EQUAL } from "diff-match-patch";
|
|
2
|
+
import { readString, decodeBinary } from "octagonal-wheels/binary";
|
|
3
|
+
import { Logger, LOG_LEVEL_VERBOSE, LOG_LEVEL_INFO } from "octagonal-wheels/common/logger";
|
|
4
|
+
import {
|
|
5
|
+
MISSING_OR_ERROR,
|
|
6
|
+
NOT_CONFLICTED
|
|
7
|
+
} from "../common/types.js";
|
|
8
|
+
import {
|
|
9
|
+
getDocData,
|
|
10
|
+
tryParseJSON,
|
|
11
|
+
generatePatchObj,
|
|
12
|
+
flattenObject,
|
|
13
|
+
applyPatch,
|
|
14
|
+
isSensibleMargeApplicable,
|
|
15
|
+
isObjectMargeApplicable
|
|
16
|
+
} from "../common/utils.js";
|
|
17
|
+
import { isErrorOfMissingDoc } from "../pouchdb/utils_couchdb.js";
|
|
18
|
+
class ConflictManager {
|
|
19
|
+
options;
|
|
20
|
+
constructor(options) {
|
|
21
|
+
this.options = options;
|
|
22
|
+
}
|
|
23
|
+
get database() {
|
|
24
|
+
return this.options.database;
|
|
25
|
+
}
|
|
26
|
+
async getConflictedDoc(path, rev) {
|
|
27
|
+
try {
|
|
28
|
+
const doc = await this.options.entryManager.getDBEntry(path, { rev }, false, true, true);
|
|
29
|
+
if (doc === false) return false;
|
|
30
|
+
let data = getDocData(doc.data);
|
|
31
|
+
if (doc.datatype == "newnote") {
|
|
32
|
+
data = readString(new Uint8Array(decodeBinary(doc.data)));
|
|
33
|
+
} else if (doc.datatype == "plain") {
|
|
34
|
+
}
|
|
35
|
+
return {
|
|
36
|
+
deleted: doc.deleted || doc._deleted,
|
|
37
|
+
ctime: doc.ctime,
|
|
38
|
+
mtime: doc.mtime,
|
|
39
|
+
rev,
|
|
40
|
+
data
|
|
41
|
+
};
|
|
42
|
+
} catch (ex) {
|
|
43
|
+
if (isErrorOfMissingDoc(ex)) {
|
|
44
|
+
return false;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
49
|
+
async mergeSensibly(path, baseRev, currentRev, conflictedRev) {
|
|
50
|
+
const baseLeaf = await this.getConflictedDoc(path, baseRev);
|
|
51
|
+
const leftLeaf = await this.getConflictedDoc(path, currentRev);
|
|
52
|
+
const rightLeaf = await this.getConflictedDoc(path, conflictedRev);
|
|
53
|
+
let autoMerge = false;
|
|
54
|
+
if (baseLeaf == false || leftLeaf == false || rightLeaf == false) {
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
if (leftLeaf.deleted || rightLeaf.deleted) {
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
const dmp = new diff_match_patch();
|
|
61
|
+
const mapLeft = dmp.diff_linesToChars_(baseLeaf.data, leftLeaf.data);
|
|
62
|
+
const diffLeftSrc = dmp.diff_main(mapLeft.chars1, mapLeft.chars2, false);
|
|
63
|
+
dmp.diff_charsToLines_(diffLeftSrc, mapLeft.lineArray);
|
|
64
|
+
const mapRight = dmp.diff_linesToChars_(baseLeaf.data, rightLeaf.data);
|
|
65
|
+
const diffRightSrc = dmp.diff_main(mapRight.chars1, mapRight.chars2, false);
|
|
66
|
+
dmp.diff_charsToLines_(diffRightSrc, mapRight.lineArray);
|
|
67
|
+
function splitDiffPiece(src) {
|
|
68
|
+
const ret = [];
|
|
69
|
+
do {
|
|
70
|
+
const d = src.shift();
|
|
71
|
+
if (d === void 0) {
|
|
72
|
+
return ret;
|
|
73
|
+
}
|
|
74
|
+
const pieces = d[1].split(/([^\n]*\n)/).filter((f) => f != "");
|
|
75
|
+
if (typeof d == "undefined") {
|
|
76
|
+
break;
|
|
77
|
+
}
|
|
78
|
+
if (d[0] != DIFF_DELETE) {
|
|
79
|
+
ret.push(...pieces.map((e) => [d[0], e]));
|
|
80
|
+
}
|
|
81
|
+
if (d[0] == DIFF_DELETE) {
|
|
82
|
+
const nd = src.shift();
|
|
83
|
+
if (typeof nd != "undefined") {
|
|
84
|
+
const piecesPair = nd[1].split(/([^\n]*\n)/).filter((f) => f != "");
|
|
85
|
+
if (nd[0] == DIFF_INSERT) {
|
|
86
|
+
for (const pt of pieces) {
|
|
87
|
+
ret.push([d[0], pt]);
|
|
88
|
+
const pairP = piecesPair.shift();
|
|
89
|
+
if (typeof pairP != "undefined") ret.push([DIFF_INSERT, pairP]);
|
|
90
|
+
}
|
|
91
|
+
ret.push(...piecesPair.map((e) => [nd[0], e]));
|
|
92
|
+
} else {
|
|
93
|
+
ret.push(...pieces.map((e) => [d[0], e]));
|
|
94
|
+
ret.push(...piecesPair.map((e) => [nd[0], e]));
|
|
95
|
+
}
|
|
96
|
+
} else {
|
|
97
|
+
ret.push(...pieces.map((e) => [0, e]));
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
} while (src.length > 0);
|
|
101
|
+
return ret;
|
|
102
|
+
}
|
|
103
|
+
const diffLeft = splitDiffPiece(diffLeftSrc);
|
|
104
|
+
const diffRight = splitDiffPiece(diffRightSrc);
|
|
105
|
+
let rightIdx = 0;
|
|
106
|
+
let leftIdx = 0;
|
|
107
|
+
const merged = [];
|
|
108
|
+
autoMerge = true;
|
|
109
|
+
LOOP_MERGE: do {
|
|
110
|
+
if (leftIdx >= diffLeft.length && rightIdx >= diffRight.length) {
|
|
111
|
+
break LOOP_MERGE;
|
|
112
|
+
}
|
|
113
|
+
const leftItem = diffLeft[leftIdx] ?? [0, ""];
|
|
114
|
+
const rightItem = diffRight[rightIdx] ?? [0, ""];
|
|
115
|
+
leftIdx++;
|
|
116
|
+
rightIdx++;
|
|
117
|
+
if (leftItem[0] == DIFF_EQUAL && rightItem[0] == DIFF_EQUAL && leftItem[1] == rightItem[1]) {
|
|
118
|
+
merged.push(leftItem);
|
|
119
|
+
continue;
|
|
120
|
+
}
|
|
121
|
+
if (leftItem[0] == DIFF_DELETE && rightItem[0] == DIFF_DELETE && leftItem[1] == rightItem[1]) {
|
|
122
|
+
const nextLeftIdx = leftIdx;
|
|
123
|
+
const nextRightIdx = rightIdx;
|
|
124
|
+
const [nextLeftItem, nextRightItem] = [
|
|
125
|
+
diffLeft[nextLeftIdx] ?? [0, ""],
|
|
126
|
+
diffRight[nextRightIdx] ?? [0, ""]
|
|
127
|
+
];
|
|
128
|
+
const nextLeftIsInsert = nextLeftItem[0] == DIFF_INSERT;
|
|
129
|
+
const nextRightIsInsert = nextRightItem[0] == DIFF_INSERT;
|
|
130
|
+
if (nextLeftIsInsert != nextRightIsInsert) {
|
|
131
|
+
autoMerge = false;
|
|
132
|
+
break;
|
|
133
|
+
}
|
|
134
|
+
if (nextLeftIsInsert && nextRightIsInsert && nextLeftItem[1] != nextRightItem[1]) {
|
|
135
|
+
autoMerge = false;
|
|
136
|
+
break;
|
|
137
|
+
}
|
|
138
|
+
merged.push(leftItem);
|
|
139
|
+
continue;
|
|
140
|
+
}
|
|
141
|
+
if (leftItem[0] == DIFF_INSERT && rightItem[0] == DIFF_INSERT) {
|
|
142
|
+
if (leftItem[1] == rightItem[1]) {
|
|
143
|
+
merged.push(leftItem);
|
|
144
|
+
continue;
|
|
145
|
+
} else {
|
|
146
|
+
if (leftLeaf.mtime <= rightLeaf.mtime) {
|
|
147
|
+
merged.push(leftItem);
|
|
148
|
+
merged.push(rightItem);
|
|
149
|
+
continue;
|
|
150
|
+
} else {
|
|
151
|
+
merged.push(rightItem);
|
|
152
|
+
merged.push(leftItem);
|
|
153
|
+
continue;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
if (leftItem[0] == DIFF_INSERT) {
|
|
158
|
+
rightIdx--;
|
|
159
|
+
merged.push(leftItem);
|
|
160
|
+
continue;
|
|
161
|
+
}
|
|
162
|
+
if (rightItem[0] == DIFF_INSERT) {
|
|
163
|
+
leftIdx--;
|
|
164
|
+
merged.push(rightItem);
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
167
|
+
if (rightItem[1] != leftItem[1]) {
|
|
168
|
+
Logger(
|
|
169
|
+
`MERGING PANIC:${leftItem[0]},${leftItem[1]} == ${rightItem[0]},${rightItem[1]}`,
|
|
170
|
+
LOG_LEVEL_VERBOSE
|
|
171
|
+
);
|
|
172
|
+
autoMerge = false;
|
|
173
|
+
break LOOP_MERGE;
|
|
174
|
+
}
|
|
175
|
+
if (leftItem[0] == DIFF_DELETE) {
|
|
176
|
+
if (rightItem[0] == DIFF_EQUAL) {
|
|
177
|
+
merged.push(leftItem);
|
|
178
|
+
continue;
|
|
179
|
+
} else {
|
|
180
|
+
autoMerge = false;
|
|
181
|
+
break LOOP_MERGE;
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
if (rightItem[0] == DIFF_DELETE) {
|
|
185
|
+
if (leftItem[0] == DIFF_EQUAL) {
|
|
186
|
+
merged.push(rightItem);
|
|
187
|
+
continue;
|
|
188
|
+
} else {
|
|
189
|
+
autoMerge = false;
|
|
190
|
+
break LOOP_MERGE;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
Logger(
|
|
194
|
+
`Weird condition:${leftItem[0]},${leftItem[1]} == ${rightItem[0]},${rightItem[1]}`,
|
|
195
|
+
LOG_LEVEL_VERBOSE
|
|
196
|
+
);
|
|
197
|
+
break LOOP_MERGE;
|
|
198
|
+
} while (leftIdx < diffLeft.length || rightIdx < diffRight.length);
|
|
199
|
+
if (autoMerge) {
|
|
200
|
+
Logger(`Sensibly merge available`, LOG_LEVEL_VERBOSE);
|
|
201
|
+
return merged;
|
|
202
|
+
} else {
|
|
203
|
+
return false;
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
async mergeObject(path, baseRev, currentRev, conflictedRev) {
|
|
207
|
+
try {
|
|
208
|
+
const baseLeaf = await this.getConflictedDoc(path, baseRev);
|
|
209
|
+
const leftLeaf = await this.getConflictedDoc(path, currentRev);
|
|
210
|
+
const rightLeaf = await this.getConflictedDoc(path, conflictedRev);
|
|
211
|
+
if (baseLeaf == false || leftLeaf == false || rightLeaf == false) {
|
|
212
|
+
Logger(`Could not load leafs for merge`, LOG_LEVEL_VERBOSE);
|
|
213
|
+
Logger(
|
|
214
|
+
`${baseLeaf ? "base" : "missing base"}, ${leftLeaf ? "left" : "missing left"}, ${rightLeaf ? "right" : "missing right"} }`,
|
|
215
|
+
LOG_LEVEL_VERBOSE
|
|
216
|
+
);
|
|
217
|
+
return false;
|
|
218
|
+
}
|
|
219
|
+
if (leftLeaf.deleted || rightLeaf.deleted) {
|
|
220
|
+
Logger(`Either is deleted`, LOG_LEVEL_VERBOSE);
|
|
221
|
+
return false;
|
|
222
|
+
}
|
|
223
|
+
const baseObj = { data: tryParseJSON(baseLeaf.data, {}) };
|
|
224
|
+
const leftObj = { data: tryParseJSON(leftLeaf.data, {}) };
|
|
225
|
+
const rightObj = { data: tryParseJSON(rightLeaf.data, {}) };
|
|
226
|
+
const diffLeft = generatePatchObj(baseObj, leftObj);
|
|
227
|
+
const diffRight = generatePatchObj(baseObj, rightObj);
|
|
228
|
+
const diffSetLeft = new Map(flattenObject(diffLeft));
|
|
229
|
+
const diffSetRight = new Map(flattenObject(diffRight));
|
|
230
|
+
for (const [key, value] of diffSetLeft) {
|
|
231
|
+
if (diffSetRight.has(key)) {
|
|
232
|
+
if (diffSetRight.get(key) == value) {
|
|
233
|
+
diffSetRight.delete(key);
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
for (const [key, value] of diffSetRight) {
|
|
238
|
+
if (diffSetLeft.has(key) && diffSetLeft.get(key) != value) {
|
|
239
|
+
Logger(`Conflicted key:${key}`, LOG_LEVEL_VERBOSE);
|
|
240
|
+
return false;
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
const patches = [
|
|
244
|
+
{ mtime: leftLeaf.mtime, patch: diffLeft },
|
|
245
|
+
{ mtime: rightLeaf.mtime, patch: diffRight }
|
|
246
|
+
].sort((a, b) => a.mtime - b.mtime);
|
|
247
|
+
let newObj = { ...baseObj };
|
|
248
|
+
for (const patch of patches) {
|
|
249
|
+
newObj = applyPatch(newObj, patch.patch);
|
|
250
|
+
}
|
|
251
|
+
Logger(`Object merge is applicable!`, LOG_LEVEL_VERBOSE);
|
|
252
|
+
return JSON.stringify(newObj.data);
|
|
253
|
+
} catch (ex) {
|
|
254
|
+
Logger("Could not merge object");
|
|
255
|
+
Logger(ex, LOG_LEVEL_VERBOSE);
|
|
256
|
+
return false;
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
async tryAutoMergeSensibly(path, test, conflicts) {
|
|
260
|
+
const conflictedRev = conflicts[0];
|
|
261
|
+
const conflictedRevNo = Number(conflictedRev.split("-")[0]);
|
|
262
|
+
const revFrom = await this.database.get(await this.options.pathService.path2id(path), {
|
|
263
|
+
revs_info: true
|
|
264
|
+
});
|
|
265
|
+
const commonBase = (revFrom._revs_info || []).filter(
|
|
266
|
+
(e) => e.status == "available" && Number(e.rev.split("-")[0]) < conflictedRevNo
|
|
267
|
+
)?.[0]?.rev ?? "";
|
|
268
|
+
let p = void 0;
|
|
269
|
+
if (commonBase) {
|
|
270
|
+
if (isSensibleMargeApplicable(path)) {
|
|
271
|
+
const result = await this.mergeSensibly(path, commonBase, test._rev, conflictedRev);
|
|
272
|
+
if (result) {
|
|
273
|
+
p = result.filter((e) => e[0] != DIFF_DELETE).map((e) => e[1]).join("");
|
|
274
|
+
Logger(`Sensible merge:${path}`, LOG_LEVEL_INFO);
|
|
275
|
+
} else {
|
|
276
|
+
Logger(`Sensible merge is not applicable.`, LOG_LEVEL_VERBOSE);
|
|
277
|
+
}
|
|
278
|
+
} else if (isObjectMargeApplicable(path)) {
|
|
279
|
+
const result = await this.mergeObject(path, commonBase, test._rev, conflictedRev);
|
|
280
|
+
if (result) {
|
|
281
|
+
Logger(`Object merge:${path}`, LOG_LEVEL_INFO);
|
|
282
|
+
p = result;
|
|
283
|
+
} else {
|
|
284
|
+
Logger(`Object merge is not applicable..`, LOG_LEVEL_VERBOSE);
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
if (p !== void 0) {
|
|
288
|
+
return { result: p, conflictedRev };
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
return false;
|
|
292
|
+
}
|
|
293
|
+
async tryAutoMerge(path, enableMarkdownAutoMerge) {
|
|
294
|
+
const test = await this.options.entryManager.getDBEntry(
|
|
295
|
+
path,
|
|
296
|
+
{ conflicts: true, revs_info: true },
|
|
297
|
+
false,
|
|
298
|
+
false,
|
|
299
|
+
true
|
|
300
|
+
);
|
|
301
|
+
if (test === false) return { ok: MISSING_OR_ERROR };
|
|
302
|
+
if (test == null) return { ok: MISSING_OR_ERROR };
|
|
303
|
+
if (!test._conflicts) return { ok: NOT_CONFLICTED };
|
|
304
|
+
if (test._conflicts.length == 0) return { ok: NOT_CONFLICTED };
|
|
305
|
+
const conflicts = test._conflicts.sort((a, b) => Number(a.split("-")[0]) - Number(b.split("-")[0]));
|
|
306
|
+
const leftLeaf = await this.getConflictedDoc(path, test._rev);
|
|
307
|
+
const rightLeaf = await this.getConflictedDoc(path, conflicts[0]);
|
|
308
|
+
if (leftLeaf !== false && rightLeaf !== false && leftLeaf.data == rightLeaf.data && leftLeaf.deleted == rightLeaf.deleted) {
|
|
309
|
+
return { leftRev: test._rev, rightRev: conflicts[0], leftLeaf, rightLeaf };
|
|
310
|
+
}
|
|
311
|
+
if ((isSensibleMargeApplicable(path) || isObjectMargeApplicable(path)) && enableMarkdownAutoMerge) {
|
|
312
|
+
const autoMergeResult = await this.tryAutoMergeSensibly(path, test, conflicts);
|
|
313
|
+
if (autoMergeResult !== false) {
|
|
314
|
+
return autoMergeResult;
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
return { leftRev: test._rev, rightRev: conflicts[0], leftLeaf, rightLeaf };
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
export {
|
|
321
|
+
ConflictManager
|
|
322
|
+
};
|