fix(dashmate): rs-dapi not stopped when dashmate reset --platform -f is called

packages/dashmate/src/config/getPlatformProfilesFactory.js

@@ -0,0 +1,32 @@
+const PLATFORM_PROFILES = [
+  'platform',
+  'platform-dapi-deprecated',
+  'platform-dapi-rs',
+];
+
+/**
+ * @param {getConfigProfiles} getConfigProfiles
+ * @return {getPlatformProfiles}
+ */
+export default function getPlatformProfilesFactory(getConfigProfiles) {
+  /**
+   * @typedef {function} getPlatformProfiles
+   * @param {Config} config
+   * @param {{includeAll?: boolean}} [options]
+   * @returns {string[]}
+   */
+  function getPlatformProfiles(config, { includeAll = false } = {}) {
+    if (!config.get('platform.enable')) {
+      return [];
+    }
+
+    if (includeAll) {
+      return [...PLATFORM_PROFILES];
+    }
+
+    return getConfigProfiles(config)
+      .filter((profile) => profile.startsWith('platform'));
+  }
+
+  return getPlatformProfiles;
+}

packages/dashmate/src/createDIContainer.js

@@ -117,6 +117,7 @@ import assertLocalServicesRunningFactory from './test/asserts/assertLocalService
 import assertServiceRunningFactory from './test/asserts/assertServiceRunningFactory.js';
 import generateEnvsFactory from './config/generateEnvsFactory.js';
 import getConfigProfilesFactory from './config/getConfigProfilesFactory.js';
+import getPlatformProfilesFactory from './config/getPlatformProfilesFactory.js';
 import createIpAndPortsFormFactory from './listr/prompts/createIpAndPortsForm.js';
 import registerMasternodeWithCoreWalletFactory from './listr/tasks/setup/regular/registerMasternode/registerMasternodeWithCoreWallet.js';
 import registerMasternodeWithDMTFactory from './listr/tasks/setup/regular/registerMasternode/registerMasternodeWithDMT.js';
@@ -169,6 +170,7 @@ export default async function createDIContainer(options = {}) {
     getConnectionHost: asFunction(getConnectionHostFactory).singleton(),
     generateEnvs: asFunction(generateEnvsFactory).singleton(),
     getConfigProfiles: asFunction(getConfigProfilesFactory).singleton(),
+    getPlatformProfiles: asFunction(getPlatformProfilesFactory).singleton(),
     ensureFileMountExists: asFunction(ensureFileMountExistsFactory).singleton(),
     // `configFile` and `config` are registering on command init
   });

packages/dashmate/src/listr/tasks/resetNodeTaskFactory.js

@@ -12,6 +12,7 @@ import wait from '../../util/wait.js';
  * @param {ConfigFile} configFile
  * @param {HomeDir} homeDir
  * @param {generateEnvs} generateEnvs
