@cloud-cli/dx 2.2.2 → 2.3.1

package/dist/containers.d.ts

@@ -1,10 +1,15 @@
 import { ServerParams } from '@cloud-cli/cli';
-import { ContainerName, GetLogsOptions, NameAndStatus } from './types.js';
+import { Container, ContainerName, GetLogsOptions, NameAndStatus, RenameOptions } from './types.js';
 export declare function getRunningContainers(): Promise<string[]>;
 export declare function getAllContainers(): Promise<NameAndStatus[]>;
 export declare function getLogs(options: GetLogsOptions): Promise<string>;
+export declare function renameContainer(options: RenameOptions): Container;
 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 interface StartOptions {
+    worker?: boolean;
+    startArgs?: string;
+}
+export declare function startContainer(options: ContainerName & StartOptions, { run }: ServerParams): Promise<boolean>;
 export declare function stopContainer(options: ContainerName, { run }: ServerParams): Promise<boolean>;

package/dist/containers.js

@@ -1,7 +1,7 @@
 import { exec } from '@cloud-cli/exec';
 import { getConfig, logInfo, logError } from '@cloud-cli/cli';
-import { findContainer, listContainers } from './store.js';
-import { addExecFlag, getEnvVars, getListFromString, readTargetName } from './utils.js';
+import { findContainer, listContainers, rename } from './store.js';
+import { addExecFlag, getEnvVars, getListFromString, readTargetName, readTargetNewName } from './utils.js';
 import getPort from 'get-port';
 export async function getRunningContainers() {
     const ps = await exec('docker', ['ps', '--format', '{{.Names}}']);
@@ -31,6 +31,19 @@ export async function getLogs(options) {
     const sh = await exec('docker', args);
     return [sh.stdout, sh.stderr].join('\n\n').trim();
 }
+export function renameContainer(options) {
+    readTargetName(options);
+    readTargetNewName(options);
+    const { name, newName } = options;
+    if (!name || !newName) {
+        throw new Error('Name and new name required');
+    }
+    const container = findContainer(name);
+    if (!container) {
+        throw new Error('Container not found: ' + name);
+    }
+    return rename(name, newName);
+}
 export async function startAll(_, cli) {
     const list = listContainers();
     const running = (await getRunningContainers());
@@ -92,7 +105,7 @@ export async function startContainer(options, { run }) {
     const portBindings = addExecFlag([ports.join(':')], 'p');
     const extraArgs = [];
     const config = await getConfig('dx');
-    if (container.domain) {
+    if (container.domain && !options.worker) {
         const [domain, path = ''] = container.domain.split("/");
         await run("dns.add", { domain });
         extraArgs.push("--label", "px:host=" + domain, "--label", "px:path=" + path);
@@ -106,8 +119,7 @@ export async function startContainer(options, { run }) {
     const execArgs = [
         'run',
         '--detach',
-        '--restart',
-        'always',
+        ...(!options.worker ? ['--restart', 'always'] : []),
         '--name',
         name,
         ...extraArgs,
@@ -116,6 +128,9 @@ export async function startContainer(options, { run }) {
         ...addExecFlag(envKeys, 'e'),
         container.image,
     ];
+    if (options.startArgs) {
+        execArgs.push(...JSON.parse(options.startArgs));
+    }
     const output = await exec('docker', execArgs.filter(Boolean), { env });
     if (!output.ok) {
         const e = 'Failed to start container ' + name;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-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';
+import { getLogs, refreshContainer, restartContainer, startAll, startContainer, stopContainer, renameContainer } 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[]>;
@@ -10,6 +10,7 @@ declare const _default: {
     prune: typeof prune;
     add: typeof addContainer;
     remove: typeof removeContainer;
+    rename: typeof renameContainer;
     get: typeof getContainer;
     list: typeof listContainers;
     refresh: typeof refreshContainer;

package/dist/index.js

@@ -1,6 +1,6 @@
-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';
+import { getAllContainers, getLogs, getRunningContainers, refreshContainer, restartContainer, startAll, startContainer, stopContainer, renameContainer, } 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();
@@ -12,6 +12,7 @@ export default {
     prune,
     add: addContainer,
     remove: removeContainer,
+    rename: renameContainer,
     get: getContainer,
     list: listContainers,
     refresh: refreshContainer,

package/dist/store.d.ts

@@ -7,12 +7,15 @@ interface ContainerUpdateOptions extends ContainerName {
     domain?: string;
     volumes?: string;
     port?: string;
+    worker?: boolean;
+    startArgs?: string;
 }
 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 rename(name: string, newName: string): Container;
 export declare function listContainers(options?: ContainerListOptions): Container[];
 export declare function findContainer(name: string): Container;
 export {};

package/dist/store.js

@@ -10,9 +10,8 @@ export function addContainer(options) {
     if (!image)
         throw new Error('Image required');
     const volumes = options.volumes ? sanitiseVolumes(options.volumes) : '';
-    const port = options.port || '';
-    const domain = options.domain || '';
-    const container = { name, image, volumes, port, domain };
+    const { port = '', domain = '', worker = false, startArgs = '' } = options;
+    const container = { name, image, volumes, port, domain, worker, startArgs };
     set(name, container);
     return container;
 }
@@ -31,32 +30,45 @@ export function getContainer(options) {
 const optionSplitter = /,\s*/;
 export function updateContainer(options) {
     readTargetName(options);
-    let { port, volumes, name, image, domain } = options;
+    let { port, volumes, name, image, domain, startArgs, worker } = options;
     const container = get(name);
     if (!container) {
         throw new Error('Container not found');
     }
-    if (port) {
+    if (port !== undefined) {
         container.port = port;
     }
-    if (volumes) {
+    if (volumes !== undefined) {
         container.volumes = sanitiseVolumes(volumes);
     }
-    if (image) {
+    if (image !== undefined) {
         container.image = image;
     }
-    if (domain) {
+    if (domain !== undefined) {
         container.domain = domain;
     }
+    if (startArgs !== undefined) {
+        container.startArgs = startArgs;
+    }
+    if (worker !== undefined) {
+        container.worker = worker;
+    }
     set(container.name, container);
     return container;
 }
+export function rename(name, newName) {
+    const container = get(name);
+    container.name = newName;
+    set(newName, container);
+    remove(name);
+    return container;
+}
 export function listContainers(options = {}) {
     const keys = ['name', 'image', 'domain', '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.filter((c) => String(c[key]).toLowerCase().includes(String(options[key]).toLowerCase()));
         }
         return list;
     }, list);

package/dist/types.d.ts

@@ -8,6 +8,8 @@ export interface Container {
     domain: string;
     port: string;
     volumes: string;
+    worker: boolean;
+    startArgs: string;
 }
 export interface NameAndStatus {
     name: string;
@@ -23,3 +25,7 @@ export interface GetLogsOptions extends ExtraOptions {
 export interface ContainerName extends ExtraOptions {
     name: string;
 }
+export interface RenameOptions extends ExtraOptions {
+    name: string;
+    newName: string;
+}

package/dist/utils.d.ts

@@ -12,4 +12,5 @@ export declare function getEnvVars(vars: EnvList): Promise<{
 export declare function getListFromString(string: string): string[];
 export declare function addExecFlag(list: string[], flag: string): string[];
 export declare function readTargetName(args: any): void;
+export declare function readTargetNewName(args: any): void;
 export declare function readTargetImage(args: any): void;

package/dist/utils.js

@@ -18,6 +18,9 @@ export function addExecFlag(list, flag) {
 export function readTargetName(args) {
     readPositionalArgs(args, 'name');
 }
+export function readTargetNewName(args) {
+    readPositionalArgs(args, 'newName');
+}
 export function readTargetImage(args) {
     readPositionalArgs(args, 'image');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/dx",
-  "version": "2.2.2",
+  "version": "2.3.1",
   "description": "Docker container management",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -10,18 +10,16 @@
     "test": "vitest",
     "build": "rm -rf ./dist/* && tsc"
   },
-  "keywords": [
-    "cloudy"
-  ],
+  "keywords": ["cloudy"],
   "license": "MIT",
   "author": "Darlan Alves <me@darlanalv.es>",
   "devDependencies": {
     "@cloud-cli/prettier-config": "^1.0.0",
     "@cloud-cli/typescript-config": "^1.0.1",
     "@types/node": "^20.12.8",
-    "@vitest/coverage-v8": "^1.6.0",
+    "@vitest/coverage-v8": "^3.1.1",
     "typescript": "^5.4.5",
-    "vitest": "^1.6.0"
+    "vitest": "^3.1.1"
   },
   "repository": {
     "type": "git",