@researchdatabox/redbox-core 0.0.1-beta.10213 → 0.0.1-beta.10300

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 (110) hide show
  1. package/dist/CoreController.d.ts +8 -0
  2. package/dist/CoreController.d.ts.map +1 -1
  3. package/dist/CoreController.js +87 -52
  4. package/dist/api-routes/groups/export.js +2 -2
  5. package/dist/config/brandingConfigurationDefaults.config.d.ts +1 -1
  6. package/dist/config/brandingConfigurationDefaults.config.d.ts.map +1 -1
  7. package/dist/config/brandingConfigurationDefaults.config.js +9 -230
  8. package/dist/config/dashboardtype.config.d.ts +7 -0
  9. package/dist/config/dashboardtype.config.d.ts.map +1 -1
  10. package/dist/config/dashboardtype.config.js +9 -89
  11. package/dist/config/dashboardview.config.d.ts +7 -0
  12. package/dist/config/dashboardview.config.d.ts.map +1 -1
  13. package/dist/config/dashboardview.config.js +9 -134
  14. package/dist/config/http.config.d.ts +2 -0
  15. package/dist/config/http.config.d.ts.map +1 -1
  16. package/dist/config/http.config.js +47 -1
  17. package/dist/config/jsonld.config.d.ts.map +1 -1
  18. package/dist/config/jsonld.config.js +2 -21
  19. package/dist/config/record.config.d.ts.map +1 -1
  20. package/dist/config/record.config.js +2 -9
  21. package/dist/config/recordtype.config.d.ts +8 -0
  22. package/dist/config/recordtype.config.d.ts.map +1 -1
  23. package/dist/config/recordtype.config.js +10 -660
  24. package/dist/config/routes.config.d.ts.map +1 -1
  25. package/dist/config/routes.config.js +2 -3
  26. package/dist/config/storage.config.d.ts.map +1 -1
  27. package/dist/config/storage.config.js +7 -1
  28. package/dist/config/views.config.d.ts.map +1 -1
  29. package/dist/config/views.config.js +2 -6
  30. package/dist/config/workflow.config.d.ts +7 -0
  31. package/dist/config/workflow.config.d.ts.map +1 -1
  32. package/dist/config/workflow.config.js +9 -194
  33. package/dist/config/workspacetype.config.d.ts +7 -0
  34. package/dist/config/workspacetype.config.d.ts.map +1 -1
  35. package/dist/config/workspacetype.config.js +9 -10
  36. package/dist/configmodels/DoiPublishing.d.ts +1 -1
  37. package/dist/configmodels/DoiPublishing.d.ts.map +1 -1
  38. package/dist/configmodels/FigsharePublishing.d.ts +24 -1
  39. package/dist/configmodels/FigsharePublishing.d.ts.map +1 -1
  40. package/dist/configmodels/FigsharePublishing.js +152 -131
  41. package/dist/constants/export.d.ts +2 -0
  42. package/dist/constants/export.d.ts.map +1 -0
  43. package/dist/constants/export.js +8 -0
  44. package/dist/controllers/ExportController.d.ts.map +1 -1
  45. package/dist/controllers/ExportController.js +4 -3
  46. package/dist/controllers/RecordController.d.ts.map +1 -1
  47. package/dist/controllers/RecordController.js +2 -1
  48. package/dist/controllers/webservice/ExportController.d.ts.map +1 -1
  49. package/dist/controllers/webservice/ExportController.js +4 -3
  50. package/dist/form-config/index.d.ts +7 -0
  51. package/dist/form-config/index.d.ts.map +1 -1
  52. package/dist/form-config/index.js +8 -5
  53. package/dist/hooks/hookDiscovery.d.ts +20 -0
  54. package/dist/hooks/hookDiscovery.d.ts.map +1 -0
  55. package/dist/hooks/hookDiscovery.js +186 -0
  56. package/dist/hooks/hookResources.d.ts +23 -0
  57. package/dist/hooks/hookResources.d.ts.map +1 -0
  58. package/dist/hooks/hookResources.js +136 -0
  59. package/dist/hooks/index.d.ts +4 -0
  60. package/dist/hooks/index.d.ts.map +1 -1
  61. package/dist/hooks/index.js +14 -2
  62. package/dist/index.d.ts +4 -0
  63. package/dist/index.d.ts.map +1 -1
  64. package/dist/index.js +14 -2
  65. package/dist/loader/index.d.ts.map +1 -1
  66. package/dist/loader/index.js +21 -62
  67. package/dist/services/EmailService.d.ts +2 -8
  68. package/dist/services/EmailService.d.ts.map +1 -1
  69. package/dist/services/EmailService.js +8 -26
  70. package/dist/services/FigshareService.d.ts.map +1 -1
  71. package/dist/services/FigshareService.js +5 -4
  72. package/dist/services/NamedQueryService.d.ts.map +1 -1
  73. package/dist/services/NamedQueryService.js +3 -16
  74. package/dist/services/RecordsService.d.ts +1 -0
  75. package/dist/services/RecordsService.d.ts.map +1 -1
  76. package/dist/services/RecordsService.js +30 -10
  77. package/dist/services/ReportsService.d.ts +0 -5
  78. package/dist/services/ReportsService.d.ts.map +1 -1
  79. package/dist/services/ReportsService.js +2 -19
  80. package/dist/services/StandardDatastreamService.d.ts +7 -0
  81. package/dist/services/StandardDatastreamService.d.ts.map +1 -1
  82. package/dist/services/StandardDatastreamService.js +127 -27
  83. package/dist/services/TemplateService.d.ts +0 -14
  84. package/dist/services/TemplateService.d.ts.map +1 -1
  85. package/dist/services/TemplateService.js +4 -45
  86. package/dist/services/ViewUtilsService.d.ts +5 -1
  87. package/dist/services/ViewUtilsService.d.ts.map +1 -1
  88. package/dist/services/ViewUtilsService.js +38 -46
  89. package/dist/services/doi-v2/bindings.d.ts.map +1 -1
  90. package/dist/services/doi-v2/bindings.js +2 -11
  91. package/dist/services/figshare-v2/assets.d.ts +2 -1
  92. package/dist/services/figshare-v2/assets.d.ts.map +1 -1
  93. package/dist/services/figshare-v2/assets.js +144 -89
  94. package/dist/services/figshare-v2/bindings.d.ts +0 -1
  95. package/dist/services/figshare-v2/bindings.d.ts.map +1 -1
  96. package/dist/services/figshare-v2/bindings.js +2 -12
  97. package/dist/services/figshare-v2/context.d.ts.map +1 -1
  98. package/dist/services/figshare-v2/context.js +11 -2
  99. package/dist/storage/TusStorageManagerDataStore.d.ts.map +1 -1
  100. package/dist/storage/TusStorageManagerDataStore.js +14 -1
  101. package/dist/utilities/ContextVariableUtils.d.ts +3 -1
  102. package/dist/utilities/ContextVariableUtils.d.ts.map +1 -1
  103. package/dist/utilities/ContextVariableUtils.js +25 -7
  104. package/package.json +5 -5
  105. package/dist/form-config/dataRecord-1.0-draft.d.ts +0 -4
  106. package/dist/form-config/dataRecord-1.0-draft.d.ts.map +0 -1
  107. package/dist/form-config/dataRecord-1.0-draft.js +0 -1042
  108. package/dist/form-config/default-1.0-draft.d.ts +0 -4
  109. package/dist/form-config/default-1.0-draft.d.ts.map +0 -1
  110. package/dist/form-config/default-1.0-draft.js +0 -1156
