Update test deps

CHANGELOG.md

@@ -47,3 +47,22 @@
 [1.2.1]
 * Add H02 port 5013
 
+[1.2.2]
+* Update traccar to 5.6
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.6)
+
+[1.3.0]
+* Update traccar to 5.7
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.7)
+
+[1.4.0]
+* Add support for Telefonika TMT250 Port 5027
+
+[1.5.0]
+* Update traccar to 5.8
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.8)
+
+[1.5.1]
+* Update traccar to 5.9
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.9)
+

CloudronManifest.json

@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "Modern GPS Tracking Platform",
-  "version": "1.2.1",
-  "upstreamVersion": "5.5",
+  "version": "1.5.1",
+  "upstreamVersion": "5.9",
   "minBoxVersion": "7.1.0",
   "memoryLimit": 1073741824,
   "healthCheckPath": "/",
@@ -31,27 +31,38 @@
     "OSMAND_PORT": {
       "title": "OsmAnd Port",
       "description": "Port over which OsmAnd clients can connect",
-      "defaultValue": 5055
+      "defaultValue": 5055,
+      "containerPort": 5055
     },
     "GL200_PORT": {
       "title": "GL200 Protocol Port",
       "description": "Port over which GL200 clients can connect",
-      "defaultValue": 5004
+      "defaultValue": 5004,
+      "containerPort": 5004
     },
     "GPS103_PORT": {
       "title": "GPS103 Protocol Port",
       "description": "Port over which GPS103 clients can connect",
-      "defaultValue": 5001
+      "defaultValue": 5001,
+      "containerPort": 5001
     },
     "TAIP_PORT": {
       "title": "TAIP Protocol Port",
       "description": "Port over which TAIP clients can connect",
-      "defaultValue": 5031
+      "defaultValue": 5031,
+      "containerPort": 5031
     },
     "H02_PORT": {
       "title": "H02 Protocol Port",
       "description": "Port over which H02 clients can connect",
-      "defaultValue": 5013
+      "defaultValue": 5013,
+      "containerPort": 5013
+    },
+    "TELTOKIA_PORT": {
+      "title": "Teltonika Protocol Port",
+      "description": "Port over which Teltonika clients can connect",
+      "defaultValue": 5027,
+      "containerPort": 5027
     }
   },
   "website": "https://www.traccar.org",

Dockerfile

@@ -3,7 +3,7 @@ FROM cloudron/base:4.0.0@sha256:31b195ed0662bdb06a6e8a5ddbedb6f191ce92e8bee04c03
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=5.5
+ARG VERSION=5.9
 
 RUN wget https://github.com/traccar/traccar/releases/download/v${VERSION}/traccar-linux-64-${VERSION}.zip -O traccar.zip && \
     unzip traccar.zip && \

POSTINSTALL.md

@@ -1,7 +1,6 @@
 This app is pre-setup with an admin account. The initial credentials are:
 
-**Username**: admin<br/>
+**Username**: admin@cloudron.local<br/>
 **Password**: admin<br/>
 
 Please change the admin email and password credentials immediately.
-

start.sh

@@ -7,16 +7,38 @@ mkdir -p /run/traccar/logs /app/data/media
 echo -e "[client]\npassword=${CLOUDRON_MYSQL_PASSWORD}" > /run/traccar/mysql-extra
 readonly mysql="mysql --defaults-file=/run/traccar/mysql-extra --user=${CLOUDRON_MYSQL_USERNAME} --host=${CLOUDRON_MYSQL_HOST} -P ${CLOUDRON_MYSQL_PORT} ${CLOUDRON_MYSQL_DATABASE}"
 
+wait_for_table() {
+    ret=`$mysql --skip-column-names -s -e "SHOW TABLES LIKE '$1';"`
+    while [ "$ret" != "$1" ]; do
+        echo "=> Table $1 not yet created, waiting ..."
+        sleep 1;
+        ret=`$mysql --skip-column-names -s -e "SHOW TABLES LIKE '$1';"`
+        echo "ret was ${ret}"
+    done
+}
+
 disable_registration() {
-    sleep 10
-    echo "==> disabling registration"
+    wait_for_table tc_servers;
+
+    echo "==> Disabling registration"
     $mysql -e "UPDATE tc_servers SET registration=0 WHERE id=1"
 }
 
