@wocker/ws 1.0.8 → 1.0.10

package/lib/controllers/ProxyController.js

@@ -54,30 +54,33 @@ let ProxyController = class ProxyController {
         });
     }
     async init(httpPort, httpsPort) {
+        const config = await this.appConfigService.getConfig();
         if (typeof httpPort === "undefined" || isNaN(httpPort)) {
             httpPort = await (0, utils_1.promptText)({
                 required: true,
                 message: "Http port:",
                 type: "int",
-                default: await this.appConfigService.getEnvVariable("PROXY_HTTP_PORT", "80")
+                default: config.getMeta("PROXY_HTTP_PORT", "80")
             });
         }
-        await this.appConfigService.setEnvVariable("PROXY_HTTP_PORT", httpPort);
+        config.setMeta("PROXY_HTTP_PORT", httpPort.toString());
         if (typeof httpsPort === "undefined" || isNaN(httpsPort)) {
             httpsPort = await (0, utils_1.promptText)({
                 required: true,
                 message: "Https port:",
                 type: "int",
-                default: await this.appConfigService.getEnvVariable("PROXY_HTTPS_PORT", "443")
+                default: config.getMeta("PROXY_HTTPS_PORT", "443")
             });
         }
-        await this.appConfigService.setEnvVariable("PROXY_HTTPS_PORT", httpsPort);
+        config.setMeta("PROXY_HTTPS_PORT", httpsPort.toString());
+        await config.save();
     }
     async start() {
         console.info("Proxy starting...");
+        const config = await this.appConfigService.getConfig();
         await this.dockerService.pullImage("nginxproxy/nginx-proxy");
-        const httpPort = await this.appConfigService.getEnvVariable("PROXY_HTTP_PORT", "80");
-        const httpsPort = await this.appConfigService.getEnvVariable("PROXY_HTTPS_PORT", "443");
+        const httpPort = config.getMeta("PROXY_HTTP_PORT", "80");
+        const httpsPort = config.getMeta("PROXY_HTTPS_PORT", "443");
         let container = await this.dockerService.getContainer(this.containerName);
         if (!container) {
             const certsDir = this.appConfigService.dataPath("certs");
@@ -217,6 +220,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], ProxyController.prototype, "getProjectNames", null);
+__decorate([
+    (0, core_1.Command)("domains"),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Array]),
+    __metadata("design:returntype", Promise)
+], ProxyController.prototype, "getDomains", null);
 __decorate([
     (0, core_1.Command)("proxy:init"),
     __param(0, (0, core_1.Option)("http-port", {

package/lib/controllers/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./CompletionController";
+export * from "./DebugController";
 export * from "./ImageController";
 export * from "./PluginController";
 export * from "./PresetController";

package/lib/controllers/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./CompletionController"), exports);
+__exportStar(require("./DebugController"), exports);
 __exportStar(require("./ImageController"), exports);
 __exportStar(require("./PluginController"), exports);
 __exportStar(require("./PresetController"), exports);

package/lib/main.d.ts

@@ -1,3 +1,3 @@
 export declare const app: {
-    run(args: string[]): Promise<any>;
+    run(args: string[]): Promise<void>;
 };

package/lib/main.js

@@ -1,11 +1,31 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.app = void 0;
 const core_1 = require("@wocker/core");
+const chalk_1 = __importDefault(require("chalk"));
 const AppModule_1 = require("./AppModule");
+const services_1 = require("./services");
 exports.app = {
     async run(args) {
-        const factory = await core_1.Factory.create(AppModule_1.AppModule);
-        return factory.run(args);
+        const app = await core_1.Factory.create(AppModule_1.AppModule);
+        const config = app.get(services_1.AppConfigService);
+        const logger = app.get(services_1.LogService);
+        try {
+            const res = await app.run(args);
+            if (res) {
+                process.stdout.write(res);
+                process.stdout.write("\n");
+            }
+        }
+        catch (err) {
+            console.error(chalk_1.default.red(err.message));
+            const { debug } = await config.getConfig();
+            if (debug) {
+                logger.error(err.stack || err.message);
+            }
+        }
     }
 };

package/lib/makes/FS.d.ts

@@ -7,13 +7,11 @@ import { PassThrough } from "readable-stream";
 type ReaddirFilesOptions = {
     recursive?: boolean;
 };
-declare class FS extends CoreFS {
+export declare class FS extends CoreFS {
     static access(path: PathLike): Promise<any>;
-    static exists(path: PathLike): Promise<boolean>;
     static existsSync(path: PathLike): boolean;
     static mkdir(dirPath: string, options?: MakeDirectoryOptions): Promise<void>;
-    static mkdirSync(path: any, options?: MakeDirectoryOptions): string;
-    static readdir(path: PathLike): Promise<string[]>;
+    static mkdirSync(path: string, options?: MakeDirectoryOptions): 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;
@@ -28,4 +26,4 @@ declare class FS extends CoreFS {
     static createReadLinesStream(path: PathLike, count?: number): PassThrough;
     static copyFile(src: PathLike, dest: PathLike): Promise<void>;
 }
-export { FS };
+export {};

package/lib/makes/FS.js

@@ -41,13 +41,6 @@ class FS extends core_1.FS {
             });
         });
     }
-    static async exists(path) {
-        return new Promise((resolve) => {
-            fs.exists(path, (exists) => {
-                resolve(exists);
-            });
-        });
-    }
     static existsSync(path) {
         return fs.existsSync(path);
     }
@@ -66,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) {
@@ -106,7 +87,8 @@ class FS extends core_1.FS {
                 withFileTypes: true
             }, (err, files) => {
                 if (err) {
-                    return reject(err);
+                    reject(err);
+                    return;
                 }
                 const names = files.filter((dirent) => {
                     return dirent.isFile();
@@ -160,7 +142,7 @@ class FS extends core_1.FS {
                     reject(err);
                     return;
                 }
-                fs.read(file, buffer, 0, buffer.length, position, (err, bytesRead, buffer) => {
+                fs.read(file, buffer, 0, buffer.length, position, (err, _, buffer) => {
                     if (err) {
                         reject(err);
                         return;

package/lib/makes/Http.d.ts

@@ -0,0 +1,18 @@
+import { AxiosHeaders, AxiosResponse } from "axios";
+type HttpMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+export declare class Http {
+    readonly method: HttpMethod;
+    readonly url: string;
+    body?: any;
+    protected headers: AxiosHeaders;
+    private constructor();
+    withHeader(name: string, value: string): Http;
+    withBody(body: any): Http;
+    send(path: string): Promise<AxiosResponse>;
+    static get(url: string): Http;
+    static post(url: string): Http;
+    static put(url: string): Http;
+    static patch(url: string): Http;
+    static delete(url: string): Http;
+}
+export {};

package/lib/makes/Http.js

@@ -0,0 +1,72 @@
+"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Http = void 0;
+const axios_1 = __importStar(require("axios"));
+class Http {
+    constructor(method = "GET", url, body) {
+        this.method = method;
+        this.url = url;
+        this.body = body;
+        this.headers = new axios_1.AxiosHeaders();
+    }
+    withHeader(name, value) {
+        this.headers.set(name, value);
+        return this;
+    }
+    withBody(body) {
+        this.body = body;
+        return this;
+    }
+    async send(path) {
+        return axios_1.default.create({
+            method: this.method,
+            baseURL: this.url,
+            headers: this.headers.toJSON(),
+            validateStatus() {
+                return true;
+            }
+        }).request({
+            url: path,
+            data: this.body
+        });
+    }
+    static get(url) {
+        return new Http("GET", url);
+    }
+    static post(url) {
+        return new Http("POST", url);
+    }
+    static put(url) {
+        return new Http("PUT", url);
+    }
+    static patch(url) {
+        return new Http("PATCH", url);
+    }
+    static delete(url) {
+        return new Http("DELETE", url);
+    }
+}
+exports.Http = Http;

package/lib/makes/Preset.d.ts

@@ -39,7 +39,7 @@ declare class Preset {
     save(): Promise<void>;
     getImageName(buildArgs?: EnvConfig): string;
     static install(ps: PresetService): void;
-    static search(options: SearchOptions): Promise<Preset[]>;
-    static searchOne(options: SearchOptions): Promise<Preset>;
+    static search(options: SearchOptions): Promise<import("@wocker/core").Preset[]>;
+    static searchOne(options: SearchOptions): Promise<import("@wocker/core").Preset>;
 }
 export { Preset };

package/lib/makes/index.d.ts

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

package/lib/makes/index.js

@@ -15,5 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./FS"), exports);
+__exportStar(require("./Http"), exports);
 __exportStar(require("./Logger"), exports);
 __exportStar(require("./Preset"), exports);

package/lib/plugins/index.d.ts

@@ -2,7 +2,5 @@ export * from "./ElasticSearchPlugin";
 export * from "./LocaltunnelPlugin";
 export * from "./MaildevPlugin";
 export * from "./MongodbPlugin";
-export * from "./NgrokPlugin";
 export * from "./PageKitePlugin";
 export * from "./ProxmoxPlugin";
-export * from "./RedisPlugin";

package/lib/plugins/index.js

@@ -18,7 +18,5 @@ __exportStar(require("./ElasticSearchPlugin"), exports);
 __exportStar(require("./LocaltunnelPlugin"), exports);
 __exportStar(require("./MaildevPlugin"), exports);
 __exportStar(require("./MongodbPlugin"), exports);
-__exportStar(require("./NgrokPlugin"), exports);
 __exportStar(require("./PageKitePlugin"), exports);
 __exportStar(require("./ProxmoxPlugin"), exports);
-__exportStar(require("./RedisPlugin"), exports);

package/lib/services/AppConfigService.d.ts

@@ -1,28 +1,18 @@
-import { AppConfig as Config, EnvConfig } from "@wocker/core";
+import { Config, AppConfigService as CoreAppConfigService } from "@wocker/core";
 type TypeMap = {
     [type: string]: string;
 };
-export declare class AppConfigService {
+export declare class AppConfigService extends CoreAppConfigService {
     protected pwd: string;
     protected mapTypes: TypeMap;
     constructor();
-    dataPath(...args: string[]): string;
-    pluginsPath(...args: string[]): string;
+    dataPath(...parts: string[]): string;
+    pluginsPath(...parts: string[]): string;
+    presetPath(...parts: string[]): string;
     getPWD(): string;
     setPWD(pwd: string): void;
-    getAppConfig(): Promise<Config>;
-    private saveAppConfig;
-    getMeta(name: string, defaultValue?: string): Promise<string>;
-    setMeta(name: string, value?: string | number): Promise<void>;
-    getAllEnvVariables(): Promise<EnvConfig>;
-    getEnvVariable(name: string, defaultValue?: string): Promise<string>;
-    setEnv(env: any): Promise<void>;
-    setEnvVariable(name: string, value: string | number): Promise<void>;
-    unsetEnv(...keys: string[]): Promise<void>;
     getProjectTypes(): TypeMap;
     registerProjectType(name: string, title?: string): void;
-    setProjectConfig(id: string, path: string): Promise<void>;
-    activatePlugin(name: string): Promise<void>;
-    deactivatePlugin(name: string): Promise<void>;
+    protected loadConfig(): Promise<Config>;
 }
 export {};

package/lib/services/AppConfigService.js

@@ -37,19 +37,23 @@ const core_1 = require("@wocker/core");
 const Path = __importStar(require("path"));
 const env_1 = require("../env");
 const makes_1 = require("../makes");
-let AppConfigService = class AppConfigService {
+let AppConfigService = class AppConfigService extends core_1.AppConfigService {
     constructor() {
+        super();
         this.mapTypes = {
             image: "Image",
             dockerfile: "Dockerfile"
         };
         this.pwd = (process.cwd() || process.env.PWD);
     }
-    dataPath(...args) {
-        return Path.join(env_1.DATA_DIR, ...args);
+    dataPath(...parts) {
+        return Path.join(env_1.DATA_DIR, ...parts);
     }
-    pluginsPath(...args) {
-        return Path.join(env_1.PLUGINS_DIR, ...args);
+    pluginsPath(...parts) {
+        return Path.join(env_1.PLUGINS_DIR, ...parts);
+    }
+    presetPath(...parts) {
+        return Path.join(env_1.PRESETS_DIR, ...parts);
     }
     getPWD() {
         return this.pwd;
@@ -57,121 +61,33 @@ let AppConfigService = class AppConfigService {
     setPWD(pwd) {
         this.pwd = pwd;
     }
-    async getAppConfig() {
-        return makes_1.FS.readJSON(env_1.MAP_PATH);
-    }
-    async saveAppConfig(config) {
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, config);
-    }
-    async getMeta(name, defaultValue) {
-        const config = await this.getAppConfig();
-        const value = (config.meta || {})[name];
-        if (!value) {
-            return defaultValue;
-        }
-        return value;
-    }
-    async setMeta(name, value) {
-        const config = await this.getAppConfig();
-        if (!config.meta) {
-            config.meta = {};
-        }
-        config.meta[name] = value ? value.toString() : undefined;
-        await this.saveAppConfig(config);
-    }
-    async getAllEnvVariables() {
-        const { env = {} } = await makes_1.FS.readJSON(env_1.MAP_PATH);
-        return env;
-    }
-    async getEnvVariable(name, defaultValue) {
-        const { [name]: value = defaultValue } = await this.getAllEnvVariables();
-        if (value === null) {
-            return defaultValue;
-        }
-        return value;
-    }
-    async setEnv(env) {
-        const config = await makes_1.FS.readJSON(env_1.MAP_PATH);
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            ...config,
-            env: {
-                ...config.env || {},
-                ...env
-            }
-        });
-    }
-    async setEnvVariable(name, value) {
-        const config = await makes_1.FS.readJSON(env_1.MAP_PATH);
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            ...config,
-            env: {
-                ...config.env || {},
-                [name]: value
-            }
-        });
-    }
-    async unsetEnv(...keys) {
-        const config = await makes_1.FS.readJSON(env_1.MAP_PATH);
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            ...config,
-            env: Object.keys(config.env || {}).reduce((res, key) => {
-                if (!keys.includes(key)) {
-                    res[key] = config.env[key];
-                }
-                return res;
-            }, {})
-        });
-    }
     getProjectTypes() {
         return this.mapTypes;
     }
     registerProjectType(name, title) {
         this.mapTypes[name] = title || name;
     }
-    async setProjectConfig(id, path) {
-        const { projects, ...rest } = await this.getAppConfig();
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            ...rest,
-            projects: [
-                ...(projects || []).filter((project) => {
-                    return project.id !== id;
-                }).filter((project) => {
-                    return project.src !== path;
-                }),
-                {
-                    id: id,
-                    src: path
+    async loadConfig() {
+        const data = makes_1.FS.existsSync(env_1.MAP_PATH)
+            ? await makes_1.FS.readJSON(env_1.MAP_PATH)
+            : {};
+        return new class extends core_1.Config {
+            constructor(data) {
+                super(data);
+            }
+            addPlugin(plugin) {
+                if (!this.plugins) {
+                    this.plugins = [];
                 }
-            ]
-        });
-    }
-    async activatePlugin(name) {
-        const { default: Plugin } = await Promise.resolve(`${name}`).then(s => __importStar(require(s)));
-        if (!Plugin) {
-            throw new Error("No plugin");
-        }
-        const { plugins = [], ...rest } = await this.getAppConfig();
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            plugins: [
-                ...plugins.filter((plugin) => {
-                    return plugin !== name;
-                }),
-                name
-            ],
-            ...rest
-        });
-    }
-    async deactivatePlugin(name) {
-        const { plugins = [], ...rest } = await this.getAppConfig();
-        if (!plugins.includes(name)) {
-            return;
-        }
-        await makes_1.FS.writeJSON(env_1.MAP_PATH, {
-            plugins: plugins.filter((plugin) => {
-                return plugin !== name;
-            }),
-            ...rest
-        });
+                if (this.plugins.includes(plugin)) {
+                    return;
+                }
+                this.plugins.push(plugin);
+            }
+            async save() {
+                await makes_1.FS.writeJSON(env_1.MAP_PATH, this.toJson());
+            }
+        }(data);
     }
 };
 exports.AppConfigService = AppConfigService;

package/lib/services/DockerService.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import Docker, { Container } from "dockerode";
 import { DockerServiceParams as Params } from "@wocker/core";
+import Docker, { Container } from "dockerode";
 import { LogService } from "./LogService";
 export declare class DockerService {
     protected readonly logService: LogService;
@@ -16,6 +16,7 @@ export declare class DockerService {
     imageLs(options?: Params.ImageList): Promise<Docker.ImageInfo[]>;
     pullImage(tag: string): Promise<void>;
     attach(name: string): Promise<void>;
+    logs(name: string): Promise<void>;
     attachStream(stream: NodeJS.ReadWriteStream): Promise<void>;
     exec(name: string, args?: string[], tty?: boolean): Promise<import("stream").Duplex>;
 }

package/lib/services/DockerService.js

@@ -13,9 +13,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DockerService = void 0;
-const dockerode_1 = __importDefault(require("dockerode"));
 const core_1 = require("@wocker/core");
-const utils_1 = require("../utils");
+const utils_1 = require("@wocker/utils");
+const dockerode_1 = __importDefault(require("dockerode"));
+const utils_2 = require("../utils");
 const makes_1 = require("../makes");
 const LogService_1 = require("./LogService");
 let DockerService = class DockerService {
@@ -159,7 +160,7 @@ let DockerService = class DockerService {
             }, {}),
             dockerfile: src
         });
-        await (0, utils_1.followProgress)(stream);
+        await (0, utils_2.followProgress)(stream);
     }
     async imageExists(tag) {
         const image = this.docker.getImage(tag);
@@ -209,17 +210,21 @@ let DockerService = class DockerService {
             return;
         }
         const stream = await this.docker.pull(tag);
-        await (0, utils_1.followProgress)(stream);
+        await (0, utils_2.followProgress)(stream);
     }
     async attach(name) {
         const container = await this.getContainer(name);
+        if (!container) {
+            return;
+        }
         const stream = await container.attach({
             logs: true,
             stream: true,
             hijack: true,
             stdin: true,
             stdout: true,
-            stderr: true
+            stderr: true,
+            detachKeys: "ctrl-c"
         });
         process.stdin.resume();
         process.stdin.setEncoding("utf8");
@@ -230,12 +235,8 @@ let DockerService = class DockerService {
                 process.stdin.setRawMode(false);
             }
         });
-        stream.setEncoding("utf8");
-        stream.pipe(process.stdout);
-        const [width, height] = process.stdout.getWindowSize();
-        await container.resize({
-            w: width,
-            h: height
+        stream.on("data", (data) => {
+            process.stdout.write((0, utils_1.demuxOutput)(data));
         });
         stream.on("end", async () => {
             process.exit();
@@ -247,6 +248,25 @@ let DockerService = class DockerService {
                 h: height
             });
         });
+        const [width, height] = process.stdout.getWindowSize();
+        await container.resize({
+            w: width,
+            h: height
+        });
+    }
+    async logs(name) {
+        const container = await this.getContainer(name);
+        if (!container) {
+            return;
+        }
+        const stream = await container.logs({
+            stdout: true,
+            stderr: true,
+            follow: true
+        });
+        stream.on("data", (data) => {
+            process.stdout.write((0, utils_1.demuxOutput)(data));
+        });
     }
     async attachStream(stream) {
         process.stdin.resume();

package/lib/services/PluginService.d.ts

@@ -1,6 +1,13 @@
 import { Cli } from "@wocker/core";
+import { AppConfigService } from "./AppConfigService";
+import { LogService } from "./LogService";
 export declare class PluginService {
+    protected readonly appConfigService: AppConfigService;
+    protected readonly logService: LogService;
     protected readonly cli: Cli;
-    constructor(cli: Cli);
-    use(): void;
+    constructor(appConfigService: AppConfigService, logService: LogService, cli: Cli);
+    checkPlugin(pluginName: string): Promise<boolean>;
+    import(): Promise<void>;
+    update(): Promise<void>;
+    protected getCurrentVersion(name: string): Promise<string | null>;
 }