Merge pull request #297 from dappnode/v0.2.22

v0.2.22 Release

Author: eduadiez

build/Dockerfile

@@ -84,10 +84,6 @@ WORKDIR /usr/src/app
 COPY --from=build-deps /usr/bin/nsupdate /usr/bin/nsupdate
 COPY --from=build-deps /usr/bin/docker /usr/bin/docker
 
-COPY build/entrypoint.sh .
-COPY build/dns_updater.sh /etc/periodic/1min/dns_updater
-RUN crontab -l | { cat; echo "*       *       *       *       *       run-parts   /etc/periodic/1min"; } | crontab -
-
 # Copy the src last as it's the layer most likely to change
 COPY --from=build-deps /usr/src/app /usr/src/app
 COPY --from=build-src /usr/src/app/dist /usr/src/app/src
@@ -98,4 +94,4 @@ COPY build/update_local_dyndns.sh /usr/local/bin/update_local_dyndns
 ENV COMPOSE_HTTP_TIMEOUT=300 DOCKER_CLIENT_TIMEOUT=300 DOCKER_HOST=unix:///var/run/docker.sock
 RUN echo "127.0.0.1 localunixsocket"
 
-ENTRYPOINT /usr/src/app/entrypoint.sh
+CMD [ "node", "src/index" ]

build/dns_updater.sh

@@ -1,15 +1,18 @@
+import * as eventBus from "../eventBus";
 import { ReturnData } from "../route-types/fetchDirectory";
 import getDirectory from "../modules/release/getDirectory";
 import getRelease from "../modules/release/getRelease";
 import isSyncing from "../utils/isSyncing";
 import { RpcHandlerReturnWithResult, DirectoryItem } from "../types";
 import Logs from "../logs";
 import { listContainers } from "../modules/docker/listContainers";
-import { notUndefined } from "../utils/typingHelpers";
 import { getIsInstalled, getIsUpdated } from "./fetchDnpRequest";
 import { fileToGatewayUrl } from "../utils/distributedFile";
+import { throttle } from "lodash";
 const logs = Logs(module);
 
+const loadThrottle = 500; // 0.5 seconds
+
 /**
  * Fetches all package names in the custom dappnode directory.
  */
@@ -24,34 +27,54 @@ export default async function fetchDirectory(): RpcHandlerReturnWithResult<
     };
   }
 
+  // Prevent sending way to many updates in case the fetching process is fast
+  const emitDirectoryUpdate = throttle(eventBus.directory.emit, loadThrottle);
+
   const dnpList = await listContainers();
 
-  // const directoryItemsUnordered: DirectoryItem[] = [];
+  // Returns already sorted by: feat#0, feat#1, dnp#0, dnp#1, dnp#2
+  const directory = await getDirectory();
+  const directoryDnps: DirectoryItem[] = directory.map(
+    ({ name, isFeatured }) => ({
+      status: "loading",
+      name,
+      whitelisted: true,
+      isFeatured
+    })
+  );
+  emitDirectoryUpdate(directoryDnps);
 
