@wocker/ws 1.0.24 → 1.0.26

package/lib/modules/preset/controllers/PresetController.js

@@ -50,8 +50,8 @@ let PresetController = class PresetController {
         }
         return table.toString();
     }
-    async add(name, version) {
-        await this.presetService.addPreset(name, version);
+    async install(repository, version) {
+        await this.presetService.install(repository, version);
     }
     async destroy() {
         await this.presetService.deinit();
@@ -81,13 +81,14 @@ let PresetController = class PresetController {
             await this.dockerService.imageRm(imageName);
         }
         await this.dockerService.buildImage({
+            version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
             tag: imageName,
             labels: {
                 presetName: preset.name
             },
             buildArgs: buildArgs,
             context: preset.path,
-            src: preset.dockerfile
+            dockerfile: preset.dockerfile
         });
     }
     async presets() {
@@ -113,15 +114,15 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "list", null);
 __decorate([
-    (0, core_1.Command)("preset:install <preset>"),
-    (0, core_1.Command)("preset:install <preset>@<version>"),
+    (0, core_1.Command)("preset:install <repository>"),
+    (0, core_1.Command)("preset:install <repository>@<version>"),
     (0, core_1.Description)("Adding preset from github repository"),
-    __param(0, (0, core_1.Param)("preset")),
+    __param(0, (0, core_1.Param)("repository")),
     __param(1, (0, core_1.Param)("version")),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, String]),
     __metadata("design:returntype", Promise)
-], PresetController.prototype, "add", null);
+], PresetController.prototype, "install", null);
 __decorate([
     (0, core_1.Command)("preset:destroy"),
     __metadata("design:type", Function),
@@ -147,6 +148,12 @@ __decorate([
     __metadata("design:paramtypes", [String, Boolean]),
     __metadata("design:returntype", Promise)
 ], PresetController.prototype, "build", null);
+__decorate([
+    (0, core_1.Completion)("preset"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], PresetController.prototype, "presets", null);
 exports.PresetController = PresetController = __decorate([
     (0, core_1.Controller)(),
     (0, core_1.Description)("Preset commands"),

package/lib/modules/preset/controllers/PresetListener.d.ts

@@ -1,13 +1,14 @@
-import { EventService, Project } from "@wocker/core";
+import { EventService, Project, AppConfigService } from "@wocker/core";
 import { DockerService } from "../../docker";
 import { PresetRepository } from "../repositories/PresetRepository";
 import { PresetService } from "../services/PresetService";
 export declare class PresetListener {
+    protected readonly appConfigService: AppConfigService;
     protected readonly eventService: EventService;
     protected readonly dockerService: DockerService;
     protected readonly presetRepository: PresetRepository;
     protected readonly presetService: PresetService;
-    constructor(eventService: EventService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
+    constructor(appConfigService: AppConfigService, eventService: EventService, dockerService: DockerService, presetRepository: PresetRepository, presetService: PresetService);
     onInit(project: Project): Promise<void>;
     protected onRebuild(project: Project): Promise<void>;
     protected onBeforeStart(project: Project): Promise<void>;

package/lib/modules/preset/controllers/PresetListener.js

@@ -17,7 +17,8 @@ const PresetRepository_1 = require("../repositories/PresetRepository");
 const PresetService_1 = require("../services/PresetService");
 const utils_2 = require("../../../utils");
 let PresetListener = class PresetListener {
-    constructor(eventService, dockerService, presetRepository, presetService) {
+    constructor(appConfigService, eventService, dockerService, presetRepository, presetService) {
+        this.appConfigService = appConfigService;
         this.eventService = eventService;
         this.dockerService = dockerService;
         this.presetRepository = presetRepository;
@@ -118,13 +119,14 @@ let PresetListener = class PresetListener {
             project.imageName = this.presetService.getImageNameForProject(project, preset);
             if (!await this.dockerService.imageExists(project.imageName)) {
                 await this.dockerService.buildImage({
+                    version: this.appConfigService.isExperimentalEnabled("buildKit") ? "2" : "1",
                     tag: project.imageName,
                     labels: {
                         presetName: preset.name
                     },
                     buildArgs: project.buildArgs,
                     context: preset.path,
-                    src: preset.dockerfile
+                    dockerfile: preset.dockerfile
                 });
             }
         }
@@ -133,7 +135,8 @@ let PresetListener = class PresetListener {
 exports.PresetListener = PresetListener;
 exports.PresetListener = PresetListener = __decorate([
     (0, core_1.Controller)(),
-    __metadata("design:paramtypes", [core_1.EventService,
+    __metadata("design:paramtypes", [core_1.AppConfigService,
+        core_1.EventService,
         docker_1.DockerService,
         PresetRepository_1.PresetRepository,
         PresetService_1.PresetService])

package/lib/modules/preset/services/PresetService.d.ts

@@ -4,6 +4,7 @@ export declare class PresetService {
     protected readonly appConfigService: AppConfigService;
     protected readonly fs: AppFileSystemService;
     protected readonly presetRepository: PresetRepository;
+    protected range: string;
     constructor(appConfigService: AppConfigService, fs: AppFileSystemService, presetRepository: PresetRepository);
     prompt(configMap: {
         [name: string]: PresetVariableConfig;
@@ -13,5 +14,5 @@ export declare class PresetService {
     get(name?: string): Preset;
     init(): Promise<void>;
     deinit(): Promise<void>;
-    addPreset(name: string, repository?: string, version?: string): Promise<void>;
+    install(repository: string, version?: string): Promise<void>;
 }

package/lib/modules/preset/services/PresetService.js

@@ -17,12 +17,14 @@ const core_1 = require("@wocker/core");
 const utils_1 = require("@wocker/utils");
 const md5_1 = __importDefault(require("md5"));
 const PresetRepository_1 = require("../repositories/PresetRepository");
+const makes_1 = require("../../../makes");
 const GithubClient_1 = require("../../../makes/GithubClient");
 let PresetService = class PresetService {
     constructor(appConfigService, fs, presetRepository) {
         this.appConfigService = appConfigService;
         this.fs = fs;
         this.presetRepository = presetRepository;
+        this.range = "1.x.x";
     }
     async prompt(configMap, values = {}) {
         for (const name in configMap) {
@@ -40,18 +42,27 @@ let PresetService = class PresetService {
                     break;
                 }
                 case "select": {
+                    const options = (0, utils_1.normalizeOptions)(config.options);
+                    const defaultValue = config.multiple ? options.reduce((defaultValue, option) => {
+                        if (values[option.value] === "true") {
+                            return [
+                                ...defaultValue,
+                                option.value
+                            ];
+                        }
+                        return defaultValue;
+                    }, []) : values[name];
                     const result = await (0, utils_1.promptSelect)({
                         required: config.required,
                         multiple: config.multiple,
                         message: config.message,
                         options: config.options,
-                        default: values[name]
+                        default: defaultValue
                     });
                     if (!config.multiple) {
                         values[name] = result;
                     }
                     else {
-                        const options = (0, utils_1.normalizeOptions)(config.options);
                         for (const option of options) {
                             if (result.includes(option.value)) {
                                 values[option.value] = "true";
@@ -215,20 +226,78 @@ let PresetService = class PresetService {
         this.appConfigService.config.unregisterPreset(preset.name);
         this.appConfigService.save();
     }
-    async addPreset(name, repository, version) {
-        if (!repository) {
-            repository = `kearisp/wocker-${name}-preset`;
+    async install(repository, version) {
+        if (!/^[\w-]+\/[\w-]+$/.test(repository)) {
+            repository = `kearisp/wocker-${repository}-preset`;
         }
-        let preset = this.presetRepository.searchOne({
-            name
-        });
-        if (!preset) {
-            console.info("Loading...");
-            const [owner, repo] = repository.split("/");
-            const github = new GithubClient_1.GithubClient(owner, repo);
-            const info = await github.getInfo();
-            await github.download(info.default_branch, this.fs.path(`presets/${name}`));
-            this.appConfigService.registerPreset(name, core_1.PRESET_SOURCE_GITHUB);
+        const [owner, name] = repository.split("/");
+        let satisfyingTag;
+        let satisfyingBranch;
+        const github = new GithubClient_1.GithubClient(owner, name), wRule = makes_1.VersionRule.parse(this.range), rule = makes_1.VersionRule.parse(["latest", "beta"].includes(version) ? "x" : version ?? this.range);
+        if (version !== "beta") {
+            satisfyingTag = (await github.getTags())
+                .filter((tag) => {
+                if (!makes_1.Version.valid(tag.name)) {
+                    return false;
+                }
+                return wRule.match(tag.name) || rule.match(tag.name);
+            })
+                .reduce((tag, nextTag) => {
+                if (!tag) {
+                    return nextTag;
+                }
+                return makes_1.Version.parse(tag.name).compare(nextTag.name) < 0 ? nextTag : tag;
+            }, null);
+        }
+        if (!satisfyingTag) {
+            satisfyingBranch = (await github.getBranches())
+                .filter((branch) => {
+                if (!makes_1.Version.valid(branch.name)) {
+                    return false;
+                }
+                return wRule.match(branch.name) || rule.match(branch.name);
+            })
+                .reduce((branch, nextBranch) => {
+                if (!branch) {
+                    return nextBranch;
+                }
+                return makes_1.Version.parse(branch.name).compare(nextBranch.name) < 0 ? nextBranch : branch;
+            }, null);
+        }
+        if (!satisfyingTag && !satisfyingBranch) {
+            throw new Error(`Version "${version}" not found`);
+        }
+        try {
+            const ref = satisfyingTag ? satisfyingTag.name : satisfyingBranch.name, config = await github.getFile(ref, "config.json");
+            console.info(`Loading "${ref}"...`);
+            let preset = this.presetRepository.searchOne({
+                name: config.name
+            });
+            if (preset && satisfyingTag && preset.source === core_1.PRESET_SOURCE_GITHUB && makes_1.Version.parse(ref).compare(preset.version) === 0) {
+                console.info("Preset already installed");
+                return;
+            }
+            if (this.fs.exists(`presets/.tmp/${config.name}`)) {
+                this.fs.rm(`presets/.tmp/${config.name}`, {
+                    recursive: true
+                });
+            }
+            await github.download(ref, this.fs.path(`presets/.tmp/${config.name}`));
+            if (this.fs.exists(`presets/${config.name}`)) {
+                this.fs.rm(`presets/${config.name}`, {
+                    recursive: true
+                });
+            }
+            this.fs.mv(`presets/.tmp/${config.name}`, `presets/${config.name}`);
+            this.appConfigService.registerPreset(config.name, core_1.PRESET_SOURCE_GITHUB);
+            console.info("Preset installed successfully");
+        }
+        finally {
+            if (this.fs.exists("presets/.tmp")) {
+                this.fs.rm("presets/.tmp", {
+                    recursive: true
+                });
+            }
         }
     }
 };

package/lib/modules/project/controllers/ProjectController.d.ts

@@ -1,13 +1,49 @@
-import { AppConfigService, ProcessService } from "@wocker/core";
+import { AppConfigService, AppFileSystemService, ProcessService, ProjectType, EventService, DockerService, LogService } from "@wocker/core";
 import { PresetService } from "../../preset";
 import { ProjectService } from "../services/ProjectService";
 export declare class ProjectController {
     protected readonly appConfigService: AppConfigService;
+    protected readonly fs: AppFileSystemService;
     protected readonly processService: ProcessService;
     protected readonly projectService: ProjectService;
     protected readonly presetService: PresetService;
-    constructor(appConfigService: AppConfigService, processService: ProcessService, projectService: ProjectService, presetService: PresetService);
+    protected readonly eventService: EventService;
+    protected readonly dockerService: DockerService;
+    protected readonly logService: LogService;
+    constructor(appConfigService: AppConfigService, fs: AppFileSystemService, processService: ProcessService, projectService: ProjectService, presetService: PresetService, eventService: EventService, dockerService: DockerService, logService: LogService);
+    protected getProjectNames(): Promise<string[]>;
+    getScriptNames(): Promise<string[]>;
+    init(name: string, type: ProjectType): Promise<void>;
+    destroy(name?: string): Promise<void>;
     start(name?: string, restart?: boolean, build?: boolean, attach?: boolean): Promise<void>;
     stop(name?: string): Promise<void>;
+    projectList(all: boolean): Promise<string>;
+    buildArgsList(name?: string, service?: string): Promise<string>;
+    buildArgsGet(args: string[], name?: string): Promise<string>;
+    buildArgsSet(args: string[], name?: string, service?: string): Promise<void>;
+    buildArgsUnset(args: string[], name?: string, service?: string): Promise<void>;
+    domains(name?: string): Promise<string>;
+    addDomain(addDomains: string[], name?: string): Promise<void>;
+    setDomains(domains: string[], name?: string): Promise<void>;
+    removeDomain(removeDomains: string[], name?: string): Promise<void>;
+    clearDomain(name?: string): Promise<void>;
+    ports(name?: string, service?: string): Promise<string>;
+    addPort(hostPort: string, containerPort: string, name?: string): Promise<void>;
+    removePort(hostPort: string, containerPort: string, name?: string): Promise<void>;
+    clearPorts(name?: string): Promise<void>;
+    configList(name?: string, global?: boolean, service?: string): Promise<string>;
+    configGet(keys: string[], name: string, global: boolean): Promise<string>;
+    configSet(variables: string[], global: boolean, name: string, service?: string): Promise<void>;
+    configUnset(configs: string[], global?: boolean, name?: string, service?: string): Promise<void>;
+    volumeList(name?: string): Promise<string>;
+    volumeMount(volumes: string[], name: string): Promise<void>;
+    volumeUnmount(volumes: string[], name: string): Promise<void>;
+    extraHostList(name?: string): Promise<string>;
+    addExtraHost(extraHost: string, extraDomain: string, name?: string): Promise<void>;
+    removeExtraHost(extraHost: string, name?: string): Promise<void>;
     eject(name?: string): Promise<void>;
+    attach(name?: string): Promise<void>;
+    run(script: string, args: string[], name?: string, service?: string): Promise<void>;
+    exec(command?: string[], name?: string): Promise<void>;
+    logs(name?: string, global?: boolean, detach?: boolean, follow?: boolean, clear?: boolean): Promise<void>;
 }