extend update notification campaign

foundation for granting the full version while consuming the same amount
automatically at the next purchase

.eslintignore

@@ -1,3 +0,0 @@
-node_modules
-build
-scripts

.eslintrc.js

@@ -1,14 +0,0 @@
-module.exports = {
-  root: true,
-  parser: '@typescript-eslint/parser',
-  plugins: [
-    '@typescript-eslint',
-  ],
-  extends: [
-    'eslint:recommended',
-    'plugin:@typescript-eslint/recommended',
-  ],
-  env: {
-    node: true
-  }
-};

Dockerfile

@@ -1,11 +1,11 @@
-FROM node:16-alpine
+FROM node:24-alpine
 
 # Create app directories
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 # Install app dependencies
-COPY package.json package-lock.json tsconfig.json .eslintignore .eslintrc.js Readme.md /usr/src/app/
+COPY package.json package-lock.json tsconfig.json eslint.config.mjs Readme.md /usr/src/app/
 COPY src/ /usr/src/app/src/
 COPY scripts/ /usr/src/app/scripts/
 COPY other/ /usr/src/app/other/

docs/api/admin.md

@@ -96,10 +96,14 @@ Use this to unlock all features for one user for a specified duration.
 
 ### request
 
-request properties: ``purchaseToken`` and ``purchaseId``
+request properties: ``purchaseToken``, ``purchaseId`` and ``dryRun``
 
 - ``purchasetoken`` is a string which the client shows at the purchase screen
 - ``purchaseId`` is the ID that is used at the bill
+- ``dryRun`` is a boolean
+  - setting true will skip the actual unlocking
+  - false will add a four week tolerance to the token expiry to permit checking now and unlocking later
+- ``type`` is a string and must be ``year``, ``month`` or ``unpaid14``
 
 ### response
 
@@ -120,6 +124,7 @@ The response contains the following properties:
   - optional object
   - should be shown to the support
 - ``wasAlreadyExecuted`` (boolean, set if and only if ``ok`` is true)
+- ``mail`` (string, set if and only if ``ok`` is true)
 
 If the request was malformed: HTTP status code 400 Bad Request
 

docs/api/auth.md

@@ -41,6 +41,10 @@ If a whitelist was configured and the mail address is not within it: ``{"mailAdd
 
 If a blacklist was configured and the mail server is within it: ``{"mailServerBlacklisted": true}``
 
+If a temporarily blacklist was configured and the mail server is within it (used in case of known mail delivery issues): ``{"mailServerBlacklistedTemporarily": true}``
+
+If the client is suspicious: ``{"blockedForIntegrityReasons": true}``
+
 On success: a object with a ``mailLoginToken`` of the type string
 
 #### example response

docs/api/purchase.md

@@ -15,6 +15,8 @@ Use this before a purchase to check if a purchase is possible.
 
 see [this JSON schema](../schema/candopurchaserequest.md)
 
+Note that ``type`` is not used at all.
+
 ### response
 
 On a invalid request body: HTTP status code 400 Bad request

docs/schema/CanDoPurchaseRequest.schema.json

@@ -14,8 +14,7 @@
   },
   "additionalProperties": false,
   "required": [
-    "deviceAuthToken",
+    "deviceAuthToken"
-    "type"
   ],
   "definitions": {},
   "$schema": "http://json-schema.org/draft-07/schema#",

docs/schema/README.md

@@ -130,6 +130,8 @@
 
 * [SerializedMarkTaskPendingAction](./serializedapplogicaction-definitions-serializedmarktaskpendingaction.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedMarkTaskPendingAction`
 
+* [SerializedPingAction](./serializedapplogicaction-definitions-serializedpingaction.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction`
+
 * [SerializedRemoveCategoryAppsAction](./serializedparentaction-definitions-serializedremovecategoryappsaction.md) – `https://timelimit.io/SerializedParentAction#/definitions/SerializedRemoveCategoryAppsAction`
 
 * [SerializedRemoveInstalledAppsAction](./serializedapplogicaction-definitions-serializedremoveinstalledappsaction.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedRemoveInstalledAppsAction`
@@ -238,6 +240,8 @@
 
 * [ServerKeyResponse](./serverdatastatus-definitions-serverkeyresponse.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerKeyResponse`
 
+* [ServerPing](./serverdatastatus-definitions-serverping.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerPing`
+
 * [ServerSessionDurationItem](./serverdatastatus-definitions-serversessiondurationitem.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerSessionDurationItem`
 
 * [ServerTimeLimitRule](./serverdatastatus-definitions-servertimelimitrule.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerTimeLimitRule`
@@ -270,14 +274,6 @@
 
 * [Untitled object in ClientPullChangesRequest](./clientpullchangesrequest-definitions-clientdatastatus-properties-devicesdetail.md) – `https://timelimit.io/ClientPullChangesRequest#/definitions/ClientDataStatus/properties/devicesDetail`
 
-*   [Untitled object in ClientPullChangesRequest](./clientpullchangesrequest-definitions-clientdatastatus-properties-apps.md) – `https://timelimit.io/ClientPullChangesRequest#/definitions/ClientDataStatus/properties/apps`
-
-*   [Untitled object in ClientPullChangesRequest](./clientpullchangesrequest-definitions-clientdatastatus-properties-categories.md) – `https://timelimit.io/ClientPullChangesRequest#/definitions/ClientDataStatus/properties/categories`
-
-*   [Untitled object in ClientPullChangesRequest](./clientpullchangesrequest-definitions-clientdatastatus-properties-devicesdetail.md) – `https://timelimit.io/ClientPullChangesRequest#/definitions/ClientDataStatus/properties/devicesDetail`
-
-*   [Untitled object in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedaddusedtimeactionversion2-properties-i-items.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedAddUsedTimeActionVersion2/properties/i/items`
-
 * [Untitled object in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedaddusedtimeactionversion2-properties-i-items.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedAddUsedTimeActionVersion2/properties/i/items`
 
 ### Arrays
@@ -306,32 +302,6 @@
 
 * [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedupdateappactivitiesaction-properties-updatedoradded.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateAppActivitiesAction/properties/updatedOrAdded`
 
-*   [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedaddinstalledappsaction-properties-apps.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedAddInstalledAppsAction/properties/apps`
-
-*   [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedaddusedtimeactionversion2-properties-i.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedAddUsedTimeActionVersion2/properties/i`
-
-*   [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedaddusedtimeactionversion2-properties-i-items-properties-as.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedAddUsedTimeActionVersion2/properties/i/items/properties/as`
-
-*   [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedaddusedtimeactionversion2-properties-i-items-properties-as-items.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedAddUsedTimeActionVersion2/properties/i/items/properties/as/items`
-
-*   [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedaddusedtimeactionversion2-properties-i-items-properties-sdl.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedAddUsedTimeActionVersion2/properties/i/items/properties/sdl`
-
-*   [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedaddusedtimeactionversion2-properties-i-items-properties-sdl-items.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedAddUsedTimeActionVersion2/properties/i/items/properties/sdl/items`
-
-*   [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedremoveinstalledappsaction-properties-packagenames.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedRemoveInstalledAppsAction/properties/packageNames`
-
-*   [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedupdateappactivitiesaction-properties-removed.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateAppActivitiesAction/properties/removed`
-
-*   [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedupdateappactivitiesaction-properties-removed-items.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateAppActivitiesAction/properties/removed/items`
-
-*   [Untitled array in SerializedAppLogicAction](./serializedapplogicaction-definitions-serializedupdateappactivitiesaction-properties-updatedoradded.md) – `https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateAppActivitiesAction/properties/updatedOrAdded`
-
-*   [Untitled array in SerializedParentAction](./serializedparentaction-definitions-serializedaddcategoryappsaction-properties-packagenames.md) – `https://timelimit.io/SerializedParentAction#/definitions/SerializedAddCategoryAppsAction/properties/packageNames`
-
-*   [Untitled array in SerializedParentAction](./serializedparentaction-definitions-serializedremovecategoryappsaction-properties-packagenames.md) – `https://timelimit.io/SerializedParentAction#/definitions/SerializedRemoveCategoryAppsAction/properties/packageNames`
-
-*   [Untitled array in SerializedParentAction](./serializedparentaction-definitions-serializedupdatecategorysortingaction-properties-categoryids.md) – `https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateCategorySortingAction/properties/categoryIds`
-
 * [Untitled array in SerializedParentAction](./serializedparentaction-definitions-serializedaddcategoryappsaction-properties-packagenames.md) – `https://timelimit.io/SerializedParentAction#/definitions/SerializedAddCategoryAppsAction/properties/packageNames`
 
 * [Untitled array in SerializedParentAction](./serializedparentaction-definitions-serializedremovecategoryappsaction-properties-packagenames.md) – `https://timelimit.io/SerializedParentAction#/definitions/SerializedRemoveCategoryAppsAction/properties/packageNames`
@@ -380,29 +350,7 @@
 
 * [Untitled array in ServerDataStatus](./serverdatastatus-properties-kr.md) – `https://timelimit.io/ServerDataStatus#/properties/kr`
 
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-u2fdata-properties-d.md) – `https://timelimit.io/ServerDataStatus#/definitions/U2fData/properties/d`
+* [Untitled array in ServerDataStatus](./serverdatastatus-properties-pings.md) – `https://timelimit.io/ServerDataStatus#/properties/pings`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serverdevicelist-properties-data.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceList/properties/data`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serverinstalledappsdata-properties-apps.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerInstalledAppsData/properties/apps`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serverinstalledappsdata-properties-activities.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerInstalledAppsData/properties/activities`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serverupdatedcategorybasedata-properties-networks.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerUpdatedCategoryBaseData/properties/networks`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serverupdatedcategorybasedata-properties-atw.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerUpdatedCategoryBaseData/properties/atw`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serverupdatedcategoryassignedapps-properties-apps.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerUpdatedCategoryAssignedApps/properties/apps`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serverupdatedcategoryusedtimes-properties-times.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerUpdatedCategoryUsedTimes/properties/times`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serverupdatedcategoryusedtimes-properties-sessiondurations.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerUpdatedCategoryUsedTimes/properties/sessionDurations`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serverupdatedtimelimitrules-properties-rules.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerUpdatedTimeLimitRules/properties/rules`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serverupdatedcategorytasks-properties-tasks.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerUpdatedCategoryTasks/properties/tasks`
-
-*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-serveruserlist-properties-data.md) – `https://timelimit.io/ServerDataStatus#/definitions/ServerUserList/properties/data`
 
 * [Untitled array in ServerDataStatus](./serverdatastatus-definitions-u2fdata-properties-d.md) – `https://timelimit.io/ServerDataStatus#/definitions/U2fData/properties/d`
 

docs/schema/SerializedAppLogicAction.schema.json

@@ -21,6 +21,9 @@
     {
       "$ref": "#/definitions/SerializedMarkTaskPendingAction"
     },
+    {
+      "$ref": "#/definitions/SerializedPingAction"
+    },
     {
       "$ref": "#/definitions/SerializedUpdateInstalledAppsAction"
     },
@@ -309,6 +312,43 @@
       ],
       "title": "SerializedMarkTaskPendingAction"
     },
+    "SerializedPingAction": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "PING"
+          ]
+        },
+        "deviceId": {
+          "type": "string"
+        },
+        "event": {
+          "$ref": "#/definitions/PingEvent"
+        },
+        "token": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "deviceId",
+        "event",
+        "token",
+        "type"
+      ],
+      "title": "SerializedPingAction"
+    },
+    "PingEvent": {
+      "enum": [
+        "clear",
+        "ping",
+        "pong"
+      ],
+      "type": "string",
+      "title": "PingEvent"
+    },
     "SerializedUpdateInstalledAppsAction": {
       "type": "object",
       "properties": {

docs/schema/SerializedParentAction.schema.json

@@ -410,6 +410,9 @@
         },
         "perDay": {
           "type": "boolean"
+        },
+        "e": {
+          "type": "number"
         }
       },
       "additionalProperties": false,
@@ -1458,6 +1461,9 @@
         },
         "perDay": {
           "type": "boolean"
+        },
+        "e": {
+          "type": "number"
         }
       },
       "additionalProperties": false,

docs/schema/ServerDataStatus.schema.json

@@ -67,6 +67,12 @@
         "$ref": "#/definitions/ServerKeyResponse"
       }
     },
+    "pings": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/ServerPing"
+      }
+    },
     "dh": {
       "$ref": "#/definitions/ServerDhKey"
     },
@@ -927,6 +933,31 @@
       ],
       "title": "ServerKeyResponse"
     },
