Skip to content

Commit 2bed8f6

Browse files
RangerMauveRangerMauve
committed
Remove GUN DB support
1 parent 29900c2 commit 2bed8f6

File tree

4 files changed

+9
-156
lines changed

4 files changed

+9
-156
lines changed

‎app/config.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const DEFAULT_IPFS_DIR = path.join(USER_DATA, 'ipfs')
77
const DEFAULT_HYPER_DIR = path.join(USER_DATA, 'hyper')
88
// const DEFAULT_SSB_DIR = path.join(USER_DATA, 'ssb')
99
const DEFAULT_BT_DIR = path.join(USER_DATA, 'bt')
10-
const DEFAULT_GUN_DIR = path.join(USER_DATA, 'gun')
1110

1211
const DEFAULT_PAGE = 'agregore://welcome'
1312

@@ -26,11 +25,13 @@ module.exports = require('rc')('agregore', {
2625
EditConfigFile: 'CommandOrControl+.',
2726
CreateBookmark: 'CommandOrControl+D'
2827
},
28+
2929
extensions: {
3030
dir: DEFAULT_EXTENSIONS_DIR,
3131
// TODO: This will be for loading extensions from remote URLs
3232
remote: []
3333
},
34+
3435
theme: {
3536
'font-family': 'system-ui',
3637
background: 'var(--ag-color-black)',
@@ -52,20 +53,17 @@ module.exports = require('rc')('agregore', {
5253
enabled: false
5354
}
5455
},
56+
5557
// All options here: https://github.com/datproject/sdk/#const-hypercore-hyperdrive-resolvename-keypair-derivesecret-registerextension-close--await-sdkopts
5658
hyperOptions: {
5759
storage: DEFAULT_HYPER_DIR
5860
},
61+
5962
// All options here: https://github.com/ssbc/ssb-config#configuration
6063
ssbOptions: {},
64+
6165
// All options here: https://github.com/webtorrent/webtorrent/blob/master/docs/api.md
6266
btOptions: {
6367
storageLocation: DEFAULT_BT_DIR
64-
},
65-
// All options here: https://gun.eco/docs/API#-a-name-gun-a-gun-options-
66-
gunOptions: {
67-
file: DEFAULT_GUN_DIR,
68-
radisk: true,
69-
relay: false
7068
}
7169
})

‎app/protocols/index.js

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,11 @@ const LOW_PRIVILEGES = {
2828
corsEnabled: true
2929
}
3030

31-
const EXTENSION_PRIVILEGES = {
32-
bypassCSP: true,
33-
secure: true,
34-
standard: true,
35-
supportFetchAPI: true,
36-
allowServiceWorkers: true,
37-
corsEnabled: false
38-
}
39-
4031
const {
4132
ipfsOptions,
4233
ssbOptions,
4334
hyperOptions,
44-
btOptions,
45-
gunOptions
35+
btOptions
4636
} = require('../config')
4737

4838
const createHyperHandler = require('./hyper-protocol')
@@ -52,7 +42,6 @@ const createBrowserHandler = require('./browser-protocol')
5242
const createGeminiHandler = require('./gemini-protocol')
5343
const createBTHandler = require('./bt-protocol')
5444
const createMagnetHandler = require('./magnet-protocol')
55-
const createGunHandler = require('./gun-protocol')
5645

5746
module.exports = {
5847
registerPrivileges,
@@ -69,11 +58,9 @@ function registerPrivileges () {
6958
{ scheme: 'pubsub', privileges: P2P_PRIVILEGES },
7059
{ scheme: 'bittorrent', privileges: P2P_PRIVILEGES },
7160
{ scheme: 'bt', privileges: P2P_PRIVILEGES },
72-
{ scheme: 'gun', privileges: P2P_PRIVILEGES },
7361
{ scheme: 'ssb', privileges: P2P_PRIVILEGES },
7462
{ scheme: 'agregore', privileges: BROWSER_PRIVILEGES },
75-
{ scheme: 'magnet', privileges: LOW_PRIVILEGES },
76-
{ scheme: 'electron-extension', privileges: EXTENSION_PRIVILEGES }
63+
{ scheme: 'magnet', privileges: LOW_PRIVILEGES }
7764
])
7865
}
7966

