mirror of https://github.com/status-im/chat.git
bump murmur & status-js - use provider
This commit is contained in:
parent
2d2e23743a
commit
4197f77efe
|
@ -17,7 +17,7 @@
|
||||||
"ipfs": "^0.33.1",
|
"ipfs": "^0.33.1",
|
||||||
"lodash": "^4.17.11",
|
"lodash": "^4.17.11",
|
||||||
"memoize-one": "^4.0.3",
|
"memoize-one": "^4.0.3",
|
||||||
"murmur-client": "^0.2.0",
|
"murmur-client": "^0.2.4",
|
||||||
"react": "^16.7.0",
|
"react": "^16.7.0",
|
||||||
"react-dom": "^16.7.0",
|
"react-dom": "^16.7.0",
|
||||||
"react-dropzone": "^7.0.1",
|
"react-dropzone": "^7.0.1",
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
"react-spotify-player": "^1.0.4",
|
"react-spotify-player": "^1.0.4",
|
||||||
"react-syntax-highlighter": "^10.0.1",
|
"react-syntax-highlighter": "^10.0.1",
|
||||||
"react-youtube": "^7.8.0",
|
"react-youtube": "^7.8.0",
|
||||||
"status-js-api": "^1.1.7",
|
"status-js-api": "^1.2.4",
|
||||||
"typescript": "^3.2.4",
|
"typescript": "^3.2.4",
|
||||||
"uuid": "^3.3.2"
|
"uuid": "^3.3.2"
|
||||||
},
|
},
|
||||||
|
|
|
@ -54,7 +54,8 @@ export default class Home extends PureComponent<Props> {
|
||||||
connect = async (account) => {
|
connect = async (account) => {
|
||||||
if (!account) {
|
if (!account) {
|
||||||
this.setState({ loading: true });
|
this.setState({ loading: true });
|
||||||
status.connectToProvider(this.server.provider);
|
console.log({status}, status.connectToProvider)
|
||||||
|
status.connectToProvider(this.server.provider, null);
|
||||||
return this.onConnect();
|
return this.onConnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,9 +65,13 @@ export default class Home extends PureComponent<Props> {
|
||||||
};
|
};
|
||||||
|
|
||||||
connectMurMur() {
|
connectMurMur() {
|
||||||
|
console.log({Murmur})
|
||||||
this.server = new Murmur({
|
this.server = new Murmur({
|
||||||
protocols: ["libp2p"],
|
protocols: ["libp2p"],
|
||||||
signalServer: { host: '104.248.64.24', port: '9090', protocol: 'ws' },
|
// signalServer: { host: '104.248.64.24', port: '9090', protocol: 'ws' },
|
||||||
|
signalServers: [
|
||||||
|
"/dns4/104.248.64.24/tcp/9090/ws/p2p-webrtc-star"
|
||||||
|
],
|
||||||
bootnodes: []
|
bootnodes: []
|
||||||
});
|
});
|
||||||
this.server.start();
|
this.server.start();
|
||||||
|
|
51
yarn.lock
51
yarn.lock
|
@ -9794,6 +9794,38 @@ libp2p-webrtc-star@~0.15.3, libp2p-webrtc-star@~0.15.5:
|
||||||
stream-to-pull-stream "^1.7.2"
|
stream-to-pull-stream "^1.7.2"
|
||||||
webrtcsupport "github:ipfs/webrtcsupport"
|
webrtcsupport "github:ipfs/webrtcsupport"
|
||||||
|
|
||||||
|
libp2p-websocket-star-multi@^0.4.3:
|
||||||
|
version "0.4.3"
|
||||||
|
resolved "https://registry.yarnpkg.com/libp2p-websocket-star-multi/-/libp2p-websocket-star-multi-0.4.3.tgz#28d5aa4efffb7cf14ac147fc927841a5e275cfd7"
|
||||||
|
integrity sha512-AhiBQABPw0uCRX4T1XzixRvCRXIq3k/IqrXcdRLgBZ8Yi6SXl0l7YwfAv5bO4fjq+jJTj2ypPvyM16ftNnWqBw==
|
||||||
|
dependencies:
|
||||||
|
async "^2.6.1"
|
||||||
|
debug "^4.1.0"
|
||||||
|
libp2p-websocket-star "~0.10.2"
|
||||||
|
mafmt "^6.0.2"
|
||||||
|
multiaddr "^6.0.3"
|
||||||
|
once "^1.4.0"
|
||||||
|
|
||||||
|
libp2p-websocket-star@~0.10.2:
|
||||||
|
version "0.10.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/libp2p-websocket-star/-/libp2p-websocket-star-0.10.2.tgz#74df4c651292bf64307d1198746e249827041ea5"
|
||||||
|
integrity sha512-ccjMqy7lrKV6vbTdsm9XOZ+eWt01ZCS3hI2s+I+ZpglnPQNg8z+dGs+8rdl8/hU44Sq3EbmUw0gCxPB/2ZbPlg==
|
||||||
|
dependencies:
|
||||||
|
async "^2.6.1"
|
||||||
|
class-is "^1.1.0"
|
||||||
|
debug "^4.1.1"
|
||||||
|
interface-connection "~0.3.2"
|
||||||
|
libp2p-crypto "~0.16.0"
|
||||||
|
mafmt "^6.0.4"
|
||||||
|
multiaddr "^6.0.3"
|
||||||
|
nanoid "^2.0.0"
|
||||||
|
once "^1.4.0"
|
||||||
|
peer-id "~0.12.2"
|
||||||
|
peer-info "~0.15.1"
|
||||||
|
pull-stream "^3.6.9"
|
||||||
|
socket.io-client "^2.1.1"
|
||||||
|
socket.io-pull-stream "~0.1.5"
|
||||||
|
|
||||||
libp2p-websocket-star@~0.8.1:
|
libp2p-websocket-star@~0.8.1:
|
||||||
version "0.8.1"
|
version "0.8.1"
|
||||||
resolved "https://registry.yarnpkg.com/libp2p-websocket-star/-/libp2p-websocket-star-0.8.1.tgz#45203a0384c3cc95c3754ef960c92a708ab076e3"
|
resolved "https://registry.yarnpkg.com/libp2p-websocket-star/-/libp2p-websocket-star-0.8.1.tgz#45203a0384c3cc95c3754ef960c92a708ab076e3"
|
||||||
|
@ -10875,10 +10907,10 @@ multistream-select@^0.14.1, multistream-select@~0.14.3, multistream-select@~0.14
|
||||||
semver "^5.5.0"
|
semver "^5.5.0"
|
||||||
varint "^5.0.0"
|
varint "^5.0.0"
|
||||||
|
|
||||||
murmur-client@^0.2.0:
|
murmur-client@^0.2.4:
|
||||||
version "0.2.0"
|
version "0.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/murmur-client/-/murmur-client-0.2.0.tgz#b4e041a64f23f748e5e824267e91cfbd91988a59"
|
resolved "https://registry.yarnpkg.com/murmur-client/-/murmur-client-0.2.4.tgz#fa8b8681451b92a74b7262faf445ceb7744933f5"
|
||||||
integrity sha512-CVw6TTPe5N1G0u8vkzflDvG1EpWsTClegcmf7q214TgcFK2Zg5ELQ2qdKw2wQq46VVIO/wtmbX6mErH3F/Qzcg==
|
integrity sha512-nE4aOK+F4w5o8kgGhEjYthYqCgrJh7w+gydNXqDk4/loAO1STvbqAUboEXnT6w9PeqUONpgtPk0k3ZhQ8P1xtQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@nodeutils/defaults-deep" "^1.1.0"
|
"@nodeutils/defaults-deep" "^1.1.0"
|
||||||
async "^2.6.1"
|
async "^2.6.1"
|
||||||
|
@ -10908,6 +10940,7 @@ murmur-client@^0.2.0:
|
||||||
libp2p-tcp "^0.13.0"
|
libp2p-tcp "^0.13.0"
|
||||||
libp2p-webrtc-star "~0.15.3"
|
libp2p-webrtc-star "~0.15.3"
|
||||||
libp2p-websocket-star "~0.8.1"
|
libp2p-websocket-star "~0.8.1"
|
||||||
|
libp2p-websocket-star-multi "^0.4.3"
|
||||||
libp2p-websockets "~0.12.0"
|
libp2p-websockets "~0.12.0"
|
||||||
lru-cache "^4.1.5"
|
lru-cache "^4.1.5"
|
||||||
ms "^2.1.1"
|
ms "^2.1.1"
|
||||||
|
@ -13057,7 +13090,7 @@ pull-write@^1.1.4:
|
||||||
pull-cat "^1.1.11"
|
pull-cat "^1.1.11"
|
||||||
pull-stream "^3.4.5"
|
pull-stream "^3.4.5"
|
||||||
|
|
||||||
"pull-ws@github:hugomrdias/pull-ws#fix/bundle-size":
|
pull-ws@hugomrdias/pull-ws#fix/bundle-size:
|
||||||
version "3.3.1"
|
version "3.3.1"
|
||||||
resolved "https://codeload.github.com/hugomrdias/pull-ws/tar.gz/8e2ce0bb3b1cd6804828316e937fff8e0bef6225"
|
resolved "https://codeload.github.com/hugomrdias/pull-ws/tar.gz/8e2ce0bb3b1cd6804828316e937fff8e0bef6225"
|
||||||
dependencies:
|
dependencies:
|
||||||
|
@ -14849,10 +14882,10 @@ static-extend@^0.1.1:
|
||||||
define-property "^0.2.5"
|
define-property "^0.2.5"
|
||||||
object-copy "^0.1.0"
|
object-copy "^0.1.0"
|
||||||
|
|
||||||
status-js-api@^1.1.7:
|
status-js-api@^1.2.4:
|
||||||
version "1.1.7"
|
version "1.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/status-js-api/-/status-js-api-1.1.7.tgz#72629ec90c7b2d03d8f4c59a6f91d156e2d35da5"
|
resolved "https://registry.yarnpkg.com/status-js-api/-/status-js-api-1.2.4.tgz#f45df94d024c5c5911d730919b4a2de5fed3204c"
|
||||||
integrity sha512-2HqGVc18rKaE2qGA/0E9lr0/uaqaCjK6Kk/ULkYKHyBSqoIgz1MWKn8hBepkR1PW2Hpx2CVmo9jM9zQCifj2MQ==
|
integrity sha512-1JT1Io6OG16yGqDc+nep9kMjp3sqYCEkjDYokGhryDipPYaPxcLyuxJKIut//7bnoF3NJJUissfiAsQytfOOkQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
bip39 "^2.5.0"
|
bip39 "^2.5.0"
|
||||||
chance "^1.0.16"
|
chance "^1.0.16"
|
||||||
|
|
Loading…
Reference in New Issue