document-drive 4.0.4 → 4.1.0-dev.10

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.
Files changed (279) hide show
  1. package/dist/index.d.ts +2 -2
  2. package/dist/index.d.ts.map +1 -1
  3. package/dist/index.js +2 -2
  4. package/dist/index.js.map +1 -1
  5. package/dist/prisma/schema.prisma +1 -2
  6. package/dist/src/drive-document-model/gen/document-model.js +3 -3
  7. package/dist/src/drive-document-model/gen/document-model.js.map +1 -1
  8. package/dist/src/drive-document-model/gen/drive/actions.d.ts +34 -10
  9. package/dist/src/drive-document-model/gen/drive/actions.d.ts.map +1 -1
  10. package/dist/src/drive-document-model/gen/node/actions.d.ts +30 -9
  11. package/dist/src/drive-document-model/gen/node/actions.d.ts.map +1 -1
  12. package/dist/src/drive-document-model/gen/node/creators.d.ts +6 -2
  13. package/dist/src/drive-document-model/gen/node/creators.d.ts.map +1 -1
  14. package/dist/src/drive-document-model/gen/node/creators.js +8 -1
  15. package/dist/src/drive-document-model/gen/node/creators.js.map +1 -1
  16. package/dist/src/drive-document-model/gen/reducer.d.ts.map +1 -1
  17. package/dist/src/drive-document-model/gen/reducer.js +32 -31
  18. package/dist/src/drive-document-model/gen/reducer.js.map +1 -1
  19. package/dist/src/drive-document-model/gen/schema/types.d.ts +1 -14
  20. package/dist/src/drive-document-model/gen/schema/types.d.ts.map +1 -1
  21. package/dist/src/drive-document-model/gen/schema/zod.d.ts +1 -5
  22. package/dist/src/drive-document-model/gen/schema/zod.d.ts.map +1 -1
  23. package/dist/src/drive-document-model/gen/schema/zod.js +0 -12
  24. package/dist/src/drive-document-model/gen/schema/zod.js.map +1 -1
  25. package/dist/src/drive-document-model/gen/types.d.ts +17 -5
  26. package/dist/src/drive-document-model/gen/types.d.ts.map +1 -1
  27. package/dist/src/drive-document-model/gen/types.js.map +1 -1
  28. package/dist/src/drive-document-model/module.d.ts +2 -1
  29. package/dist/src/drive-document-model/module.d.ts.map +1 -1
  30. package/dist/src/drive-document-model/src/reducers/node.d.ts.map +1 -1
  31. package/dist/src/drive-document-model/src/reducers/node.js +1 -25
  32. package/dist/src/drive-document-model/src/reducers/node.js.map +1 -1
  33. package/dist/src/drive-document-model/src/tests/actions.test.js +1 -23
  34. package/dist/src/drive-document-model/src/tests/actions.test.js.map +1 -1
  35. package/dist/src/drive-document-model/src/tests/base.test.js +0 -32
  36. package/dist/src/drive-document-model/src/tests/base.test.js.map +1 -1
  37. package/dist/src/drive-document-model/src/tests/node.test.js +4 -0
  38. package/dist/src/drive-document-model/src/tests/node.test.js.map +1 -1
  39. package/dist/src/drive-document-model/src/tests/utils.test.js +7 -37
  40. package/dist/src/drive-document-model/src/tests/utils.test.js.map +1 -1
  41. package/dist/src/drive-document-model/src/utils.d.ts +2 -8
  42. package/dist/src/drive-document-model/src/utils.d.ts.map +1 -1
  43. package/dist/src/drive-document-model/src/utils.js +6 -55
  44. package/dist/src/drive-document-model/src/utils.js.map +1 -1
  45. package/dist/src/processors/types.d.ts +2 -1
  46. package/dist/src/processors/types.d.ts.map +1 -1
  47. package/dist/src/queue/base.d.ts +6 -27
  48. package/dist/src/queue/base.d.ts.map +1 -1
  49. package/dist/src/queue/base.js +15 -203
  50. package/dist/src/queue/base.js.map +1 -1
  51. package/dist/src/queue/event.d.ts +41 -0
  52. package/dist/src/queue/event.d.ts.map +1 -0
  53. package/dist/src/queue/event.js +222 -0
  54. package/dist/src/queue/event.js.map +1 -0
  55. package/dist/src/queue/redis.d.ts +1 -27
  56. package/dist/src/queue/redis.d.ts.map +1 -1
  57. package/dist/src/queue/redis.js +122 -110
  58. package/dist/src/queue/redis.js.map +1 -1
  59. package/dist/src/queue/types.d.ts +18 -12
  60. package/dist/src/queue/types.d.ts.map +1 -1
  61. package/dist/src/queue/types.js +3 -0
  62. package/dist/src/queue/types.js.map +1 -1
  63. package/dist/src/read-mode/server.js.map +1 -1
  64. package/dist/src/read-mode/types.d.ts.map +1 -1
  65. package/dist/src/server/base-server.d.ts +90 -13
  66. package/dist/src/server/base-server.d.ts.map +1 -1
  67. package/dist/src/server/base-server.js +552 -250
  68. package/dist/src/server/base-server.js.map +1 -1
  69. package/dist/src/server/builder.js +2 -2
  70. package/dist/src/server/builder.js.map +1 -1
  71. package/dist/src/server/error.d.ts +3 -3
  72. package/dist/src/server/error.d.ts.map +1 -1
  73. package/dist/src/server/error.js +2 -2
  74. package/dist/src/server/error.js.map +1 -1
  75. package/dist/src/server/listener/listener-manager.d.ts +5 -6
  76. package/dist/src/server/listener/listener-manager.d.ts.map +1 -1
  77. package/dist/src/server/listener/listener-manager.js +62 -79
  78. package/dist/src/server/listener/listener-manager.js.map +1 -1
  79. package/dist/src/server/listener/transmitter/internal.d.ts +4 -4
  80. package/dist/src/server/listener/transmitter/internal.d.ts.map +1 -1
  81. package/dist/src/server/listener/transmitter/internal.js +18 -13
  82. package/dist/src/server/listener/transmitter/internal.js.map +1 -1
  83. package/dist/src/server/listener/transmitter/pull-responder.d.ts.map +1 -1
  84. package/dist/src/server/listener/transmitter/pull-responder.js +14 -8
  85. package/dist/src/server/listener/transmitter/pull-responder.js.map +1 -1
  86. package/dist/src/server/listener/transmitter/switchboard-push.d.ts.map +1 -1
  87. package/dist/src/server/listener/transmitter/switchboard-push.js +13 -8
  88. package/dist/src/server/listener/transmitter/switchboard-push.js.map +1 -1
  89. package/dist/src/server/listener/util.d.ts +1 -1
  90. package/dist/src/server/listener/util.d.ts.map +1 -1
  91. package/dist/src/server/listener/util.js +1 -1
  92. package/dist/src/server/listener/util.js.map +1 -1
  93. package/dist/src/server/sync-manager.d.ts +8 -10
  94. package/dist/src/server/sync-manager.d.ts.map +1 -1
  95. package/dist/src/server/sync-manager.js +62 -147
  96. package/dist/src/server/sync-manager.js.map +1 -1
  97. package/dist/src/server/sync-unit-map.d.ts +137 -0
  98. package/dist/src/server/sync-unit-map.d.ts.map +1 -0
  99. package/dist/src/server/sync-unit-map.js +234 -0
  100. package/dist/src/server/sync-unit-map.js.map +1 -0
  101. package/dist/src/server/types.d.ts +122 -38
  102. package/dist/src/server/types.d.ts.map +1 -1
  103. package/dist/src/server/types.js.map +1 -1
  104. package/dist/src/server/utils.d.ts +12 -3
  105. package/dist/src/server/utils.d.ts.map +1 -1
  106. package/dist/src/server/utils.js +44 -1
  107. package/dist/src/server/utils.js.map +1 -1
  108. package/dist/src/storage/browser.d.ts +8 -4
  109. package/dist/src/storage/browser.d.ts.map +1 -1
  110. package/dist/src/storage/browser.js +80 -22
  111. package/dist/src/storage/browser.js.map +1 -1
  112. package/dist/src/storage/filesystem.d.ts +8 -4
  113. package/dist/src/storage/filesystem.d.ts.map +1 -1
  114. package/dist/src/storage/filesystem.js +79 -22
  115. package/dist/src/storage/filesystem.js.map +1 -1
  116. package/dist/src/storage/ipfs.d.ts.map +1 -1
  117. package/dist/src/storage/ipfs.js.map +1 -1
  118. package/dist/src/storage/memory.d.ts +9 -5
  119. package/dist/src/storage/memory.d.ts.map +1 -1
  120. package/dist/src/storage/memory.js +76 -22
  121. package/dist/src/storage/memory.js.map +1 -1
  122. package/dist/src/storage/prisma/client/edge.js +5 -4
  123. package/dist/src/storage/prisma/client/index-browser.js +2 -1
  124. package/dist/src/storage/prisma/client/index.d.ts +58 -249
  125. package/dist/src/storage/prisma/client/index.js +5 -4
  126. package/dist/src/storage/prisma/client/package.json +1 -1
  127. package/dist/src/storage/prisma/client/schema.prisma +2 -3
  128. package/dist/src/storage/prisma/client/wasm.js +2 -1
  129. package/dist/src/storage/prisma/prisma.d.ts +13 -8
  130. package/dist/src/storage/prisma/prisma.d.ts.map +1 -1
  131. package/dist/src/storage/prisma/prisma.js +119 -51
  132. package/dist/src/storage/prisma/prisma.js.map +1 -1
  133. package/dist/src/storage/types.d.ts +45 -6
  134. package/dist/src/storage/types.d.ts.map +1 -1
  135. package/dist/src/storage/utils.d.ts +3 -0
  136. package/dist/src/storage/utils.d.ts.map +1 -1
  137. package/dist/src/storage/utils.js +14 -0
  138. package/dist/src/storage/utils.js.map +1 -1
  139. package/dist/src/utils/default-drives-manager.d.ts.map +1 -1
  140. package/dist/src/utils/default-drives-manager.js.map +1 -1
  141. package/dist/src/utils/gql-transformations.d.ts +14 -5
  142. package/dist/src/utils/gql-transformations.d.ts.map +1 -1
  143. package/dist/src/utils/gql-transformations.js +1 -0
  144. package/dist/src/utils/gql-transformations.js.map +1 -1
  145. package/dist/src/utils/graphql.d.ts +2 -2
  146. package/dist/src/utils/graphql.d.ts.map +1 -1
  147. package/dist/src/utils/migrations.d.ts.map +1 -1
  148. package/dist/src/utils/migrations.js.map +1 -1
  149. package/dist/src/utils/misc.d.ts +4 -2
  150. package/dist/src/utils/misc.d.ts.map +1 -1
  151. package/dist/src/utils/misc.js +4 -0
  152. package/dist/src/utils/misc.js.map +1 -1
  153. package/dist/tsconfig.lib.tsbuildinfo +1 -0
  154. package/package.json +5 -4
  155. package/dist/test/cache.test.d.ts +0 -2
  156. package/dist/test/cache.test.d.ts.map +0 -1
  157. package/dist/test/cache.test.js +0 -281
  158. package/dist/test/cache.test.js.map +0 -1
  159. package/dist/test/default-remote-drives.test.d.ts +0 -2
  160. package/dist/test/default-remote-drives.test.d.ts.map +0 -1
  161. package/dist/test/default-remote-drives.test.js +0 -446
  162. package/dist/test/default-remote-drives.test.js.map +0 -1
  163. package/dist/test/document-helpers/addUndo.test.d.ts +0 -2
  164. package/dist/test/document-helpers/addUndo.test.d.ts.map +0 -1
  165. package/dist/test/document-helpers/addUndo.test.js +0 -120
  166. package/dist/test/document-helpers/addUndo.test.js.map +0 -1
  167. package/dist/test/document-helpers/attachBranch.test.d.ts +0 -2
  168. package/dist/test/document-helpers/attachBranch.test.d.ts.map +0 -1
  169. package/dist/test/document-helpers/attachBranch.test.js +0 -333
  170. package/dist/test/document-helpers/attachBranch.test.js.map +0 -1
  171. package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.d.ts +0 -2
  172. package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.d.ts.map +0 -1
  173. package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.js +0 -252
  174. package/dist/test/document-helpers/checkCleanedOperationsIntegrity.test.js.map +0 -1
  175. package/dist/test/document-helpers/garbageCollect.test.d.ts +0 -2
  176. package/dist/test/document-helpers/garbageCollect.test.d.ts.map +0 -1
  177. package/dist/test/document-helpers/garbageCollect.test.js +0 -136
  178. package/dist/test/document-helpers/garbageCollect.test.js.map +0 -1
  179. package/dist/test/document-helpers/groupOperationsByScope.test.d.ts +0 -2
  180. package/dist/test/document-helpers/groupOperationsByScope.test.d.ts.map +0 -1
  181. package/dist/test/document-helpers/groupOperationsByScope.test.js +0 -98
  182. package/dist/test/document-helpers/groupOperationsByScope.test.js.map +0 -1
  183. package/dist/test/document-helpers/merge.test.d.ts +0 -2
  184. package/dist/test/document-helpers/merge.test.d.ts.map +0 -1
  185. package/dist/test/document-helpers/merge.test.js +0 -757
  186. package/dist/test/document-helpers/merge.test.js.map +0 -1
  187. package/dist/test/document-helpers/nextSkipNumber.test.d.ts +0 -2
  188. package/dist/test/document-helpers/nextSkipNumber.test.d.ts.map +0 -1
  189. package/dist/test/document-helpers/nextSkipNumber.test.js +0 -123
  190. package/dist/test/document-helpers/nextSkipNumber.test.js.map +0 -1
  191. package/dist/test/document-helpers/prepareOperations.test.d.ts +0 -2
  192. package/dist/test/document-helpers/prepareOperations.test.d.ts.map +0 -1
  193. package/dist/test/document-helpers/prepareOperations.test.js +0 -304
  194. package/dist/test/document-helpers/prepareOperations.test.js.map +0 -1
  195. package/dist/test/document-helpers/removeExistingOperations.test.d.ts +0 -2
  196. package/dist/test/document-helpers/removeExistingOperations.test.d.ts.map +0 -1
  197. package/dist/test/document-helpers/removeExistingOperations.test.js +0 -150
  198. package/dist/test/document-helpers/removeExistingOperations.test.js.map +0 -1
  199. package/dist/test/document-helpers/reshuffleByTimestamp.test.d.ts +0 -2
  200. package/dist/test/document-helpers/reshuffleByTimestamp.test.d.ts.map +0 -1
  201. package/dist/test/document-helpers/reshuffleByTimestamp.test.js +0 -148
  202. package/dist/test/document-helpers/reshuffleByTimestamp.test.js.map +0 -1
  203. package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.d.ts +0 -2
  204. package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.d.ts.map +0 -1
  205. package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.js +0 -200
  206. package/dist/test/document-helpers/reshuffleByTimestampAndIndex.test.js.map +0 -1
  207. package/dist/test/document-helpers/sortOperations.test.d.ts +0 -2
  208. package/dist/test/document-helpers/sortOperations.test.d.ts.map +0 -1
  209. package/dist/test/document-helpers/sortOperations.test.js +0 -101
  210. package/dist/test/document-helpers/sortOperations.test.js.map +0 -1
  211. package/dist/test/document-helpers/split.test.d.ts +0 -2
  212. package/dist/test/document-helpers/split.test.d.ts.map +0 -1
  213. package/dist/test/document-helpers/split.test.js +0 -121
  214. package/dist/test/document-helpers/split.test.js.map +0 -1
  215. package/dist/test/document-helpers/utils.d.ts +0 -8
  216. package/dist/test/document-helpers/utils.d.ts.map +0 -1
  217. package/dist/test/document-helpers/utils.js +0 -22
  218. package/dist/test/document-helpers/utils.js.map +0 -1
  219. package/dist/test/drive-operations.test.d.ts +0 -2
  220. package/dist/test/drive-operations.test.d.ts.map +0 -1
  221. package/dist/test/drive-operations.test.js +0 -145
  222. package/dist/test/drive-operations.test.js.map +0 -1
  223. package/dist/test/graphql.test.d.ts +0 -2
  224. package/dist/test/graphql.test.d.ts.map +0 -1
  225. package/dist/test/graphql.test.js +0 -10
  226. package/dist/test/graphql.test.js.map +0 -1
  227. package/dist/test/internal-listener.test.d.ts +0 -2
  228. package/dist/test/internal-listener.test.d.ts.map +0 -1
  229. package/dist/test/internal-listener.test.js +0 -277
  230. package/dist/test/internal-listener.test.js.map +0 -1
  231. package/dist/test/queue.test.d.ts +0 -2
  232. package/dist/test/queue.test.d.ts.map +0 -1
  233. package/dist/test/queue.test.js +0 -338
  234. package/dist/test/queue.test.js.map +0 -1
  235. package/dist/test/read-mode.test.d.ts +0 -2
  236. package/dist/test/read-mode.test.d.ts.map +0 -1
  237. package/dist/test/read-mode.test.js +0 -578
  238. package/dist/test/read-mode.test.js.map +0 -1
  239. package/dist/test/server/driveOperationsConflictResolution.test.d.ts +0 -2
  240. package/dist/test/server/driveOperationsConflictResolution.test.d.ts.map +0 -1
  241. package/dist/test/server/driveOperationsConflictResolution.test.js +0 -460
  242. package/dist/test/server/driveOperationsConflictResolution.test.js.map +0 -1
  243. package/dist/test/server/mergeOperations.test.d.ts +0 -2
  244. package/dist/test/server/mergeOperations.test.d.ts.map +0 -1
  245. package/dist/test/server/mergeOperations.test.js +0 -107
  246. package/dist/test/server/mergeOperations.test.js.map +0 -1
  247. package/dist/test/server/processOperations.test.d.ts +0 -2
  248. package/dist/test/server/processOperations.test.d.ts.map +0 -1
  249. package/dist/test/server/processOperations.test.js +0 -380
  250. package/dist/test/server/processOperations.test.js.map +0 -1
  251. package/dist/test/server.test.d.ts +0 -2
  252. package/dist/test/server.test.d.ts.map +0 -1
  253. package/dist/test/server.test.js +0 -899
  254. package/dist/test/server.test.js.map +0 -1
  255. package/dist/test/signature-migration.test.d.ts +0 -2
  256. package/dist/test/signature-migration.test.d.ts.map +0 -1
  257. package/dist/test/signature-migration.test.js +0 -239
  258. package/dist/test/signature-migration.test.js.map +0 -1
  259. package/dist/test/storage.test.d.ts +0 -2
  260. package/dist/test/storage.test.d.ts.map +0 -1
  261. package/dist/test/storage.test.js +0 -523
  262. package/dist/test/storage.test.js.map +0 -1
  263. package/dist/test/utils.d.ts +0 -48
  264. package/dist/test/utils.d.ts.map +0 -1
  265. package/dist/test/utils.js +0 -133
  266. package/dist/test/utils.js.map +0 -1
  267. package/dist/test/utils.test.d.ts +0 -2
  268. package/dist/test/utils.test.d.ts.map +0 -1
  269. package/dist/test/utils.test.js +0 -89
  270. package/dist/test/utils.test.js.map +0 -1
  271. package/dist/test/vitest-setup.d.ts +0 -2
  272. package/dist/test/vitest-setup.d.ts.map +0 -1
  273. package/dist/test/vitest-setup.js +0 -5
  274. package/dist/test/vitest-setup.js.map +0 -1
  275. package/dist/tsconfig.tsbuildinfo +0 -1
  276. package/dist/vitest.config.d.ts +0 -3
  277. package/dist/vitest.config.d.ts.map +0 -1
  278. package/dist/vitest.config.js +0 -27
  279. package/dist/vitest.config.js.map +0 -1
