@cloud-cli/dx 1.4.0 → 1.5.1

package/dist/containers.d.ts

@@ -1,16 +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;
-}
-export declare function refreshContainer(options: RunOptions, { run }: any): Promise<void>;
-export declare function startContainer(options: RunOptions, { run }: any): Promise<boolean>;
-export interface StopOptions {
+interface ContainerName {
     name: string;
 }
-export declare function stopContainer(options: StopOptions, { run }: any): 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,12 +1,12 @@
 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) {
         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) {
@@ -22,12 +22,24 @@ export async function getLogs({ name, lines }) {
     }
     return '';
 }
+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) {
+        try {
+            await refreshContainer({ name: app.name }, cli);
+        }
+        catch { }
+    }
+    return true;
+}
 export async function refreshContainer(options, { run }) {
     const { name } = options;
     const container = await findContainer(name);
-    await run('dx.stop', { name });
     await run('dx.pull', { image: container.image });
-    await run('dx.prune');
+    await run('dx.stop', { name });
+    await run('dx.prune', {});
     await run('dx.start', { name });
 }
 export async function startContainer(options, { run }) {
@@ -44,9 +56,9 @@ export async function startContainer(options, { run }) {
         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 run('dns.reload', {});
     }
-    await exec('docker', [
+    const execArgs = [
         'run',
         '--detach',
         '--restart',
@@ -57,27 +69,13 @@ export async function startContainer(options, { run }) {
         ...ports,
         ...envKeys.map((e) => '-e' + e),
         container.image,
-    ], { env });
+    ];
+    const output = await exec('docker', execArgs, { env });
+    if (!output.ok) {
+        throw new Error('Failed to start ' + name);
+    }
     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(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 async function stopContainer(options, { run }) {
     let { name } = options;
     if (!name) {
@@ -87,15 +85,6 @@ export async function stopContainer(options, { run }) {
     await exec('docker', ['stop', '-t', '5', name]);
     await exec('docker', ['rm', name]);
     await run('dns.remove', { domain: container.host });
-    await run('dns.reload');
+    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, refreshContainer } 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;
@@ -12,11 +11,11 @@ declare const _default: {
     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, refreshContainer } 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);
 }
@@ -17,10 +17,12 @@ export default {
     list: listContainers,
     refresh: refreshContainer,
     update: updateContainer,
+    startAll,
     start: startContainer,
     stop: stopContainer,
     ps: getRunningContainers,
     logs: getLogs,
-    reload,
-    [init]: reload
+    async [init]() {
+        await initResource();
+    }
 };

package/dist/store.js

@@ -84,7 +84,8 @@ export async function updateContainer(options) {
     return container;
 }
 export async function listContainers() {
-    return Resource.find(Container, new Query());
+    const list = await Resource.find(Container, new 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));

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.4.0",
+  "version": "1.5.1",
   "description": "Docker container management",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",