@wocker/ws 1.0.11 → 1.0.12

package/lib/controllers/ProjectController.d.ts

@@ -10,7 +10,7 @@ export declare class ProjectController {
     getScriptNames(): Promise<string[]>;
     init(name: string, type: string, preset: string): Promise<void>;
     projectList(all: boolean): Promise<string>;
-    start(name?: string, detach?: boolean, rebuild?: boolean, restart?: boolean): Promise<void>;
+    start(name?: string, detach?: boolean, attach?: boolean, rebuild?: boolean, restart?: boolean): Promise<void>;
     stop(name: string): Promise<void>;
     run(name: string, script: string): Promise<void>;
     attach(name?: string): Promise<void>;

package/lib/controllers/ProjectController.js

@@ -155,17 +155,19 @@ let ProjectController = class ProjectController {
         }
         return table.toString();
     }
-    async start(name, detach, rebuild, restart) {
+    async start(name, detach, attach, rebuild, restart) {
         if (name) {
             await this.projectService.cdProject(name);
         }
         const project = await this.projectService.get();
         if (rebuild) {
-            await this.projectService.stop();
-            await this.appEventsService.emit("project:rebuild", project);
+            await this.projectService.rebuild(project);
         }
-        await this.projectService.start(restart);
-        if (!detach) {
+        await this.projectService.start(project, restart);
+        if (detach) {
+            console.info(chalk_1.default.yellow("Warning: Detach option is deprecated"));
+        }
+        if (attach) {
             const project = await this.projectService.get();
             const containerName = project.containerName;
             const container = await this.dockerService.getContainer(containerName);
@@ -180,7 +182,8 @@ let ProjectController = class ProjectController {
         if (name) {
             await this.projectService.cdProject(name);
         }
-        await this.projectService.stop();
+        const project = await this.projectService.get();
+        await this.projectService.stop(project);
     }
     async run(name, script) {
         if (name) {
@@ -275,7 +278,7 @@ let ProjectController = class ProjectController {
             const project = await this.projectService.get();
             const container = await this.dockerService.getContainer(project.containerName);
             if (container) {
-                await this.projectService.start(true);
+                await this.projectService.start(project, true);
             }
         }
     }
@@ -300,7 +303,7 @@ let ProjectController = class ProjectController {
             const project = await this.projectService.get();
             const container = await this.dockerService.getContainer(project.containerName);
             if (container) {
-                await this.projectService.start(true);
+                await this.projectService.start(project, true);
             }
         }
     }
@@ -550,18 +553,23 @@ __decorate([
         description: "Detach",
         alias: "d"
     })),
-    __param(2, (0, core_1.Option)("build", {
+    __param(2, (0, core_1.Option)("attach", {
+        type: "boolean",
+        description: "Attach",
+        alias: "a"
+    })),
+    __param(3, (0, core_1.Option)("build", {
         type: "boolean",
         description: "Build",
         alias: "b"
     })),
-    __param(3, (0, core_1.Option)("restart", {
+    __param(4, (0, core_1.Option)("restart", {
         type: "boolean",
         alias: "r",
         description: "Restart"
     })),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean]),
+    __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean, Boolean]),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "start", null);
 __decorate([

package/lib/controllers/ProxyController.js

@@ -143,8 +143,8 @@ let ProxyController = class ProxyController {
         await project.save();
         const container = await this.dockerService.getContainer(`${project.name}.workspace`);
         if (container) {
-            await this.projectService.stop();
-            await this.projectService.start();
+            await this.projectService.stop(project);
+            await this.projectService.start(project);
         }
     }
     async addDomain(name, addDomains) {
@@ -167,8 +167,8 @@ let ProxyController = class ProxyController {
         await project.save();
         const container = await this.dockerService.getContainer(`${project.name}.workspace`);
         if (container) {
-            await this.projectService.stop();
-            await this.projectService.start();
+            await this.projectService.stop(project);
+            await this.projectService.start(project);
         }
     }
     async removeDomain(name, removeDomains) {
@@ -194,8 +194,8 @@ let ProxyController = class ProxyController {
         await project.save();
         const container = await this.dockerService.getContainer(`${project.name}.workspace`);
         if (container) {
-            await this.projectService.stop();
-            await this.projectService.start();
+            await this.projectService.stop(project);
+            await this.projectService.start(project);
         }
     }
     async logs() {

package/lib/makes/FS.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { FS as CoreFS } from "@wocker/core";
 import * as fs from "fs";
 import { Stats, BigIntStats, PathLike, PathOrFileDescriptor, WriteFileOptions, MakeDirectoryOptions } from "fs";

package/lib/makes/LineConvertStream.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Readable } from "stream";
 import { Mutex } from "async-mutex";
 declare class LineConvertStream extends Readable {

package/lib/makes/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./FS";
 export * from "./Http";
 export * from "./Logger";
-export * from "./Preset";

package/lib/makes/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./FS"), exports);
 __exportStar(require("./Http"), exports);
 __exportStar(require("./Logger"), exports);
-__exportStar(require("./Preset"), exports);

package/lib/services/DockerService.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { DockerServiceParams as Params } from "@wocker/core";
 import Docker, { Container } from "dockerode";
 import { LogService } from "./LogService";

package/lib/services/ProjectService.d.ts

@@ -15,8 +15,9 @@ declare class ProjectService {
     cdProject(name: string): Promise<void>;
     get(): Promise<Project>;
     getContainer(): Promise<import("dockerode").Container>;
-    start(restart?: boolean): Promise<void>;
-    stop(): Promise<void>;
+    rebuild(project: Project): Promise<void>;
+    start(project: Project, restart?: boolean): Promise<void>;
+    stop(project: Project): Promise<void>;
     save(project: Project): Promise<void>;
     search(params?: Partial<SearchParams>): Promise<Project[]>;
     searchOne(params?: Partial<SearchParams>): Promise<Project | null>;

package/lib/services/ProjectService.js

@@ -80,8 +80,20 @@ let ProjectService = class ProjectService {
         const project = await this.get();
         return this.dockerService.getContainer(project.containerName);
     }
-    async start(restart) {
-        const project = await this.get();
+    async rebuild(project) {
+        await this.stop(project);
+        if (project.type === "dockerfile") {
+            project.imageName = `project-${project.name}:develop`;
+            const images = await this.dockerService.imageLs({
+                tag: project.imageName
+            });
+            if (images.length > 0) {
+                await this.dockerService.imageRm(project.imageName);
+            }
+        }
+        await this.appEventsService.emit("project:rebuild", project);
+    }
+    async start(project, restart) {
         if (project.type === "dockerfile") {
             project.imageName = `project-${project.name}:develop`;
             const images = await this.dockerService.imageLs({
@@ -126,8 +138,7 @@ let ProjectService = class ProjectService {
         }
         await this.appEventsService.emit("project:start", project);
     }
-    async stop() {
-        const project = await this.get();
+    async stop(project) {
         const container = await this.dockerService.getContainer(project.containerName);
         if (!container) {
             return;

package/lib/utils/exec.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { ExecOptions } from "child_process";
 type Options = Omit<ExecOptions, "maxBuffer">;
 declare const exec: (command: string, options?: Options) => Promise<string>;

package/lib/utils/followProgress.d.ts

@@ -1,6 +1 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 export declare const followProgress: (stream: NodeJS.ReadableStream) => Promise<unknown>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -38,8 +38,7 @@
         "md5": "^2.3.0",
         "os": "^0.1.2",
         "path": "^0.12.7",
-        "readable-stream": "^4.1.0",
-        "reflect-metadata": "^0.2.1"
+        "readable-stream": "^4.1.0"
     },
     "devDependencies": {
         "@types/dockerode": "3.3.23",
@@ -55,6 +54,6 @@
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-webpack-plugin": "^3.1.0",
-        "typescript": "^5.4.4"
+        "typescript": "^5.5.2"
     }
 }

package/lib/makes/Preset.d.ts

@@ -1,45 +0,0 @@
-import { EnvConfig } from "@wocker/core";
-import { PresetService, PresetServiceSearchOptions as SearchOptions } from "../services/PresetService";
-type TextOption = {
-    type: "string" | "number" | "int";
-    message?: string;
-    default?: string | number;
-};
-type ConfirmOption = {
-    type: "boolean";
-    message?: string;
-    default?: boolean;
-};
-type SelectOption = {
-    type: "select";
-    options: string[] | {
-        label?: string;
-        value: string;
-    }[] | {
-        [name: string]: string;
-    };
-    message?: string;
-    default?: string;
-};
-type AnyOption = TextOption | ConfirmOption | SelectOption;
-declare class Preset {
-    id: string;
-    name: string;
-    version: string;
-    dockerfile?: string;
-    buildArgsOptions?: {
-        [name: string]: AnyOption;
-    };
-    envOptions?: {
-        [name: string]: AnyOption;
-    };
-    volumes?: string[];
-    volumeOptions?: string[];
-    constructor(data: any);
-    save(): Promise<void>;
-    getImageName(buildArgs?: EnvConfig): string;
-    static install(ps: PresetService): void;
-    static search(options: SearchOptions): Promise<import("@wocker/core").Preset[]>;
-    static searchOne(options: SearchOptions): Promise<import("@wocker/core").Preset>;
-}
-export { Preset };

package/lib/makes/Preset.js

@@ -1,44 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Preset = void 0;
-let presetService;
-class Preset {
-    constructor(data) {
-        this.id = data.id;
-        this.name = data.name;
-        this.version = data.version;
-        this.dockerfile = data.dockerfile;
-        this.buildArgsOptions = data.buildArgsOptions;
-        this.envOptions = data.envOptions;
-        this.volumes = data.volumes;
-        this.volumeOptions = data.volumeOptions;
-    }
-    async save() {
-        if (!presetService) {
-            throw new Error("Dependency is missing");
-        }
-        return presetService.save(this);
-    }
-    getImageName(buildArgs) {
-        if (!presetService) {
-            throw new Error("Dependency is missing");
-        }
-        return presetService.getImageName(this, buildArgs);
-    }
-    static install(ps) {
-        presetService = ps;
-    }
-    static search(options) {
-        if (!presetService) {
-            throw new Error("Dependency is missing");
-        }
-        return presetService.search(options);
-    }
-    static searchOne(options) {
-        if (!presetService) {
-            throw new Error("Dependency is missing");
-        }
-        return presetService.searchOne(options);
-    }
-}
-exports.Preset = Preset;