@dxos/credentials 2.33.8-dev.8609bc45 → 2.33.9-dev.6b3d59af
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.rush/temp/package-deps_build.json +62 -0
- package/.rush/temp/package-deps_build_test.json +10 -10
- package/.rush/temp/shrinkwrap-deps.json +2 -4
- package/credentials.build.log +10 -9
- package/dist/src/auth/auth-plugin.test.js +4 -4
- package/dist/src/auth/auth-plugin.test.js.map +1 -1
- package/dist/src/greet/greeter-plugin.test.js +11 -16
- package/dist/src/greet/greeter-plugin.test.js.map +1 -1
- package/dist/src/greet/greeter.d.ts +3 -5
- package/dist/src/greet/greeter.d.ts.map +1 -1
- package/dist/src/greet/greeter.js +5 -9
- package/dist/src/greet/greeter.js.map +1 -1
- package/dist/src/greet/greeter.test.js +4 -10
- package/dist/src/greet/greeter.test.js.map +1 -1
- package/dist/src/greet/greeting-command-plugin.d.ts.map +1 -1
- package/dist/src/greet/greeting-command-plugin.js +3 -3
- package/dist/src/greet/greeting-command-plugin.js.map +1 -1
- package/dist/src/keys/keyring-helpers.d.ts.map +1 -1
- package/dist/src/keys/keyring-helpers.js +2 -2
- package/dist/src/keys/keyring-helpers.js.map +1 -1
- package/dist/src/keys/keyring.js +1 -1
- package/dist/src/keys/keyring.js.map +1 -1
- package/dist/src/keys/keyring.test.js +3 -3
- package/dist/src/keys/keyring.test.js.map +1 -1
- package/dist/src/proto/gen/dxos/credentials/greet.d.ts +1 -1
- package/dist/src/proto/gen/dxos/credentials/greet.d.ts.map +1 -1
- package/dist/src/proto/gen/index.d.ts.map +1 -1
- package/dist/src/proto/gen/index.js +1 -1
- package/dist/src/proto/gen/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +12 -12
- package/src/auth/auth-plugin.test.ts +5 -5
- package/src/greet/greeter-plugin.test.ts +13 -19
- package/src/greet/greeter.test.js +6 -15
- package/src/greet/greeter.ts +9 -13
- package/src/greet/greeting-command-plugin.ts +3 -3
- package/src/keys/keyring-helpers.ts +2 -2
- package/src/keys/keyring.test.ts +4 -4
- package/src/keys/keyring.ts +2 -2
- package/src/proto/gen/dxos/credentials/greet.ts +1 -1
- package/src/proto/gen/index.ts +1 -1
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
{
|
|
2
|
+
"files": {
|
|
3
|
+
"packages/halo/credentials/.rush/temp/shrinkwrap-deps.json": "7e8745febba64b1eb464524e013d8443a82e697a",
|
|
4
|
+
"packages/halo/credentials/.eslintrc.js": "8c186197e908188715a6c9635941ec4b7896c787",
|
|
5
|
+
"packages/halo/credentials/README.md": "b6859b1e271596aa5934d07b6d4320721c43b035",
|
|
6
|
+
"packages/halo/credentials/package.json": "c89fac7a6a58751d0da90fcf8fc1f5e86c7f9bff",
|
|
7
|
+
"packages/halo/credentials/src/auth/auth-message.ts": "0c836d40bf3f011f7ac589bbd7c51a38bbcf8a10",
|
|
8
|
+
"packages/halo/credentials/src/auth/auth-plugin.test.ts": "5e99d59abfad6c8ae0db469a7a84f3f0bdcce1e2",
|
|
9
|
+
"packages/halo/credentials/src/auth/auth-plugin.ts": "068f54e08e213def743485a78b3c43ca2c30014d",
|
|
10
|
+
"packages/halo/credentials/src/auth/auth.test.ts": "c0fdab964c9dc19fe16775b6f1275dc572ec28fc",
|
|
11
|
+
"packages/halo/credentials/src/auth/authenticator.ts": "11605a3921db2b5e0eba380dc06650834a0e0f27",
|
|
12
|
+
"packages/halo/credentials/src/auth/error-codes.ts": "6949e70399430cc44a5cc7d4a24ee7cace599ffe",
|
|
13
|
+
"packages/halo/credentials/src/auth/index.ts": "c4a66cb0a4bb9f8f1e0abf6d429296617b11633b",
|
|
14
|
+
"packages/halo/credentials/src/greet/constants.ts": "195d88c13f436c94d499bd8ee3d62481e35e502f",
|
|
15
|
+
"packages/halo/credentials/src/greet/error-codes.ts": "93f2d4ddbf4f93507855529d7a5091ed4de8c90e",
|
|
16
|
+
"packages/halo/credentials/src/greet/greeter-plugin.test.ts": "749f1abdece0442563c0e9e226f8c8c51d6bbd41",
|
|
17
|
+
"packages/halo/credentials/src/greet/greeter.test.js": "dee7a8155ca2c89d3b6c9cbcb845c17c7eb1dddf",
|
|
18
|
+
"packages/halo/credentials/src/greet/greeter.ts": "6857408f1ae849986e890e771bf629d8650c8fb4",
|
|
19
|
+
"packages/halo/credentials/src/greet/greeting-command-plugin.ts": "b881d972c900a652fa7e3f7fbb0889aa61338689",
|
|
20
|
+
"packages/halo/credentials/src/greet/greeting-message.ts": "52171e11b3237dd69b46daf260672c758240cf73",
|
|
21
|
+
"packages/halo/credentials/src/greet/index.ts": "27c8d16082512564760dd56a7e0a33bbb47143e7",
|
|
22
|
+
"packages/halo/credentials/src/greet/invitation.ts": "8f5a178165da28b953881c7891cbb35a3dc6a8da",
|
|
23
|
+
"packages/halo/credentials/src/greet/party-invitation-claim-handler.ts": "769e163563f984540d66a122507db70b2623775f",
|
|
24
|
+
"packages/halo/credentials/src/greet/passcode.ts": "8e1dbcc8bf471b9e71a4928b32cd8f78262d748a",
|
|
25
|
+
"packages/halo/credentials/src/identity/events.ts": "e246b3c0d36466d5bcd376f715debdcd625546c5",
|
|
26
|
+
"packages/halo/credentials/src/identity/identity-message-processor.ts": "b5a0369faf1ada833dab5c145d6d36d9aa5b3ca1",
|
|
27
|
+
"packages/halo/credentials/src/identity/identity-message.ts": "6032c53a4e2386bd3b630cf72821e782d18e5bb4",
|
|
28
|
+
"packages/halo/credentials/src/identity/index.ts": "9a8a89b670b19503d0bd84d07cc3caa0eec42491",
|
|
29
|
+
"packages/halo/credentials/src/identity/seedphrase.test.ts": "9275e40662c2e8f71de03199146329ec15c81e6f",
|
|
30
|
+
"packages/halo/credentials/src/identity/seedphrase.ts": "de9f82c64eae42eb09637aa5a1aae507e44785e9",
|
|
31
|
+
"packages/halo/credentials/src/index.ts": "86006625e8875fb5ae7fcc2e77954bc9c6b07d73",
|
|
32
|
+
"packages/halo/credentials/src/keys/README.md": "593ff3672447c5561d891f9e5cd6f8b1218d9cdd",
|
|
33
|
+
"packages/halo/credentials/src/keys/filter.test.js": "882ae21a88b4065471616ac08cb10ec537a38bde",
|
|
34
|
+
"packages/halo/credentials/src/keys/filter.ts": "d16e150ccbc69b40b3a0d8afac05f763e37e2a3d",
|
|
35
|
+
"packages/halo/credentials/src/keys/index.ts": "0319187cd75685b856deb44d887e9af389e91fa9",
|
|
36
|
+
"packages/halo/credentials/src/keys/keyring-helpers.ts": "045fc8f8b9c610674333fd6d0d73ff30a9d659ed",
|
|
37
|
+
"packages/halo/credentials/src/keys/keyring.test.ts": "5f42f8163226a6147faee307901c7a23d73390e5",
|
|
38
|
+
"packages/halo/credentials/src/keys/keyring.ts": "35ca49ce479b8a05af819347200b73286869911d",
|
|
39
|
+
"packages/halo/credentials/src/keys/keystore.test.js": "c810fd1c1db191122dafbbf4f7d0acce12cb8065",
|
|
40
|
+
"packages/halo/credentials/src/keys/keystore.ts": "4dde73ccd861f1e21d6657afad6000e6c86af1c6",
|
|
41
|
+
"packages/halo/credentials/src/keys/keytype.ts": "499be4ecd6b66fac896d0b3e615af027cad19f65",
|
|
42
|
+
"packages/halo/credentials/src/keys/signer.ts": "9a774bd508d88c6fb0c8edbae670c3134848dfdc",
|
|
43
|
+
"packages/halo/credentials/src/keys/simple-metrics.ts": "819fe8021c5797a05140bcb2733cc7028d1363fd",
|
|
44
|
+
"packages/halo/credentials/src/party/events.ts": "a99049a589ec5fd5190cd5770d161d21a4bc80d5",
|
|
45
|
+
"packages/halo/credentials/src/party/index.ts": "ccb02b656cf612c45e7dedba4f396fd42e78efa9",
|
|
46
|
+
"packages/halo/credentials/src/party/party-credential.ts": "96427c0c7715b94c6e996cf1d88d453321cee888",
|
|
47
|
+
"packages/halo/credentials/src/party/party-invitation-manager.ts": "6b0eb9b620c02f68e53352f879eb35f17ec7ba56",
|
|
48
|
+
"packages/halo/credentials/src/party/party-invitations.test.js": "c936e97e6798f32fe330241b6c137abe49494f1f",
|
|
49
|
+
"packages/halo/credentials/src/party/party-state.test.js": "66e283e1e3b53585605659f0334cf53001061eda",
|
|
50
|
+
"packages/halo/credentials/src/party/party-state.ts": "5092d0742505387a0098afc75e6669fdc824ab00",
|
|
51
|
+
"packages/halo/credentials/src/proto/any.ts": "105c5acfd71c4295eb43344199897e100e3e94cd",
|
|
52
|
+
"packages/halo/credentials/src/proto/codec.ts": "8abef0896530ddfe71aa382c1906528b3bc00926",
|
|
53
|
+
"packages/halo/credentials/src/proto/datetime.ts": "6b97cac40b80a7a5e54f4f6d6a2a396fa684af9b",
|
|
54
|
+
"packages/halo/credentials/src/proto/defs/import.proto": "ff3982e0053697ef1f2a0edd273b813e25e92a6c",
|
|
55
|
+
"packages/halo/credentials/src/proto/index.ts": "d7b2823fd389cbce0684ad7f964e1db02f4df05d",
|
|
56
|
+
"packages/halo/credentials/src/proto/substitutions.ts": "28517a90c76705ba33a9d244c3b3dab1d64f2409",
|
|
57
|
+
"packages/halo/credentials/src/shims.d.ts": "8c9f4db12f5c348bdb0651be9592edcc488e1cfc",
|
|
58
|
+
"packages/halo/credentials/src/typedefs.ts": "dc2f10117831f97ce8ebd854f246b40bb48d273c",
|
|
59
|
+
"packages/halo/credentials/tsconfig.json": "4864ac82d974c1e527c27b7ba4efb0166af39cc4"
|
|
60
|
+
},
|
|
61
|
+
"arguments": "toolchain build "
|
|
62
|
+
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"files": {
|
|
3
|
-
"packages/halo/credentials/.rush/temp/shrinkwrap-deps.json": "
|
|
3
|
+
"packages/halo/credentials/.rush/temp/shrinkwrap-deps.json": "7e8745febba64b1eb464524e013d8443a82e697a",
|
|
4
4
|
"packages/halo/credentials/.eslintrc.js": "8c186197e908188715a6c9635941ec4b7896c787",
|
|
5
5
|
"packages/halo/credentials/README.md": "b6859b1e271596aa5934d07b6d4320721c43b035",
|
|
6
|
-
"packages/halo/credentials/package.json": "
|
|
6
|
+
"packages/halo/credentials/package.json": "c89fac7a6a58751d0da90fcf8fc1f5e86c7f9bff",
|
|
7
7
|
"packages/halo/credentials/src/auth/auth-message.ts": "0c836d40bf3f011f7ac589bbd7c51a38bbcf8a10",
|
|
8
|
-
"packages/halo/credentials/src/auth/auth-plugin.test.ts": "
|
|
8
|
+
"packages/halo/credentials/src/auth/auth-plugin.test.ts": "5e99d59abfad6c8ae0db469a7a84f3f0bdcce1e2",
|
|
9
9
|
"packages/halo/credentials/src/auth/auth-plugin.ts": "068f54e08e213def743485a78b3c43ca2c30014d",
|
|
10
10
|
"packages/halo/credentials/src/auth/auth.test.ts": "c0fdab964c9dc19fe16775b6f1275dc572ec28fc",
|
|
11
11
|
"packages/halo/credentials/src/auth/authenticator.ts": "11605a3921db2b5e0eba380dc06650834a0e0f27",
|
|
@@ -13,10 +13,10 @@
|
|
|
13
13
|
"packages/halo/credentials/src/auth/index.ts": "c4a66cb0a4bb9f8f1e0abf6d429296617b11633b",
|
|
14
14
|
"packages/halo/credentials/src/greet/constants.ts": "195d88c13f436c94d499bd8ee3d62481e35e502f",
|
|
15
15
|
"packages/halo/credentials/src/greet/error-codes.ts": "93f2d4ddbf4f93507855529d7a5091ed4de8c90e",
|
|
16
|
-
"packages/halo/credentials/src/greet/greeter-plugin.test.ts": "
|
|
17
|
-
"packages/halo/credentials/src/greet/greeter.test.js": "
|
|
18
|
-
"packages/halo/credentials/src/greet/greeter.ts": "
|
|
19
|
-
"packages/halo/credentials/src/greet/greeting-command-plugin.ts": "
|
|
16
|
+
"packages/halo/credentials/src/greet/greeter-plugin.test.ts": "749f1abdece0442563c0e9e226f8c8c51d6bbd41",
|
|
17
|
+
"packages/halo/credentials/src/greet/greeter.test.js": "dee7a8155ca2c89d3b6c9cbcb845c17c7eb1dddf",
|
|
18
|
+
"packages/halo/credentials/src/greet/greeter.ts": "6857408f1ae849986e890e771bf629d8650c8fb4",
|
|
19
|
+
"packages/halo/credentials/src/greet/greeting-command-plugin.ts": "b881d972c900a652fa7e3f7fbb0889aa61338689",
|
|
20
20
|
"packages/halo/credentials/src/greet/greeting-message.ts": "52171e11b3237dd69b46daf260672c758240cf73",
|
|
21
21
|
"packages/halo/credentials/src/greet/index.ts": "27c8d16082512564760dd56a7e0a33bbb47143e7",
|
|
22
22
|
"packages/halo/credentials/src/greet/invitation.ts": "8f5a178165da28b953881c7891cbb35a3dc6a8da",
|
|
@@ -33,9 +33,9 @@
|
|
|
33
33
|
"packages/halo/credentials/src/keys/filter.test.js": "882ae21a88b4065471616ac08cb10ec537a38bde",
|
|
34
34
|
"packages/halo/credentials/src/keys/filter.ts": "d16e150ccbc69b40b3a0d8afac05f763e37e2a3d",
|
|
35
35
|
"packages/halo/credentials/src/keys/index.ts": "0319187cd75685b856deb44d887e9af389e91fa9",
|
|
36
|
-
"packages/halo/credentials/src/keys/keyring-helpers.ts": "
|
|
37
|
-
"packages/halo/credentials/src/keys/keyring.test.ts": "
|
|
38
|
-
"packages/halo/credentials/src/keys/keyring.ts": "
|
|
36
|
+
"packages/halo/credentials/src/keys/keyring-helpers.ts": "045fc8f8b9c610674333fd6d0d73ff30a9d659ed",
|
|
37
|
+
"packages/halo/credentials/src/keys/keyring.test.ts": "5f42f8163226a6147faee307901c7a23d73390e5",
|
|
38
|
+
"packages/halo/credentials/src/keys/keyring.ts": "35ca49ce479b8a05af819347200b73286869911d",
|
|
39
39
|
"packages/halo/credentials/src/keys/keystore.test.js": "c810fd1c1db191122dafbbf4f7d0acce12cb8065",
|
|
40
40
|
"packages/halo/credentials/src/keys/keystore.ts": "4dde73ccd861f1e21d6657afad6000e6c86af1c6",
|
|
41
41
|
"packages/halo/credentials/src/keys/keytype.ts": "499be4ecd6b66fac896d0b3e615af027cad19f65",
|
|
@@ -70,9 +70,8 @@
|
|
|
70
70
|
"/ansi-styles/3.2.1": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
|
|
71
71
|
"/ansi-styles/4.3.0": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
|
|
72
72
|
"/ansi-styles/5.2.0": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
|
|
73
|
-
"/any-promise/1.3.0": "
|
|
73
|
+
"/any-promise/1.3.0": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
|
|
74
74
|
"/argparse/1.0.10": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
|
|
75
|
-
"/array-includes/3.1.4": "sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==",
|
|
76
75
|
"/array-includes/3.1.5": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==",
|
|
77
76
|
"/array-union/2.1.0": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
|
|
78
77
|
"/array.prototype.flat/1.2.5": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==",
|
|
@@ -95,7 +94,7 @@
|
|
|
95
94
|
"/color-convert/2.0.1": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
|
|
96
95
|
"/color-name/1.1.3": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
|
|
97
96
|
"/color-name/1.1.4": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
|
|
98
|
-
"/concat-map/0.0.1": "
|
|
97
|
+
"/concat-map/0.0.1": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
|
|
99
98
|
"/create-hash/1.2.0": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
|
|
100
99
|
"/create-hmac/1.1.7": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
|
|
101
100
|
"/cross-spawn/7.0.3": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
|
|
@@ -296,7 +295,6 @@
|
|
|
296
295
|
"/regexpp/3.2.0": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
|
|
297
296
|
"/require-from-string/2.0.2": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
|
|
298
297
|
"/resolve-from/4.0.0": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
|
|
299
|
-
"/resolve/1.20.0": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
|
|
300
298
|
"/resolve/1.22.1": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
|
|
301
299
|
"/resolve/2.0.0-next.3": "sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q==",
|
|
302
300
|
"/reusify/1.0.4": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
|
package/credentials.build.log
CHANGED
|
@@ -14,21 +14,22 @@ Loaded 3 substitutions:
|
|
|
14
14
|
dxos.halo.keys.PrivKey -> Buffer
|
|
15
15
|
google.protobuf.Any -> any
|
|
16
16
|
|
|
17
|
-
OK in
|
|
17
|
+
OK in 3404 ms
|
|
18
18
|
|
|
19
19
|
Typescript
|
|
20
|
-
OK in
|
|
20
|
+
OK in 4203 ms
|
|
21
21
|
/home/github/_work/protocols/protocols/packages/halo/credentials/src/auth/auth-plugin.test.ts(151,1): warning jest/expect-expect : Test has no assertions
|
|
22
|
+
/home/github/_work/protocols/protocols/packages/halo/credentials/src/greet/greeter.test.js(34,1): warning jest/expect-expect : Test has no assertions
|
|
22
23
|
/home/github/_work/protocols/protocols/packages/halo/credentials/src/keys/keyring.test.ts(378,1): warning jest/expect-expect : Test has no assertions
|
|
23
24
|
|
|
24
|
-
|
|
25
|
-
OK in
|
|
25
|
+
3 problems
|
|
26
|
+
OK in 6694 ms
|
|
26
27
|
|
|
27
28
|
Mocha Tests
|
|
28
29
|
|
|
29
30
|
|
|
30
|
-
✓ Auth Plugin (GOOD) (
|
|
31
|
-
✓ Auth & Repl (GOOD) (
|
|
31
|
+
✓ Auth Plugin (GOOD) (60ms)
|
|
32
|
+
✓ Auth & Repl (GOOD) (91ms)
|
|
32
33
|
✓ Greeting Flow using GreetingCommandPlugin
|
|
33
34
|
✓ Good invitation
|
|
34
35
|
✓ Bad invitation secret
|
|
@@ -94,8 +95,8 @@ Mocha Tests
|
|
|
94
95
|
✓ signature date invalid
|
|
95
96
|
|
|
96
97
|
|
|
97
|
-
64 passing (
|
|
98
|
+
64 passing (619ms)
|
|
98
99
|
|
|
99
|
-
OK in
|
|
100
|
+
OK in 1566 ms
|
|
100
101
|
|
|
101
|
-
Tests complete in
|
|
102
|
+
Tests complete in 15890 ms
|
|
@@ -71,7 +71,7 @@ const createProtocol = async (partyKey, authenticator, keyring, protocolOptions)
|
|
|
71
71
|
const auth = new auth_plugin_1.AuthPlugin(peerId, authenticator, [protocol_plugin_replicator_1.Replicator.extension]);
|
|
72
72
|
const authPromise = new Promise((resolve) => {
|
|
73
73
|
auth.on('authenticated', (incomingPeerId) => {
|
|
74
|
-
log(`Authenticated ${
|
|
74
|
+
log(`Authenticated ${protocols_1.PublicKey.stringify(incomingPeerId)} on ${protocols_1.PublicKey.stringify(peerId)}`);
|
|
75
75
|
resolve(true);
|
|
76
76
|
});
|
|
77
77
|
});
|
|
@@ -94,7 +94,7 @@ const createProtocol = async (partyKey, authenticator, keyring, protocolOptions)
|
|
|
94
94
|
const proto = new mesh_protocol_1.Protocol({
|
|
95
95
|
streamOptions: { live: true },
|
|
96
96
|
discoveryKey: partyKey.asBuffer(),
|
|
97
|
-
userSession: { peerId:
|
|
97
|
+
userSession: { peerId: protocols_1.PublicKey.stringify(peerId), credentials },
|
|
98
98
|
initiator: !!(protocolOptions === null || protocolOptions === void 0 ? void 0 : protocolOptions.initiator)
|
|
99
99
|
})
|
|
100
100
|
.setExtension(auth.createExtension())
|
|
@@ -148,14 +148,14 @@ it('Auth & Repl (GOOD)', async () => {
|
|
|
148
148
|
await (0, wait_for_expect_1.default)(async () => {
|
|
149
149
|
const msgs = await getMessages(node1, node2);
|
|
150
150
|
(0, expect_1.default)(msgs).toContain(message1);
|
|
151
|
-
log(`${message1} on ${
|
|
151
|
+
log(`${message1} on ${protocols_1.PublicKey.stringify(node2.id)}.`);
|
|
152
152
|
});
|
|
153
153
|
const message2 = (0, crypto_1.randomBytes)(32).toString('hex');
|
|
154
154
|
await node2.append(message2);
|
|
155
155
|
await (0, wait_for_expect_1.default)(async () => {
|
|
156
156
|
const msgs = await getMessages(node2, node1);
|
|
157
157
|
(0, expect_1.default)(msgs).toContain(message2);
|
|
158
|
-
log(`${message2} on ${
|
|
158
|
+
log(`${message2} on ${protocols_1.PublicKey.stringify(node1.id)}.`);
|
|
159
159
|
});
|
|
160
160
|
connection.destroy();
|
|
161
161
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-plugin.test.js","sourceRoot":"","sources":["../../../src/auth/auth-plugin.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,wBAAwB;AAExB,oDAA4B;AAC5B,kDAA0B;AAC1B,kEAAgC;AAChC,oDAA4B;AAC5B,gDAAwB;AACxB,gDAAwB;AACxB,sEAA4C;AAE5C,
|
|
1
|
+
{"version":3,"file":"auth-plugin.test.js","sourceRoot":"","sources":["../../../src/auth/auth-plugin.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,18 +23,12 @@ const log = (0, debug_1.default)('dxos:halo:greet');
|
|
|
23
23
|
/**
|
|
24
24
|
* Create the Greeter with Plugin and Protocol.
|
|
25
25
|
*/
|
|
26
|
-
const createGreeter = async (targetPartyKey) => {
|
|
26
|
+
const createGreeter = async (targetPartyKey, genesisFeedKey) => {
|
|
27
27
|
const [writePromise, outerResolve] = (0, async_1.trigger)();
|
|
28
|
-
const
|
|
29
|
-
{ publicKey: protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32)), type: proto_1.KeyType.IDENTITY },
|
|
30
|
-
{ publicKey: protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32)), type: proto_1.KeyType.DEVICE },
|
|
31
|
-
{ publicKey: protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32)), type: proto_1.KeyType.FEED },
|
|
32
|
-
{ publicKey: protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32)), type: proto_1.KeyType.FEED }
|
|
33
|
-
];
|
|
34
|
-
const greeter = new greeter_1.Greeter(targetPartyKey, async (messages) => {
|
|
28
|
+
const greeter = new greeter_1.Greeter(targetPartyKey, genesisFeedKey, async (messages) => {
|
|
35
29
|
outerResolve(messages);
|
|
36
30
|
return messages;
|
|
37
|
-
}
|
|
31
|
+
});
|
|
38
32
|
const peerId = (0, crypto_1.randomBytes)(32);
|
|
39
33
|
const plugin = new greeting_command_plugin_1.GreetingCommandPlugin(peerId, greeter.createMessageHandler());
|
|
40
34
|
const protocol = new mesh_protocol_1.Protocol({
|
|
@@ -42,12 +36,12 @@ const createGreeter = async (targetPartyKey) => {
|
|
|
42
36
|
live: true
|
|
43
37
|
},
|
|
44
38
|
discoveryKey: peerId,
|
|
45
|
-
userSession: { peerId:
|
|
39
|
+
userSession: { peerId: protocols_1.PublicKey.stringify(peerId) },
|
|
46
40
|
initiator: true
|
|
47
41
|
})
|
|
48
42
|
.setExtension(plugin.createExtension())
|
|
49
43
|
.init();
|
|
50
|
-
return { greeter, rendezvousKey: peerId, plugin, protocol, writePromise: writePromise()
|
|
44
|
+
return { greeter, rendezvousKey: peerId, plugin, protocol, writePromise: writePromise() };
|
|
51
45
|
};
|
|
52
46
|
/**
|
|
53
47
|
* Create the Invitee with Plugin and Protocol.
|
|
@@ -58,8 +52,8 @@ const createInvitee = async (rendezvousKey, invitationId) => {
|
|
|
58
52
|
const plugin = new greeting_command_plugin_1.GreetingCommandPlugin(peerId, invitee.createMessageHandler());
|
|
59
53
|
const connectionPromise = new Promise(resolve => {
|
|
60
54
|
plugin.on('peer:joined', (peerId) => {
|
|
61
|
-
if (peerId &&
|
|
62
|
-
log(`${
|
|
55
|
+
if (peerId && protocols_1.PublicKey.stringify(peerId) === protocols_1.PublicKey.stringify(rendezvousKey)) {
|
|
56
|
+
log(`${protocols_1.PublicKey.stringify(peerId)} connected.`);
|
|
63
57
|
resolve();
|
|
64
58
|
}
|
|
65
59
|
});
|
|
@@ -69,7 +63,7 @@ const createInvitee = async (rendezvousKey, invitationId) => {
|
|
|
69
63
|
live: true
|
|
70
64
|
},
|
|
71
65
|
discoveryKey: rendezvousKey,
|
|
72
|
-
userSession: { peerId:
|
|
66
|
+
userSession: { peerId: protocols_1.PublicKey.stringify(peerId) },
|
|
73
67
|
initiator: false
|
|
74
68
|
})
|
|
75
69
|
.setExtension(plugin.createExtension())
|
|
@@ -83,10 +77,11 @@ const createInvitee = async (rendezvousKey, invitationId) => {
|
|
|
83
77
|
const connect = (source, target) => (0, pump_1.default)(source.stream, target.stream, source.stream);
|
|
84
78
|
it('Greeting Flow using GreetingCommandPlugin', async () => {
|
|
85
79
|
const targetPartyKey = protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32));
|
|
80
|
+
const genesisFeedKey = protocols_1.PublicKey.from((0, crypto_1.randomBytes)(32));
|
|
86
81
|
const secret = '0000';
|
|
87
82
|
const secretProvider = async () => Buffer.from(secret);
|
|
88
83
|
const secretValidator = async (invitation, secret) => !!secret && !!invitation.secret && (0, util_1.arraysEqual)(secret, invitation.secret);
|
|
89
|
-
const { protocol: greeterProtocol, greeter, rendezvousKey,
|
|
84
|
+
const { protocol: greeterProtocol, greeter, rendezvousKey, writePromise } = await createGreeter(targetPartyKey, genesisFeedKey);
|
|
90
85
|
const invitation = await greeter.createInvitation(targetPartyKey, secretValidator, secretProvider);
|
|
91
86
|
const { protocol: inviteeProtocol, plugin, connectionPromise } = await createInvitee(rendezvousKey, invitation.id);
|
|
92
87
|
connect(greeterProtocol, inviteeProtocol);
|
|
@@ -124,7 +119,7 @@ it('Greeting Flow using GreetingCommandPlugin', async () => {
|
|
|
124
119
|
};
|
|
125
120
|
// Send them to the greeter.
|
|
126
121
|
const notarizeResponse = await plugin.send(rendezvousKey, command);
|
|
127
|
-
(0, expect_1.default)(notarizeResponse.
|
|
122
|
+
(0, expect_1.default)(notarizeResponse.genesisFeed).toEqual(genesisFeedKey);
|
|
128
123
|
// In the real world, the response would be signed in an envelope by the Greeter, but in this test it is not altered.
|
|
129
124
|
const written = await writePromise;
|
|
130
125
|
(0, expect_1.default)(written.length).toBe(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeter-plugin.test.js","sourceRoot":"","sources":["../../../src/greet/greeter-plugin.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,kDAA0B;AAC1B,oDAA4B;AAC5B,gDAAwB;AAExB,uCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"greeter-plugin.test.js","sourceRoot":"","sources":["../../../src/greet/greeter-plugin.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,24 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { PublicKeyLike, PublicKey } from '@dxos/protocols';
|
|
3
|
-
import { Message,
|
|
3
|
+
import { Message, Command, NotarizeResponse, WithTypeUrl } from '../proto';
|
|
4
4
|
import { PeerId } from '../typedefs';
|
|
5
5
|
import { Invitation, InvitationOnFinish, SecretProvider, SecretValidator } from './invitation';
|
|
6
6
|
export declare type PartyWriter = (params: Message[]) => Promise<Message[]>;
|
|
7
|
-
export declare type HintProvider = (params: Message[]) => Promise<KeyHint[]>;
|
|
8
7
|
/**
|
|
9
8
|
* Reference Greeter that uses useable, single-use "invitations" to authenticate the invitee.
|
|
10
9
|
*/
|
|
11
10
|
export declare class Greeter {
|
|
11
|
+
private readonly _genesisFeedKey?;
|
|
12
12
|
_partyKey?: PublicKey;
|
|
13
13
|
_partyWriter?: PartyWriter;
|
|
14
|
-
_hintProvider?: HintProvider;
|
|
15
14
|
_invitations: Map<string, Invitation>;
|
|
16
15
|
/**
|
|
17
16
|
* For a Greeter, all parameters must be properly set, but for the Invitee, they can be omitted.
|
|
18
17
|
* TODO(telackey): Does it make sense to separate out the Invitee functionality?
|
|
19
18
|
* @param {PublicKeyLike} [partyKey] The publicKey of the target Party.
|
|
20
19
|
* @param {function} [partyWriter] Callback function to write messages to the Party.
|
|
21
|
-
* @param {function} [hintProvider] Callback function to gather feed and key hints to give to the invitee.
|
|
22
20
|
*/
|
|
23
|
-
constructor(partyKey?: PublicKeyLike,
|
|
21
|
+
constructor(partyKey?: PublicKeyLike, _genesisFeedKey?: PublicKey | undefined, partyWriter?: PartyWriter);
|
|
24
22
|
/**
|
|
25
23
|
* Issues a new invitation for the indicated Party. The secretProvider is a function
|
|
26
24
|
* for obtaining a secret that the invitee must provide for verification. If present,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeter.d.ts","sourceRoot":"","sources":["../../../src/greet/greeter.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK3D,OAAO,EAAmB,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"greeter.d.ts","sourceRoot":"","sources":["../../../src/greet/greeter.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAK3D,OAAO,EAAmB,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAWrC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/F,oBAAY,WAAW,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAEpE;;GAEG;AACH,qBAAa,OAAO;IAahB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IAZnC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,YAAY,0BAAiC;IAE7C;;;;;OAKG;gBAED,QAAQ,CAAC,EAAE,aAAa,EACP,eAAe,CAAC,uBAAW,EAC5C,WAAW,CAAC,EAAE,WAAW;IAW3B;;;;;;;;;;OAUG;IACH,gBAAgB,CAAE,QAAQ,EAAE,aAAa,EACvC,eAAe,EAAE,eAAe,EAChC,cAAc,CAAC,EAAE,cAAc,EAC/B,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,UAAU,CAAC,EAAE,MAAM;;;IAgBrB,oBAAoB,cACK,OAAO,gBAAgB,MAAM,UAAU,MAAM;;;;;;;;;;;;;;;;;IAKtE;;;;;;OAMG;IACG,aAAa,CAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;;;;;;;;;;;IAuC3E;;;;;;OAMG;IACG,cAAc,CAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAuB1D;;;;OAIG;IACG,aAAa,CAAE,UAAU,EAAE,UAAU;IAKrC,YAAY,CAAE,YAAY,EAAE,MAAM;;;;;;;;;;;;;IA0BlC,gBAAgB,CAAE,UAAU,EAAE,UAAU;;;;;IAaxC,eAAe,CAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;CA0CtG"}
|
|
@@ -28,18 +28,16 @@ class Greeter {
|
|
|
28
28
|
* TODO(telackey): Does it make sense to separate out the Invitee functionality?
|
|
29
29
|
* @param {PublicKeyLike} [partyKey] The publicKey of the target Party.
|
|
30
30
|
* @param {function} [partyWriter] Callback function to write messages to the Party.
|
|
31
|
-
* @param {function} [hintProvider] Callback function to gather feed and key hints to give to the invitee.
|
|
32
31
|
*/
|
|
33
|
-
constructor(partyKey,
|
|
32
|
+
constructor(partyKey, _genesisFeedKey, partyWriter) {
|
|
33
|
+
this._genesisFeedKey = _genesisFeedKey;
|
|
34
34
|
this._invitations = new Map();
|
|
35
|
-
if (partyKey || partyWriter
|
|
35
|
+
if (partyKey || partyWriter) {
|
|
36
36
|
(0, assert_1.default)(partyKey);
|
|
37
37
|
(0, assert_1.default)(partyWriter);
|
|
38
|
-
(0, assert_1.default)(hintProvider);
|
|
39
38
|
}
|
|
40
39
|
this._partyKey = partyKey ? protocols_1.PublicKey.from(partyKey) : undefined;
|
|
41
40
|
this._partyWriter = partyWriter;
|
|
42
|
-
this._hintProvider = hintProvider;
|
|
43
41
|
}
|
|
44
42
|
/**
|
|
45
43
|
* Issues a new invitation for the indicated Party. The secretProvider is a function
|
|
@@ -201,16 +199,14 @@ class Greeter {
|
|
|
201
199
|
// TODO(dboreham): Add useful data here (peer id, key?)
|
|
202
200
|
log('Admitting new node after successful greeting.');
|
|
203
201
|
(0, assert_1.default)(this._partyWriter);
|
|
204
|
-
(0, assert_1.default)(this._hintProvider);
|
|
205
202
|
// Write the supplied messages to the target Party.
|
|
206
203
|
const copies = await this._partyWriter(params);
|
|
207
|
-
// Retrieve the hinted feed and key info for the invitee.
|
|
208
|
-
const hints = await this._hintProvider(params);
|
|
209
204
|
await invitation.notarize();
|
|
205
|
+
(0, assert_1.default)(this._genesisFeedKey);
|
|
210
206
|
return {
|
|
211
207
|
'@type': 'dxos.credentials.greet.NotarizeResponse',
|
|
212
208
|
copies,
|
|
213
|
-
|
|
209
|
+
genesisFeed: this._genesisFeedKey
|
|
214
210
|
};
|
|
215
211
|
}
|
|
216
212
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeter.js","sourceRoot":"","sources":["../../../src/greet/greeter.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uDAAoE;AACpE,+CAA2D;AAC3D,qCAAyC;AAEzC,kCAAkC;AAClC,oCAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"greeter.js","sourceRoot":"","sources":["../../../src/greet/greeter.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,19 +21,14 @@ const createKeyring = async () => {
|
|
|
21
21
|
await keyring.createKeyRecord({ type: proto_1.KeyType.PARTY });
|
|
22
22
|
await keyring.createKeyRecord({ type: proto_1.KeyType.IDENTITY });
|
|
23
23
|
await keyring.createKeyRecord({ type: proto_1.KeyType.DEVICE });
|
|
24
|
+
await keyring.createKeyRecord({ type: proto_1.KeyType.FEED });
|
|
24
25
|
return keyring;
|
|
25
26
|
};
|
|
26
|
-
const createGreeter = (keyring
|
|
27
|
+
const createGreeter = (keyring) => new greeter_1.Greeter(keyring.findKey(keys_1.Filter.matches({ type: proto_1.KeyType.PARTY })).publicKey, keyring.findKey(keys_1.Filter.matches({ type: proto_1.KeyType.FEED })).publicKey, messages => messages);
|
|
27
28
|
it('Good invitation', async () => {
|
|
28
29
|
const keyring = await createKeyring();
|
|
29
30
|
const secret = '0000';
|
|
30
|
-
const
|
|
31
|
-
{ publicKey: (0, crypto_1.randomBytes)(32), type: proto_1.KeyType.IDENTITY },
|
|
32
|
-
{ publicKey: (0, crypto_1.randomBytes)(32), type: proto_1.KeyType.DEVICE },
|
|
33
|
-
{ publicKey: (0, crypto_1.randomBytes)(32), type: proto_1.KeyType.FEED },
|
|
34
|
-
{ publicKey: (0, crypto_1.randomBytes)(32), type: proto_1.KeyType.FEED }
|
|
35
|
-
];
|
|
36
|
-
const greeter = createGreeter(keyring, hints);
|
|
31
|
+
const greeter = createGreeter(keyring);
|
|
37
32
|
const secretProvider = async () => Buffer.from(secret);
|
|
38
33
|
const secretValidator = async (invitation, secret) => secret && (0, util_1.arraysEqual)(secret, invitation.secret);
|
|
39
34
|
const invitation = await greeter.createInvitation(keyring.findKey(keys_1.Filter.matches({ type: proto_1.KeyType.PARTY })).publicKey, secretValidator, secretProvider);
|
|
@@ -82,8 +77,7 @@ it('Good invitation', async () => {
|
|
|
82
77
|
]
|
|
83
78
|
}
|
|
84
79
|
};
|
|
85
|
-
|
|
86
|
-
(0, expect_1.default)(response.feedHints).toEqual(hints.filter(hint => hint.type === proto_1.KeyType.FEED).map(hint => hint.publicKey));
|
|
80
|
+
await greeter.handleMessage(message.payload, invitation.id, (0, crypto_1.randomBytes)());
|
|
87
81
|
// The `FINISH` command informs the Greeter the Invitee is done.
|
|
88
82
|
{
|
|
89
83
|
const message = (0, proto_1.codecLoop)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeter.test.js","sourceRoot":"","sources":["../../../src/greet/greeter.test.js"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,wBAAwB;AAExB,oDAA4B;AAE5B,yCAA2C;AAC3C,uDAAoE;AACpE,qCAAyC;AAEzC,kCAAyE;AACzE,oCAA+E;AAC/E,oCAA8C;AAC9C,2CAAsC;AACtC,uCAAoC;AAEpC,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IAC/B,MAAM,OAAO,GAAG,IAAI,cAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,eAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACvD,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,eAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,MAAM,OAAO,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,eAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACxD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"greeter.test.js","sourceRoot":"","sources":["../../../src/greet/greeter.test.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"greeting-command-plugin.d.ts","sourceRoot":"","sources":["../../../src/greet/greeting-command-plugin.ts"],"names":[],"mappings":";;AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"greeting-command-plugin.d.ts","sourceRoot":"","sources":["../../../src/greet/greeting-command-plugin.ts"],"names":[],"mappings":";;AAWA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAiC,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAIzF,OAAO,EAAS,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAOrC,oBAAY,6BAA6B,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;AAOjH;;;;;;;;;;;;;GAaG;AAEH,qBAAa,qBAAsB,SAAQ,YAAY;IACrD,OAAc,cAAc,SAA+B;IAE3D,OAAO,EAAE,MAAM,CAAC;IAChB,mBAAmB,EAAE,6BAA6B,CAAC;IACnD,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBAEZ,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,6BAA6B;IAgB9E,IAAI,MAAM,WAET;IAED,IAAI,KAAK,UAER;IAED;;;OAGG;IACH,eAAe,CAAE,OAAO,SAAkB;IAO1C;;;;;OAKG;IACG,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,UAAQ;IAMzE;;;;;;;;;OASG;IACG,KAAK,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO;IA2C9D;;;;;;OAMG;IACG,QAAQ,CAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAoBlC,QAAQ,CAAE,QAAQ,EAAE,QAAQ;IAa5B,WAAW,CAAE,QAAQ,EAAE,QAAQ;CAatC"}
|
|
@@ -14,8 +14,8 @@ exports.GreetingCommandPlugin = void 0;
|
|
|
14
14
|
const assert_1 = __importDefault(require("assert"));
|
|
15
15
|
const debug_1 = __importDefault(require("debug"));
|
|
16
16
|
const events_1 = require("events");
|
|
17
|
-
const crypto_1 = require("@dxos/crypto");
|
|
18
17
|
const mesh_protocol_1 = require("@dxos/mesh-protocol");
|
|
18
|
+
const protocols_1 = require("@dxos/protocols");
|
|
19
19
|
const party_1 = require("../party");
|
|
20
20
|
const proto_1 = require("../proto");
|
|
21
21
|
const error_codes_1 = require("./error-codes");
|
|
@@ -24,7 +24,7 @@ const DEFAULT_TIMEOUT = 30000;
|
|
|
24
24
|
const getPeerId = (protocol) => {
|
|
25
25
|
var _a;
|
|
26
26
|
const { peerId } = (_a = protocol.getSession()) !== null && _a !== void 0 ? _a : {};
|
|
27
|
-
return
|
|
27
|
+
return protocols_1.PublicKey.bufferize(peerId);
|
|
28
28
|
};
|
|
29
29
|
/**
|
|
30
30
|
* A Protocol plugin. Implements a simple request/response protocol.
|
|
@@ -95,7 +95,7 @@ class GreetingCommandPlugin extends events_1.EventEmitter {
|
|
|
95
95
|
async _send(peerId, message, oneway) {
|
|
96
96
|
(0, assert_1.default)(Buffer.isBuffer(peerId));
|
|
97
97
|
// `peerId` is a Buffer, but here we only need its string form.
|
|
98
|
-
const peerIdStr =
|
|
98
|
+
const peerIdStr = protocols_1.PublicKey.stringify(peerId);
|
|
99
99
|
const peer = this._peers.get(peerIdStr);
|
|
100
100
|
(0, assert_1.default)(peer, `Peer not connected: ${peerIdStr}`);
|
|
101
101
|
const extension = peer.getExtension(GreetingCommandPlugin.EXTENSION_NAME);
|