Update dependencies

docs/schema/SerializedAppLogicAction.schema.json

@@ -545,6 +545,12 @@
         },
         "addedManipulationFlags": {
           "type": "number"
+        },
+        "platformType": {
+          "type": "string"
+        },
+        "platformLevel": {
+          "type": "number"
         }
       },
       "additionalProperties": false,

docs/schema/ServerDataStatus.schema.json

@@ -212,6 +212,12 @@
         },
         "pk": {
           "type": "string"
+        },
+        "pType": {
+          "type": "string"
+        },
+        "pLevel": {
+          "type": "number"
         }
       },
       "additionalProperties": false,
@@ -240,6 +246,7 @@
         "model",
         "name",
         "networkTime",
+        "pLevel",
         "qOrLater",
         "reboot",
         "rebootIsManipulation",

docs/schema/serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-platformlevel.md

@@ -0,0 +1,15 @@
+# Untitled number in SerializedAppLogicAction Schema
+
+```txt
+https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/platformLevel
+```
+
+
+
+| 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") |
+
+## platformLevel Type
+
+`number`

docs/schema/serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-platformtype.md

@@ -0,0 +1,15 @@
+# Untitled string in SerializedAppLogicAction Schema
+
+```txt
+https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/platformType
+```
+
+
+
+| 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") |
+
+## platformType Type
+
+`string`

docs/schema/serializedapplogicaction-definitions-serializedupdatedevicestatusaction.md