@@ -0,0 +1,222 @@
1
+ import { childLogger, logger } from "#utils/logger";
2
+ import { generateId } from "document-model";
3
+ import { createNanoEvents } from "nanoevents";
4
+ import { MemoryQueue } from "./base.js";
5
+ import { isDocumentJob, isOperationJob, } from "./types.js";
6
+ export class EventQueueManager {
7
+ logger = childLogger(["EventQueueManager"]);
8
+ emitter = createNanoEvents();
9
+ queues = new Map();
10
+ globalQueue = new Array();
11
+ isFindingJob = false;
12
+ maxWorkers;
13
+ workers;
14
+ runningJobs = new Array();
15
+ timeout;
16
+ delegate;
17
+ onError;
18
+ constructor(maxWorkers = 1, timeout = 0) {
19
+ this.maxWorkers = maxWorkers;
20
+ this.workers = 0;
21
+ this.timeout = timeout;
22
+ }
23
+ async init(delegate, onError) {
24
+ this.delegate = delegate;
25
+ this.onError = onError;
26
+ function wrapErrorHandler(method) {
27
+ return (async (...args) => {
28
+ try {
29
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
30
+ await method(...args);
31
+ }
32
+ catch (error) {
33
+ throw error instanceof Error
34
+ ? error
35
+ : new Error(JSON.stringify(error));
36
+ }
37
+ });
38
+ }
39
+ this.emitter.on("jobAdded", wrapErrorHandler(async (job) => {
40
+ this.logger.verbose("Added job", job);
41
+ await this.processNextJob();
42
+ }));
43
+ this.emitter.on("jobStarted", wrapErrorHandler(async (job) => {
44
+ this.logger.verbose("Started job", job.jobId);
45
+ this.runningJobs.push(job);
46
+ await this.processNextJob();
47
+ }));
48
+ this.emitter.on("jobCompleted", wrapErrorHandler(async (job, result) => {
49
+ this.logger.verbose("Completed job", job.jobId);
50
+ await this.handleJobCompleted(job, result);
51
+ }));
52
+ this.emitter.on("jobFailed", wrapErrorHandler(async (job, error) => {
53
+ this.logger.error("Failed job", job, error);
54
+ this.removeJob(job);
55
+ onError(error);
56
+ await this.processNextJob();
57
+ }));
58
+ return Promise.resolve();
59
+ }
60
+ async addJob(job) {
61
+ if (!this.delegate) {
62
+ throw new Error("No server delegate defined");
63
+ }
64
+ const jobId = generateId();
65
+ const documentJob = isDocumentJob(job);
66
+ const jobActions = isDocumentJob(job)
67
+ ? undefined
68
+ : isOperationJob(job)
69
+ ? job.operations
70
+ : job.actions;
71
+ if (!documentJob && !jobActions?.length) {
72
+ throw new Error("Job has no operations or actions: " + JSON.stringify(job));
73
+ }
74
+ const scope = jobActions?.at(0)?.scope ?? "global";
75
+ if (jobActions?.find((j) => j.scope !== scope)) {
76
+ throw new Error("Job has actions with different scopes");
77
+ }
78
+ const queue = this.getQueue(job.documentId, scope);
79
+ // checks if the job is for a document:scope that has been deleted
80
+ if (!isDocumentJob(job) && (await queue.isDeleted())) {
81
+ throw new Error("Job has operations for deleted document");
82
+ }
83
+ // TODO should create document job be a dependency of all jobs to the same document?
84
+ const jobValue = Object.freeze({ jobId, ...job });
85
+ await queue.addJob(jobValue);
86
+ this.globalQueue.push({
87
+ jobId,
88
+ documentId: job.documentId,
89
+ scope,
90
+ timestamp: new Date().toUTCString(),
91
+ });
92
+ this.emit("jobAdded", jobValue);
93
+ return jobId;
94
+ }
95
+ getQueue(documentId, scope) {
96
+ let docQueue = this.queues.get(documentId);
97
+ if (!docQueue) {
98
+ docQueue = new Map();
99
+ this.queues.set(documentId, docQueue);
100
+ }
101
+ let scopeQueue = docQueue.get(scope);
102
+ if (!scopeQueue) {
103
+ scopeQueue = new MemoryQueue(scope);
104
+ docQueue.set(scope, scopeQueue);
105
+ }
106
+ return scopeQueue;
107
+ }
108
+ getDocumentQueues(documentId) {
109
+ return this.queues.get(documentId);
110
+ }
111
+ removeQueue(documentId, scope) {
112
+ const docQueues = this.queues.get(documentId);
113
+ const deleted = docQueues?.delete(scope);
114
+ if (deleted) {
115
+ this.emit("queueRemoved", { documentId, scope });
116
+ }
117
+ return deleted;
118
+ }
119
+ removeDocumentQueues(documentId) {
120
+ const docQueues = this.queues.get(documentId);
121
+ docQueues?.keys().forEach((scope) => {
122
+ this.removeQueue(documentId, scope);
123
+ });
124
+ }
125
+ removeJob(job) {
126
+ const indexRunning = this.runningJobs.findIndex((j) => j.jobId === job.jobId);
127
+ if (indexRunning === -1) {
128
+ this.logger.warn("Running job not found", job.jobId);
129
+ }
130
+ this.runningJobs.splice(indexRunning, 1);
131
+ const indexGlobal = this.globalQueue.findIndex((j) => j.jobId === job.jobId);
132
+ if (indexGlobal === -1) {
133
+ this.logger.warn("Job not found on global queue", job.jobId);
134
+ }
135
+ this.globalQueue.splice(indexGlobal, 1);
136
+ }
137
+ async handleJobCompleted(job, result) {
138
+ this.removeJob(job);
139
+ return this.processNextJob();
140
+ }
141
+ isBusy() {
142
+ return this.workers >= this.maxWorkers;
143
+ }
144
+ async processNextJob() {
145
+ // if there is already a worker looking for a job then waits for it to finish
146
+ if (this.isFindingJob) {
147
+ return;
148
+ }
149
+ if (!this.delegate) {
150
+ throw new Error("No server delegate defined");
151
+ }
152
+ // returns if there are no jobs available
153
+ if (this.globalQueue.length === 0) {
154
+ return;
155
+ }
156
+ // returns if there are no workers available
157
+ if (this.isBusy()) {
158
+ return;
159
+ }
160
+ this.isFindingJob = true;
161
+ this.workers++;
162
+ let queue;
163
+ let job;
164
+ try {
165
+ const queueJob = await this.findNextJob();
166
+ queue = queueJob?.queue;
167
+ job = queueJob?.job;
168
+ }
169
+ catch (error) {
170
+ logger.error("Error finding next job", error);
171
+ }
172
+ if (!queue || !job) {
173
+ this.workers--;
174
+ this.isFindingJob = false;
175
+ return;
176
+ }
177
+ try {
178
+ await queue.setRunning(true);
179
+ this.isFindingJob = false;
180
+ this.emit("jobStarted", job);
181
+ const result = await this.delegate.processJob(job);
182
+ this.workers--;
183
+ await queue.setRunning(false);
184
+ this.emit("jobCompleted", job, result);
185
+ }
186
+ catch (error) {
187
+ logger.error("Job failed", error);
188
+ this.workers--;
189
+ this.isFindingJob = false;
190
+ await queue.setRunning(false);
191
+ this.emit("jobFailed", job, error instanceof Error ? error : new Error(JSON.stringify(error)));
192
+ }
193
+ }
194
+ async findNextJob() {
195
+ const skippedQueues = new Set();
196
+ for (const job of this.globalQueue) {
197
+ const queue = this.getQueue(job.documentId, job.scope);
198
+ const queueId = queue.getId();
199
+ if (skippedQueues.has(queueId)) {
200
+ continue;
201
+ }
202
+ if (await queue.isBlocked()) {
203
+ skippedQueues.add(queue.getId());
204
+ continue;
205
+ }
206
+ const queueJob = await queue.getNextJob();
207
+ if (queueJob?.jobId !== job.jobId) {
208
+ logger.warn("Queue has different job waiting to be picked up"); // TODO ensure this is not possible
209
+ logger.error(job, queueJob);
210
+ continue;
211
+ }
212
+ return { queue, job: queueJob };
213
+ }
214
+ }
215
+ emit(event, ...args) {
216
+ this.emitter.emit(event, ...args);
217
+ }
218
+ on(event, cb) {
219
+ return this.emitter.on(event, cb);
220
+ }
221
+ }
222
+ //# sourceMappingURL=event.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"event.js","sourceRoot":"","sources":["../../../src/queue/event.ts"],"names":[],"mappings":"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"}
@@ -1,28 +1,2 @@
1
- import { type RedisClientType } from "redis";
2
- import { BaseQueueManager } from "./base.js";
3
- import { type IJob, type IQueue, type IQueueManager, type IServerDelegate, type Job } from "./types.js";
4
- export declare class RedisQueue<T> implements IQueue<T> {
5
- private id;
6
- private client;
7
- constructor(id: string, client: RedisClientType);
8
- addJob(data: any): Promise<void>;
9
- getNextJob(): Promise<IJob<T> | undefined>;
10
- amountOfJobs(): Promise<number>;
11
- setBlocked(blocked: boolean): Promise<void>;
12
- isBlocked(): Promise<boolean>;
13
- getId(): string;
14
- getJobs(): Promise<IJob<T>[]>;
15
- addDependencies(job: IJob<Job>): Promise<void>;
16
- hasDependency(job: IJob<Job>): Promise<boolean>;
17
- removeDependencies(job: IJob<Job>): Promise<void>;
18
- isDeleted(): Promise<boolean>;
19
- setDeleted(deleted: boolean): Promise<void>;
20
- }
21
- export declare class RedisQueueManager extends BaseQueueManager implements IQueueManager {
22
- private client;
23
- constructor(workers: number | undefined, timeout: number | undefined, client: RedisClientType);
24
- init(delegate: IServerDelegate, onError: (error: Error) => void): Promise<void>;
25
- getQueue(driveId: string, documentId?: string): import("./types.js").IJobQueue;
26
- removeQueue(driveId: string, documentId?: string | undefined): void;
27
- }
1
+ export {};
28
2
  //# sourceMappingURL=redis.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../src/queue/redis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EACL,KAAK,IAAI,EACT,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,GAAG,EACT,MAAM,YAAY,CAAC;AAEpB,qBAAa,UAAU,CAAC,CAAC,CAAE,YAAW,MAAM,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,MAAM,CAAkB;gBAEpB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe;IAOzC,MAAM,CAAC,IAAI,EAAE,GAAG;IAIhB,UAAU;IAQV,YAAY;IAIZ,UAAU,CAAC,OAAO,EAAE,OAAO;IAQ3B,SAAS;IASf,KAAK;IAIC,OAAO;IAKP,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;IAQ9B,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;IAK5B,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;IAUjC,SAAS;IAKT,UAAU,CAAC,OAAO,EAAE,OAAO;CAOlC;AAED,qBAAa,iBACX,SAAQ,gBACR,YAAW,aAAa;IAExB,OAAO,CAAC,MAAM,CAAkB;gBAEpB,OAAO,oBAAI,EAAE,OAAO,oBAAI,EAAE,MAAM,EAAE,eAAe;IAKvD,IAAI,CACR,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAC9B,OAAO,CAAC,IAAI,CAAC;IAWhB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAY7C,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;CAMpE"}