+ensure_admin_account() {
+    wait_for_table tc_users;
+
+    echo "==> Ensure admin account"
+    count=`$mysql --skip-column-names -s -e "SELECT COUNT(*) FROM tc_users WHERE name='admin';"`
+    if [[ "$count" = "0" ]]; then
+        echo "==> Create initial admin account"
+        # Values are from https://github.com/traccar/traccar/blob/master/schema/changelog-3.3.xml#L179 which is not used anymore, but we still want the admin account
+        $mysql -e "INSERT INTO tc_users (name, email, hashedpassword, salt, administrator) VALUES ('admin', 'admin@cloudron.local', 'D33DCA55ABD4CC5BC76F2BC0B4E603FE2C6F61F4C1EF2D47', '000000000000000000000000000000000000000000000000', TRUE)"
+    fi
+}
+
 echo "=> Ensure traccar.xml config"
 if [[ ! -f /app/data/traccar.xml ]]; then
     cp /app/pkg/traccar.xml.template /app/data/traccar.xml
-    disable_registration &
 fi
 
 echo "=> Ensure database settings"
@@ -58,6 +80,9 @@ xmlstarlet ed --inplace \
     --update '//properties/entry[@key="mail.smtp.password"]' -v "${CLOUDRON_MAIL_SMTP_PASSWORD}" \
     /app/data/traccar.xml
 
+disable_registration &
+ensure_admin_account &
+
 chown -R cloudron /run/traccar /app/data
 
 # https://www.traccar.org/optimization/

test/package-lock.json

@@ -9,12 +9,12 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^109.0.0"
+        "chromedriver": "^116.0.0"
       },
       "devDependencies": {
         "expect.js": "^0.3.1",
         "mocha": "^10.2.0",
-        "selenium-webdriver": "^4.7.1"
+        "selenium-webdriver": "^4.12.0"
       }
     },
     "node_modules/@testim/chrome-version": {
@@ -106,9 +106,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz",
-      "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz",
+      "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -234,14 +234,14 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "109.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-109.0.0.tgz",
-      "integrity": "sha512-jdmBq11IUwfThLFiygGTZ89qbROSQI4bICQjvOVQy2Bqr1LwC+MFkhwyZp3YG99eehQbZuTlQmmfCZBfpewTNA==",
+      "version": "116.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-116.0.0.tgz",
+      "integrity": "sha512-/TQaRn+RUAYnVqy5Vx8VtU8DvtWosU8QLM2u7BoNM5h55PRQPXF/onHAehEi8Sj/CehdKqH50NFdiumQAUr0DQ==",
       "hasInstallScript": true,
       "dependencies": {
         "@testim/chrome-version": "^1.1.3",
-        "axios": "^1.2.1",
-        "compare-versions": "^5.0.1",
+        "axios": "^1.4.0",
+        "compare-versions": "^6.0.0",
         "extract-zip": "^2.0.1",
         "https-proxy-agent": "^5.0.1",
         "proxy-from-env": "^1.1.0",
@@ -251,7 +251,7 @@
         "chromedriver": "bin/chromedriver"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=16"
       }
     },
     "node_modules/cliui": {
@@ -295,9 +295,9 @@
       }
     },
     "node_modules/compare-versions": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-5.0.1.tgz",
-      "integrity": "sha512-v8Au3l0b+Nwkp4G142JcgJFh1/TUhdxut7wzD1Nq1dyp5oa3tXaqb03EXOAB6jS4gMlalkjAUPZBMiAfKUixHQ=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.0.tgz",
+      "integrity": "sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg=="
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -742,9 +742,9 @@
       }
     },
     "node_modules/jszip": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.0.tgz",
