@cloud-cli/dx 1.3.2 → 1.5.0

package/README.md

@@ -12,10 +12,9 @@ npm i @cloud-cli/dx
 
 ```bash
 cy dx.list
-cy dx.status
 cy dx.prune
-cy dx.pull node:latest
-cy dx.add --name node-app --image node --version latest --command 'node --version' --volumes 'volume:/container/path' --ports '1234:80' --host 'foo.example.com'
+cy dx.pull --image node:latest
+cy dx.add --name node-app --image node:latest --volumes 'volume:/container/path' --ports '1234:80' --host 'foo.example.com'
 cy dx.start --name node-app --env 'FOO=bar' --ports '1234:80'
 cy dx.logs --name node-app
 cy dx.stop --name node-app

package/dist/containers.d.ts

@@ -1,17 +1,15 @@
+import { ServerParams } from '@cloud-cli/cli';
 export declare function getRunningContainers(): Promise<string[]>;
 interface GetLogsOptions {
     name: string;
     lines?: string;
 }
-export declare function getLogs({ name, lines }: GetLogsOptions): Promise<string>;
-interface RunOptions {
-    name: string;
-    env?: string[] | string;
-    ports?: string;
-}
-export declare function startContainer(options: RunOptions, { run }: any): Promise<boolean>;
-export interface StopOptions {
+interface ContainerName {
     name: string;
 }
-export declare function stopContainer(options: StopOptions): Promise<boolean>;
+export declare function getLogs({ name, lines }: 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 startContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;
+export declare function stopContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;
 export {};

package/dist/containers.js

@@ -1,6 +1,6 @@
 import { exec } from '@cloud-cli/exec';
-import { findContainer } from './store.js';
-import getPort from 'get-port';
+import { findContainer, listContainers } from './store.js';
+import { addExecFlag, getEnvVars, getListFromString, getPorts } from './utils.js';
 export async function getRunningContainers() {
     const ps = await exec('docker', ['ps', '--format', '{{.Names}}']);
     if (!ps.ok) {
@@ -22,23 +22,40 @@ export async function getLogs({ name, lines }) {
     }
     return '';
 }
-const defaultRunOptions = { ports: '', env: [] };
+export async function startAll(_, cli) {
+    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);
+    }
+    return true;
+}
+export async function refreshContainer(options, { run }) {
+    const { name } = options;
+    const container = await findContainer(name);
+    await run('dx.pull', { image: container.image });
+    await run('dx.stop', { name });
+    await run('dx.prune', {});
+    await run('dx.start', { name });
+}
 export async function startContainer(options, { run }) {
-    options = { ...defaultRunOptions, ...options };
     const { name } = options;
     if (!name) {
         throw new Error('Name is required');
     }
     const vars = (await run('env.show', { app: name }));
-    const { env, envKeys } = await getEnvVars(options.env, vars);
+    const { env, envKeys } = await getEnvVars(vars);
     const container = await findContainer(name);
     const volumes = addExecFlag(container.volumes, 'v');
-    const ports = getPorts([...container.ports.split(','), ...options.ports.split(','), env.PORT + ':' + env.PORT]);
+    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 });
+        await run('dns.reload', {});
     }
-    await exec('docker', [
+    const execArgs = [
         'run',
         '--detach',
         '--restart',
@@ -49,49 +66,22 @@ export async function startContainer(options, { run }) {
         ...ports,
         ...envKeys.map((e) => '-e' + e),
         container.image,
-    ], { env });
-    return true;
-}
-function getPorts(ports) {
-    const map = {};
-    ports.filter(Boolean).forEach((str) => {
-        const [left, right] = str.split(':');
-        map[left] = right;
-    });
-    return Object.entries(map).map(([left, right]) => '-p' + left + ':' + right);
-}
-async function getEnvVars(inputEnv, vars) {
-    const port = await getPort();
-    const envVars = vars.concat({ key: 'PORT', value: String(port) });
-    const additionalEnv = [inputEnv].flat();
-    if (Array.isArray(additionalEnv)) {
-        additionalEnv.forEach((str) => {
-            let [key, value] = str.split('=');
-            envVars.push({ key, value });
-        });
+    ];
+    const output = await exec('docker', execArgs, { env });
+    if (!output.ok) {
+        throw new Error('Failed to start ' + name);
     }
-    const envKeys = [];
-    const env = {};
-    envVars.forEach(({ key, value }) => {
-        envKeys.push(key);
-        env[key] = String(value);
-    });
-    return { env, envKeys: [...new Set(envKeys)] };
+    return true;
 }
-export async function stopContainer(options) {
-    if (!options.name) {
+export async function stopContainer(options, { run }) {
+    let { name } = options;
+    if (!name) {
         throw new Error('Name is required');
     }
-    await exec('docker', ['stop', '-t', '5', options.name]);
-    await exec('docker', ['rm', options.name]);
+    const container = await findContainer(name);
+    await exec('docker', ['stop', '-t', '5', name]);
+    await exec('docker', ['rm', name]);
+    await run('dns.remove', { domain: container.host });
+    await run('dns.reload', {});
     return true;
 }
-function getListFromString(string) {
-    return string.trim().split('\n').filter(Boolean);
-}
-function addExecFlag(string, flag) {
-    return string
-        .split(',')
-        .filter(Boolean)
-        .map((p) => `-${flag}${p}`);
-}

package/dist/index.d.ts

@@ -1,8 +1,7 @@
 import { init } from '@cloud-cli/cli';
-import { getRunningContainers, getLogs, startContainer, stopContainer } from './containers.js';
+import { getRunningContainers, getLogs, startContainer, stopContainer, refreshContainer, startAll } from './containers.js';
 import { addContainer, removeContainer, listContainers, updateContainer, getContainer } from './store.js';
 import { pull, prune } from './images.js';
-declare function reload(): Promise<void>;
 declare const _default: {
     pull: typeof pull;
     prune: typeof prune;
@@ -10,12 +9,13 @@ declare const _default: {
     remove: typeof removeContainer;
     get: typeof getContainer;
     list: typeof listContainers;
+    refresh: typeof refreshContainer;
     update: typeof updateContainer;
+    startAll: typeof startAll;
     start: typeof startContainer;
     stop: typeof stopContainer;
     ps: typeof getRunningContainers;
     logs: typeof getLogs;
-    reload: typeof reload;
-    [init]: typeof reload;
+    [init](): Promise<void>;
 };
 export default _default;

package/dist/index.js

@@ -1,10 +1,10 @@
 import { init } from '@cloud-cli/cli';
 import { Resource, SQLiteDriver } from '@cloud-cli/store';
 import { Container } from './store.js';
-import { getRunningContainers, getLogs, startContainer, stopContainer } from './containers.js';
+import { getRunningContainers, getLogs, startContainer, stopContainer, refreshContainer, startAll } from './containers.js';
 import { addContainer, removeContainer, listContainers, updateContainer, getContainer } from './store.js';
 import { pull, prune } from './images.js';
-async function reload() {
+async function initResource() {
     Resource.use(new SQLiteDriver());
     await Resource.create(Container);
 }
@@ -15,11 +15,14 @@ export default {
     remove: removeContainer,
     get: getContainer,
     list: listContainers,
+    refresh: refreshContainer,
     update: updateContainer,
+    startAll,
     start: startContainer,
     stop: stopContainer,
     ps: getRunningContainers,
     logs: getLogs,
-    reload,
-    [init]: reload
+    async [init]() {
+        await initResource();
+    }
 };

package/dist/utils.d.ts

@@ -0,0 +1,13 @@
+export type EnvList = Array<{
+    key: string;
+    value: string;
+}>;
+export declare function getPorts(ports: string[]): string[];
+export declare function getEnvVars(vars: EnvList): Promise<{
+    env: {
+        [x: string]: string;
+    };
+    envKeys: string[];
+}>;
+export declare function getListFromString(string: string): string[];
+export declare function addExecFlag(string: string, flag: string): string[];

package/dist/utils.js

@@ -0,0 +1,28 @@
+import getPort from 'get-port';
+export function getPorts(ports) {
+    const map = {};
+    ports.filter(Boolean).forEach((str) => {
+        const [left, right] = str.split(':');
+        map[left] = right;
+    });
+    return Object.entries(map).map(([left, right]) => '-p' + left + ':' + right);
+}
+export async function getEnvVars(vars) {
+    const port = await getPort();
+    const envKeys = [];
+    const env = { ...process.env };
+    vars.concat({ key: 'PORT', value: String(port) }).forEach(({ key, value }) => {
+        envKeys.push(key);
+        env[key] = String(value);
+    });
+    return { env, envKeys: [...new Set(envKeys)] };
+}
+export function getListFromString(string) {
+    return string.trim().split('\n').filter(Boolean);
+}
+export function addExecFlag(string, flag) {
+    return string
+        .split(',')
+        .filter(Boolean)
+        .map((p) => `-${flag}${p}`);
+}

package/package.json

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