1
+ {"version":3,"file":"redis.d.ts","sourceRoot":"","sources":["../../../src/queue/redis.ts"],"names":[],"mappings":""}
@@ -1,111 +1,123 @@
1
- import { BaseQueueManager } from "./base.js";
2
- export class RedisQueue {
3
- id;
4
- client;
5
- constructor(id, client) {
6
- this.client = client;
7
- this.id = id;
8
- this.client.hSet("queues", id, "true");
9
- this.client.hSet(this.id, "blocked", "false");
10
- }
11
- async addJob(data) {
12
- await this.client.lPush(this.id + "-jobs", JSON.stringify(data));
13
- }
14
- async getNextJob() {
15
- const job = await this.client.rPop(this.id + "-jobs");
16
- if (!job) {
17
- return undefined;
18
- }
19
- return JSON.parse(job);
20
- }
21
- async amountOfJobs() {
22
- return this.client.lLen(this.id + "-jobs");
23
- }
24
- async setBlocked(blocked) {
25
- if (blocked) {
26
- await this.client.hSet(this.id, "blocked", "true");
27
- }
28
- else {
29
- await this.client.hSet(this.id, "blocked", "false");
30
- }
31
- }
32
- async isBlocked() {
33
- const blockedResult = await this.client.hGet(this.id, "blocked");
34
- if (blockedResult === "true") {
35
- return true;
36
- }
37
- return false;
38
- }
39
- getId() {
40
- return this.id;
41
- }
42
- async getJobs() {
43
- const entries = await this.client.lRange(this.id + "-jobs", 0, -1);
44
- return entries.map((e) => JSON.parse(e));
45
- }
46
- async addDependencies(job) {
47
- if (await this.hasDependency(job)) {
48
- return;
49
- }
50
- await this.client.lPush(this.id + "-deps", JSON.stringify(job));
51
- await this.setBlocked(true);
52
- }
53
- async hasDependency(job) {
54
- const deps = await this.client.lRange(this.id + "-deps", 0, -1);
55
- return deps.some((d) => d === JSON.stringify(job));
56
- }
57
- async removeDependencies(job) {
58
- await this.client.lRem(this.id + "-deps", 1, JSON.stringify(job));
59
- const allDeps = await this.client.lLen(this.id + "-deps");
60
- if (allDeps > 0) {
61
- await this.setBlocked(true);
62
- }
63
- else {
64
- await this.setBlocked(false);
65
- }
66
- }
67
- async isDeleted() {
68
- const active = await this.client.hGet("queues", this.id);
69
- return active === "false";
70
- }
71
- async setDeleted(deleted) {
72
- if (deleted) {
73
- await this.client.hSet("queues", this.id, "false");
74
- }
75
- else {
76
- await this.client.hSet("queues", this.id, "true");
77
- }
78
- }
79
- }
80
- export class RedisQueueManager extends BaseQueueManager {
81
- client;
82
- constructor(workers = 3, timeout = 0, client) {
83
- super(workers, timeout);
84
- this.client = client;
85
- }
86
- async init(delegate, onError) {
87
- await super.init(delegate, onError);
88
- const queues = await this.client.hGetAll("queues");
89
- for (const queueId in queues) {
90
- const active = await this.client.hGet("queues", queueId);
91
- if (active === "true") {
92
- this.queues.push(new RedisQueue(queueId, this.client));
93
- }
94
- }
95
- }
96
- getQueue(driveId, documentId) {
97
- const queueId = this.getQueueId(driveId, documentId);
98
- let queue = this.queues.find((q) => q.getId() === queueId);
99
- if (!queue) {
100
- queue = new RedisQueue(queueId, this.client);
101
- this.queues.push(queue);
102
- }
103
- return queue;
104
- }
105
- removeQueue(driveId, documentId) {
106
- super.removeQueue(driveId, documentId);
107
- const queueId = this.getQueueId(driveId, documentId);
108
- this.client.hDel("queues", queueId);
109
- }
110
- }
1
+ // import { type RedisClientType } from "redis";
2
+ // import { BaseQueueManager } from "./base.js";
3
+ // import {
4
+ // type IJob,
5
+ // type IQueue,
6
+ // type IQueueManager,
7
+ // type IServerDelegate,
8
+ // type Job,
9
+ // } from "./types.js";
10
+ export {};
11
+ // export class RedisQueue<T> implements IQueue<T> {
12
+ // private id: string;
13
+ // private client: RedisClientType;
14
+ // constructor(id: string, client: RedisClientType) {
15
+ // this.client = client;
16
+ // this.id = id;
17
+ // this.client.hSet("queues", id, "true");
18
+ // this.client.hSet(this.id, "blocked", "false");
19
+ // }
20
+ // async addJob(data: any) {
21
+ // await this.client.lPush(this.id + "-jobs", JSON.stringify(data));
22
+ // }
23
+ // async getNextJob() {
24
+ // const job = await this.client.rPop(this.id + "-jobs");
25
+ // if (!job) {
26
+ // return undefined;
27
+ // }
28
+ // return JSON.parse(job) as IJob<T>;
29
+ // }
30
+ // async amountOfJobs() {
31
+ // return this.client.lLen(this.id + "-jobs");
32
+ // }
33
+ // async setBlocked(blocked: boolean) {
34
+ // if (blocked) {
35
+ // await this.client.hSet(this.id, "blocked", "true");
36
+ // } else {
37
+ // await this.client.hSet(this.id, "blocked", "false");
38
+ // }
39
+ // }
40
+ // async isBlocked() {
41
+ // const blockedResult = await this.client.hGet(this.id, "blocked");
42
+ // if (blockedResult === "true") {
43
+ // return true;
44
+ // }
45
+ // return false;
46
+ // }
47
+ // getId() {
48
+ // return this.id;
49
+ // }
50
+ // async getJobs() {
51
+ // const entries = await this.client.lRange(this.id + "-jobs", 0, -1);
52
+ // return entries.map((e) => JSON.parse(e) as IJob<T>);
53
+ // }
54
+ // async addDependencies(job: IJob<Job>) {
55
+ // if (await this.hasDependency(job)) {
56
+ // return;
57
+ // }
58
+ // await this.client.lPush(this.id + "-deps", JSON.stringify(job));
59
+ // await this.setBlocked(true);
60
+ // }
61
+ // async hasDependency(job: IJob<Job>) {
62
+ // const deps = await this.client.lRange(this.id + "-deps", 0, -1);
63
+ // return deps.some((d) => d === JSON.stringify(job));
64
+ // }
65
+ // async removeDependencies(job: IJob<Job>) {
66
+ // await this.client.lRem(this.id + "-deps", 1, JSON.stringify(job));
67
+ // const allDeps = await this.client.lLen(this.id + "-deps");
68
+ // if (allDeps > 0) {
69
+ // await this.setBlocked(true);
70
+ // } else {
71
+ // await this.setBlocked(false);
72
+ // }
73
+ // }
74
+ // async isDeleted() {
75
+ // const active = await this.client.hGet("queues", this.id);
76
+ // return active === "false";
77
+ // }
78
+ // async setDeleted(deleted: boolean) {
79
+ // if (deleted) {
80
+ // await this.client.hSet("queues", this.id, "false");
81
+ // } else {
82
+ // await this.client.hSet("queues", this.id, "true");
83
+ // }
84
+ // }
85
+ // }
86
+ // export class RedisQueueManager
87
+ // extends BaseQueueManager
88
+ // implements IQueueManager
89
+ // {
90
+ // private client: RedisClientType;
91
+ // constructor(workers = 3, timeout = 0, client: RedisClientType) {
92
+ // super(workers, timeout);
93
+ // this.client = client;
94
+ // }
95
+ // async init(
96
+ // delegate: IServerDelegate,
97
+ // onError: (error: Error) => void,
98
+ // ): Promise<void> {
99
+ // await super.init(delegate, onError);
100
+ // const queues = await this.client.hGetAll("queues");
101
+ // for (const queueId in queues) {
102
+ // const active = await this.client.hGet("queues", queueId);
103
+ // if (active === "true") {
104
+ // this.queues.push(new RedisQueue(queueId, this.client));
105
+ // }
106
+ // }
107
+ // }
108
+ // getQueue(driveId: string, documentId?: string) {
109
+ // const queueId = this.getQueueId(driveId, documentId);
110
+ // let queue = this.queues.find((q) => q.getId() === queueId);
111
+ // if (!queue) {
112
+ // queue = new RedisQueue(queueId, this.client);
113
+ // this.queues.push(queue);
114
+ // }
115
+ // return queue;
116
+ // }
117
+ // removeQueue(driveId: string, documentId?: string | undefined): void {
118
+ // super.removeQueue(driveId, documentId);
119
+ // const queueId = this.getQueueId(driveId, documentId);
120
+ // this.client.hDel("queues", queueId);
121
+ // }
122
+ // }
111
123
  //# sourceMappingURL=redis.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/queue/redis.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"redis.js","sourceRoot":"","sources":["../../../src/queue/redis.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,gDAAgD;AAChD,WAAW;AACX,eAAe;AACf,iBAAiB;AACjB,wBAAwB;AACxB,0BAA0B;AAC1B,cAAc;AACd,uBAAuB;;AAEvB,oDAAoD;AACpD,wBAAwB;AACxB,qCAAqC;AAErC,uDAAuD;AACvD,4BAA4B;AAC5B,oBAAoB;AACpB,8CAA8C;AAC9C,qDAAqD;AACrD,MAAM;AAEN,8BAA8B;AAC9B,wEAAwE;AACxE,MAAM;AAEN,yBAAyB;AACzB,6DAA6D;AAC7D,kBAAkB;AAClB,0BAA0B;AAC1B,QAAQ;AACR,yCAAyC;AACzC,MAAM;AAEN,2BAA2B;AAC3B,kDAAkD;AAClD,MAAM;AAEN,yCAAyC;AACzC,qBAAqB;AACrB,4DAA4D;AAC5D,eAAe;AACf,6DAA6D;AAC7D,QAAQ;AACR,MAAM;AAEN,wBAAwB;AACxB,wEAAwE;AACxE,sCAAsC;AACtC,qBAAqB;AACrB,QAAQ;AAER,oBAAoB;AACpB,MAAM;AAEN,cAAc;AACd,sBAAsB;AACtB,MAAM;AAEN,sBAAsB;AACtB,0EAA0E;AAC1E,2DAA2D;AAC3D,MAAM;AAEN,4CAA4C;AAC5C,2CAA2C;AAC3C,gBAAgB;AAChB,QAAQ;AACR,uEAAuE;AACvE,mCAAmC;AACnC,MAAM;AAEN,0CAA0C;AAC1C,uEAAuE;AACvE,0DAA0D;AAC1D,MAAM;AAEN,+CAA+C;AAC/C,yEAAyE;AACzE,iEAAiE;AACjE,yBAAyB;AACzB,qCAAqC;AACrC,eAAe;AACf,sCAAsC;AACtC,QAAQ;AACR,MAAM;AAEN,wBAAwB;AACxB,gEAAgE;AAChE,iCAAiC;AACjC,MAAM;AAEN,yCAAyC;AACzC,qBAAqB;AACrB,4DAA4D;AAC5D,eAAe;AACf,2DAA2D;AAC3D,QAAQ;AACR,MAAM;AACN,IAAI;AAEJ,iCAAiC;AACjC,6BAA6B;AAC7B,6BAA6B;AAC7B,IAAI;AACJ,qCAAqC;AAErC,qEAAqE;AACrE,+BAA+B;AAC/B,4BAA4B;AAC5B,MAAM;AAEN,gBAAgB;AAChB,iCAAiC;AACjC,uCAAuC;AACvC,uBAAuB;AACvB,2CAA2C;AAC3C,0DAA0D;AAC1D,sCAAsC;AACtC,kEAAkE;AAClE,iCAAiC;AACjC,kEAAkE;AAClE,UAAU;AACV,QAAQ;AACR,MAAM;AAEN,qDAAqD;AACrD,4DAA4D;AAC5D,kEAAkE;AAElE,oBAAoB;AACpB,sDAAsD;AACtD,iCAAiC;AACjC,QAAQ;AAER,oBAAoB;AACpB,MAAM;AAEN,0EAA0E;AAC1E,8CAA8C;AAE9C,4DAA4D;AAC5D,2CAA2C;AAC3C,MAAM;AACN,IAAI"}
