@cloud-cli/dx 1.8.3 → 2.0.0

package/README.md

@@ -14,8 +14,8 @@ 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' --ports '1234:80' --host 'foo.example.com'
-cy dx.start --name node-app --env 'FOO=bar' --ports '1234:80'
+cy dx.add --name node-app --image node:latest --volumes 'volume:/container/path' --port '8080' --host 'foo.example.com'
+cy dx.start --name node-app --env 'FOO=bar'
 cy dx.logs --name node-app
 cy dx.stop --name node-app
 cy dx.remove --name node-app

package/dist/containers.d.ts

@@ -1,12 +1,11 @@
 import { ServerParams } from '@cloud-cli/cli';
+import { ExtraOptions } from './types.js';
 export declare function getRunningContainers(): Promise<string[]>;
-interface GetLogsOptions {
-    _?: string[];
+interface GetLogsOptions extends ExtraOptions {
     name: string;
     lines?: string;
 }
-interface ContainerName {
-    _?: string[];
+interface ContainerName extends ExtraOptions {
     name: string;
 }
 export declare function getLogs(options: GetLogsOptions): Promise<string>;

package/dist/containers.js

@@ -1,7 +1,7 @@
 import { exec } from '@cloud-cli/exec';
+import { getConfig } from '@cloud-cli/cli';
 import { findContainer, listContainers } from './store.js';
-import { getConfig } from './config.js';
-import { addExecFlag, getEnvVars, getListFromString, getPorts, readTargetName, } from './utils.js';
+import { addExecFlag, getEnvVars, getListFromString, readTargetName } from './utils.js';
 export async function getRunningContainers() {
     const ps = await exec('docker', ['ps', '--format', '{{.Names}}']);
     if (!ps.ok) {
@@ -63,16 +63,19 @@ export async function startContainer(options, { run }) {
     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]);
+    const ports = ['-p' + env.PORT + ':' + (container.port || env.PORT)];
     if (container.host) {
         const domain = container.host;
         await run('px.update', { domain, target: 'http://localhost:' + env.PORT });
         await run('dns.add', { domain });
-        await run('dns.reload', {});
     }
-    const dnsOption = [];
-    if (getConfig('dns')) {
-        dnsOption.push('--dns=' + getConfig('dns'));
+    const extraArgs = [];
+    const config = await getConfig('dx');
+    if (config.dns) {
+        extraArgs.push('--dns=' + config.dns);
+    }
+    if (config.dockerArgs) {
+        extraArgs.push(...config.dockerArgs);
     }
     const execArgs = [
         'run',
@@ -81,7 +84,7 @@ export async function startContainer(options, { run }) {
         'always',
         '--name',
         name,
-        ...dnsOption,
+        ...extraArgs,
         ...volumes,
         ...ports,
         ...envKeys.map((e) => '-e' + e),

package/dist/images.js

@@ -1,5 +1,5 @@
 import { exec } from '@cloud-cli/exec';
-import { readTargetImage } from './utils';
+import { readTargetImage } from './utils.js';
 export async function pull(options) {
     readTargetImage(options);
     if (!options.image) {

package/dist/index.d.ts

@@ -1,9 +1,7 @@
-import { init } from '@cloud-cli/cli';
-import { getRunningContainers, getLogs, startContainer, stopContainer, refreshContainer, startAll, restartContainer } from './containers.js';
-import { addContainer, removeContainer, listContainers, updateContainer, getContainer } from './store.js';
-import { pull, prune } from './images.js';
-import { Config } from './config.js';
-export type { Config } from './config.js';
+import { 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';
+export type { Config } from './types.js';
 declare const _default: {
     pull: typeof pull;
     prune: typeof prune;
@@ -19,6 +17,5 @@ declare const _default: {
     restart: typeof restartContainer;
     ps: typeof getRunningContainers;
     logs: typeof getLogs;
-    [init](config?: Config): Promise<void>;
 };
 export default _default;

package/dist/index.js

@@ -1,14 +1,6 @@
-import { init } from '@cloud-cli/cli';
-import { Resource, SQLiteDriver } from '@cloud-cli/store';
-import { Container } from './store.js';
-import { getRunningContainers, getLogs, startContainer, stopContainer, refreshContainer, startAll, restartContainer } from './containers.js';
-import { addContainer, removeContainer, listContainers, updateContainer, getContainer } from './store.js';
-import { pull, prune } from './images.js';
-import { setConfig } from './config.js';
-async function initResource() {
-    Resource.use(new SQLiteDriver());
-    await Resource.create(Container);
-}
+import { 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';
 export default {
     pull,
     prune,
@@ -24,8 +16,4 @@ export default {
     restart: restartContainer,
     ps: getRunningContainers,
     logs: getLogs,
-    async [init](config) {
-        setConfig(config);
-        await initResource();
-    }
 };

package/dist/store.d.ts

@@ -1,37 +1,18 @@
-import { Resource } from '@cloud-cli/store';
-export declare class Container extends Resource {
-    id: number;
-    name: string;
-    image: string;
-    host: string;
-    ports: string;
-    volumes: string;
-}
-interface ContainerName {
-    _?: string[];
+import type { Container, ExtraOptions } from './types.js';
+interface ContainerName extends ExtraOptions {
     name: string;
 }
-interface AddContainerOptions extends ContainerName {
+interface ContainerUpdateOptions extends ContainerName {
     image: string;
     host?: string;
     volumes?: string;
-    ports?: string;
-}
-export declare function addContainer(options: AddContainerOptions): Promise<Container>;
-export declare function removeContainer(options: ContainerName): Promise<boolean>;
-export declare function getContainer(options: ContainerName): Promise<Container>;
-interface UpdateOptions extends ContainerName {
-    ports?: string;
-    volumes?: string;
-    image?: string;
-    host?: string;
-}
-export declare function updateContainer(options: UpdateOptions): Promise<Container>;
-interface ListOptions {
-    name?: string;
-    image?: string;
-    host?: string;
+    port?: string;
 }
-export declare function listContainers(options: ListOptions): Promise<Container[]>;
-export declare function findContainer(name: string): Promise<Container | null>;
+type ContainerListOptions = Partial<Container>;
+export declare function addContainer(options: ContainerUpdateOptions): Container;
+export declare function removeContainer(options: ContainerName): boolean;
+export declare function getContainer(options: ContainerName): Container;
+export declare function updateContainer(options: Partial<ContainerUpdateOptions>): Container;
+export declare function listContainers(options?: ContainerListOptions): Container[];
+export declare function findContainer(name: string): Container;
 export {};

package/dist/store.js

@@ -1,43 +1,7 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { Model, Resource, Primary, NotNull, Property, Query } from '@cloud-cli/store';
-import { readTargetImage, readTargetName } from './utils';
-let Container = class Container extends Resource {
-};
-__decorate([
-    Primary(),
-    NotNull(),
-    Property(Number)
-], Container.prototype, "id", void 0);
-__decorate([
-    NotNull(),
-    Property(String)
-], Container.prototype, "name", void 0);
-__decorate([
-    NotNull(),
-    Property(String)
-], Container.prototype, "image", void 0);
-__decorate([
-    NotNull(),
-    Property(String)
-], Container.prototype, "host", void 0);
-__decorate([
-    NotNull(),
-    Property(String)
-], Container.prototype, "ports", void 0);
-__decorate([
-    NotNull(),
-    Property(String)
-], Container.prototype, "volumes", void 0);
-Container = __decorate([
-    Model('container')
-], Container);
-export { Container };
-export async function addContainer(options) {
+import { readTargetImage, readTargetName } from './utils.js';
+import { getStorage } from '@cloud-cli/cli';
+const { get, set, has, remove, getAll } = getStorage('dx');
+export function addContainer(options) {
     readTargetName(options);
     readTargetImage(options);
     const { name, image } = options;
@@ -46,36 +10,34 @@ export async function addContainer(options) {
     if (!image)
         throw new Error('Image required');
     const volumes = options.volumes ? sanitiseVolumes(options.volumes) : '';
-    const ports = options.ports ? sanitisePorts(options.ports) : '';
+    const port = options.port || '';
     const host = options.host;
-    const container = new Container({ name, image, volumes, ports, host });
-    const id = await container.save();
-    container.id = Number(id);
+    const container = { name, image, volumes, port, host };
+    set(name, container);
     return container;
 }
-export async function removeContainer(options) {
+export function removeContainer(options) {
     readTargetName(options);
-    const found = await findContainer(options.name);
-    if (found) {
-        await found.remove();
+    if (has(options.name)) {
+        remove(options.name);
         return true;
     }
     throw new Error('Container not found: ' + options.name);
 }
-export async function getContainer(options) {
+export function getContainer(options) {
     readTargetName(options);
-    return await findContainer(options.name);
+    return get(options.name);
 }
 const optionSplitter = /,\s*/;
-export async function updateContainer(options) {
+export function updateContainer(options) {
     readTargetName(options);
-    let { ports, volumes, name, image, host } = options;
-    const container = await findContainer(name);
+    let { port, volumes, name, image, host } = options;
+    const container = get(name);
     if (!container) {
         throw new Error('Container not found');
     }
-    if (ports) {
-        container.ports = sanitisePorts(ports);
+    if (port) {
+        container.port = port;
     }
     if (volumes) {
         container.volumes = sanitiseVolumes(volumes);
@@ -86,26 +48,22 @@ export async function updateContainer(options) {
     if (host) {
         container.host = host;
     }
-    await container.save();
+    set(container.name, container);
     return container;
 }
-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 function listContainers(options = {}) {
+    const keys = ['name', 'image', 'host', 'port', 'volumes'];
+    const list = getAll();
+    const filtered = keys.reduce((list, key) => {
+        if (options[key]) {
+            return list.filter((c) => String(c[key]).toLowerCase().includes(options[key].toLowerCase()));
+        }
+        return list;
+    }, list);
+    return filtered.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));
-    return found[0] || null;
-}
-const portTester = /^\d+:\d+$/;
-function sanitisePorts(ports) {
-    return ports
-        .split(optionSplitter)
-        .map((s) => s.trim())
-        .filter((s) => portTester.test(s))
-        .join(',');
+export function findContainer(name) {
+    return get(name);
 }
 const volumeTester = /^\S+:\S+$/;
 function sanitiseVolumes(volumes) {

package/dist/types.d.ts

@@ -0,0 +1,14 @@
+export interface Config {
+    dns?: string;
+    dockerArgs?: string[];
+}
+export interface Container {
+    name: string;
+    image: string;
+    host: string;
+    port: string;
+    volumes: string;
+}
+export interface ExtraOptions {
+    _?: string[];
+}

package/dist/types.js

@@ -0,0 +1 @@
+export {};

package/dist/utils.d.ts

@@ -2,10 +2,10 @@ 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;
+        TZ?: string;
     };
     envKeys: string[];
 }>;

package/dist/utils.js

@@ -1,12 +1,4 @@
 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 = [];
@@ -18,7 +10,7 @@ export async function getEnvVars(vars) {
     return { env, envKeys: [...new Set(envKeys)] };
 }
 export function getListFromString(string) {
-    return string.trim().split('\n').filter(Boolean);
+    return String(string).trim().split('\n').filter(Boolean);
 }
 export function addExecFlag(string, flag) {
     return string

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@cloud-cli/dx",
-  "version": "1.8.3",
+  "version": "2.0.0",
   "description": "Docker container management",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",
   "prettier": "@cloud-cli/prettier-config",
   "scripts": {
-    "test": "jest",
-    "tdd": "jest --watch",
+    "test": "vitest",
     "build": "rm -rf ./dist/* && tsc"
   },
   "keywords": [
@@ -17,10 +16,11 @@
   "license": "MIT",
   "author": "Darlan Alves <me@darlanalv.es>",
   "devDependencies": {
-    "@cloud-cli/jest-config": "^1.0.0",
     "@cloud-cli/prettier-config": "^1.0.0",
     "@cloud-cli/typescript-config": "^1.0.1",
-    "typescript": "^4.4.2"
+    "@types/node": "^20.12.8",
+    "typescript": "^5.4.5",
+    "vitest": "^1.6.0"
   },
   "repository": {
     "type": "git",
@@ -30,9 +30,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@cloud-cli/cli": "^1.4.4",
+    "@cloud-cli/cli": "^1.9.0",
     "@cloud-cli/exec": "^1.0.4",
-    "@cloud-cli/store": "^1.5.1",
-    "get-port": "^6.1.2"
+    "get-port": "^7.1.0"
   }
 }

package/dist/config.d.ts

@@ -1,5 +0,0 @@
-export interface Config {
-    dns?: string;
-}
-export declare function setConfig(newConfig: Config): void;
-export declare function getConfig(name: keyof Config): string;

package/dist/config.js

@@ -1,9 +0,0 @@
-const config = {};
-export function setConfig(newConfig) {
-    if (newConfig) {
-        Object.assign(config, newConfig);
-    }
-}
-export function getConfig(name) {
-    return config[name];
-}