fix: cleanup + add logplease

Author: Julien Bouquillon

package.json

@@ -15,6 +15,7 @@
   ],
   "dependencies": {
     "ipfs": "^0.46.0",
+    "logplease": "^1.2.15",
     "orbit-db": "^0.24.1"
   },
   "devDependencies": {

src/OrbitProvider.js

@@ -11,13 +11,10 @@ const OrbitProvider = ({ config = DEFAULT_IPFS_CONFIG, ...props }) => {
   const [value, setValue] = useState(null);
   const { Provider } = orbitContext;
   useEffect(() => {
-    console.log("ipfs", ipfs, orbit);
     if (ipfs && orbit) {
       setValue(orbit);
     }
-    //setValue(orbit)
   }, [ipfs, orbit]);
-  console.log("OrbitProvider", { value, ipfs, orbit });
   return <Provider value={value} {...props} />;
 };
 

src/useIpfs.js

@@ -1,14 +1,16 @@
 import { useEffect, useState } from "react";
-
+import Logger from "logplease";
 import IPFS from "ipfs";
 
+const logger = Logger.create("useIpfs");
+
 // window.ipfsLoaded hack to keep a global ipfs instance
 const useIpfs = (config) => {
   const [ipfs, setIpfs] = useState(null);
 
   useEffect(() => {
     const ipfsInit = async () => {
-      console.log("ipfsInit", config);
+      logger.info("ipfsInit", config);
       if (typeof window !== "undefined" && window.ipfsLoaded) {
         setIpfs(window.ipfsLoaded);
         return;
@@ -17,13 +19,13 @@ const useIpfs = (config) => {
       const ipfs = await IPFS.create(config);
       if (typeof window !== "undefined") window.ipfsLoaded = ipfs;
       const peerId = (await ipfs.id()).id;
-      console.log("IPFS: connected as", peerId);
+      logger.info("IPFS: connected as", peerId);
       setIpfs(ipfs);
     };
     ipfsInit();
     return () => {
       if (ipfs) {
-        console.log("ipfsStop");
+        logger.debug("ipfs.stop()");
         ipfs.stop();
       }
     };

src/useOrbit.js

@@ -1,5 +1,8 @@
 import { useEffect, useState } from "react";
 import OrbitDB from "orbit-db";
+import Logger from "logplease";
+
+const logger = Logger.create("useOrbit");
 
 const useOrbit = (ipfs) => {
   const [orbit, setOrbit] = useState(null);
@@ -12,7 +15,7 @@ const useOrbit = (ipfs) => {
     if (ipfs) createInstance();
     return () => {
       if (orbit && orbit.stop) {
-        console.log("orbit.stop()");
+        logger.debug("orbit.stop()");
         orbit.stop();
       }
     };

src/useOrbitDb.js

@@ -1,7 +1,10 @@
 import { useEffect, useState, useContext } from "react";
+import Logger from "logplease";
 
 import orbitContext from "./orbitContext";
 
+const logger = Logger.create("useOrbitDb");
+
 const publicRead = (orbitdb) => ({
   accessController: {
     write: [orbitdb.identity.id],
@@ -35,9 +38,9 @@ const useOrbitDb = (address, options = {}) => {
           ? publicWrite(orbit)
           : publicRead(orbit)),
       };
-      console.log("orbit.open", address, allOptions);
+      logger.debug("orbit.open", address, allOptions);
       const db = await orbit.open(address, allOptions);
-      console.log("orbitdb.opened", db);
+      logger.debug("orbitdb.opened", db.address.toString());
       const refreshDb = async () => {
         await db.load();
         if (!orbitDb) {
@@ -53,33 +56,44 @@ const useOrbitDb = (address, options = {}) => {
           setRecords([...allEvents] || []);
         } else if (db.type === "docstore") {
           setRecords(db.query(() => true));
+        } else if (db.type === "counter") {
+          setRecords(db.value);
         }
       };
-      console.log("useOrbitDb.open", address, allOptions);
 
       db.events.on("replicate", (address) => {
-        console.log("replicate", { address });
+        logger.debug("db.events.replicate", address.toString());
         //refreshDb();
       });
 
       db.events.on("replicated", (address) => {
-        console.log("replicated", { address });
+        logger.debug("db.events.replicated", address.toString());
         refreshDb();
       });
 
       db.events.on("write", (address, entry, heads) => {
-        console.log("write", { address, entry, heads });
+        logger.debug("db.events.write", address.toString());
         refreshDb();
       });
       await refreshDb();
     };
     if (orbit) {
       createDb();
     }
-    return () => {};
+    return () => {
+      if (orbitDb) {
+        logger.debug("db.close()");
+        orbitDb.close();
+      }
+    };
   }, [orbit, address, options]);
 
-  return { orbit, db: orbitDb, records };
+  const state = { orbit, db: orbitDb, records };
+  if (orbitDb && orbitDb.type === "counter") {
+    state.inc = orbitDb.inc.bind(orbitDb);
+    state.value = orbitDb.value;
+  }
+  return state;
 };
 
 export default useOrbitDb;

yarn.lock

@@ -8168,7 +8168,7 @@ log-symbols@^2.2.0:
   dependencies:
     chalk "^2.0.1"
 
-logplease@^1.2.14, logplease@~1.2.14, logplease@~1.2.15:
+logplease@^1.2.14, logplease@^1.2.15, logplease@~1.2.14, logplease@~1.2.15:
   version "1.2.15"
   resolved "https://registry.yarnpkg.com/logplease/-/logplease-1.2.15.tgz#3da442e93751a5992cc19010a826b08d0293c48a"
   integrity sha512-jLlHnlsPSJjpwUfcNyUxXCl33AYg2cHhIf9QhGL2T4iPT0XPB+xP1LRKFPgIg1M/sg9kAJvy94w9CzBNrfnstA==