Move utils to types

packages/dockerCompose/src/setDappnodeComposeDefaults.ts

@@ -1,16 +1,16 @@
 import { mapValues, toPairs, sortBy, fromPairs, pick } from "lodash-es";
 import {
-  getContainerName,
   getPrivateNetworkAliases,
   getIsCore,
   parseEnvironment,
-  getImageTag,
   getIsMonoService,
 } from "@dappnode/utils";
 import { params } from "@dappnode/params";
 import { cleanCompose } from "./clean.js";
 import { parseServiceNetworks } from "./networks.js";
 import {
+  getContainerName,
+  getImageTag,
   Compose,
   ComposeNetworks,
   ComposeService,

packages/httpsPortal/src/domains.ts

@@ -1,5 +1,5 @@
-import { ContainerNames } from "@dappnode/types";
-import { getShortUniqueDnp, getContainerDomain } from "@dappnode/utils";
+import { ContainerNames, getContainerDomain } from "@dappnode/types";
+import { getShortUniqueDnp } from "@dappnode/utils";
 
 export function stripBadDomainChars(s: string): string {
   // eslint-disable-next-line no-useless-escape

packages/installer/src/installer/downloadImages.ts

@@ -1,8 +1,12 @@
 import fs from "fs";
 import { isAbsolute } from "path";
-import { InstallPackageData, DistributedFile } from "@dappnode/types";
+import {
+  InstallPackageData,
+  DistributedFile,
+  getImageTag,
+} from "@dappnode/types";
 import { Log, logs } from "@dappnode/logger";
-import { shell, validatePath, getImageTag } from "@dappnode/utils";
+import { shell, validatePath } from "@dappnode/utils";
 import { getDockerImageManifest } from "@dappnode/dockerapi";
 import { DappnodeInstaller } from "../dappnodeInstaller.js";
 

packages/types/src/index.ts

@@ -10,3 +10,6 @@ export * from "./releaseFiles.js";
 export * from "./errors.js";
 export * from "./routes.js";
 export * from "./subscriptions.js";
+
+// utils
+export * from "./utils/index.js";

packages/types/src/utils/READEME.md

@@ -0,0 +1,3 @@
+# Utils
+
+This package contains utility functions that are used between the dappmanager and the dappnode sdk. They must not use any external dependency.

packages/utils/src/getContainerName.ts → packages/types/src/utils/getContainerName.ts

@@ -1,4 +1,3 @@
-import { params } from "@dappnode/params";
 import { getContainerDomain } from "./getContainerDomain.js";
 
 /**
@@ -19,6 +18,6 @@ export const getContainerName = ({
 }): string =>
   // Note: _PREFIX variables already end with the character "-"
   [
-    isCore ? params.CONTAINER_CORE_NAME_PREFIX : params.CONTAINER_NAME_PREFIX,
+    isCore ? "DAppNodeCore-" : "DAppNodePackage-",
     getContainerDomain({ dnpName, serviceName }),
   ].join("");

packages/types/src/utils/index.ts

@@ -0,0 +1,3 @@
+export { getImageTag } from "./getImageTag.js";
+export { getContainerName } from "./getContainerName.js";
+export { getContainerDomain } from "./getContainerDomain.js";

packages/utils/src/index.ts

@@ -1,8 +1,6 @@
 export { applyRecursivelyToStringValues } from "./applyRecursivelyToStringValues.js";
 export { JsonFileDb } from "./jsonFileDb.js";
 export { PlainTextFileDb } from "./plainTextFileDb.js";
-export { getContainerName } from "./getContainerName.js";
-export { getContainerDomain } from "./getContainerDomain.js";
 export { validatePath } from "./validatePath.js";
 export { isNotFoundError } from "./isNotFoundError.js";
 export { yamlParse, yamlDump } from "./yaml.js";
@@ -28,7 +26,6 @@ export {
 } from "./environment.js";
 export { writeEnvFile, createGlobalEnvsEnvFile } from "./globalEnvs.js";
 export { getManifestPath } from "./getManifestPath.js";
-export { getImageTag } from "./getImageTag.js";
 export { getImagePath } from "./getImagePath.js";
 export { getIsMonoService } from "./getIsMonoService.js";
 export { getEnvFilePath } from "./getEnvFilePath.js";