+ * @param {getPlatformProfiles} getPlatformProfiles
  * @return {resetNodeTask}
  */
 export default function resetNodeTaskFactory(
@@ -23,6 +24,7 @@ export default function resetNodeTaskFactory(
   configFile,
   homeDir,
   generateEnvs,
+  getPlatformProfiles,
 ) {
   /**
    * Remove path but ignore permission issues to avoid failing reset on root-owned directories.
@@ -70,9 +72,13 @@ export default function resetNodeTaskFactory(
         title: 'Check services are not running',
         skip: (ctx) => ctx.isForce,
         task: async (ctx) => {
+          const profiles = ctx.isPlatformOnlyReset
+            ? getPlatformProfiles(config, { includeAll: true })
+            : [];
+
           if (await dockerCompose.isNodeRunning(
             config,
-            { profiles: ctx.isPlatformOnlyReset ? ['platform'] : [] },
+            { profiles },
           )) {
             throw new Error('Running services detected. Please ensure all services are stopped for this config before starting');
           }
@@ -98,20 +104,22 @@ export default function resetNodeTaskFactory(
         title: 'Remove platform services and associated data',
         enabled: (ctx) => ctx.isPlatformOnlyReset,
         task: async (ctx, task) => {
+          const profiles = getPlatformProfiles(config, { includeAll: true });
+
           if (ctx.keepData) {
             // eslint-disable-next-line no-param-reassign
             task.title = 'Remove platform services and keep associated data';
           }
 
-          await dockerCompose.rm(config, { profiles: ['platform'] });
+          await dockerCompose.rm(config, { profiles });
 
           // Remove volumes
           if (!ctx.keepData) {
             const { COMPOSE_PROJECT_NAME: composeProjectName } = generateEnvs(config);
 
             const projectVolumeNames = await dockerCompose.getVolumeNames(
               config,
-              { profiles: ['platform'] },
+              { profiles },
             );
 
             await Promise.all(
@@ -132,7 +140,7 @@ export default function resetNodeTaskFactory(
                         await wait(1000);
 
                         // Remove containers
-                        await dockerCompose.rm(config, { profiles: ['platform'] });
+                        await dockerCompose.rm(config, { profiles });
 
                         isRetry = true;
 

packages/dashmate/src/listr/tasks/startNodeTaskFactory.js

@@ -19,7 +19,7 @@ const DAPI_PROFILE_SERVICES = {
  * @param {getConnectionHost} getConnectionHost
  * @param {ensureFileMountExists} ensureFileMountExists
  * @param {HomeDir} homeDir
- * @param {getConfigProfiles} getConfigProfiles
+ * @param {getPlatformProfiles} getPlatformProfiles
  * @return {startNodeTask}
  */
 export default function startNodeTaskFactory(
@@ -31,19 +31,8 @@ export default function startNodeTaskFactory(
   getConnectionHost,
   ensureFileMountExists,
   homeDir,
-  getConfigProfiles,
+  getPlatformProfiles,
 ) {
-  function getPlatformProfiles(config) {
-    const platformProfiles = getConfigProfiles(config)
-      .filter((profile) => profile.startsWith('platform'));
-
-    if (platformProfiles.length === 0) {
-      platformProfiles.push('platform');
-    }
-
-    return Array.from(new Set(platformProfiles));
-  }
-
   /**
    * @typedef {startNodeTask}
    * @param {Config} config

packages/dashmate/src/listr/tasks/stopNodeTaskFactory.js

@@ -7,26 +7,15 @@ import waitForDKGWindowPass from '../../core/quorum/waitForDKGWindowPass.js';
  * @param {DockerCompose} dockerCompose
  * @param {createRpcClient} createRpcClient
  * @param {getConnectionHost} getConnectionHost
- * @param {getConfigProfiles} getConfigProfiles
+ * @param {getPlatformProfiles} getPlatformProfiles
  * @return {stopNodeTask}
  */
 export default function stopNodeTaskFactory(
   dockerCompose,
   createRpcClient,
   getConnectionHost,
-  getConfigProfiles,
+  getPlatformProfiles,
 ) {
-  function getPlatformProfiles(config) {
-    const platformProfiles = getConfigProfiles(config)
-      .filter((profile) => profile.startsWith('platform'));
-
-    if (platformProfiles.length === 0) {
-      platformProfiles.push('platform');
-    }
-
-    return Array.from(new Set(platformProfiles));
-  }
-
   /**
    * Stop node
    * @typedef stopNodeTask
@@ -40,7 +29,9 @@ export default function stopNodeTaskFactory(
         title: 'Check node is running',
         skip: (ctx) => ctx.isForce,
         task: async (ctx) => {
-          const profiles = ctx.platformOnly ? getPlatformProfiles(config) : [];
+          const profiles = ctx.platformOnly
+            ? getPlatformProfiles(config, { includeAll: true })
+            : [];
 
           if (!await dockerCompose.isNodeRunning(config, { profiles })) {
             throw new Error('Node is not running');
@@ -80,7 +71,9 @@ export default function stopNodeTaskFactory(
       {
         title: `Stopping ${config.getName()} node`,
         task: async (ctx) => {
-          const profiles = ctx.platformOnly ? getPlatformProfiles(config) : [];
+          const profiles = ctx.platformOnly
+            ? getPlatformProfiles(config, { includeAll: true })
+            : [];
 
           await dockerCompose.stop(config, { profiles });
         },