Commit 9760f8a6b7e9529e590e975950c9a305d896419f
use latest decent-ws and detect hostname
Ev Bogue committed on 1/3/2019, 5:32:20 PMParent: a69c974e03a0cd614f905b2f0238365ef5694577
Files changed
| bin.js | changed |
| config.js | changed |
| package-lock.json | changed |
| package.json | changed |
| bin.js | ||
|---|---|---|
| @@ -57,9 +57,9 @@ | ||
| 57 | 57 … | .use(require('ssb-backlinks')) |
| 58 | 58 … | .use(require('ssb-search')) |
| 59 | 59 … | .use(require('./mvd-indexes')) |
| 60 | 60 … | .use(require('ssb-links')) |
| 61 | - .use(require('./ssb-ws')) | |
| 61 … | + .use(require('decent-ws')) | |
| 62 | 62 … | //.use(require('ssb-ebt')) |
| 63 | 63 … | .use({ |
| 64 | 64 … | name: 'serve', |
| 65 | 65 … | version: '1.0.0', |
| config.js | |||
|---|---|---|---|
| @@ -2,9 +2,8 @@ | |||
| 2 | 2 … | ||
| 3 | 3 … | module.exports = function () { | |
| 4 | 4 … | var host = window.location.origin | |
| 5 | 5 … | ||
| 6 | - //var config = require('./config/inject')() | ||
| 7 | 6 … | function getConfig () { | |
| 8 | 7 … | http.get(host + '/get-config', function (res) { | |
| 9 | 8 … | res.on('data', function (data, remote) { | |
| 10 | 9 … | var config = data | |
| @@ -22,14 +21,13 @@ | |||
| 22 | 21 … | location.reload() | |
| 23 | 22 … | }, 1000) | |
| 24 | 23 … | } | |
| 25 | 24 … | ||
| 26 | - config.blobsUrl = 'http://localhost:8989/blobs/get/' | ||
| 27 | - config.emojiUrl = 'http://localhost:8989/img/emoji/' | ||
| 25 … | + config.blobsUrl = host + '/blobs/get/' | ||
| 26 … | + config.emojiUrl = host + '/img/emoji/' | ||
| 28 | 27 … | if (config.address) { | |
| 29 | 28 … | addies = config.address.split(';') | |
| 30 | 29 … | config.remote = addies[1] | |
| 31 | - console.log(addies[1]) | ||
| 32 | 30 … | } | |
| 33 | 31 … | ||
| 34 | 32 … | return config | |
| 35 | 33 … | } | |
| package-lock.json | ||
|---|---|---|
| The diff is too large to show. Use a local git client to view these changes. Old file size: 236923 bytes New file size: 236923 bytes |
| package.json | ||
|---|---|---|
| @@ -17,9 +17,9 @@ | ||
| 17 | 17 … | "author": "Ev Bogue <ev@evbogue.com>", |
| 18 | 18 … | "license": "MIT", |
| 19 | 19 … | "dependencies": { |
| 20 | 20 … | "dataurl-": "^0.1.0", |
| 21 | - "decent-ws": "1.0.4", | |
| 21 … | + "decent-ws": "1.1.0", | |
| 22 | 22 … | "deep-extend": "^0.6.0", |
| 23 | 23 … | "diff": "^3.5.0", |
| 24 | 24 … | "ecstatic": "^3.3.0", |
| 25 | 25 … | "flumeview-query": "^7.1.0", |
Built with git-ssb-web