+    "ServerPing": {
+      "type": "object",
+      "properties": {
+        "deviceId": {
+          "type": "string"
+        },
+        "token": {
+          "type": "string"
+        },
+        "type": {
+          "enum": [
+            "ping",
+            "pong"
+          ],
+          "type": "string"
+        }
+      },
+      "additionalProperties": false,
+      "required": [
+        "deviceId",
+        "token",
+        "type"
+      ],
+      "title": "ServerPing"
+    },
     "ServerDhKey": {
       "type": "object",
       "properties": {

docs/schema/candopurchaserequest.md

@@ -18,7 +18,7 @@ https://timelimit.io/CanDoPurchaseRequest
 
 | Property                            | Type     | Required | Nullable       | Defined by                                                                                                                                         |
 | :---------------------------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type)                       | `string` | Required | cannot be null | [CanDoPurchaseRequest](candopurchaserequest-properties-type.md "https://timelimit.io/CanDoPurchaseRequest#/properties/type")                       |
+| [type](#type)                       | `string` | Optional | cannot be null | [CanDoPurchaseRequest](candopurchaserequest-properties-type.md "https://timelimit.io/CanDoPurchaseRequest#/properties/type")                       |
 | [deviceAuthToken](#deviceauthtoken) | `string` | Required | cannot be null | [CanDoPurchaseRequest](candopurchaserequest-properties-deviceauthtoken.md "https://timelimit.io/CanDoPurchaseRequest#/properties/deviceAuthToken") |
 
 ## type
@@ -27,7 +27,7 @@ https://timelimit.io/CanDoPurchaseRequest
 
 `type`
 
-*   is required
+* is optional
 
 * Type: `string`
 

docs/schema/serializedapplogicaction-definitions-pingevent.md

@@ -0,0 +1,25 @@
+# PingEvent Schema
+
+```txt
+https://timelimit.io/SerializedAppLogicAction#/definitions/PingEvent
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                            |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :---------------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [SerializedAppLogicAction.schema.json\*](SerializedAppLogicAction.schema.json "open original schema") |
+
+## PingEvent Type
+
+`string` ([PingEvent](serializedapplogicaction-definitions-pingevent.md))
+
+## PingEvent Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value     | Explanation |
+| :-------- | :---------- |
+| `"clear"` |             |
+| `"ping"`  |             |
+| `"pong"`  |             |

docs/schema/serializedapplogicaction-definitions-serializedpingaction-properties-deviceid.md

@@ -0,0 +1,15 @@
+# Untitled string in SerializedAppLogicAction Schema
+
+```txt
+https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/deviceId
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                            |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :---------------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [SerializedAppLogicAction.schema.json\*](SerializedAppLogicAction.schema.json "open original schema") |
+
+## deviceId Type
+
+`string`

docs/schema/serializedapplogicaction-definitions-serializedpingaction-properties-pingevent.md

@@ -0,0 +1,25 @@
+# PingEvent Schema
+
+```txt
+https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/event
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                            |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :---------------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [SerializedAppLogicAction.schema.json\*](SerializedAppLogicAction.schema.json "open original schema") |
+
+## event Type
+
+`string` ([PingEvent](serializedapplogicaction-definitions-serializedpingaction-properties-pingevent.md))
+
+## event Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value     | Explanation |
+| :-------- | :---------- |
+| `"clear"` |             |
+| `"ping"`  |             |
+| `"pong"`  |             |

docs/schema/serializedapplogicaction-definitions-serializedpingaction-properties-token.md

@@ -0,0 +1,15 @@
+# Untitled string in SerializedAppLogicAction Schema
+
+```txt
+https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/token
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                            |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :---------------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [SerializedAppLogicAction.schema.json\*](SerializedAppLogicAction.schema.json "open original schema") |
+
+## token Type
+
+`string`

docs/schema/serializedapplogicaction-definitions-serializedpingaction-properties-type.md

@@ -0,0 +1,23 @@
+# Untitled string in SerializedAppLogicAction Schema
+
+```txt
+https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/type
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                            |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :---------------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [SerializedAppLogicAction.schema.json\*](SerializedAppLogicAction.schema.json "open original schema") |
+
+## type Type
+
+`string`
+
+## type Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value    | Explanation |
+| :------- | :---------- |
+| `"PING"` |             |

docs/schema/serializedapplogicaction-definitions-serializedpingaction.md

@@ -0,0 +1,114 @@
+# SerializedPingAction Schema
+
+```txt
+https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                            |
+| :------------------ | :--------- | :------------- | :----------- | :---------------- | :-------------------- | :------------------ | :---------------------------------------------------------------------------------------------------- |
+| Can be instantiated | No         | Unknown status | No           | Forbidden         | Forbidden             | none                | [SerializedAppLogicAction.schema.json\*](SerializedAppLogicAction.schema.json "open original schema") |
+
+## SerializedPingAction Type
+
+`object` ([SerializedPingAction](serializedapplogicaction-definitions-serializedpingaction.md))
+
+# SerializedPingAction Properties
+
+| Property              | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                         |
+| :-------------------- | :------- | :------- | :------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [type](#type)         | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/type")         |
+| [deviceId](#deviceid) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-deviceid.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/deviceId") |
+| [event](#event)       | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-pingevent.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/event")   |
+| [token](#token)       | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-token.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/token")       |
+
+## type
+
+
+
+`type`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/type")
+
+### type Type
+
+`string`
+
+### type Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value    | Explanation |
+| :------- | :---------- |
+| `"PING"` |             |
+
+## deviceId
+
+
+
+`deviceId`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-deviceid.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/deviceId")
+
+### deviceId Type
+
+`string`
+
+## event
+
+
+
+`event`
+
+* is required
+
+* Type: `string` ([PingEvent](serializedapplogicaction-definitions-serializedpingaction-properties-pingevent.md))
+
+* cannot be null
+
+* defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-pingevent.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/event")
+
+### event Type
+
+`string` ([PingEvent](serializedapplogicaction-definitions-serializedpingaction-properties-pingevent.md))
+
+### event Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value     | Explanation |
+| :-------- | :---------- |
+| `"clear"` |             |
+| `"ping"`  |             |
+| `"pong"`  |             |
+
+## token
+
+
+
+`token`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-token.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/token")
+
+### token Type
+
+`string`

docs/schema/serializedapplogicaction.md

@@ -30,6 +30,8 @@ any of
 
 * [SerializedMarkTaskPendingAction](serializedapplogicaction-definitions-serializedmarktaskpendingaction.md "check type definition")
 
+* [SerializedPingAction](serializedapplogicaction-definitions-serializedpingaction.md "check type definition")
+
 * [SerializedUpdateInstalledAppsAction](serializedapplogicaction-definitions-serializedupdateinstalledappsaction.md "check type definition")
 
 * [SerializedRemoveInstalledAppsAction](serializedapplogicaction-definitions-serializedremoveinstalledappsaction.md "check type definition")
@@ -688,6 +690,122 @@ Reference this group by using
 
 `string`
 
+## Definitions group SerializedPingAction
+
+Reference this group by using
+
+```json
+{"$ref":"https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction"}
+```
+
+| Property              | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                         |
+| :-------------------- | :------- | :------- | :------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [type](#type-7)       | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/type")         |
+| [deviceId](#deviceid) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-deviceid.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/deviceId") |
+| [event](#event)       | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-pingevent.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/event")   |
+| [token](#token)       | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-token.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/token")       |
+
+### type
+
+
+
+`type`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/type")
+
+#### type Type
+
+`string`
+
+#### type Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value    | Explanation |
+| :------- | :---------- |
+| `"PING"` |             |
+
+### deviceId
+
+
+
+`deviceId`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-deviceid.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/deviceId")
+
+#### deviceId Type
+
+`string`
+
+### event
+
+
+
+`event`
+
+* is required
+
+* Type: `string` ([PingEvent](serializedapplogicaction-definitions-serializedpingaction-properties-pingevent.md))
+
+* cannot be null
+
+* defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-pingevent.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/event")
+
+#### event Type
+
+`string` ([PingEvent](serializedapplogicaction-definitions-serializedpingaction-properties-pingevent.md))
+
+#### event Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value     | Explanation |
+| :-------- | :---------- |
+| `"clear"` |             |
+| `"ping"`  |             |
+| `"pong"`  |             |
+
+### token
+
+
+
+`token`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedpingaction-properties-token.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedPingAction/properties/token")
+
+#### token Type
+
+`string`
+
+## Definitions group PingEvent
+
+Reference this group by using
+
+```json
+{"$ref":"https://timelimit.io/SerializedAppLogicAction#/definitions/PingEvent"}
+```
+
+| Property | Type | Required | Nullable | Defined by |
+| :------- | :--- | :------- | :------- | :--------- |
+
 ## Definitions group SerializedUpdateInstalledAppsAction
 
 Reference this group by using
@@ -698,7 +816,7 @@ Reference this group by using
 
 | Property        | Type      | Required | Nullable       | Defined by                                                                                                                                                                                                                               |
 | :-------------- | :-------- | :------- | :------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-7) | `string`  | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateinstalledappsaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateInstalledAppsAction/properties/type") |
+| [type](#type-8) | `string`  | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateinstalledappsaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateInstalledAppsAction/properties/type") |
 | [b](#b)         | `string`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateinstalledappsaction-properties-b.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateInstalledAppsAction/properties/b")       |
 | [d](#d-1)       | `string`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateinstalledappsaction-properties-d.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateInstalledAppsAction/properties/d")       |
 | [w](#w)         | `boolean` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateinstalledappsaction-properties-w.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateInstalledAppsAction/properties/w")       |
@@ -793,7 +911,7 @@ Reference this group by using
 
 | Property                      | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                                               |
 | :---------------------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-8)               | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedremoveinstalledappsaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedRemoveInstalledAppsAction/properties/type")                 |
+| [type](#type-9)               | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedremoveinstalledappsaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedRemoveInstalledAppsAction/properties/type")                 |
 | [packageNames](#packagenames) | `array`  | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedremoveinstalledappsaction-properties-packagenames.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedRemoveInstalledAppsAction/properties/packageNames") |
 
 ### type
@@ -850,9 +968,9 @@ Reference this group by using
 
 | Property                    | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                                 |
 | :-------------------------- | :------- | :------- | :------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-9)             | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsendkeyrequestaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSendKeyRequestAction/properties/type")             |
+| [type](#type-10)            | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsendkeyrequestaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSendKeyRequestAction/properties/type")             |
 | [dsn](#dsn-1)               | `number` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsendkeyrequestaction-properties-dsn.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSendKeyRequestAction/properties/dsn")               |
-| [deviceId](#deviceid)       | `string` | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsendkeyrequestaction-properties-deviceid.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSendKeyRequestAction/properties/deviceId")     |
+| [deviceId](#deviceid-1)     | `string` | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsendkeyrequestaction-properties-deviceid.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSendKeyRequestAction/properties/deviceId")     |
 | [categoryId](#categoryid-1) | `string` | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsendkeyrequestaction-properties-categoryid.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSendKeyRequestAction/properties/categoryId") |
 | [dataType](#datatype)       | `number` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsendkeyrequestaction-properties-datatype.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSendKeyRequestAction/properties/dataType")     |
 | [tempKey](#tempkey-1)       | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsendkeyrequestaction-properties-tempkey.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSendKeyRequestAction/properties/tempKey")       |
@@ -1002,7 +1120,7 @@ Reference this group by using
 
 | Property         | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                       |
 | :--------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-10) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsignoutatdeviceaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSignOutAtDeviceAction/properties/type") |
+| [type](#type-11) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsignoutatdeviceaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSignOutAtDeviceAction/properties/type") |
 
 ### type
 
@@ -1040,7 +1158,7 @@ Reference this group by using
 
 | Property         | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                                           |
 | :--------------- | :------- | :------- | :------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-11) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serialiezdtrieddisablingdeviceadminaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerialiezdTriedDisablingDeviceAdminAction/properties/type") |
+| [type](#type-12) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serialiezdtrieddisablingdeviceadminaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerialiezdTriedDisablingDeviceAdminAction/properties/type") |
 
 ### type
 
@@ -1078,7 +1196,7 @@ Reference this group by using
 
 | Property                          | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                                                   |
 | :-------------------------------- | :------- | :------- | :------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-12)                  | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateappactivitiesaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateAppActivitiesAction/properties/type")                     |
+| [type](#type-13)                  | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateappactivitiesaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateAppActivitiesAction/properties/type")                     |
 | [removed](#removed)               | `array`  | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateappactivitiesaction-properties-removed.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateAppActivitiesAction/properties/removed")               |
 | [updatedOrAdded](#updatedoradded) | `array`  | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateappactivitiesaction-properties-updatedoradded.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateAppActivitiesAction/properties/updatedOrAdded") |
 
@@ -1230,7 +1348,7 @@ Reference this group by using
 
 | Property                                                    | Type      | Required | Nullable       | Defined by                                                                                                                                                                                                                                                                           |
 | :---------------------------------------------------------- | :-------- | :------- | :------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-13)                                            | `string`  | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/type")                                               |
+| [type](#type-14)                                            | `string`  | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/type")                                               |
 | [protectionLevel](#protectionlevel)                         | `string`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-protectionlevel.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/protectionLevel")                         |
 | [usageStats](#usagestats)                                   | `string`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-usagestats.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/usageStats")                                   |
 | [notificationAccess](#notificationaccess)                   | `string`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-notificationaccess.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/notificationAccess")                   |
@@ -1518,7 +1636,7 @@ Reference this group by using
 
 | Property         | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                                   |
 | :--------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-14) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializeduploaddevicepublickeyaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUploadDevicePublicKeyAction/properties/type") |
+| [type](#type-15) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializeduploaddevicepublickeyaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUploadDevicePublicKeyAction/properties/type") |
 | [key](#key)      | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializeduploaddevicepublickeyaction-properties-key.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUploadDevicePublicKeyAction/properties/key")   |
 
 ### type

docs/schema/serializedparentaction-definitions-encryptableparentpassword.md

@@ -1,7 +1,7 @@
 # EncryptableParentPassword Schema
 
 ```txt
-https://timelimit.io/SerializedParentAction#/definitions/SerializedSetChildPasswordAction/properties/newPassword
+https://timelimit.io/SerializedParentAction#/definitions/EncryptableParentPassword
 ```
 
 
@@ -10,11 +10,11 @@ https://timelimit.io/SerializedParentAction#/definitions/SerializedSetChildPassw
 | :------------------ | :--------- | :------------- | :----------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------------------ |
 | Can be instantiated | No         | Unknown status | No           | Forbidden         | Forbidden             | none                | [SerializedParentAction.schema.json\*](SerializedParentAction.schema.json "open original schema") |
 
-## newPassword Type
+## EncryptableParentPassword Type
 
 `object` ([EncryptableParentPassword](serializedparentaction-definitions-encryptableparentpassword.md))
 
-# newPassword Properties
+# EncryptableParentPassword Properties
 
 | Property                  | Type      | Required | Nullable       | Defined by                                                                                                                                                                                                                 |
 | :------------------------ | :-------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |

docs/schema/serializedparentaction-definitions-serializedtimelimitrule-properties-e.md

@@ -0,0 +1,15 @@
+# Untitled number in SerializedParentAction Schema
+
+```txt
+https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/e
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                        |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------------------ |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [SerializedParentAction.schema.json\*](SerializedParentAction.schema.json "open original schema") |
+
+## e Type
+
+`number`

docs/schema/serializedparentaction-definitions-serializedtimelimitrule.md

@@ -28,6 +28,7 @@ https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule
 | [dur](#dur)               | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedtimelimitrule-properties-dur.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/dur")               |
 | [pause](#pause)           | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedtimelimitrule-properties-pause.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/pause")           |
 | [perDay](#perday)         | `boolean` | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedtimelimitrule-properties-perday.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/perDay")         |
+| [e](#e)                   | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedtimelimitrule-properties-e.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/e")                   |
 
 ## ruleId
 
@@ -208,3 +209,21 @@ https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule
 ### perDay Type
 
 `boolean`
+
+## e
+
+
+
+`e`
+
+* is optional
+
+* Type: `number`
+
+* cannot be null
+
+* defined in: [SerializedParentAction](serializedparentaction-definitions-serializedtimelimitrule-properties-e.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/e")
+
+### e Type
+
+`number`

docs/schema/serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-e.md

@@ -0,0 +1,15 @@
+# Untitled number in SerializedParentAction Schema
+
+```txt
+https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/e
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                        |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------------------ |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [SerializedParentAction.schema.json\*](SerializedParentAction.schema.json "open original schema") |
+
+## e Type
+
+`number`

docs/schema/serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-expiresat.md

@@ -0,0 +1,15 @@
+# Untitled number in SerializedParentAction Schema
+
+```txt
+https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/expiresAt
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                                        |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------------------ |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [SerializedParentAction.schema.json\*](SerializedParentAction.schema.json "open original schema") |
+
+## expiresAt Type
+
+`number`

docs/schema/serializedparentaction-definitions-serializedupdatetimelimitruleaction.md

@@ -28,6 +28,7 @@ https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelim
 | [dur](#dur)             | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-dur.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/dur")             |
 | [pause](#pause)         | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-pause.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/pause")         |
 | [perDay](#perday)       | `boolean` | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-perday.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/perDay")       |
+| [e](#e)                 | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-e.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/e")                 |
 
 ## type
 
@@ -216,3 +217,21 @@ https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelim
 ### perDay Type
 
 `boolean`
+
+## e
+
+
+
+`e`
+
+* is optional
+
+* Type: `number`
+
+* cannot be null
+
+* defined in: [SerializedParentAction](serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-e.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/e")
+
+### e Type
+
+`number`

docs/schema/serializedparentaction.md

@@ -899,6 +899,7 @@ Reference this group by using
 | [dur](#dur)                 | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedtimelimitrule-properties-dur.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/dur")               |
 | [pause](#pause)             | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedtimelimitrule-properties-pause.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/pause")           |
 | [perDay](#perday)           | `boolean` | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedtimelimitrule-properties-perday.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/perDay")         |
+| [e](#e)                     | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedtimelimitrule-properties-e.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/e")                   |
 
 ### ruleId
 
@@ -1080,6 +1081,24 @@ Reference this group by using
 
 `boolean`
 
+### e
+
+
+
+`e`
+
+* is optional
+
+* Type: `number`
+
+* cannot be null
+
+* defined in: [SerializedParentAction](serializedparentaction-definitions-serializedtimelimitrule-properties-e.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedTimeLimitRule/properties/e")
+
+#### e Type
+
+`number`
+
 ## Definitions group SerializedDeleteCategoryAction
 
 Reference this group by using
@@ -4397,6 +4416,7 @@ Reference this group by using
 | [dur](#dur-1)             | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-dur.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/dur")             |
 | [pause](#pause-1)         | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-pause.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/pause")         |
 | [perDay](#perday-1)       | `boolean` | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-perday.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/perDay")       |
+| [e](#e-1)                 | `number`  | Optional | cannot be null | [SerializedParentAction](serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-e.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/e")                 |
 
 ### type
 
@@ -4586,6 +4606,24 @@ Reference this group by using
 
 `boolean`
 
+### e
+
+
+
+`e`
+
+* is optional
+
+* Type: `number`
+
+* cannot be null
+
+* defined in: [SerializedParentAction](serializedparentaction-definitions-serializedupdatetimelimitruleaction-properties-e.md "https://timelimit.io/SerializedParentAction#/definitions/SerializedUpdateTimelimitRuleAction/properties/e")
+
+#### e Type
+
+`number`
+
 ## Definitions group SerializedUpdateUserFlagsAction
 
 Reference this group by using

docs/schema/serverdatastatus-definitions-serverping-properties-deviceid.md

@@ -0,0 +1,15 @@
+# Untitled string in ServerDataStatus Schema
+
+```txt
+https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/deviceId
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                            |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------ |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [ServerDataStatus.schema.json\*](ServerDataStatus.schema.json "open original schema") |
+
+## deviceId Type
+
+`string`

docs/schema/serverdatastatus-definitions-serverping-properties-token.md

@@ -0,0 +1,15 @@
+# Untitled string in ServerDataStatus Schema
+
+```txt
+https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/token
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                            |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------ |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [ServerDataStatus.schema.json\*](ServerDataStatus.schema.json "open original schema") |
+
+## token Type
+
+`string`

docs/schema/serverdatastatus-definitions-serverping-properties-type.md

@@ -0,0 +1,24 @@
+# Untitled string in ServerDataStatus Schema
+
+```txt
+https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/type
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                            |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------ |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [ServerDataStatus.schema.json\*](ServerDataStatus.schema.json "open original schema") |
+
+## type Type
+
+`string`
+
+## type Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value    | Explanation |
+| :------- | :---------- |
+| `"ping"` |             |
+| `"pong"` |             |

docs/schema/serverdatastatus-definitions-serverping.md

@@ -0,0 +1,86 @@
+# ServerPing Schema
+
+```txt
+https://timelimit.io/ServerDataStatus#/definitions/ServerPing
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                            |
+| :------------------ | :--------- | :------------- | :----------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------ |
+| Can be instantiated | No         | Unknown status | No           | Forbidden         | Forbidden             | none                | [ServerDataStatus.schema.json\*](ServerDataStatus.schema.json "open original schema") |
+
+## ServerPing Type
+
+`object` ([ServerPing](serverdatastatus-definitions-serverping.md))
+
+# ServerPing Properties
+
+| Property              | Type     | Required | Nullable       | Defined by                                                                                                                                                             |
+| :-------------------- | :------- | :------- | :------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [deviceId](#deviceid) | `string` | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverping-properties-deviceid.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/deviceId") |
+| [token](#token)       | `string` | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverping-properties-token.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/token")       |
+| [type](#type)         | `string` | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverping-properties-type.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/type")         |
+
+## deviceId
+
+
+
+`deviceId`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [ServerDataStatus](serverdatastatus-definitions-serverping-properties-deviceid.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/deviceId")
+
+### deviceId Type
+
+`string`
+
+## token
+
+
+
+`token`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [ServerDataStatus](serverdatastatus-definitions-serverping-properties-token.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/token")
+
+### token Type
+
+`string`
+
+## type
+
+
+
+`type`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [ServerDataStatus](serverdatastatus-definitions-serverping-properties-type.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/type")
+
+### type Type
+
+`string`
+
+### type Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value    | Explanation |
+| :------- | :---------- |
+| `"ping"` |             |
+| `"pong"` |             |

docs/schema/serverdatastatus-properties-pings.md

@@ -0,0 +1,15 @@
+# Untitled array in ServerDataStatus Schema
+
+```txt
+https://timelimit.io/ServerDataStatus#/properties/pings
+```
+
+
+
+| Abstract            | Extensible | Status         | Identifiable            | Custom Properties | Additional Properties | Access Restrictions | Defined In                                                                            |
+| :------------------ | :--------- | :------------- | :---------------------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------ |
+| Can be instantiated | No         | Unknown status | Unknown identifiability | Forbidden         | Allowed               | none                | [ServerDataStatus.schema.json\*](ServerDataStatus.schema.json "open original schema") |
+
+## pings Type
+
+`object[]` ([ServerPing](serverdatastatus-definitions-serverping.md))

docs/schema/serverdatastatus.md

@@ -30,6 +30,7 @@ https://timelimit.io/ServerDataStatus
 | [users](#users)               | `object` | Optional | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serveruserlist.md "https://timelimit.io/ServerDataStatus#/properties/users")     |
 | [krq](#krq)                   | `array`  | Optional | cannot be null | [ServerDataStatus](serverdatastatus-properties-krq.md "https://timelimit.io/ServerDataStatus#/properties/krq")                   |
 | [kr](#kr)                     | `array`  | Optional | cannot be null | [ServerDataStatus](serverdatastatus-properties-kr.md "https://timelimit.io/ServerDataStatus#/properties/kr")                     |
+| [pings](#pings)               | `array`  | Optional | cannot be null | [ServerDataStatus](serverdatastatus-properties-pings.md "https://timelimit.io/ServerDataStatus#/properties/pings")               |
 | [dh](#dh)                     | `object` | Optional | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdhkey.md "https://timelimit.io/ServerDataStatus#/properties/dh")           |
 | [u2f](#u2f)                   | `object` | Optional | cannot be null | [ServerDataStatus](serverdatastatus-definitions-u2fdata.md "https://timelimit.io/ServerDataStatus#/properties/u2f")              |
 | [fullVersion](#fullversion)   | `number` | Required | cannot be null | [ServerDataStatus](serverdatastatus-properties-fullversion.md "https://timelimit.io/ServerDataStatus#/properties/fullVersion")   |
@@ -252,6 +253,24 @@ https://timelimit.io/ServerDataStatus
 
 `object[]` ([ServerKeyResponse](serverdatastatus-definitions-serverkeyresponse.md))
 
+## pings
+
+
+
+`pings`
+
+* is optional
+
+* Type: `object[]` ([ServerPing](serverdatastatus-definitions-serverping.md))
+
+* cannot be null
+
+* defined in: [ServerDataStatus](serverdatastatus-properties-pings.md "https://timelimit.io/ServerDataStatus#/properties/pings")
+
+### pings Type
+
+`object[]` ([ServerPing](serverdatastatus-definitions-serverping.md))
+
 ## dh
 
 
@@ -3449,6 +3468,83 @@ Reference this group by using
 
 `string`
 
+## Definitions group ServerPing
+
+Reference this group by using
+
+```json
+{"$ref":"https://timelimit.io/ServerDataStatus#/definitions/ServerPing"}
+```
+
+| Property                | Type     | Required | Nullable       | Defined by                                                                                                                                                             |
+| :---------------------- | :------- | :------- | :------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [deviceId](#deviceid-4) | `string` | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverping-properties-deviceid.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/deviceId") |
+| [token](#token)         | `string` | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverping-properties-token.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/token")       |
+| [type](#type-2)         | `string` | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverping-properties-type.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/type")         |
+
+### deviceId
+
+
+
+`deviceId`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [ServerDataStatus](serverdatastatus-definitions-serverping-properties-deviceid.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/deviceId")
+
+#### deviceId Type
+
+`string`
+
+### token
+
+
+
+`token`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [ServerDataStatus](serverdatastatus-definitions-serverping-properties-token.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/token")
+
+#### token Type
+
+`string`
+
+### type
+
+
+
+`type`
+
+* is required
+
+* Type: `string`
+
+* cannot be null
+
+* defined in: [ServerDataStatus](serverdatastatus-definitions-serverping-properties-type.md "https://timelimit.io/ServerDataStatus#/definitions/ServerPing/properties/type")
+
+#### type Type
+
+`string`
+
+#### type Constraints
+
+**enum**: the value of this property must be equal to one of the following values:
+
+| Value    | Explanation |
+| :------- | :---------- |
+| `"ping"` |             |
+| `"pong"` |             |
+
 ## Definitions group ServerDhKey
 
 Reference this group by using

eslint.config.mjs

@@ -0,0 +1,18 @@
+// @ts-check
+
+import eslint from '@eslint/js';
+import { defineConfig } from 'eslint/config';
+import tseslint from 'typescript-eslint';
+
+export default defineConfig(
+  eslint.configs.recommended,
+  tseslint.configs.recommended,
+  {
+    ignores: ['build', 'scripts']
+  },
+  {
+    rules: {
+      '@typescript-eslint/no-unused-vars': ['warn', { caughtErrors: 'none' }]
+    }
+  }
+)

package.json

@@ -6,10 +6,10 @@
   "scripts": {
     "start": "node ./build/index.js",
     "test": "node scripts/test-launch-with-different-databases.js",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "lint": "eslint .",
-    "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
+    "lint:fix": "eslint . --fix",
     "build": "npm run build:clean && npm run build:json && npm run build:ts && npm run lint && npm run build:doc",
-    "build:clean": "rimraf build",
+    "build:clean": "rm -rf build",
     "build:json": "node ./scripts/build-schemas.js",
     "build:ts": "tsc",
     "build:doc": "npm run build:doc:json",
@@ -29,7 +29,8 @@
   },
   "homepage": "https://gitlab.com/timelimit.io/timelimit-server-2018#README",
   "devDependencies": {
-    "@adobe/jsonschema2md": "^7.0.0",
+    "@adobe/jsonschema2md": "^8.0.8",
+    "@eslint/js": "^10.0.1",
     "@types/basic-auth": "^1.1.3",
     "@types/body-parser": "^1.19.0",
     "@types/ejs": "^3.1.0",
@@ -38,15 +39,13 @@
     "@types/lodash": "^4.14.166",
     "@types/node": "^16.11.59",
     "@types/nodemailer": "^6.4.4",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "eslint": "^10.0.1",
-    "@typescript-eslint/parser": "^7.18.0",
-    "eslint": "^8.7.0",
-    "rimraf": "^3.0.2",
     "typescript": "^5.5.4",
+    "typescript-eslint": "^8.56.0",
     "typescript-json-schema": "^0.52.0"
   },
   "dependencies": {
-    "ajv": "^7.0.2",
+    "ajv": "^8.18.0",
     "basic-auth": "^2.0.1",
     "body-parser": "^1.19.0",
     "ejs": "^3.1.5",
@@ -56,7 +55,7 @@
     "jose": "^4.9.3",
     "lodash": "^4.17.21",
     "mariadb": "^2.5.2",
-    "nodemailer": "^6.7.2",
+    "nodemailer": "^9.0.4",
     "pg": "^8.5.1",
     "pg-hstore": "^2.3.3",
     "rate-limiter-flexible": "^2.1.15",
@@ -65,6 +64,6 @@
     "umzug": "^3.8.1"
   },
   "optionalDependencies": {
-    "sqlite3": "^5.0.0"
+    "sqlite3": "npm:@vscode/sqlite3@^5.1.12-vscode"
   }
 }

scripts/util/database/mariadb.js

@@ -24,6 +24,8 @@ const { spawnAsync } = require('../process.js')
 const { sleep } = require('../sleep.js')
 
 async function startMariadb() {
+  const osUsername = require('os').userInfo().username
+
   try { await mkdirAsync(tempDir) } catch (ex) {/* ignore */}
 
   const instanceDir = resolve(tempDir, generateShortToken())
@@ -60,12 +62,12 @@ async function startMariadb() {
 
   for (command of commands) {
     console.log(command)
-    await spawnAsync('mysql', ['-S', socketPath, '-u', 'root', '-e', command], { stdio: 'inherit' })
+    await spawnAsync('mysql', ['-S', socketPath, '-u', osUsername, '-e', command], { stdio: 'inherit' })
   }
 
   return {
     shutdown: () => {
-      spawnAsync('mysql', ['-S', socketPath, '-u', 'root', '-e', 'SHUTDOWN;'], { stdio: 'inherit' }).catch((ex) => {
+      spawnAsync('mysql', ['-S', socketPath, '-u', osUsername, '-e', 'SHUTDOWN;'], { stdio: 'inherit' }).catch((ex) => {
         console.warn(ex)
       })
     },

scripts/util/database/postgres.js

@@ -58,7 +58,7 @@ async function startPostgres() {
   const password = generateToken() // this database accepts anything
 
   await spawnAsync('createuser', ['-h', socketDir, username], { stdio: 'inherit' })
-  await spawnAsync('createdb', ['-h', socketDir, database], { stdio: 'inherit' })
+  await spawnAsync('createdb', ['-h', socketDir, '--owner', username, database], { stdio: 'inherit' })
 
   return {
     shutdown: () => task.kill('SIGINT'),

src/action/index.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -78,6 +78,7 @@ export { UpdateTimelimitRuleAction } from './updatetimelimitrule'
 export { UpdateUserFlagsAction } from './updateuserflags'
 export { UpdateUserLimitLoginCategory } from './updateuserlimitlogincategory'
 export { MarkTaskPendingAction } from './marktaskpendingaction'
+export { PingAction } from './ping'
 export { DeleteChildTaskAction } from './deletechildtaskaction'
 export { UpdateChildTaskAction } from './updatechildtaskaction'
 export { ReviewChildTaskAction } from './reviewchildtaskaction'

src/action/ping.ts

@@ -0,0 +1,55 @@
+/*
+ * server component for the TimeLimit App
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { AppLogicAction } from './basetypes'
+import { assertIdWithinFamily } from './meta/util'
+
+const actionType = 'PingAction'
+
+export class PingAction extends AppLogicAction {
+  readonly deviceId: string
+  readonly event: PingEvent
+  readonly token: string
+
+  constructor ({ deviceId, event, token }: {
+    deviceId: string
+    event: PingEvent
+    token: string
+  }) {
+    super()
+
+    assertIdWithinFamily({ actionType, field: 'deviceId', value: deviceId })
+    assertIdWithinFamily({ actionType, field: 'token', value: token })
+
+    this.deviceId = deviceId
+    this.event = event
+    this.token = token
+  }
+
+  static parse = ({ deviceId, event, token }: SerializedPingAction) => (
+    new PingAction({ deviceId, event, token })
+  )
+}
+
+export interface SerializedPingAction {
+  type: 'PING'
+  deviceId: string
+  event: PingEvent
+  token: string
+}
+
+export type PingEvent = 'ping' | 'pong' | 'clear'

src/action/serialization/applogicaction.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -24,6 +24,7 @@ import { ForceSyncAction, SerializedForceSyncAction } from '../forcesync'
 import { ReplyToKeyRequestAction, SerializedReplyToKeyRequestAction } from '../replytokeyrequest'
 import { MarkTaskPendingAction, SerializedMarkTaskPendingAction } from '../marktaskpendingaction'
 import { UnknownActionTypeException } from '../meta/exception'
+import { PingAction, SerializedPingAction } from '../ping'
 import { UpdateInstalledAppsAction, SerializedUpdateInstalledAppsAction } from '../updateinstalledapps'
 import { RemoveInstalledAppsAction, SerializedRemoveInstalledAppsAction } from '../removeinstalledapps'
 import { SendKeyRequestAction, SerializedSendKeyRequestAction } from '../sendkeyrequest'
@@ -41,6 +42,7 @@ export type SerializedAppLogicAction =
   SerializedForceSyncAction |
   SerializedReplyToKeyRequestAction |
   SerializedMarkTaskPendingAction |
+  SerializedPingAction |
   SerializedUpdateInstalledAppsAction |
   SerializedRemoveInstalledAppsAction |
   SerializedSendKeyRequestAction |
@@ -65,6 +67,8 @@ export const parseAppLogicAction = (serialized: SerializedAppLogicAction): AppLo
     return ReplyToKeyRequestAction.parse(serialized)
   } else if (serialized.type === 'MARK_TASK_PENDING') {
     return MarkTaskPendingAction.parse(serialized)
+  } else if (serialized.type === 'PING') {
+    return PingAction.parse(serialized)
   } else if (serialized.type === 'UPDATE_INSTALLED_APPS') {
     return UpdateInstalledAppsAction.parse(serialized)
   } else if (serialized.type === 'REMOVE_INSTALLED_APPS') {

src/action/updatetimelimitrule.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2024 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -32,11 +32,12 @@ export class UpdateTimelimitRuleAction extends ParentAction {
   readonly sessionDurationMilliseconds: number
   readonly sessionPauseMilliseconds: number
   readonly perDay: boolean
+  readonly expiresAt?: number
 
   constructor ({
     ruleId, maximumTimeInMillis, dayMask, applyToExtraTimeUsage,
     start, end, sessionDurationMilliseconds, sessionPauseMilliseconds,
-    perDay
+    perDay, expiresAt
   }: {
     ruleId: string
     maximumTimeInMillis: number
@@ -47,6 +48,7 @@ export class UpdateTimelimitRuleAction extends ParentAction {
     sessionDurationMilliseconds: number
     sessionPauseMilliseconds: number
     perDay: boolean
+    expiresAt?: number
   }) {
     super()
 
@@ -59,6 +61,7 @@ export class UpdateTimelimitRuleAction extends ParentAction {
     this.sessionDurationMilliseconds = sessionDurationMilliseconds
     this.sessionPauseMilliseconds = sessionPauseMilliseconds
     this.perDay = perDay
+    this.expiresAt = expiresAt
 
     assertIdWithinFamily({ actionType, field: 'ruleId', value: ruleId })
 
@@ -92,9 +95,17 @@ export class UpdateTimelimitRuleAction extends ParentAction {
         staticMessage: 'session duration lesser than zero'
       })
     }
+
+    if (expiresAt !== undefined) {
+      assertSafeInteger({ actionType, field: 'expiresAt', value: expiresAt })
+
+      if (expiresAt <= 0) {
+        throwOutOfRange({ actionType, field: 'expiresAt', value: expiresAt })
+      }
+    }
   }
 
-  static parse = ({ ruleId, time, days, extraTime, start, end, dur, pause, perDay }: SerializedUpdateTimelimitRuleAction) => (
+  static parse = ({ ruleId, time, days, extraTime, start, end, dur, pause, perDay, e }: SerializedUpdateTimelimitRuleAction) => (
     new UpdateTimelimitRuleAction({
       ruleId,
       maximumTimeInMillis: time,
@@ -104,7 +115,8 @@ export class UpdateTimelimitRuleAction extends ParentAction {
       end: end ?? MinuteOfDay.MAX,
       sessionDurationMilliseconds: dur ?? 0,
       sessionPauseMilliseconds: pause ?? 0,
-      perDay: perDay ?? false
+      perDay: perDay ?? false,
+      expiresAt: e
     })
   )
 }
@@ -120,4 +132,5 @@ export interface SerializedUpdateTimelimitRuleAction {
   dur?: number
   pause?: number
   perDay?: boolean
+  e?: number
 }

src/api/admin.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@ import { json } from 'body-parser'
 import { Router } from 'express'
 import { BadRequest, Conflict } from 'http-errors'
 import * as Sequelize from 'sequelize'
-import { Database } from '../database'
+import { SimpleDatabase } from '../database/simple'
 import { addPurchase, canDoNextPurchase } from '../function/purchase'
 import { getStatusMessage, setStatusMessage } from '../function/statusmessage'
 import { EventHandler } from '../monitoring/eventhandler'
@@ -28,7 +28,7 @@ import { verifyIdentitifyToken, TokenValidationException } from '../util/identit
 import { WebsocketApi } from '../websocket'
 
 export const createAdminRouter = ({ database, websocket, eventHandler }: {
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
   eventHandler: EventHandler
 }) => {
@@ -60,7 +60,9 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
 
   router.get('/status-message', async (_, res, next) => {
     try {
-      const currentStatusMessage = await getStatusMessage({ database })
+      const currentStatusMessage = await database.transaction(async (transaction) => {
+        return getStatusMessage({ transaction })
+      })
 
       res.json({
         statusMessage: currentStatusMessage
@@ -102,12 +104,12 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
       }
 
       await database.transaction(async (transaction) => {
-        const userEntryUnsafe = await database.user.findOne({
+        const userEntryUnsafe = await transaction.legacy.database.user.findOne({
           where: {
             mail
           },
           attributes: ['familyId'],
-          transaction
+          transaction: transaction.legacy.transaction
         })
 
         if (!userEntryUnsafe) {
@@ -119,13 +121,12 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
         }
 
         await addPurchase({
-          database,
+          transaction,
           familyId: userEntry.familyId,
           type,
           service: 'directpurchase',
           transactionId: 'legacyunlock-' + type + '-' + generatePurchaseId(),
-          websocket,
+          websocket
-          transaction
         })
       })
 
@@ -140,15 +141,23 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
       if (
         typeof req.body !== 'object' ||
         typeof req.body.purchaseToken !== 'string' ||
-        typeof req.body.purchaseId !== 'string'
+        typeof req.body.purchaseId !== 'string' ||
+        typeof req.body.dryRun !== 'boolean' ||
+        typeof req.body.type !== 'string'
       ) {
         throw new BadRequest()
       }
 
       const purchaseToken: string = req.body.purchaseToken
       const purchaseId: string = req.body.purchaseId
+      const dryRun: boolean = req.body.dryRun
+      const type: string = req.body.type
 
-      const tokenContent = await verifyIdentitifyToken(purchaseToken)
+      if (type !== 'month' && type !== 'year' && type !== 'unpaid14') {
+        throw new BadRequest()
+      }
+
+      const tokenContent = await verifyIdentitifyToken(purchaseToken, dryRun)
 
       if (tokenContent.purpose !== 'purchase') {
         res.json({ ok: false, error: 'token invalid', detail: 'wrong purpose' })
@@ -157,14 +166,14 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
       }
 
       const response = await database.transaction(async (transaction) => {
-        const userValid = await database.user.count({
+        const userValid = await transaction.legacy.database.user.count({
           where: {
             familyId: tokenContent.familyId,
             userId: tokenContent.userId,
             mail: tokenContent.mail,
             type: 'parent'
           },
-          transaction
+          transaction: transaction.legacy.transaction
         })
 
         if (!userValid) return {
@@ -177,7 +186,7 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
 
         if (tokenContent.mail !== '') mailToReturn = tokenContent.mail
         else {
-          const userEntryWithMail = await database.user.findOne({
+          const userEntryWithMail = await transaction.legacy.database.user.findOne({
             where: {
               familyId: tokenContent.familyId,
               mail: {
@@ -185,7 +194,7 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
               },
               type: 'parent'
             },
-            transaction
+            transaction: transaction.legacy.transaction
           })
 
           if (!userEntryWithMail) return {
@@ -199,11 +208,12 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
 
         let wasAlreadyExecuted: boolean
 
-        const oldPurchaseByPurchaseId = await database.purchase.findOne({
+        const oldPurchaseByPurchaseId = await transaction.legacy.database.purchase.findOne({
           where: {
             service: 'directpurchase',
             transactionId: purchaseId
-          }
+          },
+          transaction: transaction.legacy.transaction
         })
 
         if (oldPurchaseByPurchaseId === null) wasAlreadyExecuted = false
@@ -214,11 +224,11 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
         }
 
         if (!wasAlreadyExecuted) {
-          const familyEntry = await database.family.findOne({
+          const familyEntry = await transaction.legacy.database.family.findOne({
             where: {
               familyId: tokenContent.familyId
             },
-            transaction
+            transaction: transaction.legacy.transaction
           })
 
           if (!familyEntry) return {
@@ -226,14 +236,17 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
             error: 'family not found'
           }
 
-          const canDoPurchase = canDoNextPurchase({ fullVersionUntil: parseInt(familyEntry.fullVersionUntil) })
+          const canDoPurchase = canDoNextPurchase({
+            fullVersionUntil: parseInt(familyEntry.fullVersionUntil),
+            fullVersionDebts: parseInt(familyEntry.fullVersionDebts),
+          })
 
           if (!canDoPurchase) {
-            const lastPurchase = await database.purchase.findOne({
+            const lastPurchase = await transaction.legacy.database.purchase.findOne({
               where: {
                 familyId: tokenContent.familyId
               },
-              transaction,
+              transaction: transaction.legacy.transaction,
               order: [['loggedAt', 'DESC']],
               limit: 1
             })
@@ -250,16 +263,17 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
             }
           }
 
+          if (!dryRun) {
             await addPurchase({
-            database,
+              transaction,
               familyId: tokenContent.familyId,
-            type: 'year',
+              type,
               service: 'directpurchase',
               transactionId: purchaseId,
               websocket,
-            transaction
             })
           }
+        }
 
         return {
           ok: true,

src/api/auth.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2021 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -18,7 +18,7 @@
 import { json } from 'body-parser'
 import { Router } from 'express'
 import { BadRequest } from 'http-errors'
-import { Database } from '../database'
+import { SimpleDatabase } from '../database/simple'
 import { sendLoginCode, signInByMailCode } from '../function/authentication/login-by-mail'
 import { isMailAddressCoveredByWhitelist, isMailServerBlacklisted, sanitizeMailAddress } from '../util/mail'
 import {
@@ -26,7 +26,7 @@ import {
   isSignInByMailCodeRequest
 } from './validator'
 
-export const createAuthRouter = (database: Database) => {
+export const createAuthRouter = (database: SimpleDatabase) => {
   const router = Router()
 
   router.post('/send-mail-login-code-v2', json(), async (req, res, next) => {

src/api/child.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -18,7 +18,7 @@
 import { json } from 'body-parser'
 import { Router } from 'express'
 import { BadRequest } from 'http-errors'
-import { Database } from '../database'
+import { SimpleDatabase } from '../database/simple'
 import { addChildDevice } from '../function/child/add-device'
 import { logoutAtPrimaryDevice } from '../function/child/logout-at-primary-device'
 import { setPrimaryDevice } from '../function/child/set-primary-device'
@@ -27,7 +27,7 @@ import { isRegisterChildDeviceRequest, isRequestWithAuthToken, isUpdatePrimaryDe
 import { EventHandler } from '../monitoring/eventhandler'
 
 export const createChildRouter = ({ database, websocket, eventHandler }: {
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
   eventHandler: EventHandler
 }) => {

src/api/index.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -18,7 +18,7 @@
 import * as basicAuth from 'basic-auth'
 import * as express from 'express'
 import { VisibleConnectedDevicesManager } from '../connected-devices'
-import { Database } from '../database'
+import { SimpleDatabase } from '../database/simple'
 import { EventHandler } from '../monitoring/eventhandler'
 import { WebsocketApi } from '../websocket'
 import { createAdminRouter } from './admin'
@@ -31,7 +31,7 @@ import { createSyncRouter } from './sync'
 const adminToken = process.env.ADMIN_TOKEN || ''
 
 export const createApi = ({ database, websocket, connectedDevicesManager, eventHandler }: {
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
   connectedDevicesManager: VisibleConnectedDevicesManager
   eventHandler: EventHandler

src/api/parent.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2023 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -20,7 +20,7 @@ import { createHmac } from 'crypto'
 import { Router } from 'express'
 import { BadRequest, Forbidden, Unauthorized } from 'http-errors'
 import { config } from '../config'
-import { Database, Transaction } from '../database'
+import { SimpleDatabase, SimpleDatabaseTransaction } from '../database/simple'
 import { deleteAccount } from '../function/cleanup/account-deletion'
 import { removeDevice } from '../function/device/remove-device'
 import { createAddDeviceToken } from '../function/parent/create-add-device-token'
@@ -44,7 +44,7 @@ import {
 export const createParentRouter = ({
   database, websocket, eventHandler
 }: {
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
   eventHandler: EventHandler
 }) => {
@@ -58,7 +58,7 @@ export const createParentRouter = ({
 
       const { mailAuthToken } = req.body
       const { status, mail } = await database.transaction(async (transaction) => {
-        return getStatusByMailToken({ database, mailAuthToken, transaction })
+        return getStatusByMailToken({ transaction, mailAuthToken })
       })
 
       res.json({
@@ -153,13 +153,13 @@ export const createParentRouter = ({
     deviceAuthToken: string
     parentId: string
     secondPasswordHash: string
-    transaction: Transaction
+    transaction: SimpleDatabaseTransaction
   }) {
-    const deviceEntry = await database.device.findOne({
+    const deviceEntry = await transaction.legacy.database.device.findOne({
       where: {
         deviceAuthToken: deviceAuthToken
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (!deviceEntry) {
@@ -171,13 +171,13 @@ export const createParentRouter = ({
         throw new Unauthorized()
       }
 
-      const parentEntry = await database.user.findOne({
+      const parentEntry = await transaction.legacy.database.user.findOne({
         where: {
           familyId: deviceEntry.familyId,
           type: 'parent',
           userId: deviceEntry.currentUserId
         },
-        transaction
+        transaction: transaction.legacy.transaction
       })
 
       if (!parentEntry) {
@@ -187,11 +187,11 @@ export const createParentRouter = ({
       return { deviceEntry, parentEntry }
     } else if (secondPasswordHash.startsWith('u2f:')) {
       try {
-        const familyEntryUnsafe = await database.family.findOne({
+        const familyEntryUnsafe = await transaction.legacy.database.family.findOne({
           where: {
             familyId: deviceEntry.familyId
           },
-          transaction,
+          transaction: transaction.legacy.transaction,
           attributes: ['hasFullVersion']
         })
 
@@ -208,7 +208,6 @@ export const createParentRouter = ({
           hasFullVersion,
           familyId: deviceEntry.familyId,
           deviceId: deviceEntry.deviceId,
-          database,
           transaction,
           calculateHmac: (secret) => createHmac('sha256', secret)
             .update('direct action')
@@ -217,13 +216,13 @@ export const createParentRouter = ({
 
         if (u2fResult.userId !== parentId) throw new Unauthorized()
 
-        const parentEntry = await database.user.findOne({
+        const parentEntry = await transaction.legacy.database.user.findOne({
           where: {
             familyId: deviceEntry.familyId,
             type: 'parent',
             userId: u2fResult.userId
           },
-          transaction
+          transaction: transaction.legacy.transaction
         })
 
         if (!parentEntry) {
@@ -236,14 +235,14 @@ export const createParentRouter = ({
         else throw ex
       }
     } else {
-      const parentEntry = await database.user.findOne({
+      const parentEntry = await transaction.legacy.database.user.findOne({
         where: {
           familyId: deviceEntry.familyId,
           type: 'parent',
           userId: parentId,
           secondPasswordHash: secondPasswordHash
         },
-        transaction
+        transaction: transaction.legacy.transaction
       })
 
       if (!parentEntry) {
@@ -268,7 +267,7 @@ export const createParentRouter = ({
           transaction
         })
 
-        return createAddDeviceToken({ familyId: deviceEntry.familyId, database, transaction })
+        return createAddDeviceToken({ familyId: deviceEntry.familyId, transaction })
       })
 
       res.json({ token, deviceId })
@@ -313,11 +312,10 @@ export const createParentRouter = ({
         })
 
         await removeDevice({
-          database,
+          transaction,
           familyId: deviceEntry.familyId,
           deviceId: req.body.deviceId,
-          websocket,
+          websocket
-          transaction
         })
       })
 

src/api/purchase.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -18,7 +18,7 @@
 import { json } from 'body-parser'
 import { Router } from 'express'
 import { BadRequest, Conflict, Unauthorized } from 'http-errors'
-import { Database } from '../database'
+import { SimpleDatabase } from '../database/simple'
 import {
   addPurchase,
   areGooglePlayPaymentsPossible,
@@ -31,30 +31,32 @@ import { WebsocketApi } from '../websocket'
 import { isCanDoPurchaseRequest, isFinishPurchaseByGooglePlayRequest } from './validator'
 
 export const createPurchaseRouter = ({ database, websocket }: {
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
 }) => {
   const router = Router()
 
   router.post('/can-do-purchase', json(), async (req, res, next) => {
-    if (!areGooglePlayPaymentsPossible) {
-      res.json({ canDoPurchase: 'no because not supported by the server' })
-      return
-    }
-
     try {
       if (!isCanDoPurchaseRequest(req.body)) {
         throw new BadRequest()
       }
 
+      if (req.body.type === 'googleplay' && !areGooglePlayPaymentsPossible) {
+        res.json({ canDoPurchase: 'no because not supported by the server' })
+        return
+      }
+
       const result: boolean = await database.transaction(async (transaction) => {
         const familyEntry = await requireFamilyEntry({
-          database,
+          transaction,
           deviceAuthToken: req.body.deviceAuthToken,
-          transaction
         })
 
-        return canDoNextPurchase({ fullVersionUntil: parseInt(familyEntry.fullVersionUntil, 10) })
+        return canDoNextPurchase({
+          fullVersionUntil: parseInt(familyEntry.fullVersionUntil, 10),
+          fullVersionDebts: parseInt(familyEntry.fullVersionDebts, 10),
+        })
       })
 
       res.json({
@@ -73,12 +75,12 @@ export const createPurchaseRouter = ({ database, websocket }: {
       }
 
       await database.transaction(async (transaction) => {
-        const deviceEntryUnsafe = await database.device.findOne({
+        const deviceEntryUnsafe = await transaction.legacy.database.device.findOne({
           where: {
             deviceAuthToken: req.body.deviceAuthToken
           },
           attributes: ['familyId'],
-          transaction
+          transaction: transaction.legacy.transaction
         })
 
         if (!deviceEntryUnsafe) {
@@ -119,13 +121,12 @@ export const createPurchaseRouter = ({ database, websocket }: {
         }
 
         await addPurchase({
-          database,
+          transaction,
           familyId: deviceEntry.familyId,
           type,
           service: 'googleplay',
           transactionId: orderId,
-          websocket,
+          websocket
-          transaction
         })
       })
 

src/api/schema.ts

@@ -113,7 +113,7 @@ export interface CreateRegisterDeviceTokenRequest {
 }
 
 export interface CanDoPurchaseRequest {
-  type: 'googleplay' | 'any'
+  type?: 'googleplay' | 'any'
   deviceAuthToken: string
 }
 

src/api/sync.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@ import { json } from 'body-parser'
 import { Router } from 'express'
 import { BadRequest, Unauthorized } from 'http-errors'
 import { VisibleConnectedDevicesManager } from '../connected-devices'
-import { Database } from '../database'
+import { SimpleDatabase } from '../database/simple'
 import { reportDeviceRemoved } from '../function/device/report-device-removed'
 import { applyActionsFromDevice } from '../function/sync/apply-actions'
 import { generateServerDataStatus } from '../function/sync/get-server-data-status'
@@ -34,7 +34,7 @@ const getRoundedTimestampForLastConnectivity = () => {
 }
 
 export const createSyncRouter = ({ database, websocket, connectedDevicesManager, eventHandler }: {
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
   connectedDevicesManager: VisibleConnectedDevicesManager
   eventHandler: EventHandler
@@ -86,12 +86,12 @@ export const createSyncRouter = ({ database, websocket, connectedDevicesManager,
       }
 
       const serverStatus = await database.transaction(async (transaction) => {
-        const deviceEntryUnsafe = await database.device.findOne({
+        const deviceEntryUnsafe = await transaction.legacy.database.device.findOne({
           where: {
             deviceAuthToken: body.deviceAuthToken
           },
           attributes: ['familyId', 'deviceId', 'lastConnectivity'],
-          transaction
+          transaction: transaction.legacy.transaction
         })
 
         if (!deviceEntryUnsafe) {
@@ -102,22 +102,21 @@ export const createSyncRouter = ({ database, websocket, connectedDevicesManager,
         const now = getRoundedTimestampForLastConnectivity()
 
         if (parseInt(lastConnectivity, 10) !== now) {
-          await database.device.update({
+          await transaction.legacy.database.device.update({
             lastConnectivity: now.toString(10)
           }, {
             where: {
               deviceAuthToken: body.deviceAuthToken
             },
-            transaction
+            transaction: transaction.legacy.transaction
           })
         }
 
         return generateServerDataStatus({
-          database,
+          transaction,
           familyId,
           deviceId,
           clientStatus: body.status,
-          transaction,
           eventHandler
         })
       })
@@ -165,11 +164,11 @@ export const createSyncRouter = ({ database, websocket, connectedDevicesManager,
       }
 
       const isDeviceRemoved: boolean = await database.transaction(async (transaction) => {
-        const removedEntry = await database.oldDevice.findOne({
+        const removedEntry = await transaction.legacy.database.oldDevice.findOne({
           where: {
             deviceAuthToken: req.body.deviceAuthToken
           },
-          transaction
+          transaction: transaction.legacy.transaction
         })
 
         return !!removedEntry

src/api/validator.ts

@@ -409,6 +409,9 @@ const definitions = {
       },
       "perDay": {
         "type": "boolean"
+      },
+      "e": {
+        "type": "number"
       }
     },
     "additionalProperties": false,
@@ -1417,6 +1420,9 @@ const definitions = {
       },
       "perDay": {
         "type": "boolean"
+      },
+      "e": {
+        "type": "number"
       }
     },
     "additionalProperties": false,
@@ -1753,6 +1759,41 @@ const definitions = {
       "type"
     ]
   },
+  "SerializedPingAction": {
+    "type": "object",
+    "properties": {
+      "type": {
+        "type": "string",
+        "enum": [
+          "PING"
+        ]
+      },
+      "deviceId": {
+        "type": "string"
+      },
+      "event": {
+        "$ref": "#/definitions/PingEvent"
+      },
+      "token": {
+        "type": "string"
+      }
+    },
+    "additionalProperties": false,
+    "required": [
+      "deviceId",
+      "event",
+      "token",
+      "type"
+    ]
+  },
+  "PingEvent": {
+    "enum": [
+      "clear",
+      "ping",
+      "pong"
+    ],
+    "type": "string"
+  },
   "SerializedUpdateInstalledAppsAction": {
     "type": "object",
     "properties": {
@@ -2809,6 +2850,30 @@ const definitions = {
       "tempKey"
     ]
   },
+  "ServerPing": {
+    "type": "object",
+    "properties": {
+      "deviceId": {
+        "type": "string"
+      },
+      "token": {
+        "type": "string"
+      },
+      "type": {
+        "enum": [
+          "ping",
+          "pong"
+        ],
+        "type": "string"
+      }
+    },
+    "additionalProperties": false,
+    "required": [
+      "deviceId",
+      "token",
+      "type"
+    ]
+  },
   "ServerDhKey": {
     "type": "object",
     "properties": {
@@ -3207,6 +3272,9 @@ export const isSerializedAppLogicAction: (value: unknown) => value is Serialized
     {
       "$ref": "#/definitions/SerializedMarkTaskPendingAction"
     },
+    {
+      "$ref": "#/definitions/SerializedPingAction"
+    },
     {
       "$ref": "#/definitions/SerializedUpdateInstalledAppsAction"
     },
@@ -3285,8 +3353,7 @@ export const isCanDoPurchaseRequest: (value: unknown) => value is CanDoPurchaseR
   },
   "additionalProperties": false,
   "required": [
-    "deviceAuthToken",
+    "deviceAuthToken"
-    "type"
   ],
   "definitions": definitions,
   "$schema": "http://json-schema.org/draft-07/schema#"

src/cli/delete-old-families.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,9 +16,10 @@
  */
 
 import { defaultDatabase } from '../database'
+import { fromLegacy as createSimpleDatabase } from '../database/simple'
 import { deleteOldFamilies } from '../function/cleanup/delete-old-families'
 
-const database = defaultDatabase
+const database = createSimpleDatabase(defaultDatabase)
 
 deleteOldFamilies(database)
   .then(() => console.log('done'))

src/cli/find-old-families.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,9 +16,10 @@
  */
 
 import { defaultDatabase } from '../database'
+import { fromLegacy as createSimpleDatabase } from '../database/simple'
 import { findOldFamilyIds } from '../function/cleanup/delete-old-families'
 
-const database = defaultDatabase
+const database = createSimpleDatabase(defaultDatabase)
 
 findOldFamilyIds(database)
   .then((res) => console.log(JSON.stringify(res)))

src/connected-devices/index.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,7 +16,7 @@
  */
 
 import { EventEmitter } from 'events'
-import { Database } from '../database'
+import { SimpleDatabase } from '../database/simple'
 
 export class ConnectedDevicesManager {
   private deviceConnectionCounters = new Map<string, number>()
@@ -59,10 +59,10 @@ export class ConnectedDevicesManager {
 
 export class VisibleConnectedDevicesManager {
   connectedDevicesManager = new ConnectedDevicesManager()
-  private database: Database
+  private database: SimpleDatabase
 
   constructor ({ database }: {
-    database: Database
+    database: SimpleDatabase
   }) {
     this.database = database
   }
@@ -174,20 +174,25 @@ export class VisibleConnectedDevicesManager {
 
     // add all current devices
     ;(async () => {
-      const devicesUnsafe = await this.database.device.findAll({
+      const devices = await this.database.transaction(async (transaction) => {
+        const devicesUnsafe = await transaction.legacy.database.device.findAll({
           where: {
             familyId
           },
           attributes: [
             'deviceId',
             'showDeviceConnected'
-        ]
+          ],
+          transaction: transaction.legacy.transaction
         })
 
         const devices = devicesUnsafe.map(({ deviceId, showDeviceConnected }) => ({
           deviceId, showDeviceConnected
         }))
 
+        return devices
+      })
+
       devices.forEach(({ deviceId, showDeviceConnected }) => {
         addDevice({ deviceId, showDeviceConnected })
       })

src/database/family.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -37,8 +37,13 @@ export interface FamilyAttributesVersion3 {
   u2fKeysVersion: string
 }
 
+export interface FamilyAttributesVersion4 {
+  fullVersionDebts: string
+}
+
 export type FamilyAttributes = FamilyAttributesVersion1 &
-  FamilyAttributesVersion2 & FamilyAttributesVersion3
+  FamilyAttributesVersion2 & FamilyAttributesVersion3 &
+  FamilyAttributesVersion4
 
 export type FamilyModel = Sequelize.Model<FamilyAttributes> & FamilyAttributes
 export type FamilyModelStatic = typeof Sequelize.Model & {
@@ -76,10 +81,22 @@ export const attributesVersion3: SequelizeAttributes<FamilyAttributesVersion3> =
   }
 }
 
+export const attributesVersion4: SequelizeAttributes<FamilyAttributesVersion4> = {
+  fullVersionDebts: {
+    type: Sequelize.BIGINT,
+    allowNull: false,
+    defaultValue: 0,
+    validate: {
+      min: 0
+    }
+  }
+}
+
 export const attributes: SequelizeAttributes<FamilyAttributes> = {
   ...attributesVersion1,
   ...attributesVersion2,
-  ...attributesVersion3
+  ...attributesVersion3,
+  ...attributesVersion4
 }
 
 export const createFamilyModel = (sequelize: Sequelize.Sequelize): FamilyModelStatic => sequelize.define('Family', attributes) as FamilyModelStatic

src/database/main.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -33,6 +33,7 @@ import { createKeyResponseModel, KeyResponseModelStatic } from './keyresponse'
 import { createMailLoginTokenModel, MailLoginTokenModelStatic } from './maillogintoken'
 import { createUmzug } from './migration/umzug'
 import { createOldDeviceModel, OldDeviceModelStatic } from './olddevice'
+import { createPingModel, PingModelStatic } from './ping'
 import { createPurchaseModel, PurchaseModelStatic } from './purchase'
 import { createSessionDurationModel, SessionDurationModelStatic } from './sessionduration'
 import { createTimelimitRuleModel, TimelimitRuleModelStatic } from './timelimitrule'
@@ -61,6 +62,7 @@ export interface Database {
   keyResponse: KeyResponseModelStatic
   mailLoginToken: MailLoginTokenModelStatic
   oldDevice: OldDeviceModelStatic
+  ping: PingModelStatic
   purchase: PurchaseModelStatic
   sessionDuration: SessionDurationModelStatic
   timelimitRule: TimelimitRuleModelStatic
@@ -97,6 +99,7 @@ const createDatabase = (sequelize: Sequelize.Sequelize): Database => ({
   keyResponse: createKeyResponseModel(sequelize),
   mailLoginToken: createMailLoginTokenModel(sequelize),
   oldDevice: createOldDeviceModel(sequelize),
+  ping: createPingModel(sequelize),
   purchase: createPurchaseModel(sequelize),
   sessionDuration: createSessionDurationModel(sequelize),
   timelimitRule: createTimelimitRuleModel(sequelize),

src/database/migration/migrations/20240408-add-rule-expires.ts

@@ -0,0 +1,39 @@
+/*
+ * server component for the TimeLimit App
+ * Copyright (C) 2019 - 2024 Jonas Lochmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { QueryInterface, Sequelize, Transaction } from 'sequelize'
+import { attributesVersion4 as ruleAttributes } from '../../timelimitrule'
+
+export async function up (queryInterface: QueryInterface, sequelize: Sequelize) {
+  await sequelize.transaction({
+    type: Transaction.TYPES.EXCLUSIVE
+  }, async (transaction) => {
+    await queryInterface.addColumn('TimelimitRules', 'expiresAt', {
+      ...ruleAttributes.expiresAt
+    }, {
+      transaction
+    })
+  })
+}
+
+export async function down (queryInterface: QueryInterface, sequelize: Sequelize) {
+  await sequelize.transaction({
+    type: Transaction.TYPES.EXCLUSIVE
+  }, async (transaction) => {
+    await queryInterface.removeColumn('TimelimitRules', 'expiresAt', { transaction })
+  })
+}

src/database/migration/migrations/20260329-add-pings.ts

@@ -0,0 +1,67 @@
+/*
+ * server component for the TimeLimit App
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { QueryInterface, Sequelize, Transaction } from 'sequelize'
+
+export async function up (queryInterface: QueryInterface, sequelize: Sequelize) {
+  await sequelize.transaction({
+    type: Transaction.TYPES.EXCLUSIVE
+  }, async (transaction) => {
+    const dialect = sequelize.getDialect()
+    const isMysql = dialect === 'mysql' || dialect === 'mariadb'
+
+    if (isMysql) {
+      await sequelize.query(
+        'CREATE TABLE `Pings` ' +
+        '(`familyId` VARCHAR(10) NOT NULL,' +
+        '`receiverDeviceId` VARCHAR(6) NOT NULL,' +
+        '`senderDeviceId` VARCHAR(6) NOT NULL,' +
+        '`type` INTEGER NOT NULL,' +
+        '`token` VARCHAR(6) NOT NULL,' +
+        'PRIMARY KEY (`familyId`, `receiverDeviceId`, `senderDeviceId`, `type`),' +
+        'FOREIGN KEY (`familyId`, `receiverDeviceId`) REFERENCES `Devices` (`familyId`, `deviceId`) ON UPDATE CASCADE ON DELETE CASCADE,' +
+        'FOREIGN KEY (`familyId`, `senderDeviceId`) REFERENCES `Devices` (`familyId`, `deviceId`) ON UPDATE CASCADE ON DELETE CASCADE' +
+        ')',
+        { transaction }
+      )
+    } else {
+      await sequelize.query(
+        'CREATE TABLE "Pings" ' +
+        '("familyId" VARCHAR(10) NOT NULL,' +
+        '"receiverDeviceId" VARCHAR(6) NOT NULL,' +
+        '"senderDeviceId" VARCHAR(6) NOT NULL,' +
+        '"type" INTEGER NOT NULL,' +
+        '"token" VARCHAR(6) NOT NULL,' +
+        'PRIMARY KEY ("familyId", "receiverDeviceId", "senderDeviceId", "type"),' +
+        'FOREIGN KEY ("familyId", "receiverDeviceId") REFERENCES "Devices" ("familyId", "deviceId") ON UPDATE CASCADE ON DELETE CASCADE,' +
+        'FOREIGN KEY ("familyId", "senderDeviceId") REFERENCES "Devices" ("familyId", "deviceId") ON UPDATE CASCADE ON DELETE CASCADE' +
+        ')',
+        { transaction }
+      )
+    }
+
+    await queryInterface.addIndex('Pings', ['familyId', 'senderDeviceId'], { transaction })
+  })
+}
+
+export async function down (queryInterface: QueryInterface, sequelize: Sequelize) {
+  await sequelize.transaction({
+    type: Transaction.TYPES.EXCLUSIVE
+  }, async (transaction) => {
+    await queryInterface.dropTable('Pings', { transaction })
+  })
+}

src/database/migration/migrations/20260712-add-family-full-version-debts.ts

@@ -0,0 +1,39 @@
+/*
+ * server component for the TimeLimit App
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { QueryInterface, Sequelize, Transaction } from 'sequelize'
+import { attributesVersion4 as familyAttributes } from '../../family'
+
+export async function up (queryInterface: QueryInterface, sequelize: Sequelize) {
+  await sequelize.transaction({
+    type: Transaction.TYPES.EXCLUSIVE
+  }, async (transaction) => {
+    await queryInterface.addColumn('Families', 'fullVersionDebts', {
+      ...familyAttributes.fullVersionDebts
+    }, {
+      transaction
+    })
+  })
+}
+
+export async function down (queryInterface: QueryInterface, sequelize: Sequelize) {
+  await sequelize.transaction({
+    type: Transaction.TYPES.EXCLUSIVE
+  }, async (transaction) => {
+    await queryInterface.removeColumn('Families', 'fullVersionDebts', { transaction })
+  })
+}

src/database/migration/umzug.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2024 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -27,7 +27,7 @@ export const createUmzug = (sequelize: Sequelize) => (
       resolve: ({ name, path }) => {
         if (!path) throw new Error()
 
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
         const migration = require(path)
 
         return {

src/database/ping.ts

@@ -0,0 +1,67 @@
+/*
+ * server component for the TimeLimit App
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import * as Sequelize from 'sequelize'
+import { familyIdColumn, idWithinFamilyColumn } from './columns'
+import { SequelizeAttributes } from './types'
+
+export interface PingAttributes {
+  familyId: string
+  receiverDeviceId: string
+  senderDeviceId: string
+  type: number
+  token: string
+}
+
+export const types = {
+  ping: 1,
+  pong: 2,
+  all: [1, 2]
+}
+
+export type PingModel = Sequelize.Model<PingAttributes> & PingAttributes
+export type PingModelStatic = typeof Sequelize.Model & {
+  new (values?: object, options?: Sequelize.BuildOptions): PingModel;
+}
+
+export const attributes: SequelizeAttributes<PingAttributes> = {
+  familyId: {
+    ...familyIdColumn,
+    primaryKey: true
+  },
+  receiverDeviceId: {
+    ...idWithinFamilyColumn,
+    primaryKey: true
+  },
+  senderDeviceId: {
+    ...idWithinFamilyColumn,
+    primaryKey: true
+  },
+  type: {
+    type: Sequelize.INTEGER,
+    allowNull: false,
+    validate: {
+      isIn: [types.all]
+    },
+    primaryKey: true
+  },
+  token: {
+    ...idWithinFamilyColumn
+  }
+}
+
+export const createPingModel = (sequelize: Sequelize.Sequelize): PingModelStatic => sequelize.define('Ping', attributes) as PingModelStatic

src/database/purchase.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -23,7 +23,7 @@ export interface PurchaseAttributes {
   familyId: string
   service: 'googleplay' | 'directpurchase'
   transactionId: string
-  type: 'month' | 'year'
+  type: 'month' | 'year' | 'unpaid14'
   loggedAt: string
   previousFullVersionEndTime: string
   newFullVersionEndTime: string
@@ -44,7 +44,7 @@ export const attributes: SequelizeAttributes<PurchaseAttributes> = {
     type: Sequelize.STRING,
     primaryKey: true
   },
-  type: createEnumColumn(['month', 'year']),
+  type: createEnumColumn(['month', 'year', 'unpaid14']),
   loggedAt: { ...timestampColumn },
   previousFullVersionEndTime: { ...timestampColumn },
   newFullVersionEndTime: { ...timestampColumn }

src/database/simple/index.ts

@@ -0,0 +1,59 @@
+/*
+ * server component for the TimeLimit App
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { Database as LegacyDatabase, Transaction as LegacyTransaction } from '../main'
+
+export interface SimpleDatabase {
+  legacy: LegacyDatabase
+  transaction: <T> (
+    inner: (t: SimpleDatabaseTransaction) => Promise<T>
+  ) => Promise<T>
+}
+
+export interface SimpleDatabaseTransaction {
+  transaction: <T> (
+    inner: (t: SimpleDatabaseTransaction) => Promise<T>
+  ) => Promise<T>
+
+  enqueueAfterCommit(callback: () => void): void
+
+  legacy: {
+    database: LegacyDatabase
+    transaction: LegacyTransaction
+  }
+}
+
+export function fromLegacy(database: LegacyDatabase): SimpleDatabase {
+  return {
+    legacy: database,
+    transaction: (inner) => database.transaction((legacyTransaction) => inner(fromLegacyTransaction(database, legacyTransaction)))
+  }
+}
+
+function fromLegacyTransaction(database: LegacyDatabase, legacyTransaction: LegacyTransaction): SimpleDatabaseTransaction {
+  return {
+    transaction: (inner) => database.transaction(
+      (innerTransaction) => inner(fromLegacyTransaction(database, innerTransaction)),
+      { transaction: legacyTransaction }
+    ),
+    enqueueAfterCommit: (afterCommitAction) => legacyTransaction.afterCommit(afterCommitAction),
+    legacy: {
+      database,
+      transaction: legacyTransaction
+    }
+  }
+}

src/database/timelimitrule.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2021 Jonas Lochmann
+ * Copyright (C) 2019 - 2024 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -41,8 +41,13 @@ interface TimelimitRuleAttributesVersion3 {
   perDay: number
 }
 
+interface TimelimitRuleAttributesVersion4 {
+  expiresAt: string | null
+}
+
 type TimelimitRuleAttributes = TimelimitRuleAttributesVersion1 &
-  TimelimitRuleAttributesVersion2 & TimelimitRuleAttributesVersion3
+  TimelimitRuleAttributesVersion2 & TimelimitRuleAttributesVersion3 &
+  TimelimitRuleAttributesVersion4
 
 export type TimelimitRuleModel = Sequelize.Model<TimelimitRuleAttributes> & TimelimitRuleAttributes
 export type TimelimitRuleModelStatic = typeof Sequelize.Model & {
@@ -137,10 +142,22 @@ export const attributesVersion3: SequelizeAttributes<TimelimitRuleAttributesVers
   }
 }
 
+export const attributesVersion4: SequelizeAttributes<TimelimitRuleAttributesVersion4> = {
+  expiresAt: {
+    type: Sequelize.BIGINT,
+    validate: {
+      min: 1
+    },
+    allowNull: true,
+    defaultValue: null
+  }
+}
+
 export const attributes: SequelizeAttributes<TimelimitRuleAttributes> = {
   ...attributesVersion1,
   ...attributesVersion2,
-  ...attributesVersion3
+  ...attributesVersion3,
+  ...attributesVersion4
 }
 
 export const createTimelimitRuleModel = (sequelize: Sequelize.Sequelize): TimelimitRuleModelStatic => sequelize.define('TimelimitRule', attributes) as TimelimitRuleModelStatic

src/function/authentication/index.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2021 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,45 +16,45 @@
  */
 
 import { Unauthorized } from 'http-errors'
-import { Database, Transaction } from '../../database'
+import { SimpleDatabaseTransaction } from '../../database/simple'
 import { generateAuthToken } from '../../util/token'
 
 export const createAuthTokenByMailAddress = async ({
-  mail, database, transaction, locale
+  mail, transaction, locale
 }: {
-  mail: string, database: Database, transaction: Transaction, locale: string
+  mail: string, transaction: SimpleDatabaseTransaction, locale: string
 }) => {
   const token = generateAuthToken()
 
-  await database.authtoken.create({
+  await transaction.legacy.database.authtoken.create({
     token,
     mail,
     createdAt: Date.now().toString(),
     locale
-  }, { transaction })
+  }, { transaction: transaction.legacy.transaction })
 
   return token
 }
 
 export const getMailAndLocaleByAuthToken = async ({
-  mailAuthToken, database, transaction, invalidate
+  mailAuthToken, transaction, invalidate
 }: {
-  mailAuthToken: string, database: Database, transaction: Transaction, invalidate: boolean
+  mailAuthToken: string, transaction: SimpleDatabaseTransaction, invalidate: boolean
 }) => {
-  const entry = await database.authtoken.findOne({
+  const entry = await transaction.legacy.database.authtoken.findOne({
     where: {
       token: mailAuthToken
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   if (entry) {
     if (invalidate) {
-      const rowCounter = await database.authtoken.destroy({
+      const rowCounter = await transaction.legacy.database.authtoken.destroy({
         where: {
           token: mailAuthToken
         },
-        transaction
+        transaction: transaction.legacy.transaction
       })
 
       if (rowCounter !== 1) {
@@ -72,11 +72,11 @@ export const getMailAndLocaleByAuthToken = async ({
 }
 
 export const requireMailAndLocaleByAuthToken = async ({
-  mailAuthToken, database, transaction, invalidate
+  mailAuthToken, transaction, invalidate
 }: {
-  mailAuthToken: string, database: Database, transaction: Transaction, invalidate: boolean
+  mailAuthToken: string, transaction: SimpleDatabaseTransaction, invalidate: boolean
 }) => {
-  const result = await getMailAndLocaleByAuthToken({ mailAuthToken, database, transaction, invalidate })
+  const result = await getMailAndLocaleByAuthToken({ mailAuthToken, transaction, invalidate })
 
   if (!result) {
     throw new Unauthorized()

src/function/authentication/login-by-mail.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2023 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,7 +16,7 @@
  */
 
 import { Forbidden, Gone, TooManyRequests, Unauthorized } from 'http-errors'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { sendAuthenticationMail } from '../../util/mail'
 import { areWordSequencesEqual, randomWords } from '../../util/random-words'
 import { checkMailSendLimit } from '../../util/ratelimit-authmail'
@@ -27,17 +27,17 @@ export const sendLoginCode = async ({ mail, deviceAuthToken, locale, database }:
   mail: string
   deviceAuthToken?: string
   locale: string
-  database: Database
+  database: SimpleDatabase
   // no transaction here because this is directly called from an API endpoint
 }): Promise<{ mailLoginToken: string }> => {
   let deviceName = null
 
   if (deviceAuthToken !== undefined) {
     const info = await database.transaction(async (transaction) => {
-      const deviceEntryUnsafe = await database.device.findOne({
+      const deviceEntryUnsafe = await transaction.legacy.database.device.findOne({
         where: { deviceAuthToken },
         attributes: ['familyId', 'name'],
-        transaction
+        transaction: transaction.legacy.transaction
       })
 
       if (!deviceEntryUnsafe) {
@@ -49,12 +49,12 @@ export const sendLoginCode = async ({ mail, deviceAuthToken, locale, database }:
         name: deviceEntryUnsafe.name
       }
 
-      const userEntryCounter = await database.user.count({
+      const userEntryCounter = await transaction.legacy.database.user.count({
         where: {
           familyId: deviceEntry.familyId,
           mail
         },
-        transaction
+        transaction: transaction.legacy.transaction
       })
 
       if (userEntryCounter === 1) {
@@ -86,14 +86,14 @@ export const sendLoginCode = async ({ mail, deviceAuthToken, locale, database }:
   })
 
   await database.transaction(async (transaction) => {
-    await database.mailLoginToken.create({
+    await transaction.legacy.database.mailLoginToken.create({
       mailLoginToken,
       receivedCode: code,
       mail,
       createdAt: Date.now().toString(10),
       remainingAttempts: 3,
       locale
-    }, { transaction })
+    }, { transaction: transaction.legacy.transaction })
   })
 
   return {
@@ -106,15 +106,15 @@ export const sendLoginCode = async ({ mail, deviceAuthToken, locale, database }:
 export const signInByMailCode = async ({ mailLoginToken, receivedCode, database }: {
   mailLoginToken: string
   receivedCode: string
-  database: Database
+  database: SimpleDatabase
   // no transaction here because this is directly called from an API endpoint
 }): Promise<{ mailAuthToken: string }> => {
   const result = await database.transaction(async (transaction) => {
-    const entry = await database.mailLoginToken.findOne({
+    const entry = await transaction.legacy.database.mailLoginToken.findOne({
       where: {
         mailLoginToken
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if ((!entry) || entry.remainingAttempts === 0) {
@@ -124,7 +124,7 @@ export const signInByMailCode = async ({ mailLoginToken, receivedCode, database
     if (!areWordSequencesEqual(entry.receivedCode, receivedCode)) {
       entry.remainingAttempts--
 
-      await entry.save({ transaction })
+      await entry.save({ transaction: transaction.legacy.transaction })
 
       if (entry.remainingAttempts === 0) {
         return () => { throw new Gone() }
@@ -133,11 +133,11 @@ export const signInByMailCode = async ({ mailLoginToken, receivedCode, database
       }
     }
 
-    const counter = await database.mailLoginToken.destroy({
+    const counter = await transaction.legacy.database.mailLoginToken.destroy({
       where: {
         mailLoginToken
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (counter !== 1) {
@@ -147,7 +147,6 @@ export const signInByMailCode = async ({ mailLoginToken, receivedCode, database
     const mailAuthToken = await createAuthTokenByMailAddress({
       mail: entry.mail,
       locale: entry.locale,
-      database,
       transaction
     })
 

src/function/child/add-device.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -17,7 +17,7 @@
 
 import { Unauthorized } from 'http-errors'
 import { RegisterChildDeviceRequest } from '../../api/schema'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { generateAuthToken, generateVersionId } from '../../util/token'
 import { WebsocketApi } from '../../websocket'
 import { prepareDeviceEntry } from '../device/prepare-device-entry'
@@ -28,7 +28,7 @@ import { ServerDataStatus } from '../../object/serverdatastatus'
 import { createEmptyClientDataStatus } from '../../object/clientdatastatus'
 
 export const addChildDevice = async ({ database, eventHandler, websocket, request }: {
-  database: Database
+  database: SimpleDatabase
   eventHandler: EventHandler
   websocket: WebsocketApi
   request: RegisterChildDeviceRequest
@@ -39,23 +39,23 @@ export const addChildDevice = async ({ database, eventHandler, websocket, reques
   data: ServerDataStatus
 }> => {
   return database.transaction(async (transaction) => {
-    const entry = await database.addDeviceToken.findOne({
+    const entry = await transaction.legacy.database.addDeviceToken.findOne({
       where: {
         token: request.registerToken.toLowerCase()
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (!entry) {
       throw new Unauthorized()
     }
 
-    await entry.destroy({ transaction })
+    await entry.destroy({ transaction: transaction.legacy.transaction })
 
     const { deviceId, familyId } = entry
     const deviceAuthToken = generateAuthToken()
 
-    await database.device.create(prepareDeviceEntry({
+    await transaction.legacy.database.device.create(prepareDeviceEntry({
       familyId,
       deviceId,
       deviceAuthToken,
@@ -63,33 +63,31 @@ export const addChildDevice = async ({ database, eventHandler, websocket, reques
       newDeviceInfo: request.childDevice,
       userId: '',
       isUserKeptSignedIn: false
-    }), { transaction })
+    }), { transaction: transaction.legacy.transaction })
 
-    await database.family.update({
+    await transaction.legacy.database.family.update({
       deviceListVersion: generateVersionId()
     }, {
       where: {
         familyId
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     await notifyClientsAboutChangesDelayed({
       familyId,
       websocket,
-      database,
+      transaction,
       generalLevel: 1,
       targetedLevels: new Map(),
-      sourceDeviceId: deviceId,
+      sourceDeviceId: deviceId
-      transaction
     })
 
     const data = await generateServerDataStatus({
-      database,
+      transaction,
       clientStatus: createEmptyClientDataStatus({ clientLevel: request.clientLevel || null }),
       familyId: entry.familyId,
       deviceId,
-      transaction,
       eventHandler
     })
 

src/function/child/logout-at-primary-device.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,21 +16,21 @@
  */
 
 import { Conflict, Unauthorized } from 'http-errors'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { WebsocketApi } from '../../websocket'
 
 export const logoutAtPrimaryDevice = async ({ deviceAuthToken, database, websocket }: {
   deviceAuthToken: string
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
   // no transaction here because this is directly called from an API endpoint
 }) => {
   await database.transaction(async (transaction) => {
-    const ownDeviceEntryUnsafe = await database.device.findOne({
+    const ownDeviceEntryUnsafe = await transaction.legacy.database.device.findOne({
       where: {
         deviceAuthToken
       },
-      transaction,
+      transaction: transaction.legacy.transaction,
       attributes: ['familyId', 'currentUserId', 'deviceId']
     })
 
@@ -43,14 +43,14 @@ export const logoutAtPrimaryDevice = async ({ deviceAuthToken, database, websock
       currentUserId: ownDeviceEntryUnsafe.currentUserId
     }
 
-    const deviceUserEntryUnsafe = await database.user.findOne({
+    const deviceUserEntryUnsafe = await transaction.legacy.database.user.findOne({
       where: {
         familyId: ownDeviceEntry.familyId,
         userId: ownDeviceEntry.currentUserId,
         type: 'child'
       },
       attributes: ['currentDevice'],
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (!deviceUserEntryUnsafe) {
@@ -61,14 +61,14 @@ export const logoutAtPrimaryDevice = async ({ deviceAuthToken, database, websock
       currentDevice: deviceUserEntryUnsafe.currentDevice
     }
 
-    const otherDeviceEntryUnsafe = await database.device.findOne({
+    const otherDeviceEntryUnsafe = await transaction.legacy.database.device.findOne({
       where: {
         familyId: ownDeviceEntry.familyId,
         deviceId: deviceUserEntry.currentDevice,
         currentUserId: ownDeviceEntry.currentUserId
       },
       attributes: ['deviceAuthToken'],
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (!otherDeviceEntryUnsafe) {

src/function/child/set-primary-device.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -17,13 +17,13 @@
 
 import { Conflict, InternalServerError, Unauthorized } from 'http-errors'
 import { config } from '../../config'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { generateVersionId } from '../../util/token'
 import { WebsocketApi } from '../../websocket'
 import { notifyClientsAboutChangesDelayed } from '../websocket'
 
 export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, currentUserId, action }: {
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
   deviceAuthToken: string
   currentUserId: string
@@ -31,11 +31,11 @@ export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, c
   // no transaction here because this is directly called from an API endpoint
 }): Promise<'assigned to other device' | 'requires full version' | 'success'> => {
   return database.transaction(async (transaction): Promise<'assigned to other device' | 'requires full version' | 'success'> => {
-    const deviceEntryUnsafe = await database.device.findOne({
+    const deviceEntryUnsafe = await transaction.legacy.database.device.findOne({
       where: {
         deviceAuthToken
       },
-      transaction,
+      transaction: transaction.legacy.transaction,
       attributes: ['familyId', 'currentUserId', 'deviceId']
     })
 
@@ -53,12 +53,12 @@ export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, c
       throw new Conflict()
     }
 
-    const userEntryUnsafe = await database.user.findOne({
+    const userEntryUnsafe = await transaction.legacy.database.user.findOne({
       where: {
         familyId: deviceEntry.familyId,
         userId: deviceEntry.currentUserId
       },
-      transaction,
+      transaction: transaction.legacy.transaction,
       attributes: ['currentDevice']
     })
 
@@ -70,12 +70,12 @@ export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, c
       currentDevice: userEntryUnsafe.currentDevice
     }
 
-    const userDeviceEntriesUnsafe = await database.device.findAll({
+    const userDeviceEntriesUnsafe = await transaction.legacy.database.device.findAll({
       where: {
         familyId: deviceEntry.familyId,
         currentUserId
       },
-      transaction,
+      transaction: transaction.legacy.transaction,
       attributes: ['deviceId']
     })
 
@@ -84,11 +84,11 @@ export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, c
     }))
 
     if (userDeviceEntries.length >= 2) {
-      const familyEntryUnsafe = await database.family.findOne({
+      const familyEntryUnsafe = await transaction.legacy.database.family.findOne({
         where: {
           familyId: deviceEntry.familyId
         },
-        transaction,
+        transaction: transaction.legacy.transaction,
         attributes: ['hasFullVersion']
       })
 
@@ -112,14 +112,14 @@ export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, c
       }
 
       // update
-      const [affectedRows] = await database.user.update({
+      const [affectedRows] = await transaction.legacy.database.user.update({
         currentDevice: deviceEntry.deviceId
       }, {
         where: {
           familyId: deviceEntry.familyId,
           userId: currentUserId
         },
-        transaction
+        transaction: transaction.legacy.transaction
       })
 
       if (affectedRows !== 1) {
@@ -131,14 +131,14 @@ export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, c
       }
 
       // update
-      const [affectedRows] = await database.user.update({
+      const [affectedRows] = await transaction.legacy.database.user.update({
         currentDevice: ''
       }, {
         where: {
           familyId: deviceEntry.familyId,
           userId: currentUserId
         },
-        transaction
+        transaction: transaction.legacy.transaction
       })
 
       if (affectedRows !== 1) {
@@ -149,10 +149,10 @@ export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, c
     }
 
     // invalidiate user list
-    await database.family.update({
+    await transaction.legacy.database.family.update({
       userListVersion: generateVersionId()
     }, {
-      transaction,
+      transaction: transaction.legacy.transaction,
       where: {
         familyId: deviceEntry.familyId
       }
@@ -163,10 +163,9 @@ export const setPrimaryDevice = async ({ database, websocket, deviceAuthToken, c
       familyId: deviceEntry.familyId,
       sourceDeviceId: deviceEntry.deviceId,
       websocket,
-      database,
+      transaction,
       generalLevel: 1,  // the source device knows it already
       targetedLevels: new Map(),
-      transaction
     })
 
     return 'success'

src/function/cleanup/account-deletion.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2023 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -17,7 +17,7 @@
 
 import { Unauthorized } from 'http-errors'
 import { DeleteAccountPayload } from '../../api/schema'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { sendAccountDeletedMail } from '../../util/mail'
 import { WebsocketApi } from '../../websocket'
 import { requireMailAndLocaleByAuthToken } from '../authentication'
@@ -25,14 +25,14 @@ import { deleteFamilies } from './delete-families'
 
 export async function deleteAccount({ request, database, websocket }: {
   request: DeleteAccountPayload
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
 }) {
   await database.transaction(async (transaction) => {
-    const deviceEntryUnsafe = await database.device.findOne({
+    const deviceEntryUnsafe = await transaction.legacy.database.device.findOne({
       where: { deviceAuthToken: request.deviceAuthToken },
       attributes: ['familyId'],
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (!deviceEntryUnsafe) {
@@ -43,13 +43,13 @@ export async function deleteAccount({ request, database, websocket }: {
       familyId: deviceEntryUnsafe.familyId
     }
 
-    const userEntries = (await database.user.findAll({
+    const userEntries = (await transaction.legacy.database.user.findAll({
       where: {
         familyId: deviceEntry.familyId,
         type: 'parent'
       },
       attributes: ['mail'],
-      transaction
+      transaction: transaction.legacy.transaction
     })).map((item) => ({ mail: item.mail }))
 
     const registeredMailAddresses = new Set<string>()
@@ -63,7 +63,6 @@ export async function deleteAccount({ request, database, websocket }: {
     for (const mailAuthToken of request.mailAuthTokens) {
       const info = await requireMailAndLocaleByAuthToken({
         mailAuthToken,
-        database,
         transaction,
         invalidate: true
       })
@@ -79,17 +78,17 @@ export async function deleteAccount({ request, database, websocket }: {
       if (!authenticatedMailAddresses.has(mail)) throw new Unauthorized()
     })
 
-    const deviceEntries = (await database.device.findAll({
+    const deviceEntries = (await transaction.legacy.database.device.findAll({
       where: {
         familyId: deviceEntry.familyId
       },
-      transaction,
+      transaction: transaction.legacy.transaction,
       attributes: ['deviceAuthToken']
     })).map((item) => ({ deviceAuthToken: item.deviceAuthToken }))
 
-    await deleteFamilies({ database, transaction, familiyIds: [deviceEntry.familyId] })
+    await deleteFamilies({ transaction, familiyIds: [deviceEntry.familyId] })
 
-    transaction.afterCommit(() => {
+    transaction.enqueueAfterCommit(() => {
       for (const device of deviceEntries) {
         websocket.triggerSyncByDeviceAuthToken({
           deviceAuthToken: device.deviceAuthToken,

src/function/cleanup/delete-families.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2023 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -17,138 +17,136 @@
 
 import { difference } from 'lodash'
 import * as Sequelize from 'sequelize'
-import { Database, Transaction } from '../../database'
+import { SimpleDatabaseTransaction } from '../../database/simple'
 
-export async function deleteFamilies ({ database, transaction, familiyIds }: {
+export async function deleteFamilies ({ transaction, familiyIds }: {
-  database: Database
+  transaction: SimpleDatabaseTransaction
-  transaction: Transaction
   familiyIds: Array<string>
-  // no transaction here because this should run isolated
 }) {
   if (familiyIds.length === 0) {
     return
   }
 
   // category
-  await database.category.destroy({
+  await transaction.legacy.database.category.destroy({
     where: {
       familyId: {
         [Sequelize.Op.in]: familiyIds
       }
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   // categoryapp
-  await database.categoryApp.destroy({
+  await transaction.legacy.database.categoryApp.destroy({
     where: {
       familyId: {
         [Sequelize.Op.in]: familiyIds
       }
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   // purchase
-  await database.purchase.destroy({
+  await transaction.legacy.database.purchase.destroy({
     where: {
       familyId: {
         [Sequelize.Op.in]: familiyIds
       }
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   // timelimitrule
-  await database.timelimitRule.destroy({
+  await transaction.legacy.database.timelimitRule.destroy({
     where: {
       familyId: {
         [Sequelize.Op.in]: familiyIds
       }
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   // usedtime
-  await database.usedTime.destroy({
+  await transaction.legacy.database.usedTime.destroy({
     where: {
       familyId: {
         [Sequelize.Op.in]: familiyIds
       }
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   // session durations
-  await database.sessionDuration.destroy({
+  await transaction.legacy.database.sessionDuration.destroy({
     where: {
       familyId: {
         [Sequelize.Op.in]: familiyIds
       }
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   // user
-  await database.user.destroy({
+  await transaction.legacy.database.user.destroy({
     where: {
       familyId: {
         [Sequelize.Op.in]: familiyIds
       }
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   // device
-  const oldDeviceAuthTokens = (await database.device.findAll({
+  const oldDeviceAuthTokens = (await transaction.legacy.database.device.findAll({
     where: {
       familyId: {
         [Sequelize.Op.in]: familiyIds
       }
     },
     attributes: ['deviceAuthToken'],
-    transaction
+    transaction: transaction.legacy.transaction
   })).map((item) => item.deviceAuthToken)
 
-  await database.device.destroy({
+  await transaction.legacy.database.device.destroy({
     where: {
       familyId: {
         [Sequelize.Op.in]: familiyIds
       }
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   // olddevice
   if (oldDeviceAuthTokens.length > 0) {
-    const knownOldDeviceAuthTokens = (await database.oldDevice.findAll({
+    const knownOldDeviceAuthTokens = (await transaction.legacy.database.oldDevice.findAll({
       where: {
         deviceAuthToken: {
           [Sequelize.Op.in]: oldDeviceAuthTokens
         }
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })).map((item) => item.deviceAuthToken)
 
     const oldDeviceAuthTokensToAdd = difference(oldDeviceAuthTokens, knownOldDeviceAuthTokens)
 
     if (oldDeviceAuthTokensToAdd.length > 0) {
-      await database.oldDevice.bulkCreate(
+      await transaction.legacy.database.oldDevice.bulkCreate(
         oldDeviceAuthTokensToAdd.map((item) => ({
           deviceAuthToken: item
         })),
-        { transaction }
+        { transaction: transaction.legacy.transaction }
       )
     }
   }
 
   // family
-  await database.family.destroy({
+  await transaction.legacy.database.family.destroy({
     where: {
       familyId: {
         [Sequelize.Op.in]: familiyIds
       }
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 }

src/function/cleanup/delete-old-families.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2023 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -17,10 +17,10 @@
 
 import { difference } from 'lodash'
 import * as Sequelize from 'sequelize'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { deleteFamilies } from './delete-families'
 
-export async function deleteOldFamilies (database: Database) {
+export async function deleteOldFamilies (database: SimpleDatabase) {
   const oldFamilyIds = await findOldFamilyIds(database)
 
   if (oldFamilyIds.length > 0) {
@@ -28,7 +28,6 @@ export async function deleteOldFamilies (database: Database) {
 
     await database.transaction(async (transaction) => {
       await deleteFamilies({
-        database,
         transaction,
         familiyIds: familyIdsToDelete
       })
@@ -36,23 +35,23 @@ export async function deleteOldFamilies (database: Database) {
   }
 }
 
-export async function findOldFamilyIds (database: Database) {
+export async function findOldFamilyIds (database: SimpleDatabase): Promise<Array<string>> {
   return database.transaction(async (transaction) => {
-    const familyIdsWithExpiredLicenses = (await database.family.findAll({
+    const familyIdsWithExpiredLicenses = (await transaction.legacy.database.family.findAll({
       where: {
         fullVersionUntil: {
           [Sequelize.Op.lt]: (Date.now() - 1000 * 60 * 60 * 24 * 90 /* 90 days */).toString(10)
         }
       },
       attributes: ['familyId'],
-      transaction
+      transaction: transaction.legacy.transaction
     })).map((item) => item.familyId)
 
     if (familyIdsWithExpiredLicenses.length === 0) {
       return []
     }
 
-    const recentlyUsedFamilyIds = (await database.device.findAll({
+    const recentlyUsedFamilyIds = (await transaction.legacy.database.device.findAll({
       where: {
         familyId: {
           [Sequelize.Op.in]: familyIdsWithExpiredLicenses
@@ -62,7 +61,7 @@ export async function findOldFamilyIds (database: Database) {
         }
       },
       attributes: ['familyId'],
-      transaction
+      transaction: transaction.legacy.transaction
     })).map((item) => item.familyId)
 
     return difference(familyIdsWithExpiredLicenses, recentlyUsedFamilyIds)

src/function/device/remove-device.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,24 +16,23 @@
  */
 
 import { Conflict } from 'http-errors'
-import { Database, Transaction } from '../../database'
+import { SimpleDatabaseTransaction } from '../../database/simple'
 import { generateVersionId } from '../../util/token'
 import { WebsocketApi } from '../../websocket'
 import { notifyClientsAboutChangesDelayed } from '../websocket'
 
-export async function removeDevice ({ database, familyId, deviceId, websocket, transaction }: {
+export async function removeDevice ({ familyId, deviceId, websocket, transaction }: {
-  database: Database
+  transaction: SimpleDatabaseTransaction
   familyId: string
   deviceId: string
   websocket: WebsocketApi
-  transaction: Transaction
 }) {
-  const deviceEntry = await database.device.findOne({
+  const deviceEntry = await transaction.legacy.database.device.findOne({
     where: {
       familyId,
       deviceId
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   if (!deviceEntry) {
@@ -41,37 +40,37 @@ export async function removeDevice ({ database, familyId, deviceId, websocket, t
   }
 
   // remove as current device
-  await database.user.update({
+  await transaction.legacy.database.user.update({
     currentDevice: ''
   }, {
     where: {
       familyId,
       currentDevice: deviceId
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   // add to old devices if it is not yet there (it could be there if it reported a uninstall)
-  const oldOldDeviceEntry = await database.oldDevice.findOne({
+  const oldOldDeviceEntry = await transaction.legacy.database.oldDevice.findOne({
     where: {
       deviceAuthToken: deviceEntry.deviceAuthToken
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   if (!oldOldDeviceEntry) {
-    await database.oldDevice.create({
+    await transaction.legacy.database.oldDevice.create({
       deviceAuthToken: deviceEntry.deviceAuthToken
     }, {
-      transaction
+      transaction: transaction.legacy.transaction
     })
   }
 
   // remove from the device list
-  await deviceEntry.destroy({ transaction })
+  await deviceEntry.destroy({ transaction: transaction.legacy.transaction })
 
   // invalidiate the caches
-  await database.family.update({
+  await transaction.legacy.database.family.update({
     deviceListVersion: generateVersionId(),
     // the device could have become unassigned during this
     userListVersion: generateVersionId()
@@ -79,20 +78,19 @@ export async function removeDevice ({ database, familyId, deviceId, websocket, t
     where: {
       familyId: deviceEntry.familyId
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   await notifyClientsAboutChangesDelayed({
-    database,
+    transaction,
     websocket,
     familyId,
     sourceDeviceId: null,
     generalLevel: 1,
-    targetedLevels: new Map(),
+    targetedLevels: new Map()
-    transaction
   })
 
-  transaction.afterCommit(() => {
+  transaction.enqueueAfterCommit(() => {
     websocket.triggerSyncByDeviceAuthToken({
       deviceAuthToken: deviceEntry.deviceAuthToken,
       isImportant: true

src/function/device/report-device-removed.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,24 +16,24 @@
  */
 
 import { Unauthorized } from 'http-errors'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { generateAuthToken, generateVersionId } from '../../util/token'
 import { WebsocketApi } from '../../websocket'
 import { sendUninstallWarnings } from '../warningmail/uninstall'
 import { notifyClientsAboutChangesDelayed } from '../websocket'
 
 export async function reportDeviceRemoved ({ database, deviceAuthToken, websocket }: {
-  database: Database
+  database: SimpleDatabase
   deviceAuthToken: string
   websocket: WebsocketApi
   // no transaction here because this is directly called from an API endpoint
 }) {
   await database.transaction(async (transaction) => {
-    const deviceEntry = await database.device.findOne({
+    const deviceEntry = await transaction.legacy.database.device.findOne({
       where: {
         deviceAuthToken
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (deviceEntry) {
@@ -41,47 +41,45 @@ export async function reportDeviceRemoved ({ database, deviceAuthToken, websocke
 
       deviceEntry.didDeviceReportUninstall = true
       deviceEntry.deviceAuthToken = generateAuthToken() // invalidiate the token
-      await deviceEntry.save({ transaction })
+      await deviceEntry.save({ transaction: transaction.legacy.transaction })
 
       // invalidiate device list
-      await database.family.update({
+      await transaction.legacy.database.family.update({
         deviceListVersion: generateVersionId()
       }, {
         where: {
           familyId: deviceEntry.familyId
         },
-        transaction
+        transaction: transaction.legacy.transaction
       })
 
       // add to old devices
-      await database.oldDevice.create({
+      await transaction.legacy.database.oldDevice.create({
         deviceAuthToken: currentAuthToken
       }, {
-        transaction
+        transaction: transaction.legacy.transaction
       })
 
       await notifyClientsAboutChangesDelayed({
-        database,
+        transaction,
         websocket,
         familyId: deviceEntry.familyId,
         sourceDeviceId: null,
         generalLevel: 1,
         targetedLevels: new Map(),
-        transaction
       })
 
       await sendUninstallWarnings({
-        database,
+        transaction,
         familyId: deviceEntry.familyId,
         deviceName: deviceEntry.name,
-        transaction
       })
     } else {
-      const oldDeviceEntry = await database.oldDevice.findOne({
+      const oldDeviceEntry = await transaction.legacy.database.oldDevice.findOne({
         where: {
           deviceAuthToken
         },
-        transaction
+        transaction: transaction.legacy.transaction
       })
 
       if (!oldDeviceEntry) {

src/function/dh/decrypt.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -15,17 +15,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import * as Sequelize from 'sequelize'
 import { createDecipheriv } from 'crypto'
-import { Database } from '../../database'
+import { SimpleDatabaseTransaction } from '../../database/simple'
 import { isVersionId } from '../../util/token'
 import { getSharedSecret, SharedSecretException } from './shared-secret'
 
 export async function decrypt({
-  database, transaction, familyId, deviceId, encryptedData, authData
+  transaction, familyId, deviceId, encryptedData, authData
 }: {
-  database: Database
+  transaction: SimpleDatabaseTransaction
-  transaction: Sequelize.Transaction
   familyId: string
   deviceId: string
   encryptedData: string
@@ -46,7 +44,6 @@ export async function decrypt({
   const sharedSecret = await (async () => {
     try {
       return getSharedSecret({
-        database,
         transaction,
         familyId,
         deviceId,

src/function/dh/parentpassword.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -31,7 +31,6 @@ export async function decryptParentPassword({ cache, password } : {
 
   try {
     const secondHash = (await decrypt({
-      database: cache.database,
       transaction: cache.transaction,
       familyId: cache.familyId,
       deviceId: cache.deviceId,

src/function/dh/shared-secret.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -15,17 +15,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import * as Sequelize from 'sequelize'
 import { createPrivateKey, createPublicKey, diffieHellman } from 'crypto'
-import { Database } from '../../database'
+import { SimpleDatabaseTransaction } from '../../database/simple'
 import { calculateExpireTime } from '../../database/devicedhkey'
 import { isVersionId } from '../../util/token'
 
 export async function getSharedSecret({
-  database, transaction, familyId, deviceId, keyId, otherPublicKey
+  transaction, familyId, deviceId, keyId, otherPublicKey
 }: {
-  database: Database
+  transaction: SimpleDatabaseTransaction
-  transaction: Sequelize.Transaction
   familyId: string
   deviceId: string
   keyId: string
@@ -33,20 +31,20 @@ export async function getSharedSecret({
 }) {
   if (!isVersionId(keyId)) throw new KeyNotFoundException('invalid key id')
 
-  const databaseKeyEntry = await database.deviceDhKey.findOne({
+  const databaseKeyEntry = await transaction.legacy.database.deviceDhKey.findOne({
     where: {
       familyId,
       deviceId,
       version: keyId
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   if (!databaseKeyEntry) throw new KeyNotFoundException('private key not found')
 
   if (databaseKeyEntry.expireAt === null) {
     databaseKeyEntry.expireAt = calculateExpireTime(BigInt(Date.now())).toString(10)
-    await databaseKeyEntry.save({ transaction })
+    await databaseKeyEntry.save({ transaction: transaction.legacy.transaction })
   } else {
     if (BigInt(databaseKeyEntry.expireAt) < BigInt(Date.now())) throw new KeyExpiredException()
   }

src/function/parent/create-add-device-token.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -15,31 +15,30 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { Database, Transaction } from '../../database'
+import { SimpleDatabaseTransaction } from '../../database/simple'
 import { randomWords } from '../../util/random-words'
 import { generateIdWithinFamily } from '../../util/token'
 
-export const createAddDeviceToken = async ({ familyId, database, transaction }: {
+export const createAddDeviceToken = async ({ familyId, transaction }: {
   familyId: string
-  database: Database
+  transaction: SimpleDatabaseTransaction
-  transaction: Transaction
 }) => {
   const token = randomWords(5)
   const deviceId = generateIdWithinFamily()
 
-  await database.addDeviceToken.destroy({
+  await transaction.legacy.database.addDeviceToken.destroy({
     where: {
       familyId
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
-  await database.addDeviceToken.create({
+  await transaction.legacy.database.addDeviceToken.create({
     familyId,
     token: token.toLowerCase(),
     deviceId,
     createdAt: Date.now().toString()
-  }, { transaction })
+  }, { transaction: transaction.legacy.transaction })
 
   return { token, deviceId }
 }

src/function/parent/create-family.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -18,7 +18,7 @@
 import { Conflict } from 'http-errors'
 import { generateServerDataStatus } from '../sync/get-server-data-status'
 import { NewDeviceInfo, PlaintextParentPassword, assertPlaintextParentPasswordValid } from '../../api/schema'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { maxMailNotificationFlags } from '../../database/user'
 import { EventHandler } from '../../monitoring/eventhandler'
 import { ServerDataStatus } from '../../object/serverdatastatus'
@@ -33,7 +33,7 @@ export async function createFamily ({
   database, eventHandler, mailAuthToken, firstParentDevice,
   password, timeZone, parentName, deviceName, clientLevel
 }: {
-  database: Database
+  database: SimpleDatabase
   eventHandler: EventHandler
   mailAuthToken: string
   firstParentDevice: NewDeviceInfo
@@ -52,14 +52,14 @@ export async function createFamily ({
 
   return database.transaction(async (transaction) => {
     const now = Date.now().toString(10)
-    const mailInfo = await requireMailAndLocaleByAuthToken({ database, mailAuthToken, transaction, invalidate: true })
+    const mailInfo = await requireMailAndLocaleByAuthToken({ transaction, mailAuthToken, invalidate: true })
 
     // ensure that no family was created for this mail yet
-    const existingUserEntry = await database.user.findOne({
+    const existingUserEntry = await transaction.legacy.database.user.findOne({
       where: {
         mail: mailInfo.mail
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (existingUserEntry) {
@@ -72,7 +72,7 @@ export async function createFamily ({
     const deviceAuthToken = generateAuthToken()
 
     // create family
-    await database.family.create({
+    await transaction.legacy.database.family.create({
       familyId,
       name: '',
       createdAt: now,
@@ -82,11 +82,12 @@ export async function createFamily ({
       fullVersionUntil: (Date.now() + 1000 * 60 * 60 * 24 * 14).toString(10),
       hasFullVersion: true,
       nextServerKeyRequestSeq: '1',
-      u2fKeysVersion: generateVersionId()
+      u2fKeysVersion: generateVersionId(),
-    }, { transaction })
+      fullVersionDebts: '0'
+    }, { transaction: transaction.legacy.transaction })
 
     // create parent user
-    await database.user.create({
+    await transaction.legacy.database.user.create({
       familyId,
       userId,
       name: parentName,
@@ -103,10 +104,10 @@ export async function createFamily ({
       mailNotificationFlags: maxMailNotificationFlags,
       blockedTimes: '',
       flags: '0'
-    }, { transaction })
+    }, { transaction: transaction.legacy.transaction })
 
     // add parent device
-    await database.device.create(prepareDeviceEntry({
+    await transaction.legacy.database.device.create(prepareDeviceEntry({
       familyId,
       deviceId,
       deviceName,
@@ -114,14 +115,13 @@ export async function createFamily ({
       userId,
       deviceAuthToken,
       isUserKeptSignedIn: true
-    }), { transaction })
+    }), { transaction: transaction.legacy.transaction })
 
     const data = await generateServerDataStatus({
-      database,
+      transaction,
       clientStatus: createEmptyClientDataStatus({ clientLevel }),
       familyId,
       deviceId,
-      transaction,
       eventHandler
     })
 

src/function/parent/get-status-by-mail-address.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2021 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -15,22 +15,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { Database, Transaction } from '../../database'
+import { SimpleDatabaseTransaction } from '../../database/simple'
 import { StaticMessageException } from '../../exception'
 import { requireMailAndLocaleByAuthToken } from '../authentication'
 
 const getStatusByMailAddress = async ({
-  mail, database, transaction
+  mail, transaction
-}: { mail: string, database: Database, transaction: Transaction }) => {
+}: { mail: string, transaction: SimpleDatabaseTransaction }) => {
   if (!mail) {
     throw new StaticMessageException({ staticMessage: 'getStatusByMailAddress: no mail address provided' })
   }
 
-  const entry = await database.user.findOne({
+  const entry = await transaction.legacy.database.user.findOne({
     where: {
       mail
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   if (entry) {
@@ -41,12 +41,12 @@ const getStatusByMailAddress = async ({
 }
 
 export const getStatusByMailToken = async ({
-  mailAuthToken, database, transaction
+  mailAuthToken, transaction
-}: { mailAuthToken: string, database: Database, transaction: Transaction }) => {
+}: { mailAuthToken: string, transaction: SimpleDatabaseTransaction }) => {
-  const mailInfo = await requireMailAndLocaleByAuthToken({ mailAuthToken, database, transaction, invalidate: false })
+  const mailInfo = await requireMailAndLocaleByAuthToken({ mailAuthToken, transaction, invalidate: false })
   const mail = mailInfo.mail
 
-  const status = await getStatusByMailAddress({ mail, database, transaction })
+  const status = await getStatusByMailAddress({ mail, transaction })
 
   return { mail, status }
 }

src/function/parent/link-mail-address.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,7 +16,7 @@
  */
 
 import { Conflict, Unauthorized } from 'http-errors'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { generateVersionId } from '../../util/token'
 import { WebsocketApi } from '../../websocket'
 import { requireMailAndLocaleByAuthToken } from '../authentication'
@@ -27,16 +27,16 @@ export const linkMailAddress = async ({ mailAuthToken, deviceAuthToken, parentUs
   deviceAuthToken: string
   parentUserId: string
   parentPasswordSecondHash: string
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
   // no transaction here because this is directly called from an API endpoint
 }) => {
   await database.transaction(async (transaction) => {
-    const deviceEntry = await database.device.findOne({
+    const deviceEntry = await transaction.legacy.database.device.findOne({
       where: {
         deviceAuthToken
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (!deviceEntry) {
@@ -45,26 +45,26 @@ export const linkMailAddress = async ({ mailAuthToken, deviceAuthToken, parentUs
 
     const familyId = deviceEntry.familyId
 
-    const mailInfo = await requireMailAndLocaleByAuthToken({ mailAuthToken, database, transaction, invalidate: true })
+    const mailInfo = await requireMailAndLocaleByAuthToken({ mailAuthToken, transaction, invalidate: true })
 
-    const exisitingUser = await database.user.findOne({
+    const exisitingUser = await transaction.legacy.database.user.findOne({
       where: {
         mail: mailInfo.mail
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (exisitingUser) {
       throw new Conflict()
     }
 
-    const parentEntry = await database.user.findOne({
+    const parentEntry = await transaction.legacy.database.user.findOne({
       where: {
         type: 'parent',
         familyId,
         userId: parentUserId
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (!parentEntry) {
@@ -85,16 +85,16 @@ export const linkMailAddress = async ({ mailAuthToken, deviceAuthToken, parentUs
 
     parentEntry.mail = mailInfo.mail
 
-    await parentEntry.save({ transaction })
+    await parentEntry.save({ transaction: transaction.legacy.transaction })
 
     // invalidiate client caches
-    await database.family.update({
+    await transaction.legacy.database.family.update({
       userListVersion: generateVersionId()
     }, {
       where: {
         familyId
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     // notify
@@ -103,9 +103,8 @@ export const linkMailAddress = async ({ mailAuthToken, deviceAuthToken, parentUs
       sourceDeviceId: null,
       generalLevel: 1,
       targetedLevels: new Map(),
-      database,
+      transaction,
-      websocket,
+      websocket
-      transaction
     })
   })
 }

src/function/parent/recover-parent-password.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -17,7 +17,7 @@
 
 import { Conflict } from 'http-errors'
 import { PlaintextParentPassword, assertPlaintextParentPasswordValid } from '../../api/schema'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { sendPasswordRecoveryUsedMail } from '../../util/mail'
 import { generateVersionId } from '../../util/token'
 import { WebsocketApi } from '../../websocket'
@@ -25,7 +25,7 @@ import { requireMailAndLocaleByAuthToken } from '../authentication'
 import { notifyClientsAboutChangesDelayed } from '../websocket'
 
 export const recoverParentPassword = async ({ database, websocket, password, mailAuthToken }: {
-  database: Database
+  database: SimpleDatabase
   websocket: WebsocketApi
   password: PlaintextParentPassword
   mailAuthToken: string
@@ -34,14 +34,14 @@ export const recoverParentPassword = async ({ database, websocket, password, mai
   assertPlaintextParentPasswordValid(password)
 
   await database.transaction(async (transaction) => {
-    const mailInfo = await requireMailAndLocaleByAuthToken({ mailAuthToken, database, transaction, invalidate: true })
+    const mailInfo = await requireMailAndLocaleByAuthToken({ mailAuthToken, transaction, invalidate: true })
 
     // update the user entry
-    const userEntry = await database.user.findOne({
+    const userEntry = await transaction.legacy.database.user.findOne({
       where: {
         mail: mailInfo.mail
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (!userEntry) {
@@ -52,29 +52,28 @@ export const recoverParentPassword = async ({ database, websocket, password, mai
     userEntry.secondPasswordHash = password.secondHash
     userEntry.secondPasswordSalt = password.secondSalt
 
-    await userEntry.save({ transaction })
+    await userEntry.save({ transaction: transaction.legacy.transaction })
 
     // invalidate the user list
-    await database.family.update({
+    await transaction.legacy.database.family.update({
       userListVersion: generateVersionId()
     }, {
       where: {
         familyId: userEntry.familyId
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     await notifyClientsAboutChangesDelayed({
-      database,
+      transaction,
       familyId: userEntry.familyId,
       websocket,
       generalLevel: 2,
       targetedLevels: new Map(),
-      sourceDeviceId: null,
+      sourceDeviceId: null
-      transaction
     })
 
-    transaction.afterCommit(async () => {
+    transaction.enqueueAfterCommit(async () => {
       await sendPasswordRecoveryUsedMail({
         receiver: mailInfo.mail,
         locale: mailInfo.locale

src/function/parent/sign-in-into-family.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -17,7 +17,7 @@
 
 import { Conflict } from 'http-errors'
 import { NewDeviceInfo } from '../../api/schema'
-import { Database } from '../../database'
+import { SimpleDatabase } from '../../database/simple'
 import { sendDeviceLinkedMail } from '../../util/mail'
 import { generateAuthToken, generateIdWithinFamily, generateVersionId } from '../../util/token'
 import { WebsocketApi } from '../../websocket'
@@ -30,7 +30,7 @@ import { ServerDataStatus } from '../../object/serverdatastatus'
 import { createEmptyClientDataStatus } from '../../object/clientdatastatus'
 
 export const signInIntoFamily = async ({ database, eventHandler, mailAuthToken, newDeviceInfo, deviceName, websocket, clientLevel }: {
-  database: Database
+  database: SimpleDatabase
   eventHandler: EventHandler
   mailAuthToken: string
   newDeviceInfo: NewDeviceInfo
@@ -40,14 +40,14 @@ export const signInIntoFamily = async ({ database, eventHandler, mailAuthToken,
   // no transaction here because this is directly called from an API endpoint
 }): Promise<{ deviceId: string; deviceAuthToken: string; data: ServerDataStatus }> => {
   return database.transaction(async (transaction) => {
-    const mailInfo = await requireMailAndLocaleByAuthToken({ database, mailAuthToken, transaction, invalidate: true })
+    const mailInfo = await requireMailAndLocaleByAuthToken({ mailAuthToken, transaction, invalidate: true })
 
-    const userEntryUnsafe = await database.user.findOne({
+    const userEntryUnsafe = await transaction.legacy.database.user.findOne({
       where: {
         mail: mailInfo.mail
       },
       attributes: ['familyId', 'userId'],
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     if (!userEntryUnsafe) {
@@ -62,7 +62,7 @@ export const signInIntoFamily = async ({ database, eventHandler, mailAuthToken,
     const deviceAuthToken = generateAuthToken()
     const deviceId = generateIdWithinFamily()
 
-    await database.device.create(prepareDeviceEntry({
+    await transaction.legacy.database.device.create(prepareDeviceEntry({
       familyId: userEntry.familyId,
       deviceId,
       userId: userEntry.userId,
@@ -70,29 +70,28 @@ export const signInIntoFamily = async ({ database, eventHandler, mailAuthToken,
       deviceAuthToken,
       newDeviceInfo,
       isUserKeptSignedIn: true
-    }), { transaction })
+    }), { transaction: transaction.legacy.transaction })
 
     // notify about changes
-    await database.family.update({
+    await transaction.legacy.database.family.update({
       deviceListVersion: generateVersionId()
     }, {
       where: {
         familyId: userEntry.familyId
       },
-      transaction
+      transaction: transaction.legacy.transaction
     })
 
     await notifyClientsAboutChangesDelayed({
       familyId: userEntry.familyId,
       websocket,
-      database,
+      transaction,
       generalLevel: 1,
       targetedLevels: new Map(),
-      sourceDeviceId: deviceId,
+      sourceDeviceId: deviceId
-      transaction
     })
 
-    transaction.afterCommit(async () => {
+    transaction.enqueueAfterCommit(async () => {
       await sendDeviceLinkedMail({
         receiver: mailInfo.mail,
         locale: mailInfo.locale,
@@ -101,11 +100,10 @@ export const signInIntoFamily = async ({ database, eventHandler, mailAuthToken,
     })
 
     const data = await generateServerDataStatus({
-      database,
+      transaction,
       clientStatus: createEmptyClientDataStatus({ clientLevel }),
       familyId: userEntry.familyId,
       deviceId,
-      transaction,
       eventHandler
     })
 

src/function/purchase/add-purchase.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,40 +16,40 @@
  */
 
 import { Conflict } from 'http-errors'
-import { Database, Transaction } from '../../database'
+import { SimpleDatabaseTransaction } from '../../database/simple'
 import { notifyClientsAboutChangesDelayed } from '../../function/websocket'
 import { WebsocketApi } from '../../websocket'
 
 const day = 1000 * 60 * 60 * 24
+const week = day * 7
 const month = day * 31
 const year = day * 366
 
-export const addPurchase = async ({ database, familyId, type, service, transactionId, websocket, transaction }: {
+export const addPurchase = async ({ familyId, type, service, transactionId, websocket, transaction }: {
-  database: Database
+  transaction: SimpleDatabaseTransaction
   familyId: string
-  type: 'month' | 'year'
+  type: 'month' | 'year' | 'unpaid14'
   service: 'googleplay' | 'directpurchase'
   transactionId: string
   websocket: WebsocketApi
-  transaction: Transaction
 }) => {
-  const oldPurchaseEntry = await database.purchase.findOne({
+  const oldPurchaseEntry = await transaction.legacy.database.purchase.findOne({
     where: {
       service,
       transactionId
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   if (oldPurchaseEntry) {
     return
   }
 
-  const familyEntry = await database.family.findOne({
+  const familyEntry = await transaction.legacy.database.family.findOne({
     where: {
       familyId
     },
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   if (!familyEntry) {
@@ -57,33 +57,63 @@ export const addPurchase = async ({ database, familyId, type, service, transacti
   }
 
   const previousFullVersionEndTime = familyEntry.fullVersionUntil
+  const previousFullVersionDebts = parseInt(familyEntry.fullVersionDebts, 10)
 
-  const newFullVersionUntil = Math.max(parseInt(familyEntry.fullVersionUntil, 10), Date.now()) + (type === 'year' ? year : month)
+  if (type === 'month' || type === 'year') {
+    const typeDuration = type === 'year' ? year : month
+
+    if (typeDuration > previousFullVersionDebts) {
+      const newFullVersionUntil = Math.max(parseInt(familyEntry.fullVersionUntil, 10), Date.now()) + typeDuration - previousFullVersionDebts
 
       familyEntry.fullVersionUntil = newFullVersionUntil.toString(10)
+      familyEntry.fullVersionDebts = '0'
       familyEntry.hasFullVersion = true
+    } else {
+      familyEntry.fullVersionDebts = (previousFullVersionDebts - typeDuration).toString(10)
+    }
+  } else if (type === 'unpaid14') {
+    const debtsAdd = 2 * week
+    const debtsMax = 3 * week
 
-  await familyEntry.save({ transaction })
+    const newDebts = Math.min(debtsMax, previousFullVersionDebts + debtsAdd)
 
-  await database.purchase.create({
+    if (newDebts <= previousFullVersionDebts) {
+      // do not save anything
+
+      return
+    }
+
+    const durationToAdd = newDebts - previousFullVersionDebts
+
+    const newFullVersionUntil = Math.max(parseInt(familyEntry.fullVersionUntil, 10), Date.now()) + durationToAdd
+
+    familyEntry.fullVersionUntil = newFullVersionUntil.toString(10)
+    familyEntry.fullVersionDebts = newDebts.toString(10)
+    familyEntry.hasFullVersion = true
+  } else {
+    throw new Error()
+  }
+
+  await familyEntry.save({ transaction: transaction.legacy.transaction })
+
+  await transaction.legacy.database.purchase.create({
     familyId,
     service,
     transactionId,
     type,
     loggedAt: Date.now().toString(10),
     previousFullVersionEndTime,
-    newFullVersionEndTime: newFullVersionUntil.toString(10)
+    newFullVersionEndTime: familyEntry.fullVersionUntil
   }, {
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   await notifyClientsAboutChangesDelayed({
     familyId,
     sourceDeviceId: null,
-    database,
+    transaction,
     websocket,
     generalLevel: 2,
-    targetedLevels: new Map(),
+    targetedLevels: new Map()
-    transaction
   })
 }

src/function/purchase/can-do-next-purchase.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -15,6 +15,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-export const canDoNextPurchase = ({ fullVersionUntil }: {fullVersionUntil: number}) => (
+export const canDoNextPurchase = ({ fullVersionUntil, fullVersionDebts }: {
-  fullVersionUntil < (Date.now() + 1000 * 60 * 60 * 24 * 31)  // 31 days
+  fullVersionUntil: number
+  fullVersionDebts: number
+}) => (
+  (fullVersionUntil - fullVersionDebts) < (Date.now() + 1000 * 60 * 60 * 24 * 31)  // 31 days
 )

src/function/purchase/require-family-entry.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,19 +16,18 @@
  */
 
 import { InternalServerError, Unauthorized } from 'http-errors'
-import { Database, Transaction } from '../../database'
+import { SimpleDatabaseTransaction } from '../../database/simple'
 
-export const requireFamilyEntry = async ({ database, deviceAuthToken, transaction }: {
+export const requireFamilyEntry = async ({ transaction, deviceAuthToken }: {
-  database: Database
+  transaction: SimpleDatabaseTransaction
   deviceAuthToken: string
-  transaction: Transaction
 }) => {
-  const deviceEntryUnsafe = await database.device.findOne({
+  const deviceEntryUnsafe = await transaction.legacy.database.device.findOne({
     where: {
       deviceAuthToken
     },
     attributes: ['familyId'],
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   if (!deviceEntryUnsafe) {
@@ -39,12 +38,12 @@ export const requireFamilyEntry = async ({ database, deviceAuthToken, transactio
     familyId: deviceEntryUnsafe.familyId
   }
 
-  const familyEntryUnsafe = await database.family.findOne({
+  const familyEntryUnsafe = await transaction.legacy.database.family.findOne({
     where: {
       familyId: deviceEntry.familyId
     },
-    attributes: ['fullVersionUntil'],
+    attributes: ['fullVersionUntil', 'fullVersionDebts'],
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   if (!familyEntryUnsafe) {
@@ -52,7 +51,8 @@ export const requireFamilyEntry = async ({ database, deviceAuthToken, transactio
   }
 
   const familyEntry = {
-    fullVersionUntil: familyEntryUnsafe.fullVersionUntil
+    fullVersionUntil: familyEntryUnsafe.fullVersionUntil,
+    fullVersionDebts: familyEntryUnsafe.fullVersionDebts,
   }
 
   return familyEntry

src/function/statusmessage/index.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -15,37 +15,39 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import * as Sequelize from 'sequelize'
+import { SimpleDatabase, SimpleDatabaseTransaction } from '../../database/simple'
-import { Database } from '../../database'
 import { configItemIds } from '../../database/config'
 
-export const getStatusMessage = async ({ database, transaction }: {
+export const getStatusMessage = async ({ transaction }: {
-  database: Database
+  transaction: SimpleDatabaseTransaction
-  transaction?: Sequelize.Transaction
 }) => {
-  const currentStatusMessageItem = await database.config.findByPk(configItemIds.statusMessage, { transaction })
+  const currentStatusMessageItem = await transaction.legacy.database.config.findByPk(
+    configItemIds.statusMessage,
+    { transaction: transaction.legacy.transaction }
+  )
+
   const currentStatusMessage = (currentStatusMessageItem ? currentStatusMessageItem.value : null) || ''
 
   return currentStatusMessage
 }
 
 export const setStatusMessage = async ({ database, newStatusMessage }: {
-  database: Database
+  database: SimpleDatabase
   newStatusMessage: string
 }) => {
   await database.transaction(async (transaction) => {
     if (newStatusMessage === '') {
-      await database.config.destroy({
+      await transaction.legacy.database.config.destroy({
         where: {
           id: configItemIds.statusMessage
         },
-        transaction
+        transaction: transaction.legacy.transaction
       })
     } else {
-      await database.config.upsert({
+      await transaction.legacy.database.config.upsert({
         id: configItemIds.statusMessage,
         value: newStatusMessage
-      }, { transaction })
+      }, { transaction: transaction.legacy.transaction })
     }
   })
 }

src/function/sync/apply-actions/baseinfo.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2020 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,7 +16,7 @@
  */
 
 import { Unauthorized } from 'http-errors'
-import { Database, Transaction } from '../../../database'
+import { SimpleDatabaseTransaction } from '../../../database/simple'
 import { SourceFamilyNotFoundException } from './exception/illegal-state'
 
 export interface ApplyActionBaseInfo {
@@ -26,15 +26,14 @@ export interface ApplyActionBaseInfo {
   hasFullVersion: boolean
 }
 
-export async function getApplyActionBaseInfo ({ database, transaction, deviceAuthToken }: {
+export async function getApplyActionBaseInfo ({ transaction, deviceAuthToken }: {
-  database: Database
+  transaction: SimpleDatabaseTransaction
-  transaction: Transaction
   deviceAuthToken: string
 }): Promise<ApplyActionBaseInfo> {
-  const deviceEntryUnsafe = await database.device.findOne({
+  const deviceEntryUnsafe = await transaction.legacy.database.device.findOne({
     where: { deviceAuthToken },
     attributes: ['familyId', 'deviceId', 'nextSequenceNumber'],
-    transaction
+    transaction: transaction.legacy.transaction
   })
 
   if (!deviceEntryUnsafe) {
@@ -47,11 +46,11 @@ export async function getApplyActionBaseInfo ({ database, transaction, deviceAut
     nextSequenceNumber: deviceEntryUnsafe.nextSequenceNumber
   }
 
-  const familyEntryUnsafe = await database.family.findOne({
+  const familyEntryUnsafe = await transaction.legacy.database.family.findOne({
     where: {
       familyId: deviceEntry.familyId
     },
-    transaction,
+    transaction: transaction.legacy.transaction,
     attributes: ['hasFullVersion']
   })
 

src/function/sync/apply-actions/cache.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -19,7 +19,7 @@ import { memoize } from 'lodash'
 import * as Sequelize from 'sequelize'
 import { config } from '../../../config'
 import { VisibleConnectedDevicesManager } from '../../../connected-devices'
-import { Database } from '../../../database'
+import { SimpleDatabaseTransaction } from '../../../database/simple'
 import { setToList } from '../../../util/list'
 import { generateVersionId } from '../../../util/token'
 import { SourceUserNotFoundException } from './exception/illegal-state'
@@ -29,8 +29,7 @@ export class Cache {
   readonly familyId: string
   readonly deviceId: string
   readonly hasFullVersion: boolean
-  transaction: Sequelize.Transaction
+  transaction: SimpleDatabaseTransaction
-  readonly database: Database
   readonly connectedDevicesManager: VisibleConnectedDevicesManager
   private requireSenderDoFullSync = false
 
@@ -48,18 +47,16 @@ export class Cache {
   triggeredSyncLevel: 0 | 1 | 2 = 0 // 0 = no, 1 = unimportant, 2 = important
   targetedTriggeredSyncLevels = new Map<string, 0 | 1 | 2>()
 
-  constructor ({ familyId, deviceId, hasFullVersion, database, transaction, connectedDevicesManager }: {
+  constructor ({ familyId, deviceId, hasFullVersion, transaction, connectedDevicesManager }: {
     familyId: string
     deviceId: string
     hasFullVersion: boolean
-    database: Database
+    transaction: SimpleDatabaseTransaction
-    transaction: Sequelize.Transaction
     connectedDevicesManager: VisibleConnectedDevicesManager
   }) {
     this.familyId = familyId
     this.deviceId = deviceId
     this.hasFullVersion = hasFullVersion || config.alwaysPro
-    this.database = database
     this.transaction = transaction
     this.connectedDevicesManager = connectedDevicesManager
   }
@@ -77,7 +74,7 @@ export class Cache {
   async subtransaction<T> (callback: () => Promise<T>): Promise<T> {
     const oldTransaction = this.transaction
 
-    return this.database.transaction(async (newTransaction) => {
+    return this.transaction.transaction(async (newTransaction) => {
       try {
         this.transaction = newTransaction
 
@@ -87,18 +84,18 @@ export class Cache {
       } finally {
         this.transaction = oldTransaction
       }
-    }, { transaction: oldTransaction })
+    })
   }
 
   getSecondPasswordHashOfParent = memoize(async (parentId: string) => {
-    const userEntryUnsafe = await this.database.user.findOne({
+    const userEntryUnsafe = await this.transaction.legacy.database.user.findOne({
       where: {
         familyId: this.familyId,
         userId: parentId,
         type: 'parent'
       },
       attributes: ['secondPasswordHash'],
-      transaction: this.transaction
+      transaction: this.transaction.legacy.transaction
     })
 
     if (!userEntryUnsafe) {
@@ -109,14 +106,14 @@ export class Cache {
   })
 
   getSecondPasswordHashOfChild = memoize(async (childId: string) => {
-    const userEntryUnsafe = await this.database.user.findOne({
+    const userEntryUnsafe = await this.transaction.legacy.database.user.findOne({
       where: {
         familyId: this.familyId,
         userId: childId,
         type: 'child'
       },
       attributes: ['secondPasswordHash'],
-      transaction: this.transaction
+      transaction: this.transaction.legacy.transaction
     })
 
     if (!userEntryUnsafe) {
@@ -131,24 +128,24 @@ export class Cache {
   })
 
   doesCategoryExist = memoize(async (categoryId: string) => {
-    const categoryEntry = await this.database.category.findOne({
+    const categoryEntry = await this.transaction.legacy.database.category.findOne({
       where: {
         familyId: this.familyId,
         categoryId
       },
-      transaction: this.transaction
+      transaction: this.transaction.legacy.transaction
     })
 
     return !!categoryEntry
   })
 
   doesUserExist = memoize(async (userId: string) => {
-    const userEntry = await this.database.user.findOne({
+    const userEntry = await this.transaction.legacy.database.user.findOne({
       where: {
         familyId: this.familyId,
         userId
       },
-      transaction: this.transaction
+      transaction: this.transaction.legacy.transaction
     })
 
     return !!userEntry
@@ -158,10 +155,10 @@ export class Cache {
   requireSenderFullSync: () => void = () => this.requireSenderDoFullSync = true
 
   async saveModifiedVersionNumbers () {
-    const { database, transaction, familyId } = this
+    const { familyId } = this
 
     if (this.categoriesWithModifiedApps.size > 0) {
-      await database.category.update({
+      await this.transaction.legacy.database.category.update({
         assignedAppsVersion: generateVersionId()
       }, {
         where: {
@@ -170,14 +167,14 @@ export class Cache {
             [Sequelize.Op.in]: setToList(this.categoriesWithModifiedApps)
           }
         },
-        transaction
+        transaction: this.transaction.legacy.transaction
       })
 
       this.categoriesWithModifiedApps.clear()
     }
 
     if (this.categoriesWithModifiedBaseData.size > 0) {
-      await database.category.update({
+      await this.transaction.legacy.database.category.update({
         baseVersion: generateVersionId()
       }, {
         where: {
@@ -186,14 +183,14 @@ export class Cache {
             [Sequelize.Op.in]: setToList(this.categoriesWithModifiedBaseData)
           }
         },
-        transaction
+        transaction: this.transaction.legacy.transaction
       })
 
       this.categoriesWithModifiedBaseData.clear()
     }
 
     if (this.categoriesWithModifiedTimeLimitRules.size > 0) {
-      await database.category.update({
+      await this.transaction.legacy.database.category.update({
         timeLimitRulesVersion: generateVersionId()
       }, {
         where: {
@@ -202,14 +199,14 @@ export class Cache {
             [Sequelize.Op.in]: setToList(this.categoriesWithModifiedTimeLimitRules)
           }
         },
-        transaction
+        transaction: this.transaction.legacy.transaction
       })
 
       this.categoriesWithModifiedTimeLimitRules.clear()
     }
 
     if (this.categoriesWithModifiedUsedTimes.size > 0) {
-      await database.category.update({
+      await this.transaction.legacy.database.category.update({
         usedTimesVersion: generateVersionId()
       }, {
         where: {
@@ -218,14 +215,14 @@ export class Cache {
             [Sequelize.Op.in]: setToList(this.categoriesWithModifiedUsedTimes)
           }
         },
-        transaction
+        transaction: this.transaction.legacy.transaction
       })
 
       this.categoriesWithModifiedUsedTimes.clear()
     }
 
     if (this.categoriesWithModifiedTasks.size > 0) {
-      await database.category.update({
+      await this.transaction.legacy.database.category.update({
         taskListVersion: generateVersionId()
       }, {
         where: {
@@ -234,46 +231,46 @@ export class Cache {
             [Sequelize.Op.in]: setToList(this.categoriesWithModifiedTasks)
           }
         },
-        transaction
+        transaction: this.transaction.legacy.transaction
       })
 
       this.categoriesWithModifiedUsedTimes.clear()
     }
 
     if (this.invalidiateUserList) {
-      await database.family.update({
+      await this.transaction.legacy.database.family.update({
         userListVersion: generateVersionId()
       }, {
         where: {
           familyId: this.familyId
         },
-        transaction
+        transaction: this.transaction.legacy.transaction
       })
 
       this.invalidiateUserList = false
     }
 
     if (this.invalidiateDeviceList) {
-      await database.family.update({
+      await this.transaction.legacy.database.family.update({
         deviceListVersion: generateVersionId()
       }, {
         where: {
           familyId: this.familyId
         },
-        transaction
+        transaction: this.transaction.legacy.transaction
       })
 
       this.invalidiateDeviceList = false
     }
 
     if (this.invalidateU2fList) {
-      await database.family.update({
+      await this.transaction.legacy.database.family.update({
         u2fKeysVersion: generateVersionId()
       }, {
         where: {
           familyId: this.familyId
         },
-        transaction
+        transaction: this.transaction.legacy.transaction
       })
 
       this.invalidateU2fList = false

src/function/sync/apply-actions/dispatch-app-logic-action/addusedtime.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -37,12 +37,12 @@ export async function dispatchAddUsedTime ({ action, cache }: {
 }) {
   const roundedTimestamp = getRoundedTimestamp().toString(10)
 
-  const categoryEntryUnsafe = await cache.database.category.findOne({
+  const categoryEntryUnsafe = await cache.transaction.legacy.database.category.findOne({
     where: {
       familyId: cache.familyId,
       categoryId: action.categoryId
     },
-    transaction: cache.transaction,
+    transaction: cache.transaction.legacy.transaction,
     attributes: [
       'childId',
       'parentCategoryId',
@@ -65,7 +65,7 @@ export async function dispatchAddUsedTime ({ action, cache }: {
     currentExtraTime: number
   }) => {
     if (action.timeToAdd !== 0) {
-      const oldItem = await cache.database.usedTime.findOne({
+      const oldItem = await cache.transaction.legacy.database.usedTime.findOne({
         where: {
           familyId: cache.familyId,
           categoryId: action.categoryId,
@@ -73,7 +73,7 @@ export async function dispatchAddUsedTime ({ action, cache }: {
           startMinuteOfDay: MinuteOfDay.MIN,
           endMinuteOfDay: MinuteOfDay.MAX
         },
-        transaction: cache.transaction
+        transaction: cache.transaction.legacy.transaction
       })
 
       if (oldItem) {
@@ -84,7 +84,7 @@ export async function dispatchAddUsedTime ({ action, cache }: {
         const newLastUpdate = parseInt(roundedTimestamp, 10)
 
         if (oldUsedTime !== newUsedTime || oldLastUpdate !== newLastUpdate) {
-          const [updatedRows] = await cache.database.usedTime.update({
+          const [updatedRows] = await cache.transaction.legacy.database.usedTime.update({
             usedTime: newUsedTime,
             lastUpdate: newLastUpdate.toString(10)
           }, {
@@ -95,7 +95,7 @@ export async function dispatchAddUsedTime ({ action, cache }: {
               startMinuteOfDay: MinuteOfDay.MIN,
               endMinuteOfDay: MinuteOfDay.MAX
             },
-            transaction: cache.transaction
+            transaction: cache.transaction.legacy.transaction
           })
 
           if (updatedRows === 0) {
@@ -103,7 +103,7 @@ export async function dispatchAddUsedTime ({ action, cache }: {
           }
         }
       } else {
-        await cache.database.usedTime.create({
+        await cache.transaction.legacy.database.usedTime.create({
           familyId: cache.familyId,
           categoryId: action.categoryId,
           dayOfEpoch: action.dayOfEpoch,
@@ -112,20 +112,20 @@ export async function dispatchAddUsedTime ({ action, cache }: {
           startMinuteOfDay: MinuteOfDay.MIN,
           endMinuteOfDay: MinuteOfDay.MAX
         }, {
-          transaction: cache.transaction
+          transaction: cache.transaction.legacy.transaction
         })
       }
     }
 
     if (action.extraTimeToSubtract !== 0) {
-      await cache.database.category.update({
+      await cache.transaction.legacy.database.category.update({
         extraTimeInMillis: Math.max(0, currentExtraTime - action.extraTimeToSubtract)
       }, {
         where: {
           familyId: cache.familyId,
           categoryId: categoryId
         },
-        transaction: cache.transaction
+        transaction: cache.transaction.legacy.transaction
       })
 
       cache.categoriesWithModifiedBaseData.add(categoryId)
@@ -140,13 +140,13 @@ export async function dispatchAddUsedTime ({ action, cache }: {
   })
 
   if (categoryEntry.parentCategoryId !== '') {
-    const parentCategoryEntry = await cache.database.category.findOne({
+    const parentCategoryEntry = await cache.transaction.legacy.database.category.findOne({
       where: {
         familyId: cache.familyId,
         categoryId: categoryEntry.parentCategoryId,
         childId: categoryEntry.childId
       },
-      transaction: cache.transaction
+      transaction: cache.transaction.legacy.transaction
     })
 
     if (parentCategoryEntry) {

src/function/sync/apply-actions/dispatch-app-logic-action/addusedtime2.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2023 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -37,13 +37,13 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
   cache: Cache
   eventHandler: EventHandler
 }) {
-  const deviceEntryUnsafe = await cache.database.device.findOne({
+  const deviceEntryUnsafe = await cache.transaction.legacy.database.device.findOne({
     where: {
       familyId: cache.familyId,
       deviceId: deviceId
     },
     attributes: ['currentUserId'],
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   if (!deviceEntryUnsafe) {
@@ -60,12 +60,12 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
   let addUsedTimeForADifferentUserThanTheCurrentUserOfTheDevice = false
 
   for (const item of action.items) {
-    const categoryEntryUnsafe = await cache.database.category.findOne({
+    const categoryEntryUnsafe = await cache.transaction.legacy.database.category.findOne({
       where: {
         familyId: cache.familyId,
         categoryId: item.categoryId
       },
-      transaction: cache.transaction,
+      transaction: cache.transaction.legacy.transaction,
       attributes: [
         'childId',
         'extraTimeInMillis'
@@ -89,12 +89,11 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
       addUsedTimeForADifferentUserThanTheCurrentUserOfTheDevice = true
     }
 
-    // eslint-disable-next-line no-inner-declarations
     async function handle (start: number, end: number) {
       const lengthInMinutes = (end - start) + 1
       const lengthInMs = lengthInMinutes * 1000 * 60
 
-      const oldItem = await cache.database.usedTime.findOne({
+      const oldItem = await cache.transaction.legacy.database.usedTime.findOne({
         where: {
           familyId: cache.familyId,
           categoryId: item.categoryId,
@@ -102,7 +101,7 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
           startMinuteOfDay: start,
           endMinuteOfDay: end
         },
-        transaction: cache.transaction
+        transaction: cache.transaction.legacy.transaction
       })
 
       if (oldItem) {
@@ -113,7 +112,7 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
         const newLastUpdate = parseInt(roundedTimestampForUsedTime, 10)
 
         if (oldUsedTime !== newUsedTime || oldLastUpdate !== newLastUpdate) {
-          const [updatedRows] = await cache.database.usedTime.update({
+          const [updatedRows] = await cache.transaction.legacy.database.usedTime.update({
             usedTime: newUsedTime,
             lastUpdate: newLastUpdate.toString(10)
           }, {
@@ -124,7 +123,7 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
               startMinuteOfDay: start,
               endMinuteOfDay: end
             },
-            transaction: cache.transaction
+            transaction: cache.transaction.legacy.transaction
           })
 
           if (updatedRows === 0) {
@@ -132,7 +131,7 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
           }
         }
       } else {
-        const oldTime: number | null = await cache.database.usedTime.aggregate(
+        const oldTime: number | null = await cache.transaction.legacy.database.usedTime.aggregate(
           'usedTime',
           'MAX',
           {
@@ -147,13 +146,13 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
                 [Sequelize.Op.lte]: end
               }
             },
-            transaction: cache.transaction
+            transaction: cache.transaction.legacy.transaction
           }
         ) || 0
 
         if (oldTime !== null && typeof oldTime !== 'number') throw new Error()
 
-        await cache.database.usedTime.create({
+        await cache.transaction.legacy.database.usedTime.create({
           familyId: cache.familyId,
           categoryId: item.categoryId,
           dayOfEpoch: action.dayOfEpoch,
@@ -162,7 +161,7 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
           startMinuteOfDay: start,
           endMinuteOfDay: end
         }, {
-          transaction: cache.transaction
+          transaction: cache.transaction.legacy.transaction
         })
       }
     }
@@ -180,7 +179,7 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
     for (let j = 0; j < item.sessionDurationLimits.length; j++) {
       const limit = item.sessionDurationLimits[j]
 
-      const oldItem = await cache.database.sessionDuration.findOne({
+      const oldItem = await cache.transaction.legacy.database.sessionDuration.findOne({
         where: {
           familyId: cache.familyId,
           categoryId: item.categoryId,
@@ -189,11 +188,11 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
           startMinuteOfDay: limit.start,
           endMinuteOfDay: limit.end
         },
-        transaction: cache.transaction
+        transaction: cache.transaction.legacy.transaction
       })
 
       const oldDuration: () => Promise<number> = async () => {
-        const fittingDurationItems = await cache.database.sessionDuration.findAll({
+        const fittingDurationItems = await cache.transaction.legacy.database.sessionDuration.findAll({
           where: {
             familyId: cache.familyId,
             categoryId: item.categoryId,
@@ -210,15 +209,15 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
               [Sequelize.Op.lte]: limit.pause
             }
           },
-          transaction: cache.transaction
+          transaction: cache.transaction.legacy.transaction
         })
 
         const fittingDurationItemsLastUsageFiltered =
           hasTrustedTimestamp ?
-          fittingDurationItems.filter((it) => {
+          fittingDurationItems.filter((it) => (
             action.trustedTimestamp - item.timeToAdd <=
             parseInt(it.lastUsage, 10) + it.sessionPauseDuration - tolerance
-          }) : fittingDurationItems
+          )) : fittingDurationItems
 
         return fittingDurationItemsLastUsageFiltered
           .map((it) => it.lastSessionDuration)
@@ -260,9 +259,9 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
           }
         }
 
-        await oldItem.save({ transaction: cache.transaction })
+        await oldItem.save({ transaction: cache.transaction.legacy.transaction })
       } else {
-        await cache.database.sessionDuration.create({
+        await cache.transaction.legacy.database.sessionDuration.create({
           familyId: cache.familyId,
           categoryId: item.categoryId,
           maxSessionDuration: limit.duration,
@@ -273,21 +272,21 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
           lastUsage: action.trustedTimestamp.toString(10),
           lastSessionDuration: await oldDuration() + item.timeToAdd,
           roundedLastUpdate: roundedTimestampForSessionDuration
-        }, { transaction: cache.transaction })
+        }, { transaction: cache.transaction.legacy.transaction })
       }
     }
 
     cache.categoriesWithModifiedUsedTimes.add(item.categoryId)
 
     if (item.extraTimeToSubtract !== 0) {
-      await cache.database.category.update({
+      await cache.transaction.legacy.database.category.update({
         extraTimeInMillis: Math.max(0, categoryEntry.extraTimeInMillis - item.extraTimeToSubtract)
       }, {
         where: {
           familyId: cache.familyId,
           categoryId: item.categoryId
         },
-        transaction: cache.transaction
+        transaction: cache.transaction.legacy.transaction
       })
 
       cache.categoriesWithModifiedBaseData.add(item.categoryId)

src/function/sync/apply-actions/dispatch-app-logic-action/finishkeyrequest.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -23,13 +23,13 @@ export async function dispatchFinishKeyRequestAction ({ action, cache, deviceId
   action: FinishKeyRequestAction
   cache: Cache
 }) {
-  await cache.database.keyRequest.destroy({
+  await cache.transaction.legacy.database.keyRequest.destroy({
     where: {
       familyId: cache.familyId,
       senderDeviceId: deviceId,
       senderSequenceNumber: action.deviceSequenceNumber.toString(10)
     },
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   // no sync triggered

src/function/sync/apply-actions/dispatch-app-logic-action/index.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -23,6 +23,7 @@ import {
   FinishKeyRequestAction,
   ForceSyncAction,
   MarkTaskPendingAction,
+  PingAction,
   ReplyToKeyRequestAction,
   RemoveInstalledAppsAction,
   SendKeyRequestAction,
@@ -41,6 +42,7 @@ import { dispatchAddUsedTimeVersion2 } from './addusedtime2'
 import { dispatchFinishKeyRequestAction } from './finishkeyrequest'
 import { dispatchForceSyncAction } from './forcesync'
 import { dispatchMarkTaskPendingAction } from './marktaskpendingaction'
+import { dispatchPingAction } from './ping'
 import { dispatchReplyToKeyRequestAction } from './replytokeyrequest'
 import { dispatchSendKeyRequestAction } from './sendkeyrequest'
 import { dispatchSignOutAtDevice } from './signoutatdevice'
@@ -67,6 +69,8 @@ export const dispatchAppLogicAction = async ({ action, deviceId, cache, eventHan
     await dispatchForceSyncAction({ deviceId, action, cache })
   } else if (action instanceof MarkTaskPendingAction) {
     await dispatchMarkTaskPendingAction({ deviceId, action, cache })
+  } else if (action instanceof PingAction) {
+    await dispatchPingAction({ deviceId, action, cache })
   } else if (action instanceof ReplyToKeyRequestAction) {
     await dispatchReplyToKeyRequestAction({ deviceId, action, cache, eventHandler })
   } else if (action instanceof RemoveInstalledAppsAction) {

src/function/sync/apply-actions/dispatch-app-logic-action/marktaskpendingaction.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -26,12 +26,12 @@ export async function dispatchMarkTaskPendingAction ({ action, cache, deviceId }
   action: MarkTaskPendingAction
   cache: Cache
 }) {
-  const taskInfoUnsafe = await cache.database.childTask.findOne({
+  const taskInfoUnsafe = await cache.transaction.legacy.database.childTask.findOne({
     where: {
       familyId: cache.familyId,
       taskId: action.taskId
     },
-    transaction: cache.transaction,
+    transaction: cache.transaction.legacy.transaction,
     attributes: ['categoryId', 'pendingRequest', 'taskTitle']
   })
 
@@ -45,13 +45,13 @@ export async function dispatchMarkTaskPendingAction ({ action, cache, deviceId }
 
   if (taskInfo.pendingRequest !== 0) return // review already requested
 
-  const categoryInfoUnsafe = await cache.database.category.findOne({
+  const categoryInfoUnsafe = await cache.transaction.legacy.database.category.findOne({
     where: {
       familyId: cache.familyId,
       categoryId: taskInfo.categoryId
     },
     attributes: ['childId'],
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   if (categoryInfoUnsafe === null) {
@@ -60,13 +60,13 @@ export async function dispatchMarkTaskPendingAction ({ action, cache, deviceId }
 
   const categoryInfo = { childId: categoryInfoUnsafe.childId }
 
-  const deviceInfoUnsafe = await cache.database.device.findOne({
+  const deviceInfoUnsafe = await cache.transaction.legacy.database.device.findOne({
     where: {
       familyId: cache.familyId,
       deviceId
     },
     attributes: ['currentUserId'],
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   if (deviceInfoUnsafe === null) throw new SourceDeviceNotFoundException()
@@ -77,33 +77,33 @@ export async function dispatchMarkTaskPendingAction ({ action, cache, deviceId }
     throw new IllegalStateException({ staticMessage: 'Can not mark task pending for other user than the current user' })
   }
 
-  const childInfoUnsafe = await cache.database.user.findOne({
+  const childInfoUnsafe = await cache.transaction.legacy.database.user.findOne({
     where: {
       familyId: cache.familyId,
       userId: categoryInfo.childId
     },
     attributes: ['name'],
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   if (childInfoUnsafe === null) throw new SourceUserNotFoundException()
 
   const childInfo = { name: childInfoUnsafe.name }
 
-  await cache.database.childTask.update({ pendingRequest: 1 }, {
+  await cache.transaction.legacy.database.childTask.update({ pendingRequest: 1 }, {
     where: {
       familyId: cache.familyId,
       taskId: action.taskId
     },
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   cache.categoriesWithModifiedTasks.add(taskInfo.categoryId)
   cache.incrementTriggeredSyncLevel(1) // parents are not faster reachable
 
   await sendTaskDoneMails({
-    database: cache.database,
+    database: cache.transaction.legacy.database,
-    transaction: cache.transaction,
+    transaction: cache.transaction.legacy.transaction,
     familyId: cache.familyId,
     childName: childInfo.name,
     taskTitle: taskInfo.taskTitle

src/function/sync/apply-actions/dispatch-app-logic-action/ping.ts

@@ -0,0 +1,73 @@
+/*
+ * server component for the TimeLimit App
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { PingAction } from '../../../../action'
+import { types as pingTypes } from '../../../../database/ping'
+import { Cache } from '../cache'
+
+export async function dispatchPingAction ({ action, cache, deviceId }: {
+  deviceId: string
+  action: PingAction
+  cache: Cache
+}) {
+  // handle insertion
+  if (action.event === 'ping' || action.event === 'pong') {
+    let type
+
+    if (action.event === 'ping') type = pingTypes.ping
+    else if (action.event === 'pong') type = pingTypes.pong
+    else throw new Error()
+
+    // delete any previous ping/pong
+    await cache.transaction.legacy.database.ping.destroy({
+      where: {
+        familyId: cache.familyId,
+        receiverDeviceId: action.deviceId,
+        senderDeviceId: deviceId,
+	type: type
+      },
+      transaction: cache.transaction.legacy.transaction
+    })
+
+    // insert
+    await cache.transaction.legacy.database.ping.create({
+      familyId: cache.familyId,
+      receiverDeviceId: action.deviceId,
+      senderDeviceId: deviceId,
+      type,
+      token: action.token
+    }, {
+      transaction: cache.transaction.legacy.transaction
+    })
+
+    // notify
+    cache.incrementTargetedTriggeredSyncLevel(action.deviceId, 2)
+  }
+
+  // handle deleting
+  if (action.event === 'pong' || action.event === 'clear') {
+    await cache.transaction.legacy.database.ping.destroy({
+      where: {
+        familyId: cache.familyId,
+        receiverDeviceId: deviceId,
+        senderDeviceId: action.deviceId,
+        token: action.token
+      },
+      transaction: cache.transaction.legacy.transaction
+    })
+  }
+}

src/function/sync/apply-actions/dispatch-app-logic-action/replytokeyrequest.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -26,13 +26,13 @@ export async function dispatchReplyToKeyRequestAction ({ deviceId, action, cache
   cache: Cache
   eventHandler: EventHandler
 }) {
-  const requestUnsafe = await cache.database.keyRequest.findOne({
+  const requestUnsafe = await cache.transaction.legacy.database.keyRequest.findOne({
     where: {
       familyId: cache.familyId,
       serverSequenceNumber: action.requestServerSequenceNumber.toString(10)
     },
     attributes: ['senderDeviceId', 'senderSequenceNumber'],
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   if (!requestUnsafe) {
@@ -46,14 +46,14 @@ export async function dispatchReplyToKeyRequestAction ({ deviceId, action, cache
     senderSequenceNumber: requestUnsafe.senderSequenceNumber
   }
 
-  const oldReplyCounter = await cache.database.keyResponse.count({
+  const oldReplyCounter = await cache.transaction.legacy.database.keyResponse.count({
     where: {
       familyId: cache.familyId,
       receiverDeviceId: request.senderDeviceId,
       requestServerSequenceNumber: action.requestServerSequenceNumber.toString(10),
       senderDeviceId: deviceId
     },
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   if (oldReplyCounter !== 0) {
@@ -62,12 +62,12 @@ export async function dispatchReplyToKeyRequestAction ({ deviceId, action, cache
     return
   }
 
-  const deviceEntryUnsafe = await cache.database.device.findOne({
+  const deviceEntryUnsafe = await cache.transaction.legacy.database.device.findOne({
     where: {
       familyId: cache.familyId,
       deviceId: request.senderDeviceId
     },
-    transaction: cache.transaction,
+    transaction: cache.transaction.legacy.transaction,
     attributes: ['nextKeyReplySequenceNumber']
   })
 
@@ -81,17 +81,17 @@ export async function dispatchReplyToKeyRequestAction ({ deviceId, action, cache
     nextKeyReplySequenceNumber: deviceEntryUnsafe.nextKeyReplySequenceNumber
   }
 
-  await cache.database.device.update({
+  await cache.transaction.legacy.database.device.update({
     nextKeyReplySequenceNumber: (parseInt(deviceEntry.nextKeyReplySequenceNumber) + 1).toString(10)
   }, {
     where: {
       familyId: cache.familyId,
       deviceId: request.senderDeviceId
     },
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
-  await cache.database.keyResponse.create({
+  await cache.transaction.legacy.database.keyResponse.create({
     familyId: cache.familyId,
     receiverDeviceId: request.senderDeviceId,
     requestServerSequenceNumber: action.requestServerSequenceNumber.toString(10),
@@ -102,7 +102,7 @@ export async function dispatchReplyToKeyRequestAction ({ deviceId, action, cache
     encryptedKey: action.encryptedKey,
     signature: action.signature
   }, {
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   cache.incrementTargetedTriggeredSyncLevel(request.senderDeviceId, 2)

src/function/sync/apply-actions/dispatch-app-logic-action/sendkeyrequest.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -24,11 +24,11 @@ export async function dispatchSendKeyRequestAction ({ action, cache, deviceId }:
   action: SendKeyRequestAction
   cache: Cache
 }) {
-  const familyEntryUnsafe = await cache.database.family.findOne({
+  const familyEntryUnsafe = await cache.transaction.legacy.database.family.findOne({
     where: {
       familyId: cache.familyId
     },
-    transaction: cache.transaction,
+    transaction: cache.transaction.legacy.transaction,
     attributes: ['nextServerKeyRequestSeq']
   })
 
@@ -38,16 +38,16 @@ export async function dispatchSendKeyRequestAction ({ action, cache, deviceId }:
 
   const serverSequenceNumber = familyEntryUnsafe.nextServerKeyRequestSeq
 
-  await cache.database.family.update({
+  await cache.transaction.legacy.database.family.update({
     nextServerKeyRequestSeq: (parseInt(serverSequenceNumber, 10) + 1).toString(10)
   }, {
     where: {
       familyId: cache.familyId
     },
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
-  await cache.database.keyRequest.destroy({
+  await cache.transaction.legacy.database.keyRequest.destroy({
     where: {
       familyId: cache.familyId,
       senderDeviceId: deviceId,
@@ -55,10 +55,10 @@ export async function dispatchSendKeyRequestAction ({ action, cache, deviceId }:
       deviceId: action.deviceId || null,
       categoryId: action.categoryId || null
     },
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
-  await cache.database.keyRequest.create({
+  await cache.transaction.legacy.database.keyRequest.create({
     familyId: cache.familyId,
     serverSequenceNumber: serverSequenceNumber,
     senderDeviceId: deviceId,
@@ -69,7 +69,7 @@ export async function dispatchSendKeyRequestAction ({ action, cache, deviceId }:
     tempKey: action.tempKey,
     signature: action.signature
   }, {
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   cache.incrementTriggeredSyncLevel(2)

src/function/sync/apply-actions/dispatch-app-logic-action/signoutatdevice.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -30,12 +30,12 @@ export async function dispatchSignOutAtDevice ({ deviceId, cache }: {
     throw new PremiumVersionMissingException()
   }
 
-  const deviceEntry = await cache.database.device.findOne({
+  const deviceEntry = await cache.transaction.legacy.database.device.findOne({
     where: {
       familyId: cache.familyId,
       deviceId
     },
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   if (!deviceEntry) {

src/function/sync/apply-actions/dispatch-app-logic-action/trieddisablingdeviceadmin.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -26,12 +26,12 @@ export async function dispatchTriedDisablingDeviceAdmin ({ deviceId, cache }: {
   action: TriedDisablingDeviceAdminAction
   cache: Cache
 }) {
-  const deviceEntry = await cache.database.device.findOne({
+  const deviceEntry = await cache.transaction.legacy.database.device.findOne({
     where: {
       familyId: cache.familyId,
       deviceId
     },
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   if (deviceEntry === null) {
@@ -43,7 +43,7 @@ export async function dispatchTriedDisablingDeviceAdmin ({ deviceId, cache }: {
   if (!deviceEntry.triedDisablingDeviceAdmin) {
     deviceEntry.triedDisablingDeviceAdmin = true
 
-    await deviceEntry.save({ transaction: cache.transaction })
+    await deviceEntry.save({ transaction: cache.transaction.legacy.transaction })
 
     cache.invalidiateDeviceList = true
     cache.incrementTriggeredSyncLevel(1)
@@ -51,7 +51,6 @@ export async function dispatchTriedDisablingDeviceAdmin ({ deviceId, cache }: {
 
   if (!hadManipulationBefore) {
     await sendManipulationWarnings({
-      database: cache.database,
       transaction: cache.transaction,
       deviceName: deviceEntry.name,
       familyId: cache.familyId

src/function/sync/apply-actions/dispatch-app-logic-action/updatedevicestatus.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2023 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -30,12 +30,12 @@ export async function dispatchUpdateDeviceStatus ({ deviceId, action, cache }: {
   action: UpdateDeviceStatusAction
   cache: Cache
 }) {
-  const deviceEntry = await cache.database.device.findOne({
+  const deviceEntry = await cache.transaction.legacy.database.device.findOne({
     where: {
       familyId: cache.familyId,
       deviceId
     },
-    transaction: cache.transaction
+    transaction: cache.transaction.legacy.transaction
   })
 
   if (!deviceEntry) {
@@ -175,12 +175,11 @@ export async function dispatchUpdateDeviceStatus ({ deviceId, action, cache }: {
     }
   }
 
-  await deviceEntry.save({ transaction: cache.transaction })
+  await deviceEntry.save({ transaction: cache.transaction.legacy.transaction })
 
   if (hasDeviceManipulation(deviceEntry)) {
     if (!hadManipulationBefore) {
       await sendManipulationWarnings({
-        database: cache.database,
         transaction: cache.transaction,
         deviceName: deviceEntry.name,
         familyId: cache.familyId

src/function/sync/apply-actions/dispatch-app-logic-action/updateinstalledapps.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 Jonas Lochmann
+ * Copyright (C) 2019 - 2026 Jonas Lochmann
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -26,13 +26,13 @@ export async function dispatchUpdateInstalledApps ({ deviceId, action, cache }:
   cache: Cache
 }) {
   async function upsert({ type, data }: { type: number, data: Buffer }) {
-    await cache.database.encryptedAppList.upsert({
+    await cache.transaction.legacy.database.encryptedAppList.upsert({
       familyId: cache.familyId,
       deviceId,
       type,
       version: generateVersionId(),
       data
-    }, { transaction: cache.transaction })
+    }, { transaction: cache.transaction.legacy.transaction })
   }
 
   if (action.base) {