Refactor code to be more consistent
This commit is contained in:
@ -1,32 +1,64 @@
|
||||
'use strict'
|
||||
|
||||
const ssbClient = require('ssb-client')
|
||||
const secretStack = require('secret-stack')
|
||||
const ssbConfig = require('ssb-config')
|
||||
const debug = require('debug')('oasis')
|
||||
|
||||
const server = secretStack()
|
||||
|
||||
server
|
||||
.use(require('ssb-db'))
|
||||
.use(require('ssb-replicate'))
|
||||
|
||||
.use(require('ssb-about'))
|
||||
.use(require('ssb-backlinks'))
|
||||
.use(require('ssb-blobs'))
|
||||
.use(require('ssb-ebt'))
|
||||
.use(require('ssb-friends'))
|
||||
.use(require('ssb-gossip'))
|
||||
.use(require('ssb-invite'))
|
||||
.use(require('ssb-links'))
|
||||
.use(require('ssb-local'))
|
||||
.use(require('ssb-logging'))
|
||||
.use(require('ssb-master'))
|
||||
.use(require('ssb-no-auth'))
|
||||
.use(require('ssb-onion'))
|
||||
.use(require('ssb-ooo'))
|
||||
.use(require('ssb-plugins'))
|
||||
.use(require('ssb-query'))
|
||||
.use(require('ssb-unix-socket'))
|
||||
.use(require('ssb-ws'))
|
||||
|
||||
const rawConnect = () => new Promise((resolve, reject) => {
|
||||
ssbClient((err, api) => {
|
||||
if (err) return reject(err)
|
||||
resolve(api)
|
||||
if (err) {
|
||||
reject(err)
|
||||
} else {
|
||||
resolve(api)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
const db = {
|
||||
connect: function () {
|
||||
connect () {
|
||||
return handle
|
||||
},
|
||||
/**
|
||||
* @param {function} method
|
||||
*/
|
||||
get: function (method, ...opts) {
|
||||
get (method, ...opts) {
|
||||
return new Promise((resolve, reject) => {
|
||||
method(...opts, (err, val) => {
|
||||
if (err) return reject(err)
|
||||
resolve(val)
|
||||
if (err) {
|
||||
reject(err)
|
||||
} else {
|
||||
resolve(val)
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
read: function (method, ...args) {
|
||||
read (method, ...args) {
|
||||
return new Promise((resolve, reject) => {
|
||||
resolve(method(...args))
|
||||
})
|
||||
@ -43,31 +75,6 @@ const handle = new Promise((resolve, reject) => {
|
||||
debug('Initial connection attempt failed')
|
||||
debug('Starting Scuttlebutt server')
|
||||
|
||||
const server = secretStack()
|
||||
|
||||
server
|
||||
.use(require('ssb-db'))
|
||||
.use(require('ssb-replicate'))
|
||||
|
||||
.use(require('ssb-about'))
|
||||
.use(require('ssb-backlinks'))
|
||||
.use(require('ssb-blobs'))
|
||||
.use(require('ssb-ebt'))
|
||||
.use(require('ssb-friends'))
|
||||
.use(require('ssb-gossip'))
|
||||
.use(require('ssb-invite'))
|
||||
.use(require('ssb-links'))
|
||||
.use(require('ssb-local'))
|
||||
.use(require('ssb-logging'))
|
||||
.use(require('ssb-master'))
|
||||
.use(require('ssb-no-auth'))
|
||||
.use(require('ssb-onion'))
|
||||
.use(require('ssb-ooo'))
|
||||
.use(require('ssb-plugins'))
|
||||
.use(require('ssb-query'))
|
||||
.use(require('ssb-unix-socket'))
|
||||
.use(require('ssb-ws'))
|
||||
|
||||
server(ssbConfig)
|
||||
|
||||
const connectOrRetry = () => {
|
||||
|
Reference in New Issue
Block a user