diff --git a/.github/workflows/checkmarx.ym_ b/.github/workflows/checkmarx.ym_ deleted file mode 100644 index c0364e5df..000000000 --- a/.github/workflows/checkmarx.ym_ +++ /dev/null @@ -1,34 +0,0 @@ -name: "Checkmarx" - -on: - push: - branches: [master, thinx-staging, main] - pull_request: - # The branches below must be a subset of the branches above - branches: [master, thinx-staging, main] - schedule: - - cron: '0 18 * * 5' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - # Override automatic language detection by changing the below list - # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] - language: ['javascript'] - # Learn more... - # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection - - steps: - - name: Checkmarx AST Github Action - uses: Checkmarx/ast-github-action@2.0.14 - - with: - base_uri: https://ast.checkmarx.net/ - cx_tenant: nfr_nfr_ast_corpus - cx_client_id: ${{ secrets.CX_CLIENT_ID }} - cx_client_secret: ${{ secrets.CX_CLIENT_SECRET }} \ No newline at end of file diff --git a/.github/workflows/codesee-arch-diagram.yml b/.github/workflows/codesee-arch-diagram.yml deleted file mode 100644 index a2fbc75ea..000000000 --- a/.github/workflows/codesee-arch-diagram.yml +++ /dev/null @@ -1,22 +0,0 @@ -# This workflow was added by CodeSee. Learn more at https://codesee.io/ -# This is v2.0 of this workflow file -on: - push: - branches: - - master - pull_request_target: - types: [opened, synchronize, reopened] - -name: CodeSee - -permissions: read-all - -jobs: - codesee: - runs-on: ubuntu-latest - continue-on-error: true - name: Analyze the repo with CodeSee - steps: - - uses: Codesee-io/codesee-action@v2 - with: - codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }} diff --git a/base b/base index 38e2e232a..e18fb3676 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 38e2e232a25f20429c400ff499e24b18fb81b794 +Subproject commit e18fb367661a56af36dd12d3eec2771ad8046405 diff --git a/lib/thinx/coap.js b/lib/thinx/coap.js index b169cd931..42cb03f20 100644 --- a/lib/thinx/coap.js +++ b/lib/thinx/coap.js @@ -17,7 +17,7 @@ module.exports = class CoAP { req.on('response', (res) => { res.pipe(process.stdout); res.on('end', () => { - process.exit(0); + console.log("[debug] CoAP connection terminated"); }); }); req.end(); diff --git a/package-lock.json b/package-lock.json index cd319b2b4..072ba0391 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@hapi/hoek": "9.0.3", "@slack/rtm-api": "^6.1.1", "@slack/web-api": "^6.9.1", - "@snyk/protect": "^1.657.0", + "@snyk/protect": "^1.1242.0", "axios": "^1.6.0", "base-64": "^0.1.0", "bcrypt": "^5.0.0", @@ -22,12 +22,12 @@ "chai-http": "^4.3.0", "chalk": "^4.1.0", "chmodr": "^1.2.0", - "coap": "^0.26.0", + "coap": "^1.3.0", "connect-redis": "^6.1.3", "connect-timeout": "^1.9.0", "cookie-parser": "^1.4.5", "crypto-js": "^4.0.0", - "dateformat": "^3.0.3", + "dateformat": "^5.0.3", "express": "^4.17.1", "express-rate-limit": "^5.2.3", "express-session": "^1.17.2", @@ -1351,15 +1351,6 @@ "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" }, - "node_modules/@types/bl": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@types/bl/-/bl-5.1.0.tgz", - "integrity": "sha512-VXd3oG66/bay2tlApl0U3BrdkGop68tYTzybJO2xzAtLFk6ULWKIm+UGbrG9Ev8t+yuQd2uUm2m6wUP8XO8mfA==", - "deprecated": "This is a stub types definition. bl provides its own type definitions, so you do not need this installed.", - "dependencies": { - "bl": "*" - } - }, "node_modules/@types/chai": { "version": "4.3.9", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.9.tgz", @@ -1415,6 +1406,11 @@ "@types/istanbul-lib-report": "*" } }, + "node_modules/@types/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==" + }, "node_modules/@types/node": { "version": "20.8.10", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz", @@ -1428,6 +1424,20 @@ "resolved": "https://registry.npmjs.org/@types/p-queue/-/p-queue-2.3.2.tgz", "integrity": "sha512-eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ==" }, + "node_modules/@types/readable-stream": { + "version": "2.3.15", + "resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.15.tgz", + "integrity": "sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==", + "dependencies": { + "@types/node": "*", + "safe-buffer": "~5.1.1" + } + }, + "node_modules/@types/readable-stream/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, "node_modules/@types/retry": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", @@ -1482,6 +1492,17 @@ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -2330,19 +2351,19 @@ } }, "node_modules/coap": { - "version": "0.26.0", - "resolved": "https://registry.npmjs.org/coap/-/coap-0.26.0.tgz", - "integrity": "sha512-aRTrRToDLcZ68Ygxvbmc0/9XPQL3ypCeJQKMnitjH3HL/+ekh7REj7JZlG1mDsTwC7mDU2Zq9s4jo52BLNxAcg==", - "dependencies": { - "@types/bl": "^5.0.1", - "@types/node": "^16.10.1", - "bl": "^5.0.0", - "capitalize": "^2.0.3", - "coap-packet": "^1.0.0", - "debug": "^4.3.2", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/coap/-/coap-1.3.0.tgz", + "integrity": "sha512-vRi1x4z0iCfez3fy9JCiH3Kwkt0wPmRZxeRfr9lQeWTrBSevkKZ458N3ZrwieD9vulcVODJr4SQP4cigIO150A==", + "dependencies": { + "@types/lru-cache": "^5.1.1", + "@types/readable-stream": "^2.3.15", + "bl": "^6.0.0", + "capitalize": "^2.0.4", + "coap-packet": "^1.1.1", + "debug": "^4.3.4", "fastseries": "^2.0.0", "lru-cache": "^6.0.0", - "readable-stream": "^3.6.0" + "readable-stream": "^4.2.0" }, "engines": { "node": ">=10" @@ -2356,10 +2377,28 @@ "node": ">= 0.10" } }, - "node_modules/coap/node_modules/@types/node": { - "version": "16.18.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.60.tgz", - "integrity": "sha512-ZUGPWx5vKfN+G2/yN7pcSNLkIkXEvlwNaJEd4e0ppX7W2S8XAkdc/37hM4OUNJB9sa0p12AOvGvxL4JCPiz9DA==" + "node_modules/coap/node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } }, "node_modules/coap/node_modules/debug": { "version": "4.3.4", @@ -2382,6 +2421,21 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "node_modules/coap/node_modules/readable-stream": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", + "dependencies": { + "abort-controller": "^3.0.0", + "buffer": "^6.0.3", + "events": "^3.3.0", + "process": "^0.11.10", + "string_decoder": "^1.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -2800,11 +2854,11 @@ "integrity": "sha512-AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==" }, "node_modules/dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-5.0.3.tgz", + "integrity": "sha512-Kvr6HmPXUMerlLcLF+Pwq3K7apHpYmGDVqrxcDasBg86UcKeTSNWbEzU8bwdXnxnR44FtMhJAxI4Bov6Y/KUfA==", "engines": { - "node": "*" + "node": ">=12.20" } }, "node_modules/debug": { @@ -3580,6 +3634,14 @@ "es5-ext": "~0.10.14" } }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "engines": { + "node": ">=6" + } + }, "node_modules/eventemitter2": { "version": "0.4.14", "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz", @@ -3591,6 +3653,14 @@ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==" }, + "node_modules/events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "engines": { + "node": ">=0.8.x" + } + }, "node_modules/exit": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", diff --git a/package.json b/package.json index dbad66fb9..a197dbcf3 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@hapi/hoek": "9.0.3", "@slack/rtm-api": "^6.1.1", "@slack/web-api": "^6.9.1", - "@snyk/protect": "^1.657.0", + "@snyk/protect": "^1.1242.0", "axios": "^1.6.0", "base-64": "^0.1.0", "bcrypt": "^5.0.0", @@ -40,14 +40,14 @@ "chai-http": "^4.3.0", "chalk": "^4.1.0", "chmodr": "^1.2.0", - "coap": "^0.26.0", + "coap": "^1.3.0", "connect-redis": "^6.1.3", "connect-timeout": "^1.9.0", "cookie-parser": "^1.4.5", - "crypto-js": "^4.0.0", - "dateformat": "^3.0.3", - "express": "^4.17.1", - "express-rate-limit": "^5.2.3", + "crypto-js": "^4.2.0", + "dateformat": "^5.0.3", + "express": "^4.18.2", + "express-rate-limit": "^7.1.4", "express-session": "^1.17.2", "fs-extra": "^9.0.1", "fs-finder": "github:suculent/Node-FsFinder#master", @@ -88,7 +88,7 @@ "typeof": "^1.0.0", "utf-8": "^2.0.0", "uuid": "^8.3.2", - "ws": "^7.4.6", + "ws": "^8.14.2", "yaml": "2.2.2" }, "overrides": { diff --git a/services/transformer b/services/transformer index e07040948..8d1ece9c6 160000 --- a/services/transformer +++ b/services/transformer @@ -1 +1 @@ -Subproject commit e07040948ca648ccf00937a25509923091597f81 +Subproject commit 8d1ece9c69d3f5e880041bb374171d35cc286057 diff --git a/services/worker b/services/worker index 74d3429f2..8f106289d 160000 --- a/services/worker +++ b/services/worker @@ -1 +1 @@ -Subproject commit 74d3429f2f82fbf6189913e7a3e9b3444df00f69 +Subproject commit 8f106289d62b4a1d719825a02f6d59ca4f14efd6 diff --git a/spec/test_repositories/thinx-firmware-esp8266 b/spec/test_repositories/thinx-firmware-esp8266 index 09c13e471..b7a4da912 160000 --- a/spec/test_repositories/thinx-firmware-esp8266 +++ b/spec/test_repositories/thinx-firmware-esp8266 @@ -1 +1 @@ -Subproject commit 09c13e4714bb15dfdf7bbfbce513bc66320ca577 +Subproject commit b7a4da91213a545a3cae72b3cccfb450f8d13bcf