@wocker/ws 1.0.9 → 1.0.11

package/lib/controllers/DebugController.d.ts

@@ -1,7 +1,8 @@
-import { AppConfigService } from "../services";
+import { AppConfigService, LogService } from "../services";
 export declare class DebugController {
     protected readonly appConfigService: AppConfigService;
-    constructor(appConfigService: AppConfigService);
+    protected readonly logService: LogService;
+    constructor(appConfigService: AppConfigService, logService: LogService);
     debug(status: string): Promise<void>;
     debugCompletion(): Promise<string[]>;
 }

package/lib/controllers/DebugController.js

@@ -13,8 +13,9 @@ exports.DebugController = void 0;
 const core_1 = require("@wocker/core");
 const services_1 = require("../services");
 let DebugController = class DebugController {
-    constructor(appConfigService) {
+    constructor(appConfigService, logService) {
         this.appConfigService = appConfigService;
+        this.logService = logService;
     }
     async debug(status) {
         const config = await this.appConfigService.getConfig();
@@ -40,5 +41,6 @@ __decorate([
 ], DebugController.prototype, "debugCompletion", null);
 exports.DebugController = DebugController = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [services_1.AppConfigService])
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.LogService])
 ], DebugController);

package/lib/controllers/ImageController.js

@@ -29,7 +29,7 @@ let ImageController = class ImageController {
         for (const image of images) {
             table.push([image.Id]);
         }
-        return table.toString() + "\n";
+        return table.toString();
     }
 };
 exports.ImageController = ImageController;

package/lib/controllers/PresetController.d.ts

@@ -11,6 +11,7 @@ export declare class PresetController {
     protected onInit(project: Project): Promise<void>;
     protected onRebuild(project: Project): Promise<void>;
     protected onBeforeStart(project: Project): Promise<void>;
+    add(preset: string): Promise<void>;
     eject(name?: string): Promise<void>;
     build(rebuild: boolean, presetName: string): Promise<void>;
 }

package/lib/controllers/PresetController.js

@@ -42,7 +42,6 @@ const utils_2 = require("@wocker/utils");
 const Path = __importStar(require("path"));
 const env_1 = require("../env");
 const utils_3 = require("../utils");
