remove ipfs provider

airalab · Oct 4, 2023 · c228722 · c228722
1 parent 3b1f96d
commit c228722
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 275 deletions.
diff --git a/package.json b/package.json
@@ -35,7 +35,6 @@
     "leaflet.tilelayer.colorfilter": "^1.2.5",
     "libp2p": "^0.46.11",
     "moment": "^2.29.4",
-    "multiaddr": "^10.0.1",
     "pinia": "^2.0.23",
     "socket.io-client": "^2.3.0",
     "vue": "^3.2.38",

diff --git a/src/components/footer/Footer.vue b/src/components/footer/Footer.vue
@@ -28,7 +28,7 @@
             type="date"
             v-model="start"
             :max="maxDate"
-            :disabled="currentProvider == 'ipfs'"
+            :disabled="currentProvider == 'realtime'"
           />
           <Switcher
             id="realtime"
@@ -88,7 +88,7 @@ export default {
       isActive: false,
       isActiveMenu: false,
 
-      realtime: this.currentProvider === "ipfs",
+      realtime: this.currentProvider === "realtime",
       wind: false,
       messages: config.SHOW_MESSAGES,
       start: moment().format("YYYY-MM-DD"),
@@ -112,7 +112,7 @@ export default {
       await this.$router.push({
         name: "main",
         params: {
-          provider: v ? "ipfs" : "remote",
+          provider: v ? "realtime" : "remote",
           type: this.$route.params.type,
           zoom: this.$route.params.zoom,
           lat: this.$route.params.lat,

diff --git a/src/components/measures/Measures.vue b/src/components/measures/Measures.vue
@@ -58,7 +58,7 @@ export default {
       await this.$router.push({
         name: "main",
         params: {
-          provider: this.$route.params.provider || "ipfs",
+          provider: this.$route.params.provider || "realtime",
           type: this.type,
           zoom: this.$route.params.zoom,
           lat: this.$route.params.lat,

diff --git a/src/config.js b/src/config.js
@@ -6,36 +6,6 @@ export default {
       "/dns4/3.pubsub.aira.life/tcp/443/wss/ipfs/QmWZSKTEQQ985mnNzMqhGCrwQ1aTA6sxVsorsycQz9cQrw",
     ],
   },
-  IPFS: {
-    fallback: {
-      repo: "ipfs/robonomics/5",
-      config: {
-        Addresses: {
-          Swarm: [
-            "/dns4/1.webrtcstar.aira.life/tcp/443/wss/p2p-webrtc-star/",
-            "/dns4/2.webrtcstar.aira.life/tcp/443/wss/p2p-webrtc-star/",
-            "/dns4/3.webrtcstar.aira.life/tcp/443/wss/p2p-webrtc-star/",
-          ],
-        },
-        Bootstrap: [
-          "/dns4/1.pubsub.aira.life/tcp/443/wss/ipfs/QmdfQmbmXt6sqjZyowxPUsmvBsgSGQjm4VXrV7WGy62dv8",
-          "/dns4/2.pubsub.aira.life/tcp/443/wss/ipfs/QmPTFt7GJ2MfDuVYwJJTULr6EnsQtGVp8ahYn9NSyoxmd9",
-          "/dns4/3.pubsub.aira.life/tcp/443/wss/ipfs/QmWZSKTEQQ985mnNzMqhGCrwQ1aTA6sxVsorsycQz9cQrw",
-        ],
-      },
-    },
-    cdn: "https://cdn.jsdelivr.net/npm/ipfs@0.61.0/index.min.js",
-    permission: [
-      "id",
-      "files.cat",
-      "files.add",
-      "pubsub.peers",
-      "pubsub.publish",
-      "pubsub.subscribe",
-      "swarm.peers",
-      "swarm.connect",
-    ],
-  },
   REMOTE_PROVIDER: "https://roseman.airalab.org/",
   // REMOTE_PROVIDER: "http://localhost:3000/",
   WIND_PROVIDER: "https://wind.airalab.org/latest",

diff --git a/src/config.template.js b/src/config.template.js
@@ -1,32 +1,9 @@
 export default {
-  IPFS: {
-    fallback: {
-      repo: "ipfs/robonomics/5",
-      config: {
-        Addresses: {
-          Swarm: [
-            "/dns4/1.webrtcstar.aira.life/tcp/443/wss/p2p-webrtc-star/",
-            "/dns4/2.webrtcstar.aira.life/tcp/443/wss/p2p-webrtc-star/",
-            "/dns4/3.webrtcstar.aira.life/tcp/443/wss/p2p-webrtc-star/",
-          ],
-        },
-        Bootstrap: [
-          "/dns4/1.pubsub.aira.life/tcp/443/wss/ipfs/QmdfQmbmXt6sqjZyowxPUsmvBsgSGQjm4VXrV7WGy62dv8",
-          "/dns4/2.pubsub.aira.life/tcp/443/wss/ipfs/QmPTFt7GJ2MfDuVYwJJTULr6EnsQtGVp8ahYn9NSyoxmd9",
-          "/dns4/3.pubsub.aira.life/tcp/443/wss/ipfs/QmWZSKTEQQ985mnNzMqhGCrwQ1aTA6sxVsorsycQz9cQrw",
-        ],
-      },
-    },
-    cdn: "https://cdn.jsdelivr.net/npm/ipfs@0.61.0/index.min.js",
-    permission: [
-      "id",
-      "files.cat",
-      "files.add",
-      "pubsub.peers",
-      "pubsub.publish",
-      "pubsub.subscribe",
-      "swarm.peers",
-      "swarm.connect",
+  LIBP2P: {
+    bootstrappers: [
+      "/dns4/1.pubsub.aira.life/tcp/443/wss/ipfs/QmdfQmbmXt6sqjZyowxPUsmvBsgSGQjm4VXrV7WGy62dv8",
+      "/dns4/2.pubsub.aira.life/tcp/443/wss/ipfs/QmPTFt7GJ2MfDuVYwJJTULr6EnsQtGVp8ahYn9NSyoxmd9",
+      "/dns4/3.pubsub.aira.life/tcp/443/wss/ipfs/QmWZSKTEQQ985mnNzMqhGCrwQ1aTA6sxVsorsycQz9cQrw",
     ],
   },
   REMOTE_PROVIDER: "",

diff --git a/src/providers/index.js b/src/providers/index.js
@@ -1,3 +1,2 @@
-export { default as Ipfs } from "./ipfs";
 export { default as Libp2p } from "./libp2p";
 export { default as Remote } from "./remote";
diff --git a/src/providers/ipfs.js b/src/providers/ipfs.js
diff --git a/src/utils/ipfs.js b/src/utils/ipfs.js
diff --git a/src/views/Main.vue b/src/views/Main.vue
@@ -34,7 +34,7 @@
             :zoom="zoom"
             :lat="lat"
             :lng="lng"
-            :availableWind="provider === 'ipfs'"
+            :availableWind="provider === 'realtime'"
             @clickMarker="handlerClick"
             @city="handlerChangeCity"
           />
@@ -124,15 +124,16 @@ export default {
   },
   computed: {
     isLoader() {
-      return this.provider === "ipfs" && Object.keys(this.points).length === 0;
+      return (
+        this.provider === "realtime" && Object.keys(this.points).length === 0
+      );
     },
   },
   mounted() {
     if (this.provider === "remote") {
       this.providerObj = new providers.Remote(config.REMOTE_PROVIDER);
     } else {
       this.providerObj = new providers.Libp2p(config.LIBP2P);
-      // this.providerObj = new providers.Ipfs(config.IPFS);
     }
     this.providerObj.ready().then(() => {
       this.providerReady = true;