diff --git a/dht-node/Dockerfile b/dht-node/Dockerfile index b422e0fad..9f1bbabf7 100644 --- a/dht-node/Dockerfile +++ b/dht-node/Dockerfile @@ -2,6 +2,7 @@ # BASE ########################################################################### ################################################################################## FROM node:19.5.0-alpine3.17 as base +#FROM ubuntu:latest as base # ENVs (available in production aswell, can be overwritten by commandline or env file) ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame @@ -31,8 +32,11 @@ LABEL org.label-schema.schema-version="1.0" LABEL maintainer="support@gradido.net" # Install Additional Software -## install: git -#RUN apk --no-cache add git +## install: sodium requirements +RUN apk add --no-cache --virtual build-deps python3 alpine-sdk autoconf libtool automake && \ + mkdir -p /prebuilds && cd /prebuilds && npm init -y && npm install sodium-native@3.1.1 && \ + apk del build-deps +ENV SODIUM_NATIVE_PREBUILD=/prebuilds/node_modules/sodium-native/ # Settings ## Expose Container Port diff --git a/dht-node/package.json b/dht-node/package.json index 2fd414360..ac9b88968 100644 --- a/dht-node/package.json +++ b/dht-node/package.json @@ -16,7 +16,7 @@ "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles" }, "dependencies": { - "@hyperswarm/dht": "^6.3.3", + "@hyperswarm/dht": "^6.4.4", "cross-env": "^7.0.3", "dotenv": "10.0.0", "log4js": "^6.7.1", @@ -26,11 +26,11 @@ "typescript": "^4.9.4" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^5.48.0", - "@typescript-eslint/parser": "^5.48.0", "@types/dotenv": "^8.2.0", "@types/jest": "^27.0.2", "@types/node": "^18.11.18", + "@typescript-eslint/eslint-plugin": "^5.48.0", + "@typescript-eslint/parser": "^5.48.0", "eslint": "^8.31.0", "eslint-config-prettier": "^8.3.0", "eslint-config-standard": "^17.0.0", diff --git a/dht-node/yarn.lock b/dht-node/yarn.lock index 9f6953de6..5832ecd8b 100644 --- a/dht-node/yarn.lock +++ b/dht-node/yarn.lock @@ -332,10 +332,10 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -"@hyperswarm/dht@^6.3.3": - version "6.3.3" - resolved "https://registry.yarnpkg.com/@hyperswarm/dht/-/dht-6.3.3.tgz#a9266cb56549f74e2d5dea587aad00c483799ad6" - integrity sha512-2eGtS2i0Ij6zQL2IuDWzUbN6/c+NBpigBzRsH2/x2aA+8AJUO0IL3BaHECnO69T6WigCOMz+mp2exFkDjjGTRQ== +"@hyperswarm/dht@^6.4.4": + version "6.4.4" + resolved "https://registry.yarnpkg.com/@hyperswarm/dht/-/dht-6.4.4.tgz#aee0e431ede7fe81311342db553775dccd816a3b" + integrity sha512-yqOZ4iaOS9MYIMdC03lZ8scam+ptspTwL0rMFJILF+LU3LT8QjUCRHRUbUOaZFjZ0tf0g7+DICRILMTRwSQ/Ug== dependencies: "@hyperswarm/secret-stream" "^6.0.0" b4a "^1.3.1" @@ -343,15 +343,14 @@ compact-encoding "^2.4.1" compact-encoding-net "^1.0.1" debugging-stream "^2.0.0" - dht-rpc "^6.3.0" + dht-rpc "^6.6.1" events "^3.3.0" hypercore-crypto "^3.3.0" noise-curve-ed "^2.0.0" noise-handshake "^3.0.0" record-cache "^1.1.1" safety-catch "^1.0.1" - sodium-universal "^3.0.4" - udx-native "^1.5.1" + sodium-universal "^4.0.0" xache "^1.1.0" "@hyperswarm/secret-stream@^6.0.0": @@ -1442,10 +1441,10 @@ detect-newline@^3.0.0: resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== -dht-rpc@^6.3.0: - version "6.3.1" - resolved "https://registry.yarnpkg.com/dht-rpc/-/dht-rpc-6.3.1.tgz#6571a3b48006c8256aadc6b993a7753582db551d" - integrity sha512-TCvDU5Pc7CL3QwFv1QKe/7IKj24Fp1JxWSRqZd1vVKFQCMRbYZxGsD3pIsPa/ILTzEUUOK5oBWPxeO2mDQr+gw== +dht-rpc@^6.6.1: + version "6.6.2" + resolved "https://registry.yarnpkg.com/dht-rpc/-/dht-rpc-6.6.2.tgz#2a9bee77a94e97c1a203030ac34977e608bb3c12" + integrity sha512-tOG4cEwere/Vi5y8zJb1D55ApPFRMyHwgVLmjPeROQhYc0/L2ZYw/h4u3XqGYI0i+vweBN2ZEJ99vk9iBsxd3A== dependencies: b4a "^1.3.1" compact-encoding "^2.1.0" @@ -1454,7 +1453,7 @@ dht-rpc@^6.3.0: fast-fifo "^1.0.0" kademlia-routing-table "^1.0.0" nat-sampler "^1.0.1" - sodium-universal "^3.0.4" + sodium-universal "^4.0.0" streamx "^2.10.3" time-ordered-set "^1.0.2" udx-native "^1.2.0" @@ -3703,6 +3702,13 @@ sodium-native@^3.1.1, sodium-native@^3.2.0: dependencies: node-gyp-build "^4.3.0" +sodium-native@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/sodium-native/-/sodium-native-4.0.1.tgz#773201b0d7872da294b9b12cd90d4a913dc9a2dd" + integrity sha512-OQTaxrVLtMvrnfcwZVsOTHe58MfDApJiHJNoOwcmmrhwvlYkfaUt2WuzRio8PgEMOd96R5aDHY49DCtock1zsA== + dependencies: + node-gyp-build "^4.3.0" + sodium-secretstream@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/sodium-secretstream/-/sodium-secretstream-1.0.2.tgz#ae6fec16555f1a1d9fd2460b41256736d5044e13" @@ -3727,6 +3733,21 @@ sodium-universal@^3.0.0, sodium-universal@^3.0.4: sodium-native "^3.2.0" xsalsa20 "^1.0.0" +sodium-universal@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/sodium-universal/-/sodium-universal-4.0.0.tgz#0d7c81aee7a013e8a950f7bea8d8cfff369c2424" + integrity sha512-iKHl8XnBV96k1c75gwwzANFdephw/MDWSjQAjPmBE+du0y3P23Q8uf7AcdcfFsYAMwLg7WVBfSAIBtV/JvRsjA== + dependencies: + blake2b "^2.1.1" + chacha20-universal "^1.0.4" + nanoassert "^2.0.0" + sha256-universal "^1.1.0" + sha512-universal "^1.1.0" + siphash24 "^1.0.1" + sodium-javascript "~0.8.0" + sodium-native "^4.0.0" + xsalsa20 "^1.0.0" + source-map-support@^0.5.6: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" @@ -4058,7 +4079,7 @@ typescript@^4.9.4: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78" integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg== -udx-native@^1.2.0, udx-native@^1.5.1: +udx-native@^1.2.0: version "1.5.1" resolved "https://registry.yarnpkg.com/udx-native/-/udx-native-1.5.1.tgz#aa71b7f2ee5cf3f738f2c59a64f3b2eeb4575337" integrity sha512-sqIHaQVgB1zVZ2vcSLo/yuErLK7eon6Y4/rwPTz4s7B4yLhqxP33nh/Pj+C4TOj4KxK01HMzdLveZMUbutcGdQ==