Merge remote-tracking branch 'origin/develop' into develop

ci: delete circleci config
dep: update @lumeweb/relay-cfg
2023-07-07 09:38:30 -04:00 · 2023-07-07 09:38:16 -04:00 · 2023-07-07 09:22:51 -04:00 · 2023-07-07 09:11:16 -04:00 · 2023-07-07 09:08:16 -04:00 · 2023-07-07 09:06:51 -04:00
10 changed files with 56 additions and 295 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -1,37 +0,0 @@
-version: 2.1
-
-orbs:
-    node: circleci/node@5.1.0
-    ssh: credijusto/ssh@0.5.2
-workflows:
-    release:
-        jobs:
-            -   node/run:
-                    name: build
-                    npm-run: build
-                    filters:
-                        branches:
-                            only:
-                                - master
-                                - develop
-                                - /^develop-.*$/
-            -   node/run:
-                    name: release
-                    npm-run: semantic-release
-                    requires:
-                        - build
-                    filters:
-                        branches:
-                            only:
-                                - master
-                                - develop
-                                - /^develop-.*$/
-
-                    context:
-                        - publish
-                    setup:
-                        -   add_ssh_keys:
-                                fingerprints:
-                                    - "47:cf:a1:17:d9:81:8e:c5:51:e5:53:c8:33:e4:33:b9"
-                        -   ssh/ssh-add-host:
-                                host_url: GITEA_HOST
--- a/package-lock.json
+++ b/package-lock.json
@ -11,8 +11,8 @@
            "dependencies": {
                "@fastify/websocket": "^8.1.0",
                "@hyperswarm/dht-relay": "^0.4.0",
-                "@lumeweb/cfg": "git+https://git.lumeweb.com/LumeWeb/cfg.git",
-                "@lumeweb/interface-relay": "git+https://git.lumeweb.com/LumeWeb/interface-relay",
+                "@lumeweb/interface-relay": "^0.0.2-develop.3",
+                "@lumeweb/relay-cfg": "^0.1.11",
                "@scure/bip39": "^1.2.0",
                "@types/node": "^18.15.11",
                "@types/ws": "^8.5.4",
@ -1078,55 +1078,33 @@
            "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
            "dev": true
        },