@@ -28,6 +28,8 @@ https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDevic
 | [didReboot](#didreboot)                                     | `boolean` | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-didreboot.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/didReboot")                                     |
 | [isQOrLaterNow](#isqorlaternow)                             | `boolean` | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-isqorlaternow.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/isQOrLaterNow")                             |
 | [addedManipulationFlags](#addedmanipulationflags)           | `number`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-addedmanipulationflags.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/addedManipulationFlags")           |
+| [platformType](#platformtype)                               | `string`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-platformtype.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/platformType")                               |
+| [platformLevel](#platformlevel)                             | `number`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-platformlevel.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/platformLevel")                             |
 
 ## type
 
@@ -257,3 +259,39 @@ https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDevic
 ### addedManipulationFlags Type
 
 `number`
+
+## platformType
+
+
+
+`platformType`
+
+*   is optional
+
+*   Type: `string`
+
+*   cannot be null
+
+*   defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-platformtype.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/platformType")
+
+### platformType Type
+
+`string`
+
+## platformLevel
+
+
+
+`platformLevel`
+
+*   is optional
+
+*   Type: `number`
+
+*   cannot be null
+
+*   defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-platformlevel.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/platformLevel")
+
+### platformLevel Type
+
+`number`

docs/schema/serializedapplogicaction.md

@@ -1240,6 +1240,8 @@ Reference this group by using
 | [didReboot](#didreboot)                                     | `boolean` | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-didreboot.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/didReboot")                                     |
 | [isQOrLaterNow](#isqorlaternow)                             | `boolean` | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-isqorlaternow.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/isQOrLaterNow")                             |
 | [addedManipulationFlags](#addedmanipulationflags)           | `number`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-addedmanipulationflags.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/addedManipulationFlags")           |
+| [platformType](#platformtype)                               | `string`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-platformtype.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/platformType")                               |
+| [platformLevel](#platformlevel)                             | `number`  | Optional | cannot be null | [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-platformlevel.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/platformLevel")                             |
 
 ### type
 
@@ -1470,6 +1472,42 @@ Reference this group by using
 
 `number`
 
+### platformType
+
+
+
+`platformType`
+
+*   is optional
+
+*   Type: `string`
+
+*   cannot be null
+
+*   defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-platformtype.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/platformType")
+
+#### platformType Type
+
+`string`
+
+### platformLevel
+
+
+
+`platformLevel`
+
+*   is optional
+
+*   Type: `number`
+
+*   cannot be null
+
+*   defined in: [SerializedAppLogicAction](serializedapplogicaction-definitions-serializedupdatedevicestatusaction-properties-platformlevel.md "https://timelimit.io/SerializedAppLogicAction#/definitions/SerializedUpdateDeviceStatusAction/properties/platformLevel")
+
+#### platformLevel Type
+
+`number`
+
 ## Definitions group SerializedUploadDevicePublicKeyAction
 
 Reference this group by using

docs/schema/serverdatastatus-definitions-serverdevicedata-properties-plevel.md

@@ -0,0 +1,15 @@
+# Untitled number in ServerDataStatus Schema
+
+```txt
+https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pLevel
+```
+
+
+
+| 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") |
+
+## pLevel Type
+
+`number`

docs/schema/serverdatastatus-definitions-serverdevicedata-properties-ptype.md

@@ -0,0 +1,15 @@
+# Untitled string in ServerDataStatus Schema
+
+```txt
+https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pType
+```
+
+
+
+| 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") |
+
+## pType Type
+
+`string`

docs/schema/serverdatastatus-definitions-serverdevicedata.md

@@ -50,6 +50,8 @@ https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData
 | [qOrLater](#qorlater)                           | `boolean` | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-qorlater.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/qOrLater")                           |
 | [mFlags](#mflags)                               | `number`  | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-mflags.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/mFlags")                               |
 | [pk](#pk)                                       | `string`  | Optional | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-pk.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pk")                                       |
+| [pType](#ptype)                                 | `string`  | Optional | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-ptype.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pType")                                 |
+| [pLevel](#plevel)                               | `number`  | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-plevel.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pLevel")                               |
 
 ## deviceId
 
@@ -718,3 +720,39 @@ https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData
 ### pk Type
 
 `string`
+
+## pType
+
+
+
+`pType`
+
+*   is optional
+
+*   Type: `string`
+
+*   cannot be null
+
+*   defined in: [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-ptype.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pType")
+
+### pType Type
+
+`string`
+
+## pLevel
+
+
+
+`pLevel`
+
+*   is required
+
+*   Type: `number`
+
+*   cannot be null
+
+*   defined in: [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-plevel.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pLevel")
+
+### pLevel Type
+
+`number`

docs/schema/serverdatastatus.md

@@ -435,6 +435,8 @@ Reference this group by using
 | [qOrLater](#qorlater)                           | `boolean` | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-qorlater.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/qOrLater")                           |
 | [mFlags](#mflags)                               | `number`  | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-mflags.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/mFlags")                               |
 | [pk](#pk)                                       | `string`  | Optional | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-pk.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pk")                                       |
+| [pType](#ptype)                                 | `string`  | Optional | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-ptype.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pType")                                 |
+| [pLevel](#plevel)                               | `number`  | Required | cannot be null | [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-plevel.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pLevel")                               |
 
 ### deviceId
 
@@ -1104,6 +1106,42 @@ Reference this group by using
 
 `string`
 
+### pType
+
+
+
+`pType`
+
+*   is optional
+
+*   Type: `string`
+
+*   cannot be null
+
+*   defined in: [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-ptype.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pType")
+
+#### pType Type
+
+`string`
+
+### pLevel
+
+
+
+`pLevel`
+
+*   is required
+
+*   Type: `number`
+
+*   cannot be null
+
+*   defined in: [ServerDataStatus](serverdatastatus-definitions-serverdevicedata-properties-plevel.md "https://timelimit.io/ServerDataStatus#/definitions/ServerDeviceData/properties/pLevel")
+
+#### pLevel Type
+
+`number`
+
 ## Definitions group ProtectionLevel
 
 Reference this group by using

package.json

@@ -38,12 +38,11 @@
     "@types/lodash": "^4.14.166",
     "@types/node": "^16.11.59",
     "@types/nodemailer": "^6.4.4",
-    "@types/umzug": "^2.3.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/eslint-plugin": "^5.10.0",
+    "@typescript-eslint/parser": "^7.18.0",
-    "@typescript-eslint/parser": "^5.10.0",
     "eslint": "^8.7.0",
     "rimraf": "^3.0.2",
-    "typescript": "^4.4.4",
+    "typescript": "^5.5.4",
     "typescript-json-schema": "^0.52.0"
   },
   "dependencies": {
@@ -63,10 +62,9 @@
     "rate-limiter-flexible": "^2.1.15",
     "sequelize": "^6.25.5",
     "socket.io": "^4.0.1",
-    "sqlite3": "^4.0.0",
+    "umzug": "^3.8.1"
-    "umzug": "^2.3.0"
   },
   "optionalDependencies": {
-    "sqlite3": "^4.0.0"
+    "sqlite3": "^5.0.0"
   }
 }

scripts/build-schemas.js

@@ -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
@@ -58,7 +58,9 @@ const allTypes = [
 
 const settings = {
   required: true,
-  noExtraProps: true
+  noExtraProps: true,
+  // otherwise it finds errors in dependencies that we don't care about
+  ignoreErrors: true
 };
 
 const compilerOptions = {

src/action/updatedevicestatus.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 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
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import { minPlatformLevel, maxPlatformLevel, minPlatformTypeLength, maxPlatformTypeLength } from '../database/device'
 import { NewPermissionStatus } from '../model/newpermissionstatus'
 import { ProtectionLevel } from '../model/protectionlevel'
 import { RuntimePermissionStatus } from '../model/runtimepermissionstatus'
@@ -33,6 +34,8 @@ export class UpdateDeviceStatusAction extends AppLogicAction {
   readonly didReboot: boolean
   readonly isQOrLaterNow: boolean
   readonly addedManipulationFlags: number
+  readonly platformType?: string
+  readonly platformLevel?: number
 
   constructor ({
     newProtetionLevel,
@@ -43,7 +46,9 @@ export class UpdateDeviceStatusAction extends AppLogicAction {
     newAppVersion,
     didReboot,
     isQOrLaterNow,
-    addedManipulationFlags
+    addedManipulationFlags,
+    platformType,
+    platformLevel
   }: {
     newProtetionLevel?: ProtectionLevel
     newUsageStatsPermissionStatus?: RuntimePermissionStatus
@@ -54,6 +59,8 @@ export class UpdateDeviceStatusAction extends AppLogicAction {
     didReboot: boolean
     isQOrLaterNow: boolean
     addedManipulationFlags: number
+    platformType?: string
+    platformLevel?: number
   }) {
     super()
 
@@ -67,6 +74,20 @@ export class UpdateDeviceStatusAction extends AppLogicAction {
 
     assertSafeInteger({ actionType, field: 'addedManipulationFlags', value: addedManipulationFlags })
 
+    if (platformType !== undefined) {
+      if (platformType.length < minPlatformTypeLength || platformType.length > maxPlatformTypeLength) {
+        throwOutOfRange({ actionType, field: 'platformType.length', value: platformType.length })
+      }
+    }
+
+    if (platformLevel !== undefined) {
+      assertSafeInteger({ actionType, field: 'platformLevel', value: platformLevel })
+
+      if (platformLevel < minPlatformLevel || platformLevel > maxPlatformLevel) {
+        throwOutOfRange({ actionType, field: 'platformLevel', value: platformLevel })
+      }
+    }
+
     this.newProtetionLevel = newProtetionLevel
     this.newUsageStatsPermissionStatus = newUsageStatsPermissionStatus
     this.newNotificationAccessPermission = newNotificationAccessPermission
@@ -76,6 +97,8 @@ export class UpdateDeviceStatusAction extends AppLogicAction {
     this.didReboot = didReboot
     this.isQOrLaterNow = isQOrLaterNow
     this.addedManipulationFlags = addedManipulationFlags
+    this.platformType = platformType
+    this.platformLevel = platformLevel
   }
 
   static parse = ({
@@ -87,7 +110,9 @@ export class UpdateDeviceStatusAction extends AppLogicAction {
     appVersion,
     didReboot,
     isQOrLaterNow,
-    addedManipulationFlags
+    addedManipulationFlags,
+    platformType,
+    platformLevel
   }: SerializedUpdateDeviceStatusAction) => (
     new UpdateDeviceStatusAction({
       newProtetionLevel: protectionLevel,
@@ -98,7 +123,9 @@ export class UpdateDeviceStatusAction extends AppLogicAction {
       newAppVersion: appVersion,
       didReboot: !!didReboot,
       isQOrLaterNow: !!isQOrLaterNow,
-      addedManipulationFlags: addedManipulationFlags || 0
+      addedManipulationFlags: addedManipulationFlags || 0,
+      platformType: platformType,
+      platformLevel: platformLevel
     })
   )
 }
@@ -114,4 +141,6 @@ export interface SerializedUpdateDeviceStatusAction {
   didReboot?: boolean
   isQOrLaterNow?: boolean
   addedManipulationFlags?: number
+  platformType?: string
+  platformLevel?: number
 }

src/api/validator.ts

@@ -1982,6 +1982,12 @@ const definitions = {
       },
       "addedManipulationFlags": {
         "type": "number"
+      },
+      "platformType": {
+        "type": "string"
+      },
+      "platformLevel": {
+        "type": "number"
       }
     },
     "additionalProperties": false,
@@ -2164,6 +2170,12 @@ const definitions = {
       },
       "pk": {
         "type": "string"
+      },
+      "pType": {
+        "type": "string"
+      },
+      "pLevel": {
+        "type": "number"
       }
     },
     "additionalProperties": false,
@@ -2192,6 +2204,7 @@ const definitions = {
       "model",
       "name",
       "networkTime",
+      "pLevel",
       "qOrLater",
       "reboot",
       "rebootIsManipulation",

src/database/device.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 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
@@ -37,6 +37,12 @@ export const DeviceManipulationFlags = {
   ALL: 1
 }
 
+export const minPlatformTypeLength = 1
+export const maxPlatformTypeLength = 8
+
+export const minPlatformLevel = 0
+export const maxPlatformLevel = 128
+
 export interface DeviceAttributesVersion1 {
   familyId: string
   deviceId: string
@@ -119,11 +125,17 @@ export interface DeviceAttributesVersion14 {
   nextKeyReplySequenceNumber: string
 }
 
+export interface DeviceAttributesVersion15 {
+  platformType: string | null
+  platformLevel: number
+}
+
 export type DeviceAttributes = DeviceAttributesVersion1 & DeviceAttributesVersion2 &
   DeviceAttributesVersion3 & DeviceAttributesVersion4 & DeviceAttributesVersion5 &
   DeviceAttributesVersion6 & DeviceAttributesVersion7 & DeviceAttributesVersion8 &
   DeviceAttributesVersion9 & DeviceAttributesVersion10 & DeviceAttributesVersion11 &
-  DeviceAttributesVersion12 & DeviceAttributesVersion13 & DeviceAttributesVersion14
+  DeviceAttributesVersion12 & DeviceAttributesVersion13 & DeviceAttributesVersion14 &
+  DeviceAttributesVersion15
 
 export type DeviceModel = Sequelize.Model<DeviceAttributes> & DeviceAttributes
 export type DeviceModelStatic = typeof Sequelize.Model & {
@@ -305,6 +317,26 @@ export const attributesVersion14: SequelizeAttributes<DeviceAttributesVersion14>
   }
 }
 
+export const attributesVersion15: SequelizeAttributes<DeviceAttributesVersion15> = {
+  platformType: {
+    type: Sequelize.STRING(maxPlatformTypeLength),
+    allowNull: true,
+    defaultValue: null,
+    validate: {
+      len: [minPlatformTypeLength, maxPlatformTypeLength]
+    }
+  },
+  platformLevel: {
+    type: Sequelize.INTEGER,
+    allowNull: false,
+    defaultValue: minPlatformLevel,
+    validate: {
+      min: minPlatformLevel,
+      max: maxPlatformLevel
+    }
+  }
+}
+
 export const attributes: SequelizeAttributes<DeviceAttributes> = {
   ...attributesVersion1,
   ...attributesVersion2,
@@ -319,7 +351,8 @@ export const attributes: SequelizeAttributes<DeviceAttributes> = {
   ...attributesVersion11,
   ...attributesVersion12,
   ...attributesVersion13,
-  ...attributesVersion14
+  ...attributesVersion14,
+  ...attributesVersion15
 }
 
 export const createDeviceModel = (sequelize: Sequelize.Sequelize): DeviceModelStatic => sequelize.define('Device', attributes) as DeviceModelStatic

src/database/devicedhkey.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
@@ -26,7 +26,7 @@ export const config = {
   expireTimeRounding: 1000 * 60 * 15
 }
 
-export function calculateExpireTime(now: bigint): BigInt {
+export function calculateExpireTime(now: bigint): bigint {
   const expireBaseTime = now + BigInt(config.expireDelay)
   const expireTime = expireBaseTime - expireBaseTime % BigInt(config.expireTimeRounding) + BigInt(config.expireTimeRounding)
 

src/database/migration/migrations/20230612-add-platform-level.ts

@@ -0,0 +1,46 @@
+/*
+ * server component for the TimeLimit App
+ * 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
+ * published by the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { QueryInterface, Sequelize, Transaction } from 'sequelize'
+import { attributesVersion15 as deviceAttributes } from '../../device'
+
+export async function up (queryInterface: QueryInterface, sequelize: Sequelize) {
+  await sequelize.transaction({
+    type: Transaction.TYPES.EXCLUSIVE
+  }, async (transaction) => {
+    await queryInterface.addColumn('Devices', 'platformType', {
+      ...deviceAttributes.platformType
+    }, {
+      transaction
+    })
+
+    await queryInterface.addColumn('Devices', 'platformLevel', {
+      ...deviceAttributes.platformLevel
+    }, {
+      transaction
+    })
+  })
+}
+
+export async function down (queryInterface: QueryInterface, sequelize: Sequelize) {
+  await sequelize.transaction({
+    type: Transaction.TYPES.EXCLUSIVE
+  }, async (transaction) => {
+    await queryInterface.removeColumn('Devices', 'platformLevel', { transaction })
+    await queryInterface.removeColumn('Devices', 'platformType', { transaction })
+  })
+}

src/database/migration/umzug.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 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,18 +17,26 @@
 
 import { resolve } from 'path'
 import { Sequelize } from 'sequelize'
-import * as Umzug from 'umzug'
+import { Umzug, SequelizeStorage } from 'umzug'
 
 export const createUmzug = (sequelize: Sequelize) => (
   new Umzug({
-    storage: 'sequelize',
+    storage: new SequelizeStorage({ sequelize }),
-    storageOptions: {
-      sequelize
-    },
     migrations: {
-      params: [sequelize.getQueryInterface(), sequelize],
+      glob: resolve(__dirname, '../../../build/database/migration/migrations/*.js'),
-      path: resolve(__dirname, '../../../build/database/migration/migrations'),
+      resolve: ({ name, path }) => {
-      pattern: /^\d+[\w-]+\.js$/
+        if (!path) throw new Error()
-    }
+
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const migration = require(path)
+
+        return {
+          name,
+          up: async () => migration.up(sequelize.getQueryInterface(), sequelize),
+          down: async () => migration.down(sequelize.getQueryInterface(), sequelize),
+        }
+      },
+    },
+    logger: console
   })
 )

src/function/device/prepare-device-entry.ts

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 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
@@ -66,5 +66,7 @@ export const prepareDeviceEntry = ({ familyId, userId, deviceAuthToken, deviceId
   isQorLater: false,
   manipulationFlags: 0,
   publicKey: null,
-  nextKeyReplySequenceNumber: '1'
+  nextKeyReplySequenceNumber: '1',
+  platformType: null,
+  platformLevel: 0
 })

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

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 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
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+import * as Sequelize from 'sequelize'
 import { AddUsedTimeActionVersion2 } from '../../../../action'
 import { EventHandler } from '../../../../monitoring/eventhandler'
 import { MinuteOfDay } from '../../../../util/minuteofday'
@@ -22,6 +23,8 @@ import { Cache } from '../cache'
 import { IllegalStateException, SourceDeviceNotFoundException } from '../exception/illegal-state'
 import { getRoundedTimestamp as getRoundedTimestampForUsedTime } from './addusedtime'
 
+const tolerance = 5 * 1000  // 5 seconds
+
 export const getRoundedTimestampForSessionDuration = () => {
   const now = Date.now()
 
@@ -129,11 +132,32 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
           }
         }
       } else {
+        const oldTime: number | null = await cache.database.usedTime.aggregate(
+          'usedTime',
+          'MAX',
+          {
+            where: {
+              familyId: cache.familyId,
+              categoryId: item.categoryId,
+              dayOfEpoch: action.dayOfEpoch,
+              startMinuteOfDay: {
+                [Sequelize.Op.gte]: start
+              },
+              endMinuteOfDay: {
+                [Sequelize.Op.lte]: end
+              }
+            },
+            transaction: cache.transaction
+          }
+        ) || 0
+
+        if (oldTime !== null && typeof oldTime !== 'number') throw new Error()
+
         await cache.database.usedTime.create({
           familyId: cache.familyId,
           categoryId: item.categoryId,
           dayOfEpoch: action.dayOfEpoch,
-          usedTime: Math.max(0, Math.min(item.timeToAdd, lengthInMs)),
+          usedTime: Math.max(0, Math.min(oldTime + item.timeToAdd, lengthInMs)),
           lastUpdate: roundedTimestampForUsedTime,
           startMinuteOfDay: start,
           endMinuteOfDay: end
@@ -168,6 +192,39 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
         transaction: cache.transaction
       })
 
+      const oldDuration: () => Promise<number> = async () => {
+        const fittingDurationItems = await cache.database.sessionDuration.findAll({
+          where: {
+            familyId: cache.familyId,
+            categoryId: item.categoryId,
+            startMinuteOfDay: {
+              [Sequelize.Op.gte]: limit.start
+            },
+            endMinuteOfDay: {
+              [Sequelize.Op.lte]: limit.end
+            },
+            maxSessionDuration: {
+              [Sequelize.Op.gte]: limit.duration
+            },
+            sessionPauseDuration: {
+              [Sequelize.Op.lte]: limit.pause
+            }
+          },
+          transaction: cache.transaction
+        })
+
+        const fittingDurationItemsLastUsageFiltered =
+          hasTrustedTimestamp ?
+          fittingDurationItems.filter((it) => {
+            action.trustedTimestamp - item.timeToAdd <=
+            parseInt(it.lastUsage, 10) + it.sessionPauseDuration - tolerance
+          }) : fittingDurationItems
+
+        return fittingDurationItemsLastUsageFiltered
+          .map((it) => it.lastSessionDuration)
+          .reduce((a, b) => Math.max(a, b), 0)
+      }
+
       if (oldItem) {
         let extendSession: boolean
 
@@ -188,14 +245,13 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
            * Due to this, a session is reset if it would be over in a few seconds, too.
            */
 
-          const tolerance = 5 * 1000  // 5 seconds
           const timeWhenStartingCurrentUsage = action.trustedTimestamp - item.timeToAdd
           const nextSessionStart = parseInt(oldItem.lastUsage, 10) + oldItem.sessionPauseDuration - tolerance
 
           extendSession = timeWhenStartingCurrentUsage <= nextSessionStart
         }
 
-        oldItem.lastSessionDuration = extendSession ? oldItem.lastSessionDuration + item.timeToAdd : item.timeToAdd
+        oldItem.lastSessionDuration = extendSession ? oldItem.lastSessionDuration + item.timeToAdd : await oldDuration() + item.timeToAdd
         oldItem.roundedLastUpdate = roundedTimestampForSessionDuration
 
         if (hasTrustedTimestamp) {
@@ -215,7 +271,7 @@ export async function dispatchAddUsedTimeVersion2 ({ deviceId, action, cache, ev
           endMinuteOfDay: limit.end,
           // end of primary key
           lastUsage: action.trustedTimestamp.toString(10),
-          lastSessionDuration: item.timeToAdd,
+          lastSessionDuration: await oldDuration() + item.timeToAdd,
           roundedLastUpdate: roundedTimestampForSessionDuration
         }, { transaction: cache.transaction })
       }

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

@@ -1,6 +1,6 @@
 /*
  * server component for the TimeLimit App
- * Copyright (C) 2019 - 2022 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
@@ -155,6 +155,18 @@ export async function dispatchUpdateDeviceStatus ({ deviceId, action, cache }: {
     }
   }
 
+  if (action.platformType !== undefined) {
+    if (action.platformType !== deviceEntry.platformType) {
+      deviceEntry.platformType = action.platformType
+    }
+  }
+
+  if (action.platformLevel !== undefined) {
+    if (action.platformLevel !== deviceEntry.platformLevel) {
+      deviceEntry.platformLevel = action.platformLevel
+    }
+  }
+
   {
     const effectiveManipulationFlags = action.addedManipulationFlags & DeviceManipulationFlags.ALL
 

src/function/sync/get-server-data-status/device-list.ts

@@ -66,7 +66,9 @@ export async function getDeviceList ({ database, transaction, familyEntry }: {
       activityLevelBlocking: item.activityLevelBlocking,
       qOrLater: item.isQorLater,
       mFlags: item.manipulationFlags,
-      pk: item.publicKey ? item.publicKey.toString('base64') : undefined
+      pk: item.publicKey ? item.publicKey.toString('base64') : undefined,
+      pType: item.platformType || undefined,
+      pLevel: item.platformLevel
     }))
   }
 }

src/object/serverdatastatus.ts

@@ -103,6 +103,8 @@ export interface ServerDeviceData {
   qOrLater: boolean
   mFlags: number  // manipulation flags
   pk?: string     // public key
+  pType?: string
+  pLevel: number
 }
 
 export interface ServerUpdatedCategoryBaseData {

tsconfig.json

@@ -11,7 +11,8 @@
     "noUnusedParameters": false,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "sourceMap": true
+    "sourceMap": true,
+    "skipLibCheck": true
   },
   "include": [
     "./src/**/*"