-  const directoryDnps = (await Promise.all(
-    // Returns already sorted by: feat#0, feat#1, dnp#0, dnp#1, dnp#2
-    (await getDirectory()).map(async ({ name, isFeatured }) => {
+  await Promise.all(
+    directory.map(async ({ name, isFeatured }, idx) => {
+      const whitelisted = true;
+      const directoryItemBasic = { name, whitelisted, isFeatured };
       try {
         // Now resolve the last version of the package
         const release = await getRelease(name);
         const { metadata, avatarFile } = release;
 
-        return {
-          name,
+        directoryDnps[idx] = {
+          ...directoryItemBasic,
+          status: "ok",
           description: getShortDescription(metadata),
           avatarUrl: fileToGatewayUrl(avatarFile), // Must be URL to a resource in a DAPPMANAGER API
           isInstalled: getIsInstalled(release, dnpList),
           isUpdated: getIsUpdated(release, dnpList),
-          whitelisted: true,
-          isFeatured,
           featuredStyle: metadata.style,
           categories: metadata.categories || getFallBackCategories(name) || []
-        } as DirectoryItem;
+        };
       } catch (e) {
         logs.error(`Error fetching ${name} release: ${e.message}`);
+        directoryDnps[idx] = {
+          ...directoryItemBasic,
+          status: "error",
+          message: e.message
+        };
+      } finally {
+        emitDirectoryUpdate(directoryDnps);
       }
     })
-  )).filter(notUndefined);
+  );
 
   return {
     message: `Listed directory of ${directoryDnps.length} DNPs`,

build/entrypoint.sh

@@ -29,6 +29,7 @@ import naclEncryptionGetPublicKey from "./naclEncryptionGetPublicKey";
 import notificationsGet from "./notificationsGet";
 import notificationsRemove from "./notificationsRemove";
 import notificationsTest from "./notificationsTest";
+import packageGettingStartedToggle from "./packageGettingStartedToggle";
 import passwordChange from "./passwordChange";
 import passwordIsSecure from "./passwordIsSecure";
 import poweroffHost from "./poweroffHost";
@@ -71,6 +72,7 @@ export {
   notificationsGet,
   notificationsRemove,
   notificationsTest,
+  packageGettingStartedToggle,
   passwordChange,
   passwordIsSecure,
   poweroffHost,

build/src/src/calls/fetchDirectory.ts

@@ -1,6 +1,7 @@
 import fs from "fs";
 import path from "path";
 import * as eventBus from "../eventBus";
+import * as db from "../db";
 // Modules
 import dappGet from "../modules/dappGet";
 import getImage, { verifyDockerImage } from "../modules/release/getImage";
@@ -283,6 +284,7 @@ export default async function installPackage({
       logUi({ id, name, message: "Writing files..." });
 
       writeManifest(manifestPath, metadata);
+      db.addPackageInstalledMetadata(name);
     }
 
     /**
@@ -306,7 +308,9 @@ export default async function installPackage({
 
     // Emit packages update
     eventBus.requestPackages.emit();
-    eventBus.packageModified.emit({ id });
+    eventBus.packagesModified.emit({
+      ids: packagesData.map(({ name }) => name)
+    });
 
     // Flag packages as no longer installing
     flagPackagesAreNotInstalling(state);

build/src/src/calls/index.ts

@@ -1,11 +1,14 @@
+import { ReturnData } from "../route-types/listPackages";
 import * as eventBus from "../eventBus";
+import * as db from "../db";
 // Modules
 import { listContainers } from "../modules/docker/listContainers";
 import { dockerDf } from "../modules/docker/dockerApi";
 // Utils
+import { omit } from "lodash";
 import parseDockerSystemDf from "../utils/parseDockerSystemDf";
 import Logs from "../logs";
-import { PackageContainer, RpcHandlerReturnWithResult } from "../types";
+import { RpcHandlerReturnWithResult } from "../types";
 import { readConfigFiles } from "../utils/configFiles";
 const logs = Logs(module);
 
@@ -14,8 +17,6 @@ const logs = Logs(module);
 // Prevent running it twice
 let isDockerSystemDfCallRunning = false;
 
-type ReturnData = PackageContainer[];
-
 /**
  * Returns the list of current containers associated to packages
  */
@@ -28,8 +29,12 @@ export default async function listPackages(): RpcHandlerReturnWithResult<
   dnpList.map(dnp => {
     try {
       const { manifest, environment } = readConfigFiles(dnp);
-      dnp.manifest = manifest;
+      dnp.manifest = omit(manifest, ["gettingStarted"]);
       dnp.envs = environment;
+      dnp.gettingStarted = manifest.gettingStarted;
+      dnp.gettingStartedShow = Boolean(
+        db.packageGettingStartedShow.get(dnp.name)
+      );
     } catch (e) {
       logs.warn(`Error appending ${dnp.name} files: ${e.stack || e.message}`);
     }

build/src/src/calls/installPackage.ts

@@ -0,0 +1,24 @@
+import { RequestData } from "../route-types/packageGettingStartedToggle";
+import * as db from "../db";
+import * as eventBus from "../eventBus";
+import { RpcHandlerReturn } from "../types";
+
+/**
+ * Toggles the visibility of a getting started block
+ * @param show Should be shown on hidden
+ */
+export default async function packageGettingStartedToggle({
+  id,
+  show
+}: RequestData): RpcHandlerReturn {
+  if (!id) throw Error("kwarg id must be defined");
+
+  db.packageGettingStartedShow.set(id, show);
+
+  // Emit packages update
+  eventBus.requestPackages.emit();
+
+  return {
+    message: `Toggled getting started visibility of ${id}`
+  };
+}

build/src/src/calls/listPackages.ts

@@ -3,7 +3,7 @@ import * as eventBus from "../eventBus";
 // Modules
 import { dockerComposeDown, dockerRm } from "../modules/docker/dockerCommands";
 // External call
-import restartPackageVolumes from "./restartPackageVolumes";
+import { restartPackageVolumesTask } from "./restartPackageVolumes";
 // Utils
 import * as getPath from "../utils/getPath";
 import shell from "../utils/shell";
@@ -39,14 +39,21 @@ export default async function removePackage({
   const composePath = getPath.dockerCompose(name, false);
   const packageRepoDir = getPath.packageRepoDir(id, false);
 
+  // Necessary for eventBus dependants to know the exact list of deleted DNPs
+  let removedIds: string[] = [id];
+
   /**
    * [NOTE] Not necessary to close the ports since they will just
    * not be renewed in the next interval
    */
 
   // Call restartPackageVolumes to safely delete dependant volumes
   if (deleteVolumes) {
-    await restartPackageVolumes({ id, doNotRestart: true });
+    const { removedDnps } = await restartPackageVolumesTask({
+      id,
+      doNotRestart: true
+    });
+    removedIds = removedDnps; // restartPackageVolumes may remove additional DNPs
   } else {
     /**
      * If there is no docker-compose, do a docker rm directly
@@ -71,7 +78,7 @@ export default async function removePackage({
 
   // Emit packages update
   eventBus.requestPackages.emit();
-  eventBus.packageModified.emit({ id, removed: true });
+  eventBus.packagesModified.emit({ ids: removedIds, removed: true });
 
   return {
     message: `Removed package: ${id}`,

build/src/src/calls/packageGettingStartedToggle.ts

@@ -32,6 +32,7 @@ export default async function restartPackage({
 
     // Emit packages update
     eventBus.requestPackages.emit();
+    eventBus.packagesModified.emit({ ids: [id] });
   }
 
   return {