document-drive 1.30.2 → 2.5.0-dev.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/README.md +6 -6
- package/dist/index.d.ts +6 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -4
- package/dist/index.js.map +1 -1
- package/dist/prisma/schema.prisma +2 -0
- package/dist/src/cache/lru.d.ts +34 -0
- package/dist/src/cache/lru.d.ts.map +1 -0
- package/dist/src/cache/lru.js +41 -0
- package/dist/src/cache/lru.js.map +1 -0
- package/dist/src/cache/memory.d.ts +19 -1
- package/dist/src/cache/memory.d.ts.map +1 -1
- package/dist/src/cache/memory.js +49 -9
- package/dist/src/cache/memory.js.map +1 -1
- package/dist/src/cache/redis.d.ts.map +1 -1
- package/dist/src/cache/redis.js +3 -4
- package/dist/src/cache/redis.js.map +1 -1
- package/dist/src/drive-document-model/constants.d.ts +1 -1
- package/dist/src/drive-document-model/constants.d.ts.map +1 -1
- package/dist/src/drive-document-model/constants.js +2 -1
- package/dist/src/drive-document-model/constants.js.map +1 -1
- package/dist/src/drive-document-model/gen/actions.d.ts +4 -5
- package/dist/src/drive-document-model/gen/actions.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/actions.js +1 -1
- package/dist/src/drive-document-model/gen/actions.js.map +1 -1
- package/dist/src/drive-document-model/gen/creators.d.ts +1 -1
- package/dist/src/drive-document-model/gen/creators.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/creators.js +1 -1
- package/dist/src/drive-document-model/gen/creators.js.map +1 -1
- package/dist/src/drive-document-model/gen/document-model.d.ts +1 -1
- package/dist/src/drive-document-model/gen/document-model.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/document-model.js +7 -8
- package/dist/src/drive-document-model/gen/document-model.js.map +1 -1
- package/dist/src/drive-document-model/gen/drive/actions.d.ts +2 -2
- package/dist/src/drive-document-model/gen/drive/actions.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/drive/creators.d.ts +2 -2
- package/dist/src/drive-document-model/gen/drive/creators.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/drive/creators.js +9 -9
- package/dist/src/drive-document-model/gen/drive/creators.js.map +1 -1
- package/dist/src/drive-document-model/gen/drive/object.d.ts +2 -2
- package/dist/src/drive-document-model/gen/drive/object.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/drive/object.js +1 -1
- package/dist/src/drive-document-model/gen/drive/object.js.map +1 -1
- package/dist/src/drive-document-model/gen/drive/operations.d.ts +3 -3
- package/dist/src/drive-document-model/gen/drive/operations.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/index.d.ts +6 -0
- package/dist/src/drive-document-model/gen/index.d.ts.map +1 -0
- package/dist/src/drive-document-model/gen/index.js +6 -0
- package/dist/src/drive-document-model/gen/index.js.map +1 -0
- package/dist/src/drive-document-model/gen/node/actions.d.ts +2 -2
- package/dist/src/drive-document-model/gen/node/actions.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/node/creators.d.ts +2 -2
- package/dist/src/drive-document-model/gen/node/creators.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/node/creators.js +8 -8
- package/dist/src/drive-document-model/gen/node/creators.js.map +1 -1
- package/dist/src/drive-document-model/gen/node/object.d.ts +2 -2
- package/dist/src/drive-document-model/gen/node/object.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/node/object.js +1 -1
- package/dist/src/drive-document-model/gen/node/object.js.map +1 -1
- package/dist/src/drive-document-model/gen/node/operations.d.ts +3 -3
- package/dist/src/drive-document-model/gen/node/operations.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/object.d.ts +11 -14
- package/dist/src/drive-document-model/gen/object.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/object.js +11 -12
- package/dist/src/drive-document-model/gen/object.js.map +1 -1
- package/dist/src/drive-document-model/gen/reducer.d.ts +1 -1
- package/dist/src/drive-document-model/gen/reducer.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/reducer.js +16 -16
- package/dist/src/drive-document-model/gen/reducer.js.map +1 -1
- package/dist/src/drive-document-model/gen/schema/index.d.ts +3 -0
- package/dist/src/drive-document-model/gen/schema/index.d.ts.map +1 -0
- package/dist/src/drive-document-model/gen/schema/index.js +3 -0
- package/dist/src/drive-document-model/gen/schema/index.js.map +1 -0
- package/dist/src/drive-document-model/gen/schema/types.d.ts +88 -2
- package/dist/src/drive-document-model/gen/schema/types.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/schema/zod.d.ts +1 -1
- package/dist/src/drive-document-model/gen/schema/zod.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/schema/zod.js +0 -2
- package/dist/src/drive-document-model/gen/schema/zod.js.map +1 -1
- package/dist/src/drive-document-model/gen/types.d.ts +5 -4
- package/dist/src/drive-document-model/gen/types.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/types.js +1 -1
- package/dist/src/drive-document-model/gen/types.js.map +1 -1
- package/dist/src/drive-document-model/gen/utils.d.ts +9 -9
- package/dist/src/drive-document-model/gen/utils.d.ts.map +1 -1
- package/dist/src/drive-document-model/gen/utils.js +39 -23
- package/dist/src/drive-document-model/gen/utils.js.map +1 -1
- package/dist/src/drive-document-model/module.d.ts +26 -2
- package/dist/src/drive-document-model/module.d.ts.map +1 -1
- package/dist/src/drive-document-model/module.js +14 -8
- package/dist/src/drive-document-model/module.js.map +1 -1
- package/dist/src/drive-document-model/src/reducers/node.d.ts.map +1 -1
- package/dist/src/drive-document-model/src/reducers/node.js +10 -1
- package/dist/src/drive-document-model/src/reducers/node.js.map +1 -1
- package/dist/src/drive-document-model/src/tests/actions.test.d.ts +2 -0
- package/dist/src/drive-document-model/src/tests/actions.test.d.ts.map +1 -0
- package/dist/src/drive-document-model/src/tests/actions.test.js +221 -0
- package/dist/src/drive-document-model/src/tests/actions.test.js.map +1 -0
- package/dist/src/drive-document-model/src/tests/base.test.d.ts +2 -0
- package/dist/src/drive-document-model/src/tests/base.test.d.ts.map +1 -0
- package/dist/src/drive-document-model/src/tests/base.test.js +116 -0
- package/dist/src/drive-document-model/src/tests/base.test.js.map +1 -0
- package/dist/src/drive-document-model/src/tests/document-model.test.d.ts +6 -0
- package/dist/src/drive-document-model/src/tests/document-model.test.d.ts.map +1 -0
- package/dist/src/drive-document-model/src/tests/document-model.test.js +19 -0
- package/dist/src/drive-document-model/src/tests/document-model.test.js.map +1 -0
- package/dist/src/drive-document-model/src/tests/drive.test.d.ts +6 -0
- package/dist/src/drive-document-model/src/tests/drive.test.d.ts.map +1 -0
- package/dist/src/drive-document-model/src/tests/drive.test.js +41 -0
- package/dist/src/drive-document-model/src/tests/drive.test.js.map +1 -0
- package/dist/src/drive-document-model/src/tests/node.test.d.ts +6 -0
- package/dist/src/drive-document-model/src/tests/node.test.d.ts.map +1 -0
- package/dist/src/drive-document-model/src/tests/node.test.js +376 -0
- package/dist/src/drive-document-model/src/tests/node.test.js.map +1 -0
- package/dist/src/drive-document-model/src/tests/utils.test.d.ts +2 -0
- package/dist/src/drive-document-model/src/tests/utils.test.d.ts.map +1 -0
- package/dist/src/drive-document-model/src/tests/utils.test.js +262 -0
- package/dist/src/drive-document-model/src/tests/utils.test.js.map +1 -0
- package/dist/src/drive-document-model/src/utils.d.ts.map +1 -1
- package/dist/src/drive-document-model/src/utils.js +2 -2
- package/dist/src/drive-document-model/src/utils.js.map +1 -1
- package/dist/src/processors/processor-manager.d.ts.map +1 -1
- package/dist/src/processors/processor-manager.js +14 -4
- package/dist/src/processors/processor-manager.js.map +1 -1
- package/dist/src/queue/base.js +3 -2
- package/dist/src/queue/base.js.map +1 -1
- package/dist/src/read-mode/service.d.ts.map +1 -1
- package/dist/src/read-mode/service.js +9 -2
- package/dist/src/read-mode/service.js.map +1 -1
- package/dist/src/server/base-server.d.ts +9 -6
- package/dist/src/server/base-server.d.ts.map +1 -1
- package/dist/src/server/base-server.js +84 -41
- package/dist/src/server/base-server.js.map +1 -1
- package/dist/src/server/builder.d.ts +3 -3
- package/dist/src/server/builder.d.ts.map +1 -1
- package/dist/src/server/builder.js.map +1 -1
- package/dist/src/server/error.d.ts +6 -0
- package/dist/src/server/error.d.ts.map +1 -1
- package/dist/src/server/error.js +11 -1
- package/dist/src/server/error.js.map +1 -1
- package/dist/src/server/listener/listener-manager.d.ts +3 -0
- package/dist/src/server/listener/listener-manager.d.ts.map +1 -1
- package/dist/src/server/listener/listener-manager.js +7 -0
- package/dist/src/server/listener/listener-manager.js.map +1 -1
- package/dist/src/server/listener/transmitter/factory.d.ts.map +1 -1
- package/dist/src/server/listener/transmitter/factory.js +1 -1
- package/dist/src/server/listener/transmitter/factory.js.map +1 -1
- package/dist/src/server/listener/transmitter/internal.js +1 -1
- package/dist/src/server/listener/transmitter/internal.js.map +1 -1
- package/dist/src/server/listener/transmitter/pull-responder.d.ts +7 -5
- package/dist/src/server/listener/transmitter/pull-responder.d.ts.map +1 -1
- package/dist/src/server/listener/transmitter/pull-responder.js +148 -20
- package/dist/src/server/listener/transmitter/pull-responder.js.map +1 -1
- package/dist/src/server/listener/transmitter/switchboard-push.d.ts +5 -2
- package/dist/src/server/listener/transmitter/switchboard-push.d.ts.map +1 -1
- package/dist/src/server/listener/transmitter/switchboard-push.js +37 -6
- package/dist/src/server/listener/transmitter/switchboard-push.js.map +1 -1
- package/dist/src/server/sync-manager.d.ts +2 -2
- package/dist/src/server/sync-manager.d.ts.map +1 -1
- package/dist/src/server/sync-manager.js.map +1 -1
- package/dist/src/server/types.d.ts +21 -7
- package/dist/src/server/types.d.ts.map +1 -1
- package/dist/src/server/types.js.map +1 -1
- package/dist/src/storage/browser.d.ts +9 -8
- package/dist/src/storage/browser.d.ts.map +1 -1
- package/dist/src/storage/browser.js +116 -40
- package/dist/src/storage/browser.js.map +1 -1
- package/dist/src/storage/filesystem.d.ts +10 -8
- package/dist/src/storage/filesystem.d.ts.map +1 -1
- package/dist/src/storage/filesystem.js +112 -41
- package/dist/src/storage/filesystem.js.map +1 -1
- package/dist/src/storage/ipfs.d.ts +8 -5
- package/dist/src/storage/ipfs.d.ts.map +1 -1
- package/dist/src/storage/ipfs.js +133 -79
- package/dist/src/storage/ipfs.js.map +1 -1
- package/dist/src/storage/memory.d.ts +9 -7
- package/dist/src/storage/memory.d.ts.map +1 -1
- package/dist/src/storage/memory.js +97 -51
- package/dist/src/storage/memory.js.map +1 -1
- package/dist/src/storage/prisma/client/edge.js +4 -3
- package/dist/src/storage/prisma/client/index-browser.js +1 -0
- package/dist/src/storage/prisma/client/index.d.ts +150 -71
- package/dist/src/storage/prisma/client/index.js +4 -3
- package/dist/src/storage/prisma/client/package.json +1 -1
- package/dist/src/storage/prisma/client/schema.prisma +2 -0
- package/dist/src/storage/prisma/client/wasm.js +1 -0
- package/dist/src/storage/prisma/prisma.d.ts +8 -6
- package/dist/src/storage/prisma/prisma.d.ts.map +1 -1
- package/dist/src/storage/prisma/prisma.js +96 -49
- package/dist/src/storage/prisma/prisma.js.map +1 -1
- package/dist/src/storage/types.d.ts +40 -19
- package/dist/src/storage/types.d.ts.map +1 -1
- package/dist/src/storage/utils.d.ts +3 -0
- package/dist/src/storage/utils.d.ts.map +1 -0
- package/dist/src/storage/utils.js +3 -0
- package/dist/src/storage/utils.js.map +1 -0
- package/dist/src/utils/default-drives-manager.d.ts.map +1 -1
- package/dist/src/utils/default-drives-manager.js +13 -11
- package/dist/src/utils/default-drives-manager.js.map +1 -1
- package/dist/src/utils/graphql.d.ts +8 -4
- package/dist/src/utils/graphql.d.ts.map +1 -1
- package/dist/src/utils/graphql.js +27 -14
- package/dist/src/utils/graphql.js.map +1 -1
- package/dist/src/utils/logger.d.ts +2 -2
- package/dist/src/utils/logger.d.ts.map +1 -1
- package/dist/src/utils/logger.js +21 -19
- package/dist/src/utils/logger.js.map +1 -1
- package/dist/src/utils/misc.d.ts +0 -1
- package/dist/src/utils/misc.d.ts.map +1 -1
- package/dist/src/utils/misc.js +0 -4
- package/dist/src/utils/misc.js.map +1 -1
- package/dist/test/cache.test.d.ts +2 -0
- package/dist/test/cache.test.d.ts.map +1 -0
- package/dist/test/cache.test.js +281 -0
- package/dist/test/cache.test.js.map +1 -0
- package/dist/test/default-remote-drives.test.d.ts +2 -0
- package/dist/test/default-remote-drives.test.d.ts.map +1 -0
- package/dist/test/default-remote-drives.test.js +446 -0
- package/dist/test/default-remote-drives.test.js.map +1 -0
- package/dist/test/document-helpers/addUndo.test.d.ts +2 -0
- package/dist/test/document-helpers/addUndo.test.d.ts.map +1 -0
- package/dist/test/document-helpers/addUndo.test.js +120 -0
- package/dist/test/document-helpers/addUndo.test.js.map +1 -0
- package/dist/test/document-helpers/attachBranch.test.d.ts +2 -0
- package/dist/test/document-helpers/attachBranch.test.d.ts.map +1 -0
- package/dist/test/document-helpers/attachBranch.test.js +333 -0
- package/dist/test/document-helpers/attachBranch.test.js.map +1 -0
- package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.d.ts +2 -0
- package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.d.ts.map +1 -0
- package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.js +252 -0
- package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.js.map +1 -0
- package/dist/test/document-helpers/garbageCollect.test.d.ts +2 -0
- package/dist/test/document-helpers/garbageCollect.test.d.ts.map +1 -0
- package/dist/test/document-helpers/garbageCollect.test.js +136 -0
- package/dist/test/document-helpers/garbageCollect.test.js.map +1 -0
- package/dist/test/document-helpers/groupOperationsByScope.test.d.ts +2 -0
- package/dist/test/document-helpers/groupOperationsByScope.test.d.ts.map +1 -0
- package/dist/test/document-helpers/groupOperationsByScope.test.js +98 -0
- package/dist/test/document-helpers/groupOperationsByScope.test.js.map +1 -0
- package/dist/test/document-helpers/merge.test.d.ts +2 -0
- package/dist/test/document-helpers/merge.test.d.ts.map +1 -0
- package/dist/test/document-helpers/merge.test.js +757 -0
- package/dist/test/document-helpers/merge.test.js.map +1 -0
- package/dist/test/document-helpers/nextSkipNumber.test.d.ts +2 -0
- package/dist/test/document-helpers/nextSkipNumber.test.d.ts.map +1 -0
- package/dist/test/document-helpers/nextSkipNumber.test.js +123 -0
- package/dist/test/document-helpers/nextSkipNumber.test.js.map +1 -0
- package/dist/test/document-helpers/prepareOperations.test.d.ts +2 -0
- package/dist/test/document-helpers/prepareOperations.test.d.ts.map +1 -0
- package/dist/test/document-helpers/prepareOperations.test.js +304 -0
- package/dist/test/document-helpers/prepareOperations.test.js.map +1 -0
- package/dist/test/document-helpers/removeExistingOperations.test.d.ts +2 -0
- package/dist/test/document-helpers/removeExistingOperations.test.d.ts.map +1 -0
- package/dist/test/document-helpers/removeExistingOperations.test.js +150 -0
- package/dist/test/document-helpers/removeExistingOperations.test.js.map +1 -0
- package/dist/test/document-helpers/reshuffleByTimestamp.test.d.ts +2 -0
- package/dist/test/document-helpers/reshuffleByTimestamp.test.d.ts.map +1 -0
- package/dist/test/document-helpers/reshuffleByTimestamp.test.js +148 -0
- package/dist/test/document-helpers/reshuffleByTimestamp.test.js.map +1 -0
- package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.d.ts +2 -0
- package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.d.ts.map +1 -0
- package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.js +200 -0
- package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.js.map +1 -0
- package/dist/test/document-helpers/sortOperations.test.d.ts +2 -0
- package/dist/test/document-helpers/sortOperations.test.d.ts.map +1 -0
- package/dist/test/document-helpers/sortOperations.test.js +101 -0
- package/dist/test/document-helpers/sortOperations.test.js.map +1 -0
- package/dist/test/document-helpers/split.test.d.ts +2 -0
- package/dist/test/document-helpers/split.test.d.ts.map +1 -0
- package/dist/test/document-helpers/split.test.js +121 -0
- package/dist/test/document-helpers/split.test.js.map +1 -0
- package/dist/test/drive-operations.test.d.ts +2 -0
- package/dist/test/drive-operations.test.d.ts.map +1 -0
- package/dist/test/drive-operations.test.js +145 -0
- package/dist/test/drive-operations.test.js.map +1 -0
- package/dist/test/graphql.test.d.ts +2 -0
- package/dist/test/graphql.test.d.ts.map +1 -0
- package/dist/test/graphql.test.js +10 -0
- package/dist/test/graphql.test.js.map +1 -0
- package/dist/test/internal-listener.test.d.ts +2 -0
- package/dist/test/internal-listener.test.d.ts.map +1 -0
- package/dist/test/internal-listener.test.js +274 -0
- package/dist/test/internal-listener.test.js.map +1 -0
- package/dist/test/queue.test.d.ts +2 -0
- package/dist/test/queue.test.d.ts.map +1 -0
- package/dist/test/queue.test.js +338 -0
- package/dist/test/queue.test.js.map +1 -0
- package/dist/test/read-mode.test.d.ts +2 -0
- package/dist/test/read-mode.test.d.ts.map +1 -0
- package/dist/test/read-mode.test.js +566 -0
- package/dist/test/read-mode.test.js.map +1 -0
- package/dist/test/server/driveOperationsConflictResolution.test.d.ts +2 -0
- package/dist/test/server/driveOperationsConflictResolution.test.d.ts.map +1 -0
- package/dist/test/server/driveOperationsConflictResolution.test.js +389 -0
- package/dist/test/server/driveOperationsConflictResolution.test.js.map +1 -0
- package/dist/test/server/mergeOperations.test.d.ts +2 -0
- package/dist/test/server/mergeOperations.test.d.ts.map +1 -0
- package/dist/test/server/mergeOperations.test.js +107 -0
- package/dist/test/server/mergeOperations.test.js.map +1 -0
- package/dist/test/server/processOperations.test.d.ts +2 -0
- package/dist/test/server/processOperations.test.d.ts.map +1 -0
- package/dist/test/server/processOperations.test.js +380 -0
- package/dist/test/server/processOperations.test.js.map +1 -0
- package/dist/test/server.test.d.ts +2 -0
- package/dist/test/server.test.d.ts.map +1 -0
- package/dist/test/server.test.js +826 -0
- package/dist/test/server.test.js.map +1 -0
- package/dist/test/signature-migration.test.d.ts +2 -0
- package/dist/test/signature-migration.test.d.ts.map +1 -0
- package/dist/test/signature-migration.test.js +235 -0
- package/dist/test/signature-migration.test.js.map +1 -0
- package/dist/test/storage.test.d.ts +2 -0
- package/dist/test/storage.test.d.ts.map +1 -0
- package/dist/test/storage.test.js +476 -0
- package/dist/test/storage.test.js.map +1 -0
- package/dist/test/utils.test.d.ts +2 -0
- package/dist/test/utils.test.d.ts.map +1 -0
- package/dist/test/utils.test.js +89 -0
- package/dist/test/utils.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/vitest.config.d.ts.map +1 -1
- package/dist/vitest.config.js +7 -1
- package/dist/vitest.config.js.map +1 -1
- package/package.json +17 -11
- package/dist/src/drive-document-model/gen/constants.d.ts +0 -7
- package/dist/src/drive-document-model/gen/constants.d.ts.map +0 -1
- package/dist/src/drive-document-model/gen/constants.js +0 -17
- package/dist/src/drive-document-model/gen/constants.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"node.test.js","sourceRoot":"","sources":["../../../../../src/drive-document-model/src/tests/node.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.test.d.ts","sourceRoot":"","sources":["../../../../../src/drive-document-model/src/tests/utils.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,262 @@
|
|
|
1
|
+
import { validate } from "uuid";
|
|
2
|
+
import { beforeEach, describe, expect, it } from "vitest";
|
|
3
|
+
import { generateNodesCopy, generateSynchronizationUnitId, generateSynchronizationUnits, getNextCopyNumber, handleTargetNameCollisions, } from "../utils.js";
|
|
4
|
+
const baseNodes = [
|
|
5
|
+
{
|
|
6
|
+
id: "1",
|
|
7
|
+
name: "Folder 1",
|
|
8
|
+
parentFolder: null,
|
|
9
|
+
kind: "folder",
|
|
10
|
+
},
|
|
11
|
+
{
|
|
12
|
+
id: "1.1",
|
|
13
|
+
name: "Folder 1.1",
|
|
14
|
+
parentFolder: "1",
|
|
15
|
+
kind: "folder",
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
id: "1.1.1",
|
|
19
|
+
name: "Folder 1.1.1",
|
|
20
|
+
parentFolder: "1.1",
|
|
21
|
+
kind: "folder",
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
id: "2",
|
|
25
|
+
name: "Folder 2",
|
|
26
|
+
parentFolder: null,
|
|
27
|
+
kind: "folder",
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
id: "3",
|
|
31
|
+
name: "Folder 3",
|
|
32
|
+
parentFolder: null,
|
|
33
|
+
kind: "folder",
|
|
34
|
+
},
|
|
35
|
+
];
|
|
36
|
+
const generateId = (id) => `${id}-copy`;
|
|
37
|
+
describe("DocumentDrive Utils", () => {
|
|
38
|
+
let nodes;
|
|
39
|
+
beforeEach(() => {
|
|
40
|
+
nodes = [...baseNodes];
|
|
41
|
+
});
|
|
42
|
+
describe("generateNodesCopy", () => {
|
|
43
|
+
it("should return a copy of the affected nodes (subfolders and files) with new id", () => {
|
|
44
|
+
const expectedResult = [
|
|
45
|
+
{
|
|
46
|
+
srcId: "1",
|
|
47
|
+
targetId: "1-copy",
|
|
48
|
+
targetName: "Folder 1",
|
|
49
|
+
targetParentFolder: null,
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
srcId: "1.1",
|
|
53
|
+
targetId: "1.1-copy",
|
|
54
|
+
targetName: "Folder 1.1",
|
|
55
|
+
targetParentFolder: "1-copy",
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
srcId: "1.1.1",
|
|
59
|
+
targetId: "1.1.1-copy",
|
|
60
|
+
targetName: "Folder 1.1.1",
|
|
61
|
+
targetParentFolder: "1.1-copy",
|
|
62
|
+
},
|
|
63
|
+
];
|
|
64
|
+
const result = generateNodesCopy({ srcId: "1" }, generateId, nodes);
|
|
65
|
+
expect(result.length).toBe(3);
|
|
66
|
+
expect(result).toEqual(expectedResult);
|
|
67
|
+
});
|
|
68
|
+
it("should return a copy of the affected nodes (subfolders and files) with new id and new name for the target node", () => {
|
|
69
|
+
const expectedResult = [
|
|
70
|
+
{
|
|
71
|
+
srcId: "1",
|
|
72
|
+
targetId: "1-copy",
|
|
73
|
+
targetName: "New Name",
|
|
74
|
+
targetParentFolder: null,
|
|
75
|
+
},
|
|
76
|
+
{
|
|
77
|
+
srcId: "1.1",
|
|
78
|
+
targetId: "1.1-copy",
|
|
79
|
+
targetName: "Folder 1.1",
|
|
80
|
+
targetParentFolder: "1-copy",
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
srcId: "1.1.1",
|
|
84
|
+
targetId: "1.1.1-copy",
|
|
85
|
+
targetName: "Folder 1.1.1",
|
|
86
|
+
targetParentFolder: "1.1-copy",
|
|
87
|
+
},
|
|
88
|
+
];
|
|
89
|
+
const result = generateNodesCopy({ srcId: "1", targetName: "New Name" }, generateId, nodes);
|
|
90
|
+
expect(result.length).toBe(3);
|
|
91
|
+
expect(result).toEqual(expectedResult);
|
|
92
|
+
});
|
|
93
|
+
it("should copy a single node inside another", () => {
|
|
94
|
+
const expectedResult = [
|
|
95
|
+
{
|
|
96
|
+
srcId: "1.1.1",
|
|
97
|
+
targetId: "1.1.1-copy",
|
|
98
|
+
targetName: "Folder 1.1.1",
|
|
99
|
+
targetParentFolder: "1.1",
|
|
100
|
+
},
|
|
101
|
+
];
|
|
102
|
+
const result = generateNodesCopy({ srcId: "1.1.1", targetParentFolder: "1.1" }, generateId, nodes);
|
|
103
|
+
expect(result.length).toBe(1);
|
|
104
|
+
expect(result).toEqual(expectedResult);
|
|
105
|
+
});
|
|
106
|
+
it("should copy target and sub-nodes into a different node", () => {
|
|
107
|
+
const expectedResult = [
|
|
108
|
+
{
|
|
109
|
+
srcId: "1",
|
|
110
|
+
targetId: "1-copy",
|
|
111
|
+
targetName: "Folder 1",
|
|
112
|
+
targetParentFolder: "2",
|
|
113
|
+
},
|
|
114
|
+
{
|
|
115
|
+
srcId: "1.1",
|
|
116
|
+
targetId: "1.1-copy",
|
|
117
|
+
targetName: "Folder 1.1",
|
|
118
|
+
targetParentFolder: "1-copy",
|
|
119
|
+
},
|
|
120
|
+
{
|
|
121
|
+
srcId: "1.1.1",
|
|
122
|
+
targetId: "1.1.1-copy",
|
|
123
|
+
targetName: "Folder 1.1.1",
|
|
124
|
+
targetParentFolder: "1.1-copy",
|
|
125
|
+
},
|
|
126
|
+
];
|
|
127
|
+
const result = generateNodesCopy({ srcId: "1", targetParentFolder: "2" }, generateId, nodes);
|
|
128
|
+
expect(result.length).toBe(3);
|
|
129
|
+
expect(result).toEqual(expectedResult);
|
|
130
|
+
});
|
|
131
|
+
it("should copy target and sub-nodes into a different node with a different name", () => {
|
|
132
|
+
const expectedResult = [
|
|
133
|
+
{
|
|
134
|
+
srcId: "1",
|
|
135
|
+
targetId: "1-copy",
|
|
136
|
+
targetName: "New Name",
|
|
137
|
+
targetParentFolder: "2",
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
srcId: "1.1",
|
|
141
|
+
targetId: "1.1-copy",
|
|
142
|
+
targetName: "Folder 1.1",
|
|
143
|
+
targetParentFolder: "1-copy",
|
|
144
|
+
},
|
|
145
|
+
{
|
|
146
|
+
srcId: "1.1.1",
|
|
147
|
+
targetId: "1.1.1-copy",
|
|
148
|
+
targetName: "Folder 1.1.1",
|
|
149
|
+
targetParentFolder: "1.1-copy",
|
|
150
|
+
},
|
|
151
|
+
];
|
|
152
|
+
const result = generateNodesCopy({
|
|
153
|
+
srcId: "1",
|
|
154
|
+
targetParentFolder: "2",
|
|
155
|
+
targetName: "New Name",
|
|
156
|
+
}, generateId, nodes);
|
|
157
|
+
expect(result.length).toBe(3);
|
|
158
|
+
expect(result).toEqual(expectedResult);
|
|
159
|
+
});
|
|
160
|
+
it("should throw an error if the src node is not found", () => {
|
|
161
|
+
expect(() => generateNodesCopy({ srcId: "invalid" }, generateId, nodes)).toThrowError(`Node with id invalid not found`);
|
|
162
|
+
});
|
|
163
|
+
it("should generate uuid sync id", () => {
|
|
164
|
+
const state = {
|
|
165
|
+
icon: null,
|
|
166
|
+
name: "",
|
|
167
|
+
nodes: [],
|
|
168
|
+
};
|
|
169
|
+
const id = generateSynchronizationUnitId(state.nodes);
|
|
170
|
+
expect(validate(id)).toBe(true);
|
|
171
|
+
});
|
|
172
|
+
it("should generate a sync unit for each scope", () => {
|
|
173
|
+
const state = {
|
|
174
|
+
icon: null,
|
|
175
|
+
name: "",
|
|
176
|
+
nodes: [],
|
|
177
|
+
};
|
|
178
|
+
const units = generateSynchronizationUnits(state, ["global", "local"]);
|
|
179
|
+
expect(units).toStrictEqual([
|
|
180
|
+
{
|
|
181
|
+
scope: "global",
|
|
182
|
+
branch: "main",
|
|
183
|
+
syncId: expect.stringMatching(/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i),
|
|
184
|
+
},
|
|
185
|
+
{
|
|
186
|
+
scope: "local",
|
|
187
|
+
branch: "main",
|
|
188
|
+
syncId: expect.stringMatching(/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i),
|
|
189
|
+
},
|
|
190
|
+
]);
|
|
191
|
+
});
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
describe("getNextCopyNumber", () => {
|
|
195
|
+
it("should return 1 if no files match", () => {
|
|
196
|
+
const files = ["unrelated file.txt", "another file.pdf"];
|
|
197
|
+
const baseFilename = "testfile";
|
|
198
|
+
expect(getNextCopyNumber(files, baseFilename)).toBe(1);
|
|
199
|
+
});
|
|
200
|
+
it('should correctly handle the base case with " (copy)" suffix', () => {
|
|
201
|
+
const files = ["testfile (copy)"];
|
|
202
|
+
const baseFilename = "testfile";
|
|
203
|
+
expect(getNextCopyNumber(files, baseFilename)).toBe(2);
|
|
204
|
+
});
|
|
205
|
+
it("should extract and increment the highest copy number", () => {
|
|
206
|
+
const files = ["testfile (copy)", "testfile (copy) 3", "testfile (copy) 2"];
|
|
207
|
+
const baseFilename = "testfile";
|
|
208
|
+
expect(getNextCopyNumber(files, baseFilename)).toBe(4);
|
|
209
|
+
});
|
|
210
|
+
it("should handle cases with padded zeroes in numbers", () => {
|
|
211
|
+
const files = [
|
|
212
|
+
"testfile (copy) 001",
|
|
213
|
+
"testfile (copy) 002",
|
|
214
|
+
"testfile (copy)",
|
|
215
|
+
];
|
|
216
|
+
const baseFilename = "testfile";
|
|
217
|
+
expect(getNextCopyNumber(files, baseFilename)).toBe(3);
|
|
218
|
+
});
|
|
219
|
+
it("should return 1 for unrelated files", () => {
|
|
220
|
+
const files = ["someotherfile (copy) 1", "someotherfile (copy) 2"];
|
|
221
|
+
const baseFilename = "testfile";
|
|
222
|
+
expect(getNextCopyNumber(files, baseFilename)).toBe(1);
|
|
223
|
+
});
|
|
224
|
+
it("handles files with special characters needing escape in regex", () => {
|
|
225
|
+
const files = ["test.file (copy)", "test.file (copy) 1"];
|
|
226
|
+
const baseFilename = "test.file";
|
|
227
|
+
expect(getNextCopyNumber(files, baseFilename)).toBe(2);
|
|
228
|
+
});
|
|
229
|
+
});
|
|
230
|
+
describe("handleTargetNameCollisions", () => {
|
|
231
|
+
it("returns original name if no collision", () => {
|
|
232
|
+
const nodes = [{ name: "file1.txt", parentFolder: "folder" }];
|
|
233
|
+
const params = {
|
|
234
|
+
nodes: nodes,
|
|
235
|
+
targetParentFolder: "folder",
|
|
236
|
+
srcName: "newfile.txt",
|
|
237
|
+
};
|
|
238
|
+
// @ts-expect-error mock
|
|
239
|
+
expect(handleTargetNameCollisions(params)).toBe("newfile.txt");
|
|
240
|
+
});
|
|
241
|
+
it("appends copy number if collision occurs", () => {
|
|
242
|
+
const nodes = [{ name: "newfile.txt", parentFolder: "folder" }];
|
|
243
|
+
const params = {
|
|
244
|
+
nodes: nodes,
|
|
245
|
+
targetParentFolder: "folder",
|
|
246
|
+
srcName: "newfile.txt",
|
|
247
|
+
};
|
|
248
|
+
// @ts-expect-error mock
|
|
249
|
+
expect(handleTargetNameCollisions(params)).toBe("newfile.txt (copy) 1");
|
|
250
|
+
});
|
|
251
|
+
it("handles null targetParentFolder correctly", () => {
|
|
252
|
+
const nodes = [{ name: "newfile.txt", parentFolder: null }];
|
|
253
|
+
const params = {
|
|
254
|
+
nodes: nodes,
|
|
255
|
+
targetParentFolder: "",
|
|
256
|
+
srcName: "newfile.txt",
|
|
257
|
+
};
|
|
258
|
+
// @ts-expect-error mock
|
|
259
|
+
expect(handleTargetNameCollisions(params)).toBe("newfile.txt (copy) 1");
|
|
260
|
+
});
|
|
261
|
+
});
|
|
262
|
+
//# sourceMappingURL=utils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../../src/drive-document-model/src/tests/utils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/drive-document-model/src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/drive-document-model/src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,cAAc,EACpB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,IAAI,EACT,KAAK,mBAAmB,EACzB,MAAM,iBAAiB,CAAC;AAEzB,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,IAAI,QAAQ,CAEvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,IAAI,UAAU,CAE3D;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAUjE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAInE;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,UAAU,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1B,kBAAkB,CAAC,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;AAE9E;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,oBAAoB,EACzB,WAAW,EAAE,4BAA4B,EACzC,KAAK,EAAE,IAAI,EAAE,GACZ,aAAa,EAAE,CAmDjB;AAED,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,GACjC,MAAM,CAaR;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,cAAc,EAAE,EACxB,MAAM,SAAS,GACd,mBAAmB,EAAE,CAMvB;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,sBAAsB,CAAC,EAClD,MAAM,EAAE,cAAc,EAAE,GACvB,aAAa,CAKf;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,sBAAsB,CAAC,GAClD,cAAc,CAqBhB;AAED,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EAAE,EACf,YAAY,EAAE,MAAM,GACnB,MAAM,CAmBR;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,UAE1C;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE;IACjD,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC;CACjB,UAkBA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { generateId } from "document-model";
|
|
2
2
|
import { addFile, copyNode } from "../gen/node/creators.js";
|
|
3
3
|
export function isFileNode(node) {
|
|
4
4
|
return node.kind === "file";
|
|
@@ -79,7 +79,7 @@ export function generateSynchronizationUnitId(nodes) {
|
|
|
79
79
|
while (!syncId ||
|
|
80
80
|
nodes.find((node) => isFileNode(node) &&
|
|
81
81
|
node.synchronizationUnits.find((unit) => unit.syncId === syncId))) {
|
|
82
|
-
syncId =
|
|
82
|
+
syncId = generateId();
|
|
83
83
|
}
|
|
84
84
|
return syncId;
|
|
85
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/drive-document-model/src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/drive-document-model/src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processor-manager.d.ts","sourceRoot":"","sources":["../../../src/processors/processor-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,
|
|
1
|
+
{"version":3,"file":"processor-manager.d.ts","sourceRoot":"","sources":["../../../src/processors/processor-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EAEtB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EAEtB,MAAM,6BAA6B,CAAC;AAIrC,qBAAa,gBAAiB,YAAW,iBAAiB;IAUtD,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK;IAVf,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGpB;IAEH,OAAO,CAAC,WAAW,CAAuC;IAC1D,OAAO,CAAC,qBAAqB,CAAiC;gBAGpD,SAAS,EAAE,gBAAgB,EAC3B,KAAK,EAAE,oBAAoB;IAK/B,eAAe,CACnB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,IAAI,CAAC;IAYV,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpD,aAAa,CAAC,OAAO,EAAE,MAAM;IASnC;;;;;OAKG;IACG,gBAAgB,CACpB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,gBAAgB;CAkC5B"}
|
|
@@ -16,7 +16,7 @@ export class ProcessorManager {
|
|
|
16
16
|
//
|
|
17
17
|
}
|
|
18
18
|
async registerFactory(identifier, factory) {
|
|
19
|
-
this.logger.
|
|
19
|
+
this.logger.debug(`Registering factory '${identifier}'.`);
|
|
20
20
|
this.idToFactory.set(identifier, factory);
|
|
21
21
|
// iterate over all drives and register the factory
|
|
22
22
|
const driveIds = await this.drive.getDrives();
|
|
@@ -28,7 +28,9 @@ export class ProcessorManager {
|
|
|
28
28
|
// remove all listeners for this identifier
|
|
29
29
|
const listeners = this.identifierToListeners.get(identifier) ?? [];
|
|
30
30
|
for (const listener of listeners) {
|
|
31
|
-
await this.listeners
|
|
31
|
+
await this.listeners
|
|
32
|
+
.removeListener(listener.driveId, listener.listenerId)
|
|
33
|
+
.catch(this.logger.error);
|
|
32
34
|
if (listener.transmitter?.disconnect) {
|
|
33
35
|
await listener.transmitter.disconnect();
|
|
34
36
|
}
|
|
@@ -36,7 +38,7 @@ export class ProcessorManager {
|
|
|
36
38
|
this.identifierToListeners.set(identifier, []);
|
|
37
39
|
}
|
|
38
40
|
async registerDrive(driveId) {
|
|
39
|
-
this.logger.
|
|
41
|
+
this.logger.debug(`Registering drive '${driveId}'.`);
|
|
40
42
|
// iterate over all factories and create listeners
|
|
41
43
|
for (const [identifier, factory] of this.idToFactory) {
|
|
42
44
|
await this.createProcessors(driveId, identifier, factory);
|
|
@@ -54,7 +56,15 @@ export class ProcessorManager {
|
|
|
54
56
|
listeners = [];
|
|
55
57
|
this.identifierToListeners.set(identifier, listeners);
|
|
56
58
|
}
|
|
57
|
-
|
|
59
|
+
// don't let the factory throw, we want to continue with the rest of the processors
|
|
60
|
+
let processors = [];
|
|
61
|
+
try {
|
|
62
|
+
processors = factory(driveId);
|
|
63
|
+
}
|
|
64
|
+
catch (e) {
|
|
65
|
+
this.logger.error(`Error creating processors for drive ${driveId}:`, e);
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
58
68
|
for (const { filter, processor } of processors) {
|
|
59
69
|
const id = generateId();
|
|
60
70
|
const listener = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processor-manager.js","sourceRoot":"","sources":["../../../src/processors/processor-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processor-manager.js","sourceRoot":"","sources":["../../../src/processors/processor-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/src/queue/base.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { logger } from "#utils/logger";
|
|
2
|
-
import {
|
|
2
|
+
import { runAsap } from "#utils/misc";
|
|
3
|
+
import { generateId } from "document-model";
|
|
3
4
|
import { createNanoEvents } from "nanoevents";
|
|
4
5
|
import { isOperationJob, } from "./types.js";
|
|
5
6
|
export class MemoryQueue {
|
|
@@ -77,7 +78,7 @@ export class BaseQueueManager {
|
|
|
77
78
|
if (!this.delegate) {
|
|
78
79
|
throw new Error("No server delegate defined");
|
|
79
80
|
}
|
|
80
|
-
const jobId =
|
|
81
|
+
const jobId = generateId();
|
|
81
82
|
const queue = this.getQueue(job.driveId, job.documentId);
|
|
82
83
|
if (await queue.isDeleted()) {
|
|
83
84
|
throw new Error("Queue is deleted");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/queue/base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/queue/base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/read-mode/service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EACL,KAAK,qBAAqB,EAG3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAuB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGtE,OAAO,EACL,yBAAyB,EAEzB,sBAAsB,EACtB,0BAA0B,EAC3B,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,SAAS,EACd,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AAEpB,qBAAa,eAAgB,YAAW,qBAAqB;;gBAO/C,sBAAsB,EAAE,sBAAsB;IAmCpD,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,sBAAsB,CAAC;IAkBnE,aAAa,CAAC,SAAS,SAAS,UAAU,EAC9C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CACN,qBAAqB,CAAC,SAAS,CAAC,GAChC,0BAA0B,GAC1B,sBAAsB,GACtB,yBAAyB,CAC5B;IAqCK,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/read-mode/service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EACL,KAAK,qBAAqB,EAG3B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAuB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGtE,OAAO,EACL,yBAAyB,EAEzB,sBAAsB,EACtB,0BAA0B,EAC3B,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,SAAS,EACd,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACtB,MAAM,YAAY,CAAC;AAEpB,qBAAa,eAAgB,YAAW,qBAAqB;;gBAO/C,sBAAsB,EAAE,sBAAsB;IAmCpD,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,sBAAsB,CAAC;IAkBnE,aAAa,CAAC,SAAS,SAAS,UAAU,EAC9C,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CACN,qBAAqB,CAAC,SAAS,CAAC,GAChC,0BAA0B,GAC1B,sBAAsB,GACtB,yBAAyB,CAC5B;IAqCK,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBpE,aAAa;IAIb,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,sBAAsB,CAAC;IASrE,kBAAkB,CACtB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,SAAS,GAAG,0BAA0B,CAAC;IAYlD,mBAAmB,CAAC,EAAE,EAAE,MAAM;IAM9B,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;CAMzE"}
|
|
@@ -71,7 +71,14 @@ export class ReadModeService {
|
|
|
71
71
|
return document;
|
|
72
72
|
}
|
|
73
73
|
async addReadDrive(url, options) {
|
|
74
|
-
|
|
74
|
+
let id;
|
|
75
|
+
if (options?.expectedDriveInfo) {
|
|
76
|
+
id = options.expectedDriveInfo.id;
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
const drive = await requestPublicDrive(url);
|
|
80
|
+
id = drive.id;
|
|
81
|
+
}
|
|
75
82
|
const result = await this.#fetchDrive(id, url);
|
|
76
83
|
if (result instanceof Error) {
|
|
77
84
|
throw result;
|
|
@@ -97,7 +104,7 @@ export class ReadModeService {
|
|
|
97
104
|
: new ReadDriveNotFoundError(id));
|
|
98
105
|
}
|
|
99
106
|
async getReadDriveBySlug(slug) {
|
|
100
|
-
const readDrive = [...this.#drives.values()].find(({ drive }) => drive.
|
|
107
|
+
const readDrive = [...this.#drives.values()].find(({ drive }) => drive.slug === slug);
|
|
101
108
|
return Promise.resolve(readDrive
|
|
102
109
|
? { ...readDrive.drive, readContext: readDrive.context }
|
|
103
110
|
: new ReadDriveSlugNotFoundError(slug));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/read-mode/service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/read-mode/service.ts"],"names":[],"mappings":"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"}
|