@@ -90,7 +77,6 @@ async function setupProtocols (session) {
9077
app.setAsDefaultProtocolClient('pubsub')
9178
app.setAsDefaultProtocolClient('bittorrent')
9279
app.setAsDefaultProtocolClient('bt')
93-
app.setAsDefaultProtocolClient('gun')
9480

9581
const browserProtocolHandler = await createBrowserHandler()
9682
sessionProtocol.registerStreamProtocol('agregore', browserProtocolHandler)
@@ -127,8 +113,4 @@ async function setupProtocols (session) {
127113
const magnetHandler = await createMagnetHandler()
128114
sessionProtocol.registerStreamProtocol('magnet', magnetHandler)
129115
globalProtocol.registerStreamProtocol('magnet', magnetHandler)
130-
131-
const gunHandler = await createGunHandler(gunOptions, session)
132-
sessionProtocol.registerStreamProtocol('gun', gunHandler)
133-
globalProtocol.registerStreamProtocol('gun', gunHandler)
134116
}

‎package.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,6 @@
9797
],
9898
"role": "Viewer"
9999
},
100-
{
101-
"name": "gunDB",
102-
"schemes": [
103-
"gun"
104-
],
105-
"role": "Viewer"
106-
},
107100
{
108101
"name": "SecureScuttlebutt",
109102
"schemes": [
@@ -192,7 +185,6 @@
192185
"gemini-fetch": "^1.0.0",
193186
"gemini-to-html": "^1.0.0",
194187
"go-ipfs": "^0.14.0",
195-
"gun-fetch": "^3.5.9",
196188
"hyper-sdk": "^3.0.7",
197189
"hypercore-fetch": "^8.6.1",
198190
"ipfs-http-client": "^56.0.0",

‎yarn.lock

Lines changed: 2 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -500,33 +500,6 @@
500500
rimraf "^3.0.2"
501501
unzip-crx-3 "^0.2.0"
502502

503-
"@peculiar/asn1-schema@^2.1.6":
504-
version "2.2.0"
505-
resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.2.0.tgz#d8a54527685c8dee518e6448137349444310ad64"
506-
integrity sha512-1ENEJNY7Lwlua/1wvzpYP194WtjQBfFxvde2FlzfBFh/ln6wvChrtxlORhbKEnYswzn6fOC4c7HdC5izLPMTJg==
507-
dependencies:
508-
asn1js "^3.0.5"
509-
pvtsutils "^1.3.2"
510-
tslib "^2.4.0"
511-
512-
"@peculiar/json-schema@^1.1.12":
513-
version "1.1.12"
514-
resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.12.tgz#fe61e85259e3b5ba5ad566cb62ca75b3d3cd5339"
515-
integrity sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==
516-
dependencies:
517-
tslib "^2.0.0"
518-
519-
"@peculiar/webcrypto@^1.1.1":
520-
version "1.4.0"
521-
resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.4.0.tgz#f941bd95285a0f8a3d2af39ccda5197b80cd32bf"
522-
integrity sha512-U58N44b2m3OuTgpmKgf0LPDOmP3bhwNz01vAnj1mBwxBASRhptWYK+M3zG+HBkDqGQM+bFsoIihTW8MdmPXEqg==
523-
dependencies:
524-
"@peculiar/asn1-schema" "^2.1.6"
525-
"@peculiar/json-schema" "^1.1.12"
526-
pvtsutils "^1.3.2"
527-
tslib "^2.4.0"
528-
webcrypto-core "^1.7.4"
529-
530503
"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
531504
version "1.1.2"
532505
resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
@@ -797,11 +770,6 @@ addr-to-ip-port@^1.0.1, addr-to-ip-port@^1.5.4:
797770
resolved "https://registry.yarnpkg.com/addr-to-ip-port/-/addr-to-ip-port-1.5.4.tgz#9542b1c6219fdb8c9ce6cc72c14ee880ab7ddd88"
798771
integrity sha512-ByxmJgv8vjmDcl3IDToxL2yrWFrRtFpZAToY0f46XFXl8zS081t7El5MXIodwm7RC6DhHBRoOSMLFSPKCtHukg==
799772

800-
addressparser@^0.3.2:
801-
version "0.3.2"
802-
resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-0.3.2.tgz#59873f35e8fcf6c7361c10239261d76e15348bb2"
803-
integrity sha512-fDlslCJpojuY1cnb7tY7COAriA7cdSzDiWyrWNdFn7Cjd+jrEgZavqkOgD/wg+eH765YPnQjqlS88OL/Q0Qtkg==
804-
805773
agent-base@6:
806774
version "6.0.2"
807775
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -969,15 +937,6 @@ asar@^3.0.3:
969937
optionalDependencies:
970938
"@types/glob" "^7.1.1"
971939

972-
asn1js@^3.0.1, asn1js@^3.0.5:
973-
version "3.0.5"
974-
resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.5.tgz#5ea36820443dbefb51cc7f88a2ebb5b462114f38"
975-
integrity sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==
976-
dependencies:
977-
pvtsutils "^1.3.2"
978-
pvutils "^1.1.3"
979-
tslib "^2.4.0"
980-
981940
assert-plus@^1.0.0:
982941
version "1.0.0"
983942
resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
@@ -2340,28 +2299,6 @@ electron@19:
23402299
"@types/node" "^16.11.26"
23412300
extract-zip "^1.0.3"
23422301

2343-
emailjs-base64@^1.1.4:
2344-
version "1.1.4"
2345-
resolved "https://registry.yarnpkg.com/emailjs-base64/-/emailjs-base64-1.1.4.tgz#392fa38cb6aa35dccd3af3637ffc14c1c7ce9612"
2346-
integrity sha512-4h0xp1jgVTnIQBHxSJWXWanNnmuc5o+k4aHEpcLXSToN8asjB5qbXAexs7+PEsUKcEyBteNYsSvXUndYT2CGGA==
2347-
2348-
emailjs-mime-codec@^2.0.7:
2349-
version "2.0.9"
2350-
resolved "https://registry.yarnpkg.com/emailjs-mime-codec/-/emailjs-mime-codec-2.0.9.tgz#d184451b6f2e55c5868b0f0a82d18fe2b82f0c97"
2351-
integrity sha512-7qJo4pFGcKlWh/kCeNjmcgj34YoJWY0ekZXEHYtluWg4MVBnXqGM4CRMtZQkfYwitOhUgaKN5EQktJddi/YIDQ==
2352-
dependencies:
2353-
emailjs-base64 "^1.1.4"
2354-
ramda "^0.26.1"
2355-
text-encoding "^0.7.0"
2356-
2357-
emailjs@^2.2.0:
2358-
version "2.2.0"
2359-
resolved "https://registry.yarnpkg.com/emailjs/-/emailjs-2.2.0.tgz#ba5b23e4a4b0a4510f652e873b154e9407b6ca03"
2360-
integrity sha512-J9HNx13GA5DnJma10YxsSqYCErTyB0KoVflTddPTyKlEVHM0MckZXn/zDqovdacwWkHCxqC9AKVY8GMPaGvaGQ==
2361-
dependencies:
2362-
addressparser "^0.3.2"
2363-
emailjs-mime-codec "^2.0.7"
2364-
23652302
emittery@^0.6.0:
23662303
version "0.6.0"
23672304
resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.6.0.tgz#e85312468d77c3ed9a6adf43bb57d34849e0c95a"
@@ -2971,7 +2908,7 @@ fs-constants@^1.0.0:
29712908
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
29722909
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
29732910

2974-
fs-extra@^10.0.0, fs-extra@^10.1.0:
2911+
fs-extra@^10.0.0:
29752912
version "10.1.0"
29762913
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
29772914
integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
@@ -3277,24 +3214,6 @@ guard-timeout@^2.0.0:
32773214
resolved "https://registry.yarnpkg.com/guard-timeout/-/guard-timeout-2.0.0.tgz#7f8f1f6d09bdeb6d0fee4cbd743d593c14d7d78a"
32783215
integrity sha512-35geHv72oal0cRUE5t1tZ5KHm3OVPXzFtiMG8AnRPV5FkkEf84RUpeQ0BCeCZunfSLGATW5ZVyALhJKgM7I/6A==
32793216

3280-
gun-fetch@^3.5.9:
3281-
version "3.7.7"
3282-
resolved "https://registry.yarnpkg.com/gun-fetch/-/gun-fetch-3.7.7.tgz#da983647b0ff6d6fda8c6544c54a27e98d053539"
3283-
integrity sha512-V+YBpO0wA2zCambRwHIOwtP5tq3zKQxMvzXA5dQUWNYFHjxjLMEmPv1TiVoFKbGs0+PV/AHvtfjf8PKGO7E6Sg==
3284-
dependencies:
3285-
fs-extra "^10.1.0"
3286-
gun "github:amark/gun"
3287-
make-fetch "^2.3.1"
3288-
3289-
"gun@github:amark/gun":
3290-
version "0.2020.1237"
3291-
resolved "https://codeload.github.com/amark/gun/tar.gz/081931a6d48cd7ceb32e1958724043127218040f"
3292-
dependencies:
3293-
ws "^7.2.1"
3294-
optionalDependencies:
3295-
"@peculiar/webcrypto" "^1.1.1"
3296-
emailjs "^2.2.0"
3297-
32983217
gunzip-maybe@^1.4.2:
32993218
version "1.4.2"
33003219
resolved "https://registry.yarnpkg.com/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz#b913564ae3be0eda6f3de36464837a9cd94b98ac"
@@ -5941,18 +5860,6 @@ pupa@^2.1.1:
59415860
dependencies:
59425861
escape-goat "^2.0.0"
59435862

5944-
pvtsutils@^1.3.2:
5945-
version "1.3.2"
5946-
resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.2.tgz#9f8570d132cdd3c27ab7d51a2799239bf8d8d5de"
5947-
integrity sha512-+Ipe2iNUyrZz+8K/2IOo+kKikdtfhRKzNpQbruF2URmqPtoqAs8g3xS7TJvFF2GcPXjh7DkqMnpVveRFq4PgEQ==
5948-
dependencies:
5949-
tslib "^2.4.0"
5950-
5951-
pvutils@^1.1.3:
5952-
version "1.1.3"
5953-
resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3"
5954-
integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==
5955-
59565863
queue-microtask@^1.2.2, queue-microtask@^1.2.3:
59575864
version "1.2.3"
59585865
resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -5983,11 +5890,6 @@ railroad-diagrams@^1.0.0:
59835890
resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
59845891
integrity sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==
59855892

5986-
ramda@^0.26.1:
5987-
version "0.26.1"
5988-
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
5989-
integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
5990-
59915893
[email protected]:
59925894
version "0.4.6"
59935895
resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
@@ -7353,11 +7255,6 @@ temp-write@^4.0.0:
73537255
temp-dir "^1.0.0"
73547256
uuid "^3.3.2"
73557257

7356-
text-encoding@^0.7.0:
7357-
version "0.7.0"
7358-
resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643"
7359-
integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA==
7360-
73617258
text-table@^0.2.0:
73627259
version "0.2.0"
73637260
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -7490,11 +7387,6 @@ tslib@^1.9.0:
74907387
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
74917388
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
74927389

7493-
tslib@^2.0.0, tslib@^2.4.0:
7494-
version "2.4.0"
7495-
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
7496-
integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
7497-
74987390
ttl@^1.3.0:
74997391
version "1.3.1"
75007392
resolved "https://registry.yarnpkg.com/ttl/-/ttl-1.3.1.tgz#d8fa510bedb6a956d85b60ec56a57339ae0d5b2c"
@@ -7813,17 +7705,6 @@ web-streams-polyfill@^3.0.0:
78137705
resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
78147706
integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
78157707

7816-
webcrypto-core@^1.7.4:
7817-
version "1.7.5"
7818-
resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.7.5.tgz#c02104c953ca7107557f9c165d194c6316587ca4"
7819-
integrity sha512-gaExY2/3EHQlRNNNVSrbG2Cg94Rutl7fAaKILS1w8ZDhGxdFOaw6EbCfHIxPy9vt/xwp5o0VQAx9aySPF6hU1A==
7820-
dependencies:
7821-
"@peculiar/asn1-schema" "^2.1.6"
7822-
"@peculiar/json-schema" "^1.1.12"
7823-
asn1js "^3.0.1"
7824-
pvtsutils "^1.3.2"
7825-
tslib "^2.4.0"
7826-
78277708
webidl-conversions@^4.0.2:
78287709
version "4.0.2"
78297710
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
@@ -7990,7 +7871,7 @@ ws@^3.2.0:
79907871
safe-buffer "~5.1.0"
79917872
ultron "~1.1.0"
79927873

7993-
ws@^7.0.0, ws@^7.2.1, ws@^7.4.2, ws@^7.4.5:
7874+
ws@^7.0.0, ws@^7.4.2, ws@^7.4.5:
79947875
version "7.5.8"
79957876
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
79967877
integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==

0 commit comments

Comments
 (0)