-        "node_modules/@lumeweb/cfg": {
-            "version": "0.1.7",
-            "resolved": "git+https://git.lumeweb.com/LumeWeb/cfg.git#62856686f20c2a627f4bafa92be24ef7f2d49a0d",
-            "license": "MIT",
+        "node_modules/@lumeweb/interface-relay": {
+            "version": "0.0.2-develop.3",
+            "resolved": "https://registry.npmjs.org/@lumeweb/interface-relay/-/interface-relay-0.0.2-develop.3.tgz",
+            "integrity": "sha512-whA528oFHlOmw7sUIHvyLP45d6HpNQTjKWl4bGvh8lDx1/Qv8SxXbJFo3UutkJIOtu68bYva0fPvBaOmKO0mnA==",
            "dependencies": {
-                "arg": "^5.0.2",
-                "bsert": "~0.0.10",
+                "@lumeweb/relay-cfg": "0.1.9"
+            }
+        },
+        "node_modules/@lumeweb/interface-relay/node_modules/@lumeweb/relay-cfg": {
+            "version": "0.1.9",
+            "resolved": "https://registry.npmjs.org/@lumeweb/relay-cfg/-/relay-cfg-0.1.9.tgz",
+            "integrity": "sha512-lns2/FZucsOKi1UFOUm9ziB3ZCQSbYxnxWDXKDzHO8fQM7CnSm+2hd/eOyelpPvpeyh4qb2W4/WD6BFQeuX1/Q==",
+            "dependencies": {
+                "bsert": "^0.0.12",
                "deep-to-flat-object": "^1.0.1",
                "object-path": "^0.11.8"
            }
        },
-        "node_modules/@lumeweb/dht-cache": {
-            "version": "0.1.0",
-            "resolved": "git+https://git.lumeweb.com/LumeWeb/dht-cache.git#00879de698f3332e4cabbda6813653124a7a0337",
+        "node_modules/@lumeweb/relay-cfg": {
+            "version": "0.1.11",
+            "resolved": "https://registry.npmjs.org/@lumeweb/relay-cfg/-/relay-cfg-0.1.11.tgz",
+            "integrity": "sha512-qlHJTY/WOWPhUjXFQsdYfwJCb1Kjccmp/9ky6Sk1CDTFoJwvYFQ4MPZ8ZMYGihfxK2edaMwg03FeZRM4zQg7Sg==",
            "dependencies": {
-                "@lumeweb/dht-flood": "git+https://git.lumeweb.com/LumeWeb/dht-flood.git",
-                "@protobuf-ts/plugin": "^2.8.1",
-                "@protobuf-ts/runtime": "^2.8.2",
-                "b4a": "^1.6.1",
-                "compact-encoding": "^2.11.0",
-                "hypercore-crypto": "^3.3.0",
-                "jsnetworkx": "^0.3.4",
-                "lru": "^3.1.0",
-                "ordered-json": "^0.1.1",
-                "pino": "^8.8.0",
-                "protocol-buffers-encodings": "^1.2.0",
-                "protomux-rpc": "^1.3.0"
-            }
-        },
-        "node_modules/@lumeweb/dht-flood": {
-            "version": "0.1.0",
-            "resolved": "git+https://git.lumeweb.com/LumeWeb/dht-flood.git#fc083fa72c5fdef6ce714b0335baa9bbbba8fda7",
-            "dependencies": {
-                "compact-encoding": "^2.11.0",
-                "lru": "^3.1.0",
-                "protocol-buffers-encodings": "^1.2.0",
-                "protomux-rpc": "^1.3.0"
-            }
-        },
-        "node_modules/@lumeweb/interface-relay": {
-            "version": "0.1.0",
-            "resolved": "git+https://git.lumeweb.com/LumeWeb/interface-relay#9401b0420c008af5ccfdca546206a1c0b6ec282e",
-            "dependencies": {
-                "@lumeweb/dht-cache": "git+https://git.lumeweb.com/LumeWeb/dht-cache.git",
-                "@types/eventemitter2": "^4.1.0",
                "arg": "^5.0.2",
-                "eventemitter2": "^6.4.9",
-                "micro-ed25519-hdkey": "^0.1.2",
-                "pino": "^8.8.0"
+                "bsert": "^0.0.12",
+                "deep-to-flat-object": "^1.0.1",
+                "object-path": "^0.11.8"
            }
        },
        "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
@ -1215,17 +1193,6 @@
                "@noble/hashes": "1.3.0"
            }
        },
-        "node_modules/@noble/ed25519": {
-            "version": "1.7.3",
-            "resolved": "https://registry.npmjs.org/@noble/ed25519/-/ed25519-1.7.3.tgz",
-            "integrity": "sha512-iR8GBkDt0Q3GyaVcIu7mSsVIqnFbkbRzGLWlvhwunacoLwt4J3swfKhfaM6rN6WY+TBGoYT1GtT1mIh2/jGbRQ==",
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://paulmillr.com/funding/"
-                }
-            ]
-        },
        "node_modules/@noble/hashes": {
            "version": "1.3.0",
            "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.0.tgz",
@ -1499,76 +1466,6 @@
                "node": ">=12"
            }
        },
