Merge branch 'master' into feat/feed

.dockerignore

@@ -0,0 +1,3 @@
+**/.git
+**/node_modules
+**/radata

Dockerfile

@@ -0,0 +1,29 @@
+FROM node:12.18.0-alpine3.9
+
+WORKDIR /usr/src/app
+
+
+ADD ./package.json /usr/src/app/package.json
+ADD ./yarn.lock /usr/src/app/yarn.lock
+#RUN useradd app && \
+#    mkdir -p /home/app/.lnd
+RUN apk update && apk upgrade && \
+    apk add --no-cache bash git openssh
+RUN yarn install
+
+ADD . /usr/src/app
+RUN ls /usr/src/app
+
+RUN chmod +x ./docker-start.sh
+#ADD ./tls.cert /usr/src/app/tls.cert
+#ADD ./admin.macaroon /usr/src/app/admin.macaroon
+
+# && \
+#    chown -R app:app /home/app && \
+#    chown -R app:app /usr/src/app && \
+#    chown -R app:app /start.sh
+
+#ARG lnd_address
+#ENV LND_ADDR=$lnd_address
+EXPOSE 9835
+CMD ["./docker-start.sh"]

docker-start.sh

@@ -0,0 +1,5 @@
+#!/bin/ash
+node main -h 0.0.0.0 \
+        -m admin.macaroon \
+        -d tls.cert \
+        -l $LND_ADDR

services/gunDB/contact-api/getters/follows.js

@@ -1,6 +1,11 @@
+/**
+ * @format
+ */
 const Common = require('shock-common')
 const Logger = require('winston')
+const size = require('lodash/size')
 
+const Utils = require('../utils')
 const Key = require('../key')
 
 /**
@@ -8,43 +13,47 @@ const Key = require('../key')
  */
 
 /**
+ * @throws {TypeError}
  * @returns {Promise<Record<string, Common.Schema.Follow>>}
  */
-exports.currentFollows = () => {
-  const user = require('../../Mediator').getUser()
-
-  return new Promise(res => {
-    user.get(Key.FOLLOWS).load(data => {
-      if (typeof data !== 'object' || data === null) {
-        Logger.warn(
-          `GunDb -> getters -> currentFollows() -> Current follows data as fetched from gun is not an object but ${typeof data}. This can happen if Gun lost its cache and it's still retrieving data from the network.`
-        )
-        res({})
-        return
+exports.currentFollows = async () => {
+  /**
+   * @type {Record<string, Common.Schema.Follow>}
+   */
+  const raw = await Utils.tryAndWait(
+    // @ts-ignore
+    (_, user) => new Promise(res => user.get(Key.FOLLOWS).load(res)),
+    v => {
+      if (typeof v !== 'object' || v === null) {
+        return true
       }
 
-      const rejected = Object.entries(data).filter(
-        ([_, follow]) => !Common.Schema.isFollow(follow)
-      )
+      if (size(v) === 0) {
+        return true
+      }
 
-      rejected.forEach(([key, item]) => {
-        // expected when unfollowed
-        if (item !== null) {
-          Logger.warn(
-            `GunDb -> getters -> currentFollows() -> Item not conforming to schema found inside follows data. Key: ${key}, item: ${JSON.stringify(
-              item
-            )}.`
-          )
-        }
-      })
+      return false
+    }
+  )
 
-      const passed = Object.entries(data).filter(([_, follow]) =>
-        Common.Schema.isFollow(follow)
-      )
+  if (typeof raw !== 'object' || raw === null) {
+    Logger.error(
+      `Expected user.follows to be an object but instead got: ${JSON.stringify(
+        raw
+      )}`
+    )
+    throw new TypeError('Could not get follows, not an object')
+  }
 
-      const p = /** @type {unknown} */ (passed)
+  const clean = {
+    ...raw
+  }
 
-      res(/** @type {Record<string, Follow>} */ (p))
-    })
-  })
-}
+  for (const [key, followOrNull] of Object.entries(clean)) {
+    if (!Common.Schema.isFollow(followOrNull)) {
+      delete clean[key]
+    }
+  }
+
+  return clean
+}