@@ -4,33 +4,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.syncAssetsPhase = syncAssetsPhase;
7
- const fs_1 = __importDefault(require("fs"));
8
7
  const path_1 = __importDefault(require("path"));
9
- const check_disk_space_1 = __importDefault(require("check-disk-space"));
8
+ const node_crypto_1 = require("node:crypto");
9
+ const node_stream_1 = require("node:stream");
10
10
  const RBValidationError_1 = require("../../model/RBValidationError");
11
11
  const config_1 = require("./config");
12
12
  const plan_1 = require("./plan");
13
- const UNKNOWN_SIZE_STAGING_BUFFER_BYTES = 50 * 1024 * 1024;
14
13
  const LINK_FILE_CREATE_RETRY_COUNT = 3;
15
14
  const FIGSHARE_UPLOAD_PENDING_STATUS = 'created';
16
- function getTempDir(config) {
17
- const configDir = config.assets.staging.tempDir;
18
- if (configDir)
19
- return configDir;
20
- return '/tmp';
21
- }
15
+ const DEFAULT_FIGSHARE_STAGING_DISK = 'figshare-staging';
22
16
  function getRecordOid(record) {
23
17
  return record.redboxOid ?? record.id ?? '';
24
18
  }
25
19
  function getDatastreamService() {
26
20
  const recordConfig = sails.config.record;
27
21
  const serviceName = String(recordConfig?.datastreamService ?? '');
28
- return serviceName ? sails.services?.[serviceName] : undefined;
22
+ return serviceName
23
+ ? sails.services?.[serviceName]
24
+ : undefined;
29
25
  }
30
26
  function validationError(message) {
31
27
  return new RBValidationError_1.RBValidationError({
32
28
  message,
33
- displayErrors: [{ title: message, detail: message }]
29
+ displayErrors: [{ title: message, detail: message }],
34
30
  });
35
31
  }
36
32
  async function getAttachmentStream(oid, fileId) {
@@ -44,21 +40,105 @@ async function getAttachmentStream(oid, fileId) {
44
40
  }
45
41
  return response;
46
42
  }
