@cloud-cli/dx 1.5.0 → 1.6.0

package/dist/containers.js

@@ -6,7 +6,7 @@ export async function getRunningContainers() {
     if (!ps.ok) {
         throw new Error('Failed to list containers: ' + ps.stderr);
     }
-    return getListFromString(ps.stdout);
+    return getListFromString(ps.stdout).sort();
 }
 export async function getLogs({ name, lines }) {
     if (!name) {
@@ -23,15 +23,21 @@ export async function getLogs({ name, lines }) {
     return '';
 }
 export async function startAll(_, cli) {
-    const list = await listContainers();
+    const list = await listContainers({});
     const running = await getRunningContainers();
     const notRunning = list.filter(({ name }) => !running.includes(name));
     for (const app of notRunning) {
-        await refreshContainer({ name: app.name }, cli);
+        try {
+            await refreshContainer({ name: app.name }, cli);
+        }
+        catch { }
     }
     return true;
 }
 export async function refreshContainer(options, { run }) {
+    if (!options.name) {
+        throw new Error('Name is required');
+    }
     const { name } = options;
     const container = await findContainer(name);
     await run('dx.pull', { image: container.image });
@@ -44,15 +50,17 @@ export async function startContainer(options, { run }) {
     if (!name) {
         throw new Error('Name is required');
     }
-    const vars = (await run('env.show', { app: name }));
+    const vars = (await run('env.show', { name }));
     const { env, envKeys } = await getEnvVars(vars);
     const container = await findContainer(name);
     const volumes = addExecFlag(container.volumes, 'v');
     const ports = getPorts([...container.ports.split(','), env.PORT + ':' + env.PORT]);
     if (container.host) {
-        await run('px.remove', { domain: container.host });
-        await run('px.add', { domain: container.host, target: 'http://localhost:' + env.PORT, cors: true, redirect: true });
-        await run('dns.add', { domain: container.host });
+        const domain = container.host;
+        const proxy = await run('px.get', { domain });
+        await run('px.remove', { domain });
+        await run('px.add', { ...proxy, domain, target: 'http://localhost:' + env.PORT });
+        await run('dns.add', { domain });
         await run('dns.reload', {});
     }
     const execArgs = [

package/dist/store.d.ts

@@ -26,6 +26,11 @@ interface UpdateOptions extends ContainerName {
     host?: string;
 }
 export declare function updateContainer(options: UpdateOptions): Promise<Container>;
-export declare function listContainers(): Promise<Container[]>;
+interface ListOptions {
+    name?: string;
+    image?: string;
+    host?: string;
+}
+export declare function listContainers(options: ListOptions): Promise<Container[]>;
 export declare function findContainer(name: string): Promise<Container | null>;
 export {};

package/dist/store.js

@@ -42,8 +42,8 @@ export async function addContainer(options) {
         throw new Error('Name required');
     if (!image)
         throw new Error('Image required');
-    const volumes = (options.volumes ? sanitiseVolumes(options.volumes) : '');
-    const ports = (options.ports ? sanitisePorts(options.ports) : '');
+    const volumes = options.volumes ? sanitiseVolumes(options.volumes) : '';
+    const ports = options.ports ? sanitisePorts(options.ports) : '';
     const host = options.host;
     const container = new Container({ name, image, volumes, ports, host });
     const id = await container.save();
@@ -83,8 +83,11 @@ export async function updateContainer(options) {
     await container.save();
     return container;
 }
-export async function listContainers() {
-    return Resource.find(Container, new Query());
+export async function listContainers(options) {
+    const query = new Query();
+    ['name', 'image', 'host'].forEach((key) => !options[key] || query.where(key).is(options[key]));
+    const list = await Resource.find(Container, query);
+    return list.sort((a, b) => Number(a.name > b.name) || -1);
 }
 export async function findContainer(name) {
     const found = await Resource.find(Container, new Query().where('name').is(name));
@@ -92,9 +95,17 @@ export async function findContainer(name) {
 }
 const portTester = /^\d+:\d+$/;
 function sanitisePorts(ports) {
-    return ports.split(optionSplitter).map(s => s.trim()).filter(s => portTester.test(s)).join(',');
+    return ports
+        .split(optionSplitter)
+        .map((s) => s.trim())
+        .filter((s) => portTester.test(s))
+        .join(',');
 }
 const volumeTester = /^\S+:\S+$/;
 function sanitiseVolumes(volumes) {
-    return volumes.split(optionSplitter).map(s => s.trim()).filter(s => volumeTester.test(s)).join(',');
+    return volumes
+        .split(optionSplitter)
+        .map((s) => s.trim())
+        .filter((s) => volumeTester.test(s))
+        .join(',');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/dx",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Docker container management",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",