update secret-stack to 8.0

This commit is contained in:
Andre Staltz 2023-12-29 12:42:48 +02:00
parent b481fa0655
commit cb1027b8b2
No known key found for this signature in database
GPG Key ID: 9EDE23EA7E8A4890
3 changed files with 37 additions and 23 deletions

View File

@ -34,8 +34,8 @@
"ppppp-caps": "github:staltz/ppppp-caps", "ppppp-caps": "github:staltz/ppppp-caps",
"ppppp-keypair": "github:staltz/ppppp-keypair", "ppppp-keypair": "github:staltz/ppppp-keypair",
"rimraf": "^4.4.0", "rimraf": "^4.4.0",
"secret-stack": "~7.1.1", "secret-stack": "~8.0.0",
"secret-handshake-ext": "0.0.8", "secret-handshake-ext": "0.0.10",
"ssb-box": "^1.0.1", "ssb-box": "^1.0.1",
"typescript": "^5.1.3" "typescript": "^5.1.3"
}, },

View File

@ -17,8 +17,10 @@ let peer
let aliceID let aliceID
test('setup', async (t) => { test('setup', async (t) => {
peer = createPeer({ peer = createPeer({
keypair: aliceKeypair, global: {
db: { path: DIR }, keypair: aliceKeypair,
path: DIR,
},
set: { ghostSpan: 40 }, set: { ghostSpan: 40 },
}) })

View File

@ -1,20 +1,29 @@
const os = require('node:os') const OS = require('node:os')
const path = require('node:path') const Path = require('node:path')
const rimraf = require('rimraf') const rimraf = require('rimraf')
const caps = require('ppppp-caps') const caps = require('ppppp-caps')
const Keypair = require('ppppp-keypair') const Keypair = require('ppppp-keypair')
function createPeer(opts) { function createPeer(config) {
if (opts.name) { if (config.name) {
const tmp = os.tmpdir() const name = config.name
opts.db ??= {path: path.join(tmp, `ppppp-set-${opts.name}-${Date.now()}`)} const tmp = OS.tmpdir()
opts.keypair ??= Keypair.generate('ed25519', opts.name) config.global ??= {}
opts.name = undefined config.global.path ??= Path.join(tmp, `ppppp-set-${name}-${Date.now()}`)
config.global.keypair ??= Keypair.generate('ed25519', name)
delete config.name
}
if (!config.global) {
throw new Error('need config.global in createPeer()')
}
if (!config.global.path) {
throw new Error('need config.global.path in createPeer()')
}
if (!config.global.keypair) {
throw new Error('need config.global.keypair in createPeer()')
} }
if (!opts.db.path) throw new Error('need opts.db.path in createPeer()')
if (!opts.keypair) throw new Error('need opts.keypair in createPeer()')
rimraf.sync(opts.db.path) rimraf.sync(config.global.path)
return require('secret-stack/bare')() return require('secret-stack/bare')()
.use(require('secret-stack/plugins/net')) .use(require('secret-stack/plugins/net'))
.use(require('secret-handshake-ext/secret-stack')) .use(require('secret-handshake-ext/secret-stack'))
@ -22,16 +31,19 @@ function createPeer(opts) {
.use(require('ssb-box')) .use(require('ssb-box'))
.use(require('../lib')) .use(require('../lib'))
.call(null, { .call(null, {
caps, shse: { caps },
connections: { ...config,
incoming: { global: {
net: [{ scope: 'device', transform: 'shse', port: null }], connections: {
}, incoming: {
outgoing: { net: [{ scope: 'device', transform: 'shse', port: null }],
net: [{ transform: 'shse' }], },
outgoing: {
net: [{ transform: 'shse' }],
},
}, },
...config.global,
}, },
...opts,
}) })
} }