Merge branch 'master' into development

.eslintignore

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

.eslintrc.js

@@ -0,0 +1,14 @@
+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:24-alpine
+FROM node:16-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 eslint.config.mjs Readme.md /usr/src/app/
+COPY package.json package-lock.json tsconfig.json .eslintignore .eslintrc.js 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,11 +96,10 @@ Use this to unlock all features for one user for a specified duration.
 
 ### request
 
-request properties: ``purchaseToken``, ``purchaseId`` and ``dryRun``
+request properties: ``purchaseToken`` and ``purchaseId``
 
 - ``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
 
 ### response
 

docs/schema/README.md

@@ -130,8 +130,6 @@
 
 *   [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`
@@ -240,8 +238,6 @@
 
 *   [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`
@@ -274,6 +270,14 @@
 
 *   [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
@@ -302,6 +306,32 @@
 
 *   [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`
@@ -350,7 +380,29 @@
 
 *   [Untitled array in ServerDataStatus](./serverdatastatus-properties-kr.md) – `https://timelimit.io/ServerDataStatus#/properties/kr`
 
-* [Untitled array in ServerDataStatus](./serverdatastatus-properties-pings.md) – `https://timelimit.io/ServerDataStatus#/properties/pings`
+*   [Untitled array in ServerDataStatus](./serverdatastatus-definitions-u2fdata-properties-d.md) – `https://timelimit.io/ServerDataStatus#/definitions/U2fData/properties/d`
+
+*   [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,9 +21,6 @@
     {
       "$ref": "#/definitions/SerializedMarkTaskPendingAction"
     },
-    {
-      "$ref": "#/definitions/SerializedPingAction"
-    },
     {
       "$ref": "#/definitions/SerializedUpdateInstalledAppsAction"
     },
@@ -312,43 +309,6 @@
       ],
       "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/ServerDataStatus.schema.json

@@ -67,12 +67,6 @@
         "$ref": "#/definitions/ServerKeyResponse"
       }
     },
-    "pings": {
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/ServerPing"
-      }
-    },
     "dh": {
       "$ref": "#/definitions/ServerDhKey"
     },
@@ -933,31 +927,6 @@
       ],
       "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/serializedapplogicaction-definitions-pingevent.md

@@ -1,25 +0,0 @@
-# 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

@@ -1,15 +0,0 @@
-# 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

@@ -1,25 +0,0 @@
-# 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

@@ -1,15 +0,0 @@
-# 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

@@ -1,23 +0,0 @@
-# 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

@@ -1,114 +0,0 @@
-# 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,8 +30,6 @@ 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")
@@ -690,122 +688,6 @@ 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
@@ -816,7 +698,7 @@ Reference this group by using
 
 | Property        | Type      | Required | Nullable       | Defined by                                                                                                                                                                                                                               |
 | :-------------- | :-------- | :------- | :------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-8) | `string`  | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateinstalledappsaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateInstalledAppsAction/properties/type") |
+| [type](#type-7) | `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")       |
@@ -911,7 +793,7 @@ Reference this group by using
 
 | Property                      | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                                               |
 | :---------------------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-9)               | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedremoveinstalledappsaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedRemoveInstalledAppsAction/properties/type")                 |
+| [type](#type-8)               | `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
@@ -968,9 +850,9 @@ Reference this group by using
 
 | Property                    | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                                 |
 | :-------------------------- | :------- | :------- | :------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-10)            | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsendkeyrequestaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSendKeyRequestAction/properties/type")             |
