@wocker/ws 1.0.7 → 1.0.8

package/lib/services/ProjectService.d.ts

@@ -1,4 +1,4 @@
-import { DI, Project } from "../makes";
+import { Project, PickProperties } from "@wocker/core";
 import { DockerService, AppConfigService, AppEventsService } from "../services";
 type SearchParams = Partial<{
     id: string;
@@ -6,16 +6,19 @@ type SearchParams = Partial<{
     path: string;
 }>;
 declare class ProjectService {
-    protected appConfigService: AppConfigService;
-    protected appEventsService: AppEventsService;
-    protected dockerService: DockerService;
-    constructor(di: DI);
+    protected readonly appConfigService: AppConfigService;
+    protected readonly appEventsService: AppEventsService;
+    protected readonly dockerService: DockerService;
+    constructor(appConfigService: AppConfigService, appEventsService: AppEventsService, dockerService: DockerService);
+    fromObject(data: Partial<PickProperties<Project>>): Project;
+    getById(id: string): Promise<Project>;
     cdProject(name: string): Promise<void>;
     get(): Promise<Project>;
     getContainer(): Promise<import("dockerode").Container>;
-    start(): Promise<void>;
+    start(restart?: boolean): Promise<void>;
     stop(): Promise<void>;
     save(project: Project): Promise<void>;
     search(params?: Partial<SearchParams>): Promise<Project[]>;
+    searchOne(params?: Partial<SearchParams>): Promise<Project | null>;
 }
 export { ProjectService };

package/lib/services/ProjectService.js

@@ -15,6 +15,12 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
+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;
+};
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
@@ -22,19 +28,38 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectService = void 0;
+const core_1 = require("@wocker/core");
 const Path = __importStar(require("path"));
 const makes_1 = require("../makes");
 const services_1 = require("../services");
