fix: fix instance auto deletion (#35)

Author: terriblygood

docs/en/farm-config-json.md

@@ -27,7 +27,7 @@ Git repository format: `https://<token>@github.com/<repositoryPath>.git`.
 ### `instanceDeleteTimeout`
 - *Number*
 - *Optional*
-> Ms time after which only **generated** instances will be removed. Default is unset (instances will **not** be removed)
+> Ms after creation after which only **generated** instances are removed (same lifecycle status as when stopped: rows stay `generated` in DB). Default is **30 days** when omitted. Instances the provider still reports as **running** are not queued for deletion. Set to `0` or a negative value to turn off automatic deletion.
 
 ### `urlTemplate`
 - *String*

docs/ru/farm-config-json.md

@@ -27,7 +27,7 @@
 ### `instanceDeleteTimeout`
 - *Number*
 - *Optional*
-> Время в мс, по истечении которого только **сгенерированные** инстансы будут удалены. По умолчанию не установлено (инстансы **не будут** удалены)
+> Время в мс с момента **создания**, по истечении которого **сгенерированные** инстансы ставятся в очередь на удаление (в БД статус остаётся `generated`, как и у остановленных). Если не задано — по умолчанию **30 суток**. Инстансы, которые провайдер по-прежнему считает **running**, в очередь на удаление не попадают. Значение `0` или отрицательное число отключает автоудаление.
 
 ### `urlTemplate`
 - *String*

src/server/utils/butler.ts

@@ -14,7 +14,7 @@ const Locker = {
 };
 
 const globalInstanceStopTimeout = getGlobalFarmConfig().instanceStopTimeout ?? ms('1h');
-const globalInstanceDeleteTimeout = getGlobalFarmConfig().instanceDeleteTimeout;
+const globalInstanceDeleteTimeout = getGlobalFarmConfig().instanceDeleteTimeout ?? ms('30d');
 
 export const isTimeout = (now: number, time: number, timeout: number) => {
     const diff = now - time;
@@ -67,17 +67,22 @@ const stopInstances = async () => {
 };
 
 const deleteInstancesByTTL = async () => {
-    if (!globalInstanceDeleteTimeout || Locker.deleteInstances) {
+    if (globalInstanceDeleteTimeout <= 0 || Locker.deleteInstances) {
         return;
     }
 
     try {
         Locker.deleteInstances = true;
 
         const instancesToDelete = await db.getInstancesByTTL(globalInstanceDeleteTimeout);
+        const providerInstances = await getFarmProvider().getInstances();
+        const runningHashes = new Set(
+            providerInstances.filter((p) => p.status === 'running').map((p) => p.hash),
+        );
+        const instancesSafeToDelete = instancesToDelete.filter((i) => !runningHashes.has(i.hash));
 
         await Promise.all(
-            instancesToDelete.map((instance) =>
+            instancesSafeToDelete.map((instance) =>
                 instanceUtils
                     .addInstanceToDeleteQueue(instance)
                     .catch(() => console.warn(`error while deleting instance "${instance.hash}"`)),

src/shared/common.ts

@@ -67,7 +67,9 @@ export interface FarmConfigBase {
     /**
      * Instance life before deletion in ms.
      *
-     * Deletes only `generated` instances, that were created more than `instanceDeleteTimeout` ms ago.
+     * Deletes only `generated` instances whose `createdAt` is older than this value.
+     * Instances still reported as `running` by the provider are skipped until they stop.
+     * When omitted, defaults to 30 days. Set to `0` or a negative value to disable automatic deletion.
      */
     instanceDeleteTimeout?: number;
     autoStartDelay?: number;