-        "node_modules/@protobuf-ts/plugin": {
-            "version": "2.8.3",
-            "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.8.3.tgz",
-            "integrity": "sha512-MZG6up/AJKPviHLCH6p3jBDte4FMP08f01AvgmRjgZen4jRfIql59cptBCs4gaw+4icLb8AWtGY6O04D/hNHSw==",
-            "dependencies": {
-                "@protobuf-ts/plugin-framework": "^2.8.3",
-                "@protobuf-ts/protoc": "^2.8.3",
-                "@protobuf-ts/runtime": "^2.8.3",
-                "@protobuf-ts/runtime-rpc": "^2.8.3",
-                "typescript": "^3.9"
-            },
-            "bin": {
-                "protoc-gen-dump": "bin/protoc-gen-dump",
-                "protoc-gen-ts": "bin/protoc-gen-ts"
-            }
-        },
-        "node_modules/@protobuf-ts/plugin-framework": {
-            "version": "2.8.3",
-            "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin-framework/-/plugin-framework-2.8.3.tgz",
-            "integrity": "sha512-VfQP5Cfipaf7XASz+VRdKshN8EuDDvbfp+c5RTS6c3utUn6KhylDQWKSR/J1+hS5bQ2rHqYTqf6zya8Wn/2o3w==",
-            "dependencies": {
-                "@protobuf-ts/runtime": "^2.8.3",
-                "typescript": "^3.9"
-            }
-        },
-        "node_modules/@protobuf-ts/plugin-framework/node_modules/typescript": {
-            "version": "3.9.10",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-            "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=4.2.0"
-            }
-        },
-        "node_modules/@protobuf-ts/plugin/node_modules/typescript": {
-            "version": "3.9.10",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-            "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=4.2.0"
-            }
-        },
-        "node_modules/@protobuf-ts/protoc": {
-            "version": "2.8.3",
-            "resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.8.3.tgz",
-            "integrity": "sha512-j5REioDr7KT/cyfBD6k+FNkQFzkqv38PuUw+BsQ0dcIFJqaP8PnilbwtPn6kAJtI5QxFWPkoAr3fsWtjK7k6tQ==",
-            "bin": {
-                "protoc": "protoc.js"
-            }
-        },
-        "node_modules/@protobuf-ts/runtime": {
-            "version": "2.8.3",
-            "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.8.3.tgz",
-            "integrity": "sha512-nVL1s5wWpF6U+wtWTEWfUPD9Ockckj+fHqhzgm41CKV4Oma3D/2M6tzqOQ+wrm4GZu1bt+s6f43feNnar6fhjA=="
-        },
-        "node_modules/@protobuf-ts/runtime-rpc": {
-            "version": "2.8.3",
-            "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.8.3.tgz",
-            "integrity": "sha512-Tb6nuevgezjGNnT8WF+aveGWeI5xeAbNpySd/nzknKx6ynepXdlNz5cN0xIADeOgDJHo/05Ka+vZ5ZI33tz2Og==",
-            "dependencies": {
-                "@protobuf-ts/runtime": "^2.8.3"
-            }
-        },
        "node_modules/@scure/base": {
            "version": "1.1.1",
            "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz",
@ -2194,15 +2091,6 @@
                "@types/node": "*"
            }
        },
-        "node_modules/@types/eventemitter2": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/@types/eventemitter2/-/eventemitter2-4.1.0.tgz",
-            "integrity": "sha512-IyrCYFL+FakW3gVd/x2b0QIpcVrdgcNCkj985xoBVinc0rNwoV87IbBx7KlS5aP+bx7uIZxVypLCiSwmI4jZrg==",
-            "deprecated": "This is a stub types definition for eventemitter2 (https://github.com/asyncly/EventEmitter2). eventemitter2 provides its own type definitions, so you don't need @types/eventemitter2 installed!",
-            "dependencies": {
-                "eventemitter2": "*"
-            }
-        },
        "node_modules/@types/minimatch": {
            "version": "3.0.5",
            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
@ -2509,14 +2397,6 @@
            "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.3.tgz",
            "integrity": "sha512-aX6/FqpWQve8VN9kyTExy7GlmwNShvxcCWWD5QVR3ZbRlyBGtCrG5Autu95xxSPH4CRs+5PSV4d7PRnWpmqFlA=="
        },
-        "node_modules/babel-runtime": {
-            "version": "5.8.38",
-            "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz",
-            "integrity": "sha512-KpgoA8VE/pMmNCrnEeeXqFG24TIH11Z3ZaimIhJWsin8EbfZy3WzFKUTIan10ZIDgRVvi9EkLbruJElJC9dRlg==",
-            "dependencies": {
-                "core-js": "^1.0.0"
-            }
-        },
        "node_modules/balanced-match": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@ -2637,9 +2517,9 @@
            "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="
        },
        "node_modules/bsert": {
-            "version": "0.0.10",
-            "resolved": "https://registry.npmjs.org/bsert/-/bsert-0.0.10.tgz",
-            "integrity": "sha512-NHNwlac+WPy4t2LoNh8pXk8uaIGH3NSaIUbTTRXGpE2WEbq0te/tDykYHkFK57YKLPjv/aGHmbqvnGeVWDz57Q==",
+            "version": "0.0.12",
+            "resolved": "https://registry.npmjs.org/bsert/-/bsert-0.0.12.tgz",
+            "integrity": "sha512-lUB0EMu4KhIf+VQ6RZJ7J3dFdohYSeta+gNgDi00Hi/t3k/W6xZlwm9PSSG0q7hJ2zW9Rsn5yaMPymETxroTRw==",
            "engines": {
                "node": ">=8.0.0"
            }
@ -3095,12 +2975,6 @@
                "node": ">= 0.6"
            }
        },
