@naturalcycles/abba 1.25.2 → 1.26.0

package/dist/abba.d.ts

@@ -36,6 +36,8 @@ export declare class Abba {
     private updateExclusions;
     /**
      * Delete an experiment. Removes all user assignments and buckets.
+     * Requires the experiment to have been inactive for at least 15 minutes in order to
+     * avoid row locking issues.
      * Cold method.
      */
     deleteExperiment(experimentId: string): Promise<void>;

package/dist/abba.js

@@ -12,7 +12,7 @@ const util_1 = require("./util");
 /**
  * 10 minutes
  */
-const CACHE_TTL = 600_000; // 10 minutes
+const CACHE_TTL = 600_000;
 class Abba {
     constructor(cfg) {
         this.cfg = cfg;
@@ -103,9 +103,15 @@ class Abba {
     }
     /**
      * Delete an experiment. Removes all user assignments and buckets.
+     * Requires the experiment to have been inactive for at least 15 minutes in order to
+     * avoid row locking issues.
      * Cold method.
      */
     async deleteExperiment(experimentId) {
+        const experiment = await this.experimentDao.requireById(experimentId);
+        const hasBeenInactiveFor15Mins = experiment.status === types_1.AssignmentStatus.Inactive &&
+            (0, js_lib_1.localTime)(experiment.updated).isOlderThan(15, 'minute');
+        (0, js_lib_1._assert)(hasBeenInactiveFor15Mins, 'Experiment must be inactive for at least 15 minutes before deletion');
         const userAssignmentDeleteQuery = this.userAssignmentDao
             .query()
             .filterEq('experimentId', experimentId);

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import { CommonDB } from '@naturalcycles/db-lib';
-import { AnyObject, BaseDBEntity, IsoDateString, Saved } from '@naturalcycles/js-lib';
+import { AnyObject, BaseDBEntity, IsoDate, Saved } from '@naturalcycles/js-lib';
 export interface AbbaConfig {
     db: CommonDB;
 }
@@ -24,11 +24,11 @@ export type BaseExperiment = BaseDBEntity & {
     /**
      * Date range start for the experiment assignments
      */
-    startDateIncl: IsoDateString;
+    startDateIncl: IsoDate;
     /**
      * Date range end for the experiment assignments
      */
-    endDateExcl: IsoDateString;
+    endDateExcl: IsoDate;
 };
 export type Experiment = BaseExperiment & {
     rules: SegmentationRule[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/abba",
-  "version": "1.25.2",
+  "version": "1.26.0",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",
@@ -39,7 +39,7 @@
     "url": "https://github.com/NaturalCycles/abba"
   },
   "engines": {
-    "node": ">=20.13.0"
+    "node": ">=22.10.0"
   },
   "description": "AB test assignment configuration tool for Node.js",
   "author": "Natural Cycles Team",

package/src/abba.ts

@@ -1,4 +1,4 @@
-import { _assert, _Memo, _shuffle, pMap, Unsaved } from '@naturalcycles/js-lib'
+import { _assert, _Memo, _shuffle, localTime, pMap, Unsaved } from '@naturalcycles/js-lib'
 import { LRUMemoCache } from '@naturalcycles/nodejs-lib'
 import { SegmentationData } from '.'
 import { bucketDao } from './dao/bucket.dao'
@@ -25,7 +25,7 @@ import {
 /**
  * 10 minutes
  */
-const CACHE_TTL = 600_000 // 10 minutes
+const CACHE_TTL = 600_000
 
 export class Abba {
   private experimentDao = experimentDao(this.cfg.db)
@@ -149,9 +149,21 @@ export class Abba {
 
   /**
    * Delete an experiment. Removes all user assignments and buckets.
+   * Requires the experiment to have been inactive for at least 15 minutes in order to
+   * avoid row locking issues.
    * Cold method.
    */
   async deleteExperiment(experimentId: string): Promise<void> {
+    const experiment = await this.experimentDao.requireById(experimentId)
+
+    const hasBeenInactiveFor15Mins =
+      experiment.status === AssignmentStatus.Inactive &&
+      localTime(experiment.updated).isOlderThan(15, 'minute')
+    _assert(
+      hasBeenInactiveFor15Mins,
+      'Experiment must be inactive for at least 15 minutes before deletion',
+    )
+
     const userAssignmentDeleteQuery = this.userAssignmentDao
       .query()
       .filterEq('experimentId', experimentId)

package/src/dao/experiment.dao.ts

@@ -1,5 +1,5 @@
 import { CommonDao, CommonDB } from '@naturalcycles/db-lib'
-import { IsoDateString, localDate, Saved } from '@naturalcycles/js-lib'
+import { IsoDate, localDate, Saved } from '@naturalcycles/js-lib'
 import { BaseExperiment, Experiment } from '../types'
 
 type ExperimentDBM = Saved<BaseExperiment> & {
@@ -46,8 +46,8 @@ export const experimentDao = (db: CommonDB): ExperimentDao =>
  * MySQL Automatically parses Date fields as Date objects
  * For simplicity let's not do that by having this function...
  */
-function parseMySQLDate(date: string): IsoDateString {
+function parseMySQLDate(date: string): IsoDate {
   // @ts-expect-error
   if (date instanceof Date) return localDate(date).toISODate()
-  return date
+  return date as IsoDate
 }

package/src/types.ts

@@ -1,5 +1,5 @@
 import { CommonDB } from '@naturalcycles/db-lib'
-import { AnyObject, BaseDBEntity, IsoDateString, Saved } from '@naturalcycles/js-lib'
+import { AnyObject, BaseDBEntity, IsoDate, Saved } from '@naturalcycles/js-lib'
 
 export interface AbbaConfig {
   db: CommonDB
@@ -26,11 +26,11 @@ export type BaseExperiment = BaseDBEntity & {
   /**
    * Date range start for the experiment assignments
    */
-  startDateIncl: IsoDateString
+  startDateIncl: IsoDate
   /**
    * Date range end for the experiment assignments
    */
-  endDateExcl: IsoDateString
+  endDateExcl: IsoDate
 }
 
 export type Experiment = BaseExperiment & {