+| [type](#type-9)             | `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-1)     | `string` | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsendkeyrequestaction-properties-deviceid.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSendKeyRequestAction/properties/deviceId")     |
+| [deviceId](#deviceid)       | `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")       |
@@ -1120,7 +1002,7 @@ Reference this group by using
 
 | Property         | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                       |
 | :--------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-11) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsignoutatdeviceaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSignOutAtDeviceAction/properties/type") |
+| [type](#type-10) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedsignoutatdeviceaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedSignOutAtDeviceAction/properties/type") |
 
 ### type
 
@@ -1158,7 +1040,7 @@ Reference this group by using
 
 | Property         | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                                           |
 | :--------------- | :------- | :------- | :------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-12) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serialiezdtrieddisablingdeviceadminaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerialiezdTriedDisablingDeviceAdminAction/properties/type") |
+| [type](#type-11) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serialiezdtrieddisablingdeviceadminaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerialiezdTriedDisablingDeviceAdminAction/properties/type") |
 
 ### type
 
@@ -1196,7 +1078,7 @@ Reference this group by using
 
 | Property                          | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                                                   |
 | :-------------------------------- | :------- | :------- | :------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-13)                  | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdateappactivitiesaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateAppActivitiesAction/properties/type")                     |
+| [type](#type-12)                  | `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") |
 
@@ -1348,7 +1230,7 @@ Reference this group by using
 
 | Property                                                    | Type      | Required | Nullable       | Defined by                                                                                                                                                                                                                                                                           |
 | :---------------------------------------------------------- | :-------- | :------- | :------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-14)                                            | `string`  | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/type")                                               |
+| [type](#type-13)                                            | `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")                   |
@@ -1636,7 +1518,7 @@ Reference this group by using
 
 | Property         | Type     | Required | Nullable       | Defined by                                                                                                                                                                                                                                   |
 | :--------------- | :------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [type](#type-15) | `string` | Required | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializeduploaddevicepublickeyaction-properties-type.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUploadDevicePublicKeyAction/properties/type") |
+| [type](#type-14) | `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/EncryptableParentPassword
+https://timelimit.io/SerializedParentAction#/definitions/SerializedSetChildPasswordAction/properties/newPassword
 ```
 
 
@@ -10,11 +10,11 @@ https://timelimit.io/SerializedParentAction#/definitions/EncryptableParentPasswo
 | :------------------ | :--------- | :------------- | :----------- | :---------------- | :-------------------- | :------------------ | :------------------------------------------------------------------------------------------------ |
 | Can be instantiated | No         | Unknown status | No           | Forbidden         | Forbidden             | none                | [SerializedParentAction.schema.json\*](SerializedParentAction.schema.json "open original schema") |
 
-## EncryptableParentPassword Type
+## newPassword Type
 
 `object` ([EncryptableParentPassword](serializedparentaction-definitions-encryptableparentpassword.md))
 
-# EncryptableParentPassword Properties
+# newPassword Properties
 
 | Property                  | Type      | Required | Nullable       | Defined by                                                                                                                                                                                                                 |
 | :------------------------ | :-------- | :------- | :------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |

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

@@ -1,15 +0,0 @@
-# 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

@@ -1,15 +0,0 @@
-# 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

@@ -1,24 +0,0 @@
-# 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

@@ -1,86 +0,0 @@
-# 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

@@ -1,15 +0,0 @@
-# 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,7 +30,6 @@ 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")   |
@@ -253,24 +252,6 @@ 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
 
 
@@ -3468,83 +3449,6 @@ 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

docs/usage/configuration.md

@@ -57,3 +57,5 @@
 - SIGN_SECRET
   - used for signing tokens
   - if not set or set to an empty string, then the features that depend on it are disabled
+- UA_MAIL_BLOCKLIST
+  - List of user agents, separated by comma, that are not allowed to trigger sign in mails

eslint.config.mjs

@@ -1,18 +0,0 @@
-// @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 .",
+    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
-    "lint:fix": "eslint . --fix",
+    "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "build": "npm run build:clean && npm run build:json && npm run build:ts && npm run lint && npm run build:doc",
-    "build:clean": "rm -rf build",
+    "build:clean": "rimraf build",
     "build:json": "node ./scripts/build-schemas.js",
     "build:ts": "tsc",
     "build:doc": "npm run build:doc:json",
@@ -29,8 +29,7 @@
   },
   "homepage": "https://gitlab.com/timelimit.io/timelimit-server-2018#README",
   "devDependencies": {
-    "@adobe/jsonschema2md": "^8.0.8",
+    "@adobe/jsonschema2md": "^7.0.0",
-    "@eslint/js": "^10.0.1",
     "@types/basic-auth": "^1.1.3",
     "@types/body-parser": "^1.19.0",
     "@types/ejs": "^3.1.0",
@@ -39,13 +38,15 @@
     "@types/lodash": "^4.14.166",
     "@types/node": "^16.11.59",
     "@types/nodemailer": "^6.4.4",
-    "eslint": "^10.0.1",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@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": "^8.18.0",
+    "ajv": "^7.0.2",
     "basic-auth": "^2.0.1",
     "body-parser": "^1.19.0",
     "ejs": "^3.1.5",
@@ -55,15 +56,16 @@
     "jose": "^4.9.3",
     "lodash": "^4.17.21",
     "mariadb": "^2.5.2",
-    "nodemailer": "^8.0.4",
+    "nodemailer": "^7.0.9",
     "pg": "^8.5.1",
     "pg-hstore": "^2.3.3",
+    "pkijs": "^3.0.16",
     "rate-limiter-flexible": "^2.1.15",
     "sequelize": "^6.25.5",
     "socket.io": "^4.0.1",
     "umzug": "^3.8.1"
   },
   "optionalDependencies": {
-    "sqlite3": "npm:@vscode/sqlite3@^5.1.12-vscode"
+    "sqlite3": "^5.0.0"
   }
 }

scripts/util/database/mariadb.js

@@ -24,8 +24,6 @@ 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())
@@ -62,12 +60,12 @@ async function startMariadb() {
 
   for (command of commands) {
     console.log(command)
-    await spawnAsync('mysql', ['-S', socketPath, '-u', osUsername, '-e', command], { stdio: 'inherit' })
+    await spawnAsync('mysql', ['-S', socketPath, '-u', 'root', '-e', command], { stdio: 'inherit' })
   }
 
   return {
     shutdown: () => {
-      spawnAsync('mysql', ['-S', socketPath, '-u', osUsername, '-e', 'SHUTDOWN;'], { stdio: 'inherit' }).catch((ex) => {
+      spawnAsync('mysql', ['-S', socketPath, '-u', 'root', '-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, '--owner', username, database], { stdio: 'inherit' })
+  await spawnAsync('createdb', ['-h', socketDir, 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 - 2026 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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,7 +78,6 @@ 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

@@ -1,55 +0,0 @@
-/*
- * 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 - 2026 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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,7 +24,6 @@ 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'
@@ -42,7 +41,6 @@ export type SerializedAppLogicAction =
   SerializedForceSyncAction |
   SerializedReplyToKeyRequestAction |
   SerializedMarkTaskPendingAction |
-  SerializedPingAction |
   SerializedUpdateInstalledAppsAction |
   SerializedRemoveInstalledAppsAction |
   SerializedSendKeyRequestAction |
@@ -67,8 +65,6 @@ 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/api/admin.ts

@@ -140,15 +140,13 @@ 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'
       ) {
         throw new BadRequest()
       }
 
       const purchaseToken: string = req.body.purchaseToken
       const purchaseId: string = req.body.purchaseId
-      const dryRun: boolean = req.body.dryRun
 
       const tokenContent = await verifyIdentitifyToken(purchaseToken)
 
@@ -252,7 +250,6 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
             }
           }
 
-          if (!dryRun) {
           await addPurchase({
             database,
             familyId: tokenContent.familyId,
@@ -263,7 +260,6 @@ export const createAdminRouter = ({ database, websocket, eventHandler }: {
             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 - 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
@@ -17,7 +17,8 @@
 
 import { json } from 'body-parser'
 import { Router } from 'express'
-import { BadRequest } from 'http-errors'
+import { BadRequest, Forbidden } from 'http-errors'
+import { config } from '../config'
 import { Database } from '../database'
 import { sendLoginCode, signInByMailCode } from '../function/authentication/login-by-mail'
 import { isMailAddressCoveredByWhitelist, isMailServerBlacklisted, sanitizeMailAddress } from '../util/mail'
@@ -25,11 +26,17 @@ import {
   isSendMailLoginCodeRequest,
   isSignInByMailCodeRequest
 } from './validator'
+import { analyze } from './integrity'
 
 export const createAuthRouter = (database: Database) => {
   const router = Router()
 
   router.post('/send-mail-login-code-v2', json(), async (req, res, next) => {
+    const info = {
+      ua: req.headers['user-agent'],
+      cert: analyze(req),
+    }
+
     try {
       if (!isSendMailLoginCodeRequest(req.body)) {
         throw new BadRequest()
@@ -45,12 +52,15 @@ export const createAuthRouter = (database: Database) => {
         res.json({ mailAddressNotWhitelisted: true })
       } else if (isMailServerBlacklisted(mail)) {
         res.json({ mailServerBlacklisted: true })
+      } else if (config.uaMailBlocklist.indexOf(req.headers['user-agent'] || '') !== -1) {
+        throw new Forbidden()
       } else {
         const { mailLoginToken } = await sendLoginCode({
           mail,
           deviceAuthToken: req.body.deviceAuthToken,
           locale: req.body.locale,
-          database
+          database,
+          info: Buffer.from(JSON.stringify(info), 'utf8')
         })
 
         res.json({ mailLoginToken })

src/api/integrity.ts

@@ -0,0 +1,102 @@
+import { X509Certificate } from 'crypto'
+import { Request } from 'express'
+import { fromBER, Sequence, Integer, OctetString, Set } from 'asn1js'
+import { Certificate } from 'pkijs'
+
+export interface CertInfo {
+  applicationCerts: Array<string>
+}
+
+export function analyze(req: Request): CertInfo | null {
+  try {
+    const certStr = req.headers['clientcertificate']
+
+    if (typeof certStr !== 'string') return null
+
+    const nativeCert = new X509Certificate(decodeURIComponent(certStr))
+
+    const now = Date.now()
+    const from = Date.parse(nativeCert.validFrom)
+    const to = Date.parse(nativeCert.validTo)
+
+    if (from > now || to < now) return null
+    if (from > to || from + 1000 * 60 * 5 < to) return null
+
+    const cert1 = fromBER(nativeCert.raw)
+
+    if (cert1.offset === -1) return null
+
+    const cert2 = new Certificate({ schema: cert1.result })
+    const androidExtension = (cert2.extensions || []).find((item) => item.extnID === '1.3.6.1.4.1.11129.2.1.17')?.extnValue?.valueBlock?.valueHexView
+
+    if (!androidExtension) return null
+
+    const androidExtensionParsed = fromBER(androidExtension)
+
+    if (androidExtensionParsed.offset === -1) return null
+
+    const androidExtensionSequence = androidExtensionParsed.result
+
+    if (!(androidExtensionSequence instanceof Sequence)) return null
+
+    const versionInteger = androidExtensionSequence.valueBlock.value[0]
+
+    if (!(versionInteger instanceof Integer)) return null
+
+    const versionValue = versionInteger.valueBlock.valueDec
+
+    const authorizationLists = androidExtensionSequence.valueBlock.value.slice(6, 8)
+
+    let applicationId = null
+
+    for (const authList of authorizationLists) {
+      if (!(authList instanceof Sequence)) continue
+
+      for (const authListItem of authList.valueBlock.value) {
+        if (
+          // version 1 does not provide this data structure
+          versionValue !== 1 &&
+          authListItem.idBlock.tagNumber === 709
+        ) {
+          if (!('value' in authListItem.valueBlock)) continue
+
+          const value = (authListItem.valueBlock as unknown as { value: object }).value
+
+          if (!Array.isArray(value) || value.length !== 1) continue
+
+          if (value[0] instanceof OctetString) applicationId = value[0]
+        }
+      }
+    }
+
+    if (!applicationId) return null
+
+    const parsedApplicationId = fromBER(applicationId.valueBlock.valueHexView)
+
+    if (parsedApplicationId.offset === -1) return null
+
+    if (!(parsedApplicationId.result instanceof Sequence)) return null
+
+    const parsedApplicationIdInfo = parsedApplicationId.result.valueBlock.value
+
+    if (parsedApplicationIdInfo.length !== 2) return null
+
+    const signatureDigests = parsedApplicationIdInfo[1]
+
+    if (!(signatureDigests instanceof Set)) return null
+
+    const applicationCerts = []
+
+    for (const cert of signatureDigests.valueBlock.value) {
+      if (cert instanceof OctetString) {
+        applicationCerts.push(Buffer.from(cert.valueBlock.valueHexView).toString('hex'))
+      }
+    }
+
+    return {
+      applicationCerts
+    }
+  } catch (ex) {
+    return null
+  }
+}

src/api/validator.ts

@@ -1759,41 +1759,6 @@ 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": {
@@ -2850,30 +2815,6 @@ 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": {
@@ -3272,9 +3213,6 @@ export const isSerializedAppLogicAction: (value: unknown) => value is Serialized
     {
       "$ref": "#/definitions/SerializedMarkTaskPendingAction"
     },
-    {
-      "$ref": "#/definitions/SerializedPingAction"
-    },
     {
       "$ref": "#/definitions/SerializedUpdateInstalledAppsAction"
     },

src/config.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 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
@@ -22,6 +22,7 @@ interface Config {
   pingInterval: number
   alwaysPro: boolean
   signSecret: string
+  uaMailBlocklist: Array<string>
 }
 
 function parseYesNo (value: string) {
@@ -34,12 +35,17 @@ function parseYesNo (value: string) {
   }
 }
 
+function parseList(list: string) {
+  return list.split(',').map((item) => item.trim()).filter((item) => item.length > 0)
+}
+
 class ParseYesNoException extends Error {}
 
 export const config: Config = {
-  mailWhitelist: (process.env.MAIL_WHITELIST || '').split(',').map((item) => item.trim()).filter((item) => item.length > 0),
+  mailWhitelist: parseList(process.env.MAIL_WHITELIST || ''),
   disableSignup: parseYesNo(process.env.DISABLE_SIGNUP || 'no'),
   pingInterval: parseInt(process.env.PING_INTERVAL_SEC || '25', 10) * 1000,
   alwaysPro: process.env.ALWAYS_PRO ? parseYesNo(process.env.ALWAYS_PRO) : false,
-  signSecret: process.env.SIGN_SECRET || ''
+  signSecret: process.env.SIGN_SECRET || '',
+  uaMailBlocklist: parseList(process.env.UA_MAIL_BLOCKLIST || '')
 }

src/database/main.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2026 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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,7 +33,6 @@ 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'
@@ -62,7 +61,6 @@ export interface Database {
   keyResponse: KeyResponseModelStatic
   mailLoginToken: MailLoginTokenModelStatic
   oldDevice: OldDeviceModelStatic
-  ping: PingModelStatic
   purchase: PurchaseModelStatic
   sessionDuration: SessionDurationModelStatic
   timelimitRule: TimelimitRuleModelStatic
@@ -99,7 +97,6 @@ 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/20260329-add-pings.ts

@@ -1,67 +0,0 @@
-/*
- * 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/umzug.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2026 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
@@ -27,7 +27,7 @@ export const createUmzug = (sequelize: Sequelize) => (
       resolve: ({ name, path }) => {
         if (!path) throw new Error()
 
-        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
         const migration = require(path)
 
         return {

src/database/ping.ts

@@ -1,67 +0,0 @@
-/*
- * 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/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 - 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
@@ -23,11 +23,12 @@ import { checkMailSendLimit } from '../../util/ratelimit-authmail'
 import { generateAuthToken } from '../../util/token'
 import { createAuthTokenByMailAddress } from './index'
 
-export const sendLoginCode = async ({ mail, deviceAuthToken, locale, database }: {
+export const sendLoginCode = async ({ mail, deviceAuthToken, locale, database, info }: {
   mail: string
   deviceAuthToken?: string
   locale: string
   database: Database
+  info: Buffer
   // no transaction here because this is directly called from an API endpoint
 }): Promise<{ mailLoginToken: string }> => {
   let deviceName = null
@@ -82,7 +83,8 @@ export const sendLoginCode = async ({ mail, deviceAuthToken, locale, database }:
     receiver: mail,
     code,
     locale,
-    deviceName
+    deviceName,
+    info
   })
 
   await database.transaction(async (transaction) => {

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

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2026 Jonas Lochmann
+ * Copyright (C) 2019 - 2023 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
@@ -89,6 +89,7 @@ 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
@@ -214,10 +215,10 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
 
         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)

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

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2026 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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,6 @@ import {
   FinishKeyRequestAction,
   ForceSyncAction,
   MarkTaskPendingAction,
-  PingAction,
   ReplyToKeyRequestAction,
   RemoveInstalledAppsAction,
   SendKeyRequestAction,
@@ -42,7 +41,6 @@ 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'
@@ -69,8 +67,6 @@ 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/ping.ts

@@ -1,73 +0,0 @@
-/*
- * 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.database.ping.destroy({
-      where: {
-        familyId: cache.familyId,
-        receiverDeviceId: action.deviceId,
-        senderDeviceId: deviceId,
-	type: type
-      },
-      transaction: cache.transaction
-    })
-
-    // insert
-    await cache.database.ping.create({
-      familyId: cache.familyId,
-      receiverDeviceId: action.deviceId,
-      senderDeviceId: deviceId,
-      type,
-      token: action.token
-    }, {
-      transaction: cache.transaction
-    })
-
-    // notify
-    cache.incrementTargetedTriggeredSyncLevel(action.deviceId, 2)
-  }
-
-  // handle deleting
-  if (action.event === 'pong' || action.event === 'clear') {
-    await cache.database.ping.destroy({
-      where: {
-        familyId: cache.familyId,
-        receiverDeviceId: deviceId,
-        senderDeviceId: action.deviceId,
-        token: action.token
-      },
-      transaction: cache.transaction
-    })
-  }
-}

src/function/sync/apply-actions/dispatch-child-action/childchangepassword.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2026 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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
@@ -48,8 +48,7 @@ export const dispatchChildChangePassword = async ({ action, childUserId, cache }
 
   {
     const clear = cache.getSecondPasswordHashOfChild.cache.clear
-
+    clear && clear()
-    if (clear) clear()
   }
 
   cache.invalidiateUserList = true

src/function/sync/apply-actions/dispatch-parent-action/changeparentpassword.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2026 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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
@@ -55,8 +55,7 @@ export async function dispatchChangeParentPassword ({ action, cache }: {
 
   {
     const clear = cache.getSecondPasswordHashOfParent.cache.clear
-
+    clear && clear()
-    if (clear) clear()
   }
 
   cache.invalidiateUserList = true

src/function/sync/apply-actions/dispatch-parent-action/setchildpassword.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2026 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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
@@ -47,8 +47,7 @@ export async function dispatchSetChildPassword ({ action, cache }: {
 
   {
     const clear = cache.getSecondPasswordHashOfChild.cache.clear
-
+    clear && clear()
-    if (clear) clear()
   }
 
   cache.invalidiateUserList = true

src/function/sync/get-server-data-status/index.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2026 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
@@ -30,7 +30,6 @@ import { getDeviceDetailList } from './device-detail'
 import { getDeviceList } from './device-list'
 import { getDeviceDhKeys } from './dh-keys'
 import { getFamilyEntry } from './family-entry'
-import { getPings } from './pings'
 import { getUserList } from './user-list'
 import { getKeyRequests } from './key-requests'
 import { getKeyResponses } from './key-responses'
@@ -53,14 +52,13 @@ export const generateServerDataStatus = async ({
   const doesClientSupportCryptoApps = clientLevel >= 4
   const doesClientSupportDh = clientLevel >= 5
   const doesClientSupportU2f = clientLevel >= 6
-  const doesClientSupportPing = clientLevel >= 7
 
   const result: ServerDataStatus = {
     fullVersion: config.alwaysPro ? 1 : (
       familyEntry.hasFullVersion ? parseInt(familyEntry.fullVersionUntil, 10) : 0
     ),
     message: await getStatusMessage({ database, transaction }) || undefined,
-    apiLevel: 9
+    apiLevel: 8
   }
 
   if (familyEntry.deviceListVersion !== clientStatus.devices) {
@@ -162,14 +160,5 @@ export const generateServerDataStatus = async ({
     }) || undefined
   }
 
-  if (doesClientSupportPing) {
-    result.pings = await getPings({
-      database,
-      transaction,
-      familyEntry,
-      deviceId
-    })
-  }
-
   return result
 }

src/function/sync/get-server-data-status/pings.ts

@@ -1,52 +0,0 @@
-/*
- * 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 { Database } from '../../../database'
-import { types as pingTypes } from '../../../database/ping'
-import { ServerPing } from '../../../object/serverdatastatus'
-import { FamilyEntry } from './family-entry'
-
-export async function getPings ({
-  database, transaction, familyEntry, deviceId
-}: {
-  database: Database
-  transaction: Sequelize.Transaction
-  familyEntry: FamilyEntry
-  deviceId: string
-}): Promise<Array<ServerPing>> {
-  const savedData = await database.ping.findAll({
-    where: {
-      familyId: familyEntry.familyId,
-      receiverDeviceId: deviceId,
-    },
-    attributes: ['senderDeviceId', 'type', 'token'],
-    transaction
-  })
-
-  return savedData.map((row) => ({
-    deviceId: row.senderDeviceId,
-    type: convertType(row.type),
-    token: row.token
-  }))
-}
-
-function convertType(type: number): 'ping' | 'pong' {
-  if (type === pingTypes.ping) return 'ping'
-  else if (type === pingTypes.pong) return 'pong'
-  else throw new Error()
-}

src/object/serverdatastatus.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2026 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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
@@ -34,7 +34,6 @@ export interface ServerDataStatus {
   users?: ServerUserList  // newUserList
   krq?: Array<ServerKeyRequest> // pendingKeyRequests
   kr?: Array<ServerKeyResponse> // keyResponses
-  pings?: Array<ServerPing>
   dh?: ServerDhKey // Diffie Hellman
   u2f?: U2fData
   fullVersion: number     // fullVersionUntil
@@ -258,12 +257,6 @@ export interface ServerKeyResponse {
   signature: string
 }
 
-export interface ServerPing {
-  deviceId: string
-  token: string
-  type: 'ping' | 'pong'
-}
-
 export interface ServerDhKey {
   v: string // version
   k: string // key, base64

src/util/mail.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2023 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
@@ -45,9 +45,10 @@ function createMailTemplateSender (templateName: string) {
   const textTemplate = compileTemplate('text.ejs')
   const htmlTemplate = compileTemplate('html.ejs')
 
-  const sendMail = async ({ receiver, params }: {
+  const sendMail = async ({ receiver, params, info }: {
     receiver: string
     params: object
+    info?: Buffer
   }) => {
     if (!mailTransport) {
       throw new Error('can not send mails without mail config and without NODE_ENV=development')
@@ -56,6 +57,9 @@ function createMailTemplateSender (templateName: string) {
     const subject = subjectTemplate(params).replace(/\n/g, ' ')
     const text = textTemplate(params)
     const html = htmlTemplate(params)
+    const headers: {[key: string]: string} = info ? {
+      'X-TlInfo': info.toString('base64')
+    } : {}
 
     await new Promise<void>((resolve, reject) => {
       mailTransport.sendMail({
@@ -63,7 +67,8 @@ function createMailTemplateSender (templateName: string) {
         to: receiver,
         subject,
         text,
-        html
+        html,
+        headers
       }, (err, info) => {
         if (err) {
           reject(err)
@@ -90,9 +95,13 @@ function createMailTemplateSender (templateName: string) {
 const loginMailSender = createMailTemplateSender('login')
 
 export const sendAuthenticationMail = async ({
-  receiver, code, locale, deviceName
+  receiver, code, locale, deviceName, info
 }: {
-  receiver: string, code: string, locale: string, deviceName: string | null
+  receiver: string
+  code: string
+  locale: string
+  deviceName: string | null
+  info: Buffer
 }) => {
   await loginMailSender.sendMail({
     receiver,
@@ -105,7 +114,8 @@ export const sendAuthenticationMail = async ({
       deviceName,
       deviceNameIntro: locale === 'de' ? 'Die Anmeldung wurde am Gerät' : 'The login was attempted at the device',
       deviceNameOutro: locale === 'de' ? 'versucht.' : '.'
-    }
+    },
+    info
   })
 }
 

src/websocket/index.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2026 Jonas Lochmann
+ * Copyright (C) 2019 - 2022 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
@@ -56,7 +56,7 @@ export const createWebsocketHandler = ({ connectedDevicesManager, database }: {
 
       const importantSyncForAllListener = () => {
         setTimeout(() => {
-          if (socket.connected) socket.emit('should sync', { isImportant: true })
+          socket.connected && socket.emit('should sync', { isImportant: true })
         }, Math.random() * 1000 * 60 /* wait up to one minute */)
       }