-        "node_modules/core-js": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-            "integrity": "sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA==",
-            "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js."
-        },
        "node_modules/core-util-is": {
            "version": "1.0.3",
            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@ -4763,22 +4637,6 @@
                "node": ">=4"
            }
        },
-        "node_modules/jsnetworkx": {
-            "version": "0.3.4",
-            "resolved": "https://registry.npmjs.org/jsnetworkx/-/jsnetworkx-0.3.4.tgz",
-            "integrity": "sha512-3wLBxtTWsgMUADKiEXyVr6s0BNnXBtB+A13cYToatl65OFF9UG1BTOij1Jx7AhK7Q9fbrfFCNppDuSOmTFkB1Q==",
-            "dependencies": {
-                "babel-runtime": "^5",
-                "lodash": "^3.3.1",
-                "through": "^2.3.6",
-                "tiny-sprintf": "^0.3.0"
-            }
-        },
-        "node_modules/jsnetworkx/node_modules/lodash": {
-            "version": "3.10.1",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-            "integrity": "sha512-9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ=="
-        },
        "node_modules/json-parse-better-errors": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@ -5003,17 +4861,6 @@
            "integrity": "sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==",
            "dev": true
        },
-        "node_modules/lru": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/lru/-/lru-3.1.0.tgz",
-            "integrity": "sha512-5OUtoiVIGU4VXBOshidmtOsvBIvcQR6FD/RzWSvaeHyxCGB+PCUCu+52lqMfdc0h/2CLvHhZS4TwUmMQrrMbBQ==",
-            "dependencies": {
-                "inherits": "^2.0.1"
-            },
-            "engines": {
-                "node": ">= 0.4.0"
-            }
-        },
        "node_modules/lru-cache": {
            "version": "7.18.3",
            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
@ -5296,32 +5143,6 @@
                "node": ">= 8"
            }
        },
-        "node_modules/micro-ed25519-hdkey": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/micro-ed25519-hdkey/-/micro-ed25519-hdkey-0.1.2.tgz",
-            "integrity": "sha512-oHEvmBntX3vVAQ3NenKnu9K4pv6cYGgu0EP8i3ThORg7TedWMR7zFqBAznsK02xQZjMatgjn2UFpSpK4jBzMng==",
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://paulmillr.com/funding/"
-                }
-            ],
-            "dependencies": {
-                "@noble/ed25519": "~1.7.1",
-                "@noble/hashes": "~1.1.1"
-            }
-        },
-        "node_modules/micro-ed25519-hdkey/node_modules/@noble/hashes": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
-            "integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ==",
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://paulmillr.com/funding/"
-                }
-            ]
-        },
        "node_modules/micro-packed": {
            "version": "0.3.2",
            "resolved": "https://registry.npmjs.org/micro-packed/-/micro-packed-0.3.2.tgz",
@ -8934,19 +8755,6 @@
                "url": "https://github.com/sponsors/sindresorhus"
            }
        },
-        "node_modules/ordered-json": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/ordered-json/-/ordered-json-0.1.1.tgz",
-            "integrity": "sha512-qw4OYAxofa+WAZAP90eoXftAErUCjs8OII5ddDzKAZBsPMpQvWEIvuKCmUgGV22Cyd3/bT6i12KeuBBZixThDg==",
-            "dependencies": {
-                "ordered-object": "^0.2.0"
-            }
-        },
-        "node_modules/ordered-object": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/ordered-object/-/ordered-object-0.2.3.tgz",
-            "integrity": "sha512-UKBtJiO7PsKqAAenewZ/moHQIRbcjZ4HE0J/+RyzgnpCTIn5ZLe3N2izno1kViTCXtHB4xuewjPgYLEiuS6t5A=="
-        },
        "node_modules/os-tmpdir": {
            "version": "1.0.2",
            "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
@ -9694,16 +9502,6 @@
            "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
            "dev": true
        },
