@cloud-cli/dx 2.0.0 → 2.1.1

package/README.md

@@ -14,7 +14,7 @@ npm i @cloud-cli/dx
 cy dx.list
 cy dx.prune
 cy dx.pull --image node:latest
-cy dx.add --name node-app --image node:latest --volumes 'volume:/container/path' --port '8080' --host 'foo.example.com'
+cy dx.add --name node-app --image node:latest --volumes 'volume:/container/path' --port '8080' --domain 'foo.example.com'
 cy dx.start --name node-app --env 'FOO=bar'
 cy dx.logs --name node-app
 cy dx.stop --name node-app

package/dist/containers.d.ts

@@ -1,17 +1,10 @@
 import { ServerParams } from '@cloud-cli/cli';
-import { ExtraOptions } from './types.js';
+import { ContainerName, GetLogsOptions, NameAndStatus } from './types.js';
 export declare function getRunningContainers(): Promise<string[]>;
-interface GetLogsOptions extends ExtraOptions {
-    name: string;
-    lines?: string;
-}
-interface ContainerName extends ExtraOptions {
-    name: string;
-}
+export declare function getAllContainers(): Promise<NameAndStatus[]>;
 export declare function getLogs(options: GetLogsOptions): Promise<string>;
 export declare function startAll(_: any, cli: any): Promise<boolean>;
 export declare function refreshContainer(options: ContainerName, { run }: ServerParams): Promise<void>;
 export declare function restartContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;
 export declare function startContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;
 export declare function stopContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;
-export {};

package/dist/containers.js

@@ -7,7 +7,15 @@ export async function getRunningContainers() {
     if (!ps.ok) {
         throw new Error('Failed to list containers: ' + ps.stderr);
     }
-    return getListFromString(ps.stdout).sort();
+    const list = getListFromString(ps.stdout).sort();
+    return list;
+}
+export async function getAllContainers() {
+    const running = await getRunningContainers();
+    return listContainers().map((c) => ({
+        name: c.name,
+        status: running.includes(c.name) ? 'running' : 'stopped',
+    }));
 }
 export async function getLogs(options) {
     readTargetName(options);
@@ -23,8 +31,8 @@ export async function getLogs(options) {
     return [sh.stdout, sh.stderr].join('\n\n').trim();
 }
 export async function startAll(_, cli) {
-    const list = await listContainers({});
-    const running = await getRunningContainers();
+    const list = listContainers();
+    const running = (await getRunningContainers());
     const notRunning = list.filter(({ name }) => !running.includes(name));
     for (const app of notRunning) {
         try {
@@ -61,11 +69,11 @@ export async function startContainer(options, { run }) {
     }
     const vars = (await run('env.show', { name }));
     const { env, envKeys } = await getEnvVars(vars);
-    const container = await findContainer(name);
+    const container = findContainer(name);
     const volumes = addExecFlag(container.volumes, 'v');
     const ports = ['-p' + env.PORT + ':' + (container.port || env.PORT)];
-    if (container.host) {
-        const domain = container.host;
+    if (container.domain) {
+        const [domain] = container.domain.split('/');
         await run('px.update', { domain, target: 'http://localhost:' + env.PORT });
         await run('dns.add', { domain });
     }
@@ -105,9 +113,9 @@ export async function stopContainer(options, { run }) {
     }
     await exec('docker', ['stop', '-t', '5', name]);
     await exec('docker', ['rm', name]);
-    const containers = [await findContainer(name)].filter(Boolean);
+    const containers = [findContainer(name)].filter(Boolean);
     for (const container of containers) {
-        await run('dns.remove', { domain: container.host });
+        await run('dns.remove', { domain: container.domain });
     }
     return true;
 }

package/dist/index.d.ts

@@ -1,7 +1,10 @@
-import { getLogs, getRunningContainers, refreshContainer, restartContainer, startAll, startContainer, stopContainer } from './containers.js';
+import { getLogs, refreshContainer, restartContainer, startAll, startContainer, stopContainer } from './containers.js';
 import { prune, pull } from './images.js';
 import { addContainer, getContainer, listContainers, removeContainer, updateContainer } from './store.js';
 export type { Config } from './types.js';
+declare function ps(options?: {
+    status?: boolean;
+}): Promise<string[]> | Promise<import("./types.js").NameAndStatus[]>;
 declare const _default: {
     pull: typeof pull;
     prune: typeof prune;
@@ -15,7 +18,7 @@ declare const _default: {
     start: typeof startContainer;
     stop: typeof stopContainer;
     restart: typeof restartContainer;
-    ps: typeof getRunningContainers;
+    ps: typeof ps;
     logs: typeof getLogs;
 };
 export default _default;

package/dist/index.js

@@ -1,6 +1,12 @@
-import { getLogs, getRunningContainers, refreshContainer, restartContainer, startAll, startContainer, stopContainer } from './containers.js';
+import { getAllContainers, getLogs, getRunningContainers, refreshContainer, restartContainer, startAll, startContainer, stopContainer } from './containers.js';
 import { prune, pull } from './images.js';
 import { addContainer, getContainer, listContainers, removeContainer, updateContainer } from './store.js';
+function ps(options = {}) {
+    if (options.status) {
+        return getAllContainers();
+    }
+    return getRunningContainers();
+}
 export default {
     pull,
     prune,
@@ -14,6 +20,6 @@ export default {
     start: startContainer,
     stop: stopContainer,
     restart: restartContainer,
-    ps: getRunningContainers,
+    ps: ps,
     logs: getLogs,
 };

package/dist/store.d.ts

@@ -4,7 +4,7 @@ interface ContainerName extends ExtraOptions {
 }
 interface ContainerUpdateOptions extends ContainerName {
     image: string;
-    host?: string;
+    domain?: string;
     volumes?: string;
     port?: string;
 }

package/dist/store.js

@@ -11,8 +11,8 @@ export function addContainer(options) {
         throw new Error('Image required');
     const volumes = options.volumes ? sanitiseVolumes(options.volumes) : '';
     const port = options.port || '';
-    const host = options.host;
-    const container = { name, image, volumes, port, host };
+    const domain = options.domain || '';
+    const container = { name, image, volumes, port, domain };
     set(name, container);
     return container;
 }
@@ -31,7 +31,7 @@ export function getContainer(options) {
 const optionSplitter = /,\s*/;
 export function updateContainer(options) {
     readTargetName(options);
-    let { port, volumes, name, image, host } = options;
+    let { port, volumes, name, image, domain } = options;
     const container = get(name);
     if (!container) {
         throw new Error('Container not found');
@@ -45,14 +45,14 @@ export function updateContainer(options) {
     if (image) {
         container.image = image;
     }
-    if (host) {
-        container.host = host;
+    if (domain) {
+        container.domain = domain;
     }
     set(container.name, container);
     return container;
 }
 export function listContainers(options = {}) {
-    const keys = ['name', 'image', 'host', 'port', 'volumes'];
+    const keys = ['name', 'image', 'domain', 'port', 'volumes'];
     const list = getAll();
     const filtered = keys.reduce((list, key) => {
         if (options[key]) {

package/dist/types.d.ts

@@ -5,10 +5,21 @@ export interface Config {
 export interface Container {
     name: string;
     image: string;
-    host: string;
+    domain: string;
     port: string;
     volumes: string;
 }
+export interface NameAndStatus {
+    name: string;
+    status: string;
+}
 export interface ExtraOptions {
     _?: string[];
 }
+export interface GetLogsOptions extends ExtraOptions {
+    name: string;
+    lines?: string;
+}
+export interface ContainerName extends ExtraOptions {
+    name: string;
+}

package/package.json

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