-class ProjectService {
-    constructor(di) {
-        this.appConfigService = di.resolveService(services_1.AppConfigService);
-        this.appEventsService = di.resolveService(services_1.AppEventsService);
-        this.dockerService = di.resolveService(services_1.DockerService);
+let ProjectService = class ProjectService {
+    constructor(appConfigService, appEventsService, dockerService) {
+        this.appConfigService = appConfigService;
+        this.appEventsService = appEventsService;
+        this.dockerService = dockerService;
+    }
+    fromObject(data) {
+        return new class extends core_1.Project {
+            constructor(projectService, data) {
+                super(data);
+                this.projectService = projectService;
+            }
+            async save() {
+                await this.projectService.save(this);
+            }
+        }(this, data);
+    }
+    async getById(id) {
+        const data = await makes_1.FS.readJSON(this.appConfigService.dataPath("projects", id, "config.json"));
+        return this.fromObject(data);
     }
     async cdProject(name) {
-        const project = await makes_1.Project.searchOne({
+        const project = await this.searchOne({
             name
         });
         if (!project) {
@@ -43,7 +68,7 @@ class ProjectService {
         this.appConfigService.setPWD(project.path);
     }
     async get() {
-        const project = await makes_1.Project.searchOne({
+        const project = await this.searchOne({
             path: this.appConfigService.getPWD()
         });
         if (!project) {
@@ -55,15 +80,15 @@ class ProjectService {
         const project = await this.get();
         return this.dockerService.getContainer(project.containerName);
     }
-    async start() {
+    async start(restart) {
         const project = await this.get();
         if (project.type === "dockerfile") {
             project.imageName = `project-${project.name}:develop`;
-            const images = await makes_1.Docker.imageLs({
+            const images = await this.dockerService.imageLs({
                 tag: project.imageName
             });
             if (images.length === 0) {
-                await makes_1.Docker.imageBuild2({
+                await this.dockerService.buildImage({
                     tag: project.imageName,
                     context: this.appConfigService.getPWD(),
                     src: project.dockerfile
@@ -72,8 +97,12 @@ class ProjectService {
         }
         await this.appEventsService.emit("project:beforeStart", project);
         let container = await this.dockerService.getContainer(project.containerName);
+        if (container && restart) {
+            container = null;
+            await this.dockerService.removeContainer(project.containerName);
+        }
         if (!container) {
-            container = await makes_1.Docker.createContainer({
+            container = await this.dockerService.createContainer({
                 name: project.containerName,
                 image: project.imageName,
                 env: {
@@ -88,24 +117,20 @@ class ProjectService {
                 ports: project.ports || []
             });
         }
-        else {
-            process.stdout.write("Container already exists\n");
-        }
-        if (container) {
-            const { State: { Status } } = await container.inspect();
-            if (Status === "created" || Status === "exited") {
-                await container.start();
-                await this.appEventsService.emit("project:start", project);
-            }
+        const { State: { Status } } = await container.inspect();
+        if (Status === "created" || Status === "exited") {
+            await container.start();
+            await this.appEventsService.emit("project:start", project);
         }
     }
     async stop() {
         const project = await this.get();
-        const container = await makes_1.Docker.getContainer(project.containerName);
-        if (container) {
-            await this.appEventsService.emit("project:stop", project);
-            await makes_1.Docker.removeContainer(`${project.name}.workspace`);
+        const container = await this.dockerService.getContainer(project.containerName);
+        if (!container) {
+            return;
         }
+        await this.appEventsService.emit("project:stop", project);
+        await this.dockerService.removeContainer(project.containerName);
     }
     async save(project) {
         if (!project.name) {
@@ -138,17 +163,23 @@ class ProjectService {
             if (path && config.src !== path) {
                 continue;
             }
-            const projectData = await makes_1.FS.readJSON(this.appConfigService.dataPath("projects", config.id, "config.json"));
-            if (name && projectData.name !== name) {
+            const project = await this.getById(config.id);
+            if (name && project.name !== name) {
                 continue;
             }
-            const project = makes_1.Project.fromObject({
-                id: config.id,
-                ...projectData
-            });
             projects.push(project);
         }
         return projects;
     }
-}
+    async searchOne(params = {}) {
+        const [project] = await this.search(params);
+        return project || null;
+    }
+};
 exports.ProjectService = ProjectService;
+exports.ProjectService = ProjectService = __decorate([
+    (0, core_1.Injectable)("PROJECT_SERVICE"),
+    __metadata("design:paramtypes", [services_1.AppConfigService,
+        services_1.AppEventsService,
+        services_1.DockerService])
+], ProjectService);

package/lib/utils/get-config.d.ts

@@ -1,2 +1,2 @@
-import { Config } from "../types";
-export declare const getConfig: () => Promise<Config>;
+import { AppConfig } from "@wocker/core";
+export declare const getConfig: () => Promise<AppConfig>;

package/lib/utils/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./buildOptions";
-export * from "./demuxOutput";
 export * from "./escapeRegExp";
 export * from "./exec";
 export * from "./fetch";

package/lib/utils/index.js

@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./buildOptions"), exports);
-__exportStar(require("./demuxOutput"), exports);
 __exportStar(require("./escapeRegExp"), exports);
 __exportStar(require("./exec"), exports);
 __exportStar(require("./fetch"), exports);

package/lib/utils/set-config.d.ts

@@ -1,2 +1,2 @@
-import { Config } from "../types";
-export declare const setConfig: (data: Partial<Config>) => Promise<Config>;
+import { AppConfig } from "@wocker/core";
+export declare const setConfig: (data: Partial<AppConfig>) => Promise<AppConfig>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
@@ -25,9 +25,9 @@
         "lint": "eslint \"**/*.{js,jsx,ts,tsx}\""
     },
     "dependencies": {
-        "@kearisp/cli": "^1.0.6",
-        "@wocker/core": "^1.0.4",
-        "@wocker/utils": "^1.0.2",
+        "@kearisp/cli": "^1.0.7",
+        "@wocker/core": "^1.0.8",
+        "@wocker/utils": "^1.0.3",
         "async-mutex": "^0.4.0",
         "axios": "^1.6.7",
         "chalk": "^2.4.2",

package/presets/node/config.json

@@ -33,7 +33,7 @@
             ]
         }
     },
-    "volumes": [
+    "volumeOptions": [
         "./:/usr/app"
     ]
 }

package/presets/php-fpm/Dockerfile

@@ -164,7 +164,7 @@ ARG NGINX_DOCUMENT_ROOT=/var/www
 WORKDIR $WORKDIR
 
 ADD etc/nginx/sites-available/default.conf /tmp/default.conf.txt
-RUN envsubst '\${NGINX_DOCUMENT_ROOT}' < /tmp/default.conf.txt > /etc/nginx/sites-available/default.conf
+RUN envsubst '\${NGINX_DOCUMENT_ROOT}' < /tmp/default.conf.txt > /etc/nginx/sites-available/default
 
 EXPOSE 80
 EXPOSE 9000

package/lib/decorators/Inject.d.ts

@@ -1 +0,0 @@
-export declare const Inject: () => (target: any) => void;

package/lib/decorators/Inject.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Inject = void 0;
-const Inject = () => {
-    return (target) => {
-    };
-};
-exports.Inject = Inject;

package/lib/decorators/Injectable.d.ts

@@ -1,4 +0,0 @@
-import { DI } from "../makes";
-export declare const Injectable: () => <T extends new (...rest: any[]) => {}>(Target: T) => {
-    new (di: DI): {};
-} & T;

package/lib/decorators/Injectable.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Injectable = void 0;
-const Injectable = () => {
-    return (Target) => {
-        return class extends Target {
-            constructor(di) {
-                const types = Reflect.getMetadata("design:paramtypes", Target);
-                const params = types.map((type) => {
-                    return (di).resolveService(type);
-                });
-                super(...params);
-            }
-        };
-    };
-};
-exports.Injectable = Injectable;

package/lib/decorators/index.d.ts

@@ -1 +0,0 @@
-export * from "./Injectable";

package/lib/decorators/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Injectable"), exports);

package/lib/makes/Controller.d.ts

@@ -1,5 +0,0 @@
-import { Cli } from "@kearisp/cli";
-declare class Controller {
-    install(cli: Cli): void;
-}
-export { Controller };

package/lib/makes/Controller.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Controller = void 0;
-class Controller {
-    install() {
-    }
-}
-exports.Controller = Controller;

package/lib/makes/DI.d.ts

@@ -1,7 +0,0 @@
-import "reflect-metadata";
-declare class DI {
-    private services;
-    resolveService<T>(key: any): T;
-    registerService(key: any, service: any): void;
-}
-export { DI };

package/lib/makes/DI.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DI = void 0;
-require("reflect-metadata");
-class DI {
-    constructor() {
-        this.services = new Map();
-    }
-    resolveService(key) {
-        let res = this.services.get(key);
-        if (!res) {
-            const types = Reflect.getMetadata("design:paramtypes", key);
-            if (types && types.length > 0) {
-                types.forEach((type) => {
-                    this.resolveService(type);
-                });
-            }
-            res = new key(this);
-            this.services.set(key, res);
-        }
-        return res;
-    }
-    registerService(key, service) {
-        this.services.set(key, service);
-    }
-}
-exports.DI = DI;

package/lib/makes/Docker.d.ts

@@ -1,58 +0,0 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import Dockerode from "dockerode";
-type ContainerRunOptions = {
-    name: string;
-    image: string;
-    restart?: "always";
-    projectId?: string;
-    tty?: boolean;
-    links?: string[];
-    env?: {
-        [key: string]: string;
-    };
-    networkMode?: string;
-    extraHosts?: any;
-    volumes?: string[];
-    ports?: string[];
-    cmd?: string[];
-};
-type ImageBuildOptions = {
-    tag: string;
-    buildArgs?: {
-        [key: string]: string;
-    };
-    labels?: {
-        [key: string]: string;
-    };
-    context: string;
-    src: string;
-};
-declare class Docker {
-    static docker: Dockerode;
-    static exec(name: string, args: string[], tty?: boolean): Promise<import("stream").Duplex>;
-    static getImage(name: string): Promise<Dockerode.Image>;
-    static getContainer(name: any): Promise<Dockerode.Container>;
-    static removeContainer(name: string): Promise<void>;
-    static getContainerList(options?: {
-        name?: string;
-        projectId?: string;
-    }): Promise<Dockerode.ContainerInfo[]>;
-    static attach(name: string): Promise<void>;
-    static attachStream(stream: NodeJS.ReadWriteStream): Promise<void>;
-    static imageExists(tag: string): Promise<boolean>;
-    static imageLs(options?: {
-        tag?: string;
-        reference?: string;
-        labels?: {
-            [key: string]: string;
-        };
-    }): Promise<Dockerode.ImageInfo[]>;
-    static imageBuild(options: ImageBuildOptions): Promise<void>;
-    static imageBuild2(options: ImageBuildOptions): Promise<NodeJS.ReadableStream>;
-    static imageRm(name: string): Promise<void>;
-    static pullImage(tag: string): Promise<void>;
-    static createContainer(options: ContainerRunOptions): Promise<Dockerode.Container>;
-    static containerRun(options: ContainerRunOptions, attach?: boolean): Promise<Dockerode.Container>;
-}
-export { Docker };