@researchdatabox/redbox-core 5.0.4 → 5.1.0-beta.12573
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/dist/AttachmentStagingIdentity.d.ts +3 -0
- package/dist/AttachmentStagingIdentity.d.ts.map +1 -0
- package/dist/AttachmentStagingIdentity.js +10 -0
- package/dist/CoreController.d.ts +7 -3
- package/dist/CoreController.d.ts.map +1 -1
- package/dist/CoreController.js +85 -3
- package/dist/DatastreamService.d.ts +5 -1
- package/dist/DatastreamService.d.ts.map +1 -1
- package/dist/HarvestRunService.d.ts +4 -3
- package/dist/HarvestRunService.d.ts.map +1 -1
- package/dist/HarvestRunService.js +1 -1
- package/dist/RecordConcurrencyObservability.d.ts +51 -0
- package/dist/RecordConcurrencyObservability.d.ts.map +1 -0
- package/dist/RecordConcurrencyObservability.js +136 -0
- package/dist/RecordEntityTag.d.ts +31 -0
- package/dist/RecordEntityTag.d.ts.map +1 -0
- package/dist/RecordEntityTag.js +101 -0
- package/dist/RecordFormFingerprint.d.ts +7 -0
- package/dist/RecordFormFingerprint.d.ts.map +1 -0
- package/dist/RecordFormFingerprint.js +106 -0
- package/dist/RecordHttpConcurrency.d.ts +60 -0
- package/dist/RecordHttpConcurrency.d.ts.map +1 -0
- package/dist/RecordHttpConcurrency.js +181 -0
- package/dist/RecordSaveResponse.d.ts +219 -0
- package/dist/RecordSaveResponse.d.ts.map +1 -0
- package/dist/RecordSaveResponse.js +639 -0
- package/dist/RecordStorageConcurrency.d.ts +49 -0
- package/dist/RecordStorageConcurrency.d.ts.map +1 -0
- package/dist/RecordStorageConcurrency.js +103 -0
- package/dist/RecordWriteClassification.d.ts +12 -0
- package/dist/RecordWriteClassification.d.ts.map +1 -0
- package/dist/RecordWriteClassification.js +70 -0
- package/dist/RecordsService.d.ts +109 -13
- package/dist/RecordsService.d.ts.map +1 -1
- package/dist/RecordsService.js +44 -1
- package/dist/SearchService.d.ts +2 -1
- package/dist/SearchService.d.ts.map +1 -1
- package/dist/StorageService.d.ts +49 -9
- package/dist/StorageService.d.ts.map +1 -1
- package/dist/StorageService.js +19 -1
- package/dist/StorageServiceResponse.d.ts +22 -1
- package/dist/StorageServiceResponse.d.ts.map +1 -1
- package/dist/StorageServiceResponse.js +22 -4
- package/dist/action-execution/audit.d.ts +41 -0
- package/dist/action-execution/audit.d.ts.map +1 -0
- package/dist/action-execution/audit.js +122 -0
- package/dist/action-execution/executor.d.ts +24 -0
- package/dist/action-execution/executor.d.ts.map +1 -0
- package/dist/action-execution/executor.js +435 -0
- package/dist/action-execution/failure.d.ts +49 -0
- package/dist/action-execution/failure.d.ts.map +1 -0
- package/dist/action-execution/failure.js +129 -0
- package/dist/action-execution/index.d.ts +7 -0
- package/dist/action-execution/index.d.ts.map +1 -0
- package/dist/action-execution/index.js +23 -0
- package/dist/action-execution/legacy-result.d.ts +21 -0
- package/dist/action-execution/legacy-result.d.ts.map +1 -0
- package/dist/action-execution/legacy-result.js +70 -0
- package/dist/action-execution/policy.d.ts +12 -0
- package/dist/action-execution/policy.d.ts.map +1 -0
- package/dist/action-execution/policy.js +138 -0
- package/dist/action-execution/types.d.ts +121 -0
- package/dist/action-execution/types.d.ts.map +1 -0
- package/dist/action-execution/types.js +22 -0
- package/dist/api-routes/groups/branding.d.ts +8 -0
- package/dist/api-routes/groups/branding.d.ts.map +1 -1
- package/dist/api-routes/groups/branding.js +86 -11
- package/dist/api-routes/groups/dashboard-config.d.ts +12 -9
- package/dist/api-routes/groups/dashboard-config.d.ts.map +1 -1
- package/dist/api-routes/groups/dashboard-config.js +136 -73
- package/dist/api-routes/groups/forms.d.ts.map +1 -1
- package/dist/api-routes/groups/forms.js +10 -2
- package/dist/api-routes/groups/record-schemas.d.ts +5 -0
- package/dist/api-routes/groups/record-schemas.d.ts.map +1 -0
- package/dist/api-routes/groups/record-schemas.js +181 -0
- package/dist/api-routes/groups/records.d.ts +1 -0
- package/dist/api-routes/groups/records.d.ts.map +1 -1
- package/dist/api-routes/groups/records.js +141 -26
- package/dist/api-routes/index.d.ts +3 -0
- package/dist/api-routes/index.d.ts.map +1 -1
- package/dist/api-routes/index.js +4 -1
- package/dist/api-routes/openapi.d.ts.map +1 -1
- package/dist/api-routes/openapi.js +7 -5
- package/dist/api-routes/record-schema-openapi.d.ts +26 -0
- package/dist/api-routes/record-schema-openapi.d.ts.map +1 -0
- package/dist/api-routes/record-schema-openapi.js +38 -0
- package/dist/api-routes/record-schema-response.d.ts +40 -0
- package/dist/api-routes/record-schema-response.d.ts.map +1 -0
- package/dist/api-routes/record-schema-response.js +89 -0
- package/dist/api-routes/request-extraction.d.ts.map +1 -1
- package/dist/api-routes/request-extraction.js +10 -8
- package/dist/api-routes/route-factory.d.ts.map +1 -1
- package/dist/api-routes/route-factory.js +2 -1
- package/dist/api-routes/route-registry.d.ts.map +1 -1
- package/dist/api-routes/route-registry.js +3 -1
- package/dist/api-routes/schemas/common.d.ts +36 -0
- package/dist/api-routes/schemas/common.d.ts.map +1 -1
- package/dist/api-routes/schemas/common.js +95 -5
- package/dist/api-routes/schemas/responses.d.ts +1424 -1
- package/dist/api-routes/schemas/responses.d.ts.map +1 -1
- package/dist/api-routes/schemas/responses.js +382 -60
- package/dist/api-routes/types.d.ts +1 -0
- package/dist/api-routes/types.d.ts.map +1 -1
- package/dist/api-routes/validation.d.ts +5 -1
- package/dist/api-routes/validation.d.ts.map +1 -1
- package/dist/api-routes/validation.js +14 -15
- package/dist/bootstrap.d.ts +3 -1
- package/dist/bootstrap.d.ts.map +1 -1
- package/dist/bootstrap.js +58 -41
- package/dist/config/agendaQueue.config.d.ts +3 -0
- package/dist/config/agendaQueue.config.d.ts.map +1 -1
- package/dist/config/agendaQueue.config.js +29 -2
- package/dist/config/branding.config.d.ts +13 -0
- package/dist/config/branding.config.d.ts.map +1 -1
- package/dist/config/branding.config.js +34 -2
- package/dist/config/brandingConfigurationDefaults.config.d.ts +4 -0
- package/dist/config/brandingConfigurationDefaults.config.d.ts.map +1 -1
- package/dist/config/brandingConfigurationDefaults.config.js +42 -3
- package/dist/config/index.d.ts +12 -4
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +7 -4
- package/dist/config/policies.config.d.ts.map +1 -1
- package/dist/config/policies.config.js +37 -23
- package/dist/config/raid.config.d.ts +7 -4
- package/dist/config/raid.config.d.ts.map +1 -1
- package/dist/config/raid.config.js +21 -35
- package/dist/config/record.config.d.ts +3 -0
- package/dist/config/record.config.d.ts.map +1 -1
- package/dist/config/record.config.js +37 -35
- package/dist/config/recordSchema.config.d.ts +68 -0
- package/dist/config/recordSchema.config.d.ts.map +1 -0
- package/dist/config/recordSchema.config.js +173 -0
- package/dist/config/recordValidation.config.d.ts +19 -0
- package/dist/config/recordValidation.config.d.ts.map +1 -0
- package/dist/config/recordValidation.config.js +10 -0
- package/dist/config/recordtype.config.d.ts +32 -9
- package/dist/config/recordtype.config.d.ts.map +1 -1
- package/dist/config/recordtype.config.js +4 -7
- package/dist/config/routes.config.d.ts.map +1 -1
- package/dist/config/routes.config.js +135 -53
- package/dist/config/workflow.config.d.ts +6 -0
- package/dist/config/workflow.config.d.ts.map +1 -1
- package/dist/config/workflow.config.js +1 -1
- package/dist/configmodels/AdminSidebarConfig.d.ts.map +1 -1
- package/dist/configmodels/AdminSidebarConfig.js +4 -2
- package/dist/configmodels/ConfigModels.d.ts +1 -1
- package/dist/configmodels/ConfigModels.d.ts.map +1 -1
- package/dist/configmodels/ConfigModels.js +26 -9
- package/dist/configmodels/DashboardFieldCatalogue.d.ts +67 -0
- package/dist/configmodels/DashboardFieldCatalogue.d.ts.map +1 -0
- package/dist/configmodels/DashboardFieldCatalogue.js +174 -0
- package/dist/configmodels/DashboardSettings.d.ts +191 -0
- package/dist/configmodels/DashboardSettings.d.ts.map +1 -0
- package/dist/configmodels/DashboardSettings.js +705 -0
- package/dist/configmodels/FigsharePublishing.d.ts +1 -1
- package/dist/configmodels/OniPublishing.d.ts +205 -0
- package/dist/configmodels/OniPublishing.d.ts.map +1 -0
- package/dist/configmodels/OniPublishing.js +335 -0
- package/dist/configmodels/RaidPublishing.d.ts +97 -0
- package/dist/configmodels/RaidPublishing.d.ts.map +1 -0
- package/dist/configmodels/RaidPublishing.js +35 -0
- package/dist/configmodels/WebAnalytics.d.ts +55 -0
- package/dist/configmodels/WebAnalytics.d.ts.map +1 -0
- package/dist/configmodels/WebAnalytics.js +61 -0
- package/dist/controllers/AppConfigController.d.ts.map +1 -1
- package/dist/controllers/AppConfigController.js +4 -1
- package/dist/controllers/BrandingAppController.d.ts +29 -7
- package/dist/controllers/BrandingAppController.d.ts.map +1 -1
- package/dist/controllers/BrandingAppController.js +265 -69
- package/dist/controllers/BrandingController.d.ts +24 -1
- package/dist/controllers/BrandingController.d.ts.map +1 -1
- package/dist/controllers/BrandingController.js +173 -43
- package/dist/controllers/BrandingControllerSupport.d.ts +20 -0
- package/dist/controllers/BrandingControllerSupport.d.ts.map +1 -0
- package/dist/controllers/BrandingControllerSupport.js +80 -0
- package/dist/controllers/DashboardConfigController.d.ts +6 -2
- package/dist/controllers/DashboardConfigController.d.ts.map +1 -1
- package/dist/controllers/DashboardConfigController.js +18 -4
- package/dist/controllers/DynamicAssetController.d.ts +7 -5
- package/dist/controllers/DynamicAssetController.d.ts.map +1 -1
- package/dist/controllers/DynamicAssetController.js +21 -12
- package/dist/controllers/RecordController.d.ts +45 -4
- package/dist/controllers/RecordController.d.ts.map +1 -1
- package/dist/controllers/RecordController.js +778 -345
- package/dist/controllers/index.d.ts.map +1 -1
- package/dist/controllers/index.js +4 -1
- package/dist/controllers/webservice/AdminController.d.ts.map +1 -1
- package/dist/controllers/webservice/AdminController.js +4 -3
- package/dist/controllers/webservice/BrandingController.d.ts +26 -1
- package/dist/controllers/webservice/BrandingController.d.ts.map +1 -1
- package/dist/controllers/webservice/BrandingController.js +292 -116
- package/dist/controllers/webservice/DashboardConfigController.d.ts +25 -17
- package/dist/controllers/webservice/DashboardConfigController.d.ts.map +1 -1
- package/dist/controllers/webservice/DashboardConfigController.js +90 -205
- package/dist/controllers/webservice/FormManagementController.d.ts.map +1 -1
- package/dist/controllers/webservice/FormManagementController.js +37 -3
- package/dist/controllers/webservice/RecordController.d.ts +15 -1
- package/dist/controllers/webservice/RecordController.d.ts.map +1 -1
- package/dist/controllers/webservice/RecordController.js +647 -267
- package/dist/controllers/webservice/RecordSchemaController.d.ts +32 -0
- package/dist/controllers/webservice/RecordSchemaController.d.ts.map +1 -0
- package/dist/controllers/webservice/RecordSchemaController.js +356 -0
- package/dist/controllers/webservice/RecordTypeController.d.ts +6 -1
- package/dist/controllers/webservice/RecordTypeController.d.ts.map +1 -1
- package/dist/controllers/webservice/RecordTypeController.js +21 -3
- package/dist/controllers/webservice/SearchController.d.ts.map +1 -1
- package/dist/controllers/webservice/SearchController.js +7 -3
- package/dist/hooks/defineRedboxHook.d.ts +3 -0
- package/dist/hooks/defineRedboxHook.d.ts.map +1 -1
- package/dist/hooks/defineRedboxHook.js +4 -1
- package/dist/index.d.ts +50 -23
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +90 -2
- package/dist/loader/bootstrapShimRuntime.d.ts +1 -1
- package/dist/loader/bootstrapShimRuntime.d.ts.map +1 -1
- package/dist/loader/bootstrapShimRuntime.js +20 -12
- package/dist/loader/index.d.ts +9 -0
- package/dist/loader/index.d.ts.map +1 -1
- package/dist/loader/index.js +93 -4
- package/dist/model/BrandingTypeface.d.ts +70 -0
- package/dist/model/BrandingTypeface.d.ts.map +1 -0
- package/dist/model/BrandingTypeface.js +116 -0
- package/dist/model/BuildResponse.d.ts +25 -11
- package/dist/model/BuildResponse.d.ts.map +1 -1
- package/dist/model/BuildResponse.js +4 -3
- package/dist/model/DashboardTypeResponseModel.d.ts +6 -0
- package/dist/model/DashboardTypeResponseModel.d.ts.map +1 -1
- package/dist/model/DashboardTypeResponseModel.js +7 -1
- package/dist/model/DashboardViewResponseModel.d.ts +5 -1
- package/dist/model/DashboardViewResponseModel.d.ts.map +1 -1
- package/dist/model/DashboardViewResponseModel.js +6 -3
- package/dist/model/RBValidationError.d.ts +17 -0
- package/dist/model/RBValidationError.d.ts.map +1 -1
- package/dist/model/RBValidationError.js +37 -1
- package/dist/model/RecordTypeResponseModel.d.ts +12 -4
- package/dist/model/RecordTypeResponseModel.d.ts.map +1 -1
- package/dist/model/RecordTypeResponseModel.js +11 -2
- package/dist/model/index.d.ts +5 -1
- package/dist/model/index.d.ts.map +1 -1
- package/dist/model/index.js +5 -2
- package/dist/model/record-contract.d.ts +42 -0
- package/dist/model/record-contract.d.ts.map +1 -0
- package/dist/model/record-contract.js +3 -0
- package/dist/model/storage/BrandingModel.d.ts +7 -0
- package/dist/model/storage/BrandingModel.d.ts.map +1 -1
- package/dist/model/storage/BrandingModel.js +7 -1
- package/dist/model/storage/DeletedRecordModel.d.ts +35 -0
- package/dist/model/storage/DeletedRecordModel.d.ts.map +1 -1
- package/dist/model/storage/DeletedRecordModel.js +62 -1
- package/dist/model/storage/IntegrationAuditModel.d.ts +16 -2
- package/dist/model/storage/IntegrationAuditModel.d.ts.map +1 -1
- package/dist/model/storage/IntegrationAuditModel.js +15 -1
- package/dist/model/storage/RecordAuditModel.d.ts +11 -1
- package/dist/model/storage/RecordAuditModel.d.ts.map +1 -1
- package/dist/model/storage/RecordAuditModel.js +8 -2
- package/dist/model/storage/RecordModel.d.ts +8 -2
- package/dist/model/storage/RecordModel.d.ts.map +1 -1
- package/dist/model/storage/RecordTypeModel.d.ts +6 -0
- package/dist/model/storage/RecordTypeModel.d.ts.map +1 -1
- package/dist/model/storage/RecordTypeModel.js +4 -1
- package/dist/model/storage/index.d.ts +12 -10
- package/dist/model/storage/index.d.ts.map +1 -1
- package/dist/model/storage/index.js +24 -2
- package/dist/model/storage/record-schema.d.ts +115 -0
- package/dist/model/storage/record-schema.d.ts.map +1 -0
- package/dist/model/storage/record-schema.js +3 -0
- package/dist/policies/checkAuth.d.ts +2 -6
- package/dist/policies/checkAuth.d.ts.map +1 -1
- package/dist/policies/checkAuth.js +32 -9
- package/dist/policies/contentSecurityPolicy.d.ts.map +1 -1
- package/dist/policies/contentSecurityPolicy.js +85 -2
- package/dist/policies/index.d.ts +3 -2
- package/dist/policies/index.d.ts.map +1 -1
- package/dist/policies/index.js +4 -2
- package/dist/policies/validateApiContractRequest.d.ts.map +1 -1
- package/dist/policies/validateApiContractRequest.js +49 -11
- package/dist/record-contract/ajv-error-mapper.d.ts +34 -0
- package/dist/record-contract/ajv-error-mapper.d.ts.map +1 -0
- package/dist/record-contract/ajv-error-mapper.js +153 -0
- package/dist/record-contract/canonical-json.d.ts +20 -0
- package/dist/record-contract/canonical-json.d.ts.map +1 -0
- package/dist/record-contract/canonical-json.js +126 -0
- package/dist/record-contract/codes.d.ts +36 -0
- package/dist/record-contract/codes.d.ts.map +1 -0
- package/dist/record-contract/codes.js +38 -0
- package/dist/record-contract/contributor-registry.d.ts +76 -0
- package/dist/record-contract/contributor-registry.d.ts.map +1 -0
- package/dist/record-contract/contributor-registry.js +126 -0
- package/dist/record-contract/core-contributors.d.ts +44 -0
- package/dist/record-contract/core-contributors.d.ts.map +1 -0
- package/dist/record-contract/core-contributors.js +395 -0
- package/dist/record-contract/deep-freeze.d.ts +3 -0
- package/dist/record-contract/deep-freeze.d.ts.map +1 -0
- package/dist/record-contract/deep-freeze.js +23 -0
- package/dist/record-contract/index.d.ts +13 -0
- package/dist/record-contract/index.d.ts.map +1 -0
- package/dist/record-contract/index.js +29 -0
- package/dist/record-contract/json-pointer.d.ts +20 -0
- package/dist/record-contract/json-pointer.d.ts.map +1 -0
- package/dist/record-contract/json-pointer.js +70 -0
- package/dist/record-contract/json-schema-renderer.d.ts +51 -0
- package/dist/record-contract/json-schema-renderer.d.ts.map +1 -0
- package/dist/record-contract/json-schema-renderer.js +450 -0
- package/dist/record-contract/record-contract-compiler.d.ts +42 -0
- package/dist/record-contract/record-contract-compiler.d.ts.map +1 -0
- package/dist/record-contract/record-contract-compiler.js +775 -0
- package/dist/record-contract/record-contract-context.d.ts +91 -0
- package/dist/record-contract/record-contract-context.d.ts.map +1 -0
- package/dist/record-contract/record-contract-context.js +39 -0
- package/dist/record-contract/record-json-schema-artifact.d.ts +74 -0
- package/dist/record-contract/record-json-schema-artifact.d.ts.map +1 -0
- package/dist/record-contract/record-json-schema-artifact.js +309 -0
- package/dist/record-contract/record-json-schema-etag.d.ts +15 -0
- package/dist/record-contract/record-json-schema-etag.d.ts.map +1 -0
- package/dist/record-contract/record-json-schema-etag.js +41 -0
- package/dist/record-contract/types.d.ts +151 -0
- package/dist/record-contract/types.d.ts.map +1 -0
- package/dist/record-contract/types.js +6 -0
- package/dist/services/AppConfigService.d.ts +6 -0
- package/dist/services/AppConfigService.d.ts.map +1 -1
- package/dist/services/AppConfigService.js +23 -1
- package/dist/services/AttachmentMetadataService.d.ts +58 -0
- package/dist/services/AttachmentMetadataService.d.ts.map +1 -1
- package/dist/services/AttachmentMetadataService.js +643 -8
- package/dist/services/BrandingLogoService.d.ts +6 -1
- package/dist/services/BrandingLogoService.d.ts.map +1 -1
- package/dist/services/BrandingLogoService.js +77 -9
- package/dist/services/BrandingService.d.ts +171 -9
- package/dist/services/BrandingService.d.ts.map +1 -1
- package/dist/services/BrandingService.js +572 -68
- package/dist/services/BrandingThemeCssService.d.ts +17 -1
- package/dist/services/BrandingThemeCssService.d.ts.map +1 -1
- package/dist/services/BrandingThemeCssService.js +71 -9
- package/dist/services/BrandingTypefaceService.d.ts +74 -0
- package/dist/services/BrandingTypefaceService.d.ts.map +1 -0
- package/dist/services/BrandingTypefaceService.js +359 -0
- package/dist/services/BrandingWoff2Inspector.d.ts +17 -0
- package/dist/services/BrandingWoff2Inspector.d.ts.map +1 -0
- package/dist/services/BrandingWoff2Inspector.js +402 -0
- package/dist/services/DashboardConfigService.d.ts +214 -54
- package/dist/services/DashboardConfigService.d.ts.map +1 -1
- package/dist/services/DashboardConfigService.js +829 -261
- package/dist/services/DashboardLegacyConversion.d.ts +82 -0
- package/dist/services/DashboardLegacyConversion.d.ts.map +1 -0
- package/dist/services/DashboardLegacyConversion.js +427 -0
- package/dist/services/DashboardTypesService.d.ts +15 -4
- package/dist/services/DashboardTypesService.d.ts.map +1 -1
- package/dist/services/DashboardTypesService.js +72 -139
- package/dist/services/DoiService.d.ts +1 -1
- package/dist/services/DoiService.d.ts.map +1 -1
- package/dist/services/DoiService.js +71 -45
- package/dist/services/FigshareService.d.ts.map +1 -1
- package/dist/services/FigshareService.js +8 -7
- package/dist/services/FormRecordConsistencyService.d.ts +8 -23
- package/dist/services/FormRecordConsistencyService.d.ts.map +1 -1
- package/dist/services/FormRecordConsistencyService.js +54 -70
- package/dist/services/FormsService.d.ts +91 -2
- package/dist/services/FormsService.d.ts.map +1 -1
- package/dist/services/FormsService.js +324 -64
- package/dist/services/HarvestRunService.d.ts +6 -3
- package/dist/services/HarvestRunService.d.ts.map +1 -1
- package/dist/services/HarvestRunService.js +161 -97
- package/dist/services/I18nEntriesService.d.ts +11 -11
- package/dist/services/I18nEntriesService.d.ts.map +1 -1
- package/dist/services/I18nEntriesService.js +71 -48
- package/dist/services/OniService.d.ts +19 -62
- package/dist/services/OniService.d.ts.map +1 -1
- package/dist/services/OniService.js +223 -691
- package/dist/services/RDMPService.d.ts +1 -1
- package/dist/services/RDMPService.d.ts.map +1 -1
- package/dist/services/RDMPService.js +5 -5
- package/dist/services/RaidService.d.ts +19 -61
- package/dist/services/RaidService.d.ts.map +1 -1
- package/dist/services/RaidService.js +191 -530
- package/dist/services/RecordSchemaService.d.ts +440 -0
- package/dist/services/RecordSchemaService.d.ts.map +1 -0
- package/dist/services/RecordSchemaService.js +3061 -0
- package/dist/services/RecordTypesService.d.ts +29 -0
- package/dist/services/RecordTypesService.d.ts.map +1 -1
- package/dist/services/RecordTypesService.js +106 -11
- package/dist/services/RecordValidationService.d.ts +340 -0
- package/dist/services/RecordValidationService.d.ts.map +1 -0
- package/dist/services/RecordValidationService.js +1898 -0
- package/dist/services/RecordsService.d.ts +317 -26
- package/dist/services/RecordsService.d.ts.map +1 -1
- package/dist/services/RecordsService.js +5145 -765
- package/dist/services/SolrSearchService.d.ts +1 -1
- package/dist/services/SolrSearchService.d.ts.map +1 -1
- package/dist/services/SolrSearchService.js +42 -12
- package/dist/services/StandardDatastreamService.d.ts +4 -0
- package/dist/services/StandardDatastreamService.d.ts.map +1 -1
- package/dist/services/StandardDatastreamService.js +106 -44
- package/dist/services/TriggerService.d.ts.map +1 -1
- package/dist/services/TriggerService.js +54 -30
- package/dist/services/UsersService.d.ts +2 -1
- package/dist/services/UsersService.d.ts.map +1 -1
- package/dist/services/UsersService.js +364 -283
- package/dist/services/VocabularyService.d.ts +2 -0
- package/dist/services/VocabularyService.d.ts.map +1 -1
- package/dist/services/VocabularyService.js +61 -2
- package/dist/services/WorkflowStepsService.d.ts +11 -0
- package/dist/services/WorkflowStepsService.d.ts.map +1 -1
- package/dist/services/WorkflowStepsService.js +32 -3
- package/dist/services/WorkspaceService.d.ts +2 -2
- package/dist/services/WorkspaceService.d.ts.map +1 -1
- package/dist/services/WorkspaceService.js +5 -5
- package/dist/services/doi-v2/bindings.d.ts.map +1 -1
- package/dist/services/doi-v2/bindings.js +3 -20
- package/dist/services/doi-v2/config.d.ts +1 -0
- package/dist/services/doi-v2/config.d.ts.map +1 -1
- package/dist/services/doi-v2/config.js +13 -5
- package/dist/services/doi-v2/runtime.d.ts.map +1 -1
- package/dist/services/doi-v2/runtime.js +14 -54
- package/dist/services/figshare-v2/bindings.d.ts.map +1 -1
- package/dist/services/figshare-v2/bindings.js +3 -20
- package/dist/services/figshare-v2/runtime.d.ts.map +1 -1
- package/dist/services/figshare-v2/runtime.js +11 -58
- package/dist/services/figshare-v2/worker.d.ts.map +1 -1
- package/dist/services/figshare-v2/worker.js +254 -74
- package/dist/services/form-record-access-user.d.ts +3 -0
- package/dist/services/form-record-access-user.d.ts.map +1 -0
- package/dist/services/form-record-access-user.js +23 -0
- package/dist/services/index.d.ts +9 -0
- package/dist/services/index.d.ts.map +1 -1
- package/dist/services/index.js +45 -3
- package/dist/services/integration-v2/bindings.d.ts +3 -0
- package/dist/services/integration-v2/bindings.d.ts.map +1 -0
- package/dist/services/integration-v2/bindings.js +91 -0
- package/dist/services/integration-v2/runtime.d.ts +3 -0
- package/dist/services/integration-v2/runtime.d.ts.map +1 -0
- package/dist/services/integration-v2/runtime.js +50 -0
- package/dist/services/internal-record-schema-authorization.d.ts +8 -0
- package/dist/services/internal-record-schema-authorization.d.ts.map +1 -0
- package/dist/services/internal-record-schema-authorization.js +16 -0
- package/dist/services/oni-v2/audit.d.ts +19 -0
- package/dist/services/oni-v2/audit.d.ts.map +1 -0
- package/dist/services/oni-v2/audit.js +50 -0
- package/dist/services/oni-v2/bindings.d.ts +7 -0
- package/dist/services/oni-v2/bindings.d.ts.map +1 -0
- package/dist/services/oni-v2/bindings.js +31 -0
- package/dist/services/oni-v2/config.d.ts +12 -0
- package/dist/services/oni-v2/config.d.ts.map +1 -0
- package/dist/services/oni-v2/config.js +134 -0
- package/dist/services/oni-v2/context.d.ts +3 -0
- package/dist/services/oni-v2/context.d.ts.map +1 -0
- package/dist/services/oni-v2/context.js +17 -0
- package/dist/services/oni-v2/crate.d.ts +17 -0
- package/dist/services/oni-v2/crate.d.ts.map +1 -0
- package/dist/services/oni-v2/crate.js +504 -0
- package/dist/services/oni-v2/flydriveOcflStore.d.ts +69 -0
- package/dist/services/oni-v2/flydriveOcflStore.d.ts.map +1 -0
- package/dist/services/oni-v2/flydriveOcflStore.js +325 -0
- package/dist/services/oni-v2/ingestion.d.ts +37 -0
- package/dist/services/oni-v2/ingestion.d.ts.map +1 -0
- package/dist/services/oni-v2/ingestion.js +91 -0
- package/dist/services/oni-v2/mapping.d.ts +17 -0
- package/dist/services/oni-v2/mapping.d.ts.map +1 -0
- package/dist/services/oni-v2/mapping.js +137 -0
- package/dist/services/oni-v2/repository.d.ts +9 -0
- package/dist/services/oni-v2/repository.d.ts.map +1 -0
- package/dist/services/oni-v2/repository.js +180 -0
- package/dist/services/oni-v2/runtime.d.ts +23 -0
- package/dist/services/oni-v2/runtime.d.ts.map +1 -0
- package/dist/services/oni-v2/runtime.js +121 -0
- package/dist/services/oni-v2/templating.d.ts +11 -0
- package/dist/services/oni-v2/templating.d.ts.map +1 -0
- package/dist/services/oni-v2/templating.js +27 -0
- package/dist/services/oni-v2/types.d.ts +100 -0
- package/dist/services/oni-v2/types.d.ts.map +1 -0
- package/dist/services/oni-v2/types.js +3 -0
- package/dist/services/raid-v2/audit.d.ts +10 -0
- package/dist/services/raid-v2/audit.d.ts.map +1 -0
- package/dist/services/raid-v2/audit.js +29 -0
- package/dist/services/raid-v2/errors.d.ts +85 -0
- package/dist/services/raid-v2/errors.d.ts.map +1 -0
- package/dist/services/raid-v2/errors.js +36 -0
- package/dist/services/raid-v2/http.d.ts +4 -0
- package/dist/services/raid-v2/http.d.ts.map +1 -0
- package/dist/services/raid-v2/http.js +84 -0
- package/dist/services/raid-v2/logger.d.ts +8 -0
- package/dist/services/raid-v2/logger.d.ts.map +1 -0
- package/dist/services/raid-v2/logger.js +30 -0
- package/dist/services/raid-v2/mapping.d.ts +9 -0
- package/dist/services/raid-v2/mapping.d.ts.map +1 -0
- package/dist/services/raid-v2/mapping.js +168 -0
- package/dist/services/raid-v2/runtime.d.ts +5 -0
- package/dist/services/raid-v2/runtime.d.ts.map +1 -0
- package/dist/services/raid-v2/runtime.js +135 -0
- package/dist/services/raid-v2/tags.d.ts +11 -0
- package/dist/services/raid-v2/tags.d.ts.map +1 -0
- package/dist/services/raid-v2/tags.js +12 -0
- package/dist/services/raid-v2/types.d.ts +66 -0
- package/dist/services/raid-v2/types.d.ts.map +1 -0
- package/dist/services/raid-v2/types.js +3 -0
- package/dist/services/record-hooks/coordinator.d.ts +64 -0
- package/dist/services/record-hooks/coordinator.d.ts.map +1 -0
- package/dist/services/record-hooks/coordinator.js +276 -0
- package/dist/visitor/client.visitor.d.ts +6 -0
- package/dist/visitor/client.visitor.d.ts.map +1 -1
- package/dist/visitor/client.visitor.js +59 -14
- package/dist/visitor/construct.visitor.d.ts +27 -1
- package/dist/visitor/construct.visitor.d.ts.map +1 -1
- package/dist/visitor/construct.visitor.js +265 -177
- package/dist/visitor/context-variables.visitor.d.ts +3 -1
- package/dist/visitor/context-variables.visitor.d.ts.map +1 -1
- package/dist/visitor/context-variables.visitor.js +15 -1
- package/dist/visitor/data-value.visitor.d.ts +6 -0
- package/dist/visitor/data-value.visitor.d.ts.map +1 -1
- package/dist/visitor/data-value.visitor.js +10 -1
- package/dist/visitor/json-type-def.visitor.d.ts +6 -0
- package/dist/visitor/json-type-def.visitor.d.ts.map +1 -1
- package/dist/visitor/json-type-def.visitor.js +10 -1
- package/dist/visitor/migrate-config-v4-v5.visitor.d.ts +11 -0
- package/dist/visitor/migrate-config-v4-v5.visitor.d.ts.map +1 -1
- package/dist/visitor/migrate-config-v4-v5.visitor.js +228 -133
- package/dist/visitor/related-object-data-inline.visitor.d.ts +31 -0
- package/dist/visitor/related-object-data-inline.visitor.d.ts.map +1 -0
- package/dist/visitor/related-object-data-inline.visitor.js +96 -0
- package/dist/visitor/template.visitor.d.ts +17 -2
- package/dist/visitor/template.visitor.d.ts.map +1 -1
- package/dist/visitor/template.visitor.js +60 -22
- package/dist/visitor/validator.visitor.d.ts +49 -7
- package/dist/visitor/validator.visitor.d.ts.map +1 -1
- package/dist/visitor/validator.visitor.js +275 -178
- package/dist/waterline-models/AttachmentMetadata.d.ts +22 -0
- package/dist/waterline-models/AttachmentMetadata.d.ts.map +1 -1
- package/dist/waterline-models/AttachmentMetadata.js +147 -3
- package/dist/waterline-models/BrandingConfig.d.ts +7 -0
- package/dist/waterline-models/BrandingConfig.d.ts.map +1 -1
- package/dist/waterline-models/BrandingConfig.js +16 -1
- package/dist/waterline-models/BrandingConfigHistory.d.ts +11 -2
- package/dist/waterline-models/BrandingConfigHistory.d.ts.map +1 -1
- package/dist/waterline-models/BrandingConfigHistory.js +21 -1
- package/dist/waterline-models/DashboardConfiguration.d.ts +29 -0
- package/dist/waterline-models/DashboardConfiguration.d.ts.map +1 -0
- package/dist/waterline-models/DashboardConfiguration.js +52 -0
- package/dist/waterline-models/RecordType.d.ts +9 -0
- package/dist/waterline-models/RecordType.d.ts.map +1 -1
- package/dist/waterline-models/RecordType.js +16 -1
- package/dist/waterline-models/User.d.ts.map +1 -1
- package/dist/waterline-models/User.js +10 -15
- package/dist/waterline-models/index.d.ts +2 -0
- package/dist/waterline-models/index.d.ts.map +1 -1
- package/dist/waterline-models/index.js +4 -1
- package/package.json +59 -45
- package/dist/config/datapubs.config.d.ts +0 -72
- package/dist/config/datapubs.config.d.ts.map +0 -1
- package/dist/config/datapubs.config.js +0 -74
|
@@ -1,14 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Services = void 0;
|
|
4
|
+
const node_crypto_1 = require("node:crypto");
|
|
4
5
|
const CoreService_1 = require("../CoreService");
|
|
6
|
+
const AttachmentStagingIdentity_1 = require("../AttachmentStagingIdentity");
|
|
5
7
|
var Services;
|
|
6
8
|
(function (Services) {
|
|
9
|
+
const STAGING_COORDINATOR_OID = '__global_attachment_staging__';
|
|
10
|
+
const STAGING_COORDINATOR_LEASE_MS = 5 * 60 * 1000;
|
|
7
11
|
class AttachmentMetadataService extends CoreService_1.Services.Core.Service {
|
|
8
12
|
_exportedMethods = [
|
|
9
13
|
'upsert',
|
|
10
14
|
'findByOid',
|
|
15
|
+
'findUnresolvedByOid',
|
|
16
|
+
'findUnresolvedByStagingFileId',
|
|
11
17
|
'findOneByStorageKey',
|
|
18
|
+
'prepareMutations',
|
|
19
|
+
'markMutation',
|
|
20
|
+
'hasCleanupClaim',
|
|
21
|
+
'claimExpiredStagingCleanup',
|
|
22
|
+
'beginStagingCleanup',
|
|
23
|
+
'authorizeStagingCleanup',
|
|
24
|
+
'releaseStagingCleanup',
|
|
25
|
+
'completeStagingCleanup',
|
|
26
|
+
'recoverStagingCleanup',
|
|
27
|
+
'rebindOid',
|
|
28
|
+
'markDeleted',
|
|
12
29
|
'deleteByStorageKey',
|
|
13
30
|
'recordAccess',
|
|
14
31
|
];
|
|
@@ -21,10 +38,26 @@ var Services;
|
|
|
21
38
|
const payload = this.normalizeMetadataRow(row);
|
|
22
39
|
const oid = String(payload.oid ?? '').trim();
|
|
23
40
|
const fileId = String(payload.fileId ?? '').trim();
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
41
|
+
let existing = (await AttachmentMetadata.findOne({ storageKey }));
|
|
42
|
+
// A journal key may be upgraded from the original attachment-only form
|
|
43
|
+
// to the mutation-specific form. Reuse that row when its mutation
|
|
44
|
+
// identity is otherwise unchanged instead of leaving an unresolved
|
|
45
|
+
// legacy row behind on the next retry.
|
|
46
|
+
if (!existing && payload.isJournal === true && payload.attachmentId && payload.generation && payload.mutationFileId) {
|
|
47
|
+
existing = (await AttachmentMetadata.findOne({
|
|
48
|
+
oid,
|
|
49
|
+
attachmentId: payload.attachmentId,
|
|
50
|
+
generation: payload.generation,
|
|
51
|
+
mutationFileId: payload.mutationFileId,
|
|
52
|
+
isJournal: true,
|
|
53
|
+
}));
|
|
54
|
+
}
|
|
55
|
+
// A physical row may retain its identity if a storage prefix changes,
|
|
56
|
+
// but journal rows must never claim the physical {oid,fileId} row.
|
|
57
|
+
if (!existing && payload.isJournal !== true && oid && fileId) {
|
|
58
|
+
const sameFileRows = (await AttachmentMetadata.find({ oid, fileId }));
|
|
59
|
+
existing = (sameFileRows ?? []).find(candidate => candidate.isJournal !== true) ?? null;
|
|
60
|
+
}
|
|
28
61
|
if (existing?.id) {
|
|
29
62
|
await AttachmentMetadata.updateOne({ id: existing.id }).set(payload);
|
|
30
63
|
return;
|
|
@@ -36,14 +69,377 @@ var Services;
|
|
|
36
69
|
if (!normalizedOid) {
|
|
37
70
|
return [];
|
|
38
71
|
}
|
|
39
|
-
|
|
72
|
+
const rows = (await AttachmentMetadata.find({ oid: normalizedOid }).sort([
|
|
73
|
+
{ createdAt: 'ASC' },
|
|
74
|
+
]));
|
|
75
|
+
// Journal rows are retained for reconciliation, but prepared/pending
|
|
76
|
+
// work is not a confirmed physical attachment and must not appear in
|
|
77
|
+
// the listing API. Legacy rows without a mutationState remain visible.
|
|
78
|
+
return rows.filter(row => {
|
|
79
|
+
const mutationState = String(row.mutationState ?? '').trim();
|
|
80
|
+
return (row.isJournal !== true &&
|
|
81
|
+
row.operation !== 'delete' &&
|
|
82
|
+
mutationState !== 'cancelled' &&
|
|
83
|
+
(!mutationState || mutationState === 'applied'));
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
async findUnresolvedByOid(oid) {
|
|
87
|
+
const normalizedOid = String(oid ?? '').trim();
|
|
88
|
+
if (!normalizedOid) {
|
|
89
|
+
return [];
|
|
90
|
+
}
|
|
91
|
+
const rows = (await AttachmentMetadata.find({ oid: normalizedOid }).sort([
|
|
92
|
+
{ createdAt: 'ASC' },
|
|
93
|
+
]));
|
|
94
|
+
return rows.filter(row => row.isJournal === true &&
|
|
95
|
+
(row.mutationState === 'prepared' ||
|
|
96
|
+
row.mutationState === 'pending' ||
|
|
97
|
+
row.mutationState === 'incomplete' ||
|
|
98
|
+
row.mutationState === 'unknown'));
|
|
99
|
+
}
|
|
100
|
+
async findUnresolvedByStagingFileId(fileId) {
|
|
101
|
+
const normalizedFileId = (0, AttachmentStagingIdentity_1.normalizeAttachmentStagingFileId)(fileId);
|
|
102
|
+
if (!normalizedFileId)
|
|
103
|
+
return [];
|
|
104
|
+
return (await AttachmentMetadata.find({
|
|
105
|
+
mutationFileId: normalizedFileId,
|
|
106
|
+
isJournal: true,
|
|
107
|
+
mutationState: { in: ['prepared', 'pending', 'incomplete', 'unknown'] },
|
|
108
|
+
}));
|
|
109
|
+
}
|
|
110
|
+
async prepareMutations(rows) {
|
|
111
|
+
for (const row of rows) {
|
|
112
|
+
const attachmentId = String(row.attachmentId ?? '').trim();
|
|
113
|
+
const generation = String(row.generation ?? '').trim();
|
|
114
|
+
const oid = String(row.oid ?? '').trim();
|
|
115
|
+
const mutationFileId = (0, AttachmentStagingIdentity_1.normalizeAttachmentStagingFileId)(row.mutationFileId ?? row.fileId);
|
|
116
|
+
if (!oid || !attachmentId || !generation || !mutationFileId) {
|
|
117
|
+
throw new Error('Attachment mutation preparation requires bounded journal identity.');
|
|
118
|
+
}
|
|
119
|
+
if (await this.hasCleanupClaim(oid, mutationFileId)) {
|
|
120
|
+
throw new Error('Attachment staging cleanup already owns this mutation.');
|
|
121
|
+
}
|
|
122
|
+
const token = (0, node_crypto_1.randomUUID)();
|
|
123
|
+
if (!(await this.acquireStagingCoordinator(oid, mutationFileId, attachmentId, generation, token, 'staging-preparing'))) {
|
|
124
|
+
throw new Error('Attachment staging identity is already reserved.');
|
|
125
|
+
}
|
|
126
|
+
try {
|
|
127
|
+
// The coordinator is held until the prepared row is durable. Cleanup
|
|
128
|
+
// must acquire the same row before its reference scan, so it cannot
|
|
129
|
+
// pass that scan and remove the blob during this preparation window.
|
|
130
|
+
if (await this.hasCleanupClaim(oid, mutationFileId)) {
|
|
131
|
+
throw new Error('Attachment staging cleanup already owns this mutation.');
|
|
132
|
+
}
|
|
133
|
+
const storageKey = String(row.storageKey ?? '').trim();
|
|
134
|
+
const existing = (await AttachmentMetadata.findOne({ storageKey }));
|
|
135
|
+
if (existing) {
|
|
136
|
+
throw new Error('Attachment mutation generation already exists.');
|
|
137
|
+
}
|
|
138
|
+
if (!(await this.acquireStagingCoordinator(oid, mutationFileId, attachmentId, generation, token, 'staging-preparing'))) {
|
|
139
|
+
throw new Error('Attachment staging preparation lease was lost.');
|
|
140
|
+
}
|
|
141
|
+
await this.upsert({
|
|
142
|
+
...row,
|
|
143
|
+
fileId: this.journalFileId(attachmentId, generation, mutationFileId),
|
|
144
|
+
mutationFileId,
|
|
145
|
+
isJournal: true,
|
|
146
|
+
mutationState: 'prepared',
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
finally {
|
|
150
|
+
if (!(await this.releaseStagingCoordinator(mutationFileId, attachmentId, generation, token, 'staging-preparing'))) {
|
|
151
|
+
throw new Error('Attachment staging preparation ownership could not be released safely.');
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
async markMutation(oid, attachmentId, generation, mutationState, codeOrMutationFileId, legacyMutationFileId) {
|
|
157
|
+
const mutationFileId = legacyMutationFileId ??
|
|
158
|
+
(mutationState === 'pending' || mutationState === 'applied' ? codeOrMutationFileId : undefined);
|
|
159
|
+
const lastSafeErrorCode = legacyMutationFileId === undefined && mutationFileId !== undefined
|
|
160
|
+
? undefined
|
|
161
|
+
: codeOrMutationFileId;
|
|
162
|
+
const criteria = {
|
|
163
|
+
oid: String(oid ?? '').trim(),
|
|
164
|
+
attachmentId: String(attachmentId ?? '').trim(),
|
|
165
|
+
generation: String(generation ?? '').trim(),
|
|
166
|
+
isJournal: true,
|
|
167
|
+
...(String(mutationFileId ?? '').trim()
|
|
168
|
+
? { mutationFileId: String(mutationFileId).trim() }
|
|
169
|
+
: {}),
|
|
170
|
+
};
|
|
171
|
+
if (!criteria.oid || !criteria.attachmentId || !criteria.generation) {
|
|
172
|
+
return false;
|
|
173
|
+
}
|
|
174
|
+
const existing = (await AttachmentMetadata.findOne(criteria));
|
|
175
|
+
if (!existing?.id) {
|
|
176
|
+
return false;
|
|
177
|
+
}
|
|
178
|
+
const allowedSources = {
|
|
179
|
+
prepared: [],
|
|
180
|
+
pending: ['prepared'],
|
|
181
|
+
applied: ['pending'],
|
|
182
|
+
incomplete: ['applied', 'unknown'],
|
|
183
|
+
unknown: ['prepared', 'pending', 'applied'],
|
|
184
|
+
cancelled: ['prepared', 'incomplete'],
|
|
185
|
+
'cleanup-pending': ['cancelled'],
|
|
186
|
+
'cleanup-removing': [],
|
|
187
|
+
cleaned: [],
|
|
188
|
+
};
|
|
189
|
+
const existingState = existing.mutationState;
|
|
190
|
+
if (!existingState || !allowedSources[mutationState].includes(existingState)) {
|
|
191
|
+
return false;
|
|
192
|
+
}
|
|
193
|
+
const updated = await AttachmentMetadata.updateOne({
|
|
194
|
+
id: existing.id,
|
|
195
|
+
mutationState: existing.mutationState,
|
|
196
|
+
}).set({
|
|
197
|
+
mutationState,
|
|
198
|
+
attemptCount: mutationState === 'pending' ? Number(existing.attemptCount ?? 0) + 1 : Number(existing.attemptCount ?? 0),
|
|
199
|
+
lastAttemptAt: new Date().toISOString(),
|
|
200
|
+
...(lastSafeErrorCode
|
|
201
|
+
? { lastSafeErrorCode }
|
|
202
|
+
: mutationState === 'applied'
|
|
203
|
+
? { lastSafeErrorCode: undefined }
|
|
204
|
+
: {}),
|
|
205
|
+
});
|
|
206
|
+
return Boolean(updated);
|
|
207
|
+
}
|
|
208
|
+
async hasCleanupClaim(oid, fileId) {
|
|
209
|
+
const normalizedFileId = (0, AttachmentStagingIdentity_1.normalizeAttachmentStagingFileId)(fileId);
|
|
210
|
+
if (!String(oid ?? '').trim() || !normalizedFileId)
|
|
211
|
+
return false;
|
|
212
|
+
return Boolean(await AttachmentMetadata.findOne({
|
|
213
|
+
mutationFileId: normalizedFileId,
|
|
214
|
+
isJournal: true,
|
|
215
|
+
mutationState: { in: ['cleanup-pending', 'cleanup-checking', 'cleanup-removing', 'cleaned'] },
|
|
216
|
+
}));
|
|
217
|
+
}
|
|
218
|
+
async claimExpiredStagingCleanup(before, limit = 100) {
|
|
219
|
+
const beforeDate = new Date(before);
|
|
220
|
+
if (Number.isNaN(beforeDate.getTime()))
|
|
221
|
+
return [];
|
|
222
|
+
const boundedLimit = Number.isSafeInteger(limit) ? Math.min(1000, Math.max(1, limit)) : 100;
|
|
223
|
+
const beforeIso = beforeDate.toISOString();
|
|
224
|
+
const query = AttachmentMetadata.find({
|
|
225
|
+
isJournal: true,
|
|
226
|
+
mutationState: 'cancelled',
|
|
227
|
+
updatedAt: { '<': beforeIso },
|
|
228
|
+
});
|
|
229
|
+
const rows = await query.sort([{ updatedAt: 'ASC' }]).limit(boundedLimit);
|
|
230
|
+
const claims = [];
|
|
231
|
+
for (const row of rows) {
|
|
232
|
+
const oid = String(row.oid ?? '').trim();
|
|
233
|
+
const attachmentId = String(row.attachmentId ?? '').trim();
|
|
234
|
+
const fileId = (0, AttachmentStagingIdentity_1.normalizeAttachmentStagingFileId)(row.mutationFileId);
|
|
235
|
+
const generation = String(row.generation ?? '').trim();
|
|
236
|
+
if (!row.id || !oid || !attachmentId || !fileId || !generation)
|
|
237
|
+
continue;
|
|
238
|
+
const token = (0, node_crypto_1.randomUUID)();
|
|
239
|
+
const claimed = await AttachmentMetadata.updateOne({
|
|
240
|
+
id: row.id,
|
|
241
|
+
mutationState: 'cancelled',
|
|
242
|
+
updatedAt: { '<': beforeIso },
|
|
243
|
+
}).set({
|
|
244
|
+
mutationState: 'cleanup-pending',
|
|
245
|
+
coordinationToken: token,
|
|
246
|
+
coordinationLeaseExpiresAt: this.coordinationLeaseExpiresAt(),
|
|
247
|
+
lastAttemptAt: new Date().toISOString(),
|
|
248
|
+
lastSafeErrorCode: undefined,
|
|
249
|
+
});
|
|
250
|
+
if (claimed)
|
|
251
|
+
claims.push({ oid, attachmentId, fileId, generation, token, phase: 'checking' });
|
|
252
|
+
}
|
|
253
|
+
const staleQuery = AttachmentMetadata.find({
|
|
254
|
+
isJournal: true,
|
|
255
|
+
mutationState: { in: ['cleanup-pending', 'cleanup-checking', 'cleanup-removing'] },
|
|
256
|
+
coordinationLeaseExpiresAt: { '<': new Date().toISOString() },
|
|
257
|
+
});
|
|
258
|
+
const staleRows = await staleQuery.sort([{ coordinationLeaseExpiresAt: 'ASC' }]).limit(boundedLimit);
|
|
259
|
+
for (const row of staleRows) {
|
|
260
|
+
if (claims.length >= boundedLimit)
|
|
261
|
+
break;
|
|
262
|
+
const oid = String(row.oid ?? '').trim();
|
|
263
|
+
const attachmentId = String(row.attachmentId ?? '').trim();
|
|
264
|
+
const fileId = (0, AttachmentStagingIdentity_1.normalizeAttachmentStagingFileId)(row.mutationFileId);
|
|
265
|
+
const generation = String(row.generation ?? '').trim();
|
|
266
|
+
const previousToken = String(row.coordinationToken ?? '').trim();
|
|
267
|
+
const previousLease = row.coordinationLeaseExpiresAt
|
|
268
|
+
? new Date(row.coordinationLeaseExpiresAt).toISOString()
|
|
269
|
+
: undefined;
|
|
270
|
+
if (!row.id || !oid || !attachmentId || !fileId || !generation || !previousToken || !previousLease)
|
|
271
|
+
continue;
|
|
272
|
+
const token = (0, node_crypto_1.randomUUID)();
|
|
273
|
+
const phase = row.mutationState === 'cleanup-removing' ? 'removing' : 'checking';
|
|
274
|
+
const reclaimed = await AttachmentMetadata.updateOne({
|
|
275
|
+
id: row.id,
|
|
276
|
+
mutationState: row.mutationState,
|
|
277
|
+
coordinationToken: previousToken,
|
|
278
|
+
coordinationLeaseExpiresAt: previousLease,
|
|
279
|
+
}).set({
|
|
280
|
+
mutationState: phase === 'removing' ? 'cleanup-removing' : 'cleanup-pending',
|
|
281
|
+
coordinationToken: token,
|
|
282
|
+
coordinationLeaseExpiresAt: this.coordinationLeaseExpiresAt(),
|
|
283
|
+
lastAttemptAt: new Date().toISOString(),
|
|
284
|
+
});
|
|
285
|
+
if (reclaimed)
|
|
286
|
+
claims.push({ oid, attachmentId, fileId, generation, token, phase });
|
|
287
|
+
}
|
|
288
|
+
return claims;
|
|
289
|
+
}
|
|
290
|
+
async beginStagingCleanup(claim) {
|
|
291
|
+
const normalized = this.normalizeCleanupClaim(claim);
|
|
292
|
+
if (!normalized)
|
|
293
|
+
return false;
|
|
294
|
+
if (!(await this.acquireStagingCoordinator(normalized.oid, normalized.fileId, normalized.attachmentId, normalized.generation, normalized.token, 'staging-cleanup'))) {
|
|
295
|
+
return false;
|
|
296
|
+
}
|
|
297
|
+
const updated = await AttachmentMetadata.updateOne({
|
|
298
|
+
...this.cleanupClaimCriteria(normalized),
|
|
299
|
+
isJournal: true,
|
|
300
|
+
mutationState: 'cleanup-pending',
|
|
301
|
+
}).set({
|
|
302
|
+
mutationState: 'cleanup-checking',
|
|
303
|
+
coordinationLeaseExpiresAt: this.coordinationLeaseExpiresAt(),
|
|
304
|
+
lastAttemptAt: new Date().toISOString(),
|
|
305
|
+
});
|
|
306
|
+
if (updated)
|
|
307
|
+
return true;
|
|
308
|
+
const alreadyBegun = await AttachmentMetadata.findOne({
|
|
309
|
+
...this.cleanupClaimCriteria(normalized),
|
|
310
|
+
isJournal: true,
|
|
311
|
+
mutationState: { in: ['cleanup-checking', 'cleanup-removing'] },
|
|
312
|
+
});
|
|
313
|
+
if (alreadyBegun)
|
|
314
|
+
return true;
|
|
315
|
+
await this.releaseStagingCoordinator(normalized.fileId, normalized.attachmentId, normalized.generation, normalized.token, 'staging-cleanup');
|
|
316
|
+
return false;
|
|
317
|
+
}
|
|
318
|
+
async authorizeStagingCleanup(claim) {
|
|
319
|
+
const normalized = this.normalizeCleanupClaim(claim);
|
|
320
|
+
if (!normalized ||
|
|
321
|
+
!(await this.acquireStagingCoordinator(normalized.oid, normalized.fileId, normalized.attachmentId, normalized.generation, normalized.token, 'staging-cleanup'))) {
|
|
322
|
+
return false;
|
|
323
|
+
}
|
|
324
|
+
const updated = await AttachmentMetadata.updateOne({
|
|
325
|
+
...this.cleanupClaimCriteria(normalized),
|
|
326
|
+
isJournal: true,
|
|
327
|
+
mutationState: 'cleanup-checking',
|
|
328
|
+
}).set({
|
|
329
|
+
mutationState: 'cleanup-removing',
|
|
330
|
+
coordinationLeaseExpiresAt: this.coordinationLeaseExpiresAt(),
|
|
331
|
+
lastAttemptAt: new Date().toISOString(),
|
|
332
|
+
});
|
|
333
|
+
if (updated)
|
|
334
|
+
return true;
|
|
335
|
+
return Boolean(await AttachmentMetadata.findOne({
|
|
336
|
+
...this.cleanupClaimCriteria(normalized),
|
|
337
|
+
isJournal: true,
|
|
338
|
+
mutationState: 'cleanup-removing',
|
|
339
|
+
}));
|
|
340
|
+
}
|
|
341
|
+
async releaseStagingCleanup(claim, code) {
|
|
342
|
+
const normalized = this.normalizeCleanupClaim(claim);
|
|
343
|
+
if (!normalized)
|
|
344
|
+
return false;
|
|
345
|
+
const safeCode = /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/.test(code) ? code : 'attachment-cleanup-failed';
|
|
346
|
+
const updated = await AttachmentMetadata.updateOne({
|
|
347
|
+
...this.cleanupClaimCriteria(normalized),
|
|
348
|
+
isJournal: true,
|
|
349
|
+
mutationState: { in: ['cleanup-pending', 'cleanup-checking'] },
|
|
350
|
+
}).set({
|
|
351
|
+
mutationState: 'cancelled',
|
|
352
|
+
coordinationLeaseExpiresAt: undefined,
|
|
353
|
+
lastAttemptAt: new Date().toISOString(),
|
|
354
|
+
lastSafeErrorCode: safeCode,
|
|
355
|
+
});
|
|
356
|
+
const claimReleased = Boolean(updated) ||
|
|
357
|
+
Boolean(await AttachmentMetadata.findOne({
|
|
358
|
+
...this.cleanupClaimCriteria(normalized),
|
|
359
|
+
isJournal: true,
|
|
360
|
+
mutationState: 'cancelled',
|
|
361
|
+
}));
|
|
362
|
+
if (!claimReleased)
|
|
363
|
+
return false;
|
|
364
|
+
return this.releaseStagingCoordinator(normalized.fileId, normalized.attachmentId, normalized.generation, normalized.token, 'staging-cleanup');
|
|
365
|
+
}
|
|
366
|
+
async completeStagingCleanup(claim) {
|
|
367
|
+
const normalized = this.normalizeCleanupClaim(claim);
|
|
368
|
+
if (!normalized)
|
|
369
|
+
return false;
|
|
370
|
+
const completed = await AttachmentMetadata.updateOne({
|
|
371
|
+
...this.cleanupClaimCriteria(normalized),
|
|
372
|
+
isJournal: true,
|
|
373
|
+
mutationState: 'cleanup-removing',
|
|
374
|
+
}).set({
|
|
375
|
+
mutationState: 'cleaned',
|
|
376
|
+
coordinationLeaseExpiresAt: undefined,
|
|
377
|
+
lastAttemptAt: new Date().toISOString(),
|
|
378
|
+
lastSafeErrorCode: 'attachment-cleanup-completed',
|
|
379
|
+
});
|
|
380
|
+
const claimCompleted = Boolean(completed) ||
|
|
381
|
+
Boolean(await AttachmentMetadata.findOne({
|
|
382
|
+
...this.cleanupClaimCriteria(normalized),
|
|
383
|
+
isJournal: true,
|
|
384
|
+
mutationState: 'cleaned',
|
|
385
|
+
}));
|
|
386
|
+
if (!claimCompleted)
|
|
387
|
+
return false;
|
|
388
|
+
return this.releaseStagingCoordinator(normalized.fileId, normalized.attachmentId, normalized.generation, normalized.token, 'staging-cleanup');
|
|
389
|
+
}
|
|
390
|
+
async recoverStagingCleanup(claim, stagedObjectExists) {
|
|
391
|
+
const normalized = this.normalizeCleanupClaim(claim);
|
|
392
|
+
if (!normalized ||
|
|
393
|
+
!(await this.acquireStagingCoordinator(normalized.oid, normalized.fileId, normalized.attachmentId, normalized.generation, normalized.token, 'staging-cleanup'))) {
|
|
394
|
+
return 'lost';
|
|
395
|
+
}
|
|
396
|
+
if (!stagedObjectExists) {
|
|
397
|
+
return (await this.completeStagingCleanup(normalized)) ? 'completed' : 'lost';
|
|
398
|
+
}
|
|
399
|
+
// Presence is ambiguous after a crash: it may be the old object or a
|
|
400
|
+
// newly uploaded object using the same key. Never delete or release the
|
|
401
|
+
// global identity in that state. The bounded lease allows another
|
|
402
|
+
// worker to reconcile it later, while hasCleanupClaim keeps preparation
|
|
403
|
+
// fail-closed until absence is observed.
|
|
404
|
+
const retained = await AttachmentMetadata.updateOne({
|
|
405
|
+
...this.cleanupClaimCriteria(normalized),
|
|
406
|
+
isJournal: true,
|
|
407
|
+
mutationState: 'cleanup-removing',
|
|
408
|
+
}).set({
|
|
409
|
+
coordinationLeaseExpiresAt: this.coordinationLeaseExpiresAt(),
|
|
410
|
+
lastAttemptAt: new Date().toISOString(),
|
|
411
|
+
lastSafeErrorCode: 'attachment-cleanup-removal-unconfirmed',
|
|
412
|
+
});
|
|
413
|
+
return retained ? 'retained' : 'lost';
|
|
414
|
+
}
|
|
415
|
+
journalFileId(attachmentId, generation, mutationFileId) {
|
|
416
|
+
const identity = `${attachmentId}\u0000${generation}\u0000${mutationFileId}`;
|
|
417
|
+
const suffix = (0, node_crypto_1.createHash)('sha256').update(identity).digest('hex').slice(0, 32);
|
|
418
|
+
return `journal-${attachmentId}-${generation}-${suffix}`;
|
|
419
|
+
}
|
|
420
|
+
async rebindOid(fromOid, toOid) {
|
|
421
|
+
const from = String(fromOid ?? '').trim();
|
|
422
|
+
const to = String(toOid ?? '').trim();
|
|
423
|
+
if (!from || !to || from === to) {
|
|
424
|
+
return;
|
|
425
|
+
}
|
|
426
|
+
await AttachmentMetadata.update({ oid: from }).set({ oid: to });
|
|
427
|
+
}
|
|
428
|
+
async markDeleted(row) {
|
|
429
|
+
await this.upsert({
|
|
430
|
+
...row,
|
|
431
|
+
isJournal: false,
|
|
432
|
+
operation: 'delete',
|
|
433
|
+
mutationState: 'applied',
|
|
434
|
+
lastAttemptAt: new Date().toISOString(),
|
|
435
|
+
});
|
|
40
436
|
}
|
|
41
437
|
async findOneByStorageKey(storageKey) {
|
|
42
438
|
const normalizedStorageKey = String(storageKey ?? '').trim();
|
|
43
439
|
if (!normalizedStorageKey) {
|
|
44
440
|
return undefined;
|
|
45
441
|
}
|
|
46
|
-
return await AttachmentMetadata.findOne({ storageKey: normalizedStorageKey });
|
|
442
|
+
return (await AttachmentMetadata.findOne({ storageKey: normalizedStorageKey }));
|
|
47
443
|
}
|
|
48
444
|
async deleteByStorageKey(storageKey) {
|
|
49
445
|
const normalizedStorageKey = String(storageKey ?? '').trim();
|
|
@@ -59,7 +455,9 @@ var Services;
|
|
|
59
455
|
return;
|
|
60
456
|
}
|
|
61
457
|
if (normalizedEvent.storageKey && normalizedEvent.action !== 'list') {
|
|
62
|
-
const existing = await AttachmentMetadata.findOne({
|
|
458
|
+
const existing = (await AttachmentMetadata.findOne({
|
|
459
|
+
storageKey: normalizedEvent.storageKey,
|
|
460
|
+
}));
|
|
63
461
|
if (existing?.id) {
|
|
64
462
|
const currentCount = Number(existing.accessCount ?? 0);
|
|
65
463
|
const nextCount = this.shouldIncrementAccessCount(normalizedEvent.action) ? currentCount + 1 : currentCount;
|
|
@@ -77,6 +475,175 @@ var Services;
|
|
|
77
475
|
throw err;
|
|
78
476
|
}
|
|
79
477
|
}
|
|
478
|
+
async acquireStagingCoordinator(oid, fileId, attachmentId, generation, token, ownerState) {
|
|
479
|
+
const identity = this.stagingCoordinatorIdentity(fileId);
|
|
480
|
+
const coordinator = await this.ensureStagingCoordinator(fileId, identity);
|
|
481
|
+
if (coordinator.mutationState === ownerState &&
|
|
482
|
+
coordinator.coordinationToken === token &&
|
|
483
|
+
coordinator.attachmentId === attachmentId &&
|
|
484
|
+
coordinator.generation === generation) {
|
|
485
|
+
return this.renewStagingCoordinator(coordinator, token, ownerState);
|
|
486
|
+
}
|
|
487
|
+
const reclaiming = coordinator.mutationState !== 'staging-available';
|
|
488
|
+
if (reclaiming && !this.coordinationLeaseExpired(coordinator.coordinationLeaseExpiresAt))
|
|
489
|
+
return false;
|
|
490
|
+
const updated = await AttachmentMetadata.updateOne({
|
|
491
|
+
id: coordinator.id,
|
|
492
|
+
oid: STAGING_COORDINATOR_OID,
|
|
493
|
+
fileId: identity.fileId,
|
|
494
|
+
storageKey: identity.storageKey,
|
|
495
|
+
mutationFileId: fileId,
|
|
496
|
+
isJournal: true,
|
|
497
|
+
mutationState: coordinator.mutationState,
|
|
498
|
+
...(reclaiming
|
|
499
|
+
? {
|
|
500
|
+
coordinationToken: coordinator.coordinationToken,
|
|
501
|
+
coordinationLeaseExpiresAt: coordinator.coordinationLeaseExpiresAt,
|
|
502
|
+
}
|
|
503
|
+
: {}),
|
|
504
|
+
}).set({
|
|
505
|
+
mutationState: ownerState,
|
|
506
|
+
attachmentId,
|
|
507
|
+
generation,
|
|
508
|
+
coordinationToken: token,
|
|
509
|
+
coordinationLeaseExpiresAt: this.coordinationLeaseExpiresAt(),
|
|
510
|
+
lastAttemptAt: new Date().toISOString(),
|
|
511
|
+
});
|
|
512
|
+
if (updated)
|
|
513
|
+
return true;
|
|
514
|
+
const raced = (await AttachmentMetadata.findOne({ storageKey: identity.storageKey }));
|
|
515
|
+
return Boolean(this.isExpectedStagingCoordinator(raced, fileId, identity) &&
|
|
516
|
+
raced?.mutationState === ownerState &&
|
|
517
|
+
raced.coordinationToken === token &&
|
|
518
|
+
raced.attachmentId === attachmentId &&
|
|
519
|
+
raced.generation === generation);
|
|
520
|
+
}
|
|
521
|
+
async ensureStagingCoordinator(fileId, identity) {
|
|
522
|
+
let coordinator = (await AttachmentMetadata.findOne({
|
|
523
|
+
storageKey: identity.storageKey,
|
|
524
|
+
}));
|
|
525
|
+
if (!coordinator) {
|
|
526
|
+
try {
|
|
527
|
+
coordinator = (await AttachmentMetadata.create({
|
|
528
|
+
oid: STAGING_COORDINATOR_OID,
|
|
529
|
+
fileId: identity.fileId,
|
|
530
|
+
storageKey: identity.storageKey,
|
|
531
|
+
mutationFileId: fileId,
|
|
532
|
+
isJournal: true,
|
|
533
|
+
mutationState: 'staging-available',
|
|
534
|
+
}).fetch());
|
|
535
|
+
}
|
|
536
|
+
catch (error) {
|
|
537
|
+
if (!this.isUniqueConstraintError(error))
|
|
538
|
+
throw error;
|
|
539
|
+
coordinator = (await AttachmentMetadata.findOne({
|
|
540
|
+
storageKey: identity.storageKey,
|
|
541
|
+
}));
|
|
542
|
+
}
|
|
543
|
+
}
|
|
544
|
+
if (!coordinator || !this.isExpectedStagingCoordinator(coordinator, fileId, identity)) {
|
|
545
|
+
throw new Error('Attachment staging coordinator is unavailable or malformed.');
|
|
546
|
+
}
|
|
547
|
+
return coordinator;
|
|
548
|
+
}
|
|
549
|
+
async releaseStagingCoordinator(fileId, attachmentId, generation, token, ownerState) {
|
|
550
|
+
const identity = this.stagingCoordinatorIdentity(fileId);
|
|
551
|
+
const coordinator = (await AttachmentMetadata.findOne({
|
|
552
|
+
storageKey: identity.storageKey,
|
|
553
|
+
}));
|
|
554
|
+
if (!coordinator || !this.isExpectedStagingCoordinator(coordinator, fileId, identity))
|
|
555
|
+
return false;
|
|
556
|
+
const leaseExpiresAt = coordinator.coordinationLeaseExpiresAt;
|
|
557
|
+
if (coordinator.mutationState !== ownerState ||
|
|
558
|
+
coordinator.coordinationToken !== token ||
|
|
559
|
+
coordinator.attachmentId !== attachmentId ||
|
|
560
|
+
coordinator.generation !== generation ||
|
|
561
|
+
!leaseExpiresAt ||
|
|
562
|
+
this.coordinationLeaseExpired(leaseExpiresAt)) {
|
|
563
|
+
return false;
|
|
564
|
+
}
|
|
565
|
+
const released = await AttachmentMetadata.updateOne({
|
|
566
|
+
id: coordinator.id,
|
|
567
|
+
oid: STAGING_COORDINATOR_OID,
|
|
568
|
+
fileId: identity.fileId,
|
|
569
|
+
storageKey: identity.storageKey,
|
|
570
|
+
mutationFileId: fileId,
|
|
571
|
+
isJournal: true,
|
|
572
|
+
mutationState: ownerState,
|
|
573
|
+
coordinationToken: token,
|
|
574
|
+
coordinationLeaseExpiresAt: leaseExpiresAt,
|
|
575
|
+
attachmentId,
|
|
576
|
+
generation,
|
|
577
|
+
}).set({
|
|
578
|
+
mutationState: 'staging-available',
|
|
579
|
+
coordinationToken: undefined,
|
|
580
|
+
coordinationLeaseExpiresAt: undefined,
|
|
581
|
+
lastAttemptAt: new Date().toISOString(),
|
|
582
|
+
});
|
|
583
|
+
return Boolean(released);
|
|
584
|
+
}
|
|
585
|
+
stagingCoordinatorIdentity(fileId) {
|
|
586
|
+
const digest = (0, node_crypto_1.createHash)('sha256').update(fileId).digest('hex');
|
|
587
|
+
return {
|
|
588
|
+
fileId: `staging-coordinator-${digest}`,
|
|
589
|
+
storageKey: `journal/staging-coordinator/${digest}`,
|
|
590
|
+
};
|
|
591
|
+
}
|
|
592
|
+
isExpectedStagingCoordinator(row, fileId, identity) {
|
|
593
|
+
return Boolean(row?.id &&
|
|
594
|
+
row.oid === STAGING_COORDINATOR_OID &&
|
|
595
|
+
row.fileId === identity.fileId &&
|
|
596
|
+
row.storageKey === identity.storageKey &&
|
|
597
|
+
row.mutationFileId === fileId &&
|
|
598
|
+
row.isJournal === true &&
|
|
599
|
+
(row.mutationState === 'staging-available' ||
|
|
600
|
+
row.mutationState === 'staging-preparing' ||
|
|
601
|
+
row.mutationState === 'staging-cleanup'));
|
|
602
|
+
}
|
|
603
|
+
coordinationLeaseExpiresAt() {
|
|
604
|
+
return new Date(Date.now() + STAGING_COORDINATOR_LEASE_MS).toISOString();
|
|
605
|
+
}
|
|
606
|
+
coordinationLeaseExpired(value) {
|
|
607
|
+
const expiresAt = new Date(value).getTime();
|
|
608
|
+
return !Number.isFinite(expiresAt) || expiresAt <= Date.now();
|
|
609
|
+
}
|
|
610
|
+
async renewStagingCoordinator(coordinator, token, ownerState) {
|
|
611
|
+
const currentExpiry = new Date(coordinator.coordinationLeaseExpiresAt).getTime();
|
|
612
|
+
if (Number.isFinite(currentExpiry) && currentExpiry > Date.now() + 60_000)
|
|
613
|
+
return true;
|
|
614
|
+
return Boolean(await AttachmentMetadata.updateOne({
|
|
615
|
+
id: coordinator.id,
|
|
616
|
+
mutationState: ownerState,
|
|
617
|
+
coordinationToken: token,
|
|
618
|
+
coordinationLeaseExpiresAt: coordinator.coordinationLeaseExpiresAt,
|
|
619
|
+
}).set({
|
|
620
|
+
coordinationLeaseExpiresAt: this.coordinationLeaseExpiresAt(),
|
|
621
|
+
lastAttemptAt: new Date().toISOString(),
|
|
622
|
+
}));
|
|
623
|
+
}
|
|
624
|
+
isUniqueConstraintError(error) {
|
|
625
|
+
const details = error;
|
|
626
|
+
return details?.code === 'E_UNIQUE' || details?.raw?.code === 11000 || details?.cause?.code === 11000;
|
|
627
|
+
}
|
|
628
|
+
normalizeCleanupClaim(claim) {
|
|
629
|
+
const oid = String(claim?.oid ?? '').trim();
|
|
630
|
+
const attachmentId = this.optionalIdentifier(claim?.attachmentId);
|
|
631
|
+
const fileId = (0, AttachmentStagingIdentity_1.normalizeAttachmentStagingFileId)(claim?.fileId);
|
|
632
|
+
const generation = this.optionalIdentifier(claim?.generation);
|
|
633
|
+
const token = this.optionalIdentifier(claim?.token);
|
|
634
|
+
if (!oid || !attachmentId || !fileId || !generation || !token)
|
|
635
|
+
return undefined;
|
|
636
|
+
return { oid, attachmentId, fileId, generation, token, phase: claim.phase };
|
|
637
|
+
}
|
|
638
|
+
cleanupClaimCriteria(claim) {
|
|
639
|
+
return {
|
|
640
|
+
oid: claim.oid,
|
|
641
|
+
attachmentId: claim.attachmentId,
|
|
642
|
+
generation: claim.generation,
|
|
643
|
+
mutationFileId: claim.fileId,
|
|
644
|
+
coordinationToken: claim.token,
|
|
645
|
+
};
|
|
646
|
+
}
|
|
80
647
|
shouldIncrementAccessCount(action) {
|
|
81
648
|
return action === 'download' || action === 'access';
|
|
82
649
|
}
|
|
@@ -85,6 +652,10 @@ var Services;
|
|
|
85
652
|
oid: String(row.oid ?? '').trim(),
|
|
86
653
|
fileId: String(row.fileId ?? '').trim(),
|
|
87
654
|
storageKey: String(row.storageKey ?? '').trim(),
|
|
655
|
+
isJournal: row.isJournal === true,
|
|
656
|
+
// Journal fields are only written when the caller supplies them, so an
|
|
657
|
+
// ordinary metadata upsert cannot silently reset reconciliation state.
|
|
658
|
+
...this.journalRow(row),
|
|
88
659
|
contentType: this.optionalString(row.contentType),
|
|
89
660
|
contentLength: this.optionalNumber(row.contentLength),
|
|
90
661
|
etag: this.optionalString(row.etag),
|
|
@@ -98,6 +669,70 @@ var Services;
|
|
|
98
669
|
accessCount: this.optionalNumber(row.accessCount) ?? 0,
|
|
99
670
|
};
|
|
100
671
|
}
|
|
672
|
+
journalRow(row) {
|
|
673
|
+
const journal = {};
|
|
674
|
+
const attachmentId = this.optionalIdentifier(row.attachmentId);
|
|
675
|
+
if (attachmentId) {
|
|
676
|
+
journal.attachmentId = attachmentId;
|
|
677
|
+
}
|
|
678
|
+
const operation = this.optionalOperation(row.operation);
|
|
679
|
+
if (operation) {
|
|
680
|
+
journal.operation = operation;
|
|
681
|
+
}
|
|
682
|
+
const mutationState = this.optionalMutationState(row.mutationState);
|
|
683
|
+
if (mutationState) {
|
|
684
|
+
journal.mutationState = mutationState;
|
|
685
|
+
}
|
|
686
|
+
const generation = this.optionalIdentifier(row.generation);
|
|
687
|
+
if (generation) {
|
|
688
|
+
journal.generation = generation;
|
|
689
|
+
}
|
|
690
|
+
const mutationFileId = (0, AttachmentStagingIdentity_1.normalizeAttachmentStagingFileId)(row.mutationFileId);
|
|
691
|
+
if (mutationFileId) {
|
|
692
|
+
journal.mutationFileId = mutationFileId;
|
|
693
|
+
}
|
|
694
|
+
const coordinationToken = this.optionalIdentifier(row.coordinationToken);
|
|
695
|
+
if (coordinationToken) {
|
|
696
|
+
journal.coordinationToken = coordinationToken;
|
|
697
|
+
}
|
|
698
|
+
const attemptCount = this.optionalNumber(row.attemptCount);
|
|
699
|
+
if (attemptCount !== undefined) {
|
|
700
|
+
journal.attemptCount = attemptCount;
|
|
701
|
+
}
|
|
702
|
+
const lastAttemptAt = this.optionalDateString(row.lastAttemptAt);
|
|
703
|
+
if (lastAttemptAt) {
|
|
704
|
+
journal.lastAttemptAt = lastAttemptAt;
|
|
705
|
+
}
|
|
706
|
+
const lastSafeErrorCode = this.optionalIdentifier(row.lastSafeErrorCode);
|
|
707
|
+
if (lastSafeErrorCode) {
|
|
708
|
+
journal.lastSafeErrorCode = lastSafeErrorCode;
|
|
709
|
+
}
|
|
710
|
+
return journal;
|
|
711
|
+
}
|
|
712
|
+
optionalIdentifier(value) {
|
|
713
|
+
const normalized = String(value ?? '').trim();
|
|
714
|
+
return normalized && /^[A-Za-z0-9][A-Za-z0-9_-]{0,127}$/.test(normalized) ? normalized : undefined;
|
|
715
|
+
}
|
|
716
|
+
optionalOperation(value) {
|
|
717
|
+
return value === 'add' || value === 'finalize' || value === 'delete' ? value : undefined;
|
|
718
|
+
}
|
|
719
|
+
optionalMutationState(value) {
|
|
720
|
+
return value === 'prepared' ||
|
|
721
|
+
value === 'pending' ||
|
|
722
|
+
value === 'applied' ||
|
|
723
|
+
value === 'incomplete' ||
|
|
724
|
+
value === 'unknown' ||
|
|
725
|
+
value === 'cancelled' ||
|
|
726
|
+
value === 'cleanup-pending' ||
|
|
727
|
+
value === 'cleanup-checking' ||
|
|
728
|
+
value === 'cleanup-removing' ||
|
|
729
|
+
value === 'cleaned' ||
|
|
730
|
+
value === 'staging-available' ||
|
|
731
|
+
value === 'staging-preparing' ||
|
|
732
|
+
value === 'staging-cleanup'
|
|
733
|
+
? value
|
|
734
|
+
: undefined;
|
|
735
|
+
}
|
|
101
736
|
normalizeAccessEvent(event) {
|
|
102
737
|
return {
|
|
103
738
|
oid: String(event.oid ?? '').trim(),
|
|
@@ -130,4 +765,4 @@ var Services;
|
|
|
130
765
|
}
|
|
131
766
|
Services.AttachmentMetadataService = AttachmentMetadataService;
|
|
132
767
|
})(Services || (exports.Services = Services = {}));
|
|
133
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXR0YWNobWVudE1ldGFkYXRhU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXJ2aWNlcy9BdHRhY2htZW50TWV0YWRhdGFTZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLGdEQUFzRDtBQUd0RCxJQUFpQixRQUFRLENBdUp4QjtBQXZKRCxXQUFpQixRQUFRO0lBYXZCLE1BQWEseUJBQTBCLFNBQVEsc0JBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTztRQUMvQyxnQkFBZ0IsR0FBYTtZQUM5QyxRQUFRO1lBQ1IsV0FBVztZQUNYLHFCQUFxQjtZQUNyQixvQkFBb0I7WUFDcEIsY0FBYztTQUNmLENBQUM7UUFFaUIsU0FBUyxHQUFXLDZCQUE2QixDQUFDO1FBRTlELEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBNEI7WUFDOUMsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxVQUFVLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDdkQsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO2dCQUNoQixNQUFNLElBQUksS0FBSyxDQUFDLHNEQUFzRCxDQUFDLENBQUM7WUFDMUUsQ0FBQztZQUVELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUMvQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUM3QyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNuRCxNQUFNLFFBQVEsR0FBRyxNQUFNLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxFQUFFLFVBQVUsRUFBRSxDQUF3QzttQkFDbkcsQ0FBQyxHQUFHLElBQUksTUFBTTtvQkFDZixDQUFDLENBQUMs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
|
|
768
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AttachmentMetadataService.js","sourceRoot":"","sources":["../../src/services/AttachmentMetadataService.ts"],"names":[],"mappings":"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"}
|