diff --git a/README.md b/README.md index 1151b610..a2cd213a 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,9 @@ Patchbay doesn't give you a way to join pubs yet, so this is good if you've alre ### Harder Install (full dev setup) -Install a standalone scuttlebot (your gossip server) +Install a standalone ssb-server (your gossip server) ```sh -npm install scuttlebot@latest -g +npm install ssb-server@latest -g ``` ```sh diff --git a/package-lock.json b/package-lock.json index de95dd00..640ceb4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3463,6 +3463,15 @@ } } }, + "gossip-query": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/gossip-query/-/gossip-query-0.2.3.tgz", + "integrity": "sha512-j5q/bbD+B/md03ho7QxhT1Ao6KBUV3PetbveQXEfQyqojG0kkXBxnkHjjMcWTMzP1anlk0JxaA1mFsRU8hrFXQ==", + "requires": { + "obv": "0.0.1", + "pull-stream": "^3.6.0" + } + }, "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", @@ -3595,7 +3604,7 @@ }, "he": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/he/-/he-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/he/-/he-0.5.0.tgz", "integrity": "sha1-LAX/rvkLaOhg8/0rVO9YCYknfuI=" }, "heap": { @@ -4449,7 +4458,7 @@ "dependencies": { "abstract-leveldown": { "version": "0.12.4", - "resolved": "http://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz", + "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz", "integrity": "sha1-KeGOYy5g5OIh1YECR4UqY9ey5BA=", "requires": { "xtend": "~3.0.0" @@ -4464,7 +4473,7 @@ }, "bl": { "version": "0.8.2", - "resolved": "http://registry.npmjs.org/bl/-/bl-0.8.2.tgz", + "resolved": "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz", "integrity": "sha1-yba8oI0bwuoA/Ir7Txpf0eHGbk4=", "requires": { "readable-stream": "~1.0.26" @@ -4516,7 +4525,7 @@ }, "readable-stream": { "version": "1.0.34", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "requires": { "core-util-is": "~1.0.0", @@ -4527,7 +4536,7 @@ }, "semver": { "version": "5.1.1", - "resolved": "http://registry.npmjs.org/semver/-/semver-5.1.1.tgz", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.1.tgz", "integrity": "sha1-oykqNz5vPgeY2gsgZBuanFvEfhk=" }, "string_decoder": { @@ -4772,7 +4781,7 @@ }, "map-merge": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/map-merge/-/map-merge-1.1.0.tgz", "integrity": "sha1-am/FjJXYqrRsK93kTVFbbuBvzjQ=" }, "map-obj": { @@ -4844,7 +4853,7 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } @@ -5167,7 +5176,7 @@ "dependencies": { "pull-stream": { "version": "2.28.4", - "resolved": "http://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz", + "resolved": "https://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz", "integrity": "sha1-fql0E8FhnCC8O9+eEOkTR7AyU+Q=", "requires": { "pull-core": "~1.1.0" @@ -5188,12 +5197,12 @@ "dependencies": { "minimist": { "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "pull-stream": { "version": "2.28.4", - "resolved": "http://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz", + "resolved": "https://registry.npmjs.org/pull-stream/-/pull-stream-2.28.4.tgz", "integrity": "sha1-fql0E8FhnCC8O9+eEOkTR7AyU+Q=", "requires": { "pull-core": "~1.1.0" @@ -5225,7 +5234,7 @@ }, "rimraf": { "version": "2.4.5", - "resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=", "requires": { "glob": "^6.0.1" @@ -5281,7 +5290,7 @@ }, "ncp": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=" }, "nearley": { @@ -6770,7 +6779,7 @@ }, "pull-stringify": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/pull-stringify/-/pull-stringify-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/pull-stringify/-/pull-stringify-2.0.0.tgz", "integrity": "sha1-Irox2pWvCIjg+1WSOLH6kVpqW2Q=", "requires": { "defined": "^1.0.0" @@ -7346,7 +7355,7 @@ }, "remark": { "version": "3.2.3", - "resolved": "http://registry.npmjs.org/remark/-/remark-3.2.3.tgz", + "resolved": "https://registry.npmjs.org/remark/-/remark-3.2.3.tgz", "integrity": "sha1-gCo4w6qYyeHj6gFe66IR0ny2Xh8=", "requires": { "camelcase": "^2.0.0", @@ -7774,7 +7783,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { "ret": "~0.1.10" @@ -7933,95 +7942,6 @@ } } }, - "scuttlebot": { - "version": "13.0.3", - "resolved": "https://registry.npmjs.org/scuttlebot/-/scuttlebot-13.0.3.tgz", - "integrity": "sha512-/Axzh0wWOSb8n9i/7t+HaN+71rj+Q7oCnObpph7WAoroHKb2GtgZALLW2ioJ10PXbRrEPHFTkHhmvBKUKRYu4w==", - "requires": { - "atomic-file": "^1.1.5", - "bash-color": "~0.0.3", - "broadcast-stream": "^0.2.1", - "cont": "~1.0.3", - "cross-spawn": "^6.0.5", - "deep-equal": "^1.0.1", - "explain-error": "^1.0.3", - "has-network": "0.0.1", - "ip": "^1.1.5", - "mdmanifest": "^1.0.4", - "minimist": "^1.1.3", - "mkdirp": "~0.5.0", - "multiblob": "^1.13.0", - "multiserver": "^1.13.4", - "multiserver-address": "^1.0.1", - "muxrpc-validation": "^2.0.0", - "muxrpcli": "^1.0.0", - "mv": "^2.1.1", - "observ-debounce": "^1.1.1", - "obv": "0.0.1", - "on-change-network": "0.0.2", - "on-wakeup": "^1.0.0", - "osenv": "^0.1.5", - "pull-cat": "~1.1.5", - "pull-file": "^1.0.0", - "pull-many": "~1.0.6", - "pull-next": "^1.0.0", - "pull-notify": "0.1.1", - "pull-paramap": "~1.2.1", - "pull-ping": "^2.0.2", - "pull-pushable": "^2.2.0", - "pull-stream": "^3.6.2", - "pull-stringify": "^2.0.0", - "rimraf": "^2.4.2", - "secret-stack": "^4.2.1", - "secure-scuttlebutt": "^18.5.0", - "ssb-blobs": "^1.1.4", - "ssb-client": "^4.5.7", - "ssb-config": "^2.3.6", - "ssb-ebt": "^5.1.4", - "ssb-friends": "^3.1.3", - "ssb-keys": "^7.1.1", - "ssb-links": "^3.0.2", - "ssb-query": "^2.1.0", - "ssb-ref": "^2.13.3", - "ssb-ws": "^3.0.0", - "statistics": "^3.0.0", - "stream-to-pull-stream": "^1.6.10", - "zerr": "^1.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, - "ssb-ws": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/ssb-ws/-/ssb-ws-3.0.2.tgz", - "integrity": "sha512-rQnbFIdzyQrB77y1UD0cWlW/TYO6rqCT1RO95p0ka6UQsEBtm/O7TN8h5AgroD9XqyxdusXhEbhobpUt41s1Cw==", - "requires": { - "emoji-server": "^1.0.0", - "multiblob-http": "^0.4.2", - "multiserver": "^1.13.5", - "muxrpc": "^6.3.3", - "pull-box-stream": "^1.0.13", - "ssb-ref": "^2.3.0", - "stack": "^0.1.0" - } - } - } - }, "secret-handshake": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/secret-handshake/-/secret-handshake-1.1.14.tgz", @@ -8035,154 +7955,60 @@ } }, "secret-stack": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/secret-stack/-/secret-stack-4.2.4.tgz", - "integrity": "sha512-HUG0YujOk20t7CeQz75dz79XmQQl1qsxEVngF+3l5ZNEHNEO6TJHNKo0OAxAWGKzSWiJDkzKLSnHqqZFNKcrPA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/secret-stack/-/secret-stack-5.0.0.tgz", + "integrity": "sha512-kksU6sS9+sm9qKcER39VEEQggObTFJkuVSXHSKxQ+qu3TcqhQnPQT4BY9nmkq7mvMdYOhVWnXsktnIHfSNgfoQ==", "requires": { + "debug": "^4.1.0", "hoox": "0.0.1", "ip": "^1.1.5", "map-merge": "^1.1.0", - "multiserver": "^1.13.0", + "multiserver": "^3.0.2", "muxrpc": "^6.4.0", "non-private-ip": "^1.4.3", "pull-inactivity": "~2.1.1", "pull-rate": "^1.0.2", "pull-stream": "^3.4.5", - "stream-to-pull-stream": "^1.6.1" - } - }, - "secrets.js-grempe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/secrets.js-grempe/-/secrets.js-grempe-1.1.0.tgz", - "integrity": "sha1-uztgbdaGN8okRoGhD97mxRIEkpQ=" - }, - "secure-scuttlebutt": { - "version": "18.6.0", - "resolved": "https://registry.npmjs.org/secure-scuttlebutt/-/secure-scuttlebutt-18.6.0.tgz", - "integrity": "sha512-gKQ8tJVnxd8WJEMusXyVkcHGZHoYB+F+TuQYisFYlhAntqlKBExdN+IT6DjVmHev7DvxE68PVtR8Ijqme93d2w==", - "requires": { - "async-write": "^2.1.0", - "cont": "~1.0.0", - "explain-error": "~1.0.1", - "flumedb": "^1.0.0", - "flumelog-offset": "^3.3.1", - "flumeview-hashtable": "^1.0.3", - "flumeview-level": "^3.0.5", - "flumeview-reduce": "^1.3.9", - "level": "^4.0.0", - "level-sublevel": "^6.6.2", - "ltgt": "^2.2.0", - "monotonic-timestamp": "~0.0.8", - "obv": "0.0.1", - "pull-cont": "^0.1.1", - "pull-level": "^2.0.3", - "pull-live": "^1.0.1", - "pull-notify": "^0.1.0", - "pull-paramap": "^1.1.6", - "pull-stream": "^3.4.0", - "ssb-keys": "^7.1.3", - "ssb-msgs": "^5.0.0", - "ssb-ref": "^2.12.0", - "ssb-validate": "^4.0.0", - "typewiselite": "^1.0.0" + "stream-to-pull-stream": "^1.6.1", + "to-camel-case": "^1.0.0" }, "dependencies": { - "abstract-leveldown": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", - "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==", - "requires": { - "xtend": "~4.0.0" - } - }, - "deferred-leveldown": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz", - "integrity": "sha512-5fMC8ek8alH16QiV0lTCis610D1Zt1+LA4MS4d63JgS32lrCjTFDUFz2ao09/j2I4Bqb5jL4FZYwu7Jz0XO1ww==", - "requires": { - "abstract-leveldown": "~5.0.0", - "inherits": "^2.0.3" - } - }, - "encoding-down": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-5.0.4.tgz", - "integrity": "sha512-8CIZLDcSKxgzT+zX8ZVfgNbu8Md2wq/iqa1Y7zyVR18QBEAc0Nmzuvj/N5ykSKpfGzjM8qxbaFntLPwnVoUhZw==", - "requires": { - "abstract-leveldown": "^5.0.0", - "inherits": "^2.0.3", - "level-codec": "^9.0.0", - "level-errors": "^2.0.0", - "xtend": "^4.0.1" - } - }, - "level": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/level/-/level-4.0.0.tgz", - "integrity": "sha512-4epzCOlEcJ529NOdlAYiuiakS/kZTDdiKSBNJmE1B8bsmA+zEVwcpxyH86qJSQTpOu7SODrlaD9WgPRHLkGutA==", - "requires": { - "level-packager": "^3.0.0", - "leveldown": "^4.0.0", - "opencollective-postinstall": "^2.0.0" - } - }, - "level-codec": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.0.tgz", - "integrity": "sha512-OIpVvjCcZNP5SdhcNupnsI1zo5Y9Vpm+k/F1gfG5kXrtctlrwanisakweJtE0uA0OpLukRfOQae+Fg0M5Debhg==" - }, - "level-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.0.tgz", - "integrity": "sha512-AmY4HCp9h3OiU19uG+3YWkdELgy05OTP/r23aNHaQKWv8DO787yZgsEuGVkoph40uwN+YdUKnANlrxSsoOaaxg==", - "requires": { - "errno": "~0.1.1" - } - }, - "level-iterator-stream": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-3.0.1.tgz", - "integrity": "sha512-nEIQvxEED9yRThxvOrq8Aqziy4EGzrxSZK+QzEFAVuJvQ8glfyZ96GB6BoI4sBbLfjMXm2w4vu3Tkcm9obcY0g==", - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "xtend": "^4.0.0" - } - }, - "level-packager": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-3.1.0.tgz", - "integrity": "sha512-UxVEfK5WH0u0InR3WxTCSAroiorAGKzXWZT6i+nBjambmvINuXFUsFx2Ai3UIjUUtnyWhluv42jMlzUZCsAk9A==", + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "requires": { - "encoding-down": "~5.0.0", - "levelup": "^3.0.0" + "ms": "^2.1.1" } }, - "leveldown": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-4.0.1.tgz", - "integrity": "sha512-ZlBKVSsglPIPJnz4ggB8o2R0bxDxbsMzuQohbfgoFMVApyTE118DK5LNRG0cRju6rt3OkGxe0V6UYACGlq/byg==", - "requires": { - "abstract-leveldown": "~5.0.0", - "bindings": "~1.3.0", - "fast-future": "~1.0.2", - "nan": "~2.10.0", - "prebuild-install": "^4.0.0" - } + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" }, - "levelup": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/levelup/-/levelup-3.1.1.tgz", - "integrity": "sha512-9N10xRkUU4dShSRRFTBdNaBxofz+PGaIZO962ckboJZiNmLuhVT6FZ6ZKAsICKfUBO76ySaYU6fJWX/jnj3Lcg==", + "multiserver": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/multiserver/-/multiserver-3.0.2.tgz", + "integrity": "sha512-YCVA+zCtc4xR55CrKIK6pAYPKTDswrlF+bkO9Nyb1osn93AhFGjKnelA38G9mNHeUd/v9/Un3gxpisorouRQfw==", "requires": { - "deferred-leveldown": "~4.0.0", - "level-errors": "~2.0.0", - "level-iterator-stream": "~3.0.0", - "xtend": "~4.0.0" + "multicb": "^1.2.2", + "multiserver-scopes": "^1.0.0", + "pull-cat": "~1.1.5", + "pull-stream": "^3.6.1", + "pull-ws": "^3.3.0", + "secret-handshake": "^1.1.12", + "separator-escape": "0.0.0", + "socks": "2.2.1", + "stream-to-pull-stream": "^1.7.2" } } } }, + "secrets.js-grempe": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/secrets.js-grempe/-/secrets.js-grempe-1.1.0.tgz", + "integrity": "sha1-uztgbdaGN8okRoGhD97mxRIEkpQ=" + }, "semver": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", @@ -8979,6 +8805,132 @@ "ssb-schema-definitions": "^1.0.6" } }, + "ssb-db": { + "version": "18.6.3", + "resolved": "https://registry.npmjs.org/ssb-db/-/ssb-db-18.6.3.tgz", + "integrity": "sha512-Dpc+xz0OnSFGnQaoiE81+Ru0nncXjXI5/CrpltdPkzCFj9E9yMz93KHJ1GNohJIUOivZAHJ9E3ZYhqTPHjxvRA==", + "requires": { + "async-write": "^2.1.0", + "cont": "~1.0.0", + "explain-error": "~1.0.1", + "flumedb": "^1.0.0", + "flumelog-offset": "^3.3.1", + "flumeview-hashtable": "^1.0.3", + "flumeview-level": "^3.0.5", + "flumeview-reduce": "^1.3.9", + "level": "^4.0.0", + "level-sublevel": "^6.6.2", + "ltgt": "^2.2.0", + "monotonic-timestamp": "~0.0.8", + "obv": "0.0.1", + "pull-cont": "^0.1.1", + "pull-level": "^2.0.3", + "pull-live": "^1.0.1", + "pull-paramap": "^1.1.6", + "pull-stream": "^3.4.0", + "ssb-keys": "^7.1.3", + "ssb-msgs": "^5.0.0", + "ssb-ref": "^2.12.0", + "ssb-validate": "^4.0.0", + "typewiselite": "^1.0.0" + }, + "dependencies": { + "abstract-leveldown": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-5.0.0.tgz", + "integrity": "sha512-5mU5P1gXtsMIXg65/rsYGsi93+MlogXZ9FA8JnwKurHQg64bfXwGYVdVdijNTVNOlAsuIiOwHdvFFD5JqCJQ7A==", + "requires": { + "xtend": "~4.0.0" + } + }, + "deferred-leveldown": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-4.0.2.tgz", + "integrity": "sha512-5fMC8ek8alH16QiV0lTCis610D1Zt1+LA4MS4d63JgS32lrCjTFDUFz2ao09/j2I4Bqb5jL4FZYwu7Jz0XO1ww==", + "requires": { + "abstract-leveldown": "~5.0.0", + "inherits": "^2.0.3" + } + }, + "encoding-down": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/encoding-down/-/encoding-down-5.0.4.tgz", + "integrity": "sha512-8CIZLDcSKxgzT+zX8ZVfgNbu8Md2wq/iqa1Y7zyVR18QBEAc0Nmzuvj/N5ykSKpfGzjM8qxbaFntLPwnVoUhZw==", + "requires": { + "abstract-leveldown": "^5.0.0", + "inherits": "^2.0.3", + "level-codec": "^9.0.0", + "level-errors": "^2.0.0", + "xtend": "^4.0.1" + } + }, + "level": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/level/-/level-4.0.0.tgz", + "integrity": "sha512-4epzCOlEcJ529NOdlAYiuiakS/kZTDdiKSBNJmE1B8bsmA+zEVwcpxyH86qJSQTpOu7SODrlaD9WgPRHLkGutA==", + "requires": { + "level-packager": "^3.0.0", + "leveldown": "^4.0.0", + "opencollective-postinstall": "^2.0.0" + } + }, + "level-codec": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-9.0.0.tgz", + "integrity": "sha512-OIpVvjCcZNP5SdhcNupnsI1zo5Y9Vpm+k/F1gfG5kXrtctlrwanisakweJtE0uA0OpLukRfOQae+Fg0M5Debhg==" + }, + "level-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.0.tgz", + "integrity": "sha512-AmY4HCp9h3OiU19uG+3YWkdELgy05OTP/r23aNHaQKWv8DO787yZgsEuGVkoph40uwN+YdUKnANlrxSsoOaaxg==", + "requires": { + "errno": "~0.1.1" + } + }, + "level-iterator-stream": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-3.0.1.tgz", + "integrity": "sha512-nEIQvxEED9yRThxvOrq8Aqziy4EGzrxSZK+QzEFAVuJvQ8glfyZ96GB6BoI4sBbLfjMXm2w4vu3Tkcm9obcY0g==", + "requires": { + "inherits": "^2.0.1", + "readable-stream": "^2.3.6", + "xtend": "^4.0.0" + } + }, + "level-packager": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/level-packager/-/level-packager-3.1.0.tgz", + "integrity": "sha512-UxVEfK5WH0u0InR3WxTCSAroiorAGKzXWZT6i+nBjambmvINuXFUsFx2Ai3UIjUUtnyWhluv42jMlzUZCsAk9A==", + "requires": { + "encoding-down": "~5.0.0", + "levelup": "^3.0.0" + } + }, + "leveldown": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/leveldown/-/leveldown-4.0.1.tgz", + "integrity": "sha512-ZlBKVSsglPIPJnz4ggB8o2R0bxDxbsMzuQohbfgoFMVApyTE118DK5LNRG0cRju6rt3OkGxe0V6UYACGlq/byg==", + "requires": { + "abstract-leveldown": "~5.0.0", + "bindings": "~1.3.0", + "fast-future": "~1.0.2", + "nan": "~2.10.0", + "prebuild-install": "^4.0.0" + } + }, + "levelup": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/levelup/-/levelup-3.1.1.tgz", + "integrity": "sha512-9N10xRkUU4dShSRRFTBdNaBxofz+PGaIZO962ckboJZiNmLuhVT6FZ6ZKAsICKfUBO76ySaYU6fJWX/jnj3Lcg==", + "requires": { + "deferred-leveldown": "~4.0.0", + "level-errors": "~2.0.0", + "level-iterator-stream": "~3.0.0", + "xtend": "~4.0.0" + } + } + } + }, "ssb-ebt": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/ssb-ebt/-/ssb-ebt-5.2.3.tgz", @@ -9092,7 +9044,7 @@ }, "ssb-links": { "version": "3.0.3", - "resolved": "http://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz", + "resolved": "https://registry.npmjs.org/ssb-links/-/ssb-links-3.0.3.tgz", "integrity": "sha512-x09ShIMjwvdZI7aDZm8kc1v5YCGZa9ulCOoxrf/RYJ98s5gbTfO9CBCzeMBAeQ5kRwSuKjiOxJHdeEBkj4Y6hw==", "requires": { "flumeview-query": "^6.0.0", @@ -9103,7 +9055,7 @@ "dependencies": { "map-filter-reduce": { "version": "2.2.1", - "resolved": "http://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz", + "resolved": "https://registry.npmjs.org/map-filter-reduce/-/map-filter-reduce-2.2.1.tgz", "integrity": "sha1-YysSfDrl1q2eIc/dlpG2O4lE/NI=", "requires": { "binary-search": "^1.2.0", @@ -9195,6 +9147,37 @@ "ssb-ref": "^2.6.2" } }, + "ssb-ooo": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ssb-ooo/-/ssb-ooo-1.1.0.tgz", + "integrity": "sha512-zYVfLuI6krIxB23ApT1V2KlePtazApU0afbdqyG6L8Iggcvb5QPUXFzPjv0qEmnAWzvOM4FQ78hyWhCf1504Cg==", + "requires": { + "flumecodec": "0.0.1", + "flumedb": "^1.0.0", + "flumelog-offset": "^3.3.2", + "flumeview-hashtable": "^1.0.2", + "gossip-query": "^0.2.3", + "mkdirp": "^0.5.1", + "pull-stream": "^3.6.1", + "ssb-keys": "^7.1.3", + "ssb-ref": "^2.13.3" + }, + "dependencies": { + "flumecodec": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/flumecodec/-/flumecodec-0.0.1.tgz", + "integrity": "sha1-rgSacUOGu4PjQmV6gpJLcDZKkNY=", + "requires": { + "level-codec": "^6.2.0" + } + }, + "level-codec": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-6.2.0.tgz", + "integrity": "sha1-pLUkS7akwvcj1oodZOmAxTYn2dQ=" + } + } + }, "ssb-ooo-about": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/ssb-ooo-about/-/ssb-ooo-about-1.0.0.tgz", @@ -9295,6 +9278,124 @@ "ssb-msgs": "^5.2.0" } }, + "ssb-server": { + "version": "13.5.2", + "resolved": "https://registry.npmjs.org/ssb-server/-/ssb-server-13.5.2.tgz", + "integrity": "sha512-zECkaD3BQ2argeRuYqLhqfYRC888aTJbGqWf34A0fE0pJU5iM0T5WySejaawyaALHchFILFsbhjGmgltte4fmA==", + "requires": { + "atomic-file": "^1.1.5", + "bash-color": "~0.0.3", + "broadcast-stream": "^0.2.1", + "cont": "~1.0.3", + "cross-spawn": "^6.0.5", + "deep-equal": "^1.0.1", + "explain-error": "^1.0.3", + "has-network": "0.0.1", + "ip": "^1.1.5", + "mdmanifest": "^1.0.4", + "minimist": "^1.1.3", + "mkdirp": "~0.5.0", + "multiblob": "^1.13.0", + "multiserver": "^3.0.2", + "multiserver-address": "^1.0.1", + "muxrpc-validation": "^2.0.0", + "muxrpcli": "^1.0.0", + "mv": "^2.1.1", + "observ-debounce": "^1.1.1", + "obv": "0.0.1", + "on-change-network": "0.0.2", + "on-wakeup": "^1.0.0", + "osenv": "^0.1.5", + "pull-cat": "~1.1.5", + "pull-file": "^1.0.0", + "pull-many": "~1.0.6", + "pull-next": "^1.0.0", + "pull-notify": "0.1.1", + "pull-paramap": "~1.2.1", + "pull-ping": "^2.0.2", + "pull-pushable": "^2.2.0", + "pull-stream": "^3.6.2", + "pull-stringify": "^2.0.0", + "rimraf": "^2.4.2", + "secret-stack": "^5.0.0", + "ssb-blobs": "^1.1.4", + "ssb-client": "^4.5.7", + "ssb-config": "^2.3.7", + "ssb-db": "^18.6.2", + "ssb-ebt": "^5.1.4", + "ssb-friends": "^3.1.3", + "ssb-keys": "^7.1.1", + "ssb-links": "^3.0.2", + "ssb-ooo": "^1.1.0", + "ssb-query": "^2.1.0", + "ssb-ref": "^2.13.9", + "ssb-ws": "^5.1.1", + "statistics": "^3.0.0", + "stream-to-pull-stream": "^1.6.10", + "zerr": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "multiserver": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/multiserver/-/multiserver-3.0.2.tgz", + "integrity": "sha512-YCVA+zCtc4xR55CrKIK6pAYPKTDswrlF+bkO9Nyb1osn93AhFGjKnelA38G9mNHeUd/v9/Un3gxpisorouRQfw==", + "requires": { + "multicb": "^1.2.2", + "multiserver-scopes": "^1.0.0", + "pull-cat": "~1.1.5", + "pull-stream": "^3.6.1", + "pull-ws": "^3.3.0", + "secret-handshake": "^1.1.12", + "separator-escape": "0.0.0", + "socks": "2.2.1", + "stream-to-pull-stream": "^1.7.2" + } + }, + "ssb-ref": { + "version": "2.13.9", + "resolved": "https://registry.npmjs.org/ssb-ref/-/ssb-ref-2.13.9.tgz", + "integrity": "sha512-TfatNqLvoP+eW/pMIbCmNcaoDq4R2k8jCtWkwDKx4AtluN/LwtyP931d5Mh+2gmzA04W7kxkr6f5ENGgdadMYg==", + "requires": { + "ip": "^1.1.3", + "is-canonical-base64": "^1.1.1", + "is-valid-domain": "~0.0.1", + "multiserver-address": "^1.0.1" + } + }, + "ssb-ws": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/ssb-ws/-/ssb-ws-5.1.1.tgz", + "integrity": "sha512-Wbttwlr+wVqcoxGsn+WoiBbSI9UMqgL/DZU6Pjm/KQ61LO7jaxV4hGw3+H4uRBtgtOE4pidvHeCk7jUuoXWZfQ==", + "requires": { + "emoji-server": "^1.0.0", + "multiblob-http": "^0.4.2", + "multiserver": "^3.0.2", + "multiserver-scopes": "^1.0.0", + "muxrpc": "^6.3.3", + "pull-box-stream": "^1.0.13", + "ssb-ref": "^2.3.0", + "stack": "^0.1.0" + } + } + } + }, "ssb-sort": { "version": "1.1.0", "resolved": "http://registry.npmjs.org/ssb-sort/-/ssb-sort-1.1.0.tgz", @@ -9936,11 +10037,24 @@ "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==" }, + "to-camel-case": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-camel-case/-/to-camel-case-1.0.0.tgz", + "integrity": "sha1-GlYFSy+daWKYzmamCJcyK29CPkY=", + "requires": { + "to-space-case": "^1.0.0" + } + }, "to-fast-properties": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" }, + "to-no-case": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/to-no-case/-/to-no-case-1.0.2.tgz", + "integrity": "sha1-xyKQcWTvaxeBMsjmmTAhLRtKoWo=" + }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", @@ -9979,9 +10093,17 @@ } } }, + "to-space-case": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz", + "integrity": "sha1-sFLar7Gysp3HcM6gFj5ewOvJ/Bc=", + "requires": { + "to-no-case": "^1.0.0" + } + }, "to-vfile": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/to-vfile/-/to-vfile-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/to-vfile/-/to-vfile-1.0.0.tgz", "integrity": "sha1-iN7+zUOtsu9ZhiXw49WffzQpQbo=", "requires": { "vfile": "^1.0.0" @@ -10324,12 +10446,12 @@ }, "vfile": { "version": "1.4.0", - "resolved": "http://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-1.4.0.tgz", "integrity": "sha1-wP1vpIT43r23cfaMMe112I2pf+c=" }, "vfile-find-down": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/vfile-find-down/-/vfile-find-down-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/vfile-find-down/-/vfile-find-down-1.0.0.tgz", "integrity": "sha1-hKTWbQNRP2FAqE4Hdu8ISNTwrZU=", "requires": { "to-vfile": "^1.0.0" @@ -10337,7 +10459,7 @@ }, "vfile-find-up": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/vfile-find-up/-/vfile-find-up-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-1.0.0.tgz", "integrity": "sha1-VgTab+RTs0NQY3mE61/kkJ4oA5A=", "requires": { "to-vfile": "^1.0.0" @@ -10345,7 +10467,7 @@ }, "vfile-reporter": { "version": "1.5.0", - "resolved": "http://registry.npmjs.org/vfile-reporter/-/vfile-reporter-1.5.0.tgz", + "resolved": "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-1.5.0.tgz", "integrity": "sha1-IacAm/5V4k34/0Mqpb9vbvp05Bg=", "requires": { "chalk": "^1.1.0", @@ -10359,7 +10481,7 @@ }, "vfile-sort": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/vfile-sort/-/vfile-sort-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/vfile-sort/-/vfile-sort-1.0.0.tgz", "integrity": "sha1-F+5JG6Q+iVG7IpE/z/MqfcTSNNQ=" }, "vlq": { diff --git a/package.json b/package.json index b8897300..20e92c2e 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,6 @@ "require-style": "^1.0.1", "scuttle-blog": "^1.0.1", "scuttle-thread": "^1.0.1", - "scuttlebot": "~13.0.2", "setimmediate": "^1.0.5", "ssb-about": "^2.0.0", "ssb-backlinks": "^0.7.3", @@ -105,6 +104,7 @@ "ssb-query": "^2.1.0", "ssb-ref": "^2.13.6", "ssb-search": "^1.1.2", + "ssb-server": "^13.5.2", "ssb-sort": "^1.1.0", "ssb-unread": "^1.0.2", "ssb-ws": "^4.0.1", diff --git a/server.js b/server.js index b712ae47..5caed021 100644 --- a/server.js +++ b/server.js @@ -5,15 +5,15 @@ var electron = require('electron') console.log('STARTING SBOT') -var createSbot = require('scuttlebot') - .use(require('scuttlebot/plugins/master')) - .use(require('scuttlebot/plugins/gossip')) - .use(require('scuttlebot/plugins/replicate')) - .use(require('scuttlebot/plugins/invite')) - .use(require('scuttlebot/plugins/local')) - .use(require('scuttlebot/plugins/logging')) - .use(require('scuttlebot/plugins/unix-socket')) - .use(require('scuttlebot/plugins/no-auth')) +var createSbot = require('ssb-server') + .use(require('ssb-server/plugins/master')) + .use(require('ssb-server/plugins/gossip')) + .use(require('ssb-server/plugins/replicate')) + .use(require('ssb-server/plugins/invite')) + .use(require('ssb-server/plugins/local')) + .use(require('ssb-server/plugins/logging')) + .use(require('ssb-server/plugins/unix-socket')) + .use(require('ssb-server/plugins/no-auth')) .use(require('ssb-about')) .use(require('ssb-backlinks')) .use(require('ssb-blobs'))