-const makes_1 = require("../makes");
 const services_1 = require("../services");
 let PresetController = class PresetController {
     constructor(appConfigService, appEventsService, projectService, presetService, dockerService) {
@@ -123,7 +122,7 @@ let PresetController = class PresetController {
         if (!preset) {
             throw new Error(`Preset ${project.preset} not found`);
         }
-        const imageName = preset.getImageName(project.buildArgs || {});
+        const imageName = this.presetService.getImageName(preset, project.buildArgs || {});
         const exists = await this.dockerService.imageExists(imageName);
         if (exists) {
             console.info(`Removing image: ${imageName}`);
@@ -136,7 +135,7 @@ let PresetController = class PresetController {
         }
         const preset = await this.presetService.get(project.preset);
         if (preset.dockerfile) {
-            project.imageName = preset.getImageName(project.buildArgs);
+            project.imageName = this.presetService.getImageName(preset, project.buildArgs);
             if (!await this.dockerService.imageExists(project.imageName)) {
                 await this.dockerService.buildImage({
                     tag: project.imageName,
@@ -150,6 +149,8 @@ let PresetController = class PresetController {
             }
         }
     }
+    async add(preset) {
+    }
     async eject(name) {
         if (name) {
             await this.projectService.cdProject(name);
@@ -166,37 +167,34 @@ let PresetController = class PresetController {
         if (!confirm) {
             return;
         }
-        const source = new makes_1.FS(this.appConfigService.presetPath(preset.name));
-        const destination = new makes_1.FS(this.appConfigService.getPWD());
-        const fs = new core_1.FSManager(this.appConfigService.presetPath(preset.name), this.appConfigService.getPWD());
+        const copier = new core_1.FSManager(this.appConfigService.presetPath(preset.name), this.appConfigService.getPWD());
         if (preset.dockerfile) {
-            if (!destination.exists(preset.dockerfile)) {
-                await fs.copy(preset.dockerfile);
+            if (!copier.destination.exists(preset.dockerfile)) {
+                await copier.copy(preset.dockerfile);
             }
             project.type = "dockerfile";
             project.dockerfile = preset.dockerfile;
         }
-        const files = await source.readdirFiles("", {
+        const files = await copier.source.readdirFiles("", {
             recursive: true
         });
         for (const path of files) {
-            const stat = source.stat(path);
+            const stat = copier.source.stat(path), dir = Path.dirname(path);
             if (stat.isFile() && path === "config.json") {
                 continue;
             }
             if (stat.isFile() && path === preset.dockerfile) {
                 continue;
             }
-            if (destination.exists(path)) {
+            if (copier.destination.exists(path)) {
                 continue;
             }
-            const dir = Path.dirname(path);
-            if (!destination.exists(dir)) {
-                destination.mkdir(dir, {
+            if (!copier.destination.exists(dir)) {
+                copier.destination.mkdir(dir, {
                     recursive: true
                 });
             }
-            await fs.copy(path);
+            await copier.copy(path);
         }
         delete project.preset;
         delete project.imageName;
@@ -208,7 +206,7 @@ let PresetController = class PresetController {
         if (preset.buildArgsOptions) {
             buildArgs = await (0, utils_1.promptGroup)(preset.buildArgsOptions);
         }
-        const imageName = preset.getImageName(buildArgs);
+        const imageName = this.presetService.getImageName(preset, buildArgs);
         await this.dockerService.buildImage({
             tag: imageName,
             labels: {
@@ -221,6 +219,12 @@ let PresetController = class PresetController {
     }
 };
 exports.PresetController = PresetController;
+__decorate([
+    (0, core_1.Command)("preset:add <preset>"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "add", null);
 __decorate([
     (0, core_1.Command)("preset:eject"),
     __param(0, (0, core_1.Option)("name", {

package/lib/controllers/ProjectController.d.ts

@@ -7,6 +7,7 @@ export declare class ProjectController {
     protected readonly logService: LogService;
     constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService, logService: LogService);
     protected getProjectNames(): Promise<string[]>;
+    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>;

package/lib/controllers/ProjectController.js

@@ -62,6 +62,15 @@ let ProjectController = class ProjectController {
             return project.name;
         });
     }
+    async getScriptNames() {
+        try {
+            const project = await this.projectService.get();
+            return Object.keys(project.scripts);
+        }
+        catch (err) {
+            return [];
+        }
+    }
     async init(name, type, preset) {
         let project = await this.projectService.searchOne({
             path: this.appConfigService.getPWD()
@@ -144,7 +153,7 @@ let ProjectController = class ProjectController {
             const { State: { Status = "stopped" } = {} } = await container.inspect();
             table.push([project.name, project.type, Status]);
         }
-        return table.toString() + "\n";
+        return table.toString();
     }
     async start(name, detach, rebuild, restart) {
         if (name) {
@@ -203,8 +212,8 @@ let ProjectController = class ProjectController {
         if (name) {
             await this.projectService.cdProject(name);
         }
-        const containerName = `${name}.workspace`;
-        await this.dockerService.attach(containerName);
+        const project = await this.projectService.get();
+        await this.dockerService.attach(project.containerName);
     }
     async configList(name, global) {
         if (name) {
@@ -225,7 +234,7 @@ let ProjectController = class ProjectController {
         for (const i in env) {
             table.push([i, env[i]]);
         }
-        return table.toString() + "\n";
+        return table.toString();
     }
     async configGet(name, global, keys) {
         if (name) {
@@ -244,7 +253,7 @@ let ProjectController = class ProjectController {
             }
             table.push([key, value]);
         }
-        return table.toString() + "\n";
+        return table.toString();
     }
     async configSet(name, global, variables) {
         if (!global && name) {
@@ -262,6 +271,13 @@ let ProjectController = class ProjectController {
             config.setEnv(key.trim(), value.trim());
         }
         await config.save();
+        if (!global) {
+            const project = await this.projectService.get();
+            const container = await this.dockerService.getContainer(project.containerName);
+            if (container) {
+                await this.projectService.start(true);
+            }
+        }
     }
     async configUnset(name, global, configs) {
         const env = configs.reduce((env, config) => {
@@ -280,6 +296,13 @@ let ProjectController = class ProjectController {
             project.unsetEnv(i);
         }
         await project.save();
+        if (!global) {
+            const project = await this.projectService.get();
+            const container = await this.dockerService.getContainer(project.containerName);
+            if (container) {
+                await this.projectService.start(true);
+            }
+        }
     }
     async buildArgsList(name) {
         if (name) {
@@ -293,7 +316,7 @@ let ProjectController = class ProjectController {
         for (const i in buildArgs) {
             table.push([i, typeof buildArgs[i] === "string" ? buildArgs[i] : JSON.stringify(buildArgs[i])]);
         }
-        return table.toString() + "\n";
+        return table.toString();
     }
     async buildArgsGet(name, args) {
         if (name) {
@@ -310,7 +333,7 @@ let ProjectController = class ProjectController {
                 table.push([key, value]);
             }
         }
-        return table.toString() + "\n";
+        return table.toString();
     }
     async buildArgsSet(name, args) {
         if (name) {
@@ -362,7 +385,7 @@ let ProjectController = class ProjectController {
         for (const volume of volumes) {
             table.push([volume]);
         }
-        return table.toString() + "\n";
+        return table.toString();
     }
     async volumeMount(name, volumes) {
         if (name) {
@@ -390,6 +413,10 @@ let ProjectController = class ProjectController {
             const prepareLog = (str) => {
                 return str.replace(/^\[.*]\s([^:]+):\s.*$/gm, (substring, type) => {
                     switch (type) {
+                        case "debug":
+                            return chalk_1.default.grey(substring);
+                        case "log":
+                            return chalk_1.default.white(substring);
                         case "info":
                             return chalk_1.default.green(substring);
                         case "warn":
@@ -471,6 +498,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], ProjectController.prototype, "getProjectNames", null);
+__decorate([
+    (0, core_1.Completion)("script"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ProjectController.prototype, "getScriptNames", null);
 __decorate([
     (0, core_1.Command)("init"),
     __param(0, (0, core_1.Option)("name", {
@@ -505,22 +538,27 @@ __decorate([
 ], ProjectController.prototype, "projectList", null);
 __decorate([
     (0, core_1.Command)("start"),
+    (0, core_1.Description)("Starting project"),
     __param(0, (0, core_1.Option)("name", {
         type: "string",
         alias: "n",
-        description: "Project name"
+        description: "Project name",
+        help: true
     })),
     __param(1, (0, core_1.Option)("detach", {
         type: "boolean",
+        description: "Detach",
         alias: "d"
     })),
     __param(2, (0, core_1.Option)("build", {
         type: "boolean",
+        description: "Build",
         alias: "b"
     })),
     __param(3, (0, core_1.Option)("restart", {
         type: "boolean",
-        alias: "r"
+        alias: "r",
+        description: "Restart"
     })),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Boolean, Boolean, Boolean]),
@@ -583,6 +621,7 @@ __decorate([
         type: "boolean",
         alias: "g"
     })),
+    __param(2, (0, core_1.Param)("key")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Boolean, Array]),
     __metadata("design:returntype", Promise)

package/lib/main.js

@@ -17,6 +17,7 @@ exports.app = {
             const res = await app.run(args);
             if (res) {
                 process.stdout.write(res);
+                process.stdout.write("\n");
             }
         }
         catch (err) {

package/lib/makes/FS.d.ts

@@ -2,28 +2,16 @@
 /// <reference types="node" />
 import { FS as CoreFS } from "@wocker/core";
 import * as fs from "fs";
-import { Stats, BigIntStats, PathLike, PathOrFileDescriptor, WriteFileOptions, ObjectEncodingOptions, MakeDirectoryOptions } from "fs";
+import { Stats, BigIntStats, PathLike, PathOrFileDescriptor, WriteFileOptions, MakeDirectoryOptions } from "fs";
 import { PassThrough } from "readable-stream";
-type ReaddirOptions = ObjectEncodingOptions & {
-    recursive?: boolean;
-};
 type ReaddirFilesOptions = {
     recursive?: boolean;
 };
 export declare class FS extends CoreFS {
-    protected source: string;
-    constructor(source: string);
-    path(...parts: string[]): string;
-    exists(...parts: string[]): boolean;
-    stat(...parts: string[]): fs.Stats;
-    mkdir(path: string, options?: MakeDirectoryOptions): void;
-    readdir(...parts: string[]): Promise<string[]>;
-    readdirFiles(path?: string, options?: ReaddirOptions): Promise<string[]>;
     static access(path: PathLike): Promise<any>;
     static existsSync(path: PathLike): boolean;
     static mkdir(dirPath: string, options?: MakeDirectoryOptions): Promise<void>;
     static mkdirSync(path: string, options?: MakeDirectoryOptions): string;
-    static readdir(path: PathLike): Promise<string[]>;
     static readdirFiles(path: string, options?: ReaddirFilesOptions): Promise<string[]>;
     static appendFile(path: PathOrFileDescriptor, data: any, options?: WriteFileOptions): Promise<unknown>;
     static appendFileSync(path: PathOrFileDescriptor, data: any, options?: WriteFileOptions): void;

package/lib/makes/FS.js

@@ -29,45 +29,6 @@ const fs = __importStar(require("fs"));
 const Path = __importStar(require("path"));
 const readable_stream_1 = require("readable-stream");
 class FS extends core_1.FS {
-    constructor(source) {
-        super();
-        this.source = source;
-    }
-    path(...parts) {
-        return Path.join(this.source, ...parts);
-    }
-    exists(...parts) {
-        const fullPath = this.path(...parts);
-        return FS.existsSync(fullPath);
-    }
-    stat(...parts) {
-        const fullPath = this.path(...parts);
-        return fs.statSync(fullPath);
-    }
-    mkdir(path, options) {
-        const fullPath = this.path(path);
-        fs.mkdirSync(fullPath, options);
-    }
-    async readdir(...parts) {
-        const fullPath = this.path(...parts);
-        return FS.readdir(fullPath);
-    }
-    async readdirFiles(path, options) {
-        const fullPath = this.path(path);
-        return new Promise((resolve, reject) => {
-            fs.readdir(fullPath, options, (err, files) => {
-                if (err) {
-                    reject(err);
-                    return;
-                }
-                files = files.filter((path) => {
-                    const stat = this.stat(path);
-                    return stat.isFile();
-                });
-                resolve(files);
-            });
-        });
-    }
     static async access(path) {
         return new Promise((resolve, reject) => {
             fs.access(path, (err) => {
@@ -98,18 +59,6 @@ class FS extends core_1.FS {
     static mkdirSync(path, options) {
         return fs.mkdirSync(path, options);
     }
-    static async readdir(path) {
-        return new Promise((resolve, reject) => {
-            fs.readdir(path, (err, files) => {
-                if (!err) {
-                    resolve(files);
-                }
-                else {
-                    reject(err);
-                }
-            });
-        });
-    }
     static async readdirFiles(path, options) {
         const { recursive = false } = options || {};
         if (recursive) {

package/lib/plugins/ElasticSearchPlugin.d.ts

@@ -1,5 +1,4 @@
 import { FSManager } from "@wocker/core";
-import { Cli } from "@kearisp/cli";
 import { AppConfigService, DockerService } from "../services";
 type StartOptions = {
     restart?: boolean;
@@ -10,7 +9,6 @@ export declare class ElasticSearchPlugin {
     protected containerName: string;
     protected fs: FSManager;
     constructor(appConfigService: AppConfigService, dockerService: DockerService);
-    install(cli: Cli): void;
     start(options: StartOptions): Promise<void>;
     stop(): Promise<void>;
 }

package/lib/plugins/ElasticSearchPlugin.js

@@ -19,17 +19,6 @@ let ElasticSearchPlugin = class ElasticSearchPlugin {
         this.containerName = "elastic-search.workspace";
         this.fs = new core_1.FSManager(this.appConfigService.pluginsPath("elastic-search"), this.appConfigService.dataPath("plugins/elastic-search"));
     }
-    install(cli) {
-        cli.command("elastica:start")
-            .option("restart", {
-            type: "boolean",
-            alias: "r",
-            description: "Restart service"
-        })
-            .action((options) => this.start(options));
-        cli.command("elastica:stop")
-            .action(() => this.stop());
-    }
     async start(options) {
         const { restart } = options;
         await this.dockerService.pullImage("docker.elastic.co/elasticsearch/elasticsearch:7.5.2");

package/lib/plugins/LocaltunnelPlugin.d.ts

@@ -1,5 +1,4 @@
 import { Project } from "@wocker/core";
-import { Cli } from "@kearisp/cli";
 import { AppConfigService, AppEventsService, ProjectService, DockerService } from "../services";
 type InitOptions = {
     name?: string;
@@ -21,7 +20,6 @@ export declare class LocaltunnelPlugin {
     protected readonly projectService: ProjectService;
     protected readonly dockerService: DockerService;
     constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService);
-    install(cli: Cli): void;
     getIp(): Promise<string>;
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(project: Project): Promise<void>;

package/lib/plugins/LocaltunnelPlugin.js

@@ -25,64 +25,6 @@ let LocaltunnelPlugin = class LocaltunnelPlugin {
         this.projectService = projectService;
         this.dockerService = dockerService;
     }
-    install(cli) {
-        this.appEventsService.on("project:start", (project) => this.onProjectStart(project));
-        this.appEventsService.on("project:stop", (project) => this.onProjectStop(project));
-        cli.command("localtunnel:init")
-            .option("name", {
-            alias: "n",
-            type: "string",
-            description: "Project name"
-        })
-            .action((options) => this.init(options));
-        cli.command("localtunnel:start")
-            .option("name", {
-            alias: "n",
-            type: "string",
-            description: "Project name"
-        })
-            .option("detach", {
-            type: "boolean",
-            alias: "d",
-            description: "Detach"
-        })
-            .action((options) => this.start(options));
-        cli.command("localtunnel:restart")
-            .option("name", {
-            alias: "n",
-            type: "string",
-            description: "Project name"
-        })
-            .option("detach", {
-            type: "boolean",
-            alias: "d",
-            description: "Detach"
-        })
-            .action((options) => this.restart(options));
-        cli.command("localtunnel:stop")
-            .option("name", {
-            alias: "n",
-            type: "string",
-            description: "Project name"
-        })
-            .action((options) => this.stop(options));
-        cli.command("localtunnel:build")
-            .action(() => this.build());
-        cli.command("localtunnel:rebuild")
-            .action(() => this.rebuild());
-        cli.command("localtunnel:logs")
-            .option("name", {
-            alias: "n",
-            type: "string",
-            description: "Project name"
-        })
-            .option("detach", {
-            type: "boolean",
-            alias: "d",
-            description: "Detach"
-        })
-            .action((options) => this.logs(options));
-    }
     async getIp() {
         const res = await axios_1.default.get("https://ipv4.icanhazip.com");
         return res.data.replace("\n", "");

package/lib/plugins/MaildevPlugin.d.ts

@@ -1,11 +1,9 @@
-import { Cli } from "@kearisp/cli";
 import { DockerService, AppConfigService } from "../services";
 export declare class MaildevPlugin {
     protected readonly appConfigService: AppConfigService;
     protected readonly dockerService: DockerService;
     protected containerName: string;
     constructor(appConfigService: AppConfigService, dockerService: DockerService);
-    install(cli: Cli): void;
     start(): Promise<void>;
     stop(): Promise<void>;
 }

package/lib/plugins/MaildevPlugin.js

@@ -18,12 +18,6 @@ let MaildevPlugin = class MaildevPlugin {
         this.dockerService = dockerService;
         this.containerName = "maildev.workspace";
     }
-    install(cli) {
-        cli.command("maildev:start")
-            .action(() => this.start());
-        cli.command("maildev:stop")
-            .action(() => this.stop());
-    }
     async start() {
         console.log("Maildev starting...");
         const imageName = "ws-maildev";

package/lib/plugins/MongodbPlugin.d.ts

@@ -1,4 +1,3 @@
-import { Cli } from "@kearisp/cli";
 import { DockerService } from "../services";
 export declare class MongodbPlugin {
     protected readonly dockerService: DockerService;
@@ -7,7 +6,6 @@ export declare class MongodbPlugin {
     protected dataDir: string;
     constructor(dockerService: DockerService);
     protected dataPath(...parts: string[]): string;
-    install(cli: Cli): void;
     getDatabases(): Promise<string[]>;
     getDatabasesDumps(): Promise<string[]>;
     start(): Promise<void>;

package/lib/plugins/MongodbPlugin.js

@@ -50,63 +50,6 @@ let MongodbPlugin = class MongodbPlugin {
     dataPath(...parts) {
         return Path.join(this.dataDir, ...parts);
     }
-    install(cli) {
-        cli.command("mongodb:start").action(() => {
-            return this.start();
-        });
-        cli.command("mongodb:stop").action(() => {
-            return this.stop();
-        });
-        cli.command("mongodb:restart").action(() => {
-            return this.restart();
-        });
-        cli.command("mongodb:backup [database]")
-            .completion("database", () => {
-            return this.getDatabases();
-        })
-            .action((options, database) => {
-            return this.backup(database);
-        });
-        cli.command("mongodb:restore [database] [filename]")
-            .completion("database", () => {
-            const dumpPath = this.dataPath("dump");
-            return makes_1.FS.readdir(dumpPath);
-        })
-            .completion("filename", (options, database) => {
-            if (!database) {
-                return [];
-            }
-            const dirPath = this.dataPath("dump", database);
-            if (!makes_1.FS.existsSync(dirPath)) {
-                return [];
-            }
-            return makes_1.FS.readdir(dirPath);
-        })
-            .action((options, database, filename) => {
-            return this.restore(database, filename);
-        });
-        cli.command("mongodb:delete-backup [database] [filename]")
-            .option("yes", {
-            type: "boolean",
-            alias: "y"
-        })
-            .completion("database", () => {
-            return this.getDatabasesDumps();
-        })
-            .completion("filename", (options, database) => {
-            if (!database) {
-                return [];
-            }
-            const dumpPath = this.dataPath("dump", database);
-            if (!makes_1.FS.existsSync(dumpPath)) {
-                return [];
-            }
-            return makes_1.FS.readdirFiles(dumpPath);
-        })
-            .action((options, database, filename) => {
-            return this.deleteBackup(database, filename, options.yes);
-        });
-    }
     async getDatabases() {
         const stream = await this.dockerService.exec(this.container, [
             "mongosh",

package/lib/plugins/PageKitePlugin.d.ts

@@ -1,5 +1,4 @@
 import { Project } from "@wocker/core";
-import { Cli } from "@kearisp/cli";
 import { AppConfigService, AppEventsService, ProjectService, DockerService } from "../services";
 type InitOptions = {};
 type StartOptions = {
@@ -21,7 +20,6 @@ export declare class PageKitePlugin {
     protected readonly dockerService: DockerService;
     constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, projectService: ProjectService, dockerService: DockerService);
     pluginPath(...parts: string[]): string;
-    install(cli: Cli): void;
     onProjectStart(project: Project): Promise<void>;
     onProjectStop(project: Project): Promise<void>;
     init(options: InitOptions): Promise<void>;