47
- async function stageAttachmentToDisk(response, filePath) {
48
- await fs_1.default.promises.mkdir(path_1.default.dirname(filePath), { recursive: true });
49
- const readStream = response.readstream;
50
- await new Promise((resolve, reject) => {
51
- const writeStream = fs_1.default.createWriteStream(filePath);
52
- readStream.on('error', reject);
53
- writeStream.on('error', reject);
54
- writeStream.on('close', () => resolve());
55
- readStream.pipe(writeStream);
56
- });
57
- const stat = await fs_1.default.promises.stat(filePath);
58
- return stat.size;
43
+ async function ensureAttachmentDatastream(oid, fileId) {
44
+ const response = await getAttachmentStream(oid, fileId);
45
+ const stream = response.readstream;
46
+ if (typeof stream?.destroy === 'function') {
47
+ const ignoreDestroyError = () => undefined;
48
+ const removeDestroyErrorHandler = () => {
49
+ stream.off('error', ignoreDestroyError);
50
+ stream.off('close', removeDestroyErrorHandler);
51
+ stream.off('finish', removeDestroyErrorHandler);
52
+ };
53
+ stream.once('error', ignoreDestroyError);
54
+ stream.once('close', removeDestroyErrorHandler);
55
+ stream.once('finish', removeDestroyErrorHandler);
56
+ stream.destroy();
57
+ }
59
58
  }
60
59
  function sanitizePathComponent(value) {
61
- return value.replace(/[^A-Za-z0-9._-]+/g, '-').replace(/^-+|-+$/g, '') || 'item';
60
+ return (value
61
+ .replace(/[^A-Za-z0-9._-]+/g, '-')
62
+ .replace(/-+/g, '-')
63
+ .replace(/-\./g, '.')
64
+ .replace(/^-+|-+$/g, '') || 'item');
65
+ }
66
+ function getStagingDisk(config) {
67
+ const diskName = config.assets.staging.disk?.trim();
68
+ if (!diskName) {
69
+ return StorageManagerService.stagingDisk();
70
+ }
71
+ try {
72
+ return StorageManagerService.disk(diskName);
73
+ }
74
+ catch (error) {
75
+ if (diskName !== DEFAULT_FIGSHARE_STAGING_DISK) {
76
+ throw error;
77
+ }
78
+ // A deployment that overrides storage.disks may not register the default
79
+ // 'figshare-staging' disk. Fall back to the configured staging disk rather
80
+ // than failing the upload before staging starts.
81
+ sails.log.warn(`FigService - staging disk '${diskName}' is not registered; falling back to the default staging disk`, error);
82
+ return StorageManagerService.stagingDisk();
83
+ }
84
+ }
85
+ function buildStagingKey(config, articleId, oid, fileId, fileName, logger) {
86
+ const prefix = (config.assets.staging.keyPrefix ?? 'figshare/').replace(/^\/+|\/+$/g, '') || 'figshare';
87
+ const originalFileName = path_1.default.basename(fileName).trim();
88
+ if (originalFileName === '') {
89
+ throw validationError(`Attachment '${fileName}' does not contain a valid file name`);
90
+ }
91
+ // basename() can still yield the reserved '.'/'..' segments, which would point the
92
+ // staging key at the directory itself or escape it on an fs-backed disk.
93
+ if (originalFileName === '.' || originalFileName === '..') {
94
+ throw validationError(`Attachment '${fileName}' does not contain a valid file name`);
95
+ }
96
+ const storageFileName = sanitizePathComponent(originalFileName);
97
+ if (storageFileName !== originalFileName) {
98
+ logger?.verbose(`FigService - sanitized staging filename '${originalFileName}' to '${storageFileName}' for attachment '${fileId}'`);
99
+ }
100
+ // Append a per-attempt random segment so concurrent or retried uploads of the
101
+ // same attachment never share a staging key (which would let one attempt
102
+ // overwrite or delete the object another attempt is still streaming).
103
+ const dir = `${sanitizePathComponent(articleId)}-${sanitizePathComponent(oid)}-${sanitizePathComponent(fileId)}-${(0, node_crypto_1.randomUUID)()}`;
104
+ return `${prefix}/${dir}/${storageFileName}`;
105
+ }
106
+ async function stageAttachmentToDisk(disk, key, response) {
107
+ const expectedSize = Number(response.size ?? 0);
108
+ await disk.putStream(key, response.readstream, expectedSize > 0 ? { contentLength: expectedSize } : {});
109
+ const meta = await disk.getMetaData(key);
110
+ return meta.contentLength;
111
+ }
112
+ async function* readPartsSequentially(source, parts) {
113
+ const ordered = [...parts].sort((a, b) => a.startOffset - b.startOffset);
114
+ let consumed = 0;
115
+ let carry = Buffer.alloc(0);
116
+ const iterator = source[Symbol.asyncIterator]();
117
+ for (const part of ordered) {
118
+ const partSize = part.endOffset - part.startOffset + 1;
119
+ if (part.startOffset !== consumed) {
120
+ throw validationError(`Figshare upload part ${part.partNo} starts at ${part.startOffset}; expected ${consumed}`);
121
+ }
122
+ async function* partStream() {
123
+ let need = partSize;
124
+ while (need > 0) {
125
+ if (carry.length === 0) {
126
+ const { value, done } = await iterator.next();
127
+ if (done === true) {
128
+ throw validationError(`Staged object truncated at offset ${consumed}; expected more bytes for part ${part.partNo}`);
129
+ }
130
+ carry = Buffer.isBuffer(value) ? value : Buffer.from(value);
131
+ }
132
+ const take = Math.min(need, carry.length);
133
+ const chunk = carry.subarray(0, take);
134
+ carry = carry.subarray(take);
135
+ need -= take;
136
+ consumed += take;
137
+ yield chunk;
138
+ }
139
+ }
140
+ yield { partNo: part.partNo, stream: node_stream_1.Readable.from(partStream()) };
141
+ }
62
142
  }
63
143
  async function listArticleFiles(client, articleId) {
64
144
  const currentFiles = [];
@@ -78,65 +158,32 @@ async function listArticleFiles(client, articleId) {
78
158
  return currentFiles;
79
159
  }
80
160
  function hasPendingUploads(files) {
81
- return files.some((entry) => String(entry.status ?? '').toLowerCase() === FIGSHARE_UPLOAD_PENDING_STATUS);
161
+ return files.some(entry => String(entry.status ?? '').toLowerCase() === FIGSHARE_UPLOAD_PENDING_STATUS);
82
162
  }
83
- async function uploadAttachment(client, config, articleId, oid, attachment) {
163
+ async function uploadAttachment(client, config, articleId, oid, attachment, logger) {
84
164
  const fileId = attachment.fileId ?? '';
85
165
  const fileName = attachment.name ?? '';
86
166
  if (fileId === '' || fileName === '') {
87
167
  throw validationError('Attachment entry is missing fileId or name');
88
168
  }
89
- const tempDir = getTempDir(config);
90
- const resolvedTempDir = path_1.default.resolve(tempDir);
91
- const safeFileName = path_1.default.basename(fileName).trim();
92
- if (safeFileName === '') {
93
- throw validationError(`Attachment '${fileName}' does not contain a valid file name`);
94
- }
95
- await fs_1.default.promises.mkdir(resolvedTempDir, { recursive: true });
96
- const stagingDir = await fs_1.default.promises.mkdtemp(path_1.default.join(resolvedTempDir, `${sanitizePathComponent(articleId)}-${sanitizePathComponent(oid)}-${sanitizePathComponent(fileId)}-`));
97
- const filePath = path_1.default.resolve(stagingDir, safeFileName);
98
- if (!filePath.startsWith(`${stagingDir}${path_1.default.sep}`) && filePath !== path_1.default.join(stagingDir, safeFileName)) {
99
- throw validationError(`Attachment '${fileName}' resolves outside the staging directory`);
100
- }
169
+ const disk = getStagingDisk(config);
170
+ const stagingKey = buildStagingKey(config, articleId, oid, fileId, fileName, logger);
101
171
  const datastream = await getAttachmentStream(oid, fileId);
102
- const expectedSize = Number(datastream.size ?? 0);
103
- if (expectedSize > 0) {
104
- const diskSpace = await (0, check_disk_space_1.default)(tempDir);
105
- if (diskSpace.free < expectedSize + config.assets.staging.diskSpaceThresholdBytes) {
106
- throw validationError(`Not enough free disk space to upload '${fileName}'`);
107
- }
108
- }
109
- else {
110
- const diskSpace = await (0, check_disk_space_1.default)(tempDir);
111
- const requiredBytes = config.assets.staging.diskSpaceThresholdBytes + UNKNOWN_SIZE_STAGING_BUFFER_BYTES;
112
- if (diskSpace.free < requiredBytes) {
113
- throw validationError(`Not enough free disk space to upload '${fileName}'`);
114
- }
115
- }
116
172
  let uploadSucceeded = false;
117
173
  try {
118
- const stagedSize = await stageAttachmentToDisk(datastream, filePath);
119
- if (expectedSize <= 0) {
120
- const diskSpace = await (0, check_disk_space_1.default)(tempDir);
121
- if (diskSpace.free < stagedSize + config.assets.staging.diskSpaceThresholdBytes) {
122
- throw validationError(`Not enough free disk space to upload '${fileName}'`);
123
- }
124
- }
174
+ const stagedSize = await stageAttachmentToDisk(disk, stagingKey, datastream);
125
175
  const uploadInit = await client.createArticleFile(articleId, {
126
176
  name: fileName,
127
- size: stagedSize
177
+ size: stagedSize,
128
178
  });
129
179
  const uploadDescriptor = await client.getLocation(uploadInit.location);
130
180
  const uploadUrl = uploadDescriptor.upload_url;
131
181
  const figshareFileId = String(uploadDescriptor.id);
132
182
  const partsDescriptor = await client.getLocation(uploadUrl);
133
183
  const parts = partsDescriptor.parts ?? [];
134
- for (const part of parts) {
135
- const readStream = fs_1.default.createReadStream(filePath, {
136
- start: part.startOffset,
137
- end: part.endOffset
138
- });
139
- await client.uploadFilePart(uploadUrl, part.partNo, readStream);
184
+ const source = await disk.getStream(stagingKey);
185
+ for await (const { partNo, stream } of readPartsSequentially(source, parts)) {
186
+ await client.uploadFilePart(uploadUrl, partNo, stream);
140
187
  }
141
188
  await client.completeFileUpload(articleId, figshareFileId, {});
142
189
  const uploadedFile = await client.getLocation(uploadInit.location);
@@ -144,14 +191,19 @@ async function uploadAttachment(client, config, articleId, oid, attachment) {
144
191
  return uploadedFile;
145
192
  }
146
193
  finally {
147
- const shouldDeleteStagingDir = !uploadSucceeded || config.assets.staging.cleanupPolicy === 'deleteAfterSuccess';
148
- if (shouldDeleteStagingDir && fs_1.default.existsSync(stagingDir)) {
149
- await fs_1.default.promises.rm(stagingDir, { recursive: true, force: true });
194
+ // Stored configs may omit cleanupPolicy; default to delete-after-success so
195
+ // staged objects are not retained on the staging disk indefinitely.
196
+ const cleanupPolicy = config.assets.staging.cleanupPolicy ?? 'deleteAfterSuccess';
197
+ const shouldDelete = !uploadSucceeded || cleanupPolicy === 'deleteAfterSuccess';
198
+ if (shouldDelete) {
199
+ await disk
200
+ .delete(stagingKey)
201
+ .catch(error => sails.log.warn(`FigService - failed to delete staged object '${stagingKey}'`, error));
150
202
  }
151
203
  }
152
204
  }
153
205
  async function syncLinkOnlyFiles(client, articleId, selectedUrls, currentFiles) {
154
- const existingLinkFiles = currentFiles.filter((entry) => entry.is_link_only === true);
206
+ const existingLinkFiles = currentFiles.filter(entry => entry.is_link_only === true);
155
207
  const uploadedUrls = [];
156
208
  const creationErrors = [];
157
209
  for (const entry of selectedUrls) {
@@ -164,7 +216,7 @@ async function syncLinkOnlyFiles(client, articleId, selectedUrls, currentFiles)
164
216
  attempt += 1;
165
217
  try {
166
218
  responseLocation = await client.createArticleFile(articleId, {
167
- link: entry.location ?? ''
219
+ link: entry.location ?? '',
168
220
  });
169
221
  break;
170
222
  }
@@ -183,7 +235,7 @@ async function syncLinkOnlyFiles(client, articleId, selectedUrls, currentFiles)
183
235
  name: entry.name ?? entry.originalFileName ?? String(entry.location ?? ''),
184
236
  status: uploadedFile.status,
185
237
  download_url: uploadedFile.download_url,
186
- is_link_only: true
238
+ is_link_only: true,
187
239
  });
188
240
  }
189
241
  catch (error) {
@@ -209,13 +261,13 @@ function toFixtureFigshareFile(entry, articleId, index, isLinkOnly) {
209
261
  size: 0,
210
262
  is_link_only: isLinkOnly,
211
263
  download_url: isLinkOnly ? String(entry.location ?? '') : String(entry.download_url ?? ''),
212
- computed_md5: 'fixture-md5'
264
+ computed_md5: 'fixture-md5',
213
265
  };
214
266
  }
215
- async function syncAssetsPhase(client, config, record, article, syncState) {
267
+ async function syncAssetsPhase(client, config, record, article, syncState, logger) {
216
268
  const selectedDataLocations = (0, plan_1.getSelectedDataLocations)(config, record);
217
- const selectedAttachments = selectedDataLocations.filter((entry) => entry.type === 'attachment');
218
- const selectedUrls = selectedDataLocations.filter((entry) => entry.type === 'url');
269
+ const selectedAttachments = selectedDataLocations.filter(entry => entry.type === 'attachment');
270
+ const selectedUrls = selectedDataLocations.filter(entry => entry.type === 'url');
219
271
  const articleId = String(article.id);
220
272
  const attachmentCount = selectedAttachments.length;
221
273
  const urlCount = selectedUrls.length;
@@ -225,16 +277,17 @@ async function syncAssetsPhase(client, config, record, article, syncState) {
225
277
  }
226
278
  if (config.runtime.mode === 'fixture') {
227
279
  const uploadsComplete = !(attachmentCount > 0 && config.article.publishMode === 'afterUploadsComplete');
228
- syncState.status = attachmentCount > 0 && config.article.publishMode === 'afterUploadsComplete'
229
- ? 'awaiting_upload_completion'
230
- : 'syncing';
280
+ syncState.status =
281
+ attachmentCount > 0 && config.article.publishMode === 'afterUploadsComplete'
282
+ ? 'awaiting_upload_completion'
283
+ : 'syncing';
231
284
  syncState.partialProgress = {
232
285
  articleId,
233
286
  attachmentCount,
234
287
  urlCount,
235
288
  uploadsComplete,
236
289
  uploadedAttachmentCount: attachmentCount,
237
- uploadedUrlCount: urlCount
290
+ uploadedUrlCount: urlCount,
238
291
  };
239
292
  (0, config_1.setSyncState)(config, record, syncState);
240
293
  return {
@@ -244,7 +297,7 @@ async function syncAssetsPhase(client, config, record, article, syncState) {
244
297
  uploadsComplete,
245
298
  uploadedAttachments: selectedAttachments.map((entry, index) => toFixtureFigshareFile(entry, articleId, index, false)),
246
299
  uploadedUrls: selectedUrls.map((entry, index) => toFixtureFigshareFile(entry, articleId, index, true)),
247
- dataLocations: selectedDataLocations
300
+ dataLocations: selectedDataLocations,
248
301
  };
249
302
  }
250
303
  const oid = getRecordOid(record);
@@ -253,12 +306,13 @@ async function syncAssetsPhase(client, config, record, article, syncState) {
253
306
  if (config.assets.enableHostedFiles) {
254
307
  for (const attachment of selectedAttachments) {
255
308
  const fileName = attachment.name ?? '';
256
- const alreadyUploaded = currentFiles.find((entry) => entry.name === fileName);
309
+ const alreadyUploaded = currentFiles.find(entry => entry.name === fileName);
257
310
  if (alreadyUploaded != null) {
311
+ await ensureAttachmentDatastream(oid, attachment.fileId ?? '');
258
312
  uploadedAttachments.push(alreadyUploaded);
259
313
  continue;
260
314
  }
261
- uploadedAttachments.push(await uploadAttachment(client, config, articleId, oid, attachment));
315
+ uploadedAttachments.push(await uploadAttachment(client, config, articleId, oid, attachment, logger));
262
316
  uploadedAttachmentCountThisRun += 1;
263
317
  }
264
318
  }
@@ -271,9 +325,10 @@ async function syncAssetsPhase(client, config, record, article, syncState) {
271
325
  : config.article.publishMode === 'afterUploadsComplete' && uploadedAttachmentCountThisRun > 0
272
326
  ? false
273
327
  : !hasPendingUploads(refreshedFiles);
274
- syncState.status = attachmentCount > 0 && config.article.publishMode === 'afterUploadsComplete'
275
- ? 'awaiting_upload_completion'
276
- : 'syncing';
328
+ syncState.status =
329
+ attachmentCount > 0 && config.article.publishMode === 'afterUploadsComplete'
330
+ ? 'awaiting_upload_completion'
331
+ : 'syncing';
277
332
  syncState.partialProgress = {
278
333
  articleId,
279
334
  attachmentCount,
@@ -281,7 +336,7 @@ async function syncAssetsPhase(client, config, record, article, syncState) {
281
336
  uploadsComplete,
282
337
  uploadedAttachmentCountThisRun,
283
338
  uploadedAttachmentCount: uploadedAttachments.length,
284
- uploadedUrlCount: uploadedUrls.length
339
+ uploadedUrlCount: uploadedUrls.length,
285
340
  };
286
341
  (0, config_1.setSyncState)(config, record, syncState);
287
342
  return {
@@ -291,7 +346,7 @@ async function syncAssetsPhase(client, config, record, article, syncState) {
291
346
  uploadsComplete,
292
347
  uploadedAttachments,
293
348
  uploadedUrls,
294
- dataLocations: selectedDataLocations
349
+ dataLocations: selectedDataLocations,
295
350
  };
296
351
  }
297
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/services/figshare-v2/assets.ts"],"names":[],"mappings":"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"}
352
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../src/services/figshare-v2/assets.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,5 @@
1
1
  import { ValueBinding } from '../../configmodels/FigsharePublishing';
2
2
  import { AnyRecord } from './types';
3
- export declare function ensureHandlebarsHelpersRegistered(): void;
4
3
  export declare function validateHandlebarsTemplate(template: string): void;
5
4
  export declare function evaluateBinding(binding: ValueBinding | undefined, record: AnyRecord): Promise<unknown>;
6
5
  //# sourceMappingURL=bindings.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../../../src/services/figshare-v2/bindings.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIpC,wBAAgB,iCAAiC,IAAI,IAAI,CAKxD;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAoBjE;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAqB5G"}
1
+ {"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../../../src/services/figshare-v2/bindings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGpC,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAoBjE;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAoB5G"}
@@ -3,19 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.ensureHandlebarsHelpersRegistered = ensureHandlebarsHelpersRegistered;
7
6
  exports.validateHandlebarsTemplate = validateHandlebarsTemplate;
8
7
  exports.evaluateBinding = evaluateBinding;
9
8
  const lodash_1 = __importDefault(require("lodash"));
10
- const handlebars_1 = __importDefault(require("handlebars"));
11
9
  const sails_ng_common_1 = require("@researchdatabox/sails-ng-common");
12
- let handlebarsHelpersRegistered = false;
13
- function ensureHandlebarsHelpersRegistered() {
14
- if (!handlebarsHelpersRegistered) {
15
- (0, sails_ng_common_1.registerSharedHandlebarsHelpers)(handlebars_1.default);
16
- handlebarsHelpersRegistered = true;
17
- }
18
- }
19
10
  function validateHandlebarsTemplate(template) {
20
11
  const allowedHelpers = new Set(['default', 'join', 'lower', 'upper', 'trim', 'formatDate']);
21
12
  const tagPattern = /{{{?\s*([#/!>]?)\s*([A-Za-z_][A-Za-z0-9_]*)?/g;
@@ -46,13 +37,12 @@ async function evaluateBinding(binding, record) {
46
37
  return value ?? binding.defaultValue;
47
38
  }
48
39
  if (binding.kind === 'handlebars') {
49
- ensureHandlebarsHelpersRegistered();
50
40
  validateHandlebarsTemplate(binding.template);
51
- const compiled = handlebars_1.default.compile(binding.template);
41
+ const compiled = (0, sails_ng_common_1.handlebarsCompile)(binding.template);
52
42
  const value = compiled(record);
53
43
  return value === '' ? binding.defaultValue : value;
54
44
  }
55
45
  const value = await (0, sails_ng_common_1.jsonataCompileAndEvaluate)(binding.expression, record);
56
46
  return value ?? binding.defaultValue;
57
47
  }
58
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmluZGluZ3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvZmlnc2hhcmUtdjIvYmluZGluZ3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFRQSw4RUFLQztBQUVELGdFQW9CQztBQUVELDBDQXFCQztBQTFERCxvREFBdUI7QUFDdkIsNERBQW9DO0FBQ3BDLHNFQUE0RztBQUk1RyxJQUFJLDJCQUEyQixHQUFHLEtBQUssQ0FBQztBQUV4QyxTQUFnQixpQ0FBaUM7SUFDL0MsSUFBSSxDQUFDLDJCQUEyQixFQUFFLENBQUM7UUFDakMsSUFBQSxpREFBK0IsRUFBQyxvQkFBVSxDQUFDLENBQUM7UUFDNUMsMkJBQTJCLEdBQUcsSUFBSSxDQUFDO0lBQ3JDLENBQUM7QUFDSCxDQUFDO0FBRUQsU0FBZ0IsMEJBQTBCLENBQUMsUUFBZ0I7SUFDekQsTUFBTSxjQUFjLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQyxTQUFTLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUM7SUFDNUYsTUFBTSxVQUFVLEdBQUcsK0NBQStDLENBQUM7SUFDbkUsSUFBSSxLQUE2QixDQUFDO0lBQ2xDLE9BQU8sQ0FBQyxLQUFLLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ25ELE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2QixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdkIsSUFBSSxLQUFLLEtBQUssR0FBRyxJQUFJLEtBQUssS0FBSyxHQUFHLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUM3QyxTQUFTO1FBQ1gsQ0FBQztRQUNELElBQUksS0FBSyxLQUFLLEdBQUcsRUFBRSxDQUFDO1lBQ2xCLE1BQU0sSUFBSSxLQUFLLENBQUMsd0NBQXdDLEtBQUssdUJBQXVCLENBQUMsQ0FBQztRQUN4RixDQUFDO1FBQ0QsTUFBTSxVQUFVLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDcEUsTUFBTSxjQUFjLEdBQUcsVUFBVSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxVQUFVLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDakgsSUFBSSxjQUFjLElBQUksY0FBYyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ2hELFNBQVM7UUFDWCxDQUFDO1FBQ0QsTUFBTSxJQUFJLEtBQUssQ0FBQyxrQ0FBa0MsS0FBSyx1QkFBdUIsQ0FBQyxDQUFDO0lBQ2xGLENBQUM7QUFDSCxDQUFDO0FBRU0sS0FBSyxVQUFVLGVBQWUsQ0FBQyxPQUFpQyxFQUFFLE1BQWlCO0lBQ3hGLElBQUksT0FBTyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ3BCLE9BQU8sU0FBUyxDQUFDO0lBQ25CLENBQUM7SUFFRCxJQUFJLE9BQU8sQ0FBQyxJQUFJLEtBQUssTUFBTSxFQUFFLENBQUM7UUFDNUIsTUFBTSxLQUFLLEdBQUcsZ0JBQUMsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ2hFLE9BQU8sS0FBSyxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUM7SUFDdkMsQ0FBQztJQUVELElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxZQUFZLEVBQUUsQ0FBQztRQUNsQyxpQ0FBaUMsRUFBRSxDQUFDO1FBQ3BDLDBCQUEwQixDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUM3QyxNQUFNLFFBQVEsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDdEQsTUFBTSxLQUFLLEdBQUcsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQy9CLE9BQU8sS0FBSyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO0lBQ3JELENBQUM7SUFFRCxNQUFNLEtBQUssR0FBRyxNQUFNLElBQUEsMkNBQXlCLEVBQUMsT0FBTyxDQUFDLFVBQVUsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUUxRSxPQUFPLEtBQUssSUFBSSxPQUFPLENBQUMsWUFBWSxDQUFDO0FBQ3ZDLENBQUMifQ==
48
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmluZGluZ3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvZmlnc2hhcmUtdjIvYmluZGluZ3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFNQSxnRUFvQkM7QUFFRCwwQ0FvQkM7QUFoREQsb0RBQXVCO0FBQ3ZCLHNFQUE4RjtBQUs5RixTQUFnQiwwQkFBMEIsQ0FBQyxRQUFnQjtJQUN6RCxNQUFNLGNBQWMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsWUFBWSxDQUFDLENBQUMsQ0FBQztJQUM1RixNQUFNLFVBQVUsR0FBRywrQ0FBK0MsQ0FBQztJQUNuRSxJQUFJLEtBQTZCLENBQUM7SUFDbEMsT0FBTyxDQUFDLEtBQUssR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksSUFBSSxFQUFFLENBQUM7UUFDbkQsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3ZCLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2QixJQUFJLEtBQUssS0FBSyxHQUFHLElBQUksS0FBSyxLQUFLLEdBQUcsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQzdDLFNBQVM7UUFDWCxDQUFDO1FBQ0QsSUFBSSxLQUFLLEtBQUssR0FBRyxFQUFFLENBQUM7WUFDbEIsTUFBTSxJQUFJLEtBQUssQ0FBQyx3Q0FBd0MsS0FBSyx1QkFBdUIsQ0FBQyxDQUFDO1FBQ3hGLENBQUM7UUFDRCxNQUFNLFVBQVUsR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUNwRSxNQUFNLGNBQWMsR0FBRyxVQUFVLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLElBQUksVUFBVSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNqSCxJQUFJLGNBQWMsSUFBSSxjQUFjLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDaEQsU0FBUztRQUNYLENBQUM7UUFDRCxNQUFNLElBQUksS0FBSyxDQUFDLGtDQUFrQyxLQUFLLHVCQUF1QixDQUFDLENBQUM7SUFDbEYsQ0FBQztBQUNILENBQUM7QUFFTSxLQUFLLFVBQVUsZUFBZSxDQUFDLE9BQWlDLEVBQUUsTUFBaUI7SUFDeEYsSUFBSSxPQUFPLElBQUksSUFBSSxFQUFFLENBQUM7UUFDcEIsT0FBTyxTQUFTLENBQUM7SUFDbkIsQ0FBQztJQUVELElBQUksT0FBTyxDQUFDLElBQUksS0FBSyxNQUFNLEVBQUUsQ0FBQztRQUM1QixNQUFNLEtBQUssR0FBRyxnQkFBQyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDaEUsT0FBTyxLQUFLLElBQUksT0FBTyxDQUFDLFlBQVksQ0FBQztJQUN2QyxDQUFDO0lBRUQsSUFBSSxPQUFPLENBQUMsSUFBSSxLQUFLLFlBQVksRUFBRSxDQUFDO1FBQ2xDLDBCQUEwQixDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUM3QyxNQUFNLFFBQVEsR0FBRyxJQUFBLG1DQUFpQixFQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNyRCxNQUFNLEtBQUssR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDL0IsT0FBTyxLQUFLLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7SUFDckQsQ0FBQztJQUVELE1BQU0sS0FBSyxHQUFHLE1BQU0sSUFBQSwyQ0FBeUIsRUFBQyxPQUFPLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBRTFFLE9BQU8sS0FBSyxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUM7QUFDdkMsQ0FBQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/services/figshare-v2/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAkB,MAAM,SAAS,CAAC;AAG1E,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,4BAA4B,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,GAAE,MAAiB,GAAG,kBAAkB,CAchK"}
1
+ {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/services/figshare-v2/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAkB,MAAM,SAAS,CAAC;AAa1E,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,4BAA4B,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,aAAa,GAAE,MAAiB,GAAG,kBAAkB,CAchK"}
@@ -3,9 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createRunContext = createRunContext;
4
4
  const types_1 = require("./types");
5
5
  const config_1 = require("./config");
6
+ function inferRecordOid(record, jobId) {
7
+ const rm = record;
8
+ const fromRecord = String(rm.redboxOid ?? rm.id ?? rm.oid ?? '').trim();
9
+ if (fromRecord) {
10
+ return fromRecord;
11
+ }
12
+ const fromJobId = String(jobId ?? '').match(/^([^:]+):/)?.[1] ?? '';
13
+ return fromJobId.trim();
14
+ }
6
15
  function createRunContext(record, config, jobId, triggerSource = 'manual') {
7
16
  const rm = record;
8
- const recordOid = rm.redboxOid ?? rm.id ?? '';
17
+ const recordOid = inferRecordOid(rm, jobId);
9
18
  const articleId = (0, types_1.getRecordField)(rm, config.record.articleIdPath);
10
19
  const correlationId = jobId || `${recordOid || 'record'}-${Date.now()}`;
11
20
  return {
@@ -18,4 +27,4 @@ function createRunContext(record, config, jobId, triggerSource = 'manual') {
18
27
  triggerSource
19
28
  };
20
29
  }
21
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9maWdzaGFyZS12Mi9jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBSUEsNENBY0M7QUFqQkQsbUNBQTBFO0FBQzFFLHFDQUF3QztBQUV4QyxTQUFnQixnQkFBZ0IsQ0FBQyxNQUFtQixFQUFFLE1BQW9DLEVBQUUsS0FBYyxFQUFFLGdCQUF3QixRQUFRO0lBQzFJLE1BQU0sRUFBRSxHQUFHLE1BQXFCLENBQUM7SUFDakMsTUFBTSxTQUFTLEdBQUcsRUFBRSxDQUFDLFNBQVMsSUFBSSxFQUFFLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQztJQUM5QyxNQUFNLFNBQVMsR0FBRyxJQUFBLHNCQUFjLEVBQUMsRUFBRSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDbEUsTUFBTSxhQUFhLEdBQUcsS0FBSyxJQUFJLEdBQUcsU0FBUyxJQUFJLFFBQVEsSUFBSSxJQUFJLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQztJQUN4RSxPQUFPO1FBQ0wsU0FBUyxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUM7UUFDNUIsT0FBTyxFQUFFLE1BQU0sQ0FBQyxFQUFFLENBQUMsWUFBWSxFQUFFLE9BQU8sSUFBSyxNQUFrQyxDQUFDLFFBQVEsSUFBSSxTQUFTLENBQUM7UUFDdEcsU0FBUyxFQUFFLElBQUEscUJBQVksRUFBQyxNQUFNLENBQUM7UUFDL0IsU0FBUyxFQUFFLFNBQVMsSUFBSSxJQUFJLElBQUksU0FBUyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDO1FBQ2hGLEtBQUs7UUFDTCxhQUFhO1FBQ2IsYUFBYTtLQUNkLENBQUM7QUFDSixDQUFDIn0=
30
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9maWdzaGFyZS12Mi9jb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBY0EsNENBY0M7QUEzQkQsbUNBQTBFO0FBQzFFLHFDQUF3QztBQUV4QyxTQUFTLGNBQWMsQ0FBQyxNQUFtQixFQUFFLEtBQWM7SUFDekQsTUFBTSxFQUFFLEdBQUcsTUFBNEUsQ0FBQztJQUN4RixNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsRUFBRSxDQUFDLFNBQVMsSUFBSSxFQUFFLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDeEUsSUFBSSxVQUFVLEVBQUUsQ0FBQztRQUNmLE9BQU8sVUFBVSxDQUFDO0lBQ3BCLENBQUM7SUFDRCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNwRSxPQUFPLFNBQVMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQUMxQixDQUFDO0FBRUQsU0FBZ0IsZ0JBQWdCLENBQUMsTUFBbUIsRUFBRSxNQUFvQyxFQUFFLEtBQWMsRUFBRSxnQkFBd0IsUUFBUTtJQUMxSSxNQUFNLEVBQUUsR0FBRyxNQUFxQixDQUFDO0lBQ2pDLE1BQU0sU0FBUyxHQUFHLGNBQWMsQ0FBQyxFQUFFLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDNUMsTUFBTSxTQUFTLEdBQUcsSUFBQSxzQkFBYyxFQUFDLEVBQUUsRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ2xFLE1BQU0sYUFBYSxHQUFHLEtBQUssSUFBSSxHQUFHLFNBQVMsSUFBSSxRQUFRLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUM7SUFDeEUsT0FBTztRQUNMLFNBQVMsRUFBRSxNQUFNLENBQUMsU0FBUyxDQUFDO1FBQzVCLE9BQU8sRUFBRSxNQUFNLENBQUMsRUFBRSxDQUFDLFlBQVksRUFBRSxPQUFPLElBQUssTUFBa0MsQ0FBQyxRQUFRLElBQUksU0FBUyxDQUFDO1FBQ3RHLFNBQVMsRUFBRSxJQUFBLHFCQUFZLEVBQUMsTUFBTSxDQUFDO1FBQy9CLFNBQVMsRUFBRSxTQUFTLElBQUksSUFBSSxJQUFJLFNBQVMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQztRQUNoRixLQUFLO1FBQ0wsYUFBYTtRQUNiLGFBQWE7S0FDZCxDQUFDO0FBQ0osQ0FBQyJ9
@@ -1 +1 @@
1
- {"version":3,"file":"TusStorageManagerDataStore.d.ts","sourceRoot":"","sources":["../../src/storage/TusStorageManagerDataStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAU,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAElE,KAAK,SAAS,GAAG,IAAI,CAAC,OAAO,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AActE,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,8BAA8B,CAAC,EAAE,MAAM,CAAC;CACzC,CAAC;AAQF,qBAAa,0BAA2B,SAAQ,SAAS;IACvD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAS;IACxD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;gBAE5C,OAAO,EAAE,UAAU;IAehB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAOrC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjC,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA8CtE,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWtC,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpE,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IA+BtC,aAAa,IAAI,MAAM;IAIvC,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,cAAc;YAWR,eAAe;YAIf,gBAAgB;YAYhB,iBAAiB;YAehB,qBAAqB;IASpC,OAAO,CAAC,mBAAmB;YASb,cAAc;YAqBd,UAAU;YAQV,aAAa;YAeb,YAAY;IAO1B,OAAO,CAAC,eAAe;YAKT,gBAAgB;IAO9B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,cAAc;IA8BtB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;CAGrB"}
1
+ {"version":3,"file":"TusStorageManagerDataStore.d.ts","sourceRoot":"","sources":["../../src/storage/TusStorageManagerDataStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAU,MAAM,aAAa,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAElE,KAAK,SAAS,GAAG,IAAI,CAAC,OAAO,KAAK,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AActE,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,8BAA8B,CAAC,EAAE,MAAM,CAAC;CACzC,CAAC;AAQF,qBAAa,0BAA2B,SAAQ,SAAS;IACvD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAS;IACxD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;gBAE5C,OAAO,EAAE,UAAU;IAehB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUrC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjC,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA6DtE,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAWtC,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAapE,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IA+BtC,aAAa,IAAI,MAAM;IAIvC,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,cAAc;YAWR,eAAe;YAIf,gBAAgB;YAYhB,iBAAiB;YA2BhB,qBAAqB;IASpC,OAAO,CAAC,mBAAmB;YASb,cAAc;YAqBd,UAAU;YAQV,aAAa;YAeb,YAAY;IAO1B,OAAO,CAAC,eAAe;YAKT,gBAAgB;IAO9B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,cAAc;IA8BtB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,YAAY;CAGrB"}