-        "node_modules/protocol-buffers-encodings": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.2.0.tgz",
-            "integrity": "sha512-daeNPuKh1NlLD1uDfbLpD+xyUTc07nEtfHwmBZmt/vH0B7VOM+JOCOpDcx9ZRpqHjAiIkGqyTDi+wfGSl17R9w==",
-            "dependencies": {
-                "b4a": "^1.6.0",
-                "signed-varint": "^2.0.1",
-                "varint": "5.0.0"
-            }
-        },
        "node_modules/protomux": {
            "version": "3.4.1",
            "resolved": "https://registry.npmjs.org/protomux/-/protomux-3.4.1.tgz",
@ -10561,14 +10359,6 @@
                "node": ">=4"
            }
        },
-        "node_modules/signed-varint": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/signed-varint/-/signed-varint-2.0.1.tgz",
-            "integrity": "sha512-abgDPg1106vuZZOvw7cFwdCABddfJRz5akcCcchzTbhyhYnsG31y4AlZEgp315T7W3nQq5P4xeOm186ZiPVFzw==",
-            "dependencies": {
-                "varint": "~5.0.0"
-            }
-        },
        "node_modules/simple-concat": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
@ -11146,7 +10936,8 @@
        "node_modules/through": {
            "version": "2.3.8",
            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
+            "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+            "dev": true
        },
        "node_modules/through2": {
            "version": "4.0.2",
@ -11175,11 +10966,6 @@
                "node": ">=12"
            }
        },
-        "node_modules/tiny-sprintf": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/tiny-sprintf/-/tiny-sprintf-0.3.0.tgz",
-            "integrity": "sha512-2GsAMPBTxDYKjJVsK3Do2nLAMV7hteGNTy3CuNbJwRtBGgbzuzlmYIehmzJPaPyj0IsjChgcGutBZcpCe76flg=="
-        },
        "node_modules/tmp": {
            "version": "0.0.33",
            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@ -11398,11 +11184,6 @@
                "spdx-expression-parse": "^3.0.0"
            }
        },