@@ -1,24 +1,32 @@
1
1
  import { type AddOperationOptions, type IOperationResult } from "#server/types";
2
- import type { Action, Operation } from "document-model";
2
+ import type { Action, Operation, PHDocument } from "document-model";
3
3
  import type { Unsubscribe } from "nanoevents";
4
4
  export interface BaseJob {
5
- driveId: string;
6
- documentId?: string;
5
+ documentId: string;
7
6
  actions?: Action[];
8
7
  options?: AddOperationOptions;
9
8
  }
9
+ export interface DocumentJob extends Omit<BaseJob, "actions"> {
10
+ documentType: string;
11
+ initialState?: PHDocument;
12
+ }
10
13
  export interface OperationJob extends BaseJob {
11
14
  operations: Operation[];
12
15
  }
13
16
  export interface ActionJob extends BaseJob {
14
17
  actions: Action[];
15
18
  }
16
- export type Job = OperationJob | ActionJob;
19
+ export type Job = DocumentJob | OperationJob | ActionJob;
17
20
  export type JobId = string;
18
21
  export interface QueueEvents {
22
+ jobAdded: (job: IJob<Job>) => void;
23
+ jobStarted: (job: IJob<Job>) => void;
19
24
  jobCompleted: (job: IJob<Job>, result: IOperationResult) => void;
20
25
  jobFailed: (job: IJob<Job>, error: Error) => void;
21
- queueRemoved: (queueId: string) => void;
26
+ queueRemoved: (queue: {
27
+ documentId: string;
28
+ scope: string;
29
+ }) => void;
22
30
  }
