@flusys/nestjs-form-builder 9.1.2 → 9.2.0

package/README.md

@@ -204,6 +204,16 @@ FormBuilderModule.forRoot({
 | `POST form-builder/result/submit-public` | `OptionalJwtGuard` | Now also accepts `EMAIL_VERIFIED` forms — pass `{ accessToken }` for anonymous visitors, nothing for JWT-authenticated ones |
 | `POST form-builder/result/has-submitted-email` | `OptionalJwtGuard` | Anonymous-path counterpart to `has-submitted`, resolving identity the same way |
 
+**Single-response race:** the "already submitted?" count and the insert are not atomic, so a non-draft submission to a `single` form `claim`s `form-builder:submit:[<tenant>:]<formId>:<email>` (30 s, released when done) on the shared cache. A concurrent submission for the same form + email - on any instance with `redis` / `hybrid` cache - gets 409 `form.result.already.submitted`. When the cache is unreachable the count check alone applies.
+
+### Caching
+
+`FormService` and `FormResultService` cache `get-all` / `get/:id` (ApiService version stamps, see [nestjs-shared section 7](../nestjs-shared/README.md#7-hybrid-cache)):
+
+- Submit, draft save / finalize and `update-draft` bump the `form_result` stamp after the write - also when the insert fails after an old draft was already soft-removed - and before the domain event is published.
+- With the company feature, cached result lists join `form` for the company filter, so `FormResultService` also depends on the `form` stamp.
+- Public, authenticated, email-verified and submission reads (`public/:id`, `access-info/:id`, `authenticated/:id`, `email-verified/:id`, `by-slug`, submit) always read the database, so a deactivated or re-scoped form is never served from cache. OTP and access-token state lives only in `form_email_verification`, never in the cache.
+
 ---
 
 ## 4. Computed Fields

package/controllers/form-result.controller.d.ts

@@ -7,6 +7,7 @@ declare const FormResultController_base: abstract new (service: FormResultServic
     readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: FormResultService;
     isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
+    assertEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): void;
     insert(addDto: CreateFormResultDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResultResponseDto>>;
     insertMany(addDto: CreateFormResultDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FormResultResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResultResponseDto>>;

package/controllers/form.controller.d.ts

@@ -7,6 +7,7 @@ declare const FormController_base: abstract new (service: FormService) => {
     readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: FormService;
     isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
+    assertEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): void;
     insert(addDto: CreateFormDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResponseDto>>;
     insertMany(addDto: CreateFormDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FormResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResponseDto>>;

package/fesm/432.js

@@ -429,7 +429,7 @@ _ts_decorate([
     (0,external_typeorm_.Column)({
         type: 'varchar',
         length: 50,
-        default: 'AUTHENTICATED',
+        default: form_access_type_enum/* .FormAccessType.AUTHENTICATED */.h.AUTHENTICATED,
         name: 'access_type'
     }),
     _ts_metadata("design:type", typeof form_access_type_enum/* .FormAccessType */.h === "undefined" ? Object : form_access_type_enum/* .FormAccessType */.h)
@@ -1231,15 +1231,21 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
     permissionResolver;
     permissionCache;
     formRepository = null;
-    // Serializes the single-response check-then-insert per (formId, email) within
-    // this process, so a double-click/two-tab submission can't both pass the check
-    // before either has saved. Static because the service is REQUEST-scoped - a
-    // per-instance lock would never be shared between the two racing requests.
-    // Does not span multiple app instances; see withSubmissionLock().
-    static submissionLocks = new Map();
+    resultLogger = new _nestjs_common__rspack_import_4.Logger(FormResultService.name);
+    // Bounds how long a crashed instance can block a submitter's retry.
+    static SUBMISSION_CLAIM_TTL_MS = 30_000;
     constructor(cacheManager, utilsService, formBuilderConfig, dataSourceProvider, formEmailAuthService, permissionResolver, permissionCache){
         super(_config_index_js__rspack_import_13/* .FORM_BUILDER_EVENT_ENTITIES.FORM_RESULT */.eF.FORM_RESULT, cacheManager, utilsService, FormResultService.name, true, _config_index_js__rspack_import_13/* .FORM_BUILDER_EVENT_MODULE */.T$, dataSourceProvider, _entities_index_js__rspack_import_7/* .FormResult */.ez), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formEmailAuthService = formEmailAuthService, this.permissionResolver = permissionResolver, this.permissionCache = permissionCache;
     }
+    // With the company feature, cached lists join the form to filter by its company.
+    cacheDependencies() {
+        return this.formBuilderConfig.isCompanyFeatureEnabled() ? [
+            this.entityName,
+            _config_index_js__rspack_import_13/* .FORM_BUILDER_EVENT_ENTITIES.FORM */.eF.FORM
+        ] : [
+            this.entityName
+        ];
+    }
     async ensureFormRepositoryInitialized() {
         if (!this.formRepository) {
             const enableCompanyFeature = this.formBuilderConfig.isCompanyFeatureEnabled();
@@ -1247,21 +1253,31 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
             this.formRepository = await this.dataSourceProvider.getRepository(formEntity);
         }
     }
-    async withSubmissionLock(key, fn) {
-        const prior = FormResultService.submissionLocks.get(key) ?? Promise.resolve();
-        let release;
-        const current = new Promise((resolve)=>{
-            release = resolve;
-        });
-        FormResultService.submissionLocks.set(key, current);
-        await prior;
+    // Single-response forms: the count check and the insert are not atomic, so a
+    // double-click or two tabs (possibly on different instances) could both pass the
+    // check. The cross-instance claim lets only one submission per form + email run;
+    // a concurrent one is rejected as already submitted. Without a reachable cache the
+    // count check alone still applies.
+    async withSubmissionClaim(formId, email, fn) {
+        const tenant = this.cacheTenant();
+        const claimKey = `form-builder:submit:${tenant ? `${tenant}:` : ''}${formId}:${email}`;
+        let claimed = false;
+        try {
+            claimed = await this.cacheManager.claim(claimKey, FormResultService.SUBMISSION_CLAIM_TTL_MS);
+            if (!claimed) {
+                throw new _nestjs_common__rspack_import_4.ConflictException({
+                    message: 'You have already submitted a response to this form',
+                    messageKey: _config_index_js__rspack_import_14/* .FORM_RESULT_MESSAGES.ALREADY_SUBMITTED */.y.ALREADY_SUBMITTED
+                });
+            }
+        } catch (error) {
+            if (error instanceof _nestjs_common__rspack_import_4.ConflictException) throw error;
+            this.resultLogger.warn(`Submission claim unavailable for form '${formId}': ${error.message}`);
+        }
         try {
             return await fn();
         } finally{
-            release();
-            if (FormResultService.submissionLocks.get(key) === current) {
-                FormResultService.submissionLocks.delete(key);
-            }
+            if (claimed) await this.cacheManager.releaseClaim(claimKey).catch(()=>undefined);
         }
     }
     async getActiveForm(formId) {
@@ -1282,11 +1298,14 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         return form;
     }
     applyCompanyFilterToQuery(query, user) {
-        if (this.formBuilderConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            query.innerJoin('form', 'f', 'f.id = form_result.formId').andWhere('f.company_id = :companyId', {
-                companyId: user.companyId
-            });
+        if (!this.formBuilderConfig.isCompanyFeatureEnabled() || !user) return;
+        if (!user.companyId) {
+            query.andWhere('1 = 0');
+            return;
         }
+        query.innerJoin('form', 'f', 'f.id = form_result.formId').andWhere('f.company_id = :companyId', {
+            companyId: user.companyId
+        });
     }
     static PUBLICLY_SUBMITTABLE_ACCESS_TYPES = new Set([
         _enums_form_access_type_enum_js__rspack_import_15/* .FormAccessType.PUBLIC */.h.PUBLIC,
@@ -1354,10 +1373,12 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         }
         return email;
     }
-    async assertSingleResponseNotExceeded(form, submitterEmail) {
-        if (!submitterEmail) return;
+    isSingleResponse(form) {
         const settings = form.schema?.settings;
-        if (settings?.responseMode !== 'single') return;
+        return settings?.responseMode === 'single';
+    }
+    async assertSingleResponseNotExceeded(form, submitterEmail) {
+        if (!submitterEmail || !this.isSingleResponse(form)) return;
         const count = await this.repository.count({
             where: {
                 formId: form.id,
@@ -1450,11 +1471,8 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         const submitterEmail = await this.resolveEmailVerifiedSubmitter(form, user, dto.accessToken);
         const isDraft = dto.isDraft ?? false;
         const persist = ()=>this.persistSubmission(form, dto, user, submitterEmail, isDraft);
-        // Only a non-draft submission is subject to the single-response check, so
-        // only that path needs serializing against a concurrent duplicate for the
-        // same form + email (see withSubmissionLock()).
-        if (!isDraft && submitterEmail) {
-            return this.withSubmissionLock(`${form.id}:${submitterEmail}`, persist);
+        if (!isDraft && submitterEmail && this.isSingleResponse(form)) {
+            return this.withSubmissionClaim(form.id, submitterEmail, persist);
         }
         return persist();
     }
@@ -1462,8 +1480,17 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         if (!isDraft) {
             await this.assertSingleResponseNotExceeded(form, submitterEmail);
         }
-        const staleResults = [];
-        // Handle existing draft for authenticated users
+        let saved;
+        try {
+            saved = await this.writeSubmission(form, dto, user, submitterEmail, isDraft);
+        } finally{
+            // Also after a failed insert: the replaced draft may already be soft-removed.
+            await this.invalidateCache();
+        }
+        await this.publishSubmissionEvent(saved, dto.formId, saved.isDraft, user);
+        return this.convertEntityToResponseDto(saved, false);
+    }
+    async writeSubmission(form, dto, user, submitterEmail, isDraft) {
         if (user?.id) {
             const existingDraft = await this.repository.findOne({
                 where: this.buildUserDraftWhere(dto.formId, user.id)
@@ -1476,18 +1503,12 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
                         schemaVersion: form.schemaVersion,
                         submittedAt: new Date()
                     });
-                    const saved = await this.repository.save(existingDraft);
-                    await this.invalidateResultCache([
-                        saved
-                    ]);
-                    await this.publishSubmissionEvent(saved, dto.formId, true, user);
-                    return this.convertEntityToResponseDto(saved, false);
+                    return await this.repository.save(existingDraft);
                 }
                 await this.repository.softRemove(existingDraft);
-                staleResults.push(existingDraft);
             }
         }
-        const saved = await this.repository.save({
+        return await this.repository.save({
             formId: dto.formId,
             schemaVersionSnapshot: form.schema,
             schemaVersion: form.schemaVersion,
@@ -1497,12 +1518,6 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
             submittedAt: new Date(),
             isDraft
         });
-        await this.invalidateResultCache([
-            ...staleResults,
-            saved
-        ]);
-        await this.publishSubmissionEvent(saved, dto.formId, isDraft, user);
-        return this.convertEntityToResponseDto(saved, false);
     }
     async getMyDraft(formId, user) {
         await this.ensureDataSourceRepository();
@@ -1519,7 +1534,9 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
         const draft = await this.repository.findOne({
             where: {
                 id: draftId,
+                formId: dto.formId,
                 submittedById: user.id,
+                isDraft: true,
                 deletedAt: (0,typeorm__rspack_import_5.IsNull)()
             }
         });
@@ -1539,9 +1556,7 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
             isDraft
         });
         const saved = await this.repository.save(draft);
-        await this.invalidateResultCache([
-            saved
-        ]);
+        await this.invalidateCache();
         await this.publishSubmissionEvent(saved, dto.formId, isDraft, user);
         return this.convertEntityToResponseDto(saved, false);
     }
@@ -1559,12 +1574,6 @@ class FormResultService extends _flusys_nestjs_shared_classes__rspack_import_0.A
             user
         });
     }
-    async invalidateResultCache(results) {
-        await Promise.all([
-            this.clearCacheForAll(),
-            this.clearCacheForId(results)
-        ]);
-    }
     async getByFormId(formId, user, pagination) {
         await this.ensureDataSourceRepository();
         const query = this.repository.createQueryBuilder(this.entityName).where('form_result.formId = :formId', {
@@ -1780,6 +1789,9 @@ class FormService extends classes_.ApiService {
             ...form,
             ...dto
         };
+        if (!isUpdate) {
+            form.accessType ??= form_access_type_enum/* .FormAccessType.AUTHENTICATED */.h.AUTHENTICATED;
+        }
         // Set company context if enabled
         const enableCompanyFeature = this.formBuilderConfig.isCompanyFeatureEnabled();
         if (enableCompanyFeature) {

package/fesm/entities/index.js

@@ -104,7 +104,7 @@ _ts_decorate([
     (0,external_typeorm_.Column)({
         type: 'varchar',
         length: 50,
-        default: 'AUTHENTICATED',
+        default: form_access_type_enum/* .FormAccessType.AUTHENTICATED */.h.AUTHENTICATED,
         name: 'access_type'
     }),
     _ts_metadata("design:type", typeof form_access_type_enum/* .FormAccessType */.h === "undefined" ? Object : form_access_type_enum/* .FormAccessType */.h)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-form-builder",
-  "version": "9.1.2",
+  "version": "9.2.0",
   "description": "Dynamic form builder module with schema versioning and access control",
   "type": "module",
   "main": "./fesm/index.js",
@@ -75,7 +75,7 @@
     "express": "^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "9.1.2",
-    "@flusys/nestjs-shared": "9.1.2"
+    "@flusys/nestjs-core": "9.2.0",
+    "@flusys/nestjs-shared": "9.2.0"
   }
 }

package/services/form-result.service.d.ts

@@ -18,15 +18,18 @@ export declare class FormResultService extends ApiService<CreateFormResultDto, U
     private readonly permissionResolver?;
     private readonly permissionCache?;
     private formRepository;
-    private static readonly submissionLocks;
+    private readonly resultLogger;
+    private static readonly SUBMISSION_CLAIM_TTL_MS;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, formBuilderConfig: FormBuilderConfigService, dataSourceProvider: FormBuilderDataSourceProvider, formEmailAuthService: FormEmailAuthService, permissionResolver?: IPermissionResolver | undefined, permissionCache?: SharedPermissionCacheService | undefined);
+    protected cacheDependencies(): string[];
     private ensureFormRepositoryInitialized;
-    private withSubmissionLock;
+    private withSubmissionClaim;
     private getActiveForm;
     private applyCompanyFilterToQuery;
     private static readonly PUBLICLY_SUBMITTABLE_ACCESS_TYPES;
     private validateSubmissionAccess;
     private resolveEmailVerifiedSubmitter;
+    private isSingleResponse;
     private assertSingleResponseNotExceeded;
     private buildUserDraftWhere;
     getSelectQuery(query: SelectQueryBuilder<FormResult>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
@@ -41,10 +44,10 @@ export declare class FormResultService extends ApiService<CreateFormResultDto, U
     protected convertEntityToResponseDto(entity: FormResult, _isRaw: boolean): IFormResult;
     submitForm(dto: SubmitFormDto, user: ILoggedUserInfo | null, isPublic?: boolean): Promise<IFormResult>;
     private persistSubmission;
+    private writeSubmission;
     getMyDraft(formId: string, user: ILoggedUserInfo): Promise<IFormResult | null>;
     updateDraft(draftId: string, dto: SubmitFormDto, user: ILoggedUserInfo): Promise<IFormResult>;
     private publishSubmissionEvent;
-    private invalidateResultCache;
     getByFormId(formId: string, user: ILoggedUserInfo | null, pagination?: {
         page?: number;
         pageSize?: number;