Merge branch 'develop', prepare 5.0.3

Author: yamalight

.gitignore

@@ -8,3 +8,6 @@ dist/
 bin/server-core.js
 bin/runner.js
 bin/home.html
+
+.idea/
+package-lock.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "exoframe-server",
-  "version": "5.0.2",
+  "version": "5.0.3-dev",
   "description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
   "main": "bin/server-core.js",
   "bin": "bin/exoframe-server.js",

src/routes/deploy.js

@@ -175,13 +175,16 @@ module.exports = fastify => {
       const resultStream = _();
       // deploy new versions
       deploy({username, folder, payload: request.payload, resultStream});
-      // schedule cleanup
-      scheduleCleanup({username, project, existing});
       // reply with deploy stream
       const responseStream = new Readable().wrap(resultStream);
       reply.code(200).send(responseStream);
-      // schedule temp folder cleanup on end
-      responseStream.on('end', () => cleanTemp(folder));
+      // schedule temp folder and container cleanup on deployment end
+      responseStream.on('end', () => {
+        // schedule container cleanup
+        scheduleCleanup({username, project, existing});
+        // clean temp folder
+        cleanTemp(folder);
+      });
     },
   });
 };

src/routes/remove.js

@@ -20,18 +20,29 @@ const removeUserContainer = async ({username, id, reply}) => {
     return;
   }
 
-  // if not found by name - try to find by project
-  const containers = allContainers.filter(
+  // if not found by name - try to find by domain.
+  const containersByUrl = allContainers.filter(c => {
+    return c.Labels['exoframe.user'] === username && c.Labels['traefik.frontend.rule'] === 'Host:' + id;
+  });
+
+  if (containersByUrl.length) {
+    await Promise.all(containersByUrl.map(removeContainer));
+    reply.code(204).send('removed');
+    return;
+  }
+
+  // if not found by name and url - try to find by project
+  const containersByProject = allContainers.filter(
     c => c.Labels['exoframe.user'] === username && c.Labels['exoframe.project'] === id
   );
-  if (!containers.length) {
-    reply.code(404).send({error: 'Container or function not found!'});
+
+  if (containersByProject.length) {
+    await Promise.all(containersByProject.map(removeContainer));
+    reply.code(204).send('removed');
     return;
   }
-  // remove all
-  await Promise.all(containers.map(removeContainer));
-  // reply
-  reply.code(204).send('removed');
+
+  reply.code(404).send({error: 'Container or function not found!'});
 };
 
 module.exports = fastify => {

test/remove.test.js

@@ -27,7 +27,7 @@ const projectName = 'rmtestproject';
 // fastify ref
 let fastify;
 
-const generateContainerConfig = ({name, username, project, baseName}) => ({
+const generateContainerConfig = ({name, username, project, baseName, url}) => ({
   Image: 'busybox:latest',
   Cmd: ['sh', '-c', 'sleep 1000'],
   name,
@@ -36,7 +36,7 @@ const generateContainerConfig = ({name, username, project, baseName}) => ({
     'exoframe.user': username,
     'exoframe.project': project,
     'traefik.backend': baseName,
-    'traefik.frontend.rule': 'Host:test',
+    'traefik.frontend.rule': 'Host:' + url,
   },
 });
 
@@ -57,6 +57,7 @@ beforeAll(async () => {
     username: 'admin',
     project: 'rmtest1',
     baseName: 'exo-admin-rmtest1',
+    url: 'test',
   });
   const container = await docker.createContainer(containerConfig);
   await container.start();
@@ -67,15 +68,17 @@ beforeAll(async () => {
     username: 'admin',
     project: projectName,
     baseName: 'exo-admin-rmtest2',
+    url: 'test',
   });
   const projectContainer1 = await docker.createContainer(prjContainerConfig1);
   await projectContainer1.start();
   // second project container
   const prjContainerConfig2 = generateContainerConfig({
     name: 'rmtest3',
     username: 'admin',
-    project: projectName,
+    project: projectName + '_custom',
     baseName: 'exo-admin-rmtest3',
+    url: 'test.example.com',
   });
   const projectContainer2 = await docker.createContainer(prjContainerConfig2);
   await projectContainer2.start();
@@ -133,3 +136,14 @@ test('Should return error when removing nonexistent project', async done => {
   expect(result).toMatchObject({error: 'Container or function not found!'});
   done();
 });
+
+test('Should remove by url', async done => {
+  const options = Object.assign({}, baseOptions, {
+    url: `/remove/test.example.com`,
+  });
+
+  const response = await fastify.inject(options);
+
+  expect(response.statusCode).toEqual(204);
+  done();
+});