From 96ffc426b3c9ed84a310a777ce5443e7b80aee9e Mon Sep 17 00:00:00 2001 From: Andre Staltz Date: Fri, 12 Jan 2024 16:47:07 +0200 Subject: [PATCH] update to ppppp-net --- lib/index.js | 10 +++++----- test/createForFriend.test.js | 6 +++--- test/createForMyself.test.js | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/index.js b/lib/index.js index e898efa..b01cb5e 100644 --- a/lib/index.js +++ b/lib/index.js @@ -7,7 +7,7 @@ const p = require('promisify-tuple') /** * @typedef {{ pubkey: string }} SHSE * @typedef {ReturnType} PPPPPPromise - * @typedef {{connect: (addr: string, cb: CB) => void}} ConnPlugin + * @typedef {{connect: (addr: string, cb: CB) => void}} PPPPPNet * @typedef {{ * type: 'join', * address: string, @@ -243,7 +243,7 @@ function parse(uri) { * @param {{ * shse: SHSE; * promise: PPPPPPromise; - * conn: ConnPlugin; + * net: PPPPPNet; * }} peer * @param {unknown} config */ @@ -277,7 +277,7 @@ function initInvite(peer, config) { } // 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) const [err2, hubToken] = await p(rpc.hub.createToken)() if (err2) return cb(err2) @@ -346,7 +346,7 @@ function initInvite(peer, config) { } // 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) const [err2, hubToken] = await p(rpc.hub.createToken)() if (err2) return cb(err2) @@ -390,7 +390,7 @@ function initInvite(peer, config) { } exports.name = 'invite' -exports.needs = ['shse', 'promise', 'conn'] +exports.needs = ['shse', 'promise', 'net'] exports.manifest = { createForFriend: 'async', createForMyself: 'async', diff --git a/test/createForFriend.test.js b/test/createForFriend.test.js index bdde02f..32a2e2e 100644 --- a/test/createForFriend.test.js +++ b/test/createForFriend.test.js @@ -16,8 +16,8 @@ test('createForFriend()', async (t) => { let createTokenCalled = false let createPromiseCalled = false - const mockConn = { - name: 'conn', + const mockNet = { + name: 'net', manifest: { connect: 'async', }, @@ -59,7 +59,7 @@ test('createForFriend()', async (t) => { const local = require('secret-stack/bare')() .use(require('secret-stack/plugins/net')) .use(require('secret-handshake-ext/secret-stack')) - .use(mockConn) + .use(mockNet) .use(mockPromise) .use(require('../lib')) .call(null, { diff --git a/test/createForMyself.test.js b/test/createForMyself.test.js index 091253e..efabe00 100644 --- a/test/createForMyself.test.js +++ b/test/createForMyself.test.js @@ -16,8 +16,8 @@ test('createForMyself()', async (t) => { let createTokenCalled = false let createPromiseCalled = false - const mockConn = { - name: 'conn', + const mockNet = { + name: 'net', manifest: { connect: 'async', }, @@ -59,7 +59,7 @@ test('createForMyself()', async (t) => { const local = require('secret-stack/bare')() .use(require('secret-stack/plugins/net')) .use(require('secret-handshake-ext/secret-stack')) - .use(mockConn) + .use(mockNet) .use(mockPromise) .use(require('../lib')) .call(null, {