Add GT06 protocol support on port 5023

- Added GT06_PORT configuration to CloudronManifest.json
- GT06 protocol now available on port 5023 (standard port)
- Enables support for GT06 GPS tracker devices
- Tested and verified port connectivity

CHANGELOG.md

@@ -174,3 +174,12 @@
 [1.17.1]
 * Update traccar to 6.7.2
 
+[1.17.2]
+* fix OpenID login from mobile apps
+
+[1.17.3]
+* Update traccar to 6.7.3
+
+[1.18.0]
+* Update traccar to 6.8.1
+

CloudronManifest.json

@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "Modern GPS Tracking Platform",
-  "version": "1.17.1",
-  "upstreamVersion": "6.7.2",
+  "version": "1.18.0",
+  "upstreamVersion": "6.8.1",
   "minBoxVersion": "8.1.0",
   "memoryLimit": 1073741824,
   "healthCheckPath": "/",
@@ -26,7 +26,7 @@
     "localstorage": {},
     "mysql": {},
     "oidc": {
-      "loginRedirectUri": "/api/session/openid/callback"
+      "loginRedirectUri": "/api/session/openid/callback, org.traccar.manager:/api/session/openid/callback"
     }
   },
   "optionalSso": true,
@@ -72,6 +72,12 @@
       "description": "Port over which Teltonika clients can connect",
       "defaultValue": 5027,
       "containerPort": 5027
+    },
+    "GT06_PORT": {
+      "title": "GT06 Protocol Port",
+      "description": "Port over which GT06 clients can connect",
+      "defaultValue": 5023,
+      "containerPort": 5023
     }
   },
   "website": "https://www.traccar.org",
@@ -90,5 +96,5 @@
     "https://screenshots.cloudron.io/org.traccar.cloudronapp/command_new.png"
   ],
   "forumUrl": "https://forum.cloudron.io/category/146/traccar",
-  "documentationUrl": "https://docs.cloudron.io/apps/traccar"
+  "documentationUrl": "https://docs.cloudron.io/packages/traccar"
 }

Dockerfile

@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
 WORKDIR /app/code
 
 # renovate: datasource=github-releases depName=traccar/traccar versioning=regex:^(?<major>\d+)\.(?<minor>\d+)\.?(?<patch>\d+)?$ extractVersion=^v(?<version>.+)$
-ARG TRACCAR_VERSION=6.7.2
+ARG TRACCAR_VERSION=6.8.1
 
 RUN wget https://github.com/traccar/traccar/releases/download/v${TRACCAR_VERSION}/traccar-linux-64-${TRACCAR_VERSION}.zip -O traccar.zip && \
     unzip traccar.zip && \

test/package-lock.json

@@ -9,12 +9,12 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^137.0.0"
+        "chromedriver": "^138.0.1"
       },
       "devDependencies": {
         "expect.js": "^0.3.1",
-        "mocha": "^11.5.0",
-        "selenium-webdriver": "^4.33.0"
+        "mocha": "^11.7.1",
+        "selenium-webdriver": "^4.34.0"
       }
     },
     "node_modules/@bazel/runfiles": {
@@ -326,9 +326,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "137.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-137.0.0.tgz",
-      "integrity": "sha512-RyyIQOXaDfCc0IZrGx9EpNYCepvJca+fvreJqFgNaWBLIzLj5UInn85mWMecborYCBMtRhMZuxwNuzNXgoCIFg==",
+      "version": "138.0.1",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-138.0.1.tgz",
+      "integrity": "sha512-QS/Z1qB2OpKsPUlJjkfKmpf9lGw6ObB0dX5+dP3M0gdtbu80TUnS+EjXbtu6YkbMfr2/Qt8IfOONrawNW1GwhA==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -344,7 +344,7 @@
         "chromedriver": "bin/chromedriver"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/cliui": {
@@ -1049,9 +1049,9 @@
       }
     },
     "node_modules/mocha": {
-      "version": "11.5.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.5.0.tgz",
-      "integrity": "sha512-VKDjhy6LMTKm0WgNEdlY77YVsD49LZnPSXJAaPNL9NRYQADxvORsyG1DIQY6v53BKTnlNbEE2MbVCDbnxr4K3w==",
+      "version": "11.7.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz",
+      "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1071,7 +1071,7 @@
         "serialize-javascript": "^6.0.2",
         "strip-json-comments": "^3.1.1",
         "supports-color": "^8.1.1",
-        "workerpool": "^6.5.1",
+        "workerpool": "^9.2.0",
         "yargs": "^17.7.2",
         "yargs-parser": "^21.1.1",
         "yargs-unparser": "^2.0.0"
@@ -1352,9 +1352,9 @@
       ]
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.33.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.33.0.tgz",
-      "integrity": "sha512-5vRhk4iI0B9nYbEitfnCjPDXBfG6o9DNhj5DG2355eQo8idETknhj1tigqqlkHsGephSZwLZqEm/d+3e1stGUA==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.34.0.tgz",
+      "integrity": "sha512-zGfQFcsASAv3KrYzYh+iw4fFqB7iZAgHW7BU6rRz7isK1i1X4x3LvjmZad4bUUgHDwTnAhlqTzDh21byB+zHMg==",
       "dev": true,
       "funding": [
         {
@@ -1371,10 +1371,10 @@
         "@bazel/runfiles": "^6.3.1",
         "jszip": "^3.10.1",
         "tmp": "^0.2.3",
-        "ws": "^8.18.0"
+        "ws": "^8.18.2"
       },
       "engines": {
-        "node": ">= 18.20.5"
+        "node": ">= 20.0.0"
       }
     },
     "node_modules/serialize-javascript": {
@@ -1645,10 +1645,11 @@
       }
     },
     "node_modules/workerpool": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
