update to ppppp-net

This commit is contained in:
Andre Staltz 2024-01-12 16:47:07 +02:00
parent cbafdaa2fc
commit 96ffc426b3
No known key found for this signature in database
GPG Key ID: 9EDE23EA7E8A4890
3 changed files with 11 additions and 11 deletions

View File

@ -7,7 +7,7 @@ const p = require('promisify-tuple')
/** /**
* @typedef {{ pubkey: string }} SHSE * @typedef {{ pubkey: string }} SHSE
* @typedef {ReturnType<import('ppppp-promise').init>} PPPPPPromise * @typedef {ReturnType<import('ppppp-promise').init>} PPPPPPromise
* @typedef {{connect: (addr: string, cb: CB<any>) => void}} ConnPlugin * @typedef {{connect: (addr: string, cb: CB<any>) => void}} PPPPPNet
* @typedef {{ * @typedef {{
* type: 'join', * type: 'join',
* address: string, * address: string,
@ -243,7 +243,7 @@ function parse(uri) {
* @param {{ * @param {{
* shse: SHSE; * shse: SHSE;
* promise: PPPPPPromise; * promise: PPPPPPromise;
* conn: ConnPlugin; * net: PPPPPNet;
* }} peer * }} peer
* @param {unknown} config * @param {unknown} config
*/ */
@ -277,7 +277,7 @@ function initInvite(peer, config) {
} }
// Connect to hub and create token // Connect to hub and create token
const [err, rpc] = await p(peer.conn.connect)(opts._hubMsAddr) const [err, rpc] = await p(peer.net.connect)(opts._hubMsAddr)
if (err) return cb(err) if (err) return cb(err)
const [err2, hubToken] = await p(rpc.hub.createToken)() const [err2, hubToken] = await p(rpc.hub.createToken)()
if (err2) return cb(err2) if (err2) return cb(err2)
@ -346,7 +346,7 @@ function initInvite(peer, config) {
} }
// Connect to hub and create token // Connect to hub and create token
const [err, rpc] = await p(peer.conn.connect)(opts._hubMsAddr) const [err, rpc] = await p(peer.net.connect)(opts._hubMsAddr)
if (err) return cb(err) if (err) return cb(err)
const [err2, hubToken] = await p(rpc.hub.createToken)() const [err2, hubToken] = await p(rpc.hub.createToken)()
if (err2) return cb(err2) if (err2) return cb(err2)
@ -390,7 +390,7 @@ function initInvite(peer, config) {
} }
exports.name = 'invite' exports.name = 'invite'
exports.needs = ['shse', 'promise', 'conn'] exports.needs = ['shse', 'promise', 'net']
exports.manifest = { exports.manifest = {
createForFriend: 'async', createForFriend: 'async',
createForMyself: 'async', createForMyself: 'async',

View File

@ -16,8 +16,8 @@ test('createForFriend()', async (t) => {
let createTokenCalled = false let createTokenCalled = false
let createPromiseCalled = false let createPromiseCalled = false
const mockConn = { const mockNet = {
name: 'conn', name: 'net',
manifest: { manifest: {
connect: 'async', connect: 'async',
}, },
@ -59,7 +59,7 @@ test('createForFriend()', async (t) => {
const local = require('secret-stack/bare')() const local = 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'))
.use(mockConn) .use(mockNet)
.use(mockPromise) .use(mockPromise)
.use(require('../lib')) .use(require('../lib'))
.call(null, { .call(null, {

View File

@ -16,8 +16,8 @@ test('createForMyself()', async (t) => {
let createTokenCalled = false let createTokenCalled = false
let createPromiseCalled = false let createPromiseCalled = false
const mockConn = { const mockNet = {
name: 'conn', name: 'net',
manifest: { manifest: {
connect: 'async', connect: 'async',
}, },
@ -59,7 +59,7 @@ test('createForMyself()', async (t) => {
const local = require('secret-stack/bare')() const local = 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'))
.use(mockConn) .use(mockNet)
.use(mockPromise) .use(mockPromise)
.use(require('../lib')) .use(require('../lib'))
.call(null, { .call(null, {