-        "node_modules/varint": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/varint/-/varint-5.0.0.tgz",
-            "integrity": "sha512-gC13b/bWrqQoKY2EmROCZ+AR0jitc6DnDGaQ6Ls9QpKmuSgJB1eQ7H3KETtQm7qSdMWMKCmsshyCmUwMLh3OAA=="
-        },
        "node_modules/web-streams-polyfill": {
            "version": "3.2.1",
            "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
--- a/package.json
+++ b/package.json
@ -22,8 +22,8 @@
    "dependencies": {
        "@fastify/websocket": "^8.1.0",
        "@hyperswarm/dht-relay": "^0.4.0",
-        "@lumeweb/cfg": "git+https://git.lumeweb.com/LumeWeb/cfg.git",
-        "@lumeweb/interface-relay": "git+https://git.lumeweb.com/LumeWeb/interface-relay",
+        "@lumeweb/interface-relay": "^0.0.2-develop.3",
+        "@lumeweb/relay-cfg": "^0.1.11",
        "@scure/bip39": "^1.2.0",
        "@types/node": "^18.15.11",
        "@types/ws": "^8.5.4",
--- a/patches/@lumeweb+interface-relay+0.0.2-develop.3.patch
+++ b/patches/@lumeweb+interface-relay+0.0.2-develop.3.patch
@ -0,0 +1,12 @@
+diff --git a/node_modules/@lumeweb/interface-relay/package.json b/node_modules/@lumeweb/interface-relay/package.json
+index 0bfaba0..c503d91 100644
+--- a/node_modules/@lumeweb/interface-relay/package.json
+++ b/node_modules/@lumeweb/interface-relay/package.json
+@@ -2,7 +2,6 @@
+     "name": "@lumeweb/interface-relay",
+     "version": "0.0.2-develop.3",
+     "main": "lib/index.js",
+-    "type": "module",
+     "types": "lib/index.d.ts",
+     "module": "lib/index.mjs",
+     "exports": {
--- a/src/config.ts
+++ b/src/config.ts
@ -1,5 +1,5 @@
 // @ts-ignore
-import Config from "@lumeweb/cfg";
+import { Config } from "@lumeweb/relay-cfg";
 import * as os from "os";
 import * as fs from "fs";
 import path from "path";
@ -34,7 +34,7 @@ config.inject({

 config.load();

-configDir = config.str("core.confDir");
+configDir = config.str("core.confDir") as string;

 if (fs.existsSync(configDir)) {
  try {
--- a/src/lib/seed.ts
+++ b/src/lib/seed.ts
@ -1,4 +1,4 @@
-import { HDKey } from "ed25519-keygen/dist/hdkey";
+import { HDKey } from "ed25519-keygen/hdkey";
 import config from "../config";
 import * as bip39 from "@scure/bip39";
 import { wordlist } from "@scure/bip39/wordlists/english";
@ -8,7 +8,7 @@ import b4a from "b4a";
 const BIP44_PATH = "m/44'/1627'/0'/0'/0'";

 export function getSeed() {
-  const seed = config.str("core.seed");
+  const seed = config.str("core.seed") as string;

  let valid = bip39.validateMnemonic(seed, wordlist);
  if (!valid) {
--- a/src/modules/app.ts
+++ b/src/modules/app.ts
@ -20,7 +20,10 @@ export async function start() {

  await getPluginAPI().emitAsync("core.appServer.buildRoutes");

-  await app.listen({ port: config.uint("core.appPort"), host: "0.0.0.0" });
+  await app.listen({
+    port: config.uint("core.appPort") as number,
+    host: "0.0.0.0",
+  });

  getPluginAPI().emit("core.appServer.started");
 }
--- a/src/modules/plugin.ts
+++ b/src/modules/plugin.ts
@ -8,7 +8,7 @@ import path from "path";
 import type { Logger } from "pino";

 import { getHDKey, getSeed } from "../lib/seed.js";
-import type Config from "@lumeweb/cfg";
+import type { Config } from "@lumeweb/relay-cfg";
 import EventEmitter2 from "eventemitter2";
 import log from "../log.js";
 import {
@ -17,7 +17,7 @@ import {
  ProtocolManager,
 } from "./swarm.js";
 import { get as getApp } from "./app.js";
-import type { HDKey } from "ed25519-keygen/dist/hdkey";
+import type { HDKey } from "ed25519-keygen/hdkey";
 import corePlugins from "../plugins";
 import Util from "./plugin/util";

@ -250,7 +250,9 @@ export async function loadPlugins() {
    await apiManager.loadPluginInstance(plugin);
  }

-  for (const plugin of [...new Set(config.array("core.plugins", []))] as []) {
+  for (const plugin of [
+    ...new Set(config.array("core.plugins", [] as any)),
+  ] as []) {
    await apiManager.loadPlugin(plugin);
  }

--- a/src/modules/relay.ts
+++ b/src/modules/relay.ts
@ -32,7 +32,7 @@ export async function start() {
  let port = config.uint("core.relayPort");

  if (!port) {
-    port = config.uint("core.port");
+    port = config.uint("core.port") as number;
  }

  await relayServer.listen({ port, host: "0.0.0.0" });
--- a/tsconfig.json
+++ b/tsconfig.json
@ -2,7 +2,7 @@
    "compilerOptions": {
        "target": "es2020",
        "module": "commonjs",
-        "moduleResolution": "node",
+        "moduleResolution": "nodenext",
        "rootDir": "src",
        "outDir": "build",
        "esModuleInterop": true,
Author	SHA1	Message	Date
Derrick Hammer	d9abdfd0d9	Merge remote-tracking branch 'origin/develop' into develop	2023-07-07 09:38:30 -04:00
Derrick Hammer	f5511a93b3	ci: delete circleci config	2023-07-07 09:38:16 -04:00
Derrick Hammer	34ddaf59e7	dep: update @lumeweb/relay-cfg	2023-07-07 09:22:51 -04:00
Derrick Hammer	5a63df0f50	fix: add typecasts	2023-07-07 09:11:16 -04:00
Derrick Hammer	641db83b42	fix: update import	2023-07-07 09:08:16 -04:00
Derrick Hammer	6d31f50579	fix: add patch for @lumeweb/interface-relay	2023-07-07 09:06:51 -04:00
Derrick Hammer	d0c80f36f6	dep: update @lumeweb/interface-relay	2023-07-07 09:05:14 -04:00
Derrick Hammer	1976659633	fix: use exports from package	2023-07-07 08:38:56 -04:00
Derrick Hammer	4ac844d509	ci: change moduleResolution to nodenext	2023-07-07 08:34:34 -04:00
Derrick Hammer	5b7dc6cf00	fix: update import	2023-07-07 08:21:13 -04:00
Derrick Hammer	b7f76970f7	dep: update @lumeweb/cfg and @lumeweb/interface-relay	2023-07-07 08:19:04 -04:00