23
31
  export interface IServerDelegate {
24
32
  exists: (documentId: string) => Promise<boolean>;
@@ -26,10 +34,6 @@ export interface IServerDelegate {
26
34
  }
27
35
  export interface IQueueManager {
28
36
  addJob: (job: Job) => Promise<JobId>;
29
- getQueue: (driveId: string, documentId?: string) => IQueue<Job>;
30
- removeQueue: (driveId: string, documentId?: string) => void;
31
- getQueueByIndex: (index: number) => IQueue<Job> | null;
32
- getQueues: () => string[];
33
37
  init: (delegate: IServerDelegate, onError: (error: Error) => void) => Promise<void>;
34
38
  on: <K extends keyof QueueEvents>(this: this, event: K, cb: QueueEvents[K]) => Unsubscribe;
35
39
  }
@@ -41,15 +45,17 @@ export interface IQueue<T> {
41
45
  getNextJob(): Promise<IJob<T> | undefined>;
42
46
  amountOfJobs(): Promise<number>;
43
47
  getId(): string;
44
- setBlocked(blocked: boolean): Promise<void>;
45
48
  isBlocked(): Promise<boolean>;
46
49
  isDeleted(): Promise<boolean>;
50
+ isRunning(): Promise<boolean>;
47
51
  setDeleted(deleted: boolean): Promise<void>;
52
+ setRunning(running: boolean): Promise<void>;
48
53
  getJobs(): Promise<IJob<T>[]>;
49
- addDependencies: (job: IJob<Job>) => Promise<void>;
50
- removeDependencies: (job: IJob<Job>) => Promise<void>;
54
+ addDependency: (job: IJob<Job>) => Promise<void>;
55
+ removeDependency: (job: IJob<Job>) => Promise<void>;
51
56
  }
52
57
  export type IJobQueue = IQueue<Job>;
58
+ export declare function isDocumentJob(job: Job): job is DocumentJob;
53
59
  export declare function isOperationJob(job: Job): job is OperationJob;
54
60
  export declare function isActionJob(job: Job): job is ActionJob;
55
61
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/queue/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/queue/types.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,6 @@
1
+ export function isDocumentJob(job) {
2
+ return "documentType" in job;
3
+ }
1
4
  export function isOperationJob(job) {
2
5
  return "operations" in job;
3
6
  }
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/queue/types.ts"],"names":[],"mappings":"AAqEA,MAAM,UAAU,cAAc,CAAC,GAAQ;IACrC,OAAO,YAAY,IAAI,GAAG,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAQ;IAClC,OAAO,SAAS,IAAI,GAAG,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/queue/types.ts"],"names":[],"mappings":"AAwEA,MAAM,UAAU,aAAa,CAAC,GAAQ;IACpC,OAAO,cAAc,IAAI,GAAG,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAQ;IACrC,OAAO,YAAY,IAAI,GAAG,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAQ;IAClC,OAAO,SAAS,IAAI,GAAG,CAAC;AAC1B,CAAC"}