-      "integrity": "sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
       "dev": true,
       "dependencies": {
         "lie": "~3.3.0",
@@ -1026,9 +1026,9 @@
       }
     },
     "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -1103,14 +1103,14 @@
       ]
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.7.1.tgz",
-      "integrity": "sha512-IfTM9OE8HtCKjOJwyudbAVtAHQKOJK8mu2qrXXbKyj4lqgXF+2lYW4rSZXCV6SLQRWZ+DVGkomCmFzq5orD/ZA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.12.0.tgz",
+      "integrity": "sha512-zvPzmTsky6WfO6+BGMj2mCJsw7qKnfQONur2b+pGn8jeTiC+WAUOthZOnaK+HkX5wiU6L4uoMF+JIcOVstp25A==",
       "dev": true,
       "dependencies": {
-        "jszip": "^3.10.0",
+        "jszip": "^3.10.1",
         "tmp": "^0.2.1",
-        "ws": ">=8.7.0"
+        "ws": ">=8.13.0"
       },
       "engines": {
         "node": ">= 14.20.0"
@@ -1283,16 +1283,16 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/ws": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
-      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -1448,9 +1448,9 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "axios": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz",
-      "integrity": "sha512-pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz",
+      "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -1543,13 +1543,13 @@
       }
     },
     "chromedriver": {
-      "version": "109.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-109.0.0.tgz",
-      "integrity": "sha512-jdmBq11IUwfThLFiygGTZ89qbROSQI4bICQjvOVQy2Bqr1LwC+MFkhwyZp3YG99eehQbZuTlQmmfCZBfpewTNA==",
+      "version": "116.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-116.0.0.tgz",
+      "integrity": "sha512-/TQaRn+RUAYnVqy5Vx8VtU8DvtWosU8QLM2u7BoNM5h55PRQPXF/onHAehEi8Sj/CehdKqH50NFdiumQAUr0DQ==",
       "requires": {
         "@testim/chrome-version": "^1.1.3",
-        "axios": "^1.2.1",
-        "compare-versions": "^5.0.1",
+        "axios": "^1.4.0",
+        "compare-versions": "^6.0.0",
         "extract-zip": "^2.0.1",
         "https-proxy-agent": "^5.0.1",
         "proxy-from-env": "^1.1.0",
@@ -1591,9 +1591,9 @@
       }
     },
     "compare-versions": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-5.0.1.tgz",
-      "integrity": "sha512-v8Au3l0b+Nwkp4G142JcgJFh1/TUhdxut7wzD1Nq1dyp5oa3tXaqb03EXOAB6jS4gMlalkjAUPZBMiAfKUixHQ=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.0.tgz",
+      "integrity": "sha512-LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg=="
     },
     "concat-map": {
       "version": "0.0.1",
@@ -1905,9 +1905,9 @@
       }
     },
     "jszip": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.0.tgz",
-      "integrity": "sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
+      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
       "dev": true,
       "requires": {
         "lie": "~3.3.0",
@@ -2123,9 +2123,9 @@
       }
     },
     "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
@@ -2176,14 +2176,14 @@
       "dev": true
     },
     "selenium-webdriver": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.7.1.tgz",
-      "integrity": "sha512-IfTM9OE8HtCKjOJwyudbAVtAHQKOJK8mu2qrXXbKyj4lqgXF+2lYW4rSZXCV6SLQRWZ+DVGkomCmFzq5orD/ZA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.12.0.tgz",
+      "integrity": "sha512-zvPzmTsky6WfO6+BGMj2mCJsw7qKnfQONur2b+pGn8jeTiC+WAUOthZOnaK+HkX5wiU6L4uoMF+JIcOVstp25A==",
       "dev": true,
       "requires": {
-        "jszip": "^3.10.0",
+        "jszip": "^3.10.1",
         "tmp": "^0.2.1",
-        "ws": ">=8.7.0"
+        "ws": ">=8.13.0"
       }
     },
     "serialize-javascript": {
@@ -2319,9 +2319,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
-      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "dev": true,
       "requires": {}
     },

test/package.json

@@ -11,9 +11,9 @@
   "devDependencies": {
     "expect.js": "^0.3.1",
     "mocha": "^10.2.0",
-    "selenium-webdriver": "^4.7.1"
+    "selenium-webdriver": "^4.12.0"
   },
   "dependencies": {
-    "chromedriver": "^109.0.0"
+    "chromedriver": "^116.0.0"
   }
 }

test/test.js

@@ -27,10 +27,12 @@ describe('Application life cycle test', function () {
     const LOCATION = 'test';
     const TEST_TIMEOUT = 10000;
     const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
-    const ADMIN_USERNAME = 'admin'; // the login form is called email but accepts usernames
-    const ADMIN_PASSWORD = 'admin';
     const DEVICE_NAME = 'FancyDevice';
     const DEVICE_IDENTIFIER = 'device1';
+    const ADMIN_USERNAME = 'admin@cloudron.local';
+    const ADMIN_PASSWORD = 'admin';
+    const EMAIL = process.env.EMAIL;
+    const PASSWORD = process.env.PASSWORD;
 
     var browser, app;