Adjust code to multiple addresses

TryQuiet · Aug 10, 2023 · 7510cab · 7510cab
1 parent 2e69186
commit 7510cab
Show file tree

Hide file tree

Showing 13 changed files with 429 additions and 81 deletions.
diff --git a/packages/common/package-lock.json b/packages/common/package-lock.json
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -26,6 +26,7 @@
   },
   "dependencies": {
     "@quiet/types": "^1.6.0",
+    "multiaddr": "^10.0.1",
     "cross-env": "^5.2.0",
     "debug": "^4.3.1"
   },

diff --git a/packages/common/src/invitationCode.test.ts b/packages/common/src/invitationCode.test.ts
@@ -3,22 +3,42 @@ import { Site } from './static'
 
 describe('Invitation code helper', () => {
   it('retrieves invitation code from argv', () => {
+    const expectedCodes = [
+      { peerId: 'peerID1', address: 'address1' },
+      { peerId: 'peerID2', address: 'address2' },
+    ]
     const result = argvInvitationCode([
       'something',
       'quiet:/invalid',
       'zbay://invalid',
       'quiet://invalid',
       'quiet://?param=invalid',
-      invitationDeepUrl('validCode'),
+      invitationDeepUrl(expectedCodes),
     ])
-    expect(result).toBe('validCode')
+    expect(result).toBe(expectedCodes)
   })
 
   it('builds proper invitation deep url', () => {
-    expect(invitationDeepUrl('validCode')).toEqual('quiet://?code=validCode')
+    expect(
+      invitationDeepUrl([
+        { peerId: 'peerID1', address: 'address1' },
+        { peerId: 'peerID2', address: 'address2' },
+      ])
+    ).toEqual('quiet://?peerID1=address1&peerID2=address2')
   })
 
+  // it('builds proper invitation share url', () => {
+  //   expect(invitationShareUrl('validCode')).toEqual(`https://${Site.DOMAIN}/${Site.JOIN_PAGE}#validCode`)
+  // })
+
   it('builds proper invitation share url', () => {
-    expect(invitationShareUrl('validCode')).toEqual(`https://${Site.DOMAIN}/${Site.JOIN_PAGE}#validCode`)
+    const peerList = [
+      '/dns4/gloao6h5plwjy4tdlze24zzgcxll6upq2ex2fmu2ohhyu4gtys4nrjad.onion/tcp/443/wss/p2p/QmZoiJNAvCffeEHBjk766nLuKVdkxkAT7wfFJDPPLsbKSE',
+      'invalidAddress',
+      '/dns4/somethingElse.onion/tcp/443/wss/p2p/QmZoiJNAvCffeEHBjk766nLuKVdkxkAT7wfFJDPPLsbKSA',
+    ]
+    expect(invitationShareUrl(peerList)).toEqual(
+      `https://${Site.DOMAIN}/${Site.JOIN_PAGE}#QmZoiJNAvCffeEHBjk766nLuKVdkxkAT7wfFJDPPLsbKSE=gloao6h5plwjy4tdlze24zzgcxll6upq2ex2fmu2ohhyu4gtys4nrjad&QmZoiJNAvCffeEHBjk766nLuKVdkxkAT7wfFJDPPLsbKSA=somethingElse`
+    )
   })
 })