-      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
-      "dev": true
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.2.tgz",
+      "integrity": "sha512-Xz4Nm9c+LiBHhDR5bDLnNzmj6+5F+cyEAWPMkbs2awq/dYazR/efelZzUAjB/y3kNHL+uzkHvxVVpaOfGCPV7A==",
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
@@ -1693,10 +1694,11 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "version": "8.18.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -2013,9 +2015,9 @@
       }
     },
     "chromedriver": {
-      "version": "137.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-137.0.0.tgz",
-      "integrity": "sha512-RyyIQOXaDfCc0IZrGx9EpNYCepvJca+fvreJqFgNaWBLIzLj5UInn85mWMecborYCBMtRhMZuxwNuzNXgoCIFg==",
+      "version": "138.0.1",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-138.0.1.tgz",
+      "integrity": "sha512-QS/Z1qB2OpKsPUlJjkfKmpf9lGw6ObB0dX5+dP3M0gdtbu80TUnS+EjXbtu6YkbMfr2/Qt8IfOONrawNW1GwhA==",
       "requires": {
         "@testim/chrome-version": "^1.1.4",
         "axios": "^1.7.4",
@@ -2513,9 +2515,9 @@
       "dev": true
     },
     "mocha": {
-      "version": "11.5.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.5.0.tgz",
-      "integrity": "sha512-VKDjhy6LMTKm0WgNEdlY77YVsD49LZnPSXJAaPNL9NRYQADxvORsyG1DIQY6v53BKTnlNbEE2MbVCDbnxr4K3w==",
+      "version": "11.7.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz",
+      "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==",
       "dev": true,
       "requires": {
         "browser-stdout": "^1.3.1",
@@ -2534,7 +2536,7 @@
         "serialize-javascript": "^6.0.2",
         "strip-json-comments": "^3.1.1",
         "supports-color": "^8.1.1",
-        "workerpool": "^6.5.1",
+        "workerpool": "^9.2.0",
         "yargs": "^17.7.2",
         "yargs-parser": "^21.1.1",
         "yargs-unparser": "^2.0.0"
@@ -2747,15 +2749,15 @@
       "dev": true
     },
     "selenium-webdriver": {
-      "version": "4.33.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.33.0.tgz",
-      "integrity": "sha512-5vRhk4iI0B9nYbEitfnCjPDXBfG6o9DNhj5DG2355eQo8idETknhj1tigqqlkHsGephSZwLZqEm/d+3e1stGUA==",
+      "version": "4.34.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.34.0.tgz",
+      "integrity": "sha512-zGfQFcsASAv3KrYzYh+iw4fFqB7iZAgHW7BU6rRz7isK1i1X4x3LvjmZad4bUUgHDwTnAhlqTzDh21byB+zHMg==",
       "dev": true,
       "requires": {
         "@bazel/runfiles": "^6.3.1",
         "jszip": "^3.10.1",
         "tmp": "^0.2.3",
-        "ws": "^8.18.0"
+        "ws": "^8.18.2"
       }
     },
     "serialize-javascript": {
@@ -2952,9 +2954,9 @@
       }
     },
     "workerpool": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz",
-      "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==",
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.2.tgz",
+      "integrity": "sha512-Xz4Nm9c+LiBHhDR5bDLnNzmj6+5F+cyEAWPMkbs2awq/dYazR/efelZzUAjB/y3kNHL+uzkHvxVVpaOfGCPV7A==",
       "dev": true
     },
     "wrap-ansi": {
@@ -2985,9 +2987,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "version": "8.18.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
       "dev": true,
       "requires": {}
     },

test/package.json

@@ -10,10 +10,10 @@
   "license": "ISC",
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "mocha": "^11.5.0",
-    "selenium-webdriver": "^4.33.0"
+    "mocha": "^11.7.1",
+    "selenium-webdriver": "^4.34.0"
   },
   "dependencies": {
-    "chromedriver": "^137.0.0"
+    "chromedriver": "^138.0.1"
   }
 }

test/test.js

@@ -111,9 +111,9 @@ describe('Application life cycle test', function () {
 
     async function addDevice() {
         await browser.get(`https://${app.fqdn}/settings/device`);
-        await waitForElement(By.xpath('//input[@id=":r3:" or @id="«r8»"]'));
-        await browser.findElement(By.xpath('//input[@id=":r3:" or @id="«r8»"]')).sendKeys(DEVICE_NAME);
-        await browser.findElement(By.xpath('//input[@id=":r4:" or @id="«r9»"]')).sendKeys(DEVICE_IDENTIFIER);
+        await waitForElement(By.xpath('(//input[contains(@id, "«r")])[1]'));
+        await browser.findElement(By.xpath('(//input[contains(@id, "«r")])[1]')).sendKeys(DEVICE_NAME);
+        await browser.findElement(By.xpath('(//input[contains(@id, "«r")])[2]')).sendKeys(DEVICE_IDENTIFIER);
         await browser.findElement(By.xpath('//button[text()="Save"]')).click();
         await waitForElement(By.xpath(`//span[text()="${DEVICE_NAME}"]`));
     }